Merge branch 'develop'

erpnext/__version__.py

@@ -1,2 +1,2 @@
 from __future__ import unicode_literals
-__version__ = '6.12.5'
+__version__ = '6.12.6'

erpnext/hooks.py

@@ -7,7 +7,7 @@ app_publisher = "Frappe Technologies Pvt. Ltd."
 app_description = """ERP made simple"""
 app_icon = "icon-th"
 app_color = "#e74c3c"
-app_version = "6.12.5"
+app_version = "6.12.6"
 app_email = "info@erpnext.com"
 app_license = "GNU General Public License (v3)"
 source_link = "https://github.com/frappe/erpnext"

erpnext/patches.txt

@@ -237,5 +237,5 @@ erpnext.patches.v6_10.fix_ordered_received_billed
 erpnext.patches.v6_10.fix_jv_total_amount #2015-11-30
 erpnext.patches.v6_10.email_digest_default_quote
 erpnext.patches.v6_10.fix_billed_amount_in_drop_ship_po
-erpnext.patches.v6_10.fix_delivery_status_of_drop_ship_item
+erpnext.patches.v6_10.fix_delivery_status_of_drop_ship_item #2015-12-08
 erpnext.patches.v5_8.tax_rule #2015-12-08

erpnext/patches/v5_8/tax_rule.py

@@ -11,7 +11,7 @@ def execute():
 		ifnull(default_taxes_and_charges, '') != '' """, as_dict=1)
 
 	for d in customers:
-		if not frappe.db.exists({"doctype": "Tax Rule", "customer": d.name}):
+		if not frappe.db.sql("select name from `tabTax Rule` where customer=%s", d.name):
 			tr = frappe.new_doc("Tax Rule")
 			tr.tax_type = "Sales"
 			tr.customer = d.name
@@ -23,7 +23,7 @@ def execute():
 		ifnull(default_taxes_and_charges, '') != '' """, as_dict=1)
 
 	for d in suppliers:
-		if not frappe.db.exists({"doctype": "Tax Rule", "supplier": d.name}):
+		if not frappe.db.sql("select name from `tabTax Rule` where supplier=%s", d.name):
 			tr = frappe.new_doc("Tax Rule")
 			tr.tax_type = "Purchase"
 			tr.supplier = d.name

erpnext/patches/v6_10/fix_delivery_status_of_drop_ship_item.py

@@ -2,16 +2,8 @@ from __future__ import unicode_literals
 import frappe
 
 def execute():
-	sales_orders_to_update = []
+	for so_name in frappe.db.sql("""select distinct parent from `tabSales Order Item`
-
+			where delivered_by_supplier=1 and docstatus=1"""):
-	for item in frappe.get_all("Purchase Order Item", filters={"delivered_by_supplier": 1}, 
+		so = frappe.get_doc("Sales Order", so_name[0])
-		fields=["prevdoc_doctype", "prevdoc_docname"]):
-		
-		if item.prevdoc_doctype == "Sales Order":
-			if item.prevdoc_docname not in sales_orders_to_update:
-				sales_orders_to_update.append(item.prevdoc_docname)
-
-	for so_name in sales_orders_to_update:
-		so = frappe.get_doc("Sales Order", so_name)
 		so.update_delivery_status()
 		so.set_status(update=True, update_modified=False)

erpnext/translations/hu.csv

@@ -579,7 +579,7 @@ DocType: Lead,Campaign Name,Kampány neve
 ,Reserved,Fenntartott
 DocType: Purchase Order,Supply Raw Materials,Supply nyersanyagok
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,"Az időpont, amikor a következő számlán kerül előállításra. Úgy keletkezett benyújtani."
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Befektetett eszközök
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Jelenlegi eszközök
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +92,{0} is not a stock Item,{0} nem Stock tétel
 DocType: Mode of Payment Account,Default Account,Alapértelmezett számla
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +157,Lead must be set if Opportunity is made from Lead,"Lead kell állítani, ha Opportunity készült Lead"

setup.py

@@ -1,6 +1,6 @@
 from setuptools import setup, find_packages
 
-version = "6.12.5"
+version = "6.12.6"
 
 with open("requirements.txt", "r") as f:
 	install_requires = f.readlines()