nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-13 10:11:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: resolve conflicts

Browse Source
This commit is contained in:
Deepesh Garg
2022-09-20 14:48:06 +05:30
parent fe252b48f7
commit 794eeebabc
1 changed files with 0 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1368,11 +1368,7 @@
"width": "50px" "width": "50px"
}, },
{ {
<<<<<<< HEAD
"depends_on": "eval:doc.update_stock && doc.is_subcontracted==\"Yes\"", "depends_on": "eval:doc.update_stock && doc.is_subcontracted==\"Yes\"",
=======
"depends_on": "eval:doc.is_subcontracted",
>>>>>>> 246c1a9380 (fix: Add child table for tax withheld vouchers)
"fieldname": "supplier_warehouse", "fieldname": "supplier_warehouse",
"fieldtype": "Link", "fieldtype": "Link",
"label": "Supplier Warehouse", "label": "Supplier Warehouse",
@@ -1423,16 +1419,6 @@
"label": "Advance Tax", "label": "Advance Tax",
"options": "Advance Tax", "options": "Advance Tax",
"read_only": 1 "read_only": 1
<<<<<<< HEAD
=======
},
{
"default": "0",
"fieldname": "is_old_subcontracting_flow",
"fieldtype": "Check",
"hidden": 1,
"label": "Is Old Subcontracting Flow",
"read_only": 1
}, },
{ {
"fieldname": "tax_withheld_vouchers_section", "fieldname": "tax_withheld_vouchers_section",
@@ -1445,22 +1431,13 @@
"label": "Tax Withheld Vouchers", "label": "Tax Withheld Vouchers",
"options": "Tax Withheld Vouchers", "options": "Tax Withheld Vouchers",
"read_only": 1 "read_only": 1
>>>>>>> 246c1a9380 (fix: Add child table for tax withheld vouchers)
} }
], ],
"icon": "fa fa-file-text", "icon": "fa fa-file-text",
"idx": 204, "idx": 204,
"is_submittable": 1, "is_submittable": 1,
"links": [], "links": [],
<<<<<<< HEAD
<<<<<<< HEAD
"modified": "2021-11-25 13:31:02.716727",
=======
"modified": "2022-09-13 16:22:04.103982",
>>>>>>> 246c1a9380 (fix: Add child table for tax withheld vouchers)
=======
"modified": "2022-09-13 23:39:54.525037", "modified": "2022-09-13 23:39:54.525037",
>>>>>>> b6184ce471 (test: Add tests)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Purchase Invoice", "name": "Purchase Invoice",