From 90f2d8d9fc703abe0f5b046e539f9b56c2c3a09e Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Wed, 7 May 2014 14:55:09 +0530 Subject: [PATCH 1/2] minor fix --- erpnext/controllers/accounts_controller.py | 6 +++--- erpnext/selling/doctype/sales_order/sales_order.json | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/erpnext/controllers/accounts_controller.py b/erpnext/controllers/accounts_controller.py index c088042864..9033065bd9 100644 --- a/erpnext/controllers/accounts_controller.py +++ b/erpnext/controllers/accounts_controller.py @@ -299,9 +299,9 @@ class AccountsController(TransactionBase): key = item.item_code or item.item_name if tax.item_wise_tax_detail.get(key): item_wise_tax_amount = tax.item_wise_tax_detail[key][1] + current_tax_amount - tax.item_wise_tax_detail[key] = [tax_rate, item_wise_tax_amount] + tax.item_wise_tax_detail[key] = [tax_rate,item_wise_tax_amount] else: - tax.item_wise_tax_detail[key] = [tax_rate, current_tax_amount] + tax.item_wise_tax_detail[key] = [tax_rate,current_tax_amount] return current_tax_amount @@ -316,7 +316,7 @@ class AccountsController(TransactionBase): def _cleanup(self): for tax in self.tax_doclist: - tax.item_wise_tax_detail = json.dumps(tax.item_wise_tax_detail) + tax.item_wise_tax_detail = json.dumps(tax.item_wise_tax_detail, separators=(',', ':')) def _set_in_company_currency(self, item, print_field, base_field): """set values in base currency""" diff --git a/erpnext/selling/doctype/sales_order/sales_order.json b/erpnext/selling/doctype/sales_order/sales_order.json index 102abc0eef..35fd8fbc92 100644 --- a/erpnext/selling/doctype/sales_order/sales_order.json +++ b/erpnext/selling/doctype/sales_order/sales_order.json @@ -2,7 +2,7 @@ "allow_attach": 1, "allow_import": 1, "autoname": "naming_series:", - "creation": "2013-06-18 12:39:59.000000", + "creation": "2013-06-18 12:39:59", "docstatus": 0, "doctype": "DocType", "document_type": "Transaction", @@ -874,7 +874,7 @@ "idx": 1, "is_submittable": 1, "issingle": 0, - "modified": "2014-01-28 18:47:42.000000", + "modified": "2014-05-07 14:37:33.548622", "modified_by": "Administrator", "module": "Selling", "name": "Sales Order", From 23649c6852c20686f456ef099edf8d0c59aa34b2 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Wed, 7 May 2014 19:18:15 +0530 Subject: [PATCH 2/2] fixe in query.py --- erpnext/controllers/queries.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/controllers/queries.py b/erpnext/controllers/queries.py index 4547276f28..5cc7f6448c 100644 --- a/erpnext/controllers/queries.py +++ b/erpnext/controllers/queries.py @@ -20,7 +20,7 @@ def get_filters_cond(doctype, filters, conditions): query = DatabaseQuery(doctype) query.filters = flt query.conditions = conditions - query.build_filter_conditions() + query.build_filter_conditions(flt, conditions) cond = ' and ' + ' and '.join(query.conditions) else: