Merge lp:~vauxoo/openerp-venezuela-localization/jose-wf-municipality into lp:~openerp-venezuela/openerp-venezuela-localization/6.0-trunk

[Jose Antonio Morales Ponce(vauxoo) - - http://www.vauxoo.com]

Added workflow in withholding municipality and changed to 2.0 version all modules

=== modified file 'bank_management/__openerp__.py'
--- bank_management/__openerp__.py	2011-10-06 17:35:45 +0000
+++ bank_management/__openerp__.py	2011-10-20 13:23:24 +0000
@@ -33,7 +33,7 @@
 
 {
     "name" : "Bank Management",
-    "version" : "0.1",
+    "version" : "0.2",
     "author" : "Vauxoo",
     "website" : "http://vauxoo.com",
     "category": 'Generic Modules/Accounting',

=== modified file 'l10n_ve/__openerp__.py'
--- l10n_ve/__openerp__.py	2011-10-11 04:59:00 +0000
+++ l10n_ve/__openerp__.py	2011-10-20 13:23:24 +0000
@@ -24,7 +24,7 @@
 ##############################################################################
 {
     "name" : "Venezuelan Account Chart (Aimed at Commercial Trades)",
-    "version" : "1.0",
+    "version" : "0.2",
     "author" : "Tiny & Vauxoo",
     "category" : "Localisation/Account Charts",
     "description": 

=== modified file 'l10n_ve_fiscal_requirements/__openerp__.py'
--- l10n_ve_fiscal_requirements/__openerp__.py	2011-10-11 19:04:54 +0000
+++ l10n_ve_fiscal_requirements/__openerp__.py	2011-10-20 13:23:24 +0000
@@ -22,7 +22,7 @@
 ##############################################################################
 {
     "name" : "Fiscal requirements Venezuelan laws",
-    "version" : "0.5",
+    "version" : "0.2",
     "author" : "Vauxoo",
     "website" : "http://vauxoo.com",
     "category": 'Generic Modules/Accounting',

=== modified file 'l10n_ve_islr_withholding/__openerp__.py'
--- l10n_ve_islr_withholding/__openerp__.py	2011-10-05 02:12:07 +0000
+++ l10n_ve_islr_withholding/__openerp__.py	2011-10-20 13:23:24 +0000
@@ -28,7 +28,7 @@
 
 {
     "name" : "Automatically Calculated Withholding Income",
-    "version" : "0.6",
+    "version" : "0.2",
     "author" : "Vauxoo",
     "category" : "General",
     "website": "http://wiki.openerp.org.ve/",

=== modified file 'l10n_ve_sale_purchase/__openerp__.py'
--- l10n_ve_sale_purchase/__openerp__.py	2011-10-04 23:39:47 +0000
+++ l10n_ve_sale_purchase/__openerp__.py	2011-10-20 13:23:24 +0000
@@ -27,7 +27,7 @@
 ###############################################################################
 {
     'name' : 'ISLR Sale and Purchase Functionalities',
-    'version' : '0.1',
+    'version' : '0.2',
     'author' : 'Vauxoo',
     'description' : '''
         Due to the Dependendy reduction on the l10n_ve_islr_withholding module, it was necesary to incorporate

=== modified file 'l10n_ve_withholding/__openerp__.py'
--- l10n_ve_withholding/__openerp__.py	2011-10-06 01:32:14 +0000
+++ l10n_ve_withholding/__openerp__.py	2011-10-20 13:23:24 +0000
@@ -23,7 +23,7 @@
 ##############################################################################
 {
     "name" : "Management withholdings Venezuelan laws",
-    "version" : "0.5",
+    "version" : "0.2",
     "author" : "Vauxoo",
     "website" : "http://vauxoo.com",
     "category": 'Generic Modules/Accounting',

=== modified file 'l10n_ve_withholding_iva/__openerp__.py'
--- l10n_ve_withholding_iva/__openerp__.py	2011-10-11 19:04:54 +0000
+++ l10n_ve_withholding_iva/__openerp__.py	2011-10-20 13:23:24 +0000
@@ -23,7 +23,7 @@
 ##############################################################################
 {
     "name" : "Withholding vat Venezuelan laws",
-    "version" : "0.6",
+    "version" : "0.2",
     "author" : "Vauxoo",
     "website" : "http://vauxoo.com",
     "category": 'Generic Modules/Accounting',

=== modified file 'l10n_ve_withholding_muni/__init__.py'
--- l10n_ve_withholding_muni/__init__.py	2011-09-25 23:55:38 +0000
+++ l10n_ve_withholding_muni/__init__.py	2011-10-20 13:23:24 +0000
@@ -34,4 +34,4 @@
 import partner
 import report
 #import wizard
-
+import workflow 

=== modified file 'l10n_ve_withholding_muni/__openerp__.py'
--- l10n_ve_withholding_muni/__openerp__.py	2011-09-12 16:34:55 +0000
+++ l10n_ve_withholding_muni/__openerp__.py	2011-10-20 13:23:24 +0000
@@ -23,7 +23,7 @@
 ##############################################################################
 {
     "name" : "Local Withholding Venezuelan laws",
-    "version" : "0.5",
+    "version" : "0.2",
     "author" : "Vauxoo",
     "website" : "http://vauxoo.com",
     "category": 'Generic Modules/Accounting',
@@ -39,6 +39,7 @@
         'wh_muni_view.xml',
         "wh_muni_sequence.xml",
         "wh_muni_report.xml",
+        "workflow/l10n_ve_wh_muni_wf.xml"
 #        "account_workflow.xml",
     ],
     'demo_xml': [],

=== modified file 'l10n_ve_withholding_muni/wh_muni.py'
--- l10n_ve_withholding_muni/wh_muni.py	2011-09-25 23:55:38 +0000
+++ l10n_ve_withholding_muni/wh_muni.py	2011-10-20 13:23:24 +0000
@@ -117,7 +117,6 @@
                 raise osv.except_osv(_('Invalid action !'), _("The line containing the document '%s' looks as if the amount withheld was wrong please check.!") % (i.invoice_id.reference))
             total+=i.amount
         self.write(cr,uid,ids,{'amount':total})
-        self.write(cr, uid, ids, {'state':'confirmed'})
         return True
 
 
@@ -141,7 +140,6 @@
     def action_done(self, cr, uid, ids, context={}):
         self.action_number(cr, uid, ids)
         self.action_move_create(cr, uid, ids)
-        self.write(cr, uid, ids, {'state':'done'})
         return True
 
 

=== modified file 'l10n_ve_withholding_muni/wh_muni_view.xml'
--- l10n_ve_withholding_muni/wh_muni_view.xml	2011-10-05 15:30:11 +0000
+++ l10n_ve_withholding_muni/wh_muni_view.xml	2011-10-20 13:23:24 +0000
@@ -128,8 +128,8 @@
                             <field name="munici_line_ids" default_get="{'lines': munici_line_ids }" colspan="4" nolabel="1" height="275"/>
                             <group col="4" colspan="2">
                                 <field name="state"/>
-                                <button name="action_confirm" string="Confirmed" states="draft" type="object" icon="gtk-open"/>
-                                <button name="action_done" string="Done" states="confirmed" type="object"  icon="gtk-go-forward"/>
+                                <button name="wh_muni_confirmed" states="draft" string="Confirm" icon="gtk-execute"/>
+                                <button name="wh_muni_done" states="confirmed" string="Done" icon="gtk-execute"/>
                             </group>
                         </page>
                         <page string="Other Information">

=== added directory 'l10n_ve_withholding_muni/workflow'
=== added file 'l10n_ve_withholding_muni/workflow/l10n_ve_wh_muni_wf.xml'
--- l10n_ve_withholding_muni/workflow/l10n_ve_wh_muni_wf.xml	1970-01-01 00:00:00 +0000
+++ l10n_ve_withholding_muni/workflow/l10n_ve_wh_muni_wf.xml	2011-10-20 13:23:24 +0000
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <record id="wh_muni_order" model="workflow">
+            <field name="name">Withholding municipality Order Basic Workflow</field>
+            <field name="osv">account.wh.munici</field>
+            <field name="on_create">True</field>
+        </record>
+
+        <record id="act_draft" model="workflow.activity">
+            <field name="wkf_id" ref="wh_muni_order"/>
+            <field name="flow_start">True</field>
+            <field name="name">draft</field>
+        </record>
+
+        <record id="act_confirmed" model="workflow.activity">
+            <field name="wkf_id" ref="wh_muni_order"/>
+            <field name="action">action_confirm()
+                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_muni_order"/>
+            <field name="action">action_done()
+                write({'state':'done'})</field>
+            <field name="kind">function</field>
+            <field name="name">done</field>
+        </record>
+
+
+        <record id="trans_draft_done" model="workflow.transition">
+            <field name="act_from" ref="act_draft"/>
+            <field name="act_to" ref="act_confirmed"/>
+            <field name="signal">wh_muni_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_muni_done</field>
+        </record>
+
+
+    </data>
+</openerp>

=== modified file 'topology/__openerp__.py'
--- topology/__openerp__.py	2011-09-22 17:30:32 +0000
+++ topology/__openerp__.py	2011-10-20 13:23:24 +0000
@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 {
     "name" : "Opening balance Update",
-    "version" : "0.1",
+    "version" : "0.2",
     "depends" : ["base"],
     "author" : "Vauxoo",
     "description" : """