openerp-dev-web team mailing list archive

[xrg <xrg@xxxxxxxxx>]

xrg has proposed merging lp:~openerp-dev/openobject-server/6.0-bug-768294-xrg into lp:openobject-server/6.0.

Requested reviews:
  OpenERP Core Team (openerp)
Related bugs:
  Bug #768294 in OpenERP Server: "server-init: add the required Default-Stop tag"
  https://bugs.launchpad.net/openobject-server/+bug/768294

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-server/6.0-bug-768294-xrg/+merge/58719
-- 
https://code.launchpad.net/~openerp-dev/openobject-server/6.0-bug-768294-xrg/+merge/58719
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-server/6.0-bug-768294-xrg.

=== modified file 'README'
--- README	2010-09-28 18:53:49 +0000
+++ README	2011-04-21 17:29:27 +0000
@@ -1,17 +1,17 @@
-About OpenERP
----------------
-
-OpenERP is a free Enterprise Resource Planning and Customer Relationship 
-Management software. It is mainly developed to meet changing needs.
-
-The main functional features are: CRM & SRM, analytic and financial accounting,
-double-entry stock management, sales and purchases management, tasks automation,
-help desk, marketing campaign, ... and vertical modules for very specific 
-businesses.
-
-Technical features include a distributed server, flexible workflows, an object 
-database, dynamic GUIs, customizable reports, NET-RPC and XML-RPC interfaces, ...
-
-For more information, please visit: 
-http://www.openerp.com
-
+About OpenERP
+---------------
+
+OpenERP is a free Enterprise Resource Planning and Customer Relationship 
+Management software. It is mainly developed to meet changing needs.
+
+The main functional features are: CRM & SRM, analytic and financial accounting,
+double-entry stock management, sales and purchases management, tasks automation,
+help desk, marketing campaign, ... and vertical modules for very specific 
+businesses.
+
+Technical features include a distributed server, flexible workflows, an object 
+database, dynamic GUIs, customizable reports, NET-RPC and XML-RPC interfaces, ...
+
+For more information, please visit: 
+http://www.openerp.com
+

=== modified file 'bin/netsvc.py'
--- bin/netsvc.py	2011-01-18 18:01:54 +0000
+++ bin/netsvc.py	2011-04-21 17:29:27 +0000
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ##############################################################################
 #

=== modified file 'bin/osv/expression.py'
--- bin/osv/expression.py	2011-01-17 08:41:08 +0000
+++ bin/osv/expression.py	2011-04-21 17:29:27 +0000
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ##############################################################################
 #

=== modified file 'doc/openerp-server.init'
--- doc/openerp-server.init	2009-10-23 22:29:25 +0000
+++ doc/openerp-server.init	2011-04-21 17:29:27 +0000
@@ -14,6 +14,7 @@
 # Required-Stop: postgresql
 # Should-Start: $network harddrake
 # Default-Start: 345
+# Default-Stop: 3 4 5
 # Short-Description: Launches the OpenERP server.
 # Description: This startup script launches the OpenERP server.
 ### END INIT INFO