Unifield Server

Merge lp:~mallorymarcot/unifield-server/us-4371 into lp:unifield-server

  1. us-4371
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 5022
Proposed branch: lp:~mallorymarcot/unifield-server/us-4371
Merge into: lp:unifield-server
Diff against target: 62 lines (+7/-7)
3 files modified
bin/addons/msf_supply_doc_export/msf_supply_doc_export.py (+5/-5)
bin/addons/msf_supply_doc_export/report/report_validated_purchase_order_xls.mako (+1/-1)
bin/addons/msf_supply_doc_export/report/report_validated_purchase_order_xml.mako (+1/-1)
To merge this branch: bzr merge lp:~mallorymarcot/unifield-server/us-4371
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+349143@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/addons/msf_supply_doc_export/msf_supply_doc_export.py'
2--- bin/addons/msf_supply_doc_export/msf_supply_doc_export.py 2018-06-07 15:44:40 +0000
3+++ bin/addons/msf_supply_doc_export/msf_supply_doc_export.py 2018-07-09 08:36:13 +0000
4@@ -127,11 +127,11 @@
5 for addr in company_partner.address:
6 if addr.active:
7 if addr.type == 'default':
8- return addr.name or ''
9+ return addr.office_name or ''
10 elif addr.type == 'delivery':
11- deliv_addr = addr.name
12+ deliv_addr = addr.office_name
13 else:
14- part_addr.append(addr.name)
15+ part_addr.append(addr.office_name)
16
17 return deliv_addr or (part_addr and part_addr[0]) or ''
18
19@@ -181,7 +181,7 @@
20 def getContactName(self, addr_id):
21 res = ''
22 if addr_id:
23- res = self.pool.get('res.partner.address').read(self.cr, self.uid, addr_id)['name']
24+ res = self.pool.get('res.partner.address').read(self.cr, self.uid, addr_id)['office_name']
25 return res
26
27
28@@ -230,7 +230,7 @@
29 def getContactName(self, addr_id):
30 res = ''
31 if addr_id:
32- res = self.pool.get('res.partner.address').read(self.cr, self.uid, addr_id)['name']
33+ res = self.pool.get('res.partner.address').read(self.cr, self.uid, addr_id)['office_name']
34 return res
35
36 def getInstanceAddress(self):
37
38=== modified file 'bin/addons/msf_supply_doc_export/report/report_validated_purchase_order_xls.mako'
39--- bin/addons/msf_supply_doc_export/report/report_validated_purchase_order_xls.mako 2018-06-07 15:44:40 +0000
40+++ bin/addons/msf_supply_doc_export/report/report_validated_purchase_order_xls.mako 2018-07-09 08:36:13 +0000
41@@ -131,7 +131,7 @@
42 % if o.order_type == 'direct':
43 <Cell ss:StyleID="line" ><Data ss:Type="String">${getContactName(o.dest_address_id.id) or ''|x}</Data></Cell>
44 % else:
45- <Cell ss:StyleID="line" ><Data ss:Type="String">${o.dest_address_id and o.dest_address_id.name or ''|x}</Data></Cell>
46+ <Cell ss:StyleID="line" ><Data ss:Type="String">${o.dest_address_id and o.dest_address_id.office_name or ''|x}</Data></Cell>
47 % endif
48 </Row>
49 <Row>
50
51=== modified file 'bin/addons/msf_supply_doc_export/report/report_validated_purchase_order_xml.mako'
52--- bin/addons/msf_supply_doc_export/report/report_validated_purchase_order_xml.mako 2018-06-07 15:44:40 +0000
53+++ bin/addons/msf_supply_doc_export/report/report_validated_purchase_order_xml.mako 2018-07-09 08:36:13 +0000
54@@ -28,7 +28,7 @@
55 % if o.order_type == 'direct':
56 <field name="delivery_name">${getContactName(o.dest_address_id.id) or ''|x}</field>
57 % else:
58- <field name="delivery_name">${o.dest_address_id and o.dest_address_id.name or ''|x}</field>
59+ <field name="delivery_name">${o.dest_address_id and o.dest_address_id.office_name or ''|x}</field>
60 % endif
61 % if o.order_type == 'direct':
62 <field name="delivery_address">${o.dest_partner_id and o.dest_partner_id.name or ''|x}</field>

Subscribers

People subscribed via source and target branches