Merge lp:~openerp-dev/openobject-addons/6.1-opw-578473-han into lp:openobject-addons/6.1

[Hardik Ansodariya (OpenERP)]

Hello,

Fixed the issue of wrong invoice view from mrp_repair.

With reference of Maintenance case: 578473

Kindly review it.

Thanks,

[Naresh(OpenERP) (nch-openerp)]

review: Approve

[Naresh(OpenERP) (nch-openerp)]

Hello,

This bug was qualified as Confirmed on Trunk (means still existing and reproducible). A Merge Proposal for trunk was created to fix it. Here is the link to follow the MP on Launchpad https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-opw-578473-port-mma/+merge/135108 and be informed once it's been merged in trunk: ... If this Merge Proposal could not be merged in v6.1 at the release of v7.0, it will be closed.

Thanks,
Naresh Soni

Unmerged revisions

6967. By Hardik Ansodariya (OpenERP) on 2012-09-03

[FIX] mrp_repair: Wrong view open when generate invoice from mrp_repair (Maintanace case:578473)

=== modified file 'mrp_repair/mrp_repair_view.xml'
--- mrp_repair/mrp_repair_view.xml	2011-12-13 07:28:24 +0000
+++ mrp_repair/mrp_repair_view.xml	2012-09-03 13:27:20 +0000
@@ -158,7 +158,7 @@
                         </field>
                     </page>
                     <page string="Extra Info" groups="base.group_extended">
-                        <field name="invoice_id"/>
+                        <field name="invoice_id" context="{'form_view_ref': 'account.invoice_form'}"/>
                         <field name="picking_id"/>
                         <field name="location_id"/>
                         <field name="location_dest_id" attrs="{'readonly':[('deliver_bool','=', False)], 'required':[('deliver_bool','=', True)]}"/>

=== modified file 'mrp_repair/wizard/make_invoice.py'
--- mrp_repair/wizard/make_invoice.py	2012-01-31 13:36:57 +0000
+++ mrp_repair/wizard/make_invoice.py	2012-09-03 13:27:20 +0000
@@ -53,6 +53,12 @@
         for repair_id in context['active_ids']:
             wf_service.trg_validate(uid, 'mrp.repair', repair_id, 'action_invoice_create', cr)
 
+        mod_obj = self.pool.get('ir.model.data')
+        form_res = mod_obj.get_object_reference(cr, uid, 'account', 'invoice_form')
+        form_id = form_res and form_res[1] or False
+        tree_res = mod_obj.get_object_reference(cr, uid, 'account', 'invoice_tree')
+        tree_id = tree_res and tree_res[1] or False
+
         return {
             'domain': [('id','in', newinv.values())],
             'name': 'Invoices',
@@ -60,10 +66,10 @@
             'view_mode': 'tree,form',
             'res_model': 'account.invoice',
             'view_id': False,
+            'views': [(tree_id, 'tree'),(form_id, 'form')],
             'context': "{'type':'out_invoice'}",
             'type': 'ir.actions.act_window'
         }
-
 make_invoice()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: