OpenERP RMA

Merge lp:~komsas/openerp-rma/add-security-product-warranty into lp:~openerprma/openerp-rma/6.1

  1. add-security-product-warranty
  2. Merge into 6.1
Proposed by Paulius Sladkevičius @ hbee
Status: Superseded
Proposed branch: lp:~komsas/openerp-rma/add-security-product-warranty
Merge into: lp:~openerprma/openerp-rma/6.1
Diff against target: 42 lines (+10/-2) (has conflicts)
3 files modified
crm_claim_rma/wizard/returned_lines_from_serial.py (+4/-0)
product_warranty/__openerp__.py (+3/-2)
product_warranty/security/ir.model.access.csv (+3/-0)
Text conflict in crm_claim_rma/wizard/returned_lines_from_serial.py
To merge this branch: bzr merge lp:~komsas/openerp-rma/add-security-product-warranty
Reviewer Review Type Date Requested Status
esamyn Approve
Review via email: mp+85890@code.launchpad.net

Description of the change

Added product warranty module security rights.

To post a comment you must log in.
Revision history for this message
esamyn (esamyn) :
review: Approve

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'crm_claim_rma/wizard/returned_lines_from_serial.py'
2--- crm_claim_rma/wizard/returned_lines_from_serial.py 2011-10-31 14:58:09 +0000
3+++ crm_claim_rma/wizard/returned_lines_from_serial.py 2011-12-15 15:40:03 +0000
4@@ -82,7 +82,11 @@
5
6 # Get partner from case is set to filter serials
7 def _get_default_partner_id(self, cr, uid, context):
8+<<<<<<< TREE
9 return self.pool.get('crm.claim').read(cr, uid, context['active_id'], ['partner_id'])['partner_id'][0]
10+=======
11+ return self.pool.get('crm.claim').read(cr, uid, context['active_id'], ['partner_id'])['partner_id'][0]
12+>>>>>>> MERGE-SOURCE
13
14 _defaults = {
15 'qty_1': lambda *a: 1.0,
16
17=== modified file 'product_warranty/__openerp__.py'
18--- product_warranty/__openerp__.py 2011-10-13 09:10:00 +0000
19+++ product_warranty/__openerp__.py 2011-12-15 15:40:03 +0000
20@@ -36,10 +36,11 @@
21 'depends': ['product'],
22 'init_xml': [],
23 'update_xml': [
24+ 'security/ir.model.access.csv',
25 'product_warranty_view.xml',
26 ],
27- 'demo_xml': [],
28- 'test': [],
29+ 'demo_xml': [],
30+ 'test': [],
31 'installable': True,
32 'active': False,
33 'certificate' : '',
34
35=== added directory 'product_warranty/security'
36=== added file 'product_warranty/security/ir.model.access.csv'
37--- product_warranty/security/ir.model.access.csv 1970-01-01 00:00:00 +0000
38+++ product_warranty/security/ir.model.access.csv 2011-12-15 15:40:03 +0000
39@@ -0,0 +1,3 @@
40+"id","name","model_id","group_id","perm_read","perm_write","perm_create","perm_unlink"
41+"access_return_instruction_user","return.instruction.user","return.instruction","Sales / User","True","True","True",
42+"access_return_instruction_manager","return.instruction.manager","return.instruction","Sales / Manager","True","True","True","True"

Subscribers

People subscribed via source and target branches