From 0fb76b9b6f6527050fa790ef54914688e5ecad3c Mon Sep 17 00:00:00 2001 From: Javier Iniesta Date: Mon, 17 Aug 2015 13:02:34 +0200 Subject: [PATCH 1/2] [FIX] init calculation of taxes --- pos_pricelist/__init__.py | 2 ++ pos_pricelist/__openerp__.py | 1 - pos_pricelist/data/pos_order.yml | 29 ----------------------------- 3 files changed, 2 insertions(+), 30 deletions(-) delete mode 100644 pos_pricelist/data/pos_order.yml diff --git a/pos_pricelist/__init__.py b/pos_pricelist/__init__.py index 9e2b95da..e28daa3c 100644 --- a/pos_pricelist/__init__.py +++ b/pos_pricelist/__init__.py @@ -17,6 +17,7 @@ # ############################################################################## from . import models +from openerp import SUPERUSER_ID def set_pos_line_taxes(cr, registry): @@ -28,3 +29,4 @@ def set_pos_line_taxes(cr, registry): join product_taxes_rel rel on rel.prod_id = l.product_id join account_tax t on rel.tax_id = t.id where t.company_id = o.company_id""") + registry['pos.order']._install_tax_detail(cr, SUPERUSER_ID) diff --git a/pos_pricelist/__openerp__.py b/pos_pricelist/__openerp__.py index bdbe9278..0ea79f95 100644 --- a/pos_pricelist/__openerp__.py +++ b/pos_pricelist/__openerp__.py @@ -37,7 +37,6 @@ New feature for the Point Of Sale: "views/point_of_sale_view.xml", "report/report_receipt.xml", "security/ir.model.access.csv", - "data/pos_order.yml", ], 'demo': [ 'demo/pos_pricelist_demo.yml', diff --git a/pos_pricelist/data/pos_order.yml b/pos_pricelist/data/pos_order.yml deleted file mode 100644 index 35596b48..00000000 --- a/pos_pricelist/data/pos_order.yml +++ /dev/null @@ -1,29 +0,0 @@ -# -*- coding: utf-8 -*- -# Python source code encoding : https://www.python.org/dev/peps/pep-0263/ -############################################################################## -# -# OpenERP, Open Source Management Solution -# This module copyright : -# (c) 2015 Antiun Ingenieria, SL (Madrid, Spain, http://www.antiun.com) -# Antonio Espinosa -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . -# -############################################################################## - -- - !context - noupdate: 1 - -- !function {model: pos.order, name: _install_tax_detail} From c1deaee54a86da31d51004aa05cfdff4c9f7e955 Mon Sep 17 00:00:00 2001 From: Javier Iniesta Date: Mon, 17 Aug 2015 14:35:53 +0200 Subject: [PATCH 2/2] [FIX] Pick taxes related with product templates --- pos_pricelist/__init__.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pos_pricelist/__init__.py b/pos_pricelist/__init__.py index e28daa3c..576e94c5 100644 --- a/pos_pricelist/__init__.py +++ b/pos_pricelist/__init__.py @@ -26,7 +26,9 @@ def set_pos_line_taxes(cr, registry): select l.id, t.id from pos_order_line l join pos_order o on l.order_id = o.id - join product_taxes_rel rel on rel.prod_id = l.product_id + join product_product p on l.product_id = p.id + join product_template pt on pt.id = p.product_tmpl_id + join product_taxes_rel rel on rel.prod_id = pt.id join account_tax t on rel.tax_id = t.id where t.company_id = o.company_id""") registry['pos.order']._install_tax_detail(cr, SUPERUSER_ID)