Unifield Server

Merge lp:~dorian-kemps/unifield-server/US-6595 into lp:unifield-server

  1. US-6595
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 5763
Proposed branch: lp:~dorian-kemps/unifield-server/US-6595
Merge into: lp:unifield-server
Diff against target: 601 lines (+162/-117) (has conflicts)
3 files modified
bin/addons/msf_profile/i18n/fr_MF.po (+16/-13)
bin/addons/stock/report/physical_inventory_counting_sheet_xls.mako (+3/-1)
bin/addons/stock/report/physical_inventory_discrepancies_report_xls.mako (+143/-103)
Text conflict in bin/addons/msf_profile/i18n/fr_MF.po
To merge this branch: bzr merge lp:~dorian-kemps/unifield-server/US-6595
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+383197@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 2020-07-28 15:47:53 +0000
3+++ bin/addons/msf_profile/i18n/fr_MF.po 2020-07-31 14:38:32 +0000
4@@ -38477,7 +38477,7 @@
5 #. module: stock
6 #: code:addons/stock/physical_inventory.py:1411
7 #: field:physical.inventory.discrepancy,discrepancy_value:0
8-#: report:addons/stock/report/physical_inventory_discrepancies_report_xls.mako:813
9+#: report:addons/stock/report/physical_inventory_discrepancies_report_xls.mako:833
10 #, python-format
11 msgid "Discrepancy Value"
12 msgstr "Valeur des Écarts"
13@@ -41514,8 +41514,9 @@
14 msgstr "The partner is missing."
15
16 #. module: stock
17+#: view:physical.inventory:0
18 #: report:addons/stock/report/physical_inventory_discrepancies_report_xls.mako:682
19-msgid "With discrepencies"
20+msgid "With discrepancies"
21 msgstr "Avec les écarts"
22
23 #. module: base
24@@ -48064,11 +48065,6 @@
25 msgid "Unit"
26 msgstr "Unité"
27
28-#. module: stock
29-#: view:physical.inventory:0
30-msgid "With discrepancies"
31-msgstr "Avec les écart"
32-
33 #. module: msf_instance
34 #: view:res.company:0
35 msgid "B/S Move to 0 accounts"
36@@ -91203,7 +91199,6 @@
37 #: field:wizard.import.po.simulation.screen.line,imp_discrepancy:0
38 #: field:wizard.simu.import.po.line,discrepancy:0
39 #: report:addons/stock/report/physical_inventory_discrepancies_report_xls.mako:801
40-#: report:addons/stock/report/physical_inventory_discrepancies_report_xls.mako:811
41 msgid "Discrepancy"
42 msgstr "Écarts"
43
44@@ -92418,11 +92413,6 @@
45 msgid "Gives the margin of profitability by calculating the difference between Unit Price and Cost Price."
46 msgstr "Donne la marge de rentabilité en calculant la différence entre le prix unitaire et le prix"
47
48-#. module: stock
49-#: report:addons/stock/report/physical_inventory_discrepancies_report_xls.mako:803
50-msgid "Discrepancy value"
51-msgstr "Valeur des écarts"
52-
53 #. module: base
54 #: selection:res.config.users,context_tz:0
55 #: selection:res.users,context_tz:0
56@@ -109250,6 +109240,7 @@
57 #: code:addons/account_override/invoice.py:1272
58 msgid "Split Stock Transfer Voucher"
59 msgstr "Fractionner Bon Client"
60+<<<<<<< TREE
61
62 #. modules: account_override, register_accounting
63 #: view:account.invoice:0
64@@ -110362,3 +110353,15 @@
65 #, python-format
66 msgid "is dispatched."
67 msgstr "est expédié."
68+=======
69+
70+#. module: stock
71+#: report:addons/stock/report/physical_inventory_discrepancies_report_xls.mako:841
72+msgid "Total Discrepancy"
73+msgstr "Écart Total"
74+
75+#. module: stock
76+#: report:addons/stock/report/physical_inventory_discrepancies_report_xls.mako:843
77+msgid "Total Discrepancy Value"
78+msgstr "Valeur Totale des Écarts"
79+>>>>>>> MERGE-SOURCE
80
81=== modified file 'bin/addons/stock/report/physical_inventory_counting_sheet_xls.mako'
82--- bin/addons/stock/report/physical_inventory_counting_sheet_xls.mako 2018-02-15 17:15:17 +0000
83+++ bin/addons/stock/report/physical_inventory_counting_sheet_xls.mako 2020-07-31 14:38:32 +0000
84@@ -231,6 +231,7 @@
85 <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
86 </Borders>
87 <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="9" ss:Color="#000000"/>
88+ <NumberFormat ss:Format="0"/>
89 <Interior/>
90 </Style>
91 <Style ss:ID="s108">
92@@ -241,6 +242,7 @@
93 <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
94 </Borders>
95 <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="9" ss:Color="#000000"/>
96+ <NumberFormat ss:Format="0"/>
97 </Style>
98 <Style ss:ID="s109">
99 <Alignment ss:Horizontal="Center" ss:Vertical="Center"/>
100@@ -476,7 +478,7 @@
101 ss:Name="_FilterDatabase"/><NamedCell ss:Name="Print_Area"/></Cell>
102 <Cell ss:StyleID="s107"><Data ss:Type="String">${item.product_uom_id and item.product_uom_id.name or ''|x}</Data><NamedCell
103 ss:Name="_FilterDatabase"/><NamedCell ss:Name="Print_Area"/></Cell>
104- <Cell ss:StyleID="s108"><Data ss:Type="String">${item.quantity or ''}</Data><NamedCell
105+ <Cell ss:StyleID="s108"><Data ss:Type="Number">${item.quantity or 0|x}</Data><NamedCell
106 ss:Name="_FilterDatabase"/><NamedCell ss:Name="Print_Area"/></Cell>
107 <Cell ss:StyleID="s108"><Data ss:Type="String">${item.batch_number or ''|x}</Data></Cell>
108 % if isDate(item.expiry_date):
109
110=== modified file 'bin/addons/stock/report/physical_inventory_discrepancies_report_xls.mako'
111--- bin/addons/stock/report/physical_inventory_discrepancies_report_xls.mako 2019-04-25 08:34:50 +0000
112+++ bin/addons/stock/report/physical_inventory_discrepancies_report_xls.mako 2020-07-31 14:38:32 +0000
113@@ -18,9 +18,8 @@
114 <ExcelWorkbook xmlns="urn:schemas-microsoft-com:office:excel">
115 <WindowHeight>9660</WindowHeight>
116 <WindowWidth>17370</WindowWidth>
117- <WindowTopX>480</WindowTopX>
118- <WindowTopY>195</WindowTopY>
119- <TabRatio>319</TabRatio>
120+ <WindowTopX>120</WindowTopX>
121+ <WindowTopY>75</WindowTopY>
122 <ProtectStructure>False</ProtectStructure>
123 <ProtectWindows>False</ProtectWindows>
124 </ExcelWorkbook>
125@@ -87,6 +86,8 @@
126 <Alignment ss:Horizontal="Center" ss:Vertical="Center" ss:WrapText="1"/>
127 <Borders>
128 <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="2"/>
129+ <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="2"/>
130+ <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="2"/>
131 <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="2"/>
132 </Borders>
133 <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="9" ss:Color="#000000"
134@@ -96,8 +97,8 @@
135 <Style ss:ID="s27">
136 <Alignment ss:Horizontal="Center" ss:Vertical="Center" ss:WrapText="1"/>
137 <Borders>
138- <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/>
139- <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
140+ <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="2"/>
141+ <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="2"/>
142 <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="2"/>
143 </Borders>
144 <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="9" ss:Color="#000000"
145@@ -129,27 +130,29 @@
146 <Style ss:ID="s30">
147 <Borders>
148 <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
149- <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="2"/>
150+ <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/>
151 <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
152- <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="2"/>
153+ <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
154 </Borders>
155 <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="9" ss:Color="#000000"/>
156+ <NumberFormat ss:Format="0"/>
157 </Style>
158 <Style ss:ID="s31">
159 <Borders>
160 <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
161 <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/>
162 <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
163- <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="2"/>
164+ <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
165 </Borders>
166 <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="9" ss:Color="#000000"/>
167+ <NumberFormat ss:Format="#0"/>
168 </Style>
169 <Style ss:ID="s32">
170 <Borders>
171 <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
172 <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/>
173- <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="2"/>
174- <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="2"/>
175+ <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
176+ <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
177 </Borders>
178 <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="9" ss:Color="#000000"/>
179 </Style>
180@@ -186,9 +189,21 @@
181 <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
182 <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/>
183 <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
184- <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="2"/>
185- </Borders>
186- <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="9" ss:Color="#000000"/>
187+ <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
188+ </Borders>
189+ <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="9" ss:Color="#000000"/>
190+ <NumberFormat ss:Format="#0"/>
191+ </Style>
192+ <Style ss:ID="s36dec">
193+ <Alignment ss:Horizontal="Center" ss:Vertical="Center"/>
194+ <Borders>
195+ <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
196+ <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/>
197+ <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
198+ <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
199+ </Borders>
200+ <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="9" ss:Color="#000000"/>
201+ <NumberFormat ss:Format="#,##0.00"/>
202 </Style>
203 <Style ss:ID="s37">
204 <Alignment ss:Horizontal="Center" ss:Vertical="Center" ss:WrapText="1"/>
205@@ -204,7 +219,7 @@
206 <Borders>
207 <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
208 <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/>
209- <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="2"/>
210+ <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
211 </Borders>
212 <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="9" ss:Color="#000000"/>
213 </Style>
214@@ -239,16 +254,20 @@
215 <Borders>
216 <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
217 <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
218- <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="2"/>
219+ <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/>
220+ <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
221 </Borders>
222 <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="9" ss:Color="#000000"/>
223+ <NumberFormat ss:Format="#0"/>
224 </Style>
225 <Style ss:ID="s43">
226 <Borders>
227 <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
228- <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="2"/>
229+ <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/>
230+ <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
231 </Borders>
232 <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="9" ss:Color="#000000"/>
233+ <NumberFormat ss:Format="#,##0.00"/>
234 </Style>
235 <Style ss:ID="s44">
236 <Borders>
237@@ -274,9 +293,10 @@
238 <Borders>
239 <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
240 <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/>
241- <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="2"/>
242+ <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
243 </Borders>
244 <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="9" ss:Color="#000000"/>
245+ <NumberFormat ss:Format="#,##0.00"/>
246 </Style>
247 <Style ss:ID="s47">
248 <Alignment ss:Horizontal="Center" ss:Vertical="Center" ss:WrapText="1"/>
249@@ -290,8 +310,8 @@
250 <Style ss:ID="s48">
251 <Borders>
252 <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
253- <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="2"/>
254- <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="2"/>
255+ <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>"production"
256+ <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
257 </Borders>
258 <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="9" ss:Color="#000000"/>
259 </Style>
260@@ -307,9 +327,9 @@
261 <Alignment ss:Horizontal="Center" ss:Vertical="Center"/>
262 <Borders>
263 <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
264- <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="2"/>
265- <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="2"/>
266- <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="2"/>
267+ <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/>
268+ <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
269+ <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
270 </Borders>
271 <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="9" ss:Color="#000000"/>
272 </Style>
273@@ -327,23 +347,38 @@
274 <Borders/>
275 </Style>
276 <Style ss:ID="s57">
277- <Alignment ss:Horizontal="Right" ss:Vertical="Bottom"/>
278+ <Alignment ss:Horizontal="Center" ss:Vertical="Bottom"/>
279 <Borders>
280 <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
281 <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/>
282 <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
283 <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
284 </Borders>
285- <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="9" ss:Color="#000000"
286+ <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="9" ss:Color="#000000"/>
287+ <NumberFormat ss:Format="#,##0.00"/>
288 ss:Bold="1"/>
289 </Style>
290 <Style ss:ID="s58">
291- <Borders>
292- <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
293- <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/>
294- <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
295- <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
296- </Borders>
297+ <Alignment ss:Horizontal="Center" ss:Vertical="Bottom"/>
298+ <Borders>
299+ <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
300+ <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/>
301+ <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
302+ <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
303+ </Borders>
304+ <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="9" ss:Color="#000000"/>
305+ <NumberFormat ss:Format="#0"/>
306+ </Style>
307+ <Style ss:ID="s58dec">
308+ <Alignment ss:Horizontal="Center" ss:Vertical="Bottom"/>
309+ <Borders>
310+ <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
311+ <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/>
312+ <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
313+ <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
314+ </Borders>
315+ <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="9" ss:Color="#000000"/>
316+ <NumberFormat ss:Format="#,##0.00"/>
317 </Style>
318 <Style ss:ID="s59">
319 <Borders>
320@@ -366,60 +401,67 @@
321 </Borders>
322 </Style>
323 <Style ss:ID="s63">
324- <Alignment ss:Horizontal="Left" ss:Vertical="Bottom"/>
325+ <Alignment ss:Horizontal="Center" ss:Vertical="Bottom"/>
326 <Borders>
327 <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
328 <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/>
329 <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
330 <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="2"/>
331 </Borders>
332- <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="9" ss:Color="#000000"/>
333+ <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="9" ss:Color="#000000" ss:Bold="1"/>
334 </Style>
335 <Style ss:ID="s64">
336- <Alignment ss:Horizontal="Left" ss:Vertical="Bottom"/>
337+ <Alignment ss:Horizontal="Center" ss:Vertical="Bottom"/>
338 <Borders>
339 <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
340 <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/>
341 <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="2"/>
342 <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="2"/>
343 </Borders>
344- <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="11" ss:Color="#000000"/>
345+ <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="9" ss:Color="#000000" ss:Bold="1"/>
346 </Style>
347 <Style ss:ID="s65">
348- <Alignment ss:Horizontal="Right" ss:Vertical="Bottom"/>
349+ <Alignment ss:Horizontal="Center" ss:Vertical="Bottom"/>
350 <Borders>
351 <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
352 <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/>
353 <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="2"/>
354 <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
355 </Borders>
356- <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="9" ss:Color="#000000"
357- ss:Bold="1"/>
358+ <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="9" ss:Color="#000000"/>
359+ <NumberFormat ss:Format="#,##0.00"/>
360 </Style>
361 <Style ss:ID="s66">
362+ <Alignment ss:Horizontal="Center" ss:Vertical="Bottom"/>
363 <Borders>
364 <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
365 <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/>
366 <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="2"/>
367 <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
368 </Borders>
369+ <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="9" ss:Color="#000000"/>
370 </Style>
371 <Style ss:ID="s67" ss:Parent="s16">
372+ <Alignment ss:Horizontal="Center" ss:Vertical="Bottom"/>
373 <Borders>
374 <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="2"/>
375 <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/>
376 <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
377 <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
378 </Borders>
379- <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="11" ss:Color="#000000"/>
380+ <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="9" ss:Color="#000000"/>
381+ <NumberFormat ss:Format="#,##0.00"/>
382 </Style>
383 <Style ss:ID="s68">
384+ <Alignment ss:Horizontal="Center" ss:Vertical="Bottom"/>
385 <Borders>
386 <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="2"/>
387 <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/>
388 <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="2"/>
389 <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
390 </Borders>
391+ <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="9" ss:Color="#000000"/>
392+ <NumberFormat ss:Format="#,##0.00"/>
393 </Style>
394 <Style ss:ID="s69">
395 <Alignment ss:Horizontal="Left" ss:Vertical="Bottom"/>
396@@ -429,7 +471,7 @@
397 <Interior ss:Color="#DCDEE2" ss:Pattern="Solid"/>
398 </Style>
399 <Style ss:ID="s70">
400- <Alignment ss:Horizontal="Left" ss:Vertical="Center"/>
401+ <Alignment ss:Horizontal="Left" ss:Vertical="Bottom"/>
402 <Borders/>
403 <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="24" ss:Color="#000000"
404 ss:Bold="1"/>
405@@ -464,8 +506,7 @@
406 <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
407 <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
408 </Borders>
409- <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="9" ss:Color="#000000"
410- ss:Bold="1"/>
411+ <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="9" ss:Color="#000000" ss:Bold="1"/>
412 </Style>
413 <Style ss:ID="s80">
414 <Alignment ss:Horizontal="Center" ss:Vertical="Bottom"/>
415@@ -475,8 +516,7 @@
416 <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
417 <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
418 </Borders>
419- <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="9" ss:Color="#000000"
420- ss:Bold="1"/>
421+ <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="9" ss:Color="#000000" ss:Bold="1"/>
422 </Style>
423 </Styles>
424 <Worksheet ss:Name="stock">
425@@ -496,7 +536,7 @@
426 <Column ss:Index="16" ss:Width="67.5"/>
427 <Column ss:AutoFitWidth="0" ss:Width="78" ss:Span="2"/>
428 <Column ss:Index="20" ss:AutoFitWidth="0" ss:Width="273"/>
429- <Row ss:Height="31.5" ss:StyleID="s71">
430+ <Row ss:Height="35" ss:StyleID="s71">
431 <Cell ss:StyleID="s70"><Data ss:Type="String">${_('INVENTORY REPORT')|x}</Data><NamedCell
432 ss:Name="Print_Titles"/><NamedCell ss:Name="Print_Area"/></Cell>
433 <Cell ss:StyleID="s69"><NamedCell ss:Name="Print_Titles"/><NamedCell
434@@ -651,11 +691,11 @@
435 ss:Name="Print_Area"/></Cell>
436 <Cell ss:Index="16" ss:MergeAcross="1" ss:StyleID="s78"><Data ss:Type="String">${_('Total at the end')|x}</Data><NamedCell
437 ss:Name="Print_Titles"/><NamedCell ss:Name="Print_Area"/></Cell>
438- <Cell ss:StyleID="s58"><NamedCell ss:Name="Print_Titles"/><Data ss:Type="String">${objects[0].inventory_lines_number}</Data><NamedCell
439- ss:Name="Print_Area"/></Cell>
440- <Cell ss:StyleID="s57"><NamedCell ss:Name="Print_Titles"/><Data ss:Type="String">${objects[0].inventory_lines_value}</Data><NamedCell
441- ss:Name="Print_Area"/></Cell>
442- <Cell ss:StyleID="s65"><NamedCell ss:Name="Print_Titles"/><Data ss:Type="String">${objects[0].inventory_lines_absvalue}</Data><NamedCell
443+ <Cell ss:StyleID="s58"><NamedCell ss:Name="Print_Titles"/><Data ss:Type="Number">${objects[0].inventory_lines_number}</Data><NamedCell
444+ ss:Name="Print_Area"/></Cell>
445+ <Cell ss:StyleID="s57"><NamedCell ss:Name="Print_Titles"/><Data ss:Type="Number">${objects[0].inventory_lines_value}</Data><NamedCell
446+ ss:Name="Print_Area"/></Cell>
447+ <Cell ss:StyleID="s65"><NamedCell ss:Name="Print_Titles"/><Data ss:Type="Number">${objects[0].inventory_lines_absvalue}</Data><NamedCell
448 ss:Name="Print_Area"/></Cell>
449 </Row>
450 <Row ss:Height="15.75">
451@@ -679,13 +719,13 @@
452 ss:Name="Print_Area"/></Cell>
453 <Cell ss:StyleID="s18"><NamedCell ss:Name="Print_Titles"/><NamedCell
454 ss:Name="Print_Area"/></Cell>
455- <Cell ss:MergeAcross="1" ss:StyleID="s78"><Data ss:Type="String">${_('With discrepencies')|x}</Data><NamedCell
456+ <Cell ss:MergeAcross="1" ss:StyleID="s78"><Data ss:Type="String">${_('With discrepancies')|x}</Data><NamedCell
457 ss:Name="Print_Titles"/><NamedCell ss:Name="Print_Area"/></Cell>
458- <Cell ss:StyleID="s58"><Data ss:Type="String">${objects[0].discrepancy_lines_number}</Data><NamedCell ss:Name="Print_Titles"/><NamedCell
459- ss:Name="Print_Area"/></Cell>
460- <Cell ss:StyleID="s58"><Data ss:Type="String">${objects[0].discrepancy_lines_value}</Data><NamedCell ss:Name="Print_Titles"/><NamedCell
461- ss:Name="Print_Area"/></Cell>
462- <Cell ss:StyleID="s66"><Data ss:Type="String">${objects[0].discrepancy_lines_absvalue}</Data><NamedCell ss:Name="Print_Titles"/><NamedCell
463+ <Cell ss:StyleID="s58"><Data ss:Type="Number">${objects[0].discrepancy_lines_number}</Data><NamedCell ss:Name="Print_Titles"/><NamedCell
464+ ss:Name="Print_Area"/></Cell>
465+ <Cell ss:StyleID="s58dec"><Data ss:Type="Number">${objects[0].discrepancy_lines_value}</Data><NamedCell ss:Name="Print_Titles"/><NamedCell
466+ ss:Name="Print_Area"/></Cell>
467+ <Cell ss:StyleID="s66"><Data ss:Type="Number">${objects[0].discrepancy_lines_absvalue}</Data><NamedCell ss:Name="Print_Titles"/><NamedCell
468 ss:Name="Print_Area"/></Cell>
469 </Row>
470 <Row ss:Height="15.75">
471@@ -719,11 +759,11 @@
472 ss:Name="Print_Area"/></Cell>
473 <Cell ss:MergeAcross="1" ss:StyleID="s80"><Data ss:Type="String">${_('%')|x}</Data><NamedCell
474 ss:Name="Print_Titles"/><NamedCell ss:Name="Print_Area"/></Cell>
475- <Cell ss:StyleID="s67"><Data ss:Type="String">${objects[0].discrepancy_lines_percent}</Data><NamedCell
476- ss:Name="Print_Titles"/><NamedCell ss:Name="Print_Area"/></Cell>
477- <Cell ss:StyleID="s67"><Data ss:Type="String">${objects[0].discrepancy_lines_percent_value}</Data><NamedCell
478- ss:Name="Print_Titles"/><NamedCell ss:Name="Print_Area"/></Cell>
479- <Cell ss:StyleID="s68"><Data ss:Type="String">${objects[0].discrepancy_lines_percent_absvalue}</Data><NamedCell
480+ <Cell ss:StyleID="s67"><Data ss:Type="Number">${objects[0].discrepancy_lines_percent}</Data><NamedCell
481+ ss:Name="Print_Titles"/><NamedCell ss:Name="Print_Area"/></Cell>
482+ <Cell ss:StyleID="s67"><Data ss:Type="Number">${objects[0].discrepancy_lines_percent_value}</Data><NamedCell
483+ ss:Name="Print_Titles"/><NamedCell ss:Name="Print_Area"/></Cell>
484+ <Cell ss:StyleID="s68"><Data ss:Type="Number">${objects[0].discrepancy_lines_percent_absvalue}</Data><NamedCell
485 ss:Name="Print_Titles"/><NamedCell ss:Name="Print_Area"/></Cell>
486 </Row>
487 <Row ss:Height="15.75">
488@@ -773,16 +813,16 @@
489 <Cell ss:StyleID="s26"><Data ss:Type="String">${_('Family')|x}</Data><NamedCell
490 ss:Name="_FilterDatabase"/><NamedCell ss:Name="Print_Titles"/><NamedCell
491 ss:Name="Print_Area"/></Cell>
492- <Cell ss:StyleID="s27"><Data ss:Type="String">${_('Item code')|x}</Data><NamedCell
493- ss:Name="_FilterDatabase"/><NamedCell ss:Name="Print_Titles"/><NamedCell
494- ss:Name="Print_Area"/></Cell>
495- <Cell ss:StyleID="s27"><Data ss:Type="String">${_('Description')|x}</Data><NamedCell
496- ss:Name="_FilterDatabase"/><NamedCell ss:Name="Print_Titles"/><NamedCell
497- ss:Name="Print_Area"/></Cell>
498- <Cell ss:StyleID="s37"><Data ss:Type="String">${_('UoM')|x}</Data><NamedCell
499- ss:Name="_FilterDatabase"/><NamedCell ss:Name="Print_Titles"/><NamedCell
500- ss:Name="Print_Area"/></Cell>
501- <Cell ss:StyleID="s45"><Data ss:Type="String">${_('Unit price')|x}</Data><NamedCell
502+ <Cell ss:StyleID="s26"><Data ss:Type="String">${_('Item code')|x}</Data><NamedCell
503+ ss:Name="_FilterDatabase"/><NamedCell ss:Name="Print_Titles"/><NamedCell
504+ ss:Name="Print_Area"/></Cell>
505+ <Cell ss:StyleID="s26"><Data ss:Type="String">${_('Description')|x}</Data><NamedCell
506+ ss:Name="_FilterDatabase"/><NamedCell ss:Name="Print_Titles"/><NamedCell
507+ ss:Name="Print_Area"/></Cell>
508+ <Cell ss:StyleID="s26"><Data ss:Type="String">${_('UoM')|x}</Data><NamedCell
509+ ss:Name="_FilterDatabase"/><NamedCell ss:Name="Print_Titles"/><NamedCell
510+ ss:Name="Print_Area"/></Cell>
511+ <Cell ss:StyleID="s26"><Data ss:Type="String">${_('Unit price')|x}</Data><NamedCell
512 ss:Name="_FilterDatabase"/><NamedCell ss:Name="Print_Titles"/><NamedCell
513 ss:Name="Print_Area"/></Cell>
514 <Cell ss:StyleID="s26"><Data ss:Type="String">${_('currency (functional)')|x}</Data><NamedCell
515@@ -791,53 +831,53 @@
516 <Cell ss:StyleID="s26"><Data ss:Type="String">${_('Quantity Theorical')|x}</Data><NamedCell
517 ss:Name="_FilterDatabase"/><NamedCell ss:Name="Print_Titles"/><NamedCell
518 ss:Name="Print_Area"/></Cell>
519- <Cell ss:StyleID="s29"><Data ss:Type="String">${_('Quantity counted')|x}</Data><NamedCell
520+ <Cell ss:StyleID="s26"><Data ss:Type="String">${_('Quantity counted')|x}</Data><NamedCell
521 ss:Name="_FilterDatabase"/><NamedCell ss:Name="Print_Titles"/><NamedCell
522 ss:Name="Print_Area"/></Cell>
523- <Cell ss:StyleID="s47"><Data ss:Type="String">${_('Batch no')|x}</Data><NamedCell
524- ss:Name="Print_Titles"/><NamedCell ss:Name="Print_Area"/></Cell>
525- <Cell ss:StyleID="s28"><Data ss:Type="String">${_('Expiry date')|x}</Data><NamedCell
526- ss:Name="Print_Titles"/><NamedCell ss:Name="Print_Area"/></Cell>
527- <Cell ss:StyleID="s41"><Data ss:Type="String">${_('Discrepancy')|x}</Data><NamedCell
528- ss:Name="Print_Titles"/><NamedCell ss:Name="Print_Area"/></Cell>
529- <Cell ss:StyleID="s41"><Data ss:Type="String">${_('Discrepancy value')|x}</Data><NamedCell
530- ss:Name="Print_Titles"/><NamedCell ss:Name="Print_Area"/></Cell>
531- <Cell ss:StyleID="s41"><Data ss:Type="String">${_('Total QTY before INV')|x}</Data><NamedCell
532- ss:Name="Print_Titles"/><NamedCell ss:Name="Print_Area"/></Cell>
533- <Cell ss:StyleID="s28"><Data ss:Type="String">${_('Total QTY after INV')|x}</Data><NamedCell
534- ss:Name="Print_Titles"/><NamedCell ss:Name="Print_Area"/></Cell>
535- <Cell ss:StyleID="s28"><Data ss:Type="String">${_('Total Value after INV')|x}</Data><NamedCell
536- ss:Name="Print_Titles"/><NamedCell ss:Name="Print_Area"/></Cell>
537- <Cell ss:StyleID="s28"><Data ss:Type="String">${_('Discrepancy')|x}</Data><NamedCell
538- ss:Name="Print_Titles"/><NamedCell ss:Name="Print_Area"/></Cell>
539- <Cell ss:StyleID="s45"><Data ss:Type="String">${_('Discrepancy Value')|x}</Data><NamedCell
540- ss:Name="Print_Titles"/><NamedCell ss:Name="Print_Area"/></Cell>
541- <Cell ss:StyleID="s45"><Data ss:Type="String">${_('Adjustment type')|x}</Data><NamedCell
542- ss:Name="Print_Titles"/><NamedCell ss:Name="Print_Area"/></Cell>
543- <Cell ss:StyleID="s45"><Data ss:Type="String">${_('Comments / actions (in case of discrepancy)')|x}</Data><NamedCell
544+ <Cell ss:StyleID="s26"><Data ss:Type="String">${_('Batch no')|x}</Data><NamedCell
545+ ss:Name="Print_Titles"/><NamedCell ss:Name="Print_Area"/></Cell>
546+ <Cell ss:StyleID="s26"><Data ss:Type="String">${_('Expiry date')|x}</Data><NamedCell
547+ ss:Name="Print_Titles"/><NamedCell ss:Name="Print_Area"/></Cell>
548+ <Cell ss:StyleID="s26"><Data ss:Type="String">${_('Discrepancy')|x}</Data><NamedCell
549+ ss:Name="Print_Titles"/><NamedCell ss:Name="Print_Area"/></Cell>
550+ <Cell ss:StyleID="s26"><Data ss:Type="String">${_('Discrepancy Value')|x}</Data><NamedCell
551+ ss:Name="Print_Titles"/><NamedCell ss:Name="Print_Area"/></Cell>
552+ <Cell ss:StyleID="s26"><Data ss:Type="String">${_('Total QTY before INV')|x}</Data><NamedCell
553+ ss:Name="Print_Titles"/><NamedCell ss:Name="Print_Area"/></Cell>
554+ <Cell ss:StyleID="s26"><Data ss:Type="String">${_('Total QTY after INV')|x}</Data><NamedCell
555+ ss:Name="Print_Titles"/><NamedCell ss:Name="Print_Area"/></Cell>
556+ <Cell ss:StyleID="s26"><Data ss:Type="String">${_('Total Value after INV')|x}</Data><NamedCell
557+ ss:Name="Print_Titles"/><NamedCell ss:Name="Print_Area"/></Cell>
558+ <Cell ss:StyleID="s26"><Data ss:Type="String">${_('Total Discrepancy')|x}</Data><NamedCell
559+ ss:Name="Print_Titles"/><NamedCell ss:Name="Print_Area"/></Cell>
560+ <Cell ss:StyleID="s26"><Data ss:Type="String">${_('Total Discrepancy Value')|x}</Data><NamedCell
561+ ss:Name="Print_Titles"/><NamedCell ss:Name="Print_Area"/></Cell>
562+ <Cell ss:StyleID="s26"><Data ss:Type="String">${_('Adjustment type')|x}</Data><NamedCell
563+ ss:Name="Print_Titles"/><NamedCell ss:Name="Print_Area"/></Cell>
564+ <Cell ss:StyleID="s26"><Data ss:Type="String">${_('Comments / actions (in case of discrepancy)')|x}</Data><NamedCell
565 ss:Name="Print_Titles"/><NamedCell ss:Name="Print_Area"/></Cell>
566 <% index = 0 %>
567 </Row>
568 % for index,item in enumerate([x for x in objects[0].discrepancy_line_ids if not x.ignored]):
569 <Row>
570- <Cell ss:StyleID="s30"><Data ss:Type="String">${item.line_no}</Data><NamedCell ss:Name="Print_Area"/></Cell>
571+ <Cell ss:StyleID="s30"><Data ss:Type="Number">${item.line_no}</Data><NamedCell ss:Name="Print_Area"/></Cell>
572 <Cell ss:StyleID="s30"><Data ss:Type="String">${item.nomen_manda_2 and item.nomen_manda_2.name or ''|x}</Data><NamedCell ss:Name="Print_Area"/></Cell>
573 <Cell ss:StyleID="s31"><Data ss:Type="String">${item.product_id and item.product_id.code or ''|x}</Data><NamedCell ss:Name="Print_Area"/></Cell>
574 <Cell ss:StyleID="s31"><Data ss:Type="String">${item.product_id and item.product_id.name or ''|x}</Data><NamedCell ss:Name="Print_Area"/></Cell>
575 <Cell ss:StyleID="s38"><Data ss:Type="String">${item.product_uom_id and item.product_uom_id.name or ''|x}</Data><NamedCell ss:Name="Print_Area"/></Cell>
576- <Cell ss:StyleID="s43"><Data ss:Type="String">${item.standard_price}</Data><NamedCell ss:Name="Print_Area"/></Cell>
577+ <Cell ss:StyleID="s43"><Data ss:Type="Number">${item.standard_price}</Data><NamedCell ss:Name="Print_Area"/></Cell>
578 <Cell ss:StyleID="s43"><Data ss:Type="String">${item.currency_id and item.currency_id.name or ''|x}</Data><NamedCell ss:Name="Print_Area"/></Cell>
579- <Cell ss:StyleID="s30"><Data ss:Type="String">${item.theoretical_qty}</Data><NamedCell ss:Name="Print_Area"/></Cell>
580- <Cell ss:StyleID="s31"><Data ss:Type="String">${item.counted_qty}</Data><NamedCell ss:Name="Print_Area"/></Cell>
581+ <Cell ss:StyleID="s30"><Data ss:Type="Number">${item.theoretical_qty}</Data><NamedCell ss:Name="Print_Area"/></Cell>
582+ <Cell ss:StyleID="s31"><Data ss:Type="Number">${item.counted_qty}</Data><NamedCell ss:Name="Print_Area"/></Cell>
583 <Cell ss:StyleID="s38"><Data ss:Type="String">${item.batch_number or ''|x}</Data><NamedCell ss:Name="Print_Area"/></Cell>
584 <Cell ss:StyleID="s32"><Data ss:Type="String">${item.expiry_date or ''}</Data><NamedCell ss:Name="Print_Area"/></Cell>
585- <Cell ss:StyleID="s43"><Data ss:Type="String">${item.discrepancy_qty}</Data><NamedCell ss:Name="Print_Area"/></Cell>
586- <Cell ss:StyleID="s43"><Data ss:Type="String">${item.discrepancy_value}</Data><NamedCell ss:Name="Print_Area"/></Cell>
587- <Cell ss:StyleID="s42"><Data ss:Type="String">${item.total_product_theoretical_qty}</Data><NamedCell ss:Name="Print_Area"/></Cell>
588- <Cell ss:StyleID="s36"><Data ss:Type="String">${item.total_product_counted_qty}</Data><NamedCell ss:Name="Print_Area"/></Cell>
589- <Cell ss:StyleID="s36"><Data ss:Type="String">${item.total_product_counted_value}</Data><NamedCell ss:Name="Print_Area"/></Cell>
590- <Cell ss:StyleID="s36"><Data ss:Type="String">${item.total_product_discrepancy_qty}</Data><NamedCell ss:Name="Print_Area"/></Cell>
591- <Cell ss:StyleID="s46"><Data ss:Type="String">${item.total_product_discrepancy_value}</Data><NamedCell ss:Name="Print_Area"/></Cell>
592+ <Cell ss:StyleID="s31"><Data ss:Type="Number">${item.discrepancy_qty}</Data><NamedCell ss:Name="Print_Area"/></Cell>
593+ <Cell ss:StyleID="s43"><Data ss:Type="Number">${item.discrepancy_value}</Data><NamedCell ss:Name="Print_Area"/></Cell>
594+ <Cell ss:StyleID="s42"><Data ss:Type="Number">${item.total_product_theoretical_qty}</Data><NamedCell ss:Name="Print_Area"/></Cell>
595+ <Cell ss:StyleID="s36"><Data ss:Type="Number">${item.total_product_counted_qty}</Data><NamedCell ss:Name="Print_Area"/></Cell>
596+ <Cell ss:StyleID="s36dec"><Data ss:Type="Number">${item.total_product_counted_value}</Data><NamedCell ss:Name="Print_Area"/></Cell>
597+ <Cell ss:StyleID="s36"><Data ss:Type="Number">${item.total_product_discrepancy_qty}</Data><NamedCell ss:Name="Print_Area"/></Cell>
598+ <Cell ss:StyleID="s46"><Data ss:Type="Number">${item.total_product_discrepancy_value}</Data><NamedCell ss:Name="Print_Area"/></Cell>
599 <Cell ss:StyleID="s50"><Data ss:Type="String">${item.reason_type_id and item.reason_type_id.complete_name or ''|x}</Data><NamedCell ss:Name="Print_Area"/></Cell>
600 <Cell ss:StyleID="s48"><Data ss:Type="String">${item.comment or ''|x}</Data><NamedCell ss:Name="Print_Area"/></Cell>
601 </Row>

Subscribers

People subscribed via source and target branches