Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests 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
commit 5da2f21aed
3 changed files with 754 additions and 754 deletions
Show Stats 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:

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

File diff suppressed because it is too large Load Diff