nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-29 18:04:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: typo

Browse Source 
(cherry picked from commit 0f2f11cb33)

# Conflicts:
#	erpnext/accounts/doctype/sales_invoice/sales_invoice.json
This commit is contained in:
Raffael Meyer
2021-08-15 18:47:51 +02:00
committed by Mergify
parent 216563d1e3
commit 927cd173cf
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/accounts/doctype/sales_invoice/sales_invoice.json
View File

@@ -2229,11 +2229,15 @@
"link_fieldname": "consolidated_invoice" "link_fieldname": "consolidated_invoice"
} }
], ],
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
"modified": "2025-02-06 15:59:54.636202", "modified": "2025-02-06 15:59:54.636202",
======= =======
"modified": "2021-08-02 18:36:51.978581", "modified": "2021-08-02 18:36:51.978581",
>>>>>>> b57521a337 (feat: add `total_billing_hours` to Sales Invoice) >>>>>>> b57521a337 (feat: add `total_billing_hours` to Sales Invoice)
=======
"modified": "2021-08-15 18:40:20.445127",
>>>>>>> 0f2f11cb33 (fix: typo)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Sales Invoice", "name": "Sales Invoice",
@@ -2288,4 +2292,4 @@
"title_field": "customer_name", "title_field": "customer_name",
"track_changes": 1, "track_changes": 1,
"track_seen": 1 "track_seen": 1
} }