Merge lp:~vauxoo/openerp-venezuela-localization/miguel-workflow-islr-menu into lp:~openerp-venezuela/openerp-venezuela-localization/6.0-trunk

[Miguel Delgado (Vauxoo)]

[ADD] workflow to l10n_ve_islr_withholding
[IMP] the menu items for l10n_ve_islr_withholding, l10n_ve_withholding_iva and l10n_ve_withholding

=== modified file 'l10n_ve_fiscal_requirements/view/account_invoice_view.xml'
--- l10n_ve_fiscal_requirements/view/account_invoice_view.xml	2011-09-30 15:48:47 +0000
+++ l10n_ve_fiscal_requirements/view/account_invoice_view.xml	2011-10-03 21:42:44 +0000
@@ -107,6 +107,6 @@
                 </xpath>
             </field>
         </record>
-
+        <menuitem id="menu_venezuela_reporting" name="Venezuela Reports" parent="account.menu_finance_legal_statement"/>
     </data>
 </openerp>

=== modified file 'l10n_ve_islr_withholding/__openerp__.py'
--- l10n_ve_islr_withholding/__openerp__.py	2011-09-30 22:08:51 +0000
+++ l10n_ve_islr_withholding/__openerp__.py	2011-10-03 21:42:44 +0000
@@ -74,6 +74,7 @@
             "islr_xml_wh_report.xml",
             "islr_wh_report.xml",
             "islr_xml_wh.xml",
+            "workflow/islr_wh_workflow.xml"
     ],
     "active": False,
     "installable": True

=== modified file 'l10n_ve_islr_withholding/islr_xml_wh.xml'
--- l10n_ve_islr_withholding/islr_xml_wh.xml	2011-07-01 21:55:39 +0000
+++ l10n_ve_islr_withholding/islr_xml_wh.xml	2011-10-03 21:42:44 +0000
@@ -157,13 +157,13 @@
         
         <menuitem name="Generate file XML" 
             id="menu_action_xml_islr" 
-            parent="l10n_ve_withholding.menu_wh_suppiler"
+            parent="l10n_ve_fiscal_requirements.menu_venezuela_reporting"
             action="action_xml_islr"/>
 
     </data>
 </openerp>
 
-
+<!--            parent="l10n_ve_withholding.menu_wh_suppiler"-->
 
 
 

=== modified file 'l10n_ve_islr_withholding/view/islr_wh_doc_view.xml'
--- l10n_ve_islr_withholding/view/islr_wh_doc_view.xml	2011-09-26 22:15:56 +0000
+++ l10n_ve_islr_withholding/view/islr_wh_doc_view.xml	2011-10-03 21:42:44 +0000
@@ -325,7 +325,7 @@
         <menuitem
             id="menu_action_wh_islr_customer"
             name="Customer Withholding Income"
-            parent="l10n_ve_withholding.menu_wh_customer"
+            parent="account.menu_finance_receivables"
             action="action_wh_islr_customer"/>
 
         <record model="ir.actions.act_window" id="action_wh_islr_supplier">
@@ -356,7 +356,7 @@
         <menuitem
             id="menu_action_wh_islr_supplier"
             name="Supplier Withholding Income" 
-            parent="l10n_ve_withholding.menu_wh_suppiler"
+            parent="account.menu_finance_payables"
             action="action_wh_islr_supplier"/>
 
     </data>

=== added directory 'l10n_ve_islr_withholding/workflow'
=== added file 'l10n_ve_islr_withholding/workflow/islr_wh_workflow.xml'
--- l10n_ve_islr_withholding/workflow/islr_wh_workflow.xml	1970-01-01 00:00:00 +0000
+++ l10n_ve_islr_withholding/workflow/islr_wh_workflow.xml	2011-10-03 21:42:44 +0000
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <record id="wh_islr_order" model="workflow">
+            <field name="name">Withholding ISLR Order Basic Workflow</field>
+            <field name="osv">islr.wh.doc</field>
+            <field name="on_create">True</field>
+        </record>
+
+        <record id="act_process" model="workflow.activity">
+            <field name="wkf_id" ref="wh_islr_order"/>
+            <field name="flow_start">True</field>
+            <field name="name">process</field>
+        </record>
+
+        <record id="act_draft" model="workflow.activity">
+            <field name="wkf_id" ref="wh_islr_order"/>
+            <field name="action">
+                write({'state':'draft'})
+            </field>
+            <field name="kind">function</field>
+            <field name="name">draft</field>
+        </record>
+
+        <record id="act_confirmed" model="workflow.activity">
+            <field name="wkf_id" ref="wh_islr_order"/>
+            <field name="action">
+                write({'state':'confirmed'})
+            </field>
+            <field name="kind">function</field>
+            <field name="name">confirmed</field>
+        </record>
+
+        <record id="act_done" model="workflow.activity">
+            <field name="wkf_id" ref="wh_islr_order"/>
+            <field name="action">
+                write({'state':'done'})
+            </field>
+            <field name="kind">function</field>
+            <field name="name">done</field>
+        </record>
+
+        <record id="act_cancel" model="workflow.activity">
+            <field name="wkf_id" ref="wh_islr_order"/>
+            <field name="action">
+                write({'state':'cancel'})
+            </field>
+            <field name="kind">function</field>
+            <field name="name">cancel</field>
+        </record>
+
+        <record id="trans_process_draft" model="workflow.transition">
+            <field name="act_from" ref="act_process"/>
+            <field name="act_to" ref="act_draft"/>
+            <field name="signal">wh_islr_draft</field>
+        </record>
+
+        <record id="trans_draft_confirmed" model="workflow.transition">
+            <field name="act_from" ref="act_draft"/>
+            <field name="act_to" ref="act_confirmed"/>
+            <field name="signal">wh_islr_confirmed</field>
+        </record>
+
+        <record id="trans_confirmed_done" model="workflow.transition">
+            <field name="act_from" ref="act_confirmed"/>
+            <field name="act_to" ref="act_done"/>
+            <field name="signal">wh_islr_done</field>
+        </record>
+
+        <record id="trans_done_cancel" model="workflow.transition">
+            <field name="act_from" ref="act_done"/>
+            <field name="act_to" ref="act_cancel"/>
+            <field name="signal">wh_islr_cancel</field>
+        </record>
+
+    </data>
+</openerp>

=== modified file 'l10n_ve_withholding/l10n_ve_withholding_view.xml'
--- l10n_ve_withholding/l10n_ve_withholding_view.xml	2011-08-21 20:39:12 +0000
+++ l10n_ve_withholding/l10n_ve_withholding_view.xml	2011-10-03 21:42:44 +0000
@@ -6,9 +6,10 @@
     Menu Generico para todos los modulos de iva, islr y municipales
 -->
         <menuitem id="menu_wh_configuration" name="Withholdings" parent="account.menu_finance_configuration"/>
+        <menuitem id="menu_withholdings" name="Withholdings" parent="account.menu_finance"/>
 
-        <menuitem id="menu_wh_customer" name="Customer Withholding" parent="account.menu_finance_receivables" sequence="300"/>
-        <menuitem id="menu_wh_suppiler" name="Supplier Withholding" parent="account.menu_finance_payables" sequence="300"/>
+<!--        <menuitem id="menu_wh_customer" name="Customer Withholding" parent="account.menu_finance_receivables" sequence="300"/>-->
+<!--        <menuitem id="menu_wh_suppiler" name="Supplier Withholding" parent="account.menu_finance_payables" sequence="300"/>-->
 <!--
         Vista Generica de Facturas de Compra para iva, islr y municipales
 -->

=== modified file 'l10n_ve_withholding_iva/generate_txt_view.xml'
--- l10n_ve_withholding_iva/generate_txt_view.xml	2011-10-03 14:27:38 +0000
+++ l10n_ve_withholding_iva/generate_txt_view.xml	2011-10-03 21:42:44 +0000
@@ -96,7 +96,7 @@
 
         <menuitem name="Generar TXT" 
             id="menu_action_generate_txt_iva" 
-            parent="l10n_ve_withholding.menu_wh_suppiler"
+            parent="l10n_ve_fiscal_requirements.menu_venezuela_reporting"
             action="action_generate_text_iva"/>
 
     </data>

=== modified file 'l10n_ve_withholding_iva/wh_iva_view.xml'
--- l10n_ve_withholding_iva/wh_iva_view.xml	2011-10-03 02:58:44 +0000
+++ l10n_ve_withholding_iva/wh_iva_view.xml	2011-10-03 21:42:44 +0000
@@ -237,8 +237,8 @@
 
         <menuitem
             id="menu_action_account_wh_iva_customer"
-            name="Withholding vat customer"
-            parent="l10n_ve_withholding.menu_wh_customer"
+            name="Customer Withholding VAT "
+            parent="account.menu_finance_receivables"
             action="action_account_wh_iva_customer"/>
 
 
@@ -269,8 +269,8 @@
 
         <menuitem
             id="menu_action_account_wh_iva_supplier"
-            name="Withholding vat supplier"        
-            parent="l10n_ve_withholding.menu_wh_suppiler"
+            name="Supplier Withholding VAT "        
+            parent="account.menu_finance_payables"
             action="action_account_wh_iva_supplier"/>
 
     </data>