From 5601d9fbda25b9d83d92ac07197bbf9055d902af Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Fri, 20 Mar 2015 14:40:36 +0530 Subject: [PATCH 1/9] match condition in get_query --- .../stock/doctype/stock_entry/stock_entry.py | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.py b/erpnext/stock/doctype/stock_entry/stock_entry.py index 5a5904ae09c..4f45bf85b20 100644 --- a/erpnext/stock/doctype/stock_entry/stock_entry.py +++ b/erpnext/stock/doctype/stock_entry/stock_entry.py @@ -696,16 +696,15 @@ def get_batch_no(doctype, txt, searchfield, start, page_len, filters): } if filters.get("s_warehouse"): - batch_nos = frappe.db.sql("""select batch_no - from `tabStock Ledger Entry` sle - where item_code = '%(item_code)s' - and warehouse = '%(s_warehouse)s' - and batch_no like '%(txt)s' - and exists(select * from `tabBatch` - where name = sle.batch_no - and (ifnull(expiry_date, '2099-12-31') >= %(posting_date)s - or expiry_date = '') - and docstatus != 2) + batch_nos = frappe.db.sql("""select sle.batch_no + from `tabStock Ledger Entry` sle, `tabBatch` + where sle.batch_no = `tabBatch`.name + and sle.item_code = '%(item_code)s' + and sle.warehouse = '%(s_warehouse)s' + and sle.batch_no like '%(txt)s' + and (ifnull(`tabBatch`.expiry_date, '2099-12-31') >= %(posting_date)s + or `tabBatch`.expiry_date = '') + and `tabBatch`.docstatus != 2 %(mcond)s group by batch_no having sum(actual_qty) > 0 order by batch_no desc From 2ed71bac204c3a984e5db4a4c00ad1b7c74e6ba4 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Fri, 20 Mar 2015 15:06:30 +0530 Subject: [PATCH 2/9] Batch related cleanup --- erpnext/controllers/queries.py | 71 +++++++++++-------- erpnext/selling/sales_common.js | 25 ++++--- .../stock/doctype/stock_entry/stock_entry.js | 24 ++++--- .../stock/doctype/stock_entry/stock_entry.py | 46 +----------- erpnext/stock/get_item_details.py | 14 ++-- 5 files changed, 76 insertions(+), 104 deletions(-) diff --git a/erpnext/controllers/queries.py b/erpnext/controllers/queries.py index d5555324191..31727ab3565 100644 --- a/erpnext/controllers/queries.py +++ b/erpnext/controllers/queries.py @@ -5,6 +5,7 @@ from __future__ import unicode_literals import frappe from frappe.widgets.reportview import get_match_cond from frappe.model.db_query import DatabaseQuery +from frappe.utils import nowdate def get_filters_cond(doctype, filters, conditions): if filters: @@ -154,8 +155,6 @@ def tax_account_query(doctype, txt, searchfield, start, page_len, filters): return tax_accounts def item_query(doctype, txt, searchfield, start, page_len, filters): - from frappe.utils import nowdate - conditions = [] return frappe.db.sql("""select tabItem.name, @@ -229,36 +228,48 @@ def get_delivery_notes_to_be_billed(doctype, txt, searchfield, start, page_len, }, { "start": start, "page_len": page_len, "txt": ("%%%s%%" % txt) }) def get_batch_no(doctype, txt, searchfield, start, page_len, filters): - from erpnext.controllers.queries import get_match_cond + if not filters.get("posting_date"): + filters["posting_date"] = nowdate() - if filters.has_key('warehouse'): - return frappe.db.sql("""select batch_no from `tabStock Ledger Entry` sle - where item_code = '%(item_code)s' - and warehouse = '%(warehouse)s' - and batch_no like '%(txt)s' - and exists(select * from `tabBatch` - where name = sle.batch_no - and (ifnull(expiry_date, '')='' or expiry_date >= '%(posting_date)s') - and docstatus != 2) - %(mcond)s - group by batch_no having sum(actual_qty) > 0 - order by batch_no desc - limit %(start)s, %(page_len)s """ % {'item_code': filters['item_code'], - 'warehouse': filters['warehouse'], 'posting_date': filters['posting_date'], - 'txt': "%%%s%%" % txt, 'mcond':get_match_cond(doctype), - 'start': start, 'page_len': page_len}) + batch_nos = None + args = { + 'item_code': filters.get("item_code"), + 'warehouse': filters.get("warehouse"), + 'posting_date': filters.get('posting_date'), + 'txt': "%%%s%%" % txt, + 'mcond':get_match_cond(doctype), + "start": start, + "page_len": page_len + } + + if args.get("warehouse"): + batch_nos = frappe.db.sql("""select sle.batch_no + from `tabStock Ledger Entry` sle, `tabBatch` + where sle.batch_no = `tabBatch`.name + and sle.item_code = '%(item_code)s' + and sle.warehouse = '%(warehouse)s' + and sle.batch_no like '%(txt)s' + and (ifnull(`tabBatch`.expiry_date, '2099-12-31') >= %(posting_date)s + or `tabBatch`.expiry_date = '') + and `tabBatch`.docstatus != 2 + %(mcond)s + group by batch_no having sum(actual_qty) > 0 + order by batch_no desc + limit %(start)s, %(page_len)s """ + % args) + + if batch_nos: + return batch_nos else: - return frappe.db.sql("""select name from tabBatch - where docstatus != 2 - and item = '%(item_code)s' - and (ifnull(expiry_date, '')='' or expiry_date >= '%(posting_date)s') - and name like '%(txt)s' - %(mcond)s - order by name desc - limit %(start)s, %(page_len)s""" % {'item_code': filters['item_code'], - 'posting_date': filters['posting_date'], 'txt': "%%%s%%" % txt, - 'mcond':get_match_cond(doctype),'start': start, - 'page_len': page_len}) + return frappe.db.sql("""select name from `tabBatch` + where item = '%(item_code)s' + and docstatus < 2 + and (ifnull(expiry_date, '2099-12-31') >= %(posting_date)s + or expiry_date = '' or expiry_date = "0000-00-00") + %(mcond)s + order by name desc + limit %(start)s, %(page_len)s + """ % args) def get_account_list(doctype, txt, searchfield, start, page_len, filters): filter_list = [] diff --git a/erpnext/selling/sales_common.js b/erpnext/selling/sales_common.js index e905de1470d..c0f35071558 100644 --- a/erpnext/selling/sales_common.js +++ b/erpnext/selling/sales_common.js @@ -500,20 +500,23 @@ erpnext.selling.SellingController = erpnext.TransactionController.extend({ }) } }, - + batch_no: function(doc, cdt, cdn) { var me = this; var item = frappe.get_doc(cdt, cdn); - return this.frm.call({ - method: "erpnext.stock.get_item_details.get_batch_qty", - child: item, - args: { - "batch_no": item.batch_no, - "warehouse": item.warehouse, - "item_code": item.item_code - }, - "fieldname": "actual_batch_qty" - }); + + if(doc.warehouse && doc.item_code && doc.batch_no) { + return this.frm.call({ + method: "erpnext.stock.get_item_details.get_batch_qty", + child: item, + args: { + "batch_no": item.batch_no, + "warehouse": item.warehouse, + "item_code": item.item_code + }, + "fieldname": "actual_batch_qty" + }); + } }, set_dynamic_labels: function() { diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.js b/erpnext/stock/doctype/stock_entry/stock_entry.js index 61cacce5e0b..99e6af495fd 100644 --- a/erpnext/stock/doctype/stock_entry/stock_entry.js +++ b/erpnext/stock/doctype/stock_entry/stock_entry.js @@ -378,18 +378,20 @@ cur_frm.cscript.purpose = function(doc, cdt, cdn) { // Overloaded query for link batch_no cur_frm.fields_dict['mtn_details'].grid.get_field('batch_no').get_query = function(doc, cdt, cdn) { - var d = locals[cdt][cdn]; - if(d.item_code) { - return{ - query: "erpnext.stock.doctype.stock_entry.stock_entry.get_batch_no", - filters:{ - 'item_code': d.item_code, - 's_warehouse': d.s_warehouse, - 'posting_date': doc.posting_date - } - } + var item = locals[cdt][cdn]; + if(!item.item_code) { + frappe.throw(__("Please enter Item Code to get batch nos")); } else { - msgprint(__("Please enter Item Code to get batch no")); + filters = { + 'item_code': item.item_code, + 'posting_date': me.frm.doc.posting_date, + } + if(item.s_warehouse) filters["warehouse"] = item.s_warehouse + + return { + query : "erpnext.controllers.queries.get_batch_no", + filters: filters + } } } diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.py b/erpnext/stock/doctype/stock_entry/stock_entry.py index 4f45bf85b20..a9b7fe55f5f 100644 --- a/erpnext/stock/doctype/stock_entry/stock_entry.py +++ b/erpnext/stock/doctype/stock_entry/stock_entry.py @@ -5,7 +5,7 @@ from __future__ import unicode_literals import frappe import frappe.defaults -from frappe.utils import cstr, cint, flt, comma_or, nowdate +from frappe.utils import cstr, cint, flt, comma_or from frappe import _ from erpnext.stock.utils import get_incoming_rate @@ -680,50 +680,6 @@ def query_return_item(doctype, txt, searchfield, start, page_len, filters): return result[start:start+page_len] -def get_batch_no(doctype, txt, searchfield, start, page_len, filters): - if not filters.get("posting_date"): - filters["posting_date"] = nowdate() - - batch_nos = None - args = { - 'item_code': filters.get("item_code"), - 's_warehouse': filters.get('s_warehouse'), - 'posting_date': filters.get('posting_date'), - 'txt': "%%%s%%" % txt, - 'mcond':get_match_cond(doctype), - "start": start, - "page_len": page_len - } - - if filters.get("s_warehouse"): - batch_nos = frappe.db.sql("""select sle.batch_no - from `tabStock Ledger Entry` sle, `tabBatch` - where sle.batch_no = `tabBatch`.name - and sle.item_code = '%(item_code)s' - and sle.warehouse = '%(s_warehouse)s' - and sle.batch_no like '%(txt)s' - and (ifnull(`tabBatch`.expiry_date, '2099-12-31') >= %(posting_date)s - or `tabBatch`.expiry_date = '') - and `tabBatch`.docstatus != 2 - %(mcond)s - group by batch_no having sum(actual_qty) > 0 - order by batch_no desc - limit %(start)s, %(page_len)s """ - % args) - - if batch_nos: - return batch_nos - else: - return frappe.db.sql("""select name from `tabBatch` - where item = '%(item_code)s' - and docstatus < 2 - and (ifnull(expiry_date, '2099-12-31') >= %(posting_date)s - or expiry_date = '' or expiry_date = "0000-00-00") - %(mcond)s - order by name desc - limit %(start)s, %(page_len)s - """ % args) - def get_stock_items_for_return(ref_doc, parentfields): """return item codes filtered from doc, which are stock items""" if isinstance(parentfields, basestring): diff --git a/erpnext/stock/get_item_details.py b/erpnext/stock/get_item_details.py index 6d01c33644e..cbf5f34a1f1 100644 --- a/erpnext/stock/get_item_details.py +++ b/erpnext/stock/get_item_details.py @@ -279,13 +279,13 @@ def get_serial_nos_by_fifo(args, item_doc): })) def get_actual_batch_qty(batch_no,warehouse,item_code): - actual_batch_qty = 0 - if batch_no: - actual_batch_qty = flt(frappe.db.sql("""select sum(actual_qty) - from `tabStock Ledger Entry` - where warehouse=%s and item_code=%s and batch_no=%s""", - (warehouse, item_code, batch_no))[0][0]) - return actual_batch_qty + actual_batch_qty = 0 + if batch_no: + actual_batch_qty = flt(frappe.db.sql("""select sum(actual_qty) + from `tabStock Ledger Entry` + where warehouse=%s and item_code=%s and batch_no=%s""", + (warehouse, item_code, batch_no))[0][0]) + return actual_batch_qty @frappe.whitelist() def get_conversion_factor(item_code, uom): From 63e00dcfd22fcd63968fec03d26855589f8aef58 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Fri, 20 Mar 2015 16:25:53 +0530 Subject: [PATCH 3/9] Set qty as per stock_uom while mapping Material request to Purchase order --- erpnext/stock/doctype/material_request/material_request.py | 1 + 1 file changed, 1 insertion(+) diff --git a/erpnext/stock/doctype/material_request/material_request.py b/erpnext/stock/doctype/material_request/material_request.py index e87ceb0a0e1..ff11f267848 100644 --- a/erpnext/stock/doctype/material_request/material_request.py +++ b/erpnext/stock/doctype/material_request/material_request.py @@ -185,6 +185,7 @@ def set_missing_values(source, target_doc): def update_item(obj, target, source_parent): target.conversion_factor = 1 target.qty = flt(obj.qty) - flt(obj.ordered_qty) + target.stock_qty = target.qty @frappe.whitelist() def make_purchase_order(source_name, target_doc=None): From e07e5bbe008f9df03855944a35b9a79ba3cde783 Mon Sep 17 00:00:00 2001 From: Pratik Vyas Date: Fri, 20 Mar 2015 18:02:07 +0600 Subject: [PATCH 4/9] bumped to version 4.24.2 --- erpnext/__version__.py | 2 +- erpnext/hooks.py | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/erpnext/__version__.py b/erpnext/__version__.py index 5886dcc9613..4898e44e7b9 100644 --- a/erpnext/__version__.py +++ b/erpnext/__version__.py @@ -1,2 +1,2 @@ from __future__ import unicode_literals -__version__ = '4.24.1' +__version__ = '4.24.2' diff --git a/erpnext/hooks.py b/erpnext/hooks.py index 15ed3921882..00c752b7b8a 100644 --- a/erpnext/hooks.py +++ b/erpnext/hooks.py @@ -5,7 +5,7 @@ app_publisher = "Web Notes Technologies Pvt. Ltd. and Contributors" app_description = "Open Source Enterprise Resource Planning for Small and Midsized Organizations" app_icon = "icon-th" app_color = "#e74c3c" -app_version = "4.24.1" +app_version = "4.24.2" error_report_email = "support@erpnext.com" diff --git a/setup.py b/setup.py index 622575385f0..5b1dab73b96 100644 --- a/setup.py +++ b/setup.py @@ -1,7 +1,7 @@ from setuptools import setup, find_packages import os -version = "4.24.1" +version = "4.24.2" with open("requirements.txt", "r") as f: install_requires = f.readlines() From 7057970c0cb064295f7170ac2b5f1e58c967e8b0 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Thu, 26 Mar 2015 11:04:41 +0530 Subject: [PATCH 5/9] purchase order items to be billed report --- .../purchase_order_items_to_be_billed.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.json b/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.json index e3a658e5c7a..42e37fd6c75 100644 --- a/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.json +++ b/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.json @@ -6,12 +6,12 @@ "doctype": "Report", "idx": 1, "is_standard": "Yes", - "modified": "2014-06-03 07:18:17.244501", + "modified": "2015-03-26 11:00:48.720037", "modified_by": "Administrator", "module": "Accounts", "name": "Purchase Order Items To Be Billed", "owner": "Administrator", - "query": "select \n `tabPurchase Order`.`name` as \"Purchase Order:Link/Purchase Order:120\",\n `tabPurchase Order`.`transaction_date` as \"Date:Date:100\",\n\t`tabPurchase Order`.`supplier` as \"Supplier:Link/Supplier:120\",\n\t`tabPurchase Order Item`.`project_name` as \"Project\",\n\t`tabPurchase Order Item`.item_code as \"Item Code:Link/Item:120\",\n\t`tabPurchase Order Item`.base_amount as \"Amount:Currency:100\",\n\t`tabPurchase Order Item`.billed_amt as \"Billed Amount:Currency:100\", \n\t(`tabPurchase Order Item`.base_amount - ifnull(`tabPurchase Order Item`.billed_amt, 0)) as \"Amount to Bill:Currency:100\",\n\t`tabPurchase Order Item`.item_name as \"Item Name::150\",\n\t`tabPurchase Order Item`.description as \"Description::200\"\nfrom\n\t`tabPurchase Order`, `tabPurchase Order Item`\nwhere\n\t`tabPurchase Order Item`.`parent` = `tabPurchase Order`.`name`\n\tand `tabPurchase Order`.docstatus = 1\n\tand `tabPurchase Order`.status != \"Stopped\"\n\tand ifnull(`tabPurchase Order Item`.billed_amt, 0) < ifnull(`tabPurchase Order Item`.base_amount, 0)\norder by `tabPurchase Order`.transaction_date asc", + "query": "select \n `tabPurchase Order`.`name` as \"Purchase Order:Link/Purchase Order:120\",\n `tabPurchase Order`.`transaction_date` as \"Date:Date:100\",\n\t`tabPurchase Order`.`supplier` as \"Supplier:Link/Supplier:120\",\n\t`tabPurchase Order Item`.`project_name` as \"Project\",\n\t`tabPurchase Order Item`.item_code as \"Item Code:Link/Item:120\",\n\t`tabPurchase Order Item`.base_amount as \"Amount:Currency:100\",\n\t(`tabPurchase Order Item`.billed_amt * ifnull(`tabPurchase Order`.conversion_rate, 1)) as \"Billed Amount:Currency:100\", \n\t(`tabPurchase Order Item`.base_amount - (ifnull(`tabPurchase Order Item`.billed_amt, 0) * ifnull(`tabPurchase Order`.conversion_rate, 1))) as \"Amount to Bill:Currency:100\",\n\t`tabPurchase Order Item`.item_name as \"Item Name::150\",\n\t`tabPurchase Order Item`.description as \"Description::200\"\nfrom\n\t`tabPurchase Order`, `tabPurchase Order Item`\nwhere\n\t`tabPurchase Order Item`.`parent` = `tabPurchase Order`.`name`\n\tand `tabPurchase Order`.docstatus = 1\n\tand `tabPurchase Order`.status != \"Stopped\"\n\tand (ifnull(`tabPurchase Order Item`.billed_amt, 0) * ifnull(`tabPurchase Order`.conversion_rate, 1)) < ifnull(`tabPurchase Order Item`.base_amount, 0)\norder by `tabPurchase Order`.transaction_date asc", "ref_doctype": "Purchase Invoice", "report_name": "Purchase Order Items To Be Billed", "report_type": "Query Report" From 54c865e77c4b17e6e11d0642626e6b71b4a9303c Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Fri, 27 Mar 2015 15:38:31 +0530 Subject: [PATCH 6/9] Landed cost voucher: fixes for serialized item --- erpnext/controllers/stock_controller.py | 5 +++-- erpnext/stock/doctype/bin/bin.py | 4 ++-- .../landed_cost_voucher/landed_cost_voucher.py | 17 +++++++++++++++-- .../purchase_receipt/purchase_receipt.py | 5 +++-- .../stock_ledger_entry/stock_ledger_entry.py | 5 +++-- erpnext/stock/stock_ledger.py | 15 +++++++++------ erpnext/stock/utils.py | 4 ++-- 7 files changed, 37 insertions(+), 18 deletions(-) diff --git a/erpnext/controllers/stock_controller.py b/erpnext/controllers/stock_controller.py index 7fed7367b1d..487f406f77a 100644 --- a/erpnext/controllers/stock_controller.py +++ b/erpnext/controllers/stock_controller.py @@ -197,9 +197,10 @@ class StockController(AccountsController): sl_dict.update(args) return sl_dict - def make_sl_entries(self, sl_entries, is_amended=None, allow_negative_stock=False): + def make_sl_entries(self, sl_entries, is_amended=None, allow_negative_stock=False, + via_landed_cost_voucher=False): from erpnext.stock.stock_ledger import make_sl_entries - make_sl_entries(sl_entries, is_amended, allow_negative_stock) + make_sl_entries(sl_entries, is_amended, allow_negative_stock, via_landed_cost_voucher) def make_gl_entries_on_cancel(self): if frappe.db.sql("""select name from `tabGL Entry` where voucher_type=%s diff --git a/erpnext/stock/doctype/bin/bin.py b/erpnext/stock/doctype/bin/bin.py index 1fb1e2d1672..242d4faad3e 100644 --- a/erpnext/stock/doctype/bin/bin.py +++ b/erpnext/stock/doctype/bin/bin.py @@ -23,7 +23,7 @@ class Bin(Document): if (not getattr(self, f, None)) or (not self.get(f)): self.set(f, 0.0) - def update_stock(self, args, allow_negative_stock=False): + def update_stock(self, args, allow_negative_stock=False, via_landed_cost_voucher=False): self.update_qty(args) if args.get("actual_qty") or args.get("voucher_type") == "Stock Reconciliation": @@ -38,7 +38,7 @@ class Bin(Document): "warehouse": self.warehouse, "posting_date": args.get("posting_date"), "posting_time": args.get("posting_time") - }, allow_negative_stock=allow_negative_stock) + }, allow_negative_stock=allow_negative_stock, via_landed_cost_voucher=via_landed_cost_voucher) def update_qty(self, args): # update the stock values (for current quantities) diff --git a/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py b/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py index 16f0f1c82ef..d35fed856d5 100644 --- a/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +++ b/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py @@ -6,6 +6,7 @@ import frappe from frappe import _ from frappe.utils import flt from frappe.model.document import Document +from erpnext.stock.doctype.serial_no.serial_no import get_serial_nos class LandedCostVoucher(Document): def get_items_from_purchase_receipts(self): @@ -92,13 +93,25 @@ class LandedCostVoucher(Document): # save will update landed_cost_voucher_amount and voucher_amount in PR, # as those fields are allowed to edit after submit pr.save() + + # update latest valuation rate in serial no + self.update_rate_in_serial_no(pr) # update stock & gl entries for cancelled state of PR pr.docstatus = 2 - pr.update_stock_ledger(allow_negative_stock=True) + pr.update_stock_ledger(allow_negative_stock=True, via_landed_cost_voucher=True) pr.make_gl_entries_on_cancel() + # update stock & gl entries for submit state of PR pr.docstatus = 1 - pr.update_stock_ledger() + pr.update_stock_ledger(via_landed_cost_voucher=True) pr.make_gl_entries() + + def update_rate_in_serial_no(self, purchase_receipt): + for item in purchase_receipt.get("purchase_receipt_details"): + if item.serial_no: + serial_nos = get_serial_nos(item.serial_no) + if serial_nos: + frappe.db.sql("update `tabSerial No` set purchase_rate=%s where name in ({0})" + .format(", ".join(["%s"]*len(serial_nos))), tuple([item.valuation_rate] + serial_nos)) \ No newline at end of file diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py index abc08598290..448581c31be 100644 --- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py @@ -129,7 +129,7 @@ class PurchaseReceipt(BuyingController): if not d.prevdoc_docname: frappe.throw(_("Purchase Order number required for Item {0}").format(d.item_code)) - def update_stock_ledger(self, allow_negative_stock=False): + def update_stock_ledger(self, allow_negative_stock=False, via_landed_cost_voucher=False): sl_entries = [] stock_items = self.get_stock_items() @@ -154,7 +154,8 @@ class PurchaseReceipt(BuyingController): })) self.bk_flush_supp_wh(sl_entries) - self.make_sl_entries(sl_entries, allow_negative_stock=allow_negative_stock) + self.make_sl_entries(sl_entries, allow_negative_stock=allow_negative_stock, + via_landed_cost_voucher=via_landed_cost_voucher) def update_ordered_qty(self): po_map = {} diff --git a/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py b/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py index b5de2554f98..4d6e6b04854 100644 --- a/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +++ b/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py @@ -27,8 +27,9 @@ class StockLedgerEntry(Document): self.check_stock_frozen_date() self.actual_amt_check() - from erpnext.stock.doctype.serial_no.serial_no import process_serial_no - process_serial_no(self) + if not self.get("via_landed_cost_voucher"): + from erpnext.stock.doctype.serial_no.serial_no import process_serial_no + process_serial_no(self) #check for item quantity available in stock def actual_amt_check(self): diff --git a/erpnext/stock/stock_ledger.py b/erpnext/stock/stock_ledger.py index 97a1f82157b..65469456705 100644 --- a/erpnext/stock/stock_ledger.py +++ b/erpnext/stock/stock_ledger.py @@ -14,7 +14,7 @@ class NegativeStockError(frappe.ValidationError): pass _exceptions = frappe.local('stockledger_exceptions') # _exceptions = [] -def make_sl_entries(sl_entries, is_amended=None, allow_negative_stock=False): +def make_sl_entries(sl_entries, is_amended=None, allow_negative_stock=False, via_landed_cost_voucher=False): if sl_entries: from erpnext.stock.utils import update_bin @@ -28,14 +28,14 @@ def make_sl_entries(sl_entries, is_amended=None, allow_negative_stock=False): sle['actual_qty'] = -flt(sle['actual_qty']) if sle.get("actual_qty") or sle.get("voucher_type")=="Stock Reconciliation": - sle_id = make_entry(sle, allow_negative_stock) + sle_id = make_entry(sle, allow_negative_stock, via_landed_cost_voucher) args = sle.copy() args.update({ "sle_id": sle_id, "is_amended": is_amended }) - update_bin(args, allow_negative_stock) + update_bin(args, allow_negative_stock, via_landed_cost_voucher) if cancel: delete_cancelled_entry(sl_entries[0].get('voucher_type'), sl_entries[0].get('voucher_no')) @@ -46,11 +46,12 @@ def set_as_cancel(voucher_type, voucher_no): where voucher_no=%s and voucher_type=%s""", (now(), frappe.session.user, voucher_type, voucher_no)) -def make_entry(args, allow_negative_stock=False): +def make_entry(args, allow_negative_stock=False, via_landed_cost_voucher=False): args.update({"doctype": "Stock Ledger Entry"}) sle = frappe.get_doc(args) sle.ignore_permissions = 1 sle.allow_negative_stock=allow_negative_stock + sle.via_landed_cost_voucher = via_landed_cost_voucher sle.insert() sle.submit() return sle.name @@ -59,7 +60,9 @@ def delete_cancelled_entry(voucher_type, voucher_no): frappe.db.sql("""delete from `tabStock Ledger Entry` where voucher_type=%s and voucher_no=%s""", (voucher_type, voucher_no)) -def update_entries_after(args, allow_zero_rate=False, allow_negative_stock=False, verbose=1): +def update_entries_after(args, allow_zero_rate=False, allow_negative_stock=False, + via_landed_cost_voucher=False, verbose=1): + """ update valution rate and qty after transaction from the current time-bucket onwards @@ -91,7 +94,7 @@ def update_entries_after(args, allow_zero_rate=False, allow_negative_stock=False stock_value_difference = 0.0 for sle in entries_to_fix: - if sle.serial_no or not allow_negative_stock: + if (sle.serial_no and not via_landed_cost_voucher) or not allow_negative_stock: # validate negative stock for serialized items, fifo valuation # or when negative stock is not allowed for moving average if not validate_negative_stock(qty_after_transaction, sle): diff --git a/erpnext/stock/utils.py b/erpnext/stock/utils.py index b5638c85b90..37326b7d3e4 100644 --- a/erpnext/stock/utils.py +++ b/erpnext/stock/utils.py @@ -53,11 +53,11 @@ def get_bin(item_code, warehouse): bin_obj.ignore_permissions = True return bin_obj -def update_bin(args, allow_negative_stock=False): +def update_bin(args, allow_negative_stock=False, via_landed_cost_voucher=False): is_stock_item = frappe.db.get_value('Item', args.get("item_code"), 'is_stock_item') if is_stock_item == 'Yes': bin = get_bin(args.get("item_code"), args.get("warehouse")) - bin.update_stock(args, allow_negative_stock) + bin.update_stock(args, allow_negative_stock, via_landed_cost_voucher) return bin else: frappe.msgprint(_("Item {0} ignored since it is not a stock item").format(args.get("item_code"))) From 10224c9d8661b200c1be577962f4c31c9e754219 Mon Sep 17 00:00:00 2001 From: Pratik Vyas Date: Mon, 30 Mar 2015 13:11:48 +0600 Subject: [PATCH 7/9] bumped to version 4.24.3 --- erpnext/__version__.py | 2 +- erpnext/hooks.py | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/erpnext/__version__.py b/erpnext/__version__.py index 4898e44e7b9..7b6f237255a 100644 --- a/erpnext/__version__.py +++ b/erpnext/__version__.py @@ -1,2 +1,2 @@ from __future__ import unicode_literals -__version__ = '4.24.2' +__version__ = '4.24.3' diff --git a/erpnext/hooks.py b/erpnext/hooks.py index 00c752b7b8a..ea136702aba 100644 --- a/erpnext/hooks.py +++ b/erpnext/hooks.py @@ -5,7 +5,7 @@ app_publisher = "Web Notes Technologies Pvt. Ltd. and Contributors" app_description = "Open Source Enterprise Resource Planning for Small and Midsized Organizations" app_icon = "icon-th" app_color = "#e74c3c" -app_version = "4.24.2" +app_version = "4.24.3" error_report_email = "support@erpnext.com" diff --git a/setup.py b/setup.py index 5b1dab73b96..217cc84d070 100644 --- a/setup.py +++ b/setup.py @@ -1,7 +1,7 @@ from setuptools import setup, find_packages import os -version = "4.24.2" +version = "4.24.3" with open("requirements.txt", "r") as f: install_requires = f.readlines() From a4fa96cc79754e2f1fb60599cefe8f72454eb1fd Mon Sep 17 00:00:00 2001 From: Sambhaji Kolate Date: Mon, 30 Mar 2015 16:04:55 +0530 Subject: [PATCH 8/9] some fix in batch related cleanup --- erpnext/selling/sales_common.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/selling/sales_common.js b/erpnext/selling/sales_common.js index c0f35071558..117232dc2cc 100644 --- a/erpnext/selling/sales_common.js +++ b/erpnext/selling/sales_common.js @@ -505,7 +505,7 @@ erpnext.selling.SellingController = erpnext.TransactionController.extend({ var me = this; var item = frappe.get_doc(cdt, cdn); - if(doc.warehouse && doc.item_code && doc.batch_no) { + if(item.warehouse && item.item_code && item.batch_no) { return this.frm.call({ method: "erpnext.stock.get_item_details.get_batch_qty", child: item, From 1b41b50a955bb1c5f42f06decf838554efe1417b Mon Sep 17 00:00:00 2001 From: Pratik Vyas Date: Tue, 31 Mar 2015 13:13:52 +0530 Subject: [PATCH 9/9] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b9dc4bff0b2..6f3325480cc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,7 +19,7 @@ install: - sudo apt-get install xfonts-75dpi xfonts-base -y - wget http://downloads.sourceforge.net/project/wkhtmltopdf/0.12.2.1/wkhtmltox-0.12.2.1_linux-precise-amd64.deb - sudo dpkg -i wkhtmltox-0.12.2.1_linux-precise-amd64.deb - - CFLAGS=-O0 pip install git+https://github.com/frappe/frappe.git@develop + - CFLAGS=-O0 pip install git+https://github.com/frappe/frappe.git@v4.x.x - CFLAGS=-O0 pip install --editable . before_script: