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

Merge branch 'master' of github.com:webnotes/erpnext into website-wip

Browse Source 
Conflicts:
	patches/patch_list.py
This commit is contained in:
Anand Doshi 2013-09-12 17:03:21 +05:30
commit 155d985cd4
6 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
patches/december_2012/address_title.py
View File

@ -9,9 +9,6 @@ def execute():
webnotes.conn.sql("""update tabAddress set address_title = customer_name where ifnull(customer_name,'')!=''""")
webnotes.conn.sql("""update tabAddress set address_title = supplier_name where ifnull(supplier_name,'')!=''""")
webnotes.conn.sql("""update tabAddress set address_title = sales_partner where ifnull(sales_partner,'')!=''""")
webnotes.reload_doc("website", "doctype", "product_settings")
webnotes.reset_perms("Product Settings")
# move code to new doctype
webnotes.conn.set_value("Website Script", None, "javascript",

3
patches/patch_list.py
View File

@ -263,5 +263,6 @@ patch_list = [
"patches.september_2013.p01_update_communication",
"execute:webnotes.reload_doc('setup', 'doctype', 'features_setup') # 2013-09-05",
"patches.september_2013.p02_fix_serial_no_status",
"patches.september_2013.p03_move_website_to_framework"
"patches.september_2013.p03_update_stock_uom_in_sle",
"patches.september_2013.p03_move_website_to_framework",
]

9
patches/september_2013/p03_update_stock_uom_in_sle.py Normal file
View File

@ -0,0 +1,9 @@
# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd.
# License: GNU General Public License v3. See license.txt
from __future__ import unicode_literals
import webnotes
def execute():
webnotes.conn.sql("""update `tabStock Ledger Entry` sle, tabItem i
set sle.stock_uom = i.stock_uom
where sle.item_code = i.name and ifnull(sle.stock_uom, '') = ''""")

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

@ -70,7 +70,6 @@ class DocType(DocListController):
matched=True
ref_uom = webnotes.conn.get_value("Stock Ledger Entry",
{"item_code": self.doc.name, "is_cancelled": "No"}, "stock_uom")
if ref_uom:
if cstr(ref_uom) != cstr(self.doc.stock_uom):
matched = False

7
stock/doctype/stock_ledger_entry/stock_ledger_entry.py
View File

@ -72,7 +72,7 @@ class DocType(DocListController):
def validate_item(self):
item_det = webnotes.conn.sql("""select name, has_batch_no, docstatus,
is_stock_item, has_serial_no, serial_no_series
is_stock_item, has_serial_no, serial_no_series, stock_uom
from tabItem where name=%s""",
self.doc.item_code, as_dict=True)[0]
@ -88,7 +88,10 @@ class DocType(DocListController):
if not webnotes.conn.sql("""select name from `tabBatch`
where item='%s' and name ='%s' and docstatus != 2""" % (self.doc.item_code, self.doc.batch_no)):
webnotes.throw("'%s' is not a valid Batch Number for Item '%s'" % (self.doc.batch_no, self.doc.item_code))
if not self.doc.stock_uom:
self.doc.stock_uom = item_det.stock_uom
self.validate_serial_no(item_det)
def validate_serial_no(self, item_det):

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

@ -243,6 +243,7 @@ class DocType(StockController):
"voucher_type": self.doc.doctype,
"voucher_no": self.doc.name,
"company": self.doc.company,
"stock_uom": webnotes.conn.get_value("Item", row.item_code, "stock_uom"),
"is_cancelled": "No",
"voucher_detail_no": row.voucher_detail_no,
"fiscal_year": self.doc.fiscal_year,