Unifield Server

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

  1. US-6382
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 5614
Proposed branch: lp:~dorian-kemps/unifield-server/US-6382
Merge into: lp:unifield-server
Diff against target: 148 lines (+30/-8)
4 files modified
bin/addons/kit/kit.py (+3/-1)
bin/addons/kit/kit_view.xml (+2/-1)
bin/addons/kit/report/kit_report.rml (+16/-4)
bin/addons/msf_profile/i18n/fr_MF.po (+9/-2)
To merge this branch: bzr merge lp:~dorian-kemps/unifield-server/US-6382
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+378108@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
=== modified file 'bin/addons/kit/kit.py'
--- bin/addons/kit/kit.py 2019-10-28 16:42:13 +0000
+++ bin/addons/kit/kit.py 2020-01-27 10:41:41 +0000
@@ -231,6 +231,7 @@
231 'item_exp': item_v.item_exp, # is set to False231 'item_exp': item_v.item_exp, # is set to False
232 'item_kit_id': obj.id,232 'item_kit_id': obj.id,
233 'item_description': item_v.item_description,233 'item_description': item_v.item_description,
234 'comment': item_v.comment,
234 }235 }
235 item_obj.create(cr, uid, values, context=context)236 item_obj.create(cr, uid, values, context=context)
236 # we display the composition list view form237 # we display the composition list view form
@@ -1139,7 +1140,8 @@
1139 'hidden_batch_management_mandatory': fields.function(_vals_get, method=True, type='boolean', string='B.Num', multi='get_vals', store=False, readonly=True),1140 'hidden_batch_management_mandatory': fields.function(_vals_get, method=True, type='boolean', string='B.Num', multi='get_vals', store=False, readonly=True),
1140 'hidden_asset_mandatory': fields.function(_vals_get, method=True, type='boolean', string='Asset', multi='get_vals', store=False, readonly=True),1141 'hidden_asset_mandatory': fields.function(_vals_get, method=True, type='boolean', string='Asset', multi='get_vals', store=False, readonly=True),
1141 'inactive_product': fields.function(_get_inactive_product, method=True, type='boolean', string='Product is inactive', store=False, multi='inactive'),1142 'inactive_product': fields.function(_get_inactive_product, method=True, type='boolean', string='Product is inactive', store=False, multi='inactive'),
1142 'inactive_error': fields.function(_get_inactive_product, method=True, type='char', string='Comment', store=False, multi='inactive'),1143 'inactive_error': fields.function(_get_inactive_product, method=True, type='char', string='System message', store=False, multi='inactive'),
1144 'comment': fields.char(size=256, string='Comment'),
1143 }1145 }
11441146
1145 _defaults = {'hidden_batch_management_mandatory': False,1147 _defaults = {'hidden_batch_management_mandatory': False,
11461148
=== modified file 'bin/addons/kit/kit_view.xml'
--- bin/addons/kit/kit_view.xml 2019-10-29 10:38:54 +0000
+++ bin/addons/kit/kit_view.xml 2020-01-27 10:41:41 +0000
@@ -59,7 +59,8 @@
59 <field name="item_uom_id" on_change="onchange_uom_qty(item_uom_id, item_qty)" domain="[('uom_by_product', '=', item_product_id)]" />59 <field name="item_uom_id" on_change="onchange_uom_qty(item_uom_id, item_qty)" domain="[('uom_by_product', '=', item_product_id)]" />
60 <field name="item_asset_id" context="{'product_id': item_product_id}" domain="[('product_id', '=', item_product_id)]"60 <field name="item_asset_id" context="{'product_id': item_product_id}" domain="[('product_id', '=', item_product_id)]"
61 attrs="{'readonly': [('hidden_asset_mandatory', '=', False)]}" />61 attrs="{'readonly': [('hidden_asset_mandatory', '=', False)]}" />
62 <field name="item_lot"62 <field name="comment" />
63 <field name="item_lot"
63 on_change="on_lot_change(item_product_id, item_lot, context)" 64 on_change="on_lot_change(item_product_id, item_lot, context)"
64 attrs="{'readonly': [('hidden_batch_management_mandatory', '=', False)]}" />65 attrs="{'readonly': [('hidden_batch_management_mandatory', '=', False)]}" />
65 <field name="item_exp" attrs="{'readonly': [('hidden_perishable_mandatory', '=', False)]}" />66 <field name="item_exp" attrs="{'readonly': [('hidden_perishable_mandatory', '=', False)]}" />
6667
=== modified file 'bin/addons/kit/report/kit_report.rml'
--- bin/addons/kit/report/kit_report.rml 2018-12-06 10:27:14 +0000
+++ bin/addons/kit/report/kit_report.rml 2020-01-27 10:41:41 +0000
@@ -125,7 +125,7 @@
125 <section>125 <section>
126126
127 <!-- Composition items for Kit Composition List -->127 <!-- Composition items for Kit Composition List -->
128 <blockTable colWidths="90.0,130.0,40.0,60.0,80.0,80.0,60.0,40.0,40.0,170.0" style="LineHeader" repeatRows="1">128 <blockTable colWidths="90.0,130.0,95.0,40.0,30.0,65.0,60.0,60.0,40.0,40.0,140.0" style="LineHeader" repeatRows="1">
129 [[ o.composition_type == 'real' or removeParentNode('blockTable') ]]129 [[ o.composition_type == 'real' or removeParentNode('blockTable') ]]
130 <tr>130 <tr>
131 <td>131 <td>
@@ -135,6 +135,9 @@
135 <para style="LHeader">Product</para>135 <para style="LHeader">Product</para>
136 </td>136 </td>
137 <td>137 <td>
138 <para style="LHeader">Comment</para>
139 </td>
140 <td>
138 <para style="LHeader">Qty</para>141 <para style="LHeader">Qty</para>
139 </td>142 </td>
140 <td>143 <td>
@@ -156,7 +159,7 @@
156 <para style="LHeader">Exp</para>159 <para style="LHeader">Exp</para>
157 </td>160 </td>
158 <td>161 <td>
159 <para style="LHeader">Comment</para>162 <para style="LHeader">System Message</para>
160 </td>163 </td>
161 </tr>164 </tr>
162 <tr>165 <tr>
@@ -168,6 +171,9 @@
168 <para style="Line">[[ item.item_product_id and get_name('product.product', item.item_product_id.id) or '' ]]</para>171 <para style="Line">[[ item.item_product_id and get_name('product.product', item.item_product_id.id) or '' ]]</para>
169 </td>172 </td>
170 <td>173 <td>
174 <para style="Line">[[ item.comment ]]</para>
175 </td>
176 <td>
171 <para style="Line">[[ formatLang(item.item_qty) ]]</para>177 <para style="Line">[[ formatLang(item.item_qty) ]]</para>
172 </td>178 </td>
173 <td>179 <td>
@@ -195,7 +201,7 @@
195 </blockTable>201 </blockTable>
196202
197 <!-- Composition items for Theoretical Kit Composition -->203 <!-- Composition items for Theoretical Kit Composition -->
198 <blockTable colWidths="110.0,200.0,55.0,75.0,50.0,50.0,250.0" style="LineHeader" repeatRows="1">204 <blockTable colWidths="90.0,170.0,165.0,55.0,30.0,40.0,40.0,200.0" style="LineHeader" repeatRows="1">
199 [[ o.composition_type == 'theoretical' or removeParentNode('blockTable') ]]205 [[ o.composition_type == 'theoretical' or removeParentNode('blockTable') ]]
200 <tr>206 <tr>
201 <td>207 <td>
@@ -205,6 +211,9 @@
205 <para style="LHeader">Product</para>211 <para style="LHeader">Product</para>
206 </td>212 </td>
207 <td>213 <td>
214 <para style="LHeader">Comment</para>
215 </td>
216 <td>
208 <para style="LHeader">Qty</para>217 <para style="LHeader">Qty</para>
209 </td>218 </td>
210 <td>219 <td>
@@ -217,7 +226,7 @@
217 <para style="LHeader">Exp</para>226 <para style="LHeader">Exp</para>
218 </td>227 </td>
219 <td>228 <td>
220 <para style="LHeader">Comment</para>229 <para style="LHeader">System Message</para>
221 </td>230 </td>
222 </tr>231 </tr>
223 <tr>232 <tr>
@@ -229,6 +238,9 @@
229 <para style="Line">[[ item.item_product_id and get_name('product.product', item.item_product_id.id) or '' ]]</para>238 <para style="Line">[[ item.item_product_id and get_name('product.product', item.item_product_id.id) or '' ]]</para>
230 </td>239 </td>
231 <td>240 <td>
241 <para style="Line">[[ item.comment ]]</para>
242 </td>
243 <td>
232 <para style="Line">[[ formatLang(item.item_qty) ]]</para>244 <para style="Line">[[ formatLang(item.item_qty) ]]</para>
233 </td>245 </td>
234 <td>246 <td>
235247
=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po 2019-11-21 16:33:04 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po 2020-01-27 10:41:41 +0000
@@ -24510,7 +24510,7 @@
24510#: field:account.commitment,notes:024510#: field:account.commitment,notes:0
24511#: field:account.invoice.line,inactive_error:024511#: field:account.invoice.line,inactive_error:0
24512#: field:res.groups,comment:024512#: field:res.groups,comment:0
24513#: field:composition.item,inactive_error:024513#: field:composition.item,comment:0
24514#: report:kit.report:024514#: report:kit.report:0
24515#: field:msf_button_access_rights.button_access_rule,comment:024515#: field:msf_button_access_rights.button_access_rule,comment:0
24516#: report:addons/msf_doc_import/report/po_simulation_screen_xls_report.mako:23224516#: report:addons/msf_doc_import/report/po_simulation_screen_xls_report.mako:232
@@ -27764,11 +27764,18 @@
27764msgid "Your system will be updated."27764msgid "Your system will be updated."
27765msgstr "Votre système sera mis à jour."27765msgstr "Votre système sera mis à jour."
2776627766
27767#. module: consumption_calculation27767#. module: consumption_calculation, kit
27768#: field:real.average.consumption.line,inactive_error:027768#: field:real.average.consumption.line,inactive_error:0
27769#: field:composition.item,inactive_error:0
27770#: report:kit.report:0
27769msgid "System message"27771msgid "System message"
27770msgstr "Message système"27772msgstr "Message système"
2777127773
27774#. module: kit
27775#: report:kit.report:0
27776msgid "System Message"
27777msgstr "Message Système"
27778
27772#. module: base27779#. module: base
27773#: selection:res.config.users,context_tz:027780#: selection:res.config.users,context_tz:0
27774#: selection:res.users,context_tz:027781#: selection:res.users,context_tz:0

Subscribers

People subscribed via source and target branches