Update parts return pricing error IO-684

client/src/components/bills-list-table/bills-list-table.component.jsx

@@ -275,8 +275,8 @@ export function BillsListTableComponent({
                   .map((i) => {
                     return {
                       line_desc: i.line_desc,
-                      db_price: i.actual_price,
-                      act_price: i.actual_cost,
+                     // db_price: i.actual_price,
+                      act_price: i.actual_price,
                       quantity: i.quantity,
                       joblineid: i.joblineid,
                     };

client/src/components/parts-order-modal/parts-order-modal.component.jsx

@@ -63,7 +63,7 @@ export default function PartsOrderModalComponent({
               {fields.map((field, index) => (
                 <Form.Item required={false} key={field.key}>
                   <div style={{ display: "flex", alignItems: "center" }}>
-                    <LayoutFormRow grow style={{ flex: 1 }}>
+                    <LayoutFormRow style={{ flex: 1 }}>
                       <Form.Item
                         label={t("parts_orders.fields.line_desc")}
                         key={`${index}line_desc`}
@@ -84,7 +84,13 @@ export default function PartsOrderModalComponent({
                       >
                         <Input />
                       </Form.Item>
-
+                      <Form.Item
+                        label={t("parts_orders.fields.db_price")}
+                        key={`${index}db_price`}
+                        name={[field.name, "db_price"]}
+                      >
+                        <CurrencyInput />
+                      </Form.Item>
                       <Form.Item
                         label={t("parts_orders.fields.act_price")}
                         key={`${index}act_price`}

client/src/pages/bills/bills.page.component.jsx

@@ -153,8 +153,8 @@ export function BillsListPage({
                   linesToOrder: record.billlines.map((i) => {
                     return {
                       line_desc: i.line_desc,
-                      db_price: i.actual_price,
-                      act_price: i.actual_cost,
+                    //  db_price: i.actual_price,
+                      act_price: i.actual_price,
                       quantity: i.quantity,
                       joblineid: i.joblineid,
                     };

client/src/translations/en_us/common.json

@@ -92,6 +92,7 @@
 				"jobline": "Job Line",
 				"line_desc": "Line Description",
 				"local_tax_applicable": "Loc. Tax?",
+				"location": "Location",
 				"quantity": "Quantity",
 				"state_tax_applicable": "St. Tax?"
 			},
@@ -99,7 +100,7 @@
 				"deductfromlabor": "Deduct from Labor?",
 				"entered": "Entered",
 				"from": "From",
-				"other": "--Not On Estimate--",
+				"other": "-- Not On Estimate --",
 				"reconciled": "Reconciled!",
 				"unreconciled": "Unreconciled"
 			}

client/src/translations/es/common.json

@@ -92,6 +92,7 @@
 				"jobline": "",
 				"line_desc": "",
 				"local_tax_applicable": "",
+				"location": "",
 				"quantity": "",
 				"state_tax_applicable": ""
 			},

client/src/translations/fr/common.json

@@ -92,6 +92,7 @@
 				"jobline": "",
 				"line_desc": "",
 				"local_tax_applicable": "",
+				"location": "",
 				"quantity": "",
 				"state_tax_applicable": ""
 			},