Merge lp:~vauxoo/openerp-venezuela-localization/ovl70-rev-taskovl-yani into lp:openerp-venezuela-localization

[Yanina Aular (Vauxoo)]

localization improvements, bug fixes

[Yanina Aular (Vauxoo) (yanina-aular)]

localization improvements, bug fixes

[hbto [Vauxoo] http://www.vauxoo.com (humbertoarocha)]

review: Approve

=== modified file 'l10n_ve_fiscal_requirements/__openerp__.py'
--- l10n_ve_fiscal_requirements/__openerp__.py	2013-04-12 21:29:36 +0000
+++ l10n_ve_fiscal_requirements/__openerp__.py	2013-04-25 15:51:30 +0000
@@ -88,6 +88,7 @@
     ],
     'demo_xml': [
         'demo/demo_partners.xml',
+        'demo/journal_demo.xml',
     ],
     'test': [
         'test/control_number.yml',

=== added file 'l10n_ve_fiscal_requirements/demo/journal_demo.xml'
--- l10n_ve_fiscal_requirements/demo/journal_demo.xml	1970-01-01 00:00:00 +0000
+++ l10n_ve_fiscal_requirements/demo/journal_demo.xml	2013-04-25 15:51:30 +0000
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>                                                                       
+    <data noupdate="1"> 
+
+        <!-- Sequences -->
+
+        <record id="seq_debit_purchase_type" model="ir.sequence.type">                                                                           
+            <field name="name">Nota Debito Compra</field>                 
+            <field name="code">account.journal.debit.purchase</field>            
+        </record>     
+
+        <record id="seq_debit_purchase_journal" model="ir.sequence">                                                                             
+            <field name="name">Nota de debito Compra</field>                 
+            <field name="code">account.journal.debit.purchase</field>            
+            <field name="prefix">RE:</field>                                    
+            <field name="padding">6</field>                                     
+            <field name="number_increment">1</field>                            
+        </record>
+
+        <record id="seq_debit_sale_type" model="ir.sequence.type">                                                                           
+            <field name="name">Nota Debito Venta</field>                 
+            <field name="code">account.journal.debit.sale</field>            
+        </record>     
+        
+        <record id="seq_debit_sale_journal" model="ir.sequence">                                                                             
+            <field name="name">Nota de debito Venta</field>                 
+            <field name="code">account.journal.debit.sale</field>            
+            <field name="prefix">RE:</field>                                    
+            <field name="padding">6</field>                                     
+            <field name="number_increment">1</field>                            
+        </record>
+
+        <!-- Journal -->
+
+        <record id="debit_purchase_journal" model="account.journal">      
+             <field name="name">DIARIO DE NOTA DE DEBITO COMPRA</field>                    
+             <field name="code">DBT1</field>                                    
+             <field name="type">purchase_debit</field>                            
+             <field name="sequence_id" ref="seq_debit_purchase_journal"/>      
+         </record>
+ 
+        <record id="debit_sale_journal" model="account.journal">      
+             <field name="name">DIARIO DE NOTA DE DEBITO VENTA</field>                    
+             <field name="code">DBT2</field>                                    
+             <field name="type">sale_debit</field>                            
+             <field name="sequence_id" ref="seq_debit_sale_journal"/>      
+         </record>
+
+     </data>                                                                     
+</openerp>   

=== modified file 'l10n_ve_fiscal_requirements/model/invoice.py'
--- l10n_ve_fiscal_requirements/model/invoice.py	2013-04-16 15:45:09 +0000
+++ l10n_ve_fiscal_requirements/model/invoice.py	2013-04-25 15:51:30 +0000
@@ -72,6 +72,18 @@
                 return False
         return True
 
+    def _get_loc_req(self, cr, uid, context=None):
+        """Get if a field is required or not by a Localization
+        @param uid: Integer value of the user
+        """
+        context = context or {}
+        res = False
+        rc_obj = self.pool.get('res.company')
+        rc_brw = rc_obj.browse(cr, uid, uid, context=context)
+        
+        if rc_brw.country_id and rc_brw.country_id.code == 'VE' and rc_brw.printer_fiscal:
+            res = True
+        return res
 
     _inherit = 'account.invoice'
     _columns = {
@@ -84,9 +96,14 @@
         'invoice_printer' : fields.char('Fiscal printer invoice number', size=64, required=False,help="Fiscal printer invoice number, is the number of the invoice on the fiscal printer"),
         #TODO": maybe it must be a many2one to declared FiscalPrinter when FiscalV is ready
         'fiscal_printer' : fields.char('Fiscal printer number', size=64, required=False,help="Fiscal printer number, generally is the id number of the printer."),
-
+        'loc_req':fields.boolean('Required by Localization', help='This fields is for technical use'),
     }
 
+    _defaults ={
+        'loc_req': _get_loc_req
+        }
+
+
     _constraints = [
           (_unique_invoice_per_partner, _('The Document you have been entering for this Partner has already been recorded'),['Control Number (nro_ctrl)','Reference (reference)']),
          ]

=== modified file 'l10n_ve_fiscal_requirements/model/res_company.py'
--- l10n_ve_fiscal_requirements/model/res_company.py	2013-03-26 23:24:31 +0000
+++ l10n_ve_fiscal_requirements/model/res_company.py	2013-04-25 15:51:30 +0000
@@ -36,7 +36,8 @@
     _columns = {
         'jour_id': fields.many2one('account.journal', 'Journal', required=False, help="Default journal for damaged invoices"),
         'acc_id': fields.many2one('account.account', 'Account', required=False, help="Default account used for invoices and lines from damaged invoices"),
-    }
+        'printer_fiscal' : fields.boolean('Manages fiscal printer', help='Indicates that the company can operate a fiscal printer'),
+        }
 
     def create(self, cr, uid, vals, context=None):
         '''

=== modified file 'l10n_ve_fiscal_requirements/view/account_invoice_view.xml'
--- l10n_ve_fiscal_requirements/view/account_invoice_view.xml	2013-04-16 20:53:35 +0000
+++ l10n_ve_fiscal_requirements/view/account_invoice_view.xml	2013-04-25 15:51:30 +0000
@@ -26,19 +26,27 @@
                     </group>
                     <newline/>
                 </xpath>
+                
                 <xpath expr="//page[@string='Payments']" position="after">
-                    <page string="Debit-Credit Notes">
+                    <page string="Debit-Credit Notes" attrs="{'invisible':['|','|',('type','=','in_refund'),('type','=','out_refund'),('parent_id','!=',False)]}">
                         <newline/>
                         <field name="child_ids" nolabel="1" widget="many2many" domain="[('partner_id','=',partner_id),('id', '!=', active_id),('type','in',['out_invoice', 'out_refund'])]"/>
                     </page>
                 </xpath>
+                
                 <xpath expr="//page[@string='Other Info']/group/group[2]" position="after">
                       
                     <group colspan="2" >
                      <separator colspan="6" string="Fiscal Information"/>
                         <field name="sin_cred" />
-                        <field name="invoice_printer" groups="parameters_fiscal_printer.group_parameters_fiscal_printer_user"/>
+                        <!--
+                             <field name="invoice_printer" groups="parameters_fiscal_printer.group_parameters_fiscal_printer_user"/>
                         <field name="fiscal_printer" groups="parameters_fiscal_printer.group_parameters_fiscal_printer_user"/>
+                        -->
+                        <field name="loc_req" invisible="1"/>
+                        <field name="invoice_printer" attrs="{'required':[('loc_req','=',True)]}"/>
+                        <field name="fiscal_printer" attrs="{'required':[('loc_req','=',True)]}"/>
+                        
                         <field name="parent_id" 
                                attrs="{'required':[('type','=','out_refund')]}" 
                                domain="[('partner_id','=',partner_id),('id', '!=', active_id),('type','in',['out_invoice', 'out_refund'])]"/>
@@ -152,15 +160,16 @@
                     <field name="address_invoice_id"  domain="[('partner_id','=',partner_id), ('type','=','invoice')]"/>
                 </xpath>
 -->
-
+                
                 <xpath expr="//page[@string='Payments']" position="after">
-                    <page string="Debit-Credit Notes">
+                    <page string="Debit-Credit Notes" attrs="{'invisible':['|','|',('type','=','in_refund'),('type','=','out_refund'),('parent_id','!=',False)]}">
                         <field name="child_ids" 
                                nolabel="1" 
                                widget="many2many" 
                                domain="[('partner_id','=',partner_id),('id', '!=', active_id),('type','in',['in_invoice', 'in_refund'])]"/>
                     </page>
                 </xpath>
+                
                 <xpath expr="//button[@string='Refund Invoice']" position="after">
                     <button name="%(action_account_invoice_debit)d" 
                             type='action' 

=== modified file 'l10n_ve_fiscal_requirements/view/res_company_view.xml'
--- l10n_ve_fiscal_requirements/view/res_company_view.xml	2013-01-08 14:55:04 +0000
+++ l10n_ve_fiscal_requirements/view/res_company_view.xml	2013-04-25 15:51:30 +0000
@@ -9,6 +9,10 @@
             <field name="inherit_id" ref="base.view_company_form"/>
             <field name="arch" type="xml">
 
+                <xpath expr='//page[@string="Configuration"]/group/group[@name="account_grp"]' position="inside">
+                    <field name="printer_fiscal"/>
+                </xpath>
+                
                 <xpath expr='//page[@string="Configuration"]/group/group[@name="account_grp"]' position="after">
                     <separator string="Data used by default for invoices damaged" colspan="4"/>
                 </xpath>
@@ -17,7 +21,6 @@
 
                     <field name="jour_id"/>
 
-                    <field name="acc_id"/>
                     <newline/>
 
                     <field name="acc_id" domain="[('type','in',('other','receivable','payable'))]"/>

=== modified file 'l10n_ve_withholding/model/l10n_ve_withholding.py'
--- l10n_ve_withholding/model/l10n_ve_withholding.py	2013-03-20 21:00:03 +0000
+++ l10n_ve_withholding/model/l10n_ve_withholding.py	2013-04-25 15:51:30 +0000
@@ -27,7 +27,7 @@
 
 
 class account_wh_doc(osv.osv):
-    _description = 'With holding document'
+    _description = 'Withholding document'
     _name = 'account.wh.doc'
     _columns = {
         'model_parent': fields.char('Parent Object', size=64, required=True, select=1, help="parent for relationship between withholding"),

=== modified file 'l10n_ve_withholding_iva/model/generate_txt.py'
--- l10n_ve_withholding_iva/model/generate_txt.py	2013-03-21 15:58:01 +0000
+++ l10n_ve_withholding_iva/model/generate_txt.py	2013-04-25 15:51:30 +0000
@@ -75,7 +75,6 @@
         'type':fields.boolean('Retention Suppliers?',required=True,states={'draft':[('readonly',False)]}, help="Select the type of retention to make"),
         'date_start': fields.date('Begin Date',required=True,states={'draft':[('readonly',False)]}, help="Begin date of period"),
         'date_end': fields.date('End date', required=True,states={'draft':[('readonly',False)]}, help="End date of period"),
-        'type':fields.boolean('Retención Proveedores?',required=True,states={'draft':[('readonly',False)]}, help="Select the type of retention to make"),
         'txt_ids':fields.one2many('txt.iva.line','txt_id', readonly=True,states={'draft':[('readonly',False)]}, help='Txt field lines of ar required by SENIAT for VAT withholding'),
         'amount_total_ret':fields.function(_get_amount_total,method=True, digits=(16, 2), readonly=True, string=' Total Monto de Retencion', help="Monto Total Retenido"),
         'amount_total_base':fields.function(_get_amount_total_base,method=True, digits=(16, 2), readonly=True, string='Total Base Imponible', help="Total de la Base Imponible"),

=== modified file 'l10n_ve_withholding_iva/report/__init__.py'
--- l10n_ve_withholding_iva/report/__init__.py	2011-10-28 17:13:52 +0000
+++ l10n_ve_withholding_iva/report/__init__.py	2013-04-25 15:51:30 +0000
@@ -26,4 +26,4 @@
 ##############################################################################
 
 import list_wh_iva
-import wittholding_vat
+import withholding_vat

=== renamed file 'l10n_ve_withholding_iva/report/wittholding_vat.py' => 'l10n_ve_withholding_iva/report/withholding_vat.py'
=== modified file 'l10n_ve_withholding_src/model/partner.py'
--- l10n_ve_withholding_src/model/partner.py	2013-04-16 20:27:37 +0000
+++ l10n_ve_withholding_src/model/partner.py	2013-04-25 15:51:30 +0000
@@ -31,7 +31,6 @@
 
 class res_partner(osv.osv):
     _inherit = 'res.partner'
-    logger = netsvc.Logger()
     _columns = {
         'wh_src_agent': fields.boolean('SRC Wh. Agent', help="Indicate if the partner is a SRC withholding agent"),
         'wh_src_rate': fields.float(string='SRC Rate', digits_compute= dp.get_precision('Withhold'), help="SRC Withholding rate"),