Unifield Server

Merge lp:~unifield-team/unifield-server/us-2734-3369-3927 into lp:unifield-server

  1. us-2734-3369-3927
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 5013
Proposed branch: lp:~unifield-team/unifield-server/us-2734-3369-3927
Merge into: lp:unifield-server
Diff against target: 95 lines (+8/-16)
4 files modified
bin/addons/msf_printed_documents/report/sale_order.rml (+1/-3)
bin/addons/purchase_override/report/merged_order.rml (+3/-5)
bin/addons/purchase_override/report/purchase_order.rml (+3/-5)
bin/addons/purchase_override/report/rfq.rml (+1/-3)
To merge this branch: bzr merge lp:~unifield-team/unifield-server/us-2734-3369-3927
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+350935@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_printed_documents/report/sale_order.rml'
2--- bin/addons/msf_printed_documents/report/sale_order.rml 2018-04-05 09:27:43 +0000
3+++ bin/addons/msf_printed_documents/report/sale_order.rml 2018-08-06 14:52:22 +0000
4@@ -6,9 +6,7 @@
5 <frame id="first" x1="30.0" y1="0.0" width="772" height="520" />
6
7 <pageGraphics>
8- <drawString x="35" y="560.0">FIELD ORDER ([[ getSel(objects[0], 'order_type') ]])</drawString>
9- <fill color="blue"/>
10- <drawString x="35" y="540.0">[[ '%s %s %s' % (getSel(objects[0], 'order_type'), objects[0].name, getSel(objects[0], 'state')) ]]</drawString>
11+ <drawString x="35" y="560.0">[[ 'FIELD ORDER %s (%s/%s)' % (objects[0].name, getSel(objects[0],'order_type'), getSel(objects[0],'state')) ]]</drawString>
12 <image x="700" y="530.0" height="53.3" width="100">[[ company.logo or removeParentNode('image') ]]</image>
13 <setFont name="Helvetica" size="8"/>
14 <fill color="black"/>
15
16=== modified file 'bin/addons/purchase_override/report/merged_order.rml'
17--- bin/addons/purchase_override/report/merged_order.rml 2018-04-19 12:09:40 +0000
18+++ bin/addons/purchase_override/report/merged_order.rml 2018-08-06 14:52:22 +0000
19@@ -6,9 +6,7 @@
20 <frame id="first" x1="30.0" y1="15.0" width="772" height="500" />
21
22 <pageGraphics>
23- <drawString x="35" y="560.0">PURCHASE ORDER ([[ getSel(objects[0], 'order_type') ]])</drawString>
24- <fill color="blue"/>
25- <drawString x="35" y="548.0">[[ '%s %s %s' % (getSel(objects[0], 'order_type'), objects[0].name, getSel(objects[0], 'state')) ]]</drawString>
26+ <drawString x="35" y="560.0">[[ 'PURCHASE ORDER %s (%s/%s)' % (objects[0].name, getSel(objects[0],'order_type'), getSel(objects[0],'state')) ]]</drawString>
27 <image x="700" y="530.0" height="53.3" width="100">[[ company.logo or removeParentNode('image') ]]</image>
28 <setFont name="Helvetica" size="8"/>
29 <fill color="black"/>
30@@ -82,7 +80,7 @@
31 <paraStyle name="Header_9" fontName="Helvetica-Bold" fontSize="8.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="3.0" />
32 <paraStyle name="HeaderBlue" textColor="blue" fontName="Helvetica-Bold" fontSize="13.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="35.0" />
33 <!-- Information font style -->
34- <paraStyle name="TextInformation" fontName="Helvetica" fontSize="7.0" alignment="LEFT" leading="3.0" spaceBefore="1.0" spaceAfter="1.0" />
35+ <paraStyle name="TextInformation" fontName="Helvetica" fontSize="7.0" alignment="LEFT" leading="7.0" spaceBefore="1.0" spaceAfter="1.0" />
36 <paraStyle name="TextInformationMail" fontName="Helvetica" fontSize="7.0" alignment="LEFT" leading="7.0" spaceBefore="1.0" spaceAfter="1.0" />
37 <paraStyle name="TextRemarks" fontName="Helvetica" fontSize="7.0" alignment="LEFT" leading="15.0" spaceBefore="1.0" spaceAfter="1.0" />
38 <!-- Lines font style -->
39@@ -209,7 +207,7 @@
40 <para style="TextInformation"> </para>
41 </td>
42 <td>
43- <para style="TextInformation">[[ objects[0].partner_address_id.office_name or objects[0].partner_address_id.partner_id.name or objects[0].partner_id.name ]]</para>
44+ <parawrap style="TextInformation">[[ (objects[0].partner_address_id.office_name or objects[0].partner_address_id.partner_id.name or objects[0].partner_id.name)[0:100] ]]</parawrap>
45 </td>
46 <td>
47 <para style="TextInformation"> </para>
48
49=== modified file 'bin/addons/purchase_override/report/purchase_order.rml'
50--- bin/addons/purchase_override/report/purchase_order.rml 2018-02-01 10:44:18 +0000
51+++ bin/addons/purchase_override/report/purchase_order.rml 2018-08-06 14:52:22 +0000
52@@ -6,9 +6,7 @@
53 <frame id="first" x1="30.0" y1="15.0" width="772" height="500" />
54
55 <pageGraphics>
56- <drawString x="35" y="560.0">PURCHASE ORDER ([[ getSel(objects[0], 'order_type') ]])</drawString>
57- <fill color="blue"/>
58- <drawString x="35" y="548.0">[[ '%s %s %s' % (getSel(objects[0], 'order_type'), objects[0].name, getSel(objects[0], 'state')) ]]</drawString>
59+ <drawString x="35" y="560.0">[[ 'PURCHASE ORDER %s (%s/%s)' % (objects[0].name, getSel(objects[0],'order_type'), getSel(objects[0],'state')) ]]</drawString>
60 <drawString x="700" y="548.0">[[ time.strftime('%Y-%m-%d') ]]</drawString>
61 <image x="700" y="530.0" height="53.3" width="100">[[ company.logo or removeParentNode('image') ]]</image>
62 <setFont name="Helvetica" size="8"/>
63@@ -83,7 +81,7 @@
64 <paraStyle name="Header_9" fontName="Helvetica-Bold" fontSize="8.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="3.0" />
65 <paraStyle name="HeaderBlue" textColor="blue" fontName="Helvetica-Bold" fontSize="13.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="35.0" />
66 <!-- Information font style -->
67- <paraStyle name="TextInformation" fontName="Helvetica" fontSize="7.0" alignment="LEFT" leading="3.0" spaceBefore="1.0" spaceAfter="1.0" />
68+ <paraStyle name="TextInformation" fontName="Helvetica" fontSize="7.0" alignment="LEFT" leading="7.0" spaceBefore="1.0" spaceAfter="1.0" />
69 <paraStyle name="TextInformationMail" fontName="Helvetica" fontSize="7.0" alignment="LEFT" leading="7.0" spaceBefore="1.0" spaceAfter="1.0" />
70 <paraStyle name="TextRemarks" fontName="Helvetica" fontSize="7.0" alignment="LEFT" leading="15.0" spaceBefore="1.0" spaceAfter="1.0" />
71 <!-- Lines font style -->
72@@ -211,7 +209,7 @@
73 <para style="TextInformation"> </para>
74 </td>
75 <td>
76- <para style="TextInformation">[[ objects[0].partner_address_id.office_name or objects[0].partner_address_id.partner_id.name or objects[0].partner_id.name ]]</para>
77+ <parawrap style="TextInformation">[[ (objects[0].partner_address_id.office_name or objects[0].partner_address_id.partner_id.name or objects[0].partner_id.name or '')[0:100] ]]</parawrap>
78 </td>
79 <td>
80 <para style="TextInformation"> </para>
81
82=== modified file 'bin/addons/purchase_override/report/rfq.rml'
83--- bin/addons/purchase_override/report/rfq.rml 2018-04-20 09:12:49 +0000
84+++ bin/addons/purchase_override/report/rfq.rml 2018-08-06 14:52:22 +0000
85@@ -6,9 +6,7 @@
86 <frame id="first" x1="30.0" y1="0.0" width="772" height="500" />
87
88 <pageGraphics>
89- <drawString x="35" y="560.0">REQUEST FOR QUOTATION ([[ getSel(objects[0], 'order_type') ]])</drawString>
90- <fill color="blue"/>
91- <drawString x="35" y="540.0">[[ '%s %s %s' % (getSel(objects[0], 'order_type'), objects[0].name, getSel(objects[0], 'state')) ]]</drawString>
92+ <drawString x="35" y="560.0">[[ 'REQUEST FOR QUOTATION %s (%s/%s)' % (objects[0].name, getSel(objects[0],'order_type'), getSel(objects[0],'state')) ]]</drawString>
93 <image x="700" y="530.0" height="53.3" width="100">[[ company.logo or removeParentNode('image') ]]</image>
94 <setFont name="Helvetica" size="8"/>
95 <fill color="black"/>

Subscribers

People subscribed via source and target branches

to all changes: