From e68103be30eef0ccb840fc18980518b0e74d5697 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Tue, 19 Mar 2013 12:34:47 +0530 Subject: [PATCH] fixes in reorder level and company --- setup/doctype/company/company.py | 8 +++----- stock/doctype/bin/bin.py | 19 +++++-------------- stock/doctype/item_reorder/item_reorder.txt | 13 ++++++++----- 3 files changed, 16 insertions(+), 24 deletions(-) diff --git a/setup/doctype/company/company.py b/setup/doctype/company/company.py index 405171760b..e895b49fdc 100644 --- a/setup/doctype/company/company.py +++ b/setup/doctype/company/company.py @@ -47,12 +47,11 @@ class DocType: ['Loans and Advances (Assets)','Current Assets','Group','No','','Debit',self.doc.name,''], ['Securities and Deposits','Current Assets','Group','No','','Debit',self.doc.name,''], ['Earnest Money','Securities and Deposits','Ledger','No','','Debit',self.doc.name,''], - ['Stock In Hand','Current Assets','Group','No','','Debit',self.doc.name,''], - ['Stock','Stock In Hand','Ledger','No','','Debit',self.doc.name,''], - ['Stock Delivered But Not Billed', 'Stock In Hand', 'Ledger', + ['Stock Assets','Current Assets','Group','No','','Debit',self.doc.name,''], + ['Stock In Hand','Stock Assets','Ledger','No','','Debit',self.doc.name,''], + ['Stock Delivered But Not Billed', 'Stock Assets', 'Ledger', 'No', '', 'Debit', self.doc.name, ''], ['Tax Assets','Current Assets','Group','No','','Debit',self.doc.name,''], - ['Stock Delivered But Not Billed','Current Assets','Ledger','No','','Debit',self.doc.name,''], ['Fixed Assets','Application of Funds (Assets)','Group','No','','Debit',self.doc.name,''], ['Capital Equipments','Fixed Assets','Ledger','No','Fixed Asset Account','Debit',self.doc.name,''], ['Computers','Fixed Assets','Ledger','No','Fixed Asset Account','Debit',self.doc.name,''], @@ -111,7 +110,6 @@ class DocType: ['Secured Loans','Loans (Liabilities)','Group','No','','Credit',self.doc.name,''], ['Unsecured Loans','Loans (Liabilities)','Group','No','','Credit',self.doc.name,''], ['Bank Overdraft Account','Loans (Liabilities)','Group','No','','Credit',self.doc.name,''], - ['Stock Received But Not Billed','Current Liabilities','Ledger','No','','Credit',self.doc.name,''], ['Temporary Accounts (Liabilities)','Source of Funds (Liabilities)','Group','No','','Credit',self.doc.name,''], ['Temporary Account (Liabilities)','Temporary Accounts (Liabilities)','Ledger','No','','Credit',self.doc.name,''] ] diff --git a/stock/doctype/bin/bin.py b/stock/doctype/bin/bin.py index 37ecf85d2c..204053d9ee 100644 --- a/stock/doctype/bin/bin.py +++ b/stock/doctype/bin/bin.py @@ -16,15 +16,8 @@ from __future__ import unicode_literals import webnotes -from webnotes import _ - -from webnotes.utils import add_days, cint, cstr, flt, now, nowdate, \ - get_url_to_form, formatdate -from webnotes.model import db_exists -from webnotes.model.doc import Document, addchild -from webnotes.model.bean import copy_doclist -from webnotes.model.code import get_obj -from webnotes import msgprint +from webnotes.utils import add_days, cint,flt, nowdate, get_url_to_form, formatdate +from webnotes import msgprint, _ sql = webnotes.conn.sql import webnotes.defaults @@ -61,7 +54,7 @@ class DocType: from stock.stock_ledger import update_entries_after if not args.get("posting_date"): - posting_date = nowdate() + args["posting_date"] = nowdate() # update valuation and qty after transaction for post dated entry update_entries_after({ @@ -108,11 +101,10 @@ class DocType: #check if re-order is required item_reorder = webnotes.conn.get("Item Reorder", {"parent": self.doc.item_code, "warehouse": self.doc.warehouse}) - if item_reorder: reorder_level = item_reorder.warehouse_reorder_level reorder_qty = item_reorder.warehouse_reorder_qty - material_request_type = item_reorder.material_request_type + material_request_type = item_reorder.material_request_type or "Purchase" else: reorder_level, reorder_qty = webnotes.conn.get_value("Item", self.doc.item_code, ["re_order_level", "re_order_qty"]) @@ -123,7 +115,7 @@ class DocType: material_request_type) def create_material_request(self, doc_type, doc_name, reorder_level, reorder_qty, - material_request_type): + material_request_type="Purchase"): """ Create indent on reaching reorder level """ defaults = webnotes.defaults.get_defaults() item = webnotes.doc("Item", self.doc.item_code) @@ -151,7 +143,6 @@ class DocType: "qty": reorder_qty, "brand": item.brand, }]) - mr.insert() mr.submit() diff --git a/stock/doctype/item_reorder/item_reorder.txt b/stock/doctype/item_reorder/item_reorder.txt index 43ed4fed86..b6933c7458 100644 --- a/stock/doctype/item_reorder/item_reorder.txt +++ b/stock/doctype/item_reorder/item_reorder.txt @@ -1,8 +1,8 @@ [ { - "creation": "2013-02-22 01:28:01", + "creation": "2013-03-07 11:42:59", "docstatus": 0, - "modified": "2013-03-07 07:03:22", + "modified": "2013-03-19 12:22:44", "modified_by": "Administrator", "owner": "Administrator" }, @@ -20,7 +20,8 @@ "parent": "Item Reorder", "parentfield": "fields", "parenttype": "DocType", - "permlevel": 0 + "permlevel": 0, + "read_only": 0 }, { "doctype": "DocType", @@ -38,7 +39,8 @@ "doctype": "DocField", "fieldname": "warehouse_reorder_level", "fieldtype": "Float", - "label": "Re-order Level" + "label": "Re-order Level", + "reqd": 1 }, { "doctype": "DocField", @@ -51,6 +53,7 @@ "fieldname": "material_request_type", "fieldtype": "Select", "label": "Material Request Type", - "options": "Purchase\nTransfer" + "options": "Purchase\nTransfer", + "reqd": 1 } ] \ No newline at end of file