Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes for standard print formats

Browse Source
This commit is contained in:
Nabin Hait 2014-08-04 17:01:01 +05:30
parent 1279f1d430
commit 4d18b3f96d
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/templates/print_formats/includes/item_grid.html
View File

@ -22,12 +22,12 @@
{%- endif %} {%- endif %}
{% if (not row.meta.is_print_hide("item_name") and {% if (not row.meta.is_print_hide("item_name") and
(row.meta.is_print_hide("item_code") or row.item_code != row.item_name)) -%} (row.meta.is_print_hide("item_code") or row.item_code != row.item_name)) -%}
<div class="primary">{{ row.item_name }}</div> <div class="primary">{{ row.get_formatted("item_name",as_html=True) }}</div>
{%- endif %} {%- endif %}
{% if (not row.meta.is_print_hide("description") and row.description and {% if (not row.meta.is_print_hide("description") and row.description and
((row.meta.is_print_hide("item_code") and row.meta.is_print_hide("item_name")) ((row.meta.is_print_hide("item_code") and row.meta.is_print_hide("item_name"))
or not (row.item_code == row.item_name == row.description))) -%} or not (row.item_code == row.item_name == row.description))) -%}
<p>{{ row.description }}</p> <p>{{ row.get_formatted("description", as_html=True) }}</p>
{%- endif %} {%- endif %}
{%- for field in visible_columns -%} {%- for field in visible_columns -%}
{%- if (field.fieldname not in std_fields) and {%- if (field.fieldname not in std_fields) and

4
erpnext/templates/print_formats/includes/taxes.html
View File

@ -5,10 +5,10 @@
{%- if not charge.included_in_print_rate -%} {%- if not charge.included_in_print_rate -%}
<div class="row"> <div class="row">
<div class="col-xs-5 text-right"> <div class="col-xs-5 text-right">
<label>{{ charge.description }}</label></div> <label>{{ charge.get_formatted("description", as_html=True) }}</label></div>
<div class="col-xs-7 text-right"> <div class="col-xs-7 text-right">
{{ frappe.format_value(charge.tax_amount / doc.conversion_rate, {{ frappe.format_value(charge.tax_amount / doc.conversion_rate,
table_meta.get_field("tax_amount"), doc) }} table_meta.get_field("tax_amount"), doc, currency=doc.currency) }}
</div> </div>
</div> </div>
{%- endif -%} {%- endif -%}