From 723129d924de408f8c283ffd883f8810e57a9089 Mon Sep 17 00:00:00 2001
From: Charles-Henri Decultot <chdecultot@dokos.io>
Date: Wed, 14 Feb 2024 09:00:51 +0100
Subject: [PATCH 1/2] fix: Missing fields in Sales Invoices

---
 .../doctype/sales_invoice/sales_invoice.json  | 56 ++++++++++---------
 1 file changed, 31 insertions(+), 25 deletions(-)

diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
index 919488c2cd8..8c6501f832d 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
@@ -195,6 +195,7 @@
   "sales_team_section_break",
   "sales_partner",
   "amount_eligible_for_commission",
+  "column_break10",
   "commission_rate",
   "total_commission",
   "section_break2",
@@ -1222,15 +1223,6 @@
    "options": "Account",
    "print_hide": 1
   },
-  {
-   "collapsible": 1,
-   "collapsible_depends_on": "write_off_amount",
-   "depends_on": "is_pos",
-   "fieldname": "column_break4",
-   "fieldtype": "Section Break",
-   "label": "Write Off",
-   "width": "50%"
-  },
   {
    "fieldname": "write_off_amount",
    "fieldtype": "Currency",
@@ -1721,6 +1713,21 @@
    "label": "Ignore Default Payment Terms Template",
    "read_only": 1
   },
+  {
+   "allow_on_submit": 1,
+   "fieldname": "dispatch_address_name",
+   "fieldtype": "Link",
+   "label": "Dispatch Address Name",
+   "options": "Address",
+   "print_hide": 1
+  },
+  {
+   "allow_on_submit": 1,
+   "fieldname": "dispatch_address",
+   "fieldtype": "Small Text",
+   "label": "Dispatch Address",
+   "read_only": 1
+  },
   {
    "fieldname": "total_billing_hours",
    "fieldtype": "Float",
@@ -1883,20 +1890,20 @@
    "no_copy": 1
   },
   {
-    "fieldname": "accounting_journal",
-    "fieldtype": "Link",
-    "label": "Accounting Journal",
-    "options": "Accounting Journal",
-    "read_only": 1
-   },
-   {
-    "fieldname": "clearance_date",
-    "fieldtype": "Date",
-    "hidden": 1,
-    "label": "Clearance Date",
-    "no_copy": 1,
-    "print_hide": 1
-   }
+   "fieldname": "accounting_journal",
+   "fieldtype": "Link",
+   "label": "Accounting Journal",
+   "options": "Accounting Journal",
+   "read_only": 1
+  },
+  {
+   "fieldname": "clearance_date",
+   "fieldtype": "Date",
+   "hidden": 1,
+   "label": "Clearance Date",
+   "no_copy": 1,
+   "print_hide": 1
+  }
  ],
  "icon": "uil uil-file-alt",
  "idx": 181,
@@ -1910,12 +1917,11 @@
    "link_fieldname": "consolidated_invoice"
   }
  ],
- "modified": "2024-01-02 17:25:46.027523",
+ "modified": "2024-02-14 08:58:22.844580",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Sales Invoice",
  "name_after_submit": 1,
- "name_case": "Title Case",
  "naming_rule": "By \"Naming Series\" field",
  "owner": "Administrator",
  "permissions": [
-- 
GitLab


From fbd80f706da9c5c9805b88540dcb273d525d1458 Mon Sep 17 00:00:00 2001
From: Charles-Henri Decultot <chdecultot@dokos.io>
Date: Wed, 14 Feb 2024 09:04:12 +0100
Subject: [PATCH 2/2] fix: move down payment field with is return field

---
 erpnext/accounts/doctype/sales_invoice/sales_invoice.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
index 8c6501f832d..faa755e609c 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
@@ -13,7 +13,6 @@
   "customer",
   "customer_name",
   "tax_id",
-  "is_down_payment_invoice",
   "company",
   "company_tax_id",
   "column_break1",
@@ -27,6 +26,7 @@
   "is_consolidated",
   "is_return",
   "return_against",
+  "is_down_payment_invoice",
   "update_billed_amount_in_sales_order",
   "update_billed_amount_in_delivery_note",
   "is_debit_note",
@@ -1917,7 +1917,7 @@
    "link_fieldname": "consolidated_invoice"
   }
  ],
- "modified": "2024-02-14 08:58:22.844580",
+ "modified": "2024-02-14 09:03:16.049314",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Sales Invoice",
-- 
GitLab