From c9dd3f6c674461511f5962d4ea99ea979856ecaf Mon Sep 17 00:00:00 2001 From: Ahmed Aly Date: Mon, 3 Sep 2018 14:29:34 +0200 Subject: [PATCH 1/7] =?UTF-8?q?FB-011:=20Rechnungsvorlagen=20-=20Wei=C3=9F?= =?UTF-8?q?e=20Rechtecke?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ext/custom-addons/dp_reports_sale/reports/sale.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ext/custom-addons/dp_reports_sale/reports/sale.xml b/ext/custom-addons/dp_reports_sale/reports/sale.xml index 630f407c..f23168f5 100644 --- a/ext/custom-addons/dp_reports_sale/reports/sale.xml +++ b/ext/custom-addons/dp_reports_sale/reports/sale.xml @@ -143,8 +143,7 @@ kg - - + From aacf4c265344b66484d603e95be1cdb2179b5a4c Mon Sep 17 00:00:00 2001 From: Ahmed Aly Date: Wed, 5 Sep 2018 12:14:02 +0200 Subject: [PATCH 2/7] Fix sale_report: white rectangle in some sites under the image --- dev/pylint/setup_pylint_hook | 11 ++--------- ext/custom-addons/dp_reports_sale/reports/sale.xml | 2 +- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/dev/pylint/setup_pylint_hook b/dev/pylint/setup_pylint_hook index 6ea70795..f77ee54d 100755 --- a/dev/pylint/setup_pylint_hook +++ b/dev/pylint/setup_pylint_hook @@ -1,21 +1,14 @@ #!/usr/bin/env bash -if ! $(python -c "import pylint" &> /dev/null); then - echo 'Pylint is not installed and is going to be installed now!' - sudo pip install pylint -else - echo 'Pylint is already installed. Continue ...' -fi - if ! $(python -c "import pylint_odoo" &> /dev/null); then echo 'The pylint module "pylint-odoo" is not installed and is going to be installed now!' - sudo pip install --upgrade git+https://github.com/oca/pylint-odoo.git + sudo pip3 install --upgrade git+https://github.com/oca/pylint-odoo.git else echo 'The pylint module "pylint-odoo" is already installed. Continue ...' fi if ! $(python -c "import git_pylint_commit_hook" &> /dev/null); then echo 'git-pylint-commit-hook is not insalled and is going to be isntalled now!' - sudo pip install git-pylint-commit-hook + sudo pip3 install git-pylint-commit-hook else echo 'git-pylint-commit-hook is already installed. Continue ...' fi diff --git a/ext/custom-addons/dp_reports_sale/reports/sale.xml b/ext/custom-addons/dp_reports_sale/reports/sale.xml index f23168f5..984a60b3 100644 --- a/ext/custom-addons/dp_reports_sale/reports/sale.xml +++ b/ext/custom-addons/dp_reports_sale/reports/sale.xml @@ -110,7 +110,7 @@

- +
From 5f3a0ecadf8050c2bee92e8c024bfd8d94fee0ad Mon Sep 17 00:00:00 2001 From: Roman Widmann Date: Wed, 5 Sep 2018 15:26:43 +0200 Subject: [PATCH 3/7] RW development setup --- dev/odoo-server-dev-rw.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/odoo-server-dev-rw.conf b/dev/odoo-server-dev-rw.conf index c648544e..dd79bc61 100644 --- a/dev/odoo-server-dev-rw.conf +++ b/dev/odoo-server-dev-rw.conf @@ -8,7 +8,7 @@ db_port = 5432 db_user = False db_password = False -addons_path = ext/odoo/addons,ext/3rd-party-addons,ext/custom-addons +addons_path = ext/odoo/addons,ext/3rd-party-addons,ext/custom-addons,ext/clarico-addons ; For enterprise use the addons path bellow ; addons_path = ext/enterprise-addons,ext/odoo/addons,ext/3rd-party-addons,ext/custom-addons,dmi/run1 timezone = Europe/Vienna From db3c36b72c4b932ee0cde770758eb2feafaa3151 Mon Sep 17 00:00:00 2001 From: Roman Widmann Date: Wed, 5 Sep 2018 15:27:47 +0200 Subject: [PATCH 4/7] US-009 (481), FB-012: Rechnung von ATOC18-000502 --- 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 28ea0f62..661410bf 100644 --- a/ext/custom-addons/dp_custom/models/account.py +++ b/ext/custom-addons/dp_custom/models/account.py @@ -37,7 +37,7 @@ class AccountInvoiceLine(models.Model): if vals.get('lot_id', False): vals.update(intrastat_id=self.env['stock.production.lot'].browse(vals['lot_id']).intrastat_id.id) elif vals.get('product_id', False): - vals.update(intrastat_id=self.env['product.template'].browse(vals['product_id']).intrastat_id.id) + vals.update(intrastat_id=self.env['product.product'].browse(vals['product_id']).intrastat_id.id) return super(AccountInvoiceLine, self).create(vals) @api.multi From 8f1968f9c6f5f72aa95e5911b18fe903544cc877 Mon Sep 17 00:00:00 2001 From: Roman Widmann Date: Wed, 5 Sep 2018 16:31:01 +0200 Subject: [PATCH 5/7] US-009 (481), FB-010: Support - TZ-Austria --- ext/custom-addons/dp_custom/models/stock.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ext/custom-addons/dp_custom/models/stock.py b/ext/custom-addons/dp_custom/models/stock.py index ca592b69..3ca1c36e 100644 --- a/ext/custom-addons/dp_custom/models/stock.py +++ b/ext/custom-addons/dp_custom/models/stock.py @@ -36,12 +36,14 @@ class StockProductionLot(models.Model): @api.model def create(self, vals): - tools.image_resize_images(vals) + if vals.get('image'): + vals.update(tools.image_get_resized_images(vals['image'], return_big=True, return_medium=True, return_small=False)) return super(StockProductionLot, self).create(vals) @api.multi def write(self, vals): - tools.image_resize_images(vals) + if vals.get('image'): + vals.update(tools.image_get_resized_images(vals['image'], return_big=True, return_medium=True, return_small=False)) return super(StockProductionLot, self).write(vals) From 39db8a6bafdfae2bcc489cf808dbf7a63c26316b Mon Sep 17 00:00:00 2001 From: Andreas Wabro Date: Thu, 6 Sep 2018 14:09:34 +0200 Subject: [PATCH 6/7] =?UTF-8?q?FB-013=20E-Mailversand=20-=20Lieferschein?= =?UTF-8?q?=20best=C3=A4tigen:=20Deaktiviert=20automatische=20Versandbest?= =?UTF-8?q?=C3=A4tigung?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ext/custom-addons/dp_website/models/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ext/custom-addons/dp_website/models/__init__.py b/ext/custom-addons/dp_website/models/__init__.py index 585bb3e1..d1e04ad0 100644 --- a/ext/custom-addons/dp_website/models/__init__.py +++ b/ext/custom-addons/dp_website/models/__init__.py @@ -1,3 +1,3 @@ from . import sale_order -from . import stock_picking +# uncomment to send delivery confirmation => from . import stock_picking from . import delivery_carrier From a602a65275202ccebfcf6d43b911eabe5938b4a7 Mon Sep 17 00:00:00 2001 From: Ahmed Aly Date: Fri, 7 Sep 2018 12:11:09 +0200 Subject: [PATCH 7/7] singelton error bugfix --- .../dp_sale_delivery_date/models/sale_order_line.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/ext/custom-addons/dp_sale_delivery_date/models/sale_order_line.py b/ext/custom-addons/dp_sale_delivery_date/models/sale_order_line.py index 903de178..87374d8c 100644 --- a/ext/custom-addons/dp_sale_delivery_date/models/sale_order_line.py +++ b/ext/custom-addons/dp_sale_delivery_date/models/sale_order_line.py @@ -23,7 +23,9 @@ class SaleOrderLine(models.Model): def _inverse_delivery_date(self): for line in self: stock_move = self.env['stock.move'] - move = stock_move.search([('sale_line_id', '=', line.id), ('state', 'not in', ['cancel'])]) + move = stock_move.search([('sale_line_id', '=', line.id), ('state', 'not in', ['cancel', 'done'])]) if move: - move.date = line.delivery_date - move.date_expected = line.delivery_date + move.write({ + 'date': line.delivery_date, + 'date_expected': line.delivery_date + })