[IMP] ensan_sale_management: use payment state instead of reconcile
This commit is contained in:
parent
7222104a81
commit
511655de43
|
|
@ -170,7 +170,7 @@ class ProductTemplate_Inherit(models.Model):
|
||||||
|
|
||||||
line_ids = self.env['account.move.line'].search([
|
line_ids = self.env['account.move.line'].search([
|
||||||
('product_id.product_tmpl_id', 'in', products.ids),
|
('product_id.product_tmpl_id', 'in', products.ids),
|
||||||
('reconciled', '=', True),
|
('move_id.payment_state', '=', 'paid'),
|
||||||
('move_id.move_type', '=', 'out_invoice')
|
('move_id.move_type', '=', 'out_invoice')
|
||||||
])
|
])
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -29,11 +29,10 @@ class SaleOrder(models.Model):
|
||||||
def write(self, vals):
|
def write(self, vals):
|
||||||
if 'order_mobile_number' in vals and not self._context.get('skip_partner_mobile_sync'):
|
if 'order_mobile_number' in vals and not self._context.get('skip_partner_mobile_sync'):
|
||||||
vals['order_mobile_number'] = self.phone_format(vals['order_mobile_number'])
|
vals['order_mobile_number'] = self.phone_format(vals['order_mobile_number'])
|
||||||
orders = self.search([('state', '=', 'sale'), ('id', 'not in', self.ids)])
|
old_orders = self.search([('state', '=', 'sale'), ('id', 'not in', self.ids), ('order_mobile_number', '=', vals['order_mobile_number'])], limit=1, order='id desc')
|
||||||
numbers = set(orders.mapped('order_mobile_number'))
|
if old_orders:
|
||||||
if vals['order_mobile_number'] in numbers:
|
|
||||||
vals['donor_type'] = 'returning'
|
vals['donor_type'] = 'returning'
|
||||||
orders.filtered(lambda o: o.order_mobile_number == vals['order_mobile_number']).write({'donor_type': 'returning'})
|
old_orders.write({'donor_type': 'returning'})
|
||||||
else:
|
else:
|
||||||
vals['donor_type'] = 'new'
|
vals['donor_type'] = 'new'
|
||||||
partner_sudo = self.env['res.partner'].sudo()
|
partner_sudo = self.env['res.partner'].sudo()
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue