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

Merge pull request #1603 from nabinhait/v4-hotfix

Browse Source 
fixes
This commit is contained in:
Nabin Hait
2014-05-07 19:22:02 +05:30
parent 17425a24c6 e37b8e6682
commit 5da2f21aed
3 changed files with 754 additions and 754 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/controllers/accounts_controller.py
View File

@@ -299,9 +299,9 @@ class AccountsController(TransactionBase):
key = item.item_code or item.item_name key = item.item_code or item.item_name
if tax.item_wise_tax_detail.get(key): if tax.item_wise_tax_detail.get(key):
item_wise_tax_amount = tax.item_wise_tax_detail[key][1] + current_tax_amount 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: 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 return current_tax_amount
@@ -316,7 +316,7 @@ class AccountsController(TransactionBase):
def _cleanup(self): def _cleanup(self):
for tax in self.tax_doclist: 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): def _set_in_company_currency(self, item, print_field, base_field):
"""set values in base currency""" """set values in base currency"""

2
erpnext/controllers/queries.py
View File

@@ -20,7 +20,7 @@ def get_filters_cond(doctype, filters, conditions):
query = DatabaseQuery(doctype) query = DatabaseQuery(doctype)
query.filters = flt query.filters = flt
query.conditions = conditions query.conditions = conditions
query.build_filter_conditions() query.build_filter_conditions(flt, conditions)
cond = ' and ' + ' and '.join(query.conditions) cond = ' and ' + ' and '.join(query.conditions)
else: else:

2
erpnext/selling/doctype/sales_order/sales_order.json
View File

@@ -874,7 +874,7 @@
"idx": 1, "idx": 1,
"is_submittable": 1, "is_submittable": 1,
"issingle": 0, "issingle": 0,
"modified": "2014-05-07 05:38:12.866900", "modified": "2014-05-07 14:37:33.548622",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Selling", "module": "Selling",
"name": "Sales Order", "name": "Sales Order",