lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
Laurent Destailleur 2020-02-26 06:39:13 +01:00
commit 76305d5ac7
8 changed files with 69 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
build/README
View File

@ -45,9 +45,12 @@ Dolibarr working. It is here only to build Dolibarr packages, and those
generated packages will not contains this "build" directory. 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. To build Debian package.
* dmg: * dmg:

30
build/obs/README
View File

@ -1,20 +1,24 @@
README (English) README (English)
################################################## ##################################################
OBS Package tools OBS Package tools
OBE - openSUSE Build Service
################################################## ##################################################
This directory contains files to explain how to publish This directory contains an instruction to explain
a package onto OBS how to publish a package onto OBS.
# Create a project onto OBS # Create a project onto OBS
#---------------------------------- ---------------------------
https://build.opensuse.org https://build.opensuse.org
Packaging rules: http://en.opensuse.org/Portal:Packaging
# Packaging rules:
------------------
https://en.opensuse.org/Portal:Packaging
Add attributes: 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:QualityCategory Development|Testing|Stable|Private
OBS:Maintained 1 OBS:Maintained 1
@ -28,22 +32,24 @@ To submit a snapshot for building, we should have a service file with content
</service> </service>
</services> </services>
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 - openSUSE Build Service > Projects > Application:ERP:Dolibarr > dolibarr
- or your private project - or your private project
Once logged, click on "Add file" in section "Source Files", then select mode "Upload From: Remote URL" 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: 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 Then add into Advanded - Attributes
OBS:Screenshots http://www.dolibarr.org/images/dolibarr_screenshot1.png OBS:Screenshots https://www.dolibarr.org/images/dolibarr_screenshot1.png
OBS:QualityCategory Stable|Testing|Development|Private OBS:QualityCategory Stable|Testing|Development|Private
# Move project into official directory # Move project into official directory
--------------------------------------
- Enter a bug to ask to be a maintener of a category or to add a new one. - 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 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 https://build.opensuse.org/project/show/Application:ERP

30
dev/translation/erp_comparison_translation.txt
View File

@ -1,17 +1,25 @@
comparison of terms
Term Dolibarr SAP Odoo ... Dolibarr SAP ERP Odoo
---------------------------------------------------------------------------- -------------------------------------------------------------------------
Thirdparty Contact partner Partner/Contact (company) Thirdparty Contact partner Partner/Contact (company)
Contact/address Contact person Partner/Contact (individual) Contact/address Contact person Partner/Contact (individual)
Financial ?? Invoicing Financial Finance (FI) Accounting
Accounting
Income / Expense ?? Profit / Loss
Balance ?? Net profit
Subledger account Subledger account ??
Proposal ?? Quotation Proposal is ok but proposition looks better (proposal is for a detailed proposition). We can say also "business proposition or business proposal". Income / Expense ?? Profit / Loss
Indian are using "Quotation". 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".

3
htdocs/core/class/commonobject.class.php
View File

@ -3369,6 +3369,9 @@ abstract class CommonObject
elseif ($objecttype == 'subscription') { elseif ($objecttype == 'subscription') {
$classpath = 'adherents/class'; $module = 'adherent'; $classpath = 'adherents/class'; $module = 'adherent';
} }
elseif ($objecttype == 'contact') {
$module = 'societe';
}
// Set classfile // Set classfile
$classfile = strtolower($subelement); $classname = ucfirst($subelement); $classfile = strtolower($subelement); $classname = ucfirst($subelement);

6
htdocs/install/doctemplates/README
View File

@ -1,8 +1,8 @@
README (English) README (English)
-------------------------------- --------------------------------
This directory contains samples of odttemplates used by install This directory contains samples of odt-templates used by install
process. process.
WARNING: WARNING:
Do not edit files in those directories, but in installed data Do not edit/change files in these directories,
directory instead. only in installed data directory instead (e.g. //dolibarr/documents/doctemplates/).

11
htdocs/langs/HOWTO-Translation.txt
View File

@ -1,8 +1,9 @@
--- Translation How to --- --- Translation How to ---
Document explaining how to translate Dolibarr in a new language is An instruction guide for translating Dolibarr in a new language is
available on wiki: available on Dolibarr wiki:
English: http://wiki.dolibarr.org/index.php/Translator_documentation English: https://wiki.dolibarr.org/index.php/Translator_documentation
French: http://wiki.dolibarr.org/index.php/Documentation_traducteur French: https://wiki.dolibarr.org/index.php/Documentation_traducteur
Spanish: http://wiki.dolibarr.org/index.php/Documentaci%C3%B3n_traductores Spanish: https://wiki.dolibarr.org/index.php/Documentaci%C3%B3n_traductores
German: https://wiki.dolibarr.org/index.php/Dokumentation_Uebersetzung

4
test/README
View File

@ -3,6 +3,10 @@ README (English)
This directory contains unit tests and docs for Dolibarr quality analysis. 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 PHPUNIT
------- -------

11
test/selenium/README Normal file
View File

@ -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/