Merge lp:~dorian-kemps/unifield-server/US-6536 into lp:unifield-server
- US-6536
- Merge into trunk
Proposed by
jftempo
Status: | Merged |
---|---|
Merged at revision: | 5613 |
Proposed branch: | lp:~dorian-kemps/unifield-server/US-6536 |
Merge into: | lp:unifield-server |
Diff against target: |
426 lines (+96/-17) 2 files modified
bin/addons/msf_profile/i18n/fr_MF.po (+36/-11) bin/addons/stock_override/report/report_stock_move.py (+60/-6) |
To merge this branch: | bzr merge lp:~dorian-kemps/unifield-server/US-6536 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
UniField Reviewer Team | Pending | ||
Review via email: mp+378106@code.launchpad.net |
Commit message
Description of the change
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-11-21 16:33:04 +0000 | |||
3 | +++ bin/addons/msf_profile/i18n/fr_MF.po 2020-01-27 10:41:38 +0000 | |||
4 | @@ -1477,7 +1477,7 @@ | |||
5 | 1477 | msgid "Partner Form" | 1477 | msgid "Partner Form" |
6 | 1478 | msgstr "Formulaire du Partenaire" | 1478 | msgstr "Formulaire du Partenaire" |
7 | 1479 | 1479 | ||
9 | 1480 | #. modules: purchase, tender_flow, service_purchasing, sale, purchase_allocation_report, purchase_followup, return_claim, order_types, purchase_compare_rfq, sourcing, consumption_calculation, stock | 1480 | #. modules: purchase, tender_flow, service_purchasing, sale, purchase_allocation_report, purchase_followup, return_claim, order_types, purchase_compare_rfq, sourcing, consumption_calculation, stock, stock_override |
10 | 1481 | #: selection:stock.move,order_category:0 | 1481 | #: selection:stock.move,order_category:0 |
11 | 1482 | #: view:purchase.order:0 | 1482 | #: view:purchase.order:0 |
12 | 1483 | #: selection:purchase.order,categ:0 | 1483 | #: selection:purchase.order,categ:0 |
13 | @@ -1499,6 +1499,7 @@ | |||
14 | 1499 | #: selection:sale.order.line,categ:0 | 1499 | #: selection:sale.order.line,categ:0 |
15 | 1500 | #: selection:internal.request.import,imp_categ:0 | 1500 | #: selection:internal.request.import,imp_categ:0 |
16 | 1501 | #: selection:stock.reception.wizard,order_category:0 | 1501 | #: selection:stock.reception.wizard,order_category:0 |
17 | 1502 | #: code:addons/stock_override/report/report_stock_move.py:529 | ||
18 | 1502 | msgid "Medical" | 1503 | msgid "Medical" |
19 | 1503 | msgstr "Médical" | 1504 | msgstr "Médical" |
20 | 1504 | 1505 | ||
21 | @@ -1858,6 +1859,7 @@ | |||
22 | 1858 | #: selection:stock.reception.wizard,order_type:0 | 1859 | #: selection:stock.reception.wizard,order_type:0 |
23 | 1859 | #: code:addons/msf_supply_doc_export/wizard/supplier_performance_wizard.py:36 | 1860 | #: code:addons/msf_supply_doc_export/wizard/supplier_performance_wizard.py:36 |
24 | 1860 | #: field:supplier.performance.wizard,po_type_donation_exp:0 | 1861 | #: field:supplier.performance.wizard,po_type_donation_exp:0 |
25 | 1862 | #: code:addons/stock_override/report/report_stock_move.py:28 | ||
26 | 1861 | #, python-format | 1863 | #, python-format |
27 | 1862 | msgid "Donation before expiry" | 1864 | msgid "Donation before expiry" |
28 | 1863 | msgstr "Donation avant expiration" | 1865 | msgstr "Donation avant expiration" |
29 | @@ -3626,7 +3628,7 @@ | |||
30 | 3626 | msgid "You cannot add any new move while validating the picking, rather you can split the lines prior to validation!" | 3628 | msgid "You cannot add any new move while validating the picking, rather you can split the lines prior to validation!" |
31 | 3627 | msgstr "Vous ne pouvez ajouter aucun nouveau mouvement tout en validant le picking. Veuillez plutôt fractionner les lignes avant Validation!" | 3629 | msgstr "Vous ne pouvez ajouter aucun nouveau mouvement tout en validant le picking. Veuillez plutôt fractionner les lignes avant Validation!" |
32 | 3628 | 3630 | ||
34 | 3629 | #. modules: purchase_allocation_report, service_purchasing, stock, purchase_followup, sale, msf_supply_doc_export, procurement_request | 3631 | #. modules: purchase_allocation_report, service_purchasing, stock, purchase_followup, sale, msf_supply_doc_export, procurement_request, stock_override |
35 | 3630 | #: report:addons/purchase_allocation_report/report/po_allocation_report.mako:158 | 3632 | #: report:addons/purchase_allocation_report/report/po_allocation_report.mako:158 |
36 | 3631 | #: report:po.line.allocation.report:0 | 3633 | #: report:po.line.allocation.report:0 |
37 | 3632 | #: field:purchase.order.followup,categ:0 | 3634 | #: field:purchase.order.followup,categ:0 |
38 | @@ -3644,6 +3646,7 @@ | |||
39 | 3644 | #: report:addons/stock/report/stock_reception_report_xls.mako:230 | 3646 | #: report:addons/stock/report/stock_reception_report_xls.mako:230 |
40 | 3645 | #: field:stock.reception.wizard,order_category:0 | 3647 | #: field:stock.reception.wizard,order_category:0 |
41 | 3646 | #: report:addons/stock/report/stock_delivery_report_xls.mako:213 | 3648 | #: report:addons/stock/report/stock_delivery_report_xls.mako:213 |
42 | 3649 | #: code:addons/stock_override/report/report_stock_move.py:826 | ||
43 | 3647 | msgid "Order Category" | 3650 | msgid "Order Category" |
44 | 3648 | msgstr "Catégorie de Commande" | 3651 | msgstr "Catégorie de Commande" |
45 | 3649 | 3652 | ||
46 | @@ -4054,16 +4057,19 @@ | |||
47 | 4054 | msgid "UoM Stock" | 4057 | msgid "UoM Stock" |
48 | 4055 | msgstr "Stock UdM" | 4058 | msgstr "Stock UdM" |
49 | 4056 | 4059 | ||
51 | 4057 | #. modules: stock, sync_client, base, stock_override, stock_move_tracking | 4060 | #. modules: stock, sync_client, base, stock_move_tracking |
52 | 4058 | #: view:stock.move:0 | 4061 | #: view:stock.move:0 |
53 | 4059 | #: field:ir.translation,src:0 | 4062 | #: field:ir.translation,src:0 |
54 | 4060 | #: view:sync.client.message_received:0 | 4063 | #: view:sync.client.message_received:0 |
55 | 4061 | #: view:sync.client.update_received:0 | 4064 | #: view:sync.client.update_received:0 |
56 | 4062 | #: report:addons/stock_override/report/report_stock_move_xls.mako:142 | ||
57 | 4063 | #: report:tracking.move.report:0 | 4065 | #: report:tracking.move.report:0 |
58 | 4066 | msgid "Source" | ||
59 | 4067 | msgstr "Origine" | ||
60 | 4068 | |||
61 | 4069 | #. module: stock_override | ||
62 | 4064 | #: code:addons/stock_override/report/report_stock_move.py:759 | 4070 | #: code:addons/stock_override/report/report_stock_move.py:759 |
63 | 4065 | msgid "Source" | 4071 | msgid "Source" |
65 | 4066 | msgstr "Origine" | 4072 | msgstr "Source" |
66 | 4067 | 4073 | ||
67 | 4068 | #. module: base | 4074 | #. module: base |
68 | 4069 | #: field:ir.actions.report.xml,auto:0 | 4075 | #: field:ir.actions.report.xml,auto:0 |
69 | @@ -5533,6 +5539,7 @@ | |||
70 | 5533 | #: selection:stock.reception.wizard,order_type:0 | 5539 | #: selection:stock.reception.wizard,order_type:0 |
71 | 5534 | #: code:addons/msf_supply_doc_export/wizard/supplier_performance_wizard.py:37 | 5540 | #: code:addons/msf_supply_doc_export/wizard/supplier_performance_wizard.py:37 |
72 | 5535 | #: field:supplier.performance.wizard,po_type_donation_st:0 | 5541 | #: field:supplier.performance.wizard,po_type_donation_st:0 |
73 | 5542 | #: code:addons/stock_override/report/report_stock_move.py:29 | ||
74 | 5536 | #, python-format | 5543 | #, python-format |
75 | 5537 | msgid "Standard donation" | 5544 | msgid "Standard donation" |
76 | 5538 | msgstr "Donation normale" | 5545 | msgstr "Donation normale" |
77 | @@ -10179,6 +10186,7 @@ | |||
78 | 10179 | #: selection:account.invoice.line,partner_type:0 | 10186 | #: selection:account.invoice.line,partner_type:0 |
79 | 10180 | #: code:addons/msf_supply_doc_export/wizard/supplier_performance_wizard.py:32 | 10187 | #: code:addons/msf_supply_doc_export/wizard/supplier_performance_wizard.py:32 |
80 | 10181 | #: field:supplier.performance.wizard,partner_type_intermission:0 | 10188 | #: field:supplier.performance.wizard,partner_type_intermission:0 |
81 | 10189 | #: code:addons/stock_override/report/report_stock_move.py:23 | ||
82 | 10182 | msgid "Intermission" | 10190 | msgid "Intermission" |
83 | 10183 | msgstr "Intermission" | 10191 | msgstr "Intermission" |
84 | 10184 | 10192 | ||
85 | @@ -13054,6 +13062,7 @@ | |||
86 | 13054 | #: selection:account.invoice.line,partner_type:0 | 13062 | #: selection:account.invoice.line,partner_type:0 |
87 | 13055 | #: code:addons/msf_supply_doc_export/wizard/supplier_performance_wizard.py:30 | 13063 | #: code:addons/msf_supply_doc_export/wizard/supplier_performance_wizard.py:30 |
88 | 13056 | #: field:supplier.performance.wizard,partner_type_external:0 | 13064 | #: field:supplier.performance.wizard,partner_type_external:0 |
89 | 13065 | #: code:addons/stock_override/report/report_stock_move.py:21 | ||
90 | 13057 | msgid "External" | 13066 | msgid "External" |
91 | 13058 | msgstr "Externe" | 13067 | msgstr "Externe" |
92 | 13059 | 13068 | ||
93 | @@ -20712,6 +20721,7 @@ | |||
94 | 20712 | #: selection:stock.picking,partner_type_stock_picking:0 | 20721 | #: selection:stock.picking,partner_type_stock_picking:0 |
95 | 20713 | #: code:addons/msf_supply_doc_export/wizard/supplier_performance_wizard.py:29 | 20722 | #: code:addons/msf_supply_doc_export/wizard/supplier_performance_wizard.py:29 |
96 | 20714 | #: field:supplier.performance.wizard,partner_type_section:0 | 20723 | #: field:supplier.performance.wizard,partner_type_section:0 |
97 | 20724 | #: code:addons/stock_override/report/report_stock_move.py:20 | ||
98 | 20715 | msgid "Inter-section" | 20725 | msgid "Inter-section" |
99 | 20716 | msgstr "Inter-section" | 20726 | msgstr "Inter-section" |
100 | 20717 | 20727 | ||
101 | @@ -24287,6 +24297,7 @@ | |||
102 | 24287 | #: selection:stock.reception.wizard,order_type:0 | 24297 | #: selection:stock.reception.wizard,order_type:0 |
103 | 24288 | #: code:addons/msf_supply_doc_export/wizard/supplier_performance_wizard.py:38 | 24298 | #: code:addons/msf_supply_doc_export/wizard/supplier_performance_wizard.py:38 |
104 | 24289 | #: field:supplier.performance.wizard,po_type_loan:0 | 24299 | #: field:supplier.performance.wizard,po_type_loan:0 |
105 | 24300 | #: code:addons/stock_override/report/report_stock_move.py:27 | ||
106 | 24290 | #, python-format | 24301 | #, python-format |
107 | 24291 | msgid "Loan" | 24302 | msgid "Loan" |
108 | 24292 | msgstr "Prêt" | 24303 | msgstr "Prêt" |
109 | @@ -30133,6 +30144,7 @@ | |||
110 | 30133 | #: selection:stock.reception.wizard,order_type:0 | 30144 | #: selection:stock.reception.wizard,order_type:0 |
111 | 30134 | #: code:addons/msf_supply_doc_export/wizard/supplier_performance_wizard.py:35 | 30145 | #: code:addons/msf_supply_doc_export/wizard/supplier_performance_wizard.py:35 |
112 | 30135 | #: field:supplier.performance.wizard,po_type_regular:0 | 30146 | #: field:supplier.performance.wizard,po_type_regular:0 |
113 | 30147 | #: code:addons/stock_override/report/report_stock_move.py:27 | ||
114 | 30136 | #, python-format | 30148 | #, python-format |
115 | 30137 | msgid "Regular" | 30149 | msgid "Regular" |
116 | 30138 | msgstr "Normal" | 30150 | msgstr "Normal" |
117 | @@ -45887,7 +45899,7 @@ | |||
118 | 45887 | msgid "Activate the payroll feature" | 45899 | msgid "Activate the payroll feature" |
119 | 45888 | msgstr "Activer l'attribut Paie" | 45900 | msgstr "Activer l'attribut Paie" |
120 | 45889 | 45901 | ||
122 | 45890 | #. modules: purchase, product, purchase_allocation_report, service_purchasing, consumption_calculation, sale, sales_followup, purchase_compare_rfq, sourcing, order_types, tender_flow, return_claim, purchase_followup, stock | 45902 | #. modules: purchase, product, purchase_allocation_report, service_purchasing, consumption_calculation, sale, sales_followup, purchase_compare_rfq, sourcing, order_types, tender_flow, return_claim, purchase_followup, stock, stock_override |
123 | 45891 | #: selection:real.average.consumption,categ:0 | 45903 | #: selection:real.average.consumption,categ:0 |
124 | 45892 | #: selection:stock.move,order_category:0 | 45904 | #: selection:stock.move,order_category:0 |
125 | 45893 | #: view:product.product:0 | 45905 | #: view:product.product:0 |
126 | @@ -45912,6 +45924,7 @@ | |||
127 | 45912 | #: selection:purchase.report,categ:0 | 45924 | #: selection:purchase.report,categ:0 |
128 | 45913 | #: selection:tender,categ:0 | 45925 | #: selection:tender,categ:0 |
129 | 45914 | #: selection:stock.reception.wizard,order_category:0 | 45926 | #: selection:stock.reception.wizard,order_category:0 |
130 | 45927 | #: code:addons/stock_override/report/report_stock_move.py:532 | ||
131 | 45915 | msgid "Transport" | 45928 | msgid "Transport" |
132 | 45916 | msgstr "Transport" | 45929 | msgstr "Transport" |
133 | 45917 | 45930 | ||
134 | @@ -46312,6 +46325,7 @@ | |||
135 | 46312 | #: selection:account.invoice.line,partner_type:0 | 46325 | #: selection:account.invoice.line,partner_type:0 |
136 | 46313 | #: code:addons/msf_supply_doc_export/wizard/supplier_performance_wizard.py:31 | 46326 | #: code:addons/msf_supply_doc_export/wizard/supplier_performance_wizard.py:31 |
137 | 46314 | #: field:supplier.performance.wizard,partner_type_esc:0 | 46327 | #: field:supplier.performance.wizard,partner_type_esc:0 |
138 | 46328 | #: code:addons/stock_override/report/report_stock_move.py:22 | ||
139 | 46315 | msgid "ESC" | 46329 | msgid "ESC" |
140 | 46316 | msgstr "ESC" | 46330 | msgstr "ESC" |
141 | 46317 | 46331 | ||
142 | @@ -50991,11 +51005,12 @@ | |||
143 | 50991 | msgid "Search Donation" | 51005 | msgid "Search Donation" |
144 | 50992 | msgstr "Rechercher Donation" | 51006 | msgstr "Rechercher Donation" |
145 | 50993 | 51007 | ||
147 | 50994 | #. modules: sale, account_override, account | 51008 | #. modules: sale, account_override, account, stock_override |
148 | 50995 | #: report:addons/sale/report/sale_donation_stock_moves_report_xls.mako:127 | 51009 | #: report:addons/sale/report/sale_donation_stock_moves_report_xls.mako:127 |
149 | 50996 | #: field:sale.donation.stock.moves,partner_type:0 | 51010 | #: field:sale.donation.stock.moves,partner_type:0 |
150 | 50997 | #: field:account.invoice,partner_type:0 | 51011 | #: field:account.invoice,partner_type:0 |
151 | 50998 | #: field:account.invoice.line,partner_type:0 | 51012 | #: field:account.invoice.line,partner_type:0 |
152 | 51013 | #: code:addons/stock_override/report/report_stock_move.py:826 | ||
153 | 50999 | msgid "Partner Type" | 51014 | msgid "Partner Type" |
154 | 51000 | msgstr "Type de Partenaire" | 51015 | msgstr "Type de Partenaire" |
155 | 51001 | 51016 | ||
156 | @@ -52553,6 +52568,7 @@ | |||
157 | 52553 | #: selection:stock.reception.wizard,order_type:0 | 52568 | #: selection:stock.reception.wizard,order_type:0 |
158 | 52554 | #: code:addons/msf_supply_doc_export/wizard/supplier_performance_wizard.py:40 | 52569 | #: code:addons/msf_supply_doc_export/wizard/supplier_performance_wizard.py:40 |
159 | 52555 | #: field:supplier.performance.wizard,po_type_purchase_list:0 | 52570 | #: field:supplier.performance.wizard,po_type_purchase_list:0 |
160 | 52571 | #: code:addons/stock_override/report/report_stock_move.py:32 | ||
161 | 52556 | #, python-format | 52572 | #, python-format |
162 | 52557 | msgid "Purchase List" | 52573 | msgid "Purchase List" |
163 | 52558 | msgstr "Liste d'Achats" | 52574 | msgstr "Liste d'Achats" |
164 | @@ -53308,6 +53324,7 @@ | |||
165 | 53308 | #: selection:stock.reception.wizard,order_type:0 | 53324 | #: selection:stock.reception.wizard,order_type:0 |
166 | 53309 | #: code:addons/msf_supply_doc_export/wizard/supplier_performance_wizard.py:41 | 53325 | #: code:addons/msf_supply_doc_export/wizard/supplier_performance_wizard.py:41 |
167 | 53310 | #: field:supplier.performance.wizard,po_type_direct:0 | 53326 | #: field:supplier.performance.wizard,po_type_direct:0 |
168 | 53327 | #: code:addons/stock_override/report/report_stock_move.py:33 | ||
169 | 53311 | #, python-format | 53328 | #, python-format |
170 | 53312 | msgid "Direct Purchase Order" | 53329 | msgid "Direct Purchase Order" |
171 | 53313 | msgstr "Bon de Commande Direct" | 53330 | msgstr "Bon de Commande Direct" |
172 | @@ -56396,6 +56413,7 @@ | |||
173 | 56396 | #: selection:stock.reception.wizard,order_type:0 | 56413 | #: selection:stock.reception.wizard,order_type:0 |
174 | 56397 | #: code:addons/msf_supply_doc_export/wizard/supplier_performance_wizard.py:39 | 56414 | #: code:addons/msf_supply_doc_export/wizard/supplier_performance_wizard.py:39 |
175 | 56398 | #: field:supplier.performance.wizard,po_type_in_kind:0 | 56415 | #: field:supplier.performance.wizard,po_type_in_kind:0 |
176 | 56416 | #: code:addons/stock_override/report/report_stock_move.py:27 | ||
177 | 56399 | #, python-format | 56417 | #, python-format |
178 | 56400 | msgid "In Kind Donation" | 56418 | msgid "In Kind Donation" |
179 | 56401 | msgstr "Donation en Nature" | 56419 | msgstr "Donation en Nature" |
180 | @@ -56406,7 +56424,7 @@ | |||
181 | 56406 | msgid "Other Types" | 56424 | msgid "Other Types" |
182 | 56407 | msgstr "Autres Types" | 56425 | msgstr "Autres Types" |
183 | 56408 | 56426 | ||
185 | 56409 | #. modules: purchase, tender_flow, service_purchasing, sale, purchase_allocation_report, purchase_followup, return_claim, order_types, purchase_compare_rfq, sourcing, consumption_calculation, stock | 56427 | #. modules: purchase, tender_flow, service_purchasing, sale, purchase_allocation_report, purchase_followup, return_claim, order_types, purchase_compare_rfq, sourcing, consumption_calculation, stock, stock_override |
186 | 56410 | #: selection:stock.move,order_category:0 | 56428 | #: selection:stock.move,order_category:0 |
187 | 56411 | #: view:purchase.order:0 | 56429 | #: view:purchase.order:0 |
188 | 56412 | #: selection:purchase.order,categ:0 | 56430 | #: selection:purchase.order,categ:0 |
189 | @@ -56428,6 +56446,7 @@ | |||
190 | 56428 | #: selection:sale.order.line,categ:0 | 56446 | #: selection:sale.order.line,categ:0 |
191 | 56429 | #: selection:internal.request.import,imp_categ:0 | 56447 | #: selection:internal.request.import,imp_categ:0 |
192 | 56430 | #: selection:stock.reception.wizard,order_category:0 | 56448 | #: selection:stock.reception.wizard,order_category:0 |
193 | 56449 | #: code:addons/stock_override/report/report_stock_move.py:530 | ||
194 | 56431 | msgid "Logistic" | 56450 | msgid "Logistic" |
195 | 56432 | msgstr "Logistique" | 56451 | msgstr "Logistique" |
196 | 56433 | 56452 | ||
197 | @@ -61929,6 +61948,7 @@ | |||
198 | 61929 | #: field:stock.reception.wizard,order_type:0 | 61948 | #: field:stock.reception.wizard,order_type:0 |
199 | 61930 | #: code:addons/msf_supply_doc_export/msf_supply_doc_export.py:882 | 61949 | #: code:addons/msf_supply_doc_export/msf_supply_doc_export.py:882 |
200 | 61931 | #: report:addons/stock/report/stock_delivery_report_xls.mako:212 | 61950 | #: report:addons/stock/report/stock_delivery_report_xls.mako:212 |
201 | 61951 | #: code:addons/stock_override/report/report_stock_move.py:826 | ||
202 | 61932 | msgid "Order Type" | 61952 | msgid "Order Type" |
203 | 61933 | msgstr "Type de Commande" | 61953 | msgstr "Type de Commande" |
204 | 61934 | 61954 | ||
205 | @@ -74705,6 +74725,7 @@ | |||
206 | 74705 | #: report:addons/stock/report/stock_reception_report_xls.mako:234 | 74725 | #: report:addons/stock/report/stock_reception_report_xls.mako:234 |
207 | 74706 | #: report:tracking.move.report:0 | 74726 | #: report:tracking.move.report:0 |
208 | 74707 | #: report:addons/stock/report/stock_delivery_report_xls.mako:210 | 74727 | #: report:addons/stock/report/stock_delivery_report_xls.mako:210 |
209 | 74728 | #: code:addons/stock_override/report/report_stock_move.py:826 | ||
210 | 74708 | #, python-format | 74729 | #, python-format |
211 | 74709 | msgid "Origin" | 74730 | msgid "Origin" |
212 | 74710 | msgstr "Origine" | 74731 | msgstr "Origine" |
213 | @@ -90411,7 +90432,7 @@ | |||
214 | 90411 | msgid "Export search result" | 90432 | msgid "Export search result" |
215 | 90412 | msgstr "Exporter le résultat de la recherche" | 90433 | msgstr "Exporter le résultat de la recherche" |
216 | 90413 | 90434 | ||
218 | 90414 | #. modules: purchase, tender_flow, msf_outgoing, reason_types_moves, product_asset, sale, purchase_allocation_report, base, order_types, specific_locations, return_claim, service_purchasing, purchase_followup, purchase_compare_rfq, sourcing, consumption_calculation, stock | 90435 | #. modules: purchase, tender_flow, msf_outgoing, reason_types_moves, product_asset, sale, purchase_allocation_report, base, order_types, specific_locations, return_claim, service_purchasing, purchase_followup, purchase_compare_rfq, sourcing, consumption_calculation, stock, stock_override |
219 | 90415 | #: selection:res.partner.address,type:0 | 90436 | #: selection:res.partner.address,type:0 |
220 | 90416 | #: field:shipment,carrier_other:0 | 90437 | #: field:shipment,carrier_other:0 |
221 | 90417 | #: field:shipment,consignee_other:0 | 90438 | #: field:shipment,consignee_other:0 |
222 | @@ -90440,6 +90461,7 @@ | |||
223 | 90440 | #: selection:sale.order.line,categ:0 | 90461 | #: selection:sale.order.line,categ:0 |
224 | 90441 | #: selection:internal.request.import,imp_categ:0 | 90462 | #: selection:internal.request.import,imp_categ:0 |
225 | 90442 | #: selection:stock.reception.wizard,order_category:0 | 90463 | #: selection:stock.reception.wizard,order_category:0 |
226 | 90464 | #: code:addons/stock_override/report/report_stock_move.py:533 | ||
227 | 90443 | msgid "Other" | 90465 | msgid "Other" |
228 | 90444 | msgstr "Autre" | 90466 | msgstr "Autre" |
229 | 90445 | 90467 | ||
230 | @@ -95651,6 +95673,7 @@ | |||
231 | 95651 | #: selection:account.invoice.line,partner_type:0 | 95673 | #: selection:account.invoice.line,partner_type:0 |
232 | 95652 | #: code:addons/msf_supply_doc_export/wizard/supplier_performance_wizard.py:28 | 95674 | #: code:addons/msf_supply_doc_export/wizard/supplier_performance_wizard.py:28 |
233 | 95653 | #: field:supplier.performance.wizard,partner_type_internal:0 | 95675 | #: field:supplier.performance.wizard,partner_type_internal:0 |
234 | 95676 | #: code:addons/stock_override/report/report_stock_move.py:19 | ||
235 | 95654 | #, python-format | 95677 | #, python-format |
236 | 95655 | msgid "Internal" | 95678 | msgid "Internal" |
237 | 95656 | msgstr "Interne" | 95679 | msgstr "Interne" |
238 | @@ -96649,7 +96672,7 @@ | |||
239 | 96649 | msgid "America/Port-au-Prince" | 96672 | msgid "America/Port-au-Prince" |
240 | 96650 | msgstr "Amériques/Port-au-Prince" | 96673 | msgstr "Amériques/Port-au-Prince" |
241 | 96651 | 96674 | ||
243 | 96652 | #. modules: purchase, tender_flow, purchase_allocation_report, supplier_catalogue, service_purchasing, consumption_calculation, sale, msf_config_locations, procurement, sourcing, order_types, return_claim, purchase_compare_rfq, purchase_followup, stock | 96675 | #. modules: purchase, tender_flow, purchase_allocation_report, supplier_catalogue, service_purchasing, consumption_calculation, sale, msf_config_locations, procurement, sourcing, order_types, return_claim, purchase_compare_rfq, purchase_followup, stock, stock_override |
244 | 96653 | #: selection:real.average.consumption,categ:0 | 96676 | #: selection:real.average.consumption,categ:0 |
245 | 96654 | #: model:stock.location,name:msf_config_locations.stock_location_service | 96677 | #: model:stock.location,name:msf_config_locations.stock_location_service |
246 | 96655 | #: selection:stock.move,order_category:0 | 96678 | #: selection:stock.move,order_category:0 |
247 | @@ -96674,6 +96697,7 @@ | |||
248 | 96674 | #: view:tender:0 | 96697 | #: view:tender:0 |
249 | 96675 | #: selection:tender,categ:0 | 96698 | #: selection:tender,categ:0 |
250 | 96676 | #: selection:stock.reception.wizard,order_category:0 | 96699 | #: selection:stock.reception.wizard,order_category:0 |
251 | 96700 | #: code:addons/stock_override/report/report_stock_move.py:531 | ||
252 | 96677 | msgid "Service" | 96701 | msgid "Service" |
253 | 96678 | msgstr "Service" | 96702 | msgstr "Service" |
254 | 96679 | 96703 | ||
255 | @@ -103236,7 +103260,7 @@ | |||
256 | 103236 | msgid "Specific Destination Location" | 103260 | msgid "Specific Destination Location" |
257 | 103237 | msgstr "Zone de Destination Spécifique" | 103261 | msgstr "Zone de Destination Spécifique" |
258 | 103238 | 103262 | ||
260 | 103239 | #. module: stock | 103263 | #. module: stock, stock_override |
261 | 103240 | #: report:addons/stock/report/stock_expired_damaged_report_xls.mako:206 | 103264 | #: report:addons/stock/report/stock_expired_damaged_report_xls.mako:206 |
262 | 103241 | #: report:addons/stock/report/stock_expired_damaged_report_xls.mako:217 | 103265 | #: report:addons/stock/report/stock_expired_damaged_report_xls.mako:217 |
263 | 103242 | #: field:stock.expired.damaged.report,nomen_manda_0:0 | 103266 | #: field:stock.expired.damaged.report,nomen_manda_0:0 |
264 | @@ -103244,6 +103268,7 @@ | |||
265 | 103244 | #: field:stock.reception.wizard,nomen_manda_0:0 | 103268 | #: field:stock.reception.wizard,nomen_manda_0:0 |
266 | 103245 | #: report:addons/stock/report/stock_delivery_report_xls.mako:190 | 103269 | #: report:addons/stock/report/stock_delivery_report_xls.mako:190 |
267 | 103246 | #: field:stock.delivery.wizard,nomen_manda_0:0 | 103270 | #: field:stock.delivery.wizard,nomen_manda_0:0 |
268 | 103271 | #: code:addons/stock_override/report/report_stock_move.py:826 | ||
269 | 103247 | msgid "Product Main Type" | 103272 | msgid "Product Main Type" |
270 | 103248 | msgstr "Type Principal du Produit" | 103273 | msgstr "Type Principal du Produit" |
271 | 103249 | 103274 | ||
272 | 103250 | 103275 | ||
273 | === modified file 'bin/addons/stock_override/report/report_stock_move.py' | |||
274 | --- bin/addons/stock_override/report/report_stock_move.py 2019-10-30 16:33:21 +0000 | |||
275 | +++ bin/addons/stock_override/report/report_stock_move.py 2020-01-27 10:41:38 +0000 | |||
276 | @@ -15,6 +15,7 @@ | |||
277 | 15 | import tempfile | 15 | import tempfile |
278 | 16 | import base64 | 16 | import base64 |
279 | 17 | 17 | ||
280 | 18 | |||
281 | 18 | class report_stock_move(osv.osv): | 19 | class report_stock_move(osv.osv): |
282 | 19 | _name = "report.stock.move" | 20 | _name = "report.stock.move" |
283 | 20 | _rec_name = 'location_id' | 21 | _rec_name = 'location_id' |
284 | @@ -503,10 +504,35 @@ | |||
285 | 503 | ) | 504 | ) |
286 | 504 | 505 | ||
287 | 505 | def getLines(self, cr, uid, datas, currency_id, context=None): | 506 | def getLines(self, cr, uid, datas, currency_id, context=None): |
288 | 506 | |||
289 | 507 | if context is None: | 507 | if context is None: |
290 | 508 | context = {} | 508 | context = {} |
291 | 509 | 509 | ||
292 | 510 | PARTNER_TYPES = { | ||
293 | 511 | 'internal': _('Internal'), | ||
294 | 512 | 'section': _('Inter-section'), | ||
295 | 513 | 'external': _('External'), | ||
296 | 514 | 'esc': _('ESC'), | ||
297 | 515 | 'intermission': _('Intermission'), | ||
298 | 516 | } | ||
299 | 517 | |||
300 | 518 | ORDER_TYPES = { | ||
301 | 519 | 'regular': _('Regular'), | ||
302 | 520 | 'donation_exp': _('Donation before expiry'), | ||
303 | 521 | 'donation_st': _('Standard donation'), | ||
304 | 522 | 'loan': _('Loan'), | ||
305 | 523 | 'in_kind': _('In Kind Donation'), | ||
306 | 524 | 'purchase_list': _('Purchase List'), | ||
307 | 525 | 'direct': _('Direct Purchase Order'), | ||
308 | 526 | } | ||
309 | 527 | |||
310 | 528 | ORDER_CATEGORIES = { | ||
311 | 529 | 'medical': _('Medical'), | ||
312 | 530 | 'log': _('Logistic'), | ||
313 | 531 | 'service': _('Service'), | ||
314 | 532 | 'transport': _('Transport'), | ||
315 | 533 | 'other': _('Other'), | ||
316 | 534 | } | ||
317 | 535 | |||
318 | 510 | _logger = logging.getLogger('in.out.report') | 536 | _logger = logging.getLogger('in.out.report') |
319 | 511 | prod_obj = self.pool.get('product.product') | 537 | prod_obj = self.pool.get('product.product') |
320 | 512 | curr_obj = self.pool.get('res.currency') | 538 | curr_obj = self.pool.get('res.currency') |
321 | @@ -552,12 +578,19 @@ | |||
322 | 552 | pick.name as pick_name, | 578 | pick.name as pick_name, |
323 | 553 | m.date as date, | 579 | m.date as date, |
324 | 554 | uom.name as uom_name, | 580 | uom.name as uom_name, |
325 | 581 | nom.name as nom_name, | ||
326 | 555 | t.standard_price as standard_price, | 582 | t.standard_price as standard_price, |
327 | 556 | m.location_id as location_src_id, | 583 | m.location_id as location_src_id, |
328 | 557 | m.location_dest_id as location_dest_id, | 584 | m.location_dest_id as location_dest_id, |
329 | 585 | par.name as partner_name, | ||
330 | 586 | par.partner_type as partner_type, | ||
331 | 558 | m.reason_type_id as reason_type_id, | 587 | m.reason_type_id as reason_type_id, |
332 | 559 | lot.name as lot_name, | 588 | lot.name as lot_name, |
333 | 560 | lot.life_date as life_date, | 589 | lot.life_date as life_date, |
334 | 590 | COALESCE(pick.origin, m.origin) as origin, | ||
335 | 591 | pi.ref as pi_name, | ||
336 | 592 | case when m.sale_line_id is not null and not so.procurement_request then so.order_type when m.purchase_line_id is not null then po.order_type end as order_type, | ||
337 | 593 | case when m.sale_line_id is not null then so.categ when m.purchase_line_id is not null then po.categ end as order_category, | ||
338 | 561 | case when pick.subtype not in ('ppl', 'packing') then null when so.procurement_request then %s else pl.currency_id end as bug_pl | 594 | case when pick.subtype not in ('ppl', 'packing') then null when so.procurement_request then %s else pl.currency_id end as bug_pl |
339 | 562 | from | 595 | from |
340 | 563 | stock_move m | 596 | stock_move m |
341 | @@ -566,10 +599,16 @@ | |||
342 | 566 | inner join product_template t on t.id = p.product_tmpl_id | 599 | inner join product_template t on t.id = p.product_tmpl_id |
343 | 567 | left join stock_picking pick on m.picking_id = pick.id | 600 | left join stock_picking pick on m.picking_id = pick.id |
344 | 568 | left join stock_production_lot lot on lot.id = m.prodlot_id | 601 | left join stock_production_lot lot on lot.id = m.prodlot_id |
346 | 569 | left join ir_translation trans on trans.name='product.template,name' and trans.res_id=t.id and lang=%s | 602 | left join ir_translation trans on trans.name='product.template,name' and trans.res_id=t.id and trans.lang=%s |
347 | 570 | left join sale_order_line sol on m.sale_line_id = sol.id | 603 | left join sale_order_line sol on m.sale_line_id = sol.id |
348 | 571 | left join sale_order so on sol.order_id = so.id | 604 | left join sale_order so on sol.order_id = so.id |
349 | 605 | left join purchase_order_line pol on m.purchase_line_id = pol.id | ||
350 | 606 | left join purchase_order po on pol.order_id = po.id | ||
351 | 572 | left join product_pricelist pl on so.pricelist_id = pl.id | 607 | left join product_pricelist pl on so.pricelist_id = pl.id |
352 | 608 | left join product_nomenclature nom on nom.id = t.nomen_manda_0 | ||
353 | 609 | left join res_partner par on par.id = m.partner_id | ||
354 | 610 | left join physical_inventory_discrepancy pi_discr on pi_discr.move_id = m.id | ||
355 | 611 | left join physical_inventory pi on pi.id = pi_discr.inventory_id | ||
356 | 573 | where | 612 | where |
357 | 574 | m.id in %s | 613 | m.id in %s |
358 | 575 | order by p.default_code, m.date asc, lot.name | 614 | order by p.default_code, m.date asc, lot.name |
359 | @@ -607,7 +646,6 @@ | |||
360 | 607 | else: | 646 | else: |
361 | 608 | prod_stock = prod_stock_cache[move['product_id']]['stock'] | 647 | prod_stock = prod_stock_cache[move['product_id']]['stock'] |
362 | 609 | 648 | ||
363 | 610 | |||
364 | 611 | if move['prodlot_id']: | 649 | if move['prodlot_id']: |
365 | 612 | ctx.update({'prodlot_id': move['prodlot_id'], 'from_strict_date': bn_stock_cache.get(move['prodlot_id'], {}).get('to_date', False)}) | 650 | ctx.update({'prodlot_id': move['prodlot_id'], 'from_strict_date': bn_stock_cache.get(move['prodlot_id'], {}).get('to_date', False)}) |
366 | 613 | if ctx['to_date'] != ctx['from_strict_date']: | 651 | if ctx['to_date'] != ctx['from_strict_date']: |
367 | @@ -645,6 +683,7 @@ | |||
368 | 645 | move['default_code'], | 683 | move['default_code'], |
369 | 646 | move['product_name'], | 684 | move['product_name'], |
370 | 647 | move['uom_name'], | 685 | move['uom_name'], |
371 | 686 | move['nom_name'], | ||
372 | 648 | move_date and datetime.datetime.strptime(move_date, '%Y-%m-%d %H:%M:%S') or '', | 687 | move_date and datetime.datetime.strptime(move_date, '%Y-%m-%d %H:%M:%S') or '', |
373 | 649 | move['lot_name'] or '', | 688 | move['lot_name'] or '', |
374 | 650 | move['life_date'] and datetime.datetime.strptime(move['life_date'], '%Y-%m-%d'), | 689 | move['life_date'] and datetime.datetime.strptime(move['life_date'], '%Y-%m-%d'), |
375 | @@ -655,8 +694,13 @@ | |||
376 | 655 | prod_stock, | 694 | prod_stock, |
377 | 656 | location_info.get(move['location_src_id']), | 695 | location_info.get(move['location_src_id']), |
378 | 657 | location_info.get(move['location_dest_id']), | 696 | location_info.get(move['location_dest_id']), |
379 | 697 | move['partner_name'], | ||
380 | 698 | PARTNER_TYPES.get(move['partner_type']) or '', | ||
381 | 658 | reason_info.get(move['reason_type_id']) or '', | 699 | reason_info.get(move['reason_type_id']) or '', |
383 | 659 | move['pick_name'] or move['move_name'] or '', | 700 | move['pi_name'] or move['pick_name'] or move['move_name'] or '', |
384 | 701 | move['pi_name'] and move['move_name'] or move['origin'] or '', | ||
385 | 702 | ORDER_TYPES.get(move['order_type']) or '', | ||
386 | 703 | ORDER_CATEGORIES.get(move['order_category']) or '', | ||
387 | 660 | ] | 704 | ] |
388 | 661 | 705 | ||
389 | 662 | raise StopIteration | 706 | raise StopIteration |
390 | @@ -726,6 +770,13 @@ | |||
391 | 726 | """) | 770 | """) |
392 | 727 | row_style.borders = borders | 771 | row_style.borders = borders |
393 | 728 | 772 | ||
394 | 773 | row_left_style = easyxf(""" | ||
395 | 774 | font: height 200; | ||
396 | 775 | font: name Calibri; | ||
397 | 776 | align: wrap on, vert center, horiz left; | ||
398 | 777 | """) | ||
399 | 778 | row_left_style.borders = borders | ||
400 | 779 | |||
401 | 729 | date_time_format = easyxf( | 780 | date_time_format = easyxf( |
402 | 730 | """ | 781 | """ |
403 | 731 | font: height 200; | 782 | font: height 200; |
404 | @@ -774,7 +825,7 @@ | |||
405 | 774 | 825 | ||
406 | 775 | row_count += 1 | 826 | row_count += 1 |
407 | 776 | pos = 0 | 827 | pos = 0 |
409 | 777 | headers = [(_('Product Code'), '', 25), (_('Product Description'), '', 70), (_('UoM'), '', 11), (_('Stock Move Date'), date_time_format,20), (_('Batch'), '',30), (_('Exp Date'), date_format, 11), (_('Quantity'), '', 10), (_('Unit Price (%s)') % (currency.name,), '', 10), (_('Movement value (%s)') % (currency.name,) , '', 10), (_('BN stock after movement (instance)'), '', 10), (_('Total stock after movement (instance)'), '', 10), (_('Source'), '', 40), (_('Destination'), '', 40), (_('Reason Type'), '', 30), (_('Document Ref.'), '', 40)] | 828 | headers = [(_('Product Code'), '', 25), (_('Product Description'), '', 70), (_('UoM'), '', 11), (_('Product Main Type'), '', 11), (_('Stock Move Date'), date_time_format,20), (_('Batch'), '',30), (_('Exp Date'), date_format, 11), (_('Quantity'), '', 10), (_('Unit Price (%s)') % (currency.name,), '', 10), (_('Movement value (%s)') % (currency.name,) , '', 10), (_('BN stock after movement (instance)'), '', 10), (_('Total stock after movement (instance)'), '', 10), (_('Source'), '', 40), (_('Destination'), '', 40), (_('Partner'), '', 30), (_('Partner Type'), '', 15), (_('Reason Type'), '', 30), (_('Document Ref.'), '', 40), (_('Origin'), '', 70), (_('Order Type'), '', 15), (_('Order Category'), '', 11)] |
410 | 778 | 829 | ||
411 | 779 | for header_row, col_type, size in headers: | 830 | for header_row, col_type, size in headers: |
412 | 780 | sheet.col(pos).width = size * 256 | 831 | sheet.col(pos).width = size * 256 |
413 | @@ -793,7 +844,10 @@ | |||
414 | 793 | if value and headers[col_count][1]: | 844 | if value and headers[col_count][1]: |
415 | 794 | style = headers[col_count][1] | 845 | style = headers[col_count][1] |
416 | 795 | else: | 846 | else: |
418 | 796 | style = row_style | 847 | if col_count == 18: # Change style on Origin column |
419 | 848 | style = row_left_style | ||
420 | 849 | else: | ||
421 | 850 | style = row_style | ||
422 | 797 | sheet.write(row_count, col_count, value, style) | 851 | sheet.write(row_count, col_count, value, style) |
423 | 798 | col_count += 1 | 852 | col_count += 1 |
424 | 799 | #sheet.row(row_count).height = 60*20 | 853 | #sheet.row(row_count).height = 60*20 |
425 | 800 | 854 | ||
426 | === removed file 'bin/addons/stock_override/report/report_stock_move_xls.mako.THIS' |