Merge lp:~vauxoo/openerp-venezuela-localization/7.0-YAML-rev2-dev-hbto into lp:openerp-venezuela-localization

[hbto [Vauxoo] http://www.vauxoo.com]

[lp:~vauxoo/openerp-venezuela-localization/7.0-YAML-rev2-dev-hbto]

933. By hbto [Vauxoo] http://www.vauxoo.com on 2013-11-18

[FIX][l10n_ve_vat_write_off] Enabling Module

934. By hbto [Vauxoo] http://www.vauxoo.com on 2013-11-18

[FIX][ovl] Enabling Module

935. By hbto [Vauxoo] http://www.vauxoo.com on 2013-11-18

[MERGE][l10n_ve_sale_purchase] Enabling & Restructuring Module

Unmerged revisions

=== modified file 'l10n_ve_fiscal_requirements/__openerp__.py'
--- l10n_ve_fiscal_requirements/__openerp__.py	2013-11-16 17:50:57 +0000
+++ l10n_ve_fiscal_requirements/__openerp__.py	2013-11-18 22:02:53 +0000
@@ -94,17 +94,18 @@
         'demo/demo_taxes.yml',
     ],
     'test': [
-        'test/control_number.yml',
-        'test/fr_sale_test.yml',
-        'test/fr_purchase_test.yml',
-        'test/fr_address.yml',
-        'test/fr_vat_test.yml',
-        'test/fr_damaged.yml',
-        'test/fr_debit_note.yml',
-        'test/fr_refund_note.yml',
+        'test/account_customer_invoice.yml',
+        'test/account_supplier_invoice.yml',
+#        'test/control_number.yml',
+#        'test/fr_sale_test.yml',
+#        'test/fr_purchase_test.yml',
+#        'test/fr_address.yml',
+#        'test/fr_vat_test.yml',
+#        'test/fr_damaged.yml',
+#        'test/fr_debit_note.yml',
+#        'test/fr_refund_note.yml',
       ],
     'installable': True,
     'active': False,
 }
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'l10n_ve_fiscal_requirements/model/account.py'
--- l10n_ve_fiscal_requirements/model/account.py	2013-02-13 19:39:18 +0000
+++ l10n_ve_fiscal_requirements/model/account.py	2013-11-18 22:02:53 +0000
@@ -24,9 +24,6 @@
 ################################################################################
 
 from openerp.osv import fields, osv
-__TYPES__ = [('sale_debit', 'Sale Debit'),('purchase_debit', 'Purchase Debit')]
-
-__HELP__= " Select 'Sale Debit' for customer debit note journals. Select 'Purchase Debit' for supplier debit note journals."
 
 class account_journal(osv.osv):
     _inherit = 'account.journal'
@@ -45,5 +42,3 @@
                     " Select 'Sale Debit' for customer debit note journals."\
                     " Select 'Purchase Debit' for supplier debit note journals.")
    }
-
-account_journal()

=== modified file 'l10n_ve_fiscal_requirements/model/invoice.py'
--- l10n_ve_fiscal_requirements/model/invoice.py	2013-06-01 18:58:59 +0000
+++ l10n_ve_fiscal_requirements/model/invoice.py	2013-11-18 22:02:53 +0000
@@ -33,21 +33,18 @@
         it does not exist, return false
         """
         
-        if context is None:
-            context = {}
-        journal_type_inv = context.get('journal_type', 'sale')
-        
-        if journal_type_inv in ('sale_debit', 'purchase_debit'):
+        context = context or {}
+        res = super(account_invoice, self)._get_journal(cr, uid, context=context)
+        if res: return res
+        type_inv = context.get('type', 'sale')
+        if type_inv in ('sale_debit', 'purchase_debit'):
             user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
             company_id = context.get('company_id', user.company_id.id)
             journal_obj = self.pool.get('account.journal')
-            res = journal_obj.search(cr, uid, [('type', '=',journal_type_inv),
-                                               ('company_id', '=', company_id)],
-                                                    limit=1)
-            return res and res[0] or False
-        else:
-            return super(account_invoice, self)._get_journal(cr, uid, context=context)
-    
+            domain = [('company_id', '=', company_id),('type', '=',type_inv)]
+            res = journal_obj.search(cr, uid, domain, limit=1)
+        return res and res[0] or False
+
     def _unique_invoice_per_partner(self, cr, uid, ids, context=None):
         """ Return false when it is found 
         that the bill is not out_invoice or out_refund,
@@ -118,6 +115,17 @@
             'child_ids':[],
             'nro_ctrl':None,
             'supplier_invoice_number':None, 
+            'sin_cred': False,
+            # No cleaned in this copy because it is related to the previous
+            # document, if previous document says so this too
+            # 'parent_id':False,
+            'date_document': False,
+            'invoice_printer' : '',
+            'fiscal_printer' : '',
+            # No cleaned in this copy because it is related to the previous
+            # document, if previous document says so this too
+            #'loc_req':False, 
+            'z_report': '',
         })
         return super(account_invoice, self).copy(cr, uid, id, default, context)
 
@@ -129,9 +137,6 @@
         return super(account_invoice, self).write(cr, uid, ids, vals,
                                                     context=context)
 
-account_invoice()
-
-
 class account_invoice_tax(osv.osv):
     _inherit = 'account.invoice.tax'
     _columns = {
@@ -139,6 +144,4 @@
         help="Tax relation to original tax, to be able to take off all data from invoices."),
     }
 
-account_invoice_tax()
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'l10n_ve_fiscal_requirements/model/partner.py'
--- l10n_ve_fiscal_requirements/model/partner.py	2013-11-16 04:03:30 +0000
+++ l10n_ve_fiscal_requirements/model/partner.py	2013-11-18 22:02:53 +0000
@@ -308,5 +308,4 @@
             # force full VIES online check
             self.update_rif(cr, uid, ids, context=context)
         return True
-res_partner()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'l10n_ve_fiscal_requirements/test/account_customer_invoice.yml'
--- l10n_ve_fiscal_requirements/test/account_customer_invoice.yml	1970-01-01 00:00:00 +0000
+++ l10n_ve_fiscal_requirements/test/account_customer_invoice.yml	2013-11-18 22:02:53 +0000
@@ -0,0 +1,29 @@
+-
+  In order to test account invoice I create a new customer invoice
+-
+  I set the context that will be used for the encoding of all the invoices of this file
+-
+  !context
+    'type': 'out_invoice'
+-
+  I create a customer invoice
+-
+  !record {model: account.invoice, id: account_invoice_customer0, view: account.invoice_form}:
+    payment_term: account.account_payment_term_advance
+    journal_id: account.sales_journal
+    partner_id: base.res_partner_3
+    reference_type: none
+    name: 'Test Customer Invoice - l10n_ve_fiscal_requirements'
+    invoice_line:
+      - product_id: product.product_product_5
+        quantity: 10.0
+-
+  I check that Initially customer invoice state is "Draft"
+-
+  !assert {model: account.invoice, id: account_invoice_customer0}:
+    - state == 'draft'
+-
+  I check that the customer invoice is a "Customer Invoice"
+-
+  !assert {model: account.invoice, id: account_invoice_customer0, string: This is not a customer invoice}:
+    - type == 'out_invoice'

=== added file 'l10n_ve_fiscal_requirements/test/account_supplier_invoice.yml'
--- l10n_ve_fiscal_requirements/test/account_supplier_invoice.yml	1970-01-01 00:00:00 +0000
+++ l10n_ve_fiscal_requirements/test/account_supplier_invoice.yml	2013-11-18 22:02:53 +0000
@@ -0,0 +1,35 @@
+-
+  In order to test account invoice I create a new supplier invoice
+-
+  I set the context that will be used for the encoding of all the invoices of this file
+-
+  !context
+    'type': 'in_invoice'
+-
+  I create a supplier invoice
+-
+  !record {model: account.invoice, id: account_invoice_supplier0, view: account.invoice_supplier_form }:
+    account_id: account.a_pay
+    company_id: base.main_company
+    currency_id: base.EUR
+    invoice_line:
+      - account_id: account.a_expense
+        name: '[PCSC234] PC Assemble SC234'
+        price_unit: 300.0
+        product_id: product.product_product_3
+        quantity: 10.0
+        uos_id: product.product_uom_unit
+    journal_id: account.expenses_journal
+    partner_id: base.res_partner_12
+    reference_type: none
+    type: 'in_invoice'
+-
+  I check that Initially supplier invoice state is "Draft"
+-
+  !assert {model: account.invoice, id: account_invoice_supplier0}:
+    - state == 'draft'
+-
+  I check that the supplier invoice is a "Supplier Invoice"
+-
+  !assert {model: account.invoice, id: account_invoice_supplier0, string: This is not a supplier invoice}:
+    - type == 'in_invoice'

=== modified file 'l10n_ve_fiscal_requirements/test/fr_damaged.yml'
--- l10n_ve_fiscal_requirements/test/fr_damaged.yml	2013-11-14 20:14:21 +0000
+++ l10n_ve_fiscal_requirements/test/fr_damaged.yml	2013-11-18 22:02:53 +0000
@@ -109,7 +109,6 @@
   !python {model: account.journal}: |
     aj_ids = self.search(cr, uid, [('type', '=','sale')])
     assert aj_ids, 'There are no Journals'
-
     self.write(cr, uid, aj_ids, {'update_posted': True})
 -
   6.13 Verify that the journal was properly updated
@@ -171,4 +170,3 @@
       pass
     finally:
       cr.sql_log = l
-  

=== modified file 'l10n_ve_imex/model/invoice.py'
--- l10n_ve_imex/model/invoice.py	2013-09-23 14:18:19 +0000
+++ l10n_ve_imex/model/invoice.py	2013-11-18 22:02:53 +0000
@@ -75,7 +75,7 @@
                     % item.customs_form_id.name)
         return super(account_invoice, self).test_open(cr, uid, ids, args)
 
-class inheried_account_invoice_tax(osv.osv):
+class account_invoice_tax(osv.osv):
 
     _inherit = 'account.invoice.tax'
 

=== modified file 'l10n_ve_sale_purchase/__openerp__.py'
--- l10n_ve_sale_purchase/__openerp__.py	2013-09-18 23:55:08 +0000
+++ l10n_ve_sale_purchase/__openerp__.py	2013-11-18 22:02:53 +0000
@@ -41,7 +41,7 @@
     ],
     'demo' : [],
     'active' : False,
-    'installable': True,
+    'installable': False,
     'test': [
 #        'test/purchase_order.yml',
 #        'test/purchase_picking.yml',

=== modified file 'l10n_ve_split_invoice/__init__.py'
--- l10n_ve_split_invoice/__init__.py	2012-01-19 20:03:36 +0000
+++ l10n_ve_split_invoice/__init__.py	2013-11-18 22:02:53 +0000
@@ -22,7 +22,4 @@
 #    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 installer
-import res_company
-import invoice
-
+import model

=== modified file 'l10n_ve_split_invoice/__openerp__.py'
--- l10n_ve_split_invoice/__openerp__.py	2013-11-14 20:44:23 +0000
+++ l10n_ve_split_invoice/__openerp__.py	2013-11-18 22:02:53 +0000
@@ -51,7 +51,7 @@
     "demo_xml" : [
     ],
     "update_xml" : [
-#~        "installer_view.xml",
+#~        "view/installer_view.xml",
         "view/company_view.xml",
     ],
     'test': [

=== added directory 'l10n_ve_split_invoice/model'
=== added file 'l10n_ve_split_invoice/model/__init__.py'
--- l10n_ve_split_invoice/model/__init__.py	1970-01-01 00:00:00 +0000
+++ l10n_ve_split_invoice/model/__init__.py	2013-11-18 22:02:53 +0000
@@ -0,0 +1,28 @@
+ # -*- encoding: utf-8 -*-
+###########################################################################
+#    Module Writen to OpenERP, Open Source Management Solution
+#    Copyright (C) OpenERP Venezuela (<http://openerp.com.ve>).
+#    All Rights Reserved
+###############Credits######################################################
+#    Coded by: [e-mail]
+#    Planified by: Nhomar Hernandez
+#    Finance by: Helados Gilda, C.A. http://heladosgilda.com.ve
+#    Audited by: Humberto Arocha [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 installer
+import res_company
+import invoice
+

=== renamed file 'l10n_ve_split_invoice/installer.py' => 'l10n_ve_split_invoice/model/installer.py'
=== renamed file 'l10n_ve_split_invoice/invoice.py' => 'l10n_ve_split_invoice/model/invoice.py'
=== renamed file 'l10n_ve_split_invoice/res_company.py' => 'l10n_ve_split_invoice/model/res_company.py'
=== renamed file 'l10n_ve_split_invoice/installer_view.xml' => 'l10n_ve_split_invoice/view/installer_view.xml'
=== modified file 'l10n_ve_withholding/__openerp__.py'
--- l10n_ve_withholding/__openerp__.py	2013-09-18 23:55:08 +0000
+++ l10n_ve_withholding/__openerp__.py	2013-11-18 22:02:53 +0000
@@ -49,7 +49,8 @@
     ],
     'demo_xml': [],
     'test': [
-#        'test/wh_pay_invoice.yml'
+        'test/account_supplier_invoice.yml',
+#        'test/wh_pay_invoice.yml',
         ],
     'installable': True,
     'active': False,

=== modified file 'l10n_ve_withholding/model/invoice.py'
--- l10n_ve_withholding/model/invoice.py	2013-04-12 20:19:03 +0000
+++ l10n_ve_withholding/model/invoice.py	2013-11-18 22:02:53 +0000
@@ -28,11 +28,9 @@
 from openerp.addons import decimal_precision as dp
 from openerp.tools.translate import _
 
-
 class account_invoice(osv.osv):
     _inherit = 'account.invoice'
     
-    
     def _get_move_lines(self, cr, uid, ids, to_wh, period_id, 
                             pay_journal_id, writeoff_acc_id, 
                             writeoff_period_id, writeoff_journal_id, date, 
@@ -42,7 +40,7 @@
         """
         if context is None: context = {}
         return []
-        
+
     def ret_and_reconcile(self, cr, uid, ids, pay_amount, pay_account_id, 
                             period_id, pay_journal_id, writeoff_acc_id, 
                             writeoff_period_id, writeoff_journal_id, date, 
@@ -105,7 +103,6 @@
         self.pool.get('account.invoice').write(cr, uid, ids, {}, context=context)
         return {'move_id': move_id}
 
-    
     def ret_payment_get(self, cr, uid, ids, *args):
         """ Return payments associated with this bill
         """
@@ -127,10 +124,7 @@
             lines = filter(lambda x: x not in src, lines)
 
         return lines
-    
-    
-    
-    
+
     def check_tax_lines(self, cr, uid, inv, compute_taxes, ait_obj):
         """ Check if no tax lines are created. If 
         existing tax lines, there are checks on the invoice 
@@ -157,11 +151,6 @@
                 if not key in tax_key:
                     raise osv.except_osv(_('Warning !'), _('Taxes missing !'))
 
-account_invoice()
-
-
-
-
 class account_invoice_tax(osv.osv):
     _inherit = 'account.invoice.tax'
     _columns = {
@@ -223,6 +212,3 @@
             t['base_amount'] = cur_obj.round(cr, uid, cur, t['base_amount'])
             t['tax_amount'] = cur_obj.round(cr, uid, cur, t['tax_amount'])
         return tax_grouped
-
-
-account_invoice_tax()

=== added file 'l10n_ve_withholding/test/account_supplier_invoice.yml'
--- l10n_ve_withholding/test/account_supplier_invoice.yml	1970-01-01 00:00:00 +0000
+++ l10n_ve_withholding/test/account_supplier_invoice.yml	2013-11-18 22:02:53 +0000
@@ -0,0 +1,76 @@
+-
+  In order to test account invoice I create a new supplier invoice
+-
+  I create a Tax
+-
+  !record {model: account.tax, id: tax10}:
+    name: Tax 10.0 %
+    amount: 0.10
+    type: percent
+    sequence: 1
+    company_id: base.main_company
+    type_tax_use: purchase
+-
+  I set the context that will be used for the encoding of all the invoices of this file
+-
+  !context
+    'type': 'in_invoice'
+-
+  I create a supplier invoice
+-
+  !record {model: account.invoice, id: account_invoice_supplier0, view: account.invoice_supplier_form}:
+    account_id: account.a_pay
+    check_total: 3000.0
+    company_id: base.main_company
+    currency_id: base.EUR
+    invoice_line:
+      - account_id: account.a_expense
+        name: '[PCSC234] PC Assemble SC234'
+        price_unit: 300.0
+        product_id: product.product_product_3
+        quantity: 10.0
+        uos_id: product.product_uom_unit
+        invoice_line_tax_id:
+                  - tax10
+    journal_id: account.expenses_journal
+    partner_id: base.res_partner_12
+    reference_type: none
+    type: in_invoice
+    comment: 'Supplier Invoice - l10n_ve_withholding'
+-
+  I check that Initially supplier invoice state is "Draft"
+-
+  !assert {model: account.invoice, id: account_invoice_supplier0}:
+    - state == 'draft'
+-
+  I check that the supplier invoice is a "Supplier Invoice"
+-
+  !assert {model: account.invoice, id: account_invoice_supplier0, string: This is not a supplier invoice}:
+    - 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_supplier0}
+-
+  I check that the invoice state is now "Open"
+-
+  !assert {model: account.invoice, id: account_invoice_supplier0}:
+    - state == 'open'
+-
+  I verify that account.invoice.tax has 'tax_id'
+-
+  !python {model: account.invoice}: |
+    inv = self.browse(cr, uid, ref('account_invoice_supplier0'))
+    assert inv.tax_line, ('This invoice should has at least one tax')
+    for t in inv.tax_line:
+        assert t.tax_id, "No tax_id in account.invoice.tax record '%s'"%t.name
+-
+  I verify that account move is created
+-
+  !python {model: account.invoice}: |
+    move_obj = self.pool.get('account.move')
+    inv = self.browse(cr, uid, ref('account_invoice_supplier0'))
+    move = inv.move_id
+    assert move, ('Journal Entries has not been created')
+    assert move.line_id, ('Empty Entry Lines')
+    print [(x.debit, x.credit) for x in move.line_id]

=== modified file 'l10n_ve_withholding_islr/__openerp__.py'
--- l10n_ve_withholding_islr/__openerp__.py	2013-11-14 20:14:21 +0000
+++ l10n_ve_withholding_islr/__openerp__.py	2013-11-18 22:02:53 +0000
@@ -74,5 +74,5 @@
 #            'test/test_duplicate.yml',
         ],
     "active": False,
-    "installable": True
+    "installable": True,
 }

=== modified file 'l10n_ve_withholding_islr/model/invoice.py'
--- l10n_ve_withholding_islr/model/invoice.py	2013-11-14 05:25:38 +0000
+++ l10n_ve_withholding_islr/model/invoice.py	2013-11-18 22:02:53 +0000
@@ -31,7 +31,6 @@
 import datetime
 from openerp import netsvc
 
-
 class account_invoice_line(osv.osv):
     """ It adds a field that determines if a line has been retained or not
     """
@@ -66,8 +65,7 @@
         @param price_unit: new Unit Price for the invoice line
         @param currency_id: 
         """
-        if context is None:
-            context = {}
+        context = context or {}
         data = super(
             account_invoice_line, self).product_id_change(cr, uid, ids,
                                                           product, uom,
@@ -88,26 +86,15 @@
         """ Initialilizes the fields wh_xml_id and apply_wh,
         when it comes to a new line
         """
-        if context is None:
-            context = {}
-
+        context = context or {}
         if context.get('new_key', False):
-
             vals.update({'wh_xml_id': False,
                          'apply_wh': False,
-
                          })
-
         return super(account_invoice_line, self).create(cr, uid, vals, context=context)
 
-
-account_invoice_line()
-
-
 class account_invoice(osv.osv):
-
     _inherit = 'account.invoice'
-
     _columns = {
         'status': fields.selection([
             ('pro', 'Processed withholding, xml Line generated'),
@@ -207,19 +194,13 @@
         """ Inicializes the fields islr_wh_doc and status
         when the line is duplicated
         """
-        if default is None:
-            default = {}
-
-        if context is None:
-            context = {}
-
+        default = default or {}
+        context = context or {}
         default = default.copy()
         default.update({'islr_wh_doc': 0,
                         'status': 'no_pro',
                         })
-
         context.update({'new_key': True})
-
         return super(account_invoice, self).copy(cr, uid, id, default,
                                                  context)
 
@@ -319,4 +300,3 @@
 
         return res
 
-account_invoice()

=== modified file 'l10n_ve_withholding_islr/model/partner.py'
--- l10n_ve_withholding_islr/model/partner.py	2013-04-12 20:19:03 +0000
+++ l10n_ve_withholding_islr/model/partner.py	2013-11-18 22:02:53 +0000
@@ -33,7 +33,6 @@
 import datetime
 
 class res_partner(osv.osv):
-    _name = 'res.partner'
     _inherit = 'res.partner'
 
     _columns = {
@@ -45,4 +44,3 @@
     _defaults = {
         'islr_withholding_agent': lambda *a: True,
     }
-res_partner()

=== modified file 'l10n_ve_withholding_islr/model/product.py'
--- l10n_ve_withholding_islr/model/product.py	2013-04-26 23:55:44 +0000
+++ l10n_ve_withholding_islr/model/product.py	2013-11-18 22:02:53 +0000
@@ -25,6 +25,7 @@
 #    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.osv import osv
 from openerp.osv import fields
 from openerp.tools.translate import _
@@ -40,14 +41,10 @@
         'concept_id': fields.many2one('islr.wh.concept','Withhold  Concept',help="Concept Income Withholding to apply to the service", required=False),
     }
 
-product_template()
-
-
 class product_product(osv.osv):
 
     _inherit = "product.product"
-    
-   
+
     def onchange_product_type(self, cr, uid, ids, prd_type, context=None):
         """ Add a default concept for products that are not service type,
         Returns false if the product type is not a service, and if the
@@ -65,5 +62,3 @@
                  raise osv.except_osv(_('Invalid action !'),_("Must create the concept of income withholding"))
                 
         return {'value' : {'concept_id':concept_id or False}} 
-
-product_product()

=== modified file 'l10n_ve_withholding_islr/model/res_company.py'
--- l10n_ve_withholding_islr/model/res_company.py	2013-02-13 19:39:18 +0000
+++ l10n_ve_withholding_islr/model/res_company.py	2013-11-18 22:02:53 +0000
@@ -22,6 +22,7 @@
 #    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.osv import osv
 from openerp.osv import fields
 from openerp.tools.translate import _
@@ -30,7 +31,6 @@
 import datetime
 
 class res_company(osv.osv):
-    _name = 'res.company'
     _inherit = 'res.company'
 
     _columns = {
@@ -38,10 +38,7 @@
             help='When True, Supplier Income Withholding will be check and '\
                     'validate automatically'),
     }
-    
+
     defaults = {
         'automatic_income_wh': False,
     }
-    
-res_company()
-

=== modified file 'l10n_ve_withholding_iva/demo/demo_invoices.xml'
--- l10n_ve_withholding_iva/demo/demo_invoices.xml	2013-11-17 02:03:44 +0000
+++ l10n_ve_withholding_iva/demo/demo_invoices.xml	2013-11-18 22:02:53 +0000
@@ -5,9 +5,17 @@
              Mark demo taxes as withholdable
         -->
         <record id="l10n_ve_fiscal_requirements.iva_sale1" model="account.tax">
+            <field name="name">IVA - Sale</field>
+            <field name="amount">0.12</field>
+            <field name="type_tax_use">sale</field>
+            <field name="applicable_type">true</field>
             <field name="ret">True</field>
         </record>
         <record id="l10n_ve_fiscal_requirements.iva_purchase1" model="account.tax">
+            <field name="name">IVA - Purchase</field>
+            <field name="amount">0.12</field>
+            <field name="type_tax_use">purchase</field>
+            <field name="applicable_type">true</field>
             <field name="ret">True</field>
         </record>
         <!--

=== modified file 'l10n_ve_withholding_iva/model/account.py'
--- l10n_ve_withholding_iva/model/account.py	2013-05-11 05:45:52 +0000
+++ l10n_ve_withholding_iva/model/account.py	2013-11-18 22:02:53 +0000
@@ -49,5 +49,3 @@
             domain="[('type', '=', 'other')]",
             help="This account will be used when applying a withhold to a Refund"),
    }
-
-account_tax()

=== modified file 'l10n_ve_withholding_iva/model/invoice.py'
--- l10n_ve_withholding_iva/model/invoice.py	2013-11-14 01:52:50 +0000
+++ l10n_ve_withholding_iva/model/invoice.py	2013-11-18 22:02:53 +0000
@@ -435,7 +435,6 @@
                   " invoice."))
         return True
 
-account_invoice()
 
 class account_invoice_tax(osv.osv):
     _inherit = 'account.invoice.tax'
@@ -460,5 +459,3 @@
                 amount_ret = wh_iva_rate and ait.tax_amount*wh_iva_rate/100.0 or 0.00
             res[ait.id] = {'amount_ret': amount_ret, 'base_ret': ait.base_amount}
         return res
-
-account_invoice_tax()

=== modified file 'l10n_ve_withholding_iva/model/wh_iva.py'
--- l10n_ve_withholding_iva/model/wh_iva.py	2013-07-23 14:23:34 +0000
+++ l10n_ve_withholding_iva/model/wh_iva.py	2013-11-18 22:02:53 +0000
@@ -30,16 +30,10 @@
 
 class account_wh_iva_line_tax(osv.osv):
     _name = 'account.wh.iva.line.tax'
-account_wh_iva_line_tax()
-
 class account_wh_iva_line(osv.osv):
     _name = "account.wh.iva.line"
-account_wh_iva_line()
-
 class account_wh_iva(osv.osv):
     _name = "account.wh.iva"
-account_wh_iva()
-
 class account_wh_iva_line_tax(osv.osv):
     
     def _set_amount_ret(self, cr, uid, id, name, value, arg, ctx=None):
@@ -91,8 +85,6 @@
             help="Vat Withholding amount"),
     }
 
-account_wh_iva_line_tax()
-
 class account_wh_iva_line(osv.osv):
 
     def _get_tax_lines(self, cr, uid, tax_id_brw, context=None):
@@ -194,8 +186,6 @@
 
         return {'value':result, 'domain':domain}
 
-account_wh_iva_line()
-
 class account_wh_iva(osv.osv):
     
     def name_get(self,cr, uid, ids, context):
@@ -725,6 +715,7 @@
         fortnight_str = {'True': ' - Second Fortnight)',
                         'False': ' - First Fortnight)'}
         for awi_brw in self.browse(cr, uid, ids, context=context):
+            if not awi_brw.wh_lines: return False
             if awi_brw.type in ['out_invoice']: return True
             for awil_brw in awi_brw.wh_lines:
                 awil_period_id, awil_fortnight = per_obj.find_fortnight(
@@ -781,4 +772,3 @@
                 super(account_wh_iva, self).unlink(cr, uid, ids, context=context)
         return True
 
-account_wh_iva()

=== modified file 'l10n_ve_withholding_iva/test/iva_purchase_nret1.yml'
--- l10n_ve_withholding_iva/test/iva_purchase_nret1.yml	2013-01-15 15:16:32 +0000
+++ l10n_ve_withholding_iva/test/iva_purchase_nret1.yml	2013-11-18 22:02:53 +0000
@@ -32,7 +32,7 @@
     date_invoice: !eval time.strftime('%Y-%m-%d')
     partner_id: base.res_partner_23
     reference_type: none
-    journal_id: account.sales_journal
+    journal_id: account.expenses_journal
     wh_iva: True
     invoice_line:
       - product_id: product.product_product_3

=== modified file 'l10n_ve_withholding_iva/test/iva_purchase_nret2.yml'
--- l10n_ve_withholding_iva/test/iva_purchase_nret2.yml	2013-01-15 15:16:32 +0000
+++ l10n_ve_withholding_iva/test/iva_purchase_nret2.yml	2013-11-18 22:02:53 +0000
@@ -42,7 +42,7 @@
     date_invoice: !eval time.strftime('%Y-%m-%d')
     partner_id: base.res_partner_23
     reference_type: none
-    journal_id: account.sales_journal
+    journal_id: account.expenses_journal
     wh_iva: True
     invoice_line:
       - product_id: product.product_product_3

=== modified file 'l10n_ve_withholding_iva/test/iva_purchase_nret3.yml'
--- l10n_ve_withholding_iva/test/iva_purchase_nret3.yml	2013-01-15 15:16:32 +0000
+++ l10n_ve_withholding_iva/test/iva_purchase_nret3.yml	2013-11-18 22:02:53 +0000
@@ -52,7 +52,7 @@
     date_invoice: !eval time.strftime('%Y-%m-%d')
     partner_id: base.res_partner_23
     reference_type: none
-    journal_id: account.sales_journal
+    journal_id: account.expenses_journal
     wh_iva: True
     invoice_line:
       - product_id: product.product_product_3

=== modified file 'l10n_ve_withholding_iva/test/iva_purchase_wh.yml'
--- l10n_ve_withholding_iva/test/iva_purchase_wh.yml	2013-01-15 15:16:32 +0000
+++ l10n_ve_withholding_iva/test/iva_purchase_wh.yml	2013-11-18 22:02:53 +0000
@@ -26,13 +26,14 @@
 -
   2.4 I create a purchase invoice
 -
-  !record {model: account.invoice, id: test_purchase_iva02}:
-    type: out_invoice
+  !record {model: account.invoice, id: test_purchase_iva02, view: account.invoice_supplier_form, context:{'default_type': 'in_invoice', 'type': 'in_invoice', 'journal_type': 'purchase'}}:
+    type: in_invoice
+    state: draft
     company_id: base.main_company
     date_invoice: !eval time.strftime('%Y-%m-%d')
     partner_id: base.res_partner_23
     reference_type: none
-    journal_id: account.sales_journal
+    journal_id: 
     wh_iva: True
     invoice_line:
       - product_id: product.product_product_3
@@ -50,10 +51,19 @@
         invoice_line_tax_id:
         - l10n_ve_fiscal_requirements.iva_purchase1
 -
-  2.5 I check that Initially customer invoice is in the "Draft" state
+  2.5 I check that Initially supplier invoice is in the "Draft" state
 -
-  !assert {model: account.invoice, id: test_purchase_iva02}:
-    - state == 'draft'
+  !python {model: account.invoice}: |
+    ap_obj=self.pool.get('account.period')
+    import time
+    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_obj.write(cr, uid, period, {'special':False})
+    self.write(cr,uid,ref('test_purchase_iva02'),{'journal_id':ref('account.expenses_journal'),'type':'in_invoice'})
+    ai_brw = self.browse(cr,uid,ref('test_purchase_iva02'))
+    assert ai_brw.type == 'in_invoice', "Not the intended type. It should be 'in_invoice' not '%s'"%ai_brw.type
+    assert ai_brw.state == 'draft', "Not the intended state. It should be 'draft' not '%s'"%ai_brw.state
+    assert ai_brw.journal_id.id == ref('account.expenses_journal'), "Not the intended Journal. It should be 'Expenses Journal - (test)' not '%s'"%ai_brw.journal_id.name
 -
   2.6 I change the state of invoice to "Proforma2" by clicking PRO-FORMA button
 -
@@ -76,6 +86,7 @@
   2.10 Set control number for the invoice
 -
   !python {model: account.invoice}: |
-    self.write(cr, uid, [ref("test_purchase_iva02")], {'nro_ctrl':'iva002', 'journal_id':ref("account.expenses_journal")})
+    self.write(cr, uid, [ref("test_purchase_iva02")], {'nro_ctrl':'iva002'})
     ai_brw = self.browse(cr, uid, ref("test_purchase_iva02"))
-    assert ai_brw.nro_ctrl=='iva002' and ai_brw.journal_id.id == ref("account.expenses_journal"), 'Invoice wasn\'t updated properly'
+    assert ai_brw.nro_ctrl=='iva002', "Not the intended Control Number. It should be 'iva002' not '%s'"%ai_brw.nro_ctrl
+    assert ai_brw.journal_id.id == ref('account.expenses_journal'), "Not the intended Journal. It should be 'Expenses Journal - (test)' not '%s'"%ai_brw.journal_id.name

=== modified file 'l10n_ve_withholding_iva/test/iva_sale_wh.yml'
--- l10n_ve_withholding_iva/test/iva_sale_wh.yml	2013-01-17 19:19:09 +0000
+++ l10n_ve_withholding_iva/test/iva_sale_wh.yml	2013-11-18 22:02:53 +0000
@@ -109,11 +109,13 @@
     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_obj.write(cr, uid, period, {'special':False})
     ap_brw = ap_obj.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'
+    assert ap_brw.special == False, 'Period is special. It should be'
 
     self.write(cr, uid, ref("wh_iva_sale01"), {'period_id':period[0]})
 -

=== modified file 'l10n_ve_withholding_iva/test/iva_test_wh_2.yml'
--- l10n_ve_withholding_iva/test/iva_test_wh_2.yml	2013-01-18 19:55:38 +0000
+++ l10n_ve_withholding_iva/test/iva_test_wh_2.yml	2013-11-18 22:02:53 +0000
@@ -10,28 +10,55 @@
 -
   10.2 I generate a withholding vat customer
 -
-  !record {model: account.wh.iva, id: wh_iva_test02}:
+  !record {model: account.wh.iva, id: wh_iva_test02, view: view_wh_iva_form_customer, context: {'type':'out_invoice'}}:
     journal_id: wh_sales_journal
     partner_id: base.res_partner_23
     number: 222444333000
     account_id: account.a_recv
     name: 'IVA wh vat customer Vauxoo test 2'
     type: out_invoice
+    state: draft
 -
   10.3 I check withholding vat customer
 -
-  !assert {model: account.wh.iva, id: wh_iva_test02, string: Wh was not saved}:
-    - state == 'draft'
+  !python {model: account.wh.iva}: |
+    values = {}
+    rp_obj = self.pool.get('res.partner')
+    rp_brw = rp_obj.browse(cr,uid,ref("base.res_partner_23"))
+    res = self.onchange_partner_id(cr, uid, [ref('wh_iva_test02')], 'out_invoice', rp_brw.id)
+    values['wh_lines'] = [(0,0,{'invoice_id':ref('test_iva01'), 'name':'N/A', 'wh_iva_rate':rp_brw.wh_iva_rate})]
+    values['account_id'] = res['value']['account_id']
+    values['type'] = 'out_invoice'
+    self.write(cr,uid,ref('wh_iva_test02'),values)
+    awi_brw = self.browse(cr,uid,ref('wh_iva_test02'))
+    assert awi_brw.type == 'out_invoice', "Not the intended type. It should be 'out_invoice' not '%s'"%awi_brw.type
+    assert awi_brw.state == 'draft', "Not the intended state. It should be 'draft' not '%s'"%awi_brw.state
+    assert awi_brw.wh_lines, "There are no lines to withhold"
+    self.compute_amount_wh(cr,uid,[ref('wh_iva_test02')])
 -
   10.4 I confirm the withholding vat customer
 -
-  !workflow {model: account.wh.iva, action: wh_iva_confirmed, ref: wh_iva_test02}
+  !python {model: account.wh.iva}: |
+    import netsvc
+    from openerp.osv import osv
+    wf_service = netsvc.LocalService("workflow")
+    try:
+      self.check_wh_lines_fortnights(cr, uid, [ref('wh_iva_test02')])
+      self.check_invoice_nro_ctrl(cr, uid, [ref('wh_iva_test02')])
+      self.check_vat_wh(cr, uid, [ref('wh_iva_test02')])
+      self.check_wh_taxes(cr, uid, [ref('wh_iva_test02')])
+      self.check_wh_taxes(cr, uid, [ref('wh_iva_test02')])
+      assert False, "An exception should have been raised, unwithholdable taxes  are not allowed to reach here!"
+    except osv.except_osv:
+      # exception was raised as expected
+      pass
 -
   10.5 I check withholding vat is not confirmed
   # TODO: Check this test case, it fails. It means that something in the wh_iva_confirmed action is wrong.
 -
-  !assert {model: account.wh.iva, id: wh_iva_test02, string: Could not confirm the wh}:
-    - state != 'confirmed'
+  !python {model: account.wh.iva}: |
+    awi_brw = self.browse(cr,uid,ref('wh_iva_test02'))
+    assert awi_brw.state == 'draft', "Not the intended state. It should be 'draft' not '%s'"%awi_brw.state
 -
   10.6 I try to mark it as done
 -

=== modified file 'l10n_ve_withholding_iva/test/iva_test_wh_3.yml'
--- l10n_ve_withholding_iva/test/iva_test_wh_3.yml	2013-01-18 19:55:38 +0000
+++ l10n_ve_withholding_iva/test/iva_test_wh_3.yml	2013-11-18 22:02:53 +0000
@@ -16,11 +16,15 @@
     account_id: account.a_recv
     name: 'IVA wh vat customer Vauxoo test 3'
     type: out_invoice
+    state: draft
 -
   11.3 I check withholding vat customer
 -
-  !assert {model: account.wh.iva, id: wh_iva_test03, string: Wh was not saved}:
-    - state == 'draft'
+  !python {model: account.wh.iva}: |
+    self.write(cr,uid,ref('wh_iva_test03'),{'type':'out_invoice'})
+    awi_brw = self.browse(cr,uid,ref('wh_iva_test03'))
+    assert awi_brw.type == 'out_invoice', "Not the intended type. It should be 'out_invoice' not '%s'"%awi_brw.type
+    assert awi_brw.state == 'draft', "Not the intended state. It should be 'draft' not '%s'"%awi_brw.state
 -
   11.4 Before validating let's add the period
 -
@@ -43,8 +47,9 @@
   11.7 I check withholding vat is not confirmed
   # TODO: Check this test case, it fails. It means that something in the wh_iva_confirmed action is wrong.
 -
-  !assert {model: account.wh.iva, id: wh_iva_test03, string: Could not confirm the wh}:
-    - state != 'confirmed'
+  !python {model: account.wh.iva}: |
+    awi_brw = self.browse(cr,uid,ref('wh_iva_test03'))
+    assert awi_brw.state == 'draft', "Not the intended state. It should be 'draft' not '%s'"%awi_brw.state
 -
   11.8 I try to mark it as done
 -
@@ -52,5 +57,6 @@
 -
   11.9 I check withholding vat is not done
 -
-  !assert {model: account.wh.iva, id: wh_iva_test01, string: Wh cannot be in done state}:
-    - state != 'done'
+  !python {model: account.wh.iva}: |
+    awi_brw = self.browse(cr,uid,ref('wh_iva_test03'))
+    assert awi_brw.state == 'draft', "Not the intended state. It should be 'draft' not '%s'"%awi_brw.state

=== modified file 'l10n_ve_withholding_iva/test/iva_test_wh_4.yml'
--- l10n_ve_withholding_iva/test/iva_test_wh_4.yml	2013-01-18 19:55:38 +0000
+++ l10n_ve_withholding_iva/test/iva_test_wh_4.yml	2013-11-18 22:02:53 +0000
@@ -16,11 +16,15 @@
     account_id: account.a_recv
     name: 'IVA wh vat customer Vauxoo test 3'
     type: out_invoice
+    state: draft
 -
   12.3 I check withholding vat customer
 -
-  !assert {model: account.wh.iva, id: wh_iva_test04, string: Wh was not saved}:
-    - state == 'draft'
+  !python {model: account.wh.iva}: |
+    self.write(cr,uid,ref('wh_iva_test04'),{'type':'out_invoice'})
+    awi_brw = self.browse(cr,uid,ref('wh_iva_test04'))
+    assert awi_brw.type == 'out_invoice', "Not the intended type. It should be 'out_invoice' not '%s'"%awi_brw.type
+    assert awi_brw.state == 'draft', "Not the intended state. It should be 'draft' not '%s'"%awi_brw.state
 -
   12.4 Before validating let's add the period
 -

=== modified file 'l10n_ve_withholding_muni/__openerp__.py'
--- l10n_ve_withholding_muni/__openerp__.py	2013-01-30 20:27:24 +0000
+++ l10n_ve_withholding_muni/__openerp__.py	2013-11-18 22:02:53 +0000
@@ -46,10 +46,9 @@
         'data/wh_muni_sequence.xml',
     ],
     'demo_xml': [],
-    'test': [],
+    'test': [
+    ],
     'installable': True,
     'active': False,
 }
-
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'l10n_ve_withholding_muni/model/invoice.py'
--- l10n_ve_withholding_muni/model/invoice.py	2013-04-12 20:19:03 +0000
+++ l10n_ve_withholding_muni/model/invoice.py	2013-11-18 22:02:53 +0000
@@ -158,5 +158,3 @@
             readonly=True, help="Withholding muni."),
 
     }
-
-account_invoice()

=== modified file 'l10n_ve_withholding_muni/model/partner.py'
--- l10n_ve_withholding_muni/model/partner.py	2013-02-28 16:24:39 +0000
+++ l10n_ve_withholding_muni/model/partner.py	2013-11-18 22:02:53 +0000
@@ -26,7 +26,6 @@
 
 from openerp.osv import fields, osv
 
-
 class res_partner(osv.osv):
     _inherit = 'res.partner'
     _columns = {
@@ -50,6 +49,3 @@
             help="This account will be used credit local withholding amount"),
 
     }
-
-
-res_partner()

=== modified file 'l10n_ve_withholding_muni/model/wh_muni.py'
--- l10n_ve_withholding_muni/model/wh_muni.py	2013-06-11 21:12:31 +0000
+++ l10n_ve_withholding_muni/model/wh_muni.py	2013-11-18 22:02:53 +0000
@@ -23,14 +23,12 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ##########################################################################
 
-
 from openerp.osv import osv, fields
 import time
 from openerp.tools import config
 from openerp.tools.translate import _
 from openerp.addons import decimal_precision as dp
 
-
 class account_wh_munici(osv.osv):
 
     def _get_type(self, cr, uid, context=None):
@@ -96,9 +94,8 @@
         'munici_line_ids': fields.one2many('account.wh.munici.line', 'retention_id', 'Local withholding lines', readonly=True, states={'draft': [('readonly', False)]}, help="Invoices to will be made local withholdings"),
         'amount': fields.float('Amount', required=False, digits_compute=dp.get_precision('Withhold'), help="Amount withheld"),
         'move_id': fields.many2one('account.move', 'Account Entry', help='account entry for the invoice'),
-
-
     }
+
     _defaults = {
         'type': _get_type,
         'state': lambda *a: 'draft',
@@ -107,7 +104,6 @@
         'company_id': lambda self, cr, uid, context:
         self.pool.get('res.users').browse(cr, uid, uid,
                                           context=context).company_id.id,
-
     }
 
     _sql_constraints = [
@@ -307,10 +303,6 @@
                 super(account_wh_munici, self).unlink(cr, uid, ids, context=context)
         return True
 
-
-account_wh_munici()
-
-
 class account_wh_munici_line(osv.osv):
 
     def default_get(self, cr, uid, fields, context=None):
@@ -322,6 +314,7 @@
                                                                uid, fields, context)
         self.munici_context = context
         return data
+
 # TODO
 # necesito crear el campo y tener la forma de calcular el monto del impuesto
 # munici retenido en la factura
@@ -376,6 +369,3 @@
 
             total = res.amount_total
             return {'value': {'amount': total}}
-
-
-account_wh_munici_line()

=== modified file 'l10n_ve_withholding_src/__openerp__.py'
--- l10n_ve_withholding_src/__openerp__.py	2013-04-18 21:03:12 +0000
+++ l10n_ve_withholding_src/__openerp__.py	2013-11-18 22:02:53 +0000
@@ -67,5 +67,5 @@
         
     ],
     "active": False,
-    "installable": True
+    "installable": True,
 }

=== modified file 'l10n_ve_withholding_src/model/invoice.py'
--- l10n_ve_withholding_src/model/invoice.py	2013-11-04 20:34:17 +0000
+++ l10n_ve_withholding_src/model/invoice.py	2013-11-18 22:02:53 +0000
@@ -138,7 +138,7 @@
         @param date: current date                                               
         @param name: description 
         """
-        if context is None: context = {}
+        context = context or {}
         res = super(account_invoice,self)._get_move_lines(cr, uid, ids, to_wh, period_id, 
                             pay_journal_id, writeoff_acc_id, 
                             writeoff_period_id, writeoff_journal_id, date, 
@@ -166,7 +166,4 @@
                     'currency_id': False,
                     'name':name
                 }))
-        
         return res
-
-account_invoice()

=== modified file 'l10n_ve_withholding_src/model/partner.py'
--- l10n_ve_withholding_src/model/partner.py	2013-04-23 15:15:12 +0000
+++ l10n_ve_withholding_src/model/partner.py	2013-11-18 22:02:53 +0000
@@ -38,4 +38,3 @@
     _defaults = {
         'wh_src_rate': lambda *a: 0,
     }
-res_partner()

=== modified file 'l10n_ve_withholding_src/model/res_company.py'
--- l10n_ve_withholding_src/model/res_company.py	2013-03-01 10:53:41 +0000
+++ l10n_ve_withholding_src/model/res_company.py	2013-11-18 22:02:53 +0000
@@ -30,7 +30,6 @@
 
 class res_company(osv.osv):
     _inherit = 'res.company'
-    
     _columns = {        
         'wh_src_collected_account_id': fields.many2one(
             'account.account',
@@ -51,5 +50,3 @@
             domain="[('type', '=', 'other')]",
             help="This account will be used when applying a withhold to a Customer"),
     }
-
-res_company()

=== modified file 'l10n_ve_withholding_src/model/wh_src.py'
--- l10n_ve_withholding_src/model/wh_src.py	2013-06-11 21:03:55 +0000
+++ l10n_ve_withholding_src/model/wh_src.py	2013-11-18 22:02:53 +0000
@@ -155,14 +155,11 @@
     _defaults = {
     'state': lambda *a: 'draft',
     'currency_id': lambda self, cr, uid, c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.currency_id.id,
-    'journal_id':lambda self, cr, uid, context: \
-        self._diario(cr, uid, uid, context),
+    'journal_id': _diario,
     'company_id': lambda self, cr, uid, c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id,
-
     }
 
     _sql_constraints = [
-
     ] 
     
     def onchange_partner_id(self, cr, uid, ids, type, partner_id,context=None):
@@ -363,7 +360,6 @@
         
 
         
-account_wh_src()
 
 class account_wh_src_line(osv.osv):
 
@@ -414,4 +410,3 @@
             }
         }
         return res
-account_wh_src_line()

=== modified file 'ovl/__openerp__.py'
--- ovl/__openerp__.py	2013-11-14 06:07:44 +0000
+++ ovl/__openerp__.py	2013-11-18 22:02:53 +0000
@@ -87,5 +87,5 @@
     "images" : [],
     "auto_install": False,
     "application": True,
-    "installable": True,
+    "installable": False,
 }