Merge pull request #3385 from nabinhait/develop

In standard print format, item name will now honour 'Print Hide' property

erpnext/accounts/doctype/journal_entry/journal_entry.py

@@ -81,7 +81,8 @@ class JournalEntry(AccountsController):
 				frappe.throw(_("Row {0}: Party Type and Party is only applicable against Receivable / Payable account").format(d.idx))
 
 	def check_credit_limit(self):
-		customers = list(set([d.party for d in self.get("accounts") if d.party_type=="Customer" and flt(d.debit) > 0]))
+		customers = list(set([d.party for d in self.get("accounts") 
+			if d.party_type=="Customer" and d.party and flt(d.debit) > 0]))
 		if customers:
 			from erpnext.selling.doctype.customer.customer import check_credit_limit
 			for customer in customers:

erpnext/accounts/doctype/pricing_rule/pricing_rule.py

@@ -205,9 +205,9 @@ def get_pricing_rules(args):
 
 def filter_pricing_rules(args, pricing_rules):
 	# filter for qty
-	if pricing_rules and args.get("qty"):
+	if pricing_rules:
-		pricing_rules = filter(lambda x: (args.qty>=flt(x.min_qty)
+		pricing_rules = filter(lambda x: (flt(args.get("qty"))>=flt(x.min_qty)
-			and (args.qty<=x.max_qty if x.max_qty else True)), pricing_rules)
+			and (flt(args.get("qty"))<=x.max_qty if x.max_qty else True)), pricing_rules)
 
 	# find pricing rule with highest priority
 	if pricing_rules:

erpnext/accounts/general_ledger.py

@@ -101,7 +101,6 @@ def round_off_debit_credit(gl_map):
 		debit_credit_diff += entry.debit - entry.credit
 	
 	debit_credit_diff = flt(debit_credit_diff, precision)
-	print debit_credit_diff, 1.0 / (10**precision)
 	if abs(debit_credit_diff) >= (2.0 / (10**precision)):
 		frappe.throw(_("Debit and Credit not equal for {0} #{1}. Difference is {2}.")
 			.format(gl_map[0].voucher_type, gl_map[0].voucher_no, debit_credit_diff))

erpnext/accounts/report/gross_profit/gross_profit.py

@@ -183,8 +183,6 @@ class GrossProfitGenerator(object):
 				my_sle = self.sle.get((item_code, row.warehouse))
 				for i, sle in enumerate(my_sle):
 					# find the stock valution rate from stock ledger entry
-					print sle.voucher_type, row.parenttype, sle.voucher_no, row.parent, \
-						sle.voucher_detail_no, row.item_row
 					if sle.voucher_type == row.parenttype and row.parent == sle.voucher_no and \
 						sle.voucher_detail_no == row.item_row:
 							previous_stock_value = len(my_sle) > i+1 and \

erpnext/config/learn.py

@@ -31,7 +31,7 @@ def get_data():
 				{
 					"type": "help",
 					"label": _("Opening Stock Balance"),
-					"youtube_id": "yPgrtfeCTs"
+					"youtube_id": "0yPgrtfeCTs"
 				},
 				{
 					"type": "help",
@@ -106,7 +106,7 @@ def get_data():
 				{
 					"type": "help",
 					"label": _("Opening Stock Balance"),
-					"youtube_id": "yPgrtfeCTs"
+					"youtube_id": "0yPgrtfeCTs"
 				},
 				{
 					"type": "help",

erpnext/config/stock.py

@@ -266,7 +266,7 @@ def get_data():
 				{
 					"type": "help",
 					"label": _("Opening Stock Balance"),
-					"youtube_id": "yPgrtfeCTs"
+					"youtube_id": "0yPgrtfeCTs"
 				},
 				{
 					"type": "help",

erpnext/hr/doctype/leave_allocation/leave_allocation.py

@@ -23,9 +23,6 @@ class LeaveAllocation(Document):
 	def on_update(self):
 		self.get_total_allocated_leaves()
 
-	def on_cancel(self):
-		self.check_for_leave_application()
-
 	def validate_new_leaves_allocated_value(self):
 		"""validate that leave allocation is in multiples of 0.5"""
 		if flt(self.new_leaves_allocated) % 0.5:

erpnext/stock/get_item_details.py

@@ -163,8 +163,8 @@ def get_basic_details(args, item):
 		"uom": item.stock_uom,
 		"min_order_qty": flt(item.min_order_qty) if args.parenttype == "Material Request" else "",
 		"conversion_factor": 1.0,
-		"qty": args.qty or 0.0,
+		"qty": args.qty or 1.0,
-		"stock_qty": 0.0,
+		"stock_qty": 1.0,
 		"price_list_rate": 0.0,
 		"base_price_list_rate": 0.0,
 		"rate": 0.0,

erpnext/templates/print_formats/includes/item_table_description.html

@@ -7,8 +7,8 @@
     {% if doc.in_format_data("item_code") and not doc.is_print_hide("item_code") -%}
     	<div class="primary">{{ doc.item_code }}</div>
     {%- endif %}
-    {% if (doc.in_format_data("item_name") and
+    {% if (doc.in_format_data("item_name") and not doc.is_print_hide("item_name") and
-    	(not doc.in_format_data("item_code") or doc.is_print_hide("item_code")
+    	(not doc.in_format_data("item_code") or doc.is_print_hide("item_code") 
 			or doc.item_code != doc.item_name)) -%}
     	<div class="primary">{{ doc.get_formatted("item_name") }}</div>
     {%- endif %}