fix: added disable_rounded_total field

(cherry picked from commit f8524d526b)

# Conflicts:
#	erpnext/selling/doctype/quotation/quotation.json
This commit is contained in:
Ninad1306
2024-11-08 12:51:05 +05:30
committed by Mergify
parent 73a31cb395
commit c98a0ccd1d
2 changed files with 48 additions and 0 deletions

View File

@@ -65,6 +65,7 @@
"grand_total", "grand_total",
"rounding_adjustment", "rounding_adjustment",
"rounded_total", "rounded_total",
"disable_rounded_total",
"in_words", "in_words",
"section_break_44", "section_break_44",
"apply_discount_on", "apply_discount_on",
@@ -661,6 +662,7 @@
"width": "200px" "width": "200px"
}, },
{ {
"depends_on": "eval:!doc.disable_rounded_total",
"fieldname": "base_rounding_adjustment", "fieldname": "base_rounding_adjustment",
"fieldtype": "Currency", "fieldtype": "Currency",
"label": "Rounding Adjustment (Company Currency)", "label": "Rounding Adjustment (Company Currency)",
@@ -709,6 +711,7 @@
"width": "200px" "width": "200px"
}, },
{ {
"depends_on": "eval:!doc.disable_rounded_total",
"fieldname": "rounding_adjustment", "fieldname": "rounding_adjustment",
"fieldtype": "Currency", "fieldtype": "Currency",
"label": "Rounding Adjustment", "label": "Rounding Adjustment",
@@ -1067,13 +1070,57 @@
"fieldname": "named_place", "fieldname": "named_place",
"fieldtype": "Data", "fieldtype": "Data",
"label": "Named Place" "label": "Named Place"
<<<<<<< HEAD
=======
},
{
"fieldname": "utm_campaign",
"fieldtype": "Link",
"label": "Campaign",
"oldfieldname": "campaign",
"oldfieldtype": "Link",
"options": "UTM Campaign",
"print_hide": 1
},
{
"fieldname": "utm_source",
"fieldtype": "Link",
"label": "Source",
"oldfieldname": "source",
"oldfieldtype": "Select",
"options": "UTM Source",
"print_hide": 1
},
{
"fieldname": "utm_medium",
"fieldtype": "Link",
"label": "Medium",
"options": "UTM Medium",
"print_hide": 1
},
{
"fieldname": "utm_content",
"fieldtype": "Data",
"label": "Content",
"print_hide": 1
},
{
"default": "0",
"fieldname": "disable_rounded_total",
"fieldtype": "Check",
"label": "Disable Rounded Total"
>>>>>>> f8524d526b (fix: added disable_rounded_total field)
} }
], ],
"icon": "fa fa-shopping-cart", "icon": "fa fa-shopping-cart",
"idx": 82, "idx": 82,
"is_submittable": 1, "is_submittable": 1,
"links": [], "links": [],
<<<<<<< HEAD
"modified": "2024-03-20 16:04:21.567847", "modified": "2024-03-20 16:04:21.567847",
=======
"modified": "2024-11-07 18:37:11.715189",
>>>>>>> f8524d526b (fix: added disable_rounded_total field)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Selling", "module": "Selling",
"name": "Quotation", "name": "Quotation",

View File

@@ -61,6 +61,7 @@ class Quotation(SellingController):
customer_address: DF.Link | None customer_address: DF.Link | None
customer_group: DF.Link | None customer_group: DF.Link | None
customer_name: DF.Data | None customer_name: DF.Data | None
disable_rounded_total: DF.Check
discount_amount: DF.Currency discount_amount: DF.Currency
enq_det: DF.Text | None enq_det: DF.Text | None
grand_total: DF.Currency grand_total: DF.Currency