Skip to content

Commit

Permalink
Revert "feat: nice page breaks for long item descriptions"
Browse files Browse the repository at this point in the history 
This reverts commit ada1fb0.
  • Loading branch information
@barredterra
barredterra committed Apr 24, 2024
1 parent 2fc8d8c commit bb70ff0
Show file tree
Hide file tree
Showing 7 changed files with 47 additions and 144 deletions.
51 changes: 19 additions & 32 deletions print_format/delivery_note.jinja
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,38 +98,25 @@
{% endif %}
</td>
</tr>

{% set paragraphs = n.description.split("<p>") %}
{# the first paragraph is always an empty div, skip that #}
{% for p in paragraphs[1:] %}
<tr class="
{{ 'no-bottom-padding' if loop.first and loop.nextitem else '' }}
{{ 'no-top-padding' if loop.previtem and loop.last else '' }}
{{ 'no-y-padding' if loop.nextitem and loop.previtem else '' }}
">
<td></td>
<td colspan="2">
<div class="ql-editor">{{ p.removesuffix("</p>") }}</div>

{% if loop.last %}
{% if n.against_sales_order %}
<br>{{ _("Sales Order: {0}").format(n.against_sales_order) }}
{% endif %}
{% if n.against_sales_invoice %}
<br>{{ _("Sales Invoice: {0}").format(n.against_sales_invoice) }}
{% endif %}
{% if n.batch_no %}
<br>{{ _("Batch No: {0}").format(n.batch_no) }}
{% endif %}
{% if n.serial_no %}
<br>{{ _("Serial Numbers: {0}").format(n.serial_no) }}
{% endif %}
{% endif %}
</td>
<td></td>
</tr>
{% endfor %}

<tr>
<td></td>
<td colspan="2">
{{ n.description }}
{% if n.against_sales_order %}
<br>{{ _("Sales Order: {0}").format(n.against_sales_order) }}
{% endif %}
{% if n.against_sales_invoice %}
<br>{{ _("Sales Invoice: {0}").format(n.against_sales_invoice) }}
{% endif %}
{% if n.batch_no %}
<br>{{ _("Batch No: {0}").format(n.batch_no) }}
{% endif %}
{% if n.serial_no %}
<br>{{ _("Serial Numbers: {0}").format(n.serial_no) }}
{% endif %}
</td>
<td></td>
</tr>
{% endfor %}
</tbody>
</table>
Expand Down
22 changes: 5 additions & 17 deletions print_format/purchase_order.jinja
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,23 +98,11 @@
<!-- <td>{{ n.get_formatted("discount_amount") }}</td> -->
<td class="text-right">{{ n.get_formatted("amount") }}</td>
</tr>

{% set paragraphs = n.description.split("<p>") %}
{# the first paragraph is always an empty div, skip that #}
{% for p in paragraphs[1:] %}
<tr class="
{{ 'no-bottom-padding' if loop.first and loop.nextitem else '' }}
{{ 'no-top-padding' if loop.previtem and loop.last else '' }}
{{ 'no-y-padding' if loop.nextitem and loop.previtem else '' }}
">
<td></td>
<td colspan="4">
<div class="ql-editor">{{ p.removesuffix("</p>") }}</div>
</td>
<td></td>
</tr>
{% endfor %}

<tr>
<td></td>
<td colspan="4">{{ n.description }}</td>
<td></td>
</tr>
{% endfor %}
</tbody>

Expand Down
22 changes: 5 additions & 17 deletions print_format/quotation.jinja
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,23 +113,11 @@
<!-- <td>{{ n.get_formatted("discount_amount") }}</td> -->
<td class="text-right">{{ n.get_formatted("amount") }}</td>
</tr>

{% set paragraphs = n.description.split("<p>") %}
{# the first paragraph is always an empty div, skip that #}
{% for p in paragraphs[1:] %}
<tr class="
{{ 'no-bottom-padding' if loop.first and loop.nextitem else '' }}
{{ 'no-top-padding' if loop.previtem and loop.last else '' }}
{{ 'no-y-padding' if loop.nextitem and loop.previtem else '' }}
">
<td></td>
<td colspan="4">
<div class="ql-editor">{{ p.removesuffix("</p>") }}</div>
</td>
<td></td>
</tr>
{% endfor %}

<tr>
<td></td>
<td colspan="4">{{ n.description }}</td>
<td></td>
</tr>
{% endfor %}
</tbody>

Expand Down
24 changes: 0 additions & 24 deletions print_format/request_for_quotation.jinja
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,30 +118,6 @@
</td>
<td></td>
</tr>

{% set paragraphs = n.description.split("<p>") %}
{# the first paragraph is always an empty div, skip that #}
{% for p in paragraphs[1:] %}
<tr class="
{{ 'no-bottom-padding' if loop.first and loop.nextitem else '' }}
{{ 'no-top-padding' if loop.previtem and loop.last else '' }}
{{ 'no-y-padding' if loop.nextitem and loop.previtem else '' }}
">
<td></td>
<td colspan="2">
<div class="ql-editor">{{ p.removesuffix("</p>") }}</div>

{% if loop.last %}
{{ _("Our Part No.: {0}").format(n.item_code) }}
{% if n.supplier_part_no %}
<br>
{{ _("Your Part No.: {0}").format(n.supplier_part_no) }}
{% endif %}
{% endif %}
</td>
<td></td>
</tr>
{% endfor %}
{% endfor %}
</tbody>

Expand Down
22 changes: 5 additions & 17 deletions print_format/sales_invoice.jinja
View file
Original file line number Diff line number Diff line change
Expand Up @@ -152,23 +152,11 @@
<!-- <td>{{ n.get_formatted("discount_amount") }}</td> -->
<td class="text-right">{{ n.get_formatted("amount") }}</td>
</tr>

{% set paragraphs = n.description.split("<p>") %}
{# the first paragraph is always an empty div, skip that #}
{% for p in paragraphs[1:] %}
<tr class="
{{ 'no-bottom-padding' if loop.first and loop.nextitem else '' }}
{{ 'no-top-padding' if loop.previtem and loop.last else '' }}
{{ 'no-y-padding' if loop.nextitem and loop.previtem else '' }}
">
<td></td>
<td colspan="4">
<div class="ql-editor">{{ p.removesuffix("</p>") }}</div>
</td>
<td></td>
</tr>
{% endfor %}

<tr>
<td></td>
<td colspan="4">{{ n.description }}</td>
<td></td>
</tr>
{% endfor %}
</tbody>

Expand Down
32 changes: 11 additions & 21 deletions print_format/sales_order.jinja
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,27 +115,17 @@
<!-- <td>{{ n.get_formatted("discount_amount") }}</td> -->
<td class="text-right">{{ n.get_formatted("amount") }}</td>
</tr>

{% set paragraphs = n.description.split("<p>") %}
{# the first paragraph is always an empty div, skip that #}
{% for p in paragraphs[1:] %}
<tr class="
{{ 'no-bottom-padding' if loop.first and loop.nextitem else '' }}
{{ 'no-top-padding' if loop.previtem and loop.last else '' }}
{{ 'no-y-padding' if loop.nextitem and loop.previtem else '' }}
">
<td></td>
<td colspan="4">
<div class="ql-editor">{{ p.removesuffix("</p>") }}</div>
{% if loop.last and n.prevdoc_docname %}
<!-- (Angebot: A-2020-001) -->
({{ _("Quotation") }}: {{ n.prevdoc_docname }})
{% endif %}
</td>
<td></td>
</tr>
{% endfor %}

<tr>
<td></td>
<td colspan="4">
{{ n.description }}
{% if n.prevdoc_docname %}
<!-- Angebot: A-2020-001 -->
({{ _("Quotation") }}: {{ n.prevdoc_docname }})
{% endif %}
</td>
<td></td>
</tr>
{% endfor %}
</tbody>

Expand Down
18 changes: 2 additions & 16 deletions print_style/print_style.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,24 +112,11 @@
page-break-inside: avoid;
page-break-after: auto;
}

tr.no-y-padding td {
padding-top: 0 !important;
padding-bottom: 0 !important;
}

tr.no-top-padding td {
padding-top: 0 !important;
}

tr.no-bottom-padding td {
padding-bottom: 0 !important;
}


thead {
display: table-header-group;
}

tfoot {
display: table-row-group;
}
Expand All @@ -139,7 +126,6 @@
line-height: 1.42857143;
font-family: Inter, "Helvetica Neue", Helvetica, Arial, "Open Sans", sans-serif; // use `var(--font-stack)` for v16+
overflow: hidden;
padding: 0 !important;

p {
margin: unset;
Expand Down

0 comments on commit bb70ff0

Please # to comment.