nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-08 15:42:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: resolve merge conflicts

Browse Source
This commit is contained in:
barredterra
2022-11-27 16:30:19 +01:00
parent 978924a7e4
commit 21deb02d81
2 changed files with 1 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1547,11 +1547,7 @@
"idx": 204, "idx": 204,
"is_submittable": 1, "is_submittable": 1,
"links": [], "links": [],
<<<<<<< HEAD "modified": "2022-11-27 16:28:45.559785",
"modified": "2022-11-22 12:44:29.935567",
=======
"modified": "2022-11-17 17:30:45.559785",
>>>>>>> 77105306f2 (feat: add incoterm to purchasing transactions)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Purchase Invoice", "name": "Purchase Invoice",

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

@@ -2098,24 +2098,12 @@
"hide_seconds": 1, "hide_seconds": 1,
"label": "Write Off", "label": "Write Off",
"width": "50%" "width": "50%"
<<<<<<< HEAD
=======
},
{
"default": "0",
"fieldname": "repost_required",
"fieldtype": "Check",
"hidden": 1,
"label": "Repost Required",
"no_copy": 1,
"read_only": 1
}, },
{ {
"fieldname": "incoterm", "fieldname": "incoterm",
"fieldtype": "Link", "fieldtype": "Link",
"label": "Incoterm", "label": "Incoterm",
"options": "Incoterm" "options": "Incoterm"
>>>>>>> 029f22c549 (feat: add incoterm to sales transactions)
} }
], ],
"icon": "fa fa-file-text", "icon": "fa fa-file-text",