Merge lp:~vauxoo/addons-vauxoo/7.0-merge-account-voucher-generic-dev-1824-kty into lp:~vauxoo/addons-vauxoo/addons-vauxoo-cicsa
- 7.0-merge-account-voucher-generic-dev-1824-kty
- Merge into addons-vauxoo-cicsa
Proposed by
Katherine Zaoral (Vauxoo)
Status: | Merged |
---|---|
Merged at revision: | 1068 |
Proposed branch: | lp:~vauxoo/addons-vauxoo/7.0-merge-account-voucher-generic-dev-1824-kty |
Merge into: | lp:~vauxoo/addons-vauxoo/addons-vauxoo-cicsa |
Diff against target: |
576 lines (+460/-0) 14 files modified
account_voucher_department/__init__.py (+27/-0) account_voucher_department/__openerp__.py (+54/-0) account_voucher_department/i18n/account_voucher_department.pot (+37/-0) account_voucher_department/model/__init__.py (+26/-0) account_voucher_department/model/account_voucher.py (+53/-0) account_voucher_department/view/account_voucher_view.xml (+20/-0) account_voucher_department/wizard/__init__.py (+25/-0) account_voucher_requester/__init__.py (+27/-0) account_voucher_requester/__openerp__.py (+52/-0) account_voucher_requester/i18n/account_voucher_requester.pot (+32/-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-merge-account-voucher-generic-dev-1824-kty |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Katherine Zaoral (Vauxoo) | Approve | ||
Review via email: mp+226028@code.launchpad.net |
Commit message
Description of the change
[MERGE] add new generic modules account_
To post a comment you must log in.
Revision history for this message
Katherine Zaoral (Vauxoo) (kathy-zaoral) wrote : | # |
Revision history for this message
Katherine Zaoral (Vauxoo) (kathy-zaoral) wrote : | # |
runbot is green.
the functional test work propertly
I will proceed with the merge.
review:
Approve
- 1070. By Katherine Zaoral (Vauxoo)
-
[ADD] add translation templates for the two new modules.
Revision history for this message
Katherine Zaoral (Vauxoo) (kathy-zaoral) wrote : | # |
add missing translation templates files for both modules.
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === added directory 'account_voucher_department' |
2 | === added file 'account_voucher_department/__init__.py' |
3 | --- account_voucher_department/__init__.py 1970-01-01 00:00:00 +0000 |
4 | +++ account_voucher_department/__init__.py 2014-07-08 20:09:41 +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_department/__openerp__.py' |
35 | --- account_voucher_department/__openerp__.py 1970-01-01 00:00:00 +0000 |
36 | +++ account_voucher_department/__openerp__.py 2014-07-08 20:09:41 +0000 |
37 | @@ -0,0 +1,54 @@ |
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 Department', |
65 | + 'version': '1.0', |
66 | + 'author': 'Vauxoo', |
67 | + 'website': 'http://www.vauxoo.com/', |
68 | + 'category': '', |
69 | + 'description': ''' |
70 | +Account Voucher Department |
71 | +========================== |
72 | + |
73 | +This module add a department field to the account voucher model that it is |
74 | +automactly fill by the account voucher requester. |
75 | +''', |
76 | + 'depends': [ |
77 | + 'account_voucher', |
78 | + 'account_voucher_requester', |
79 | + 'hr', |
80 | + ], |
81 | + 'data': [ |
82 | + 'view/account_voucher_view.xml', |
83 | + ], |
84 | + 'demo': [], |
85 | + 'test': [], |
86 | + 'qweb': [], |
87 | + 'js': [], |
88 | + 'css': [], |
89 | + 'active': False, |
90 | + 'installable': True, |
91 | +} |
92 | |
93 | === added directory 'account_voucher_department/data' |
94 | === added directory 'account_voucher_department/demo' |
95 | === added directory 'account_voucher_department/doc' |
96 | === added directory 'account_voucher_department/doc/images' |
97 | === added directory 'account_voucher_department/i18n' |
98 | === added file 'account_voucher_department/i18n/account_voucher_department.pot' |
99 | --- account_voucher_department/i18n/account_voucher_department.pot 1970-01-01 00:00:00 +0000 |
100 | +++ account_voucher_department/i18n/account_voucher_department.pot 2014-07-08 20:09:41 +0000 |
101 | @@ -0,0 +1,37 @@ |
102 | +# Translation of OpenERP Server. |
103 | +# This file contains the translation of the following modules: |
104 | +# * account_voucher_department |
105 | +# |
106 | +msgid "" |
107 | +msgstr "" |
108 | +"Project-Id-Version: OpenERP Server 7.0\n" |
109 | +"Report-Msgid-Bugs-To: \n" |
110 | +"POT-Creation-Date: 2014-07-08 20:05+0000\n" |
111 | +"PO-Revision-Date: 2014-07-08 20:05+0000\n" |
112 | +"Last-Translator: <>\n" |
113 | +"Language-Team: \n" |
114 | +"MIME-Version: 1.0\n" |
115 | +"Content-Type: text/plain; charset=UTF-8\n" |
116 | +"Content-Transfer-Encoding: \n" |
117 | +"Plural-Forms: \n" |
118 | + |
119 | +#. module: account_voucher_department |
120 | +#: field:account.voucher,department_id:0 |
121 | +msgid "Department" |
122 | +msgstr "" |
123 | + |
124 | +#. module: account_voucher_department |
125 | +#: help:account.voucher,department_id:0 |
126 | +msgid "Department were the requester belongs." |
127 | +msgstr "" |
128 | + |
129 | +#. module: account_voucher_department |
130 | +#: model:ir.model,name:account_voucher_department.model_account_voucher |
131 | +msgid "Accounting Voucher" |
132 | +msgstr "" |
133 | + |
134 | +#. module: account_voucher_department |
135 | +#: view:account.voucher:0 |
136 | +msgid "onchange_employee_id(employee_id)" |
137 | +msgstr "" |
138 | + |
139 | |
140 | === added directory 'account_voucher_department/model' |
141 | === added file 'account_voucher_department/model/__init__.py' |
142 | --- account_voucher_department/model/__init__.py 1970-01-01 00:00:00 +0000 |
143 | +++ account_voucher_department/model/__init__.py 2014-07-08 20:09:41 +0000 |
144 | @@ -0,0 +1,26 @@ |
145 | +#!/usr/bin/python |
146 | +# -*- encoding: utf-8 -*- |
147 | +############################################################################### |
148 | +# Module Writen to OpenERP, Open Source Management Solution |
149 | +# Copyright (C) OpenERP Venezuela (<http://www.vauxoo.com>). |
150 | +# All Rights Reserved |
151 | +############# Credits ######################################################### |
152 | +# Coded by: Katherine Zaoral <kathy@vauxoo.com> |
153 | +# Planified by: Humberto Arocha <hbto@vauxoo.com> |
154 | +# Audited by: Humberto Arocha <hbto@vauxoo.com> |
155 | +############################################################################### |
156 | +# This program is free software: you can redistribute it and/or modify |
157 | +# it under the terms of the GNU Affero General Public License as published |
158 | +# by the Free Software Foundation, either version 3 of the License, or |
159 | +# (at your option) any later version. |
160 | +# |
161 | +# This program is distributed in the hope that it will be useful, |
162 | +# but WITHOUT ANY WARRANTY; without even the implied warranty of |
163 | +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
164 | +# GNU Affero General Public License for more details. |
165 | +# |
166 | +# You should have received a copy of the GNU Affero General Public License |
167 | +# along with this program. If not, see <http://www.gnu.org/licenses/>. |
168 | +############################################################################### |
169 | + |
170 | +import account_voucher |
171 | |
172 | === added file 'account_voucher_department/model/account_voucher.py' |
173 | --- account_voucher_department/model/account_voucher.py 1970-01-01 00:00:00 +0000 |
174 | +++ account_voucher_department/model/account_voucher.py 2014-07-08 20:09:41 +0000 |
175 | @@ -0,0 +1,53 @@ |
176 | +#!/usr/bin/python |
177 | +# -*- encoding: utf-8 -*- |
178 | +############################################################################### |
179 | +# Module Writen to OpenERP, Open Source Management Solution |
180 | +# Copyright (C) OpenERP Venezuela (<http://www.vauxoo.com>). |
181 | +# All Rights Reserved |
182 | +############# Credits ######################################################### |
183 | +# Coded by: Katherine Zaoral <kathy@vauxoo.com> |
184 | +# Planified by: Humberto Arocha <hbto@vauxoo.com> |
185 | +# Audited by: Humberto Arocha <hbto@vauxoo.com> |
186 | +############################################################################### |
187 | +# This program is free software: you can redistribute it and/or modify |
188 | +# it under the terms of the GNU Affero General Public License as published |
189 | +# by the Free Software Foundation, either version 3 of the License, or |
190 | +# (at your option) any later version. |
191 | +# |
192 | +# This program is distributed in the hope that it will be useful, |
193 | +# but WITHOUT ANY WARRANTY; without even the implied warranty of |
194 | +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
195 | +# GNU Affero General Public License for more details. |
196 | +# |
197 | +# You should have received a copy of the GNU Affero General Public License |
198 | +# along with this program. If not, see <http://www.gnu.org/licenses/>. |
199 | +############################################################################### |
200 | + |
201 | +from openerp.osv import fields, osv, orm |
202 | +from openerp.tools.translate import _ |
203 | +from openerp import tools |
204 | + |
205 | + |
206 | +class account_voucher(osv.Model): |
207 | + |
208 | + _inherit = 'account.voucher' |
209 | + _columns = { |
210 | + 'department_id': fields.many2one( |
211 | + 'hr.department', |
212 | + string='Department', |
213 | + help='Department were the requester belongs.'), |
214 | + } |
215 | + |
216 | + def onchange_employee_id(self, cr, uid, ids, employee_id, context=None): |
217 | + """ Return the department depending of the employee. |
218 | + @param employee_id: employee id |
219 | + """ |
220 | + context = context or {} |
221 | + res = {} |
222 | + he_obj = self.pool.get('hr.employee') |
223 | + if employee_id: |
224 | + he_brw = he_obj.browse(cr, uid, employee_id, context=context) |
225 | + department_id = (he_brw.department_id and he_brw.department_id.id |
226 | + or False) |
227 | + res.update({'value': {'department_id': department_id}}) |
228 | + return res |
229 | |
230 | === added directory 'account_voucher_department/report' |
231 | === added directory 'account_voucher_department/security' |
232 | === added directory 'account_voucher_department/static' |
233 | === added directory 'account_voucher_department/static/description' |
234 | === added file 'account_voucher_department/static/description/index.html' |
235 | === added directory 'account_voucher_department/static/src' |
236 | === added directory 'account_voucher_department/static/src/css' |
237 | === added directory 'account_voucher_department/static/src/img' |
238 | === added file 'account_voucher_department/static/src/img/icon.png' |
239 | Binary files account_voucher_department/static/src/img/icon.png 1970-01-01 00:00:00 +0000 and account_voucher_department/static/src/img/icon.png 2014-07-08 20:09:41 +0000 differ |
240 | === added directory 'account_voucher_department/static/src/js' |
241 | === added directory 'account_voucher_department/static/src/xml' |
242 | === added directory 'account_voucher_department/test' |
243 | === added directory 'account_voucher_department/view' |
244 | === added file 'account_voucher_department/view/account_voucher_view.xml' |
245 | --- account_voucher_department/view/account_voucher_view.xml 1970-01-01 00:00:00 +0000 |
246 | +++ account_voucher_department/view/account_voucher_view.xml 2014-07-08 20:09:41 +0000 |
247 | @@ -0,0 +1,20 @@ |
248 | +<?xml version="1.0" encoding="utf-8"?> |
249 | +<openerp> |
250 | + <data> |
251 | + |
252 | + <record model="ir.ui.view" id="account_voucher_department_form"> |
253 | + <field name="name">account.voucher.department.form</field> |
254 | + <field name="model">account.voucher</field> |
255 | + <field name="inherit_id" ref="account_voucher_requester.account_voucher_requester_form"/> |
256 | + <field name="arch" type="xml"> |
257 | + <xpath expr="//field[@name='employee_id']" position="attributes"> |
258 | + <attribute name="on_change">onchange_employee_id(employee_id)</attribute> |
259 | + </xpath> |
260 | + <xpath expr="//field[@name='employee_id']" position="after"> |
261 | + <field name="department_id"/> |
262 | + </xpath> |
263 | + </field> |
264 | + </record> |
265 | + |
266 | + </data> |
267 | +</openerp> |
268 | |
269 | === added directory 'account_voucher_department/wizard' |
270 | === added file 'account_voucher_department/wizard/__init__.py' |
271 | --- account_voucher_department/wizard/__init__.py 1970-01-01 00:00:00 +0000 |
272 | +++ account_voucher_department/wizard/__init__.py 2014-07-08 20:09:41 +0000 |
273 | @@ -0,0 +1,25 @@ |
274 | +#!/usr/bin/python |
275 | +# -*- encoding: utf-8 -*- |
276 | +############################################################################### |
277 | +# Module Writen to OpenERP, Open Source Management Solution |
278 | +# Copyright (C) OpenERP Venezuela (<http://www.vauxoo.com>). |
279 | +# All Rights Reserved |
280 | +############# Credits ######################################################### |
281 | +# Coded by: Katherine Zaoral <kathy@vauxoo.com> |
282 | +# Planified by: Humberto Arocha <hbto@vauxoo.com> |
283 | +# Audited by: Humberto Arocha <hbto@vauxoo.com> |
284 | +############################################################################### |
285 | +# This program is free software: you can redistribute it and/or modify |
286 | +# it under the terms of the GNU Affero General Public License as published |
287 | +# by the Free Software Foundation, either version 3 of the License, or |
288 | +# (at your option) any later version. |
289 | +# |
290 | +# This program is distributed in the hope that it will be useful, |
291 | +# but WITHOUT ANY WARRANTY; without even the implied warranty of |
292 | +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
293 | +# GNU Affero General Public License for more details. |
294 | +# |
295 | +# You should have received a copy of the GNU Affero General Public License |
296 | +# along with this program. If not, see <http://www.gnu.org/licenses/>. |
297 | +############################################################################### |
298 | + |
299 | |
300 | === added directory 'account_voucher_department/workflow' |
301 | === added directory 'account_voucher_requester' |
302 | === added file 'account_voucher_requester/__init__.py' |
303 | --- account_voucher_requester/__init__.py 1970-01-01 00:00:00 +0000 |
304 | +++ account_voucher_requester/__init__.py 2014-07-08 20:09:41 +0000 |
305 | @@ -0,0 +1,27 @@ |
306 | +#!/usr/bin/python |
307 | +# -*- encoding: utf-8 -*- |
308 | +############################################################################### |
309 | +# Module Writen to OpenERP, Open Source Management Solution |
310 | +# Copyright (C) OpenERP Venezuela (<http://www.vauxoo.com>). |
311 | +# All Rights Reserved |
312 | +############# Credits ######################################################### |
313 | +# Coded by: Katherine Zaoral <kathy@vauxoo.com> |
314 | +# Planified by: Humberto Arocha <hbto@vauxoo.com> |
315 | +# Audited by: Humberto Arocha <hbto@vauxoo.com> |
316 | +############################################################################### |
317 | +# This program is free software: you can redistribute it and/or modify |
318 | +# it under the terms of the GNU Affero General Public License as published |
319 | +# by the Free Software Foundation, either version 3 of the License, or |
320 | +# (at your option) any later version. |
321 | +# |
322 | +# This program is distributed in the hope that it will be useful, |
323 | +# but WITHOUT ANY WARRANTY; without even the implied warranty of |
324 | +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
325 | +# GNU Affero General Public License for more details. |
326 | +# |
327 | +# You should have received a copy of the GNU Affero General Public License |
328 | +# along with this program. If not, see <http://www.gnu.org/licenses/>. |
329 | +############################################################################### |
330 | + |
331 | +import model |
332 | +import wizard |
333 | |
334 | === added file 'account_voucher_requester/__openerp__.py' |
335 | --- account_voucher_requester/__openerp__.py 1970-01-01 00:00:00 +0000 |
336 | +++ account_voucher_requester/__openerp__.py 2014-07-08 20:09:41 +0000 |
337 | @@ -0,0 +1,52 @@ |
338 | +#!/usr/bin/python |
339 | +# -*- encoding: utf-8 -*- |
340 | +############################################################################### |
341 | +# Module Writen to OpenERP, Open Source Management Solution |
342 | +# Copyright (C) OpenERP Venezuela (<http://www.vauxoo.com>). |
343 | +# All Rights Reserved |
344 | +############# Credits ######################################################### |
345 | +# Coded by: Katherine Zaoral <kathy@vauxoo.com> |
346 | +# Planified by: Humberto Arocha <hbto@vauxoo.com> |
347 | +# Audited by: Humberto Arocha <hbto@vauxoo.com> |
348 | +############################################################################### |
349 | +# This program is free software: you can redistribute it and/or modify |
350 | +# it under the terms of the GNU Affero General Public License as published |
351 | +# by the Free Software Foundation, either version 3 of the License, or |
352 | +# (at your option) any later version. |
353 | +# |
354 | +# This program is distributed in the hope that it will be useful, |
355 | +# but WITHOUT ANY WARRANTY; without even the implied warranty of |
356 | +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
357 | +# GNU Affero General Public License for more details. |
358 | +# |
359 | +# You should have received a copy of the GNU Affero General Public License |
360 | +# along with this program. If not, see <http://www.gnu.org/licenses/>. |
361 | +############################################################################### |
362 | + |
363 | +{ |
364 | + 'name': 'Account Voucher Requester', |
365 | + 'version': '1.0', |
366 | + 'author': 'Vauxoo', |
367 | + 'website': 'http://www.vauxoo.com/', |
368 | + 'category': '', |
369 | + 'description': ''' |
370 | +Account Voucher Requester |
371 | +========================= |
372 | + |
373 | +This module add an employee field to the account voucher model. |
374 | +''', |
375 | + 'depends': [ |
376 | + 'account_voucher', |
377 | + 'hr', |
378 | + ], |
379 | + 'data': [ |
380 | + 'view/account_voucher_view.xml', |
381 | + ], |
382 | + 'demo': [], |
383 | + 'test': [], |
384 | + 'qweb': [], |
385 | + 'js': [], |
386 | + 'css': [], |
387 | + 'active': False, |
388 | + 'installable': True, |
389 | +} |
390 | |
391 | === added directory 'account_voucher_requester/data' |
392 | === added directory 'account_voucher_requester/demo' |
393 | === added directory 'account_voucher_requester/doc' |
394 | === added directory 'account_voucher_requester/doc/images' |
395 | === added directory 'account_voucher_requester/i18n' |
396 | === added file 'account_voucher_requester/i18n/account_voucher_requester.pot' |
397 | --- account_voucher_requester/i18n/account_voucher_requester.pot 1970-01-01 00:00:00 +0000 |
398 | +++ account_voucher_requester/i18n/account_voucher_requester.pot 2014-07-08 20:09:41 +0000 |
399 | @@ -0,0 +1,32 @@ |
400 | +# Translation of OpenERP Server. |
401 | +# This file contains the translation of the following modules: |
402 | +# * account_voucher_requester |
403 | +# |
404 | +msgid "" |
405 | +msgstr "" |
406 | +"Project-Id-Version: OpenERP Server 7.0\n" |
407 | +"Report-Msgid-Bugs-To: \n" |
408 | +"POT-Creation-Date: 2014-07-08 20:05+0000\n" |
409 | +"PO-Revision-Date: 2014-07-08 20:05+0000\n" |
410 | +"Last-Translator: <>\n" |
411 | +"Language-Team: \n" |
412 | +"MIME-Version: 1.0\n" |
413 | +"Content-Type: text/plain; charset=UTF-8\n" |
414 | +"Content-Transfer-Encoding: \n" |
415 | +"Plural-Forms: \n" |
416 | + |
417 | +#. module: account_voucher_requester |
418 | +#: model:ir.model,name:account_voucher_requester.model_account_voucher |
419 | +msgid "Accounting Voucher" |
420 | +msgstr "" |
421 | + |
422 | +#. module: account_voucher_requester |
423 | +#: help:account.voucher,employee_id:0 |
424 | +msgid "Requester Employee" |
425 | +msgstr "" |
426 | + |
427 | +#. module: account_voucher_requester |
428 | +#: field:account.voucher,employee_id:0 |
429 | +msgid "Requester" |
430 | +msgstr "" |
431 | + |
432 | |
433 | === added directory 'account_voucher_requester/model' |
434 | === added file 'account_voucher_requester/model/__init__.py' |
435 | --- account_voucher_requester/model/__init__.py 1970-01-01 00:00:00 +0000 |
436 | +++ account_voucher_requester/model/__init__.py 2014-07-08 20:09:41 +0000 |
437 | @@ -0,0 +1,26 @@ |
438 | +#!/usr/bin/python |
439 | +# -*- encoding: utf-8 -*- |
440 | +############################################################################### |
441 | +# Module Writen to OpenERP, Open Source Management Solution |
442 | +# Copyright (C) OpenERP Venezuela (<http://www.vauxoo.com>). |
443 | +# All Rights Reserved |
444 | +############# Credits ######################################################### |
445 | +# Coded by: Katherine Zaoral <kathy@vauxoo.com> |
446 | +# Planified by: Humberto Arocha <hbto@vauxoo.com> |
447 | +# Audited by: Humberto Arocha <hbto@vauxoo.com> |
448 | +############################################################################### |
449 | +# This program is free software: you can redistribute it and/or modify |
450 | +# it under the terms of the GNU Affero General Public License as published |
451 | +# by the Free Software Foundation, either version 3 of the License, or |
452 | +# (at your option) any later version. |
453 | +# |
454 | +# This program is distributed in the hope that it will be useful, |
455 | +# but WITHOUT ANY WARRANTY; without even the implied warranty of |
456 | +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
457 | +# GNU Affero General Public License for more details. |
458 | +# |
459 | +# You should have received a copy of the GNU Affero General Public License |
460 | +# along with this program. If not, see <http://www.gnu.org/licenses/>. |
461 | +############################################################################### |
462 | + |
463 | +import account_voucher |
464 | |
465 | === added file 'account_voucher_requester/model/account_voucher.py' |
466 | --- account_voucher_requester/model/account_voucher.py 1970-01-01 00:00:00 +0000 |
467 | +++ account_voucher_requester/model/account_voucher.py 2014-07-08 20:09:41 +0000 |
468 | @@ -0,0 +1,39 @@ |
469 | +#!/usr/bin/python |
470 | +# -*- encoding: utf-8 -*- |
471 | +############################################################################### |
472 | +# Module Writen to OpenERP, Open Source Management Solution |
473 | +# Copyright (C) OpenERP Venezuela (<http://www.vauxoo.com>). |
474 | +# All Rights Reserved |
475 | +############# Credits ######################################################### |
476 | +# Coded by: Katherine Zaoral <kathy@vauxoo.com> |
477 | +# Planified by: Humberto Arocha <hbto@vauxoo.com> |
478 | +# Audited by: Humberto Arocha <hbto@vauxoo.com> |
479 | +############################################################################### |
480 | +# This program is free software: you can redistribute it and/or modify |
481 | +# it under the terms of the GNU Affero General Public License as published |
482 | +# by the Free Software Foundation, either version 3 of the License, or |
483 | +# (at your option) any later version. |
484 | +# |
485 | +# This program is distributed in the hope that it will be useful, |
486 | +# but WITHOUT ANY WARRANTY; without even the implied warranty of |
487 | +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
488 | +# GNU Affero General Public License for more details. |
489 | +# |
490 | +# You should have received a copy of the GNU Affero General Public License |
491 | +# along with this program. If not, see <http://www.gnu.org/licenses/>. |
492 | +############################################################################### |
493 | + |
494 | +from openerp.osv import fields, osv, orm |
495 | +from openerp.tools.translate import _ |
496 | +from openerp import tools |
497 | + |
498 | + |
499 | +class account_voucher(osv.Model): |
500 | + |
501 | + _inherit = 'account.voucher' |
502 | + _columns = { |
503 | + 'employee_id': fields.many2one( |
504 | + 'hr.employee', |
505 | + string='Requester', |
506 | + help='Requester Employee'), |
507 | + } |
508 | |
509 | === added directory 'account_voucher_requester/report' |
510 | === added directory 'account_voucher_requester/security' |
511 | === added directory 'account_voucher_requester/static' |
512 | === added directory 'account_voucher_requester/static/description' |
513 | === added file 'account_voucher_requester/static/description/index.html' |
514 | === added directory 'account_voucher_requester/static/src' |
515 | === added directory 'account_voucher_requester/static/src/css' |
516 | === added directory 'account_voucher_requester/static/src/img' |
517 | === added file 'account_voucher_requester/static/src/img/icon.png' |
518 | Binary 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 20:09:41 +0000 differ |
519 | === added directory 'account_voucher_requester/static/src/js' |
520 | === added directory 'account_voucher_requester/static/src/xml' |
521 | === added directory 'account_voucher_requester/test' |
522 | === added directory 'account_voucher_requester/view' |
523 | === added file 'account_voucher_requester/view/account_voucher_view.xml' |
524 | --- account_voucher_requester/view/account_voucher_view.xml 1970-01-01 00:00:00 +0000 |
525 | +++ account_voucher_requester/view/account_voucher_view.xml 2014-07-08 20:09:41 +0000 |
526 | @@ -0,0 +1,17 @@ |
527 | +<?xml version="1.0" encoding="utf-8"?> |
528 | +<openerp> |
529 | + <data> |
530 | + |
531 | + <record model="ir.ui.view" id="account_voucher_requester_form"> |
532 | + <field name="name">account.voucher.requester.form</field> |
533 | + <field name="model">account.voucher</field> |
534 | + <field name="inherit_id" ref="account_voucher.view_vendor_payment_form"/> |
535 | + <field name="arch" type="xml"> |
536 | + <xpath expr="//field[@name='journal_id']" position="after"> |
537 | + <field name="employee_id"/> |
538 | + </xpath> |
539 | + </field> |
540 | + </record> |
541 | + |
542 | + </data> |
543 | +</openerp> |
544 | |
545 | === added directory 'account_voucher_requester/wizard' |
546 | === added file 'account_voucher_requester/wizard/__init__.py' |
547 | --- account_voucher_requester/wizard/__init__.py 1970-01-01 00:00:00 +0000 |
548 | +++ account_voucher_requester/wizard/__init__.py 2014-07-08 20:09:41 +0000 |
549 | @@ -0,0 +1,25 @@ |
550 | +#!/usr/bin/python |
551 | +# -*- encoding: utf-8 -*- |
552 | +############################################################################### |
553 | +# Module Writen to OpenERP, Open Source Management Solution |
554 | +# Copyright (C) OpenERP Venezuela (<http://www.vauxoo.com>). |
555 | +# All Rights Reserved |
556 | +############# Credits ######################################################### |
557 | +# Coded by: Katherine Zaoral <kathy@vauxoo.com> |
558 | +# Planified by: Humberto Arocha <hbto@vauxoo.com> |
559 | +# Audited by: Humberto Arocha <hbto@vauxoo.com> |
560 | +############################################################################### |
561 | +# This program is free software: you can redistribute it and/or modify |
562 | +# it under the terms of the GNU Affero General Public License as published |
563 | +# by the Free Software Foundation, either version 3 of the License, or |
564 | +# (at your option) any later version. |
565 | +# |
566 | +# This program is distributed in the hope that it will be useful, |
567 | +# but WITHOUT ANY WARRANTY; without even the implied warranty of |
568 | +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
569 | +# GNU Affero General Public License for more details. |
570 | +# |
571 | +# You should have received a copy of the GNU Affero General Public License |
572 | +# along with this program. If not, see <http://www.gnu.org/licenses/>. |
573 | +############################################################################### |
574 | + |
575 | |
576 | === added directory 'account_voucher_requester/workflow' |
waiting for runbot
Also need a complete functional test.