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

rework Upload sale order

develop
Andreas Osim 2023-11-15 16:26:04 +01:00
parent 278eaed5e3
commit 1f77c60f24
3 changed files with 27 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
ext/custom-addons/dp_custom/models/sale.py
View File

@ -383,9 +383,9 @@ class SaleOrder(models.Model):
if order_id.state == 'sale' and (order_id.assembly_state == 'created'):
vals['assembly_state'] = 'approved'
vals['message_post'] = 'PG9 autoreleased'
order_id.write(vals)
if (order_id.state == 'draft' or order_id.state == 'sent') and (order_id.assembly_state == 'created'):
order_id.action_confirm()
order_id.write(vals)
return {'id': order_id.id, 'name': order_id.name}
else:
cq = self.env['res.confirmation_queue'].search([('origin', '=', origin)])
@ -496,6 +496,10 @@ class SaleOrder(models.Model):
if dv:
vals['desired_delivery_date'] = datetime.strptime(dv,'%d.%m.%Y').date()
dv = vals.get('order_delivery_date',False)
if dv:
vals['delivery_date'] = datetime.strptime(dv,'%d.%m.%Y').date()
shipping_type = vals.get('shipping_type',False)
carrier_id = False
if shipping_type:
@ -614,19 +618,20 @@ class SaleOrder(models.Model):
def _get_specified_fields(self):
return ['origin', 'client_order_ref', 'note', 'date_order', 'assembled', 'line_id', 'partner_id',
'fiscal_position_id', 'user_id', 'payment_term_id', 'partner_delivery_id', 'partner_invoice_id', 'shipping_type',
'assembly_state', 'confirmation_nr', 'confirm_order', 'order_type', 'internal_notes', 'from_designbox', 'discount', 'hide_discount', 'desired_delivery_date', 'sequence']
'assembly_state', 'confirmation_nr', 'confirm_order', 'order_type', 'internal_notes', 'from_designbox', 'discount',
'hide_discount', 'desired_delivery_date', 'order_delivery_date', 'sequence']
@api.model
def create(self,vals):
order = super(SaleOrder, self).create(vals)
current_sequence = 0
for order_line in order.order_line:
current_sequence += 1
order_line.update({'sequence': current_sequence,})
# order.partner_id.last_order_changed = datetime.now()
return order
# @api.model
# def create(self,vals):
# order = super(SaleOrder, self).create(vals)
# current_sequence = 0
# for order_line in order.order_line:
# current_sequence += 1
# order_line.update({'sequence': current_sequence,})
#
# # order.partner_id.last_order_changed = datetime.now()
#
# return order
@api.multi
def write(self, vals):

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

@ -10,16 +10,18 @@ class SaleOrder(models.Model):
# delivery_date = fields.Date('Lieferdatum', compute='_compute_delivery_date', inverse='_inverse_delivery_date')
@api.multi
@api.depends('state','write_date','order_line.delivery_date','order_line.write_date')
# @api.depends('state','write_date','order_line.delivery_date','order_line.write_date')
# @api.depends('order_line.delivery_date')
def _compute_delivery_date(self):
for order in self:
lines = order.order_line.filtered(lambda d: d.delivery_date)
lines = lines.sorted(key=lambda d: fields.Date.from_string(d.delivery_date))
if lines:
order.delivery_date = lines[0].delivery_date
if order.has_delivery:
lines = order.order_line.filtered(lambda d: d.delivery_date)
lines = lines.sorted(key=lambda d: fields.Date.from_string(d.delivery_date))
if lines:
order.delivery_date = lines[0].delivery_date
@api.multi
@api.depends('state','write_date','order_line.delivery_date','order_line.write_date')
# @api.depends('state','write_date','order_line.delivery_date','order_line.write_date')
def _inverse_delivery_date(self):
for order in self:
for line in order.order_line:

1
ext/custom-addons/dp_sale_delivery_date/models/sale_order_line.py
View File

@ -8,6 +8,7 @@ class SaleOrderLine(models.Model):
_inherit = 'sale.order.line'
delivery_date = fields.Date('Lieferdatum', compute='_compute_delivery_date', inverse='_inverse_delivery_date')
# delivery_date = fields.Date('Lieferdatum', compute='_compute_delivery_date')
@api.multi
def _compute_delivery_date(self):