Merge lp:~dreis-pt/openerp-mgmtsystem/isolate-audittrail into lp:openerp-mgmtsystem
- isolate-audittrail
- Merge into 7.0
Status: | Merged |
---|---|
Merged at revision: | 23 |
Proposed branch: | lp:~dreis-pt/openerp-mgmtsystem/isolate-audittrail |
Merge into: | lp:openerp-mgmtsystem |
Diff against target: |
684 lines (+312/-102) 25 files modified
mgmtsystem_action/__openerp__.py (+8/-9) mgmtsystem_action/mgmtsystem_action.xml (+2/-14) mgmtsystem_action_audittrail/__init__.py (+2/-0) mgmtsystem_action_audittrail/__openerp__.py (+37/-0) mgmtsystem_action_audittrail/mgmtsystem_action.xml (+17/-0) mgmtsystem_audit/__openerp__.py (+2/-2) mgmtsystem_audit/mgmtsystem_audit.xml (+2/-13) mgmtsystem_audit_audittrail/__init__.py (+2/-0) mgmtsystem_audit_audittrail/__openerp__.py (+37/-0) mgmtsystem_audit_audittrail/mgmtsystem_audit.xml (+18/-0) mgmtsystem_claim/__openerp__.py (+7/-9) mgmtsystem_claim/mgmtsystem_claim.xml (+2/-14) mgmtsystem_claim_audittrail/__init__.py (+2/-0) mgmtsystem_claim_audittrail/__openerp__.py (+37/-0) mgmtsystem_claim_audittrail/mgmtsystem_claim.xml (+16/-0) mgmtsystem_hazard/__openerp__.py (+3/-11) mgmtsystem_hazard/mgmtsystem_hazard.xml (+3/-15) mgmtsystem_hazard_audittrail/__init__.py (+2/-0) mgmtsystem_hazard_audittrail/__openerp__.py (+37/-0) mgmtsystem_hazard_audittrail/mgmtsystem_hazard.xml (+16/-0) mgmtsystem_review/__openerp__.py (+1/-2) mgmtsystem_review/mgmtsystem_review.xml (+1/-13) mgmtsystem_review_audittrail/__init__.py (+2/-0) mgmtsystem_review_audittrail/__openerp__.py (+37/-0) mgmtsystem_review_audittrail/mgmtsystem_review.xml (+19/-0) |
To merge this branch: | bzr merge lp:~dreis-pt/openerp-mgmtsystem/isolate-audittrail |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Maxime Chambreuil (http://www.savoirfairelinux.com) | Approve | ||
Guewen Baconnier @ Camptocamp | code review, no test | Needs Fixing | |
Review via email: mp+151206@code.launchpad.net |
Commit message
Description of the change
Currently a dependency is forced on the audittrail module.
This change makes that feature available, but optional.
These new audittrail modules are automatically installed when the audittrail module is installed.
Guewen Baconnier @ Camptocamp (gbaconnier-c2c) wrote : | # |
- 24. By Daniel Reis
-
[FIX] dos2unix
- 25. By Daniel Reis
-
[FIX] Improving manifest descriptions.
Daniel Reis (dreis-pt) wrote : | # |
@Guewen: Diff was big because of whitespace differences ... I fixed that.
The changes don't touch any form definitions - that's now more clear with the whitespace fix.
I also improved the module descriptions, but full descriptions are on the mgmgsystem main modules.
Guewen Baconnier @ Camptocamp (gbaconnier-c2c) wrote : | # |
Thanks, for the whitespace, thats better.
I think that the descriptions are fine now.
Maxime Chambreuil (http://www.savoirfairelinux.com) (max3903) wrote : | # |
In new module names, there is a typo: Audittral -> Audittrail
# -*- encoding: utf-8 -*-
should become
# -*- coding: utf-8 -*-
- 26. By Daniel Reis
-
[FIX] typo on module names; python source encoding declaration.
Daniel Reis (dreis-pt) wrote : | # |
@maxime: You're right. Fixed it.
Maxime Chambreuil (http://www.savoirfairelinux.com) (max3903) : | # |
Preview Diff
1 | === modified file 'mgmtsystem_action/__openerp__.py' |
2 | --- mgmtsystem_action/__openerp__.py 2013-01-31 14:21:30 +0000 |
3 | +++ mgmtsystem_action/__openerp__.py 2013-03-04 15:00:27 +0000 |
4 | @@ -1,6 +1,6 @@ |
5 | # -*- encoding: utf-8 -*- |
6 | ############################################################################## |
7 | -# |
8 | +# |
9 | # OpenERP, Open Source Management Solution |
10 | # Copyright (C) 2010 Savoir-faire Linux (<http://www.savoirfairelinux.com>). |
11 | # |
12 | @@ -31,17 +31,16 @@ |
13 | * corrective actions |
14 | * preventive actions |
15 | * improvement opportunities. |
16 | - |
17 | -WARNING: when upgrading from v0.1, data conversion is required, since there are subtancial changes to the data structure. |
18 | - """, |
19 | - "depends" : ['mgmtsystem','audittrail','crm_claim'], |
20 | - "init_xml" : [], |
21 | - "update_xml" : [ |
22 | +""", |
23 | + "depends": ['mgmtsystem', 'crm_claim'], |
24 | + "init": [ |
25 | + 'action_sequence.xml', |
26 | + 'workflow_mgmtsystem_action.xml', |
27 | + ], |
28 | + "data": [ |
29 | 'security/ir.model.access.csv', |
30 | 'mgmtsystem_action.xml', |
31 | - 'action_sequence.xml', |
32 | 'board_mgmtsystem_action.xml', |
33 | - 'workflow_mgmtsystem_action.xml', |
34 | ], |
35 | "demo_xml" : ['demo_action.xml',], |
36 | "installable" : True, |
37 | |
38 | === modified file 'mgmtsystem_action/mgmtsystem_action.xml' |
39 | --- mgmtsystem_action/mgmtsystem_action.xml 2013-02-08 16:05:22 +0000 |
40 | +++ mgmtsystem_action/mgmtsystem_action.xml 2013-03-04 15:00:27 +0000 |
41 | @@ -32,7 +32,7 @@ |
42 | <field name="user_id"/> |
43 | <field name="system_id"/> |
44 | </group> |
45 | - <newline /> |
46 | + <newline/> |
47 | <group expand="0" string="Group By..."> |
48 | <filter string="User" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/> |
49 | <separator orientation="vertical"/> |
50 | @@ -108,18 +108,6 @@ |
51 | sequence="30" |
52 | groups="mgmtsystem.group_mgmtsystem_manager,mgmtsystem.group_mgmtsystem_auditor,base.group_user"/> |
53 | |
54 | - <!-- audittrail rule --> |
55 | - |
56 | - <record id="mgmtsystem_action_audit_rule" model="audittrail.rule"> |
57 | - <field name="name">Audit on Management System Actions</field> |
58 | - <field name="object_id" search="[('model','=','mgmtsystem.action')]"/> |
59 | - <field name="log_create">1</field> |
60 | - <field name="log_workflow">1</field> |
61 | - <field name="log_unlink">1</field> |
62 | - <field name="log_action">1</field> |
63 | - <field name="log_workflow">1</field> |
64 | - <field name="state">subscribed</field> |
65 | - </record> |
66 | - |
67 | </data> |
68 | </openerp> |
69 | + |
70 | |
71 | === added directory 'mgmtsystem_action_audittrail' |
72 | === added file 'mgmtsystem_action_audittrail/__init__.py' |
73 | --- mgmtsystem_action_audittrail/__init__.py 1970-01-01 00:00:00 +0000 |
74 | +++ mgmtsystem_action_audittrail/__init__.py 2013-03-04 15:00:27 +0000 |
75 | @@ -0,0 +1,2 @@ |
76 | +# -*- coding: utf-8 -*- |
77 | +# empty |
78 | \ No newline at end of file |
79 | |
80 | === added file 'mgmtsystem_action_audittrail/__openerp__.py' |
81 | --- mgmtsystem_action_audittrail/__openerp__.py 1970-01-01 00:00:00 +0000 |
82 | +++ mgmtsystem_action_audittrail/__openerp__.py 2013-03-04 15:00:27 +0000 |
83 | @@ -0,0 +1,37 @@ |
84 | +# -*- coding: utf-8 -*- |
85 | +############################################################################## |
86 | +# |
87 | +# OpenERP, Open Source Management Solution |
88 | +# Copyright (C) 2010 Savoir-faire Linux (<http://www.savoirfairelinux.com>). |
89 | +# |
90 | +# This program is free software: you can redistribute it and/or modify |
91 | +# it under the terms of the GNU Affero General Public License as |
92 | +# published by the Free Software Foundation, either version 3 of the |
93 | +# License, or (at your option) any later version. |
94 | +# |
95 | +# This program is distributed in the hope that it will be useful, |
96 | +# but WITHOUT ANY WARRANTY; without even the implied warranty of |
97 | +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
98 | +# GNU Affero General Public License for more details. |
99 | +# |
100 | +# You should have received a copy of the GNU Affero General Public License |
101 | +# along with this program. If not, see <http://www.gnu.org/licenses/>. |
102 | +# |
103 | +############################################################################## |
104 | +{ |
105 | + "name": "Management System - Actions Audit Trail tracking", |
106 | + "version": "1.0", |
107 | + "author": "Savoir-faire Linux", |
108 | + "website": "http://www.savoirfairelinux.com", |
109 | + "license": "AGPL-3", |
110 | + "category": "Management System", |
111 | + "description": """\ |
112 | +Adds rule to track changes to Management System Actions, if Audit Trail module |
113 | +is installed. |
114 | +""", |
115 | + "depends": ['mgmtsystem_action', 'audittrail'], |
116 | + "init": ['mgmtsystem_action.xml'], |
117 | + "data": [], |
118 | + "auto_install": True, |
119 | +} |
120 | +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |
121 | |
122 | === added file 'mgmtsystem_action_audittrail/mgmtsystem_action.xml' |
123 | --- mgmtsystem_action_audittrail/mgmtsystem_action.xml 1970-01-01 00:00:00 +0000 |
124 | +++ mgmtsystem_action_audittrail/mgmtsystem_action.xml 2013-03-04 15:00:27 +0000 |
125 | @@ -0,0 +1,17 @@ |
126 | +<openerp> |
127 | + <data> |
128 | + |
129 | + <record id="mgmtsystem_action_audit_rule" model="audittrail.rule"> |
130 | + <field name="name">Audit on Management System Actions</field> |
131 | + <field name="object_id" search="[('model','=','mgmtsystem.action')]"/> |
132 | + <field name="log_create">1</field> |
133 | + <field name="log_workflow">1</field> |
134 | + <field name="log_unlink">1</field> |
135 | + <field name="log_action">1</field> |
136 | + <field name="log_workflow">1</field> |
137 | + <field name="state">subscribed</field> |
138 | + </record> |
139 | + |
140 | + </data> |
141 | +</openerp> |
142 | + |
143 | |
144 | === modified file 'mgmtsystem_audit/__openerp__.py' |
145 | --- mgmtsystem_audit/__openerp__.py 2013-01-31 14:21:30 +0000 |
146 | +++ mgmtsystem_audit/__openerp__.py 2013-03-04 15:00:27 +0000 |
147 | @@ -1,6 +1,6 @@ |
148 | # -*- encoding: utf-8 -*- |
149 | ############################################################################## |
150 | -# |
151 | +# |
152 | # OpenERP, Open Source Management Solution |
153 | # Copyright (C) 2010 Savoir-faire Linux (<http://www.savoirfairelinux.com>). |
154 | # |
155 | @@ -28,7 +28,7 @@ |
156 | "description": """\ |
157 | This module enables you to manage audits and verifications lists of your management system. |
158 | """, |
159 | - "depends" : ['mgmtsystem_nonconformity','audittrail'], |
160 | + "depends": ['mgmtsystem_nonconformity'], |
161 | "init_xml" : [ |
162 | 'audit_sequence.xml', |
163 | ], |
164 | |
165 | === modified file 'mgmtsystem_audit/mgmtsystem_audit.xml' |
166 | --- mgmtsystem_audit/mgmtsystem_audit.xml 2013-02-08 16:05:22 +0000 |
167 | +++ mgmtsystem_audit/mgmtsystem_audit.xml 2013-03-04 15:00:27 +0000 |
168 | @@ -169,18 +169,6 @@ |
169 | sequence="10" |
170 | groups="mgmtsystem.group_mgmtsystem_manager,mgmtsystem.group_mgmtsystem_auditor"/> |
171 | |
172 | - <!-- audittrail rule --> |
173 | - |
174 | - <record id="mgmtsystem_audit_audit_rule" model="audittrail.rule"> |
175 | - <field name="name">Audit on Management System Audits</field> |
176 | - <field name="object_id" search="[('model','=','mgmtsystem.audit')]"/> |
177 | - <field name="log_create">1</field> |
178 | - <field name="log_workflow">1</field> |
179 | - <field name="log_unlink">1</field> |
180 | - <field name="log_action">1</field> |
181 | - <field name="log_workflow">1</field> |
182 | - <field name="state">subscribed</field> |
183 | - </record> |
184 | |
185 | <!-- Nonconformities related to Audits --> |
186 | <record id="view_mgmtsystem_nonconformity_form" model="ir.ui.view"> |
187 | @@ -191,7 +179,7 @@ |
188 | |
189 | <notebook position="inside"> |
190 | <page string="Related Audits" groups="base.group_extended,mgmtsystem.group_mgmtsystem_auditor"> |
191 | - <field name="audit_ids" colspan="4" nolabel="1" /> |
192 | + <field name="audit_ids" colspan="4" nolabel="1"/> |
193 | </page> |
194 | </notebook> |
195 | |
196 | @@ -201,3 +189,4 @@ |
197 | |
198 | </data> |
199 | </openerp> |
200 | + |
201 | |
202 | === added directory 'mgmtsystem_audit_audittrail' |
203 | === added file 'mgmtsystem_audit_audittrail/__init__.py' |
204 | --- mgmtsystem_audit_audittrail/__init__.py 1970-01-01 00:00:00 +0000 |
205 | +++ mgmtsystem_audit_audittrail/__init__.py 2013-03-04 15:00:27 +0000 |
206 | @@ -0,0 +1,2 @@ |
207 | +# -*- coding: utf-8 -*- |
208 | +# empty |
209 | \ No newline at end of file |
210 | |
211 | === added file 'mgmtsystem_audit_audittrail/__openerp__.py' |
212 | --- mgmtsystem_audit_audittrail/__openerp__.py 1970-01-01 00:00:00 +0000 |
213 | +++ mgmtsystem_audit_audittrail/__openerp__.py 2013-03-04 15:00:27 +0000 |
214 | @@ -0,0 +1,37 @@ |
215 | +# -*- coding: utf-8 -*- |
216 | +############################################################################## |
217 | +# |
218 | +# OpenERP, Open Source Management Solution |
219 | +# Copyright (C) 2010 Savoir-faire Linux (<http://www.savoirfairelinux.com>). |
220 | +# |
221 | +# This program is free software: you can redistribute it and/or modify |
222 | +# it under the terms of the GNU Affero General Public License as |
223 | +# published by the Free Software Foundation, either version 3 of the |
224 | +# License, or (at your option) any later version. |
225 | +# |
226 | +# This program is distributed in the hope that it will be useful, |
227 | +# but WITHOUT ANY WARRANTY; without even the implied warranty of |
228 | +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
229 | +# GNU Affero General Public License for more details. |
230 | +# |
231 | +# You should have received a copy of the GNU Affero General Public License |
232 | +# along with this program. If not, see <http://www.gnu.org/licenses/>. |
233 | +# |
234 | +############################################################################## |
235 | +{ |
236 | + "name": "Management System - Audits Audit Trail tracking", |
237 | + "version": "1.0", |
238 | + "author": "Savoir-faire Linux", |
239 | + "website": "http://www.savoirfairelinux.com", |
240 | + "license": "AGPL-3", |
241 | + "category": "Management System", |
242 | + "description": """\ |
243 | +Adds rule to track changes to Management System Audits, if Audit Trail module |
244 | +is installed. |
245 | +""", |
246 | + "depends": ['mgmtsystem_audit', 'audittrail'], |
247 | + "init": ['mgmtsystem_audit.xml'], |
248 | + "data": [], |
249 | + "auto_install": True, |
250 | +} |
251 | +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |
252 | |
253 | === added file 'mgmtsystem_audit_audittrail/mgmtsystem_audit.xml' |
254 | --- mgmtsystem_audit_audittrail/mgmtsystem_audit.xml 1970-01-01 00:00:00 +0000 |
255 | +++ mgmtsystem_audit_audittrail/mgmtsystem_audit.xml 2013-03-04 15:00:27 +0000 |
256 | @@ -0,0 +1,18 @@ |
257 | +<openerp> |
258 | + <data> |
259 | + |
260 | + <record id="mgmtsystem_audit_audit_rule" model="audittrail.rule"> |
261 | + <field name="name">Audit on Management System Audits</field> |
262 | + <field name="object_id" search="[('model','=','mgmtsystem.audit')]"/> |
263 | + <field name="log_create">1</field> |
264 | + <field name="log_workflow">1</field> |
265 | + <field name="log_unlink">1</field> |
266 | + <field name="log_action">1</field> |
267 | + <field name="log_workflow">1</field> |
268 | + <field name="state">subscribed</field> |
269 | + </record> |
270 | + |
271 | + </data> |
272 | +</openerp> |
273 | + |
274 | + |
275 | |
276 | === modified file 'mgmtsystem_claim/__openerp__.py' |
277 | --- mgmtsystem_claim/__openerp__.py 2013-01-31 14:21:30 +0000 |
278 | +++ mgmtsystem_claim/__openerp__.py 2013-03-04 15:00:27 +0000 |
279 | @@ -1,6 +1,6 @@ |
280 | # -*- encoding: utf-8 -*- |
281 | ############################################################################## |
282 | -# |
283 | +# |
284 | # OpenERP, Open Source Management Solution |
285 | # Copyright (C) 2010 Savoir-faire Linux (<http://www.savoirfairelinux.com>). |
286 | # |
287 | @@ -26,18 +26,16 @@ |
288 | "license" : "AGPL-3", |
289 | "category" : "Management System", |
290 | "description": """This module enables you to manage the claims of your management system.""", |
291 | - "depends" : ['mgmtsystem','audittrail','crm_claim','mail'], |
292 | - "init_xml" : [], |
293 | - "update_xml" : [ |
294 | + "depends": ['mgmtsystem', 'crm_claim', 'mail'], |
295 | + "init": [ |
296 | + 'claim_sequence.xml', |
297 | + 'workflow_mgmtsystem_claim.xml', |
298 | + ], |
299 | + "data": [ |
300 | 'security/ir.model.access.csv', |
301 | 'mgmtsystem_claim.xml', |
302 | - 'claim_sequence.xml', |
303 | 'board_mgmtsystem_claim.xml', |
304 | - 'workflow_mgmtsystem_claim.xml', |
305 | ], |
306 | - "demo_xml" : [], |
307 | - "installable" : True, |
308 | - "certificate" : '' |
309 | } |
310 | # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |
311 | |
312 | |
313 | === modified file 'mgmtsystem_claim/mgmtsystem_claim.xml' |
314 | --- mgmtsystem_claim/mgmtsystem_claim.xml 2013-01-28 19:11:37 +0000 |
315 | +++ mgmtsystem_claim/mgmtsystem_claim.xml 2013-03-04 15:00:27 +0000 |
316 | @@ -11,7 +11,7 @@ |
317 | <field name="reference"/> |
318 | <field name="name"/> |
319 | <field name="partner_id"/> |
320 | - <field name="user_id" /> |
321 | + <field name="user_id"/> |
322 | <field name="date"/> |
323 | <field name="date_action_next"/> |
324 | <field name="action_next"/> |
325 | @@ -206,18 +206,6 @@ |
326 | parent="mgmtsystem.menu_mgmtsystem_configuration" |
327 | sequence="20" /> |
328 | |
329 | - <!-- audittrail rule --> |
330 | - |
331 | - <record id="mgmtsystem_claim_audit_rule" model="audittrail.rule"> |
332 | - <field name="name">Audit on Management System Claims</field> |
333 | - <field name="object_id" search="[('model','=','mgmtsystem.claim')]"/> |
334 | - <field name="log_create">1</field> |
335 | - <field name="log_workflow">1</field> |
336 | - <field name="log_unlink">1</field> |
337 | - <field name="log_action">1</field> |
338 | - <field name="log_workflow">1</field> |
339 | - <field name="state">subscribed</field> |
340 | - </record> |
341 | - |
342 | </data> |
343 | </openerp> |
344 | + |
345 | |
346 | === added directory 'mgmtsystem_claim_audittrail' |
347 | === added file 'mgmtsystem_claim_audittrail/__init__.py' |
348 | --- mgmtsystem_claim_audittrail/__init__.py 1970-01-01 00:00:00 +0000 |
349 | +++ mgmtsystem_claim_audittrail/__init__.py 2013-03-04 15:00:27 +0000 |
350 | @@ -0,0 +1,2 @@ |
351 | +# -*- coding: utf-8 -*- |
352 | +# empty |
353 | \ No newline at end of file |
354 | |
355 | === added file 'mgmtsystem_claim_audittrail/__openerp__.py' |
356 | --- mgmtsystem_claim_audittrail/__openerp__.py 1970-01-01 00:00:00 +0000 |
357 | +++ mgmtsystem_claim_audittrail/__openerp__.py 2013-03-04 15:00:27 +0000 |
358 | @@ -0,0 +1,37 @@ |
359 | +# -*- coding: utf-8 -*- |
360 | +############################################################################## |
361 | +# |
362 | +# OpenERP, Open Source Management Solution |
363 | +# Copyright (C) 2010 Savoir-faire Linux (<http://www.savoirfairelinux.com>). |
364 | +# |
365 | +# This program is free software: you can redistribute it and/or modify |
366 | +# it under the terms of the GNU Affero General Public License as |
367 | +# published by the Free Software Foundation, either version 3 of the |
368 | +# License, or (at your option) any later version. |
369 | +# |
370 | +# This program is distributed in the hope that it will be useful, |
371 | +# but WITHOUT ANY WARRANTY; without even the implied warranty of |
372 | +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
373 | +# GNU Affero General Public License for more details. |
374 | +# |
375 | +# You should have received a copy of the GNU Affero General Public License |
376 | +# along with this program. If not, see <http://www.gnu.org/licenses/>. |
377 | +# |
378 | +############################################################################## |
379 | +{ |
380 | + "name": "Management System - Claims Audit Trail tracking", |
381 | + "version": "1.0", |
382 | + "author": "Savoir-faire Linux", |
383 | + "website": "http://www.savoirfairelinux.com", |
384 | + "license": "AGPL-3", |
385 | + "category": "Management System", |
386 | + "description": """\ |
387 | +Adds rule to track changes to Management System Claims, if Audit Trail module |
388 | +is installed. |
389 | +""", |
390 | + "depends": ['mgmtsystem_claim', 'audittrail'], |
391 | + "init": ['mgmtsystem_claim.xml'], |
392 | + "data": [], |
393 | + "auto_install": True, |
394 | +} |
395 | +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |
396 | |
397 | === added file 'mgmtsystem_claim_audittrail/mgmtsystem_claim.xml' |
398 | --- mgmtsystem_claim_audittrail/mgmtsystem_claim.xml 1970-01-01 00:00:00 +0000 |
399 | +++ mgmtsystem_claim_audittrail/mgmtsystem_claim.xml 2013-03-04 15:00:27 +0000 |
400 | @@ -0,0 +1,16 @@ |
401 | +<openerp> |
402 | + <data> |
403 | + |
404 | + <record id="mgmtsystem_claim_audit_rule" model="audittrail.rule"> |
405 | + <field name="name">Audit on Management System Claims</field> |
406 | + <field name="object_id" search="[('model','=','mgmtsystem.claim')]"/> |
407 | + <field name="log_create">1</field> |
408 | + <field name="log_workflow">1</field> |
409 | + <field name="log_unlink">1</field> |
410 | + <field name="log_action">1</field> |
411 | + <field name="log_workflow">1</field> |
412 | + <field name="state">subscribed</field> |
413 | + </record> |
414 | + |
415 | + </data> |
416 | +</openerp> |
417 | |
418 | === modified file 'mgmtsystem_hazard/__openerp__.py' |
419 | --- mgmtsystem_hazard/__openerp__.py 2013-01-31 14:21:30 +0000 |
420 | +++ mgmtsystem_hazard/__openerp__.py 2013-03-04 15:00:27 +0000 |
421 | @@ -1,6 +1,6 @@ |
422 | # -*- encoding: utf-8 -*- |
423 | ############################################################################## |
424 | -# |
425 | +# |
426 | # OpenERP, Open Source Management Solution |
427 | # Copyright (C) 2010 Savoir-faire Linux (<http://www.savoirfairelinux.com>). |
428 | # |
429 | @@ -28,20 +28,12 @@ |
430 | "description": """\ |
431 | This module enables you to manage the hazards and risks of your health and safety management system. |
432 | """, |
433 | - "depends" : [ |
434 | - 'mgmtsystem', |
435 | - 'hr', |
436 | - 'audittrail', |
437 | - ], |
438 | - "init_xml" : [], |
439 | - "update_xml" : [ |
440 | + "depends": ['mgmtsystem', 'hr'], |
441 | + "data": [ |
442 | 'security/ir.model.access.csv', |
443 | 'mgmtsystem_hazard.xml', |
444 | 'mgmtsystem_hazard_data.xml', |
445 | ], |
446 | - "demo_xml" : [], |
447 | - "installable" : True, |
448 | - "certificate" : '' |
449 | } |
450 | # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |
451 | |
452 | |
453 | === modified file 'mgmtsystem_hazard/mgmtsystem_hazard.xml' |
454 | --- mgmtsystem_hazard/mgmtsystem_hazard.xml 2013-01-29 15:35:43 +0000 |
455 | +++ mgmtsystem_hazard/mgmtsystem_hazard.xml 2013-03-04 15:00:27 +0000 |
456 | @@ -39,7 +39,7 @@ |
457 | <field name="risk"/> |
458 | <field name="acceptability"/> |
459 | </group> |
460 | - <newline /> |
461 | + <newline/> |
462 | <group expand="0" string="Group By..."> |
463 | <filter string="Accepted" context="{'group_by':'acceptability'}"/> |
464 | <separator orientation="vertical"/> |
465 | @@ -72,7 +72,7 @@ |
466 | <page string="Risk Evaluation"> |
467 | <field name="probability_id"/> |
468 | <field name="severity_id"/> |
469 | - <newline /> |
470 | + <newline/> |
471 | <field name="usage_id"/> |
472 | <field name="risk"/> |
473 | <newline/> |
474 | @@ -754,18 +754,6 @@ |
475 | <field name="search_view_id" ref="view_mgmtsystem_hazard_residual_risk_filter"/> |
476 | </record> |
477 | |
478 | - <!-- audittrail rule --> |
479 | - |
480 | - <record id="mgmtsystem_hazard_audit_rule" model="audittrail.rule"> |
481 | - <field name="name">Audit on Management System Hazards</field> |
482 | - <field name="object_id" search="[('model','=','mgmtsystem.hazard')]"/> |
483 | - <field name="log_create">1</field> |
484 | - <field name="log_workflow">1</field> |
485 | - <field name="log_unlink">1</field> |
486 | - <field name="log_action">1</field> |
487 | - <field name="log_workflow">1</field> |
488 | - <field name="state">subscribed</field> |
489 | - </record> |
490 | - |
491 | </data> |
492 | </openerp> |
493 | + |
494 | |
495 | === added directory 'mgmtsystem_hazard_audittrail' |
496 | === added file 'mgmtsystem_hazard_audittrail/__init__.py' |
497 | --- mgmtsystem_hazard_audittrail/__init__.py 1970-01-01 00:00:00 +0000 |
498 | +++ mgmtsystem_hazard_audittrail/__init__.py 2013-03-04 15:00:27 +0000 |
499 | @@ -0,0 +1,2 @@ |
500 | +# -*- coding: utf-8 -*- |
501 | +# empty |
502 | \ No newline at end of file |
503 | |
504 | === added file 'mgmtsystem_hazard_audittrail/__openerp__.py' |
505 | --- mgmtsystem_hazard_audittrail/__openerp__.py 1970-01-01 00:00:00 +0000 |
506 | +++ mgmtsystem_hazard_audittrail/__openerp__.py 2013-03-04 15:00:27 +0000 |
507 | @@ -0,0 +1,37 @@ |
508 | +# -*- coding: utf-8 -*- |
509 | +############################################################################## |
510 | +# |
511 | +# OpenERP, Open Source Management Solution |
512 | +# Copyright (C) 2010 Savoir-faire Linux (<http://www.savoirfairelinux.com>). |
513 | +# |
514 | +# This program is free software: you can redistribute it and/or modify |
515 | +# it under the terms of the GNU Affero General Public License as |
516 | +# published by the Free Software Foundation, either version 3 of the |
517 | +# License, or (at your option) any later version. |
518 | +# |
519 | +# This program is distributed in the hope that it will be useful, |
520 | +# but WITHOUT ANY WARRANTY; without even the implied warranty of |
521 | +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
522 | +# GNU Affero General Public License for more details. |
523 | +# |
524 | +# You should have received a copy of the GNU Affero General Public License |
525 | +# along with this program. If not, see <http://www.gnu.org/licenses/>. |
526 | +# |
527 | +############################################################################## |
528 | +{ |
529 | + "name": "Management System - Hazards Audit Trail tracking", |
530 | + "version": "1.0", |
531 | + "author": "Savoir-faire Linux", |
532 | + "website": "http://www.savoirfairelinux.com", |
533 | + "license": "AGPL-3", |
534 | + "category": "Management System", |
535 | + "description": """\ |
536 | +Adds rule to track changes to Management System Hazards, if Audit Trail module |
537 | +is installed. |
538 | +""", |
539 | + "depends": ['mgmtsystem_hazard', 'audittrail'], |
540 | + "init": ['mgmtsystem_hazard.xml'], |
541 | + "data": [], |
542 | + "auto_install": True, |
543 | +} |
544 | +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |
545 | |
546 | === added file 'mgmtsystem_hazard_audittrail/mgmtsystem_hazard.xml' |
547 | --- mgmtsystem_hazard_audittrail/mgmtsystem_hazard.xml 1970-01-01 00:00:00 +0000 |
548 | +++ mgmtsystem_hazard_audittrail/mgmtsystem_hazard.xml 2013-03-04 15:00:27 +0000 |
549 | @@ -0,0 +1,16 @@ |
550 | +<openerp> |
551 | + <data> |
552 | + |
553 | + <record id="mgmtsystem_hazard_audit_rule" model="audittrail.rule"> |
554 | + <field name="name">Audit on Management System Hazards</field> |
555 | + <field name="object_id" search="[('model','=','mgmtsystem.hazard')]"/> |
556 | + <field name="log_create">1</field> |
557 | + <field name="log_workflow">1</field> |
558 | + <field name="log_unlink">1</field> |
559 | + <field name="log_action">1</field> |
560 | + <field name="log_workflow">1</field> |
561 | + <field name="state">subscribed</field> |
562 | + </record> |
563 | + |
564 | + </data> |
565 | +</openerp> |
566 | |
567 | === modified file 'mgmtsystem_review/__openerp__.py' |
568 | --- mgmtsystem_review/__openerp__.py 2013-01-31 14:21:30 +0000 |
569 | +++ mgmtsystem_review/__openerp__.py 2013-03-04 15:00:27 +0000 |
570 | @@ -1,6 +1,6 @@ |
571 | # -*- encoding: utf-8 -*- |
572 | ############################################################################## |
573 | -# |
574 | +# |
575 | # OpenERP, Open Source Management Solution |
576 | # Copyright (C) 2010 Savoir-faire Linux (<http://www.savoirfairelinux.com>). |
577 | # |
578 | @@ -31,7 +31,6 @@ |
579 | "depends" : [ |
580 | 'mgmtsystem_nonconformity', |
581 | 'mgmtsystem_survey', |
582 | - 'audittrail', |
583 | ], |
584 | "init_xml" : [ |
585 | 'review_sequence.xml', |
586 | |
587 | === modified file 'mgmtsystem_review/mgmtsystem_review.xml' |
588 | --- mgmtsystem_review/mgmtsystem_review.xml 2013-02-08 16:05:22 +0000 |
589 | +++ mgmtsystem_review/mgmtsystem_review.xml 2013-03-04 15:00:27 +0000 |
590 | @@ -163,18 +163,6 @@ |
591 | sequence="0" |
592 | groups="mgmtsystem.group_mgmtsystem_manager"/> |
593 | |
594 | - <!-- audittrail rule --> |
595 | - |
596 | - <record id="mgmtsystem_review_audit_rule" model="audittrail.rule"> |
597 | - <field name="name">Audit on Management System Reviews</field> |
598 | - <field name="object_id" search="[('model','=','mgmtsystem.review')]"/> |
599 | - <field name="log_create">1</field> |
600 | - <field name="log_workflow">1</field> |
601 | - <field name="log_unlink">1</field> |
602 | - <field name="log_action">1</field> |
603 | - <field name="log_workflow">1</field> |
604 | - <field name="state">subscribed</field> |
605 | - </record> |
606 | - |
607 | </data> |
608 | </openerp> |
609 | + |
610 | |
611 | === added directory 'mgmtsystem_review_audittrail' |
612 | === added file 'mgmtsystem_review_audittrail/__init__.py' |
613 | --- mgmtsystem_review_audittrail/__init__.py 1970-01-01 00:00:00 +0000 |
614 | +++ mgmtsystem_review_audittrail/__init__.py 2013-03-04 15:00:27 +0000 |
615 | @@ -0,0 +1,2 @@ |
616 | +# -*- coding: utf-8 -*- |
617 | +# empty |
618 | \ No newline at end of file |
619 | |
620 | === added file 'mgmtsystem_review_audittrail/__openerp__.py' |
621 | --- mgmtsystem_review_audittrail/__openerp__.py 1970-01-01 00:00:00 +0000 |
622 | +++ mgmtsystem_review_audittrail/__openerp__.py 2013-03-04 15:00:27 +0000 |
623 | @@ -0,0 +1,37 @@ |
624 | +# -*- coding: utf-8 -*- |
625 | +############################################################################## |
626 | +# |
627 | +# OpenERP, Open Source Management Solution |
628 | +# Copyright (C) 2010 Savoir-faire Linux (<http://www.savoirfairelinux.com>). |
629 | +# |
630 | +# This program is free software: you can redistribute it and/or modify |
631 | +# it under the terms of the GNU Affero General Public License as |
632 | +# published by the Free Software Foundation, either version 3 of the |
633 | +# License, or (at your option) any later version. |
634 | +# |
635 | +# This program is distributed in the hope that it will be useful, |
636 | +# but WITHOUT ANY WARRANTY; without even the implied warranty of |
637 | +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
638 | +# GNU Affero General Public License for more details. |
639 | +# |
640 | +# You should have received a copy of the GNU Affero General Public License |
641 | +# along with this program. If not, see <http://www.gnu.org/licenses/>. |
642 | +# |
643 | +############################################################################## |
644 | +{ |
645 | + "name": "Management System - Reviews Audit Trail tracking", |
646 | + "version": "1.0", |
647 | + "author": "Savoir-faire Linux", |
648 | + "website": "http://www.savoirfairelinux.com", |
649 | + "license": "AGPL-3", |
650 | + "category": "Management System", |
651 | + "description": """\ |
652 | +Adds rule to track changes to Management System Reviews, if Audit Trail module |
653 | +is installed. |
654 | +""", |
655 | + "depends": ['mgmtsystem_review', 'audittrail'], |
656 | + "init": ['mgmtsystem_review.xml'], |
657 | + "data": [], |
658 | + "auto_install": True, |
659 | +} |
660 | +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |
661 | |
662 | === added file 'mgmtsystem_review_audittrail/mgmtsystem_review.xml' |
663 | --- mgmtsystem_review_audittrail/mgmtsystem_review.xml 1970-01-01 00:00:00 +0000 |
664 | +++ mgmtsystem_review_audittrail/mgmtsystem_review.xml 2013-03-04 15:00:27 +0000 |
665 | @@ -0,0 +1,19 @@ |
666 | +<openerp> |
667 | + <data> |
668 | + |
669 | + <record id="mgmtsystem_review_audit_rule" model="audittrail.rule"> |
670 | + <field name="name">Audit on Management System Reviews</field> |
671 | + <field name="object_id" search="[('model','=','mgmtsystem.review')]"/> |
672 | + <field name="log_create">1</field> |
673 | + <field name="log_workflow">1</field> |
674 | + <field name="log_unlink">1</field> |
675 | + <field name="log_action">1</field> |
676 | + <field name="log_workflow">1</field> |
677 | + <field name="state">subscribed</field> |
678 | + </record> |
679 | + |
680 | + </data> |
681 | +</openerp> |
682 | + |
683 | + |
684 | + |
Big diff here. I did a quick eyeballing, I may have missed things.
l.126,142,... >...</field> as they are now useless in v7. type\"> [form|tree| graph|kanban| calendar| search] " -l | xargs sed -i '/field name="type" >[form| tree|graph| kanban| calendar| search] /d'
You can remove the <field name="type"
Hint: ack-grep --xml "field name=\"
l.305,793, 1299,2899, 3338 s/Audittral/ Audittrail/
l.311 (and other __openerp__.py) The description is a bit terse when we do not know the modules. What are 'Actions'?