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

accounts/doctype/sales_invoice/sales_invoice.py

@@ -719,7 +719,7 @@ def get_next_date(dt, mcount, day=None):
 	if not day:
 		day = getdate(dt).day
 	if month > 12:
-		month, year = m-12, y+1
+		month, year = month-12, year+1
 	try:
 		next_month_date = datetime.date(year, month, day)
 	except:
@@ -911,4 +911,4 @@ def get_bank_cash_account(mode_of_payment):
 		webnotes.msgprint("Default Bank / Cash Account not set in Mode of Payment: %s. Please add a Default Account in Mode of Payment master." % mode_of_payment)
 	return {
 		"cash_bank_account": val
-	}
+	}

accounts/report/ordered_items_to_be_billed/ordered_items_to_be_billed.txt

@@ -0,0 +1,20 @@
+[
+ {
+  "owner": "Administrator", 
+  "docstatus": 0, 
+  "creation": "2012-12-14 10:22:40", 
+  "modified_by": "Administrator", 
+  "modified": "2012-12-14 10:24:16"
+ }, 
+ {
+  "name": "__common__", 
+  "ref_doctype": "Sales Invoice", 
+  "doctype": "Report", 
+  "is_standard": "Yes", 
+  "query": "select \n `tabSales Order`.`name` as \"Sales Order:Link/Sales Order:120\",\n `tabSales Order`.`customer` as \"Customer:Link/Customer:120\",\n `tabSales Order`.`status` as \"Status\",\n `tabSales Order`.`transaction_date` as \"Date:Date\",\n `tabSales Order Item`.item_code as \"Item:Link/Item:120\",\n `tabSales Order Item`.description as \"Description\",\n `tabSales Order Item`.qty as \"Qty:Float\",\n `tabSales Order Item`.billed_qty as \"Billed Qty:Float\"\nfrom\n `tabSales Order`, `tabSales Order Item`\nwhere\n `tabSales Order Item`.`parent` = `tabSales Order`.`name`\n and `tabSales Order`.docstatus = 1\n and ifnull(`tabSales Order Item`.billed_qty,0) < ifnull(`tabSales Order Item`.qty,0)\norder by `tabSales Order`.transaction_date asc"
+ }, 
+ {
+  "name": "Ordered Items To Be Billed", 
+  "doctype": "Report"
+ }
+]