diff --git a/dev/scripts/interfaces/sst01_portal_create_company.py b/dev/scripts/interfaces/sst01_portal_create_company.py index cc03b44d..2d9510d8 100755 --- a/dev/scripts/interfaces/sst01_portal_create_company.py +++ b/dev/scripts/interfaces/sst01_portal_create_company.py @@ -30,7 +30,6 @@ values = { "line_ids": ["0000"], "opt_out": True, "lang": "de", - "is_retailer": True, } res_partner_obj = odoo.env['res.partner'] diff --git a/dev/scripts/interfaces/sst04_pg_get_orders.py b/dev/scripts/interfaces/sst04_pg_get_orders.py index 568e9834..08f42761 100755 --- a/dev/scripts/interfaces/sst04_pg_get_orders.py +++ b/dev/scripts/interfaces/sst04_pg_get_orders.py @@ -7,14 +7,15 @@ db = 'tz-austria_1' user = 'admin' pw = 'x' -host = 'erp.tzaustria.info' -port = 443 -db = 'odoo-test' -user = 'tz-admin' -pw = '12tza345' -protocol="jsonrpc+ssl" +# host = 'erp.tzaustria.info' +# port = 443 +# db = 'odoo-test' +# user = 'tz-admin' +# pw = '12tza345' +# protocol="jsonrpc+ssl" -odoo = odoorpc.ODOO(host, protocol=protocol, port=port) +odoo = odoorpc.ODOO(host, port=port) +# odoo = odoorpc.ODOO(host, protocol=protocol, port=port) odoo.login(db, user, pw) sale_order_obj = odoo.env['sale.order'] diff --git a/dev/scripts/interfaces/sst10_create_product.py b/dev/scripts/interfaces/sst10_create_product.py index 7ec89e8f..50de12b1 100755 --- a/dev/scripts/interfaces/sst10_create_product.py +++ b/dev/scripts/interfaces/sst10_create_product.py @@ -7,14 +7,15 @@ db = 'tz-austria_1' user = 'tz-admin' pw = 'x' -host = 'erp.tzaustria.info' -port = 443 -db = 'odoo-test' -user = 'tz-admin' -pw = '12tza345' -protocol="jsonrpc+ssl" +# host = 'erp.tzaustria.info' +# port = 443 +# db = 'odoo-test' +# user = 'tz-admin' +# pw = '12tza345' +# protocol="jsonrpc+ssl" -odoo = odoorpc.ODOO(host, protocol=protocol, port=port) +odoo = odoorpc.ODOO(host, port=port) +# odoo = odoorpc.ODOO(host, protocol=protocol, port=port) odoo.login(db, user, pw) values = { @@ -28,10 +29,10 @@ values = { "weight": 80.45, "active": True, "is_internal": True, - "xcat_id": "Kategorie 1", + "xcat_id": "XCategory Name", "notes": "notes", - "material_type_id": "Holz", - "categ_id": "all", + "material_type_id": "Roh Material", + "categ_id": "__connector", "intrastat_id": "34052000", "sale_ok": True, "assembly_line_ids": ["0000"], diff --git a/dev/scripts/interfaces/sst11_pg_create_company.py b/dev/scripts/interfaces/sst11_pg_create_company.py index ed3a1782..6d13302c 100755 --- a/dev/scripts/interfaces/sst11_pg_create_company.py +++ b/dev/scripts/interfaces/sst11_pg_create_company.py @@ -1,6 +1,5 @@ # -*- coding: utf-8 -*- import odoorpc -from urllib.parse import urlparse host = 'localhost' port = 8080 @@ -32,7 +31,7 @@ values = { "vat": False, "lang": "de", "line_ids": ["0000"], - "property_payment_term_id": "15 Tage", + "property_payment_term_id": "7", "property_product_pricelist": "EUR", "date_vat_check": "2017-08-04", "active": True, diff --git a/ext/custom-addons/dp_custom/models/dp_custom.py b/ext/custom-addons/dp_custom/models/dp_custom.py index 7720f3bf..3c3c7cf2 100644 --- a/ext/custom-addons/dp_custom/models/dp_custom.py +++ b/ext/custom-addons/dp_custom/models/dp_custom.py @@ -27,14 +27,12 @@ class AbstractHelper(models.AbstractModel): _description = 'Abstract Helper' @api.model - def remove_not_specified_fields(self, vals): + def check_not_specified_fields(self, vals): specified_fields = self._get_specified_fields() - remove_fields = [] for key in list(vals.keys()): if key not in specified_fields: - remove_fields.append(key) - for key in remove_fields: - del vals[key] + raise ValidationError( + _('Es befinden sich unerlaubte Felder in Ihrem Aufruf. Bitte entfernen Sie diese.')) return vals @api.model diff --git a/ext/custom-addons/dp_custom/models/product.py b/ext/custom-addons/dp_custom/models/product.py index 9878fe97..d6bae65a 100644 --- a/ext/custom-addons/dp_custom/models/product.py +++ b/ext/custom-addons/dp_custom/models/product.py @@ -66,7 +66,7 @@ class ProductTemplate(models.Model): :param vals: :return: """ - vals = self.remove_not_specified_fields(vals) + self.check_not_specified_fields(vals) vals = self.correct_values(vals) product_template = self.with_context(active_test=False).search([('default_code', '=', vals['default_code'])]) if product_template: diff --git a/ext/custom-addons/dp_custom/models/res_partner.py b/ext/custom-addons/dp_custom/models/res_partner.py index 6ea85e64..a3b53bf7 100644 --- a/ext/custom-addons/dp_custom/models/res_partner.py +++ b/ext/custom-addons/dp_custom/models/res_partner.py @@ -93,7 +93,7 @@ class Partner(models.Model): :param vals: :return: """ - vals = self.with_context(sst_1=True).remove_not_specified_fields(vals) + self.with_context(sst_1=True).check_not_specified_fields(vals) vals = self.correct_values(vals) if not vals.get('active', False): vals['active'] = False @@ -109,7 +109,7 @@ class Partner(models.Model): :param vals: :return: """ - vals = self.with_context(sst_14=True).remove_not_specified_fields(vals) + self.with_context(sst_14=True).check_not_specified_fields(vals) vals = self.correct_values(vals) return self.create(vals).id @@ -120,7 +120,7 @@ class Partner(models.Model): :param vals: :return: """ - vals = self.with_context(sst_11=True).remove_not_specified_fields(vals) + self.with_context(sst_11=True).check_not_specified_fields(vals) vals = self.correct_values(vals) partner = self.with_context(active_test=False).search([('ref', '=', vals['ref'])]) if partner: diff --git a/ext/custom-addons/dp_custom/models/sale.py b/ext/custom-addons/dp_custom/models/sale.py index c9bfd46e..df114fa9 100644 --- a/ext/custom-addons/dp_custom/models/sale.py +++ b/ext/custom-addons/dp_custom/models/sale.py @@ -202,7 +202,7 @@ class SaleOrder(models.Model): if key.startswith('delivery_'): delivery_vals[key.replace('delivery_', '')] = vals[key] - delivery_vals = delivery_partner.with_context(delivery_partner=True).remove_not_specified_fields(delivery_vals) + delivery_partner.with_context(delivery_partner=True).check_not_specified_fields(delivery_vals) delivery_vals = delivery_partner.correct_values(delivery_vals) delivery_vals['parent_id'] = partner.id @@ -219,7 +219,7 @@ class SaleOrder(models.Model): attachment_vals = vals.get('attachment_ids', False) order_line_vals = vals.get('order_lines', False) - vals = self.remove_not_specified_fields(vals) + self.check_not_specified_fields(vals) vals = self.correct_values(vals) payment_term = partner.property_payment_term_id if partner.retail_partner_id: