tzaustria
/
odoo
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ext/custom-addons/dp_reports/static/src/less/report_backend.less
View File

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

11
ext/custom-addons/dp_reports_account/reports/invoice.xml
View File

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

2
ext/custom-addons/dp_reports_purchase/reports/purchase.xml
View File

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

2
ext/custom-addons/dp_reports_purchase/reports/purchasequotation.xml
View File

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

13
ext/custom-addons/dp_reports_sale/reports/sale.xml
View File

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

4
ext/custom-addons/dp_reports_stock/reports/stock.xml
View File

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

11
ext/custom-addons/tz_reports_production/reports/report_production.xml
View File

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