Unifield Server

Merge lp:~jfb-tempo-consulting/unifield-server/US-5395 into lp:unifield-server

  1. US-5395
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 5190
Proposed branch: lp:~jfb-tempo-consulting/unifield-server/US-5395
Merge into: lp:unifield-server
Diff against target: 151 lines (+17/-21)
4 files modified
bin/addons/msf_profile/i18n/fr_MF.po (+7/-12)
bin/addons/msf_supply_doc_export/report/internal_request_export_xls.mako (+2/-2)
bin/addons/procurement_request/report/internal_request_import_overview_export_xls.mako (+1/-1)
bin/addons/sale/wizard/internal_request_import.py (+7/-6)
To merge this branch: bzr merge lp:~jfb-tempo-consulting/unifield-server/US-5395
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+359903@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 2018-11-26 17:05:18 +0000
3+++ bin/addons/msf_profile/i18n/fr_MF.po 2018-11-30 09:36:42 +0000
4@@ -77477,7 +77477,7 @@
5 msgid "# of lines imported"
6 msgstr "# de lignes importées"
7
8-#. modules: purchase, account, msf_outgoing, finance, purchase_override, sales_followup, supplier_catalogue, sale, product, kit, account_override, purchase_allocation_report, order_types, tender_flow, msf_supply_doc_export, msf_doc_import, register_accounting, stock, purchase_followup
9+#. modules: purchase, account, msf_outgoing, finance, purchase_override, sales_followup, supplier_catalogue, sale, product, kit, account_override, purchase_allocation_report, order_types, tender_flow, msf_supply_doc_export, msf_doc_import, register_accounting, stock, purchase_followup, procurement_request
10 #: field:account.invoice.line,price_unit:0
11 #: report:account.invoice2:0
12 #: report:allocation.invoices.report:0
13@@ -77522,6 +77522,11 @@
14 #: report:addons/supplier_catalogue/report/report_supplier_catalogue_lines_xls.mako:75
15 #: field:supplier.catalogue.line,unit_price:0
16 #: report:addons/tender_flow/report/tender_rfq_comparison_xls.mako:577
17+#: report:addons/msf_supply_doc_export/report/internal_request_export_xls.mako:133
18+#: report:addons/procurement_request/report/internal_request_import_overview_export_xls.mako:217
19+#: code:addons/sale/wizard/internal_request_import.py:46
20+#: field:internal.request.import.line,imp_cost_price:0
21+#: field:internal.request.import.line,in_cost_price:0
22 #, python-format
23 msgid "Unit Price"
24 msgstr "Prix Unitaire"
25@@ -101500,16 +101505,6 @@
26 msgid "UoM '%s' is not consistent with the Product '%s'. "
27 msgstr "L'UdM '%s' n'est pas cohérente avec le Produit '%s'. "
28
29-#. modules: msf_supply_doc_export, sale, procurement_request
30-#: report:addons/msf_supply_doc_export/report/internal_request_export_xls.mako:133
31-#: code:addons/sale/wizard/internal_request_import.py:46
32-#: field:internal.request.import.line,imp_cost_price:0
33-#: field:internal.request.import.line,in_cost_price:0
34-#: report:addons/procurement_request/report/internal_request_import_overview_export_xls.mako:217
35-#, python-format
36-msgid "Cost Price"
37-msgstr "Prix Unitaire"
38-
39 #. module: sale
40 #: code:addons/sale/wizard/internal_request_import.py:294
41 #, python-format
42@@ -101776,7 +101771,7 @@
43 #. module: sale
44 #: code:addons/sale/wizard/internal_request_import.py:487
45 #, python-format
46-msgid "Cost Price must be a number. "
47+msgid "Unit Price must be a number. "
48 msgstr "Le Prix Unitaire doit être un nombre. "
49
50 #. module: sale
51
52=== modified file 'bin/addons/msf_supply_doc_export/report/internal_request_export_xls.mako'
53--- bin/addons/msf_supply_doc_export/report/internal_request_export_xls.mako 2018-11-05 14:54:54 +0000
54+++ bin/addons/msf_supply_doc_export/report/internal_request_export_xls.mako 2018-11-30 09:36:42 +0000
55@@ -130,7 +130,7 @@
56 <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Product Code')}</Data></Cell>
57 <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Product Description')}</Data></Cell>
58 <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Quantity')}</Data></Cell>
59- <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Cost Price')}</Data></Cell>
60+ <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Unit Price')}</Data></Cell>
61 <Cell ss:StyleID="header" ><Data ss:Type="String">${_('UoM')}</Data></Cell>
62 <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Currency')}</Data></Cell>
63 <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Comment')}</Data></Cell>
64@@ -142,7 +142,7 @@
65 <Cell ss:StyleID="line" ><Data ss:Type="String">${line.product_id.default_code or '' | x}</Data></Cell>
66 <Cell ss:StyleID="line" ><Data ss:Type="String">${line.product_id.name or '' | x}</Data></Cell>
67 <Cell ss:StyleID="line" ><Data ss:Type="Number">${line.product_uom_qty or '' | x}</Data></Cell>
68- <Cell ss:StyleID="line" ><Data ss:Type="Number">${line.cost_price or (line.product_id and line.product_id.standard_price) or '' | x}</Data></Cell>
69+ <Cell ss:StyleID="line" ><Data ss:Type="Number">${line.price_unit or (line.product_id and line.product_id.standard_price) or '' | x}</Data></Cell>
70 <Cell ss:StyleID="line" ><Data ss:Type="String">${line.product_uom.name or ''| x}</Data></Cell>
71 <Cell ss:StyleID="line" ><Data ss:Type="String">${line.functional_currency_id.name or ''| x}</Data></Cell>
72 <Cell ss:StyleID="line" ><Data ss:Type="String">${line.comment or ''| x}</Data></Cell>
73
74=== modified file 'bin/addons/procurement_request/report/internal_request_import_overview_export_xls.mako'
75--- bin/addons/procurement_request/report/internal_request_import_overview_export_xls.mako 2018-11-07 16:34:07 +0000
76+++ bin/addons/procurement_request/report/internal_request_import_overview_export_xls.mako 2018-11-30 09:36:42 +0000
77@@ -218,7 +218,7 @@
78 <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Product Code')}</Data></Cell>
79 <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Product Description')}</Data></Cell>
80 <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Quantity')}</Data></Cell>
81- <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Cost Price')}</Data></Cell>
82+ <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Unit Price')}</Data></Cell>
83 <Cell ss:StyleID="header" ><Data ss:Type="String">${_('UoM')}</Data></Cell>
84 <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Currency')}</Data></Cell>
85 <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Comment')}</Data></Cell>
86
87=== modified file 'bin/addons/sale/wizard/internal_request_import.py'
88--- bin/addons/sale/wizard/internal_request_import.py 2018-11-20 15:11:47 +0000
89+++ bin/addons/sale/wizard/internal_request_import.py 2018-11-30 09:36:42 +0000
90@@ -41,7 +41,7 @@
91 (1, _('Product Code'), 'optionnal'),
92 (2, _('Product Description'), 'optionnal'),
93 (3, _('Quantity'), 'mandatory'),
94- (4, _('Cost Price'), 'optionnal'),
95+ (4, _('Unit Price'), 'optionnal'),
96 (5, _('UoM'), 'mandatory'),
97 (6, _('Currency'), 'optionnal'),
98 (7, _('Comment'), 'optionnal'),
99@@ -660,6 +660,7 @@
100 if cost_price > 0:
101 line_data.update({'imp_cost_price': cost_price})
102 else:
103+ line_data.update({'imp_cost_price': product['standard_price']})
104 line_errors += _('Price \'%s\' must be above 0, default cost price has been used. ') \
105 % (cost_price,)
106 except:
107@@ -683,7 +684,7 @@
108 line_errors += _('Price \'%s\' must be above 0. ') % (cost_price,)
109 except:
110 red = True
111- line_errors += _('Cost Price must be a number. ')
112+ line_errors += _('Unit Price must be a number. ')
113 if uom_ids:
114 line_data.update({'imp_uom_id': uom_ids[0]})
115 else:
116@@ -845,6 +846,8 @@
117 'product_uom_qty': line.imp_qty or 0.00,
118 'comment': line.imp_comment or '',
119 'stock_take_date': line.imp_stock_take_date or False,
120+ 'cost_price': line.imp_cost_price or 0.00,
121+ 'price_unit': line.imp_cost_price or 0.00,
122 }
123 if line.imp_uom_id:
124 line_vals.update({'product_uom': line.imp_uom_id.id})
125@@ -853,8 +856,6 @@
126 else: # create IR line
127 line_vals.update({
128 'order_id': wiz.order_id.id,
129- 'cost_price': line.imp_cost_price or 0.00,
130- 'price_unit': line.imp_cost_price or 0.00,
131 })
132 sol_obj.create(cr, uid, line_vals, context=context)
133 else: # Create IR
134@@ -945,7 +946,7 @@
135 'in_product': fields.char(string='Product', size=64, readonly=True),
136 'in_product_desc': fields.char(string='Product Description', size=128, readonly=True),
137 'in_qty': fields.char(string='Quantity', size=64, readonly=True),
138- 'in_cost_price': fields.char(string='Cost Price', size=64, readonly=True),
139+ 'in_cost_price': fields.char(string='Unit Price', size=64, readonly=True),
140 'in_uom': fields.char(string='UoM', size=64, readonly=True),
141 'in_comment': fields.char(string='Comment', size=256, readonly=True),
142 'in_stock_take_date': fields.char(string='Date of Stock Take', size=64, readonly=True),
143@@ -953,7 +954,7 @@
144 'imp_line_number': fields.integer(string='Line Number'),
145 'imp_product_id': fields.many2one('product.product', string='Product', readonly=True),
146 'imp_qty': fields.float(digits=(16, 2), string='Quantity', readonly=True),
147- 'imp_cost_price': fields.float(digits=(16, 2), string='Cost Price', readonly=True),
148+ 'imp_cost_price': fields.float(digits=(16, 2), string='Unit Price', readonly=True),
149 'imp_uom_id': fields.many2one('product.uom', string='UoM', readonly=True),
150 'imp_comment': fields.char(size=256, string='Comment', readonly=True),
151 'imp_stock_take_date': fields.date(string='Date of Stock Take', readonly=True),

Subscribers

People subscribed via source and target branches