Skip to content
Extraits de code Groupes Projets
Valider 4075d702 rédigé par Rémi - Le Filament's avatar Rémi - Le Filament
Parcourir les fichiers

[UPD] rework preparation report

parent c2224243
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
], ],
"data": [ "data": [
# datas # datas
"data/paperformat_data.xml",
# views # views
"views/assets.xml", "views/assets.xml",
"views/product_views.xml", "views/product_views.xml",
......
<?xml version="1.0" encoding="utf-8" ?>
<odoo>
<data noupdate="1">
<record id="paperformat_nohead_foot" model="report.paperformat">
<field name="name">A4 - no header-footer</field>
<field name="default" eval="True" />
<field name="format">A4</field>
<field name="page_height">0</field>
<field name="page_width">0</field>
<field name="orientation">Portrait</field>
<field name="margin_top">10</field>
<field name="margin_bottom">10</field>
<field name="margin_left">7</field>
<field name="margin_right">7</field>
<field name="header_line" eval="False" />
<field name="header_spacing">0</field>
<field name="dpi">90</field>
</record>
</data>
</odoo>
...@@ -4,16 +4,20 @@ ...@@ -4,16 +4,20 @@
<template id="report_sale_order_preparation"> <template id="report_sale_order_preparation">
<t t-call="web.html_container"> <t t-call="web.html_container">
<t t-foreach="docs" t-as="o"> <t t-foreach="docs" t-as="o">
<t t-call="web.external_layout"> <t t-call="web.basic_layout">
<span><strong <div class="float-right">
>Adresse du client :</strong></span> <span><strong>Adresse du client :</strong></span>
<div <div
t-field="o.partner_shipping_id" t-field="o.partner_shipping_id"
t-options='{"widget": "contact", "fields": ["address", "name", "phone"], "no_marker": True, "phone_icons": True}' t-options='{"widget": "contact", "fields": ["address", "name", "phone"], "no_marker": True, "phone_icons": True}'
/> />
<div class="page">
<br /> <br />
<h1 t-field="o.name" class="mt0 float-left" /> </div>
<div class="page">
<h1 class="mt0 float-left">
Préparation
<span t-field="o.name" />
</h1>
<div class="row mt48 mb32"> <div class="row mt48 mb32">
<div class="col-auto" name="div_state"> <div class="col-auto" name="div_state">
<strong>Statut :</strong> <strong>Statut :</strong>
...@@ -70,7 +74,29 @@ ...@@ -70,7 +74,29 @@
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<t t-foreach="o.order_line" t-as="line"> <t t-set="categ_id" t-value="False" />
<t
t-foreach="o.order_line.sorted(key=lambda r: r.product_id.product_tmpl_id.categ_id.complete_name)"
t-as="line"
>
<t
t-if="line.product_id.product_tmpl_id.categ_id.id != categ_id"
>
<tr>
<td
colspan="4"
style="background-color:#d3d3d3"
>
<span
t-field="line.product_id.product_tmpl_id.categ_id.complete_name"
/>
<t
t-set="categ_id"
t-value="line.product_id.product_tmpl_id.categ_id.id"
/>
</td>
</tr>
</t>
<tr> <tr>
<td> <td>
<span <span
...@@ -91,7 +117,7 @@ ...@@ -91,7 +117,7 @@
<span> </span> <span> </span>
</td> </td>
<td> <td>
<span> </span> <span><br /><br /> </span>
</td> </td>
</tr> </tr>
</t> </t>
......
...@@ -59,6 +59,7 @@ ...@@ -59,6 +59,7 @@
>'Préparation de Commande - %s - %s' % (object.name, object.partner_id.name or '')</field> >'Préparation de Commande - %s - %s' % (object.name, object.partner_id.name or '')</field>
<field name="binding_model_id" ref="model_sale_order" /> <field name="binding_model_id" ref="model_sale_order" />
<field name="binding_type">report</field> <field name="binding_type">report</field>
<field name="paperformat_id" ref="fumoc_sale.paperformat_nohead_foot" />
</record> </record>
</data> </data>
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Veuillez vous inscrire ou vous pour commenter