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

Bugfixes in den Schnittstellen SST-03, SST-15, SST-11

develop
Ahmed Aly 2018-04-05 10:48:05 +02:00
parent 01769a7a68
commit cddeea5465
3 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -115,8 +115,6 @@ class Partner(models.Model):
""" """
vals = self.with_context(sst_14=True).remove_not_specified_fields(vals) vals = self.with_context(sst_14=True).remove_not_specified_fields(vals)
vals = self.correct_values(vals) vals = self.correct_values(vals)
if not vals.get('active', False):
vals['active'] = False
return self.create(vals).id return self.create(vals).id
@api.model @api.model
@ -233,14 +231,14 @@ class Partner(models.Model):
else: else:
raise ValidationError(_("Unternehmen mit Odoo-ID \'%s\' existiert nicht") % vals['company_odoo_id']) raise ValidationError(_("Unternehmen mit Odoo-ID \'%s\' existiert nicht") % vals['company_odoo_id'])
if vals.get('carrier', False): if vals.get('carrier_id', False):
carrier_id = self.env['delivery.carrier'].search([('name', '=', vals['carrier'])]) carrier_id = self.env['delivery.carrier'].search([('name', '=', vals['carrier_id'])])
if carrier_id: if carrier_id:
vals['property_delivery_carrier_id'] = carrier_id.id vals['property_delivery_carrier_id'] = carrier_id.id
del vals['carrier'] del vals['carrier_id']
else: else:
raise ValidationError( raise ValidationError(
_("Die Auslieferungsmethode mit dem Namen \'%s\' existiert nicht") % vals['carrier']) _("Die Auslieferungsmethode mit dem Namen \'%s\' existiert nicht") % vals['carrier_id'])
return vals return vals
@ -254,7 +252,7 @@ class Partner(models.Model):
elif self.env.context.get('sst_11', False): elif self.env.context.get('sst_11', False):
common_list.extend(['name', 'ref', 'partner_sector_id', 'comment', 'vat', 'property_payment_term_id', common_list.extend(['name', 'ref', 'partner_sector_id', 'comment', 'vat', 'property_payment_term_id',
'property_pricelist_id', 'date_vat_check', 'active', 'property_product_pricelist', 'property_pricelist_id', 'date_vat_check', 'active', 'property_product_pricelist',
'retail_partner_id', 'retailer', 'info_uid', 'name2', 'carrier']) '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', 'portal_id'])

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

@ -192,7 +192,6 @@ class SaleOrder(models.Model):
'user_id': partner.user_id.id, 'user_id': partner.user_id.id,
'payment_term_id': payment_term.id, 'payment_term_id': payment_term.id,
'partner_shipping_id': delivery_partner.id, 'partner_shipping_id': delivery_partner.id,
'partner_invoice_id': partner.id,
'incoterm': partner.sale_incoterm_id.id, 'incoterm': partner.sale_incoterm_id.id,
'carrier_id': partner.property_delivery_carrier_id.id 'carrier_id': partner.property_delivery_carrier_id.id
}) })

7
ext/custom-addons/dp_custom/wizards/portal_assign_company.py
View File

@ -62,10 +62,11 @@ class PortalAssignCompany(models.TransientModel):
partner = self.env['res.partner'].browse(self.env.context.get('active_ids', [])) partner = self.env['res.partner'].browse(self.env.context.get('active_ids', []))
if not partner: if not partner:
raise ValidationError(_('Der Partner konnte nicht gefuden werden.')) raise ValidationError(_('Der Partner konnte nicht gefuden werden.'))
if not self.main_partner_id.portal_id: portal_id = partner.portal_id
self.main_partner_id.portal_id = partner.portal_id
self.send_to_portal(self.main_partner_id.portal_id, self.main_partner_id.id)
partner.unlink() partner.unlink()
if not self.main_partner_id.portal_id:
self.main_partner_id.portal_id = portal_id
self.send_to_portal(self.main_partner_id.portal_id, self.main_partner_id.id)
return self.env.ref('base.action_partner_form').read()[0] return self.env.ref('base.action_partner_form').read()[0]
return {'type': 'ir.actions.act_window_close'} return {'type': 'ir.actions.act_window_close'}