Merge lp:~unifield-team/unifield-server/us-2415 into lp:unifield-server

[jftempo]

=== 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-20 14:27:26 +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]