diff --git a/bodyshop_translations.babel b/bodyshop_translations.babel
index 1ebe98359..8d90d4760 100644
--- a/bodyshop_translations.babel
+++ b/bodyshop_translations.babel
@@ -1,4 +1,4 @@
-<babeledit_project be_version="2.7.1" version="1.2">
+<babeledit_project version="1.2" be_version="2.7.1">
     <!--
 
     BabelEdit project file
@@ -2674,6 +2674,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>calculatedcreditsnotreceived</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>creditsnotreceived</name>
                                         <definition_loaded>false</definition_loaded>
@@ -27096,6 +27117,27 @@
                                                     </translation>
                                                 </translations>
                                             </concept_node>
+                                            <concept_node>
+                                                <name>calculatedcreditsnotreceived</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>creditmemos</name>
                                                 <definition_loaded>false</definition_loaded>
diff --git a/client/src/components/bill-enter-modal/bill-enter-modal.container.jsx b/client/src/components/bill-enter-modal/bill-enter-modal.container.jsx
index b9a13e06b..5cd926785 100644
--- a/client/src/components/bill-enter-modal/bill-enter-modal.container.jsx
+++ b/client/src/components/bill-enter-modal/bill-enter-modal.container.jsx
@@ -159,11 +159,11 @@ function BillEnterModalContainer({
       });
     }
 
-    const markPolReceived = outstanding_returns.filter(
-      (o) => o.cm_received === true
-    );
+    const markPolReceived =
+      outstanding_returns &&
+      outstanding_returns.filter((o) => o.cm_received === true);
 
-    if (markPolReceived.length > 0) {
+    if (markPolReceived && markPolReceived.length > 0) {
       const r2 = await updatePartsOrderLines({
         variables: { partsLineIds: markPolReceived.map((p) => p.id) },
       });
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 ef9e0da35..b1d4f33f5 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
@@ -26,6 +26,8 @@ export default function JobBillsTotalComponent({
   let billCms = Dinero();
   let lbrAdjustments = Dinero();
   let totalReturns = Dinero();
+  let totalReturnsMarkedNotReceived = Dinero();
+  let totalReturnsMarkedReceived = Dinero();
 
   partsOrders.forEach((p) =>
     p.parts_order_lines.forEach((pol) => {
@@ -35,6 +37,24 @@ export default function JobBillsTotalComponent({
             amount: Math.round((pol.act_price || 0) * 100),
           }).multiply(pol.quantity)
         );
+
+        if (pol.cm_received === null) {
+          return; // Skip this calculation for bills posted prior to the CNR change.
+        } else {
+          if (pol.cm_received === false) {
+            totalReturnsMarkedNotReceived = totalReturnsMarkedNotReceived.add(
+              Dinero({
+                amount: Math.round((pol.act_price || 0) * 100),
+              }).multiply(pol.quantity)
+            );
+          } else {
+            totalReturnsMarkedReceived = totalReturnsMarkedReceived.add(
+              Dinero({
+                amount: Math.round((pol.act_price || 0) * 100),
+              }).multiply(pol.quantity)
+            );
+          }
+        }
       }
     })
   );
@@ -73,7 +93,7 @@ export default function JobBillsTotalComponent({
   const discrepWithLbrAdj = discrepancy.add(lbrAdjustments);
 
   const discrepWithCms = discrepWithLbrAdj.add(totalReturns);
-  const creditsNotReceived = totalReturns.subtract(billCms); //billCms is tracked as a negative number.
+  const calculatedCreditsNotReceived = totalReturns.subtract(billCms); //billCms is tracked as a negative number.
 
   return (
     <Row gutter={16}>
@@ -213,6 +233,32 @@ export default function JobBillsTotalComponent({
                 value={totalReturns.toFormat()}
               />
             </Tooltip>
+            <Tooltip
+              title={
+                <div
+                  dangerouslySetInnerHTML={{
+                    __html: t(
+                      "jobs.labels.plitooltips.calculatedcreditsnotreceived"
+                    ),
+                  }}
+                />
+              }
+            >
+              <Statistic
+                title={t("bills.labels.calculatedcreditsnotreceived")}
+                valueStyle={{
+                  color:
+                    calculatedCreditsNotReceived.getAmount() <= 0
+                      ? "green"
+                      : "red",
+                }}
+                value={
+                  calculatedCreditsNotReceived.getAmount() >= 0
+                    ? calculatedCreditsNotReceived.toFormat()
+                    : Dinero().toFormat()
+                }
+              />
+            </Tooltip>
             <Tooltip
               title={
                 <div
@@ -225,11 +271,14 @@ export default function JobBillsTotalComponent({
               <Statistic
                 title={t("bills.labels.creditsnotreceived")}
                 valueStyle={{
-                  color: creditsNotReceived.getAmount() <= 0 ? "green" : "red",
+                  color:
+                    totalReturnsMarkedNotReceived.getAmount() <= 0
+                      ? "green"
+                      : "red",
                 }}
                 value={
-                  creditsNotReceived.getAmount() >= 0
-                    ? creditsNotReceived.toFormat()
+                  totalReturnsMarkedNotReceived.getAmount() >= 0
+                    ? totalReturnsMarkedNotReceived.toFormat()
                     : Dinero().toFormat()
                 }
               />
diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json
index b8814400d..dc54e36a7 100644
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -174,7 +174,8 @@
 				"bill_total": "Bill Total Amount",
 				"billcmtotal": "Credit Memos",
 				"bills": "Bills",
-				"creditsnotreceived": "Credits Not Received",
+				"calculatedcreditsnotreceived": "Calculated CNR",
+				"creditsnotreceived": "Credits Not Marked Received",
 				"creditsreceived": "Credits Received",
 				"dedfromlbr": "Labor Adjustments",
 				"deleteconfirm": "Are you sure you want to delete this bill? It cannot be undone. If this bill has deductions from labors, manual changes may be required.",
@@ -1588,14 +1589,15 @@
 				"partstotal": "Parts Total (ex. Taxes)",
 				"plitooltips": {
 					"billtotal": "The total amount of all bill lines that have been posted against this RO (not including credits, taxes, or labor adjustments).",
-					"creditmemos": "The total amount of all returns created. This amount does not reflect credit memos that have been posted.",
-					"creditsnotreceived": "The total amount of returns created for this job that do not have a corresponding credit memo posted. An amount greater than $0 indicates that vendors have not provided requested credit memos.",
+					"calculatedcreditsnotreceived": "The calculated credits not received is derived by subtracting the amount of credit memos entered from the <b>retail</b> total of returns created. This does not take into account whether the credit was marked as received. You can find more information <a href=\"https://help.imex.online/en/article/credits-not-received-changes-1jy9snw\" target=\"_blank\">here</a>.",
+					"creditmemos": "The total <b>retail</b> amount of all returns created. This amount does not reflect credit memos that have been posted.",
+					"creditsnotreceived": "This total reflects the total <b>retail</b> of parts returns lines that have not been explicitly marked as returned when posting a credit memo. You can learn more about this here <a href=\"https://help.imex.online/en/article/credits-not-received-changes-1jy9snw\" target=\"_blank\">here</a>. ",
 					"discrep1": "If the discrepancy is not $0, you may have one of the following: <br/><br/>\n\n<ul>\n<li>Too many bills/bill lines that have been posted against this RO. Check to make sure every bill posted on this RO is correctly posted and assigned.</li>\n<li>You do not have the latest supplement imported, or, a supplement must be submitted and then imported.</li>\n<li>You have posted a bill line to labor.</li>\n</ul>\n<br/>\n<i>There may be additional issues not listed above that prevent this job from reconciling.</i>",
 					"discrep2": "If the discrepancy is not $0, you may have one of the following: <br/><br/>\n\n<ul>\n<li>Used an incorrect rate when deducting from labor.</li>\n<li>An outstanding imbalance higher in the reconciliation process.</li>\n</ul>\n<br/>\n<i>There may be additional issues not listed above that prevent this job from reconciling.</i>",
-					"discrep3": "If the discrepancy is not $0, you may have one of the following: <br/><br/>\n\n<ul>\n<li>Credit memos that have not been received or posted.</li>\n<li>An outstanding imbalance higher in the reconciliation process.</li>\n</ul>\n<br/>\n<i>There may be additional issues not listed above that prevent this job from reconciling.</i>",
+					"discrep3": "If the discrepancy is not $0, you may have one of the following: <br/><br/>\n\n<ul>\n<li>A parts order return has not been created.</li>\n<li>An outstanding imbalance higher in the reconciliation process.</li>\n</ul>\n<br/>\n<i>There may be additional issues not listed above that prevent this job from reconciling.</i>",
 					"laboradj": "The sum of all bill lines that deducted from labor hours, rather than part prices.",
 					"partstotal": "This is the total of all parts and sublet amounts on the vehicle (some of these may require an in-house invoice).<br/>\nItems such as shop and paint materials, labor online lines, etc. are not included in this total.",
-					"totalreturns": "The total amount of returns created for this job."
+					"totalreturns": "The total <b>retail</b> amount of returns created for this job."
 				},
 				"prt_dsmk_total": "Line Item Adjustment",
 				"rates": "Rates",
diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json
index c1868e3fc..2bf0cd8e6 100644
--- a/client/src/translations/es/common.json
+++ b/client/src/translations/es/common.json
@@ -174,6 +174,7 @@
 				"bill_total": "",
 				"billcmtotal": "",
 				"bills": "",
+				"calculatedcreditsnotreceived": "",
 				"creditsnotreceived": "",
 				"creditsreceived": "",
 				"dedfromlbr": "",
@@ -1588,6 +1589,7 @@
 				"partstotal": "",
 				"plitooltips": {
 					"billtotal": "",
+					"calculatedcreditsnotreceived": "",
 					"creditmemos": "",
 					"creditsnotreceived": "",
 					"discrep1": "",
diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json
index 2894fb273..e81c89415 100644
--- a/client/src/translations/fr/common.json
+++ b/client/src/translations/fr/common.json
@@ -174,6 +174,7 @@
 				"bill_total": "",
 				"billcmtotal": "",
 				"bills": "",
+				"calculatedcreditsnotreceived": "",
 				"creditsnotreceived": "",
 				"creditsreceived": "",
 				"dedfromlbr": "",
@@ -1588,6 +1589,7 @@
 				"partstotal": "",
 				"plitooltips": {
 					"billtotal": "",
+					"calculatedcreditsnotreceived": "",
 					"creditmemos": "",
 					"creditsnotreceived": "",
 					"discrep1": "",