Browse Source
Merge pull request #2 from pablocm-aserti/8.0-improve-pos-pricelist
Merge pull request #2 from pablocm-aserti/8.0-improve-pos-pricelist
[FIX] Fiscal position tax mappingpull/39/head
Adil Houmadi
10 years ago
8 changed files with 160 additions and 33 deletions
-
11pos_pricelist/__init__.py
-
4pos_pricelist/__openerp__.py
-
30pos_pricelist/migrations/8.0.1.1.0/post-migration.py
-
1pos_pricelist/models/__init__.py
-
58pos_pricelist/models/point_of_sale.py
-
19pos_pricelist/static/src/js/db.js
-
53pos_pricelist/static/src/js/models.js
-
17pos_pricelist/views/point_of_sale_view.xml
@ -0,0 +1,30 @@ |
|||
# -*- coding: utf-8 -*- |
|||
############################################################################## |
|||
# |
|||
# Copyright (C) 2015 Aserti Global Solutions (http://www.aserti.es/). |
|||
# |
|||
# 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/>. |
|||
# |
|||
############################################################################## |
|||
__name__ = "Copy the product taxes to the pos.line" |
|||
|
|||
|
|||
def migrate(cr, version): |
|||
cr.execute("""insert into pline_tax_rel |
|||
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 account_tax t on rel.tax_id = t.id |
|||
where t.company_id = o.company_id""") |
@ -0,0 +1,58 @@ |
|||
# -*- coding: utf-8 -*- |
|||
############################################################################## |
|||
# |
|||
# Copyright (C) 2015 Aserti Global Solutions (http://www.aserti.es/). |
|||
# |
|||
# 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/>. |
|||
# |
|||
############################################################################## |
|||
|
|||
|
|||
from openerp import models, fields, api |
|||
|
|||
|
|||
class PosOrderLine(models.Model): |
|||
_inherit = "pos.order.line" |
|||
|
|||
@api.one |
|||
@api.depends('tax_ids', 'qty', 'price_unit', |
|||
'product_id', 'discount', 'order_id.partner_id') |
|||
def _amount_line_all(self): |
|||
price = self.price_unit * (1 - (self.discount or 0.0) / 100.0) |
|||
taxes = self.tax_ids.compute_all( |
|||
price, self.qty, product=self.product_id, |
|||
partner=self.order_id.partner_id) |
|||
self.price_subtotal = taxes['total'] |
|||
self.price_subtotal_incl = taxes['total_included'] |
|||
|
|||
tax_ids = fields.Many2many( |
|||
'account.tax', 'pline_tax_rel', 'pos_line_id', 'tax_id', |
|||
"Taxes", domain=[('type_tax_use', '=', 'sale')]) |
|||
price_subtotal = fields.Float(compute="_amount_line_all", store=True) |
|||
price_subtotal_incl = fields.Float(compute="_amount_line_all", store=True) |
|||
|
|||
|
|||
class PosOrder(models.Model): |
|||
_inherit = "pos.order" |
|||
|
|||
@api.model |
|||
def _amount_line_tax(self, line): |
|||
price = line.price_unit * (1 - (line.discount or 0.0) / 100.0) |
|||
taxes = line.tax_ids.compute_all( |
|||
price, line.qty, product=line.product_id, |
|||
partner=line.order_id.partner_id)['taxes'] |
|||
val = 0.0 |
|||
for c in taxes: |
|||
val += c.get('amount', 0.0) |
|||
return val |
@ -0,0 +1,17 @@ |
|||
<?xml version="1.0"?> |
|||
<openerp> |
|||
<data> |
|||
|
|||
<record id="view_pos_pos_form" model="ir.ui.view"> |
|||
<field name="name">pos.order</field> |
|||
<field name="model">pos.order</field> |
|||
<field name="inherit_id" ref="point_of_sale.view_pos_pos_form"/> |
|||
<field name="arch" type="xml"> |
|||
<xpath expr="//field[@name='lines']/tree/field[@name='discount']" position="after"> |
|||
<field name="tax_ids" widget="many2many_tags"/> |
|||
</xpath> |
|||
</field> |
|||
</record> |
|||
|
|||
</data> |
|||
</openerp> |
Write
Preview
Loading…
Cancel
Save
Reference in new issue