Merge lp:~vauxoo/openerp-venezuela-localization/truiz-yml-1068950 into lp:openerp-venezuela-localization/6.1

[Tulio Ruiz (Vauxoo)]

Fix bug 1068950
Added some additionals tests: duplicates customer invoices and calculates wh again

[Nhomar - Vauxoo (nhomar)]

@tulio puedes ejecutar el merge por favor.

review: Approve

=== modified file 'l10n_ve_fiscal_reports_V3/invoice.py'
--- l10n_ve_fiscal_reports_V3/invoice.py	2012-09-25 15:35:35 +0000
+++ l10n_ve_fiscal_reports_V3/invoice.py	2012-10-22 21:07:24 +0000
@@ -99,7 +99,7 @@
                 ret.update({r.id:  r.partner_id.name})
         return ret
 
-    def _get_number(self,cr,uid,ids,name,args,context=None):
+    def _get_inv_number(self,cr,uid,ids,name,args,context=None):
         '''
         Get Invoice Number
         '''
@@ -267,7 +267,7 @@
             ret.update({r.id : amount})
         return ret
     
-    def _get_tax_line(self, s):
+    def _get_inv_tax_line(self, s):
         '''
         Get Tax Line
         '''
@@ -499,7 +499,7 @@
                             help=""),    
         'get_partner_vat': fields.function(_get_vat, method=True, string='Partner vat', type='char',
                             help=""),
-        'get_reference': fields.function(_get_number, method=True, string='Invoice number', type='char',
+        'get_reference': fields.function(_get_inv_number, method=True, string='Invoice number', type='char',
                             help=""),
         'get_number': fields.function(_get_control_number, method=True, string='Control number', type='char',
                             help=""),
@@ -517,7 +517,7 @@
                             help=""),
         'get_v_exent': fields.function(_get_v_exent, method=True, string='Amount excempt', type='float',
                             help=""),
-        'get_tax_line': fields.function(_get_tax_line, method=True, string='Tax line', type='char',
+        'get_tax_line': fields.function(_get_inv_tax_line, method=True, string='Tax line', type='char',
                             help=""),
 #        'get_parent': fields.function(_get_parent, method=True, string='kind of document', type='char',
 #                            help=""),

=== modified file 'l10n_ve_withholding_islr/__openerp__.py'
--- l10n_ve_withholding_islr/__openerp__.py	2012-10-02 22:39:00 +0000
+++ l10n_ve_withholding_islr/__openerp__.py	2012-10-22 21:07:24 +0000
@@ -68,6 +68,8 @@
     'test': [
             'test/test.yml',
             'test/test_sale.yml',
+            'test/test_notax.yml',
+            'test/test_duplicate.yml',
         ],
     "active": False,
     "installable": True

=== modified file 'l10n_ve_withholding_islr/invoice.py'
--- l10n_ve_withholding_islr/invoice.py	2012-10-02 19:06:23 +0000
+++ l10n_ve_withholding_islr/invoice.py	2012-10-22 21:07:24 +0000
@@ -238,15 +238,15 @@
         '''
         Returns a dictionary with the rate of each withholding concept.
         '''
-        dict = {}
+        dictd = {}
         cont = 0
         for concept_id in concept_list:
-            dict[concept_id] = self._get_rate(cr, uid, concept_id, residence, nature,context)
-            if dict[concept_id]:
+            dictd[concept_id] = self._get_rate(cr, uid, concept_id, residence, nature,context)
+            if dictd[concept_id]:
                 cont += 1
         if not cont:
-            raise osv.except_osv(_('Invalid action !'),_("Impossible withholding income, because the Concept of Withholding associated with type line is not withheld!"))
-        return dict
+            raise osv.except_osv(_('Invalid action !'),_("Impossible withholding income, because the Concept of Withholding associated with the line has not rate for the type of customer!"))
+        return dictd
 
 
     def _pop_dict(self,cr,uid,concept_list,dict_rate,wh_dict):

=== modified file 'l10n_ve_withholding_islr/test/test.yml'
--- l10n_ve_withholding_islr/test/test.yml	2012-09-28 23:03:37 +0000
+++ l10n_ve_withholding_islr/test/test.yml	2012-10-22 21:07:24 +0000
@@ -43,27 +43,27 @@
     date_invoice: !eval time.strftime('%Y-%m-%d')
     address_contact_id: base.res_partner_address_3
     address_invoice_id: base.res_partner_address_3
-    account_id: account.a_recv
+    account_id: account.a_expense
     invoice_line:
       - product_id: product.product_product_pc3
         quantity: 5
         uos_id: product.product_uom_unit
         price_unit: 1000
         name: islrprod01
-        account_id: account.a_sale
+        account_id: account.a_expense
         concept_id: islr_wh_concept_demo2
         invoice_line_tax_id:
-        - account.tax10
+        - l10n_ve_fiscal_requirements.iva_purchase1
       - product_id: product.product_product_pc4
         quantity: 5
         uos_id: product.product_uom_unit
         price_unit: 2000
         name: islrprod02
         concept_id: islr_wh_concept_demo2
-        account_id: account.a_sale
+        account_id: account.a_expense
         invoice_line_tax_id:
-        - account.tax10
-    journal_id: account.sales_journal
+        - l10n_ve_fiscal_requirements.iva_purchase1
+    journal_id: account.expenses_journal
     partner_id: base.res_partner_notsotinysarl0
     nro_ctrl: islr123
     reference: isrlref123

=== added file 'l10n_ve_withholding_islr/test/test_duplicate.yml'
--- l10n_ve_withholding_islr/test/test_duplicate.yml	1970-01-01 00:00:00 +0000
+++ l10n_ve_withholding_islr/test/test_duplicate.yml	2012-10-22 21:07:24 +0000
@@ -0,0 +1,70 @@
+-
+  3 . Test duplacate invoice with withholding
+-
+  3.1 Check if invoice was created in previous tests and has a wh document
+-
+  !assert {model: account.invoice, id: islr_inv01}:
+    - id
+    - islr_wh_doc_id.id
+-
+  3.2 Duplicate the invoice from an open invoice
+-
+  !python {model: account.invoice}: |
+    import netsvc
+    default = {'islr_wh_doc_id': 0}
+    context =  {'lang': 'en_US', 
+                'tz': False, 
+                'uid': uid, 
+                'journal_type': 'sale', 
+                'default_type': 'out_invoice', 
+                'type': 'out_invoice'}
+    invoice_id = self.copy(cr, uid, ref("islr_inv01"), default=None, context=None)
+    assert invoice_id, "Invoice was not duplicated (should)"
+    self.write(cr, uid, [invoice_id], 
+            {'journal_id': ref("account.expenses_journal"), 
+             'nro_ctrl':'DUPLINV00',
+               'reference':'110011'})
+    acc_brw=self.browse(cr, uid, invoice_id)
+    self.button_reset_taxes(cr, uid, [invoice_id])
+    # update check total
+    self.write(cr, uid, [invoice_id], 
+            {'check_total': 16800.0})
+    wf = netsvc.LocalService("workflow")
+    wf.trg_validate(uid, 'account.invoice', invoice_id, 'invoice_open', cr)
+-
+  3 . Test duplacate invoice w/o taxes asociated
+-
+  3.1 Check if invoice was created in previous tests and has a wh document
+-
+  !assert {model: account.invoice, id: islr_inv03}:
+    - id
+    - islr_wh_doc_id.id
+-
+  3.2 Duplicate the invoice from an open invoice
+-
+  !python {model: account.invoice}: |
+    import netsvc
+    default = {'islr_wh_doc_id': 0}
+    context =  {'lang': 'en_US', 
+                'tz': False, 
+                'uid': uid, 
+                'journal_type': 'purchase', 
+                'default_type': 'out_invoice', 
+                'type': 'out_invoice'}
+    invoice_id = self.copy(cr, uid, ref("islr_inv03"), default=None, context=None)
+    assert invoice_id, "Invoice was not duplicated (should)"
+    self.write(cr, uid, [invoice_id], 
+            {'journal_id': ref("account.expenses_journal"), 
+             'nro_ctrl':'DUPLINV00NOTAX',
+               'reference':'110011NOTAX'})
+    acc_brw=self.browse(cr, uid, invoice_id)
+    self.button_reset_taxes(cr, uid, [invoice_id])
+    # update check total
+    self.write(cr, uid, [invoice_id], 
+            {'check_total': 16800.0})
+    wf = netsvc.LocalService("workflow")
+    wf.trg_validate(uid, 'account.invoice', invoice_id, 'invoice_open', cr)
+
+    
+
+    

=== added file 'l10n_ve_withholding_islr/test/test_notax.yml'
--- l10n_ve_withholding_islr/test/test_notax.yml	1970-01-01 00:00:00 +0000
+++ l10n_ve_withholding_islr/test/test_notax.yml	2012-10-22 21:07:24 +0000
@@ -0,0 +1,64 @@
+-
+  4. Test a purchase invoice w/o taxes in invoice lines
+-
+  4.1 I create a purchase invoice
+-
+  !record {model: account.invoice, id: islr_inv03}:
+    company_id: base.main_company
+    currency_id: base.EUR
+    date_invoice: !eval time.strftime('%Y-%m-%d')
+    address_contact_id: base.res_partner_address_3
+    address_invoice_id: base.res_partner_address_3
+    account_id: account.a_expense
+    invoice_line:
+      - product_id: product.product_product_pc3
+        quantity: 5
+        uos_id: product.product_uom_unit
+        price_unit: 1000
+        name: islrprod01_notax
+        account_id: account.a_expense
+        concept_id: islr_wh_concept_demo2
+      - product_id: product.product_product_pc4
+        quantity: 5
+        uos_id: product.product_uom_unit
+        price_unit: 2000
+        name: islrprod02_notax
+        concept_id: islr_wh_concept_demo2
+        account_id: account.a_expense
+    journal_id: account.expenses_journal
+    partner_id: l10n_ve_fiscal_requirements.f_req_partner_10
+    nro_ctrl: islr123NOTAX
+    reference: isrlref123NOTAX
+    type: in_invoice
+-
+  4.2 I click on Calculate taxes button
+-
+  !python {model: account.invoice}: |
+    acc_brw=self.browse(cr, uid, ref("islr_inv03"))
+    self.button_reset_taxes(cr, uid, [ref("islr_inv03")])
+-
+  4.3 I update check total before validating the invoice
+-
+  !record {model: account.invoice, id: islr_inv03}:
+    check_total: 16800.0
+-
+  4.4 I change the state of invoice to "Proforma2" by clicking PRO-FORMA button
+-
+  !workflow {model: account.invoice, action: invoice_proforma2, ref: islr_inv03}
+-
+  4.5 I create invoice by clicking on Create button
+-
+  !workflow {model: account.invoice, action: invoice_open, ref: islr_inv03}
+-
+  4.6 I check that the invoice has any wh doc (must have)
+-
+  !assert {model: account.invoice, id: islr_inv03}:
+    - islr_wh_doc_id.id
+-
+  4.7 Search for the wh lines
+-
+  !python {model: account.invoice}: |
+    import netsvc
+    import time
+    ai_brw = self.browse(cr, uid, ref("islr_inv03"))
+    assert ai_brw.islr_wh_doc_id.amount_total_ret == 222.3, "Bad value for retention amount"

=== modified file 'l10n_ve_withholding_islr/test/test_sale.yml'
--- l10n_ve_withholding_islr/test/test_sale.yml	2012-09-28 23:12:21 +0000
+++ l10n_ve_withholding_islr/test/test_sale.yml	2012-10-22 21:07:24 +0000
@@ -19,7 +19,7 @@
         account_id: account.a_sale
         concept_id: islr_wh_concept_demo2
         invoice_line_tax_id:
-        - account.tax10
+        - l10n_ve_fiscal_requirements.iva_sale1
       - product_id: product.product_product_pc4
         quantity: 5
         uos_id: product.product_uom_unit
@@ -28,7 +28,7 @@
         concept_id: islr_wh_concept_demo2
         account_id: account.a_sale
         invoice_line_tax_id:
-        - account.tax10
+        - l10n_ve_fiscal_requirements.iva_sale1
     journal_id: account.sales_journal
     partner_id: base.res_partner_notsotinysarl0
     nro_ctrl: islr456

=== modified file 'l10n_ve_withholding_iva/test/iva_sale_wh.yml'
--- l10n_ve_withholding_iva/test/iva_sale_wh.yml	2012-09-27 16:23:18 +0000
+++ l10n_ve_withholding_iva/test/iva_sale_wh.yml	2012-10-22 21:07:24 +0000
@@ -111,6 +111,12 @@
     ap_obj=self.pool.get('account.period')
     period = ap_obj.find(cr, uid, time.strftime('%Y/%m/%d'), context={'company_id':ref("base.main_company")})
     assert period, 'There aren\'t periods for this date'
+    ap_brw = ap.browse(cr, uid, period[0])
+    if ap_brw.state == 'done':
+        ap.action_draft(cr, uid, period)
+        ap_brw = ap.browse(cr, uid, period[0])
+    assert ap_brw.state == 'draft', 'Period is not open as it should be'
+
     self.write(cr, uid, ref("wh_iva_sale01"), {'period_id':period[0]})
 -
   7.14 I check period was modificated