Vauxoo Addons

Merge lp:~vauxoo/addons-vauxoo/7.0-hr_payroll_cancel-dev_luis into lp:addons-vauxoo/7.0

  1. 7.0-hr_payroll_cancel-dev_luis
  2. Merge into 7.0
Proposed by Luis Torres - http://www.vauxoo.com
Status: Merged
Merged at revision: 970
Proposed branch: lp:~vauxoo/addons-vauxoo/7.0-hr_payroll_cancel-dev_luis
Merge into: lp:addons-vauxoo/7.0
Diff against target: 129 lines (+109/-0)
4 files modified
hr_payroll_cancel/__init__.py (+25/-0)
hr_payroll_cancel/__openerp__.py (+47/-0)
hr_payroll_cancel/hr_payslip_view.xml (+17/-0)
hr_payroll_cancel/hr_payslip_workflow.xml (+20/-0)
To merge this branch: bzr merge lp:~vauxoo/addons-vauxoo/7.0-hr_payroll_cancel-dev_luis
Reviewer Review Type Date Requested Status
Julio Serna-http://www.vauxoo.com Pending
Review via email: mp+208708@code.launchpad.net

Description of the change

Se agrego al frujo de hr.payslip que se pueda pasar del estado Done a Cancelado

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
=== added directory 'hr_payroll_cancel'
=== added file 'hr_payroll_cancel/__init__.py'
--- hr_payroll_cancel/__init__.py 1970-01-01 00:00:00 +0000
+++ hr_payroll_cancel/__init__.py 2014-02-27 23:26:00 +0000
@@ -0,0 +1,25 @@
1# -*- encoding: utf-8 -*-
2###########################################################################
3# Module Writen to OpenERP, Open Source Management Solution
4#
5# Copyright (c) 2014 Vauxoo - http://www.vauxoo.com/
6# All Rights Reserved.
7# info Vauxoo (info@vauxoo.com)
8############################################################################
9# Coded by: Luis Torres (luis_t@vauxoo.com)
10############################################################################
11#
12# This program is free software: you can redistribute it and/or modify
13# it under the terms of the GNU Affero General Public License as
14# published by the Free Software Foundation, either version 3 of the
15# License, or (at your option) any later version.
16#
17# This program is distributed in the hope that it will be useful,
18# but WITHOUT ANY WARRANTY; without even the implied warranty of
19# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
20# GNU Affero General Public License for more details.
21#
22# You should have received a copy of the GNU Affero General Public License
23# along with this program. If not, see <http://www.gnu.org/licenses/>.
24#
25##############################################################################
026
=== added file 'hr_payroll_cancel/__openerp__.py'
--- hr_payroll_cancel/__openerp__.py 1970-01-01 00:00:00 +0000
+++ hr_payroll_cancel/__openerp__.py 2014-02-27 23:26:00 +0000
@@ -0,0 +1,47 @@
1# -*- encoding: utf-8 -*-
2###########################################################################
3# Module Writen to OpenERP, Open Source Management Solution
4#
5# Copyright (c) 2014 Vauxoo - http://www.vauxoo.com/
6# All Rights Reserved.
7# info Vauxoo (info@vauxoo.com)
8############################################################################
9# Coded by: Luis Torres (luis_t@vauxoo.com)
10############################################################################
11#
12# This program is free software: you can redistribute it and/or modify
13# it under the terms of the GNU Affero General Public License as
14# published by the Free Software Foundation, either version 3 of the
15# License, or (at your option) any later version.
16#
17# This program is distributed in the hope that it will be useful,
18# but WITHOUT ANY WARRANTY; without even the implied warranty of
19# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
20# GNU Affero General Public License for more details.
21#
22# You should have received a copy of the GNU Affero General Public License
23# along with this program. If not, see <http://www.gnu.org/licenses/>.
24#
25##############################################################################
26
27{
28 "name" : "Hr Payroll Cancel",
29 "version" : "1.0",
30 "author" : "Vauxoo",
31 "category" : "Localization/Mexico",
32 "description" : """
33 This module change the workflow from hr.payslip to can cancel after to confirm this
34 """,
35 "website" : "http://www.vauxoo.com/",
36 "license" : "AGPL-3",
37 "depends" : [
38 "hr_payroll",
39 ],
40 "data" : [
41 "hr_payslip_view.xml",
42 "hr_payslip_workflow.xml",
43 ],
44 "test": [],
45 "installable" : True,
46 "active" : False,
47}
048
=== added file 'hr_payroll_cancel/hr_payslip_view.xml'
--- hr_payroll_cancel/hr_payslip_view.xml 1970-01-01 00:00:00 +0000
+++ hr_payroll_cancel/hr_payslip_view.xml 2014-02-27 23:26:00 +0000
@@ -0,0 +1,17 @@
1<?xml version='1.0' encoding='utf-8'?>
2<openerp>
3 <data>
4
5 <record id="view_cancel_payslip_form" model="ir.ui.view">
6 <field name="name">view.cancel.payslip.form</field>
7 <field name="model">hr.payslip</field>
8 <field name="inherit_id" ref="hr_payroll.view_hr_payslip_form"/>
9 <field name="arch" type="xml">
10 <xpath expr="//button[@string='Cancel Payslip']" position="attributes">
11 <attribute name="states">draft,hr_check,confirm,verify,done</attribute>
12 </xpath>
13 </field>
14 </record>
15
16 </data>
17</openerp>
018
=== added file 'hr_payroll_cancel/hr_payslip_workflow.xml'
--- hr_payroll_cancel/hr_payslip_workflow.xml 1970-01-01 00:00:00 +0000
+++ hr_payroll_cancel/hr_payslip_workflow.xml 2014-02-27 23:26:00 +0000
@@ -0,0 +1,20 @@
1<?xml version="1.0" encoding="utf-8"?>
2<openerp>
3 <data>
4 <record id="hr_payroll.act_done" model="workflow.activity">
5 <field name="wkf_id" ref="hr_payroll.wkf"/>
6 <field name="name">done</field>
7 <field name="action">process_sheet()</field>
8 <field name="kind">function</field>
9 <field name="flow_stop"></field>
10 </record>
11
12 <record id="workflow_transition_act_done_to_act_cancel" model="workflow.transition">
13 <field name="signal">cancel_sheet</field>
14 <field model="workflow.activity" name="act_from" ref="hr_payroll.act_done"/>
15 <field model="workflow.activity" name="act_to" ref="hr_payroll.act_cancel"/>
16 <field name="condition">True</field>
17 </record>
18
19 </data>
20</openerp>