Merge lp:~vauxoo/openerp-mexico-localization/account_tax_category_2parte_dev_juan_carlos into lp:openerp-mexico-localization

[Isaac López Zúñiga]

[Isaac López Zúñiga (isaako34)]

Carlos,

Ahora el módulo l10n_mx_invoice_tax_ref debe depender de:
account_invoice_tax y account_invoice_tax, sin embargo:

En esta propuesta de merge solo se deben proponer los cambios en el módulo: l10n_mx_invoice_tax_ref

Ya tienes una propuesta previa en donde se agrega el módulo: account_tax_category, por lo que en esta propuesta dicho módulo no debe aparecer para ser agregado a l10n_mx.

Para agregar el módulo: account_invoice_tax a la l10n_mx se debe hacer otra propuesta de merge, por lo tanto no debe aparecer en esta propuesta de merge.

Saludos.

review: Needs Fixing

[Juan Carlos Hernandez (openerp1)]

este es el nuevo branch
lp:~vauxoo/openerp-mexico-localization/l10n_mx_invoice_tax_ref_2parte_dev_juan_carlos

review: Needs Resubmitting

[Moisés López - http://www.vauxoo.com (moylop260)]

mp applied in other mp

review: Disapprove

Unmerged revisions

188. By Juan Carlos Hernandez on 2012-08-03

[IMP][l10n_mx_invoice_tax_ref] quit print y correct percent

187. By Juan Carlos Hernandez on 2012-08-02

[IMP][l10n_mx_invoice_tax_ref]quit print

186. By Juan Carlos Hernandez on 2012-08-02

[IMP][l10n_mx_invoice_tax_ref] change name of percent

185. By Juan Carlos Hernandez on 2012-08-02

[IMP][l10n_mx_invoice_tax_ref] quit line comment

184. By Juan Carlos Hernandez on 2012-08-02

[IMP][l10n_mx_invoice_tax_ref] quit line

183. By Juan Carlos Hernandez on 2012-08-02

[IMP][l10n_mx_invoice_tax_ref] quit print

182. By Juan Carlos Hernandez on 2012-08-02

[IMP][l10n_mx_invoice_tax_ref] change code and porcentaje

181. By Juan Carlos Hernandez on 2012-08-02

[IMP][l10n_mx_invoice_tax_ref] change code value

180. By Juan Carlos Hernandez on 2012-08-02

[ADD][modules account_inovice_tax and account_tax_cayegory]add module

=== added directory 'account_invoice_tax'
=== added file 'account_invoice_tax/__init__.py'
--- account_invoice_tax/__init__.py	1970-01-01 00:00:00 +0000
+++ account_invoice_tax/__init__.py	2012-08-03 19:40:37 +0000
@@ -0,0 +1,1 @@
+import account_invoice_tax

=== added file 'account_invoice_tax/__openerp__.py'
--- account_invoice_tax/__openerp__.py	1970-01-01 00:00:00 +0000
+++ account_invoice_tax/__openerp__.py	2012-08-03 19:40:37 +0000
@@ -0,0 +1,43 @@
+# -*- encoding: utf-8 -*-
+###########################################################################
+#    Module Writen to OpenERP, Open Source Management Solution
+#
+#    Copyright (c) 2012 Vauxoo - http://www.vauxoo.com/
+#    All Rights Reserved.
+#    info Vauxoo ([e-mail])
+############################################################################
+#    Coded by: el_rodo_1 ([e-mail])
+############################################################################
+#
+#    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" : "account_invoice_tax",
+    "version" : "1.0",
+    "author" : "Vauxoo",
+    "category" : "Localization/Mexico",
+    "description" : """This module add relation tax in account_invoice_tax
+     -You will need to apply the patch patch/account_invoice.patch, 
+      that is located in this module ( use:patch -b file.py  file.patch )""",
+    "website" : "http://www.vauxoo.com/",
+    "license" : "AGPL-3",
+    "depends" : ["account"],
+    "init_xml" : [],
+    "demo_xml" : [],
+    "update_xml" : [],
+    "installable" : True,
+    "active" : False,
+}

=== added file 'account_invoice_tax/account_invoice_tax.py'
--- account_invoice_tax/account_invoice_tax.py	1970-01-01 00:00:00 +0000
+++ account_invoice_tax/account_invoice_tax.py	2012-08-03 19:40:37 +0000
@@ -0,0 +1,35 @@
+# -*- encoding: utf-8 -*-
+###########################################################################
+#    Module Writen to OpenERP, Open Source Management Solution
+#
+#    Copyright (c) 2012 Vauxoo - http://www.vauxoo.com
+#    All Rights Reserved.
+#    [e-mail]
+############################################################################
+#    Coded by: El Rodo ([e-mail])
+############################################################################
+#
+#    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 osv import fields, osv
+
+class account_invoice_tax(osv.osv):
+    _inherit = 'account.invoice.tax'
+    _columns = {
+        'tax_id': fields.many2one('account.tax', 'Tax', help="Tax"),
+    }
+
+account_invoice_tax()
\ No newline at end of file

=== added directory 'account_invoice_tax/patch'
=== added file 'account_invoice_tax/patch/account_invoice.patch'
--- account_invoice_tax/patch/account_invoice.patch	1970-01-01 00:00:00 +0000
+++ account_invoice_tax/patch/account_invoice.patch	2012-08-03 19:40:37 +0000
@@ -0,0 +1,11 @@
+--- account/account_invoice.py	2012-03-29 15:43:31 +0000
++++ account/account_invoice.py	2012-06-26 16:09:15 +0000
+@@ -1585,6 +1585,7 @@
+                 val['manual'] = False
+                 val['sequence'] = tax['sequence']
+                 val['base'] = tax['price_unit'] * line['quantity']
++                val['tax_id']=tax['id']
+ 
+                 if inv.type in ('out_invoice','in_invoice'):
+                     val['base_code_id'] = tax['base_code_id']
+

=== added directory 'account_tax_category'
=== added file 'account_tax_category/__init__.py'
--- account_tax_category/__init__.py	1970-01-01 00:00:00 +0000
+++ account_tax_category/__init__.py	2012-08-03 19:40:37 +0000
@@ -0,0 +1,24 @@
+#!/usr/bin/python
+# -*- encoding: utf-8 -*-
+###########################################################################
+#    Module Writen to OpenERP, Open Source Management Solution
+#    Copyright (C) Vauxoo (<http://vauxoo.com>).
+#    All Rights Reserved
+###############Credits######################################################
+#    Coded by: carlos([e-mail])
+#############################################################################
+#    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/>.
+################################################################################
+
+import account_tax_category

=== added file 'account_tax_category/__openerp__.py'
--- account_tax_category/__openerp__.py	1970-01-01 00:00:00 +0000
+++ account_tax_category/__openerp__.py	2012-08-03 19:40:37 +0000
@@ -0,0 +1,47 @@
+#!/usr/bin/python
+# -*- encoding: utf-8 -*-
+###########################################################################
+#    Module Writen to OpenERP, Open Source Management Solution
+#    Copyright (C) Vauxoo (<http://vauxoo.com>).
+#    All Rights Reserved
+###############Credits######################################################
+#    Coded by: carlos([e-mail])
+#############################################################################
+#    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" : "Add category to taxes",
+    "version" : "1.0",
+    "depends" : ["account"],
+    "author" : "Vauxoo",
+    "license" : "AGPL-3",
+    "description" : """This module add to the taxes category
+    """,
+    "website" : "http://vauxoo.com",
+    "category" : "Generic Modules",
+    "init_xml" : [],
+    "demo_xml" : [],
+    "test": [],
+    "update_xml" : [
+    'security/account_tax_category_security.xml',
+    'security/ir.model.access.csv',
+    'account_tax_category_view.xml',
+    'data/account_tax_category.xml'
+   
+    
+    ],
+    "active": False,
+    "installable": True,
+}
+

=== added file 'account_tax_category/account_tax_category.py'
--- account_tax_category/account_tax_category.py	1970-01-01 00:00:00 +0000
+++ account_tax_category/account_tax_category.py	2012-08-03 19:40:37 +0000
@@ -0,0 +1,52 @@
+#!/usr/bin/python
+# -*- encoding: utf-8 -*-
+###########################################################################
+#    Module Writen to OpenERP, Open Source Management Solution
+#    Copyright (C) Vauxoo (<http://vauxoo.com>).
+#    All Rights Reserved
+###############Credits######################################################
+#    Coded by: Carlos Funes([e-mail])
+#############################################################################
+#    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 osv import fields, osv, orm
+
+class account_tax_category(osv.osv):
+    _name='account.tax.category'
+    
+    _columns = {
+        'company_id': fields.many2one('res.company', 'Company', required=True),
+        'name': fields.char('Name', size=64, required=True),
+        'code': fields.char('Code', size=32, required=True),
+        'active': fields.boolean('Active'),
+        'sign': fields.integer('Sign'),
+        'category_ids': fields.one2many('account.tax', 'tax_category_id', 'Category'),
+        
+    }
+    
+    _defaults = {
+    'active': 1,
+    'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'account.tax.category', context=c),
+    }
+    
+account_tax_category()
+
+class account_tax(osv.osv):
+    _inherit = 'account.tax'
+
+    _columns = {
+        'tax_category_id': fields.many2one('account.tax.category','Tax Category',required=False),
+    }
+
+account_tax()

=== added file 'account_tax_category/account_tax_category_view.xml'
--- account_tax_category/account_tax_category_view.xml	1970-01-01 00:00:00 +0000
+++ account_tax_category/account_tax_category_view.xml	2012-08-03 19:40:37 +0000
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record id="view_account_tax_category_form" model="ir.ui.view">
+            <field name="name">view.account.tax.category.form</field>
+            <field name="model">account.tax.category</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Categories">
+                    <separator string="Categories" colspan="4"/>
+                    <field name="name" colspan="2"/>
+                    <field name="code" colspan="2"/>
+                    <newline/>
+                    <field name="active" colspan="2"/>
+                    <field name="sign" colspan="2"/>
+                    <newline/>
+                    <field name="company_id" widget="selection"/>
+                </form>
+            </field>
+        </record>
+        
+        
+        <record id="view_account_tax_category_tree" model="ir.ui.view">
+            <field name="name">view.account.tax.category.tree</field>
+            <field name="model">account.tax.category</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Categories">
+                    <field name="name" />
+                    <field name="code" />
+                    <field name="active"/>
+                    <field name="sign" />
+                </tree>
+            </field>
+        </record>
+        
+        <record id="action_account_tax_category_tree" model="ir.actions.act_window">
+            <field name="name">Tax Category</field>
+            <field name="res_model">account.tax.category</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="view_type">form</field>
+            <field name="view_id" ref="view_account_tax_category_tree"/>
+        </record>
+      
+        <menuitem action="action_account_tax_category_tree" 
+                id="menu_account_tax_category" sequence="50" 
+                parent="account.next_id_27"
+                />
+        
+        <record id="view_account_tax_category_search" model="ir.ui.view">
+            <field name="name">view.account.tax.category.search</field>
+            <field name="model">account.tax.category</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Categories">
+                    <filter string="Inactive" icon="terp-personal+" domain="[('active','=',False)]"/>
+                    <field name="name"/>
+                    <field name="code"/>
+                </search>
+            </field>
+        </record>
+
+
+        <record model="ir.ui.view" id="view_account_tax_category_form_inh">
+            <field name="name">view.account.tax.category.form.inh</field>
+            <field name="inherit_id" ref="account.view_tax_form"/>
+            <field name="model">account.tax</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+               <xpath expr='/form[@string="Account Tax"]/group/field[@name="company_id"]' position="after">
+                    <field name='tax_category_id' widget="selection"/>
+                </xpath>
+            </field>
+        </record>
+        
+    </data>
+</openerp>

=== added directory 'account_tax_category/data'
=== added file 'account_tax_category/data/account_tax_category.xml'
--- account_tax_category/data/account_tax_category.xml	1970-01-01 00:00:00 +0000
+++ account_tax_category/data/account_tax_category.xml	2012-08-03 19:40:37 +0000
@@ -0,0 +1,57 @@
+<?xml version="1.0" ?>
+<openerp>
+    <data noupdate="1">
+        <record id="tax_category_iva_ret" model="account.tax.category">
+            <field name="name">IVA-RET</field>
+            <field name="code">IVA</field>
+            <field name="active">1</field>
+            <field name="sign">-1</field>
+        </record>
+    </data>
+   
+    <data>
+         <record id="tax_category_iva" model="account.tax.category">
+            <field name="name">IVA</field>
+            <field name="code">IVA</field>
+            <field name="active">1</field>
+            <field name="sign">1</field>
+        </record>
+     </data>
+     
+     <data>
+         <record id="tax_category_isr" model="account.tax.category">
+            <field name="name">ISR</field>
+            <field name="code">ISR</field>
+            <field name="active">1</field>
+            <field name="sign">1</field>
+        </record>
+     </data>
+     
+     <data>
+         <record id="tax_category_isr_ret" model="account.tax.category">
+            <field name="name">ISR-RET</field>
+            <field name="code">ISR</field>
+            <field name="active">1</field>
+            <field name="sign">-1</field>
+        </record>
+     </data>
+ 
+     <data>
+         <record id="tax_category_ieps" model="account.tax.category">
+            <field name="name">IEPS</field>
+            <field name="code">IEPS</field>
+            <field name="active">1</field>
+            <field name="sign">1</field>
+        </record>
+     </data>
+     
+       <data>
+         <record id="tax_category_ietu" model="account.tax.category">
+            <field name="name">IETU</field>
+            <field name="code">IETU</field>
+            <field name="active">1</field>
+            <field name="sign">1</field>
+        </record>
+     </data>
+    
+</openerp>

=== added directory 'account_tax_category/security'
=== added file 'account_tax_category/security/account_tax_category_security.xml'
--- account_tax_category/security/account_tax_category_security.xml	1970-01-01 00:00:00 +0000
+++ account_tax_category/security/account_tax_category_security.xml	2012-08-03 19:40:37 +0000
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        
+        <record model="res.groups" id="group_account_tax_category_manager">
+            <field name="name">Account Tax Category / Manager</field>
+        </record>
+        
+         <record model="res.groups" id="group_account_tax_category_user">
+            <field name="name">Account Tax Category / User</field>
+        </record>
+        
+    </data>
+</openerp>

=== added file 'account_tax_category/security/ir.model.access.csv'
--- account_tax_category/security/ir.model.access.csv	1970-01-01 00:00:00 +0000
+++ account_tax_category/security/ir.model.access.csv	2012-08-03 19:40:37 +0000
@@ -0,0 +1,3 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_account_tax_category_manager,account.tax.category.manager,model_account_tax_category,,1,1,1,1
+access_account_tax_category_user,account.tax.category.user,model_account_tax_category,,1,0,0,0

=== modified file 'l10n_mx_invoice_tax_ref/invoice.py'
--- l10n_mx_invoice_tax_ref/invoice.py	2012-07-05 16:51:07 +0000
+++ l10n_mx_invoice_tax_ref/invoice.py	2012-08-03 19:40:37 +0000
@@ -35,24 +35,22 @@
 
 class account_invoice_tax(osv.osv):
     _inherit= "account.invoice.tax"
-    
+
     def _get_tax_data(self, cr, uid, ids, field_names=None, arg=False, context={}):
         if not context:
             context = {}
         res = {}
         for invoice_tax in self.browse(cr, uid, ids, context=context):
             res[invoice_tax.id] = {}
-            tax_name = invoice_tax.name.lower().replace('.','').replace(' ', '').replace('-', '')
-            tax_percent = invoice_tax.amount and invoice_tax.base and invoice_tax.amount*100.0 / abs( invoice_tax.base ) or 0.0
-            if 'iva' in tax_name:
-                tax_name = 'IVA'
+            code = invoice_tax.tax_id.tax_category_id.code.replace('.','').replace(' ', '').replace('-', '')
+            type_tax = invoice_tax.tax_id.type
+            if type_tax=='percent':
+                tax_percent = invoice_tax.tax_id.amount
                 if tax_percent > 0:
-                    tax_percent = round(tax_percent, 0)#Hay problemas de decimales al calcular el iva, y hasta ahora el iva no tiene decimales
-            elif 'isr' in tax_name:
-                tax_name = 'ISR'
-            elif 'ieps' in tax_name:
-                tax_name = 'IEPS'
-            res[invoice_tax.id]['name2'] = tax_name
+                    tax_percent = tax_percent 
+            else:
+                break
+            res[invoice_tax.id]['name2'] = code
             res[invoice_tax.id]['tax_percent'] = tax_percent
             #res[invoice_tax.id]['amount'] = invoice_tax.amount
         return res