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

chore: Resolve conflicts

Browse Source
This commit is contained in:
Deepesh Garg
2022-09-20 16:42:30 +05:30
parent 8abfdb6598
commit de8f44bbff
4 changed files with 0 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1422,11 +1422,7 @@
"idx": 204, "idx": 204,
"is_submittable": 1, "is_submittable": 1,
"links": [], "links": [],
<<<<<<< HEAD
"modified": "2021-11-25 13:31:02.716727",
=======
"modified": "2022-09-16 17:45:25.345996", "modified": "2022-09-16 17:45:25.345996",
>>>>>>> 8c5b420aea (fix: remove no_copy for ignore_pricing_rule)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Purchase Invoice", "name": "Purchase Invoice",

4
erpnext/buying/doctype/purchase_order/purchase_order.json
View File

@@ -1169,11 +1169,7 @@
"idx": 105, "idx": 105,
"is_submittable": 1, "is_submittable": 1,
"links": [], "links": [],
<<<<<<< HEAD
"modified": "2022-04-26 12:16:38.694276",
=======
"modified": "2022-09-16 17:45:04.954055", "modified": "2022-09-16 17:45:04.954055",
>>>>>>> 8c5b420aea (fix: remove no_copy for ignore_pricing_rule)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Buying", "module": "Buying",
"name": "Purchase Order", "name": "Purchase Order",

4
erpnext/selling/doctype/quotation/quotation.json
View File

@@ -1173,11 +1173,7 @@
"idx": 82, "idx": 82,
"is_submittable": 1, "is_submittable": 1,
"links": [], "links": [],
<<<<<<< HEAD
"modified": "2022-06-15 20:35:32.635804",
=======
"modified": "2022-09-16 17:44:43.221804", "modified": "2022-09-16 17:44:43.221804",
>>>>>>> 8c5b420aea (fix: remove no_copy for ignore_pricing_rule)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Selling", "module": "Selling",
"name": "Quotation", "name": "Quotation",

4
erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
View File

@@ -1148,11 +1148,7 @@
"idx": 261, "idx": 261,
"is_submittable": 1, "is_submittable": 1,
"links": [], "links": [],
<<<<<<< HEAD
"modified": "2022-05-27 15:59:18.550583",
=======
"modified": "2022-09-16 17:45:58.430132", "modified": "2022-09-16 17:45:58.430132",
>>>>>>> 8c5b420aea (fix: remove no_copy for ignore_pricing_rule)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Purchase Receipt", "name": "Purchase Receipt",