Merge lp:~openerp-dev/openobject-addons/trunk-bug-1089002-kbh into lp:openobject-addons

[Khushboo Bhatt(openerp)]

Hello,
 stock:solved the problem of after Return the all deliver product, the "Return Products" button still there and can not add new products while deliver or return the products.

Thank you,
Khushboo.

[lp:~openerp-dev/openobject-addons/trunk-bug-1089002-kbh]

8296. By Khushboo Bhatt(openerp) on 2012-12-17

[FIX]:stock:improved code

8297. By Khushboo Bhatt(openerp) on 2012-12-17

[FIX]conflicts resolved

Unmerged revisions

8297. By Khushboo Bhatt(openerp) on 2012-12-17

[FIX]conflicts resolved

8296. By Khushboo Bhatt(openerp) on 2012-12-17

[FIX]:stock:improved code

8295. By Khushboo Bhatt(openerp) on 2012-12-17

[MERGE]merge with trunk

8294. By Khushboo Bhatt(openerp) on 2012-12-17

[FIX]:stock:once return product return product button is not visible and can not add item when deliver or receive the product

=== modified file 'stock/stock.py'
--- stock/stock.py	2012-12-16 15:57:40 +0000
+++ stock/stock.py	2012-12-17 10:17:23 +0000
@@ -668,6 +668,7 @@
             ("none", "Not Applicable")], "Invoice Control",
             select=True, required=True, readonly=True, states={'draft': [('readonly', False)]}),
         'company_id': fields.many2one('res.company', 'Company', required=True, select=True, states={'done':[('readonly', True)], 'cancel':[('readonly',True)]}),
+        'return_products': fields.boolean('Return Products'),
     }
     _defaults = {
         'name': lambda self, cr, uid, context: '/',

=== modified file 'stock/stock_view.xml'
--- stock/stock_view.xml	2012-12-14 16:07:36 +0000
+++ stock/stock_view.xml	2012-12-17 10:17:23 +0000
@@ -772,6 +772,7 @@
                             <field name="date"/>
                             <field name="min_date" readonly="1" attrs="{'invisible': [('min_date','=',False)]}"/>
                             <field name="origin" placeholder="e.g. PO0032" class="oe_inline"/>
+                            <field name="return_products" invisible="1"/>
                         </group>
                     </group>
                     <notebook>
@@ -895,7 +896,7 @@
                 </field>
                 <xpath expr="/form/header//button[@name='%(act_stock_return_picking)d']" position="replace">
                     <button name="%(report_picking_list_out)d" string="Print Delivery Slip" type="action" states="done" class="oe_highlight"/>
-                    <button name="%(act_stock_return_picking)d" string="Return Products" states="done" type="action"/>
+                    <button name="%(act_stock_return_picking)d" string="Return Products" type="action" attrs="{'invisible': ['|', ('state', '!=' , 'done'), ('return_products', '=', True)]}"/>
                 </xpath>
                 <xpath expr="/form/header//button[@name='draft_validate']" position="replace">
                     <button name="draft_validate" states="draft" string="Confirm &amp; Deliver" type="object" class="oe_highlight"/>
@@ -921,6 +922,7 @@
                 </xpath>
             </field>
         </record>
+
         <record id="view_picking_out_search" model="ir.ui.view">
             <field name="name">stock.picking.out.search</field>
             <field name="model">stock.picking</field>
@@ -1016,6 +1018,7 @@
                 </tree>
             </field>
         </record>
+
         <record id="view_picking_in_form" model="ir.ui.view">
             <field name="name">stock.picking.in.form</field>
             <field name="model">stock.picking.in</field>
@@ -1025,7 +1028,7 @@
                     <attribute name="string">Date of Reception</attribute>
                 </field>
                 <xpath expr="/form/header//button[@name='%(act_stock_return_picking)d']" position="replace">
-                    <button name="%(act_stock_return_picking)d" string="Return Products" states="done" type="action"/>
+                    <button name="%(act_stock_return_picking)d" string="Return Products" type="action" attrs="{'invisible': ['|', ('state', '!=' , 'done'), ('return_products', '=', True)]}"/>
                 </xpath>
                 <xpath expr="//button[@name='draft_validate']" position="replace">
                     <button name="draft_validate" states="draft" string="Confirm &amp; Receive" type="object" class="oe_highlight"/>
@@ -1047,6 +1050,7 @@
                 </xpath>
             </field>
         </record>
+
         <record id="view_picking_in_search" model="ir.ui.view">
             <field name="name">stock.picking.in.search</field>
             <field name="model">stock.picking.in</field>

=== modified file 'stock/wizard/stock_partial_picking_view.xml'
--- stock/wizard/stock_partial_picking_view.xml	2012-12-13 13:02:36 +0000
+++ stock/wizard/stock_partial_picking_view.xml	2012-12-17 10:17:23 +0000
@@ -18,7 +18,7 @@
                     <field name="hide_tracking" invisible="1"/>
                     <separator string="Transfer Products" name="product_separator"/>
                     <field name="move_ids" context="{'hide_tracking': hide_tracking}">
-                        <tree editable="bottom" string="Product Moves">
+                        <tree string="Product Moves" create="false">
                             <field name="product_id" on_change="onchange_product_id(product_id)"/>
                             <field name="quantity" />
                             <field name="product_uom" groups="product.group_uom"/>

=== modified file 'stock/wizard/stock_return_picking.py'
--- stock/wizard/stock_return_picking.py	2012-12-06 15:38:56 +0000
+++ stock/wizard/stock_return_picking.py	2012-12-17 10:17:23 +0000
@@ -201,6 +201,15 @@
             pick_obj.write(cr, uid, [pick.id], {'invoice_state':'none'}, context=context)
         wf_service.trg_validate(uid, 'stock.picking', new_picking, 'button_confirm', cr)
         pick_obj.force_assign(cr, uid, [new_picking], context)
+
+        valid_lines = 0
+        return_history = self.get_return_history(cr, uid, record_id, context)
+        for m  in pick.move_lines:
+            if m.state == 'done' and m.product_qty * m.product_uom.factor > return_history.get(m.id, 0):
+                valid_lines += 1
+        if not valid_lines:
+            pick_obj.write(cr, uid, [pick.id], {'return_products': True}, context=context)
+
         # Update view id in context, lp:702939
         model_list = {
                 'out': 'stock.picking.out',

=== modified file 'stock/wizard/stock_return_picking_view.xml'
--- stock/wizard/stock_return_picking_view.xml	2012-11-29 22:26:45 +0000
+++ stock/wizard/stock_return_picking_view.xml	2012-12-17 10:17:23 +0000
@@ -58,7 +58,14 @@
                 <form string="Return lines" version="7.0">
                     <label string="Provide the quantities of the returned products."/>
                     <group>
-                        <field name="product_return_moves"/>
+                        <field name="product_return_moves">
+                            <tree string="Moves" create="false">
+                                <field name="product_id" />
+                                <field name="quantity" />
+                            </tree>
+                        </field>
+                    </group>
+                    <group>
                         <field name="invoice_state" />
                     </group>
                     <footer>