Merge lp:~serpent-consulting-services/openerp-rma/1009940-SerpentCS into lp:~openerprma/openerp-rma/6.1

[Serpent Consulting Services]

[esamyn (esamyn)]

Hi,

Thank you for your corrections. I don't merge your proposal because the original M2M syntaxe is a new simpliest way to do this in 6.1 and works fine (unless you had trouble with it ?)

But I updated the security CSV FIX you made in the trunk

Thank you again

Manu

review: Disapprove

[Serpent Consulting Services (serpent-consulting-services)]

Manu,

Thanks for reviewing.

You see this fix because this was filed against 6.0.

If I am not wrong, it would be nicer to get this module working in 6.0 too just for the sake of backward-compatibility.

Thanks for considering CSV ones.

Best Regards,
SerpentCS.

Unmerged revisions

23. By Serpent Consulting Services on 2012-06-07

[FIX] crm_claim_rma : Corrected the many2many field definition and CSV

=== modified file 'crm_claim_rma/security/ir.model.access.csv'
--- crm_claim_rma/security/ir.model.access.csv	2011-10-31 14:58:09 +0000
+++ crm_claim_rma/security/ir.model.access.csv	2012-06-07 14:55:22 +0000
@@ -1,10 +1,10 @@
-"id","name","model_id","group_id","perm_read","perm_write","perm_create","perm_unlink"
-"access_substate_user","substate.substate.user","substate.substate","Sales / User - All Leads","True","True","True",
-"access_return_line_user","return.line.user","return.line","Sales / User - All Leads","True","True","True",
-"access_exchange_user","product.exchange.user","product.exchange","Sales / User - All Leads","True","True","True",
-"access_substate_manager","substate.substate.manager","substate.substate","Sales / Manager","True","True","True","True"
-"access_return_line_manager","return.line.manager","return.line","Sales / Manager","True","True","True","True"
-"access_exchange_manager","product.exchange.manager","product.exchange","Sales / Manager","True","True","True","True"
-"access_substate_user","substate.substate.user","substate.substate","Sales / User - Own Leads Only","True","True","True",
-"access_return_line_user","return.line.user","return.line","Sales / User - Own Leads Only","True","True","True",
-"access_exchange_user","product.exchange.user","product.exchange","Sales / User - Own Leads Only","True","True","True",
+"id","name","model_id","group_id/id","perm_read","perm_write","perm_create","perm_unlink"
+"access_substate_user","substate.substate.user","substate.substate","base.group_sale_salesman_all_leads","True","True","True",
+"access_return_line_user","return.line.user","return.line","base.group_sale_salesman_all_leads","True","True","True",
+"access_exchange_user","product.exchange.user","product.exchange","base.group_sale_salesman_all_leads","True","True","True",
+"access_substate_manager","substate.substate.manager","substate.substate","base.group_sale_manager","True","True","True","True"
+"access_return_line_manager","return.line.manager","return.line","base.group_sale_manager","True","True","True","True"
+"access_exchange_manager","product.exchange.manager","product.exchange","base.group_sale_manager","True","True","True","True"
+"access_substate_user","substate.substate.user","substate.substate","base.group_sale_salesman","True","True","True",
+"access_return_line_user","return.line.user","return.line","base.group_sale_salesman","True","True","True",
+"access_exchange_user","product.exchange.user","product.exchange","base.group_sale_salesman","True","True","True",

=== modified file 'crm_claim_rma/wizard/exchange_from_returned_lines.py'
--- crm_claim_rma/wizard/exchange_from_returned_lines.py	2011-10-31 14:58:09 +0000
+++ crm_claim_rma/wizard/exchange_from_returned_lines.py	2012-06-07 14:55:22 +0000
@@ -29,7 +29,7 @@
     _name='exchange_from_returned_lines.wizard'
     _description='Wizard to create an exchange from selected return lines'
     _columns = {
-        'exchange_line_ids' : fields.many2many('temp.exchange.line', string='Selected exchange lines'),
+        'exchange_line_ids' : fields.many2many('temp.exchange.line','exchange_return_line_exchange_line_rel','exchange_return_line_id','temp_exchange_line_id','Selected exchange lines'),
     }
     
     # Get selected lines to add to exchange

=== modified file 'crm_claim_rma/wizard/picking_from_exchange_lines.py'
--- crm_claim_rma/wizard/picking_from_exchange_lines.py	2011-10-31 14:58:09 +0000
+++ crm_claim_rma/wizard/picking_from_exchange_lines.py	2012-06-07 14:55:22 +0000
@@ -29,7 +29,7 @@
     _name='picking_out_from_exchange_lines.wizard'
     _description='Wizard to create a picking out from selected exchange lines'
     _columns = {
-        'exchange_line_ids' : fields.many2many('temp.exchange.line', string='Selected exchange lines'),
+        'exchange_line_ids' : fields.many2many('temp.exchange.line', 'picking_out_exchange_line_rel','picking_out_from_exchange_line_id','exchange_line_id','Selected exchange lines'),
     }
     
     # Get selected lines to add to picking in

=== modified file 'crm_claim_rma/wizard/picking_from_returned_lines.py'
--- crm_claim_rma/wizard/picking_from_returned_lines.py	2011-10-31 14:58:09 +0000
+++ crm_claim_rma/wizard/picking_from_returned_lines.py	2012-06-07 14:55:22 +0000
@@ -30,7 +30,7 @@
     _description='Wizard to create a picking in from selected return lines'
     _columns = {
         'return_line_location' : fields.many2one('stock.location', 'Dest. Location',help="Location where the system will stock the returned products.", select=True),
-        'return_line_ids' : fields.many2many('temp.return.line',string='Selected return lines'),
+        'return_line_ids' : fields.many2many('temp.return.line','pickin_in_return_line_rel','picking_in_from_returned_line_id','return_line_id','Selected return lines'),
     }
     
     # Get selected lines to add to picking in
@@ -130,7 +130,7 @@
     _name='picking_out_from_returned_lines.wizard'
     _description='Wizard to create a picking out from selected return lines'
     _columns = {
-        'return_line_ids' : fields.many2many('temp.return.line', string='Selected return lines'),
+        'return_line_ids' : fields.many2many('temp.return.line', 'picking_out_return_line_rel','picking_out_from_returned_line_id','return_line_id','Selected return lines'),
     }
     
     # Get selected lines to add to picking in

=== modified file 'crm_claim_rma/wizard/refund_from_returned_lines.py'
--- crm_claim_rma/wizard/refund_from_returned_lines.py	2011-11-01 14:55:12 +0000
+++ crm_claim_rma/wizard/refund_from_returned_lines.py	2012-06-07 14:55:22 +0000
@@ -29,7 +29,7 @@
     _description='Wizard to create an refund for selected product return lines'
     _columns = {
         'refund_journal' : fields.many2one('account.journal', 'Refund journal', select=True),
-        'return_line_ids' : fields.many2many('temp.return.line', string='Selected return lines'),
+        'return_line_ids' : fields.many2many('temp.return.line', 'refund_from_return_lines_wizard_return_line_rel','refund_from_return_line_id','return_line_rel','Selected return lines'),
     }
     
     # Get selected lines to add to picking in
@@ -53,7 +53,8 @@
     def _get_journal(self, cr, uid,context):
         #('company_id','=',claim_id.company_id.id)
         # ,('refund_journal','=','True')
-        return self.pool.get('account.journal').search(cr, uid, [('type','=','sale_refund')],limit=1)[0] 
+        sale_refund_journal = self.pool.get('account.journal').search(cr, uid, [('type','=','sale_refund')],limit=1)
+        return sale_refund_journal and sale_refund_journal[0] or False 
    
     _defaults = {
         'return_line_ids': _get_selected_lines,

=== modified file 'crm_claim_rma/wizard/returned_lines_from_invoice.py'
--- crm_claim_rma/wizard/returned_lines_from_invoice.py	2011-10-31 14:58:09 +0000
+++ crm_claim_rma/wizard/returned_lines_from_invoice.py	2012-06-07 14:55:22 +0000
@@ -98,7 +98,7 @@
     _name='returned_lines_from_invoice_line.wizard'
     _description='Wizard to create product return lines from invoice'
     _columns = {
-        'return_line_ids' : fields.many2many('temp.return.line', string='Return lines'),
+        'return_line_ids' : fields.many2many('temp.return.line', 'returned_lines_from_invoice_line_return_line_rel','returned_lines_from_invoice_line_id','temp_return_line_id','Return lines'),
     }
     
     # Get possible returns from invoice