Merge branch 'master-beta' into master-AIO

client/src/components/bill-enter-modal/bill-enter-modal.container.jsx

@@ -32,8 +32,8 @@ const mapStateToProps = createStructuredSelector({
 });
 const mapDispatchToProps = (dispatch) => ({
     toggleModalVisible: () => dispatch(toggleModalVisible("billEnter")),
-    insertAuditTrail: ({jobid, billid, operation}) =>
-        dispatch(insertAuditTrail({jobid, billid, operation})),
+    insertAuditTrail: ({jobid, billid, operation, type}) =>
+        dispatch(insertAuditTrail({jobid, billid, operation, type })),
 });
 
 const Templates = TemplateList("job_special");
@@ -212,7 +212,7 @@ function BillEnterModalContainer({
                         mod_lbr_ty: key,
                         hours: adjustmentsToInsert[key].toFixed(1),
                     }),
-                });
+                type: "jobmodifylbradj",});
             });
 
             const jobUpdate = client.mutate({
@@ -369,7 +369,8 @@ function BillEnterModalContainer({
             operation: AuditTrailMapping.billposted(
                 r1.data.insert_bills.returning[0].invoice_number
             ),
-        });
+        type: "billposted",
+    });
 
         if (enterAgain) {
             // form.resetFields();