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

Merge pull request #44183 from frappe/mergify/bp/version-15-hotfix/pr-44025

Browse Source 
fix: `Disable Rounded Total` in Quotation DocType (backport #44025)
This commit is contained in:
ruthra kumar
2024-11-20 13:14:16 +05:30
committed by GitHub
parent 4afd4b4044 80f0d5b5ec
commit d0e2b7c341
3 changed files with 25 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
erpnext/selling/doctype/quotation/quotation.json
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,19 @@
"fieldname": "named_place", "fieldname": "named_place",
"fieldtype": "Data", "fieldtype": "Data",
"label": "Named Place" "label": "Named Place"
},
{
"default": "0",
"fieldname": "disable_rounded_total",
"fieldtype": "Check",
"label": "Disable Rounded Total"
} }
], ],
"icon": "fa fa-shopping-cart", "icon": "fa fa-shopping-cart",
"idx": 82, "idx": 82,
"is_submittable": 1, "is_submittable": 1,
"links": [], "links": [],
"modified": "2024-03-20 16:04:21.567847", "modified": "2024-11-07 18:37:11.715189",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Selling", "module": "Selling",
"name": "Quotation", "name": "Quotation",

1
erpnext/selling/doctype/quotation/quotation.py
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

14
erpnext/selling/doctype/quotation/test_quotation.py
View File

@@ -715,6 +715,20 @@ class TestQuotation(FrappeTestCase):
item_doc.taxes = [] item_doc.taxes = []
item_doc.save() item_doc.save()
def test_grand_total_and_rounded_total_values(self):
quotation = make_quotation(qty=6, rate=12.3, do_not_submit=1)
self.assertEqual(quotation.grand_total, 73.8)
self.assertEqual(quotation.rounding_adjustment, 0.2)
self.assertEqual(quotation.rounded_total, 74)
quotation.disable_rounded_total = 1
quotation.save()
self.assertEqual(quotation.grand_total, 73.8)
self.assertEqual(quotation.rounding_adjustment, 0)
self.assertEqual(quotation.rounded_total, 0)
test_records = frappe.get_test_records("Quotation") test_records = frappe.get_test_records("Quotation")