diff --git a/data/paperformat_data.xml b/data/paperformat_data.xml index 3f109b4a7176a503e3f0bb69c7ba6c2962c5ddc9..f6250bbfd1e65a3aaacb2018ebe0a18d3c9d4c6a 100644 --- a/data/paperformat_data.xml +++ b/data/paperformat_data.xml @@ -8,7 +8,7 @@ <field name="page_height">0</field> <field name="page_width">0</field> <field name="orientation">Landscape</field> - <field name="margin_top">30</field> + <field name="margin_top">40</field> <field name="margin_bottom">32</field> <field name="margin_left">7</field> <field name="margin_right">7</field> diff --git a/views/report_composition_templates.xml b/views/report_composition_templates.xml index 46251544c46974434f078691ed688f894ea1dea2..92702664205e114b24b2ef38393620aa8651d7f5 100644 --- a/views/report_composition_templates.xml +++ b/views/report_composition_templates.xml @@ -5,7 +5,6 @@ <template id="report_composition_document"> <t t-call="ap_report.external_layout_spe"> <t t-set="doc" t-value="doc.with_context(lang=doc.partner_id.lang)" /> - <h1 class="mt0 text-center">Compositions</h1> <div class="page"> <div class="row"> <div class="col-8" name="div_outgoing_address"> @@ -49,7 +48,6 @@ <br /> <t t-foreach="doc.sale_project_ids" t-as="project"> -<!-- <div class="col-12">--> <div style="page-break-after: always;"> <div class="row mt32 mb32" name="projets"> <div class="col-12"> @@ -166,8 +164,6 @@ </table> </div> </t> -<!-- </div>--> -<!-- <p ></p>--> </div> </div> diff --git a/views/report_delivery_ap_template.xml b/views/report_delivery_ap_template.xml index 0698059189ffd465951b690bb9fca4ad7c827662..c78d78a988f2c721481b38864269a35bb3faf3ac 100644 --- a/views/report_delivery_ap_template.xml +++ b/views/report_delivery_ap_template.xml @@ -47,7 +47,7 @@ <t t-set="product_category" - t-value="product_category+[l.product_id.categ_id]" + t-value="product_category+[l.product_id.categ_id.parent_id]" /> </t> @@ -65,7 +65,7 @@ <t t-foreach="o.move_ids_without_package" t-as="l"> - <t t-if="category.id==l.product_id.categ_id.id"> + <t t-if="category.id==l.product_id.categ_id.parent_id.id"> <tr> <td /> @@ -86,6 +86,7 @@ t-if="l.state == 'done'" t-field="l.qty_done" /> + <span t-field="l.product_uom"/> </td> </tr> </t> diff --git a/views/report_templates.xml b/views/report_templates.xml index 482e2c364172f1783ee70e1e3040752f860d913b..f08a2362b3ce1b8034525a64ec6f21d8d805ebf3 100644 --- a/views/report_templates.xml +++ b/views/report_templates.xml @@ -104,7 +104,12 @@ t-att-style="report_header_style" > <div class="row"> - <div class="col-12 mb4 text-right"> + <div class="col-4"> + </div> + <div class="col-4 text-center"> + <h1 class="mt0 text-center">Compositions</h1> + </div> + <div class="col-4 mb4 text-right"> <img t-if="company.logo" t-att-src="image_data_uri(company.logo)"