Unifield Server

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

  1. us-2734
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 5013
Proposed branch: lp:~mallorymarcot/unifield-server/us-2734
Merge into: lp:unifield-server
Diff against target: 59 lines (+4/-12)
4 files modified
bin/addons/msf_printed_documents/report/sale_order.rml (+1/-3)
bin/addons/purchase_override/report/merged_order.rml (+1/-3)
bin/addons/purchase_override/report/purchase_order.rml (+1/-3)
bin/addons/purchase_override/report/rfq.rml (+1/-3)
To merge this branch: bzr merge lp:~mallorymarcot/unifield-server/us-2734
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+350938@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-07-25 16:11:31 +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-07-25 16:11:31 +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
31=== modified file 'bin/addons/purchase_override/report/purchase_order.rml'
32--- bin/addons/purchase_override/report/purchase_order.rml 2018-02-01 10:44:18 +0000
33+++ bin/addons/purchase_override/report/purchase_order.rml 2018-07-25 16:11:31 +0000
34@@ -6,9 +6,7 @@
35 <frame id="first" x1="30.0" y1="15.0" width="772" height="500" />
36
37 <pageGraphics>
38- <drawString x="35" y="560.0">PURCHASE ORDER ([[ getSel(objects[0], 'order_type') ]])</drawString>
39- <fill color="blue"/>
40- <drawString x="35" y="548.0">[[ '%s %s %s' % (getSel(objects[0], 'order_type'), objects[0].name, getSel(objects[0], 'state')) ]]</drawString>
41+ <drawString x="35" y="560.0">[[ 'PURCHASE ORDER %s (%s/%s)' % (objects[0].name, getSel(objects[0],'order_type'), getSel(objects[0],'state')) ]]</drawString>
42 <drawString x="700" y="548.0">[[ time.strftime('%Y-%m-%d') ]]</drawString>
43 <image x="700" y="530.0" height="53.3" width="100">[[ company.logo or removeParentNode('image') ]]</image>
44 <setFont name="Helvetica" size="8"/>
45
46=== modified file 'bin/addons/purchase_override/report/rfq.rml'
47--- bin/addons/purchase_override/report/rfq.rml 2018-04-20 09:12:49 +0000
48+++ bin/addons/purchase_override/report/rfq.rml 2018-07-25 16:11:31 +0000
49@@ -6,9 +6,7 @@
50 <frame id="first" x1="30.0" y1="0.0" width="772" height="500" />
51
52 <pageGraphics>
53- <drawString x="35" y="560.0">REQUEST FOR QUOTATION ([[ getSel(objects[0], 'order_type') ]])</drawString>
54- <fill color="blue"/>
55- <drawString x="35" y="540.0">[[ '%s %s %s' % (getSel(objects[0], 'order_type'), objects[0].name, getSel(objects[0], 'state')) ]]</drawString>
56+ <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>
57 <image x="700" y="530.0" height="53.3" width="100">[[ company.logo or removeParentNode('image') ]]</image>
58 <setFont name="Helvetica" size="8"/>
59 <fill color="black"/>

Subscribers

People subscribed via source and target branches