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

[Saul Gonzalez]

Small fixes for some modules of type l10n_ve_withholding_XXX

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

review: Approve

=== modified file 'l10n_ve_withholding_islr/view/islr_wh_doc_view.xml'
--- l10n_ve_withholding_islr/view/islr_wh_doc_view.xml	2013-05-28 21:25:22 +0000
+++ l10n_ve_withholding_islr/view/islr_wh_doc_view.xml	2013-12-04 13:55:12 +0000
@@ -113,7 +113,7 @@
                         <field name="partner_id" on_change="onchange_partner_id(type,partner_id)" domain="[('islr_withholding_agent','=',True), ('customer','=',True)]"/>
                         <field name="currency_id" readonly="1"/>
                         <field name="date_ret"/>
-                        <field domain="[('type','&lt;&gt;','view'), ('company_id', '=', company_id)]" name="account_id"/>
+                        <field name="account_id" domain="[('type','=', type in ('in_invoice','in_refund') and 'payable' or 'receivable'), ('company_id', '=', company_id)]"/>
                         <field name="name"/>
                         <field name="period_id"/>
                         <field name="date_uid"/>
@@ -230,7 +230,7 @@
                         <field name="partner_id" on_change="onchange_partner_id(type,partner_id)" domain="[('supplier','=',True)]"/>
                         <field name="currency_id" readonly="1"/>
                         <field name="date_ret"/>
-                        <field domain="[('type','&lt;&gt;','view'), ('company_id', '=', company_id)]" name="account_id"/>
+                        <field name="account_id" domain="[('type','=', type in ('in_invoice','in_refund') and 'payable' or 'receivable'), ('company_id', '=', company_id)]"/>
                         <field name="name"/>
                         <field name="period_id"/>
                         <field name="number"/>

=== modified file 'l10n_ve_withholding_iva/view/wh_iva_view.xml'
--- l10n_ve_withholding_iva/view/wh_iva_view.xml	2013-11-27 21:21:41 +0000
+++ l10n_ve_withholding_iva/view/wh_iva_view.xml	2013-12-04 13:55:12 +0000
@@ -151,7 +151,7 @@
                         <field name="partner_id" on_change="onchange_lines_filter(type, partner_id, period_id, fortnight)" domain="[('supplier','=',True)]"/>
                         <field name="currency_id"/>
                         <field name="date_ret" readonly="1"/>
-                        <field domain="[('type','&lt;&gt;','view'), ('company_id', '=', company_id)]" name="account_id"/>
+                        <field name="account_id" domain="[('type','=', type == 'in_invoice' and 'payable' or 'receivable'), ('company_id', '=', company_id)]"/>
                         <field name="name"/>
                         <field name="period_id" required="1" on_change="onchange_lines_filter(type, partner_id, period_id, fortnight)" domain="[('special','=',False)]"/>
                         <field name="fortnight" required="1" on_change="onchange_lines_filter(type, partner_id, period_id, fortnight)"/>
@@ -201,7 +201,7 @@
                         <field name="partner_id" on_change="onchange_partner_id(type,partner_id)" select="1" domain="[('wh_iva_agent','=',True), ('customer','=',True)]"/>
                         <field name="currency_id"/>
                         <field name="date_ret" attrs="{'readonly':[('state','!=','draft')]}"/>
-                        <field domain="[('type','&lt;&gt;','view'), ('company_id', '=', company_id)]" name="account_id"/>
+                        <field name="account_id" domain="[('type','=', type == 'in_invoice' and 'payable' or 'receivable'), ('company_id', '=', company_id)]"/>
                         <field name="name" select="2"/>
                         <field name="period_id"/>
                         <field name="number" select="1" attrs="{'readonly':[('type','=','in_invoice')],'required':[('type','in',['out_invoice','out_refund'])]}"/>

=== modified file 'l10n_ve_withholding_muni/__openerp__.py'
--- l10n_ve_withholding_muni/__openerp__.py	2013-11-18 02:06:26 +0000
+++ l10n_ve_withholding_muni/__openerp__.py	2013-12-04 13:55:12 +0000
@@ -45,7 +45,9 @@
     'data': [
         'data/wh_muni_sequence.xml',
     ],
-    'demo_xml': [],
+    'demo_xml': [
+        'demo/demo_journal.xml',
+    ],
     'test': [
     ],
     'installable': True,

=== modified file 'l10n_ve_withholding_muni/data/wh_muni_sequence.xml'
--- l10n_ve_withholding_muni/data/wh_muni_sequence.xml	2013-05-23 04:34:03 +0000
+++ l10n_ve_withholding_muni/data/wh_muni_sequence.xml	2013-12-04 13:55:12 +0000
@@ -3,24 +3,29 @@
     <data noupdate="1">
 
         <!-- Sequences type for account.wh.munici --> 
-
-
         <record id="seq_type_account_wh_muni_purchase" model="ir.sequence.type">
             <field name="name">Withholding local.purchase</field>
-            <field name="code">account.wh.muni.in_invoice</field>
-        </record>
-
-        <!-- Sequences for account.wh.munici --> 
-
-
-        <record id="seq_account_retencion_munici_compras" model="ir.sequence">
-            <field name="name">Withholding local purchase</field>
-            <field name="code">account.wh.muni.in_invoice</field>
-            <field name="prefix">RET-MUNI</field>
-            <field name="padding">8</field>
-            <field name="number_increment">1</field>
-        </record>
-
-
+            <field name="code">account.journal.wh.purchase</field>
+        </record>
+        <record id="seq_type_account_wh_muni_sale" model="ir.sequence.type">
+            <field name="name">Withholding local.sale</field>
+            <field name="code">account.journal.wh.sale</field>
+        </record>
+
+        <!-- Sequences -->
+        <record id="seq_wh_purchase_journal" model="ir.sequence">
+            <field name="name">Retencion Municipal de Compra</field>                 
+            <field name="code">account.journal.wh.purchase</field>            
+            <field name="prefix">RMC-</field>                                    
+            <field name="padding">8</field>                                     
+            <field name="number_increment">1</field>                            
+        </record>
+        <record id="seq_wh_sale_journal" model="ir.sequence">
+            <field name="name">Retencion Municipal de Venta</field>                 
+            <field name="code">account.journal.wh.sale</field>            
+            <field name="prefix">RMV-</field>                                    
+            <field name="padding">8</field>                                     
+            <field name="number_increment">1</field>                            
+        </record>
     </data>
-</openerp>
\ No newline at end of file
+</openerp>

=== added directory 'l10n_ve_withholding_muni/demo'
=== added file 'l10n_ve_withholding_muni/demo/demo_journal.xml'
--- l10n_ve_withholding_muni/demo/demo_journal.xml	1970-01-01 00:00:00 +0000
+++ l10n_ve_withholding_muni/demo/demo_journal.xml	2013-12-04 13:55:12 +0000
@@ -0,0 +1,18 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<openerp>                                                                       
+    <data noupdate="1"> 
+        <!-- Journal -->
+        <record id="wh_purchase_journal" model="account.journal">      
+             <field name="name">Diario de Retenciones Municipales de Compra</field>                    
+             <field name="code">DRMC</field>                                   
+             <field name="type">mun_purchase</field>                            
+             <field name="sequence_id" ref="seq_wh_purchase_journal"/>      
+         </record>
+        <record id="wh_sale_journal" model="account.journal">      
+             <field name="name">Diario de Retenciones Municipales de Venta</field>                    
+             <field name="code">DRMV</field>                                    
+             <field name="type">mun_sale</field>                            
+             <field name="sequence_id" ref="seq_wh_sale_journal"/>      
+         </record>
+     </data>                                                                     
+</openerp>

=== modified file 'l10n_ve_withholding_muni/model/wh_muni.py'
--- l10n_ve_withholding_muni/model/wh_muni.py	2013-11-18 02:06:26 +0000
+++ l10n_ve_withholding_muni/model/wh_muni.py	2013-12-04 13:55:12 +0000
@@ -211,9 +211,9 @@
         if partner_id:
             p = self.pool.get('res.partner').browse(cr, uid, partner_id)
             if type in ('out_invoice', 'out_refund'):
-                acc_id = p.property_wh_munici_receivable.id
+                acc_id = p.property_account_receivable and p.property_account_receivable.id or False
             else:
-                acc_id = p.property_wh_munici_payable.id
+                acc_id = p.property_account_payable and p.property_account_payable.id or False
 
         self._update_check(cr, uid, ids, partner_id)
         result = {'value': {

=== modified file 'l10n_ve_withholding_muni/view/wh_muni_view.xml'
--- l10n_ve_withholding_muni/view/wh_muni_view.xml	2013-05-23 04:34:03 +0000
+++ l10n_ve_withholding_muni/view/wh_muni_view.xml	2013-12-04 13:55:12 +0000
@@ -111,7 +111,7 @@
                         <field name="partner_id" on_change="onchange_partner_id(type,partner_id)"/>
                         <field name="currency_id"/>
                         <field name="date_ret"/>
-                        <field domain="[('type','&lt;&gt;','view'), ('company_id', '=', company_id)]" name="account_id"/>
+                        <field name="account_id" domain="[('type','=', type == 'in_invoice' and 'payable' or 'receivable'), ('company_id', '=', company_id)]"/>
                         <field name="name"/>
                         <field name="period_id"/>
                         <field name="number" attrs="{'readonly':[('type','=','in_invoice')],'required':[('type','in',['out_invoice','out_refund'])]}"/>
@@ -191,4 +191,4 @@
         <menuitem id="menu_action_account_wh_muni_supplier" name="Local Withholding Supplier" parent="account.menu_finance_payables" action="action_account_wh_muni_supplier"/>
 
     </data>
-</openerp>
\ No newline at end of file
+</openerp>

=== modified file 'l10n_ve_withholding_src/model/wh_src.py'
--- l10n_ve_withholding_src/model/wh_src.py	2013-11-18 04:14:18 +0000
+++ l10n_ve_withholding_src/model/wh_src.py	2013-12-04 13:55:12 +0000
@@ -58,7 +58,7 @@
         return false in otherwise
         """
         context = context or {}
-        user_wh_agent = self.pool.get('res.partner').browse(cr, uid, uid, context=context).wh_src_agent
+        user_wh_agent = self.pool.get('res.users').browse(cr, uid, uid, context = context).company_id.partner_id.wh_src_agent
         return user_wh_agent
 
     def _get_partner_agent(self, cr, uid, context=None):

=== modified file 'l10n_ve_withholding_src/view/wh_src_view.xml'
--- l10n_ve_withholding_src/view/wh_src_view.xml	2013-05-23 04:34:03 +0000
+++ l10n_ve_withholding_src/view/wh_src_view.xml	2013-12-04 13:55:12 +0000
@@ -111,7 +111,7 @@
                         <field name="partner_id" on_change="onchange_partner_id(type,partner_id)" attrs="{'readonly':['&amp;',('uid_wh_agent','=',False),('type','=','in_invoice')]}" domain="[('id','in',context.get('partner_list' , False))]"/>
                         <field name="currency_id"/>
                         <field name="date_ret"/>
-                        <field name="account_id"/>
+                        <field name="account_id" domain="[('type','=', type == 'in_invoice' and 'payable' or 'receivable'), ('company_id', '=', company_id)]"/>
                         <field name="name"/>
                         <field name="period_id"/>
                         <field name="number" attrs="{'readonly':[('type','=','in_invoice')],'required':[('type','in',['out_invoice','out_refund'])]}"/>
@@ -200,4 +200,4 @@
         <menuitem id="menu_action_account_wh_src_supplier" name="Social Responsibility Commitment Withholding Supplier" parent="account.menu_finance_payables" action="action_account_wh_src_supplier"/>
 
     </data>
-</openerp>
\ No newline at end of file
+</openerp>