diff --git a/bodyshop_translations.babel b/bodyshop_translations.babel
index f292acf4f..8de0a69f7 100644
--- a/bodyshop_translations.babel
+++ b/bodyshop_translations.babel
@@ -25469,6 +25469,27 @@
                                                     </translation>
                                                 </translations>
                                             </concept_node>
+                                            <concept_node>
+                                                <name>invoicedatefuture</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>kmoutnotgreaterthankmin</name>
                                                 <definition_loaded>false</definition_loaded>
diff --git a/client/src/graphql/jobs.queries.js b/client/src/graphql/jobs.queries.js
index 999d56224..8f927d4ff 100644
--- a/client/src/graphql/jobs.queries.js
+++ b/client/src/graphql/jobs.queries.js
@@ -1878,6 +1878,7 @@ export const QUERY_JOB_CLOSE_DETAILS = gql`
       scheduled_delivery
       actual_delivery
       scheduled_in
+      date_invoiced
       actual_in
       kmin
       kmout
diff --git a/client/src/pages/jobs-close/jobs-close.component.jsx b/client/src/pages/jobs-close/jobs-close.component.jsx
index 71d961c99..697211ee6 100644
--- a/client/src/pages/jobs-close/jobs-close.component.jsx
+++ b/client/src/pages/jobs-close/jobs-close.component.jsx
@@ -56,7 +56,7 @@ export function JobsCloseComponent({ job, bodyshop, jobRO }) {
         jobId: job.id,
         job: {
           status: bodyshop.md_ro_statuses.default_invoiced || "",
-          date_invoiced: new Date(),
+          date_invoiced: values.date_invoiced,
           actual_in: values.actual_in,
           actual_completion: values.actual_completion,
           actual_delivery: values.actual_delivery,
@@ -119,6 +119,9 @@ export function JobsCloseComponent({ job, bodyshop, jobRO }) {
           actual_delivery: job.actual_delivery
             ? moment(job.actual_delivery)
             : job.scheduled_delivery && moment(job.scheduled_delivery),
+          date_invoiced: job.date_invoiced
+            ? moment(job.date_invoiced)
+            : moment(),
           kmin: job.kmin,
           kmout: job.kmout,
           dms_allocation: job.dms_allocation,
@@ -219,6 +222,32 @@ export function JobsCloseComponent({ job, bodyshop, jobRO }) {
           >
             <DateTimePicker disabled={jobRO} />
           </Form.Item>
+          <Form.Item
+            label={t("jobs.fields.date_invoiced")}
+            name="date_invoiced"
+            rules={[
+              {
+                required: true,
+              },
+              ({ getFieldValue }) => ({
+                validator(_, value) {
+                  if (!bodyshop.cdk_dealerid) return Promise.resolve();
+                  if (!value || moment(value).isSameOrAfter(moment(), "day")) {
+                    return Promise.resolve();
+                  }
+
+                  return Promise.reject(
+                    new Error(t("jobs.labels.dms.invoicedatefuture"))
+                  );
+                },
+              }),
+            ]}
+          >
+            <DateTimePicker
+              disabled={jobRO}
+              onlyFuture={!!bodyshop.cdk_dealerid}
+            />
+          </Form.Item>
           {(bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber) && (
             <Form.Item
               label={t("jobs.fields.kmin")}
diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json
index 8e08327d7..4b885d167 100644
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -1507,6 +1507,7 @@
 				"diskscan": "Scan Disk for Estimates",
 				"dms": {
 					"defaultstory": "Bodyshop RO {{ro_number}}.  Damage to $t(jobs.fields.area_of_damage_impact.{{area_of_damage}}).",
+					"invoicedatefuture": "Invoice date must be today or in the future for CDK posting.",
 					"kmoutnotgreaterthankmin": "Mileage out must be greater than mileage in.",
 					"logs": "Logs",
 					"notallocated": "Not Allocated",
diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json
index e89b26bd5..ee0b10b4d 100644
--- a/client/src/translations/es/common.json
+++ b/client/src/translations/es/common.json
@@ -1507,6 +1507,7 @@
 				"diskscan": "",
 				"dms": {
 					"defaultstory": "",
+					"invoicedatefuture": "",
 					"kmoutnotgreaterthankmin": "",
 					"logs": "",
 					"notallocated": "",
diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json
index 0f1c0c51c..9d50e5f37 100644
--- a/client/src/translations/fr/common.json
+++ b/client/src/translations/fr/common.json
@@ -1507,6 +1507,7 @@
 				"diskscan": "",
 				"dms": {
 					"defaultstory": "",
+					"invoicedatefuture": "",
 					"kmoutnotgreaterthankmin": "",
 					"logs": "",
 					"notallocated": "",