schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: remove no_copy for ignore_pricing_rule

Browse Source 
(cherry picked from commit 8c5b420aea)

# Conflicts:
#	erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
#	erpnext/buying/doctype/purchase_order/purchase_order.json
#	erpnext/selling/doctype/quotation/quotation.json
#	erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
This commit is contained in:
Maharshi Patel
2022-09-16 18:26:00 +05:30
committed by Mergify
parent 305693b562
commit 8abfdb6598
7 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -511,7 +511,6 @@
"fieldname": "ignore_pricing_rule",
"fieldtype": "Check",
"label": "Ignore Pricing Rule",
"no_copy": 1,
"permlevel": 1,
"print_hide": 1
},
@@ -1423,7 +1422,11 @@
"idx": 204,
"is_submittable": 1,
"links": [],
<<<<<<< HEAD
"modified": "2021-11-25 13:31:02.716727",
=======
"modified": "2022-09-16 17:45:25.345996",
>>>>>>> 8c5b420aea (fix: remove no_copy for ignore_pricing_rule)
"modified_by": "Administrator",
"module": "Accounts",
"name": "Purchase Invoice",
@@ -1483,6 +1486,7 @@
"show_name_in_global_search": 1,
"sort_field": "modified",
"sort_order": "DESC",
"states": [],
"timeline_field": "supplier",
"title_field": "title",
"track_changes": 1

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

@@ -651,7 +651,6 @@
"hide_days": 1,
"hide_seconds": 1,
"label": "Ignore Pricing Rule",
"no_copy": 1,
"print_hide": 1
},
{
@@ -2046,7 +2045,7 @@
"link_fieldname": "consolidated_invoice"
}
],
"modified": "2022-07-11 17:43:56.435382",
"modified": "2022-09-16 17:44:22.227332",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Sales Invoice",

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

@@ -439,7 +439,6 @@
"fieldname": "ignore_pricing_rule",
"fieldtype": "Check",
"label": "Ignore Pricing Rule",
"no_copy": 1,
"permlevel": 1,
"print_hide": 1
},
@@ -1170,7 +1169,11 @@
"idx": 105,
"is_submittable": 1,
"links": [],
<<<<<<< HEAD
"modified": "2022-04-26 12:16:38.694276",
=======
"modified": "2022-09-16 17:45:04.954055",
>>>>>>> 8c5b420aea (fix: remove no_copy for ignore_pricing_rule)
"modified_by": "Administrator",
"module": "Buying",
"name": "Purchase Order",

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

@@ -461,7 +461,6 @@
"fieldname": "ignore_pricing_rule",
"fieldtype": "Check",
"label": "Ignore Pricing Rule",
"no_copy": 1,
"permlevel": 1,
"print_hide": 1,
"show_days": 1,
@@ -1174,7 +1173,11 @@
"idx": 82,
"is_submittable": 1,
"links": [],
<<<<<<< HEAD
"modified": "2022-06-15 20:35:32.635804",
=======
"modified": "2022-09-16 17:44:43.221804",
>>>>>>> 8c5b420aea (fix: remove no_copy for ignore_pricing_rule)
"modified_by": "Administrator",
"module": "Selling",
"name": "Quotation",

3
erpnext/selling/doctype/sales_order/sales_order.json
View File

@@ -544,7 +544,6 @@
"hide_days": 1,
"hide_seconds": 1,
"label": "Ignore Pricing Rule",
"no_copy": 1,
"permlevel": 1,
"print_hide": 1
},
@@ -1549,7 +1548,7 @@
"idx": 105,
"is_submittable": 1,
"links": [],
"modified": "2022-06-10 03:52:22.212953",
"modified": "2022-09-16 17:43:57.007441",
"modified_by": "Administrator",
"module": "Selling",
"name": "Sales Order",

3
erpnext/stock/doctype/delivery_note/delivery_note.json
View File

@@ -490,7 +490,6 @@
"fieldname": "ignore_pricing_rule",
"fieldtype": "Check",
"label": "Ignore Pricing Rule",
"no_copy": 1,
"permlevel": 1,
"print_hide": 1
},
@@ -1336,7 +1335,7 @@
"idx": 146,
"is_submittable": 1,
"links": [],
"modified": "2022-06-10 03:52:04.197415",
"modified": "2022-09-16 17:46:17.701904",
"modified_by": "Administrator",
"module": "Stock",
"name": "Delivery Note",

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

@@ -404,7 +404,6 @@
"fieldname": "ignore_pricing_rule",
"fieldtype": "Check",
"label": "Ignore Pricing Rule",
"no_copy": 1,
"permlevel": 1,
"print_hide": 1
},
@@ -1149,7 +1148,11 @@
"idx": 261,
"is_submittable": 1,
"links": [],
<<<<<<< HEAD
"modified": "2022-05-27 15:59:18.550583",
=======
"modified": "2022-09-16 17:45:58.430132",
>>>>>>> 8c5b420aea (fix: remove no_copy for ignore_pricing_rule)
"modified_by": "Administrator",
"module": "Stock",
"name": "Purchase Receipt",