diff --git a/models/stock_picking.py b/models/stock_picking.py index 71b898e818b724ed418f0375d5da4542df16348e..7bb27917bbfc168ab36ab41970eb41a21701f551 100644 --- a/models/stock_picking.py +++ b/models/stock_picking.py @@ -7,9 +7,35 @@ from odoo import fields, models class FumocStockPicking(models.Model): _inherit = 'stock.picking' + # ------------------------------------------------------ + # Fields declaration + # ------------------------------------------------------ res_transporter_id = fields.Many2one( string='Transporteur', related='sale_id.res_transporter_id') packaging_id = fields.Many2one( string="Emballage", related='sale_id.packaging_id') + + partner_contact_id = fields.Many2one( + comodel_name='res.partner', + string='Contact associƩ', + compute='_compute_partner_contact_id') + + # ------------------------------------------------------ + # Compute + # ------------------------------------------------------ + def _compute_partner_contact_id(self): + for r in self: + partner = r.partner_id + is_contact = False + while not is_contact: + if partner.type != 'contact': + if partner.parent_id: + partner = partner.parent_id + else: + partner = False + is_contact = True + else: + is_contact = True + r.partner_contact_id = partner diff --git a/report/report_deliveryslip.xml b/report/report_deliveryslip.xml index 5b1ee6543a7c747ffb9f0cf4428b3af2ef4e62df..38b09e42eb655e013c6eb532b3c7f05f244c9c35 100644 --- a/report/report_deliveryslip.xml +++ b/report/report_deliveryslip.xml @@ -6,14 +6,24 @@ <template id="fumoc_sale_stock_report_delivery_document" inherit_id="stock.report_delivery_document"> - <xpath expr="//div[@name='div_sched_date']" position="after"> - <div t-if="o.res_transporter_id" class="col-6" name="div_transporter"> - <strong>Transporteur :</strong> - <p t-field="o.res_transporter_id"/> + <xpath expr="//table[@name='stock_move_table']" position="before"> + <div class="row mt32 mb32"> + <div t-if="o.res_transporter_id" class="col-auto" name="div_transporter"> + <strong>Transporteur :</strong> + <p t-field="o.res_transporter_id"/> + </div> + <div t-if="o.packaging_id" class="col-auto" name="div_packaging"> + <strong>Emballage :</strong> + <p t-field="o.packaging_id"/> + </div> </div> - <div t-if="o.packaging_id" class="col-6" name="div_packaging"> - <strong>Emballage :</strong> - <p t-field="o.packaging_id"/> + <div class="row mt32 mb32"> + <t t-if="o.partner_contact_id"> + <div t-if="o.partner_contact_id.delivery_note" class="col-auto" name="div_delivery_note"> + <strong>Note :</strong> + <p t-field="o.partner_contact_id.delivery_note"/> + </div> + </t> </div> </xpath> diff --git a/report/report_stockpicking_operations.xml b/report/report_stockpicking_operations.xml index cfb7ec1420b1daddf51dc7069db8f399114af9f3..6cb7997cc411955fc045a0f3eb93b3bd54925f33 100644 --- a/report/report_stockpicking_operations.xml +++ b/report/report_stockpicking_operations.xml @@ -7,16 +7,28 @@ inherit_id="stock.report_picking"> <xpath expr="//div[@name='div_sched_date']" position="after"> - <div class="col-6" name="div_transporter"> + <div class="col-auto" name="div_transporter"> <strong>Transporteur :</strong> <p t-field="o.res_transporter_id"/> </div> - <div class="col-6" name="div_packaging"> + <div class="col-auto" name="div_packaging"> <strong>Emballage :</strong> <p t-field="o.packaging_id"/> </div> </xpath> + <xpath expr="//table[1]" position="before"> + <div class="row mt48 mb32"> + <t t-if="o.partner_contact_id"> + <div t-if="o.partner_contact_id.delivery_note" class="col-auto" name="div_delivery_note"> + <strong>Note :</strong> + <p t-field="o.partner_contact_id.delivery_note"/> + </div> + </t> + </div> + </xpath> + + </template> </odoo>