diff --git a/bodyshop_translations.babel b/bodyshop_translations.babel
index aeabb8f20..8683bea4c 100644
--- a/bodyshop_translations.babel
+++ b/bodyshop_translations.babel
@@ -1,4 +1,4 @@
-<babeledit_project version="1.2" be_version="2.7.1">
+<babeledit_project be_version="2.7.1" version="1.2">
     <!--
 
     BabelEdit project file
@@ -6135,6 +6135,221 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <folder_node>
+                                        <name>md_ro_guard</name>
+                                        <children>
+                                            <concept_node>
+                                                <name>enabled</name>
+                                                <definition_loaded>false</definition_loaded>
+                                                <description></description>
+                                                <comment></comment>
+                                                <default_text></default_text>
+                                                <translations>
+                                                    <translation>
+                                                        <language>en-US</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                    <translation>
+                                                        <language>es-MX</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                    <translation>
+                                                        <language>fr-CA</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                </translations>
+                                            </concept_node>
+                                            <concept_node>
+                                                <name>enforce_ar</name>
+                                                <definition_loaded>false</definition_loaded>
+                                                <description></description>
+                                                <comment></comment>
+                                                <default_text></default_text>
+                                                <translations>
+                                                    <translation>
+                                                        <language>en-US</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                    <translation>
+                                                        <language>es-MX</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                    <translation>
+                                                        <language>fr-CA</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                </translations>
+                                            </concept_node>
+                                            <concept_node>
+                                                <name>enforce_bills</name>
+                                                <definition_loaded>false</definition_loaded>
+                                                <description></description>
+                                                <comment></comment>
+                                                <default_text></default_text>
+                                                <translations>
+                                                    <translation>
+                                                        <language>en-US</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                    <translation>
+                                                        <language>es-MX</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                    <translation>
+                                                        <language>fr-CA</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                </translations>
+                                            </concept_node>
+                                            <concept_node>
+                                                <name>enforce_cm</name>
+                                                <definition_loaded>false</definition_loaded>
+                                                <description></description>
+                                                <comment></comment>
+                                                <default_text></default_text>
+                                                <translations>
+                                                    <translation>
+                                                        <language>en-US</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                    <translation>
+                                                        <language>es-MX</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                    <translation>
+                                                        <language>fr-CA</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                </translations>
+                                            </concept_node>
+                                            <concept_node>
+                                                <name>enforce_labor</name>
+                                                <definition_loaded>false</definition_loaded>
+                                                <description></description>
+                                                <comment></comment>
+                                                <default_text></default_text>
+                                                <translations>
+                                                    <translation>
+                                                        <language>en-US</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                    <translation>
+                                                        <language>es-MX</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                    <translation>
+                                                        <language>fr-CA</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                </translations>
+                                            </concept_node>
+                                            <concept_node>
+                                                <name>enforce_ppd</name>
+                                                <definition_loaded>false</definition_loaded>
+                                                <description></description>
+                                                <comment></comment>
+                                                <default_text></default_text>
+                                                <translations>
+                                                    <translation>
+                                                        <language>en-US</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                    <translation>
+                                                        <language>es-MX</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                    <translation>
+                                                        <language>fr-CA</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                </translations>
+                                            </concept_node>
+                                            <concept_node>
+                                                <name>enforce_profit</name>
+                                                <definition_loaded>false</definition_loaded>
+                                                <description></description>
+                                                <comment></comment>
+                                                <default_text></default_text>
+                                                <translations>
+                                                    <translation>
+                                                        <language>en-US</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                    <translation>
+                                                        <language>es-MX</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                    <translation>
+                                                        <language>fr-CA</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                </translations>
+                                            </concept_node>
+                                            <concept_node>
+                                                <name>enforce_sublet</name>
+                                                <definition_loaded>false</definition_loaded>
+                                                <description></description>
+                                                <comment></comment>
+                                                <default_text></default_text>
+                                                <translations>
+                                                    <translation>
+                                                        <language>en-US</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                    <translation>
+                                                        <language>es-MX</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                    <translation>
+                                                        <language>fr-CA</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                </translations>
+                                            </concept_node>
+                                            <concept_node>
+                                                <name>masterbypass</name>
+                                                <definition_loaded>false</definition_loaded>
+                                                <description></description>
+                                                <comment></comment>
+                                                <default_text></default_text>
+                                                <translations>
+                                                    <translation>
+                                                        <language>en-US</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                    <translation>
+                                                        <language>es-MX</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                    <translation>
+                                                        <language>fr-CA</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                </translations>
+                                            </concept_node>
+                                            <concept_node>
+                                                <name>totalgppercent_minimum</name>
+                                                <definition_loaded>false</definition_loaded>
+                                                <description></description>
+                                                <comment></comment>
+                                                <default_text></default_text>
+                                                <translations>
+                                                    <translation>
+                                                        <language>en-US</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                    <translation>
+                                                        <language>es-MX</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                    <translation>
+                                                        <language>fr-CA</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                </translations>
+                                            </concept_node>
+                                        </children>
+                                    </folder_node>
                                     <folder_node>
                                         <name>md_tasks_presets</name>
                                         <children>
@@ -10663,6 +10878,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>md_ro_guard</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
                                     <concept_node>
                                         <name>md_tasks_presets</name>
                                         <definition_loaded>false</definition_loaded>
@@ -11067,6 +11303,32 @@
                                             </concept_node>
                                         </children>
                                     </folder_node>
+                                    <folder_node>
+                                        <name>roguard</name>
+                                        <children>
+                                            <concept_node>
+                                                <name>title</name>
+                                                <definition_loaded>false</definition_loaded>
+                                                <description></description>
+                                                <comment></comment>
+                                                <default_text></default_text>
+                                                <translations>
+                                                    <translation>
+                                                        <language>en-US</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                    <translation>
+                                                        <language>es-MX</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                    <translation>
+                                                        <language>fr-CA</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                </translations>
+                                            </concept_node>
+                                        </children>
+                                    </folder_node>
                                     <concept_node>
                                         <name>scheduling</name>
                                         <definition_loaded>false</definition_loaded>
@@ -21835,6 +22097,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>act_price_before_ppc</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
                                     <concept_node>
                                         <name>ah_detail_line</name>
                                         <definition_loaded>false</definition_loaded>
@@ -30796,6 +31079,27 @@
                             <folder_node>
                                 <name>labels</name>
                                 <children>
+                                    <concept_node>
+                                        <name>accountsreceivable</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
                                     <concept_node>
                                         <name>act_price_ppc</name>
                                         <definition_loaded>false</definition_loaded>
@@ -33110,6 +33414,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>masterbypass</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
                                     <folder_node>
                                         <name>materials</name>
                                         <children>
@@ -33241,6 +33566,132 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>outstanding_ar</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
+                                    <concept_node>
+                                        <name>outstanding_credit_memos</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
+                                    <concept_node>
+                                        <name>outstanding_ppd</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
+                                    <concept_node>
+                                        <name>outstanding_reconciliation_discrep</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
+                                    <concept_node>
+                                        <name>outstanding_sublets</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
+                                    <concept_node>
+                                        <name>outstandinghours</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
                                     <concept_node>
                                         <name>override_header</name>
                                         <definition_loaded>false</definition_loaded>
@@ -33430,6 +33881,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>performance</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
                                     <concept_node>
                                         <name>pimraryamountpayable</name>
                                         <definition_loaded>false</definition_loaded>
@@ -33687,6 +34159,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>ppdnotexported</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
                                     <concept_node>
                                         <name>profileadjustments</name>
                                         <definition_loaded>false</definition_loaded>
@@ -33708,6 +34201,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>profits</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
                                     <concept_node>
                                         <name>prt_dsmk_total</name>
                                         <definition_loaded>false</definition_loaded>
@@ -34070,6 +34584,242 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <folder_node>
+                                        <name>ro_guard</name>
+                                        <children>
+                                            <concept_node>
+                                                <name>eforce_profit</name>
+                                                <definition_loaded>false</definition_loaded>
+                                                <description></description>
+                                                <comment></comment>
+                                                <default_text></default_text>
+                                                <translations>
+                                                    <translation>
+                                                        <language>en-US</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                    <translation>
+                                                        <language>es-MX</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                    <translation>
+                                                        <language>fr-CA</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                </translations>
+                                            </concept_node>
+                                            <concept_node>
+                                                <name>enforce_ar</name>
+                                                <definition_loaded>false</definition_loaded>
+                                                <description></description>
+                                                <comment></comment>
+                                                <default_text></default_text>
+                                                <translations>
+                                                    <translation>
+                                                        <language>en-US</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                    <translation>
+                                                        <language>es-MX</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                    <translation>
+                                                        <language>fr-CA</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                </translations>
+                                            </concept_node>
+                                            <concept_node>
+                                                <name>enforce_bills</name>
+                                                <definition_loaded>false</definition_loaded>
+                                                <description></description>
+                                                <comment></comment>
+                                                <default_text></default_text>
+                                                <translations>
+                                                    <translation>
+                                                        <language>en-US</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                    <translation>
+                                                        <language>es-MX</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                    <translation>
+                                                        <language>fr-CA</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                </translations>
+                                            </concept_node>
+                                            <concept_node>
+                                                <name>enforce_cm</name>
+                                                <definition_loaded>false</definition_loaded>
+                                                <description></description>
+                                                <comment></comment>
+                                                <default_text></default_text>
+                                                <translations>
+                                                    <translation>
+                                                        <language>en-US</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                    <translation>
+                                                        <language>es-MX</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                    <translation>
+                                                        <language>fr-CA</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                </translations>
+                                            </concept_node>
+                                            <concept_node>
+                                                <name>enforce_labor</name>
+                                                <definition_loaded>false</definition_loaded>
+                                                <description></description>
+                                                <comment></comment>
+                                                <default_text></default_text>
+                                                <translations>
+                                                    <translation>
+                                                        <language>en-US</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                    <translation>
+                                                        <language>es-MX</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                    <translation>
+                                                        <language>fr-CA</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                </translations>
+                                            </concept_node>
+                                            <concept_node>
+                                                <name>enforce_ppd</name>
+                                                <definition_loaded>false</definition_loaded>
+                                                <description></description>
+                                                <comment></comment>
+                                                <default_text></default_text>
+                                                <translations>
+                                                    <translation>
+                                                        <language>en-US</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                    <translation>
+                                                        <language>es-MX</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                    <translation>
+                                                        <language>fr-CA</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                </translations>
+                                            </concept_node>
+                                            <concept_node>
+                                                <name>enforce_sublet</name>
+                                                <definition_loaded>false</definition_loaded>
+                                                <description></description>
+                                                <comment></comment>
+                                                <default_text></default_text>
+                                                <translations>
+                                                    <translation>
+                                                        <language>en-US</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                    <translation>
+                                                        <language>es-MX</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                    <translation>
+                                                        <language>fr-CA</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                </translations>
+                                            </concept_node>
+                                            <concept_node>
+                                                <name>enforce_validation</name>
+                                                <definition_loaded>false</definition_loaded>
+                                                <description></description>
+                                                <comment></comment>
+                                                <default_text></default_text>
+                                                <translations>
+                                                    <translation>
+                                                        <language>en-US</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                    <translation>
+                                                        <language>es-MX</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                    <translation>
+                                                        <language>fr-CA</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                </translations>
+                                            </concept_node>
+                                            <concept_node>
+                                                <name>enforced</name>
+                                                <definition_loaded>false</definition_loaded>
+                                                <description></description>
+                                                <comment></comment>
+                                                <default_text></default_text>
+                                                <translations>
+                                                    <translation>
+                                                        <language>en-US</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                    <translation>
+                                                        <language>es-MX</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                    <translation>
+                                                        <language>fr-CA</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                </translations>
+                                            </concept_node>
+                                        </children>
+                                    </folder_node>
+                                    <concept_node>
+                                        <name>roguard</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
+                                    <concept_node>
+                                        <name>roguardwarnings</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
                                     <concept_node>
                                         <name>rosaletotal</name>
                                         <definition_loaded>false</definition_loaded>
@@ -34280,6 +35030,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>subletsnotcompleted</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
                                     <concept_node>
                                         <name>subletstotal</name>
                                         <definition_loaded>false</definition_loaded>
diff --git a/client/src/components/ca-bc-pvrt-calculator/ca-bc-pvrt-calculator.component.jsx b/client/src/components/ca-bc-pvrt-calculator/ca-bc-pvrt-calculator.component.jsx
index cbdd26770..6d296edd1 100644
--- a/client/src/components/ca-bc-pvrt-calculator/ca-bc-pvrt-calculator.component.jsx
+++ b/client/src/components/ca-bc-pvrt-calculator/ca-bc-pvrt-calculator.component.jsx
@@ -1,9 +1,8 @@
-import React, { useState } from "react";
-import { Button, Form, InputNumber, Popover } from "antd";
-import { logImEXEvent } from "../../firebase/firebase.utils";
-import { useTranslation } from "react-i18next";
 import { CalculatorFilled } from "@ant-design/icons";
-
+import { Button, Form, InputNumber, Popover, Space } from "antd";
+import React, { useState } from "react";
+import { useTranslation } from "react-i18next";
+import { logImEXEvent } from "../../firebase/firebase.utils";
 export default function CABCpvrtCalculator({ disabled, form }) {
   const [visibility, setVisibility] = useState(false);
 
@@ -27,10 +26,14 @@ export default function CABCpvrtCalculator({ disabled, form }) {
         <Form.Item name="days" label={t("jobs.labels.ca_bc_pvrt.days")}>
           <InputNumber precision={0} min={0} />
         </Form.Item>
-        <Button type="primary" htmlType="submit">
-          {t("general.actions.calculate")}
-        </Button>
-        <Button onClick={() => setVisibility(false)}>Close</Button>
+        <div style={{ display: "flex", justifyContent: "flex-end" }}>
+          <Space>
+            <Button type="primary" htmlType="submit">
+              {t("general.actions.calculate")}
+            </Button>
+            <Button onClick={() => setVisibility(false)}>Close</Button>
+          </Space>
+        </div>
       </Form>
     </div>
   );
diff --git a/client/src/components/courtesy-car-form/courtesy-car-form.component.jsx b/client/src/components/courtesy-car-form/courtesy-car-form.component.jsx
index b08e53db6..eac3846aa 100644
--- a/client/src/components/courtesy-car-form/courtesy-car-form.component.jsx
+++ b/client/src/components/courtesy-car-form/courtesy-car-form.component.jsx
@@ -11,11 +11,15 @@ import CourtesyCarFuelSlider from "../courtesy-car-fuel-select/courtesy-car-fuel
 import CourtesyCarReadiness from "../courtesy-car-readiness-select/courtesy-car-readiness-select.component";
 import CourtesyCarStatus from "../courtesy-car-status-select/courtesy-car-status-select.component";
 import FormDatePicker from "../form-date-picker/form-date-picker.component";
-//import FormFieldsChanged from "../form-fields-changed-alert/form-fields-changed-alert.component";
+import FormFieldsChanged from "../form-fields-changed-alert/form-fields-changed-alert.component";
 import CurrencyInput from "../form-items-formatted/currency-form-item.component";
 import LayoutFormRow from "../layout-form-row/layout-form-row.component";
 
-export default function CourtesyCarCreateFormComponent({ form, saveLoading }) {
+export default function CourtesyCarCreateFormComponent({
+  form,
+  saveLoading,
+  newCC,
+}) {
   const { t } = useTranslation();
   const client = useApolloClient();
 
@@ -30,7 +34,7 @@ export default function CourtesyCarCreateFormComponent({ form, saveLoading }) {
         }
       />
 
-      {/* <FormFieldsChanged form={form} /> */}
+      {newCC ? null : <FormFieldsChanged form={form} />}
       <LayoutFormRow header={t("courtesycars.labels.vehicle")}>
         <Form.Item
           label={t("courtesycars.fields.year")}
diff --git a/client/src/components/job-bills-total/job-bills-total.component.jsx b/client/src/components/job-bills-total/job-bills-total.component.jsx
index 85f8ed893..f701cf262 100644
--- a/client/src/components/job-bills-total/job-bills-total.component.jsx
+++ b/client/src/components/job-bills-total/job-bills-total.component.jsx
@@ -1,17 +1,29 @@
-import { Card, Col, Row, Space, Statistic, Tooltip, Typography } from "antd";
-import Dinero from "dinero.js";
-import React from "react";
-import { useTranslation } from "react-i18next";
-import AlertComponent from "../alert/alert.component";
-import LoadingSkeleton from "../loading-skeleton/loading-skeleton.component";
-import "./job-bills-total.styles.scss";
-import InstanceRenderManager from "../../utils/instanceRenderMgr";
+import { Alert,  Card, Col, Row, Space, Statistic, Tooltip, Typography  } from 'antd';
+import Dinero from 'dinero.js';
+import React from 'react';
+import {  useTranslation  } from 'react-i18next';
+import InstanceRenderManager from '../../utils/instanceRenderMgr';
+import AlertComponent from '../alert/alert.component';
+import LoadingSkeleton from '../loading-skeleton/loading-skeleton.component';
+import './job-bills-total.styles.scss';
 
-export default function JobBillsTotalComponent({ loading, bills, partsOrders, jobTotals }) {
+export default function JobBillsTotalComponent({
+  loading,
+  bills,
+  partsOrders,
+  jobTotals,
+  showWarning,
+  warningCallback,
+}) {
   const { t } = useTranslation();
 
   if (loading) return <LoadingSkeleton />;
-  if (!!!jobTotals) return <AlertComponent type="error" message={t("jobs.errors.nofinancial")} />;
+  if (!!!jobTotals) {
+    if (showWarning && warningCallback && typeof warningCallback === 'function') {
+      warningCallback({ key: 'bills', warning: t('jobs.errors.nofinancial') });
+    }
+    return <AlertComponent type="error" message={t('jobs.errors.nofinancial')} />;
+  }
 
   const totals = jobTotals;
 
@@ -97,48 +109,64 @@ export default function JobBillsTotalComponent({ loading, bills, partsOrders, jo
   const discrepWithCms = discrepWithLbrAdj.add(totalReturns);
   const calculatedCreditsNotReceived = totalReturns.subtract(billCms); //billCms is tracked as a negative number.
 
+  if (showWarning && warningCallback && typeof warningCallback === 'function') {
+    if (
+      discrepWithCms.getAmount() !== 0 ||
+      discrepWithLbrAdj.getAmount() !== 0 ||
+      discrepancy.getAmount() !== 0
+    ) {
+      warningCallback({
+        key: 'bills',
+        warning: t('jobs.labels.outstanding_reconciliation_discrep'),
+      });
+    }
+    if (calculatedCreditsNotReceived.getAmount() > 0) {
+      warningCallback({ key: 'cm', warning: t('jobs.labels.outstanding_credit_memos') });
+    }
+  }
+
   return (
-    <Row gutter={16}>
-      <Col span={18}>
-        <Card title={t("jobs.labels.jobtotals")} style={{ height: "100%" }}>
+    <Row gutter={[16, 16]}>
+      <Col md={24} lg={18}>
+        <Card title={t('jobs.labels.jobtotals')} style={{ height: '100%' }}>
           <Space wrap size="large">
             <Tooltip
               title={
                 <div
                   dangerouslySetInnerHTML={{
-                    __html: t("jobs.labels.plitooltips.partstotal")
+                    __html: t('jobs.labels.plitooltips.partstotal'),
                   }}
                 />
               }
             >
-              <Statistic title={t("jobs.labels.rosaletotal")} value={totalPartsSublet.toFormat()} />
+              <Statistic title={t('jobs.labels.rosaletotal')} value={totalPartsSublet.toFormat()} />
             </Tooltip>
             <Typography.Title>-</Typography.Title>
             <Tooltip
               title={
                 <div
                   dangerouslySetInnerHTML={{
-                    __html: t("jobs.labels.plitooltips.billtotal")
+                    __html: t('jobs.labels.plitooltips.billtotal'),
                   }}
                 />
               }
             >
-              <Statistic title={t("bills.labels.retailtotal")} value={billTotals.toFormat()} />
+              <Statistic title={t('bills.labels.retailtotal')} value={billTotals.toFormat()} />
             </Tooltip>
             <Typography.Title>=</Typography.Title>
             <Tooltip
               title={
                 <div
                   dangerouslySetInnerHTML={{
-                    __html: t("jobs.labels.plitooltips.discrep1")
+                    __html: t('jobs.labels.plitooltips.discrep1'),
                   }}
                 />
               }
             >
               <Statistic
-                title={t("bills.labels.discrepancy")}
+                title={t('bills.labels.discrepancy')}
                 valueStyle={{
-                  color: discrepancy.getAmount() === 0 ? "green" : "red"
+                  color: discrepancy.getAmount() === 0 ? 'green' : 'red',
                 }}
                 value={discrepancy.toFormat()}
               />
@@ -148,27 +176,27 @@ export default function JobBillsTotalComponent({ loading, bills, partsOrders, jo
               title={
                 <div
                   dangerouslySetInnerHTML={{
-                    __html: t("jobs.labels.plitooltips.laboradj")
+                    __html: t('jobs.labels.plitooltips.laboradj'),
                   }}
                 />
               }
             >
-              <Statistic title={t("bills.labels.dedfromlbr")} value={lbrAdjustments.toFormat()} />
+              <Statistic title={t('bills.labels.dedfromlbr')} value={lbrAdjustments.toFormat()} />
             </Tooltip>
             <Typography.Title>=</Typography.Title>
             <Tooltip
               title={
                 <div
                   dangerouslySetInnerHTML={{
-                    __html: t("jobs.labels.plitooltips.discrep2")
+                    __html: t('jobs.labels.plitooltips.discrep2'),
                   }}
                 />
               }
             >
               <Statistic
-                title={t("bills.labels.discrepancy")}
+                title={t('bills.labels.discrepancy')}
                 valueStyle={{
-                  color: discrepWithLbrAdj.getAmount() === 0 ? "green" : "red"
+                  color: discrepWithLbrAdj.getAmount() === 0 ? 'green' : 'red',
                 }}
                 value={discrepWithLbrAdj.toFormat()}
               />
@@ -178,61 +206,72 @@ export default function JobBillsTotalComponent({ loading, bills, partsOrders, jo
               title={
                 <div
                   dangerouslySetInnerHTML={{
-                    __html: t("jobs.labels.plitooltips.creditmemos")
+                    __html: t('jobs.labels.plitooltips.creditmemos'),
                   }}
                 />
               }
             >
-              <Statistic title={t("bills.labels.totalreturns")} value={totalReturns.toFormat()} />
+              <Statistic title={t('bills.labels.totalreturns')} value={totalReturns.toFormat()} />
             </Tooltip>
             <Typography.Title>=</Typography.Title>
             <Tooltip
               title={
                 <div
                   dangerouslySetInnerHTML={{
-                    __html: t("jobs.labels.plitooltips.discrep3")
+                    __html: t('jobs.labels.plitooltips.discrep3'),
                   }}
                 />
               }
             >
               <Statistic
-                title={t("bills.labels.discrepancy")}
+                title={t('bills.labels.discrepancy')}
                 valueStyle={{
-                  color: discrepWithCms.getAmount() === 0 ? "green" : "red"
+                  color: discrepWithCms.getAmount() === 0 ? 'green' : 'red',
                 }}
                 value={discrepWithCms.toFormat()}
               />
             </Tooltip>
           </Space>
+
+          {showWarning &&
+            (discrepWithCms.getAmount() !== 0 ||
+              discrepWithLbrAdj.getAmount() !== 0 ||
+              discrepancy.getAmount() !== 0) && (
+              <Alert
+                style={{ margin: '8px 0px' }}
+                type="warning"
+                message={t('jobs.labels.outstanding_reconciliation_discrep')}
+              />
+            )}
         </Card>
       </Col>
-      <Col span={6}>
-        <Card title={t("jobs.labels.returntotals")} style={{ height: "100%" }}>
+      <Col md={24} lg={6}>
+        <Card title={t('jobs.labels.returntotals')} style={{ height: '100%' }}>
           <Space wrap>
             <Tooltip
               title={
                 <div
                   dangerouslySetInnerHTML={{
-                    __html: t("jobs.labels.plitooltips.totalreturns")
+                    __html: t('jobs.labels.plitooltips.totalreturns'),
                   }}
                 />
               }
             >
-              <Statistic title={t("bills.labels.totalreturns")} value={totalReturns.toFormat()} />
+              <Statistic title={t('bills.labels.totalreturns')} value={totalReturns.toFormat()} />
             </Tooltip>
             <Tooltip
               title={
                 <div
                   dangerouslySetInnerHTML={{
-                    __html: t("jobs.labels.plitooltips.calculatedcreditsnotreceived")
+                    __html: t('jobs.labels.plitooltips.calculatedcreditsnotreceived'),
                   }}
                 />
               }
             >
               <Statistic
-                title={t("bills.labels.calculatedcreditsnotreceived")}
+                title={t('bills.labels.calculatedcreditsnotreceived')}
                 valueStyle={{
-                  color: calculatedCreditsNotReceived.getAmount() <= 0 ? "green" : "red"
+                  color: calculatedCreditsNotReceived.getAmount() <= 0 ? 'green' : 'red',
                 }}
                 value={
                   calculatedCreditsNotReceived.getAmount() >= 0
@@ -245,15 +284,15 @@ export default function JobBillsTotalComponent({ loading, bills, partsOrders, jo
               title={
                 <div
                   dangerouslySetInnerHTML={{
-                    __html: t("jobs.labels.plitooltips.creditsnotreceived")
+                    __html: t('jobs.labels.plitooltips.creditsnotreceived'),
                   }}
                 />
               }
             >
               <Statistic
-                title={t("bills.labels.creditsnotreceived")}
+                title={t('bills.labels.creditsnotreceived')}
                 valueStyle={{
-                  color: totalReturnsMarkedNotReceived.getAmount() <= 0 ? "green" : "red"
+                  color: totalReturnsMarkedNotReceived.getAmount() <= 0 ? 'green' : 'red',
                 }}
                 value={
                   totalReturnsMarkedNotReceived.getAmount() >= 0
@@ -263,6 +302,13 @@ export default function JobBillsTotalComponent({ loading, bills, partsOrders, jo
               />
             </Tooltip>
           </Space>
+          {showWarning && calculatedCreditsNotReceived.getAmount() > 0 && (
+            <Alert
+              style={{ margin: '8px 0px' }}
+              type="warning"
+              message={t('jobs.labels.outstanding_credit_memos')}
+            />
+          )}
         </Card>
       </Col>
     </Row>
diff --git a/client/src/components/job-close-ro-guard/job-close-ro-gaurd.labor.jsx b/client/src/components/job-close-ro-guard/job-close-ro-gaurd.labor.jsx
new file mode 100644
index 000000000..8a874d5b7
--- /dev/null
+++ b/client/src/components/job-close-ro-guard/job-close-ro-gaurd.labor.jsx
@@ -0,0 +1,62 @@
+import React from 'react';
+
+import { useQuery } from '@apollo/client';
+import { useSplitTreatments } from '@splitsoftware/splitio-react';
+import { connect } from 'react-redux';
+import { createStructuredSelector } from 'reselect';
+import { GET_LINE_TICKET_BY_PK } from '../../graphql/jobs-lines.queries';
+import { selectJobReadOnly } from '../../redux/application/application.selectors';
+import { selectBodyshop } from '../../redux/user/user.selectors';
+import AlertComponent from '../alert/alert.component';
+import LaborAllocationsTableComponent from '../labor-allocations-table/labor-allocations-table.component';
+import PayrollLaborAllocationsTable from '../labor-allocations-table/labor-allocations-table.payroll.component';
+import LoadingSkeleton from '../loading-skeleton/loading-skeleton.component';
+const mapStateToProps = createStructuredSelector({
+  //currentUser: selectCurrentUser
+  bodyshop: selectBodyshop,
+  jobRO: selectJobReadOnly,
+});
+const mapDispatchToProps = (dispatch) => ({
+  //setUserLanguage: language => dispatch(setUserLanguage(language))
+});
+export default connect(mapStateToProps, mapDispatchToProps)(JobCloseRoGuardLabor);
+
+export function JobCloseRoGuardLabor({ job, jobRO, bodyshop, form, warningCallback }) {
+  const { loading, error, data, refetch } = useQuery(GET_LINE_TICKET_BY_PK, {
+    variables: { id: job.id },
+    fetchPolicy: 'network-only',
+    nextFetchPolicy: 'network-only',
+  });
+  const {
+    treatments: { Enhanced_Payroll },
+  } = useSplitTreatments({
+    attributes: {},
+    names: ['Enhanced_Payroll'],
+    splitKey: bodyshop.imexshopid,
+  });
+
+  if (loading) return <LoadingSkeleton />;
+  if (error) return <AlertComponent message={error.message} type="error" />;
+
+  return Enhanced_Payroll.treatment === 'on' ? (
+    <PayrollLaborAllocationsTable
+      jobId={job.id}
+      timetickets={data ? data.timetickets : []}
+      refetch={refetch}
+      adjustments={data ? data.jobs_by_pk.lbr_adjustments : []}
+      showWarning
+      warningCallback={warningCallback}
+    />
+  ) : (
+    <LaborAllocationsTableComponent
+      jobId={job.id}
+      joblines={data ? data.joblines : []}
+      timetickets={data ? data.timetickets : []}
+      refetch={refetch}
+      adjustments={data ? data.jobs_by_pk.lbr_adjustments : []}
+      showWarning
+      warningCallback={warningCallback}
+      disabled={true}
+    />
+  );
+}
diff --git a/client/src/components/job-close-ro-guard/job-close-ro-guard.ar.jsx b/client/src/components/job-close-ro-guard/job-close-ro-guard.ar.jsx
new file mode 100644
index 000000000..f22d015c6
--- /dev/null
+++ b/client/src/components/job-close-ro-guard/job-close-ro-guard.ar.jsx
@@ -0,0 +1,66 @@
+import React, { useEffect } from 'react';
+
+import { Alert, Card } from 'antd';
+import { useTranslation } from 'react-i18next';
+import { connect } from 'react-redux';
+import { createStructuredSelector } from 'reselect';
+import { selectJobReadOnly } from '../../redux/application/application.selectors';
+import { selectBodyshop } from '../../redux/user/user.selectors';
+import { useMemo } from 'react';
+import Dinero from 'dinero.js';
+import DataLabel from '../data-label/data-label.component';
+
+const mapStateToProps = createStructuredSelector({
+  //currentUser: selectCurrentUser
+  bodyshop: selectBodyshop,
+  jobRO: selectJobReadOnly,
+});
+const mapDispatchToProps = (dispatch) => ({
+  //setUserLanguage: language => dispatch(setUserLanguage(language))
+});
+export default connect(mapStateToProps, mapDispatchToProps)(JobCloseRoGuardProfit);
+
+export function JobCloseRoGuardProfit({ job, jobRO, bodyshop, form, warningCallback }) {
+  const { t } = useTranslation();
+
+  const total = useMemo(() => {
+    return (
+      job.payments &&
+      job.payments.reduce((acc, val) => {
+        acc = acc.add(Dinero({ amount: Math.round(val.amount * 100) }));
+        return acc;
+      }, Dinero())
+    );
+  }, [job.payments]);
+
+  const balance = useMemo(() => {
+    if (job && job.job_totals && job.job_totals.totals.total_repairs)
+      return Dinero(job.job_totals.totals.total_repairs).subtract(total);
+    return Dinero({ amount: 0 }).subtract(total);
+  }, [job, total]);
+
+  useEffect(() => {
+    if (balance.getAmount() !== 0) {
+      warningCallback({ key: 'ar', warning: t('jobs.labels.outstanding_ar') });
+    }
+  }, [balance, t, warningCallback]);
+
+  return (
+    <Card title={t('jobs.labels.accountsreceivable')} style={{ height: '100%' }}>
+      <DataLabel label={t('payments.labels.totalpayments')}>{total.toFormat()}</DataLabel>
+      <DataLabel
+        valueStyle={{ color: balance.getAmount() !== 0 ? 'red' : 'green' }}
+        label={t('payments.labels.balance')}
+      >
+        {balance.toFormat()}
+      </DataLabel>
+      {balance.getAmount() !== 0 && (
+        <Alert
+          style={{ margin: '8px 0px' }}
+          type="warning"
+          message={t('jobs.labels.outstanding_ar')}
+        />
+      )}
+    </Card>
+  );
+}
diff --git a/client/src/components/job-close-ro-guard/job-close-ro-guard.bills.jsx b/client/src/components/job-close-ro-guard/job-close-ro-guard.bills.jsx
new file mode 100644
index 000000000..23a0fe478
--- /dev/null
+++ b/client/src/components/job-close-ro-guard/job-close-ro-guard.bills.jsx
@@ -0,0 +1,40 @@
+import React from 'react';
+
+import { useQuery } from '@apollo/client';
+import { connect } from 'react-redux';
+import { createStructuredSelector } from 'reselect';
+import { QUERY_BILLS_BY_JOBID } from '../../graphql/bills.queries';
+import { selectJobReadOnly } from '../../redux/application/application.selectors';
+import { selectBodyshop } from '../../redux/user/user.selectors';
+import AlertComponent from '../alert/alert.component';
+import JobBillsTotalComponent from '../job-bills-total/job-bills-total.component';
+const mapStateToProps = createStructuredSelector({
+  //currentUser: selectCurrentUser
+  bodyshop: selectBodyshop,
+  jobRO: selectJobReadOnly,
+});
+const mapDispatchToProps = (dispatch) => ({
+  //setUserLanguage: language => dispatch(setUserLanguage(language))
+});
+export default connect(mapStateToProps, mapDispatchToProps)(JobCloseRoGuardBills);
+
+export function JobCloseRoGuardBills({ job, jobRO, bodyshop, form, warningCallback }) {
+  const { loading, error, data } = useQuery(QUERY_BILLS_BY_JOBID, {
+    variables: { jobid: job.id },
+    fetchPolicy: 'network-only',
+    nextFetchPolicy: 'network-only',
+  });
+
+  if (error) return <AlertComponent message={error.message} type="error" />;
+
+  return (
+    <JobBillsTotalComponent
+      loading={loading}
+      bills={data ? data.bills : []}
+      partsOrders={data ? data.parts_orders : []}
+      jobTotals={job.job_totals}
+      showWarning
+      warningCallback={warningCallback}
+    />
+  );
+}
diff --git a/client/src/components/job-close-ro-guard/job-close-ro-guard.container.jsx b/client/src/components/job-close-ro-guard/job-close-ro-guard.container.jsx
new file mode 100644
index 000000000..04a07bd98
--- /dev/null
+++ b/client/src/components/job-close-ro-guard/job-close-ro-guard.container.jsx
@@ -0,0 +1,233 @@
+import React, { useCallback, useState } from "react";
+import { LockOutlined } from "@ant-design/icons";
+import { Badge, Card, Col, Collapse, Form, Input, Row, Space, Tooltip } from "antd";
+import { useTranslation } from "react-i18next";
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { selectJobReadOnly } from "../../redux/application/application.selectors";
+import { selectBodyshop } from "../../redux/user/user.selectors";
+import JobCloseRoGuardLabor from "./job-close-ro-gaurd.labor";
+import JobCloseRoGuardAr from "./job-close-ro-guard.ar";
+import JobCloseRoGuardBills from "./job-close-ro-guard.bills";
+import JobCloseRoGuardPpd from "./job-close-ro-guard.ppd";
+import JobCloseRoGuardProfit from "./job-close-ro-guard.profit";
+import "./job-close-ro-guard.styles.scss";
+import JobCloseRoGuardSublet from "./job-close-ro-guard.sublet";
+import JobCloseRoGuardTtLifecycle from "./job-close-ro-guard.tt-lifecycle";
+import InstanceRenderManager from "../../utils/instanceRenderMgr";
+
+const mapStateToProps = createStructuredSelector({
+  //currentUser: selectCurrentUser
+  bodyshop: selectBodyshop,
+  jobRO: selectJobReadOnly
+});
+const mapDispatchToProps = (dispatch) => ({
+  //setUserLanguage: language => dispatch(setUserLanguage(language))
+});
+export default connect(mapStateToProps, mapDispatchToProps)(JobCloseRoGuardContainer);
+
+export function JobCloseRoGuardContainer({ job, jobRO, bodyshop, form }) {
+  const { t } = useTranslation();
+  const [warnings, setWarnings] = useState([]);
+
+  const warningCallback = useCallback(
+    ({ key, warning }) =>
+      setWarnings((state) => {
+        if (state.find((s) => s.key === key)) return state;
+        return [...state, { key, warning }];
+      }),
+    []
+  );
+
+  if (!bodyshop?.md_ro_guard?.enabled) return null;
+
+  return (
+    <>
+      {warnings.length > 0 && (
+        <Card
+          title={
+            <Space size="small">
+              <Badge count={warnings.length} />
+              {t("jobs.labels.roguardwarnings")}
+            </Space>
+          }
+        >
+          <ul>
+            {warnings.map((w, index) => (
+              <li key={index}>
+                {bodyshop.md_ro_guard[`enforce_${w.key}`] && (
+                  <Tooltip title={t("jobs.labels.ro_guard.enforced")}>
+                    <LockOutlined style={{ color: "tomato", marginRight: "8px" }} />
+                  </Tooltip>
+                )}
+                {w.warning}
+              </li>
+            ))}
+          </ul>
+        </Card>
+      )}
+
+      <Collapse>
+        <Collapse.Panel forceRender key="roguard" header={t("jobs.labels.roguard")}>
+          <Row gutter={[32, 32]}>
+            <Col span={24}>
+              <JobCloseRoGuardBills job={job} form={form} warningCallback={warningCallback} />
+            </Col>
+            <Col className="ro-guard-col-multiple" md={24} lg={6}>
+              <Row gutter={[32, 32]} style={{ height: "100%" }}>
+                <Col span={24}>
+                  <JobCloseRoGuardProfit
+                    job={job}
+                    form={form} //warningCallback={warningCallback}
+                  />
+                </Col>
+                <Col span={24}>
+                  <JobCloseRoGuardAr job={job} form={form} warningCallback={warningCallback} />
+                </Col>
+              </Row>
+            </Col>
+            <Col className="ro-guard-col-50" md={24} lg={8}>
+              <JobCloseRoGuardSublet job={job} warningCallback={warningCallback} />
+              {InstanceRenderManager({ rome: <JobCloseRoGuardPpd job={job} warningCallback={warningCallback} /> })}
+            </Col>
+            <Col className="ro-guard-col" md={24} lg={10}>
+              <JobCloseRoGuardLabor job={job} form={form} warningCallback={warningCallback} />
+            </Col>
+          </Row>
+          <Form.Item
+            name="masterbypass"
+            label={t("jobs.labels.masterbypass")}
+            rules={[
+              ({ getFieldValue }) => ({
+                validator(_, value) {
+                  if (
+                    !PasswordCheck({ bodyshop, value }) &&
+                    bodyshop.md_ro_guard.enforce_bills &&
+                    warnings.find((w) => w.key === "bills")
+                  ) {
+                    return Promise.reject(
+                      t("jobs.labels.ro_guard.enforce_validation", {
+                        message: t("jobs.labels.ro_guard.enforce_bills")
+                      })
+                    );
+                  }
+                  return Promise.resolve();
+                }
+              }),
+              ({ getFieldValue }) => ({
+                validator(_, value) {
+                  if (
+                    !PasswordCheck({ bodyshop, value }) &&
+                    bodyshop.md_ro_guard.enforce_cm &&
+                    warnings.find((w) => w.key === "cm")
+                  ) {
+                    return Promise.reject(
+                      t("jobs.labels.ro_guard.enforce_validation", {
+                        message: t("jobs.labels.ro_guard.enforce_cm")
+                      })
+                    );
+                  }
+                  return Promise.resolve();
+                }
+              }),
+              ({ getFieldValue }) => ({
+                validator(_, value) {
+                  if (
+                    !PasswordCheck({ bodyshop, value }) &&
+                    bodyshop.md_ro_guard.enforce_profit &&
+                    warnings.find((w) => w.key === "profit")
+                  ) {
+                    return Promise.reject(
+                      t("jobs.labels.ro_guard.enforce_validation", {
+                        message: t("jobs.labels.ro_guard.enforce_profit")
+                      })
+                    );
+                  }
+                  return Promise.resolve();
+                }
+              }),
+              ({ getFieldValue }) => ({
+                validator(_, value) {
+                  if (
+                    !PasswordCheck({ bodyshop, value }) &&
+                    bodyshop.md_ro_guard.enforce_ar &&
+                    warnings.find((w) => w.key === "ar")
+                  ) {
+                    return Promise.reject(
+                      t("jobs.labels.ro_guard.enforce_validation", {
+                        message: t("jobs.labels.ro_guard.enforce_ar")
+                      })
+                    );
+                  }
+                  return Promise.resolve();
+                }
+              }),
+              ({ getFieldValue }) => ({
+                validator(_, value) {
+                  if (
+                    !PasswordCheck({ bodyshop, value }) &&
+                    bodyshop.md_ro_guard.enforce_sublet &&
+                    warnings.find((w) => w.key === "sublet")
+                  ) {
+                    return Promise.reject(
+                      t("jobs.labels.ro_guard.enforce_validation", {
+                        message: t("jobs.labels.ro_guard.enforce_sublet")
+                      })
+                    );
+                  }
+                  return Promise.resolve();
+                }
+              }),
+              ({ getFieldValue }) => ({
+                validator(_, value) {
+                  if (
+                    !PasswordCheck({ bodyshop, value }) &&
+                    bodyshop.md_ro_guard.enforce_ppd &&
+                    warnings.find((w) => w.key === "ppd")
+                  ) {
+                    return Promise.reject(
+                      t("jobs.labels.ro_guard.enforce_validation", {
+                        message: t("jobs.labels.ro_guard.enforce_ppd")
+                      })
+                    );
+                  }
+                  return Promise.resolve();
+                }
+              }),
+              ({ getFieldValue }) => ({
+                validator(_, value) {
+                  if (
+                    !PasswordCheck({ bodyshop, value }) &&
+                    bodyshop.md_ro_guard.enforce_labor &&
+                    warnings.find((w) => w.key === "labor")
+                  ) {
+                    return Promise.reject(
+                      t("jobs.labels.ro_guard.enforce_validation", {
+                        message: t("jobs.labels.ro_guard.enforce_labor")
+                      })
+                    );
+                  }
+                  return Promise.resolve();
+                }
+              })
+            ]}
+          >
+            <Input prefix={<LockOutlined />} type="password" placeholder="Password" disabled={jobRO} />
+          </Form.Item>
+        </Collapse.Panel>
+
+        <Collapse.Panel header={t("jobs.labels.performance")}>
+          <Row gutter={[32, 32]}>
+            <Col className="ro-guard-col" span={24}>
+              <JobCloseRoGuardTtLifecycle job={job} />
+            </Col>
+          </Row>
+        </Collapse.Panel>
+      </Collapse>
+    </>
+  );
+}
+
+function PasswordCheck({ bodyshop, value }) {
+  return value === bodyshop?.md_ro_guard?.masterbypass;
+}
diff --git a/client/src/components/job-close-ro-guard/job-close-ro-guard.ppd.jsx b/client/src/components/job-close-ro-guard/job-close-ro-guard.ppd.jsx
new file mode 100644
index 000000000..21d106b9f
--- /dev/null
+++ b/client/src/components/job-close-ro-guard/job-close-ro-guard.ppd.jsx
@@ -0,0 +1,83 @@
+import React, { useEffect } from "react";
+
+import { Alert, Card, Table } from "antd";
+import { t } from "i18next";
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { selectJobReadOnly } from "../../redux/application/application.selectors";
+import { selectBodyshop } from "../../redux/user/user.selectors";
+import CurrencyFormatter from "../../utils/CurrencyFormatter";
+import { alphaSort } from "../../utils/sorters";
+const mapStateToProps = createStructuredSelector({
+  //currentUser: selectCurrentUser
+  bodyshop: selectBodyshop,
+  jobRO: selectJobReadOnly
+});
+const mapDispatchToProps = (dispatch) => ({
+  //setUserLanguage: language => dispatch(setUserLanguage(language))
+});
+export default connect(mapStateToProps, mapDispatchToProps)(JobCloseRGuardPpd);
+
+export function JobCloseRGuardPpd({ job, jobRO, bodyshop, form, warningCallback }) {
+  const linesWithPPD = job?.joblines.filter((j) => j.act_price_before_ppc !== 0 && j.act_price_before_ppc !== null);
+
+  useEffect(() => {
+    if (linesWithPPD.length > 0) {
+      warningCallback({ key: "ppd", warning: t("jobs.labels.outstanding_sublets") });
+    }
+  }, [linesWithPPD.length, warningCallback]);
+
+  const columns = [
+    {
+      title: t("joblines.fields.line_desc"),
+      dataIndex: "line_desc",
+      fixed: "left",
+      key: "line_desc",
+      sorter: (a, b) => alphaSort(a.line_desc, b.line_desc),
+      onCell: (record) => ({
+        className: record.manual_line && "job-line-manual",
+        style: {
+          ...(record.critical ? { boxShadow: " -.5em 0 0 #FFC107" } : {})
+        }
+      }),
+      ellipsis: true
+    },
+    {
+      title: t("joblines.fields.act_price"),
+      dataIndex: "act_price",
+      key: "act_price",
+      sorter: (a, b) => a.act_price - b.act_price,
+
+      ellipsis: true,
+      render: (text, record) => <CurrencyFormatter>{record.act_price}</CurrencyFormatter>
+    },
+    {
+      title: t("joblines.fields.act_price_before_ppc"),
+      dataIndex: "act_price_before_ppc",
+      key: "act_price_before_ppc",
+      sorter: (a, b) => a.act_price_before_ppc - b.act_price_before_ppc,
+
+      ellipsis: true,
+      render: (text, record) => <CurrencyFormatter>{record.act_price_before_ppc}</CurrencyFormatter>
+    },
+    {
+      title: t("joblines.fields.part_qty"),
+      dataIndex: "part_qty",
+      key: "part_qty"
+    },
+    {
+      title: t("joblines.fields.notes"),
+      dataIndex: "notes",
+      key: "notes"
+    }
+  ];
+
+  return (
+    <Card title={t("jobs.labels.ppdnotexported")}>
+      <Table dataSource={linesWithPPD} columns={columns} pagination={false} rowKey="id" bordered size="small" />
+      {linesWithPPD.length > 0 && (
+        <Alert style={{ margin: "8px 0px" }} type="warning" message={t("jobs.labels.outstanding_ppd")} />
+      )}
+    </Card>
+  );
+}
diff --git a/client/src/components/job-close-ro-guard/job-close-ro-guard.profit.jsx b/client/src/components/job-close-ro-guard/job-close-ro-guard.profit.jsx
new file mode 100644
index 000000000..4cbbca357
--- /dev/null
+++ b/client/src/components/job-close-ro-guard/job-close-ro-guard.profit.jsx
@@ -0,0 +1,60 @@
+import React, { useEffect, useState } from 'react';
+
+import { LockOutlined } from '@ant-design/icons';
+import { Card, Form, Input } from 'antd';
+import axios from 'axios';
+import { useTranslation } from 'react-i18next';
+import { connect } from 'react-redux';
+import { createStructuredSelector } from 'reselect';
+import { selectJobReadOnly } from '../../redux/application/application.selectors';
+import { selectBodyshop } from '../../redux/user/user.selectors';
+import JobCostingStatistics from '../job-costing-statistics/job-costing-statistics.component';
+import LoadingSkeleton from '../loading-skeleton/loading-skeleton.component';
+
+const mapStateToProps = createStructuredSelector({
+  //currentUser: selectCurrentUser
+  bodyshop: selectBodyshop,
+  jobRO: selectJobReadOnly,
+});
+const mapDispatchToProps = (dispatch) => ({
+  //setUserLanguage: language => dispatch(setUserLanguage(language))
+});
+export default connect(mapStateToProps, mapDispatchToProps)(JobCloseRoGuardProfit);
+
+export function JobCloseRoGuardProfit({ job, jobRO, bodyshop, form, warningCallback }) {
+  const [costingData, setCostingData] = useState(null);
+  const [loading, setLoading] = useState(false);
+  const { t } = useTranslation();
+
+  useEffect(() => {
+    async function getData() {
+      try {
+        if (job.id) {
+          setLoading(true);
+          const { data } = await axios.post('/job/costing', { jobid: job.id });
+          setCostingData(data);
+        }
+      } catch (error) {}
+      setLoading(false);
+    }
+
+    getData();
+  }, [job.id]);
+
+  const enforceProfitPassword =
+    parseFloat(costingData?.summaryData.gppercent) < bodyshop?.md_ro_guard?.totalgppercent_minimum;
+
+  useEffect(() => {
+    if (enforceProfitPassword && typeof warningCallback === 'function') {
+      warningCallback({ key: 'profit', warning: t('jobs.labels.profitbypassrequired') });
+    }
+  }, [enforceProfitPassword, t, warningCallback]);
+
+  if (loading || !costingData) return <LoadingSkeleton />;
+
+  return (
+    <Card title={t('jobs.labels.profits')} style={{ height: '100%' }}>
+      <JobCostingStatistics summaryData={costingData?.summaryData} onlyGP />
+    </Card>
+  );
+}
diff --git a/client/src/components/job-close-ro-guard/job-close-ro-guard.styles.scss b/client/src/components/job-close-ro-guard/job-close-ro-guard.styles.scss
new file mode 100644
index 000000000..51f790b77
--- /dev/null
+++ b/client/src/components/job-close-ro-guard/job-close-ro-guard.styles.scss
@@ -0,0 +1,10 @@
+.ro-guard-col {
+  .ant-card {
+    height: 100%;
+  }
+}
+.ro-guard-col-50 {
+  .ant-card {
+    height: 50%;
+  }
+}
diff --git a/client/src/components/job-close-ro-guard/job-close-ro-guard.sublet.jsx b/client/src/components/job-close-ro-guard/job-close-ro-guard.sublet.jsx
new file mode 100644
index 000000000..e44e58adf
--- /dev/null
+++ b/client/src/components/job-close-ro-guard/job-close-ro-guard.sublet.jsx
@@ -0,0 +1,89 @@
+import React, { useEffect } from 'react';
+
+import { Alert, Card, Table } from 'antd';
+import { t } from 'i18next';
+import { connect } from 'react-redux';
+import { createStructuredSelector } from 'reselect';
+import { selectJobReadOnly } from '../../redux/application/application.selectors';
+import { selectBodyshop } from '../../redux/user/user.selectors';
+import CurrencyFormatter from '../../utils/CurrencyFormatter';
+import { alphaSort } from '../../utils/sorters';
+const mapStateToProps = createStructuredSelector({
+  //currentUser: selectCurrentUser
+  bodyshop: selectBodyshop,
+  jobRO: selectJobReadOnly,
+});
+const mapDispatchToProps = (dispatch) => ({
+  //setUserLanguage: language => dispatch(setUserLanguage(language))
+});
+export default connect(mapStateToProps, mapDispatchToProps)(JobCloseRGuardSublet);
+
+export function JobCloseRGuardSublet({ job, jobRO, bodyshop, form, warningCallback }) {
+  const subletsNotDone = job?.joblines.filter(
+    (j) =>
+      (j.part_type === 'PAS' || j.part_type === 'PASL') &&
+      (!j.sublet_completed || !j.sublet_ignored)
+  );
+
+  const columns = [
+    {
+      title: t('joblines.fields.line_desc'),
+      dataIndex: 'line_desc',
+      fixed: 'left',
+      key: 'line_desc',
+      sorter: (a, b) => alphaSort(a.line_desc, b.line_desc),
+      onCell: (record) => ({
+        className: record.manual_line && 'job-line-manual',
+        style: {
+          ...(record.critical ? { boxShadow: ' -.5em 0 0 #FFC107' } : {}),
+        },
+      }),
+      ellipsis: true,
+    },
+    {
+      title: t('joblines.fields.act_price'),
+      dataIndex: 'act_price',
+      key: 'act_price',
+      sorter: (a, b) => a.act_price - b.act_price,
+
+      ellipsis: true,
+      render: (text, record) => <CurrencyFormatter>{record.act_price}</CurrencyFormatter>,
+    },
+    {
+      title: t('joblines.fields.part_qty'),
+      dataIndex: 'part_qty',
+      key: 'part_qty',
+    },
+    {
+      title: t('joblines.fields.notes'),
+      dataIndex: 'notes',
+      key: 'notes',
+    },
+  ];
+
+  useEffect(() => {
+    if (subletsNotDone.length > 0) {
+      warningCallback({ key: 'sublet', warning: t('jobs.labels.outstanding_sublets') });
+    }
+  }, [subletsNotDone.length, warningCallback]);
+
+  return (
+    <Card title={t('jobs.labels.subletsnotcompleted')}>
+      <Table
+        dataSource={subletsNotDone}
+        columns={columns}
+        pagination={false}
+        rowKey="id"
+        bordered
+        size="small"
+      />
+      {subletsNotDone.length > 0 && (
+        <Alert
+          style={{ margin: '8px 0px' }}
+          type="warning"
+          message={t('jobs.labels.outstanding_sublets')}
+        />
+      )}
+    </Card>
+  );
+}
diff --git a/client/src/components/job-close-ro-guard/job-close-ro-guard.totals.jsx b/client/src/components/job-close-ro-guard/job-close-ro-guard.totals.jsx
new file mode 100644
index 000000000..e765c941c
--- /dev/null
+++ b/client/src/components/job-close-ro-guard/job-close-ro-guard.totals.jsx
@@ -0,0 +1,26 @@
+import React from 'react';
+
+import { connect } from 'react-redux';
+import { createStructuredSelector } from 'reselect';
+import { selectJobReadOnly } from '../../redux/application/application.selectors';
+import { selectBodyshop } from '../../redux/user/user.selectors';
+import JobTotalsTableTotals from '../job-totals-table/job-totals.table.totals.component';
+import { Card } from 'antd';
+import { t } from 'i18next';
+const mapStateToProps = createStructuredSelector({
+  //currentUser: selectCurrentUser
+  bodyshop: selectBodyshop,
+  jobRO: selectJobReadOnly,
+});
+const mapDispatchToProps = (dispatch) => ({
+  //setUserLanguage: language => dispatch(setUserLanguage(language))
+});
+export default connect(mapStateToProps, mapDispatchToProps)(JobCloseRGuardTotals);
+
+export function JobCloseRGuardTotals({ job, jobRO, bodyshop, form }) {
+  return (
+    <Card title={t("jobs.labels.cards.totals")}>
+      <JobTotalsTableTotals job={job} />
+    </Card>
+  );
+}
diff --git a/client/src/components/job-close-ro-guard/job-close-ro-guard.tt-lifecycle.jsx b/client/src/components/job-close-ro-guard/job-close-ro-guard.tt-lifecycle.jsx
new file mode 100644
index 000000000..1b0f60514
--- /dev/null
+++ b/client/src/components/job-close-ro-guard/job-close-ro-guard.tt-lifecycle.jsx
@@ -0,0 +1,24 @@
+import React from 'react';
+
+import { connect } from 'react-redux';
+import { createStructuredSelector } from 'reselect';
+import { selectJobReadOnly } from '../../redux/application/application.selectors';
+import { selectBodyshop } from '../../redux/user/user.selectors';
+import JobLifecycleComponent from '../job-lifecycle/job-lifecycle.component';
+const mapStateToProps = createStructuredSelector({
+  //currentUser: selectCurrentUser
+  bodyshop: selectBodyshop,
+  jobRO: selectJobReadOnly,
+});
+const mapDispatchToProps = (dispatch) => ({
+  //setUserLanguage: language => dispatch(setUserLanguage(language))
+});
+export default connect(mapStateToProps, mapDispatchToProps)(JobCloseRoGuardTTLifeCycle);
+
+export function JobCloseRoGuardTTLifeCycle({ job, jobRO, bodyshop, form }) {
+  return (
+    <div>
+      <JobLifecycleComponent job={job} statuses={bodyshop.md_ro_statuses} />
+    </div>
+  );
+}
diff --git a/client/src/components/job-costing-statistics/job-costing-statistics.component.jsx b/client/src/components/job-costing-statistics/job-costing-statistics.component.jsx
index 38a832d91..6d778bb7e 100644
--- a/client/src/components/job-costing-statistics/job-costing-statistics.component.jsx
+++ b/client/src/components/job-costing-statistics/job-costing-statistics.component.jsx
@@ -1,11 +1,35 @@
-import { Statistic } from "antd";
-import React from "react";
-import { useTranslation } from "react-i18next";
-import Dinero from "dinero.js";
+import { Space, Statistic } from 'antd';
+import React from 'react';
+import { useTranslation } from 'react-i18next';
+import Dinero from 'dinero.js';
 
-export default function JobCostingStatistics({ summaryData }) {
+export default function JobCostingStatistics({ summaryData, onlyGP }) {
   const { t } = useTranslation();
 
+  const gpTotals = (
+    <>
+      <Space wrap direction="horizontal" size={'large'}>
+        <Statistic
+          value={Dinero(summaryData.totalSales).toFormat()}
+          title={t('jobs.labels.total_sales')}
+        />
+        <Statistic
+          value={Dinero(summaryData.totalCost).toFormat()}
+          title={t('jobs.labels.total_cost')}
+        />
+      </Space>{' '}
+      <Space wrap direction="horizontal" size={'large'}>
+        <Statistic
+          value={Dinero(summaryData.gpdollars).toFormat()}
+          title={t('jobs.labels.gpdollars')}
+        />
+        <Statistic value={summaryData.gppercentFormatted} title={t('jobs.labels.gppercent')} />
+      </Space>
+    </>
+  );
+
+  if (onlyGP) return gpTotals;
+
   return (
     <div>
       <div className="imex-flex-row imex-flex-row__flex-space-around">
diff --git a/client/src/components/job-detail-lines/job-lines-expander.component.jsx b/client/src/components/job-detail-lines/job-lines-expander.component.jsx
index 1152dc546..f90850222 100644
--- a/client/src/components/job-detail-lines/job-lines-expander.component.jsx
+++ b/client/src/components/job-detail-lines/job-lines-expander.component.jsx
@@ -97,7 +97,7 @@ export function JobLinesExpander({ jobline, jobid, bodyshop }) {
               : [
                   {
                     key: "no-orders",
-                    children: t("parts_orders.labels.notyetordered")
+                    children: t("bills.labels.nobilllines")
                   }
                 ]
           }
diff --git a/client/src/components/job-payments/job-payments.component.jsx b/client/src/components/job-payments/job-payments.component.jsx
index bfb74d8fc..979b23d44 100644
--- a/client/src/components/job-payments/job-payments.component.jsx
+++ b/client/src/components/job-payments/job-payments.component.jsx
@@ -133,6 +133,7 @@ export function JobPayments({
     }
   ];
 
+    //Same as in RO guard. If changed, update in both. 
   const total = useMemo(() => {
     return (
       job.payments &&
diff --git a/client/src/components/jobs-available-table/jobs-available-table.container.jsx b/client/src/components/jobs-available-table/jobs-available-table.container.jsx
index bb2b2f7f4..26776a8c1 100644
--- a/client/src/components/jobs-available-table/jobs-available-table.container.jsx
+++ b/client/src/components/jobs-available-table/jobs-available-table.container.jsx
@@ -592,32 +592,35 @@ function ResolveCCCLineIssues(estData, bodyshop) {
   //Group by line no
   // For everything but the first one, strip out the price number in
 
-  // InstanceRenderManager({executeFunction:true, args:[], promanager: () => {
-  // const groupedByLineRef = _.groupBy(estData.joblines.data, "line_ref");
-  // Object.keys(groupedByLineRef).forEach((lineRef) => {
-  //   let index0ActPrice;
-  //   groupedByLineRef[lineRef].forEach((line, index) => {
-  //     //Let the first one keep it
-  //     if (index === 0){
-  //       index0ActPrice = line.act_price;
-  //       return;}
-  //     //Web Est seems to have additional costs with UNQ_SEQ 0. Keep them all?
-  //     if (line.unq_seq === 0) return;
-  //     if(index0ActPrice !== line.act_price){
-  //       line.notes += ` | Price override.`;
-  //       return;
-  //     }
-  //     const indexInEstData = estData.joblines.data.findIndex(
-  //       (l) => l.unq_seq === line.unq_seq
-  //     );
-  //     estData.joblines.data[
-  //       indexInEstData
-  //     ].notes += ` | Scrubbed due to the line_ref issue. (prev act price = ${estData.joblines.data[indexInEstData].act_price})`;
-  //     estData.joblines.data[indexInEstData].act_price = 0;
-  //     estData.joblines.data[indexInEstData].db_price = 0;
-  //   });
-  // })
-  // }})
+  InstanceRenderManager({
+    executeFunction: true,
+    args: [],
+    promanager: () => {
+      const groupedByLineRef = _.groupBy(estData.joblines.data, "line_ref");
+      Object.keys(groupedByLineRef).forEach((lineRef) => {
+        let index0ActPrice;
+        groupedByLineRef[lineRef].forEach((line, index) => {
+          //Let the first one keep it
+          if (index === 0) {
+            index0ActPrice = line.act_price;
+            return;
+          }
+          //Web Est seems to have additional costs with UNQ_SEQ 0. Keep them all?
+          if (line.unq_seq === 0) return;
+          if (index0ActPrice !== line.act_price) {
+            line.notes += ` | Price override.`;
+            return;
+          }
+          const indexInEstData = estData.joblines.data.findIndex((l) => l.unq_seq === line.unq_seq);
+          estData.joblines.data[
+            indexInEstData
+          ].notes += ` | Scrubbed due to the line_ref issue. (prev act price = ${estData.joblines.data[indexInEstData].act_price})`;
+          estData.joblines.data[indexInEstData].act_price = 0;
+          estData.joblines.data[indexInEstData].db_price = 0;
+        });
+      });
+    }
+  });
 
   InstanceRenderManager({
     executeFunction: true,
diff --git a/client/src/components/labor-allocations-table/labor-allocations-table.component.jsx b/client/src/components/labor-allocations-table/labor-allocations-table.component.jsx
index 649f49584..e9e842d6a 100644
--- a/client/src/components/labor-allocations-table/labor-allocations-table.component.jsx
+++ b/client/src/components/labor-allocations-table/labor-allocations-table.component.jsx
@@ -1,5 +1,5 @@
 import { EditFilled } from "@ant-design/icons";
-import { Card, Col, Row, Space, Table, Typography } from "antd";
+import { Alert, Card, Col, Row, Space, Table, Typography } from "antd";
 import _ from "lodash";
 import React, { useEffect, useMemo, useState } from "react";
 import { useTranslation } from "react-i18next";
@@ -18,7 +18,17 @@ const mapStateToProps = createStructuredSelector({
   technician: selectTechnician
 });
 
-export function LaborAllocationsTable({ jobId, joblines, timetickets, bodyshop, adjustments, technician }) {
+export function LaborAllocationsTable({
+  jobId,
+  joblines,
+  timetickets,
+  bodyshop,
+  adjustments,
+  technician,
+  showWarning,
+  warningCallback,
+  disabled
+}) {
   const { t } = useTranslation();
   const [totals, setTotals] = useState([]);
   const [state, setState] = useState({
@@ -73,7 +83,7 @@ export function LaborAllocationsTable({ jobId, joblines, timetickets, bodyshop,
       render: (text, record) => (
         <Space wrap>
           {record.adjustments.toFixed(1)}
-          {!technician && (
+          {!technician && !disabled && (
             <LaborAllocationsAdjustmentEdit
               jobId={jobId}
               adjustments={adjustments}
@@ -176,6 +186,10 @@ export function LaborAllocationsTable({ jobId, joblines, timetickets, bodyshop,
       { hrs_total: 0, hrs_claimed: 0, adjustments: 0, difference: 0 }
     );
 
+  if (summary.difference !== 0 && typeof warningCallback === "function") {
+    warningCallback({ key: "labor", warning: t("jobs.labels.outstandinghours") });
+  }
+
   return (
     <Row gutter={[16, 16]}>
       <Col span={24}>
@@ -227,6 +241,9 @@ export function LaborAllocationsTable({ jobId, joblines, timetickets, bodyshop,
           </Card>
         </Col>
       )}
+      {showWarning && summary.difference !== 0 && (
+        <Alert style={{ margin: "8px 0px" }} type="warning" message={t("jobs.labels.outstandinghours")} />
+      )}
     </Row>
   );
 }
diff --git a/client/src/components/labor-allocations-table/labor-allocations-table.payroll.component.jsx b/client/src/components/labor-allocations-table/labor-allocations-table.payroll.component.jsx
index 164c75fb2..3e8adc17b 100644
--- a/client/src/components/labor-allocations-table/labor-allocations-table.payroll.component.jsx
+++ b/client/src/components/labor-allocations-table/labor-allocations-table.payroll.component.jsx
@@ -1,4 +1,4 @@
-import { Button, Card, Col, notification, Row, Space, Table, Typography } from "antd";
+import { Alert, Button, Card, Col, notification, Row, Space, Table, Typography } from "antd";
 import { SyncOutlined } from "@ant-design/icons";
 import axios from "axios";
 import _ from "lodash";
@@ -23,7 +23,9 @@ export function PayrollLaborAllocationsTable({
   bodyshop,
   adjustments,
   technician,
-  refetch
+  refetch,
+  showWarning,
+  warningCallback
 }) {
   const { t } = useTranslation();
   const [totals, setTotals] = useState([]);
@@ -191,6 +193,10 @@ export function PayrollLaborAllocationsTable({
       { hrs_total: 0, hrs_claimed: 0, adjustments: 0, difference: 0 }
     );
 
+  if (summary.difference !== 0 && typeof warningCallback === "function") {
+    warningCallback({ key: "labor", warning: t("jobs.labels.outstandinghours") });
+  }
+
   return (
     <Row gutter={[16, 16]}>
       <Col span={24}>
@@ -285,6 +291,9 @@ export function PayrollLaborAllocationsTable({
           </Card>
         </Col>
       )}
+      {showWarning && summary.difference !== 0 && (
+        <Alert style={{ margin: "8px 0px" }} type="warning" message={t("jobs.labels.outstandinghours")} />
+      )}
     </Row>
   );
 }
diff --git a/client/src/components/payment-mark-export-button/payment-mark-export-button-component.jsx b/client/src/components/payment-mark-export-button/payment-mark-export-button-component.jsx
index 59819e03c..8511b7506 100644
--- a/client/src/components/payment-mark-export-button/payment-mark-export-button-component.jsx
+++ b/client/src/components/payment-mark-export-button/payment-mark-export-button-component.jsx
@@ -8,16 +8,18 @@ import { INSERT_EXPORT_LOG } from "../../graphql/accounting.queries";
 import { UPDATE_PAYMENT } from "../../graphql/payments.queries";
 import { setModalContext } from "../../redux/modals/modals.actions";
 import { selectCurrentUser } from "../../redux/user/user.selectors";
+import { selectPayment } from "../../redux/modals/modals.selectors";
 
 const mapStateToProps = createStructuredSelector({
-  currentUser: selectCurrentUser
+  currentUser: selectCurrentUser,
+  paymentModal: selectPayment
 });
 
 const mapDispatchToProps = (dispatch) => ({
   setPaymentContext: (context) => dispatch(setModalContext({ context: context, modal: "payment" }))
 });
 
-const PaymentMarkForExportButton = ({ bodyshop, payment, refetch, setPaymentContext, currentUser }) => {
+const PaymentMarkForExportButton = ({ bodyshop, payment, refetch, setPaymentContext, currentUser, paymentModal }) => {
   const { t } = useTranslation();
   const [insertExportLog, { loading: exportLogLoading }] = useMutation(INSERT_EXPORT_LOG);
   const [updatePayment, { loading: updatePaymentLoading }] = useMutation(UPDATE_PAYMENT);
@@ -56,16 +58,19 @@ const PaymentMarkForExportButton = ({ bodyshop, payment, refetch, setPaymentCont
           refetch
         },
         context: {
+          ...paymentModal.context,
           ...payment,
           exportedat: today
         }
       });
 
-      if (refetch)
-        refetch(
-          paymentUpdateResponse &&
-            paymentUpdateResponse.data.update_payments.returning[0]
-        );
+      if (refetch) {
+        if (paymentModal.context.refetchRequiresContext) {
+          refetch(paymentUpdateResponse && paymentUpdateResponse.data.update_payments.returning[0]);
+        } else {
+          refetch();
+        }
+      }
     } else {
       notification["error"]({
         message: t("payments.errors.exporting", {
diff --git a/client/src/components/payment-modal/payment-modal.container.jsx b/client/src/components/payment-modal/payment-modal.container.jsx
index 1502f1e48..eb1c6ff59 100644
--- a/client/src/components/payment-modal/payment-modal.container.jsx
+++ b/client/src/components/payment-modal/payment-modal.container.jsx
@@ -1,5 +1,4 @@
 import { useMutation } from "@apollo/client";
-
 import { Button, Form, Modal, notification, Space } from "antd";
 import React, { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
@@ -91,7 +90,13 @@ function PaymentModalContainer({ paymentModal, toggleModalVisible, bodyshop, cur
         }
       }
 
-      if (actions.refetch) actions.refetch(updatedPayment && updatedPayment.data.update_payments.returning[0]);
+      if (actions.refetch) {
+        if (context.refetchRequiresContext) {
+          actions.refetch(updatedPayment && updatedPayment.data.update_payments.returning[0]);
+        } else {
+          actions.refetch();
+        }
+      }
 
       if (enterAgain) {
         const prev = form.getFieldsValue(["date"]);
@@ -166,13 +171,7 @@ function PaymentModalContainer({ paymentModal, toggleModalVisible, bodyshop, cur
         </Space>
       )}
 
-      <Form
-        onFinish={handleFinish}
-        autoComplete={"off"}
-        form={form}
-        layout="vertical"
-        disabled={context?.exportedat}
-      >
+      <Form onFinish={handleFinish} autoComplete={"off"} form={form} layout="vertical" disabled={context?.exportedat}>
         <PaymentForm form={form} />
       </Form>
     </Modal>
diff --git a/client/src/components/payment-reexport-button/payment-reexport-button.component.jsx b/client/src/components/payment-reexport-button/payment-reexport-button.component.jsx
index 5325231e4..434377e86 100644
--- a/client/src/components/payment-reexport-button/payment-reexport-button.component.jsx
+++ b/client/src/components/payment-reexport-button/payment-reexport-button.component.jsx
@@ -5,12 +5,18 @@ import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { UPDATE_PAYMENT } from "../../graphql/payments.queries";
 import { setModalContext } from "../../redux/modals/modals.actions";
+import { selectPayment } from "../../redux/modals/modals.selectors";
+import { createStructuredSelector } from "reselect";
+
+const mapStateToProps = createStructuredSelector({
+  paymentModal: selectPayment
+});
 
 const mapDispatchToProps = (dispatch) => ({
   setPaymentContext: (context) => dispatch(setModalContext({ context: context, modal: "payment" }))
 });
 
-const PaymentReexportButton = ({ payment, refetch, setPaymentContext }) => {
+const PaymentReexportButton = ({ paymentModal, payment, refetch, setPaymentContext }) => {
   const { t } = useTranslation();
   const [updatePayment, { loading }] = useMutation(UPDATE_PAYMENT);
 
@@ -34,15 +40,19 @@ const PaymentReexportButton = ({ payment, refetch, setPaymentContext }) => {
           refetch
         },
         context: {
+          ...paymentModal.context,
           ...payment,
           exportedat: null
         }
       });
-      if (refetch)
-        refetch(
-          paymentUpdateResponse &&
-            paymentUpdateResponse.data.update_payments.returning[0]
-        );
+
+      if (refetch) {
+        if (paymentModal.context.refetchRequiresContext) {
+          refetch(paymentUpdateResponse && paymentUpdateResponse.data.update_payments.returning[0]);
+        } else {
+          refetch();
+        }
+      }
     } else {
       notification["error"]({
         message: t("payments.errors.exporting", {
@@ -59,4 +69,4 @@ const PaymentReexportButton = ({ payment, refetch, setPaymentContext }) => {
   );
 };
 
-export default connect(null, mapDispatchToProps)(PaymentReexportButton);
+export default connect(mapStateToProps, mapDispatchToProps)(PaymentReexportButton);
diff --git a/client/src/components/payments-list-paginated/payment-list-paginated.component.jsx b/client/src/components/payments-list-paginated/payment-list-paginated.component.jsx
index 1a5dd6774..e6f0d9822 100644
--- a/client/src/components/payments-list-paginated/payment-list-paginated.component.jsx
+++ b/client/src/components/payments-list-paginated/payment-list-paginated.component.jsx
@@ -171,7 +171,7 @@ export function PaymentsListPaginated({
                       }
                     : refetch
                 },
-                context: apolloResults ? apolloResults : record
+                context: { ...(apolloResults ? apolloResults : record), refetchRequiresContext: true }
               });
             }}
           >
diff --git a/client/src/components/shop-info/shop-info.component.jsx b/client/src/components/shop-info/shop-info.component.jsx
index 90f4a5034..fd9ba96a8 100644
--- a/client/src/components/shop-info/shop-info.component.jsx
+++ b/client/src/components/shop-info/shop-info.component.jsx
@@ -1,24 +1,25 @@
-import { useSplitTreatments } from "@splitsoftware/splitio-react";
-import { Button, Card, Tabs } from "antd";
-import React from "react";
-import { useTranslation } from "react-i18next";
-import { connect } from "react-redux";
-import { createStructuredSelector } from "reselect";
-import { selectBodyshop } from "../../redux/user/user.selectors";
-import ShopInfoGeneral from "./shop-info.general.component";
-import ShopInfoIntakeChecklistComponent from "./shop-info.intake.component";
-import ShopInfoLaborRates from "./shop-info.laborrates.component";
-import ShopInfoOrderStatusComponent from "./shop-info.orderstatus.component";
-import ShopInfoPartsScan from "./shop-info.parts-scan";
-import ShopInfoRbacComponent from "./shop-info.rbac.component";
-import ShopInfoResponsibilityCenterComponent from "./shop-info.responsibilitycenters.component";
-import ShopInfoROStatusComponent from "./shop-info.rostatus.component";
-import ShopInfoSchedulingComponent from "./shop-info.scheduling.component";
-import ShopInfoSpeedPrint from "./shop-info.speedprint.component";
-import { useLocation, useNavigate } from "react-router-dom";
-import ShopInfoTaskPresets from "./shop-info.task-presets.component";
-import queryString from "query-string";
-import InstanceRenderManager from "../../utils/instanceRenderMgr";
+import {  useSplitTreatments  } from '@splitsoftware/splitio-react';
+import {  Button, Card, Tabs  } from 'antd';
+import React from 'react';
+import {  useTranslation  } from 'react-i18next';
+import {  connect  } from 'react-redux';
+import {  createStructuredSelector  } from 'reselect';
+import {  selectBodyshop  } from '../../redux/user/user.selectors';
+import ShopInfoGeneral from './shop-info.general.component';
+import ShopInfoIntakeChecklistComponent from './shop-info.intake.component';
+import ShopInfoLaborRates from './shop-info.laborrates.component';
+import ShopInfoOrderStatusComponent from './shop-info.orderstatus.component';
+import ShopInfoPartsScan from './shop-info.parts-scan';
+import ShopInfoRbacComponent from './shop-info.rbac.component';
+import ShopInfoResponsibilityCenterComponent from './shop-info.responsibilitycenters.component';
+import ShopInfoROStatusComponent from './shop-info.rostatus.component';
+import ShopInfoSchedulingComponent from './shop-info.scheduling.component';
+import ShopInfoSpeedPrint from './shop-info.speedprint.component';
+import {  useLocation, useNavigate  } from 'react-router-dom';
+import ShopInfoTaskPresets from './shop-info.task-presets.component';
+import queryString from 'query-string';
+import InstanceRenderManager from '../../utils/instanceRenderMgr';
+import ShopInfoRoGuard from './shop-info.roguard.component';
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop
@@ -111,7 +112,18 @@ export function ShopInfoComponent({ bodyshop, form, saveLoading }) {
             children: <ShopInfoTaskPresets form={form} />
           }
         ]
-      : [])
+      : []),
+      ...InstanceRenderManager({
+        imex: [
+          {
+            key: 'roguard',
+            label: t('bodyshop.labels.roguard.title'),
+            children: <ShopInfoRoGuard form={form} />,
+          },
+        ],
+        rome: 'USE_IMEX',
+        promanager: [],
+      }),
   ];
   return (
     <Card
diff --git a/client/src/components/shop-info/shop-info.roguard.component.jsx b/client/src/components/shop-info/shop-info.roguard.component.jsx
new file mode 100644
index 000000000..bdc661c6a
--- /dev/null
+++ b/client/src/components/shop-info/shop-info.roguard.component.jsx
@@ -0,0 +1,116 @@
+import { Form, Input, InputNumber, Switch } from "antd";
+import React from "react";
+import { useTranslation } from "react-i18next";
+import LayoutFormRow from "../layout-form-row/layout-form-row.component";
+import InstanceRenderManager from "../../utils/instanceRenderMgr";
+
+export default function ShopInfoRoGuard({ form }) {
+  const { t } = useTranslation();
+
+  return (
+    <div>
+      <LayoutFormRow header={t("bodyshop.labels.md_ro_guard")}>
+        <Form.Item
+          label={t("bodyshop.fields.md_ro_guard.enabled")}
+          name={["md_ro_guard", "enabled"]}
+          valuePropName="checked"
+        >
+          <Switch />
+        </Form.Item>
+      </LayoutFormRow>
+      <Form.Item noStyle dependencies={[["md_ro_guard", "enabled"]]}>
+        {() => {
+          const disabled = !form.getFieldValue(["md_ro_guard", "enabled"]);
+          return (
+            <LayoutFormRow noDivider>
+              <Form.Item
+                label={t("bodyshop.fields.md_ro_guard.totalgppercent_minimum")}
+                name={["md_ro_guard", "totalgppercent_minimum"]}
+                rules={[
+                  {
+                    required: !disabled
+                    //message: t("general.validation.required"),
+                  }
+                ]}
+              >
+                <InputNumber min={0} max={100} precision={1} disabled={disabled} />
+              </Form.Item>
+
+              <Form.Item
+                label={t("bodyshop.fields.md_ro_guard.masterbypass")}
+                name={["md_ro_guard", "masterbypass"]}
+                rules={[
+                  {
+                    required: !disabled
+                    //message: t("general.validation.required"),
+                  }
+                ]}
+              >
+                <Input type="password" allowClear disabled={disabled} />
+              </Form.Item>
+
+              <Form.Item
+                label={t("bodyshop.fields.md_ro_guard.enforce_bills")}
+                name={["md_ro_guard", "enforce_bills"]}
+                valuePropName="checked"
+              >
+                <Switch disabled={disabled} />
+              </Form.Item>
+              <Form.Item
+                label={t("bodyshop.fields.md_ro_guard.enforce_cm")}
+                name={["md_ro_guard", "enforce_cm"]}
+                valuePropName="checked"
+              >
+                <Switch disabled={disabled} />
+              </Form.Item>
+
+              <Form.Item
+                label={t("bodyshop.fields.md_ro_guard.enforce_profit")}
+                name={["md_ro_guard", "enforce_profit"]}
+                valuePropName="checked"
+              >
+                <Switch disabled={disabled} />
+              </Form.Item>
+
+              <Form.Item
+                label={t("bodyshop.fields.md_ro_guard.enforce_ar")}
+                name={["md_ro_guard", "enforce_ar"]}
+                valuePropName="checked"
+              >
+                <Switch disabled={disabled} />
+              </Form.Item>
+
+              <Form.Item
+                label={t("bodyshop.fields.md_ro_guard.enforce_sublet")}
+                name={["md_ro_guard", "enforce_sublet"]}
+                valuePropName="checked"
+              >
+                <Switch disabled={disabled} />
+              </Form.Item>
+
+              {InstanceRenderManager({
+                rome: (
+                  <Form.Item
+                    label={t("bodyshop.fields.md_ro_guard.enforce_ppd")}
+                    name={["md_ro_guard", "enforce_ppd"]}
+                    valuePropName="checked"
+                  >
+                    <Switch disabled={disabled} />
+                  </Form.Item>
+                )
+              })}
+
+              <Form.Item
+                label={t("bodyshop.fields.md_ro_guard.enforce_labor")}
+                name={["md_ro_guard", "enforce_labor"]}
+                valuePropName="checked"
+              >
+                <Switch disabled={disabled} />
+              </Form.Item>
+            </LayoutFormRow>
+          );
+        }}
+      </Form.Item>
+    </div>
+  );
+}
diff --git a/client/src/graphql/bodyshop.queries.js b/client/src/graphql/bodyshop.queries.js
index e1d5b93e1..6bbafe6e3 100644
--- a/client/src/graphql/bodyshop.queries.js
+++ b/client/src/graphql/bodyshop.queries.js
@@ -138,6 +138,7 @@ export const QUERY_BODYSHOP = gql`
       tt_enforce_hours_for_tech_console
       md_tasks_presets
       use_paint_scale_data
+            md_ro_guard
       employee_teams(order_by: { name: asc }, where: { active: { _eq: true } }) {
         id
         name
@@ -265,6 +266,7 @@ export const UPDATE_SHOP = gql`
         enforce_conversion_category
         tt_enforce_hours_for_tech_console
         md_tasks_presets
+                md_ro_guard
         employee_teams(order_by: { name: asc }, where: { active: { _eq: true } }) {
           id
           name
diff --git a/client/src/graphql/courtesy-car.queries.js b/client/src/graphql/courtesy-car.queries.js
index 173cb4e19..a7433e940 100644
--- a/client/src/graphql/courtesy-car.queries.js
+++ b/client/src/graphql/courtesy-car.queries.js
@@ -41,7 +41,7 @@ export const QUERY_AVAILABLE_CC = gql`
 `;
 
 export const CHECK_CC_FLEET_NUMBER = gql`
-  query CHECK_VENDOR_NAME($name: String!) {
+  query CHECK_CC_FLEET_NUMBER($name: String!) {
     courtesycars_aggregate(where: { fleetnumber: { _ilike: $name } }) {
       aggregate {
         count
diff --git a/client/src/graphql/jobs.queries.js b/client/src/graphql/jobs.queries.js
index 1dd4ea175..52a14bb61 100644
--- a/client/src/graphql/jobs.queries.js
+++ b/client/src/graphql/jobs.queries.js
@@ -1969,6 +1969,19 @@ export const QUERY_JOB_CLOSE_DETAILS = gql`
       kmout
       qb_multiple_payers
       lbr_adjustments
+            payments {
+              amount
+              created_at
+              date
+              exportedat
+              id
+              jobid
+              memo
+              payer
+              paymentnum
+              transactionid
+              type
+            }
       joblines(where: { removed: { _eq: false } }, order_by: { line_no: asc }) {
         id
         removed
@@ -1981,6 +1994,7 @@ export const QUERY_JOB_CLOSE_DETAILS = gql`
         db_price
         act_price
         part_qty
+                notes
         mod_lbr_ty
         db_hrs
         mod_lb_hrs
@@ -1992,6 +2006,9 @@ export const QUERY_JOB_CLOSE_DETAILS = gql`
         prt_dsmk_p
         convertedtolbr
         convertedtolbr_data
+                act_price_before_ppc
+                sublet_ignored
+                sublet_completed
       }
     }
   }
diff --git a/client/src/pages/bills/bills.page.component.jsx b/client/src/pages/bills/bills.page.component.jsx
index eba2096d6..175f6a5c0 100644
--- a/client/src/pages/bills/bills.page.component.jsx
+++ b/client/src/pages/bills/bills.page.component.jsx
@@ -216,7 +216,7 @@ export function BillsListPage({ loading, data, refetch, total, setPartsOrderCont
       extra={
         <Space wrap>
           {search.search && (
-            <>
+            <Space align="center">
               <Typography.Title level={4}>
                 {t("general.labels.searchresults", { search: search.search })}
               </Typography.Title>
@@ -229,7 +229,7 @@ export function BillsListPage({ loading, data, refetch, total, setPartsOrderCont
               >
                 {t("general.actions.clear")}
               </Button>
-            </>
+            </Space>
           )}
           <Button onClick={() => refetch()}>
             <SyncOutlined />
diff --git a/client/src/pages/courtesy-car-create/courtesy-car-create.page.container.jsx b/client/src/pages/courtesy-car-create/courtesy-car-create.page.container.jsx
index 4ed2ef05a..105d001c2 100644
--- a/client/src/pages/courtesy-car-create/courtesy-car-create.page.container.jsx
+++ b/client/src/pages/courtesy-car-create/courtesy-car-create.page.container.jsx
@@ -72,7 +72,11 @@ export function CourtesyCarCreateContainer({ bodyshop, setBreadcrumbs, setSelect
     <RbacWrapper action="courtesycar:create">
       <FeatureWrapperComponent featureName="courtesycars">
         <Form form={form} autoComplete="new-password" onFinish={handleFinish} layout="vertical">
-          <CourtesyCarFormComponent form={form} saveLoading={loading} />
+          <CourtesyCarFormComponent
+          form={form}
+          saveLoading={loading}
+          newCC={true}
+        />
         </Form>
       </FeatureWrapperComponent>
     </RbacWrapper>
diff --git a/client/src/pages/jobs-close/jobs-close.component.jsx b/client/src/pages/jobs-close/jobs-close.component.jsx
index 0554f6a6e..102ba0611 100644
--- a/client/src/pages/jobs-close/jobs-close.component.jsx
+++ b/client/src/pages/jobs-close/jobs-close.component.jsx
@@ -41,6 +41,7 @@ import { insertAuditTrail } from "../../redux/application/application.actions";
 import { selectJobReadOnly } from "../../redux/application/application.selectors";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import AuditTrailMapping from "../../utils/AuditTrailMappings";
+import JobCloseRoGuardContainer from '../../components/job-close-ro-guard/job-close-ro-guard.container';
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -183,7 +184,7 @@ export function JobsCloseComponent({ job, bodyshop, jobRO, insertAuditTrail }) {
             </Space>
           }
         />
-
+     <JobCloseRoGuardContainer form={form} job={job} />
         <Space wrap direction="vertical" style={{ width: "100%" }}>
           <FormsFieldChanged form={form} />
           {!job.actual_in && job.scheduled_in && <Alert type="warning" message={t("jobs.labels.actual_in_inferred")} />}
diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json
index 804a6fc90..4ecb6ef8d 100644
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -223,8 +223,9 @@
 				"markexported": "Mark Exported",
 				"markforreexport": "Mark for Re-export",
 				"new": "New Bill",
+				"nobilllines": "This part has not yet been recieved.",
 				"noneselected": "No bill selected.",
-				"onlycmforinvoiced": "Only credit memos can be entered for any Job that has been invoiced,  exported,  or voided.",
+				"onlycmforinvoiced": "Only credit memos can be entered for any Job that has been invoiced, exported, or voided.",
 				"printlabels": "Print Labels",
 				"retailtotal": "Bills Retail Total",
 				"savewithdiscrepancy": "You are about to save this bill with a discrepancy.  The system will continue to use the calculated amount using the bill lines.  Press cancel to return to the bill.",
@@ -367,6 +368,18 @@
 				},
 				"md_payment_types": "Payment Types",
 				"md_referral_sources": "Referral Sources",
+				"md_ro_guard": {
+					"enabled": "RO Guard Enabled?",
+					"enforce_ar": "Enforce AR Balance",
+					"enforce_bills": "Enforce Bill Discrepancy",
+					"enforce_cm": "Enforce Credit Memo Entry",
+					"enforce_labor": "Enforce Labor Allocation",
+					"enforce_ppd": "Enforce PPD Sync",
+					"enforce_profit": "Enforce Profit Requirement",
+					"enforce_sublet": "Enforce Sublet Completion",
+					"masterbypass": "Master Bypass Password (not encrypted)",
+					"totalgppercent_minimum": "Minimum Total Gross Profit %"
+				},
 				"md_tasks_presets": {
 					"enable_tasks": "Enable Hour Flagging",
 					"hourstype": "Hour Types",
@@ -639,6 +652,7 @@
 				"laborrates": "Labor Rates",
 				"licensing": "Licensing",
 				"md_parts_scan": "Parts Scan Rules",
+				"md_ro_guard": "RO Guard",
 				"md_tasks_presets": "Tasks Presets",
 				"md_to_emails": "Preset To Emails",
 				"md_to_emails_emails": "Emails",
@@ -660,6 +674,9 @@
 					"tax_accounts": "Tax Accounts",
 					"title": "Responsibility Centers"
 				},
+				"roguard": {
+					"title": "RO Guard"
+				},
 				"scheduling": "SMART Scheduling",
 				"scoreboardsetup": "Scoreboard Setup",
 				"shopinfo": "Shop Information",
@@ -1356,6 +1373,7 @@
 			},
 			"fields": {
 				"act_price": "Retail Price",
+				"act_price_before_ppc": "Original Part Price",
 				"ah_detail_line": "Mark as Detail Labor Line (Autohouse Only)",
 				"assigned_team": "Team",
 				"assigned_team_name": "Team {{name}}",
@@ -1825,6 +1843,7 @@
 				"scheddates": "Schedule Dates"
 			},
 			"labels": {
+				"accountsreceivable": "Accounts Receivable",
 				"act_price_ppc": "New Part Price",
 				"actual_completion_inferred": "$t(jobs.fields.actual_completion) inferred using $t(jobs.fields.scheduled_completion).",
 				"actual_delivery_inferred": "$t(jobs.fields.actual_delivery) inferred using $t(jobs.fields.scheduled_delivery).",
@@ -1944,6 +1963,7 @@
 				"mapa": "Paint Materials",
 				"markforreexport": "Mark for Re-export",
 				"mash": "Shop Materials",
+				"masterbypass": "Master Bypass Password",
 				"materials": {
 					"mapa": ""
 				},
@@ -1952,6 +1972,12 @@
 				"net_repairs": "Net Repairs",
 				"notes": "Notes",
 				"othertotal": "Other Totals",
+				"outstanding_ar": "A balance is outstanding on this RO. Payments can still be entered when the job is closed. ",
+				"outstanding_credit_memos": "Outstanding credit memos have not been entered against this job. Credit Memos may still be posted once the job is closed.",
+				"outstanding_ppd": "There are outstanding PPDs that may not have been synced back to the estimate.",
+				"outstanding_reconciliation_discrep": "At least one discrepancy is not 0. This may indicate that this job is not properly reconciled and should not be closed.",
+				"outstanding_sublets": "There are sublet lines on the job which have not been marked as completed. ",
+				"outstandinghours": "There are outstanding hours on the job that have not been paid or have been overpaid.",
 				"override_header": "Override estimate header on import?",
 				"ownerassociation": "Owner Association",
 				"parts": "Parts",
@@ -1961,6 +1987,7 @@
 				"partsfilter": "Parts Only",
 				"partssubletstotal": "Parts & Sublets Total",
 				"partstotal": "Parts Total (ex. Taxes)",
+				"performance": "Performance",
 				"pimraryamountpayable": "Total Primary Payable",
 				"plitooltips": {
 					"billtotal": "The total amount of all bill lines that have been posted against this RO (not including credits, taxes, or labor adjustments).",
@@ -1975,7 +2002,9 @@
 					"totalreturns": "The total <b>retail</b> amount of returns created for this job."
 				},
 				"ppc": "This line contains a part price change.",
+				"ppdnotexported": "PPDs not Exported",
 				"profileadjustments": "Profile Disc./Mkup",
+				"profits": "Job Profits",
 				"prt_dsmk_total": "Line Item Adjustment",
 				"rates": "Rates",
 				"rates_subtotal": "All Rates Subtotal",
@@ -1995,6 +2024,19 @@
 				"relatedros": "Related ROs",
 				"remove_from_ar": "Remove from AR",
 				"returntotals": "Return Totals",
+				"ro_guard": {
+					"eforce_profit": "Profit margins enforced.",
+					"enforce_ar": "AR collection enforced.",
+					"enforce_bills": "Bill discrepancy enforced.",
+					"enforce_cm": "Credit memo entry enforced.",
+					"enforce_labor": "Labor allocations enforced.",
+					"enforce_ppd": "PPD sync enforced.",
+					"enforce_sublet": "Sublet completion enforced.",
+					"enforce_validation": "Master Bypass Required: {{message}}",
+					"enforced": "This check has been enforced by your shop manager. Enter the master bypass password to close the Job."
+				},
+				"roguard": "RO Guard",
+				"roguardwarnings": "RO Guard Warnings",
 				"rosaletotal": "RO  Parts Total",
 				"sale_additional": "Sales - Additional",
 				"sale_labor": "Sales - Labor",
@@ -2005,6 +2047,7 @@
 				"scheduledinchange": "The scheduled in is based off the latest appointment. To change this date,  please schedule or reschedule the Job. ",
 				"specialcoveragepolicy": "Special Coverage Policy Applies",
 				"state_tax_amt": "Provincial/State Taxes",
+				"subletsnotcompleted": "Outstanding Sublets",
 				"subletstotal": "Sublets Total",
 				"subtotal": "Subtotal",
 				"supplementnote": "The Job had a supplement imported.",
diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json
index 06ed0e4b9..1a710dc95 100644
--- a/client/src/translations/es/common.json
+++ b/client/src/translations/es/common.json
@@ -367,6 +367,18 @@
 				},
 				"md_payment_types": "",
 				"md_referral_sources": "",
+				"md_ro_guard": {
+					"enabled": "",
+					"enforce_ar": "",
+					"enforce_bills": "",
+					"enforce_cm": "",
+					"enforce_labor": "",
+					"enforce_ppd": "",
+					"enforce_profit": "",
+					"enforce_sublet": "",
+					"masterbypass": "",
+					"totalgppercent_minimum": ""
+				},
 				"md_tasks_presets": {
 					"enable_tasks": "",
 					"hourstype": "",
@@ -639,6 +651,7 @@
 				"laborrates": "",
 				"licensing": "",
 				"md_parts_scan": "",
+				"md_ro_guard": "",
 				"md_tasks_presets": "",
 				"md_to_emails": "",
 				"md_to_emails_emails": "",
@@ -660,6 +673,9 @@
 					"tax_accounts": "",
 					"title": ""
 				},
+				"roguard": {
+					"title": ""
+				},
 				"scheduling": "",
 				"scoreboardsetup": "",
 				"shopinfo": "",
@@ -1356,6 +1372,7 @@
 			},
 			"fields": {
 				"act_price": "Precio actual",
+				"act_price_before_ppc": "",
 				"ah_detail_line": "",
 				"assigned_team": "",
 				"assigned_team_name": "",
@@ -1825,6 +1842,7 @@
 				"scheddates": ""
 			},
 			"labels": {
+				"accountsreceivable": "",
 				"act_price_ppc": "",
 				"actual_completion_inferred": "",
 				"actual_delivery_inferred": "",
@@ -1944,6 +1962,7 @@
 				"mapa": "",
 				"markforreexport": "",
 				"mash": "",
+				"masterbypass": "",
 				"materials": {
 					"mapa": ""
 				},
@@ -1952,6 +1971,12 @@
 				"net_repairs": "",
 				"notes": "Notas",
 				"othertotal": "",
+				"outstanding_ar": "",
+				"outstanding_credit_memos": "",
+				"outstanding_ppd": "",
+				"outstanding_reconciliation_discrep": "",
+				"outstanding_sublets": "",
+				"outstandinghours": "",
 				"override_header": "¿Anular encabezado estimado al importar?",
 				"ownerassociation": "",
 				"parts": "Partes",
@@ -1961,6 +1986,7 @@
 				"partsfilter": "",
 				"partssubletstotal": "",
 				"partstotal": "",
+				"performance": "",
 				"pimraryamountpayable": "",
 				"plitooltips": {
 					"billtotal": "",
@@ -1975,7 +2001,9 @@
 					"totalreturns": ""
 				},
 				"ppc": "",
+				"ppdnotexported": "",
 				"profileadjustments": "",
+				"profits": "",
 				"prt_dsmk_total": "",
 				"rates": "Tarifas",
 				"rates_subtotal": "",
@@ -1995,6 +2023,19 @@
 				"relatedros": "",
 				"remove_from_ar": "",
 				"returntotals": "",
+				"ro_guard": {
+					"eforce_profit": "",
+					"enforce_ar": "",
+					"enforce_bills": "",
+					"enforce_cm": "",
+					"enforce_labor": "",
+					"enforce_ppd": "",
+					"enforce_sublet": "",
+					"enforce_validation": "",
+					"enforced": ""
+				},
+				"roguard": "",
+				"roguardwarnings": "",
 				"rosaletotal": "",
 				"sale_additional": "",
 				"sale_labor": "",
@@ -2005,6 +2046,7 @@
 				"scheduledinchange": "",
 				"specialcoveragepolicy": "",
 				"state_tax_amt": "",
+				"subletsnotcompleted": "",
 				"subletstotal": "",
 				"subtotal": "",
 				"supplementnote": "",
diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json
index 120a39d8d..25d9e4dde 100644
--- a/client/src/translations/fr/common.json
+++ b/client/src/translations/fr/common.json
@@ -367,6 +367,18 @@
 				},
 				"md_payment_types": "",
 				"md_referral_sources": "",
+				"md_ro_guard": {
+					"enabled": "",
+					"enforce_ar": "",
+					"enforce_bills": "",
+					"enforce_cm": "",
+					"enforce_labor": "",
+					"enforce_ppd": "",
+					"enforce_profit": "",
+					"enforce_sublet": "",
+					"masterbypass": "",
+					"totalgppercent_minimum": ""
+				},
 				"md_tasks_presets": {
 					"enable_tasks": "",
 					"hourstype": "",
@@ -639,6 +651,7 @@
 				"laborrates": "",
 				"licensing": "",
 				"md_parts_scan": "",
+				"md_ro_guard": "",
 				"md_tasks_presets": "",
 				"md_to_emails": "",
 				"md_to_emails_emails": "",
@@ -660,6 +673,9 @@
 					"tax_accounts": "",
 					"title": ""
 				},
+				"roguard": {
+					"title": ""
+				},
 				"scheduling": "",
 				"scoreboardsetup": "",
 				"shopinfo": "",
@@ -1356,6 +1372,7 @@
 			},
 			"fields": {
 				"act_price": "Prix actuel",
+				"act_price_before_ppc": "",
 				"ah_detail_line": "",
 				"assigned_team": "",
 				"assigned_team_name": "",
@@ -1825,6 +1842,7 @@
 				"scheddates": ""
 			},
 			"labels": {
+				"accountsreceivable": "",
 				"act_price_ppc": "",
 				"actual_completion_inferred": "",
 				"actual_delivery_inferred": "",
@@ -1944,6 +1962,7 @@
 				"mapa": "",
 				"markforreexport": "",
 				"mash": "",
+				"masterbypass": "",
 				"materials": {
 					"mapa": ""
 				},
@@ -1952,6 +1971,12 @@
 				"net_repairs": "",
 				"notes": "Remarques",
 				"othertotal": "",
+				"outstanding_ar": "",
+				"outstanding_credit_memos": "",
+				"outstanding_ppd": "",
+				"outstanding_reconciliation_discrep": "",
+				"outstanding_sublets": "",
+				"outstandinghours": "",
 				"override_header": "Remplacer l'en-tête d'estimation à l'importation?",
 				"ownerassociation": "",
 				"parts": "les pièces",
@@ -1961,6 +1986,7 @@
 				"partsfilter": "",
 				"partssubletstotal": "",
 				"partstotal": "",
+				"performance": "",
 				"pimraryamountpayable": "",
 				"plitooltips": {
 					"billtotal": "",
@@ -1975,7 +2001,9 @@
 					"totalreturns": ""
 				},
 				"ppc": "",
+				"ppdnotexported": "",
 				"profileadjustments": "",
+				"profits": "",
 				"prt_dsmk_total": "",
 				"rates": "Les taux",
 				"rates_subtotal": "",
@@ -1995,6 +2023,19 @@
 				"relatedros": "",
 				"remove_from_ar": "",
 				"returntotals": "",
+				"ro_guard": {
+					"eforce_profit": "",
+					"enforce_ar": "",
+					"enforce_bills": "",
+					"enforce_cm": "",
+					"enforce_labor": "",
+					"enforce_ppd": "",
+					"enforce_sublet": "",
+					"enforce_validation": "",
+					"enforced": ""
+				},
+				"roguard": "",
+				"roguardwarnings": "",
 				"rosaletotal": "",
 				"sale_additional": "",
 				"sale_labor": "",
@@ -2005,6 +2046,7 @@
 				"scheduledinchange": "",
 				"specialcoveragepolicy": "",
 				"state_tax_amt": "",
+				"subletsnotcompleted": "",
 				"subletstotal": "",
 				"subtotal": "",
 				"supplementnote": "",
diff --git a/hasura/metadata/tables.yaml b/hasura/metadata/tables.yaml
index 516852dbc..67888b140 100644
--- a/hasura/metadata/tables.yaml
+++ b/hasura/metadata/tables.yaml
@@ -969,6 +969,7 @@
           - md_rbac
           - md_referral_sources
           - md_responsibility_centers
+          - md_ro_guard
           - md_ro_statuses
           - md_tasks_presets
           - md_to_emails
@@ -1068,6 +1069,7 @@
           - md_rbac
           - md_referral_sources
           - md_responsibility_centers
+          - md_ro_guard
           - md_ro_statuses
           - md_tasks_presets
           - md_to_emails
diff --git a/hasura/migrations/1712162752434_alter_table_public_bodyshops_add_column_md_ro_guard/down.sql b/hasura/migrations/1712162752434_alter_table_public_bodyshops_add_column_md_ro_guard/down.sql
new file mode 100644
index 000000000..8f554a895
--- /dev/null
+++ b/hasura/migrations/1712162752434_alter_table_public_bodyshops_add_column_md_ro_guard/down.sql
@@ -0,0 +1,4 @@
+-- Could not auto-generate a down migration.
+-- Please write an appropriate down migration for the SQL below:
+-- alter table "public"."bodyshops" add column "md_ro_guard" jsonb
+--  null default jsonb_build_object();
diff --git a/hasura/migrations/1712162752434_alter_table_public_bodyshops_add_column_md_ro_guard/up.sql b/hasura/migrations/1712162752434_alter_table_public_bodyshops_add_column_md_ro_guard/up.sql
new file mode 100644
index 000000000..a932a2446
--- /dev/null
+++ b/hasura/migrations/1712162752434_alter_table_public_bodyshops_add_column_md_ro_guard/up.sql
@@ -0,0 +1,2 @@
+alter table "public"."bodyshops" add column "md_ro_guard" jsonb
+ null default jsonb_build_object();
diff --git a/server/job/job-totals-USA.js b/server/job/job-totals-USA.js
index 700ea451d..7c8437e26 100644
--- a/server/job/job-totals-USA.js
+++ b/server/job/job-totals-USA.js
@@ -924,7 +924,6 @@ function CalculateTaxesTotals(job, otherTotals) {
         if (
           thresholdAmount === 9999.99 ||
           InstanceMgr({
-            debug: true,
             imex: false,
             rome: false,
             promanager: thresholdAmount === 0 && parseInt(tyCounter) === 1