Unifield Server

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

  1. us-475
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 4031
Proposed branch: lp:~unifield-team/unifield-server/us-475
Merge into: lp:unifield-server
Diff against target: 167 lines (+36/-22) (has conflicts)
4 files modified
bin/addons/msf_profile/i18n/fr_MF.po (+10/-0)
bin/addons/purchase_override/report/merged_order.rml (+8/-7)
bin/addons/purchase_override/report/purchase_order.rml (+9/-7)
bin/addons/purchase_override/report/rfq.rml (+9/-8)
Text conflict in bin/addons/msf_profile/i18n/fr_MF.po
To merge this branch: bzr merge lp:~unifield-team/unifield-server/us-475
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+309827@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_profile/i18n/fr_MF.po'
2--- bin/addons/msf_profile/i18n/fr_MF.po 2016-10-25 09:13:52 +0000
3+++ bin/addons/msf_profile/i18n/fr_MF.po 2016-11-02 09:27:37 +0000
4@@ -74617,6 +74617,7 @@
5 " Number of columns is not equal to %s"
6 msgstr "\n"
7 " Le nombre de colonnes n'est pas égal à %s"
8+<<<<<<< TREE
9
10 #. module: specific_rules
11 #: report:addons/specific_rules/report/report_stock_inventory_all_locations_xls.mako:143
12@@ -74689,3 +74690,12 @@
13 msgid "You can't search on this object without using at least one exact search term (precede your search with the character '=')."
14 msgstr "Vous ne pouvez pas exécuter de recherche sur cet objet sans utiliser au moins une recherche exacte (ajoutez le caractère = devant votre filtre)."
15
16+=======
17+
18+#. module: purchase_override
19+#: report:msf.purchase.order:0
20+#: report:msf.purchase.quotation:0
21+#: report:purchase.order.merged:0
22+msgid "Print date:"
23+msgstr "Date d'impression :"
24+>>>>>>> MERGE-SOURCE
25
26=== modified file 'bin/addons/purchase_override/report/merged_order.rml'
27--- bin/addons/purchase_override/report/merged_order.rml 2016-03-17 14:54:50 +0000
28+++ bin/addons/purchase_override/report/merged_order.rml 2016-11-02 09:27:37 +0000
29@@ -3,7 +3,7 @@
30
31 <template pageSize="(842.0,595.0)" title="Purchase Order" author="Medecins Sans Frontieres" allowSplitting="20">
32 <pageTemplate id="first">
33- <frame id="first" x1="30.0" y1="15.0" width="772" height="520" />
34+ <frame id="first" x1="30.0" y1="15.0" width="772" height="500" />
35
36 <pageGraphics>
37 <drawString x="35" y="560.0">PURCHASE ORDER ([[ getSel(objects[0], 'order_type') ]])</drawString>
38@@ -12,10 +12,11 @@
39 <image x="700" y="530.0" height="53.3" width="100">[[ company.logo or removeParentNode('image') ]]</image>
40 <setFont name="Helvetica" size="8"/>
41 <fill color="black"/>
42- <drawString x="730" y="520.0">Page : <pageNumber /></drawString>
43+ <drawString x="700" y="520.0">Page : <pageNumber /></drawString>
44 <!-- TODO: OEB-148 - Waiting integration on unifield-server -->
45- <!--<drawString x="765" y="520.0">/</drawString>
46- <drawString x="770" y="520.0"><pageCount /> </drawString>-->
47+ <drawString x="735" y="520.0">/</drawString>
48+ <drawString x="740" y="520.0"><pageCount /> </drawString>
49+ <drawString x="700" y="510.0">Print date: [[ time.strftime('%d/%b/%Y') ]]</drawString>
50 </pageGraphics>
51
52 </pageTemplate>
53@@ -74,7 +75,7 @@
54 <paraStyle name="all" alignment="justify"/>
55 </initialize>
56
57- <paraStyle name="Standard" fontName="Helvetica" fontSize="8.0" />
58+ <paraStyle name="Standard" fontName="Helvetica" fontSize="7.0" />
59
60 <!-- Header font style -->
61 <paraStyle name="Header" fontName="Helvetica-Bold" fontSize="13.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="3.0" />
62@@ -83,9 +84,9 @@
63 <!-- Information font style -->
64 <paraStyle name="TextInformation" fontName="Helvetica" fontSize="7.0" alignment="LEFT" leading="3.0" spaceBefore="1.0" spaceAfter="1.0" />
65 <paraStyle name="TextInformationMail" fontName="Helvetica" fontSize="7.0" alignment="LEFT" leading="7.0" spaceBefore="1.0" spaceAfter="1.0" />
66- <paraStyle name="TextRemarks" fontName="Helvetica" fontSize="9.0" alignment="LEFT" leading="15.0" spaceBefore="1.0" spaceAfter="1.0" />
67+ <paraStyle name="TextRemarks" fontName="Helvetica" fontSize="7.0" alignment="LEFT" leading="15.0" spaceBefore="1.0" spaceAfter="1.0" />
68 <!-- Lines font style -->
69- <paraStyle name="Lines" fontName="Helvetica" fontSize="6.0" alignment="LEFT" leading="7.0" />
70+ <paraStyle name="Lines" fontName="Helvetica" fontSize="7.0" alignment="LEFT" leading="7.0" />
71 <paraStyle name="LinesBlue" textColor="blue" fontName="Helvetica" fontSize="7.0" alignment="LEFT" leading="7.0" />
72 </stylesheet>
73
74
75=== modified file 'bin/addons/purchase_override/report/purchase_order.rml'
76--- bin/addons/purchase_override/report/purchase_order.rml 2016-03-21 13:31:17 +0000
77+++ bin/addons/purchase_override/report/purchase_order.rml 2016-11-02 09:27:37 +0000
78@@ -3,19 +3,21 @@
79
80 <template pageSize="(842.0,595.0)" title="Purchase Order" author="Medecins Sans Frontieres" allowSplitting="20">
81 <pageTemplate id="first">
82- <frame id="first" x1="30.0" y1="15.0" width="772" height="520" />
83+ <frame id="first" x1="30.0" y1="15.0" width="772" height="500" />
84
85 <pageGraphics>
86 <drawString x="35" y="560.0">PURCHASE ORDER ([[ getSel(objects[0], 'order_type') ]])</drawString>
87 <fill color="blue"/>
88 <drawString x="35" y="548.0">[[ '%s %s %s' % (getSel(objects[0], 'order_type'), objects[0].name, getSel(objects[0], 'state')) ]]</drawString>
89+ <drawString x="700" y="548.0">[[ time.strftime('%Y-%m-%d') ]]</drawString>
90 <image x="700" y="530.0" height="53.3" width="100">[[ company.logo or removeParentNode('image') ]]</image>
91 <setFont name="Helvetica" size="8"/>
92 <fill color="black"/>
93- <drawString x="730" y="520.0">Page : <pageNumber /></drawString>
94+ <drawString x="700" y="520.0">Page : <pageNumber /></drawString>
95 <!-- TODO: OEB-148 - Waiting integration on unifield-server -->
96- <!-- <drawString x="765" y="520.0">/</drawString>
97- <drawString x="770" y="520.0"><pageCount /> </drawString>-->
98+ <drawString x="735" y="520.0">/</drawString>
99+ <drawString x="740" y="520.0"><pageCount /> </drawString>
100+ <drawString x="700" y="510.0">Print date: [[ time.strftime('%d/%b/%Y') ]]</drawString>
101 </pageGraphics>
102
103 </pageTemplate>
104@@ -74,7 +76,7 @@
105 <paraStyle name="all" alignment="justify"/>
106 </initialize>
107
108- <paraStyle name="Standard" fontName="Helvetica" fontSize="8.0" />
109+ <paraStyle name="Standard" fontName="Helvetica" fontSize="7.0" />
110
111 <!-- Header font style -->
112 <paraStyle name="Header" fontName="Helvetica-Bold" fontSize="13.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="3.0" />
113@@ -83,9 +85,9 @@
114 <!-- Information font style -->
115 <paraStyle name="TextInformation" fontName="Helvetica" fontSize="7.0" alignment="LEFT" leading="3.0" spaceBefore="1.0" spaceAfter="1.0" />
116 <paraStyle name="TextInformationMail" fontName="Helvetica" fontSize="7.0" alignment="LEFT" leading="7.0" spaceBefore="1.0" spaceAfter="1.0" />
117- <paraStyle name="TextRemarks" fontName="Helvetica" fontSize="9.0" alignment="LEFT" leading="15.0" spaceBefore="1.0" spaceAfter="1.0" />
118+ <paraStyle name="TextRemarks" fontName="Helvetica" fontSize="7.0" alignment="LEFT" leading="15.0" spaceBefore="1.0" spaceAfter="1.0" />
119 <!-- Lines font style -->
120- <paraStyle name="Lines" fontName="Helvetica" fontSize="6.0" alignment="LEFT" leading="7.0" />
121+ <paraStyle name="Lines" fontName="Helvetica" fontSize="7.0" alignment="LEFT" leading="7.0" />
122 <paraStyle name="LinesBlue" textColor="blue" fontName="Helvetica" fontSize="7.0" alignment="LEFT" leading="7.0" />
123 </stylesheet>
124
125
126=== modified file 'bin/addons/purchase_override/report/rfq.rml'
127--- bin/addons/purchase_override/report/rfq.rml 2014-03-07 16:46:48 +0000
128+++ bin/addons/purchase_override/report/rfq.rml 2016-11-02 09:27:37 +0000
129@@ -3,7 +3,7 @@
130
131 <template pageSize="(842.0,595.0)" title="Purchase Order" author="Medecins Sans Frontieres" allowSplitting="20">
132 <pageTemplate id="first">
133- <frame id="first" x1="30.0" y1="0.0" width="772" height="520" />
134+ <frame id="first" x1="30.0" y1="0.0" width="772" height="500" />
135
136 <pageGraphics>
137 <drawString x="35" y="560.0">REQUEST FOR QUOTATION ([[ getSel(objects[0], 'order_type') ]])</drawString>
138@@ -12,10 +12,11 @@
139 <image x="700" y="530.0" height="53.3" width="100">[[ company.logo or removeParentNode('image') ]]</image>
140 <setFont name="Helvetica" size="8"/>
141 <fill color="black"/>
142- <drawString x="730" y="520.0">Page : <pageNumber /></drawString>
143+ <drawString x="700" y="520.0">Page : <pageNumber /></drawString>
144 <!-- TODO: OEB-148 - Waiting integration on unifield-server -->
145- <!-- <drawString x="765" y="520.0">/</drawString>
146- <drawString x="770" y="520.0"><pageCount /> </drawString>-->
147+ <drawString x="735" y="520.0">/</drawString>
148+ <drawString x="740" y="520.0"><pageCount /> </drawString>
149+ <drawString x="700" y="510.0">Print date: [[ time.strftime('%d/%b/%Y') ]]</drawString>
150 </pageGraphics>
151
152 </pageTemplate>
153@@ -77,11 +78,11 @@
154 <paraStyle name="Header_9" fontName="Helvetica-Bold" fontSize="8.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="3.0" />
155 <paraStyle name="HeaderBlue" textColor="blue" fontName="Helvetica-Bold" fontSize="13.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="35.0" />
156 <!-- Information font style -->
157- <paraStyle name="TextInformation" fontName="Helvetica" fontSize="9.0" alignment="LEFT" leading="7.0" spaceBefore="1.0" spaceAfter="1.0" />
158- <paraStyle name="TextInformationOrigin" fontName="Helvetica" fontSize="8.0" alignment="LEFT" leading="7.0" spaceBefore="1.0" spaceAfter="1.0" />
159- <paraStyle name="TextRemarks" fontName="Helvetica" fontSize="9.0" alignment="LEFT" leading="15.0" spaceBefore="1.0" spaceAfter="1.0" />
160+ <paraStyle name="TextInformation" fontName="Helvetica" fontSize="7.0" alignment="LEFT" leading="7.0" spaceBefore="1.0" spaceAfter="1.0" />
161+ <paraStyle name="TextInformationOrigin" fontName="Helvetica" fontSize="7.0" alignment="LEFT" leading="7.0" spaceBefore="1.0" spaceAfter="1.0" />
162+ <paraStyle name="TextRemarks" fontName="Helvetica" fontSize="7.0" alignment="LEFT" leading="15.0" spaceBefore="1.0" spaceAfter="1.0" />
163 <!-- Lines font style -->
164- <paraStyle name="Lines" fontName="Helvetica" fontSize="6.0" alignment="LEFT" leading="7.0" />
165+ <paraStyle name="Lines" fontName="Helvetica" fontSize="7.0" alignment="LEFT" leading="7.0" />
166 <paraStyle name="LinesBlue" textColor="blue" fontName="Helvetica" fontSize="7.0" alignment="LEFT" leading="7.0" />
167 </stylesheet>
168

Subscribers

People subscribed via source and target branches

to all changes: