Merge lp:~unifield-team/unifield-server/uf5-little-fixes into lp:unifield-server

[jftempo]

[lp:~unifield-team/unifield-server/uf5-little-fixes]

4287. By Quentin THEURET @Amaris on 2017-03-21

US-2050 [FIX] Don't display cancel button on done inventory

4288. By Quentin THEURET @Amaris on 2017-03-27

US-2053 [FIX] Fix issue with reception report if there is no lines in INcoming shipment

Unmerged revisions

4288. By Quentin THEURET @Amaris on 2017-03-27

US-2053 [FIX] Fix issue with reception report if there is no lines in INcoming shipment

4287. By Quentin THEURET @Amaris on 2017-03-21

US-2050 [FIX] Don't display cancel button on done inventory

4286. By Quentin THEURET @Amaris on 2017-03-20

US-2529 [FIX] Split Purchase orders were displayed in Documents In progress

4285. By Quentin THEURET @Amaris on 2017-03-20

US-2053 [FIX] Display the min. Actual Receipt Date of all lines on the Reception report header

4284. By Quentin THEURET @Amaris on 2017-03-20

US-2050 [FIX] Remove the cancel button on the stock inventory when the inventory is done

4283. By Quentin THEURET @Amaris on 2017-03-20

US-1972 [FIX] Be able to search Closed Shipment List by product

4282. By Quentin THEURET @Amaris on 2017-03-20

US-2211 [FIX] Include Inventory / Production / Procurement locations into the export moves analysis report

4281. By Quentin THEURET @Amaris on 2017-03-20

US-2415 [FIX] In case of IN from scratch, display quantities in PDF report

4280. By Quentin THEURET @Amaris on 2017-03-20

US-2275 [FIX] Display the export validated PO in English only

=== modified file 'bin/addons/documents_done/documents_done.py'
--- bin/addons/documents_done/documents_done.py	2014-10-10 12:00:01 +0000
+++ bin/addons/documents_done/documents_done.py	2017-03-27 11:41:27 +0000
@@ -470,7 +470,7 @@
                     FROM
                         purchase_order po
                     WHERE
-                        state NOT IN ('draft', 'done', 'cancel')
+                        state NOT IN ('draft', 'done', 'cancel', 'split')
                       AND
                         rfq_ok = False)
                 UNION
 
=== modified file 'bin/addons/msf_outgoing/msf_outgoing_view.xml'
--- bin/addons/msf_outgoing/msf_outgoing_view.xml	2017-03-10 15:44:31 +0000
+++ bin/addons/msf_outgoing/msf_outgoing_view.xml	2017-03-27 11:41:27 +0000
@@ -1472,7 +1472,7 @@
 			<field name="type">search</field>
 			<field name="arch" type="xml">
 				<search string="Shipment">
-                    <field name="name"/>
+                    <field name="product_id"/>
                     <field name="picking_id" string="Pack" domain="[('already_shipped','=',True), ('shipment_id','!=',False)]"/>
                     <field name="pick_shipment_id" string="Shipment" />
                     <field name="origin"/>
 
=== modified file 'bin/addons/msf_printed_documents/report/report_reception.py'
--- bin/addons/msf_printed_documents/report/report_reception.py	2016-03-08 15:32:40 +0000
+++ bin/addons/msf_printed_documents/report/report_reception.py	2017-03-27 11:41:27 +0000
@@ -93,14 +93,14 @@
 
     def getQtyPO(self,line):
         # line amount from the PO, always the same on all INs for a given PO
-        val = line.purchase_line_id.product_qty if line.purchase_line_id else 0
+        val = line.purchase_line_id.product_qty if line.purchase_line_id else line.product_qty
         return "{0:.2f}".format(val)
 
     def getQtyBO(self,line,o):
         # Back Order amount = PO amount - all receipts
 
         # get PO qty
-        qtyPO = line.purchase_line_id.product_qty if line.purchase_line_id else 0
+        qtyPO = line.purchase_line_id.product_qty if line.purchase_line_id else line.product_qty
         # get received qty (current and previous INs)
         cr, uid = self.cr, self.uid
         val = 0.00
@@ -147,16 +147,34 @@
         return time.strftime('%d/%m/%Y', time.strptime(o.min_date,'%Y-%m-%d %H:%M:%S'))
 
     def getPartnerCity(self,o):
-        return o.purchase_id and o.purchase_id.partner_address_id and o.purchase_id.partner_address_id.city or False
+        if o.purchase_id:
+            return o.purchase_id and o.purchase_id.partner_address_id and o.purchase_id.partner_address_id.city or False
+        elif o.partner_id and len(o.partner_id.address):
+            return o.partner_id.address[0].city
+        else:
+            return False
 
     def getPartnerPhone(self,o):
-        return o.purchase_id and o.purchase_id.partner_address_id and o.purchase_id.partner_address_id.phone or False
+        if o.purchase_id:
+            return o.purchase_id and o.purchase_id.partner_address_id and o.purchase_id.partner_address_id.phone or False
+        elif o.partner_id and len(o.partner_id.address):
+            return o.partner_id.address[0].phone
+        else:
+            return False
 
     def getPartnerName(self,o):
-        return o.purchase_id and o.purchase_id.partner_id and o.purchase_id.partner_id.name or False
+        if o.purchase_id:
+            return o.purchase_id and o.purchase_id.partner_id and o.purchase_id.partner_id.name or False
+        elif o.partner_id:
+            return o.partner_id.name
+        else:
+            return False
 
     def getPartnerAddress(self,o):
-        temp = o.purchase_id and o.purchase_id.partner_address_id.name_get()
+        if o.purchase_id:
+            temp = o.purchase_id and o.purchase_id.partner_address_id.name_get()
+        elif o.partner_id and len(o.partner_id.address):
+            temp = o.partner_id.address[0].name_get()
         if temp:
             return temp[0][1]
 
@@ -205,7 +223,12 @@
         if o.state == 'assigned':
           actual_receipt_date = ''
         else:
-            actual_receipt_date = time.strftime('%d/%m/%Y', time.strptime(o.date,'%Y-%m-%d %H:%M:%S'))
+            ard = time.strptime(o.date, '%Y-%m-%d %H:%M:%S')
+            for move in o.move_lines:
+                mard = time.strptime(move.date, '%Y-%m-%d %H:%M:%S')
+                if mard < ard:
+                    ard = mard
+            actual_receipt_date = time.strftime('%d/%m/%Y', ard)
         return actual_receipt_date
 
     def get_lines(self, o):
 
=== modified file 'bin/addons/msf_supply_doc_export/msf_supply_doc_export.py'
--- bin/addons/msf_supply_doc_export/msf_supply_doc_export.py	2017-02-17 15:16:45 +0000
+++ bin/addons/msf_supply_doc_export/msf_supply_doc_export.py	2017-03-27 11:41:27 +0000
@@ -122,6 +122,9 @@
 # VALIDATED PURCHASE ORDER (Excel XML)
 class validated_purchase_order_report_xls(report_sxw.rml_parse):
     def __init__(self, cr, uid, name, context):
+        if context is None:
+            context = {}
+        context['lang'] = 'en_MF'
         super(validated_purchase_order_report_xls, self).__init__(cr, uid, name, context=context)
         self.localcontext.update({
             'time': time,
@@ -146,6 +149,9 @@
 # VALIDATE PURCHASE ORDER (Pure XML)
 class parser_validated_purchase_order_report_xml(report_sxw.rml_parse):
     def __init__(self, cr, uid, name, context):
+        if context is None:
+            context = {}
+        context['lang'] = 'en_MF'
         super(parser_validated_purchase_order_report_xml, self).__init__(cr, uid, name, context=context)
         self.localcontext.update({
             'time': time,
 
=== modified file 'bin/addons/stock/stock_view.xml'
--- bin/addons/stock/stock_view.xml	2016-11-25 14:15:34 +0000
+++ bin/addons/stock/stock_view.xml	2017-03-27 11:41:27 +0000
@@ -171,7 +171,7 @@
                      <field name="state"/>
                     </group>
                     <group col="3" colspan="2">
-                        <button name="action_cancel_inventary" states="draft,confirm,done" string="Cancel Inventory" type="object" icon="gtk-cancel"/>
+                        <button name="action_cancel_inventary" states="draft,confirm" string="Cancel Inventory" type="object" icon="gtk-cancel"/>
                         <button name="action_confirm" states="draft" string="Confirm Inventory" type="object" icon="gtk-apply"/>
                         <button name="action_done" states="confirm" string="Validate Inventory" type="object" icon="gtk-jump-to"/>
                         <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="gtk-convert"/>
 
=== modified file 'bin/addons/stock_override/report/report_stock_move.py'
--- bin/addons/stock_override/report/report_stock_move.py	2016-08-18 08:32:03 +0000
+++ bin/addons/stock_override/report/report_stock_move.py	2017-03-27 11:41:27 +0000
@@ -357,7 +357,7 @@
         if isinstance(ids, (int, long)):
             ids = [ids]
 
-        loc_usage = ['supplier', 'customer', 'internal']
+        loc_usage = ['supplier', 'customer', 'internal', 'inventory', 'procurement', 'production']
         for report in self.browse(cr, uid, ids, context=context):
             domain = [
                 ('location_id.usage', 'in', loc_usage),
 
=== modified file 'bin/addons/stock_override/stock_view.xml'
--- bin/addons/stock_override/stock_view.xml	2017-03-10 15:44:31 +0000
+++ bin/addons/stock_override/stock_view.xml	2017-03-27 11:41:27 +0000
@@ -1166,7 +1166,7 @@
                      <field name="state"/>
                     </group>
                     <group col="3" colspan="2">
-                        <button name="action_cancel_inventary" states="draft,confirm,done" string="Cancel Inventory" type="object" icon="gtk-cancel"/>
+                        <button name="action_cancel_inventary" states="draft,confirm" string="Cancel Inventory" type="object" icon="gtk-cancel"/>
                         <button name="action_confirm" states="draft" string="Validate Inventory" type="object" icon="gtk-apply"/>
                         <button name="action_done" states="confirm" string="Confirm Inventory" type="object" icon="gtk-jump-to"/>
                         <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="gtk-convert"/>