From cddeea5465c47f6eaa71d96d3c01f28831b6e4fb Mon Sep 17 00:00:00 2001 From: Ahmed Aly Date: Thu, 5 Apr 2018 10:48:05 +0200 Subject: [PATCH] Bugfixes in den Schnittstellen SST-03, SST-15, SST-11 --- ext/custom-addons/dp_custom/models/res_partner.py | 12 +++++------- ext/custom-addons/dp_custom/models/sale.py | 1 - .../dp_custom/wizards/portal_assign_company.py | 7 ++++--- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/ext/custom-addons/dp_custom/models/res_partner.py b/ext/custom-addons/dp_custom/models/res_partner.py index 17ef1e64..68e369bc 100644 --- a/ext/custom-addons/dp_custom/models/res_partner.py +++ b/ext/custom-addons/dp_custom/models/res_partner.py @@ -115,8 +115,6 @@ class Partner(models.Model): """ vals = self.with_context(sst_14=True).remove_not_specified_fields(vals) vals = self.correct_values(vals) - if not vals.get('active', False): - vals['active'] = False return self.create(vals).id @api.model @@ -233,14 +231,14 @@ class Partner(models.Model): else: raise ValidationError(_("Unternehmen mit Odoo-ID \'%s\' existiert nicht") % vals['company_odoo_id']) - if vals.get('carrier', False): - carrier_id = self.env['delivery.carrier'].search([('name', '=', vals['carrier'])]) + if vals.get('carrier_id', False): + carrier_id = self.env['delivery.carrier'].search([('name', '=', vals['carrier_id'])]) if carrier_id: vals['property_delivery_carrier_id'] = carrier_id.id - del vals['carrier'] + del vals['carrier_id'] else: 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 @@ -254,7 +252,7 @@ class Partner(models.Model): elif self.env.context.get('sst_11', False): common_list.extend(['name', 'ref', 'partner_sector_id', 'comment', 'vat', 'property_payment_term_id', '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 elif self.env.context.get('sst_14', False): common_list.extend(['firstname', 'lastname', 'midname', 'company_odoo_id', 'portal_id']) diff --git a/ext/custom-addons/dp_custom/models/sale.py b/ext/custom-addons/dp_custom/models/sale.py index cfe28dfe..eec7f0a8 100644 --- a/ext/custom-addons/dp_custom/models/sale.py +++ b/ext/custom-addons/dp_custom/models/sale.py @@ -192,7 +192,6 @@ class SaleOrder(models.Model): 'user_id': partner.user_id.id, 'payment_term_id': payment_term.id, 'partner_shipping_id': delivery_partner.id, - 'partner_invoice_id': partner.id, 'incoterm': partner.sale_incoterm_id.id, 'carrier_id': partner.property_delivery_carrier_id.id }) diff --git a/ext/custom-addons/dp_custom/wizards/portal_assign_company.py b/ext/custom-addons/dp_custom/wizards/portal_assign_company.py index 262c7a46..3e34d535 100644 --- a/ext/custom-addons/dp_custom/wizards/portal_assign_company.py +++ b/ext/custom-addons/dp_custom/wizards/portal_assign_company.py @@ -62,10 +62,11 @@ class PortalAssignCompany(models.TransientModel): partner = self.env['res.partner'].browse(self.env.context.get('active_ids', [])) if not partner: raise ValidationError(_('Der Partner konnte nicht gefuden werden.')) - if not self.main_partner_id.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) + portal_id = partner.portal_id 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 {'type': 'ir.actions.act_window_close'}