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

Conflicts:
	patches/patch_list.py
This commit is contained in:
Anand Doshi
2013-09-12 17:03:21 +05:30
6 changed files with 17 additions and 7 deletions

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",

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",
]

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, '') = ''""")