From 5836b075a839fd261b8e89c0cb696889076ee1cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Br=C3=BCckl?= Date: Fri, 23 Feb 2018 10:01:56 +0100 Subject: [PATCH 1/6] =?UTF-8?q?=C3=84nderung=20auf=20round=5Fglobally?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ext/custom-addons/dp_custom/models/account.py | 2 +- setup/lib/config.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ext/custom-addons/dp_custom/models/account.py b/ext/custom-addons/dp_custom/models/account.py index 15fae72a..7f20177f 100644 --- a/ext/custom-addons/dp_custom/models/account.py +++ b/ext/custom-addons/dp_custom/models/account.py @@ -26,7 +26,7 @@ class AccountInvoiceLine(models.Model): intrastat_id = fields.Many2one(comodel_name='report.intrastat.code', string='Intrastat Code') - @api.model + @api.one def create(self, vals): if vals.get('product_id', False) and not vals.get('intrastat_id', False): vals.update(intrastat_id=self.env['product.template'].browse(vals['product_id']).intrastat_id.id) diff --git a/setup/lib/config.py b/setup/lib/config.py index e5e4bcba..41476799 100644 --- a/setup/lib/config.py +++ b/setup/lib/config.py @@ -76,7 +76,7 @@ class Config(object): 'security_lead': 0, # Einstellungen Finanzen - 'tax_calculation_rounding_method': 'round_per_line', + 'tax_calculation_rounding_method': 'round_globally', 'vat_check_vies': True, 'group_multi_currency': True, # Multiwährungsfunktion aktivieren 'module_account_reports_followup': False, From ed6f94e27b78c4e4eb656e3f9adedab8ca9b915e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Br=C3=BCckl?= Date: Fri, 23 Feb 2018 10:05:01 +0100 Subject: [PATCH 2/6] revert --- ext/custom-addons/dp_custom/models/account.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ext/custom-addons/dp_custom/models/account.py b/ext/custom-addons/dp_custom/models/account.py index 7f20177f..15fae72a 100644 --- a/ext/custom-addons/dp_custom/models/account.py +++ b/ext/custom-addons/dp_custom/models/account.py @@ -26,7 +26,7 @@ class AccountInvoiceLine(models.Model): intrastat_id = fields.Many2one(comodel_name='report.intrastat.code', string='Intrastat Code') - @api.one + @api.model def create(self, vals): if vals.get('product_id', False) and not vals.get('intrastat_id', False): vals.update(intrastat_id=self.env['product.template'].browse(vals['product_id']).intrastat_id.id) From 7e3273a74174951c490e25b0caef398b938860ee Mon Sep 17 00:00:00 2001 From: Roman Widmann Date: Wed, 28 Feb 2018 13:28:03 +0100 Subject: [PATCH 3/6] Feedback 1442: Setup: Module installieren --- ext/custom-addons/dp_custom/__manifest__.py | 1 + setup/lib/config.py | 2 ++ 2 files changed, 3 insertions(+) diff --git a/ext/custom-addons/dp_custom/__manifest__.py b/ext/custom-addons/dp_custom/__manifest__.py index 6102ab36..1b16c770 100644 --- a/ext/custom-addons/dp_custom/__manifest__.py +++ b/ext/custom-addons/dp_custom/__manifest__.py @@ -35,6 +35,7 @@ 'sale_stock', 'report_intrastat', 'dp_intercompany_invoicing', + 'sale_partner_incoterm', ], 'data': [ 'wizards/wizard_confirm_production.xml', diff --git a/setup/lib/config.py b/setup/lib/config.py index 41476799..139c232d 100644 --- a/setup/lib/config.py +++ b/setup/lib/config.py @@ -137,6 +137,8 @@ class Config(object): 'dp_retail_invoice', 'website_sale', 'account_invoice_fiscal_position_update', + 'dp_sale_filter_partner_addresses', + 'website_form_project', ] From d91ec620f847a7159aa1a467da15f8fbdf06617f Mon Sep 17 00:00:00 2001 From: Roman Widmann Date: Wed, 28 Feb 2018 14:38:54 +0100 Subject: [PATCH 4/6] Feedback 1436: Feedback - Dokumentenvorlagen --- .../dp_reports/reports/report_templates.xml | 2 +- .../dp_reports_account/reports/invoice.xml | 24 ++++++++++++------- .../dp_reports_sale/reports/sale.xml | 24 ++++++++++++------- 3 files changed, 31 insertions(+), 19 deletions(-) diff --git a/ext/custom-addons/dp_reports/reports/report_templates.xml b/ext/custom-addons/dp_reports/reports/report_templates.xml index 9c3798e5..bcec8bd6 100644 --- a/ext/custom-addons/dp_reports/reports/report_templates.xml +++ b/ext/custom-addons/dp_reports/reports/report_templates.xml @@ -107,7 +107,7 @@ UID-Nr.: · - EORI-Nr.: + EORI-Nr. · Firmenbuch Nr.: diff --git a/ext/custom-addons/dp_reports_account/reports/invoice.xml b/ext/custom-addons/dp_reports_account/reports/invoice.xml index e10d5209..cd70d8cf 100644 --- a/ext/custom-addons/dp_reports_account/reports/invoice.xml +++ b/ext/custom-addons/dp_reports_account/reports/invoice.xml @@ -37,26 +37,32 @@
- Kundennr.: - +
+ Kundennr.: + +
Ansprechpartner: - + Positionen:
- Rechnungsdatum: - +
+ Rechnungsdatum: + +
Email: - + Artikel:
- Lieferdatum: - ????????? +
+ Lieferdatum: + ????????? +
Telefon: - + Bezeichnung:
diff --git a/ext/custom-addons/dp_reports_sale/reports/sale.xml b/ext/custom-addons/dp_reports_sale/reports/sale.xml index 8e5794b1..5580da68 100644 --- a/ext/custom-addons/dp_reports_sale/reports/sale.xml +++ b/ext/custom-addons/dp_reports_sale/reports/sale.xml @@ -36,26 +36,32 @@
- Kundennr.: - +
+ Kundennr.: + +
Ansprechpartner: - + Positionen:
- Angebotsdatum: - +
+ Angebotsdatum: + +
Email: - + Artikel:
- Lieferdatum: - +
+ Lieferdatum: + +
Telefon: - + Bezeichnung:
From 78a09f2068cb870fc68e9e6fa69e14166ce3e819 Mon Sep 17 00:00:00 2001 From: Roman Widmann Date: Thu, 1 Mar 2018 09:23:59 +0100 Subject: [PATCH 5/6] Feedback 1455: Anzeige "Referenzbeleg" im Auftrag --- ext/custom-addons/dp_custom/views/sale_views.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ext/custom-addons/dp_custom/views/sale_views.xml b/ext/custom-addons/dp_custom/views/sale_views.xml index 25b580aa..5afb2f5b 100644 --- a/ext/custom-addons/dp_custom/views/sale_views.xml +++ b/ext/custom-addons/dp_custom/views/sale_views.xml @@ -33,6 +33,11 @@ + + + + + From de160c539681bff4b64931bf30a41e00ce9aa2a2 Mon Sep 17 00:00:00 2001 From: Roman Widmann Date: Thu, 1 Mar 2018 10:48:15 +0100 Subject: [PATCH 6/6] Feedback 1436: Feedback - Dokumentenvorlagen, Gesamtgewicht in der sale.order richtig berechnen. --- ext/custom-addons/dp_custom/models/sale.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ext/custom-addons/dp_custom/models/sale.py b/ext/custom-addons/dp_custom/models/sale.py index e486d2ca..45e145dd 100644 --- a/ext/custom-addons/dp_custom/models/sale.py +++ b/ext/custom-addons/dp_custom/models/sale.py @@ -56,7 +56,7 @@ class SaleOrder(models.Model): for record in self: sum = 0 for line in record.order_line: - sum += line.product_id.weight * line.product_uom_qty + sum += (line.lot_id.weight or line.product_id.weight) * line.product_uom_qty record.weight_total = sum @api.multi