Stock and Logistic - Reports

Merge lp:~camptocamp/stock-logistic-report/7.0-stock_picking_webkit-translate into lp:stock-logistic-report

  1. 7.0-stock_picking_webkit-translate
  2. Merge into 7.0
Proposed by Guewen Baconnier @ Camptocamp
Status: Merged
Approved by: Yannick Vaucher @ Camptocamp
Approved revision: 7
Merged at revision: 8
Proposed branch: lp:~camptocamp/stock-logistic-report/7.0-stock_picking_webkit-translate
Merge into: lp:stock-logistic-report
Diff against target: 373 lines (+315/-7)
5 files modified
stock_picking_webkit/i18n/fr.po (+154/-0)
stock_picking_webkit/i18n/stock_picking_webkit.pot (+154/-0)
stock_picking_webkit/report.xml (+1/-1)
stock_picking_webkit/report/delivery.html.mako (+3/-3)
stock_picking_webkit/report/picking.html.mako (+3/-3)
To merge this branch: bzr merge lp:~camptocamp/stock-logistic-report/7.0-stock_picking_webkit-translate
Reviewer Review Type Date Requested Status
Pedro Manuel Baeza Needs Fixing
Yannick Vaucher @ Camptocamp code review, no tests Approve
Leonardo Pistone code review Approve
Review via email: mp+199955@code.launchpad.net

Description of the change

French translation and pot for stock_picking_webkit

To post a comment you must log in.
Revision history for this message
Leonardo Pistone (lepistone) wrote :

LGTM, thanks

review: Approve (code review)
Revision history for this message
Yannick Vaucher @ Camptocamp (yvaucher-c2c) wrote :

LGTM, thanks

review: Approve (code review, no tests)
Revision history for this message
Pedro Manuel Baeza (pedro.baeza) wrote :

When I try to import template file, it says:

PO file: duplicate msgid ending on line 93

So the translation file is useless.

What do you want me to do: fix problem directly overwriting revision or make another MP?

Regards.

review: Needs Fixing
Revision history for this message
Guewen Baconnier @ Camptocamp (gbaconnier-c2c) wrote :

I don't get what the problem is.

I just tried to import the fr.po translation in OpenERP:

2014-03-12 14:36:00,310 30448 INFO openerp openerp.tools.translate: loading translation file for language fr_FR
2014-03-12 14:36:00,353 30448 INFO openerp openerp.tools.translate: translation file loaded succesfully

I tried to import the pot file in en_US and it worked too.

And I don't see any duplication of the line 93.

Where did you imported the file? In Launchpad?

Revision history for this message
Pedro Manuel Baeza (pedro.baeza) wrote :

Import was done in Launchpad:

https://translations.launchpad.net/stock-logistic-report/+imports

for the pot file.

Alexandre Fayolle has tried to approve them, but it's not working. I'm thinking that I can import via Rosetta corrected file, so I'm going to do it.

Regards.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== added directory 'stock_picking_webkit/i18n'
=== added file 'stock_picking_webkit/i18n/fr.po'
--- stock_picking_webkit/i18n/fr.po 1970-01-01 00:00:00 +0000
+++ stock_picking_webkit/i18n/fr.po 2013-12-23 14:30:38 +0000
@@ -0,0 +1,154 @@
1# Translation of OpenERP Server.
2# This file contains the translation of the following modules:
3# * stock_picking_webkit
4#
5msgid ""
6msgstr ""
7"Project-Id-Version: OpenERP Server 7.0\n"
8"Report-Msgid-Bugs-To: \n"
9"POT-Creation-Date: 2013-12-23 14:12+0000\n"
10"PO-Revision-Date: 2013-12-23 14:12+0000\n"
11"Last-Translator: <>\n"
12"Language-Team: \n"
13"MIME-Version: 1.0\n"
14"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Transfer-Encoding: \n"
16"Plural-Forms: \n"
17
18#. module: stock_picking_webkit
19#: report:addons/stock_picking_webkit/report/delivery.html.mako:24
20#: report:addons/stock_picking_webkit/report/picking.html.mako:25
21msgid "Origin"
22msgstr "Origine"
23
24#. module: stock_picking_webkit
25#: model:ir.actions.report.xml,name:stock_picking_webkit.webkit_aggregated_delivery
26msgid "Aggregated deliveries"
27msgstr "Livraisons groupées"
28
29#. module: stock_picking_webkit
30#: report:addons/stock_picking_webkit/report/delivery_slip.mako:50
31msgid "Delivery Order"
32msgstr "Bon de livraison"
33
34#. module: stock_picking_webkit
35#: report:addons/stock_picking_webkit/report/delivery_slip.mako:59
36msgid "Incoterm"
37msgstr "Incoterm"
38
39#. module: stock_picking_webkit
40#: report:addons/stock_picking_webkit/report/delivery.html.mako:22
41#: report:addons/stock_picking_webkit/report/delivery.html.mako:42
42#: report:addons/stock_picking_webkit/report/picking.html.mako:23
43msgid "Product"
44msgstr "Produit"
45
46#. module: stock_picking_webkit
47#: report:addons/stock_picking_webkit/report/delivery_slip.mako:74
48msgid "Description"
49msgstr "Description"
50
51#. module: stock_picking_webkit
52#: report:addons/stock_picking_webkit/report/delivery_slip.mako:58
53msgid "Delivery Method"
54msgstr "Méthode de livraison"
55
56#. module: stock_picking_webkit
57#: report:addons/stock_picking_webkit/report/delivery.html.mako:14
58#: report:addons/stock_picking_webkit/report/picking.html.mako:14
59msgid "Company"
60msgstr "Société"
61
62#. module: stock_picking_webkit
63#: report:addons/stock_picking_webkit/report/delivery.html.mako:23
64#: report:addons/stock_picking_webkit/report/delivery.html.mako:43
65#: report:addons/stock_picking_webkit/report/picking.html.mako:24
66msgid "Qty"
67msgstr "Qté"
68
69#. module: stock_picking_webkit
70#: report:addons/stock_picking_webkit/report/delivery.html.mako:21
71#: report:addons/stock_picking_webkit/report/delivery.html.mako:41
72#: report:addons/stock_picking_webkit/report/picking.html.mako:21
73msgid "Product Code"
74msgstr "Référence"
75
76#. module: stock_picking_webkit
77#: report:addons/stock_picking_webkit/report/delivery_slip.mako:75
78msgid "Serial Number"
79msgstr "N° de série"
80
81#. module: stock_picking_webkit
82#: report:addons/stock_picking_webkit/report/delivery.html.mako:11
83#: report:addons/stock_picking_webkit/report/picking.html.mako:11
84msgid "Visa"
85msgstr "Visa"
86
87#. module: stock_picking_webkit
88#: report:addons/stock_picking_webkit/report/delivery.html.mako:10
89#: report:addons/stock_picking_webkit/report/picking.html.mako:10
90msgid "Date"
91msgstr "Date"
92
93#. module: stock_picking_webkit
94#: report:addons/stock_picking_webkit/report/picking.html.mako:22
95msgid "Delivery Order"
96msgstr "Bon de livraison"
97
98#. module: stock_picking_webkit
99#: report:addons/stock_picking_webkit/report/delivery_slip.mako:56
100msgid "Scheduled Date"
101msgstr "Date de livraison"
102
103#. module: stock_picking_webkit
104#: view:stock.picking.out:0
105msgid "440"
106msgstr ""
107
108#. module: stock_picking_webkit
109#: report:addons/stock_picking_webkit/report/delivery_slip.mako:37
110msgid "Invoice address:"
111msgstr "Adresse de facturation :"
112
113#. module: stock_picking_webkit
114#: report:addons/stock_picking_webkit/report/delivery_slip.mako:54
115msgid "Contact"
116msgstr "Contact"
117
118#. module: stock_picking_webkit
119#: report:addons/stock_picking_webkit/report/delivery.html.mako:39
120msgid "Products Summary"
121msgstr "Résumé des produits"
122
123#. module: stock_picking_webkit
124#: report:addons/stock_picking_webkit/report/delivery_slip.mako:76
125msgid "Quantity"
126msgstr "Quantité"
127
128#. module: stock_picking_webkit
129#: report:addons/stock_picking_webkit/report/delivery_slip.mako:55
130msgid "Origin"
131msgstr "Origine"
132
133#. module: stock_picking_webkit
134#: report:addons/stock_picking_webkit/report/delivery_slip.mako:57
135msgid "Weight"
136msgstr "Poids"
137
138#. module: stock_picking_webkit
139#: report:addons/stock_picking_webkit/report/delivery.html.mako:11
140#: report:addons/stock_picking_webkit/report/picking.html.mako:11
141msgid "Done by"
142msgstr "Préparé par"
143
144#. module: stock_picking_webkit
145#: report:addons/stock_picking_webkit/report/delivery.html.mako:25
146#: report:addons/stock_picking_webkit/report/picking.html.mako:26
147msgid "Carrier"
148msgstr "Transporteur"
149
150#. module: stock_picking_webkit
151#: model:ir.actions.report.xml,name:stock_picking_webkit.webkit_aggregated_picking
152msgid "Aggregated pickings"
153msgstr "Bons de livraison groupés"
154
0155
=== added file 'stock_picking_webkit/i18n/stock_picking_webkit.pot'
--- stock_picking_webkit/i18n/stock_picking_webkit.pot 1970-01-01 00:00:00 +0000
+++ stock_picking_webkit/i18n/stock_picking_webkit.pot 2013-12-23 14:30:38 +0000
@@ -0,0 +1,154 @@
1# Translation of OpenERP Server.
2# This file contains the translation of the following modules:
3# * stock_picking_webkit
4#
5msgid ""
6msgstr ""
7"Project-Id-Version: OpenERP Server 7.0\n"
8"Report-Msgid-Bugs-To: \n"
9"POT-Creation-Date: 2013-12-23 14:12+0000\n"
10"PO-Revision-Date: 2013-12-23 14:12+0000\n"
11"Last-Translator: <>\n"
12"Language-Team: \n"
13"MIME-Version: 1.0\n"
14"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Transfer-Encoding: \n"
16"Plural-Forms: \n"
17
18#. module: stock_picking_webkit
19#: report:addons/stock_picking_webkit/report/delivery.html.mako:24
20#: report:addons/stock_picking_webkit/report/picking.html.mako:25
21msgid "Origin"
22msgstr ""
23
24#. module: stock_picking_webkit
25#: model:ir.actions.report.xml,name:stock_picking_webkit.webkit_aggregated_delivery
26msgid "Aggregated deliveries"
27msgstr ""
28
29#. module: stock_picking_webkit
30#: report:addons/stock_picking_webkit/report/delivery_slip.mako:50
31msgid "Delivery Order"
32msgstr ""
33
34#. module: stock_picking_webkit
35#: report:addons/stock_picking_webkit/report/delivery_slip.mako:59
36msgid "Incoterm"
37msgstr ""
38
39#. module: stock_picking_webkit
40#: report:addons/stock_picking_webkit/report/delivery.html.mako:22
41#: report:addons/stock_picking_webkit/report/delivery.html.mako:42
42#: report:addons/stock_picking_webkit/report/picking.html.mako:23
43msgid "Product"
44msgstr ""
45
46#. module: stock_picking_webkit
47#: report:addons/stock_picking_webkit/report/delivery_slip.mako:74
48msgid "Description"
49msgstr ""
50
51#. module: stock_picking_webkit
52#: report:addons/stock_picking_webkit/report/delivery_slip.mako:58
53msgid "Delivery Method"
54msgstr ""
55
56#. module: stock_picking_webkit
57#: report:addons/stock_picking_webkit/report/delivery.html.mako:14
58#: report:addons/stock_picking_webkit/report/picking.html.mako:14
59msgid "Company"
60msgstr ""
61
62#. module: stock_picking_webkit
63#: report:addons/stock_picking_webkit/report/delivery.html.mako:23
64#: report:addons/stock_picking_webkit/report/delivery.html.mako:43
65#: report:addons/stock_picking_webkit/report/picking.html.mako:24
66msgid "Qty"
67msgstr ""
68
69#. module: stock_picking_webkit
70#: report:addons/stock_picking_webkit/report/delivery.html.mako:21
71#: report:addons/stock_picking_webkit/report/delivery.html.mako:41
72#: report:addons/stock_picking_webkit/report/picking.html.mako:21
73msgid "Product Code"
74msgstr ""
75
76#. module: stock_picking_webkit
77#: report:addons/stock_picking_webkit/report/delivery_slip.mako:75
78msgid "Serial Number"
79msgstr ""
80
81#. module: stock_picking_webkit
82#: report:addons/stock_picking_webkit/report/delivery.html.mako:11
83#: report:addons/stock_picking_webkit/report/picking.html.mako:11
84msgid "Visa"
85msgstr ""
86
87#. module: stock_picking_webkit
88#: report:addons/stock_picking_webkit/report/delivery.html.mako:10
89#: report:addons/stock_picking_webkit/report/picking.html.mako:10
90msgid "Date"
91msgstr ""
92
93#. module: stock_picking_webkit
94#: report:addons/stock_picking_webkit/report/picking.html.mako:22
95msgid "Delivery Order"
96msgstr ""
97
98#. module: stock_picking_webkit
99#: report:addons/stock_picking_webkit/report/delivery_slip.mako:56
100msgid "Scheduled Date"
101msgstr ""
102
103#. module: stock_picking_webkit
104#: view:stock.picking.out:0
105msgid "440"
106msgstr ""
107
108#. module: stock_picking_webkit
109#: report:addons/stock_picking_webkit/report/delivery_slip.mako:37
110msgid "Invoice address:"
111msgstr ""
112
113#. module: stock_picking_webkit
114#: report:addons/stock_picking_webkit/report/delivery_slip.mako:54
115msgid "Contact"
116msgstr ""
117
118#. module: stock_picking_webkit
119#: report:addons/stock_picking_webkit/report/delivery.html.mako:39
120msgid "Products Summary"
121msgstr ""
122
123#. module: stock_picking_webkit
124#: report:addons/stock_picking_webkit/report/delivery_slip.mako:76
125msgid "Quantity"
126msgstr ""
127
128#. module: stock_picking_webkit
129#: report:addons/stock_picking_webkit/report/delivery_slip.mako:55
130msgid "Origin"
131msgstr ""
132
133#. module: stock_picking_webkit
134#: report:addons/stock_picking_webkit/report/delivery_slip.mako:57
135msgid "Weight"
136msgstr ""
137
138#. module: stock_picking_webkit
139#: report:addons/stock_picking_webkit/report/delivery.html.mako:11
140#: report:addons/stock_picking_webkit/report/picking.html.mako:11
141msgid "Done by"
142msgstr ""
143
144#. module: stock_picking_webkit
145#: report:addons/stock_picking_webkit/report/delivery.html.mako:25
146#: report:addons/stock_picking_webkit/report/picking.html.mako:26
147msgid "Carrier"
148msgstr ""
149
150#. module: stock_picking_webkit
151#: model:ir.actions.report.xml,name:stock_picking_webkit.webkit_aggregated_picking
152msgid "Aggregated pickings"
153msgstr ""
154
0155
=== modified file 'stock_picking_webkit/report.xml'
--- stock_picking_webkit/report.xml 2013-09-11 13:14:24 +0000
+++ stock_picking_webkit/report.xml 2013-12-23 14:30:38 +0000
@@ -25,7 +25,7 @@
25 auto="False"25 auto="False"
26 model="stock.picking.out"26 model="stock.picking.out"
27 file="stock_picking_webkit/report/delivery_slip.mako"27 file="stock_picking_webkit/report/delivery_slip.mako"
28 string="Delivery Slip"28 string="Delivery Order"
29 report_type="webkit"29 report_type="webkit"
30 header="True"30 header="True"
31 webkit_header="base_headers_webkit.base_reports_portrait_header" />31 webkit_header="base_headers_webkit.base_reports_portrait_header" />
3232
=== modified file 'stock_picking_webkit/report/delivery.html.mako'
--- stock_picking_webkit/report/delivery.html.mako 2013-11-21 15:26:42 +0000
+++ stock_picking_webkit/report/delivery.html.mako 2013-12-23 14:30:38 +0000
@@ -20,8 +20,8 @@
20 <tr align="left">20 <tr align="left">
21 <th>${_('Product Code')}</th>21 <th>${_('Product Code')}</th>
22 <th>${_('Product')}</th>22 <th>${_('Product')}</th>
23 <th>${_('QTY')}</th>23 <th>${_('Qty')}</th>
24 <th>${_('origin')}</th>24 <th>${_('Origin')}</th>
25 <th>${_('Carrier')}</th>25 <th>${_('Carrier')}</th>
26 </tr>26 </tr>
27 %for move in aggr.moves_by_sale_order():27 %for move in aggr.moves_by_sale_order():
@@ -36,7 +36,7 @@
36</table>36</table>
37<br/>37<br/>
38<table style="border:solid 1px" width="100%">38<table style="border:solid 1px" width="100%">
39 <caption><b><u>${_('Products summary')}</u></b></caption>39 <caption><b><u>${_('Products Summary')}</u></b></caption>
40 <tr align="left">40 <tr align="left">
41 <th>${_('Product Code')}</th>41 <th>${_('Product Code')}</th>
42 <th>${_('Product')}</th>42 <th>${_('Product')}</th>
4343
=== modified file 'stock_picking_webkit/report/picking.html.mako'
--- stock_picking_webkit/report/picking.html.mako 2013-11-21 15:26:42 +0000
+++ stock_picking_webkit/report/picking.html.mako 2013-12-23 14:30:38 +0000
@@ -19,10 +19,10 @@
19 <caption><b><u>${aggr.src_stock.name} => ${aggr.dest_stock.name}</u></b></caption>19 <caption><b><u>${aggr.src_stock.name} => ${aggr.dest_stock.name}</u></b></caption>
20 <tr align="left">20 <tr align="left">
21 <th>${_('Product Code')}</th>21 <th>${_('Product Code')}</th>
22 <th>${_('Picking')}</th>22 <th>${_('Delivery Order')}</th>
23 <th>${_('Product')}</th>23 <th>${_('Product')}</th>
24 <th>${_('QTY')}</th>24 <th>${_('Qty')}</th>
25 <th>${_('origin')}</th>25 <th>${_('Origin')}</th>
26 <th>${_('Carrier')}</th>26 <th>${_('Carrier')}</th>
27 </tr>27 </tr>
28 %for move in aggr.moves_by_product():28 %for move in aggr.moves_by_product():

Subscribers

People subscribed via source and target branches