mirror of
https://github.com/frappe/erpnext.git
synced 2026-05-18 20:49:19 +00:00
chore: remove stale 'repost_required' flag from sales invoice
(cherry picked from commit 06c5334f2a)
# Conflicts:
# erpnext/accounts/doctype/sales_invoice/sales_invoice.json
This commit is contained in:
@@ -213,7 +213,6 @@
|
|||||||
"is_internal_customer",
|
"is_internal_customer",
|
||||||
"is_discounted",
|
"is_discounted",
|
||||||
"remarks",
|
"remarks",
|
||||||
"repost_required",
|
|
||||||
"connections_tab"
|
"connections_tab"
|
||||||
],
|
],
|
||||||
"fields": [
|
"fields": [
|
||||||
@@ -2125,15 +2124,6 @@
|
|||||||
"label": "Write Off",
|
"label": "Write Off",
|
||||||
"width": "50%"
|
"width": "50%"
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"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",
|
||||||
@@ -2188,7 +2178,11 @@
|
|||||||
"link_fieldname": "consolidated_invoice"
|
"link_fieldname": "consolidated_invoice"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
|
<<<<<<< HEAD
|
||||||
"modified": "2024-06-07 16:49:32.458402",
|
"modified": "2024-06-07 16:49:32.458402",
|
||||||
|
=======
|
||||||
|
"modified": "2024-07-18 15:30:39.428519",
|
||||||
|
>>>>>>> 06c5334f2a (chore: remove stale 'repost_required' flag from sales invoice)
|
||||||
"modified_by": "Administrator",
|
"modified_by": "Administrator",
|
||||||
"module": "Accounts",
|
"module": "Accounts",
|
||||||
"name": "Sales Invoice",
|
"name": "Sales Invoice",
|
||||||
|
|||||||
@@ -161,7 +161,6 @@ class SalesInvoice(SellingController):
|
|||||||
project: DF.Link | None
|
project: DF.Link | None
|
||||||
redeem_loyalty_points: DF.Check
|
redeem_loyalty_points: DF.Check
|
||||||
remarks: DF.SmallText | None
|
remarks: DF.SmallText | None
|
||||||
repost_required: DF.Check
|
|
||||||
represents_company: DF.Link | None
|
represents_company: DF.Link | None
|
||||||
return_against: DF.Link | None
|
return_against: DF.Link | None
|
||||||
rounded_total: DF.Currency
|
rounded_total: DF.Currency
|
||||||
|
|||||||
Reference in New Issue
Block a user