From 21b33620a427dc3ed52ba2109321d11160cc47b8 Mon Sep 17 00:00:00 2001
From: Mantavya Gajjar <mga@tinyerp.com>
Date: Wed, 26 May 2010 23:47:02 +0530
Subject: [PATCH] [FIX]: fix a problem of workflow, change the name of workflow
 file name

bzr revid: mga@tinyerp.com-20100526181702-0hkihliy1twjuwff
---
 addons/account_voucher/__openerp__.py         |  3 +-
 .../account_voucher_workflow.xml              | 80 ------------------
 addons/account_voucher/voucher.py             | 14 ++--
 addons/account_voucher/voucher_view.xml       |  2 +-
 addons/account_voucher/voucher_wizard.xml     |  5 +-
 addons/account_voucher/voucher_workflow.xml   | 81 ++++++++++---------
 6 files changed, 55 insertions(+), 130 deletions(-)
 delete mode 100755 addons/account_voucher/account_voucher_workflow.xml

diff --git a/addons/account_voucher/__openerp__.py b/addons/account_voucher/__openerp__.py
index 57d2ce1ab96..620cd2428f1 100644
--- a/addons/account_voucher/__openerp__.py
+++ b/addons/account_voucher/__openerp__.py
@@ -49,11 +49,12 @@
     "update_xml" : [
         "security/ir.model.access.csv",
         "voucher_sequence.xml",
+        "voucher_workflow.xml"
         "voucher_report.xml",
         "voucher_view.xml",
         "voucher_wizard.xml",
         "wizard/account_voucher_open_view.xml",
-        "account_voucher_workflow.xml"
+        
     ],
     'certificate': '0037580727101',
     "active": False,
diff --git a/addons/account_voucher/account_voucher_workflow.xml b/addons/account_voucher/account_voucher_workflow.xml
deleted file mode 100755
index b34b84a5d24..00000000000
--- a/addons/account_voucher/account_voucher_workflow.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<openerp>
-	<data>
-		<record id="wkf" model="workflow">
-            <field name="name">account.voucher.basic</field>
-            <field name="osv">account.voucher</field>
-            <field name="on_create">True</field>
-        </record>
-		
-		<record id="act_draft" model="workflow.activity">
-            <field name="wkf_id" ref="wkf"/>
-            <field name="flow_start">True</field>
-            <field name="name">draft</field>
-            <field name="action">write({'state':'draft'})</field>
-            <field name="kind">function</field>
-        </record>
-        
-        <record id="act_proforma" model="workflow.activity">
-            <field name="wkf_id" ref="wkf"/>
-            <field name="name">proforma</field>
-            <field name="action">write({'state':'proforma'})
-            open_voucher()</field>
-            <field name="kind">function</field>
-        </record>
-        
-        <record id="act_done" model="workflow.activity">
-            <field name="wkf_id" ref="wkf"/>
-            <field name="name">done</field>
-            <field name="action">write({'state':'posted'})
-            proforma_voucher()</field>
-            <field name="flow_stop">True</field>
-            <field name="kind">function</field>
-        </record>
-        
-        <record id="act_recheck" model="workflow.activity">
-            <field name="wkf_id" ref="wkf"/>
-            <field name="name">recheck</field>
-            <field name="action">write({'state':'recheck'})</field>
-            <field name="kind">function</field>
-        </record>
-        
-        <record id="t1" model="workflow.transition">
-            <field name="act_from" ref="act_draft"/>
-            <field name="act_to" ref="act_proforma"/>
-            <field name="signal">open_voucher</field>
-        </record>
-        
-        <record id="t2" model="workflow.transition">
-            <field name="act_from" ref="act_proforma"/>
-            <field name="act_to" ref="act_done"/>
-            <field name="signal">proforma_voucher</field>
-            <field name="condition">amount &lt;= journal_id.max_amount</field>
-        </record>
-        
-        <record id="t3" model="workflow.transition">
-            <field name="act_from" ref="act_proforma"/>
-            <field name="act_to" ref="act_recheck"/>
-            <field name="signal">proforma_voucher</field>
-            <field name="condition">amount &gt; journal_id.max_amount</field>
-        </record>
-        
-        <record id="t4" model="workflow.transition">
-            <field name="act_from" ref="act_recheck"/>
-            <field name="act_to" ref="act_done"/>
-            <field name="signal">recheck_voucher</field>
-        </record>
-        
-		<record id="t5" model="workflow.transition">
-			<field name="act_from" ref="act_recheck"/>
-			<field name="act_to" ref="act_draft"/>
-			<field name="signal">action_cancel_draft</field>
-		</record>
-		
-		<record id="t6" model="workflow.transition">
-			<field name="act_from" ref="act_proforma"/>
-			<field name="act_to" ref="act_draft"/>
-			<field name="signal">action_cancel_draft</field>
-		</record>
-	</data>
-</openerp>
diff --git a/addons/account_voucher/voucher.py b/addons/account_voucher/voucher.py
index cc10dde8294..d43a7899fb4 100644
--- a/addons/account_voucher/voucher.py
+++ b/addons/account_voucher/voucher.py
@@ -99,13 +99,13 @@ class account_voucher(osv.osv):
     _columns = {
         'name':fields.char('Name', size=256, required=True, readonly=True, states={'draft':[('readonly',False)]}),
         'type': fields.selection([
-            ('pay_voucher','Cash Payment Voucher'),
-            ('bank_pay_voucher','Bank Payment Voucher'),
-            ('rec_voucher','Cash Receipt Voucher'),
-            ('bank_rec_voucher','Bank Receipt Voucher'),
-            ('cont_voucher','Contra Voucher'),
-            ('journal_sale_vou','Journal Sale Voucher'),
-            ('journal_pur_voucher','Journal Purchase Voucher'),
+            ('pay_voucher','Cash Payment'),
+            ('bank_pay_voucher','Bank Payment'),
+            ('rec_voucher','Cash Receipt'),
+            ('bank_rec_voucher','Bank Receipt'),
+            ('cont_voucher','Contra'),
+            ('journal_sale_vou','Journal Sale'),
+            ('journal_pur_voucher','Journal Purchase'),
             ('journal_voucher','Journal Voucher'),
             ],'Type', readonly=True, select=True , size=128),
         'date':fields.date('Date', readonly=True, states={'draft':[('readonly',False)]}),
diff --git a/addons/account_voucher/voucher_view.xml b/addons/account_voucher/voucher_view.xml
index 5105844d899..3927eb61b10 100644
--- a/addons/account_voucher/voucher_view.xml
+++ b/addons/account_voucher/voucher_view.xml
@@ -37,7 +37,7 @@
                     </group>
                     <notebook colspan="4">
                         <page string="Entry Lines">
-                            <field name="payment_ids" colspan="4" nolabel="1" height="150">
+                            <field name="payment_ids" colspan="4" nolabel="1" height="260">
                                 <tree string="Voucher Lines" editable="top">
                                     <field name="account_analytic_id"/>
                                     <field name="partner_id" on_change="onchange_partner(partner_id,type,parent.type)"/>
diff --git a/addons/account_voucher/voucher_wizard.xml b/addons/account_voucher/voucher_wizard.xml
index fea8cb3faa6..cd4da4e988b 100644
--- a/addons/account_voucher/voucher_wizard.xml
+++ b/addons/account_voucher/voucher_wizard.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <openerp>
     <data>
-
-<!--        <wizard
+        <wizard
              id="wizard_account_voucher_open"
              model="account.voucher"
              name="account.voucher.open"
@@ -14,6 +13,6 @@
              name="Open Vouchers"
              sequence="0"
              type="wizard"
-             parent="menu_action_voucher_list"/> -->
+             parent="menu_action_voucher_list"/>
     </data>
 </openerp>
diff --git a/addons/account_voucher/voucher_workflow.xml b/addons/account_voucher/voucher_workflow.xml
index 261a56ebb34..ceb8da48722 100644
--- a/addons/account_voucher/voucher_workflow.xml
+++ b/addons/account_voucher/voucher_workflow.xml
@@ -1,75 +1,80 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <openerp>
-	<data>
-
-		<record id="wkf_voucher" model="workflow">
+    <data>
+        <record id="wkf" model="workflow">
             <field name="name">account.voucher.basic</field>
             <field name="osv">account.voucher</field>
             <field name="on_create">True</field>
         </record>
-
+        
         <record id="act_draft" model="workflow.activity">
-            <field name="wkf_id" ref="wkf_voucher"/>
+            <field name="wkf_id" ref="wkf"/>
             <field name="flow_start">True</field>
             <field name="name">draft</field>
-        </record>
-        
-        <record id="act_performa" model="workflow.activity">
-            <field name="wkf_id" ref="wkf_voucher"/>
-            <field name="name">performa</field>
-            <field name="action">open_voucher()</field>
+            <field name="action">write({'state':'draft'})</field>
             <field name="kind">function</field>
         </record>
         
-        <record id="act_posted" model="workflow.activity">
-            <field name="wkf_id" ref="wkf_voucher"/>
-            <field name="name">posted</field>
-            <field name="action">proforma_voucher()</field>
+        <record id="act_proforma" model="workflow.activity">
+            <field name="wkf_id" ref="wkf"/>
+            <field name="name">proforma</field>
+            <field name="action">write({'state':'proforma'})
+            open_voucher()</field>
+            <field name="kind">function</field>
+        </record>
+        
+        <record id="act_done" model="workflow.activity">
+            <field name="wkf_id" ref="wkf"/>
+            <field name="name">done</field>
+            <field name="action">write({'state':'posted'})
+            proforma_voucher()</field>
             <field name="flow_stop">True</field>
             <field name="kind">function</field>
         </record>
         
-        <record id="act_cancel" model="workflow.activity">
-            <field name="wkf_id" ref="wkf_voucher"/>
-            <field name="name">cancel</field>
-            <field name="action">cancel_voucher()</field>
+        <record id="act_recheck" model="workflow.activity">
+            <field name="wkf_id" ref="wkf"/>
+            <field name="name">recheck</field>
+            <field name="action">write({'state':'recheck'})</field>
             <field name="kind">function</field>
         </record>
         
         <record id="t1" model="workflow.transition">
             <field name="act_from" ref="act_draft"/>
-            <field name="act_to" ref="act_performa"/>
+            <field name="act_to" ref="act_proforma"/>
             <field name="signal">open_voucher</field>
         </record>
         
         <record id="t2" model="workflow.transition">
-            <field name="act_from" ref="act_performa"/>
-            <field name="act_to" ref="act_posted"/>
+            <field name="act_from" ref="act_proforma"/>
+            <field name="act_to" ref="act_done"/>
             <field name="signal">proforma_voucher</field>
+            <field name="condition">amount &lt;= journal_id.max_amount</field>
         </record>
         
         <record id="t3" model="workflow.transition">
-            <field name="act_from" ref="act_performa"/>
-            <field name="act_to" ref="act_cancel"/>
-            <field name="signal">cancel_voucher</field>
+            <field name="act_from" ref="act_proforma"/>
+            <field name="act_to" ref="act_recheck"/>
+            <field name="signal">proforma_voucher</field>
+            <field name="condition">amount &gt; journal_id.max_amount</field>
+        </record>
+        
+        <record id="t4" model="workflow.transition">
+            <field name="act_from" ref="act_recheck"/>
+            <field name="act_to" ref="act_done"/>
+            <field name="signal">recheck_voucher</field>
         </record>
         
         <record id="t5" model="workflow.transition">
-            <field name="act_from" ref="act_draft"/>
-            <field name="act_to" ref="act_cancel"/>
-            <field name="signal">cancel_voucher</field>
+            <field name="act_from" ref="act_recheck"/>
+            <field name="act_to" ref="act_draft"/>
+            <field name="signal">action_cancel_draft</field>
         </record>
         
         <record id="t6" model="workflow.transition">
-            <field name="act_from" ref="act_posted"/>
-            <field name="act_to" ref="act_cancel"/>
-            <field name="signal">cancel_voucher</field>
+            <field name="act_from" ref="act_proforma"/>
+            <field name="act_to" ref="act_draft"/>
+            <field name="signal">action_cancel_draft</field>
         </record>
-	
-		<record id="t7" model="workflow.transition">
-            <field name="act_from" ref="act_cancel"/>
-            <field name="act_to" ref="act_performa"/>
-            <field name="signal">open_voucher</field>
-        </record>
-	</data>
+    </data>
 </openerp>