diff --git a/bodyshop_translations.babel b/bodyshop_translations.babel
index bf1fcf3a3..c1c2795e0 100644
--- a/bodyshop_translations.babel
+++ b/bodyshop_translations.babel
@@ -1248,6 +1248,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>location</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>quantity</name>
                                         <definition_loaded>false</definition_loaded>
diff --git a/client/src/components/bills-list-table/bills-list-table.component.jsx b/client/src/components/bills-list-table/bills-list-table.component.jsx
index 23a45b3fe..a930385b7 100644
--- a/client/src/components/bills-list-table/bills-list-table.component.jsx
+++ b/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,
                     };
diff --git a/client/src/components/parts-order-modal/parts-order-modal.component.jsx b/client/src/components/parts-order-modal/parts-order-modal.component.jsx
index c9aef624a..2805f22a2 100644
--- a/client/src/components/parts-order-modal/parts-order-modal.component.jsx
+++ b/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`}
diff --git a/client/src/pages/bills/bills.page.component.jsx b/client/src/pages/bills/bills.page.component.jsx
index 785b33453..858f443ca 100644
--- a/client/src/pages/bills/bills.page.component.jsx
+++ b/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,
                     };
diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json
index 610d544c6..e86c5175e 100644
--- a/client/src/translations/en_us/common.json
+++ b/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"
 			}
diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json
index 3b1c7c50f..278cca9c5 100644
--- a/client/src/translations/es/common.json
+++ b/client/src/translations/es/common.json
@@ -92,6 +92,7 @@
 				"jobline": "",
 				"line_desc": "",
 				"local_tax_applicable": "",
+				"location": "",
 				"quantity": "",
 				"state_tax_applicable": ""
 			},
diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json
index 1b1a1a413..ccdc1a100 100644
--- a/client/src/translations/fr/common.json
+++ b/client/src/translations/fr/common.json
@@ -92,6 +92,7 @@
 				"jobline": "",
 				"line_desc": "",
 				"local_tax_applicable": "",
+				"location": "",
 				"quantity": "",
 				"state_tax_applicable": ""
 			},
diff --git a/hasura/migrations/1613512698224_set_fk_public_billlines_joblineid/down.yaml b/hasura/migrations/1613512698224_set_fk_public_billlines_joblineid/down.yaml
new file mode 100644
index 000000000..1b64a574a
--- /dev/null
+++ b/hasura/migrations/1613512698224_set_fk_public_billlines_joblineid/down.yaml
@@ -0,0 +1,5 @@
+- args:
+    cascade: false
+    read_only: false
+    sql: alter table "public"."billlines" drop constraint "billlines_joblineid_fkey";
+  type: run_sql
diff --git a/hasura/migrations/1613512698224_set_fk_public_billlines_joblineid/up.yaml b/hasura/migrations/1613512698224_set_fk_public_billlines_joblineid/up.yaml
new file mode 100644
index 000000000..db6cd3d58
--- /dev/null
+++ b/hasura/migrations/1613512698224_set_fk_public_billlines_joblineid/up.yaml
@@ -0,0 +1,10 @@
+- args:
+    cascade: false
+    read_only: false
+    sql: |-
+      alter table "public"."billlines"
+                 add constraint "billlines_joblineid_fkey"
+                 foreign key ("joblineid")
+                 references "public"."joblines"
+                 ("id") on update restrict on delete set null;
+  type: run_sql
diff --git a/hasura/migrations/1613512720454_track_all_relationships/down.yaml b/hasura/migrations/1613512720454_track_all_relationships/down.yaml
new file mode 100644
index 000000000..781f757d6
--- /dev/null
+++ b/hasura/migrations/1613512720454_track_all_relationships/down.yaml
@@ -0,0 +1,12 @@
+- args:
+    relationship: billlines
+    table:
+      name: joblines
+      schema: public
+  type: drop_relationship
+- args:
+    relationship: jobline
+    table:
+      name: billlines
+      schema: public
+  type: drop_relationship
diff --git a/hasura/migrations/1613512720454_track_all_relationships/up.yaml b/hasura/migrations/1613512720454_track_all_relationships/up.yaml
new file mode 100644
index 000000000..11235a313
--- /dev/null
+++ b/hasura/migrations/1613512720454_track_all_relationships/up.yaml
@@ -0,0 +1,20 @@
+- args:
+    name: billlines
+    table:
+      name: joblines
+      schema: public
+    using:
+      foreign_key_constraint_on:
+        column: joblineid
+        table:
+          name: billlines
+          schema: public
+  type: create_array_relationship
+- args:
+    name: jobline
+    table:
+      name: billlines
+      schema: public
+    using:
+      foreign_key_constraint_on: joblineid
+  type: create_object_relationship
diff --git a/hasura/migrations/metadata.yaml b/hasura/migrations/metadata.yaml
index 3b288e9c0..9868bb661 100644
--- a/hasura/migrations/metadata.yaml
+++ b/hasura/migrations/metadata.yaml
@@ -367,6 +367,9 @@ tables:
   - name: bill
     using:
       foreign_key_constraint_on: billid
+  - name: jobline
+    using:
+      foreign_key_constraint_on: joblineid
   insert_permissions:
   - role: user
     permission:
@@ -1798,6 +1801,13 @@ tables:
         table:
           schema: public
           name: allocations
+  - name: billlines
+    using:
+      foreign_key_constraint_on:
+        column: joblineid
+        table:
+          schema: public
+          name: billlines
   - name: parts_order_lines
     using:
       foreign_key_constraint_on: