Merge lp:~vauxoo/openerp-venezuela-localization/nhomar_wkf-wh-fix into lp:~openerp-venezuela/openerp-venezuela-localization/6.0-trunk

[Nhomar - Vauxoo]

[MERGE] Workflow concept tested and some fixes on views related to withholding.

See logs from revno 457 to 464.

Improved wh views on invoices.
Improved Workflow for Withholding.

Not verified already functional stuff just redifined workflows-

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

Adjunto esta la estructura del workflow tanto para islr con para iva,

con las validaciones pertinentes para que sigan generandose los respectivos
movimientos que previamente se generaban (lineas para xml)
ya los cambios estan probados, lo que estoy es terminando
la estructura para dejarla funcional, habria que revisar son
errores del workflow como tal de iva y/o islr,

en tu estructura falta un router que el que considera la existencia
de las lineas xml's,

que es el metodo que falta, voy a agregar te envio el diferencial cuando lo
tenga listo

2011/10/31 Nhomar Hernandez (Vauxoo) <email address hidden>

> Nhomar Hernandez (Vauxoo) has proposed merging
> lp:~vauxoo/openerp-venezuela-localization/nhomar_wkf-wh-fix into
> lp:openerp-venezuela-localization.
>
> Requested reviews:
> hbto [Vauxoo] http://www.vauxoo.com (humbertoarocha): conceptual
>
> For more details, see:
>
> https://code.launchpad.net/~vauxoo/openerp-venezuela-localization/nhomar_wkf-wh-fix/+merge/80776
>
> See logs from revno 457 to 464.
>
> Improved wh views on invoices.
> Improved Workflow for Withholding.
>
> Not verified already functional stuff just redifined workflows-
> --
>
> https://code.launchpad.net/~vauxoo/openerp-venezuela-localization/nhomar_wkf-wh-fix/+merge/80776
> You are requested to review the proposed merge of
> lp:~vauxoo/openerp-venezuela-localization/nhomar_wkf-wh-fix into
> lp:openerp-venezuela-localization.
>
> === modified file 'l10n_ve_withholding/__openerp__.py'
> --- l10n_ve_withholding/__openerp__.py 2011-10-25 20:33:16 +0000
> +++ l10n_ve_withholding/__openerp__.py 2011-10-31 06:36:38 +0000
> @@ -32,9 +32,9 @@
> - Add relation between account invoice tax and account tax, to avoid loss
> historical relation.
> - Add account journals types or withholding VAT and Income.
> - Make relation between account move and withholding documents with a
> method.
> -- Add common menus for withholdin process.
> +- Add common menus for withholding process.
> - Add common tabs on views where they will be used to add information for
> other modules related to Venezuela. localization.
> -
> +- Add basic stage to workflow on invoice to ensure the aplication of this
> feature.
> TODO:
> -
> """,
> @@ -45,7 +45,8 @@
> 'security/ir.model.access.csv',
> 'l10n_ve_withholding_data.xml',
> 'l10n_ve_withholding_view.xml',
> - 'account_view.xml'
> + 'account_view.xml',
> + 'workflow/l10n_ve_withholding_workflow.xml',
> ],
> 'demo_xml': [],
> 'test': [],
>
> === modified file 'l10n_ve_withholding/l10n_ve_withholding_view.xml'
> --- l10n_ve_withholding/l10n_ve_withholding_view.xml 2011-10-25
> 20:33:16 +0000
> +++ l10n_ve_withholding/l10n_ve_withholding_view.xml 2011-10-31
> 06:36:38 +0000
> @@ -20,11 +20,12 @@
> <field name="type">form</field>
> <field name="inherit_id" ref="account.invoice_supplier_form"/>
> <field name="arch" type="xml">
> - <notebook>
> + <xpath expr="/form/notebook/page[@string='Invoice']"
> position="after">
> <page string="Withholdings" >
> -
> + <separator string="vsep"/>
> ...

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

en la linea 50 haces un cambio indicando que la vista de wh supplier
deberia llamarse igual tanto para el cliente como para el proveedor,
en openerp las dos vistas no son iguales y se les trata distinto,
los cambios que se aplican a una vista no se heredan en la otra,
a no ser que esto sea nuevo para la v6.1

- <field name="name">account.invoice.supplier.wh.form</field>

en la linea 125 incluyes un raise en un workflow, si la situacion no aplica
no se emerge con una señal de alarma, sencillamente no se aplica la
situacion
y la salida es transparente para el usuario, lo cual no implica que el
usuario este
comentiendo un error, lo cual si aplica si la retencion se esta generando
desde
cero donde el usuario estaria sujeto a seleccionar una factura, cuestion
que se
puede evitar porque la factura ya tiene un atributo que indica que ya ha
sido
retenida y que se puede usar para evitar que el mismo cometa el error.
+ raise osv.except_osv(_('Invalid action !'),_("The Withholding invoice
'%s' has already been done!") % (invoice.number))

2011/10/31 Nhomar Hernandez (Vauxoo) <email address hidden>

> Nhomar Hernandez (Vauxoo) has proposed merging
> lp:~vauxoo/openerp-venezuela-localization/nhomar_wkf-wh-fix into
> lp:openerp-venezuela-localization.
>
> Requested reviews:
> hbto [Vauxoo] http://www.vauxoo.com (humbertoarocha): conceptual
>
> For more details, see:
>
> https://code.launchpad.net/~vauxoo/openerp-venezuela-localization/nhomar_wkf-wh-fix/+merge/80776
>
> See logs from revno 457 to 464.
>
> Improved wh views on invoices.
> Improved Workflow for Withholding.
>
> Not verified already functional stuff just redifined workflows-
> --
>
> https://code.launchpad.net/~vauxoo/openerp-venezuela-localization/nhomar_wkf-wh-fix/+merge/80776
> You are requested to review the proposed merge of
> lp:~vauxoo/openerp-venezuela-localization/nhomar_wkf-wh-fix into
> lp:openerp-venezuela-localization.
>
> === modified file 'l10n_ve_withholding/__openerp__.py'
> --- l10n_ve_withholding/__openerp__.py 2011-10-25 20:33:16 +0000
> +++ l10n_ve_withholding/__openerp__.py 2011-10-31 06:36:38 +0000
> @@ -32,9 +32,9 @@
> - Add relation between account invoice tax and account tax, to avoid loss
> historical relation.
> - Add account journals types or withholding VAT and Income.
> - Make relation between account move and withholding documents with a
> method.
> -- Add common menus for withholdin process.
> +- Add common menus for withholding process.
> - Add common tabs on views where they will be used to add information for
> other modules related to Venezuela. localization.
> -
> +- Add basic stage to workflow on invoice to ensure the aplication of this
> feature.
> TODO:
> -
> """,
> @@ -45,7 +45,8 @@
> 'security/ir.model.access.csv',
> 'l10n_ve_withholding_data.xml',
> 'l10n_ve_withholding_view.xml',
> - 'account_view.xml'
> + 'account_view.xml',
> + 'workflow/l10n_ve_withholding_workflow.xml',
> ],
> 'demo_xml': [],
> 'test': [],
>
> === modified file 'l10n_ve_withholding/l10n_ve_withholding_view.xml'
> --- l10n_ve_withholding/l10n_ve_withholding_view.xml 2011-10-25
> 20:33:16 +0000
> +++ l10n_ve_with...

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

Discutamos ambas propuestas de merge tanto la tuya como la mia,
alli se puede sacar algo en comun y discutimos las diferencias

en mi caso me centre en resolver el asunto hasta el subflujo,
no tengo modificaciones de vista, estas las estoy dejando para
otro momento.

review: Needs Information (conceptual)

[Nhomar - Vauxoo (nhomar)]

Merged in other process.....

review: Disapprove

Unmerged revisions

465. By Nhomar Hernandez <email address hidden> on 2011-10-31

[IMP] Improved inheritance view on partner customer and supplier form view for withholdings

464. By Nhomar Hernandez <email address hidden> on 2011-10-31

[IMP] Improved inheritance view on customer form view for withholdings

463. By Nhomar Hernandez <email address hidden> on 2011-10-31

[IMP] Improved inheritance view on supplier form view for withholdings

462. By Nhomar Hernandez <email address hidden> on 2011-10-31

[FIX] Fixing inconsistency on generation and inheritance on withholding views on invoice forms

461. By Nhomar Hernandez <email address hidden> on 2011-10-31

[FIX] Corrected problem with validation in withholding islr workflow to avoid verify the validation process and the regeneration of data.

460. By Nhomar Hernandez <email address hidden> on 2011-10-31

[IMP] Moved workflow withholding iva to correct place on router generic activity

459. By Nhomar Hernandez <email address hidden> on 2011-10-31

[IMP] Moved workflow withholding islr to correct place on router generic activity

458. By Nhomar Hernandez <email address hidden> on 2011-10-31

[IMP] Add basic WKF to excecute withholding correctly.

=== modified file 'l10n_ve_withholding/__openerp__.py'
--- l10n_ve_withholding/__openerp__.py	2011-10-25 20:33:16 +0000
+++ l10n_ve_withholding/__openerp__.py	2011-10-31 06:36:38 +0000
@@ -32,9 +32,9 @@
 - Add relation between account invoice tax and account tax, to avoid loss historical relation.
 - Add account journals types or withholding VAT and Income.
 - Make relation between account move and withholding documents with a method.
-- Add common menus for withholdin process.
+- Add common menus for withholding process.
 - Add common tabs on views where they will be used to add information for other modules related to Venezuela. localization.
-
+- Add basic stage to workflow on invoice to ensure the aplication of this feature.
 TODO:
 - 
     """,
@@ -45,7 +45,8 @@
         'security/ir.model.access.csv',    
         'l10n_ve_withholding_data.xml',    
         'l10n_ve_withholding_view.xml',
-        'account_view.xml'
+        'account_view.xml',    
+        'workflow/l10n_ve_withholding_workflow.xml',
     ],
     'demo_xml': [],
     'test': [],

=== modified file 'l10n_ve_withholding/l10n_ve_withholding_view.xml'
--- l10n_ve_withholding/l10n_ve_withholding_view.xml	2011-10-25 20:33:16 +0000
+++ l10n_ve_withholding/l10n_ve_withholding_view.xml	2011-10-31 06:36:38 +0000
@@ -20,11 +20,12 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="account.invoice_supplier_form"/>
             <field name="arch" type="xml">
-                <notebook>
+                <xpath expr="/form/notebook/page[@string='Invoice']" position="after">
                    <page string="Withholdings" >
-
+                        <separator string="vsep"/>
+                        <separator string="isep"/>
                     </page> 
-                </notebook>
+                </xpath>
             </field>
         </record>
         
@@ -33,21 +34,22 @@
 -->
         
         <record id="wh_inv_customer" model="ir.ui.view">
-            <field name="name">account.invoice.supplier.wh.form</field>
+            <field name="name">account.invoice.all.wh.form</field>
             <field name="model">account.invoice</field>
             <field name="type">form</field>
             <field name="inherit_id" ref="account.invoice_form"/>
             <field name="arch" type="xml">
-                <notebook>
+                <xpath expr="/form/notebook/page[@string='Invoice']" position="after">
                    <page string="Withholdings" >
-
+                        <separator string="vsep"/>
+                        <separator string="isep"/>
                     </page> 
-                </notebook>
+                </xpath>
             </field>
         </record>
         
 <!--
-        Vista Generica de Parnets para iva, islr y municipales
+        Vista Generica de Partners para iva, islr y municipales
 -->
 
         <record id="wh_partner" model="ir.ui.view">
@@ -56,11 +58,13 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="base.view_partner_form"/>
             <field name="arch" type="xml">
-                <notebook>
+                <xpath expr="/form/notebook/page[@string='Notes']" position="after">
                    <page string="Withholdings" >
-
+                        <separator string="vsep"/>
+                        <newline/>
+                        <separator string="isep"/>
                     </page> 
-                </notebook>
+                </xpath>
             </field>
         </record>        
 

=== added directory 'l10n_ve_withholding/workflow'
=== added file 'l10n_ve_withholding/workflow/l10n_ve_withholding_workflow.xml'
--- l10n_ve_withholding/workflow/l10n_ve_withholding_workflow.xml	1970-01-01 00:00:00 +0000
+++ l10n_ve_withholding/workflow/l10n_ve_withholding_workflow.xml	2011-10-31 06:36:38 +0000
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+<!--    This will be updated from iva and islr withholding.-->
+        <record id="wh_router" model="workflow.activity">
+            <field name="wkf_id" ref="account.wkf"/>
+            <field name="name">wh_router</field>
+            <field name="split_mode">AND</field>
+        </record>
+        <record id="wh_router_trans" model="workflow.transition">
+            <field name="act_from" ref="account.act_open"/>
+            <field name="act_to" ref="wh_router"/>
+            <field name="signal"></field>
+            <field name="condition">True</field>
+        </record>
+    </data>
+</openerp>

=== modified file 'l10n_ve_withholding_islr/islr_wh_doc.py'
--- l10n_ve_withholding_islr/islr_wh_doc.py	2011-10-25 20:33:16 +0000
+++ l10n_ve_withholding_islr/islr_wh_doc.py	2011-10-31 06:36:38 +0000
@@ -390,7 +390,11 @@
         for invoice in invoices_brw:
             wh_doc_list = inv_obj.pool.get('islr.wh.doc.invoices').search(cr,uid,[('invoice_id','=',invoice.id)])  
             if wh_doc_list: #Chequear que la factura no haya sido retenida.
-                raise osv.except_osv(_('Invalid action !'),_("The Withholding invoice '%s' has already been done!") % (invoice.number))
+                print "idssssssssssssss %s" % ids
+                if not (self.browse(cr,uid,ids,context) and self.browse(cr,uid,ids,context)[0].state in ['draft','to_process','progress']):
+                    raise osv.except_osv(_('Invalid action !'),_("The Withholding invoice '%s' has already been done!") % (invoice.number))
+                else:
+                    return self.browse(cr,uid,ids,context)[0].id
             else: # 1.- Si la factura no ha sido retenida
                 wh_dict={}
                 dict_rate={}

=== modified file 'l10n_ve_withholding_islr/view/invoice_view.xml'
--- l10n_ve_withholding_islr/view/invoice_view.xml	2011-10-25 20:33:16 +0000
+++ l10n_ve_withholding_islr/view/invoice_view.xml	2011-10-31 06:36:38 +0000
@@ -14,23 +14,18 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="l10n_ve_withholding.wh_inv_customer"/>
             <field name="arch" type="xml">
-                <page string="Withholdings" position="inside">
-                    <notebook>
-                        <page string="Withholdings Income">
-                            <group col="6" colspan="4">
-                                <field name="status" colspan='4'/>
-                                <newline/>
-                                <button name="action_ret_islr" attrs="{'readonly':[('state','in',['draft','open','paid'])]}" string="Retener ISLR" type="object" colspan='1'/>
-                                <newline/>
-                                <hpaned/>
-                                <hpaned/>
-                                <hpaned/>
-                                <hpaned/>
-                                <field name="islr_wh_doc_id" colspan='8'/>
-                            </group>
-                        </page>
-                    </notebook>
-                </page>
+                <xpath expr="//separator[@string='vsep']" position="after">
+                    <newline/>
+                    <group col="6" colspan="4">
+                        <field name="status" colspan='2'/>
+                        <field name="islr_wh_doc_id" colspan='2'/>
+                        <newline/>
+<!--                        <button name="action_ret_islr" states="open" string="Retener ISLR" type="object" colspan='1'/>-->
+                    </group>
+                </xpath>
+                <xpath expr='//separator[@string="vsep"]' position='attributes'>
+                    <attribute name="string">Income Withholding</attribute>
+                </xpath>
             </field>
         </record>
 
@@ -40,23 +35,18 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="l10n_ve_withholding.wh_inv_supplier"/>
             <field name="arch" type="xml">
-                <page string="Withholdings" position="inside">
-                    <notebook>
-                        <page string="Withholdings Income">
-                            <group col="6" colspan="4">
-                            <field name="status" colspan='4'/>
-                            <newline/>
-                            <button name="action_ret_islr" states="open" string="Retener ISLR" type="object" colspan='1'/>
-                            <newline/>
-                            <hpaned/>
-                            <hpaned/>
-                            <hpaned/>
-                            <hpaned/>
-                            <field name="islr_wh_doc_id" colspan='8'/>
-                            </group>
-                        </page>
-                    </notebook>
-                </page>
+                <xpath expr="//separator[@string='vsep']" position="after">
+                    <newline/>
+                    <group col="6" colspan="4">
+                        <field name="status" colspan='2'/>
+                        <field name="islr_wh_doc_id" colspan='2'/>
+                        <newline/>
+<!--                        <button name="action_ret_islr" states="open" string="Retener ISLR" type="object" colspan='1'/>-->
+                    </group>
+                </xpath>
+                <xpath expr='//separator[@string="vsep"]' position='attributes'>
+                <attribute name="string">Income Withholding</attribute>
+                </xpath>
             </field>
         </record>
 

=== modified file 'l10n_ve_withholding_islr/view/partner_view.xml'
--- l10n_ve_withholding_islr/view/partner_view.xml	2011-10-25 20:33:16 +0000
+++ l10n_ve_withholding_islr/view/partner_view.xml	2011-10-31 06:36:38 +0000
@@ -14,15 +14,15 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="l10n_ve_withholding.wh_partner"/>
             <field name="arch" type="xml">
-                <page string="Withholdings" position="inside">
-                    <notebook>
-                        <page string="Withholding Income">
-                            <group col="4" colspan="2">
-                                <field name="islr_withholding_agent"/>
-                            </group>
-                        </page>
-                    </notebook>
-                </page>
+                <xpath expr="//separator[@string='vsep']" position="after">
+                    <newline/>
+                        <group col="4" colspan="2">
+                            <field name="islr_withholding_agent"/>
+                        </group>
+                </xpath>
+                <xpath expr='//separator[@string="vsep"]' position='attributes'>
+                    <attribute name="string">Income Withholding</attribute>
+                </xpath>
             </field>
         </record>
 

=== modified file 'l10n_ve_withholding_islr/workflow/account_workflow.xml'
--- l10n_ve_withholding_islr/workflow/account_workflow.xml	2011-10-31 01:02:55 +0000
+++ l10n_ve_withholding_islr/workflow/account_workflow.xml	2011-10-31 06:36:38 +0000
@@ -29,7 +29,7 @@
 <!--        </record>-->
 <!--        From Open to Withholdings-->
         <record id="trans_open_wh_islr" model="workflow.transition">
-            <field name="act_from" ref="account.act_open"/>
+            <field name="act_from" ref="l10n_ve_withholding.wh_router"/>
             <field name="act_to" ref="act_withold_islr"/>
             <field name="condition">check_wh_islr_apply()</field>
             <field name="signal"></field>
@@ -39,7 +39,8 @@
         <record id="trans_withhold_paid" model="workflow.transition">
             <field name="act_from" ref="act_withold_islr"/>
             <field name="act_to" ref="account.act_paid"/>
-            <field name="signal"></field>
+            <field name="trigger_model">account.move.line</field>
+            <field name="trigger_expr_id">move_line_id_payment_get()</field>
             <field name="condition">test_paid()</field>
         </record>
 

=== modified file 'l10n_ve_withholding_iva/account_invoice_view.xml'
--- l10n_ve_withholding_iva/account_invoice_view.xml	2011-10-25 20:33:16 +0000
+++ l10n_ve_withholding_iva/account_invoice_view.xml	2011-10-31 06:36:38 +0000
@@ -16,17 +16,17 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="l10n_ve_withholding.wh_inv_customer"/>
             <field name="arch" type="xml">
-                <page string="Withholdings" position="inside">
-                    <notebook>
-                        <page string="Withholdings Vat">
-                            <group col="6" colspan="4">
-                                <field name="wh_iva"/>
-                                <field name="wh_iva_rate"/>
-                                <field name="wh_iva_id"/>
-                            </group>
-                        </page>
-                    </notebook>
-                </page>
+                <xpath expr="//separator[@string='isep']" position="after">
+                    <newline/>
+                        <group col="6" colspan="4">
+                            <field name="wh_iva"/>
+                            <field name="wh_iva_rate"/>
+                            <field name="wh_iva_id"/>
+                        </group>
+                </xpath>
+                <xpath expr='//separator[@string="isep"]' position='attributes'>
+                <attribute name="string">Withholdings Vat</attribute>
+                </xpath>
             </field>
         </record>
 
@@ -37,18 +37,18 @@
             <field name="model">account.invoice</field>
             <field name="type">form</field>
             <field name="inherit_id" ref="l10n_ve_withholding.wh_inv_supplier"/>
-            <field name="arch" type="xml">
-                <page string="Withholdings" position="inside">
-                    <notebook>
-                        <page string="Withholdings Vat">
-                            <group col="6" colspan="4">
-                                <field name="wh_iva"/>
-                                <field name="wh_iva_rate"/>
-                                <field name="wh_iva_id"/>
-                            </group>
-                        </page>
-                    </notebook>
-                </page>
+            <field name="arch" type="xml">                
+            <xpath expr="//separator[@string='isep']" position="after">
+                    <newline/>
+                        <group col="6" colspan="4">
+                            <field name="wh_iva"/>
+                            <field name="wh_iva_rate"/>
+                            <field name="wh_iva_id"/>
+                        </group>
+                </xpath>
+                <xpath expr='//separator[@string="isep"]' position='attributes'>
+                <attribute name="string">Withholdings Vat</attribute>
+                </xpath>
             </field>
         </record>
 

=== modified file 'l10n_ve_withholding_iva/account_workflow.xml'
--- l10n_ve_withholding_iva/account_workflow.xml	2011-10-30 04:26:37 +0000
+++ l10n_ve_withholding_iva/account_workflow.xml	2011-10-31 06:36:38 +0000
@@ -29,7 +29,7 @@
 <!--        </record>-->
 <!--        From Open to Withholdings-->
         <record id="trans_open_wh" model="workflow.transition">
-            <field name="act_from" ref="account.act_open"/>
+            <field name="act_from" ref="l10n_ve_withholding.wh_router"/>
             <field name="act_to" ref="act_withold_vat"/>
             <field name="condition">check_wh_apply()</field>
             <field name="signal"></field>
@@ -39,7 +39,8 @@
         <record id="trans_withhold_paid" model="workflow.transition">
             <field name="act_from" ref="act_withold_vat"/>
             <field name="act_to" ref="account.act_paid"/>
-            <field name="signal"></field>
+            <field name="trigger_model">account.move.line</field>
+            <field name="trigger_expr_id">move_line_id_payment_get()</field>
             <field name="condition">test_paid()</field>
         </record>
 

=== modified file 'l10n_ve_withholding_iva/partner_view.xml'
--- l10n_ve_withholding_iva/partner_view.xml	2011-10-25 20:33:16 +0000
+++ l10n_ve_withholding_iva/partner_view.xml	2011-10-31 06:36:38 +0000
@@ -16,18 +16,18 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="l10n_ve_withholding.wh_partner"/>
             <field name="arch" type="xml">
-                <page string="Withholdings" position="inside">
-                    <notebook>
-                        <page string="Withholdings Vat">
+                <xpath expr="//separator[@string='isep']" position="after">
+                    <newline/>
                             <group col="4" colspan="2">
                                 <field name="wh_iva_agent"/>
                                 <field name="wh_iva_rate"/>
                                 <field name="property_wh_iva_payable"/>
                                 <field name="property_wh_iva_receivable"/>
                             </group>
-                        </page>
-                    </notebook>
-                </page>
+                </xpath>
+                <xpath expr='//separator[@string="isep"]' position='attributes'>
+                    <attribute name="string">VAT Withholding</attribute>
+                </xpath>
             </field>
         </record>
     </data>