[merge]

controllers/selling_controller.py

@@ -99,6 +99,8 @@ class SellingController(StockController):
 			for item in self.doclist.get({"parentfield": self.fname}):
 				if item.item_code in self.stock_items or \
 						(item_sales_bom and item_sales_bom.get(item.item_code)):
+					
+					buying_amount = 0
 					if item.item_code in self.stock_items:
 						buying_amount = get_buying_amount(self.doc.doctype, self.doc.name, 
 							item.name, stock_ledger_entries.get((item.item_code, 
@@ -108,9 +110,10 @@ class SellingController(StockController):
 							self.doc.doctype, self.doc.name, item.name, stock_ledger_entries, 
 							item_sales_bom)
 					
-						item.buying_amount = buying_amount >= 0.01 and buying_amount or 0
-						webnotes.conn.set_value(item.doctype, item.name, "buying_amount", 
-							item.buying_amount)
+					# buying_amount >= 0.01 so that gl entry doesn't get created for such small amounts
+					item.buying_amount = buying_amount >= 0.01 and buying_amount or 0
+					webnotes.conn.set_value(item.doctype, item.name, "buying_amount", 
+						item.buying_amount)
 						
 	def check_expense_account(self, item):
 		if item.buying_amount and not item.expense_account:

patches/patch_list.py

@@ -257,5 +257,6 @@ patch_list = [
 	"execute:webnotes.reload_doc('accounts', 'Print Format', 'POS Invoice') # 2013-08-16",
 	"patches.august_2013.p06_fix_sle_against_stock_entry",
 	"execute:webnotes.bean('Style Settings').save() #2013-08-20",
-	"patches.september_2013.p01_update_communication"
+	"patches.september_2013.p01_fix_buying_amount_gl_entries",
+	"patches.september_2013.p01_update_communication",
 ]

patches/september_2013/p01_fix_buying_amount_gl_entries.py

@@ -0,0 +1,66 @@
+# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd.
+# License: GNU General Public License v3. See license.txt
+
+from __future__ import unicode_literals
+import webnotes
+import webnotes.defaults
+from webnotes.utils import cint
+
+def execute():
+	if not cint(webnotes.defaults.get_global_default("auto_inventory_accounting")):
+		return
+	
+	# fix delivery note
+	for dn in webnotes.conn.sql_list("""select name from `tabDelivery Note` where docstatus=1
+		and posting_date >= "2013-08-06" order by posting_date"""):
+			recreate_gl_entries("Delivery Note", dn, "delivery_note_details")
+	
+	# fix sales invoice
+	for si in webnotes.conn.sql_list("""select name from `tabSales Invoice` where docstatus=1
+		and update_stock=1 and posting_date >= "2013-08-06" order by posting_date"""):
+			recreate_gl_entries("Sales Invoice", si, "entries")
+	
+def recreate_gl_entries(doctype, name, parentfield):
+	# calculate buying amount and make gl entries
+	bean = webnotes.bean(doctype, name)
+	bean.run_method("set_buying_amount")
+	
+	company_values = webnotes.conn.get_value("Company", bean.doc.company, ["default_expense_account",
+		"stock_adjustment_account", "cost_center", "stock_adjustment_cost_center"])
+	
+	# update missing expense account and cost center
+	for item in bean.doclist.get({"parentfield": parentfield}):
+		if item.buying_amount and not validate_item_values(item, bean.doc.company):
+			res = webnotes.conn.sql("""select expense_account, cost_center
+				from `tab%s` child where docstatus=1 and item_code=%s and
+					ifnull(expense_account, '')!='' and ifnull(cost_center, '')!='' and
+					(select company from `tabAccount` ac where ac.name=child.expense_account)=%s and
+					(select company from `tabCost Center` cc where cc.name=child.cost_center)=%s
+					order by creation desc limit 1""" % (item.doctype, "%s", "%s", "%s"), 
+					(item.item_code, bean.doc.company, bean.doc.company))
+			if res:
+				item.expense_account = res[0][0]
+				item.cost_center = res[0][1]
+			elif company_values:
+				item.expense_account = company_values[0] or company_values[1]
+				item.cost_center = company_values[2] or company_values[3]
+		
+			webnotes.conn.set_value(item.doctype, item.name, "expense_account", item.expense_account)
+			webnotes.conn.set_value(item.doctype, item.name, "cost_center", item.cost_center)
+	
+	# remove gl entries
+	webnotes.conn.sql("""delete from `tabGL Entry` where voucher_type=%s
+		and voucher_no=%s""", (doctype, name))
+	bean.run_method("make_gl_entries")
+	
+def validate_item_values(item, company):
+	if item.expense_account and \
+		webnotes.conn.get_value("Account", item.expense_account, "company")!=company:
+			return False
+	elif item.cost_center and \
+		webnotes.conn.get_value("Cost Center", item.cost_center, "company")!=company:
+			return False
+	elif not (item.expense_account and item.cost_center):
+		return False
+		
+	return True