Merge lp:~vauxoo/addons-vauxoo/7.0-account_voucher_requester-dev-1824-kty into lp:~vauxoo/addons-vauxoo/7.0-merge-account-voucher-generic-dev-1824-kty

Proposed by Katherine Zaoral (Vauxoo)
Status: Merged
Merged at revision: 1068
Proposed branch: lp:~vauxoo/addons-vauxoo/7.0-account_voucher_requester-dev-1824-kty
Merge into: lp:~vauxoo/addons-vauxoo/7.0-merge-account-voucher-generic-dev-1824-kty
Diff against target: 239 lines (+186/-0)
6 files modified
account_voucher_requester/__init__.py (+27/-0)
account_voucher_requester/__openerp__.py (+52/-0)
account_voucher_requester/model/__init__.py (+26/-0)
account_voucher_requester/model/account_voucher.py (+39/-0)
account_voucher_requester/view/account_voucher_view.xml (+17/-0)
account_voucher_requester/wizard/__init__.py (+25/-0)
To merge this branch: bzr merge lp:~vauxoo/addons-vauxoo/7.0-account_voucher_requester-dev-1824-kty
Reviewer Review Type Date Requested Status
Katherine Zaoral (Vauxoo) Approve
Review via email: mp+226023@code.launchpad.net

Description of the change

[MERGE] add new generic module account_voucher_requester

To post a comment you must log in.
Revision history for this message
Katherine Zaoral (Vauxoo) (kathy-zaoral) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added directory 'account_voucher_requester'
2=== added file 'account_voucher_requester/__init__.py'
3--- account_voucher_requester/__init__.py 1970-01-01 00:00:00 +0000
4+++ account_voucher_requester/__init__.py 2014-07-08 19:06:37 +0000
5@@ -0,0 +1,27 @@
6+#!/usr/bin/python
7+# -*- encoding: utf-8 -*-
8+###############################################################################
9+# Module Writen to OpenERP, Open Source Management Solution
10+# Copyright (C) OpenERP Venezuela (<http://www.vauxoo.com>).
11+# All Rights Reserved
12+############# Credits #########################################################
13+# Coded by: Katherine Zaoral <kathy@vauxoo.com>
14+# Planified by: Humberto Arocha <hbto@vauxoo.com>
15+# Audited by: Humberto Arocha <hbto@vauxoo.com>
16+###############################################################################
17+# This program is free software: you can redistribute it and/or modify
18+# it under the terms of the GNU Affero General Public License as published
19+# by the Free Software Foundation, either version 3 of the License, or
20+# (at your option) any later version.
21+#
22+# This program is distributed in the hope that it will be useful,
23+# but WITHOUT ANY WARRANTY; without even the implied warranty of
24+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
25+# GNU Affero General Public License for more details.
26+#
27+# You should have received a copy of the GNU Affero General Public License
28+# along with this program. If not, see <http://www.gnu.org/licenses/>.
29+###############################################################################
30+
31+import model
32+import wizard
33
34=== added file 'account_voucher_requester/__openerp__.py'
35--- account_voucher_requester/__openerp__.py 1970-01-01 00:00:00 +0000
36+++ account_voucher_requester/__openerp__.py 2014-07-08 19:06:37 +0000
37@@ -0,0 +1,52 @@
38+#!/usr/bin/python
39+# -*- encoding: utf-8 -*-
40+###############################################################################
41+# Module Writen to OpenERP, Open Source Management Solution
42+# Copyright (C) OpenERP Venezuela (<http://www.vauxoo.com>).
43+# All Rights Reserved
44+############# Credits #########################################################
45+# Coded by: Katherine Zaoral <kathy@vauxoo.com>
46+# Planified by: Humberto Arocha <hbto@vauxoo.com>
47+# Audited by: Humberto Arocha <hbto@vauxoo.com>
48+###############################################################################
49+# This program is free software: you can redistribute it and/or modify
50+# it under the terms of the GNU Affero General Public License as published
51+# by the Free Software Foundation, either version 3 of the License, or
52+# (at your option) any later version.
53+#
54+# This program is distributed in the hope that it will be useful,
55+# but WITHOUT ANY WARRANTY; without even the implied warranty of
56+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
57+# GNU Affero General Public License for more details.
58+#
59+# You should have received a copy of the GNU Affero General Public License
60+# along with this program. If not, see <http://www.gnu.org/licenses/>.
61+###############################################################################
62+
63+{
64+ 'name': 'Account Voucher Requester',
65+ 'version': '1.0',
66+ 'author': 'Vauxoo',
67+ 'website': 'http://www.vauxoo.com/',
68+ 'category': '',
69+ 'description': '''
70+Account Voucher Requester
71+=========================
72+
73+This module add an employee field to the account voucher model.
74+''',
75+ 'depends': [
76+ 'account_voucher',
77+ 'hr',
78+ ],
79+ 'data': [
80+ 'view/account_voucher_view.xml',
81+ ],
82+ 'demo': [],
83+ 'test': [],
84+ 'qweb': [],
85+ 'js': [],
86+ 'css': [],
87+ 'active': False,
88+ 'installable': True,
89+}
90
91=== added directory 'account_voucher_requester/data'
92=== added directory 'account_voucher_requester/demo'
93=== added directory 'account_voucher_requester/doc'
94=== added directory 'account_voucher_requester/doc/images'
95=== added directory 'account_voucher_requester/i18n'
96=== added directory 'account_voucher_requester/model'
97=== added file 'account_voucher_requester/model/__init__.py'
98--- account_voucher_requester/model/__init__.py 1970-01-01 00:00:00 +0000
99+++ account_voucher_requester/model/__init__.py 2014-07-08 19:06:37 +0000
100@@ -0,0 +1,26 @@
101+#!/usr/bin/python
102+# -*- encoding: utf-8 -*-
103+###############################################################################
104+# Module Writen to OpenERP, Open Source Management Solution
105+# Copyright (C) OpenERP Venezuela (<http://www.vauxoo.com>).
106+# All Rights Reserved
107+############# Credits #########################################################
108+# Coded by: Katherine Zaoral <kathy@vauxoo.com>
109+# Planified by: Humberto Arocha <hbto@vauxoo.com>
110+# Audited by: Humberto Arocha <hbto@vauxoo.com>
111+###############################################################################
112+# This program is free software: you can redistribute it and/or modify
113+# it under the terms of the GNU Affero General Public License as published
114+# by the Free Software Foundation, either version 3 of the License, or
115+# (at your option) any later version.
116+#
117+# This program is distributed in the hope that it will be useful,
118+# but WITHOUT ANY WARRANTY; without even the implied warranty of
119+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
120+# GNU Affero General Public License for more details.
121+#
122+# You should have received a copy of the GNU Affero General Public License
123+# along with this program. If not, see <http://www.gnu.org/licenses/>.
124+###############################################################################
125+
126+import account_voucher
127
128=== added file 'account_voucher_requester/model/account_voucher.py'
129--- account_voucher_requester/model/account_voucher.py 1970-01-01 00:00:00 +0000
130+++ account_voucher_requester/model/account_voucher.py 2014-07-08 19:06:37 +0000
131@@ -0,0 +1,39 @@
132+#!/usr/bin/python
133+# -*- encoding: utf-8 -*-
134+###############################################################################
135+# Module Writen to OpenERP, Open Source Management Solution
136+# Copyright (C) OpenERP Venezuela (<http://www.vauxoo.com>).
137+# All Rights Reserved
138+############# Credits #########################################################
139+# Coded by: Katherine Zaoral <kathy@vauxoo.com>
140+# Planified by: Humberto Arocha <hbto@vauxoo.com>
141+# Audited by: Humberto Arocha <hbto@vauxoo.com>
142+###############################################################################
143+# This program is free software: you can redistribute it and/or modify
144+# it under the terms of the GNU Affero General Public License as published
145+# by the Free Software Foundation, either version 3 of the License, or
146+# (at your option) any later version.
147+#
148+# This program is distributed in the hope that it will be useful,
149+# but WITHOUT ANY WARRANTY; without even the implied warranty of
150+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
151+# GNU Affero General Public License for more details.
152+#
153+# You should have received a copy of the GNU Affero General Public License
154+# along with this program. If not, see <http://www.gnu.org/licenses/>.
155+###############################################################################
156+
157+from openerp.osv import fields, osv, orm
158+from openerp.tools.translate import _
159+from openerp import tools
160+
161+
162+class account_voucher(osv.Model):
163+
164+ _inherit = 'account.voucher'
165+ _columns = {
166+ 'employee_id': fields.many2one(
167+ 'hr.employee',
168+ string='Requester',
169+ help='Requester Employee'),
170+ }
171
172=== added directory 'account_voucher_requester/report'
173=== added directory 'account_voucher_requester/security'
174=== added directory 'account_voucher_requester/static'
175=== added directory 'account_voucher_requester/static/description'
176=== added file 'account_voucher_requester/static/description/index.html'
177=== added directory 'account_voucher_requester/static/src'
178=== added directory 'account_voucher_requester/static/src/css'
179=== added directory 'account_voucher_requester/static/src/img'
180=== added file 'account_voucher_requester/static/src/img/icon.png'
181Binary files account_voucher_requester/static/src/img/icon.png 1970-01-01 00:00:00 +0000 and account_voucher_requester/static/src/img/icon.png 2014-07-08 19:06:37 +0000 differ
182=== added directory 'account_voucher_requester/static/src/js'
183=== added directory 'account_voucher_requester/static/src/xml'
184=== added directory 'account_voucher_requester/test'
185=== added directory 'account_voucher_requester/view'
186=== added file 'account_voucher_requester/view/account_voucher_view.xml'
187--- account_voucher_requester/view/account_voucher_view.xml 1970-01-01 00:00:00 +0000
188+++ account_voucher_requester/view/account_voucher_view.xml 2014-07-08 19:06:37 +0000
189@@ -0,0 +1,17 @@
190+<?xml version="1.0" encoding="utf-8"?>
191+<openerp>
192+ <data>
193+
194+ <record model="ir.ui.view" id="account_voucher_requester_form">
195+ <field name="name">account.voucher.requester.form</field>
196+ <field name="model">account.voucher</field>
197+ <field name="inherit_id" ref="account_voucher.view_vendor_payment_form"/>
198+ <field name="arch" type="xml">
199+ <xpath expr="//field[@name='journal_id']" position="after">
200+ <field name="employee_id"/>
201+ </xpath>
202+ </field>
203+ </record>
204+
205+ </data>
206+</openerp>
207
208=== added directory 'account_voucher_requester/wizard'
209=== added file 'account_voucher_requester/wizard/__init__.py'
210--- account_voucher_requester/wizard/__init__.py 1970-01-01 00:00:00 +0000
211+++ account_voucher_requester/wizard/__init__.py 2014-07-08 19:06:37 +0000
212@@ -0,0 +1,25 @@
213+#!/usr/bin/python
214+# -*- encoding: utf-8 -*-
215+###############################################################################
216+# Module Writen to OpenERP, Open Source Management Solution
217+# Copyright (C) OpenERP Venezuela (<http://www.vauxoo.com>).
218+# All Rights Reserved
219+############# Credits #########################################################
220+# Coded by: Katherine Zaoral <kathy@vauxoo.com>
221+# Planified by: Humberto Arocha <hbto@vauxoo.com>
222+# Audited by: Humberto Arocha <hbto@vauxoo.com>
223+###############################################################################
224+# This program is free software: you can redistribute it and/or modify
225+# it under the terms of the GNU Affero General Public License as published
226+# by the Free Software Foundation, either version 3 of the License, or
227+# (at your option) any later version.
228+#
229+# This program is distributed in the hope that it will be useful,
230+# but WITHOUT ANY WARRANTY; without even the implied warranty of
231+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
232+# GNU Affero General Public License for more details.
233+#
234+# You should have received a copy of the GNU Affero General Public License
235+# along with this program. If not, see <http://www.gnu.org/licenses/>.
236+###############################################################################
237+
238
239=== added directory 'account_voucher_requester/workflow'

Subscribers

People subscribed via source and target branches

to all changes: