diff --git a/stock_picking_webkit/report/delivery_slip.mako b/stock_picking_webkit/report/delivery_slip.mako index 3f95b72..c4a182a 100644 --- a/stock_picking_webkit/report/delivery_slip.mako +++ b/stock_picking_webkit/report/delivery_slip.mako @@ -29,6 +29,21 @@ %endif %endfor + <% + invoice_addr = invoice_address(picking.partner_id.id) + %> + + + + %if invoice_addr.contact_address: + <% address_lines = invoice_addr.contact_address.split("\n") %> + %for part in address_lines: + %if part: + + %endif + %endfor + %endif +
${_("Invoice address:")}
${invoice_addr.title and invoice_addr.title.name or ''} ${invoice_addr.name }
${part}

${_(u'Delivery Order') } ${picking.name}

diff --git a/stock_picking_webkit/report/stock_report.py b/stock_picking_webkit/report/stock_report.py index 42f9004..6e9be84 100644 --- a/stock_picking_webkit/report/stock_report.py +++ b/stock_picking_webkit/report/stock_report.py @@ -116,10 +116,19 @@ class PrintPick(report_sxw.rml_parse): return super(PrintPick, self).set_context(objects, data, ids, report_type=report_type) class DeliverySlip(report_sxw.rml_parse): + + def _get_invoice_address(self, partner_id): + partner_obj = self.pool.get('res.partner') + partner = partner_obj.browse(self.cr, self.uid, partner_id) + invoice_address_id = partner.address_get(adr_pref=['invoice'])['invoice'] + return partner_obj.browse( + self.cr, self.uid, invoice_address_id) + def __init__(self, cr, uid, name, context): super(DeliverySlip, self).__init__(cr, uid, name, context=context) self.localcontext.update({ 'time': time, + 'invoice_address': self._get_invoice_address, }) report_sxw.report_sxw('report.webkit.aggregated_picking',