Merge lp:~vauxoo/addons-vauxoo/addons-vauxoo-cicsa into lp:addons-vauxoo/7.0
- addons-vauxoo-cicsa
- Merge into 7.0
Proposed by
hbto [Vauxoo] http://www.vauxoo.com
Status: | Merged |
---|---|
Approved by: | hbto [Vauxoo] http://www.vauxoo.com |
Approved revision: | 1067 |
Merged at revision: | 1071 |
Proposed branch: | lp:~vauxoo/addons-vauxoo/addons-vauxoo-cicsa |
Merge into: | lp:addons-vauxoo/7.0 |
Diff against target: |
1616 lines (+1200/-26) 40 files modified
analytic_entry_line_group/__init__.py (+27/-0) analytic_entry_line_group/__openerp__.py (+55/-0) analytic_entry_line_group/model/__init__.py (+26/-0) analytic_entry_line_group/model/account_analytic_plans.py (+42/-0) analytic_entry_line_group/view/account_analytic_plans_view.xml (+46/-0) analytic_entry_line_group/wizard/__init__.py (+25/-0) analytic_entry_line_partner/__init__.py (+27/-0) analytic_entry_line_partner/__openerp__.py (+54/-0) analytic_entry_line_partner/model/__init__.py (+26/-0) analytic_entry_line_partner/model/account_analytic_plans.py (+59/-0) analytic_entry_line_partner/view/account_analytic_plans_view.xml (+38/-0) analytic_entry_line_partner/wizard/__init__.py (+25/-0) analytic_entry_line_plans/__init__.py (+27/-0) analytic_entry_line_plans/__openerp__.py (+54/-0) analytic_entry_line_plans/model/__init__.py (+26/-0) analytic_entry_line_plans/model/account_analytic_plans.py (+59/-0) analytic_entry_line_plans/view/account_analytic_plans_view.xml (+39/-0) analytic_entry_line_plans/wizard/__init__.py (+25/-0) analytic_entry_line_taxcode/__init__.py (+27/-0) analytic_entry_line_taxcode/__openerp__.py (+54/-0) analytic_entry_line_taxcode/model/__init__.py (+26/-0) analytic_entry_line_taxcode/model/account_analytic_plans.py (+60/-0) analytic_entry_line_taxcode/view/account_analytic_plans_view.xml (+39/-0) analytic_entry_line_taxcode/wizard/__init__.py (+25/-0) analytic_plans_group/__init__.py (+27/-0) analytic_plans_group/__openerp__.py (+57/-0) analytic_plans_group/data/res_groups.xml (+8/-0) analytic_plans_group/model/__init__.py (+26/-0) analytic_plans_group/model/account_analytic_plans.py (+46/-0) analytic_plans_group/security/ir.model.access.csv (+2/-0) analytic_plans_group/view/account_analytic_plans_view.xml (+48/-0) analytic_plans_group/wizard/__init__.py (+25/-0) pr_line_related_po_line/__openerp__.py (+1/-1) purchase_order_department/__openerp__.py (+1/-0) purchase_order_department/model/purchase_order.py (+21/-0) purchase_requisition_department/model/purchase_requisition.py (+14/-3) purchase_requisition_department/view/purchase_requisition_view.xml (+4/-0) purchase_requisition_line_plan/__openerp__.py (+1/-2) purchase_requisition_line_plan/model/purchase_requisition.py (+4/-16) purchase_requisition_line_plan/view/purchase_requisition_view.xml (+4/-4) |
To merge this branch: | bzr merge lp:~vauxoo/addons-vauxoo/addons-vauxoo-cicsa |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
hbto [Vauxoo] http://www.vauxoo.com | Approve | ||
Review via email:
|
Commit message
Description of the change
[IMP] change account_
[MERGE] get with a onchange method the department_id from the purchase
requisition user (requisitor). In the case that the purchase requisition
generate a purchase orderand set the purchase order the department of the
purchase order is set with the one given in the purchase requisition.
[ADD] A new module called analytic_
To post a comment you must log in.
Revision history for this message
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
hbto [Vauxoo] http://www.vauxoo.com (humbertoarocha) wrote : | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === added directory 'analytic_entry_line_group' |
2 | === added file 'analytic_entry_line_group/__init__.py' |
3 | --- analytic_entry_line_group/__init__.py 1970-01-01 00:00:00 +0000 |
4 | +++ analytic_entry_line_group/__init__.py 2014-07-07 15:46:25 +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: Yanina Aular <yani@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 'analytic_entry_line_group/__openerp__.py' |
35 | --- analytic_entry_line_group/__openerp__.py 1970-01-01 00:00:00 +0000 |
36 | +++ analytic_entry_line_group/__openerp__.py 2014-07-07 15:46:25 +0000 |
37 | @@ -0,0 +1,55 @@ |
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: Yanina Aular <yani@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': 'Analytic Entry Line Group', |
65 | + 'version': '1.0', |
66 | + 'author': 'Vauxoo', |
67 | + 'website': 'http://www.vauxoo.com/', |
68 | + 'category': '', |
69 | + 'description': ''' |
70 | +Analytic Entry Line Group |
71 | +------------------------- |
72 | +This module takes analytic_group_id field from analytic account for grouping of |
73 | +analytics entry lines. |
74 | + |
75 | +''', |
76 | + 'depends': [ |
77 | + 'analytic', |
78 | + 'account_analytic_plans', |
79 | + 'purchase_analytic_plans', |
80 | + 'analytic_plans_group', |
81 | + ], |
82 | + 'data': [ |
83 | + 'view/account_analytic_plans_view.xml', |
84 | + ], |
85 | + 'demo': [], |
86 | + 'test': [], |
87 | + 'qweb': [], |
88 | + 'js': [], |
89 | + 'css': [], |
90 | + 'active': False, |
91 | + 'installable': True, |
92 | +} |
93 | |
94 | === added directory 'analytic_entry_line_group/data' |
95 | === added directory 'analytic_entry_line_group/demo' |
96 | === added directory 'analytic_entry_line_group/doc' |
97 | === added directory 'analytic_entry_line_group/doc/images' |
98 | === added directory 'analytic_entry_line_group/i18n' |
99 | === added directory 'analytic_entry_line_group/model' |
100 | === added file 'analytic_entry_line_group/model/__init__.py' |
101 | --- analytic_entry_line_group/model/__init__.py 1970-01-01 00:00:00 +0000 |
102 | +++ analytic_entry_line_group/model/__init__.py 2014-07-07 15:46:25 +0000 |
103 | @@ -0,0 +1,26 @@ |
104 | +#!/usr/bin/python |
105 | +# -*- encoding: utf-8 -*- |
106 | +############################################################################### |
107 | +# Module Writen to OpenERP, Open Source Management Solution |
108 | +# Copyright (C) OpenERP Venezuela (<http://www.vauxoo.com>). |
109 | +# All Rights Reserved |
110 | +############# Credits ######################################################### |
111 | +# Coded by: Yanina Aular <yani@vauxoo.com> |
112 | +# Planified by: Humberto Arocha <hbto@vauxoo.com> |
113 | +# Audited by: Humberto Arocha <hbto@vauxoo.com> |
114 | +############################################################################### |
115 | +# This program is free software: you can redistribute it and/or modify |
116 | +# it under the terms of the GNU Affero General Public License as published |
117 | +# by the Free Software Foundation, either version 3 of the License, or |
118 | +# (at your option) any later version. |
119 | +# |
120 | +# This program is distributed in the hope that it will be useful, |
121 | +# but WITHOUT ANY WARRANTY; without even the implied warranty of |
122 | +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
123 | +# GNU Affero General Public License for more details. |
124 | +# |
125 | +# You should have received a copy of the GNU Affero General Public License |
126 | +# along with this program. If not, see <http://www.gnu.org/licenses/>. |
127 | +############################################################################### |
128 | + |
129 | +import account_analytic_plans |
130 | |
131 | === added file 'analytic_entry_line_group/model/account_analytic_plans.py' |
132 | --- analytic_entry_line_group/model/account_analytic_plans.py 1970-01-01 00:00:00 +0000 |
133 | +++ analytic_entry_line_group/model/account_analytic_plans.py 2014-07-07 15:46:25 +0000 |
134 | @@ -0,0 +1,42 @@ |
135 | +#!/usr/bin/python |
136 | +# -*- encoding: utf-8 -*- |
137 | +############################################################################### |
138 | +# Module Writen to OpenERP, Open Source Management Solution |
139 | +# Copyright (C) OpenERP Venezuela (<http://www.vauxoo.com>). |
140 | +# All Rights Reserved |
141 | +############# Credits ######################################################### |
142 | +# Coded by: Yanina Aular <yani@vauxoo.com> |
143 | +# Planified by: Humberto Arocha <hbto@vauxoo.com> |
144 | +# Audited by: Humberto Arocha <hbto@vauxoo.com> |
145 | +############################################################################### |
146 | +# This program is free software: you can redistribute it and/or modify |
147 | +# it under the terms of the GNU Affero General Public License as published |
148 | +# by the Free Software Foundation, either version 3 of the License, or |
149 | +# (at your option) any later version. |
150 | +# |
151 | +# This program is distributed in the hope that it will be useful, |
152 | +# but WITHOUT ANY WARRANTY; without even the implied warranty of |
153 | +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
154 | +# GNU Affero General Public License for more details. |
155 | +# |
156 | +# You should have received a copy of the GNU Affero General Public License |
157 | +# along with this program. If not, see <http://www.gnu.org/licenses/>. |
158 | +############################################################################### |
159 | + |
160 | +import time |
161 | +from lxml import etree |
162 | + |
163 | +from openerp.osv import fields, osv |
164 | +from openerp import tools |
165 | +from openerp.tools.translate import _ |
166 | + |
167 | +class account_analytic_line(osv.Model): |
168 | + |
169 | + _inherit = 'account.analytic.line' |
170 | + |
171 | + _columns = { |
172 | + 'analytic_group_id': fields.related('account_id', 'analytic_group_id', |
173 | + type='many2one', relation='account.analytic.group', string='Analytic Group', |
174 | + store=True, readonly=True), |
175 | + } |
176 | + |
177 | |
178 | === added directory 'analytic_entry_line_group/report' |
179 | === added directory 'analytic_entry_line_group/security' |
180 | === added directory 'analytic_entry_line_group/static' |
181 | === added directory 'analytic_entry_line_group/static/description' |
182 | === added file 'analytic_entry_line_group/static/description/index.html' |
183 | === added directory 'analytic_entry_line_group/static/src' |
184 | === added directory 'analytic_entry_line_group/static/src/css' |
185 | === added directory 'analytic_entry_line_group/static/src/img' |
186 | === added file 'analytic_entry_line_group/static/src/img/icon.png' |
187 | Binary files analytic_entry_line_group/static/src/img/icon.png 1970-01-01 00:00:00 +0000 and analytic_entry_line_group/static/src/img/icon.png 2014-07-07 15:46:25 +0000 differ |
188 | === added directory 'analytic_entry_line_group/static/src/js' |
189 | === added directory 'analytic_entry_line_group/static/src/xml' |
190 | === added directory 'analytic_entry_line_group/test' |
191 | === added directory 'analytic_entry_line_group/view' |
192 | === added file 'analytic_entry_line_group/view/account_analytic_plans_view.xml' |
193 | --- analytic_entry_line_group/view/account_analytic_plans_view.xml 1970-01-01 00:00:00 +0000 |
194 | +++ analytic_entry_line_group/view/account_analytic_plans_view.xml 2014-07-07 15:46:25 +0000 |
195 | @@ -0,0 +1,46 @@ |
196 | +<?xml version="1.0" encoding="utf-8"?> |
197 | +<openerp> |
198 | + <data> |
199 | + |
200 | + <record id="view_account_analytic_line_form_group" model="ir.ui.view"> |
201 | + <field name="name">account.analytic.line.form.group</field> |
202 | + <field name="model">account.analytic.line</field> |
203 | + <field name="inherit_id" ref="account.view_account_analytic_line_form"/> |
204 | + <field name="arch" type="xml"> |
205 | + <xpath expr="//field[@name='company_id']" position="after"> |
206 | + <field name="analytic_group_id" |
207 | + groups="analytic_plans_group.group_account_analytic_group" |
208 | + readonly="1"/> |
209 | + </xpath> |
210 | + </field> |
211 | + </record> |
212 | + |
213 | + <record id="view_account_analytic_line_tree_group" model="ir.ui.view"> |
214 | + <field name="name">account.analytic.line.tree.group</field> |
215 | + <field name="model">account.analytic.line</field> |
216 | + <field name="inherit_id" ref="account.view_account_analytic_line_tree"/> |
217 | + <field name="arch" type="xml"> |
218 | + <xpath expr="//field[@name='date']" position="after"> |
219 | + <field name="analytic_group_id" |
220 | + groups="analytic_plans_group.group_account_analytic_group" |
221 | + /> |
222 | + </xpath> |
223 | + </field> |
224 | + </record> |
225 | + |
226 | + |
227 | + <record id="view_account_analytic_line_filter_group" model="ir.ui.view"> |
228 | + <field name="name">account.analytic.line.filter.group</field> |
229 | + <field name="model">account.analytic.line</field> |
230 | + <field name="inherit_id" ref="account.view_account_analytic_line_filter"/> |
231 | + <field name="arch" type="xml"> |
232 | + <xpath expr="//group" position="inside"> |
233 | + <filter string="Analytic Group" |
234 | + groups="analytic_plans_group.group_account_analytic_group" |
235 | + context="{'group_by':'analytic_group_id'}"/> |
236 | + </xpath> |
237 | + </field> |
238 | + </record> |
239 | + |
240 | + </data> |
241 | +</openerp> |
242 | |
243 | === added directory 'analytic_entry_line_group/wizard' |
244 | === added file 'analytic_entry_line_group/wizard/__init__.py' |
245 | --- analytic_entry_line_group/wizard/__init__.py 1970-01-01 00:00:00 +0000 |
246 | +++ analytic_entry_line_group/wizard/__init__.py 2014-07-07 15:46:25 +0000 |
247 | @@ -0,0 +1,25 @@ |
248 | +#!/usr/bin/python |
249 | +# -*- encoding: utf-8 -*- |
250 | +############################################################################### |
251 | +# Module Writen to OpenERP, Open Source Management Solution |
252 | +# Copyright (C) OpenERP Venezuela (<http://www.vauxoo.com>). |
253 | +# All Rights Reserved |
254 | +############# Credits ######################################################### |
255 | +# Coded by: Yanina Aular <yani@vauxoo.com> |
256 | +# Planified by: Humberto Arocha <hbto@vauxoo.com> |
257 | +# Audited by: Humberto Arocha <hbto@vauxoo.com> |
258 | +############################################################################### |
259 | +# This program is free software: you can redistribute it and/or modify |
260 | +# it under the terms of the GNU Affero General Public License as published |
261 | +# by the Free Software Foundation, either version 3 of the License, or |
262 | +# (at your option) any later version. |
263 | +# |
264 | +# This program is distributed in the hope that it will be useful, |
265 | +# but WITHOUT ANY WARRANTY; without even the implied warranty of |
266 | +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
267 | +# GNU Affero General Public License for more details. |
268 | +# |
269 | +# You should have received a copy of the GNU Affero General Public License |
270 | +# along with this program. If not, see <http://www.gnu.org/licenses/>. |
271 | +############################################################################### |
272 | + |
273 | |
274 | === added directory 'analytic_entry_line_group/workflow' |
275 | === added directory 'analytic_entry_line_partner' |
276 | === added file 'analytic_entry_line_partner/__init__.py' |
277 | --- analytic_entry_line_partner/__init__.py 1970-01-01 00:00:00 +0000 |
278 | +++ analytic_entry_line_partner/__init__.py 2014-07-07 15:46:25 +0000 |
279 | @@ -0,0 +1,27 @@ |
280 | +#!/usr/bin/python |
281 | +# -*- encoding: utf-8 -*- |
282 | +############################################################################### |
283 | +# Module Writen to OpenERP, Open Source Management Solution |
284 | +# Copyright (C) OpenERP Venezuela (<http://www.vauxoo.com>). |
285 | +# All Rights Reserved |
286 | +############# Credits ######################################################### |
287 | +# Coded by: Yanina Aular <yani@vauxoo.com> |
288 | +# Planified by: Humberto Arocha <hbto@vauxoo.com> |
289 | +# Audited by: Humberto Arocha <hbto@vauxoo.com> |
290 | +############################################################################### |
291 | +# This program is free software: you can redistribute it and/or modify |
292 | +# it under the terms of the GNU Affero General Public License as published |
293 | +# by the Free Software Foundation, either version 3 of the License, or |
294 | +# (at your option) any later version. |
295 | +# |
296 | +# This program is distributed in the hope that it will be useful, |
297 | +# but WITHOUT ANY WARRANTY; without even the implied warranty of |
298 | +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
299 | +# GNU Affero General Public License for more details. |
300 | +# |
301 | +# You should have received a copy of the GNU Affero General Public License |
302 | +# along with this program. If not, see <http://www.gnu.org/licenses/>. |
303 | +############################################################################### |
304 | + |
305 | +import model |
306 | +import wizard |
307 | |
308 | === added file 'analytic_entry_line_partner/__openerp__.py' |
309 | --- analytic_entry_line_partner/__openerp__.py 1970-01-01 00:00:00 +0000 |
310 | +++ analytic_entry_line_partner/__openerp__.py 2014-07-07 15:46:25 +0000 |
311 | @@ -0,0 +1,54 @@ |
312 | +#!/usr/bin/python |
313 | +# -*- encoding: utf-8 -*- |
314 | +############################################################################### |
315 | +# Module Writen to OpenERP, Open Source Management Solution |
316 | +# Copyright (C) OpenERP Venezuela (<http://www.vauxoo.com>). |
317 | +# All Rights Reserved |
318 | +############# Credits ######################################################### |
319 | +# Coded by: Yanina Aular <yani@vauxoo.com> |
320 | +# Planified by: Humberto Arocha <hbto@vauxoo.com> |
321 | +# Audited by: Humberto Arocha <hbto@vauxoo.com> |
322 | +############################################################################### |
323 | +# This program is free software: you can redistribute it and/or modify |
324 | +# it under the terms of the GNU Affero General Public License as published |
325 | +# by the Free Software Foundation, either version 3 of the License, or |
326 | +# (at your option) any later version. |
327 | +# |
328 | +# This program is distributed in the hope that it will be useful, |
329 | +# but WITHOUT ANY WARRANTY; without even the implied warranty of |
330 | +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
331 | +# GNU Affero General Public License for more details. |
332 | +# |
333 | +# You should have received a copy of the GNU Affero General Public License |
334 | +# along with this program. If not, see <http://www.gnu.org/licenses/>. |
335 | +############################################################################### |
336 | + |
337 | +{ |
338 | + 'name': 'Analytic Entry Line Partner', |
339 | + 'version': '1.0', |
340 | + 'author': 'Vauxoo', |
341 | + 'website': 'http://www.vauxoo.com/', |
342 | + 'category': '', |
343 | + 'description': ''' |
344 | +Analytic Entry Line Partner |
345 | +--------------------------- |
346 | + |
347 | +This module takes partner_id field from move line for grouping of |
348 | +analytics entry lines by partner_id. |
349 | +''', |
350 | + 'depends': [ |
351 | + 'account', |
352 | + 'analytic', |
353 | + 'account_analytic_plans', |
354 | + ], |
355 | + 'data': [ |
356 | + 'view/account_analytic_plans_view.xml', |
357 | + ], |
358 | + 'demo': [], |
359 | + 'test': [], |
360 | + 'qweb': [], |
361 | + 'js': [], |
362 | + 'css': [], |
363 | + 'active': False, |
364 | + 'installable': True, |
365 | +} |
366 | |
367 | === added directory 'analytic_entry_line_partner/data' |
368 | === added directory 'analytic_entry_line_partner/demo' |
369 | === added directory 'analytic_entry_line_partner/doc' |
370 | === added directory 'analytic_entry_line_partner/doc/images' |
371 | === added directory 'analytic_entry_line_partner/i18n' |
372 | === added directory 'analytic_entry_line_partner/model' |
373 | === added file 'analytic_entry_line_partner/model/__init__.py' |
374 | --- analytic_entry_line_partner/model/__init__.py 1970-01-01 00:00:00 +0000 |
375 | +++ analytic_entry_line_partner/model/__init__.py 2014-07-07 15:46:25 +0000 |
376 | @@ -0,0 +1,26 @@ |
377 | +#!/usr/bin/python |
378 | +# -*- encoding: utf-8 -*- |
379 | +############################################################################### |
380 | +# Module Writen to OpenERP, Open Source Management Solution |
381 | +# Copyright (C) OpenERP Venezuela (<http://www.vauxoo.com>). |
382 | +# All Rights Reserved |
383 | +############# Credits ######################################################### |
384 | +# Coded by: Yanina Aular <yani@vauxoo.com> |
385 | +# Planified by: Humberto Arocha <hbto@vauxoo.com> |
386 | +# Audited by: Humberto Arocha <hbto@vauxoo.com> |
387 | +############################################################################### |
388 | +# This program is free software: you can redistribute it and/or modify |
389 | +# it under the terms of the GNU Affero General Public License as published |
390 | +# by the Free Software Foundation, either version 3 of the License, or |
391 | +# (at your option) any later version. |
392 | +# |
393 | +# This program is distributed in the hope that it will be useful, |
394 | +# but WITHOUT ANY WARRANTY; without even the implied warranty of |
395 | +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
396 | +# GNU Affero General Public License for more details. |
397 | +# |
398 | +# You should have received a copy of the GNU Affero General Public License |
399 | +# along with this program. If not, see <http://www.gnu.org/licenses/>. |
400 | +############################################################################### |
401 | + |
402 | +import account_analytic_plans |
403 | |
404 | === added file 'analytic_entry_line_partner/model/account_analytic_plans.py' |
405 | --- analytic_entry_line_partner/model/account_analytic_plans.py 1970-01-01 00:00:00 +0000 |
406 | +++ analytic_entry_line_partner/model/account_analytic_plans.py 2014-07-07 15:46:25 +0000 |
407 | @@ -0,0 +1,59 @@ |
408 | +#!/usr/bin/python |
409 | +# -*- encoding: utf-8 -*- |
410 | +############################################################################### |
411 | +# Module Writen to OpenERP, Open Source Management Solution |
412 | +# Copyright (C) OpenERP Venezuela (<http://www.vauxoo.com>). |
413 | +# All Rights Reserved |
414 | +############# Credits ######################################################### |
415 | +# Coded by: Yanina Aular <yani@vauxoo.com> |
416 | +# Planified by: Humberto Arocha <hbto@vauxoo.com> |
417 | +# Audited by: Humberto Arocha <hbto@vauxoo.com> |
418 | +############################################################################### |
419 | +# This program is free software: you can redistribute it and/or modify |
420 | +# it under the terms of the GNU Affero General Public License as published |
421 | +# by the Free Software Foundation, either version 3 of the License, or |
422 | +# (at your option) any later version. |
423 | +# |
424 | +# This program is distributed in the hope that it will be useful, |
425 | +# but WITHOUT ANY WARRANTY; without even the implied warranty of |
426 | +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
427 | +# GNU Affero General Public License for more details. |
428 | +# |
429 | +# You should have received a copy of the GNU Affero General Public License |
430 | +# along with this program. If not, see <http://www.gnu.org/licenses/>. |
431 | +############################################################################### |
432 | + |
433 | +import time |
434 | +from lxml import etree |
435 | + |
436 | +from openerp.osv import fields, osv |
437 | +from openerp import tools |
438 | +from openerp.tools.translate import _ |
439 | + |
440 | +class account_analytic_line(osv.Model): |
441 | + |
442 | + _inherit = 'account.analytic.line' |
443 | + |
444 | + _columns = { |
445 | + 'partner_id': fields.many2one('res.partner', 'Partner'), |
446 | + } |
447 | + |
448 | +class account_move_line(osv.Model): |
449 | + |
450 | + _inherit = "account.move.line" |
451 | + |
452 | + def create_analytic_lines(self, cr, uid, ids, context=None): |
453 | + if context is None: |
454 | + context = {} |
455 | + ids = isinstance(ids, (int, long)) and [ids] or ids |
456 | + |
457 | + res = super(account_move_line, self).create_analytic_lines(cr, uid, ids,context=context) |
458 | + |
459 | + analytic_line_obj = self.pool.get('account.analytic.line') |
460 | + for move_line in self.browse(cr, uid, ids, context=context): |
461 | + if move_line.analytics_id: |
462 | + for line in move_line.analytic_lines: |
463 | + analytic_line_obj.write(cr, uid, line.id, { |
464 | + 'partner_id': move_line.partner_id.id, |
465 | + }, context=context) |
466 | + return res |
467 | |
468 | === added directory 'analytic_entry_line_partner/report' |
469 | === added directory 'analytic_entry_line_partner/security' |
470 | === added directory 'analytic_entry_line_partner/static' |
471 | === added directory 'analytic_entry_line_partner/static/description' |
472 | === added file 'analytic_entry_line_partner/static/description/index.html' |
473 | === added directory 'analytic_entry_line_partner/static/src' |
474 | === added directory 'analytic_entry_line_partner/static/src/css' |
475 | === added directory 'analytic_entry_line_partner/static/src/img' |
476 | === added file 'analytic_entry_line_partner/static/src/img/icon.png' |
477 | Binary files analytic_entry_line_partner/static/src/img/icon.png 1970-01-01 00:00:00 +0000 and analytic_entry_line_partner/static/src/img/icon.png 2014-07-07 15:46:25 +0000 differ |
478 | === added directory 'analytic_entry_line_partner/static/src/js' |
479 | === added directory 'analytic_entry_line_partner/static/src/xml' |
480 | === added directory 'analytic_entry_line_partner/test' |
481 | === added directory 'analytic_entry_line_partner/view' |
482 | === added file 'analytic_entry_line_partner/view/account_analytic_plans_view.xml' |
483 | --- analytic_entry_line_partner/view/account_analytic_plans_view.xml 1970-01-01 00:00:00 +0000 |
484 | +++ analytic_entry_line_partner/view/account_analytic_plans_view.xml 2014-07-07 15:46:25 +0000 |
485 | @@ -0,0 +1,38 @@ |
486 | +<?xml version="1.0" encoding="utf-8"?> |
487 | +<openerp> |
488 | + <data> |
489 | + <record id="view_account_analytic_line_form_partner" model="ir.ui.view"> |
490 | + <field name="name">account.analytic.line.form.partner</field> |
491 | + <field name="model">account.analytic.line</field> |
492 | + <field name="inherit_id" ref="account.view_account_analytic_line_form"/> |
493 | + <field name="arch" type="xml"> |
494 | + <xpath expr="//field[@name='company_id']" position="after"> |
495 | + <field name="partner_id" readonly="1"/> |
496 | + </xpath> |
497 | + </field> |
498 | + </record> |
499 | + |
500 | + <record id="view_account_analytic_line_tree_partner" model="ir.ui.view"> |
501 | + <field name="name">account.analytic.line.tree.partner</field> |
502 | + <field name="model">account.analytic.line</field> |
503 | + <field name="inherit_id" ref="account.view_account_analytic_line_tree"/> |
504 | + <field name="arch" type="xml"> |
505 | + <xpath expr="//field[@name='date']" position="after"> |
506 | + <field name="partner_id"/> |
507 | + </xpath> |
508 | + </field> |
509 | + </record> |
510 | + |
511 | + <record id="view_account_analytic_line_filter_partner" model="ir.ui.view"> |
512 | + <field name="name">account.analytic.line.filter.partner</field> |
513 | + <field name="model">account.analytic.line</field> |
514 | + <field name="inherit_id" ref="account.view_account_analytic_line_filter"/> |
515 | + <field name="arch" type="xml"> |
516 | + <xpath expr="//group" position="inside"> |
517 | + <filter string="Partner" context="{'group_by':'partner_id'}"/> |
518 | + </xpath> |
519 | + </field> |
520 | + </record> |
521 | + |
522 | + </data> |
523 | +</openerp> |
524 | |
525 | === added directory 'analytic_entry_line_partner/wizard' |
526 | === added file 'analytic_entry_line_partner/wizard/__init__.py' |
527 | --- analytic_entry_line_partner/wizard/__init__.py 1970-01-01 00:00:00 +0000 |
528 | +++ analytic_entry_line_partner/wizard/__init__.py 2014-07-07 15:46:25 +0000 |
529 | @@ -0,0 +1,25 @@ |
530 | +#!/usr/bin/python |
531 | +# -*- encoding: utf-8 -*- |
532 | +############################################################################### |
533 | +# Module Writen to OpenERP, Open Source Management Solution |
534 | +# Copyright (C) OpenERP Venezuela (<http://www.vauxoo.com>). |
535 | +# All Rights Reserved |
536 | +############# Credits ######################################################### |
537 | +# Coded by: Yanina Aular <yani@vauxoo.com> |
538 | +# Planified by: Humberto Arocha <hbto@vauxoo.com> |
539 | +# Audited by: Humberto Arocha <hbto@vauxoo.com> |
540 | +############################################################################### |
541 | +# This program is free software: you can redistribute it and/or modify |
542 | +# it under the terms of the GNU Affero General Public License as published |
543 | +# by the Free Software Foundation, either version 3 of the License, or |
544 | +# (at your option) any later version. |
545 | +# |
546 | +# This program is distributed in the hope that it will be useful, |
547 | +# but WITHOUT ANY WARRANTY; without even the implied warranty of |
548 | +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
549 | +# GNU Affero General Public License for more details. |
550 | +# |
551 | +# You should have received a copy of the GNU Affero General Public License |
552 | +# along with this program. If not, see <http://www.gnu.org/licenses/>. |
553 | +############################################################################### |
554 | + |
555 | |
556 | === added directory 'analytic_entry_line_partner/workflow' |
557 | === added directory 'analytic_entry_line_plans' |
558 | === added file 'analytic_entry_line_plans/__init__.py' |
559 | --- analytic_entry_line_plans/__init__.py 1970-01-01 00:00:00 +0000 |
560 | +++ analytic_entry_line_plans/__init__.py 2014-07-07 15:46:25 +0000 |
561 | @@ -0,0 +1,27 @@ |
562 | +#!/usr/bin/python |
563 | +# -*- encoding: utf-8 -*- |
564 | +############################################################################### |
565 | +# Module Writen to OpenERP, Open Source Management Solution |
566 | +# Copyright (C) OpenERP Venezuela (<http://www.vauxoo.com>). |
567 | +# All Rights Reserved |
568 | +############# Credits ######################################################### |
569 | +# Coded by: Yanina Aular <yani@vauxoo.com> |
570 | +# Planified by: Humberto Arocha <hbto@vauxoo.com> |
571 | +# Audited by: Humberto Arocha <hbto@vauxoo.com> |
572 | +############################################################################### |
573 | +# This program is free software: you can redistribute it and/or modify |
574 | +# it under the terms of the GNU Affero General Public License as published |
575 | +# by the Free Software Foundation, either version 3 of the License, or |
576 | +# (at your option) any later version. |
577 | +# |
578 | +# This program is distributed in the hope that it will be useful, |
579 | +# but WITHOUT ANY WARRANTY; without even the implied warranty of |
580 | +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
581 | +# GNU Affero General Public License for more details. |
582 | +# |
583 | +# You should have received a copy of the GNU Affero General Public License |
584 | +# along with this program. If not, see <http://www.gnu.org/licenses/>. |
585 | +############################################################################### |
586 | + |
587 | +import model |
588 | +import wizard |
589 | |
590 | === added file 'analytic_entry_line_plans/__openerp__.py' |
591 | --- analytic_entry_line_plans/__openerp__.py 1970-01-01 00:00:00 +0000 |
592 | +++ analytic_entry_line_plans/__openerp__.py 2014-07-07 15:46:25 +0000 |
593 | @@ -0,0 +1,54 @@ |
594 | +#!/usr/bin/python |
595 | +# -*- encoding: utf-8 -*- |
596 | +############################################################################### |
597 | +# Module Writen to OpenERP, Open Source Management Solution |
598 | +# Copyright (C) OpenERP Venezuela (<http://www.vauxoo.com>). |
599 | +# All Rights Reserved |
600 | +############# Credits ######################################################### |
601 | +# Coded by: Yanina Aular <yani@vauxoo.com> |
602 | +# Planified by: Humberto Arocha <hbto@vauxoo.com> |
603 | +# Audited by: Humberto Arocha <hbto@vauxoo.com> |
604 | +############################################################################### |
605 | +# This program is free software: you can redistribute it and/or modify |
606 | +# it under the terms of the GNU Affero General Public License as published |
607 | +# by the Free Software Foundation, either version 3 of the License, or |
608 | +# (at your option) any later version. |
609 | +# |
610 | +# This program is distributed in the hope that it will be useful, |
611 | +# but WITHOUT ANY WARRANTY; without even the implied warranty of |
612 | +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
613 | +# GNU Affero General Public License for more details. |
614 | +# |
615 | +# You should have received a copy of the GNU Affero General Public License |
616 | +# along with this program. If not, see <http://www.gnu.org/licenses/>. |
617 | +############################################################################### |
618 | + |
619 | +{ |
620 | + 'name': 'Analytic Entry Line Plans', |
621 | + 'version': '1.0', |
622 | + 'author': 'Vauxoo', |
623 | + 'website': 'http://www.vauxoo.com/', |
624 | + 'category': '', |
625 | + 'description': ''' |
626 | +Analytic Entry Line Plans |
627 | +------------------------- |
628 | + |
629 | +This module takes analytics_id field from move line for grouping of |
630 | +analytics entry lines by analytics_id. |
631 | +''', |
632 | + 'depends': [ |
633 | + 'account', |
634 | + 'analytic', |
635 | + 'account_analytic_plans', |
636 | + ], |
637 | + 'data': [ |
638 | + 'view/account_analytic_plans_view.xml', |
639 | + ], |
640 | + 'demo': [], |
641 | + 'test': [], |
642 | + 'qweb': [], |
643 | + 'js': [], |
644 | + 'css': [], |
645 | + 'active': False, |
646 | + 'installable': True, |
647 | +} |
648 | |
649 | === added directory 'analytic_entry_line_plans/data' |
650 | === added directory 'analytic_entry_line_plans/demo' |
651 | === added directory 'analytic_entry_line_plans/doc' |
652 | === added directory 'analytic_entry_line_plans/doc/images' |
653 | === added directory 'analytic_entry_line_plans/i18n' |
654 | === added directory 'analytic_entry_line_plans/model' |
655 | === added file 'analytic_entry_line_plans/model/__init__.py' |
656 | --- analytic_entry_line_plans/model/__init__.py 1970-01-01 00:00:00 +0000 |
657 | +++ analytic_entry_line_plans/model/__init__.py 2014-07-07 15:46:25 +0000 |
658 | @@ -0,0 +1,26 @@ |
659 | +#!/usr/bin/python |
660 | +# -*- encoding: utf-8 -*- |
661 | +############################################################################### |
662 | +# Module Writen to OpenERP, Open Source Management Solution |
663 | +# Copyright (C) OpenERP Venezuela (<http://www.vauxoo.com>). |
664 | +# All Rights Reserved |
665 | +############# Credits ######################################################### |
666 | +# Coded by: Yanina Aular <yani@vauxoo.com> |
667 | +# Planified by: Humberto Arocha <hbto@vauxoo.com> |
668 | +# Audited by: Humberto Arocha <hbto@vauxoo.com> |
669 | +############################################################################### |
670 | +# This program is free software: you can redistribute it and/or modify |
671 | +# it under the terms of the GNU Affero General Public License as published |
672 | +# by the Free Software Foundation, either version 3 of the License, or |
673 | +# (at your option) any later version. |
674 | +# |
675 | +# This program is distributed in the hope that it will be useful, |
676 | +# but WITHOUT ANY WARRANTY; without even the implied warranty of |
677 | +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
678 | +# GNU Affero General Public License for more details. |
679 | +# |
680 | +# You should have received a copy of the GNU Affero General Public License |
681 | +# along with this program. If not, see <http://www.gnu.org/licenses/>. |
682 | +############################################################################### |
683 | + |
684 | +import account_analytic_plans |
685 | |
686 | === added file 'analytic_entry_line_plans/model/account_analytic_plans.py' |
687 | --- analytic_entry_line_plans/model/account_analytic_plans.py 1970-01-01 00:00:00 +0000 |
688 | +++ analytic_entry_line_plans/model/account_analytic_plans.py 2014-07-07 15:46:25 +0000 |
689 | @@ -0,0 +1,59 @@ |
690 | +#!/usr/bin/python |
691 | +# -*- encoding: utf-8 -*- |
692 | +############################################################################### |
693 | +# Module Writen to OpenERP, Open Source Management Solution |
694 | +# Copyright (C) OpenERP Venezuela (<http://www.vauxoo.com>). |
695 | +# All Rights Reserved |
696 | +############# Credits ######################################################### |
697 | +# Coded by: Yanina Aular <yani@vauxoo.com> |
698 | +# Planified by: Humberto Arocha <hbto@vauxoo.com> |
699 | +# Audited by: Humberto Arocha <hbto@vauxoo.com> |
700 | +############################################################################### |
701 | +# This program is free software: you can redistribute it and/or modify |
702 | +# it under the terms of the GNU Affero General Public License as published |
703 | +# by the Free Software Foundation, either version 3 of the License, or |
704 | +# (at your option) any later version. |
705 | +# |
706 | +# This program is distributed in the hope that it will be useful, |
707 | +# but WITHOUT ANY WARRANTY; without even the implied warranty of |
708 | +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
709 | +# GNU Affero General Public License for more details. |
710 | +# |
711 | +# You should have received a copy of the GNU Affero General Public License |
712 | +# along with this program. If not, see <http://www.gnu.org/licenses/>. |
713 | +############################################################################### |
714 | + |
715 | +import time |
716 | +from lxml import etree |
717 | + |
718 | +from openerp.osv import fields, osv |
719 | +from openerp import tools |
720 | +from openerp.tools.translate import _ |
721 | + |
722 | +class account_analytic_line(osv.Model): |
723 | + |
724 | + _inherit = 'account.analytic.line' |
725 | + |
726 | + _columns = { |
727 | + 'analytics_id': fields.many2one('account.analytic.plan.instance', 'Analytic Distribution'), |
728 | + } |
729 | + |
730 | +class account_move_line(osv.osv): |
731 | + |
732 | + _inherit = "account.move.line" |
733 | + |
734 | + def create_analytic_lines(self, cr, uid, ids, context=None): |
735 | + if context is None: |
736 | + context = {} |
737 | + ids = isinstance(ids, (int, long)) and [ids] or ids |
738 | + |
739 | + res = super(account_move_line, self).create_analytic_lines(cr, uid, ids,context=context) |
740 | + |
741 | + analytic_line_obj = self.pool.get('account.analytic.line') |
742 | + for move_line in self.browse(cr, uid, ids, context=context): |
743 | + if move_line.analytics_id: |
744 | + for line in move_line.analytic_lines: |
745 | + analytic_line_obj.write(cr, uid, line.id, { |
746 | + 'analytics_id': move_line.analytics_id.id, |
747 | + }, context=context) |
748 | + return res |
749 | |
750 | === added directory 'analytic_entry_line_plans/report' |
751 | === added directory 'analytic_entry_line_plans/security' |
752 | === added directory 'analytic_entry_line_plans/static' |
753 | === added directory 'analytic_entry_line_plans/static/description' |
754 | === added file 'analytic_entry_line_plans/static/description/index.html' |
755 | === added directory 'analytic_entry_line_plans/static/src' |
756 | === added directory 'analytic_entry_line_plans/static/src/css' |
757 | === added directory 'analytic_entry_line_plans/static/src/img' |
758 | === added file 'analytic_entry_line_plans/static/src/img/icon.png' |
759 | Binary files analytic_entry_line_plans/static/src/img/icon.png 1970-01-01 00:00:00 +0000 and analytic_entry_line_plans/static/src/img/icon.png 2014-07-07 15:46:25 +0000 differ |
760 | === added directory 'analytic_entry_line_plans/static/src/js' |
761 | === added directory 'analytic_entry_line_plans/static/src/xml' |
762 | === added directory 'analytic_entry_line_plans/test' |
763 | === added directory 'analytic_entry_line_plans/view' |
764 | === added file 'analytic_entry_line_plans/view/account_analytic_plans_view.xml' |
765 | --- analytic_entry_line_plans/view/account_analytic_plans_view.xml 1970-01-01 00:00:00 +0000 |
766 | +++ analytic_entry_line_plans/view/account_analytic_plans_view.xml 2014-07-07 15:46:25 +0000 |
767 | @@ -0,0 +1,39 @@ |
768 | +<?xml version="1.0" encoding="utf-8"?> |
769 | +<openerp> |
770 | + <data> |
771 | + |
772 | + <record id="view_account_analytic_line_form_analytics" model="ir.ui.view"> |
773 | + <field name="name">account.analytic.line.form.analytics</field> |
774 | + <field name="model">account.analytic.line</field> |
775 | + <field name="inherit_id" ref="account.view_account_analytic_line_form"/> |
776 | + <field name="arch" type="xml"> |
777 | + <xpath expr="//field[@name='company_id']" position="after"> |
778 | + <field name="analytics_id" readonly="1"/> |
779 | + </xpath> |
780 | + </field> |
781 | + </record> |
782 | + |
783 | + <record id="view_account_analytic_line_tree_analytics" model="ir.ui.view"> |
784 | + <field name="name">account.analytic.line.tree.analytics</field> |
785 | + <field name="model">account.analytic.line</field> |
786 | + <field name="inherit_id" ref="account.view_account_analytic_line_tree"/> |
787 | + <field name="arch" type="xml"> |
788 | + <xpath expr="//field[@name='date']" position="after"> |
789 | + <field name="analytics_id"/> |
790 | + </xpath> |
791 | + </field> |
792 | + </record> |
793 | + |
794 | + <record id="view_account_analytic_line_filter_analytics" model="ir.ui.view"> |
795 | + <field name="name">account.analytic.line.filter.analytics</field> |
796 | + <field name="model">account.analytic.line</field> |
797 | + <field name="inherit_id" ref="account.view_account_analytic_line_filter"/> |
798 | + <field name="arch" type="xml"> |
799 | + <xpath expr="//group" position="inside"> |
800 | + <filter string="Analytics" context="{'group_by':'analytics_id'}"/> |
801 | + </xpath> |
802 | + </field> |
803 | + </record> |
804 | + |
805 | + </data> |
806 | +</openerp> |
807 | |
808 | === added directory 'analytic_entry_line_plans/wizard' |
809 | === added file 'analytic_entry_line_plans/wizard/__init__.py' |
810 | --- analytic_entry_line_plans/wizard/__init__.py 1970-01-01 00:00:00 +0000 |
811 | +++ analytic_entry_line_plans/wizard/__init__.py 2014-07-07 15:46:25 +0000 |
812 | @@ -0,0 +1,25 @@ |
813 | +#!/usr/bin/python |
814 | +# -*- encoding: utf-8 -*- |
815 | +############################################################################### |
816 | +# Module Writen to OpenERP, Open Source Management Solution |
817 | +# Copyright (C) OpenERP Venezuela (<http://www.vauxoo.com>). |
818 | +# All Rights Reserved |
819 | +############# Credits ######################################################### |
820 | +# Coded by: Yanina Aular <yani@vauxoo.com> |
821 | +# Planified by: Humberto Arocha <hbto@vauxoo.com> |
822 | +# Audited by: Humberto Arocha <hbto@vauxoo.com> |
823 | +############################################################################### |
824 | +# This program is free software: you can redistribute it and/or modify |
825 | +# it under the terms of the GNU Affero General Public License as published |
826 | +# by the Free Software Foundation, either version 3 of the License, or |
827 | +# (at your option) any later version. |
828 | +# |
829 | +# This program is distributed in the hope that it will be useful, |
830 | +# but WITHOUT ANY WARRANTY; without even the implied warranty of |
831 | +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
832 | +# GNU Affero General Public License for more details. |
833 | +# |
834 | +# You should have received a copy of the GNU Affero General Public License |
835 | +# along with this program. If not, see <http://www.gnu.org/licenses/>. |
836 | +############################################################################### |
837 | + |
838 | |
839 | === added directory 'analytic_entry_line_plans/workflow' |
840 | === added directory 'analytic_entry_line_taxcode' |
841 | === added file 'analytic_entry_line_taxcode/__init__.py' |
842 | --- analytic_entry_line_taxcode/__init__.py 1970-01-01 00:00:00 +0000 |
843 | +++ analytic_entry_line_taxcode/__init__.py 2014-07-07 15:46:25 +0000 |
844 | @@ -0,0 +1,27 @@ |
845 | +#!/usr/bin/python |
846 | +# -*- encoding: utf-8 -*- |
847 | +############################################################################### |
848 | +# Module Writen to OpenERP, Open Source Management Solution |
849 | +# Copyright (C) OpenERP Venezuela (<http://www.vauxoo.com>). |
850 | +# All Rights Reserved |
851 | +############# Credits ######################################################### |
852 | +# Coded by: Yanina Aular <yani@vauxoo.com> |
853 | +# Planified by: Humberto Arocha <hbto@vauxoo.com> |
854 | +# Audited by: Humberto Arocha <hbto@vauxoo.com> |
855 | +############################################################################### |
856 | +# This program is free software: you can redistribute it and/or modify |
857 | +# it under the terms of the GNU Affero General Public License as published |
858 | +# by the Free Software Foundation, either version 3 of the License, or |
859 | +# (at your option) any later version. |
860 | +# |
861 | +# This program is distributed in the hope that it will be useful, |
862 | +# but WITHOUT ANY WARRANTY; without even the implied warranty of |
863 | +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
864 | +# GNU Affero General Public License for more details. |
865 | +# |
866 | +# You should have received a copy of the GNU Affero General Public License |
867 | +# along with this program. If not, see <http://www.gnu.org/licenses/>. |
868 | +############################################################################### |
869 | + |
870 | +import model |
871 | +import wizard |
872 | |
873 | === added file 'analytic_entry_line_taxcode/__openerp__.py' |
874 | --- analytic_entry_line_taxcode/__openerp__.py 1970-01-01 00:00:00 +0000 |
875 | +++ analytic_entry_line_taxcode/__openerp__.py 2014-07-07 15:46:25 +0000 |
876 | @@ -0,0 +1,54 @@ |
877 | +#!/usr/bin/python |
878 | +# -*- encoding: utf-8 -*- |
879 | +############################################################################### |
880 | +# Module Writen to OpenERP, Open Source Management Solution |
881 | +# Copyright (C) OpenERP Venezuela (<http://www.vauxoo.com>). |
882 | +# All Rights Reserved |
883 | +############# Credits ######################################################### |
884 | +# Coded by: Yanina Aular <yani@vauxoo.com> |
885 | +# Planified by: Humberto Arocha <hbto@vauxoo.com> |
886 | +# Audited by: Humberto Arocha <hbto@vauxoo.com> |
887 | +############################################################################### |
888 | +# This program is free software: you can redistribute it and/or modify |
889 | +# it under the terms of the GNU Affero General Public License as published |
890 | +# by the Free Software Foundation, either version 3 of the License, or |
891 | +# (at your option) any later version. |
892 | +# |
893 | +# This program is distributed in the hope that it will be useful, |
894 | +# but WITHOUT ANY WARRANTY; without even the implied warranty of |
895 | +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
896 | +# GNU Affero General Public License for more details. |
897 | +# |
898 | +# You should have received a copy of the GNU Affero General Public License |
899 | +# along with this program. If not, see <http://www.gnu.org/licenses/>. |
900 | +############################################################################### |
901 | + |
902 | +{ |
903 | + 'name': 'Analytic Entry Line Tax Code', |
904 | + 'version': '1.0', |
905 | + 'author': 'Vauxoo', |
906 | + 'website': 'http://www.vauxoo.com/', |
907 | + 'category': '', |
908 | + 'description': ''' |
909 | +Analytic Entry Line Tax Code |
910 | +---------------------------- |
911 | + |
912 | +This module takes tax_code_id field from move line for grouping of |
913 | +analytics entry lines by tax_code_id. |
914 | +''', |
915 | + 'depends': [ |
916 | + 'account', |
917 | + 'analytic', |
918 | + 'account_analytic_plans', |
919 | + ], |
920 | + 'data': [ |
921 | + 'view/account_analytic_plans_view.xml', |
922 | + ], |
923 | + 'demo': [], |
924 | + 'test': [], |
925 | + 'qweb': [], |
926 | + 'js': [], |
927 | + 'css': [], |
928 | + 'active': False, |
929 | + 'installable': True, |
930 | +} |
931 | |
932 | === added directory 'analytic_entry_line_taxcode/data' |
933 | === added directory 'analytic_entry_line_taxcode/demo' |
934 | === added directory 'analytic_entry_line_taxcode/doc' |
935 | === added directory 'analytic_entry_line_taxcode/doc/images' |
936 | === added directory 'analytic_entry_line_taxcode/i18n' |
937 | === added directory 'analytic_entry_line_taxcode/model' |
938 | === added file 'analytic_entry_line_taxcode/model/__init__.py' |
939 | --- analytic_entry_line_taxcode/model/__init__.py 1970-01-01 00:00:00 +0000 |
940 | +++ analytic_entry_line_taxcode/model/__init__.py 2014-07-07 15:46:25 +0000 |
941 | @@ -0,0 +1,26 @@ |
942 | +#!/usr/bin/python |
943 | +# -*- encoding: utf-8 -*- |
944 | +############################################################################### |
945 | +# Module Writen to OpenERP, Open Source Management Solution |
946 | +# Copyright (C) OpenERP Venezuela (<http://www.vauxoo.com>). |
947 | +# All Rights Reserved |
948 | +############# Credits ######################################################### |
949 | +# Coded by: Yanina Aular <yani@vauxoo.com> |
950 | +# Planified by: Humberto Arocha <hbto@vauxoo.com> |
951 | +# Audited by: Humberto Arocha <hbto@vauxoo.com> |
952 | +############################################################################### |
953 | +# This program is free software: you can redistribute it and/or modify |
954 | +# it under the terms of the GNU Affero General Public License as published |
955 | +# by the Free Software Foundation, either version 3 of the License, or |
956 | +# (at your option) any later version. |
957 | +# |
958 | +# This program is distributed in the hope that it will be useful, |
959 | +# but WITHOUT ANY WARRANTY; without even the implied warranty of |
960 | +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
961 | +# GNU Affero General Public License for more details. |
962 | +# |
963 | +# You should have received a copy of the GNU Affero General Public License |
964 | +# along with this program. If not, see <http://www.gnu.org/licenses/>. |
965 | +############################################################################### |
966 | + |
967 | +import account_analytic_plans |
968 | |
969 | === added file 'analytic_entry_line_taxcode/model/account_analytic_plans.py' |
970 | --- analytic_entry_line_taxcode/model/account_analytic_plans.py 1970-01-01 00:00:00 +0000 |
971 | +++ analytic_entry_line_taxcode/model/account_analytic_plans.py 2014-07-07 15:46:25 +0000 |
972 | @@ -0,0 +1,60 @@ |
973 | +#!/usr/bin/python |
974 | +# -*- encoding: utf-8 -*- |
975 | +############################################################################### |
976 | +# Module Writen to OpenERP, Open Source Management Solution |
977 | +# Copyright (C) OpenERP Venezuela (<http://www.vauxoo.com>). |
978 | +# All Rights Reserved |
979 | +############# Credits ######################################################### |
980 | +# Coded by: Yanina Aular <yani@vauxoo.com> |
981 | +# Planified by: Humberto Arocha <hbto@vauxoo.com> |
982 | +# Audited by: Humberto Arocha <hbto@vauxoo.com> |
983 | +############################################################################### |
984 | +# This program is free software: you can redistribute it and/or modify |
985 | +# it under the terms of the GNU Affero General Public License as published |
986 | +# by the Free Software Foundation, either version 3 of the License, or |
987 | +# (at your option) any later version. |
988 | +# |
989 | +# This program is distributed in the hope that it will be useful, |
990 | +# but WITHOUT ANY WARRANTY; without even the implied warranty of |
991 | +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
992 | +# GNU Affero General Public License for more details. |
993 | +# |
994 | +# You should have received a copy of the GNU Affero General Public License |
995 | +# along with this program. If not, see <http://www.gnu.org/licenses/>. |
996 | +############################################################################### |
997 | + |
998 | +import time |
999 | +from lxml import etree |
1000 | + |
1001 | +from openerp.osv import fields, osv |
1002 | +from openerp import tools |
1003 | +from openerp.tools.translate import _ |
1004 | + |
1005 | +class account_analytic_line(osv.Model): |
1006 | + |
1007 | + _inherit = 'account.analytic.line' |
1008 | + |
1009 | + _columns = { |
1010 | + 'tax_code_id': fields.many2one('account.tax.code', 'Tax Account', |
1011 | + help="The Account can either be a base tax code or a tax code account."), |
1012 | + } |
1013 | + |
1014 | +class account_move_line(osv.Model): |
1015 | + |
1016 | + _inherit = "account.move.line" |
1017 | + |
1018 | + def create_analytic_lines(self, cr, uid, ids, context=None): |
1019 | + if context is None: |
1020 | + context = {} |
1021 | + ids = isinstance(ids, (int, long)) and [ids] or ids |
1022 | + |
1023 | + res = super(account_move_line, self).create_analytic_lines(cr, uid, ids,context=context) |
1024 | + |
1025 | + analytic_line_obj = self.pool.get('account.analytic.line') |
1026 | + for move_line in self.browse(cr, uid, ids, context=context): |
1027 | + if move_line.analytics_id: |
1028 | + for line in move_line.analytic_lines: |
1029 | + analytic_line_obj.write(cr, uid, line.id, { |
1030 | + 'tax_code_id': move_line.tax_code_id.id, |
1031 | + }, context=context) |
1032 | + return res |
1033 | |
1034 | === added directory 'analytic_entry_line_taxcode/report' |
1035 | === added directory 'analytic_entry_line_taxcode/security' |
1036 | === added directory 'analytic_entry_line_taxcode/static' |
1037 | === added directory 'analytic_entry_line_taxcode/static/description' |
1038 | === added file 'analytic_entry_line_taxcode/static/description/index.html' |
1039 | === added directory 'analytic_entry_line_taxcode/static/src' |
1040 | === added directory 'analytic_entry_line_taxcode/static/src/css' |
1041 | === added directory 'analytic_entry_line_taxcode/static/src/img' |
1042 | === added file 'analytic_entry_line_taxcode/static/src/img/icon.png' |
1043 | Binary files analytic_entry_line_taxcode/static/src/img/icon.png 1970-01-01 00:00:00 +0000 and analytic_entry_line_taxcode/static/src/img/icon.png 2014-07-07 15:46:25 +0000 differ |
1044 | === added directory 'analytic_entry_line_taxcode/static/src/js' |
1045 | === added directory 'analytic_entry_line_taxcode/static/src/xml' |
1046 | === added directory 'analytic_entry_line_taxcode/test' |
1047 | === added directory 'analytic_entry_line_taxcode/view' |
1048 | === added file 'analytic_entry_line_taxcode/view/account_analytic_plans_view.xml' |
1049 | --- analytic_entry_line_taxcode/view/account_analytic_plans_view.xml 1970-01-01 00:00:00 +0000 |
1050 | +++ analytic_entry_line_taxcode/view/account_analytic_plans_view.xml 2014-07-07 15:46:25 +0000 |
1051 | @@ -0,0 +1,39 @@ |
1052 | +<?xml version="1.0" encoding="utf-8"?> |
1053 | +<openerp> |
1054 | + <data> |
1055 | + |
1056 | + <record id="view_account_analytic_line_form_taxcode" model="ir.ui.view"> |
1057 | + <field name="name">account.analytic.line.form.taxcode</field> |
1058 | + <field name="model">account.analytic.line</field> |
1059 | + <field name="inherit_id" ref="account.view_account_analytic_line_form"/> |
1060 | + <field name="arch" type="xml"> |
1061 | + <xpath expr="//field[@name='company_id']" position="after"> |
1062 | + <field name="tax_code_id" readonly="1"/> |
1063 | + </xpath> |
1064 | + </field> |
1065 | + </record> |
1066 | + |
1067 | + <record id="view_account_analytic_line_tree_taxcode" model="ir.ui.view"> |
1068 | + <field name="name">account.analytic.line.tree.taxcode</field> |
1069 | + <field name="model">account.analytic.line</field> |
1070 | + <field name="inherit_id" ref="account.view_account_analytic_line_tree"/> |
1071 | + <field name="arch" type="xml"> |
1072 | + <xpath expr="//field[@name='date']" position="after"> |
1073 | + <field name="tax_code_id"/> |
1074 | + </xpath> |
1075 | + </field> |
1076 | + </record> |
1077 | + |
1078 | + <record id="view_account_analytic_line_filter_taxcode" model="ir.ui.view"> |
1079 | + <field name="name">account.analytic.line.filter.taxcode</field> |
1080 | + <field name="model">account.analytic.line</field> |
1081 | + <field name="inherit_id" ref="account.view_account_analytic_line_filter"/> |
1082 | + <field name="arch" type="xml"> |
1083 | + <xpath expr="//group" position="inside"> |
1084 | + <filter string="Tax Code" context="{'group_by':'tax_code_id'}"/> |
1085 | + </xpath> |
1086 | + </field> |
1087 | + </record> |
1088 | + |
1089 | + </data> |
1090 | +</openerp> |
1091 | |
1092 | === added directory 'analytic_entry_line_taxcode/wizard' |
1093 | === added file 'analytic_entry_line_taxcode/wizard/__init__.py' |
1094 | --- analytic_entry_line_taxcode/wizard/__init__.py 1970-01-01 00:00:00 +0000 |
1095 | +++ analytic_entry_line_taxcode/wizard/__init__.py 2014-07-07 15:46:25 +0000 |
1096 | @@ -0,0 +1,25 @@ |
1097 | +#!/usr/bin/python |
1098 | +# -*- encoding: utf-8 -*- |
1099 | +############################################################################### |
1100 | +# Module Writen to OpenERP, Open Source Management Solution |
1101 | +# Copyright (C) OpenERP Venezuela (<http://www.vauxoo.com>). |
1102 | +# All Rights Reserved |
1103 | +############# Credits ######################################################### |
1104 | +# Coded by: Yanina Aular <yani@vauxoo.com> |
1105 | +# Planified by: Humberto Arocha <hbto@vauxoo.com> |
1106 | +# Audited by: Humberto Arocha <hbto@vauxoo.com> |
1107 | +############################################################################### |
1108 | +# This program is free software: you can redistribute it and/or modify |
1109 | +# it under the terms of the GNU Affero General Public License as published |
1110 | +# by the Free Software Foundation, either version 3 of the License, or |
1111 | +# (at your option) any later version. |
1112 | +# |
1113 | +# This program is distributed in the hope that it will be useful, |
1114 | +# but WITHOUT ANY WARRANTY; without even the implied warranty of |
1115 | +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
1116 | +# GNU Affero General Public License for more details. |
1117 | +# |
1118 | +# You should have received a copy of the GNU Affero General Public License |
1119 | +# along with this program. If not, see <http://www.gnu.org/licenses/>. |
1120 | +############################################################################### |
1121 | + |
1122 | |
1123 | === added directory 'analytic_entry_line_taxcode/workflow' |
1124 | === added directory 'analytic_plans_group' |
1125 | === added file 'analytic_plans_group/__init__.py' |
1126 | --- analytic_plans_group/__init__.py 1970-01-01 00:00:00 +0000 |
1127 | +++ analytic_plans_group/__init__.py 2014-07-07 15:46:25 +0000 |
1128 | @@ -0,0 +1,27 @@ |
1129 | +#!/usr/bin/python |
1130 | +# -*- encoding: utf-8 -*- |
1131 | +############################################################################### |
1132 | +# Module Writen to OpenERP, Open Source Management Solution |
1133 | +# Copyright (C) OpenERP Venezuela (<http://www.vauxoo.com>). |
1134 | +# All Rights Reserved |
1135 | +############# Credits ######################################################### |
1136 | +# Coded by: Yanina Aular <yani@vauxoo.com> |
1137 | +# Planified by: Humberto Arocha <hbto@vauxoo.com> |
1138 | +# Audited by: Humberto Arocha <hbto@vauxoo.com> |
1139 | +############################################################################### |
1140 | +# This program is free software: you can redistribute it and/or modify |
1141 | +# it under the terms of the GNU Affero General Public License as published |
1142 | +# by the Free Software Foundation, either version 3 of the License, or |
1143 | +# (at your option) any later version. |
1144 | +# |
1145 | +# This program is distributed in the hope that it will be useful, |
1146 | +# but WITHOUT ANY WARRANTY; without even the implied warranty of |
1147 | +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
1148 | +# GNU Affero General Public License for more details. |
1149 | +# |
1150 | +# You should have received a copy of the GNU Affero General Public License |
1151 | +# along with this program. If not, see <http://www.gnu.org/licenses/>. |
1152 | +############################################################################### |
1153 | + |
1154 | +import model |
1155 | +import wizard |
1156 | |
1157 | === added file 'analytic_plans_group/__openerp__.py' |
1158 | --- analytic_plans_group/__openerp__.py 1970-01-01 00:00:00 +0000 |
1159 | +++ analytic_plans_group/__openerp__.py 2014-07-07 15:46:25 +0000 |
1160 | @@ -0,0 +1,57 @@ |
1161 | +#!/usr/bin/python |
1162 | +# -*- encoding: utf-8 -*- |
1163 | +############################################################################### |
1164 | +# Module Writen to OpenERP, Open Source Management Solution |
1165 | +# Copyright (C) OpenERP Venezuela (<http://www.vauxoo.com>). |
1166 | +# All Rights Reserved |
1167 | +############# Credits ######################################################### |
1168 | +# Coded by: Yanina Aular <yani@vauxoo.com> |
1169 | +# Planified by: Humberto Arocha <hbto@vauxoo.com> |
1170 | +# Audited by: Humberto Arocha <hbto@vauxoo.com> |
1171 | +############################################################################### |
1172 | +# This program is free software: you can redistribute it and/or modify |
1173 | +# it under the terms of the GNU Affero General Public License as published |
1174 | +# by the Free Software Foundation, either version 3 of the License, or |
1175 | +# (at your option) any later version. |
1176 | +# |
1177 | +# This program is distributed in the hope that it will be useful, |
1178 | +# but WITHOUT ANY WARRANTY; without even the implied warranty of |
1179 | +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
1180 | +# GNU Affero General Public License for more details. |
1181 | +# |
1182 | +# You should have received a copy of the GNU Affero General Public License |
1183 | +# along with this program. If not, see <http://www.gnu.org/licenses/>. |
1184 | +############################################################################### |
1185 | + |
1186 | +{ |
1187 | + 'name': 'Analytic Plans Group', |
1188 | + 'version': '1.0', |
1189 | + 'author': 'Vauxoo', |
1190 | + 'website': 'http://www.vauxoo.com/', |
1191 | + 'category': '', |
1192 | + 'description': ''' |
1193 | +Analytic Plans Group |
1194 | +-------------------- |
1195 | + |
1196 | +This module adds analytic_group_id field in analytic account for grouping of |
1197 | +analytics entry lines in future. |
1198 | + |
1199 | +''', |
1200 | + 'depends': [ |
1201 | + 'analytic', |
1202 | + 'account_analytic_plans', |
1203 | + 'purchase_analytic_plans', |
1204 | + ], |
1205 | + 'data': [ |
1206 | + 'data/res_groups.xml', |
1207 | + 'security/ir.model.access.csv', |
1208 | + 'view/account_analytic_plans_view.xml', |
1209 | + ], |
1210 | + 'demo': [], |
1211 | + 'test': [], |
1212 | + 'qweb': [], |
1213 | + 'js': [], |
1214 | + 'css': [], |
1215 | + 'active': False, |
1216 | + 'installable': True, |
1217 | +} |
1218 | |
1219 | === added directory 'analytic_plans_group/data' |
1220 | === added file 'analytic_plans_group/data/res_groups.xml' |
1221 | --- analytic_plans_group/data/res_groups.xml 1970-01-01 00:00:00 +0000 |
1222 | +++ analytic_plans_group/data/res_groups.xml 2014-07-07 15:46:25 +0000 |
1223 | @@ -0,0 +1,8 @@ |
1224 | +<?xml version='1.0' encoding='UTF-8'?> |
1225 | +<openerp> |
1226 | + <data noupdate="1"> |
1227 | + <record id="group_account_analytic_group" model="res.groups"> |
1228 | + <field name="name">Grouping Analytics Account</field> |
1229 | + </record> |
1230 | + </data> |
1231 | +</openerp> |
1232 | |
1233 | === added directory 'analytic_plans_group/demo' |
1234 | === added directory 'analytic_plans_group/doc' |
1235 | === added directory 'analytic_plans_group/doc/images' |
1236 | === added directory 'analytic_plans_group/i18n' |
1237 | === added directory 'analytic_plans_group/model' |
1238 | === added file 'analytic_plans_group/model/__init__.py' |
1239 | --- analytic_plans_group/model/__init__.py 1970-01-01 00:00:00 +0000 |
1240 | +++ analytic_plans_group/model/__init__.py 2014-07-07 15:46:25 +0000 |
1241 | @@ -0,0 +1,26 @@ |
1242 | +#!/usr/bin/python |
1243 | +# -*- encoding: utf-8 -*- |
1244 | +############################################################################### |
1245 | +# Module Writen to OpenERP, Open Source Management Solution |
1246 | +# Copyright (C) OpenERP Venezuela (<http://www.vauxoo.com>). |
1247 | +# All Rights Reserved |
1248 | +############# Credits ######################################################### |
1249 | +# Coded by: Yanina Aular <yani@vauxoo.com> |
1250 | +# Planified by: Humberto Arocha <hbto@vauxoo.com> |
1251 | +# Audited by: Humberto Arocha <hbto@vauxoo.com> |
1252 | +############################################################################### |
1253 | +# This program is free software: you can redistribute it and/or modify |
1254 | +# it under the terms of the GNU Affero General Public License as published |
1255 | +# by the Free Software Foundation, either version 3 of the License, or |
1256 | +# (at your option) any later version. |
1257 | +# |
1258 | +# This program is distributed in the hope that it will be useful, |
1259 | +# but WITHOUT ANY WARRANTY; without even the implied warranty of |
1260 | +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
1261 | +# GNU Affero General Public License for more details. |
1262 | +# |
1263 | +# You should have received a copy of the GNU Affero General Public License |
1264 | +# along with this program. If not, see <http://www.gnu.org/licenses/>. |
1265 | +############################################################################### |
1266 | + |
1267 | +import account_analytic_plans |
1268 | |
1269 | === added file 'analytic_plans_group/model/account_analytic_plans.py' |
1270 | --- analytic_plans_group/model/account_analytic_plans.py 1970-01-01 00:00:00 +0000 |
1271 | +++ analytic_plans_group/model/account_analytic_plans.py 2014-07-07 15:46:25 +0000 |
1272 | @@ -0,0 +1,46 @@ |
1273 | +#!/usr/bin/python |
1274 | +# -*- encoding: utf-8 -*- |
1275 | +############################################################################### |
1276 | +# Module Writen to OpenERP, Open Source Management Solution |
1277 | +# Copyright (C) OpenERP Venezuela (<http://www.vauxoo.com>). |
1278 | +# All Rights Reserved |
1279 | +############# Credits ######################################################### |
1280 | +# Coded by: Yanina Aular <yani@vauxoo.com> |
1281 | +# Planified by: Humberto Arocha <hbto@vauxoo.com> |
1282 | +# Audited by: Humberto Arocha <hbto@vauxoo.com> |
1283 | +############################################################################### |
1284 | +# This program is free software: you can redistribute it and/or modify |
1285 | +# it under the terms of the GNU Affero General Public License as published |
1286 | +# by the Free Software Foundation, either version 3 of the License, or |
1287 | +# (at your option) any later version. |
1288 | +# |
1289 | +# This program is distributed in the hope that it will be useful, |
1290 | +# but WITHOUT ANY WARRANTY; without even the implied warranty of |
1291 | +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
1292 | +# GNU Affero General Public License for more details. |
1293 | +# |
1294 | +# You should have received a copy of the GNU Affero General Public License |
1295 | +# along with this program. If not, see <http://www.gnu.org/licenses/>. |
1296 | +############################################################################### |
1297 | + |
1298 | +import time |
1299 | +from lxml import etree |
1300 | + |
1301 | +from openerp.osv import fields, osv |
1302 | +from openerp import tools |
1303 | +from openerp.tools.translate import _ |
1304 | + |
1305 | +class account_analytic_group(osv.Model): |
1306 | + _name = 'account.analytic.group' |
1307 | + |
1308 | + _columns = { |
1309 | + 'name' : fields.char('Name', required=True, size=128), |
1310 | + } |
1311 | + |
1312 | +class account_analytic_account(osv.Model): |
1313 | + _inherit = 'account.analytic.account' |
1314 | + |
1315 | + _columns = { |
1316 | + 'analytic_group_id': fields.many2one('account.analytic.group', 'Analytic Group'), |
1317 | + } |
1318 | + |
1319 | |
1320 | === added directory 'analytic_plans_group/report' |
1321 | === added directory 'analytic_plans_group/security' |
1322 | === added file 'analytic_plans_group/security/ir.model.access.csv' |
1323 | --- analytic_plans_group/security/ir.model.access.csv 1970-01-01 00:00:00 +0000 |
1324 | +++ analytic_plans_group/security/ir.model.access.csv 2014-07-07 15:46:25 +0000 |
1325 | @@ -0,0 +1,2 @@ |
1326 | +id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink |
1327 | +access_account_analytic_group,access_account_analytic_group,analytic_plans_group.model_account_analytic_group,analytic_plans_group.group_account_analytic_group,1,1,1,1 |
1328 | |
1329 | === added directory 'analytic_plans_group/static' |
1330 | === added directory 'analytic_plans_group/static/description' |
1331 | === added file 'analytic_plans_group/static/description/index.html' |
1332 | === added directory 'analytic_plans_group/static/src' |
1333 | === added directory 'analytic_plans_group/static/src/css' |
1334 | === added directory 'analytic_plans_group/static/src/img' |
1335 | === added file 'analytic_plans_group/static/src/img/icon.png' |
1336 | Binary files analytic_plans_group/static/src/img/icon.png 1970-01-01 00:00:00 +0000 and analytic_plans_group/static/src/img/icon.png 2014-07-07 15:46:25 +0000 differ |
1337 | === added directory 'analytic_plans_group/static/src/js' |
1338 | === added directory 'analytic_plans_group/static/src/xml' |
1339 | === added directory 'analytic_plans_group/test' |
1340 | === added directory 'analytic_plans_group/view' |
1341 | === added file 'analytic_plans_group/view/account_analytic_plans_view.xml' |
1342 | --- analytic_plans_group/view/account_analytic_plans_view.xml 1970-01-01 00:00:00 +0000 |
1343 | +++ analytic_plans_group/view/account_analytic_plans_view.xml 2014-07-07 15:46:25 +0000 |
1344 | @@ -0,0 +1,48 @@ |
1345 | +<?xml version="1.0" encoding="utf-8"?> |
1346 | +<openerp> |
1347 | + <data> |
1348 | + |
1349 | + |
1350 | + <record model="ir.actions.act_window" id="action_account_analytic_group"> |
1351 | + <field name="name">Account Analytic Group</field> |
1352 | + <field name="res_model">account.analytic.group</field> |
1353 | + <field name="view_type">form</field> |
1354 | + <field name="view_mode">tree,form</field> |
1355 | + </record> |
1356 | + |
1357 | + <menuitem parent="account.menu_analytic_accounting" |
1358 | + action="action_account_analytic_group" |
1359 | + sequence="30" |
1360 | + id="menu_analytic_group" |
1361 | + name="Analytic Group" |
1362 | + groups="analytic_plans_group.group_account_analytic_group" |
1363 | + /> |
1364 | + |
1365 | + <record id="view_account_analytic_account_form_group" model="ir.ui.view"> |
1366 | + <field name="name">account.analytic.account.form.group</field> |
1367 | + <field name="model">account.analytic.account</field> |
1368 | + <field name="inherit_id" ref="analytic.view_account_analytic_account_form"/> |
1369 | + <field name="arch" type="xml"> |
1370 | + <xpath expr="//field[@name='manager_id']" position="after"> |
1371 | + <field name="analytic_group_id" |
1372 | + groups="analytic_plans_group.group_account_analytic_group" |
1373 | + /> |
1374 | + </xpath> |
1375 | + </field> |
1376 | + </record> |
1377 | + |
1378 | + <record id="view_account_analytic_account_search_group" model="ir.ui.view"> |
1379 | + <field name="name">account.analytic.account.search.group</field> |
1380 | + <field name="model">account.analytic.account</field> |
1381 | + <field name="inherit_id" ref="account.view_account_analytic_account_search"/> |
1382 | + <field name="arch" type="xml"> |
1383 | + <xpath expr="//group[@string='Group By...']" position="inside"> |
1384 | + <filter string="Analytic Group" |
1385 | + groups="analytic_plans_group.group_account_analytic_group" |
1386 | + context="{'group_by':'analytic_group_id'}"/> |
1387 | + </xpath> |
1388 | + </field> |
1389 | + </record> |
1390 | + |
1391 | + </data> |
1392 | +</openerp> |
1393 | |
1394 | === added directory 'analytic_plans_group/wizard' |
1395 | === added file 'analytic_plans_group/wizard/__init__.py' |
1396 | --- analytic_plans_group/wizard/__init__.py 1970-01-01 00:00:00 +0000 |
1397 | +++ analytic_plans_group/wizard/__init__.py 2014-07-07 15:46:25 +0000 |
1398 | @@ -0,0 +1,25 @@ |
1399 | +#!/usr/bin/python |
1400 | +# -*- encoding: utf-8 -*- |
1401 | +############################################################################### |
1402 | +# Module Writen to OpenERP, Open Source Management Solution |
1403 | +# Copyright (C) OpenERP Venezuela (<http://www.vauxoo.com>). |
1404 | +# All Rights Reserved |
1405 | +############# Credits ######################################################### |
1406 | +# Coded by: Yanina Aular <yani@vauxoo.com> |
1407 | +# Planified by: Humberto Arocha <hbto@vauxoo.com> |
1408 | +# Audited by: Humberto Arocha <hbto@vauxoo.com> |
1409 | +############################################################################### |
1410 | +# This program is free software: you can redistribute it and/or modify |
1411 | +# it under the terms of the GNU Affero General Public License as published |
1412 | +# by the Free Software Foundation, either version 3 of the License, or |
1413 | +# (at your option) any later version. |
1414 | +# |
1415 | +# This program is distributed in the hope that it will be useful, |
1416 | +# but WITHOUT ANY WARRANTY; without even the implied warranty of |
1417 | +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
1418 | +# GNU Affero General Public License for more details. |
1419 | +# |
1420 | +# You should have received a copy of the GNU Affero General Public License |
1421 | +# along with this program. If not, see <http://www.gnu.org/licenses/>. |
1422 | +############################################################################### |
1423 | + |
1424 | |
1425 | === added directory 'analytic_plans_group/workflow' |
1426 | === modified file 'pr_line_related_po_line/__openerp__.py' |
1427 | --- pr_line_related_po_line/__openerp__.py 2014-06-02 22:16:01 +0000 |
1428 | +++ pr_line_related_po_line/__openerp__.py 2014-07-07 15:46:25 +0000 |
1429 | @@ -24,7 +24,7 @@ |
1430 | ############################################################################### |
1431 | |
1432 | { |
1433 | - 'name': 'pr_line_related_po_line', |
1434 | + 'name': 'PR Line related PO Line', |
1435 | 'version': '1.0', |
1436 | 'author': 'Vauxoo', |
1437 | 'website': 'http://www.vauxoo.com/', |
1438 | |
1439 | === modified file 'purchase_order_department/__openerp__.py' |
1440 | --- purchase_order_department/__openerp__.py 2014-06-18 21:27:27 +0000 |
1441 | +++ purchase_order_department/__openerp__.py 2014-07-07 15:46:25 +0000 |
1442 | @@ -45,6 +45,7 @@ |
1443 | 'purchase', |
1444 | 'hr', |
1445 | 'purchase_order_requisitor', |
1446 | + 'purchase_requisition_department', |
1447 | ], |
1448 | 'data': [ |
1449 | 'view/purchase_order_view.xml', |
1450 | |
1451 | === modified file 'purchase_order_department/model/purchase_order.py' |
1452 | --- purchase_order_department/model/purchase_order.py 2014-06-18 21:36:10 +0000 |
1453 | +++ purchase_order_department/model/purchase_order.py 2014-07-07 15:46:25 +0000 |
1454 | @@ -51,3 +51,24 @@ |
1455 | and ru_brw.employee_ids[0].department_id.id or False) |
1456 | res.update({'value': {'department_id': department_id}}) |
1457 | return res |
1458 | + |
1459 | + |
1460 | +class purchase_requisition(osv.Model): |
1461 | + |
1462 | + _inherit = "purchase.requisition" |
1463 | + |
1464 | + def make_purchase_order(self, cur, uid, ids, partner_id, context=None): |
1465 | + """ |
1466 | + Over write the method to also extract the department_id from the |
1467 | + purchase requisition. |
1468 | + """ |
1469 | + context = context or {} |
1470 | + res = super(purchase_requisition, self).make_purchase_order( |
1471 | + cur, uid, ids, partner_id, context=context) |
1472 | + if res: |
1473 | + req_id = res.keys()[0] |
1474 | + req_brw = self.browse(cur, uid, req_id, context=context) |
1475 | + po_obj = self.pool.get('purchase.order') |
1476 | + po_obj.write(cur, uid, res[req_id], {'department_id': |
1477 | + req_brw.department_id.id}, context=context) |
1478 | + return res |
1479 | |
1480 | === modified file 'purchase_requisition_department/model/purchase_requisition.py' |
1481 | --- purchase_requisition_department/model/purchase_requisition.py 2014-06-06 20:59:04 +0000 |
1482 | +++ purchase_requisition_department/model/purchase_requisition.py 2014-07-07 15:46:25 +0000 |
1483 | @@ -37,9 +37,20 @@ |
1484 | help='The department where this purchase requisition belongs'), |
1485 | } |
1486 | |
1487 | - _defaults = { |
1488 | - 'department_id': lambda self, cur, uid, cxt: self.pool.get('res.users').browse(cur, uid, uid, cxt).employee_ids[0].department_id.id, |
1489 | - } |
1490 | + def onchange_user_id(self, cr, uid, ids, user_id, context=None): |
1491 | + """ Return the department depending of the user. |
1492 | + @param user_id: user id |
1493 | + """ |
1494 | + context = context or {} |
1495 | + res = {} |
1496 | + ru_obj = self.pool.get('res.users') |
1497 | + if user_id: |
1498 | + ru_brw = ru_obj.browse(cr, uid, user_id, context=context) |
1499 | + department_id = (ru_brw.employee_ids |
1500 | + and ru_brw.employee_ids[0].department_id |
1501 | + and ru_brw.employee_ids[0].department_id.id or False) |
1502 | + res.update({'value': {'department_id': department_id}}) |
1503 | + return res |
1504 | |
1505 | #def fields_view_get(self, cr, uid, view_id=None, view_type='form', |
1506 | # context=None, toolbar=False, submenu=False): |
1507 | |
1508 | === modified file 'purchase_requisition_department/view/purchase_requisition_view.xml' |
1509 | --- purchase_requisition_department/view/purchase_requisition_view.xml 2014-06-06 19:24:33 +0000 |
1510 | +++ purchase_requisition_department/view/purchase_requisition_view.xml 2014-07-07 15:46:25 +0000 |
1511 | @@ -10,6 +10,10 @@ |
1512 | <xpath expr="//field[@name='user_id']" position="after"> |
1513 | <field name="department_id"/> |
1514 | </xpath> |
1515 | + <xpath expr="//field[@name='user_id']" position="attributes"> |
1516 | + <attribute name="on_change">onchange_user_id(user_id)</attribute> |
1517 | + </xpath> |
1518 | + |
1519 | </field> |
1520 | </record> |
1521 | |
1522 | |
1523 | === modified file 'purchase_requisition_line_plan/__openerp__.py' |
1524 | --- purchase_requisition_line_plan/__openerp__.py 2014-06-27 13:36:27 +0000 |
1525 | +++ purchase_requisition_line_plan/__openerp__.py 2014-07-07 15:46:25 +0000 |
1526 | @@ -36,11 +36,10 @@ |
1527 | the account analytic value from the purchase requisition. |
1528 | ''', |
1529 | 'depends': [ |
1530 | - 'account_analytic_plans', |
1531 | 'purchase_requisition', |
1532 | 'purchase_requisition_line_view', |
1533 | + 'purchase_analytic_plans', |
1534 | 'pr_line_related_po_line', |
1535 | - 'purchase_analytic_plans', |
1536 | ], |
1537 | 'data': [ |
1538 | 'view/purchase_requisition_view.xml', |
1539 | |
1540 | === modified file 'purchase_requisition_line_plan/model/purchase_requisition.py' |
1541 | --- purchase_requisition_line_plan/model/purchase_requisition.py 2014-06-13 13:25:35 +0000 |
1542 | +++ purchase_requisition_line_plan/model/purchase_requisition.py 2014-07-07 15:46:25 +0000 |
1543 | @@ -28,27 +28,15 @@ |
1544 | from openerp.tools.translate import _ |
1545 | import openerp.addons.decimal_precision as dp |
1546 | from openerp import tools |
1547 | - |
1548 | -class purchase_order_line(osv.Model): |
1549 | - _inherit = "purchase.order.line" |
1550 | - |
1551 | - _columns = { |
1552 | - 'account_analytic_plan_id': fields.many2one( |
1553 | - 'account.analytic.plan.instance', 'Analytic Distribution', |
1554 | - help='This field is used to assign the selected'\ |
1555 | - ' analytic account to the line of the purchase order'), |
1556 | - |
1557 | - } |
1558 | - |
1559 | |
1560 | class purchase_requisition_line(osv.Model): |
1561 | _inherit = "purchase.requisition.line" |
1562 | |
1563 | _columns = { |
1564 | - 'account_analytic_plan_id': fields.many2one( |
1565 | + 'analytics_id': fields.many2one( |
1566 | 'account.analytic.plan.instance', 'Analytic Distribution', |
1567 | help='This field is used to assign the selected'\ |
1568 | - ' analytic account to the line of the purchase order'), |
1569 | + ' analytic distribution to the line of the purchase requisition'), |
1570 | } |
1571 | |
1572 | class purchase_requisition(osv.Model): |
1573 | @@ -70,6 +58,6 @@ |
1574 | pol_ids = pol_obj.search(cr, uid, [('order_id','=',po_id)]) |
1575 | for pol_id in pol_ids: |
1576 | pol_brw = pol_obj.browse(cr, uid, pol_id) |
1577 | - pol_obj.write(cr, uid, [pol_brw.id], {'account_analytic_plan_id': |
1578 | - pol_brw.purchase_requisition_line_id.account_analytic_plan_id.id}, context=context) |
1579 | + pol_obj.write(cr, uid, [pol_brw.id], {'analytics_id': |
1580 | + pol_brw.purchase_requisition_line_id.analytics_id.id}, context=context) |
1581 | return res |
1582 | |
1583 | === modified file 'purchase_requisition_line_plan/view/purchase_requisition_view.xml' |
1584 | --- purchase_requisition_line_plan/view/purchase_requisition_view.xml 2014-06-13 13:25:35 +0000 |
1585 | +++ purchase_requisition_line_plan/view/purchase_requisition_view.xml 2014-07-07 15:46:25 +0000 |
1586 | @@ -7,10 +7,10 @@ |
1587 | <field name="inherit_id" ref="purchase_requisition.view_purchase_requisition_form"/> |
1588 | <field name="arch" type="xml"> |
1589 | <xpath expr="//field[@name='line_ids']//form//field[@name='product_qty']" position="after"> |
1590 | - <field name="account_analytic_plan_id"/> |
1591 | + <field name="analytics_id"/> |
1592 | </xpath> |
1593 | <xpath expr="//field[@name='line_ids']//tree//field[@name='product_qty']" position="after"> |
1594 | - <field name="account_analytic_plan_id"/> |
1595 | + <field name="analytics_id"/> |
1596 | </xpath> |
1597 | </field> |
1598 | </record> |
1599 | @@ -21,7 +21,7 @@ |
1600 | <field name="inherit_id" ref="purchase_requisition_line_view.view_purchase_requisition_line_form"/> |
1601 | <field name="arch" type="xml"> |
1602 | <xpath expr="//field[@name='product_qty']" position="after"> |
1603 | - <field name="account_analytic_plan_id"/> |
1604 | + <field name="analytics_id"/> |
1605 | </xpath> |
1606 | </field> |
1607 | </record> |
1608 | @@ -32,7 +32,7 @@ |
1609 | <field name="inherit_id" ref="purchase_requisition_line_view.view_purchase_requisition_line_tree"/> |
1610 | <field name="arch" type="xml"> |
1611 | <xpath expr="//field[@name='product_qty']" position="after"> |
1612 | - <field name="account_analytic_plan_id" groups="purchase.group_analytic_accounting"/> |
1613 | + <field name="analytics_id" groups="purchase.group_analytic_accounting"/> |
1614 | </xpath> |
1615 | </field> |
1616 | </record> |
Everything has gone green
https:/ /docs.google. com/a/vauxoo. com/file/ d/0B1w9gokcJL9h TlRuTTh1V3lOdHM /edit?usp= drivesdk