nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-07 07:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replaced renamed total fields in code files

Browse Source
This commit is contained in:
Nabin Hait
2015-02-12 16:09:11 +05:30
parent dd1c2d3018
commit 5690be103c
67 changed files with 1235 additions and 1241 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/shopping_cart/cart.py
View File

@@ -144,7 +144,7 @@ def decorate_quotation_doc(quotation_doc):
d["formatted_tax_amount"] = fmt_money(flt(d.get("tax_amount")) / doc.conversion_rate,
currency=doc.currency)
doc.formatted_grand_total_export = fmt_money(doc.grand_total_export,
doc.formatted_grand_total_export = fmt_money(doc.grand_total,
currency=doc.currency)
return doc

6
erpnext/shopping_cart/test_shopping_cart.py
View File

@@ -84,7 +84,7 @@ class TestShoppingCart(unittest.TestCase):
self.assertEquals(quotation.get("items")[0].item_code, "_Test Item")
self.assertEquals(quotation.get("items")[0].qty, 5)
self.assertEquals(quotation.get("items")[0].amount, 50)
self.assertEquals(quotation.net_total, 70)
self.assertEquals(quotation.base_net_total, 70)
self.assertEquals(len(quotation.get("items")), 2)
def test_remove_from_cart(self):
@@ -97,13 +97,13 @@ class TestShoppingCart(unittest.TestCase):
self.assertEquals(quotation.get("items")[0].item_code, "_Test Item 2")
self.assertEquals(quotation.get("items")[0].qty, 1)
self.assertEquals(quotation.get("items")[0].amount, 20)
self.assertEquals(quotation.net_total, 20)
self.assertEquals(quotation.base_net_total, 20)
self.assertEquals(len(quotation.get("items")), 1)
# remove second item
set_item_in_cart("_Test Item 2", 0)
quotation = self.test_get_cart_lead()
self.assertEquals(quotation.net_total, 0)
self.assertEquals(quotation.base_net_total, 0)
self.assertEquals(len(quotation.get("items")), 0)
def test_set_billing_address(self):