Thibault Delavallée (OpenERP) has proposed merging
lp:~openerp-dev/openobject-server/trunk-forward-7.0-tde into
lp:openobject-server.
Requested reviews:
OpenERP Core Team (openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-server/trunk-forward-7.0-tde/+merge/142680
[MERGE] Forward porting of the 7.0 server branch inside trunk until rev4775.
--
https://code.launchpad.net/~openerp-dev/openobject-server/trunk-forward-7.0-tde/+merge/142680
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-server/trunk-forward-7.0-tde.
=== modified file 'openerp/addons/base/ir/ir_cron_view.xml'
--- openerp/addons/base/ir/ir_cron_view.xml 2012-10-13 12:09:24 +0000
+++ openerp/addons/base/ir/ir_cron_view.xml 2013-01-10 13:11:39 +0000
@@ -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>
=== modified file 'openerp/service/__init__.py'
--- openerp/service/__init__.py 2012-12-10 13:24:06 +0000
+++ openerp/service/__init__.py 2013-01-10 13:11:39 +0000
@@ -130,7 +130,7 @@
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[:]
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : openerp-dev-gtk@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
