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

fix for computed/stored delivery_date; adapt tz_report_production (carrier)

develop
Andreas Osim 2019-03-29 13:23:17 +01:00
parent f8be516f91
commit 06e29b778f
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ext/custom-addons/dp_sale_delivery_date/models/sale_order.py
View File

@ -8,8 +8,10 @@ class SaleOrder(models.Model):
_inherit = 'sale.order' _inherit = 'sale.order'
delivery_date = fields.Date('Lieferdatum', compute='_compute_delivery_date', inverse='_inverse_delivery_date',store=True,index=True) delivery_date = fields.Date('Lieferdatum', compute='_compute_delivery_date', inverse='_inverse_delivery_date',store=True,index=True)
# delivery_date = fields.Date('Lieferdatum', compute='_compute_delivery_date', inverse='_inverse_delivery_date')
@api.multi @api.multi
@api.depends('state','write_date','order_line.delivery_date','order_line.write_date')
def _compute_delivery_date(self): def _compute_delivery_date(self):
for order in self: for order in self:
lines = order.order_line.filtered(lambda d: d.delivery_date) lines = order.order_line.filtered(lambda d: d.delivery_date)
@ -18,6 +20,7 @@ class SaleOrder(models.Model):
order.delivery_date = lines[0].delivery_date order.delivery_date = lines[0].delivery_date
@api.multi @api.multi
@api.depends('state','write_date','order_line.delivery_date','order_line.write_date')
def _inverse_delivery_date(self): def _inverse_delivery_date(self):
for order in self: for order in self:
for line in order.order_line: for line in order.order_line:

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

@ -33,6 +33,9 @@
<strong><span>Kdnr: </span></strong><span t-esc="o.partner_shipping_id.ref"/> <strong><span>Kdnr: </span></strong><span t-esc="o.partner_shipping_id.ref"/>
</div> </div>
</div> </div>
<div class="col-xs-3">
<strong><span>Auslieferungsmethode: </span></strong><span t-field="o.carrier_id"/>
</div>
</div> </div>
<div class="row mt32"/> <div class="row mt32"/>
<div class="row height-20"> <div class="row height-20">