Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixes in reorder level and company

Browse Source
This commit is contained in:
Nabin Hait 2013-03-19 12:34:47 +05:30
parent 928355ad9a
commit e68103be30
3 changed files with 16 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
setup/doctype/company/company.py
View File

@ -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,'']
]

19
stock/doctype/bin/bin.py
View File

@ -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()

13
stock/doctype/item_reorder/item_reorder.txt
View File

@ -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
}
]