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

[Matjaz Kalic]

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

[lp:~matjaz-6/openerpsl/openerpsl_02_17]

373. By Dušan Laznik (Mentis) on 2014-03-24

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

=== modified file 'mrp_procurement_qty/bakery_production_view.xml'
--- mrp_procurement_qty/bakery_production_view.xml	2014-03-19 15:57:31 +0000
+++ mrp_procurement_qty/bakery_production_view.xml	2014-03-24 13:11:25 +0000
@@ -88,7 +88,7 @@
                 		<field name="duration"/>
                     </group>
                     <group string="Details">
-                    	<field name="running"/>
+                    	<field name="running" groups="base.group_erp_manager"/>
                     	<field name="misc"/>
                     	<field name="error"/>
                     </group>
 
=== modified file 'mrp_procurement_qty/report/delivery_order_return_report.rml'
--- mrp_procurement_qty/report/delivery_order_return_report.rml	2014-01-31 13:02:06 +0000
+++ mrp_procurement_qty/report/delivery_order_return_report.rml	2014-03-24 13:11:25 +0000
@@ -36,6 +36,7 @@
       <lineStyle kind="LINEBELOW" colorName="#000000" start="7,-1" stop="7,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="8,-1" stop="8,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="9,-1" stop="9,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="10,-1" stop="10,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Move_Line_Contect_Assign_State">
       <blockAlignment value="LEFT"/>
@@ -50,6 +51,7 @@
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="7,-1" stop="7,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="8,-1" stop="8,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="9,-1" stop="9,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="10,-1" stop="10,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table_sum_price">
       <blockAlignment value="LEFT"/>
@@ -78,13 +80,13 @@
     <paraStyle name="P7" fontName="Helvetica-Bold" fontSize="11.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="P8" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="P9" fontName="Helvetica-Bold" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P10" fontName="Helvetica" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P11" fontName="Helvetica" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P12" fontName="Helvetica-Bold" fontSize="6.0" leading="8" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P13" fontName="Helvetica-Bold" fontSize="6.0" leading="8" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P14" fontName="Helvetica-Bold" fontSize="6.0" leading="8" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P15" fontName="Helvetica-Bold" fontSize="6.0" leading="8" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P16" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P10" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P11" fontName="Helvetica-Bold" fontSize="5.0" leading="7" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P12" fontName="Helvetica-Bold" fontSize="5.0" leading="7" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P13" fontName="Helvetica-Bold" fontSize="5.0" leading="7" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P14" fontName="Helvetica-Bold" fontSize="5.0" leading="7" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P15" fontName="Helvetica" fontSize="5.0" leading="7" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P16" fontName="Helvetica" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="P17" fontName="Helvetica" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="Standard" fontName="Helvetica"/>
     <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
@@ -181,7 +183,7 @@
               </td>
             </tr>
           </blockTable>
-          <para style="P16">
+          <para style="P10">
             <font color="white"> </font>
           </para>
         </td>
@@ -190,37 +192,40 @@
     <para style="terp_default_5cm_Above_Space">
       <font color="white"> </font>
     </para>
-    <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">
+    <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">
       <tr>
         <td>
-          <para style="P14">Opis</para>
-        </td>
-        <td>
-          <para style="P15">EM</para>
-        </td>
-        <td>
-          <para style="P15">Naročena količina</para>
-        </td>
-        <td>
-          <para style="P12">Dobavljena količina</para>
-        </td>
-        <td>
-          <para style="P13">Zadnje vračilo</para>
-        </td>
-        <td>
-          <para style="P13">Za obračun</para>
-        </td>
-        <td>
-          <para style="P13">Cena</para>
-        </td>
-        <td>
-          <para style="P13">Vrednost</para>
-        </td>
-        <td>
-          <para style="P12">Novo naročilo</para>
-        </td>
-        <td>
-          <para style="P12">Novo vračilo</para>
+          <para style="P11">EAN</para>
+        </td>
+        <td>
+          <para style="P11">Opis</para>
+        </td>
+        <td>
+          <para style="P12">EM</para>
+        </td>
+        <td>
+          <para style="P12">Naročena količina</para>
+        </td>
+        <td>
+          <para style="P13">Dobavljena količina</para>
+        </td>
+        <td>
+          <para style="P14">Zadnje vračilo</para>
+        </td>
+        <td>
+          <para style="P14">Za obračun</para>
+        </td>
+        <td>
+          <para style="P14">Cena</para>
+        </td>
+        <td>
+          <para style="P14">Vrednost</para>
+        </td>
+        <td>
+          <para style="P13">Novo naročilo</para>
+        </td>
+        <td>
+          <para style="P13">Novo vračilo</para>
         </td>
       </tr>
     </blockTable>
@@ -228,39 +233,42 @@
       <para style="P2">
         <font face="Helvetica" size="8.0">[[ repeatIn(o['moves'], 'line') ]]</font>
       </para>
-      <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">
+      <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">
         <tr>
           <td>
-            <para style="P10">[[ line[1]['desc'] ]]</para>
-          </td>
-          <td>
-            <para style="P11">[[ line[1]['em'] ]]</para>
-          </td>
-          <td>
-            <para style="P11">[[ formatLang(line[1]['qty_ordered']) ]]</para>
-          </td>
-          <td>
-            <para style="P11">[[ formatLang(line[1]['qty']) ]]</para>
-          </td>
-          <td>
-            <para style="P11">[[ line[1]['qty_returned'] ]]</para>
-          </td>
-          <td>
-            <para style="P11">[[ line[1]['qty_for_invoice'] ]]</para>
-          </td>
-          <td>
-            <para style="P11">[[ formatLang(line[1]['price'], digits=get_digits(dp='Product Price')) ]]</para>
-          </td>
-          <td>
-            <para style="P11">[[ formatLang(line[1]['price_total']) ]]</para>
-          </td>
-          <td>
-            <para style="P11">
+            <para style="P15">[[ line[1]['ean'] ]]</para>
+          </td>
+          <td>
+            <para style="P16">[[ line[1]['desc'] ]]</para>
+          </td>
+          <td>
+            <para style="P17">[[ line[1]['em'] ]]</para>
+          </td>
+          <td>
+            <para style="P17">[[ formatLang(line[1]['qty_ordered']) ]]</para>
+          </td>
+          <td>
+            <para style="P17">[[ formatLang(line[1]['qty']) ]]</para>
+          </td>
+          <td>
+            <para style="P17">[[ line[1]['qty_returned'] ]]</para>
+          </td>
+          <td>
+            <para style="P17">[[ line[1]['qty_for_invoice'] ]]</para>
+          </td>
+          <td>
+            <para style="P17">[[ formatLang(line[1]['price'], digits=get_digits(dp='Product Price')) ]]</para>
+          </td>
+          <td>
+            <para style="P17">[[ formatLang(line[1]['price_total']) ]]</para>
+          </td>
+          <td>
+            <para style="P17">
               <font color="white"> </font>
             </para>
           </td>
           <td>
-            <para style="P11">
+            <para style="P17">
               <font color="white"> </font>
             </para>
           </td>
 
=== modified file 'mrp_procurement_qty/report/delivery_order_return_report.sxw'
 Binary 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
=== modified file 'mrp_procurement_qty/security/ir.model.access.csv'
--- mrp_procurement_qty/security/ir.model.access.csv	2014-03-19 15:57:31 +0000
+++ mrp_procurement_qty/security/ir.model.access.csv	2014-03-24 13:11:25 +0000
@@ -1,6 +1,6 @@
 id,name,model_id/id,group_id/id,perm_read,perm_write,perm_create,perm_unlink
 access_procurement_order_journal,access_procurement_order_journal,model_procurement_order_journal,,True,True,True,True
 access_bakery_process_admin,access_bakery_process_admin,model_bakery_process,base.group_erp_manager,True,True,True,False
-access_bakery_process_user,access_bakery_process_user,model_bakery_process,mrp.group_mrp_user,True,False,False,False
+access_bakery_process_user,access_bakery_process_user,model_bakery_process,mrp.group_mrp_user,True,True,True,False
 access_bakery_production_admin,access_bakery_production_admin,model_bakery_production,base.group_erp_manager,True,True,True,False
-access_bakery_production_user,access_bakery_production_user,model_bakery_production,mrp.group_mrp_user,True,False,False,False
+access_bakery_production_user,access_bakery_production_user,model_bakery_production,mrp.group_mrp_user,True,True,True,False
 
=== modified file 'mrp_procurement_qty/wizard/delivery_order_return.py'
--- mrp_procurement_qty/wizard/delivery_order_return.py	2014-02-03 15:28:57 +0000
+++ mrp_procurement_qty/wizard/delivery_order_return.py	2014-03-24 13:11:25 +0000
@@ -64,6 +64,8 @@
                 move_ids = move_obj.search(cr, uid, [('picking_id','=',pick.id)], order='product_id')
                 for line in move_obj.browse(cr, uid, move_ids):
                     dict_temp = {}
+                    
+                    dict_temp['ean'] = line.product_id.ean13                     
                     naziv = '['+line.product_id.default_code+'] '+line.product_id.name_template
                     if line.product_id.variants:
                         naziv = naziv +' - '+line.product_id.variants
@@ -167,7 +169,8 @@
                 dict_data['address_street'] = pick.partner_id.street
                 dict_data['address_zip'] = pick.partner_id.zip
                 dict_data['address_city'] = pick.partner_id.city
-                dict_data['address_country'] = pick.partner_id.country_id.name
+                trans_country =  trans_obj._get_source(cr, uid, None, 'model', context['lang'], pick.partner_id.country_id.name)
+                dict_data['address_country'] = trans_country
                 dict_data['date'] = pick.date
                 dict_data['origin'] = pick.origin
                 dict_data['note'] = pick.note