Browse Source

Merge pull request #44 from Antiun/pr-fix_pos_pricelist_init

[FIX] init calculation of taxes
pull/48/head
Pedro M. Baeza 9 years ago
parent
commit
4e4b98c618
  1. 6
      pos_pricelist/__init__.py
  2. 1
      pos_pricelist/__openerp__.py
  3. 29
      pos_pricelist/data/pos_order.yml

6
pos_pricelist/__init__.py

@ -17,6 +17,7 @@
# #
############################################################################## ##############################################################################
from . import models from . import models
from openerp import SUPERUSER_ID
def set_pos_line_taxes(cr, registry): def set_pos_line_taxes(cr, registry):
@ -25,6 +26,9 @@ def set_pos_line_taxes(cr, registry):
select l.id, t.id select l.id, t.id
from pos_order_line l from pos_order_line l
join pos_order o on l.order_id = o.id 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 join account_tax t on rel.tax_id = t.id
where t.company_id = o.company_id""") where t.company_id = o.company_id""")
registry['pos.order']._install_tax_detail(cr, SUPERUSER_ID)

1
pos_pricelist/__openerp__.py

@ -37,7 +37,6 @@ New feature for the Point Of Sale:
"views/point_of_sale_view.xml", "views/point_of_sale_view.xml",
"report/report_receipt.xml", "report/report_receipt.xml",
"security/ir.model.access.csv", "security/ir.model.access.csv",
"data/pos_order.yml",
], ],
'demo': [ 'demo': [
'demo/pos_pricelist_demo.yml', 'demo/pos_pricelist_demo.yml',

29
pos_pricelist/data/pos_order.yml

@ -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 <antonioea@antiun.com>
#
# 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 <http://www.gnu.org/licenses/>.
#
##############################################################################
-
!context
noupdate: 1
- !function {model: pos.order, name: _install_tax_detail}
Loading…
Cancel
Save