Merge lp:~openerp-dev/openobject-addons/trunk-bug-1248135-ssh into lp:openobject-addons

[Sunil Sharma(OpenERP)]

Hello,

       I have improve the onchange set type service valuation is periodic and product view in stock .

Thanks
Sunil Sharma

[lp:~openerp-dev/openobject-addons/trunk-bug-1248135-ssh]

9024. By Sunil Sharma(OpenERP) on 2013-12-31

[IMP]:improve code

9025. By Sunil Sharma(OpenERP) on 2013-12-31

[MRG]:lp:openobject-addons

Unmerged revisions

9025. By Sunil Sharma(OpenERP) on 2013-12-31

[MRG]:lp:openobject-addons

9024. By Sunil Sharma(OpenERP) on 2013-12-31

[IMP]:improve code

9023. By Sunil Sharma(OpenERP) on 2013-12-20

[IMP]:stock:onchange set type service valuation is periodic

=== modified file 'stock/product.py'
--- stock/product.py	2013-10-27 12:31:04 +0000
+++ stock/product.py	2013-12-31 07:23:33 +0000
@@ -471,6 +471,11 @@
                         res['fields']['qty_available']['string'] = _('Produced Qty')
         return res
 
+    def onchange_set_type(self, cr, uid, ids, type, context=None):
+        val = {}
+        if type == 'service':
+           val['valuation'] ='manual_periodic'
+        return {'value': val}
 
 class product_template(osv.osv):
     _name = 'product.template'

=== modified file 'stock/product_view.xml'
--- stock/product_view.xml	2013-11-27 15:32:57 +0000
+++ stock/product_view.xml	2013-12-31 07:23:33 +0000
@@ -170,10 +170,12 @@
                     </group>
                     <newline/>
                 </xpath>
+                <xpath expr="//page[@string='Information']/group/group/field[@name='type']" position="attributes">
+                    <attribute name="on_change">onchange_set_type(type, context)</attribute>
+                </xpath>
             </field>
         </record>
 
-
         <record id="action_receive_move" model="ir.actions.act_window">
             <field name="name">Receptions</field>
             <field name="res_model">stock.move</field>