From 4335ea9064eab46e61d690784c955a9e7aea8203 Mon Sep 17 00:00:00 2001 From: Alexandre SPANGARO Date: Thu, 4 Apr 2019 17:13:20 +0200 Subject: [PATCH 1/4] NEW: Accounting - Invert module name --- htdocs/core/modules/modAccounting.class.php | 16 ++++++++-------- htdocs/langs/en_US/admin.lang | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/htdocs/core/modules/modAccounting.class.php b/htdocs/core/modules/modAccounting.class.php index ea247d3b5f9..6f9fb8fb3ab 100644 --- a/htdocs/core/modules/modAccounting.class.php +++ b/htdocs/core/modules/modAccounting.class.php @@ -1,9 +1,9 @@ - * Copyright (C) 2013-2018 Alexandre Spangaro - * Copyright (C) 2014 Ari Elbaz (elarifr) - * Copyright (C) 2014 Florian Henry - * Copyright (C) 2016-2017 Laurent Destailleur +/* Copyright (C) 2013-2014 Olivier Geffroy + * Copyright (C) 2013-2019 Alexandre Spangaro + * Copyright (C) 2014 Ari Elbaz (elarifr) + * Copyright (C) 2014 Florian Henry + * Copyright (C) 2016-2017 Laurent Destailleur * Copyright (C) 2017 Open-DSI * * This program is free software; you can redistribute it and/or modify @@ -22,8 +22,8 @@ /** * \file htdocs/core/modules/modAccounting.class.php - * \ingroup Advanced accountancy - * \brief Module to activate Accounting Expert module + * \ingroup Accounting + * \brief Module to activate accounting module */ include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php'; @@ -48,7 +48,7 @@ class modAccounting extends DolibarrModules $this->module_position = '61'; // Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module) $this->name = preg_replace('/^mod/i', '', get_class($this)); - $this->description = "Advanced accounting management"; + $this->description = "Accounting management"; // Possible values for version are: 'development', 'experimental', 'dolibarr' or 'dolibarr_deprecated' or version $this->version = 'dolibarr'; diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index 709e2267405..8f33166edb9 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -494,7 +494,7 @@ Module1Name=Third Parties Module1Desc=Companies and contacts management (customers, prospects...) Module2Name=Commercial Module2Desc=Commercial management -Module10Name=Accounting +Module10Name=Accounting (simplified) Module10Desc=Simple accounting reports (journals, turnover) based on database content. Does not use any ledger table. Module20Name=Proposals Module20Desc=Commercial proposal management @@ -632,7 +632,7 @@ Module50200Name=Paypal Module50200Desc=Offer customers a PayPal online payment page (PayPal account or credit/debit cards). This can be used to allow your customers to make ad-hoc payments or payments related to a specific Dolibarr object (invoice, order etc...) Module50300Name=Stripe Module50300Desc=Offer customers a Stripe online payment page (credit/debit cards). This can be used to allow your customers to make ad-hoc payments or payments related to a specific Dolibarr object (invoice, order etc...) -Module50400Name=Accounting (advanced) +Module50400Name=Accounting Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers). Export the ledger in several other accounting software formats. Module54000Name=PrintIPP Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installed on server). From 2606de2119a1a7dab41357f53f6351584509d100 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 8 Apr 2019 13:35:06 +0200 Subject: [PATCH 2/4] Update modAccounting.class.php --- htdocs/core/modules/modAccounting.class.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/core/modules/modAccounting.class.php b/htdocs/core/modules/modAccounting.class.php index 6f9fb8fb3ab..8250549b9e1 100644 --- a/htdocs/core/modules/modAccounting.class.php +++ b/htdocs/core/modules/modAccounting.class.php @@ -22,8 +22,8 @@ /** * \file htdocs/core/modules/modAccounting.class.php - * \ingroup Accounting - * \brief Module to activate accounting module + * \ingroup Double entry accounting + * \brief Module to activate the double entry accounting module */ include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php'; @@ -48,7 +48,7 @@ class modAccounting extends DolibarrModules $this->module_position = '61'; // Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module) $this->name = preg_replace('/^mod/i', '', get_class($this)); - $this->description = "Accounting management"; + $this->description = "Double entry accounting management"; // Possible values for version are: 'development', 'experimental', 'dolibarr' or 'dolibarr_deprecated' or version $this->version = 'dolibarr'; From 8accc894b09095e221926483e3da0044fbb819b6 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 8 Apr 2019 13:36:11 +0200 Subject: [PATCH 3/4] Update admin.lang --- htdocs/langs/en_US/admin.lang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index 8f33166edb9..8eb5e1a2b9c 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -632,7 +632,7 @@ Module50200Name=Paypal Module50200Desc=Offer customers a PayPal online payment page (PayPal account or credit/debit cards). This can be used to allow your customers to make ad-hoc payments or payments related to a specific Dolibarr object (invoice, order etc...) Module50300Name=Stripe Module50300Desc=Offer customers a Stripe online payment page (credit/debit cards). This can be used to allow your customers to make ad-hoc payments or payments related to a specific Dolibarr object (invoice, order etc...) -Module50400Name=Accounting +Module50400Name=Accounting (double entry) Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers). Export the ledger in several other accounting software formats. Module54000Name=PrintIPP Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installed on server). From d2cbc95325b1f1668f137c5fdd65e932c2b913e6 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 8 Apr 2019 13:39:22 +0200 Subject: [PATCH 4/4] Update admin.lang Note that 80% of current Dolibarr users use the term "Accounting" to say "invoicing" (Definition of work accounting is not same for end users and for book keeping people). So to avoid confusion for end users and not having letting think they need this module because they ant to make accounting (with their definition), we must to be clear in name (description is not enough). So i rename "Accounting" into "Accounting (double entry)". So this is clear it is accounting with the definition of a book keeper.