[MERGE] Forward porting of the 7.0 server branch inside trunk until rev4775.

bzr revid: tde@openerp.com-20130110125122-b525s5h1cbrwtxzb

openerp/addons/base/ir/ir_cron_view.xml

@@ -40,7 +40,7 @@
         <record id="ir_cron_view_tree" model="ir.ui.view">
             <field name="model">ir.cron</field>
             <field name="arch" type="xml">
-                <tree string="Scheduled Actions">
+                <tree string="Scheduled Actions" colors="grey:(not active)">
                     <field name="priority" string="Sequence"/>
                     <field name="name"/>
                     <field name="nextcall"/>
@@ -48,6 +48,7 @@
                     <field name="interval_type"/>
                     <field name="numbercall"/>
                     <field name="user_id" invisible="1"/>
+                    <field name="active"/>
                 </tree>
             </field>
         </record>

openerp/service/__init__.py

@@ -130,7 +130,7 @@ def start_services_workers():
 def _reexec():
     """reexecute openerp-server process with (nearly) the same arguments"""
     if openerp.tools.osutil.is_running_as_nt_service():
-        subprocess.call('sc stop {0} && sc start {0}'.format(nt_service_name), shell=True)
+        subprocess.call('net stop {0} && net start {0}'.format(nt_service_name), shell=True)
     exe = os.path.basename(sys.executable)
     strip_args = ['-d', '-u']
     a = sys.argv[:]