Merge lp:~vauxoo/addons-vauxoo/account_voucher_tax_dev_rodo into lp:addons-vauxoo

[Rodolfo Lopez]

add module account_voucher_tax
genera poliza de impuesto efectivamente pagado/cobrado en el pago

[lp:~vauxoo/addons-vauxoo/account_voucher_tax_dev_rodo]

334. By Moisés López - http://www.vauxoo.com on 2012-07-07

[ADD] [product_custom_code] Add module for add product code of customer.

335. By Moisés López - http://www.vauxoo.com on 2012-07-07

[MERGE] Add product_customer_code

336. By Moisés López - http://www.vauxoo.com on 2012-07-07

[REF] [product_customer_code] Change company_id to required=False

337. By Moisés López - http://www.vauxoo.com on 2012-07-08

[MERGE] [account_invoice_tax] Add module account_invoice_tax

338. By Moisés López - http://www.vauxoo.com on 2012-07-08

[MERGE] [account_voucher_tax] Add module account_voucher_tax

=== added directory 'account_voucher_tax'
=== added file 'account_voucher_tax/__init__.py'
--- account_voucher_tax/__init__.py	1970-01-01 00:00:00 +0000
+++ account_voucher_tax/__init__.py	2012-07-07 23:18:20 +0000
@@ -0,0 +1,2 @@
+import account_tax
+import account_voucher
\ No newline at end of file

=== added file 'account_voucher_tax/__openerp__.py'
--- account_voucher_tax/__openerp__.py	1970-01-01 00:00:00 +0000
+++ account_voucher_tax/__openerp__.py	2012-07-07 23:18:20 +0000
@@ -0,0 +1,47 @@
+# -*- 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_voucher_tax",
+    "version" : "1.0",
+    "author" : "Vauxoo",
+    "category" : "Localization/Mexico",
+    "description" : """This module shows the tax actually paid/cashed in the move of payment
+     -You will nedd to aplly the patch patch/yaml_import.patch, 
+      that is located in this module  ( use:patch -b file.py  file.patch )""",
+    "website" : "http://www.vauxoo.com/",
+    "license" : "AGPL-3",
+    "depends" : ["account","account_voucher","account_invoice_tax"],
+    "init_xml" : [],
+    "demo_xml" : [],
+    "update_xml" : ["account_tax_view.xml"],
+    "test": [
+        'test/account_voucher_taxes.yml',
+        'test/account_voucher_taxes_partial.yml',
+    ],
+    "installable" : True,
+    "active" : False,
+}

=== added file 'account_voucher_tax/account_tax.py'
--- account_voucher_tax/account_tax.py	1970-01-01 00:00:00 +0000
+++ account_voucher_tax/account_tax.py	2012-07-07 23:18:20 +0000
@@ -0,0 +1,38 @@
+# -*- coding: 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: 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 osv, fields
+
+
+class account_tax(osv.osv):
+     _inherit = "account.tax"
+     
+     _columns = {
+          'tax_voucher_ok': fields.boolean('Tax Vocuher Ok',help='help'),
+          'account_collected_voucher_id': fields.many2one('account.account','Account Collected Voucher'),
+          'account_paid_voucher_id': fields.many2one('account.account','Account Paid Voucher'),
+     }
+     
+account_tax()
\ No newline at end of file

=== added file 'account_voucher_tax/account_tax_view.xml'
--- account_voucher_tax/account_tax_view.xml	1970-01-01 00:00:00 +0000
+++ account_voucher_tax/account_tax_view.xml	2012-07-07 23:18:20 +0000
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <record id="view_account_tax_voucher" model="ir.ui.view">
+                <field name="name">view.account.tax.voucher</field>
+                <field name="model">account.tax</field>
+                <field name="type">form</field>      
+                <field name="inherit_id" ref="account.view_tax_form"/>
+                <field name="arch" type="xml">
+                    <field name="active" position="after">
+                        <field name="tax_voucher_ok" />
+                    </field>
+                </field>
+        </record>
+
+
+        <record id="view_account_tax_voucher_account" model="ir.ui.view">
+                <field name="name">view.account.tax.voucher.account</field>
+                <field name="model">account.tax</field>
+                <field name="type">form</field>      
+                <field name="inherit_id" ref="account.view_tax_form"/>
+                <field name="arch" type="xml">
+                    <separator string="Tax Declaration: Invoices" position="before">
+                        <field name="account_collected_voucher_id" attrs="{'required':[('tax_voucher_ok','=',True)]}"/>
+                        <newline/>
+                        <field name="account_paid_voucher_id" attrs="{'required':[('tax_voucher_ok','=',True)]}"/>
+                    </separator>
+                </field>
+        </record>
+
+    </data>
+</openerp>

=== added file 'account_voucher_tax/account_voucher.py'
--- account_voucher_tax/account_voucher.py	1970-01-01 00:00:00 +0000
+++ account_voucher_tax/account_voucher.py	2012-07-07 23:18:20 +0000
@@ -0,0 +1,102 @@
+# -*- coding: 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: 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 osv, fields
+
+class account_voucher(osv.osv):
+    _inherit = 'account.voucher'
+    
+    def voucher_move_line_create(self, cr, uid, voucher_id, line_total, move_id, company_currency, current_currency, context=None):
+        move_obj = self.pool.get('account.move')
+        move_line_obj = self.pool.get('account.move.line')
+        invoice_obj = self.pool.get('account.invoice')
+        currency_obj = self.pool.get('res.currency')
+        res=super(account_voucher, self).voucher_move_line_create(cr, uid, voucher_id, line_total, move_id, company_currency, current_currency, context=None)
+        for voucher in self.browse(cr,uid,[voucher_id],context=context):
+            lines=[]
+            for line in voucher.line_ids:
+                if line.amount>0:
+                    invoice_ids=invoice_obj.search(cr,uid,[('move_id','=',line.move_line_id.move_id.id)],context=context)
+                    for invoice in invoice_obj.browse(cr,uid,invoice_ids,context=context):
+                        for tax in invoice.tax_line:
+                            if tax.tax_id.tax_voucher_ok:
+                                move_ids=[]
+                                account=tax.tax_id.account_collected_voucher_id.id
+                                credit_amount=currency_obj.compute(cr, uid, line.move_line_id.currency_id.id,company_currency, ((tax.tax_id.amount*tax.base)*(line.amount/line.amount_original)), context=context)
+                                debit_amount=0.0
+                                if tax.tax_id.amount<0:
+                                    credit_amount=0.0
+                                    debit_amount=(-1.0*currency_obj.compute(cr, uid, line.move_line_id.currency_id.id,company_currency, ((tax.tax_id.amount*tax.base)*(line.amount/line.amount_original)), context=context))
+                                if invoice.type=='out_invoice':## considerar que hacer con refund
+                                    account=tax.tax_id.account_paid_voucher_id.id
+                                    credit_amount, debit_amount=debit_amount, credit_amount
+                                move_line={
+                                    'journal_id': voucher.journal_id.id,
+                                    'period_id': voucher.period_id.id,
+                                    'name': tax.name or '/',
+                                    'account_id': tax.account_id.id,
+                                    'move_id': int(move_id),
+                                    'partner_id': voucher.partner_id.id,
+                                    'company_id':company_currency,
+                                    'currency_id': line.move_line_id and (company_currency <> current_currency and current_currency) or False,
+                                    'quantity': 1,
+                                    'credit': credit_amount,
+                                    'debit': debit_amount,
+                                    'analytic_account_id': line.account_analytic_id and line.account_analytic_id.id or False,
+                                    'date': voucher.date,
+                                    
+                                    }
+                                if company_currency!=current_currency:
+                                    move_line['amount_currency']=currency_obj.compute(cr, uid, company_currency, current_currency,credit_amount, context=context)
+                                move_ids.append(move_line_obj.create(cr,uid,move_line,context=context))
+                                move_line={
+                                    'journal_id': voucher.journal_id.id,
+                                    'period_id': voucher.period_id.id,
+                                    'name': tax.name or '/',
+                                    'account_id': account,
+                                    'move_id': int(move_id),
+                                    'partner_id': voucher.partner_id.id,
+                                    'company_id':company_currency,
+                                    #'currency_id': line.move_line_id and (company_currency <> line.move_line_id.currency_id.id and line.move_line_id.currency_id.id) or False,
+                                    'currency_id': line.move_line_id and (company_currency <> current_currency and current_currency) or False,
+                                    'quantity': 1,
+                                    'credit': debit_amount,
+                                    'debit': credit_amount,
+                                    'analytic_account_id': line.account_analytic_id and line.account_analytic_id.id or False,
+                                    'date': voucher.date,
+                                    }
+                                if company_currency!=current_currency:
+                                    move_line['amount_currency']=currency_obj.compute(cr, uid, company_currency, current_currency,credit_amount, context=context)
+                                move_line_obj.create(cr,uid,move_line,context=context)
+                                for mov_line in invoice.move_id.line_id:
+                                    if mov_line.account_id.id==tax.account_id.id:
+                                        move_ids.append(mov_line.id)
+                                if line.amount==line.amount_original:
+                                    self.pool.get('account.move.line').reconcile(cr, uid, move_ids, 'manual', writeoff_acc_id=tax.account_id.id, writeoff_period_id=voucher.period_id.id, writeoff_journal_id=voucher.journal_id.id)
+                                else:
+                                    self.pool.get('account.move.line').reconcile_partial(cr, uid, move_ids, 'manual', context)
+        return res
+account_voucher()
\ No newline at end of file

=== added directory 'account_voucher_tax/patch'
=== added file 'account_voucher_tax/patch/yaml_import.patch'
--- account_voucher_tax/patch/yaml_import.patch	1970-01-01 00:00:00 +0000
+++ account_voucher_tax/patch/yaml_import.patch	2012-07-07 23:18:20 +0000
@@ -0,0 +1,21 @@
+=== modified file 'openerp/tools/yaml_import.py'
+--- openerp/tools/yaml_import.py	2012-06-25 14:40:13 +0000
++++ openerp/tools/yaml_import.py	2012-07-05 22:36:58 +0000
+@@ -310,12 +310,13 @@
+     def process_record(self, node):
+         import openerp.osv as osv
+         record, fields = node.items()[0]
++        module_str = self.module
+         model = self.get_model(record.model)
+-
+         view_id = record.view
+         if view_id and (view_id is not True):
+-            view_id = self.pool.get('ir.model.data').get_object_reference(self.cr, 1, self.module, record.view)[1]
+-
++            if '.' in view_id:
++                module_str,view_id = view_id.split('.')
++            view_id = self.pool.get('ir.model.data').get_object_reference(self.cr, 1, module_str, view_id)[1]
+         if model.is_transient():
+             record_dict=self.create_osv_memory_record(record, fields)
+         else:
+

=== added directory 'account_voucher_tax/test'
=== added file 'account_voucher_tax/test/account_voucher_taxes.yml'
--- account_voucher_tax/test/account_voucher_taxes.yml	1970-01-01 00:00:00 +0000
+++ account_voucher_tax/test/account_voucher_taxes.yml	2012-07-07 23:18:20 +0000
@@ -0,0 +1,85 @@
+-
+  In order to check account voucher tax module in OpenERP I create a tax
+-
+  !record {model: account.tax, id: account_tax_iva}:
+    description: iva 16
+    type_tax_use: purchase
+    tax_voucher_ok: True
+    name: Iva 16%
+    type: percent
+    amount: 0.1600
+    account_collected_id: account.iva
+    account_paid_id: account.iva
+    account_collected_voucher_id: account.ova
+    account_paid_voucher_id: account.ova
+
+-
+  I create a supplier invoice
+-
+  !record {model: account.invoice, id: account_invoice_supplier_tax0}:
+    account_id: account.a_pay
+    address_contact_id: base.res_partner_address_3000
+    address_invoice_id: base.res_partner_address_3000
+    check_total: 6182.80
+    company_id: base.main_company
+    currency_id: base.EUR
+    invoice_line:
+      - account_id: account.a_expense
+        name: '[PC1] Basic PC'
+        price_unit: 5330.0
+        product_id: product.product_product_pc1
+        quantity: 1.0
+        uos_id: product.product_uom_unit
+        invoice_line_tax_id:
+                  - account_tax_iva
+    journal_id: account.expenses_journal
+    partner_id: base.res_partner_c2c
+    reference_type: none
+    type: in_invoice
+
+-
+  I change the state of invoice to open by clicking Validate button
+-
+  !workflow {model: account.invoice, action: invoice_open, ref: account_invoice_supplier_tax0}
+-
+  I check that the invoice state is now "Open"
+-
+  !assert {model: account.invoice, id: account_invoice_supplier_tax0}:
+    - state == 'open'
+
+-
+  I create the first voucher of payment with values 6182.80
+-
+  !record {model: account.voucher, id: account_voucher_tax1, view: False}:
+    account_id: account.cash
+    company_id: base.main_company
+    amount: 6182.80
+    journal_id: account.bank_journal
+    name: 'First payment: with tax'
+    partner_id: base.res_partner_c2c
+    period_id: account.period_7
+    date: !eval time.strftime("%Y-%m-%d")
+    type: 'payment'
+
+-
+  Line of voucher
+-
+  !python {model: account.voucher}: |
+    voucher_id = self.search(cr, uid, [('id', '=', ref('account_voucher_tax1'))])
+    voucher = self.browse(cr, uid, voucher_id[0])
+    res=self.onchange_journal(cr, uid, [voucher.id], journal_id=ref('account.bank_journal'), line_ids=[], tax_id=False, partner_id=voucher.partner_id.id, date=voucher.date, amount=6182.80, ttype='payment', company_id=voucher.company_id.id, context=None)
+    onchange_journal_value=res.get('value', {}) or {}
+    lines=onchange_journal_value.pop('line_dr_ids')[0]
+    lines_format=[0,0]
+    lines_format.append(lines)
+    onchange_journal_value['line_dr_ids']=[tuple(lines_format)]
+    self.write(cr,uid, [voucher.id], onchange_journal_value)
+    assert (voucher.amount==6182.80) , "check amount"
+-
+  !workflow {model: account.voucher, action: proforma_voucher, ref: account_voucher_tax1}
+-
+
+
+
+
+

=== added file 'account_voucher_tax/test/account_voucher_taxes_partial.yml'
--- account_voucher_tax/test/account_voucher_taxes_partial.yml	1970-01-01 00:00:00 +0000
+++ account_voucher_tax/test/account_voucher_taxes_partial.yml	2012-07-07 23:18:20 +0000
@@ -0,0 +1,100 @@
+
+-
+  I create a supplier invoice
+-
+  !record {model: account.invoice, id: account_invoice_supplier_tax1}:
+    account_id: account.a_pay
+    address_contact_id: base.res_partner_address_3000
+    address_invoice_id: base.res_partner_address_3000
+    check_total: 6182.80
+    company_id: base.main_company
+    currency_id: base.EUR
+    invoice_line:
+      - account_id: account.a_expense
+        name: '[PC1] Basic PC'
+        price_unit: 5330.0
+        product_id: product.product_product_pc1
+        quantity: 1.0
+        uos_id: product.product_uom_unit
+        invoice_line_tax_id:
+                  - account_tax_iva
+    journal_id: account.expenses_journal
+    partner_id: base.res_partner_c2c
+    reference_type: none
+    type: in_invoice
+
+-
+  I change the state of invoice to open by clicking Validate button
+-
+  !workflow {model: account.invoice, action: invoice_open, ref: account_invoice_supplier_tax1}
+-
+  I check that the invoice state is now "Open"
+-
+  !assert {model: account.invoice, id: account_invoice_supplier_tax1}:
+    - state == 'open'
+
+-
+  I create the first voucher of payment with values 3091.4
+-
+  !record {model: account.voucher, id: account_voucher_tax2, view: False}:
+    company_id: base.main_company
+    account_id: account.cash
+    amount: 3091.4
+    currency_id: base.EUR
+    journal_id: account.bank_journal
+    name: 'First Partial payment: with tax'
+    partner_id: base.res_partner_c2c
+    period_id: account.period_7
+    date: !eval time.strftime("%Y-%m-%d")
+    type: 'payment'
+
+-
+  Line of voucher
+-
+  !python {model: account.voucher}: |
+    voucher_id = self.search(cr, uid, [('id', '=', ref('account_voucher_tax2'))])
+    voucher = self.browse(cr, uid, voucher_id[0])
+    res=self.onchange_journal(cr, uid, [voucher.id], journal_id=ref('account.bank_journal'), line_ids=[], tax_id=False, partner_id=voucher.partner_id.id, date=voucher.date, amount=3091.4, ttype='payment', company_id=voucher.company_id.id, context=None)
+    onchange_journal_value=res.get('value', {}) or {}
+    lines=onchange_journal_value.pop('line_dr_ids')[0]
+    lines_format=[0,0]
+    lines_format.append(lines)
+    onchange_journal_value['line_dr_ids']=[tuple(lines_format)]
+    self.write(cr,uid, [voucher.id], onchange_journal_value)
+    assert (voucher.amount==3091.4) , "check amount"
+-
+  !workflow {model: account.voucher, action: proforma_voucher, ref: account_voucher_tax2}
+-
+
+-
+  I create the second voucher of payment with values 3091.4
+-
+  !record {model: account.voucher, id: account_voucher_tax3, view: False}:
+    company_id: base.main_company
+    account_id: account.cash
+    currency_id: base.EUR
+    amount: 3091.4
+    journal_id: account.bank_journal
+    name: 'Second Partial payment: with tax'
+    partner_id: base.res_partner_c2c
+    period_id: account.period_7
+    date: !eval time.strftime("%Y-%m-%d")
+    type: 'payment'
+
+-
+  Line of voucher
+-
+  !python {model: account.voucher}: |
+    voucher_id = self.search(cr, uid, [('id', '=', ref('account_voucher_tax3'))])
+    voucher = self.browse(cr, uid, voucher_id[0])
+    res=self.onchange_journal(cr, uid, [voucher.id], journal_id=ref('account.bank_journal'), line_ids=[], tax_id=False, partner_id=voucher.partner_id.id, date=voucher.date, amount=3091.4, ttype='payment', company_id=voucher.company_id.id, context=None)
+    onchange_journal_value=res.get('value', {}) or {}
+    lines=onchange_journal_value.pop('line_dr_ids')[0]
+    lines_format=[0,0]
+    lines_format.append(lines)
+    onchange_journal_value['line_dr_ids']=[tuple(lines_format)]
+    self.write(cr,uid, [voucher.id], onchange_journal_value)
+    assert (voucher.amount==3091.4) , "check amount"
+-
+  !workflow {model: account.voucher, action: proforma_voucher, ref: account_voucher_tax3}
+-