prevent too wide tables in Top/Bottom/Line-Comments

(tables are clipped if they are too wide)
develop
Andreas Osim 2018-12-03 13:54:31 +01:00
parent 443e02df87
commit fa150c332a
7 changed files with 28 additions and 20 deletions

View File

@ -1,3 +1,8 @@
div.dp_note {
margin: auto;
overflow: hidden;
}
.bold {
font-weight: bold;
}

View File

@ -85,11 +85,12 @@
</strong>
<span class="col-xs-2" t-field="o.name"/>
</div>
<div class="dp_note">
<p t-if="o.note1">
<span t-field="o.note1"/>
</p>
</div>
<div class="row mt32"/>
<p t-if="o.note1">
<span t-field="o.note1"/>
</p>
<t t-foreach="o.order_lines_layouted()" t-as="page" name="lines_layouted">
<table class="table table-condensed">
<t t-set="discount_is_set" t-value="field_set_in_lines(o.invoice_line_ids, 'discount')"/>
@ -266,7 +267,7 @@
</div>
</div>
<div class="row" style="page-break-inside: avoid">
<div class="row dp_note" style="page-break-inside: avoid">
<p t-if="o.note2">
<span t-field="o.note2" style="page-break-inside: avoid"/>
</p>

View File

@ -141,7 +141,7 @@
</div>
</div>
<div class="row">
<div class="row dp_note">
<p class="col-xs-12">
<span t-field="o.notes"/>
</p>

View File

@ -124,7 +124,7 @@
</div>
</div>
<div class="row">
<div class="row dp_note">
<p class="col-xs-12">
<span t-field="o.notes"/>
</p>

View File

@ -123,10 +123,11 @@
</strong>
<span class="col-xs-2" t-field="o.client_order_ref"/>
</div>
<div class="row mt32"/>
<p t-if="o.note1">
<span t-field="o.note1"/>
</p>
<div class="row mt32 dp_note">
<p t-if="o.note1">
<span t-field="o.note1"/>
</p>
</div>
<table class="table table-condensed" style="background-color: #E6E7E9;">
<t t-set="discount_is_set" t-value="field_set_in_lines(o.order_line, 'discount')"/>
<thead class="table-header">
@ -254,13 +255,13 @@
</div>
</div>
<div class="row" style="page-break-inside: avoid">
<div class="row dp_note" style="page-break-inside: avoid">
<p t-if="o.note2">
<span t-field="o.note2" style="page-break-inside: avoid"/>
</p>
</div>
<div class="row">
<div class="row dp_note">
<p class="col-xs-12">
<span t-field="o.note"/>
</p>

View File

@ -290,9 +290,9 @@
</span>
</div>
</div>
<p class="col-xs-12">
<div class="col-xs-12 dp_note">
<span t-field="o.note"/>
</p>
</div>
<p t-if="o.backorder_id">
This shipment is a backorder of<t t-esc="o.backorder_id.name"/>.

View File

@ -77,10 +77,11 @@
</strong>
<span class="col-xs-2" t-field="o.client_order_ref"/>
</div>
<div class="row mt32"/>
<p t-if="o.note1">
<span t-field="o.note1"/>
</p>
<div class="row mt32 dp_note">
<p t-if="o.note1">
<span t-field="o.note1"/>
</p>
</div>
<table class="table table-condensed" style="background-color: #E6E7E9;">
<thead class="table-header">
<tr>
@ -224,7 +225,7 @@
</div>
</div>
<div class="row" style="page-break-inside: avoid">
<div class="row dp_note" style="page-break-inside: avoid">
<p t-if="o.note2">
<span t-field="o.note2" style="page-break-inside: avoid"/>
</p>