Openerp Venezuela

Merge lp:~vauxoo/openerp-venezuela-localization/hbto_wkf_islr into lp:~openerp-venezuela/openerp-venezuela-localization/6.0-trunk

  1. hbto_wkf_islr
  2. Merge into 6.0-trunk
Proposed by hbto [Vauxoo] http://www.vauxoo.com
Status: Merged
Merged at revision: 565
Proposed branch: lp:~vauxoo/openerp-venezuela-localization/hbto_wkf_islr
Merge into: lp:~openerp-venezuela/openerp-venezuela-localization/6.0-trunk
Diff against target: 32 lines (+4/-2)
2 files modified
l10n_ve_withholding_islr/workflow/account_workflow.xml (+3/-2)
l10n_ve_withholding_islr/workflow/islr_wh_workflow.xml (+1/-0)
To merge this branch: bzr merge lp:~vauxoo/openerp-venezuela-localization/hbto_wkf_islr
Reviewer Review Type Date Requested Status
Gabriela Quilarque Pending
Nhomar - Vauxoo Pending
Review via email: mp+90050@code.launchpad.net

Description of the change

ISLR Workflow Fixing

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'l10n_ve_withholding_islr/workflow/account_workflow.xml'
2--- l10n_ve_withholding_islr/workflow/account_workflow.xml 2011-11-22 15:29:03 +0000
3+++ l10n_ve_withholding_islr/workflow/account_workflow.xml 2012-01-25 06:42:24 +0000
4@@ -45,7 +45,7 @@
5 <record id="trans_wh_router_wh_islr" model="workflow.transition">
6 <field name="act_from" ref="l10n_ve_withholding.act_wh_router"/>
7 <field name="act_to" ref="act_islr_router"/>
8- <field name="condition">check_invoice_type()</field>
9+ <field name="condition">check_invoice_type() and check_wh_islr_apply()</field>
10 <field name="signal"></field>
11 </record>
12
13@@ -67,7 +67,8 @@
14 <record id="trans_withhold_paid" model="workflow.transition">
15 <field name="act_from" ref="act_withold_islr"/>
16 <field name="act_to" ref="account.act_paid"/>
17- <field name="signal"></field>
18+ <field name="trigger_model">account.move.line</field>
19+ <field name="trigger_expr_id">move_line_id_payment_get()</field>
20 <field name="condition">test_paid()</field>
21 </record>
22
23
24=== modified file 'l10n_ve_withholding_islr/workflow/islr_wh_workflow.xml'
25--- l10n_ve_withholding_islr/workflow/islr_wh_workflow.xml 2012-01-19 23:04:33 +0000
26+++ l10n_ve_withholding_islr/workflow/islr_wh_workflow.xml 2012-01-25 06:42:24 +0000
27@@ -36,6 +36,7 @@
28 <field name="name">done</field>
29 <field name="action">action_move_create()
30 write({'state':'done'})</field>
31+ <field name="flow_stop">True</field>
32 </record>
33
34