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

patch: update item tax rate in json format

Browse Source
This commit is contained in:
Nabin Hait
2013-03-29 10:48:41 +05:30
parent 41fe3567bb 7ab3267886
commit acecb94a0f
19 changed files with 57 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
stock/doctype/delivery_note/delivery_note.py
View File

@@ -366,6 +366,7 @@ class DocType(SellingController):
# Reduce actual qty from warehouse
self.make_sl_entry(d, d['warehouse'], - flt(d['qty']) , 0, update_stock)
get_obj('Stock Ledger', 'Stock Ledger').update_stock(self.values)

3
stock/doctype/item/item.py
View File

@@ -235,9 +235,8 @@ class DocType(DocListController):
clear_cache(self.doc.page_name)
def prepare_template_args(self):
from website.helpers.product import get_parent_item_groups, url_for_website
from website.helpers.product import get_parent_item_groups
self.parent_groups = get_parent_item_groups(self.doc.item_group) + [{"name":self.doc.name}]
self.doc.website_image = url_for_website(self.doc.website_image)
self.doc.title = self.doc.item_name
if self.doc.slideshow:

5
stock/utils.py
View File

@@ -171,7 +171,7 @@ def get_buying_amount(item_code, warehouse, qty, voucher_type, voucher_no, vouch
buying_amount = 0.0
for bom_item in item_sales_bom[item_code]:
if bom_item.get("parent_detail_docname")==voucher_detail_no:
buying_amount += _get_buying_amount(voucher_type, voucher_no, "[** No Item Row **]",
buying_amount += _get_buying_amount(voucher_type, voucher_no, voucher_detail_no,
bom_item.item_code, bom_item.warehouse or warehouse,
bom_item.total_qty or (bom_item.qty * qty), stock_ledger_entries)
return buying_amount
@@ -187,8 +187,7 @@ def _get_buying_amount(voucher_type, voucher_no, item_row, item_code, warehouse,
for i, sle in enumerate(relevant_stock_ledger_entries):
if sle.voucher_type == voucher_type and sle.voucher_no == voucher_no and \
((sle.voucher_detail_no == item_row) or (sle.voucher_type != "Stock Reconciliation"
and flt(sle.qty) == qty)):
sle.voucher_detail_no == item_row:
previous_stock_value = len(relevant_stock_ledger_entries) > i+1 and \
flt(relevant_stock_ledger_entries[i+1].stock_value) or 0.0