Vauxoo Addons

Merge lp:~vauxoo/addons-vauxoo/7.0-hr_payroll_cancel-add-update-workflow-jc into lp:addons-vauxoo/7.0

  1. 7.0-hr_payroll_cancel-add-update-workflow-jc
  2. Merge into 7.0
Proposed by Juan Carlos Hernandez
Status: Merged
Merged at revision: 1052
Proposed branch: lp:~vauxoo/addons-vauxoo/7.0-hr_payroll_cancel-add-update-workflow-jc
Merge into: lp:addons-vauxoo/7.0
Diff against target: 26 lines (+9/-0)
2 files modified
hr_payroll_cancel/__openerp__.py (+1/-0)
hr_payroll_cancel/test/update_payroll_workflow.yml (+8/-0)
To merge this branch: bzr merge lp:~vauxoo/addons-vauxoo/7.0-hr_payroll_cancel-add-update-workflow-jc
Reviewer Review Type Date Requested Status
Juan Carlos Hernandez Pending
Julio Serna-http://www.vauxoo.com Pending
Review via email: mp+222974@code.launchpad.net

Description of the change

Se agragó un archivo.yml que actualize el workflow de la nómina para que deje cancelar.

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 'hr_payroll_cancel/__openerp__.py'
2--- hr_payroll_cancel/__openerp__.py 2014-05-09 21:51:34 +0000
3+++ hr_payroll_cancel/__openerp__.py 2014-06-12 16:38:16 +0000
4@@ -40,6 +40,7 @@
5 "data" : [
6 "hr_payslip_view.xml",
7 "hr_payslip_workflow.xml",
8+ "test/update_payroll_workflow.yml"
9 ],
10 "test": [],
11 "installable" : True,
12
13=== added directory 'hr_payroll_cancel/test'
14=== added file 'hr_payroll_cancel/test/update_payroll_workflow.yml'
15--- hr_payroll_cancel/test/update_payroll_workflow.yml 1970-01-01 00:00:00 +0000
16+++ hr_payroll_cancel/test/update_payroll_workflow.yml 2014-06-12 16:38:16 +0000
17@@ -0,0 +1,8 @@
18+-
19+ Workflow Mexican Electronic Payroll
20+-
21+ !python {model: hr.payslip}: |
22+ cr.execute("""UPDATE wkf_instance
23+ SET state = 'active'
24+ WHERE state = 'complete' and wkf_id = (SELECT id FROM wkf WHERE name = 'hr.payslip.basic')
25+ AND res_id IN (SELECT id FROM hr_payslip WHERE state = 'done')""")
26\ No newline at end of file