Merge lp:~openerp-dev/openobject-addons/trunk-bug-998123-pja into lp:openobject-addons

[Jalpesh Patel(OpenERP)]

hello
        i have been fixed bug we are creating the Picking Reference manual y creation creates always
        a IN picking.
        https://bugs.launchpad.net/openobject-addons/+bug/998123
        Revision ID: <email address hidden>
        Revision No: 7472.
Thanks,
pja

Unmerged revisions

7472. By Jalpesh Patel(OpenERP) on 2012-09-17

[fix]fix bug deliver product produces in-picking

=== modified file 'stock/stock.py'
--- stock/stock.py	2012-09-12 14:40:21 +0000
+++ stock/stock.py	2012-09-17 12:43:20 +0000
@@ -608,7 +608,10 @@
 
     def create(self, cr, user, vals, context=None):
         if ('name' not in vals) or (vals.get('name')=='/'):
-            seq_obj_name =  'stock.picking.' + vals['type']
+            if context.get('picking_type'):
+                seq_obj_name =  'stock.picking.' + context.get('picking_type')
+            else:    
+                seq_obj_name =  'stock.picking.' + vals['type']
             vals['name'] = self.pool.get('ir.sequence').get(cr, user, seq_obj_name)
         new_id = super(stock_picking, self).create(cr, user, vals, context)
         if new_id:

=== modified file 'stock/stock_view.xml'
--- stock/stock_view.xml	2012-09-12 10:00:53 +0000
+++ stock/stock_view.xml	2012-09-17 12:43:20 +0000
@@ -1291,7 +1291,7 @@
                             <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                         </group>
                         <group name="origin_grp" string="Origin">
-                            <field name="picking_id"/>
+                            <field name="picking_id" context="{'picking_type': 'out'}"/>
                             <field name="location_id" groups="stock.group_locations"/>
                             <field name="create_date" groups="base.group_no_one"/>
                         </group>