Merge branch 'release/AIO/2024-04-26' into test-AIO

bodyshop_translations.babel

@@ -3939,6 +3939,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>returnfrombill</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>savewithdiscrepancy</name>
                                         <definition_loaded>false</definition_loaded>
@@ -40798,6 +40819,27 @@
                             <folder_node>
                                 <name>labels</name>
                                 <children>
+                                    <concept_node>
+                                        <name>notyetdispatched</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>parts_dispatch</name>
                                         <definition_loaded>false</definition_loaded>

client/src/components/job-detail-lines/job-lines-expander.component.jsx

@@ -12,6 +12,7 @@ import { createStructuredSelector } from "reselect";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import { QUERY_JOBLINE_TASKS_PAGINATED } from "../../graphql/tasks.queries.js";
 import TaskListContainer from "../task-list/task-list.container.jsx";
+import FeatureWrapper from "../feature-wrapper/feature-wrapper.component.jsx";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop
@@ -98,13 +99,16 @@ export function JobLinesExpander({ jobline, jobid, bodyshop }) {
                     </Row>
                   )
                 }))
-              : {
+              : [
+                  {
                     key: "dispatch-lines",
-                  children: t("parts_orders.labels.notyetordered")
+                    children: t("parts_dispatch.labels.notyetdispatched")
                   }
+                ]
           }
         />
       </Col>
+      <FeatureWrapper featureName="bills" noauth={() => null}>
         <Col md={24} lg={8}>
           <Typography.Title level={4}>{t("bills.labels.bills")}</Typography.Title>
           <Timeline
@@ -147,6 +151,7 @@ export function JobLinesExpander({ jobline, jobid, bodyshop }) {
             }
           />
         </Col>
+      </FeatureWrapper>
       <Col md={24} lg={24}>
         <TaskListContainer
           parentJobId={jobid}

client/src/components/job-detail-lines/job-lines.component.jsx

@@ -43,6 +43,7 @@ import PartsOrderModalContainer from "../parts-order-modal/parts-order-modal.con
 import JobLinesExpander from "./job-lines-expander.component";
 import JobLinesPartPriceChange from "./job-lines-part-price-change.component";
 import { FaTasks } from "react-icons/fa";
+import InstanceRenderManager from "../../utils/instanceRenderMgr";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -552,7 +553,7 @@ export function JobLinesComponent({
             >
               {t("joblines.actions.new")}
             </Button>
-            {bodyshop.region_config.toLowerCase().startsWith("us") && <JobSendPartPriceChangeComponent job={job} />}
+            {InstanceRenderManager({ rome: <JobSendPartPriceChangeComponent job={job} /> })}
             <JobCreateIOU job={job} selectedJobLines={selectedLines} />
             <Input.Search
               placeholder={t("general.labels.search")}

client/src/translations/en_us/common.json

@@ -230,7 +230,7 @@
 				"markexported": "Mark Exported",
 				"markforreexport": "Mark for Re-export",
 				"new": "New Bill",
-				"nobilllines": "This part has not yet been recieved.",
+				"nobilllines": "",
 				"noneselected": "No bill selected.",
 				"onlycmforinvoiced": "Only credit memos can be entered for any Job that has been invoiced, exported, or voided.",
 				"printlabels": "Print Labels",
@@ -1323,7 +1323,6 @@
 				"value": "Value"
 			},
 			"content": {
-				"calculated_based_on": "Calculated based on",
 				"calculated_based_on": "Calculated based on",
 				"current_status_accumulated_time": "Current Status Accumulated Time",
 				"data_unavailable": " There is currently no Lifecycle data for this Job.",
@@ -2408,6 +2407,7 @@
 				"percent_accepted": "% Accepted"
 			},
 			"labels": {
+				"notyetdispatched": "This part has not been dispatched.",
 				"parts_dispatch": "Parts Dispatch"
 			}
 		},

client/src/translations/es/common.json

@@ -2407,6 +2407,7 @@
 				"percent_accepted": ""
 			},
 			"labels": {
+				"notyetdispatched": "",
 				"parts_dispatch": ""
 			}
 		},

client/src/translations/fr/common.json

@@ -2407,6 +2407,7 @@
 				"percent_accepted": ""
 			},
 			"labels": {
+				"notyetdispatched": "",
 				"parts_dispatch": ""
 			}
 		},

client/src/utils/CleanAxios.js

@@ -17,8 +17,10 @@ export const axiosAuthInterceptorId = axios.interceptors.request.use(
         executeFunction: true,
         args: [],
         promanager: () => {
+          if (!config.url.startsWith("http://localhost:1337")) {
             config.headers["Convenient-Company"] = "promanager";
           }
+        }
       });
     }