Mentis

Merge lp:~matjaz-6/openerpsl/openerpsl_02_17 into lp:openerpsl/7.0

  1. openerpsl_02_17
  2. Merge into 7.0
Proposed by Matjaz Kalic
Status: Merged
Merged at revision: 373
Proposed branch: lp:~matjaz-6/openerpsl/openerpsl_02_17
Merge into: lp:openerpsl/7.0
Diff against target: 240 lines (+79/-68)
4 files modified
mrp_procurement_qty/bakery_production_view.xml (+1/-1)
mrp_procurement_qty/report/delivery_order_return_report.rml (+72/-64)
mrp_procurement_qty/security/ir.model.access.csv (+2/-2)
mrp_procurement_qty/wizard/delivery_order_return.py (+4/-1)
To merge this branch: bzr merge lp:~matjaz-6/openerpsl/openerpsl_02_17
Reviewer Review Type Date Requested Status
Mentis Pending
Review via email: mp+212411@code.launchpad.net

Description of the change

[MOD] delivery_order_return (EAN code added to report, fix country translation)
[MOD] bakery_production (security changed, running status can change only admin)

To post a comment you must log in.
lp:~matjaz-6/openerpsl/openerpsl_02_17 updated
373. By Dušan Laznik (Mentis)

Matjaz 2014-03-24 [MOD] delivery_order_return (EAN code added to report, fix country translation)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'mrp_procurement_qty/bakery_production_view.xml'
2--- mrp_procurement_qty/bakery_production_view.xml 2014-03-19 15:57:31 +0000
3+++ mrp_procurement_qty/bakery_production_view.xml 2014-03-24 13:11:25 +0000
4@@ -88,7 +88,7 @@
5 <field name="duration"/>
6 </group>
7 <group string="Details">
8- <field name="running"/>
9+ <field name="running" groups="base.group_erp_manager"/>
10 <field name="misc"/>
11 <field name="error"/>
12 </group>
13
14=== modified file 'mrp_procurement_qty/report/delivery_order_return_report.rml'
15--- mrp_procurement_qty/report/delivery_order_return_report.rml 2014-01-31 13:02:06 +0000
16+++ mrp_procurement_qty/report/delivery_order_return_report.rml 2014-03-24 13:11:25 +0000
17@@ -36,6 +36,7 @@
18 <lineStyle kind="LINEBELOW" colorName="#000000" start="7,-1" stop="7,-1"/>
19 <lineStyle kind="LINEBELOW" colorName="#000000" start="8,-1" stop="8,-1"/>
20 <lineStyle kind="LINEBELOW" colorName="#000000" start="9,-1" stop="9,-1"/>
21+ <lineStyle kind="LINEBELOW" colorName="#000000" start="10,-1" stop="10,-1"/>
22 </blockTableStyle>
23 <blockTableStyle id="Move_Line_Contect_Assign_State">
24 <blockAlignment value="LEFT"/>
25@@ -50,6 +51,7 @@
26 <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="7,-1" stop="7,-1"/>
27 <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="8,-1" stop="8,-1"/>
28 <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="9,-1" stop="9,-1"/>
29+ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="10,-1" stop="10,-1"/>
30 </blockTableStyle>
31 <blockTableStyle id="Table_sum_price">
32 <blockAlignment value="LEFT"/>
33@@ -78,13 +80,13 @@
34 <paraStyle name="P7" fontName="Helvetica-Bold" fontSize="11.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
35 <paraStyle name="P8" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
36 <paraStyle name="P9" fontName="Helvetica-Bold" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
37- <paraStyle name="P10" fontName="Helvetica" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
38- <paraStyle name="P11" fontName="Helvetica" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
39- <paraStyle name="P12" fontName="Helvetica-Bold" fontSize="6.0" leading="8" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
40- <paraStyle name="P13" fontName="Helvetica-Bold" fontSize="6.0" leading="8" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
41- <paraStyle name="P14" fontName="Helvetica-Bold" fontSize="6.0" leading="8" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
42- <paraStyle name="P15" fontName="Helvetica-Bold" fontSize="6.0" leading="8" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
43- <paraStyle name="P16" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
44+ <paraStyle name="P10" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
45+ <paraStyle name="P11" fontName="Helvetica-Bold" fontSize="5.0" leading="7" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
46+ <paraStyle name="P12" fontName="Helvetica-Bold" fontSize="5.0" leading="7" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
47+ <paraStyle name="P13" fontName="Helvetica-Bold" fontSize="5.0" leading="7" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
48+ <paraStyle name="P14" fontName="Helvetica-Bold" fontSize="5.0" leading="7" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
49+ <paraStyle name="P15" fontName="Helvetica" fontSize="5.0" leading="7" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
50+ <paraStyle name="P16" fontName="Helvetica" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
51 <paraStyle name="P17" fontName="Helvetica" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
52 <paraStyle name="Standard" fontName="Helvetica"/>
53 <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
54@@ -181,7 +183,7 @@
55 </td>
56 </tr>
57 </blockTable>
58- <para style="P16">
59+ <para style="P10">
60 <font color="white"> </font>
61 </para>
62 </td>
63@@ -190,37 +192,40 @@
64 <para style="terp_default_5cm_Above_Space">
65 <font color="white"> </font>
66 </para>
67- <blockTable colWidths="176.0,28.0,38.0,38.0,41.0,42.0,37.0,43.0,37.0,38.0" repeatRows="1" style="Move_Line_Header">
68+ <blockTable colWidths="47.0,181.0,26.0,40.0,37.0,26.0,35.0,34.0,35.0,27.0,28.0" repeatRows="1" style="Move_Line_Header">
69 <tr>
70 <td>
71- <para style="P14">Opis</para>
72- </td>
73- <td>
74- <para style="P15">EM</para>
75- </td>
76- <td>
77- <para style="P15">Naročena količina</para>
78- </td>
79- <td>
80- <para style="P12">Dobavljena količina</para>
81- </td>
82- <td>
83- <para style="P13">Zadnje vračilo</para>
84- </td>
85- <td>
86- <para style="P13">Za obračun</para>
87- </td>
88- <td>
89- <para style="P13">Cena</para>
90- </td>
91- <td>
92- <para style="P13">Vrednost</para>
93- </td>
94- <td>
95- <para style="P12">Novo naročilo</para>
96- </td>
97- <td>
98- <para style="P12">Novo vračilo</para>
99+ <para style="P11">EAN</para>
100+ </td>
101+ <td>
102+ <para style="P11">Opis</para>
103+ </td>
104+ <td>
105+ <para style="P12">EM</para>
106+ </td>
107+ <td>
108+ <para style="P12">Naročena količina</para>
109+ </td>
110+ <td>
111+ <para style="P13">Dobavljena količina</para>
112+ </td>
113+ <td>
114+ <para style="P14">Zadnje vračilo</para>
115+ </td>
116+ <td>
117+ <para style="P14">Za obračun</para>
118+ </td>
119+ <td>
120+ <para style="P14">Cena</para>
121+ </td>
122+ <td>
123+ <para style="P14">Vrednost</para>
124+ </td>
125+ <td>
126+ <para style="P13">Novo naročilo</para>
127+ </td>
128+ <td>
129+ <para style="P13">Novo vračilo</para>
130 </td>
131 </tr>
132 </blockTable>
133@@ -228,39 +233,42 @@
134 <para style="P2">
135 <font face="Helvetica" size="8.0">[[ repeatIn(o['moves'], 'line') ]]</font>
136 </para>
137- <blockTable colWidths="177.0,28.0,38.0,39.0,41.0,42.0,37.0,43.0,37.0,38.0" style="Move_Line_Contect_Assign_State">
138+ <blockTable colWidths="48.0,182.0,26.0,40.0,37.0,26.0,35.0,34.0,35.0,28.0,27.0" style="Move_Line_Contect_Assign_State">
139 <tr>
140 <td>
141- <para style="P10">[[ line[1]['desc'] ]]</para>
142- </td>
143- <td>
144- <para style="P11">[[ line[1]['em'] ]]</para>
145- </td>
146- <td>
147- <para style="P11">[[ formatLang(line[1]['qty_ordered']) ]]</para>
148- </td>
149- <td>
150- <para style="P11">[[ formatLang(line[1]['qty']) ]]</para>
151- </td>
152- <td>
153- <para style="P11">[[ line[1]['qty_returned'] ]]</para>
154- </td>
155- <td>
156- <para style="P11">[[ line[1]['qty_for_invoice'] ]]</para>
157- </td>
158- <td>
159- <para style="P11">[[ formatLang(line[1]['price'], digits=get_digits(dp='Product Price')) ]]</para>
160- </td>
161- <td>
162- <para style="P11">[[ formatLang(line[1]['price_total']) ]]</para>
163- </td>
164- <td>
165- <para style="P11">
166+ <para style="P15">[[ line[1]['ean'] ]]</para>
167+ </td>
168+ <td>
169+ <para style="P16">[[ line[1]['desc'] ]]</para>
170+ </td>
171+ <td>
172+ <para style="P17">[[ line[1]['em'] ]]</para>
173+ </td>
174+ <td>
175+ <para style="P17">[[ formatLang(line[1]['qty_ordered']) ]]</para>
176+ </td>
177+ <td>
178+ <para style="P17">[[ formatLang(line[1]['qty']) ]]</para>
179+ </td>
180+ <td>
181+ <para style="P17">[[ line[1]['qty_returned'] ]]</para>
182+ </td>
183+ <td>
184+ <para style="P17">[[ line[1]['qty_for_invoice'] ]]</para>
185+ </td>
186+ <td>
187+ <para style="P17">[[ formatLang(line[1]['price'], digits=get_digits(dp='Product Price')) ]]</para>
188+ </td>
189+ <td>
190+ <para style="P17">[[ formatLang(line[1]['price_total']) ]]</para>
191+ </td>
192+ <td>
193+ <para style="P17">
194 <font color="white"> </font>
195 </para>
196 </td>
197 <td>
198- <para style="P11">
199+ <para style="P17">
200 <font color="white"> </font>
201 </para>
202 </td>
203
204=== modified file 'mrp_procurement_qty/report/delivery_order_return_report.sxw'
205Binary files mrp_procurement_qty/report/delivery_order_return_report.sxw 2014-01-31 13:02:06 +0000 and mrp_procurement_qty/report/delivery_order_return_report.sxw 2014-03-24 13:11:25 +0000 differ
206=== modified file 'mrp_procurement_qty/security/ir.model.access.csv'
207--- mrp_procurement_qty/security/ir.model.access.csv 2014-03-19 15:57:31 +0000
208+++ mrp_procurement_qty/security/ir.model.access.csv 2014-03-24 13:11:25 +0000
209@@ -1,6 +1,6 @@
210 id,name,model_id/id,group_id/id,perm_read,perm_write,perm_create,perm_unlink
211 access_procurement_order_journal,access_procurement_order_journal,model_procurement_order_journal,,True,True,True,True
212 access_bakery_process_admin,access_bakery_process_admin,model_bakery_process,base.group_erp_manager,True,True,True,False
213-access_bakery_process_user,access_bakery_process_user,model_bakery_process,mrp.group_mrp_user,True,False,False,False
214+access_bakery_process_user,access_bakery_process_user,model_bakery_process,mrp.group_mrp_user,True,True,True,False
215 access_bakery_production_admin,access_bakery_production_admin,model_bakery_production,base.group_erp_manager,True,True,True,False
216-access_bakery_production_user,access_bakery_production_user,model_bakery_production,mrp.group_mrp_user,True,False,False,False
217+access_bakery_production_user,access_bakery_production_user,model_bakery_production,mrp.group_mrp_user,True,True,True,False
218
219=== modified file 'mrp_procurement_qty/wizard/delivery_order_return.py'
220--- mrp_procurement_qty/wizard/delivery_order_return.py 2014-02-03 15:28:57 +0000
221+++ mrp_procurement_qty/wizard/delivery_order_return.py 2014-03-24 13:11:25 +0000
222@@ -64,6 +64,8 @@
223 move_ids = move_obj.search(cr, uid, [('picking_id','=',pick.id)], order='product_id')
224 for line in move_obj.browse(cr, uid, move_ids):
225 dict_temp = {}
226+
227+ dict_temp['ean'] = line.product_id.ean13
228 naziv = '['+line.product_id.default_code+'] '+line.product_id.name_template
229 if line.product_id.variants:
230 naziv = naziv +' - '+line.product_id.variants
231@@ -167,7 +169,8 @@
232 dict_data['address_street'] = pick.partner_id.street
233 dict_data['address_zip'] = pick.partner_id.zip
234 dict_data['address_city'] = pick.partner_id.city
235- dict_data['address_country'] = pick.partner_id.country_id.name
236+ trans_country = trans_obj._get_source(cr, uid, None, 'model', context['lang'], pick.partner_id.country_id.name)
237+ dict_data['address_country'] = trans_country
238 dict_data['date'] = pick.date
239 dict_data['origin'] = pick.origin
240 dict_data['note'] = pick.note

Subscribers

People subscribed via source and target branches