From fe4bd46c43592bd72fd76438f03cc0c9e6a4bec6 Mon Sep 17 00:00:00 2001 From: oscim Date: Mon, 24 Feb 2020 17:28:25 +0100 Subject: [PATCH 1/8] Update commonobject.class.php add support of contact linkedobject --- htdocs/core/class/commonobject.class.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php index 80e9f4c8ab4..1ddb5f20d56 100644 --- a/htdocs/core/class/commonobject.class.php +++ b/htdocs/core/class/commonobject.class.php @@ -3369,6 +3369,9 @@ abstract class CommonObject elseif ($objecttype == 'subscription') { $classpath = 'adherents/class'; $module = 'adherent'; } + elseif ($objecttype == 'contact') { + $module = 'societe'; + } // Set classfile $classfile = strtolower($subelement); $classname = ucfirst($subelement); From 376e19f6211455f9c1e25d052b5feefea9654504 Mon Sep 17 00:00:00 2001 From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com> Date: Tue, 25 Feb 2020 13:05:23 +0100 Subject: [PATCH 2/8] Update HOWTO-Translation.txt --- htdocs/langs/HOWTO-Translation.txt | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/htdocs/langs/HOWTO-Translation.txt b/htdocs/langs/HOWTO-Translation.txt index 2d7c910d98a..0a05133fdb8 100644 --- a/htdocs/langs/HOWTO-Translation.txt +++ b/htdocs/langs/HOWTO-Translation.txt @@ -1,8 +1,9 @@ --- Translation How to --- -Document explaining how to translate Dolibarr in a new language is -available on wiki: +An instruction guide for translating Dolibarr in a new language is +available on Dolibarr wiki: -English: http://wiki.dolibarr.org/index.php/Translator_documentation -French: http://wiki.dolibarr.org/index.php/Documentation_traducteur -Spanish: http://wiki.dolibarr.org/index.php/Documentaci%C3%B3n_traductores +English: https://wiki.dolibarr.org/index.php/Translator_documentation +French: https://wiki.dolibarr.org/index.php/Documentation_traducteur +Spanish: https://wiki.dolibarr.org/index.php/Documentaci%C3%B3n_traductores +German: https://wiki.dolibarr.org/index.php/Dokumentation_Uebersetzung From e4e8173b7a3b3900890a42e68a9fe0e2c293ec79 Mon Sep 17 00:00:00 2001 From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com> Date: Tue, 25 Feb 2020 13:15:15 +0100 Subject: [PATCH 3/8] Update README --- htdocs/install/doctemplates/README | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/install/doctemplates/README b/htdocs/install/doctemplates/README index 9ac615ea7c4..b1978fb3de7 100644 --- a/htdocs/install/doctemplates/README +++ b/htdocs/install/doctemplates/README @@ -1,8 +1,8 @@ README (English) -------------------------------- -This directory contains samples of odttemplates used by install +This directory contains samples of odt-templates used by install process. WARNING: -Do not edit files in those directories, but in installed data -directory instead. \ No newline at end of file +Do not edit/change files in these directories, +only in installed data directory instead (e.g. //dolibarr/documents/doctemplates/). From e60a6ee13da17bcf2b4d52eceb3ebf16933e7471 Mon Sep 17 00:00:00 2001 From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com> Date: Tue, 25 Feb 2020 13:29:24 +0100 Subject: [PATCH 4/8] add composer entry add entry of sub-directories: * composer To test an upgrade of a lib. --- build/README | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/build/README b/build/README index 07f0ebe3b55..67ceb05c8d2 100644 --- a/build/README +++ b/build/README @@ -45,9 +45,12 @@ Dolibarr working. It is here only to build Dolibarr packages, and those generated packages will not contains this "build" directory. -We can find in "build", following sub-directories: +You can find in "build", following sub-directories: -* debian: +* composer +To test an upgrade of a lib. + +* debian To build Debian package. * dmg: From 2543f3f21bffd6914c9eaceca21025c17ecf3b2c Mon Sep 17 00:00:00 2001 From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com> Date: Tue, 25 Feb 2020 13:37:39 +0100 Subject: [PATCH 5/8] Update README --- build/obs/README | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/build/obs/README b/build/obs/README index c8a29e1dac4..44427c01d49 100644 --- a/build/obs/README +++ b/build/obs/README @@ -1,20 +1,24 @@ README (English) ################################################## OBS Package tools +OBE - openSUSE Build Service ################################################## -This directory contains files to explain how to publish -a package onto OBS +This directory contains an instruction to explain +how to publish a package onto OBS. -# Create a project onto OBS -#---------------------------------- -https://build.opensuse.org +# Create a project onto OBS +--------------------------- +https://build.opensuse.org -Packaging rules: http://en.opensuse.org/Portal:Packaging + +# Packaging rules: +------------------ +https://en.opensuse.org/Portal:Packaging Add attributes: -OBS:Screenshots URL of screenshot http://www.dolibarr.org/images/dolibarr_screenshot1.png +OBS:Screenshots URL of screenshot https://www.dolibarr.org/images/dolibarr_screenshot1.png OBS:QualityCategory Development|Testing|Stable|Private OBS:Maintained 1 @@ -28,22 +32,24 @@ To submit a snapshot for building, we should have a service file with content -How to have such a service file created automatically ? -Go into project you want to update. It mught be: +# How to have such a service file created automatically ? +--------------------------------------------------------- +Go into project you want to update. It might be: - openSUSE Build Service > Projects > Application:ERP:Dolibarr > dolibarr - or your private project Once logged, click on "Add file" in section "Source Files", then select mode "Upload From: Remote URL" Keep empty for "Filename", choose "Remote URL" and enter into last field, URL that should looks like this: -http://www.dolibarr.org/files/stable/package_rpm_generic/dolibarr-x.y.v-0.4.src.rpm +https://www.dolibarr.org/files/stable/package_rpm_generic/dolibarr-x.y.v-0.4.src.rpm Then add into Advanded - Attributes -OBS:Screenshots http://www.dolibarr.org/images/dolibarr_screenshot1.png -OBS:QualityCategory Stable|Testing|Development|Private +OBS:Screenshots https://www.dolibarr.org/images/dolibarr_screenshot1.png +OBS:QualityCategory Stable|Testing|Development|Private # Move project into official directory +-------------------------------------- - Enter a bug to ask to be a maintener of a category or to add a new one. For example: https://bugzilla.novell.com/show_bug.cgi?id=848083 to be a maintener of category https://build.opensuse.org/project/show/Application:ERP From fb385827a9702c8363d8fe3e35e4c00218b453ed Mon Sep 17 00:00:00 2001 From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com> Date: Tue, 25 Feb 2020 14:04:54 +0100 Subject: [PATCH 6/8] Update README --- test/README | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/test/README b/test/README index 3e13bbbec70..2c53e31daee 100644 --- a/test/README +++ b/test/README @@ -3,6 +3,10 @@ README (English) This directory contains unit tests and docs for Dolibarr quality analysis. +- PHPUnit - https://phpunit.de +- PHP_CodeSniffer - https://pear.php.net/package/PHP_CodeSniffer/ +- PHP Depend - https://pdepend.org/ + PHPUNIT ------- From ec981632ca652c42e4155163f832502237933c20 Mon Sep 17 00:00:00 2001 From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com> Date: Tue, 25 Feb 2020 14:11:58 +0100 Subject: [PATCH 7/8] Create README --- test/selenium/README | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 test/selenium/README diff --git a/test/selenium/README b/test/selenium/README new file mode 100644 index 00000000000..1d0b7ad44d1 --- /dev/null +++ b/test/selenium/README @@ -0,0 +1,11 @@ +README (English) +-------------------------------- + +This directory contains test files for Selenium. + +Selenium is a tool for automatic testing of web applications. + +https://www.selenium.dev/ + + + From 028287d8fa04e176bb8aca21013711149f3e4fc3 Mon Sep 17 00:00:00 2001 From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com> Date: Tue, 25 Feb 2020 14:41:18 +0100 Subject: [PATCH 8/8] Update erp_comparison_translation.txt --- .../erp_comparison_translation.txt | 30 ++++++++++++------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/dev/translation/erp_comparison_translation.txt b/dev/translation/erp_comparison_translation.txt index c99a5f4cc1c..6cf7c4f7c60 100644 --- a/dev/translation/erp_comparison_translation.txt +++ b/dev/translation/erp_comparison_translation.txt @@ -1,17 +1,25 @@ +comparison of terms -Term Dolibarr SAP Odoo ... ----------------------------------------------------------------------------- -Thirdparty Contact partner Partner/Contact (company) -Contact/address Contact person Partner/Contact (individual) +Dolibarr SAP ERP Odoo +------------------------------------------------------------------------- +Thirdparty Contact partner Partner/Contact (company) +Contact/address Contact person Partner/Contact (individual) -Financial ?? Invoicing - -Income / Expense ?? Profit / Loss -Balance ?? Net profit -Subledger account Subledger account ?? +Financial Finance (FI) Accounting +Accounting -Proposal ?? Quotation Proposal is ok but proposition looks better (proposal is for a detailed proposition). We can say also "business proposition or business proposal". - Indian are using "Quotation". +Income / Expense ?? Profit / Loss +Balance ?? Net profit +Subledger account Subledger account ?? + +CRM Sales & Distribution Sales +Proposal ?? Quotation + + + +Proposal is ok but proposition looks better (proposal is for a detailed proposition). +We can say also "business proposition or business proposal". +In India they are using "Quotation".