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
1=== modified file 'bin/addons/kit/kit.py'
2--- bin/addons/kit/kit.py 2019-10-28 16:42:13 +0000
3+++ bin/addons/kit/kit.py 2020-01-27 10:41:41 +0000
4@@ -231,6 +231,7 @@
5 'item_exp': item_v.item_exp, # is set to False
6 'item_kit_id': obj.id,
7 'item_description': item_v.item_description,
8+ 'comment': item_v.comment,
9 }
10 item_obj.create(cr, uid, values, context=context)
11 # we display the composition list view form
12@@ -1139,7 +1140,8 @@
13 'hidden_batch_management_mandatory': fields.function(_vals_get, method=True, type='boolean', string='B.Num', multi='get_vals', store=False, readonly=True),
14 'hidden_asset_mandatory': fields.function(_vals_get, method=True, type='boolean', string='Asset', multi='get_vals', store=False, readonly=True),
15 'inactive_product': fields.function(_get_inactive_product, method=True, type='boolean', string='Product is inactive', store=False, multi='inactive'),
16- 'inactive_error': fields.function(_get_inactive_product, method=True, type='char', string='Comment', store=False, multi='inactive'),
17+ 'inactive_error': fields.function(_get_inactive_product, method=True, type='char', string='System message', store=False, multi='inactive'),
18+ 'comment': fields.char(size=256, string='Comment'),
19 }
20
21 _defaults = {'hidden_batch_management_mandatory': False,
22
23=== modified file 'bin/addons/kit/kit_view.xml'
24--- bin/addons/kit/kit_view.xml 2019-10-29 10:38:54 +0000
25+++ bin/addons/kit/kit_view.xml 2020-01-27 10:41:41 +0000
26@@ -59,7 +59,8 @@
27 <field name="item_uom_id" on_change="onchange_uom_qty(item_uom_id, item_qty)" domain="[('uom_by_product', '=', item_product_id)]" />
28 <field name="item_asset_id" context="{'product_id': item_product_id}" domain="[('product_id', '=', item_product_id)]"
29 attrs="{'readonly': [('hidden_asset_mandatory', '=', False)]}" />
30- <field name="item_lot"
31+ <field name="comment" />
32+ <field name="item_lot"
33 on_change="on_lot_change(item_product_id, item_lot, context)"
34 attrs="{'readonly': [('hidden_batch_management_mandatory', '=', False)]}" />
35 <field name="item_exp" attrs="{'readonly': [('hidden_perishable_mandatory', '=', False)]}" />
36
37=== modified file 'bin/addons/kit/report/kit_report.rml'
38--- bin/addons/kit/report/kit_report.rml 2018-12-06 10:27:14 +0000
39+++ bin/addons/kit/report/kit_report.rml 2020-01-27 10:41:41 +0000
40@@ -125,7 +125,7 @@
41 <section>
42
43 <!-- Composition items for Kit Composition List -->
44- <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">
45+ <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">
46 [[ o.composition_type == 'real' or removeParentNode('blockTable') ]]
47 <tr>
48 <td>
49@@ -135,6 +135,9 @@
50 <para style="LHeader">Product</para>
51 </td>
52 <td>
53+ <para style="LHeader">Comment</para>
54+ </td>
55+ <td>
56 <para style="LHeader">Qty</para>
57 </td>
58 <td>
59@@ -156,7 +159,7 @@
60 <para style="LHeader">Exp</para>
61 </td>
62 <td>
63- <para style="LHeader">Comment</para>
64+ <para style="LHeader">System Message</para>
65 </td>
66 </tr>
67 <tr>
68@@ -168,6 +171,9 @@
69 <para style="Line">[[ item.item_product_id and get_name('product.product', item.item_product_id.id) or '' ]]</para>
70 </td>
71 <td>
72+ <para style="Line">[[ item.comment ]]</para>
73+ </td>
74+ <td>
75 <para style="Line">[[ formatLang(item.item_qty) ]]</para>
76 </td>
77 <td>
78@@ -195,7 +201,7 @@
79 </blockTable>
80
81 <!-- Composition items for Theoretical Kit Composition -->
82- <blockTable colWidths="110.0,200.0,55.0,75.0,50.0,50.0,250.0" style="LineHeader" repeatRows="1">
83+ <blockTable colWidths="90.0,170.0,165.0,55.0,30.0,40.0,40.0,200.0" style="LineHeader" repeatRows="1">
84 [[ o.composition_type == 'theoretical' or removeParentNode('blockTable') ]]
85 <tr>
86 <td>
87@@ -205,6 +211,9 @@
88 <para style="LHeader">Product</para>
89 </td>
90 <td>
91+ <para style="LHeader">Comment</para>
92+ </td>
93+ <td>
94 <para style="LHeader">Qty</para>
95 </td>
96 <td>
97@@ -217,7 +226,7 @@
98 <para style="LHeader">Exp</para>
99 </td>
100 <td>
101- <para style="LHeader">Comment</para>
102+ <para style="LHeader">System Message</para>
103 </td>
104 </tr>
105 <tr>
106@@ -229,6 +238,9 @@
107 <para style="Line">[[ item.item_product_id and get_name('product.product', item.item_product_id.id) or '' ]]</para>
108 </td>
109 <td>
110+ <para style="Line">[[ item.comment ]]</para>
111+ </td>
112+ <td>
113 <para style="Line">[[ formatLang(item.item_qty) ]]</para>
114 </td>
115 <td>
116
117=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
118--- bin/addons/msf_profile/i18n/fr_MF.po 2019-11-21 16:33:04 +0000
119+++ bin/addons/msf_profile/i18n/fr_MF.po 2020-01-27 10:41:41 +0000
120@@ -24510,7 +24510,7 @@
121 #: field:account.commitment,notes:0
122 #: field:account.invoice.line,inactive_error:0
123 #: field:res.groups,comment:0
124-#: field:composition.item,inactive_error:0
125+#: field:composition.item,comment:0
126 #: report:kit.report:0
127 #: field:msf_button_access_rights.button_access_rule,comment:0
128 #: report:addons/msf_doc_import/report/po_simulation_screen_xls_report.mako:232
129@@ -27764,11 +27764,18 @@
130 msgid "Your system will be updated."
131 msgstr "Votre système sera mis à jour."
132
133-#. module: consumption_calculation
134+#. module: consumption_calculation, kit
135 #: field:real.average.consumption.line,inactive_error:0
136+#: field:composition.item,inactive_error:0
137+#: report:kit.report:0
138 msgid "System message"
139 msgstr "Message système"
140
141+#. module: kit
142+#: report:kit.report:0
143+msgid "System Message"
144+msgstr "Message Système"
145+
146 #. module: base
147 #: selection:res.config.users,context_tz:0
148 #: selection:res.users,context_tz:0

Subscribers

People subscribed via source and target branches