Unifield Server

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

  1. US-5411
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 5361
Proposed branch: lp:~dorian-kemps/unifield-server/US-5411
Merge into: lp:unifield-server
Diff against target: 897 lines (+606/-141) (has conflicts)
3 files modified
bin/addons/msf_profile/i18n/fr_MF.po (+68/-10)
bin/addons/order_types/report/donation_certificate.py (+35/-7)
bin/addons/order_types/report/donation_certificate.rml (+503/-124)
Text conflict in bin/addons/msf_profile/i18n/fr_MF.po
To merge this branch: bzr merge lp:~dorian-kemps/unifield-server/US-5411
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+365224@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 2019-05-03 13:44:52 +0000
3+++ bin/addons/msf_profile/i18n/fr_MF.po 2019-05-10 14:20:53 +0000
4@@ -10654,9 +10654,10 @@
5 msgid "Mission Report"
6 msgstr "Mission - Rapport"
7
8-#. modules: msf_outgoing, consumption_calculation
9+#. modules: msf_outgoing, consumption_calculation, order_types
10 #: view:expiry.quantity.report:0
11 #: report:packing.list:0
12+#: report:order.type.donation.certificate:0
13 msgid "Exp. Date"
14 msgstr "Date Exp."
15
16@@ -14382,10 +14383,11 @@
17 msgid "Account ID"
18 msgstr "Account ID"
19
20-#. module: msf_outgoing
21+#. module: msf_outgoing, order_types
22 #: report:packing.list:0
23+#: report:order.type.donation.certificate:0
24 msgid "Total Qty."
25-msgstr "Total Qty."
26+msgstr "Qté. Totale"
27
28 #. module: base
29 #: view:ir.translation:0
30@@ -19289,13 +19291,14 @@
31 msgid "Current synchronization has been aborted because there is update(s) to install. The sync will be restarted after update."
32 msgstr "Current synchronization has been aborted because there is update(s) to install. The sync will be restarted after update."
33
34-#. modules: msf_field_access_rights, financing_contract, register_accounting, stock_override
35+#. modules: msf_field_access_rights, financing_contract, register_accounting, stock_override, order_types
36 #: view:financing.contract.contract:0
37 #: view:msf_field_access_rights.field_access_rule:0
38 #: view:account.bank.statement:0
39 #: field:account.bank.statement,comments:0
40 #: field:account.bank.statement,notes:0
41 #: report:delivery.order:0
42+#: report:order.type.donation.certificate:0
43 msgid "Comments"
44 msgstr "Commentaires"
45
46@@ -20566,7 +20569,7 @@
47 msgid "Burundi"
48 msgstr "Burundi"
49
50-#. modules: purchase_override, sale
51+#. modules: purchase_override, sale, order_types
52 #: report:msf.purchase.order:0
53 #: report:msf.purchase.quotation:0
54 #: report:purchase.order.merged:0
55@@ -20574,8 +20577,9 @@
56 #: report:msf.product_list:0
57 #: report:msf.report_reception_in:0
58 #: report:msf.sale.order:0
59+#: report:order.type.donation.certificate:0
60 msgid "Name :"
61-msgstr "Nom: "
62+msgstr "Nom :"
63
64 #. module: analytic_distribution
65 #: field:analytic.distribution.wizard,entry_mode:0
66@@ -38836,7 +38840,7 @@
67 msgid "Male"
68 msgstr "Masculin"
69
70-#. modules: stock, account, sale, finance, purchase_followup, msf_homere_interface, procurement_request, specific_rules
71+#. modules: stock, account, sale, finance, purchase_followup, msf_homere_interface, procurement_request, specific_rules, order_types
72 #: report:hr.payment.order.report:0
73 #: field:cash.request.expense,currency_id:0
74 #: view:cash.request.liquidity.bank:0
75@@ -38854,6 +38858,7 @@
76 #: report:addons/specific_rules/report/report_stock_inventory_xls.mako:204
77 #: report:addons/stock/report/stock_reception_report_xls.mako:243
78 #: report:addons/stock/report/stock_expired_damaged_report_xls.mako:225
79+#: report:order.type.donation.certificate:0
80 msgid "Currency"
81 msgstr "Devise"
82
83@@ -46380,7 +46385,7 @@
84 msgid "Exclude journal selection"
85 msgstr "Exclure la sélection de journaux"
86
87-#. modules: msf_outgoing, stock_move_tracking, stock_override, consumption_calculation, specific_rules, msf_supply_doc_export, msf_doc_import, procurement_report, stock
88+#. modules: msf_outgoing, stock_move_tracking, stock_override, consumption_calculation, specific_rules, msf_supply_doc_export, msf_doc_import, procurement_report, stock, order_types
89 #: view:expiry.quantity.report:0
90 #: field:expiry.quantity.report.line,batch_number:0
91 #: view:product.likely.expire.report.item:0
92@@ -46410,6 +46415,7 @@
93 #: report:addons/stock/report/unreserved_stock_report_xls.mako:124
94 #: report:addons/stock_override/report/report_stock_move_xls.mako:138
95 #: report:addons/specific_rules/report/report_stock_inventory_xls.mako:226
96+#: report:order.type.donation.certificate:0
97 #, python-format
98 msgid "Batch"
99 msgstr "Lot"
100@@ -57850,7 +57856,7 @@
101 msgid "Source Type"
102 msgstr "Source Type"
103
104-#. modules: sale, msf_supply_doc_export, msf_outgoing, purchase_followup, sales_followup
105+#. modules: sale, msf_supply_doc_export, msf_outgoing, purchase_followup, sales_followup, order_types
106 #: report:msf.report_reception_in:0
107 #: report:empty.picking.ticket:0
108 #: report:invoice:0
109@@ -57863,6 +57869,7 @@
110 #: report:addons/sales_followup/report/sale_follow_up_multi_report_xls.mako:284
111 #: report:ir.follow.up.location.report_pdf:0
112 #: report:sales.follow.up.multi.report_pdf:0
113+#: report:order.type.donation.certificate:0
114 msgid "Item"
115 msgstr "Art."
116
117@@ -77664,6 +77671,7 @@
118 #: field:internal.request.import.line,in_cost_price:0
119 #: report:addons/stock/report/stock_reception_report_xls.mako:242
120 #: report:addons/stock/report/stock_expired_damaged_report_xls.mako:224
121+#: report:order.type.donation.certificate:0
122 #, python-format
123 msgid "Unit Price"
124 msgstr "Prix Unitaire"
125@@ -97686,9 +97694,11 @@
126 msgid "New value"
127 msgstr "Nouvelle valeur"
128
129-#. module: product_asset, msf_supply_doc_export
130+#. module: product_asset, msf_supply_doc_export, order_types
131 #: report:product.asset:0
132 #: report:addons/msf_supply_doc_export/report/report_pick_export_xls.mako:95
133+#: report:certificate.free.gift:0
134+#: report:order.type.donation.certificate:0
135 msgid "To:"
136 msgstr "Vers:"
137
138@@ -105519,6 +105529,7 @@
139 msgstr "\n"
140 " Attention: Les lignes suivantes ont des qté ou des montants sur plus de 15 chiffres. Veuillez vérifier la qté et le prix unitaire pour éviter des pertes d'information:\n"
141 " "
142+<<<<<<< TREE
143
144 #. module: msf_homere_interface
145 #: code:addons/msf_homere_interface/wizard/hr_payroll_import.py:580
146@@ -105888,3 +105899,50 @@
147 #: field:product.mass.update,empty_status:0
148 msgid "Set Status as empty"
149 msgstr "Mettre le Statut à vide"
150+=======
151+
152+#. module: order_types
153+#: report:order.type.donation.certificate:0
154+msgid "CERTIFICATE of DONATION"
155+msgstr "CERTIFICAT de DONATION"
156+
157+#. module: order_types
158+#: report:order.type.donation.certificate:0
159+msgid "From:"
160+msgstr "De:"
161+
162+#. module: order_types
163+#: report:order.type.donation.certificate:0
164+msgid "The undersigned parties declare that the following listed items, with an approximate value of"
165+msgstr "Les parties, ci-contre nommées, déclarent que la liste suivante des marchandises, d'une valeur approximative de"
166+
167+#. module: order_types
168+#: report:order.type.donation.certificate:0
169+msgid ", are donated by Médecins Sans Frontières, without any exchange of currency."
170+msgstr ", est donnée par Médecins Sans Frontières à titre gracieux."
171+
172+#. module: order_types
173+#: report:order.type.donation.certificate:0
174+msgid "Médecins Sans Frontières will bear no responsibility with regard to legal claims or claims for damage, injury, disability or death caused by the items donated or their use."
175+msgstr "Au terme de la donation, la responsabilité de Médecins Sans Frontières ne pourra être engagée au titre d'éventuels dommages, blessure, handicap ou mort, causés par les articles donnés ou leur usage."
176+
177+#. module: order_types
178+#: report:order.type.donation.certificate:0
179+msgid "Beneficiary from the donation will assume the responsibility regarding any potential judicial proceedings or claim."
180+msgstr "Le Bénéficiaire de la donation assumera la responsabilité concernant les éventuelles poursuites légales ou réclamations engagées à ce titre."
181+
182+#. module: order_types
183+#: report:order.type.donation.certificate:0
184+msgid "Total Value (currency)"
185+msgstr "Valeur Totale (devise)"
186+
187+#. module: order_types
188+#: report:order.type.donation.certificate:0
189+msgid "Sent by :"
190+msgstr "Envoyé par :"
191+
192+#. module: order_types
193+#: report:order.type.donation.certificate:0
194+msgid "Received by :"
195+msgstr "Reçu par :"
196+>>>>>>> MERGE-SOURCE
197
198=== modified file 'bin/addons/order_types/report/donation_certificate.py'
199--- bin/addons/order_types/report/donation_certificate.py 2011-05-04 16:16:53 +0000
200+++ bin/addons/order_types/report/donation_certificate.py 2019-05-10 14:20:53 +0000
201@@ -24,6 +24,7 @@
202 from report import report_sxw
203 from osv import osv
204 from tools.translate import _
205+import tools
206
207 class donation_certificate(report_sxw.rml_parse):
208
209@@ -31,18 +32,45 @@
210 super(donation_certificate, self).__init__(cr, uid, name, context=context)
211 self.localcontext.update({
212 'time': time,
213- 'get_lines': self._get_lines,
214+ 'getLines': self._get_lines,
215+ 'getTotalValue': self._get_total_value,
216 })
217+
218+ def _get_total_value(self, pick):
219+ '''
220+ Return a message with a calculated price
221+ '''
222+ curr_obj = self.pool.get('res.currency')
223+ tot_value = 0
224+ for move in pick.move_lines:
225+ tot_value += move.product_qty * round(curr_obj.compute(self.cr, self.uid, move.price_currency_id.id,
226+ pick.company_id.currency_id.id, move.price_unit,
227+ round=False, context=self.localcontext), 2)
228+
229+ return tot_value
230
231- def _get_lines(self, pick_id):
232- pick_obj = self.pool.get('stock.picking')
233- pick = pick_obj.browse(self.cr, self.uid, pick_id)
234+ def _get_lines(self, pick):
235+ lines = []
236+ for move in pick.move_lines:
237+ lines.append({
238+ 'item': move.line_number,
239+ 'p_code': move.product_id and move.product_id.default_code or '',
240+ 'p_desc': move.product_id and move.product_id.name or '',
241+ 'qty_and_uom': '%s %s' % (round(move.product_qty, 0), move.product_uom and move.product_uom.name or ''),
242+ 'batch': move.prodlot_id and move.prodlot_id.name or '',
243+ 'exp_date': move.prodlot_id and move.prodlot_id.life_date or move.expired_date or '',
244+ 'currency': move.price_currency_id.name,
245+ 'unit_price': move.price_unit,
246+ 'tot_value': move.product_qty * move.price_unit,
247+ 'comments': move.comment or '',
248+ })
249
250- return pick.move_lines
251-
252+ return lines
253+
254+
255 report_sxw.report_sxw('report.order.type.donation.certificate',
256 'stock.picking',
257 'addons/order_types/report/donation_certificate.rml',
258- parser= donation_certificate)
259+ parser=donation_certificate, header=False)
260
261 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
262\ No newline at end of file
263
264=== modified file 'bin/addons/order_types/report/donation_certificate.rml'
265--- bin/addons/order_types/report/donation_certificate.rml 2011-05-25 14:25:43 +0000
266+++ bin/addons/order_types/report/donation_certificate.rml 2019-05-10 14:20:53 +0000
267@@ -1,128 +1,507 @@
268-<?xml version="1.0"?>
269+<?xml version="1.0" ?>
270 <document filename="test.pdf">
271- <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
272- <pageTemplate id="first">
273- <frame id="first" x1="34.0" y1="28.0" width="530" height="786"/>
274+
275+ <template pageSize="(842.0,595.0)" title="Certificate of Donation" author="Medecins Sans Frontieres" allowSplitting="20">
276+ <pageTemplate id="first">
277+ <frame id="first" x1="30.0" y1="10.0" width="772" height="510" />
278+
279+ <pageGraphics>
280+ <drawString x="35" y="560.0">CERTIFICATE of DONATION</drawString>
281+ <fill color="blue"/>
282+ <drawString x="35" y="540.0">[[ '%s' % (objects[0].name) ]]</drawString>
283+ <image x="700" y="530.0" height="53.3" width="100">[[ company.logo or removeParentNode('image') ]]</image>
284+ <setFont name="Helvetica" size="8"/>
285+ <fill color="black"/>
286+ <drawString x="35.0" y="523.0">Page : <pageNumber /> / </drawString>
287+ <drawString x="77.0" y="523.0"><pageCount /></drawString>
288+ </pageGraphics>
289+
290 </pageTemplate>
291- </template>
292- <stylesheet>
293- <blockTableStyle id="Standard_Outline">
294- <blockAlignment value="LEFT"/>
295- <blockValign value="TOP"/>
296- </blockTableStyle>
297- <blockTableStyle id="Table1">
298- <blockAlignment value="LEFT"/>
299- <blockValign value="TOP"/>
300- <lineStyle kind="GRID" colorName="#000000" />
301- </blockTableStyle>
302- <initialize>
303- <paraStyle name="all" alignment="justify"/>
304- </initialize>
305- <paraStyle name="P1" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="24.0" leading="29" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
306- <paraStyle name="P2" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
307- <paraStyle name="P3" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
308- <paraStyle name="P4" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
309- <paraStyle name="P5" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
310- <paraStyle name="P6" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
311- <paraStyle name="P7" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
312- <paraStyle name="P8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
313- <paraStyle name="Standard" fontName="Helvetica"/>
314- <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
315- <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
316- <paraStyle name="Table Contents" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
317- <paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
318- <paraStyle name="Caption" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/>
319- <paraStyle name="Index" fontName="Helvetica"/>
320- <paraStyle name="Heading" fontName="Helvetica" fontSize="15.0" leading="19" spaceBefore="12.0" spaceAfter="6.0"/>
321- <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
322- <paraStyle name="terp_default_8" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
323- <paraStyle name="Footer" fontName="Helvetica"/>
324- <paraStyle name="Horizontal Line" fontName="Helvetica" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
325- <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
326- <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
327- <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
328- <paraStyle name="terp_default_Bold_8" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
329- <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
330- <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
331- <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
332- <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
333- <paraStyle name="terp_default_Right_8" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
334- <paraStyle name="terp_default_Centre_8" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
335- <paraStyle name="terp_header_Right" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
336- <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/>
337- <paraStyle name="terp_default_address" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
338- <paraStyle name="terp_default_9" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
339- <paraStyle name="terp_default_Bold_9" rightIndent="0.0" leftIndent="-3.0" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
340- <paraStyle name="terp_default_Centre_9" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
341- <paraStyle name="terp_default_Right_9" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
342- <paraStyle name="terp_default_Bold_Right_9" rightIndent="0.0" leftIndent="-3.0" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
343- <paraStyle name="terp_default_2" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
344- <paraStyle name="terp_default_White_2" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0" textColor="#ffffff"/>
345- <paraStyle name="terp_default_Note" rightIndent="0.0" leftIndent="9.0" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
346- <paraStyle name="Table" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/>
347- <paraStyle name="User Index 10" rightIndent="0.0" leftIndent="127.0" fontName="Helvetica"/>
348- <paraStyle name="Preformatted Text" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="0.0"/>
349- <images/>
350- </stylesheet>
351- <story>
352- <para style="terp_default_8">[[ repeatIn(objects,'o') ]]</para>
353- <para style="terp_default_8">[[ setLang(o.partner_id.lang) ]]</para>
354- <para style="terp_default_8">
355- <font color="white"> </font>
356- </para>
357- <para style="P1">Donation Certificate</para>
358- <para style="P1">
359- <font color="white"> </font>
360- </para>
361- <para style="P2">Date : [[ formatLang(time.strftime('%Y-%m-%d'), date=True) ]]</para>
362- <para style="P2">From : [[ o.company_id.name ]]</para>
363- <para style="P2">To : [[ o.address_id and o.address_id.partner_id.name or '' ]]</para>
364- <para style="P2">
365- <font color="white"> </font>
366- </para>
367- <para style="P2">
368- <font color="white"> </font>
369- </para>
370- <para style="P2">Products : </para>
371- <blockTable colWidths="161.0,61.0,103.0,103.0,103.0" style="Table1">
372- <tr>
373- <td>
374- <para style="P6">Product</para>
375- </td>
376- <td>
377- <para style="P6">Qty</para>
378- </td>
379- <td>
380- <para style="P6">Batch number</para>
381- </td>
382- <td>
383- <para style="P6">Expiry date</para>
384- </td>
385- <td>
386- <para style="P6">Valuation</para>
387- </td>
388- </tr>
389- <tr>
390- <td>
391- <para style="P3">[[ repeatIn(data['form'], 'm') ]] [[ '[%s]' %m['product_code'] ]] [[ m['product_name'] ]]</para>
392- </td>
393- <td>
394- <para style="P5">[[ m['product_qty'] ]] [[ m['product_uom'] ]]</para>
395- </td>
396- <td>
397- <para style="P4">[[ m['prodlot_name'] ]]</para>
398- </td>
399- <td>
400- <para style="P4">[[ m['life_date'] and formatLang(m['life_date'][:10],date=True) or '' ]]</para>
401- </td>
402- <td>
403- <para style="P4">[[ m['valuation'] ]]</para>
404- </td>
405- </tr>
406- </blockTable>
407- <para style="P2">
408- <font color="white"> </font>
409- </para>
410- </story>
411+ </template>
412+
413+ <stylesheet>
414+
415+ <!-- BlockTables -->
416+ <blockTableStyle id="OrderInformations">
417+ <blockAlignment value="LEFT" />
418+ <blockValign value="TOP" />
419+ <lineStyle kind="OUTLINE" colorName="black" start="2,0" stop="2,-1" thickness="0.5" />
420+ <lineStyle kind="OUTLINE" colorName="black" start="4,0" stop="4,-1" thickness="0.5" />
421+ <blockSpan start="6,0" stop="6,7"/>
422+ </blockTableStyle>
423+ <blockTableStyle id="ItemsLineHeader">
424+ <blockAlignment value="LEFT" />
425+ <blockValign value="MIDDLE" />
426+ <lineStyle kind="LINEBELOW" colorName="black" start="0,0" stop="-1,0" />
427+ <lineStyle kind="LINEBELOW" colorName="#c0c0c0" start="0,1" stop="-1,-1" />
428+ <lineStyle kind="LINEABOVE" colorName="black" start="0,0" stop="-1,0" />
429+ </blockTableStyle>
430+ <blockTableStyle id="OrderInformationsFin2">
431+ <blockAlignment value="CENTER" />
432+ <blockVAlign value="MIDDLE" />
433+ <lineStyle kind="GRID" colorName="black" start="2,0" stop="3,6" thickness="0.5" />
434+ </blockTableStyle>
435+ <blockTableStyle id="OrderInformationsFin2_2">
436+ <blockAlignment value="CENTER" />
437+ <blockVAlign value="MIDDLE" />
438+ <lineStyle kind="LINEBEFORE" colorName="black" thickness="0.5" start="1,-1" stop="3,-1"/>
439+ <lineStyle kind="LINEAFTER" colorName="black" thickness="0.5" start="1,-1" stop="3,-1"/>
440+ <lineStyle kind="LINEABOVE" colorName="black" thickness="0.5" start="1,-1" stop="3,-1"/>
441+ </blockTableStyle>
442+ <blockTableStyle id="OrderInformationsFin2_3">
443+ <blockAlignment value="CENTER" />
444+ <blockVAlign value="MIDDLE" />
445+ <lineStyle kind="LINEBEFORE" colorName="black" thickness="0.5" start="1,-1" stop="3,-1" />
446+ <lineStyle kind="LINEAFTER" colorName="black" thickness="0.5" start="1,-1" stop="3,-1"/>
447+ <lineStyle kind="LINEBELOW" colorName="black" thickness="0.5" start="1,-1" stop="3,-1" />
448+ </blockTableStyle>
449+
450+
451+ <initialize>
452+ <paraStyle name="all" alignment="justify"/>
453+ </initialize>
454+
455+ <paraStyle name="Standard" fontName="Helvetica" fontSize="8.0" />
456+
457+ <!-- Information font style -->
458+ <paraStyle name="TextInformation" fontName="Helvetica" fontSize="8.0" alignment="LEFT" leading="8.0" spaceBefore="1.0" spaceAfter="1.0" />
459+ <paraStyle name="TextInformationHeight" fontName="Helvetica" fontSize="8.0" alignment="LEFT" leading="16.0" spaceBefore="1.0" spaceAfter="1.0" />
460+ <paraStyle name="TextInformationWarning" fontName="Helvetica" fontSize="9.0" alignment="LEFT" leading="11.0" spaceBefore="1.0" spaceAfter="2.0" />
461+
462+ <!-- Lines font style -->
463+ <paraStyle name="ItemsLineTitle" fontName="Helvetica-Oblique" fontSize="7.0" leading="7.0" />
464+ <paraStyle name="ItemsLineValue" fontName="Helvetica" fontSize="7.0" leading="7.0" textColor="blue" />
465+ <paraStyle name="ItemsLineValueRight" fontName="Helvetica" fontSize="7.0" leading="7.0" textColor="blue" alignment="right" />
466+ </stylesheet>
467+
468+ <story>
469+ <para style="Standard">[[ repeatIn(objects,'o') ]]</para>
470+ <para style="Standard">
471+ <font color="white"> </font>
472+ </para>
473+
474+ <blockTable colWidths="772.0" style="OrderInformations">
475+ <tr>
476+ <td>
477+ <para style="TextInformation">Date: <font color="blue">[[ formatLang(time.strftime('%Y-%m-%d'), date=True) ]]</font></para>
478+ </td>
479+ </tr>
480+ </blockTable>
481+ <blockTable colWidths="120.5,5.5,160.0,5.5,160.0,11.0,309.5" style="OrderInformations">
482+ <tr>
483+ <td>
484+ <para style="TextInformation"> </para>
485+ </td>
486+ <td>
487+ <para style="TextInformation"> </para>
488+ </td>
489+ <td>
490+ <para style="TextInformation"><u>From:</u></para>
491+ </td>
492+ <td>
493+ <para style="TextInformation"> </para>
494+ </td>
495+ <td>
496+ <para style="TextInformation"><u>To:</u></para>
497+ </td>
498+ <td>
499+ <para style="TextInformation"> </para>
500+ </td>
501+ <td>
502+ <para style="TextInformationWarning">
503+ <section>
504+ The undersigned parties declare that the following listed items, with an approximate value of
505+ </section>
506+ <b>[[ '%s' % (getTotalValue(o) or 0) ]]</b> [[ '%s' % (o.company_id.currency_id.currency_name) ]]
507+ <section>
508+ , are donated by Médecins Sans Frontières, without any exchange of currency.
509+ </section>
510+ </para>
511+ <para style="TextInformationWarning">
512+ Médecins Sans Frontières will bear no responsibility with regard to legal claims or claims for damage, injury, disability or death caused by the items donated or their use.
513+ </para>
514+ <para style="TextInformationWarning">
515+ Beneficiary from the donation will assume the responsibility regarding any potential judicial proceedings or claim.
516+ </para>
517+ </td>
518+ </tr>
519+ <tr>
520+ <td>
521+ <para style="TextInformation"> </para>
522+ </td>
523+ <td>
524+ <para style="TextInformation"> </para>
525+ </td>
526+ <td>
527+ <para style="TextInformation">[[ o.company_id.name ]]</para>
528+ </td>
529+ <td>
530+ <para style="TextInformation"> </para>
531+ </td>
532+ <td>
533+ <para style="TextInformation">[[ o.address_id and o.address_id.partner_id.name or '' ]]</para>
534+ </td>
535+ <td>
536+ <para style="TextInformation"> </para>
537+ </td>
538+ <td>
539+ <para style="TextInformation"> </para>
540+ </td>
541+ </tr>
542+ <tr>
543+ <td>
544+ <para style="TextInformation"> </para>
545+ </td>
546+ <td>
547+ <para style="TextInformation"> </para>
548+ </td>
549+ <td>
550+ <para style="TextInformation">[[ o.company_id.partner_id.address and o.company_id.partner_id.address[0].street or '' ]]</para>
551+ </td>
552+ <td>
553+ <para style="TextInformation"> </para>
554+ </td>
555+ <td>
556+ <para style="TextInformation">[[ o.address_id and o.address_id.street or '' ]]</para>
557+ </td>
558+ <td>
559+ <para style="TextInformation"> </para>
560+ </td>
561+ <td>
562+ <para style="TextInformation"> </para>
563+ </td>
564+ </tr>
565+ <tr>
566+ <td>
567+ <para style="TextInformation"> </para>
568+ </td>
569+ <td>
570+ <para style="TextInformation"> </para>
571+ </td>
572+ <td>
573+ <para style="TextInformation">[[ o.company_id.partner_id.address and o.company_id.partner_id.address[0].street2 or '' ]]</para>
574+ </td>
575+ <td>
576+ <para style="TextInformation"> </para>
577+ </td>
578+ <td>
579+ <para style="TextInformation">[[ o.address_id and o.address_id.street2 or '' ]]</para>
580+ </td>
581+ <td>
582+ <para style="TextInformation"> </para>
583+ </td>
584+ <td>
585+ <para style="TextInformation"> </para>
586+ </td>
587+ </tr>
588+ <tr>
589+ <td>
590+ <para style="TextInformation"> </para>
591+ </td>
592+ <td>
593+ <para style="TextInformation"> </para>
594+ </td>
595+ <td>
596+ <para style="TextInformation">[[ o.company_id.partner_id.address and o.company_id.partner_id.address[0].zip or '' ]]</para>
597+ </td>
598+ <td>
599+ <para style="TextInformation"> </para>
600+ </td>
601+ <td>
602+ <para style="TextInformation">[[ o.address_id and o.address_id.zip or '' ]]</para>
603+ </td>
604+ <td>
605+ <para style="TextInformation"> </para>
606+ </td>
607+ <td>
608+ <para style="TextInformation"> </para>
609+ </td>
610+ </tr>
611+ <tr>
612+ <td>
613+ <para style="TextInformation"> </para>
614+ </td>
615+ <td>
616+ <para style="TextInformation"> </para>
617+ </td>
618+ <td>
619+ <para style="TextInformation">[[ o.company_id.partner_id.address and o.company_id.partner_id.address[0].city or '' ]]</para>
620+ </td>
621+ <td>
622+ <para style="TextInformation"> </para>
623+ </td>
624+ <td>
625+ <para style="TextInformation">[[ o.address_id and o.address_id.city or '' ]]</para>
626+ </td>
627+ <td>
628+ <para style="TextInformation"> </para>
629+ </td>
630+ <td>
631+ <para style="TextInformation"> </para>
632+ </td>
633+ </tr>
634+ <tr>
635+ <td>
636+ <para style="TextInformation"> </para>
637+ </td>
638+ <td>
639+ <para style="TextInformation"> </para>
640+ </td>
641+ <td>
642+ <para style="TextInformationHeight">[[ o.company_id.partner_id.address and o.company_id.partner_id.address[0].country_id and o.company_id.partner_id.address[0].country_id.name or '' ]]</para>
643+ </td>
644+ <td>
645+ <para style="TextInformation"> </para>
646+ </td>
647+ <td>
648+ <para style="TextInformationHeight">[[ o.address_id and o.address_id.country_id and o.address_id.country_id.name or '' ]]</para>
649+ </td>
650+ <td>
651+ <para style="TextInformation"> </para>
652+ </td>
653+ <td>
654+ <para style="TextInformation"> </para>
655+ </td>
656+ </tr>
657+ <tr>
658+ <td>
659+ <para style="TextInformation"> </para>
660+ </td>
661+ <td>
662+ <para style="TextInformation"> </para>
663+ </td>
664+ <td>
665+ <para style="TextInformationHeight">[[ o.company_id.partner_id.address and o.company_id.partner_id.address[0].phone or '' ]]</para>
666+ </td>
667+ <td>
668+ <para style="TextInformation"> </para>
669+ </td>
670+ <td>
671+ <para style="TextInformationHeight">[[ o.address_id and o.address_id.phone or '' ]]</para>
672+ </td>
673+ <td>
674+ <para style="TextInformation"> </para>
675+ </td>
676+ <td>
677+ <para style="TextInformation"> </para>
678+ </td>
679+ </tr>
680+ </blockTable>
681+
682+ <para style="Standard">
683+ <font color="white"> </font>
684+ </para>
685+
686+ <blockTable colWidths="32.0,80.0,200.0,60.0,60.0,50.0,40.0,40.0,60.0,160.0" repeatRows="1" style="ItemsLineHeader">
687+ <tr>
688+ <td>
689+ <para style="ItemsLineTitle">Item</para>
690+ </td>
691+ <td>
692+ <para style="ItemsLineTitle">Code</para>
693+ </td>
694+ <td>
695+ <para style="ItemsLineTitle">Description</para>
696+ </td>
697+ <td>
698+ <para style="ItemsLineTitle">Total Qty.</para>
699+ </td>
700+ <td>
701+ <para style="ItemsLineTitle">Batch</para>
702+ </td>
703+ <td>
704+ <para style="ItemsLineTitle">Exp. Date</para>
705+ </td>
706+ <td>
707+ <para style="ItemsLineTitle">Currency</para>
708+ </td>
709+ <td>
710+ <para style="ItemsLineTitle">Unit Price</para>
711+ </td>
712+ <td>
713+ <para style="ItemsLineTitle">Total Value (currency)</para>
714+ </td>
715+ <td>
716+ <para style="ItemsLineTitle">Comments</para>
717+ </td>
718+ </tr>
719+ <tr>
720+ [[ repeatIn(getLines(o), 'line') ]]
721+ <td>
722+ <para style="ItemsLineValue">[[ line['item'] ]]</para>
723+ </td>
724+ <td>
725+ <para style="ItemsLineValue">[[ line['p_code'] ]]</para>
726+ </td>
727+ <td>
728+ <para style="ItemsLineValue">[[ line['p_desc'] ]]</para>
729+ </td>
730+ <td>
731+ <para style="ItemsLineValue">[[ line['qty_and_uom'] ]]</para>
732+ </td>
733+ <td>
734+ <para style="ItemsLineValue">[[ line['batch'] ]]</para>
735+ </td>
736+ <td>
737+ <para style="ItemsLineValue">[[ line['exp_date'] and formatLang(line['exp_date'], date=True) or '' ]]</para>
738+ </td>
739+ <td>
740+ <para style="ItemsLineValue">[[ line['currency'] ]]</para>
741+ </td>
742+ <td>
743+ <para style="ItemsLineValueRight">[[ line['unit_price'] ]]</para>
744+ </td>
745+ <td>
746+ <para style="ItemsLineValueRight">[[ line['tot_value'] ]]</para>
747+ </td>
748+ <td>
749+ <para style="ItemsLineValue">[[ line['comments'] ]]</para>
750+ </td>
751+ </tr>
752+ </blockTable>
753+
754+ <para style="Standard">
755+ <font color="white"> </font>
756+ </para>
757+ <para style="Standard">
758+ <font color="white"> </font>
759+ </para>
760+
761+ <blockTable colWidths="175,150,150,150,175" style="OrderInformationsFin2" keepWithNext="1">
762+ <tr>
763+ <td>
764+ <para style="TextInformation" alignment="LEFT"></para>
765+ </td>
766+ <td>
767+ <para style="TextInformation" alignment="LEFT"></para>
768+ </td>
769+ <td>
770+ <para style="TextInformation" alignment="LEFT">Sent by :</para>
771+ </td>
772+ <td>
773+ <para style="TextInformation" alignment="LEFT">Received by :</para>
774+ </td>
775+ <td>
776+ <para style="TextInformation" alignment="LEFT"></para>
777+ </td>
778+ </tr>
779+ </blockTable>
780+ <blockTable colWidths="175,150,150,150,175" style="OrderInformationsFin2_2" keepWithNext="1">
781+ <tr>
782+ <td>
783+ <para style="TextInformation" alignment="LEFT"></para>
784+ </td>
785+ <td>
786+ <para style="TextInformation" alignment="LEFT">Name :</para>
787+ </td>
788+ <td>
789+ <para style="TextInformation" alignment="LEFT"></para>
790+ </td>
791+ <td>
792+ <para style="TextInformation" alignment="LEFT"></para>
793+ </td>
794+ <td>
795+ <para style="TextInformation" alignment="LEFT"></para>
796+ </td>
797+ </tr>
798+ </blockTable>
799+ <blockTable colWidths="175,150,150,150,175" style="OrderInformationsFin2_3" keepWithNext="1">
800+ <tr>
801+ <td>
802+ <para style="TextInformation" alignment="LEFT"></para>
803+ </td>
804+ <td>
805+ <para style="TextInformation" alignment="LEFT"></para>
806+ </td>
807+ <td>
808+ <para style="TextInformation" alignment="LEFT"></para>
809+ </td>
810+ <td>
811+ <para style="TextInformation" alignment="LEFT"></para>
812+ </td>
813+ <td>
814+ <para style="TextInformation" alignment="LEFT"></para>
815+ </td>
816+ </tr>
817+ </blockTable>
818+ <blockTable colWidths="175,150,150,150,175" style="OrderInformationsFin2_2" keepWithNext="1">
819+ <tr>
820+ <td>
821+ <para style="TextInformation" alignment="LEFT"></para>
822+ </td>
823+ <td>
824+ <para style="TextInformation" alignment="LEFT">Date :</para>
825+ </td>
826+ <td>
827+ <para style="TextInformation" alignment="LEFT"></para>
828+ </td>
829+ <td>
830+ <para style="TextInformation" alignment="LEFT"></para>
831+ </td>
832+ <td>
833+ <para style="TextInformation" alignment="LEFT"></para>
834+ </td>
835+ </tr>
836+ </blockTable>
837+ <blockTable colWidths="175,150,150,150,175" style="OrderInformationsFin2_3" keepWithNext="1">
838+ <tr>
839+ <td>
840+ <para style="TextInformation" alignment="LEFT"></para>
841+ </td>
842+ <td>
843+ <para style="TextInformation" alignment="LEFT"></para>
844+ </td>
845+ <td>
846+ <para style="TextInformation" alignment="LEFT"></para>
847+ </td>
848+ <td>
849+ <para style="TextInformation" alignment="LEFT"></para>
850+ </td>
851+ <td>
852+ <para style="TextInformation" alignment="LEFT"></para>
853+ </td>
854+ </tr>
855+ </blockTable>
856+ <blockTable colWidths="175,150,150,150,175" style="OrderInformationsFin2_2" keepWithNext="1">
857+ <tr>
858+ <td>
859+ <para style="TextInformation" alignment="LEFT"></para>
860+ </td>
861+ <td>
862+ <para style="TextInformation" alignment="LEFT">Signature :</para>
863+ </td>
864+ <td>
865+ <para style="TextInformation" alignment="LEFT"></para>
866+ </td>
867+ <td>
868+ <para style="TextInformation" alignment="LEFT"></para>
869+ </td>
870+ <td>
871+ <para style="TextInformation" alignment="LEFT"></para>
872+ </td>
873+ </tr>
874+ </blockTable>
875+ <blockTable colWidths="175,150,150,150,175" style="OrderInformationsFin2_3" keepWithNext="1">
876+ <tr>
877+ <td>
878+ <para style="TextInformation" alignment="LEFT"></para>
879+ </td>
880+ <td>
881+ <para style="TextInformation" alignment="LEFT"></para>
882+ </td>
883+ <td>
884+ <para style="TextInformation" alignment="LEFT"></para>
885+ </td>
886+ <td>
887+ <para style="TextInformation" alignment="LEFT"></para>
888+ </td>
889+ <td>
890+ <para style="TextInformation" alignment="LEFT"></para>
891+ </td>
892+ </tr>
893+ </blockTable>
894+
895+ </story>
896+
897 </document>
898

Subscribers

People subscribed via source and target branches