From 0f7fd1f3652543581dd953266b1572666633c132 Mon Sep 17 00:00:00 2001 From: Ahmed Aly Date: Wed, 4 Apr 2018 15:55:44 +0200 Subject: [PATCH] Fall 5397: CR1 - Auslieferungsmethode + neues Logo --- .../interfaces/sst11_pg_create_company.py | 9 +++++---- .../dp_custom/data/product_data.xml | 5 +++++ .../dp_custom/models/res_partner.py | 12 +++++++++++- ext/custom-addons/dp_custom/models/sale.py | 6 ++++-- .../dp_custom/static/src/img/logo.png | Bin 17134 -> 13583 bytes ext/custom-addons/dp_dmi/__manifest__.py | 1 + ext/custom-addons/dp_dmi/delivery.carrier.csv | 2 ++ .../dp_reports/reports/report_templates.xml | 4 ++-- 8 files changed, 30 insertions(+), 9 deletions(-) create mode 100644 ext/custom-addons/dp_dmi/delivery.carrier.csv diff --git a/dev/scripts/interfaces/sst11_pg_create_company.py b/dev/scripts/interfaces/sst11_pg_create_company.py index 40785145..9fc43dde 100755 --- a/dev/scripts/interfaces/sst11_pg_create_company.py +++ b/dev/scripts/interfaces/sst11_pg_create_company.py @@ -5,7 +5,7 @@ from urllib.parse import urlparse host = 'localhost' port = 8080 db = 'tz-austria_1' -user = 'admin' +user = 'tz-admin' pw = 'x' odoo = odoorpc.ODOO(host, port=port) @@ -27,17 +27,18 @@ values = { "email": "company@test.at", "opt_out": True, "ref": "A144S4", - "partner_sector_id": "Test", + "partner_sector_id": "ENDKUNDE", "comment": "comment", "vat": False, "lang": "de", - "line_ids": ["12345", "12346"], + "line_ids": ["0000"], "property_payment_term_id": "15 Tage", "property_product_pricelist": "EUR", "date_vat_check": "2017-08-04", "active": True, - "retail_partner_id": "A144S3", + "retail_partner_id": "004354", "retailer": False, + "carrier": "LKW" } res_partner_obj = odoo.env['res.partner'] diff --git a/ext/custom-addons/dp_custom/data/product_data.xml b/ext/custom-addons/dp_custom/data/product_data.xml index 717de1f8..c084058e 100644 --- a/ext/custom-addons/dp_custom/data/product_data.xml +++ b/ext/custom-addons/dp_custom/data/product_data.xml @@ -6,4 +6,9 @@ service + + Transport + service + + diff --git a/ext/custom-addons/dp_custom/models/res_partner.py b/ext/custom-addons/dp_custom/models/res_partner.py index 5c6ad7ee..17ef1e64 100644 --- a/ext/custom-addons/dp_custom/models/res_partner.py +++ b/ext/custom-addons/dp_custom/models/res_partner.py @@ -233,6 +233,15 @@ 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 carrier_id: + vals['property_delivery_carrier_id'] = carrier_id.id + del vals['carrier'] + else: + raise ValidationError( + _("Die Auslieferungsmethode mit dem Namen \'%s\' existiert nicht") % vals['carrier']) + return vals @api.model @@ -245,7 +254,8 @@ 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']) + 'retail_partner_id', 'retailer', 'info_uid', 'name2', 'carrier']) + return common_list elif self.env.context.get('sst_14', False): common_list.extend(['firstname', 'lastname', 'midname', 'company_odoo_id', 'portal_id']) return common_list diff --git a/ext/custom-addons/dp_custom/models/sale.py b/ext/custom-addons/dp_custom/models/sale.py index 8128e8a6..7c5760cb 100644 --- a/ext/custom-addons/dp_custom/models/sale.py +++ b/ext/custom-addons/dp_custom/models/sale.py @@ -154,7 +154,8 @@ class SaleOrder(models.Model): if not partner.parent_id: raise ValidationError( _('Zu dem Kontakt mit der portal-ID %s existiert kein Unternehmen') % vals['portal_id']) - vals['partner_id'] = partner.parent_id.id + partner = partner.parent_id + vals['partner_id'] = partner.id if not partner: raise ValidationError( _("Der Kunde mit der Portal-ID \'%s\' kann nicht zugeordnet werden") % vals['portal_id']) @@ -192,7 +193,8 @@ class SaleOrder(models.Model): 'payment_term_id': payment_term.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 }) order_id = self.create(vals) if attachment_vals: diff --git a/ext/custom-addons/dp_custom/static/src/img/logo.png b/ext/custom-addons/dp_custom/static/src/img/logo.png index 32c1481da1d0bf07472faac546a3410a249e4d2d..be92c30308c58bd19b29b20daa16c12faa27589e 100644 GIT binary patch literal 13583 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 R@RbcZa!~(3>OQNh{|CnDkRt#9 diff --git a/ext/custom-addons/dp_dmi/__manifest__.py b/ext/custom-addons/dp_dmi/__manifest__.py index 96498c46..690e5649 100644 --- a/ext/custom-addons/dp_dmi/__manifest__.py +++ b/ext/custom-addons/dp_dmi/__manifest__.py @@ -40,6 +40,7 @@ 'account.payment.term.csv', 'account.payment.term.line.csv', 'res.line.csv', + 'delivery.carrier.csv', ], 'installable': True, 'auto_install': False, diff --git a/ext/custom-addons/dp_dmi/delivery.carrier.csv b/ext/custom-addons/dp_dmi/delivery.carrier.csv new file mode 100644 index 00000000..8b5f3982 --- /dev/null +++ b/ext/custom-addons/dp_dmi/delivery.carrier.csv @@ -0,0 +1,2 @@ +"id","name","delivery_type","product_id/id","fixed_price" +"carrier_lkw","LKW","fixed","dp_custom.product_transport","0.0" diff --git a/ext/custom-addons/dp_reports/reports/report_templates.xml b/ext/custom-addons/dp_reports/reports/report_templates.xml index bf59339f..019da065 100644 --- a/ext/custom-addons/dp_reports/reports/report_templates.xml +++ b/ext/custom-addons/dp_reports/reports/report_templates.xml @@ -32,7 +32,7 @@