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

Back flush issue fixed in sub contracting #1567

Browse Source
This commit is contained in:
Nabin Hait
2014-05-02 17:36:13 +05:30
parent bc83b9c1ac
commit 296d626e53
2 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
erpnext/controllers/stock_controller.py
View File

@@ -242,7 +242,7 @@ class StockController(AccountsController):
def get_sl_entries(self, d, args): def get_sl_entries(self, d, args):
sl_dict = { sl_dict = {
"item_code": d.item_code, "item_code": d.get("item_code", None),
"warehouse": d.get("warehouse", None), "warehouse": d.get("warehouse", None),
"posting_date": self.posting_date, "posting_date": self.posting_date,
"posting_time": self.posting_time, "posting_time": self.posting_time,
@@ -250,12 +250,12 @@ class StockController(AccountsController):
"voucher_no": self.name, "voucher_no": self.name,
"voucher_detail_no": d.name, "voucher_detail_no": d.name,
"actual_qty": (self.docstatus==1 and 1 or -1)*flt(d.get("stock_qty")), "actual_qty": (self.docstatus==1 and 1 or -1)*flt(d.get("stock_qty")),
"stock_uom": d.stock_uom, "stock_uom": d.get("stock_uom"),
"incoming_rate": 0, "incoming_rate": 0,
"company": self.company, "company": self.company,
"fiscal_year": self.fiscal_year, "fiscal_year": self.fiscal_year,
"batch_no": cstr(d.batch_no).strip(), "batch_no": cstr(d.get("batch_no")).strip(),
"serial_no": d.serial_no, "serial_no": d.get("serial_no"),
"project": d.get("project_name"), "project": d.get("project_name"),
"is_cancelled": self.docstatus==2 and "Yes" or "No" "is_cancelled": self.docstatus==2 and "Yes" or "No"
} }