Merge branch 'master' into edge

Conflicts:
	accounts/doctype/sales_invoice/sales_invoice.txt
	stock/doctype/item/item.txt
This commit is contained in:
Anand Doshi
2013-04-23 12:42:18 +05:30
17 changed files with 602 additions and 285 deletions

View File

@@ -11,4 +11,4 @@ def execute():
for acc in roots:
webnotes.conn.sql("""update tabAccount set debit_or_credit = %(debit_or_credit)s,
is_pl_account = %(is_pl_account)s, company = %(company)s
where lft > %(lft)s and rgt < %(rgt)s""", acc, debug=1)
where lft > %(lft)s and rgt < %(rgt)s""", acc)