Merge lp:~unifield-team/unifield-wm/bklg-33-bis into lp:unifield-wm

[Quentin THEURET @Amaris]

=== modified file 'msf_supply_doc_export/msf_supply_doc_export.py'
--- msf_supply_doc_export/msf_supply_doc_export.py	2015-02-23 15:40:08 +0000
+++ msf_supply_doc_export/msf_supply_doc_export.py	2015-03-27 13:36:23 +0000
@@ -646,11 +646,11 @@
 #            new_act = []
 #            for v in values :
 #                if v[2]['name'] == 'Purchase Order Excel Export' and context['_terp_view_name'] == 'Purchase Orders' \
-#                or v[2]['report_name'] == 'purchase.msf.order' and context['_terp_view_name'] == 'Purchase Orders' \
-#                or v[2]['report_name'] == 'purchase.order.merged' and context['_terp_view_name'] == 'Purchase Orders' \
-#                or v[2]['report_name'] == 'po.line.allocation.report' and context['_terp_view_name'] == 'Purchase Orders' \
-#                or v[2]['report_name'] == 'purchase.msf.quotation' and context['_terp_view_name'] == 'Requests for Quotation' \
-#                or v[2]['report_name'] == 'request.for.quotation_xls' and context['_terp_view_name'] == 'Requests for Quotation' :
+#                or v[2].get('report_name', False) == 'purchase.msf.order' and context['_terp_view_name'] == 'Purchase Orders' \
+#                or v[2].get('report_name', False) == 'purchase.order.merged' and context['_terp_view_name'] == 'Purchase Orders' \
+#                or v[2].get('report_name', False) == 'po.line.allocation.report' and context['_terp_view_name'] == 'Purchase Orders' \
+#                or v[2].get('report_name', False) == 'purchase.msf.quotation' and context['_terp_view_name'] == 'Requests for Quotation' \
+#                or v[2].get('report_name', False) == 'request.for.quotation_xls' and context['_terp_view_name'] == 'Requests for Quotation' :
 #                    new_act.append(v)
 #                values = new_act
         
@@ -661,12 +661,12 @@
             #field_orders_view = data_obj.get_object_reference(cr, uid, 'procurement_request', 'action_procurement_request')[1]
             for v in values:
                 if context.get('procurement_request', False):
-                    if v[2]['report_name'] in ('internal.request_xls', 'procurement.request.report') \
+                    if v[2].get('report_name', False) in ('internal.request_xls', 'procurement.request.report') \
                     or v[1] == 'action_open_wizard_import': # this is an internal request, we only display import lines for client_action_multi --- using the name of screen, and the name of the action is definitely the wrong way to go...
                         new_act.append(v)
                 else:
-                    if v[2]['report_name'] == 'msf.sale.order' \
-                    or v[2]['report_name'] == 'sale.order_xls' \
+                    if v[2].get('report_name', False) == 'msf.sale.order' \
+                    or [2].get('report_name', False) == 'sale.order_xls' \
                     or v[1] == 'Order Follow Up': # this is a sale order, we only display Order Follow Up for client_action_multi --- using the name of screen, and the name of the action is definitely the wrong way to go...
                         new_act.append(v)
                 values = new_act
@@ -681,11 +681,11 @@
             Delivery_Order = trans_obj.tr_view(cr, 'Delivery Order', context)
             Internal_Moves = trans_obj.tr_view(cr, 'Internal Moves', context)
             for v in values:
-                if v[2]['report_name'] == 'picking.ticket' and (context.get('_terp_view_name') in (Picking_Tickets, Picking_Ticket) or context.get('picking_type') == 'picking_ticket') and context.get('picking_screen', False)\
-                or v[2]['report_name'] == 'pre.packing.list' and context.get('_terp_view_name') in (Pre_Packing_Lists, Pre_Packing_List) and context.get('ppl_screen', False)\
-                or v[2]['report_name'] == 'labels' and (context.get('_terp_view_name') in [Picking_Ticket, Picking_Tickets, Pre_Packing_List, Pre_Packing_Lists, Delivery_Orders, Delivery_Order] or context.get('picking_type', False) in ('delivery_order', 'picking_ticket'))\
-                or v[2]['report_name'] in ('internal.move.xls', 'internal.move') and (('_terp_view_name' in context and context['_terp_view_name'] in [Internal_Moves]) or context.get('picking_type') == 'internal_move') \
-                or v[2]['report_name'] == 'delivery.order' and (context.get('_terp_view_name') in [Delivery_Orders, Delivery_Order] or context.get('picking_type', False) == 'delivery_order'):
+                if v[2].get('report_name', False) == 'picking.ticket' and (context.get('_terp_view_name') in (Picking_Tickets, Picking_Ticket) or context.get('picking_type') == 'picking_ticket') and context.get('picking_screen', False)\
+                or v[2].get('report_name', False) == 'pre.packing.list' and context.get('_terp_view_name') in (Pre_Packing_Lists, Pre_Packing_List) and context.get('ppl_screen', False)\
+                or v[2].get('report_name', False) == 'labels' and (context.get('_terp_view_name') in [Picking_Ticket, Picking_Tickets, Pre_Packing_List, Pre_Packing_Lists, Delivery_Orders, Delivery_Order] or context.get('picking_type', False) in ('delivery_order', 'picking_ticket'))\
+                or v[2].get('report_name', False) in ('internal.move.xls', 'internal.move') and (('_terp_view_name' in context and context['_terp_view_name'] in [Internal_Moves]) or context.get('picking_type') == 'internal_move') \
+                or v[2].get('report_name', False) == 'delivery.order' and (context.get('_terp_view_name') in [Delivery_Orders, Delivery_Order] or context.get('picking_type', False) == 'delivery_order'):
                     new_act.append(v)
                 values = new_act
         elif context.get('_terp_view_name') and key == 'action' and key2 == 'client_print_multi' and 'shipment' in [x[0] for x in models]:
@@ -697,7 +697,7 @@
             Shipments = trans_obj.tr_view(cr, 'Shipments', context)
             Shipment = trans_obj.tr_view(cr, 'Shipment', context)
             for v in values:
-                if v[2]['report_name'] == 'packing.list' and context['_terp_view_name'] in (Packing_Lists, Packing_List) :
+                if v[2].get('report_name', False) == 'packing.list' and context['_terp_view_name'] in (Packing_Lists, Packing_List) :
                     new_act.append(v)
                 elif context['_terp_view_name'] in (Shipment_Lists, Shipment_List, Shipments, Shipment):
                     new_act.append(v)
@@ -706,19 +706,19 @@
             new_act = []
             for v in values:
                 if v[2].get('report_name', False) :
-                    if v[2]['report_name'] in ('picking.ticket', 'labels'):
+                    if v[2].get('report_name', False) in ('picking.ticket', 'labels'):
                         new_act.append(v)
                 values = new_act
 
         elif key == 'action' and key2 == 'client_print_multi' and 'composition.kit' in [x[0] for x in models]:
             new_act = []
             for v in values:
-                if context.get('composition_type')=='theoretical' and v[2]['report_name'] in ('composition.kit.xls', 'kit.report'):
-                    if v[2]['report_name'] == 'kit.report':
+                if context.get('composition_type')=='theoretical' and v[2].get('report_name', False) in ('composition.kit.xls', 'kit.report'):
+                    if v[2].get('report_name', False) == 'kit.report':
                         v[2]['name'] = _('Theoretical Kit')
                     new_act.append(v)
-                elif context.get('composition_type')=='real' and v[2]['report_name'] in ('real.composition.kit.xls', 'kit.report'):
-                    if v[2]['report_name'] == 'kit.report':
+                elif context.get('composition_type')=='real' and v[2].get('report_name', False) in ('real.composition.kit.xls', 'kit.report'):
+                    if v[2].get('report_name', False) == 'kit.report':
                         v[2]['name'] = _('Kit Composition')
                     new_act.append(v)
             values = new_act