Merge lp:~vauxoo/helados-gilda/miguel-helados-gilda-933608 into lp:helados-gilda

[Miguel Delgado (Vauxoo)]

[FIX] fix bug 933608

[Gabriela Quilarque (gabrielaquilarque97)]

Hola Migue, no sobre-escribas toda la vista de stock_view.xml, agrega xpath para los botones que vas a modificar.

review: Needs Fixing

[lp:~vauxoo/helados-gilda/miguel-helados-gilda-933608]

531. By Vauxoo on 2012-02-22

[IMP] se modifico la sobre escritura del grupo que contenia todos los botones
para solo hacer un xpath con los botones que se reemplazaron

Unmerged revisions

=== modified file 'extra_trunk_HG/picking_report/report/picking.py'
--- extra_trunk_HG/picking_report/report/picking.py	2012-02-01 15:11:47 +0000
+++ extra_trunk_HG/picking_report/report/picking.py	2012-02-16 17:38:36 +0000
@@ -53,6 +53,8 @@
 
     def _get_spoon(self,id):
         spoon_brw = self.pool.get('stock.picking').browse(self.cr,self.uid,id)
+        self.pool.get('stock.picking').write(self.cr,self.uid,id,{'printed':True})
+        
         spoon_obj = spoon_brw.move_lines
         spoon = 0
         product_id = 897
@@ -75,6 +77,7 @@
         picking_brw = self.pool.get('stock.picking').browse(self.cr,self.uid,id)
         picking_line_obj = self.pool.get('stock.picking').browse(self.cr,self.uid,id).move_lines[0]
         
+        
         value = {
             'name' : prod_brw.name,
             'date_planned' : picking_brw.min_date,
 
=== modified file 'extra_trunk_HG/picking_report/report_picking.xml'
--- extra_trunk_HG/picking_report/report_picking.xml	2011-12-28 21:17:25 +0000
+++ extra_trunk_HG/picking_report/report_picking.xml	2012-02-16 17:38:36 +0000
@@ -4,7 +4,7 @@
 <!--Reporte que sobreescribe el reporte del modulo stock (report_picking_list)  --> 
         <report             
             id="stock.report_picking_list"
-            menu="True"  
+            menu="False"  
             model="stock.picking" 
             name="stock.picking.list2" 
             rml="addons/picking_report/report/picking.rml"
 
=== modified file 'extra_trunk_HG/small_improvements/__openerp__.py'
--- extra_trunk_HG/small_improvements/__openerp__.py	2012-01-14 20:12:43 +0000
+++ extra_trunk_HG/small_improvements/__openerp__.py	2012-02-16 17:38:36 +0000
@@ -61,6 +61,7 @@
         "purchase_view.xml",
         "res_company_view.xml",
         "res_user_view.xml",
+        "stock_view.xml"
     ],
     "active": False,
     "installable": True
 
=== modified file 'extra_trunk_HG/small_improvements/stock.py'
--- extra_trunk_HG/small_improvements/stock.py	2011-12-28 21:58:39 +0000
+++ extra_trunk_HG/small_improvements/stock.py	2012-02-16 17:38:36 +0000
@@ -33,7 +33,11 @@
     _inherit = 'stock.picking'
     _columns = {
         'type': fields.selection([('out', 'Sending Goods'), ('in', 'Getting Goods'), ('internal', 'Internal')], 'Shipping Type', required=True, select=True, readonly=True, help="Shipping type specify, goods coming in or going out."),
+        'printed':fields.boolean('Printed', help="Field to know if the picking_list was printed."),
         }
+    _defaults ={
+    'printed': False
+    }
 stock_picking()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== added file 'extra_trunk_HG/small_improvements/stock_view.xml'
--- extra_trunk_HG/small_improvements/stock_view.xml	1970-01-01 00:00:00 +0000
+++ extra_trunk_HG/small_improvements/stock_view.xml	2012-02-16 17:38:36 +0000
@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+<openerp>
+  <data>
+    <record model="ir.ui.view" id="view_stock_picking_form_inherit">
+      <field name="name">stock.picking.form.inherit</field>
+      <field name="model">stock.picking</field>
+      <field name="type">form</field>
+      <field name="inherit_id" ref="stock.view_picking_out_form"/>
+      <field name="arch" type="xml">
+        <xpath expr="/form/notebook/page/group[@col='12' and @colspan='4']" position="replace">
+            <group col="12" colspan="4">
+                <field name="state" readonly="1"/>
+                <field name="printed" invisible="1"/>
+                <button name="button_cancel" states="assigned,confirmed,draft" string="_Cancel" icon="gtk-cancel"/>
+                <button name="%(stock.report_picking_list)d" attrs="{'invisible': ['|',('state','!=','assigned'),('printed','=',True)]}" type="action" string="Packing List"/>
+                <button name="draft_force_assign" states="draft" string="Process Later" type="object" icon="gtk-ok"/>
+                <button name="draft_validate" states="draft" string="Process Now" type="object" icon="gtk-yes"/>
+                <button name="action_assign" states="confirmed" string="Check Availability" type="object" groups="base.group_extended" icon="gtk-find"/>
+                <button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
+                <button name="action_process" string="Process" attrs="{'invisible': ['|',('state','!=','assigned'),('printed','=',False)]}" type="object" icon="gtk-go-forward"/>
+                <button name="%(stock.act_stock_return_picking)d" string="Return Products" states="done" type="action" icon="gtk-execute"/>
+                <button name="%(stock.action_stock_invoice_onshipping)d" string="Create Invoice" attrs="{'invisible': ['|','|',('state','&lt;&gt;','done'),('invoice_state','=','invoiced'),('invoice_state','=','none')]}"  type="action" icon="terp-gtk-go-back-rtl"/>
+            </group>
+        </xpath>
+      </field>
+    </record>
+  </data>
+</openerp>