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 | 1 | #!/usr/bin/python | ||
7 | 2 | # -*- encoding: utf-8 -*- | ||
8 | 3 | ############################################################################### | ||
9 | 4 | # Module Writen to OpenERP, Open Source Management Solution | ||
10 | 5 | # Copyright (C) OpenERP Venezuela (<http://www.vauxoo.com>). | ||
11 | 6 | # All Rights Reserved | ||
12 | 7 | ############# Credits ######################################################### | ||
13 | 8 | # Coded by: Katherine Zaoral <kathy@vauxoo.com> | ||
14 | 9 | # Planified by: Humberto Arocha <hbto@vauxoo.com> | ||
15 | 10 | # Audited by: Humberto Arocha <hbto@vauxoo.com> | ||
16 | 11 | ############################################################################### | ||
17 | 12 | # This program is free software: you can redistribute it and/or modify | ||
18 | 13 | # it under the terms of the GNU Affero General Public License as published | ||
19 | 14 | # by the Free Software Foundation, either version 3 of the License, or | ||
20 | 15 | # (at your option) any later version. | ||
21 | 16 | # | ||
22 | 17 | # This program is distributed in the hope that it will be useful, | ||
23 | 18 | # but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
24 | 19 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
25 | 20 | # GNU Affero General Public License for more details. | ||
26 | 21 | # | ||
27 | 22 | # You should have received a copy of the GNU Affero General Public License | ||
28 | 23 | # along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
29 | 24 | ############################################################################### | ||
30 | 25 | |||
31 | 26 | import model | ||
32 | 27 | import wizard | ||
33 | 0 | 28 | ||
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 | 1 | #!/usr/bin/python | ||
39 | 2 | # -*- encoding: utf-8 -*- | ||
40 | 3 | ############################################################################### | ||
41 | 4 | # Module Writen to OpenERP, Open Source Management Solution | ||
42 | 5 | # Copyright (C) OpenERP Venezuela (<http://www.vauxoo.com>). | ||
43 | 6 | # All Rights Reserved | ||
44 | 7 | ############# Credits ######################################################### | ||
45 | 8 | # Coded by: Katherine Zaoral <kathy@vauxoo.com> | ||
46 | 9 | # Planified by: Humberto Arocha <hbto@vauxoo.com> | ||
47 | 10 | # Audited by: Humberto Arocha <hbto@vauxoo.com> | ||
48 | 11 | ############################################################################### | ||
49 | 12 | # This program is free software: you can redistribute it and/or modify | ||
50 | 13 | # it under the terms of the GNU Affero General Public License as published | ||
51 | 14 | # by the Free Software Foundation, either version 3 of the License, or | ||
52 | 15 | # (at your option) any later version. | ||
53 | 16 | # | ||
54 | 17 | # This program is distributed in the hope that it will be useful, | ||
55 | 18 | # but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
56 | 19 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
57 | 20 | # GNU Affero General Public License for more details. | ||
58 | 21 | # | ||
59 | 22 | # You should have received a copy of the GNU Affero General Public License | ||
60 | 23 | # along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
61 | 24 | ############################################################################### | ||
62 | 25 | |||
63 | 26 | { | ||
64 | 27 | 'name': 'Account Voucher Department', | ||
65 | 28 | 'version': '1.0', | ||
66 | 29 | 'author': 'Vauxoo', | ||
67 | 30 | 'website': 'http://www.vauxoo.com/', | ||
68 | 31 | 'category': '', | ||
69 | 32 | 'description': ''' | ||
70 | 33 | Account Voucher Department | ||
71 | 34 | ========================== | ||
72 | 35 | |||
73 | 36 | This module add a department field to the account voucher model that it is | ||
74 | 37 | automactly fill by the account voucher requester. | ||
75 | 38 | ''', | ||
76 | 39 | 'depends': [ | ||
77 | 40 | 'account_voucher', | ||
78 | 41 | 'account_voucher_requester', | ||
79 | 42 | 'hr', | ||
80 | 43 | ], | ||
81 | 44 | 'data': [ | ||
82 | 45 | 'view/account_voucher_view.xml', | ||
83 | 46 | ], | ||
84 | 47 | 'demo': [], | ||
85 | 48 | 'test': [], | ||
86 | 49 | 'qweb': [], | ||
87 | 50 | 'js': [], | ||
88 | 51 | 'css': [], | ||
89 | 52 | 'active': False, | ||
90 | 53 | 'installable': True, | ||
91 | 54 | } | ||
92 | 0 | 55 | ||
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 | 1 | # Translation of OpenERP Server. | ||
103 | 2 | # This file contains the translation of the following modules: | ||
104 | 3 | # * account_voucher_department | ||
105 | 4 | # | ||
106 | 5 | msgid "" | ||
107 | 6 | msgstr "" | ||
108 | 7 | "Project-Id-Version: OpenERP Server 7.0\n" | ||
109 | 8 | "Report-Msgid-Bugs-To: \n" | ||
110 | 9 | "POT-Creation-Date: 2014-07-08 20:05+0000\n" | ||
111 | 10 | "PO-Revision-Date: 2014-07-08 20:05+0000\n" | ||
112 | 11 | "Last-Translator: <>\n" | ||
113 | 12 | "Language-Team: \n" | ||
114 | 13 | "MIME-Version: 1.0\n" | ||
115 | 14 | "Content-Type: text/plain; charset=UTF-8\n" | ||
116 | 15 | "Content-Transfer-Encoding: \n" | ||
117 | 16 | "Plural-Forms: \n" | ||
118 | 17 | |||
119 | 18 | #. module: account_voucher_department | ||
120 | 19 | #: field:account.voucher,department_id:0 | ||
121 | 20 | msgid "Department" | ||
122 | 21 | msgstr "" | ||
123 | 22 | |||
124 | 23 | #. module: account_voucher_department | ||
125 | 24 | #: help:account.voucher,department_id:0 | ||
126 | 25 | msgid "Department were the requester belongs." | ||
127 | 26 | msgstr "" | ||
128 | 27 | |||
129 | 28 | #. module: account_voucher_department | ||
130 | 29 | #: model:ir.model,name:account_voucher_department.model_account_voucher | ||
131 | 30 | msgid "Accounting Voucher" | ||
132 | 31 | msgstr "" | ||
133 | 32 | |||
134 | 33 | #. module: account_voucher_department | ||
135 | 34 | #: view:account.voucher:0 | ||
136 | 35 | msgid "onchange_employee_id(employee_id)" | ||
137 | 36 | msgstr "" | ||
138 | 37 | |||
139 | 0 | 38 | ||
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 | 1 | #!/usr/bin/python | ||
146 | 2 | # -*- encoding: utf-8 -*- | ||
147 | 3 | ############################################################################### | ||
148 | 4 | # Module Writen to OpenERP, Open Source Management Solution | ||
149 | 5 | # Copyright (C) OpenERP Venezuela (<http://www.vauxoo.com>). | ||
150 | 6 | # All Rights Reserved | ||
151 | 7 | ############# Credits ######################################################### | ||
152 | 8 | # Coded by: Katherine Zaoral <kathy@vauxoo.com> | ||
153 | 9 | # Planified by: Humberto Arocha <hbto@vauxoo.com> | ||
154 | 10 | # Audited by: Humberto Arocha <hbto@vauxoo.com> | ||
155 | 11 | ############################################################################### | ||
156 | 12 | # This program is free software: you can redistribute it and/or modify | ||
157 | 13 | # it under the terms of the GNU Affero General Public License as published | ||
158 | 14 | # by the Free Software Foundation, either version 3 of the License, or | ||
159 | 15 | # (at your option) any later version. | ||
160 | 16 | # | ||
161 | 17 | # This program is distributed in the hope that it will be useful, | ||
162 | 18 | # but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
163 | 19 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
164 | 20 | # GNU Affero General Public License for more details. | ||
165 | 21 | # | ||
166 | 22 | # You should have received a copy of the GNU Affero General Public License | ||
167 | 23 | # along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
168 | 24 | ############################################################################### | ||
169 | 25 | |||
170 | 26 | import account_voucher | ||
171 | 0 | 27 | ||
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 | 1 | #!/usr/bin/python | ||
177 | 2 | # -*- encoding: utf-8 -*- | ||
178 | 3 | ############################################################################### | ||
179 | 4 | # Module Writen to OpenERP, Open Source Management Solution | ||
180 | 5 | # Copyright (C) OpenERP Venezuela (<http://www.vauxoo.com>). | ||
181 | 6 | # All Rights Reserved | ||
182 | 7 | ############# Credits ######################################################### | ||
183 | 8 | # Coded by: Katherine Zaoral <kathy@vauxoo.com> | ||
184 | 9 | # Planified by: Humberto Arocha <hbto@vauxoo.com> | ||
185 | 10 | # Audited by: Humberto Arocha <hbto@vauxoo.com> | ||
186 | 11 | ############################################################################### | ||
187 | 12 | # This program is free software: you can redistribute it and/or modify | ||
188 | 13 | # it under the terms of the GNU Affero General Public License as published | ||
189 | 14 | # by the Free Software Foundation, either version 3 of the License, or | ||
190 | 15 | # (at your option) any later version. | ||
191 | 16 | # | ||
192 | 17 | # This program is distributed in the hope that it will be useful, | ||
193 | 18 | # but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
194 | 19 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
195 | 20 | # GNU Affero General Public License for more details. | ||
196 | 21 | # | ||
197 | 22 | # You should have received a copy of the GNU Affero General Public License | ||
198 | 23 | # along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
199 | 24 | ############################################################################### | ||
200 | 25 | |||
201 | 26 | from openerp.osv import fields, osv, orm | ||
202 | 27 | from openerp.tools.translate import _ | ||
203 | 28 | from openerp import tools | ||
204 | 29 | |||
205 | 30 | |||
206 | 31 | class account_voucher(osv.Model): | ||
207 | 32 | |||
208 | 33 | _inherit = 'account.voucher' | ||
209 | 34 | _columns = { | ||
210 | 35 | 'department_id': fields.many2one( | ||
211 | 36 | 'hr.department', | ||
212 | 37 | string='Department', | ||
213 | 38 | help='Department were the requester belongs.'), | ||
214 | 39 | } | ||
215 | 40 | |||
216 | 41 | def onchange_employee_id(self, cr, uid, ids, employee_id, context=None): | ||
217 | 42 | """ Return the department depending of the employee. | ||
218 | 43 | @param employee_id: employee id | ||
219 | 44 | """ | ||
220 | 45 | context = context or {} | ||
221 | 46 | res = {} | ||
222 | 47 | he_obj = self.pool.get('hr.employee') | ||
223 | 48 | if employee_id: | ||
224 | 49 | he_brw = he_obj.browse(cr, uid, employee_id, context=context) | ||
225 | 50 | department_id = (he_brw.department_id and he_brw.department_id.id | ||
226 | 51 | or False) | ||
227 | 52 | res.update({'value': {'department_id': department_id}}) | ||
228 | 53 | return res | ||
229 | 0 | 54 | ||
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 | 1 | 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 | 55 | 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 | 1 | <?xml version="1.0" encoding="utf-8"?> | ||
249 | 2 | <openerp> | ||
250 | 3 | <data> | ||
251 | 4 | |||
252 | 5 | <record model="ir.ui.view" id="account_voucher_department_form"> | ||
253 | 6 | <field name="name">account.voucher.department.form</field> | ||
254 | 7 | <field name="model">account.voucher</field> | ||
255 | 8 | <field name="inherit_id" ref="account_voucher_requester.account_voucher_requester_form"/> | ||
256 | 9 | <field name="arch" type="xml"> | ||
257 | 10 | <xpath expr="//field[@name='employee_id']" position="attributes"> | ||
258 | 11 | <attribute name="on_change">onchange_employee_id(employee_id)</attribute> | ||
259 | 12 | </xpath> | ||
260 | 13 | <xpath expr="//field[@name='employee_id']" position="after"> | ||
261 | 14 | <field name="department_id"/> | ||
262 | 15 | </xpath> | ||
263 | 16 | </field> | ||
264 | 17 | </record> | ||
265 | 18 | |||
266 | 19 | </data> | ||
267 | 20 | </openerp> | ||
268 | 0 | 21 | ||
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 | 1 | #!/usr/bin/python | ||
275 | 2 | # -*- encoding: utf-8 -*- | ||
276 | 3 | ############################################################################### | ||
277 | 4 | # Module Writen to OpenERP, Open Source Management Solution | ||
278 | 5 | # Copyright (C) OpenERP Venezuela (<http://www.vauxoo.com>). | ||
279 | 6 | # All Rights Reserved | ||
280 | 7 | ############# Credits ######################################################### | ||
281 | 8 | # Coded by: Katherine Zaoral <kathy@vauxoo.com> | ||
282 | 9 | # Planified by: Humberto Arocha <hbto@vauxoo.com> | ||
283 | 10 | # Audited by: Humberto Arocha <hbto@vauxoo.com> | ||
284 | 11 | ############################################################################### | ||
285 | 12 | # This program is free software: you can redistribute it and/or modify | ||
286 | 13 | # it under the terms of the GNU Affero General Public License as published | ||
287 | 14 | # by the Free Software Foundation, either version 3 of the License, or | ||
288 | 15 | # (at your option) any later version. | ||
289 | 16 | # | ||
290 | 17 | # This program is distributed in the hope that it will be useful, | ||
291 | 18 | # but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
292 | 19 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
293 | 20 | # GNU Affero General Public License for more details. | ||
294 | 21 | # | ||
295 | 22 | # You should have received a copy of the GNU Affero General Public License | ||
296 | 23 | # along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
297 | 24 | ############################################################################### | ||
298 | 25 | |||
299 | 0 | 26 | ||
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 | 1 | #!/usr/bin/python | ||
307 | 2 | # -*- encoding: utf-8 -*- | ||
308 | 3 | ############################################################################### | ||
309 | 4 | # Module Writen to OpenERP, Open Source Management Solution | ||
310 | 5 | # Copyright (C) OpenERP Venezuela (<http://www.vauxoo.com>). | ||
311 | 6 | # All Rights Reserved | ||
312 | 7 | ############# Credits ######################################################### | ||
313 | 8 | # Coded by: Katherine Zaoral <kathy@vauxoo.com> | ||
314 | 9 | # Planified by: Humberto Arocha <hbto@vauxoo.com> | ||
315 | 10 | # Audited by: Humberto Arocha <hbto@vauxoo.com> | ||
316 | 11 | ############################################################################### | ||
317 | 12 | # This program is free software: you can redistribute it and/or modify | ||
318 | 13 | # it under the terms of the GNU Affero General Public License as published | ||
319 | 14 | # by the Free Software Foundation, either version 3 of the License, or | ||
320 | 15 | # (at your option) any later version. | ||
321 | 16 | # | ||
322 | 17 | # This program is distributed in the hope that it will be useful, | ||
323 | 18 | # but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
324 | 19 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
325 | 20 | # GNU Affero General Public License for more details. | ||
326 | 21 | # | ||
327 | 22 | # You should have received a copy of the GNU Affero General Public License | ||
328 | 23 | # along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
329 | 24 | ############################################################################### | ||
330 | 25 | |||
331 | 26 | import model | ||
332 | 27 | import wizard | ||
333 | 0 | 28 | ||
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 | 1 | #!/usr/bin/python | ||
339 | 2 | # -*- encoding: utf-8 -*- | ||
340 | 3 | ############################################################################### | ||
341 | 4 | # Module Writen to OpenERP, Open Source Management Solution | ||
342 | 5 | # Copyright (C) OpenERP Venezuela (<http://www.vauxoo.com>). | ||
343 | 6 | # All Rights Reserved | ||
344 | 7 | ############# Credits ######################################################### | ||
345 | 8 | # Coded by: Katherine Zaoral <kathy@vauxoo.com> | ||
346 | 9 | # Planified by: Humberto Arocha <hbto@vauxoo.com> | ||
347 | 10 | # Audited by: Humberto Arocha <hbto@vauxoo.com> | ||
348 | 11 | ############################################################################### | ||
349 | 12 | # This program is free software: you can redistribute it and/or modify | ||
350 | 13 | # it under the terms of the GNU Affero General Public License as published | ||
351 | 14 | # by the Free Software Foundation, either version 3 of the License, or | ||
352 | 15 | # (at your option) any later version. | ||
353 | 16 | # | ||
354 | 17 | # This program is distributed in the hope that it will be useful, | ||
355 | 18 | # but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
356 | 19 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
357 | 20 | # GNU Affero General Public License for more details. | ||
358 | 21 | # | ||
359 | 22 | # You should have received a copy of the GNU Affero General Public License | ||
360 | 23 | # along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
361 | 24 | ############################################################################### | ||
362 | 25 | |||
363 | 26 | { | ||
364 | 27 | 'name': 'Account Voucher Requester', | ||
365 | 28 | 'version': '1.0', | ||
366 | 29 | 'author': 'Vauxoo', | ||
367 | 30 | 'website': 'http://www.vauxoo.com/', | ||
368 | 31 | 'category': '', | ||
369 | 32 | 'description': ''' | ||
370 | 33 | Account Voucher Requester | ||
371 | 34 | ========================= | ||
372 | 35 | |||
373 | 36 | This module add an employee field to the account voucher model. | ||
374 | 37 | ''', | ||
375 | 38 | 'depends': [ | ||
376 | 39 | 'account_voucher', | ||
377 | 40 | 'hr', | ||
378 | 41 | ], | ||
379 | 42 | 'data': [ | ||
380 | 43 | 'view/account_voucher_view.xml', | ||
381 | 44 | ], | ||
382 | 45 | 'demo': [], | ||
383 | 46 | 'test': [], | ||
384 | 47 | 'qweb': [], | ||
385 | 48 | 'js': [], | ||
386 | 49 | 'css': [], | ||
387 | 50 | 'active': False, | ||
388 | 51 | 'installable': True, | ||
389 | 52 | } | ||
390 | 0 | 53 | ||
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 | 1 | # Translation of OpenERP Server. | ||
401 | 2 | # This file contains the translation of the following modules: | ||
402 | 3 | # * account_voucher_requester | ||
403 | 4 | # | ||
404 | 5 | msgid "" | ||
405 | 6 | msgstr "" | ||
406 | 7 | "Project-Id-Version: OpenERP Server 7.0\n" | ||
407 | 8 | "Report-Msgid-Bugs-To: \n" | ||
408 | 9 | "POT-Creation-Date: 2014-07-08 20:05+0000\n" | ||
409 | 10 | "PO-Revision-Date: 2014-07-08 20:05+0000\n" | ||
410 | 11 | "Last-Translator: <>\n" | ||
411 | 12 | "Language-Team: \n" | ||
412 | 13 | "MIME-Version: 1.0\n" | ||
413 | 14 | "Content-Type: text/plain; charset=UTF-8\n" | ||
414 | 15 | "Content-Transfer-Encoding: \n" | ||
415 | 16 | "Plural-Forms: \n" | ||
416 | 17 | |||
417 | 18 | #. module: account_voucher_requester | ||
418 | 19 | #: model:ir.model,name:account_voucher_requester.model_account_voucher | ||
419 | 20 | msgid "Accounting Voucher" | ||
420 | 21 | msgstr "" | ||
421 | 22 | |||
422 | 23 | #. module: account_voucher_requester | ||
423 | 24 | #: help:account.voucher,employee_id:0 | ||
424 | 25 | msgid "Requester Employee" | ||
425 | 26 | msgstr "" | ||
426 | 27 | |||
427 | 28 | #. module: account_voucher_requester | ||
428 | 29 | #: field:account.voucher,employee_id:0 | ||
429 | 30 | msgid "Requester" | ||
430 | 31 | msgstr "" | ||
431 | 32 | |||
432 | 0 | 33 | ||
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 | 1 | #!/usr/bin/python | ||
439 | 2 | # -*- encoding: utf-8 -*- | ||
440 | 3 | ############################################################################### | ||
441 | 4 | # Module Writen to OpenERP, Open Source Management Solution | ||
442 | 5 | # Copyright (C) OpenERP Venezuela (<http://www.vauxoo.com>). | ||
443 | 6 | # All Rights Reserved | ||
444 | 7 | ############# Credits ######################################################### | ||
445 | 8 | # Coded by: Katherine Zaoral <kathy@vauxoo.com> | ||
446 | 9 | # Planified by: Humberto Arocha <hbto@vauxoo.com> | ||
447 | 10 | # Audited by: Humberto Arocha <hbto@vauxoo.com> | ||
448 | 11 | ############################################################################### | ||
449 | 12 | # This program is free software: you can redistribute it and/or modify | ||
450 | 13 | # it under the terms of the GNU Affero General Public License as published | ||
451 | 14 | # by the Free Software Foundation, either version 3 of the License, or | ||
452 | 15 | # (at your option) any later version. | ||
453 | 16 | # | ||
454 | 17 | # This program is distributed in the hope that it will be useful, | ||
455 | 18 | # but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
456 | 19 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
457 | 20 | # GNU Affero General Public License for more details. | ||
458 | 21 | # | ||
459 | 22 | # You should have received a copy of the GNU Affero General Public License | ||
460 | 23 | # along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
461 | 24 | ############################################################################### | ||
462 | 25 | |||
463 | 26 | import account_voucher | ||
464 | 0 | 27 | ||
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 | 1 | #!/usr/bin/python | ||
470 | 2 | # -*- encoding: utf-8 -*- | ||
471 | 3 | ############################################################################### | ||
472 | 4 | # Module Writen to OpenERP, Open Source Management Solution | ||
473 | 5 | # Copyright (C) OpenERP Venezuela (<http://www.vauxoo.com>). | ||
474 | 6 | # All Rights Reserved | ||
475 | 7 | ############# Credits ######################################################### | ||
476 | 8 | # Coded by: Katherine Zaoral <kathy@vauxoo.com> | ||
477 | 9 | # Planified by: Humberto Arocha <hbto@vauxoo.com> | ||
478 | 10 | # Audited by: Humberto Arocha <hbto@vauxoo.com> | ||
479 | 11 | ############################################################################### | ||
480 | 12 | # This program is free software: you can redistribute it and/or modify | ||
481 | 13 | # it under the terms of the GNU Affero General Public License as published | ||
482 | 14 | # by the Free Software Foundation, either version 3 of the License, or | ||
483 | 15 | # (at your option) any later version. | ||
484 | 16 | # | ||
485 | 17 | # This program is distributed in the hope that it will be useful, | ||
486 | 18 | # but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
487 | 19 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
488 | 20 | # GNU Affero General Public License for more details. | ||
489 | 21 | # | ||
490 | 22 | # You should have received a copy of the GNU Affero General Public License | ||
491 | 23 | # along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
492 | 24 | ############################################################################### | ||
493 | 25 | |||
494 | 26 | from openerp.osv import fields, osv, orm | ||
495 | 27 | from openerp.tools.translate import _ | ||
496 | 28 | from openerp import tools | ||
497 | 29 | |||
498 | 30 | |||
499 | 31 | class account_voucher(osv.Model): | ||
500 | 32 | |||
501 | 33 | _inherit = 'account.voucher' | ||
502 | 34 | _columns = { | ||
503 | 35 | 'employee_id': fields.many2one( | ||
504 | 36 | 'hr.employee', | ||
505 | 37 | string='Requester', | ||
506 | 38 | help='Requester Employee'), | ||
507 | 39 | } | ||
508 | 0 | 40 | ||
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 | 1 | 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 | 41 | 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 | 1 | <?xml version="1.0" encoding="utf-8"?> | ||
528 | 2 | <openerp> | ||
529 | 3 | <data> | ||
530 | 4 | |||
531 | 5 | <record model="ir.ui.view" id="account_voucher_requester_form"> | ||
532 | 6 | <field name="name">account.voucher.requester.form</field> | ||
533 | 7 | <field name="model">account.voucher</field> | ||
534 | 8 | <field name="inherit_id" ref="account_voucher.view_vendor_payment_form"/> | ||
535 | 9 | <field name="arch" type="xml"> | ||
536 | 10 | <xpath expr="//field[@name='journal_id']" position="after"> | ||
537 | 11 | <field name="employee_id"/> | ||
538 | 12 | </xpath> | ||
539 | 13 | </field> | ||
540 | 14 | </record> | ||
541 | 15 | |||
542 | 16 | </data> | ||
543 | 17 | </openerp> | ||
544 | 0 | 18 | ||
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 | 1 | #!/usr/bin/python | ||
551 | 2 | # -*- encoding: utf-8 -*- | ||
552 | 3 | ############################################################################### | ||
553 | 4 | # Module Writen to OpenERP, Open Source Management Solution | ||
554 | 5 | # Copyright (C) OpenERP Venezuela (<http://www.vauxoo.com>). | ||
555 | 6 | # All Rights Reserved | ||
556 | 7 | ############# Credits ######################################################### | ||
557 | 8 | # Coded by: Katherine Zaoral <kathy@vauxoo.com> | ||
558 | 9 | # Planified by: Humberto Arocha <hbto@vauxoo.com> | ||
559 | 10 | # Audited by: Humberto Arocha <hbto@vauxoo.com> | ||
560 | 11 | ############################################################################### | ||
561 | 12 | # This program is free software: you can redistribute it and/or modify | ||
562 | 13 | # it under the terms of the GNU Affero General Public License as published | ||
563 | 14 | # by the Free Software Foundation, either version 3 of the License, or | ||
564 | 15 | # (at your option) any later version. | ||
565 | 16 | # | ||
566 | 17 | # This program is distributed in the hope that it will be useful, | ||
567 | 18 | # but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
568 | 19 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
569 | 20 | # GNU Affero General Public License for more details. | ||
570 | 21 | # | ||
571 | 22 | # You should have received a copy of the GNU Affero General Public License | ||
572 | 23 | # along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
573 | 24 | ############################################################################### | ||
574 | 25 | |||
575 | 0 | 26 | ||
576 | === added directory 'account_voucher_requester/workflow' |
waiting for runbot
Also need a complete functional test.