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

Feedback 1615: SST-03: Namen wir nicht befüllt

develop
Ahmed Aly 2018-04-11 14:12:02 +02:00
parent 4533f77cc2
commit e5d2e1ffc4
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ext/custom-addons/dp_custom/models/res_partner.py
View File

@ -255,7 +255,7 @@ class Partner(models.Model):
'retail_partner_id', 'retailer', 'info_uid', 'name2', 'carrier_id']) 'retail_partner_id', 'retailer', 'info_uid', 'name2', 'carrier_id'])
return common_list return common_list
elif self.env.context.get('sst_14', False): elif self.env.context.get('sst_14', False):
common_list.extend(['firstname', 'lastname', 'midname', 'company_odoo_id', 'portal_id']) common_list.extend(['firstname', 'lastname', 'midname', 'company_odoo_id'])
return common_list return common_list
else: else:
return super(Partner, self)._get_specified_fields() return super(Partner, self)._get_specified_fields()

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

@ -168,7 +168,7 @@ class SaleOrder(models.Model):
if key.startswith('delivery_'): if key.startswith('delivery_'):
delivery_vals[key.replace('delivery_', '')] = vals[key] delivery_vals[key.replace('delivery_', '')] = vals[key]
delivery_vals = delivery_partner.with_context(sst_1=True).remove_not_specified_fields(delivery_vals) delivery_vals = delivery_partner.with_context(sst_14=True).remove_not_specified_fields(delivery_vals)
delivery_vals = delivery_partner.correct_values(delivery_vals) delivery_vals = delivery_partner.correct_values(delivery_vals)
delivery_vals['parent_id'] = partner.id delivery_vals['parent_id'] = partner.id
@ -452,7 +452,6 @@ class SaleOrderLine(models.Model):
'price_unit': -invoice_lines.price_subtotal * (discount / 100), 'price_unit': -invoice_lines.price_subtotal * (discount / 100),
'uom_id': self.env.ref('product.product_uom_unit').id, 'uom_id': self.env.ref('product.product_uom_unit').id,
'name': 'Händlerrabatt {}%'.format(discount), 'name': 'Händlerrabatt {}%'.format(discount),
'intrastat_id': False
}) })
del vals['discount'] del vals['discount']
invoice_lines |= self.env['account.invoice.line'].create(vals) invoice_lines |= self.env['account.invoice.line'].create(vals)