From 62be2b0a0af8b35f34a5ea5ecfb8cd04d2d81923 Mon Sep 17 00:00:00 2001
From: Patrick Fic <snaptsoft@gmail.com>
Date: Mon, 14 Feb 2022 13:02:54 -0800
Subject: [PATCH 1/2] Resolve bill update error.

---
 .../components/bill-detail-edit/bill-detail-edit.container.jsx  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/components/bill-detail-edit/bill-detail-edit.container.jsx b/client/src/components/bill-detail-edit/bill-detail-edit.container.jsx
index b3fc0504a..aad7403df 100644
--- a/client/src/components/bill-detail-edit/bill-detail-edit.container.jsx
+++ b/client/src/components/bill-detail-edit/bill-detail-edit.container.jsx
@@ -108,7 +108,7 @@ export function BillDetailEditcontainer({
     );
 
     billlines.forEach((billline) => {
-      const { deductedfromlbr, ...il } = billline;
+      const { deductedfromlbr, jobline, ...il } = billline;
       delete il.__typename;
 
       if (il.id) {

From e79b9f90846e5ec6dd32a6144fc5ab2fd69b445b Mon Sep 17 00:00:00 2001
From: Patrick Fic <snaptsoft@gmail.com>
Date: Mon, 14 Feb 2022 19:31:26 -0800
Subject: [PATCH 2/2] Potential resolution to date time issues post 4pm.

---
 .../form-date-picker/form-date-picker.component.jsx       | 8 +++++---
 .../form-date-time-picker.component.jsx                   | 1 +
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/client/src/components/form-date-picker/form-date-picker.component.jsx b/client/src/components/form-date-picker/form-date-picker.component.jsx
index 3a9fe2553..e9ace8082 100644
--- a/client/src/components/form-date-picker/form-date-picker.component.jsx
+++ b/client/src/components/form-date-picker/form-date-picker.component.jsx
@@ -23,20 +23,21 @@ export function FormDatePicker({
   onChange,
   onBlur,
   onlyFuture,
+  isDateOnly = true,
   ...restProps
 }) {
   const ref = useRef();
 
   const handleChange = (newDate) => {
     if (value !== newDate && onChange) {
-      onChange(newDate);
+      onChange(isDateOnly ? newDate && newDate.format("YYYY-MM-DD") : newDate);
     }
   };
 
   const handleKeyDown = (e) => {
     if (e.key.toLowerCase() === "t") {
       if (onChange) {
-        onChange(moment());
+        onChange(isDateOnly ? moment().format("YYYY-MM-DD") : moment());
         // if (ref.current && ref.current.blur) ref.current.blur();
       }
     } else if (e.key.toLowerCase() === "enter") {
@@ -64,7 +65,8 @@ export function FormDatePicker({
       });
     }
 
-    if (_a.isValid() && onChange) onChange(_a);
+    if (_a.isValid() && onChange)
+      onChange(isDateOnly ? _a.format("YYYY-MM-DD") : _a);
   };
 
   return (
diff --git a/client/src/components/form-date-time-picker/form-date-time-picker.component.jsx b/client/src/components/form-date-time-picker/form-date-time-picker.component.jsx
index 34131d479..cc4e53eb0 100644
--- a/client/src/components/form-date-time-picker/form-date-time-picker.component.jsx
+++ b/client/src/components/form-date-time-picker/form-date-time-picker.component.jsx
@@ -26,6 +26,7 @@ const DateTimePicker = (
         value={value}
         onBlur={onBlur}
         onChange={onChange}
+        isDateOnly={false}
       />
 
       <TimePicker