From dbe1e8ca98abebcb6045614d6ced335e3edb9bf6 Mon Sep 17 00:00:00 2001 From: Stephane Wirtel <stephane@tinyerp.com> Date: Wed, 10 Sep 2008 10:46:40 +0200 Subject: [PATCH] Rename Tiny ERP to OpenERP Rename tinyerp to openerp bzr revid: stephane@tinyerp.com-20080910084640-bg1h1bre7mwky8s0 --- bin/PKG-INFO | 12 ++-- bin/addons/base/__terp__.py | 4 +- bin/addons/base/i18n/cs_CZ.po | 2 +- bin/addons/base/i18n/de_DE.po | 2 +- bin/addons/base/i18n/es_AR.po | 2 +- bin/addons/base/i18n/es_ES.po | 2 +- bin/addons/base/i18n/fr_FR.po | 2 +- bin/addons/base/i18n/hu_HU.po | 2 +- bin/addons/base/i18n/it_IT.po | 2 +- bin/addons/base/i18n/nl_NL.po | 2 +- bin/addons/base/i18n/pt_BR.po | 2 +- bin/addons/base/i18n/pt_PT.po | 2 +- bin/addons/base/i18n/ro_RO.po | 2 +- bin/addons/base/i18n/ru_RU.po | 2 +- bin/addons/base/i18n/sv_SE.po | 2 +- bin/addons/base/i18n/zh_CN.po | 2 +- bin/addons/base/i18n/zh_TW.po | 2 +- bin/addons/base/ir/ir_report_custom.py | 2 +- bin/addons/base/module/module_data.xml | 6 +- bin/addons/base/report/custom.xsl | 5 +- bin/addons/base/report/custom_default.xsl | 2 +- bin/addons/base/report/custom_rml.xsl | 2 +- bin/addons/base/report/rml_template.xsl | 2 +- bin/addons/base/res/partner/partner_demo.xml | 4 +- .../base/res/partner/report/business_card.xsl | 3 +- .../res/partner/report/partner_address.xsl | 3 +- bin/openerp-server.py | 12 ++-- bin/osv/orm.py | 2 +- bin/report/render/simple.py | 2 +- bin/service/web_services.py | 4 +- bin/tools/config.py | 12 ++-- bin/tools/import_email.py | 2 +- bin/tools/misc.py | 4 +- bin/tools/translate.py | 2 +- doc/INSTALL | 6 +- doc/README.txt | 10 ++-- doc/tests/check_profile_l10n_all.py | 2 +- man/openerp-server.1 | 10 ++-- man/openerp_serverrc.5 | 2 +- setup.py | 60 +++++++++---------- win32/OpenERPServerService.py | 24 ++++---- win32/setup.py | 2 +- win32/start.bat | 4 +- win32/stop.bat | 2 +- 44 files changed, 120 insertions(+), 117 deletions(-) diff --git a/bin/PKG-INFO b/bin/PKG-INFO index eab85ed90011..c74326a14931 100644 --- a/bin/PKG-INFO +++ b/bin/PKG-INFO @@ -1,18 +1,18 @@ Metadata-Version: 1.1 -Name: Tiny ERP -Version: 4.3.0 +Name: OpenERP +Version: 4.3.99 Author: Tiny.be Author-email: fp at tiny be Maintainer: Tiny.be Maintainer-email: fp at tiny be Home-page: http://tiny.be -Download-url: http://tinyerp.org/download.php -Summary: TinyERP is an Enterprise Resource Management written entirely in python. +Download-url: http://openerp.com/downloads.html +Summary: OpenERP is an Enterprise Resource Management written entirely in python. License: GPL -Description: Tiny ERP is a complete ERP and CRM. The main features are accounting (analytic +Description: OpenERP is a complete ERP and CRM. The main features are accounting (analytic and financial), stock management, sales and purchases management, tasks automation, marketing campaigns, help desk, POS, etc. Technical features include a distributed server, flexible workflows, an object database, a dynamic GUI, - customizable reports, and SOAP and XML-RPC interfaces. + customizable reports, and NET-RPC and XML-RPC interfaces. Keywords: ERP, Accounting, Stock, CRM, Enterprise, Logistics, Management, Sales, Purchases Platform: Linux, Win32 diff --git a/bin/addons/base/__terp__.py b/bin/addons/base/__terp__.py index 5ba01da68b68..917a0ff35417 100644 --- a/bin/addons/base/__terp__.py +++ b/bin/addons/base/__terp__.py @@ -31,9 +31,9 @@ "name" : "Base", "version" : "1.0", "author" : "Tiny", - "website" : "http://tinyerp.com", + "website" : "http://openerp.com", "category" : "Generic Modules/Base", - "description": "The kernel of Tiny ERP, needed for all installation.", + "description": "The kernel of OpenERP, needed for all installation.", "depends" : [], "init_xml" : [ "base_data.xml", diff --git a/bin/addons/base/i18n/cs_CZ.po b/bin/addons/base/i18n/cs_CZ.po index 95f8ebbb3b4f..cebcb8a4b47f 100644 --- a/bin/addons/base/i18n/cs_CZ.po +++ b/bin/addons/base/i18n/cs_CZ.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 4.3.0" -"Report-Msgid-Bugs-To: support@tinyerp.com" +"Report-Msgid-Bugs-To: support@openerp.com" "POT-Creation-Date: 2008-09-04 08:32:29+0000" "PO-Revision-Date: 2008-09-04 08:32:29+0000" "Last-Translator: <>" diff --git a/bin/addons/base/i18n/de_DE.po b/bin/addons/base/i18n/de_DE.po index 796ad959f45a..7a62e651c63b 100644 --- a/bin/addons/base/i18n/de_DE.po +++ b/bin/addons/base/i18n/de_DE.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 4.3.0" -"Report-Msgid-Bugs-To: support@tinyerp.com" +"Report-Msgid-Bugs-To: support@openerp.com" "POT-Creation-Date: 2008-09-04 08:33:13+0000" "PO-Revision-Date: 2008-09-04 08:33:13+0000" "Last-Translator: <>" diff --git a/bin/addons/base/i18n/es_AR.po b/bin/addons/base/i18n/es_AR.po index f3414aa1ee81..f00d642000f8 100644 --- a/bin/addons/base/i18n/es_AR.po +++ b/bin/addons/base/i18n/es_AR.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 4.3.0" -"Report-Msgid-Bugs-To: support@tinyerp.com" +"Report-Msgid-Bugs-To: support@openerp.com" "POT-Creation-Date: 2008-09-04 08:34:02+0000" "PO-Revision-Date: 2008-09-04 08:34:02+0000" "Last-Translator: <>" diff --git a/bin/addons/base/i18n/es_ES.po b/bin/addons/base/i18n/es_ES.po index e0b7026bf456..bf2e8a57a6ee 100644 --- a/bin/addons/base/i18n/es_ES.po +++ b/bin/addons/base/i18n/es_ES.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 4.3.0" -"Report-Msgid-Bugs-To: support@tinyerp.com" +"Report-Msgid-Bugs-To: support@openerp.com" "POT-Creation-Date: 2008-09-04 08:34:48+0000" "PO-Revision-Date: 2008-09-04 08:34:48+0000" "Last-Translator: <>" diff --git a/bin/addons/base/i18n/fr_FR.po b/bin/addons/base/i18n/fr_FR.po index 6b0a938841d4..13dc60cef9d7 100644 --- a/bin/addons/base/i18n/fr_FR.po +++ b/bin/addons/base/i18n/fr_FR.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 4.3.0" -"Report-Msgid-Bugs-To: support@tinyerp.com" +"Report-Msgid-Bugs-To: support@openerp.com" "POT-Creation-Date: 2008-09-04 08:35:53+0000" "PO-Revision-Date: 2008-09-04 08:35:53+0000" "Last-Translator: <>" diff --git a/bin/addons/base/i18n/hu_HU.po b/bin/addons/base/i18n/hu_HU.po index be29b43097b6..065fabee0e90 100644 --- a/bin/addons/base/i18n/hu_HU.po +++ b/bin/addons/base/i18n/hu_HU.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 4.3.0" -"Report-Msgid-Bugs-To: support@tinyerp.com" +"Report-Msgid-Bugs-To: support@openerp.com" "POT-Creation-Date: 2008-09-04 08:36:32+0000" "PO-Revision-Date: 2008-09-04 08:36:32+0000" "Last-Translator: <>" diff --git a/bin/addons/base/i18n/it_IT.po b/bin/addons/base/i18n/it_IT.po index 20332511512f..d656bb36514b 100644 --- a/bin/addons/base/i18n/it_IT.po +++ b/bin/addons/base/i18n/it_IT.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 4.3.0" -"Report-Msgid-Bugs-To: support@tinyerp.com" +"Report-Msgid-Bugs-To: support@openerp.com" "POT-Creation-Date: 2008-09-04 08:37:25+0000" "PO-Revision-Date: 2008-09-04 08:37:25+0000" "Last-Translator: <>" diff --git a/bin/addons/base/i18n/nl_NL.po b/bin/addons/base/i18n/nl_NL.po index e152a5eab0aa..7a57a286cdb7 100644 --- a/bin/addons/base/i18n/nl_NL.po +++ b/bin/addons/base/i18n/nl_NL.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 4.3.0" -"Report-Msgid-Bugs-To: support@tinyerp.com" +"Report-Msgid-Bugs-To: support@openerp.com" "POT-Creation-Date: 2008-09-04 08:38:11+0000" "PO-Revision-Date: 2008-09-04 08:38:11+0000" "Last-Translator: <>" diff --git a/bin/addons/base/i18n/pt_BR.po b/bin/addons/base/i18n/pt_BR.po index 89b21f1cff40..a1a632e58a4c 100644 --- a/bin/addons/base/i18n/pt_BR.po +++ b/bin/addons/base/i18n/pt_BR.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 4.3.0" -"Report-Msgid-Bugs-To: support@tinyerp.com" +"Report-Msgid-Bugs-To: support@openerp.com" "POT-Creation-Date: 2008-09-04 08:38:52+0000" "PO-Revision-Date: 2008-09-04 08:38:52+0000" "Last-Translator: <>" diff --git a/bin/addons/base/i18n/pt_PT.po b/bin/addons/base/i18n/pt_PT.po index 0878619590ac..8e86560093c1 100644 --- a/bin/addons/base/i18n/pt_PT.po +++ b/bin/addons/base/i18n/pt_PT.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 4.3.0" -"Report-Msgid-Bugs-To: support@tinyerp.com" +"Report-Msgid-Bugs-To: support@openerp.com" "POT-Creation-Date: 2008-09-04 08:39:40+0000" "PO-Revision-Date: 2008-09-04 08:39:40+0000" "Last-Translator: <>" diff --git a/bin/addons/base/i18n/ro_RO.po b/bin/addons/base/i18n/ro_RO.po index 4e3049c65d96..a56056d51a5c 100644 --- a/bin/addons/base/i18n/ro_RO.po +++ b/bin/addons/base/i18n/ro_RO.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 4.3.0" -"Report-Msgid-Bugs-To: support@tinyerp.com" +"Report-Msgid-Bugs-To: support@openerp.com" "POT-Creation-Date: 2008-09-04 08:40:19+0000" "PO-Revision-Date: 2008-09-04 08:40:19+0000" "Last-Translator: <>" diff --git a/bin/addons/base/i18n/ru_RU.po b/bin/addons/base/i18n/ru_RU.po index 20ecb44fe017..13c1c714a26c 100644 --- a/bin/addons/base/i18n/ru_RU.po +++ b/bin/addons/base/i18n/ru_RU.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 4.3.0" -"Report-Msgid-Bugs-To: support@tinyerp.com" +"Report-Msgid-Bugs-To: support@openerp.com" "POT-Creation-Date: 2008-09-04 08:41:03+0000" "PO-Revision-Date: 2008-09-04 08:41:03+0000" "Last-Translator: <>" diff --git a/bin/addons/base/i18n/sv_SE.po b/bin/addons/base/i18n/sv_SE.po index 9e65d0041402..7b49d38198bd 100644 --- a/bin/addons/base/i18n/sv_SE.po +++ b/bin/addons/base/i18n/sv_SE.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 4.3.0" -"Report-Msgid-Bugs-To: support@tinyerp.com" +"Report-Msgid-Bugs-To: support@openerp.com" "POT-Creation-Date: 2008-09-04 08:41:45+0000" "PO-Revision-Date: 2008-09-04 08:41:45+0000" "Last-Translator: <>" diff --git a/bin/addons/base/i18n/zh_CN.po b/bin/addons/base/i18n/zh_CN.po index 9fe9773b0a88..80708aff4ae9 100644 --- a/bin/addons/base/i18n/zh_CN.po +++ b/bin/addons/base/i18n/zh_CN.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 4.3.0" -"Report-Msgid-Bugs-To: support@tinyerp.com" +"Report-Msgid-Bugs-To: support@openerp.com" "POT-Creation-Date: 2008-09-04 08:42:44+0000" "PO-Revision-Date: 2008-09-04 08:42:44+0000" "Last-Translator: <>" diff --git a/bin/addons/base/i18n/zh_TW.po b/bin/addons/base/i18n/zh_TW.po index 2e3e6c54493d..791cd0df4162 100644 --- a/bin/addons/base/i18n/zh_TW.po +++ b/bin/addons/base/i18n/zh_TW.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 4.3.0" -"Report-Msgid-Bugs-To: support@tinyerp.com" +"Report-Msgid-Bugs-To: support@openerp.com" "POT-Creation-Date: 2008-09-04 08:43:25+0000" "PO-Revision-Date: 2008-09-04 08:43:25+0000" "Last-Translator: <>" diff --git a/bin/addons/base/ir/ir_report_custom.py b/bin/addons/base/ir/ir_report_custom.py index 1d0dddd3a379..3a7ca1dd07e1 100644 --- a/bin/addons/base/ir/ir_report_custom.py +++ b/bin/addons/base/ir/ir_report_custom.py @@ -58,7 +58,7 @@ class report_custom(osv.osv): 'print_orientation': lambda *a: 'portrait', 'state': lambda *a: 'unsubscribed', 'type': lambda *a: 'table', - 'footer': lambda *a: 'Generated by Tiny ERP' + 'footer': lambda *a: 'Generated by OpenERP' } def onchange_model_id(self, cr, uid, ids, model_id): diff --git a/bin/addons/base/module/module_data.xml b/bin/addons/base/module/module_data.xml index 1f632c7ef086..940dd3833c98 100644 --- a/bin/addons/base/module/module_data.xml +++ b/bin/addons/base/module/module_data.xml @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <terp> <data> - <record id="module_repository_tiny" model="ir.module.repository"> - <field name="name">Tiny ERP</field> + <record id="module_repository_openerp" model="ir.module.repository"> + <field name="name">OpenERP</field> <field name="url">http://www.openerp.com/download/modules/</field> <field eval="False" name="active"/> <field eval="'href="([a-zA-Z0-9_]+)-('+version+'.(\\d+)((\\.\\d+)*)([a-z]?)((_(pre|p|beta|alpha|rc)\\d*)*)(-r(\\d+))?)(\.zip)"'" name="filter"/> </record> </data> -</terp> \ No newline at end of file +</terp> diff --git a/bin/addons/base/report/custom.xsl b/bin/addons/base/report/custom.xsl index e40c62ddb2a4..1e5fd740c0f3 100644 --- a/bin/addons/base/report/custom.xsl +++ b/bin/addons/base/report/custom.xsl @@ -7,7 +7,8 @@ <xsl:template match="report"> <document filename="example_5.pdf"> - <template leftMargin="1.5cm" rightMargin="1.5cm" topMargin="1.5cm" bottomMargin="1.5cm" title="Reporting" author="Generated by Tiny ERP, Fabien Pinckaers"> + <template leftMargin="1.5cm" rightMargin="1.5cm" topMargin="1.5cm" bottomMargin="1.5cm" + title="Reporting" author="Generated by OpenERP, Fabien Pinckaers"> <xsl:attribute name="pageSize"> <xsl:value-of select="/report/config/pageSize"/> </xsl:attribute> @@ -37,7 +38,7 @@ <drawString x="1.5cm"> <xsl:attribute name="y"> <xsl:value-of select="/report/config/pageHeight - 56.69"/> - </xsl:attribute><xsl:text>Tiny ERP</xsl:text> + </xsl:attribute><xsl:text>OpenERP</xsl:text> </drawString> <fill color="(0.2,0.2,0.2)"/> diff --git a/bin/addons/base/report/custom_default.xsl b/bin/addons/base/report/custom_default.xsl index fd90d68b44ae..f08078fcde44 100644 --- a/bin/addons/base/report/custom_default.xsl +++ b/bin/addons/base/report/custom_default.xsl @@ -2,7 +2,7 @@ <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:fo="http://www.w3.org/1999/XSL/Format"> <xsl:variable name="signature" select="//corporate-header/signature"/> - <xsl:variable name="title">Tiny ERP Report</xsl:variable> + <xsl:variable name="title">OpenERP Report</xsl:variable> <xsl:variable name="leftMargin">1cm</xsl:variable> <xsl:variable name="rightMargin">1cm</xsl:variable> <xsl:variable name="topMargin">1cm</xsl:variable> diff --git a/bin/addons/base/report/custom_rml.xsl b/bin/addons/base/report/custom_rml.xsl index afc8c3d9a920..535fe789c23f 100644 --- a/bin/addons/base/report/custom_rml.xsl +++ b/bin/addons/base/report/custom_rml.xsl @@ -7,7 +7,7 @@ <xsl:template name="rml"> <document> - <template author="Generated by Tiny ERP, Fabien Pinckaers"> + <template author="Generated by OpenERP, Fabien Pinckaers"> <xsl:attribute name="pageSize"> <xsl:value-of select="$pageSize"/> </xsl:attribute> diff --git a/bin/addons/base/report/rml_template.xsl b/bin/addons/base/report/rml_template.xsl index 8c9568911333..2725dce5b76e 100644 --- a/bin/addons/base/report/rml_template.xsl +++ b/bin/addons/base/report/rml_template.xsl @@ -13,7 +13,7 @@ --> <xsl:template name="rml"> <document> - <template author="Generated by Tiny ERP, Fabien Pinckaers"> + <template author="Generated by OpenERP, Fabien Pinckaers"> <xsl:attribute name="pageSize"> <xsl:value-of select="$pageSize"/> </xsl:attribute> diff --git a/bin/addons/base/res/partner/partner_demo.xml b/bin/addons/base/res/partner/partner_demo.xml index c4aee9c5b73b..86c5f65b4f1f 100644 --- a/bin/addons/base/res/partner/partner_demo.xml +++ b/bin/addons/base/res/partner/partner_demo.xml @@ -58,7 +58,7 @@ <field name="name">Prospect</field> </record> <record id="res_partner_category_2" model="res.partner.category"> - <field name="name">Tiny ERP Partners</field> + <field name="name">OpenERP Partners</field> <field name="parent_id" ref="res_partner_category_0"/> </record> <record id="res_partner_category_3" model="res.partner.category"> @@ -357,4 +357,4 @@ </record> </data> -</terp> \ No newline at end of file +</terp> diff --git a/bin/addons/base/res/partner/report/business_card.xsl b/bin/addons/base/res/partner/report/business_card.xsl index d04179c97db3..f274d9437f63 100644 --- a/bin/addons/base/res/partner/report/business_card.xsl +++ b/bin/addons/base/res/partner/report/business_card.xsl @@ -16,7 +16,8 @@ <xsl:template match="addresses"> <document> - <template leftMargin="2.0cm" rightMargin="2.0cm" topMargin="2.0cm" bottomMargin="2.0cm" title="Address list" author="Generated by Tiny ERP, Fabien Pinckaers"> + <template leftMargin="2.0cm" rightMargin="2.0cm" topMargin="2.0cm" + bottomMargin="2.0cm" title="Address list" author="Generated by OpenERP, Fabien Pinckaers"> <pageTemplate id="all"> <pageGraphics/> <xsl:apply-templates select="address" mode="frames"/> diff --git a/bin/addons/base/res/partner/report/partner_address.xsl b/bin/addons/base/res/partner/report/partner_address.xsl index d288a82e4490..8661dec2b585 100644 --- a/bin/addons/base/res/partner/report/partner_address.xsl +++ b/bin/addons/base/res/partner/report/partner_address.xsl @@ -15,7 +15,8 @@ <xsl:template match="addresses"> <document> - <template leftMargin="2.0cm" rightMargin="2.0cm" topMargin="2.0cm" bottomMargin="2.0cm" title="Address list" author="Generated by Tiny ERP"> + <template leftMargin="2.0cm" rightMargin="2.0cm" topMargin="2.0cm" + bottomMargin="2.0cm" title="Address list" author="Generated by OpenERP"> <pageTemplate id="all"> <pageGraphics/> <xsl:apply-templates select="address" mode="frames"/> diff --git a/bin/openerp-server.py b/bin/openerp-server.py index e5d9f2626b31..ef085ffe2c45 100755 --- a/bin/openerp-server.py +++ b/bin/openerp-server.py @@ -29,8 +29,8 @@ ############################################################################### """ -Tiny ERP - Server -Tiny ERP is an ERP+CRM program for small and medium businesses. +OpenERP - Server +OpenERP is an ERP+CRM program for small and medium businesses. The whole source code is distributed under the terms of the GNU Public Licence. @@ -42,8 +42,8 @@ __author__ = release.author __version__ = release.version import __builtin__ -__builtin__.__dict__['tinyerp_version'] = __version__ -__builtin__.__dict__['tinyerp_version_string'] = "Tiny ERP Server " + __version__ +__builtin__.__dict__['openerp_version'] = __version__ +__builtin__.__dict__['openerp_version_string'] = "OpenERP Server " + __version__ @@ -117,10 +117,10 @@ You need to create it using the command: createdb --encoding=UNICODE '%s' -When you run tinyerp-server for the first time it will initialise the +When you run openerp-server for the first time it will initialise the database. You may force this behaviour at a later time by using the command: - ./tinyerp-server --init=all + ./openerp-server --init=all Two accounts will be created by default: 1. login: admin password : admin diff --git a/bin/osv/orm.py b/bin/osv/orm.py index 2a4287106a05..effa265d3555 100644 --- a/bin/osv/orm.py +++ b/bin/osv/orm.py @@ -1410,7 +1410,7 @@ class orm(orm_template): try: cr.execute("ALTER TABLE \"%s\" ALTER COLUMN \"%s\" SET NOT NULL" % (self._table, k)) except: - logger.notifyChannel('init', netsvc.LOG_WARNING, 'WARNING: unable to set column %s of table %s not null !\nTry to re-run: tinyerp-server.py --update=module\nIf it doesn\'t work, update records and execute manually:\nALTER TABLE %s ALTER COLUMN %s SET NOT NULL' % (k, self._table, self._table, k)) + logger.notifyChannel('init', netsvc.LOG_WARNING, 'WARNING: unable to set column %s of table %s not null !\nTry to re-run: openerp-server.py --update=module\nIf it doesn\'t work, update records and execute manually:\nALTER TABLE %s ALTER COLUMN %s SET NOT NULL' % (k, self._table, self._table, k)) cr.commit() elif len(res)==1: f_pg_def = res[0] diff --git a/bin/report/render/simple.py b/bin/report/render/simple.py index 6939301a3d88..5b3cd9eb35fa 100644 --- a/bin/report/render/simple.py +++ b/bin/report/render/simple.py @@ -47,7 +47,7 @@ class simple(render.render): title = parser.documentElement.tagName doc = SimpleDocTemplate(self.result, pagesize=A4, title=title, - author='Tiny ERP, Fabien Pinckaers', leftmargin=10*mm, rightmargin=10*mm) + author='OpenERP, Fabien Pinckaers', leftmargin=10*mm, rightmargin=10*mm) styles = reportlab.lib.styles.getSampleStyleSheet() title_style = copy.deepcopy(styles["Heading1"]) diff --git a/bin/service/web_services.py b/bin/service/web_services.py index 2e02ce97da61..1c0fdc675a80 100644 --- a/bin/service/web_services.py +++ b/bin/service/web_services.py @@ -288,7 +288,7 @@ class db(netsvc.Service): """ Return the version of the server Used by the client to verify the compatibility with its own version """ - return tinyerp_version + return openerp_version db() class common(netsvc.Service): @@ -354,7 +354,7 @@ GNU Public Licence. (c) 2003-TODAY, Fabien Pinckaers - Tiny sprl''') if extended: - return info, tinyerp_version + return info, openerp_version return info def timezone_get(self, db, login, password): diff --git a/bin/tools/config.py b/bin/tools/config.py index df01bf50e3e7..2f01e409730f 100644 --- a/bin/tools/config.py +++ b/bin/tools/config.py @@ -74,10 +74,10 @@ class configmanager(object): assert_exit_levels = (netsvc.LOG_CRITICAL, netsvc.LOG_ERROR, netsvc.LOG_WARNING, netsvc.LOG_INFO, netsvc.LOG_DEBUG) - parser = optparse.OptionParser(version=tinyerp_version_string) + parser = optparse.OptionParser(version=openerp_version_string) parser.add_option("-c", "--config", dest="config", help="specify alternate config file") - parser.add_option("-s", "--save", action="store_true", dest="save", default=False, help="save configuration to ~/.terp_serverrc") + parser.add_option("-s", "--save", action="store_true", dest="save", default=False, help="save configuration to ~/.openerp_serverrc") parser.add_option("-v", "--verbose", action="store_true", dest="verbose", default=False, help="enable debugging") parser.add_option("--pidfile", dest="pidfile", help="file where the server pid will be stored") parser.add_option("--logfile", dest="logfile", help="file where the server log will be stored") @@ -121,7 +121,7 @@ class configmanager(object): parser.add_option_group(group) group = optparse.OptionGroup(parser, "Internationalisation options", - "Use these options to translate Tiny ERP to another language." + "Use these options to translate OpenERP to another language." "See i18n section of the user manual. Option '-d' is mandatory." "Option '-l' is mandatory in case of importation" ) @@ -143,11 +143,11 @@ class configmanager(object): # if the server is run by an unprivileged user, he has to specify location of a config file where he has the rights to write, # else he won't be able to save the configurations, or even to start the server... if os.name == 'nt': - rcfilepath = os.path.join(os.path.abspath(os.path.dirname(sys.argv[0])), 'tinyerp-server.conf') + rcfilepath = os.path.join(os.path.abspath(os.path.dirname(sys.argv[0])), 'openerp-server.conf') else: - rcfilepath = os.path.expanduser('~/.terp_serverrc') + rcfilepath = os.path.expanduser('~/.openerp_serverrc') - self.rcfile = fname or opt.config or os.environ.get('TERP_SERVER') or rcfilepath + self.rcfile = fname or opt.config or os.environ.get('OPENERP_SERVER') or rcfilepath self.load() diff --git a/bin/tools/import_email.py b/bin/tools/import_email.py index e85a90f7ae88..0803c4820454 100644 --- a/bin/tools/import_email.py +++ b/bin/tools/import_email.py @@ -110,7 +110,7 @@ class ReceiverEmail2Event(object): self.save_mail(msg, subject, partners) else: warning = MIMEText((warn_msg % (subject,)).encode('utf-8'), 'plain', 'utf-8') - warning['Subject'] = 'Message de TinyERP' + warning['Subject'] = 'Message de OpenERP' warning['From'] = 'erp@steel-sa.com' warning['To'] = msg['From'] s = smtplib.SMTP() diff --git a/bin/tools/misc.py b/bin/tools/misc.py index b08465403faf..dd812d3a4736 100644 --- a/bin/tools/misc.py +++ b/bin/tools/misc.py @@ -28,7 +28,7 @@ ############################################################################### """ -Miscelleanous tools used by tiny ERP. +Miscelleanous tools used by OpenERP. """ import os, time, sys @@ -171,7 +171,7 @@ def exec_command_pipe(name, *args): #file_path_addons = os.path.join(file_path_root, 'addons') def file_open(name, mode="r", subdir='addons', pathinfo=False): - """Open a file from the Tiny ERP root, using a subdir folder. + """Open a file from the OpenERP root, using a subdir folder. >>> file_open('hr/report/timesheer.xsl') >>> file_open('addons/hr/report/timesheet.xsl') diff --git a/bin/tools/translate.py b/bin/tools/translate.py index d9d837d4ab81..7a178148d1ef 100644 --- a/bin/tools/translate.py +++ b/bin/tools/translate.py @@ -160,7 +160,7 @@ class TinyPoFile(object): % { 'project': release.description, 'version': release.version, 'modules': reduce(lambda s, m: s + "#\t* %s\n" % m, modules, ""), - 'bugmail': 'support@tinyerp.com', #TODO: use variable from release + 'bugmail': 'support@openerp.com', #TODO: use variable from release 'now': mxdt.ISO.strUTC(mxdt.ISO.DateTime.utc()), } ) diff --git a/doc/INSTALL b/doc/INSTALL index bb47d6cf6509..1b7539bf859c 100644 --- a/doc/INSTALL +++ b/doc/INSTALL @@ -1,7 +1,7 @@ -Tiny ERP Quick Installation Guide +OpenERP Quick Installation Guide --------------------------------- -This file contains a quick guide to configure and install the Tiny ERP server. +This file contains a quick guide to configure and install the OpenERP server. Required dependencies: --------------------- @@ -55,7 +55,7 @@ You can find pyparsing at http://pyparsing.sourceforge.net/ 1. Check that all the required dependencies are installed. -2. Launch the program "python ./bin/tinyerp-server.py -r db_user -w db_password --db_host 127.0.0.1". +2. Launch the program "python ./bin/openerp-server.py -r db_user -w db_password --db_host 127.0.0.1". See the man page for more information about options. 3. Connect to the server using the GUI client. And follow the instructions to create a new database. diff --git a/doc/README.txt b/doc/README.txt index fed9f275fb6f..80fb4701288b 100644 --- a/doc/README.txt +++ b/doc/README.txt @@ -1,7 +1,7 @@ -About Tiny ERP +About OpenERP --------------- -Tiny ERP is a free Enterprise Resource Planning and Customer Relationship +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, @@ -10,10 +10,10 @@ 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, SOAP and XML-RPC interfaces, ... +database, dynamic GUIs, customizable reports, NET-RPC and XML-RPC interfaces, ... For more information, please visit: -http://www.tinyerp.org +http://www.openerp.com About Tiny.be ---------------- @@ -22,7 +22,7 @@ Tiny.be is a company specialising in the development of high-level applications and websites. All the company products are free software, released under the GNU GPL license. -Our main products include: Tiny ERP (ERP & CRM for SMB), Tiny eCommerce +Our main products include: OpenERP (ERP & CRM for SMB), Tiny eCommerce (complete eCommerce system), OpenReport (automated generation of complex documents), Tiny Raytracer, ... diff --git a/doc/tests/check_profile_l10n_all.py b/doc/tests/check_profile_l10n_all.py index d8d7cf05e4f6..dd3be6dd7870 100644 --- a/doc/tests/check_profile_l10n_all.py +++ b/doc/tests/check_profile_l10n_all.py @@ -31,7 +31,7 @@ # # This script will automatically test all profiles, localisations and language -# packs You must start the Tiny ERP server and not have a test database. You +# packs You must start the OpenERP server and not have a test database. You # may also have to change some data in the top of this file. # diff --git a/man/openerp-server.1 b/man/openerp-server.1 index 0d0275b31d6e..f5d336ba4942 100644 --- a/man/openerp-server.1 +++ b/man/openerp-server.1 @@ -28,11 +28,11 @@ Print the program's version number and exit. .TP .B \-c \fIFILE\fB, \-\-config=\fIFILE\fB -Specify an alternate config file. By default, openerp server uses ~/.terp_serverrc +Specify an alternate config file. By default, openerp server uses ~/.openerp_serverrc .TP .B \-s, \-\-save -Save the configuration to ~/.terp_serverrc. By default, the options given on the command line are not saved. +Save the configuration to ~/.openerp_serverrc. By default, the options given on the command line are not saved. .TP .B \-p \fIPORT\fB, \-\-port=\fIPORT\fB @@ -66,7 +66,7 @@ Enable verbose mode. .SH INTERNATIONALISATION OPTIONS -Use these options to translate Tiny ERP in another language. See the i18n +Use these options to translate OpenERP in another language. See the i18n section of the user manual. Option '-l' is mandatory. .TP @@ -83,7 +83,7 @@ Export all sentences to be translated to \fIFILEPATH\fR. Import the CSV file at \fIFILEPATH\fR. It should contain the translations for the language specified with the \fI-l\fR option. .SH FILES -~/.terp_serverrc +~/.openerp_serverrc .SH AUTHORS @@ -93,6 +93,6 @@ OpenERP is a product of \fBTiny.be\fR (\fIhttp://www.tiny.be\fR) openerp_serverrc(5) openerp(1) .br -\fIhttp://www.openerp.com\fR : Tiny ERP functional description +\fIhttp://www.openerp.com\fR : OpenERP functional description diff --git a/man/openerp_serverrc.5 b/man/openerp_serverrc.5 index 9337bc370a18..06b421981e21 100644 --- a/man/openerp_serverrc.5 +++ b/man/openerp_serverrc.5 @@ -106,6 +106,6 @@ Specify the price accuracy. OpenERP is a product of \fBTiny.be\fR (\fIhttp://www.tiny.be\fR) .SH SEE ALSO -tinyerp-server(1) +openerp-server(1) .br \fIhttp://www.openerp.com\fR : OpenERP functional description diff --git a/setup.py b/setup.py index a9a5353167ba..c81a06e2f184 100644 --- a/setup.py +++ b/setup.py @@ -81,7 +81,7 @@ def find_addons(): for dirpath, dirnames, filenames in os.walk(dp): if '__init__.py' in filenames: modname = dirpath.replace(os.path.sep, '.') - yield modname.replace('bin', 'tinyerp-server', 1) + yield modname.replace('bin', 'openerp-server', 1) def data_files(): '''Build list of data files to be installed''' @@ -102,36 +102,36 @@ def data_files(): dn.remove('.bzr') files.append((dp, map(lambda x: os.path.join(dp,x), names))) else: - files.append((opj('share', 'man', 'man1'), ['man/tinyerp-server.1'])) - files.append((opj('share', 'man', 'man5'), ['man/terp_serverrc.5'])) - files.append((opj('share','doc', 'tinyerp-server-%s' % version), [f for + files.append((opj('share', 'man', 'man1'), ['man/openerp-server.1'])) + files.append((opj('share', 'man', 'man5'), ['man/openerp_serverrc.5'])) + files.append((opj('share','doc', 'openerp-server-%s' % version), [f for f in glob.glob('doc/*') if os.path.isfile(f)])) - files.append((opj('share','doc', 'tinyerp-server-%s' % version, + files.append((opj('share','doc', 'openerp-server-%s' % version, 'migrate', '3.3.0-3.4.0'), [f for f in glob.glob('doc/migrate/3.3.0-3.4.0/*') if os.path.isfile(f)])) - files.append((opj('share','doc', 'tinyerp-server-%s' % version, + files.append((opj('share','doc', 'openerp-server-%s' % version, 'migrate', '3.4.0-4.0.0'), [f for f in glob.glob('doc/migrate/3.4.0-4.0.0/*') if os.path.isfile(f)])) files.append((opj('lib','python%s' % py_short_version, 'site-packages', - 'tinyerp-server', 'i18n'), glob.glob('bin/i18n/*'))) + 'openerp-server', 'i18n'), glob.glob('bin/i18n/*'))) files.append((opj('lib', 'python%s' % py_short_version, 'site-packages', - 'tinyerp-server', 'addons', 'custom'), + 'openerp-server', 'addons', 'custom'), glob.glob('bin/addons/custom/*xml') + glob.glob('bin/addons/custom/*rml') + glob.glob('bin/addons/custom/*xsl'))) for addon in find_addons(): - add_path = addon.replace('.', os.path.sep).replace('tinyerp-server', 'bin', + add_path = addon.replace('.', os.path.sep).replace('openerp-server', 'bin', 1) pathfiles = [(opj('lib', 'python%s' % py_short_version, 'site-packages', - add_path.replace('bin', 'tinyerp-server', 1)), + add_path.replace('bin', 'openerp-server', 1)), glob.glob(opj(add_path, '*xml')) + glob.glob(opj(add_path, '*csv')) + glob.glob(opj(add_path, '*sql'))), (opj('lib', 'python%s' % py_short_version, 'site-packages', - add_path.replace('bin', 'tinyerp-server', 1), 'data'), + add_path.replace('bin', 'openerp-server', 1), 'data'), glob.glob(opj(add_path, 'data', '*xml'))), (opj('lib', 'python%s' % py_short_version, 'site-packages', - add_path.replace('bin', 'tinyerp-server', 1), 'report'), + add_path.replace('bin', 'openerp-server', 1), 'report'), glob.glob(opj(add_path, 'report', '*xml')) + glob.glob(opj(add_path, 'report', '*rml')) + glob.glob(opj(add_path, 'report', '*sxw')) + @@ -144,10 +144,10 @@ check_modules() # create startup script start_script = \ "#!/bin/sh\n\ -cd %s/lib/python%s/site-packages/tinyerp-server\n\ -exec %s ./tinyerp-server.py $@" % (sys.prefix, py_short_version, sys.executable) +cd %s/lib/python%s/site-packages/openerp-server\n\ +exec %s ./openerp-server.py $@" % (sys.prefix, py_short_version, sys.executable) # write script -f = open('tinyerp-server', 'w') +f = open('openerp-server', 'w') f.write(start_script) f.close() @@ -168,22 +168,22 @@ setup(name = name, classifiers = filter(None, classifiers.split("\n")), license = license, data_files = data_files(), - scripts = ['tinyerp-server'], - packages = ['tinyerp-server', 'tinyerp-server.addons', - 'tinyerp-server.ir', - 'tinyerp-server.osv', - 'tinyerp-server.ssl', - 'tinyerp-server.service', 'tinyerp-server.tools', - 'tinyerp-server.pychart', 'tinyerp-server.pychart.afm', - 'tinyerp-server.report', - 'tinyerp-server.report.printscreen', - 'tinyerp-server.report.render', - 'tinyerp-server.report.render.rml2pdf', - 'tinyerp-server.report.render.rml2html', - 'tinyerp-server.wizard', 'tinyerp-server.workflow'] + \ + scripts = ['openerp-server'], + packages = ['openerp-server', 'openerp-server.addons', + 'openerp-server.ir', + 'openerp-server.osv', + 'openerp-server.ssl', + 'openerp-server.service', 'openerp-server.tools', + 'openerp-server.pychart', 'openerp-server.pychart.afm', + 'openerp-server.report', + 'openerp-server.report.printscreen', + 'openerp-server.report.render', + 'openerp-server.report.render.rml2pdf', + 'openerp-server.report.render.rml2html', + 'openerp-server.wizard', 'openerp-server.workflow'] + \ list(find_addons()), - package_dir = {'tinyerp-server': 'bin'}, - console = [{"script":"bin\\tinyerp-server.py", "icon_resources":[(1,"pixmaps\\tinyerp.ico")]}], + package_dir = {'openerp-server': 'bin'}, + console = [{"script":"bin\\openerp-server.py", "icon_resources":[(1,"pixmaps\\openerp.ico")]}], options = options, ) diff --git a/win32/OpenERPServerService.py b/win32/OpenERPServerService.py index 1a2b208417ba..85cd884a8391 100644 --- a/win32/OpenERPServerService.py +++ b/win32/OpenERPServerService.py @@ -27,9 +27,9 @@ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ############################################################################## # -# TinyERPServerService.py +# OpenERPServerService.py # -# Script installing Tiny ERP as Windows service +# Script installing OpenERP as Windows service # Win32 python extensions modules import win32serviceutil @@ -44,12 +44,12 @@ import subprocess import os import thread -class TinyERPServerService(win32serviceutil.ServiceFramework): +class OpenERPServerService(win32serviceutil.ServiceFramework): # required info - _svc_name_ = "tinyerp-service" - _svc_display_name_ = "Tiny ERP Server" + _svc_name_ = "openerp-service" + _svc_display_name_ = "OpenERP Server" # optionnal info - _svc_description_ = "Tiny ERP Server service" + _svc_description_ = "OpenERP Server service" def __init__(self, args): win32serviceutil.ServiceFramework.__init__(self, args) @@ -67,7 +67,7 @@ class TinyERPServerService(win32serviceutil.ServiceFramework): self.ReportServiceStatus(win32service.SERVICE_STOP_PENDING) # stop the running TERP Server: say it's a normal exit win32api.TerminateProcess(int(self.terpprocess._handle), 0) - servicemanager.LogInfoMsg("Tiny ERP Server stopped correctly") + servicemanager.LogInfoMsg("OpenERP Server stopped correctly") # And set my event. win32event.SetEvent(self.hWaitStop) @@ -78,7 +78,7 @@ class TinyERPServerService(win32serviceutil.ServiceFramework): # The server's binary must be one directory above the service's binary (when py2exe'd the python libraries shouldn' mix) service_dir = os.path.dirname(sys.argv[0]) server_dir = os.path.split(service_dir)[0] - server_path = os.path.join(server_dir, 'tinyerp-server.exe') + server_path = os.path.join(server_dir, 'openerp-server.exe') self.terpprocess = subprocess.Popen([server_path], \ cwd=server_dir, creationflags=win32process.CREATE_NO_WINDOW) @@ -90,22 +90,22 @@ class TinyERPServerService(win32serviceutil.ServiceFramework): self.stopping = True def SvcDoRun(self): - # Start Tiny ERP Server itself + # Start OpenERP Server itself self.StartTERP() # start the loop waiting for the Service Manager's stop signal thread.start_new_thread(self.StartControl, (self.hWaitStop,)) # Log a info message that the server is running - servicemanager.LogInfoMsg("Tiny ERP Server up and running") + servicemanager.LogInfoMsg("OpenERP Server up and running") # verification if the server is really running, else quit with an error self.terpprocess.wait() if not self.stopping: - sys.exit("Tiny ERP Server check: server not running, check the logfile for more info") + sys.exit("OpenERP Server check: server not running, check the logfile for more info") if __name__=='__main__': # Do with the service whatever option is passed in the command line - win32serviceutil.HandleCommandLine(TinyERPServerService) + win32serviceutil.HandleCommandLine(OpenERPServerService) # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/win32/setup.py b/win32/setup.py index 69be7ac30dfc..d07834ee5b4a 100644 --- a/win32/setup.py +++ b/win32/setup.py @@ -30,7 +30,7 @@ from distutils.core import setup import py2exe -setup(service=["TinyERPServerService"], +setup(service=["OpenERPServerService"], options={"py2exe":{"excludes":["Tkconstants","Tkinter","tcl", "_imagingtk","PIL._imagingtk", "ImageTk", "PIL.ImageTk", diff --git a/win32/start.bat b/win32/start.bat index 560568787e1c..67e580e9fb96 100644 --- a/win32/start.bat +++ b/win32/start.bat @@ -1,7 +1,7 @@ @PATH=%WINDIR%\system32;%WINDIR%;%WINDIR%\System32\Wbem;. -@net stop tinyerp-service +@net stop openerp-service -@net start tinyerp-service +@net start openerp-service cls diff --git a/win32/stop.bat b/win32/stop.bat index 8640bab8ddab..c7dd4b79dc13 100644 --- a/win32/stop.bat +++ b/win32/stop.bat @@ -1,5 +1,5 @@ @PATH=%WINDIR%\system32;%WINDIR%;%WINDIR%\System32\Wbem;. -@net stop tinyerp-service +@net stop openerp-service cls -- GitLab