From 8908543a9cfe1cf34d8381a80df2960874fbe969 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Fri, 29 May 2015 16:26:07 +0530 Subject: [PATCH] In standard print format, item name will now honour 'Print Hide' property --- erpnext/accounts/general_ledger.py | 1 - erpnext/accounts/report/gross_profit/gross_profit.py | 2 -- erpnext/config/learn.py | 4 ++-- erpnext/config/stock.py | 2 +- .../print_formats/includes/item_table_description.html | 4 ++-- 5 files changed, 5 insertions(+), 8 deletions(-) diff --git a/erpnext/accounts/general_ledger.py b/erpnext/accounts/general_ledger.py index 76b530998d..75dcbbf603 100644 --- a/erpnext/accounts/general_ledger.py +++ b/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)) diff --git a/erpnext/accounts/report/gross_profit/gross_profit.py b/erpnext/accounts/report/gross_profit/gross_profit.py index 98a121ace7..dd7def8bd6 100644 --- a/erpnext/accounts/report/gross_profit/gross_profit.py +++ b/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 \ diff --git a/erpnext/config/learn.py b/erpnext/config/learn.py index 146bb21b2d..ffcd76ef48 100644 --- a/erpnext/config/learn.py +++ b/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", diff --git a/erpnext/config/stock.py b/erpnext/config/stock.py index 86ec45800c..70bb258af9 100644 --- a/erpnext/config/stock.py +++ b/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", diff --git a/erpnext/templates/print_formats/includes/item_table_description.html b/erpnext/templates/print_formats/includes/item_table_description.html index 34f95b9f27..107abe03c0 100644 --- a/erpnext/templates/print_formats/includes/item_table_description.html +++ b/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") -%}
{{ doc.item_code }}
{%- endif %} - {% if (doc.in_format_data("item_name") and - (not doc.in_format_data("item_code") or doc.is_print_hide("item_code") + {% 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") or doc.item_code != doc.item_name)) -%}
{{ doc.get_formatted("item_name") }}
{%- endif %}