Merge branch 'master' of github.com:webnotes/erpnext

accounts/doctype/sales_invoice/sales_invoice.py

@@ -749,8 +749,9 @@ class DocType(SellingController):
 			for item in self.doclist.get({"parentfield": "entries"}):
 				self.check_expense_account(item)
 			
-				gl_entries += self.get_gl_entries_for_stock(item.expense_account, 
+				if item.buying_amount:
-					-1*item.buying_amount, cost_center=item.cost_center)
+					gl_entries += self.get_gl_entries_for_stock(item.expense_account, 
+						-1*item.buying_amount, cost_center=item.cost_center)
 				
 	def make_pos_gl_entries(self, gl_entries):
 		if cint(self.doc.is_pos) and self.doc.cash_bank_account and self.doc.paid_amount:

selling/doctype/quotation/quotation.txt

@@ -1,8 +1,8 @@
 [
  {
-  "creation": "2013-04-03 09:50:56", 
+  "creation": "2013-04-03 09:10:44", 
   "docstatus": 0, 
-  "modified": "2013-04-03 09:53:04", 
+  "modified": "2013-04-03 09:58:02", 
   "modified_by": "Administrator", 
   "owner": "Administrator"
  }, 
@@ -34,7 +34,9 @@
   "parent": "Quotation", 
   "parentfield": "permissions", 
   "parenttype": "DocType", 
-  "read": 1
+  "permlevel": 0, 
+  "read": 1, 
+  "report": 1
  }, 
  {
   "doctype": "DocType", 
@@ -678,7 +680,7 @@
   "label": "Letter Head", 
   "oldfieldname": "letter_head", 
   "oldfieldtype": "Select", 
-  "options": "\nDefault\nERP Grey Large\nERP LOGO\nERPNext Logo Black\nERPNext WT Logo", 
+  "options": "link:Letter Head", 
   "print_hide": 1, 
   "read_only": 0
  }, 
@@ -862,24 +864,11 @@
   "print_hide": 1, 
   "read_only": 0
  }, 
- {
-  "amend": 0, 
-  "cancel": 0, 
-  "create": 0, 
-  "doctype": "DocPerm", 
-  "permlevel": 1, 
-  "report": 0, 
-  "role": "Sales Manager", 
-  "submit": 0, 
-  "write": 0
- }, 
  {
   "amend": 1, 
   "cancel": 1, 
   "create": 1, 
   "doctype": "DocPerm", 
-  "permlevel": 0, 
-  "report": 1, 
   "role": "Sales Manager", 
   "submit": 1, 
   "write": 1
@@ -889,8 +878,6 @@
   "cancel": 1, 
   "create": 1, 
   "doctype": "DocPerm", 
-  "permlevel": 0, 
-  "report": 1, 
   "role": "Sales User", 
   "submit": 1, 
   "write": 1
@@ -900,19 +887,6 @@
   "cancel": 0, 
   "create": 0, 
   "doctype": "DocPerm", 
-  "permlevel": 1, 
-  "report": 0, 
-  "role": "Sales User", 
-  "submit": 0, 
-  "write": 0
- }, 
- {
-  "amend": 0, 
-  "cancel": 0, 
-  "create": 0, 
-  "doctype": "DocPerm", 
-  "permlevel": 0, 
-  "report": 1, 
   "role": "Customer", 
   "submit": 0, 
   "write": 0
@@ -922,43 +896,17 @@
   "cancel": 1, 
   "create": 1, 
   "doctype": "DocPerm", 
-  "permlevel": 0, 
-  "report": 1, 
   "role": "Maintenance Manager", 
   "submit": 1, 
   "write": 1
  }, 
- {
-  "amend": 0, 
-  "cancel": 0, 
-  "create": 0, 
-  "doctype": "DocPerm", 
-  "permlevel": 1, 
-  "report": 0, 
-  "role": "Maintenance Manager", 
-  "submit": 0, 
-  "write": 0
- }, 
  {
   "amend": 1, 
   "cancel": 1, 
   "create": 1, 
   "doctype": "DocPerm", 
-  "permlevel": 0, 
-  "report": 1, 
   "role": "Maintenance User", 
   "submit": 1, 
   "write": 1
- }, 
- {
-  "amend": 0, 
-  "cancel": 0, 
-  "create": 0, 
-  "doctype": "DocPerm", 
-  "permlevel": 1, 
-  "report": 0, 
-  "role": "Maintenance User", 
-  "submit": 0, 
-  "write": 0
  }
 ]

stock/doctype/delivery_note/delivery_note.py

@@ -413,8 +413,9 @@ class DocType(SellingController):
 		for item in self.doclist.get({"parentfield": "delivery_note_details"}):
 			self.check_expense_account(item)
 			
-			gl_entries += self.get_gl_entries_for_stock(item.expense_account, -1*item.buying_amount, 
+			if item.buying_amount:
-				cost_center=item.cost_center)
+				gl_entries += self.get_gl_entries_for_stock(item.expense_account, -1*item.buying_amount, 
+					cost_center=item.cost_center)
 				
 		if gl_entries:
 			from accounts.general_ledger import make_gl_entries