diff --git a/.gitignore b/.gitignore
index 30151359365..344822f0e9e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,8 +36,8 @@ htdocs/includes/jakub-onderka/
htdocs/includes/phpdocumentor/
htdocs/includes/phpspec/
htdocs/includes/phpunit/
+htdocs/includes/php-parallel-lint/
htdocs/includes/sebastian/
htdocs/includes/squizlabs/
-htdocs/includes/symfony/
htdocs/includes/webmozart/
htdocs/.well-known/apple-developer-merchantid-domain-association
diff --git a/.travis.yml b/.travis.yml
index ca9641ce63e..c47e1b19598 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -119,24 +119,18 @@ install:
echo
- |
- echo "Installing Composer dependencies (PHP Unit, Parallel Lint & PHP CodeSniffer"
- if [ "$TRAVIS_PHP_VERSION" = '5.4' ] || [ "$TRAVIS_PHP_VERSION" = '5.5' ]; then
- composer -n require phpunit/phpunit ^4 \
- jakub-onderka/php-parallel-lint ^0 \
- jakub-onderka/php-console-highlighter ^0 \
- squizlabs/php_codesniffer ^3
- fi
+ echo "Installing Composer dependencies - PHP Unit, Parallel Lint, PHP CodeSniffer - for $TRAVIS_PHP_VERSION"
if [ "$TRAVIS_PHP_VERSION" = '5.6' ] || [ "$TRAVIS_PHP_VERSION" = '7.0' ] || [ "$TRAVIS_PHP_VERSION" = '7.1' ] \
[ "$TRAVIS_PHP_VERSION" = '7.2' ] || [ "$TRAVIS_PHP_VERSION" = '7.3' ] || [ "$TRAVIS_PHP_VERSION" = '7.4' ]; then
composer -n require phpunit/phpunit ^5 \
- jakub-onderka/php-parallel-lint ^0 \
- jakub-onderka/php-console-highlighter ^0 \
+ php-parallel-lint/php-parallel-lint ^0 \
+ php-parallel-lint/php-console-highlighter ^0 \
squizlabs/php_codesniffer ^3
fi
if [ "$TRAVIS_PHP_VERSION" = 'nightly' ]; then
composer -n require --ignore-platform-reqs phpunit/phpunit ^5 \
- jakub-onderka/php-parallel-lint ^0 \
- jakub-onderka/php-console-highlighter ^0 \
+ php-parallel-lint/php-parallel-lint ^1 \
+ php-parallel-lint/php-console-highlighter ^0 \
squizlabs/php_codesniffer ^3
fi
echo
@@ -283,7 +277,11 @@ script:
# Ensure we catch errors
set -e
#parallel-lint --exclude htdocs/includes --blame .
- parallel-lint --exclude dev/namespacemig --exclude htdocs/includes/myclabs --exclude htdocs/includes/webmozart --exclude htdocs/includes/phpspec --exclude dev/initdata/dbf/includes --exclude htdocs/includes/sabre --exclude htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared --exclude htdocs/includes/phpoffice/PhpSpreadsheet --exclude htdocs/includes/sebastian --exclude htdocs/includes/squizlabs/php_codesniffer --exclude htdocs/includes/jakub-onderka --exclude htdocs/includes/mike42/escpos-php/example --exclude htdocs/includes/phpunit/ --exclude htdocs/includes/composer/autoload_static.php --blame .
+ parallel-lint --exclude dev/namespacemig --exclude htdocs/includes/composer --exclude htdocs/includes/myclabs --exclude htdocs/includes/phpspec --exclude dev/initdata/dbf/includes \
+ --exclude htdocs/includes/sabre --exclude htdocs/includes/phpoffice/phpexcel --exclude htdocs/includes/phpoffice/PhpSpreadsheet --exclude htdocs/includes/sebastian \
+ --exclude htdocs/includes/squizlabs/php_codesniffer --exclude htdocs/includes/jakub-onderka --exclude htdocs/includes/php-parallel-lint --exclude htdocs/includes/symfony \
+ --exclude htdocs/includes/mike42/escpos-php/example --exclude htdocs/includes/maximebf \
+ --exclude htdocs/includes/phpunit/ --exclude htdocs/includes/tecnickcom/tcpdf/include/barcodes --exclude htdocs/includes/webmozart --blame .
set +e
echo
diff --git a/COPYRIGHT b/COPYRIGHT
index 251ad7f2fe4..d8cefedcd65 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -21,7 +21,7 @@ Mobiledetect 2.8.34 MIT License Yes
NuSoap 0.9.5 LGPL 2.1+ Yes Library to develop SOAP Web services (not into rpm and deb package)
PEAR Mail_MIME 1.8.9 BSD Yes NuSoap dependency
ParseDown 1.6 MIT License Yes Markdown parser
-PHPDebugBar 1.15.0 MIT License Yes Used only by the module "debugbar" for developers
+PHPDebugBar 1.15.1 MIT License Yes Used only by the module "debugbar" for developers
PHPExcel 1.8.1 LGPL-2.1+ Yes Read/Write XLS files, read ODS files
PHPSpreadSheet ? LGPL-2.1+ Yes Read/Write XLS files, read ODS files
php-iban 1.4.7 LGPL-3+ Yes Parse and validate IBAN (and IIBAN) bank account information in PHP
diff --git a/ChangeLog b/ChangeLog
index d3a5558db6b..9653e4577cc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,7 +13,10 @@ WARNING:
Following changes may create regressions for some external modules, but were necessary to make Dolibarr better:
* Properties ->contactid has been renamed into ->contact_id
* Rename property $paiementid in API api_supplier_invoices into $payment_mode_id
-
+* The deprecated subsitution key __SIGNATURE__ has been removed. Replace with __USER_SIGNATURE__ if you still use old syntax in
+ your email templates.
+* The hidden option HOLIDAY_MORE_PUBLIC_HOLIDAYS has been removed. Use instead the dictionary table if you need to define custom
+ days of holiday.
***** ChangeLog for 12.0.2 compared to 12.0.1 *****
FIX: computation of the bottom margin of returns NaN because body is not loaded yet
@@ -341,14 +344,14 @@ Following changes may create regressions for some external modules, but were nec
WARNING FOR DOLIWAMP USERS ONLY:
-Only people that installed Dolibarr using the all-in-one autoinstaller for Windows called "DoliWAMP" are concerned by the following warnings:
+Only people that installed Dolibarr using the all-in-one auto-installer for Windows called "DoliWAMP" are concerned by the following warnings:
-* DoliWAMP autoinstaller for Windows is not more available on 32bits systems. Use standard package if you need to use such architecture.
-* It is not possible to migrate from an installation done with the old DoliWAMP autoinstaller for Windows by using this new one. You must make a backup
- of your database, make a fresh installation using the new installer and reload your backup. Don't forget that DoliWAMP is a good solution to make a
- quick test of Dolibarr on your local computer but was never recommanded as a production solution on a local desktop since a desktop computer has not
- a backup and security policy as good as on a server (when there is one).
- DoliWAMP remains a solution for fast test or demo purposes. Prefer using standard package for production.
+* DoliWAMP auto-installer for Windows is no more available on 32 bits systems. Use standard package if you need to use such architecture.
+* It is not possible to migrate from an installation done with the old DoliWAMP auto-installer for Windows by using this new one.
+ You must make a backup of your database, make a fresh installation using the new installer and reload your backup.
+ Don't forget that DoliWAMP is a good solution to make a quick test of Dolibarr on your local computer but is not recommended as a production
+ solution on a local desktop since a local desktop computer has often no backup and security policy, or not as good as on a server (when there is one).
+ DoliWAMP remains a solution for fast test or demo purposes. Prefer using standard packages for production.
***** ChangeLog for 11.0.5 compared to 11.0.4 *****
diff --git a/SECURITY.md b/SECURITY.md
index ac9ccbc677f..d0ab526b012 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -64,9 +64,10 @@ No vulnerability disclosure, including partial is allowed for the moment.
ONLY vulnerabilities discovered, when the following setup on tested platform is used, are accepted:
-* $dolibarr_main_prod must be 1 into conf.php
-* $dolibarr_nocsrfcheck must not be set to 0 (should be 1 by default) into conf.php
-* The constant MAIN_SECURITY_CSRF_WITH_TOKEN must be set to 1 into backoffice menu Home - Setup - Other (this value should be hard switched soon to 1 by default)
+* $dolibarr_main_prod must be set to 1 into conf.php
+* $dolibarr_nocsrfcheck must be kept to the default value 1 into conf.php
+* The module DebugBar must NOT be enabled (by default, this module is not enabled)
+* The constant MAIN_SECURITY_CSRF_WITH_TOKEN must be set to 1 into backoffice menu Home - Setup - Other (this value should be switched soon to 1 by default)
* ONLY security reports on "stable" modules are allowed (troubles into "experimental" and "developement" modules are not accepted).
Scope is the web application (back office) and the APIs.
diff --git a/composer.json b/composer.json
index d26bbb05ad9..9fede994525 100644
--- a/composer.json
+++ b/composer.json
@@ -24,7 +24,7 @@
"vendor-dir" : "htdocs/includes"
},
"require" : {
- "php" : ">=5.5.0",
+ "php" : ">=5.6.0",
"ext-curl" : "*",
"ckeditor/ckeditor" : "4.12.1",
"mike42/escpos-php" : "2.2",
@@ -33,11 +33,13 @@
"restler/framework" : "3.0.0-RC6",
"tecnickcom/tcpdf" : "6.3.2",
"nnnick/chartjs" : "^2.9",
- "stripe/stripe-php" : "6.43.1"
+ "stripe/stripe-php" : "6.43.1",
+ "maximebf/debugbar" : "1.15.1",
+ "symfony/var-dumper": "3"
},
"require-dev" : {
- "jakub-onderka/php-parallel-lint" : "^0",
- "jakub-onderka/php-console-highlighter" : "^0",
+ "php-parallel-lint/php-parallel-lint" : "^0",
+ "php-parallel-lint/php-console-highlighter" : "^0",
"phpunit/phpunit" : "^4",
"squizlabs/php_codesniffer" : "^2",
"phpunit/phpunit-selenium" : "^2"
diff --git a/composer.lock b/composer.lock
index 09c71674512..5afe0ca34f2 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1,10 +1,10 @@
{
"_readme": [
"This file locks the dependencies of your project to a known state",
- "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
+ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "content-hash": "17e906996157e8a94564f686a6096dc5",
+ "content-hash": "1dbd2d05cc0836acfca5988f29005cf2",
"packages": [
{
"name": "ckeditor/ckeditor",
@@ -47,6 +47,67 @@
],
"time": "2019-06-28T10:41:23+00:00"
},
+ {
+ "name": "maximebf/debugbar",
+ "version": "v1.15.1",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/maximebf/php-debugbar.git",
+ "reference": "6c4277f6117e4864966c9cb58fb835cee8c74a1e"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/maximebf/php-debugbar/zipball/6c4277f6117e4864966c9cb58fb835cee8c74a1e",
+ "reference": "6c4277f6117e4864966c9cb58fb835cee8c74a1e",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.6",
+ "psr/log": "^1.0",
+ "symfony/var-dumper": "^2.6|^3|^4"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "^5"
+ },
+ "suggest": {
+ "kriswallsmith/assetic": "The best way to manage assets",
+ "monolog/monolog": "Log using Monolog",
+ "predis/predis": "Redis storage"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.15-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "DebugBar\\": "src/DebugBar/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Maxime Bouroumeau-Fuseau",
+ "email": "maxime.bouroumeau@gmail.com",
+ "homepage": "http://maximebf.com"
+ },
+ {
+ "name": "Barry vd. Heuvel",
+ "email": "barryvdh@gmail.com"
+ }
+ ],
+ "description": "Debug bar in the browser for php application",
+ "homepage": "https://github.com/maximebf/php-debugbar",
+ "keywords": [
+ "debug",
+ "debugbar"
+ ],
+ "time": "2019-09-24T14:55:42+00:00"
+ },
{
"name": "mike42/escpos-php",
"version": "v2.2",
@@ -253,6 +314,53 @@
"abandoned": "phpoffice/phpspreadsheet",
"time": "2015-05-01T07:00:55+00:00"
},
+ {
+ "name": "psr/log",
+ "version": "1.1.3",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/php-fig/log.git",
+ "reference": "0f73288fd15629204f9d42b7055f72dacbe811fc"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/php-fig/log/zipball/0f73288fd15629204f9d42b7055f72dacbe811fc",
+ "reference": "0f73288fd15629204f9d42b7055f72dacbe811fc",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.3.0"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.1.x-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Psr\\Log\\": "Psr/Log/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "PHP-FIG",
+ "homepage": "http://www.php-fig.org/"
+ }
+ ],
+ "description": "Common interface for logging libraries",
+ "homepage": "https://github.com/php-fig/log",
+ "keywords": [
+ "log",
+ "psr",
+ "psr-3"
+ ],
+ "time": "2020-03-23T09:12:05+00:00"
+ },
{
"name": "restler/framework",
"version": "3.0.0-RC6",
@@ -260,12 +368,12 @@
"source": {
"type": "git",
"url": "https://github.com/Luracast/Restler-Framework.git",
- "reference": "0f6b0f26152f83e43a2a86820206c455095fb2b0"
+ "reference": "d52e61600d153bca60a287c35141c5c01863127b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/Luracast/Restler-Framework/zipball/0f6b0f26152f83e43a2a86820206c455095fb2b0",
- "reference": "0f6b0f26152f83e43a2a86820206c455095fb2b0",
+ "url": "https://api.github.com/repos/Luracast/Restler-Framework/zipball/d52e61600d153bca60a287c35141c5c01863127b",
+ "reference": "d52e61600d153bca60a287c35141c5c01863127b",
"shasum": ""
},
"require": {
@@ -312,7 +420,7 @@
"rest",
"server"
],
- "time": "2019-05-12T15:15:11+00:00"
+ "time": "2020-02-13T16:05:12+00:00"
},
{
"name": "stripe/stripe-php",
@@ -370,6 +478,146 @@
],
"time": "2019-08-29T16:56:12+00:00"
},
+ {
+ "name": "symfony/polyfill-mbstring",
+ "version": "v1.18.1",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/symfony/polyfill-mbstring.git",
+ "reference": "a6977d63bf9a0ad4c65cd352709e230876f9904a"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/a6977d63bf9a0ad4c65cd352709e230876f9904a",
+ "reference": "a6977d63bf9a0ad4c65cd352709e230876f9904a",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.3.3"
+ },
+ "suggest": {
+ "ext-mbstring": "For best performance"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.18-dev"
+ },
+ "thanks": {
+ "name": "symfony/polyfill",
+ "url": "https://github.com/symfony/polyfill"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Symfony\\Polyfill\\Mbstring\\": ""
+ },
+ "files": [
+ "bootstrap.php"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Nicolas Grekas",
+ "email": "p@tchwork.com"
+ },
+ {
+ "name": "Symfony Community",
+ "homepage": "https://symfony.com/contributors"
+ }
+ ],
+ "description": "Symfony polyfill for the Mbstring extension",
+ "homepage": "https://symfony.com",
+ "keywords": [
+ "compatibility",
+ "mbstring",
+ "polyfill",
+ "portable",
+ "shim"
+ ],
+ "funding": [
+ {
+ "url": "https://symfony.com/sponsor",
+ "type": "custom"
+ },
+ {
+ "url": "https://github.com/fabpot",
+ "type": "github"
+ },
+ {
+ "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+ "type": "tidelift"
+ }
+ ],
+ "time": "2020-07-14T12:35:20+00:00"
+ },
+ {
+ "name": "symfony/var-dumper",
+ "version": "v3.0.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/symfony/var-dumper.git",
+ "reference": "737e07704cca83f9dd0af926d45ce27eedc25657"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/symfony/var-dumper/zipball/737e07704cca83f9dd0af926d45ce27eedc25657",
+ "reference": "737e07704cca83f9dd0af926d45ce27eedc25657",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.5.9",
+ "symfony/polyfill-mbstring": "~1.0"
+ },
+ "require-dev": {
+ "twig/twig": "~1.20|~2.0"
+ },
+ "suggest": {
+ "ext-symfony_debug": ""
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "3.0-dev"
+ }
+ },
+ "autoload": {
+ "files": [
+ "Resources/functions/dump.php"
+ ],
+ "psr-4": {
+ "Symfony\\Component\\VarDumper\\": ""
+ },
+ "exclude-from-classmap": [
+ "/Tests/"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Nicolas Grekas",
+ "email": "p@tchwork.com"
+ },
+ {
+ "name": "Symfony Community",
+ "homepage": "https://symfony.com/contributors"
+ }
+ ],
+ "description": "Symfony mechanism for exploring and dumping PHP variables",
+ "homepage": "https://symfony.com",
+ "keywords": [
+ "debug",
+ "dump"
+ ],
+ "time": "2015-11-18T13:48:51+00:00"
+ },
{
"name": "tecnickcom/tcpdf",
"version": "6.3.2",
@@ -489,16 +737,16 @@
"time": "2015-06-14T21:17:01+00:00"
},
{
- "name": "jakub-onderka/php-console-color",
+ "name": "php-parallel-lint/php-console-color",
"version": "v0.2",
"source": {
"type": "git",
- "url": "https://github.com/JakubOnderka/PHP-Console-Color.git",
+ "url": "https://github.com/php-parallel-lint/PHP-Console-Color.git",
"reference": "d5deaecff52a0d61ccb613bb3804088da0307191"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/JakubOnderka/PHP-Console-Color/zipball/d5deaecff52a0d61ccb613bb3804088da0307191",
+ "url": "https://api.github.com/repos/php-parallel-lint/PHP-Console-Color/zipball/d5deaecff52a0d61ccb613bb3804088da0307191",
"reference": "d5deaecff52a0d61ccb613bb3804088da0307191",
"shasum": ""
},
@@ -531,28 +779,31 @@
"time": "2018-09-29T17:23:10+00:00"
},
{
- "name": "jakub-onderka/php-console-highlighter",
- "version": "v0.4",
+ "name": "php-parallel-lint/php-console-highlighter",
+ "version": "v0.5",
"source": {
"type": "git",
- "url": "https://github.com/JakubOnderka/PHP-Console-Highlighter.git",
- "reference": "9f7a229a69d52506914b4bc61bfdb199d90c5547"
+ "url": "https://github.com/php-parallel-lint/PHP-Console-Highlighter.git",
+ "reference": "21bf002f077b177f056d8cb455c5ed573adfdbb8"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/JakubOnderka/PHP-Console-Highlighter/zipball/9f7a229a69d52506914b4bc61bfdb199d90c5547",
- "reference": "9f7a229a69d52506914b4bc61bfdb199d90c5547",
+ "url": "https://api.github.com/repos/php-parallel-lint/PHP-Console-Highlighter/zipball/21bf002f077b177f056d8cb455c5ed573adfdbb8",
+ "reference": "21bf002f077b177f056d8cb455c5ed573adfdbb8",
"shasum": ""
},
"require": {
"ext-tokenizer": "*",
- "jakub-onderka/php-console-color": "~0.2",
- "php": ">=5.4.0"
+ "php": ">=5.4.0",
+ "php-parallel-lint/php-console-color": "~0.2"
+ },
+ "replace": {
+ "jakub-onderka/php-console-highlighter": "*"
},
"require-dev": {
- "jakub-onderka/php-code-style": "~1.0",
- "jakub-onderka/php-parallel-lint": "~1.0",
- "jakub-onderka/php-var-dump-check": "~0.1",
+ "php-parallel-lint/php-code-style": "~1.0",
+ "php-parallel-lint/php-parallel-lint": "~1.0",
+ "php-parallel-lint/php-var-dump-check": "~0.1",
"phpunit/phpunit": "~4.0",
"squizlabs/php_codesniffer": "~1.5"
},
@@ -574,19 +825,19 @@
}
],
"description": "Highlight PHP code in terminal",
- "time": "2018-09-29T18:48:56+00:00"
+ "time": "2020-05-13T07:37:49+00:00"
},
{
- "name": "jakub-onderka/php-parallel-lint",
+ "name": "php-parallel-lint/php-parallel-lint",
"version": "v0.9.2",
"source": {
"type": "git",
- "url": "https://github.com/JakubOnderka/PHP-Parallel-Lint.git",
+ "url": "https://github.com/php-parallel-lint/PHP-Parallel-Lint.git",
"reference": "2ead2e4043ab125bee9554f356e0a86742c2d4fa"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/JakubOnderka/PHP-Parallel-Lint/zipball/2ead2e4043ab125bee9554f356e0a86742c2d4fa",
+ "url": "https://api.github.com/repos/php-parallel-lint/PHP-Parallel-Lint/zipball/2ead2e4043ab125bee9554f356e0a86742c2d4fa",
"reference": "2ead2e4043ab125bee9554f356e0a86742c2d4fa",
"shasum": ""
},
@@ -1082,6 +1333,7 @@
"keywords": [
"tokenizer"
],
+ "abandoned": true,
"time": "2017-12-04T08:55:13+00:00"
},
{
@@ -1785,6 +2037,159 @@
],
"time": "2019-08-06T08:03:45+00:00"
},
+ {
+ "name": "symfony/polyfill-php72",
+ "version": "v1.18.1",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/symfony/polyfill-php72.git",
+ "reference": "639447d008615574653fb3bc60d1986d7172eaae"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/639447d008615574653fb3bc60d1986d7172eaae",
+ "reference": "639447d008615574653fb3bc60d1986d7172eaae",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.3.3"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.18-dev"
+ },
+ "thanks": {
+ "name": "symfony/polyfill",
+ "url": "https://github.com/symfony/polyfill"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Symfony\\Polyfill\\Php72\\": ""
+ },
+ "files": [
+ "bootstrap.php"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Nicolas Grekas",
+ "email": "p@tchwork.com"
+ },
+ {
+ "name": "Symfony Community",
+ "homepage": "https://symfony.com/contributors"
+ }
+ ],
+ "description": "Symfony polyfill backporting some PHP 7.2+ features to lower PHP versions",
+ "homepage": "https://symfony.com",
+ "keywords": [
+ "compatibility",
+ "polyfill",
+ "portable",
+ "shim"
+ ],
+ "funding": [
+ {
+ "url": "https://symfony.com/sponsor",
+ "type": "custom"
+ },
+ {
+ "url": "https://github.com/fabpot",
+ "type": "github"
+ },
+ {
+ "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+ "type": "tidelift"
+ }
+ ],
+ "time": "2020-07-14T12:35:20+00:00"
+ },
+ {
+ "name": "symfony/polyfill-php80",
+ "version": "v1.18.1",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/symfony/polyfill-php80.git",
+ "reference": "d87d5766cbf48d72388a9f6b85f280c8ad51f981"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/d87d5766cbf48d72388a9f6b85f280c8ad51f981",
+ "reference": "d87d5766cbf48d72388a9f6b85f280c8ad51f981",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=7.0.8"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.18-dev"
+ },
+ "thanks": {
+ "name": "symfony/polyfill",
+ "url": "https://github.com/symfony/polyfill"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Symfony\\Polyfill\\Php80\\": ""
+ },
+ "files": [
+ "bootstrap.php"
+ ],
+ "classmap": [
+ "Resources/stubs"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Ion Bazan",
+ "email": "ion.bazan@gmail.com"
+ },
+ {
+ "name": "Nicolas Grekas",
+ "email": "p@tchwork.com"
+ },
+ {
+ "name": "Symfony Community",
+ "homepage": "https://symfony.com/contributors"
+ }
+ ],
+ "description": "Symfony polyfill backporting some PHP 8.0+ features to lower PHP versions",
+ "homepage": "https://symfony.com",
+ "keywords": [
+ "compatibility",
+ "polyfill",
+ "portable",
+ "shim"
+ ],
+ "funding": [
+ {
+ "url": "https://symfony.com/sponsor",
+ "type": "custom"
+ },
+ {
+ "url": "https://github.com/fabpot",
+ "type": "github"
+ },
+ {
+ "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+ "type": "tidelift"
+ }
+ ],
+ "time": "2020-07-14T12:35:20+00:00"
+ },
{
"name": "symfony/yaml",
"version": "v3.4.32",
@@ -1903,8 +2308,9 @@
"prefer-stable": false,
"prefer-lowest": false,
"platform": {
- "php": ">=5.5.0",
+ "php": ">=5.6.0",
"ext-curl": "*"
},
- "platform-dev": []
+ "platform-dev": [],
+ "plugin-api-version": "1.1.0"
}
diff --git a/dev/dolibarr_changes.txt b/dev/dolibarr_changes.txt
index 3c7ff061e49..5f09d9536be 100644
--- a/dev/dolibarr_changes.txt
+++ b/dev/dolibarr_changes.txt
@@ -28,19 +28,6 @@ With
-DEBUGBAR:
----------
-
-Move
- this.options = {
- bodyMarginBottom: true,
- bodyMarginBottomHeight: parseInt($('body').css('margin-bottom')),
- };
-few line lower in the
- initialize: function() {
-
-
-
ESCPOS:
-------
Replace
diff --git a/htdocs/accountancy/admin/index.php b/htdocs/accountancy/admin/index.php
index 26ea76d2277..afc40bfdff9 100644
--- a/htdocs/accountancy/admin/index.php
+++ b/htdocs/accountancy/admin/index.php
@@ -34,7 +34,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
// Load translation files required by the page
-$langs->loadLangs(array("compta", "bills", "admin", "accountancy"));
+$langs->loadLangs(array("compta", "bills", "admin", "accountancy", "other"));
// Security access
if (empty($user->rights->accounting->chartofaccount))
@@ -46,14 +46,15 @@ $action = GETPOST('action', 'aZ09');
// Parameters ACCOUNTING_* and others
$list = array(
- 'ACCOUNTING_LENGTH_GACCOUNT',
- 'ACCOUNTING_LENGTH_AACCOUNT',
+ 'ACCOUNTING_LENGTH_GACCOUNT',
+ 'ACCOUNTING_LENGTH_AACCOUNT',
// 'ACCOUNTING_LENGTH_DESCRIPTION', // adjust size displayed for lines description for dol_trunc
// 'ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT', // adjust size displayed for select account description for dol_trunc
);
$list_binding = array(
'ACCOUNTING_DATE_START_BINDING',
+ 'ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER'
);
/*
@@ -67,17 +68,17 @@ if ($action == 'update') {
if (!$error)
{
- foreach ($list as $constname)
- {
- $constvalue = GETPOST($constname, 'alpha');
+ foreach ($list as $constname)
+ {
+ $constvalue = GETPOST($constname, 'alpha');
- if (!dolibarr_set_const($db, $constname, $constvalue, 'chaine', 0, '', $conf->entity)) {
- $error++;
- }
- }
- if ($error) {
- setEventMessages($langs->trans("Error"), null, 'errors');
- }
+ if (!dolibarr_set_const($db, $constname, $constvalue, 'chaine', 0, '', $conf->entity)) {
+ $error++;
+ }
+ }
+ if ($error) {
+ setEventMessages($langs->trans("Error"), null, 'errors');
+ }
foreach ($list_binding as $constname)
{
@@ -96,46 +97,46 @@ if ($action == 'update') {
}
}
- if (!$error) {
- setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
- }
+ if (!$error) {
+ setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+ }
}
if ($action == 'setlistsorttodo') {
- $setlistsorttodo = GETPOST('value', 'int');
- $res = dolibarr_set_const($db, "ACCOUNTING_LIST_SORT_VENTILATION_TODO", $setlistsorttodo, 'yesno', 0, '', $conf->entity);
- if (!$res > 0)
- $error++;
+ $setlistsorttodo = GETPOST('value', 'int');
+ $res = dolibarr_set_const($db, "ACCOUNTING_LIST_SORT_VENTILATION_TODO", $setlistsorttodo, 'yesno', 0, '', $conf->entity);
+ if (!$res > 0)
+ $error++;
- if (!$error) {
- setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
- } else {
- setEventMessages($langs->trans("Error"), null, 'mesgs');
- }
+ if (!$error) {
+ setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+ } else {
+ setEventMessages($langs->trans("Error"), null, 'mesgs');
+ }
}
if ($action == 'setlistsortdone') {
- $setlistsortdone = GETPOST('value', 'int');
- $res = dolibarr_set_const($db, "ACCOUNTING_LIST_SORT_VENTILATION_DONE", $setlistsortdone, 'yesno', 0, '', $conf->entity);
- if (!$res > 0)
- $error++;
- if (!$error) {
- setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
- } else {
- setEventMessages($langs->trans("Error"), null, 'mesgs');
- }
+ $setlistsortdone = GETPOST('value', 'int');
+ $res = dolibarr_set_const($db, "ACCOUNTING_LIST_SORT_VENTILATION_DONE", $setlistsortdone, 'yesno', 0, '', $conf->entity);
+ if (!$res > 0)
+ $error++;
+ if (!$error) {
+ setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+ } else {
+ setEventMessages($langs->trans("Error"), null, 'mesgs');
+ }
}
if ($action == 'setmanagezero') {
- $setmanagezero = GETPOST('value', 'int');
- $res = dolibarr_set_const($db, "ACCOUNTING_MANAGE_ZERO", $setmanagezero, 'yesno', 0, '', $conf->entity);
- if (!$res > 0)
- $error++;
- if (!$error) {
- setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
- } else {
- setEventMessages($langs->trans("Error"), null, 'mesgs');
- }
+ $setmanagezero = GETPOST('value', 'int');
+ $res = dolibarr_set_const($db, "ACCOUNTING_MANAGE_ZERO", $setmanagezero, 'yesno', 0, '', $conf->entity);
+ if (!$res > 0)
+ $error++;
+ if (!$error) {
+ setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+ } else {
+ setEventMessages($langs->trans("Error"), null, 'mesgs');
+ }
}
if ($action == 'setdisabledirectinput') {
@@ -163,15 +164,51 @@ if ($action == 'setenabledraftexport') {
}
if ($action == 'setenablesubsidiarylist') {
- $setenablesubsidiarylist = GETPOST('value', 'int');
- $res = dolibarr_set_const($db, "ACCOUNTANCY_COMBO_FOR_AUX", $setenablesubsidiarylist, 'yesno', 0, '', $conf->entity);
- if (!$res > 0)
- $error++;
- if (!$error) {
- setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
- } else {
- setEventMessages($langs->trans("Error"), null, 'mesgs');
- }
+ $setenablesubsidiarylist = GETPOST('value', 'int');
+ $res = dolibarr_set_const($db, "ACCOUNTANCY_COMBO_FOR_AUX", $setenablesubsidiarylist, 'yesno', 0, '', $conf->entity);
+ if (!$res > 0)
+ $error++;
+ if (!$error) {
+ setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+ } else {
+ setEventMessages($langs->trans("Error"), null, 'mesgs');
+ }
+}
+
+if ($action == 'setdisablebindingonsales') {
+ $setdisablebindingonsales = GETPOST('value', 'int');
+ $res = dolibarr_set_const($db, "ACCOUNTING_DISABLE_BINDING_ON_SALES", $setdisablebindingonsales, 'yesno', 0, '', $conf->entity);
+ if (!$res > 0)
+ $error++;
+ if (!$error) {
+ setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+ } else {
+ setEventMessages($langs->trans("Error"), null, 'mesgs');
+ }
+}
+
+if ($action == 'setdisablebindingonpurchases') {
+ $setdisablebindingonpurchases = GETPOST('value', 'int');
+ $res = dolibarr_set_const($db, "ACCOUNTING_DISABLE_BINDING_ON_PURCHASES", $setdisablebindingonpurchases, 'yesno', 0, '', $conf->entity);
+ if (!$res > 0)
+ $error++;
+ if (!$error) {
+ setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+ } else {
+ setEventMessages($langs->trans("Error"), null, 'mesgs');
+ }
+}
+
+if ($action == 'setdisablebindingonexpensereports') {
+ $setdisablebindingonexpensereports = GETPOST('value', 'int');
+ $res = dolibarr_set_const($db, "ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS", $setdisablebindingonexpensereports, 'yesno', 0, '', $conf->entity);
+ if (!$res > 0)
+ $error++;
+ if (!$error) {
+ setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+ } else {
+ setEventMessages($langs->trans("Error"), null, 'mesgs');
+ }
}
/*
@@ -226,82 +263,78 @@ print '
';
print '
'.$langs->trans('Options').'
';
print "
\n";
-if (!empty($user->admin))
+// TO DO Mutualize code for yes/no constants
+
+/* Set this option as a hidden option but keep it for some needs.
+print '
';
+
+// Param a user $user->rights->accounting->chartofaccount can access
+foreach ($list as $key)
{
- // TO DO Mutualize code for yes/no constants
+ print '
';
- /* Set this option as a hidden option but keep it for some needs.
- print '
\n";
- } else {
- $keyforobj = 'type_template';
- if (!in_array($obj->$keyforobj, array_keys($elementList)))
- {
- $i++;
- continue; // It means this is a type of template not into elementList (may be because enabled condition of this type is false because module is not enabled)
- }
+ print "\n";
+ } else {
+ $keyforobj = 'type_template';
+ if (!in_array($obj->$keyforobj, array_keys($elementList)))
+ {
+ $i++;
+ continue; // It means this is a type of template not into elementList (may be because enabled condition of this type is false because module is not enabled)
+ }
// Test on 'enabled'
if (!dol_eval($obj->enabled, 1))
{
@@ -804,100 +804,100 @@ if ($resql)
continue; // Email template not qualified
}
- print '
';
+ print '
';
- $tmpaction = 'view';
- $parameters = array('var'=>$var, 'fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]);
- $reshook = $hookmanager->executeHooks('viewEmailTemplateFieldlist', $parameters, $obj, $tmpaction); // Note that $action and $object may have been modified by some hooks
+ $tmpaction = 'view';
+ $parameters = array('var'=>$var, 'fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]);
+ $reshook = $hookmanager->executeHooks('viewEmailTemplateFieldlist', $parameters, $obj, $tmpaction); // Note that $action and $object may have been modified by some hooks
- $error = $hookmanager->error; $errors = $hookmanager->errors;
+ $error = $hookmanager->error; $errors = $hookmanager->errors;
- if (empty($reshook))
- {
- foreach ($fieldlist as $field => $value)
- {
- if (in_array($fieldlist[$field], array('content', 'content_lines'))) continue;
- $showfield = 1;
- $align = "left";
- $valuetoshow = $obj->{$fieldlist[$field]};
- if ($value == 'label' || $value == 'topic')
- {
- $valuetoshow = dol_escape_htmltag($valuetoshow);
- }
- if ($value == 'type_template')
- {
- $valuetoshow = isset($elementList[$valuetoshow]) ? $elementList[$valuetoshow] : $valuetoshow;
- }
- if ($value == 'lang' && $valuetoshow)
- {
- $valuetoshow = $valuetoshow.' - '.$langs->trans("Language_".$valuetoshow);
- }
- if ($value == 'fk_user')
- {
- if ($valuetoshow > 0)
- {
- $fuser = new User($db);
- $fuser->fetch($valuetoshow);
- $valuetoshow = $fuser->getNomUrl(1);
- }
- }
- if ($value == 'private')
- {
- $align = "center";
- if ($valuetoshow) $valuetoshow = yn($valuetoshow);
- else $valuetoshow = '';
- }
- if ($value == 'position')
- {
- $align = "center";
- }
- if ($value == 'joinfiles')
- {
- $align = "center";
- if ($valuetoshow) $valuetoshow = 1;
- else $valuetoshow = '';
- }
+ if (empty($reshook))
+ {
+ foreach ($fieldlist as $field => $value)
+ {
+ if (in_array($fieldlist[$field], array('content', 'content_lines'))) continue;
+ $showfield = 1;
+ $align = "left";
+ $valuetoshow = $obj->{$fieldlist[$field]};
+ if ($value == 'label' || $value == 'topic')
+ {
+ $valuetoshow = dol_escape_htmltag($valuetoshow);
+ }
+ if ($value == 'type_template')
+ {
+ $valuetoshow = isset($elementList[$valuetoshow]) ? $elementList[$valuetoshow] : $valuetoshow;
+ }
+ if ($value == 'lang' && $valuetoshow)
+ {
+ $valuetoshow = $valuetoshow.' - '.$langs->trans("Language_".$valuetoshow);
+ }
+ if ($value == 'fk_user')
+ {
+ if ($valuetoshow > 0)
+ {
+ $fuser = new User($db);
+ $fuser->fetch($valuetoshow);
+ $valuetoshow = $fuser->getNomUrl(1);
+ }
+ }
+ if ($value == 'private')
+ {
+ $align = "center";
+ if ($valuetoshow) $valuetoshow = yn($valuetoshow);
+ else $valuetoshow = '';
+ }
+ if ($value == 'position')
+ {
+ $align = "center";
+ }
+ if ($value == 'joinfiles')
+ {
+ $align = "center";
+ if ($valuetoshow) $valuetoshow = 1;
+ else $valuetoshow = '';
+ }
- $class = 'tddict';
+ $class = 'tddict';
// Show value for field
if ($showfield)
{
- print '';
- print '
';
- if ($canbemodified) print ''.img_edit().'';
- if ($iserasable)
- {
- print ''.img_delete().'';
- //else print ''.img_delete().''; // Some dictionary can be edited by other profile than admin
- }
- print '
';
+ // Modify link / Delete link
+ print '
';
+ if ($canbemodified) print ''.img_edit().'';
+ if ($iserasable)
+ {
+ print ''.img_delete().'';
+ //else print ''.img_delete().''; // Some dictionary can be edited by other profile than admin
+ }
+ print '
'."\n";
- $parameters = array();
- $reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
- if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+ print '
';
+ print ''; // ancre
- // Documents
- $objref = dol_sanitizeFileName($object->ref);
- $relativepath = $objref.'/'.$objref.'.pdf';
- $filedir = $conf->bom->dir_output.'/'.$objref;
- $urlsource = $_SERVER["PHP_SELF"]."?id=".$object->id;
- $genallowed = $user->rights->bom->read; // If you can read, you can build the PDF to read content
- $delallowed = $user->rights->bom->write; // If you can create/edit, you can remove a file on card
- print $formfile->showdocuments('bom', $objref, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 1, 0, 0, 28, 0, '', '', '', $langs->defaultlang);
+ // Documents
+ $objref = dol_sanitizeFileName($object->ref);
+ $relativepath = $objref.'/'.$objref.'.pdf';
+ $filedir = $conf->bom->dir_output.'/'.$objref;
+ $urlsource = $_SERVER["PHP_SELF"]."?id=".$object->id;
+ $genallowed = $user->rights->bom->read; // If you can read, you can build the PDF to read content
+ $delallowed = $user->rights->bom->write; // If you can create/edit, you can remove a file on card
+ print $formfile->showdocuments('bom', $objref, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 1, 0, 0, 28, 0, '', '', '', $langs->defaultlang);
- // Show links to link elements
- $linktoelem = $form->showLinkToObjectBlock($object, null, array('bom'));
- $somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
+ // Show links to link elements
+ $linktoelem = $form->showLinkToObjectBlock($object, null, array('bom'));
+ $somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
- print '
';
+ print '
';
- $MAXEVENT = 10;
+ $MAXEVENT = 10;
- $morehtmlright = '';
- $morehtmlright .= $langs->trans("SeeAll");
- $morehtmlright .= '';
+ $morehtmlright = '';
+ $morehtmlright .= $langs->trans("SeeAll");
+ $morehtmlright .= '';
- // List of actions on element
- include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
- $formactions = new FormActions($db);
- $somethingshown = $formactions->showactions($object, 'bom', $socid, 1, '', $MAXEVENT, '', $morehtmlright);
+ // List of actions on element
+ include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
+ $formactions = new FormActions($db);
+ $somethingshown = $formactions->showactions($object, 'bom', $socid, 1, '', $MAXEVENT, '', $morehtmlright);
- print '
';
+ print '
';
}
//Select mail models is same action as presend
- if (GETPOST('modelselected')) $action = 'presend';
+ if (GETPOST('modelselected')) $action = 'presend';
// Presend form
$modelmail = 'bom';
diff --git a/htdocs/bom/tpl/objectline_create.tpl.php b/htdocs/bom/tpl/objectline_create.tpl.php
index 74eb88393df..2a675cc60e1 100644
--- a/htdocs/bom/tpl/objectline_create.tpl.php
+++ b/htdocs/bom/tpl/objectline_create.tpl.php
@@ -31,8 +31,8 @@
// Protection to avoid direct call of template
if (empty($object) || !is_object($object)) {
- print "Error: this template page cannot be called directly as an URL";
- exit;
+ print "Error: this template page cannot be called directly as an URL";
+ exit;
}
@@ -52,34 +52,34 @@ print "\n";
$nolinesbefore = (count($this->lines) == 0 || $forcetoshowtitlelines);
if ($nolinesbefore) {
- print '
';
- if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER)) {
- print '
';
- }
- print '
';
+ print '
';
+ if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER)) {
+ print '
';
- /* WIP View per hour */
- $useviewhour = 0;
- if ($useviewhour)
- {
- print '
'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
+ /* WIP View per hour */
+ $useviewhour = 0;
+ if ($useviewhour)
+ {
+ print '
'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
- $maxheightwin = (isset($_SESSION["dol_screenheight"]) && $_SESSION["dol_screenheight"] > 500) ? ($_SESSION["dol_screenheight"] - 200) : 660; // Also into index.php file
+ $maxheightwin = (isset($_SESSION["dol_screenheight"]) && $_SESSION["dol_screenheight"] > 500) ? ($_SESSION["dol_screenheight"] - 200) : 660; // Also into index.php file
- echo '
'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
+ } else {
+ print '
'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
- show_day_events($db, $day, $month, $year, $month, $style, $eventarray, 0, $maxnbofchar, $newparam, 1, 300, 0);
+ show_day_events($db, $day, $month, $year, $month, $style, $eventarray, 0, $maxnbofchar, $newparam, 1, 300, 0);
- print '
';
- }
+ print '
';
+ }
}
print "\n".'';
@@ -1872,11 +1871,11 @@ function dol_color_minus($color, $minus, $minusunit = 16)
$newcolor = $color;
if ($minusunit == 16)
{
- $newcolor[0] = dechex(max(min(hexdec($newcolor[0]) - $minus, 15), 0));
- $newcolor[2] = dechex(max(min(hexdec($newcolor[2]) - $minus, 15), 0));
- $newcolor[4] = dechex(max(min(hexdec($newcolor[4]) - $minus, 15), 0));
+ $newcolor[0] = dechex(max(min(hexdec($newcolor[0]) - $minus, 15), 0));
+ $newcolor[2] = dechex(max(min(hexdec($newcolor[2]) - $minus, 15), 0));
+ $newcolor[4] = dechex(max(min(hexdec($newcolor[4]) - $minus, 15), 0));
} else {
- // Not yet implemented
+ // Not yet implemented
}
return $newcolor;
}
@@ -1891,39 +1890,39 @@ function dol_color_minus($color, $minus, $minusunit = 16)
function sort_events_by_date($a, $b)
{
// Sort holidays at first
- if ($a->type_code === 'HOLIDAY')
- {
- return -1;
- }
+ if ($a->type_code === 'HOLIDAY')
+ {
+ return -1;
+ }
- if ($b->type_code === 'HOLIDAY')
- {
- return 1;
- }
+ if ($b->type_code === 'HOLIDAY')
+ {
+ return 1;
+ }
- // datep => Event start time
- // datef => Event end time
+ // datep => Event start time
+ // datef => Event end time
- // Events have different start time
- if ($a->datep !== $b->datep)
- {
- return $a->datep - $b->datep;
- }
+ // Events have different start time
+ if ($a->datep !== $b->datep)
+ {
+ return $a->datep - $b->datep;
+ }
- // Events have same start time and no end time
- if ((!is_numeric($b->datef)) || (!is_numeric($a->datef)))
- {
- return sort_events_by_percentage($a, $b);
- }
+ // Events have same start time and no end time
+ if ((!is_numeric($b->datef)) || (!is_numeric($a->datef)))
+ {
+ return sort_events_by_percentage($a, $b);
+ }
- // Events have the same start time and same end time
- if ($b->datef === $a->datef)
- {
- return sort_events_by_percentage($a, $b);
- }
+ // Events have the same start time and same end time
+ if ($b->datef === $a->datef)
+ {
+ return sort_events_by_percentage($a, $b);
+ }
- // Events have the same start time, but have different end time -> longest event first
- return $b->datef - $a->datef;
+ // Events have the same start time, but have different end time -> longest event first
+ return $b->datef - $a->datef;
}
/**
@@ -1935,18 +1934,18 @@ function sort_events_by_date($a, $b)
*/
function sort_events_by_percentage($a, $b)
{
- // Sort events with no percentage before each other
- // (usefull to sort holidays, sick days or similar on the top)
+ // Sort events with no percentage before each other
+ // (usefull to sort holidays, sick days or similar on the top)
- if ($a->percentage < 0)
- {
- return -1;
- }
+ if ($a->percentage < 0)
+ {
+ return -1;
+ }
- if ($b->percentage < 0)
- {
- return 1;
- }
+ if ($b->percentage < 0)
+ {
+ return 1;
+ }
- return $b->percentage - $a->percentage;
+ return $b->percentage - $a->percentage;
}
diff --git a/htdocs/comm/action/list.php b/htdocs/comm/action/list.php
index 31274bee5fd..20ba2928de1 100644
--- a/htdocs/comm/action/list.php
+++ b/htdocs/comm/action/list.php
@@ -160,7 +160,7 @@ $arrayfields = dol_sort_array($arrayfields, 'position');
if (GETPOST('cancel', 'alpha'))
{
- $action='list'; $massaction='';
+ $action = 'list'; $massaction = '';
}
if (GETPOST("viewcal") || GETPOST("viewweek") || GETPOST("viewday"))
@@ -708,7 +708,7 @@ if ($resql)
$labeltype = $langs->trans("Message");
} else {
if (!empty($arraylist[$labeltype])) $labeltype = $arraylist[$labeltype];
- if ($obj->type_code == 'AC_OTH_AUTO' && ($obj->type_code != $obj->code) && $labeltype && !empty($arraylist[$obj->code])) $labeltype .= ' - '.$arraylist[$obj->code]; // Use code in priority on type_code
+ if ($obj->type_code == 'AC_OTH_AUTO' && ($obj->type_code != $obj->code) && $labeltype && !empty($arraylist[$obj->code])) $labeltype .= ' - '.$arraylist[$obj->code]; // Use code in priority on type_code
}
print dol_trunc($labeltype, 28);
print '
';
diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php
index ea81c4e35b9..ccccc93da4f 100644
--- a/htdocs/comm/mailing/card.php
+++ b/htdocs/comm/mailing/card.php
@@ -211,7 +211,6 @@ if (empty($reshook))
$substitutionarray['__OTHER4__'] = $other4;
$substitutionarray['__OTHER5__'] = $other5;
$substitutionarray['__USER_SIGNATURE__'] = $signature; // Signature is empty when ran from command line or taken from user in parameter)
- $substitutionarray['__SIGNATURE__'] = $signature; // For backward compatibility
$substitutionarray['__CHECK_READ__'] = '';
$substitutionarray['__UNSUBSCRIBE__'] = ''.$langs->trans("MailUnsubcribe").'';
diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index 619203c4dca..db59fd5f942 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -472,6 +472,8 @@ if ($resql)
'generate_doc'=>$langs->trans("ReGeneratePDF"),
'builddoc'=>$langs->trans("PDFMerge"),
'presend'=>$langs->trans("SendByMail"),
+ 'prevalidate'=>$langs->trans("Validate"),
+ 'presign'=>$langs->trans("Sign"),
);
if ($user->rights->propal->supprimer) $arrayofmassactions['predelete'] = ''.$langs->trans("Delete");
if ($user->rights->propal->cloturer) $arrayofmassactions['closed'] = $langs->trans("Close");
@@ -502,6 +504,16 @@ if ($resql)
$trackid = 'pro'.$object->id;
include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
+ if ($massaction == 'prevalidate')
+ {
+ print $form->formconfirm($_SERVER["PHP_SELF"], $langs->trans("ConfirmMassValidation"), $langs->trans("ConfirmMassValidationQuestion"), "validate", null, '', 0, 200, 500, 1);
+ }
+
+ if ($massaction == 'presign')
+ {
+ print $form->formconfirm($_SERVER["PHP_SELF"], $langs->trans("ConfirmMassSignature"), $langs->trans("ConfirmMassSignatureQuestion"), "sign", null, '', 0, 200, 500, 1);
+ }
+
if ($sall)
{
foreach ($fieldstosearchall as $key => $val) $fieldstosearchall[$key] = $langs->trans($val);
@@ -1270,10 +1282,72 @@ if ($resql)
$delallowed = $user->rights->propal->creer;
print $formfile->showdocuments('massfilesarea_proposals', '', $filedir, $urlsource, 0, $delallowed, '', 1, 1, 0, 48, 1, $param, $title, '', '', '', null, $hidegeneratedfilelistifempty);
+
+ if ($action == 'validate') {
+ if (GETPOST('confirm') == 'yes') {
+ $tmpproposal = new Propal($db);
+ $db->begin();
+ $error = 0;
+ foreach ($toselect as $checked) {
+ if ($tmpproposal->fetch($checked)) {
+ if ($tmpproposal->statut == 0) {
+ if ($tmpproposal->valid($user)){
+ setEventMessage($tmpproposal->ref . " " . $langs->trans('PassedInOpenStatus'), 'mesgs');
+ } else {
+ setEventMessage($langs->trans('CantBeValidated'), 'errors');
+ $error++;
+ }
+ } else {
+ setEventMessage($tmpproposal->ref . " " . $langs->trans('IsNotADraft'), 'errors');
+ $error++;
+ }
+ }
+ dol_print_error($db);
+ $error++;
+ }
+ if ($error){
+ $db->rollback();
+ } else {
+ $db->commit();
+ }
+ }
+ }
+
+ if ($action == "sign") {
+ if (GETPOST('confirm') == 'yes') {
+ $tmpproposal = new Propal($db);
+ $db->begin();
+ $error = 0;
+ foreach ($toselect as $checked) {
+ if ($tmpproposal->fetch($checked)) {
+ if ($tmpproposal->statut == 1) {
+ $tmpproposal->statut = 2;
+ if ($tmpproposal->update($user)) {
+ setEventMessage($tmpproposal->ref . " " . $langs->trans('Signed'), 'mesgs');
+ } else {
+ dol_print_error($db);
+ $error++;
+ }
+ } else {
+ setEventMessage($tmpproposal->ref . " " . $langs->trans('CantBeSign'), 'errors');
+ $error++;
+ }
+ } else {
+ dol_print_error($db);
+ $error++;
+ }
+ }
+ if ($error){
+ $db->rollback();
+ } else {
+ $db->commit();
+ }
+ }
+ }
} else {
- dol_print_error($db);
+ dol_print_error($db);
}
-// End of page
-llxFooter();
-$db->close();
+ // End of page
+ llxFooter();
+ $db->close();
diff --git a/htdocs/commande/class/api_orders.class.php b/htdocs/commande/class/api_orders.class.php
index cc7db3db852..e4d432b234a 100644
--- a/htdocs/commande/class/api_orders.class.php
+++ b/htdocs/commande/class/api_orders.class.php
@@ -348,7 +348,8 @@ class Orders extends DolibarrApi
$request_data->fk_unit,
$request_data->origin,
$request_data->origin_id,
- $request_data->multicurrency_subprice
+ $request_data->multicurrency_subprice,
+ $request_data->ref_ext
);
if ($updateRes > 0) {
@@ -406,7 +407,9 @@ class Orders extends DolibarrApi
$request_data->special_code,
$request_data->array_options,
$request_data->fk_unit,
- $request_data->multicurrency_subprice
+ $request_data->multicurrency_subprice,
+ 0,
+ $request_data->ref_ext
);
if ($updateRes > 0) {
@@ -456,6 +459,40 @@ class Orders extends DolibarrApi
}
}
+ /**
+ * Get contacts of given order
+ *
+ * Return an array with contact informations
+ *
+ * @param int $id ID of order
+ * @param string $type Type of the contact (BILLING, SHIPPING, CUSTOMER)
+ *
+ * @url GET {id}/contacts
+ *
+ * @return array data without useless information
+ *
+ * @throws RestException
+ */
+ public function getContacts($id, $type = '')
+ {
+ if (! DolibarrApiAccess::$user->rights->commande->lire) {
+ throw new RestException(401);
+ }
+
+ $result = $this->commande->fetch($id);
+ if ( ! $result ) {
+ throw new RestException(404, 'Order not found');
+ }
+
+ if ( ! DolibarrApi::_checkAccessToResource('commande', $this->commande->id)) {
+ throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+ }
+
+ $contacts = $this->commande->liste_contact(-1, 'external', 0, $type);
+
+ return $this->_cleanObjectDatas($contacts);
+ }
+
/**
* Add a contact type of given order
*
@@ -487,15 +524,24 @@ class Orders extends DolibarrApi
$result = $this->commande->add_contact($contactid, $type, 'external');
- if (!$result) {
+ if ($result < 0) {
throw new RestException(500, 'Error when added the contact');
}
- return $this->commande;
+ if ($result == 0) {
+ throw new RestException(304, 'contact already added');
+ }
+
+ return array(
+ 'success' => array(
+ 'code' => 200,
+ 'message' => 'Contact linked to the order'
+ )
+ );
}
/**
- * Delete a contact type of given order
+ * Unlink a contact type of given order
*
* @param int $id Id of order to update
* @param int $rowid Row key of the contact in the array contact_ids.
@@ -510,26 +556,31 @@ class Orders extends DolibarrApi
*/
public function deleteContact($id, $rowid)
{
- if (!DolibarrApiAccess::$user->rights->commande->creer) {
+ if (! DolibarrApiAccess::$user->rights->commande->creer) {
throw new RestException(401);
}
$result = $this->commande->fetch($id);
- if (!$result) {
+ if (! $result) {
throw new RestException(404, 'Order not found');
}
- if (!DolibarrApi::_checkAccessToResource('commande', $this->commande->id)) {
+ if (! DolibarrApi::_checkAccessToResource('commande', $this->commande->id)) {
throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
}
- $result = $this->commande->delete_contact($rowid);
+ $result = $this->commande->delete_linked_contact($rowid);
if (!$result) {
throw new RestException(500, 'Error when deleted the contact');
}
- return $this->commande;
+ return array(
+ 'success' => array(
+ 'code' => 200,
+ 'message' => 'Contact unlinked from order'
+ )
+ );
}
/**
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 77ba4456c1c..73dd2cee9fb 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -1004,6 +1004,11 @@ class Commande extends CommonOrder
$origintype = $this->element;
}
+ // ref_ext
+ if (empty($line->ref_ext)) {
+ $line->ref_ext = '';
+ }
+
$result = $this->addline(
$line->desc,
$line->subprice,
@@ -1029,7 +1034,9 @@ class Commande extends CommonOrder
$line->array_options,
$line->fk_unit,
$origintype,
- $originid
+ $originid,
+ 0,
+ $line->ref_ext
);
if ($result < 0)
{
@@ -1215,6 +1222,13 @@ class Commande extends CommonOrder
$this->date_validation = '';
if (empty($conf->global->MAIN_KEEP_REF_CUSTOMER_ON_CLONING)) $this->ref_client = '';
+ // Do not clone ref_ext
+ $num = count($this->lines);
+ for ($i = 0; $i < $num; $i++)
+ {
+ $this->lines[$i]->ref_ext = '';
+ }
+
// Create clone
$this->context['createfromclone'] = 'createfromclone';
$result = $this->create($user);
@@ -1423,6 +1437,7 @@ class Commande extends CommonOrder
* @param string $origin Depend on global conf MAIN_CREATEFROM_KEEP_LINE_ORIGIN_INFORMATION can be 'orderdet', 'propaldet'..., else 'order','propal,'....
* @param int $origin_id Depend on global conf MAIN_CREATEFROM_KEEP_LINE_ORIGIN_INFORMATION can be Id of origin object (aka line id), else object id
* @param double $pu_ht_devise Unit price in currency
+ * @param string $ref_ext line external reference
* @return int >0 if OK, <0 if KO
*
* @see add_product()
@@ -1432,13 +1447,13 @@ class Commande extends CommonOrder
* par l'appelant par la methode get_default_tva(societe_vendeuse,societe_acheteuse,produit)
* et le desc doit deja avoir la bonne valeur (a l'appelant de gerer le multilangue)
*/
- public function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1 = 0, $txlocaltax2 = 0, $fk_product = 0, $remise_percent = 0, $info_bits = 0, $fk_remise_except = 0, $price_base_type = 'HT', $pu_ttc = 0, $date_start = '', $date_end = '', $type = 0, $rang = -1, $special_code = 0, $fk_parent_line = 0, $fk_fournprice = null, $pa_ht = 0, $label = '', $array_options = 0, $fk_unit = null, $origin = '', $origin_id = 0, $pu_ht_devise = 0)
+ public function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1 = 0, $txlocaltax2 = 0, $fk_product = 0, $remise_percent = 0, $info_bits = 0, $fk_remise_except = 0, $price_base_type = 'HT', $pu_ttc = 0, $date_start = '', $date_end = '', $type = 0, $rang = -1, $special_code = 0, $fk_parent_line = 0, $fk_fournprice = null, $pa_ht = 0, $label = '', $array_options = 0, $fk_unit = null, $origin = '', $origin_id = 0, $pu_ht_devise = 0, $ref_ext = '')
{
global $mysoc, $conf, $langs, $user;
$logtext = "::addline commandeid=$this->id, desc=$desc, pu_ht=$pu_ht, qty=$qty, txtva=$txtva, fk_product=$fk_product, remise_percent=$remise_percent";
$logtext .= ", info_bits=$info_bits, fk_remise_except=$fk_remise_except, price_base_type=$price_base_type, pu_ttc=$pu_ttc, date_start=$date_start";
- $logtext .= ", date_end=$date_end, type=$type special_code=$special_code, fk_unit=$fk_unit, origin=$origin, origin_id=$origin_id, pu_ht_devise=$pu_ht_devise";
+ $logtext .= ", date_end=$date_end, type=$type special_code=$special_code, fk_unit=$fk_unit, origin=$origin, origin_id=$origin_id, pu_ht_devise=$pu_ht_devise, ref_ext=$ref_ext";
dol_syslog(get_class($this).$logtext, LOG_DEBUG);
if ($this->statut == self::STATUS_DRAFT)
@@ -1446,6 +1461,7 @@ class Commande extends CommonOrder
include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
// Clean parameters
+
if (empty($remise_percent)) $remise_percent = 0;
if (empty($qty)) $qty = 0;
if (empty($info_bits)) $info_bits = 0;
@@ -1455,6 +1471,7 @@ class Commande extends CommonOrder
if (empty($txlocaltax2)) $txlocaltax2 = 0;
if (empty($fk_parent_line) || $fk_parent_line < 0) $fk_parent_line = 0;
if (empty($this->fk_multicurrency)) $this->fk_multicurrency = 0;
+ if (empty($ref_ext)) $ref_ext = '';
$remise_percent = price2num($remise_percent);
$qty = price2num($qty);
@@ -1570,6 +1587,7 @@ class Commande extends CommonOrder
$this->line->label = $label;
$this->line->desc = $desc;
$this->line->qty = $qty;
+ $this->line->ref_ext = $ref_ext;
$this->line->vat_src_code = $vat_src_code;
$this->line->tva_tx = $txtva;
@@ -1977,7 +1995,7 @@ class Commande extends CommonOrder
// phpcs:enable
$this->lines = array();
- $sql = 'SELECT l.rowid, l.fk_product, l.fk_parent_line, l.product_type, l.fk_commande, l.label as custom_label, l.description, l.price, l.qty, l.vat_src_code, l.tva_tx,';
+ $sql = 'SELECT l.rowid, l.fk_product, l.fk_parent_line, l.product_type, l.fk_commande, l.label as custom_label, l.description, l.price, l.qty, l.vat_src_code, l.tva_tx, l.ref_ext,';
$sql .= ' l.localtax1_tx, l.localtax2_tx, l.localtax1_type, l.localtax2_type, l.fk_remise_except, l.remise_percent, l.subprice, l.fk_product_fournisseur_price as fk_fournprice, l.buy_price_ht as pa_ht, l.rang, l.info_bits, l.special_code,';
$sql .= ' l.total_ht, l.total_ttc, l.total_tva, l.total_localtax1, l.total_localtax2, l.date_start, l.date_end,';
$sql .= ' l.fk_unit,';
@@ -2012,6 +2030,7 @@ class Commande extends CommonOrder
$line->description = $objp->description; // Description line
$line->product_type = $objp->product_type;
$line->qty = $objp->qty;
+ $line->ref_ext = $objp->ref_ext;
$line->vat_src_code = $objp->vat_src_code;
$line->tva_tx = $objp->tva_tx;
@@ -2981,13 +3000,14 @@ class Commande extends CommonOrder
* @param string $fk_unit Code of the unit to use. Null to use the default one
* @param double $pu_ht_devise Amount in currency
* @param int $notrigger disable line update trigger
+ * @param string $ref_ext external reference
* @return int < 0 if KO, > 0 if OK
*/
- public function updateline($rowid, $desc, $pu, $qty, $remise_percent, $txtva, $txlocaltax1 = 0.0, $txlocaltax2 = 0.0, $price_base_type = 'HT', $info_bits = 0, $date_start = '', $date_end = '', $type = 0, $fk_parent_line = 0, $skip_update_total = 0, $fk_fournprice = null, $pa_ht = 0, $label = '', $special_code = 0, $array_options = 0, $fk_unit = null, $pu_ht_devise = 0, $notrigger = 0)
+ public function updateline($rowid, $desc, $pu, $qty, $remise_percent, $txtva, $txlocaltax1 = 0.0, $txlocaltax2 = 0.0, $price_base_type = 'HT', $info_bits = 0, $date_start = '', $date_end = '', $type = 0, $fk_parent_line = 0, $skip_update_total = 0, $fk_fournprice = null, $pa_ht = 0, $label = '', $special_code = 0, $array_options = 0, $fk_unit = null, $pu_ht_devise = 0, $notrigger = 0, $ref_ext = '')
{
global $conf, $mysoc, $langs, $user;
- dol_syslog(get_class($this)."::updateline id=$rowid, desc=$desc, pu=$pu, qty=$qty, remise_percent=$remise_percent, txtva=$txtva, txlocaltax1=$txlocaltax1, txlocaltax2=$txlocaltax2, price_base_type=$price_base_type, info_bits=$info_bits, date_start=$date_start, date_end=$date_end, type=$type, fk_parent_line=$fk_parent_line, pa_ht=$pa_ht, special_code=$special_code");
+ dol_syslog(get_class($this)."::updateline id=$rowid, desc=$desc, pu=$pu, qty=$qty, remise_percent=$remise_percent, txtva=$txtva, txlocaltax1=$txlocaltax1, txlocaltax2=$txlocaltax2, price_base_type=$price_base_type, info_bits=$info_bits, date_start=$date_start, date_end=$date_end, type=$type, fk_parent_line=$fk_parent_line, pa_ht=$pa_ht, special_code=$special_code, ref_ext=$ref_ext");
include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
if ($this->statut == Commande::STATUS_DRAFT)
@@ -3000,6 +3020,7 @@ class Commande extends CommonOrder
if (empty($txlocaltax2)) $txlocaltax2 = 0;
if (empty($remise_percent)) $remise_percent = 0;
if (empty($special_code) || $special_code == 3) $special_code = 0;
+ if (empty($ref_ext)) $ref_ext = '';
if ($date_start && $date_end && $date_start > $date_end) {
$langs->load("errors");
@@ -3104,6 +3125,7 @@ class Commande extends CommonOrder
$this->line->label = $label;
$this->line->desc = $desc;
$this->line->qty = $qty;
+ $this->line->ref_ext = $ref_ext;
$this->line->vat_src_code = $vat_src_code;
$this->line->tva_tx = $txtva;
@@ -3970,6 +3992,8 @@ class OrderLine extends CommonOrderLine
*/
public $label;
+ public $ref_ext;
+
public $fk_remise_except;
public $rang = 0;
public $fk_fournprice;
@@ -4014,7 +4038,7 @@ class OrderLine extends CommonOrderLine
public function fetch($rowid)
{
$sql = 'SELECT cd.rowid, cd.fk_commande, cd.fk_parent_line, cd.fk_product, cd.product_type, cd.label as custom_label, cd.description, cd.price, cd.qty, cd.tva_tx, cd.localtax1_tx, cd.localtax2_tx,';
- $sql .= ' cd.remise, cd.remise_percent, cd.fk_remise_except, cd.subprice,';
+ $sql .= ' cd.remise, cd.remise_percent, cd.fk_remise_except, cd.subprice, cd.ref_ext,';
$sql .= ' cd.info_bits, cd.total_ht, cd.total_tva, cd.total_localtax1, cd.total_localtax2, cd.total_ttc, cd.fk_product_fournisseur_price as fk_fournprice, cd.buy_price_ht as pa_ht, cd.rang, cd.special_code,';
$sql .= ' cd.fk_unit,';
$sql .= ' cd.fk_multicurrency, cd.multicurrency_code, cd.multicurrency_subprice, cd.multicurrency_total_ht, cd.multicurrency_total_tva, cd.multicurrency_total_ttc,';
@@ -4036,6 +4060,7 @@ class OrderLine extends CommonOrderLine
$this->qty = $objp->qty;
$this->price = $objp->price;
$this->subprice = $objp->subprice;
+ $this->ref_ext = $objp->ref_ext;
$this->vat_src_code = $objp->vat_src_code;
$this->tva_tx = $objp->tva_tx;
$this->localtax1_tx = $objp->localtax1_tx;
@@ -4205,6 +4230,7 @@ class OrderLine extends CommonOrderLine
if (empty($this->special_code)) $this->special_code = 0;
if (empty($this->fk_parent_line)) $this->fk_parent_line = 0;
if (empty($this->pa_ht)) $this->pa_ht = 0;
+ if (empty($this->ref_ext)) $this->ref_ext = '';
// if buy price not defined, define buyprice as configured in margin admin
if ($this->pa_ht == 0 && $pa_ht_isemptystring)
@@ -4224,7 +4250,7 @@ class OrderLine extends CommonOrderLine
// Insertion dans base de la ligne
$sql = 'INSERT INTO '.MAIN_DB_PREFIX.'commandedet';
- $sql .= ' (fk_commande, fk_parent_line, label, description, qty, ';
+ $sql .= ' (fk_commande, fk_parent_line, label, description, qty, ref_ext,';
$sql .= ' vat_src_code, tva_tx, localtax1_tx, localtax2_tx, localtax1_type, localtax2_type,';
$sql .= ' fk_product, product_type, remise_percent, subprice, price, remise, fk_remise_except,';
$sql .= ' special_code, rang, fk_product_fournisseur_price, buy_price_ht,';
@@ -4237,6 +4263,7 @@ class OrderLine extends CommonOrderLine
$sql .= " ".(!empty($this->label) ? "'".$this->db->escape($this->label)."'" : "null").",";
$sql .= " '".$this->db->escape($this->desc)."',";
$sql .= " '".price2num($this->qty)."',";
+ $sql .= " '".$this->db->escape($this->ref_ext)."',";
$sql .= " ".(empty($this->vat_src_code) ? "''" : "'".$this->db->escape($this->vat_src_code)."'").",";
$sql .= " '".price2num($this->tva_tx)."',";
$sql .= " '".price2num($this->localtax1_tx)."',";
@@ -4347,6 +4374,7 @@ class OrderLine extends CommonOrderLine
if (empty($this->product_type)) $this->product_type = 0;
if (empty($this->fk_parent_line)) $this->fk_parent_line = 0;
if (empty($this->pa_ht)) $this->pa_ht = 0;
+ if (empty($this->ref_ext)) $this->ref_ext = '';
// if buy price not defined, define buyprice as configured in margin admin
if ($this->pa_ht == 0 && $pa_ht_isemptystring)
@@ -4372,6 +4400,7 @@ class OrderLine extends CommonOrderLine
$sql .= " , localtax1_type='".$this->db->escape($this->localtax1_type)."'";
$sql .= " , localtax2_type='".$this->db->escape($this->localtax2_type)."'";
$sql .= " , qty=".price2num($this->qty);
+ $sql .= " , ref_ext='".$this->db->escape($this->ref_ext)."'";
$sql .= " , subprice=".price2num($this->subprice)."";
$sql .= " , remise_percent=".price2num($this->remise_percent)."";
$sql .= " , price=".price2num($this->price).""; // TODO A virer
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index e40c614ea08..20f705a8ed9 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -818,6 +818,11 @@ class Facture extends CommonInvoice
$origintype = $this->element;
}
+ // init ref_ext
+ if (empty($line->ref_ext)) {
+ $line->ref_ext = '';
+ }
+
$result = $this->addline(
$line->desc,
$line->subprice,
@@ -847,7 +852,8 @@ class Facture extends CommonInvoice
$line->situation_percent,
$line->fk_prev_id,
$line->fk_unit,
- $line->pu_ht_devise
+ $line->pu_ht_devise,
+ $line->ref_ext
);
if ($result < 0)
{
@@ -1073,6 +1079,7 @@ class Facture extends CommonInvoice
$facture->lines[$i]->total_localtax1 = -$facture->lines[$i]->total_localtax1;
$facture->lines[$i]->total_localtax2 = -$facture->lines[$i]->total_localtax2;
$facture->lines[$i]->total_ttc = -$facture->lines[$i]->total_ttc;
+ $facture->lines[$i]->ref_ext = '';
}
}
@@ -1190,6 +1197,8 @@ class Facture extends CommonInvoice
$object->lines[$i]->date_end = $newLast;
}
}
+
+ $object->lines[$i]->ref_ext = ''; // Do not clone ref_ext
}
// Create clone
@@ -1658,7 +1667,7 @@ class Facture extends CommonInvoice
$this->lines = array();
$sql = 'SELECT l.rowid, l.fk_facture, l.fk_product, l.fk_parent_line, l.label as custom_label, l.description, l.product_type, l.price, l.qty, l.vat_src_code, l.tva_tx,';
- $sql .= ' l.localtax1_tx, l.localtax2_tx, l.localtax1_type, l.localtax2_type, l.remise_percent, l.fk_remise_except, l.subprice,';
+ $sql .= ' l.localtax1_tx, l.localtax2_tx, l.localtax1_type, l.localtax2_type, l.remise_percent, l.fk_remise_except, l.subprice, l.ref_ext,';
$sql .= ' l.situation_percent, l.fk_prev_id,';
$sql .= ' l.rang, l.special_code,';
$sql .= ' l.date_start as date_start, l.date_end as date_end,';
@@ -1697,6 +1706,7 @@ class Facture extends CommonInvoice
$line->fk_product_type = $objp->fk_product_type; // Type of product
$line->qty = $objp->qty;
$line->subprice = $objp->subprice;
+ $line->ref_ext = $objp->ref_ext; // line external ref
$line->vat_src_code = $objp->vat_src_code;
$line->tva_tx = $objp->tva_tx;
@@ -1819,6 +1829,7 @@ class Facture extends CommonInvoice
// Clean parameters
if (empty($this->type)) $this->type = self::TYPE_STANDARD;
if (isset($this->ref)) $this->ref = trim($this->ref);
+ if (isset($this->ref_ext)) $this->ref_ext = trim($this->ref_ext);
if (isset($this->ref_client)) $this->ref_client = trim($this->ref_client);
if (isset($this->increment)) $this->increment = trim($this->increment);
if (isset($this->close_code)) $this->close_code = trim($this->close_code);
@@ -1837,6 +1848,7 @@ class Facture extends CommonInvoice
// Update request
$sql = "UPDATE ".MAIN_DB_PREFIX."facture SET";
$sql .= " ref=".(isset($this->ref) ? "'".$this->db->escape($this->ref)."'" : "null").",";
+ $sql .= " ref_ext=".(isset($this->ref_ext) ? "'".$this->db->escape($this->ref_ext)."'" : "null").",";
$sql .= " type=".(isset($this->type) ? $this->db->escape($this->type) : "null").",";
$sql .= " ref_client=".(isset($this->ref_client) ? "'".$this->db->escape($this->ref_client)."'" : "null").",";
$sql .= " increment=".(isset($this->increment) ? "'".$this->db->escape($this->increment)."'" : "null").",";
@@ -2930,6 +2942,7 @@ class Facture extends CommonInvoice
* @param int $fk_prev_id Previous situation line id reference
* @param string $fk_unit Code of the unit to use. Null to use the default one
* @param double $pu_ht_devise Unit price in currency
+ * @param string $ref_ext External reference of the line
* @return int <0 if KO, Id of line if OK
*/
public function addline(
@@ -2961,7 +2974,8 @@ class Facture extends CommonInvoice
$situation_percent = 100,
$fk_prev_id = 0,
$fk_unit = null,
- $pu_ht_devise = 0
+ $pu_ht_devise = 0,
+ $ref_ext = ''
) {
// Deprecation warning
if ($label) {
@@ -2989,6 +3003,7 @@ class Facture extends CommonInvoice
if (empty($fk_parent_line) || $fk_parent_line < 0) $fk_parent_line = 0;
if (empty($fk_prev_id)) $fk_prev_id = 'null';
if (!isset($situation_percent) || $situation_percent > 100 || (string) $situation_percent == '') $situation_percent = 100;
+ if (empty($ref_ext)) $ref_ext = '';
$remise_percent = price2num($remise_percent);
$qty = price2num($qty);
@@ -3082,6 +3097,7 @@ class Facture extends CommonInvoice
$this->line->fk_facture = $this->id;
$this->line->label = $label; // deprecated
$this->line->desc = $desc;
+ $this->line->ref_ext = $ref_ext;
$this->line->qty = ($this->type == self::TYPE_CREDIT_NOTE ?abs($qty) : $qty); // For credit note, quantity is always positive and unit price negative
$this->line->subprice = ($this->type == self::TYPE_CREDIT_NOTE ?-abs($pu_ht) : $pu_ht); // For credit note, unit price always negative, always positive otherwise
@@ -3157,7 +3173,7 @@ class Facture extends CommonInvoice
return -2;
}
} else {
- dol_syslog(get_class($this)."::addline status of order must be Draft to allow use of ->addline()", LOG_ERR);
+ dol_syslog(get_class($this)."::addline status of invoice must be Draft to allow use of ->addline()", LOG_ERR);
return -3;
}
}
@@ -3189,9 +3205,10 @@ class Facture extends CommonInvoice
* @param string $fk_unit Code of the unit to use. Null to use the default one
* @param double $pu_ht_devise Unit price in currency
* @param int $notrigger disable line update trigger
+ * @param string $ref_ext External reference of the line
* @return int < 0 if KO, > 0 if OK
*/
- public function updateline($rowid, $desc, $pu, $qty, $remise_percent, $date_start, $date_end, $txtva, $txlocaltax1 = 0, $txlocaltax2 = 0, $price_base_type = 'HT', $info_bits = 0, $type = self::TYPE_STANDARD, $fk_parent_line = 0, $skip_update_total = 0, $fk_fournprice = null, $pa_ht = 0, $label = '', $special_code = 0, $array_options = 0, $situation_percent = 100, $fk_unit = null, $pu_ht_devise = 0, $notrigger = 0)
+ public function updateline($rowid, $desc, $pu, $qty, $remise_percent, $date_start, $date_end, $txtva, $txlocaltax1 = 0, $txlocaltax2 = 0, $price_base_type = 'HT', $info_bits = 0, $type = self::TYPE_STANDARD, $fk_parent_line = 0, $skip_update_total = 0, $fk_fournprice = null, $pa_ht = 0, $label = '', $special_code = 0, $array_options = 0, $situation_percent = 100, $fk_unit = null, $pu_ht_devise = 0, $notrigger = 0, $ref_ext = '')
{
global $conf, $user;
// Deprecation warning
@@ -3229,6 +3246,7 @@ class Facture extends CommonInvoice
if (empty($fk_parent_line) || $fk_parent_line < 0) $fk_parent_line = 0;
if (empty($special_code) || $special_code == 3) $special_code = 0;
if (!isset($situation_percent) || $situation_percent > 100 || (string) $situation_percent == '') $situation_percent = 100;
+ if (empty($ref_ext)) $ref_ext = '';
$remise_percent = price2num($remise_percent);
$qty = price2num($qty);
@@ -3319,6 +3337,7 @@ class Facture extends CommonInvoice
$this->line->rowid = $rowid;
$this->line->label = $label;
$this->line->desc = $desc;
+ $this->line->ref_ext = $ref_ext;
$this->line->qty = ($this->type == self::TYPE_CREDIT_NOTE ?abs($qty) : $qty); // For credit note, quantity is always positive and unit price negative
$this->line->vat_src_code = $vat_src_code;
@@ -4722,6 +4741,7 @@ class FactureLigne extends CommonInvoiceLine
public $label;
//! Description ligne
public $desc;
+ public $ref_ext; // External reference of the line
public $localtax1_type; // Local tax 1 type
public $localtax2_type; // Local tax 2 type
@@ -4792,7 +4812,7 @@ class FactureLigne extends CommonInvoiceLine
public function fetch($rowid)
{
$sql = 'SELECT fd.rowid, fd.fk_facture, fd.fk_parent_line, fd.fk_product, fd.product_type, fd.label as custom_label, fd.description, fd.price, fd.qty, fd.vat_src_code, fd.tva_tx,';
- $sql .= ' fd.localtax1_tx, fd. localtax2_tx, fd.remise, fd.remise_percent, fd.fk_remise_except, fd.subprice,';
+ $sql .= ' fd.localtax1_tx, fd. localtax2_tx, fd.remise, fd.remise_percent, fd.fk_remise_except, fd.subprice, fd.ref_ext,';
$sql .= ' fd.date_start as date_start, fd.date_end as date_end, fd.fk_product_fournisseur_price as fk_fournprice, fd.buy_price_ht as pa_ht,';
$sql .= ' fd.info_bits, fd.special_code, fd.total_ht, fd.total_tva, fd.total_ttc, fd.total_localtax1, fd.total_localtax2, fd.rang,';
$sql .= ' fd.fk_code_ventilation,';
@@ -4820,6 +4840,7 @@ class FactureLigne extends CommonInvoiceLine
$this->desc = $objp->description;
$this->qty = $objp->qty;
$this->subprice = $objp->subprice;
+ $this->ref_ext = $objp->ref_ext;
$this->vat_src_code = $objp->vat_src_code;
$this->tva_tx = $objp->tva_tx;
$this->localtax1_tx = $objp->localtax1_tx;
@@ -4902,6 +4923,7 @@ class FactureLigne extends CommonInvoiceLine
if (empty($this->remise_percent)) $this->remise_percent = 0;
if (empty($this->info_bits)) $this->info_bits = 0;
if (empty($this->subprice)) $this->subprice = 0;
+ if (empty($this->ref_ext)) $this->ref_ext = '';
if (empty($this->special_code)) $this->special_code = 0;
if (empty($this->fk_parent_line)) $this->fk_parent_line = 0;
if (empty($this->fk_prev_id)) $this->fk_prev_id = 0;
@@ -4948,7 +4970,7 @@ class FactureLigne extends CommonInvoiceLine
$sql = 'INSERT INTO '.MAIN_DB_PREFIX.'facturedet';
$sql .= ' (fk_facture, fk_parent_line, label, description, qty,';
$sql .= ' vat_src_code, tva_tx, localtax1_tx, localtax2_tx, localtax1_type, localtax2_type,';
- $sql .= ' fk_product, product_type, remise_percent, subprice, fk_remise_except,';
+ $sql .= ' fk_product, product_type, remise_percent, subprice, ref_ext, fk_remise_except,';
$sql .= ' date_start, date_end, fk_code_ventilation, ';
$sql .= ' rang, special_code, fk_product_fournisseur_price, buy_price_ht,';
$sql .= ' info_bits, total_ht, total_tva, total_ttc, total_localtax1, total_localtax2,';
@@ -4971,6 +4993,7 @@ class FactureLigne extends CommonInvoiceLine
$sql .= " ".((int) $this->product_type).",";
$sql .= " ".price2num($this->remise_percent).",";
$sql .= " ".price2num($this->subprice).",";
+ $sql .= " '".$this->db->escape($this->ref_ext)."',";
$sql .= ' '.(!empty($this->fk_remise_except) ? $this->fk_remise_except : "null").',';
$sql .= " ".(!empty($this->date_start) ? "'".$this->db->idate($this->date_start)."'" : "null").",";
$sql .= " ".(!empty($this->date_end) ? "'".$this->db->idate($this->date_end)."'" : "null").",";
@@ -5097,6 +5120,7 @@ class FactureLigne extends CommonInvoiceLine
// Clean parameters
$this->desc = trim($this->desc);
+ if (empty($this->ref_ext)) $this->ref_ext = '';
if (empty($this->tva_tx)) $this->tva_tx = 0;
if (empty($this->localtax1_tx)) $this->localtax1_tx = 0;
if (empty($this->localtax2_tx)) $this->localtax2_tx = 0;
@@ -5136,6 +5160,7 @@ class FactureLigne extends CommonInvoiceLine
// Mise a jour ligne en base
$sql = "UPDATE ".MAIN_DB_PREFIX."facturedet SET";
$sql .= " description='".$this->db->escape($this->desc)."'";
+ $sql .= " ref_ext='".$this->db->escape($this->ref_ext)."'";
$sql .= ", label=".(!empty($this->label) ? "'".$this->db->escape($this->label)."'" : "null");
$sql .= ", subprice=".price2num($this->subprice)."";
$sql .= ", remise_percent=".price2num($this->remise_percent)."";
diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php
index a313f47cc13..eb11950304f 100644
--- a/htdocs/compta/index.php
+++ b/htdocs/compta/index.php
@@ -159,8 +159,8 @@ if (!empty($conf->facture->enabled) && $user->rights->facture->lire)
$reshook = $hookmanager->executeHooks('printFieldListWhereCustomerDraft', $parameters);
$sql .= $hookmanager->resPrint;
- $sql.= " GROUP BY f.rowid, f.ref, f.datef, f.total, f.tva, f.total_ttc, f.ref_client, f.type, ";
- $sql.= "s.email, s.nom, s.rowid, s.code_client, s.code_compta, s.code_fournisseur, s.code_compta_fournisseur";
+ $sql .= " GROUP BY f.rowid, f.ref, f.datef, f.total, f.tva, f.total_ttc, f.ref_client, f.type, ";
+ $sql .= "s.email, s.nom, s.rowid, s.code_client, s.code_compta, s.code_fournisseur, s.code_compta_fournisseur";
// Add Group from hooks
$parameters = array();
diff --git a/htdocs/compta/prelevement/card.php b/htdocs/compta/prelevement/card.php
index 4ec2b5d3443..6349660c59c 100644
--- a/htdocs/compta/prelevement/card.php
+++ b/htdocs/compta/prelevement/card.php
@@ -81,38 +81,38 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
if (empty($reshook))
{
- if ($action == 'confirm_delete')
- {
- $res = $object->delete($user);
- if ($res > 0)
- {
- if ($object->type == 'bank-transfer') {
- header("Location: ".DOL_URL_ROOT.'/compta/paymentbybanktransfer/index.php');
- } else {
- header("Location: ".DOL_URL_ROOT.'/compta/prelevement/index.php');
- }
- exit;
- }
- }
+ if ($action == 'confirm_delete')
+ {
+ $res = $object->delete($user);
+ if ($res > 0)
+ {
+ if ($object->type == 'bank-transfer') {
+ header("Location: ".DOL_URL_ROOT.'/compta/paymentbybanktransfer/index.php');
+ } else {
+ header("Location: ".DOL_URL_ROOT.'/compta/prelevement/index.php');
+ }
+ exit;
+ }
+ }
- // Seems to no be used and replaced with $action == 'infocredit'
- if ($action == 'confirm_credite' && GETPOST('confirm', 'alpha') == 'yes')
- {
- $res = $object->set_credite();
- if ($res >= 0)
- {
- header("Location: card.php?id=".$id);
- exit;
- }
- }
+ // Seems to no be used and replaced with $action == 'infocredit'
+ if ($action == 'confirm_credite' && GETPOST('confirm', 'alpha') == 'yes')
+ {
+ $res = $object->set_credite();
+ if ($res >= 0)
+ {
+ header("Location: card.php?id=".$id);
+ exit;
+ }
+ }
- if ($action == 'infotrans' && $user->rights->prelevement->bons->send)
- {
- require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+ if ($action == 'infotrans' && $user->rights->prelevement->bons->send)
+ {
+ require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
$dt = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
- /*
+ /*
if ($_FILES['userfile']['name'] && basename($_FILES['userfile']['name'],".ps") == $object->ref)
{
$dir = $conf->prelevement->dir_output.'/receipts';
@@ -133,24 +133,24 @@ if (empty($reshook))
$error = $object->set_infotrans($user, $dt, GETPOST('methode', 'alpha'));
- if ($error)
- {
- header("Location: card.php?id=".$id."&error=$error");
- exit;
- }
- }
+ if ($error)
+ {
+ header("Location: card.php?id=".$id."&error=$error");
+ exit;
+ }
+ }
// Set direct debit order to credited, create payment and close invoices
if ($action == 'infocredit' && $user->rights->prelevement->bons->credit)
{
$dt = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
- $error = $object->set_infocredit($user, $dt);
- if ($error)
- {
- setEventMessages($object->error, $object->errors, 'errors');
- }
- }
+ $error = $object->set_infocredit($user, $dt);
+ if ($error)
+ {
+ setEventMessages($object->error, $object->errors, 'errors');
+ }
+ }
}
diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php
index 1bea234abfc..567a1ab8951 100644
--- a/htdocs/compta/prelevement/class/bonprelevement.class.php
+++ b/htdocs/compta/prelevement/class/bonprelevement.class.php
@@ -318,7 +318,7 @@ class BonPrelevement extends CommonObject
$this->type = $obj->type;
$this->status = $obj->status;
- $this->statut = $obj->status; // For backward compatibility
+ $this->statut = $obj->status; // For backward compatibility
$this->fetched = 1;
@@ -510,7 +510,7 @@ class BonPrelevement extends CommonObject
$paiement->num_paiement = $this->ref; // For backward compatibility
$paiement->id_prelevement = $this->id;
- $paiement_id = $paiement->create($user); // This use ->paiementid, that is ID of payment mode
+ $paiement_id = $paiement->create($user); // This use ->paiementid, that is ID of payment mode
if ($paiement_id < 0)
{
$error++;
@@ -540,7 +540,7 @@ class BonPrelevement extends CommonObject
// Update withdrawal line
// TODO: Translate to ligneprelevement.class.php
- if (! $error) {
+ if (!$error) {
$sql = " UPDATE ".MAIN_DB_PREFIX."prelevement_lignes";
$sql .= " SET statut = 2";
$sql .= " WHERE fk_prelevement_bons = ".$this->id;
@@ -884,7 +884,7 @@ class BonPrelevement extends CommonObject
$sql .= " AND f.rowid = pfd.fk_facture_fourn";
}
$sql .= " AND s.rowid = f.fk_soc";
- $sql .= " AND f.fk_statut = 1"; // Invoice validated
+ $sql .= " AND f.fk_statut = 1"; // Invoice validated
$sql .= " AND f.paye = 0";
$sql .= " AND pfd.traite = 0";
$sql .= " AND f.total_ttc > 0";
@@ -1179,7 +1179,7 @@ class BonPrelevement extends CommonObject
/*
* Update total defined after generation of file
*/
- if (! $error) {
+ if (!$error) {
$sql = "UPDATE ".MAIN_DB_PREFIX."prelevement_bons";
$sql .= " SET amount = ".price2num($this->total);
$sql .= " WHERE rowid = ".$this->id;
@@ -1542,7 +1542,7 @@ class BonPrelevement extends CommonObject
{
$obj = $this->db->fetch_object($resql);
- if (! empty($cachearraytotestduplicate[$obj->idfac])) {
+ if (!empty($cachearraytotestduplicate[$obj->idfac])) {
$this->error = $langs->trans('ErrorCompanyHasDuplicateDefaultBAN', $obj->socid);
$this->invoice_in_error[$obj->idfac] = $this->error;
$result = -2;
@@ -1657,7 +1657,7 @@ class BonPrelevement extends CommonObject
{
$obj = $this->db->fetch_object($resql);
- if (! empty($cachearraytotestduplicate[$obj->idfac])) {
+ if (!empty($cachearraytotestduplicate[$obj->idfac])) {
$this->error = $langs->trans('ErrorCompanyHasDuplicateDefaultBAN', $obj->socid);
$this->invoice_in_error[$obj->idfac] = $this->error;
$result = -2;
@@ -2192,7 +2192,7 @@ class BonPrelevement extends CommonObject
$XML_SEPA_INFO .= ' '.$conf->global->MAIN_INFO_SOCIETE_ZIP.' '.$conf->global->MAIN_INFO_SOCIETE_TOWN.''.$CrLf;
$XML_SEPA_INFO .= ' '.$CrLf;
$XML_SEPA_INFO .= ' '.$CrLf;*/
- $XML_SEPA_INFO .= ' SLEV'.$CrLf; // Field "Responsible of fees". Must be SLEV
+ $XML_SEPA_INFO .= ' SLEV'.$CrLf; // Field "Responsible of fees". Must be SLEV
$XML_SEPA_INFO .= ' '.$CrLf;
$XML_SEPA_INFO .= ' '.$CrLf;
$XML_SEPA_INFO .= ' '.$CrLf;
@@ -2254,7 +2254,7 @@ class BonPrelevement extends CommonObject
$XML_SEPA_INFO .= ' '.$conf->global->MAIN_INFO_SOCIETE_ZIP.' '.$conf->global->MAIN_INFO_SOCIETE_TOWN.''.$CrLf;
$XML_SEPA_INFO .= ' '.$CrLf;
$XML_SEPA_INFO .= ' '.$CrLf;*/
- $XML_SEPA_INFO .= ' SLEV'.$CrLf; // Field "Responsible of fees". Must be SLEV
+ $XML_SEPA_INFO .= ' SLEV'.$CrLf; // Field "Responsible of fees". Must be SLEV
/*$XML_SEPA_INFO .= ' '.$CrLf;
$XML_SEPA_INFO .= ' '.$CrLf;
$XML_SEPA_INFO .= ' '.$CrLf;
diff --git a/htdocs/compta/prelevement/create.php b/htdocs/compta/prelevement/create.php
index f8d67de48c2..842b8b169f5 100644
--- a/htdocs/compta/prelevement/create.php
+++ b/htdocs/compta/prelevement/create.php
@@ -84,10 +84,10 @@ if (empty($reshook))
$conf->global->PAYMENTBYBANKTRANSFER_ADDDAYS;
}
$bprev = new BonPrelevement($db);
- $executiondate = dol_mktime(0, 0, 0, GETPOST('remonth', 'int'), (GETPOST('reday', 'int') + $delayindays), GETPOST('reyear', 'int'));
+ $executiondate = dol_mktime(0, 0, 0, GETPOST('remonth', 'int'), (GETPOST('reday', 'int') + $delayindays), GETPOST('reyear', 'int'));
- // $conf->global->PRELEVEMENT_CODE_BANQUE and $conf->global->PRELEVEMENT_CODE_GUICHET should be empty (we don't use them anymore)
- $result = $bprev->create($conf->global->PRELEVEMENT_CODE_BANQUE, $conf->global->PRELEVEMENT_CODE_GUICHET, $mode, $format, $executiondate, 0, $type);
+ // $conf->global->PRELEVEMENT_CODE_BANQUE and $conf->global->PRELEVEMENT_CODE_GUICHET should be empty (we don't use them anymore)
+ $result = $bprev->create($conf->global->PRELEVEMENT_CODE_BANQUE, $conf->global->PRELEVEMENT_CODE_GUICHET, $mode, $format, $executiondate, 0, $type);
if ($result < 0) {
setEventMessages($bprev->error, $bprev->errors, 'errors');
} elseif ($result == 0) {
@@ -188,30 +188,30 @@ print '
";
- //Select mail models is same action as presend
- if (GETPOST('modelselected')) {
- $action = 'presend';
- }
+ //Select mail models is same action as presend
+ if (GETPOST('modelselected')) {
+ $action = 'presend';
+ }
- if ($action != 'presend')
- {
- print '
';
+ if ($action != 'presend')
+ {
+ print '
';
- print '
';
+ print '
';
- $MAXEVENT = 10;
+ $MAXEVENT = 10;
- $morehtmlright = dolGetButtonTitle($langs->trans('SeeAll'), '', 'fa fa-list-alt imgforviewmode', DOL_URL_ROOT.'/contact/agenda.php?id='.$object->id);
+ $morehtmlright = dolGetButtonTitle($langs->trans('SeeAll'), '', 'fa fa-list-alt imgforviewmode', DOL_URL_ROOT.'/contact/agenda.php?id='.$object->id);
- // List of actions on element
- include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
- $formactions = new FormActions($db);
- $somethingshown = $formactions->showactions($object, 'contact', $object->socid, 1, '', $MAXEVENT, '', $morehtmlright); // Show all action for thirdparty
+ // List of actions on element
+ include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
+ $formactions = new FormActions($db);
+ $somethingshown = $formactions->showactions($object, 'contact', $object->socid, 1, '', $MAXEVENT, '', $morehtmlright); // Show all action for thirdparty
- print '
';
- }
+ print '
';
+ }
- // Presend form
- $modelmail = 'contact';
- $defaulttopic = 'Information';
- $diroutput = $conf->contact->dir_output;
- $trackid = 'con'.$object->id;
+ // Presend form
+ $modelmail = 'contact';
+ $defaulttopic = 'Information';
+ $diroutput = $conf->contact->dir_output;
+ $trackid = 'con'.$object->id;
- include DOL_DOCUMENT_ROOT.'/core/tpl/card_presend.tpl.php';
- }
+ include DOL_DOCUMENT_ROOT.'/core/tpl/card_presend.tpl.php';
+ }
}
diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php
index d7bcafc8363..a474df3b910 100644
--- a/htdocs/contact/list.php
+++ b/htdocs/contact/list.php
@@ -184,7 +184,7 @@ $arrayfields = array(
'p.statut'=>array('label'=>"Status", 'checked'=>1, 'position'=>1000),
'p.import_key'=>array('label'=>"ImportId", 'checked'=>0, 'position'=>1100),
);
-if (! empty($conf->global->THIRDPARTY_ENABLE_PROSPECTION_ON_ALTERNATIVE_ADRESSES)) {
+if (!empty($conf->global->THIRDPARTY_ENABLE_PROSPECTION_ON_ALTERNATIVE_ADRESSES)) {
$arrayfields['p.fk_prospectcontactlevel'] = array('label'=>"ProspectLevelShort", 'checked'=>1, 'position'=>210);
$arrayfields['p.fk_stcommcontact'] = array('label'=>"StatusProsp", 'checked'=>1, 'position'=>215);
}
@@ -270,8 +270,8 @@ if (empty($reshook))
}
}
$search_priv = "";
- $search_stcomm='';
- $search_level='';
+ $search_stcomm = '';
+ $search_level = '';
$search_status = -1;
$search_categ = '';
$search_categ_thirdparty = '';
@@ -314,7 +314,7 @@ $formother = new FormOther($db);
$formcompany = new FormCompany($db);
$contactstatic = new Contact($db);
-if (! empty($conf->global->THIRDPARTY_ENABLE_PROSPECTION_ON_ALTERNATIVE_ADRESSES)) {
+if (!empty($conf->global->THIRDPARTY_ENABLE_PROSPECTION_ON_ALTERNATIVE_ADRESSES)) {
$contactstatic->loadCacheOfProspStatus();
}
@@ -323,17 +323,17 @@ $title = (!empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("C
// Select every potentiels, and note each potentiels which fit in search parameters
$tab_level = array();
$sql = "SELECT code, label, sortorder";
-$sql.= " FROM ".MAIN_DB_PREFIX."c_prospectcontactlevel";
-$sql.= " WHERE active > 0";
-$sql.= " ORDER BY sortorder";
+$sql .= " FROM ".MAIN_DB_PREFIX."c_prospectcontactlevel";
+$sql .= " WHERE active > 0";
+$sql .= " ORDER BY sortorder";
$resql = $db->query($sql);
if ($resql)
{
while ($obj = $db->fetch_object($resql))
{
// Compute level text
- $level=$langs->trans($obj->code);
- if ($level == $obj->code) $level=$langs->trans($obj->label);
+ $level = $langs->trans($obj->code);
+ if ($level == $obj->code) $level = $langs->trans($obj->label);
$tab_level[$obj->code] = $level;
}
}
@@ -343,7 +343,7 @@ $sql = "SELECT s.rowid as socid, s.nom as name,";
$sql .= " p.rowid, p.lastname as lastname, p.statut, p.firstname, p.zip, p.town, p.poste, p.email, p.no_email,";
$sql .= " p.socialnetworks, p.photo,";
$sql .= " p.phone as phone_pro, p.phone_mobile, p.phone_perso, p.fax, p.fk_pays, p.priv, p.datec as date_creation, p.tms as date_update,";
-$sql.= " st.libelle as stcomm, st.picto as stcomm_picto, p.fk_stcommcontact as stcomm_id, p.fk_prospectcontactlevel,";
+$sql .= " st.libelle as stcomm, st.picto as stcomm_picto, p.fk_stcommcontact as stcomm_id, p.fk_prospectcontactlevel,";
$sql .= " co.label as country, co.code as country_code";
// Add fields from extrafields
if (!empty($extrafields->attributes[$object->table_element]['label'])) {
@@ -357,7 +357,7 @@ $sql .= " FROM ".MAIN_DB_PREFIX."socpeople as p";
if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX.$object->table_element."_extrafields as ef on (p.rowid = ef.fk_object)";
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as co ON co.rowid = p.fk_pays";
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = p.fk_soc";
-$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_stcommcontact as st ON st.id = p.fk_stcommcontact";
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_stcommcontact as st ON st.id = p.fk_stcommcontact";
if (!empty($search_categ)) $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX."categorie_contact as cc ON p.rowid = cc.fk_socpeople"; // We need this table joined to the select in order to filter by categ
if (!empty($search_categ_thirdparty)) $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX."categorie_societe as cs ON s.rowid = cs.fk_soc"; // We need this table joined to the select in order to filter by categ
if (!empty($search_categ_supplier)) $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX."categorie_fournisseur as cs2 ON s.rowid = cs2.fk_soc"; // We need this table joined to the select in order to filter by categ
@@ -469,7 +469,7 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
$sql .= $db->plimit($limit + 1, $offset);
$resql = $db->query($sql);
-if (! $resql)
+if (!$resql)
{
dol_print_error($db);
exit;
@@ -515,10 +515,10 @@ if ($search_email != '') $param .= '&search_email='.urlencode($search_email)
if ($search_no_email != '') $param .= '&search_no_email='.urlencode($search_no_email);
if ($search_status != '') $param .= '&search_status='.urlencode($search_status);
if ($search_priv == '0' || $search_priv == '1') $param .= "&search_priv=".urlencode($search_priv);
-if ($search_stcomm != '') $param.='&search_stcomm='.urlencode($search_stcomm);
+if ($search_stcomm != '') $param .= '&search_stcomm='.urlencode($search_stcomm);
if (is_array($search_level) && count($search_level)) {
foreach ($search_level as $slevel) {
- $param.='&search_level[]='.urlencode($slevel);
+ $param .= '&search_level[]='.urlencode($slevel);
}
}
if ($search_import_key != '') $param .= '&search_import_key='.urlencode($search_import_key);
@@ -739,20 +739,20 @@ if (!empty($arrayfields['p.priv']['checked']))
print '';
}
// Prospect level
-if (! empty($arrayfields['p.fk_prospectcontactlevel']['checked']))
+if (!empty($arrayfields['p.fk_prospectcontactlevel']['checked']))
{
print '
';
+ print '';
$i = 0;
if (!empty($this->lines))
@@ -4333,7 +4333,7 @@ abstract class CommonObject
if ($line->date_fin_reel) $date_end = $line->date_fin_reel;
}
- $this->tpl['id'] = $line->id;
+ $this->tpl['id'] = $line->id;
$this->tpl['label'] = '';
if (!empty($line->fk_parent_line)) $this->tpl['label'] .= img_picto('', 'rightarrow');
@@ -4405,10 +4405,10 @@ abstract class CommonObject
$this->tpl['description'] = ' ';
}
- // VAT Rate
- $this->tpl['vat_rate'] = vatrate($line->tva_tx, true);
- $this->tpl['vat_rate'] .= (($line->info_bits & 1) == 1) ? '*' : '';
- if (!empty($line->vat_src_code) && !preg_match('/\(/', $this->tpl['vat_rate'])) $this->tpl['vat_rate'] .= ' ('.$line->vat_src_code.')';
+ // VAT Rate
+ $this->tpl['vat_rate'] = vatrate($line->tva_tx, true);
+ $this->tpl['vat_rate'] .= (($line->info_bits & 1) == 1) ? '*' : '';
+ if (!empty($line->vat_src_code) && !preg_match('/\(/', $this->tpl['vat_rate'])) $this->tpl['vat_rate'] .= ' ('.$line->vat_src_code.')';
$this->tpl['price'] = price($line->subprice);
$this->tpl['multicurrency_price'] = price($line->multicurrency_subprice);
@@ -4442,7 +4442,7 @@ abstract class CommonObject
}
- // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+ // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
/**
* Add resources to the current object : add entry into llx_element_resources
* Need $this->element & $this->id
@@ -4455,7 +4455,7 @@ abstract class CommonObject
*/
public function add_element_resource($resource_id, $resource_type, $busy = 0, $mandatory = 0)
{
- // phpcs:enable
+ // phpcs:enable
$this->db->begin();
$sql = "INSERT INTO ".MAIN_DB_PREFIX."element_resources (";
@@ -4486,7 +4486,7 @@ abstract class CommonObject
}
}
- // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+ // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
/**
* Delete a link to resource line
*
@@ -4497,7 +4497,7 @@ abstract class CommonObject
*/
public function delete_resource($rowid, $element, $notrigger = 0)
{
- // phpcs:enable
+ // phpcs:enable
global $user;
$this->db->begin();
@@ -4797,7 +4797,7 @@ abstract class CommonObject
return -1;
}
} else {
- if (! $filefound) {
+ if (!$filefound) {
$this->error = $langs->trans("Error").' Failed to load doc generator with modelpaths='.$modelspath.' - modele='.$modele;
dol_print_error('', $this->error);
} else {
@@ -5287,7 +5287,7 @@ abstract class CommonObject
if ($this->array_options[$key] === '') $mandatorypb = true;
if ($mandatorypb)
{
- dol_syslog("Mandatory extra field ".$key." is empty");
+ dol_syslog("Mandatory extra field ".$key." is empty");
$this->errors[] = $langs->trans('ErrorFieldRequired', $attributeLabel);
return -1;
}
@@ -5301,8 +5301,8 @@ abstract class CommonObject
if (!empty($conf->global->MAIN_STORE_COMPUTED_EXTRAFIELDS))
{
$value = dol_eval($attrfieldcomputed, 1, 0);
- dol_syslog($langs->trans("Extrafieldcomputed")." sur ".$attributeLabel."(".$value.")", LOG_DEBUG);
- $new_array_options[$key] = $value;
+ dol_syslog($langs->trans("Extrafieldcomputed")." sur ".$attributeLabel."(".$value.")", LOG_DEBUG);
+ $new_array_options[$key] = $value;
} else {
$new_array_options[$key] = null;
}
@@ -5433,13 +5433,13 @@ abstract class CommonObject
// We must insert a default value for fields for other entities that are mandatory to avoid not null error
if (is_array($extrafields->attributes[$this->table_element]['mandatoryfieldsofotherentities']))
{
- foreach ($extrafields->attributes[$this->table_element]['mandatoryfieldsofotherentities'] as $tmpkey => $tmpval)
- {
- if (!isset($extrafields->attributes[$this->table_element]['type'][$tmpkey])) // If field not already added previously
- {
- $sql .= ",".$tmpkey;
- }
- }
+ foreach ($extrafields->attributes[$this->table_element]['mandatoryfieldsofotherentities'] as $tmpkey => $tmpval)
+ {
+ if (!isset($extrafields->attributes[$this->table_element]['type'][$tmpkey])) // If field not already added previously
+ {
+ $sql .= ",".$tmpkey;
+ }
+ }
}
$sql .= ") VALUES (".$this->id;
@@ -5460,14 +5460,14 @@ abstract class CommonObject
// We must insert a default value for fields for other entities that are mandatory to avoid not null error
if (is_array($extrafields->attributes[$this->table_element]['mandatoryfieldsofotherentities']))
{
- foreach ($extrafields->attributes[$this->table_element]['mandatoryfieldsofotherentities'] as $tmpkey => $tmpval)
- {
- if (!isset($extrafields->attributes[$this->table_element]['type'][$tmpkey])) // If field not already added previously
- {
- if (in_array($tmpval, array('int', 'double', 'price'))) $sql .= ", 0";
- else $sql .= ", ''";
- }
- }
+ foreach ($extrafields->attributes[$this->table_element]['mandatoryfieldsofotherentities'] as $tmpkey => $tmpval)
+ {
+ if (!isset($extrafields->attributes[$this->table_element]['type'][$tmpkey])) // If field not already added previously
+ {
+ if (in_array($tmpval, array('int', 'double', 'price'))) $sql .= ", 0";
+ else $sql .= ", ''";
+ }
+ }
}
$sql .= ")";
@@ -5796,38 +5796,38 @@ abstract class CommonObject
}
$out = '';
- $type = '';
- $param = array();
- $param['options'] = array();
- $reg = array();
- $size = $this->fields[$key]['size'];
- // Because we work on extrafields
- if (preg_match('/^(integer|link):(.*):(.*):(.*):(.*)/i', $val['type'], $reg)) {
- $param['options'] = array($reg[2].':'.$reg[3].':'.$reg[4].':'.$reg[5] => 'N');
- $type = 'link';
- } elseif (preg_match('/^(integer|link):(.*):(.*):(.*)/i', $val['type'], $reg)) {
- $param['options'] = array($reg[2].':'.$reg[3].':'.$reg[4] => 'N');
- $type = 'link';
- } elseif (preg_match('/^(integer|link):(.*):(.*)/i', $val['type'], $reg)) {
- $param['options'] = array($reg[2].':'.$reg[3] => 'N');
- $type = 'link';
- } elseif (preg_match('/^sellist:(.*):(.*):(.*):(.*)/i', $val['type'], $reg)) {
- $param['options'] = array($reg[1].':'.$reg[2].':'.$reg[3].':'.$reg[4] => 'N');
- $type = 'sellist';
- } elseif (preg_match('/varchar\((\d+)\)/', $val['type'], $reg)) {
- $param['options'] = array();
- $type = 'varchar';
- $size = $reg[1];
- } elseif (preg_match('/varchar/', $val['type'])) {
- $param['options'] = array();
- $type = 'varchar';
- } elseif (is_array($this->fields[$key]['arrayofkeyval'])) {
- $param['options'] = $this->fields[$key]['arrayofkeyval'];
- $type = 'select';
- } else {
- $param['options'] = array();
- $type = $this->fields[$key]['type'];
- }
+ $type = '';
+ $param = array();
+ $param['options'] = array();
+ $reg = array();
+ $size = $this->fields[$key]['size'];
+ // Because we work on extrafields
+ if (preg_match('/^(integer|link):(.*):(.*):(.*):(.*)/i', $val['type'], $reg)) {
+ $param['options'] = array($reg[2].':'.$reg[3].':'.$reg[4].':'.$reg[5] => 'N');
+ $type = 'link';
+ } elseif (preg_match('/^(integer|link):(.*):(.*):(.*)/i', $val['type'], $reg)) {
+ $param['options'] = array($reg[2].':'.$reg[3].':'.$reg[4] => 'N');
+ $type = 'link';
+ } elseif (preg_match('/^(integer|link):(.*):(.*)/i', $val['type'], $reg)) {
+ $param['options'] = array($reg[2].':'.$reg[3] => 'N');
+ $type = 'link';
+ } elseif (preg_match('/^sellist:(.*):(.*):(.*):(.*)/i', $val['type'], $reg)) {
+ $param['options'] = array($reg[1].':'.$reg[2].':'.$reg[3].':'.$reg[4] => 'N');
+ $type = 'sellist';
+ } elseif (preg_match('/varchar\((\d+)\)/', $val['type'], $reg)) {
+ $param['options'] = array();
+ $type = 'varchar';
+ $size = $reg[1];
+ } elseif (preg_match('/varchar/', $val['type'])) {
+ $param['options'] = array();
+ $type = 'varchar';
+ } elseif (is_array($this->fields[$key]['arrayofkeyval'])) {
+ $param['options'] = $this->fields[$key]['arrayofkeyval'];
+ $type = 'select';
+ } else {
+ $param['options'] = array();
+ $type = $this->fields[$key]['type'];
+ }
$label = $this->fields[$key]['label'];
//$elementtype=$this->fields[$key]['elementtype']; // Seems not used
@@ -5852,7 +5852,7 @@ abstract class CommonObject
// Set value of $morecss. For this, we use in priority showsize from parameters, then $val['css'] then autodefine
if (empty($morecss) && !empty($val['css']))
{
- $morecss = $val['css'];
+ $morecss = $val['css'];
} elseif (empty($morecss))
{
if ($type == 'date')
@@ -5962,7 +5962,7 @@ abstract class CommonObject
}
$out .= '';
@@ -3743,7 +3743,7 @@ class Form
return $return;
}
- // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+ // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
/**
* Return a HTML select list of bank accounts
*
@@ -3757,9 +3757,9 @@ class Form
* @param string $morecss More CSS
* @return int <0 if error, Num of bank account found if OK (0, 1, 2, ...)
*/
- public function select_comptes($selected = '', $htmlname = 'accountid', $status = 0, $filtre = '', $useempty = 0, $moreattrib = '', $showcurrency = 0, $morecss = '')
+ public function select_comptes($selected = '', $htmlname = 'accountid', $status = 0, $filtre = '', $useempty = 0, $moreattrib = '', $showcurrency = 0, $morecss = '')
{
- // phpcs:enable
+ // phpcs:enable
global $langs, $conf;
$langs->load("admin");
@@ -3826,7 +3826,7 @@ class Form
*/
public function selectEstablishments($selected = '', $htmlname = 'entity', $status = 0, $filtre = '', $useempty = 0, $moreattrib = '')
{
- // phpcs:enable
+ // phpcs:enable
global $langs, $conf;
$langs->load("admin");
@@ -3886,7 +3886,7 @@ class Form
* @param int $addempty 1=Add an empty value in list, 2=Add an empty value in list only if there is more than 2 entries.
* @return void
*/
- public function formSelectAccount($page, $selected = '', $htmlname = 'fk_account', $addempty = 0)
+ public function formSelectAccount($page, $selected = '', $htmlname = 'fk_account', $addempty = 0)
{
global $langs;
if ($htmlname != "none") {
@@ -3910,7 +3910,7 @@ class Form
}
}
- // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+ // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
/**
* Return list of categories having choosed type
*
@@ -3918,20 +3918,20 @@ class Form
* @param string $selected Id of category preselected or 'auto' (autoselect category if there is only one element). Not used if $outputmode = 1.
* @param string $htmlname HTML field name
* @param int $maxlength Maximum length for labels
- * @param int|string|array $markafterid Keep only or removed all categories including the leaf $markafterid in category tree (exclude) or Keep only of category is inside the leaf starting with this id.
- * $markafterid can be an :
- * - int (id of category)
- * - string (categories ids seprated by comma)
- * - array (list of categories ids)
+ * @param int|string|array $markafterid Keep only or removed all categories including the leaf $markafterid in category tree (exclude) or Keep only of category is inside the leaf starting with this id.
+ * $markafterid can be an :
+ * - int (id of category)
+ * - string (categories ids seprated by comma)
+ * - array (list of categories ids)
* @param int $outputmode 0=HTML select string, 1=Array
- * @param int $include [=0] Removed or 1=Keep only
- * @param string $morecss More CSS
+ * @param int $include [=0] Removed or 1=Keep only
+ * @param string $morecss More CSS
* @return string
* @see select_categories()
*/
- public function select_all_categories($type, $selected = '', $htmlname = "parent", $maxlength = 64, $markafterid = 0, $outputmode = 0, $include = 0, $morecss = '')
+ public function select_all_categories($type, $selected = '', $htmlname = "parent", $maxlength = 64, $markafterid = 0, $outputmode = 0, $include = 0, $morecss = '')
{
- // phpcs:enable
+ // phpcs:enable
global $conf, $langs;
$langs->load("categories");
@@ -3966,7 +3966,7 @@ class Form
} else dol_print_error($this->db);
} else {
$cat = new Categorie($this->db);
- $cate_arbo = $cat->get_full_arbo($type, $markafterid, $include);
+ $cate_arbo = $cat->get_full_arbo($type, $markafterid, $include);
}
$output = '
';
} else {
@@ -600,8 +600,8 @@ class FormCompany extends Form
* @param string $htmlname Name of HTML form
* @param array $limitto Disable answers that are not id in this array list
* @param int $forceid This is to force another object id than object->id
- * @param string $moreparam String with more param to add into url when noajax search is used.
- * @param string $morecss More CSS on select component
+ * @param string $moreparam String with more param to add into url when noajax search is used.
+ * @param string $morecss More CSS on select component
* @return int The selected third party ID
*/
public function selectCompaniesForNewContact($object, $var_id, $selected = '', $htmlname = 'newcompany', $limitto = '', $forceid = 0, $moreparam = '', $morecss = '')
@@ -746,21 +746,21 @@ class FormCompany extends Form
}
}
- /**
- * Return a select list with types of contacts
- *
- * @param object $object Object to use to find type of contact
- * @param string $selected Default selected value
- * @param string $htmlname HTML select name
- * @param string $source Source ('internal' or 'external')
- * @param string $sortorder Sort criteria ('position', 'code', ...)
- * @param int $showempty 1=Add en empty line
- * @param string $morecss Add more css to select component
- * @return void
- */
- public function selectTypeContact($object, $selected, $htmlname = 'type', $source = 'internal', $sortorder = 'position', $showempty = 0, $morecss = '')
+ /**
+ * Return a select list with types of contacts
+ *
+ * @param object $object Object to use to find type of contact
+ * @param string $selected Default selected value
+ * @param string $htmlname HTML select name
+ * @param string $source Source ('internal' or 'external')
+ * @param string $sortorder Sort criteria ('position', 'code', ...)
+ * @param int $showempty 1=Add en empty line
+ * @param string $morecss Add more css to select component
+ * @return void
+ */
+ public function selectTypeContact($object, $selected, $htmlname = 'type', $source = 'internal', $sortorder = 'position', $showempty = 0, $morecss = '')
{
- global $user, $langs;
+ global $user, $langs;
if (is_object($object) && method_exists($object, 'liste_type_contact'))
{
@@ -822,7 +822,7 @@ class FormCompany extends Form
return 'ErrorBadValueForParameterRenderMode'; // Should not happened
}
- // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+ // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
/**
* Return a select list with zip codes and their town
*
@@ -837,7 +837,7 @@ class FormCompany extends Form
*/
public function select_ziptown($selected = '', $htmlname = 'zipcode', $fields = '', $fieldsize = 0, $disableautocomplete = 0, $moreattrib = '', $morecss = '')
{
- // phpcs:enable
+ // phpcs:enable
global $conf;
$out = '';
@@ -855,155 +855,155 @@ class FormCompany extends Form
return $out;
}
- // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
- /**
- * Return HTML string to use as input of professional id into a HTML page (siren, siret, etc...)
- *
- * @param int $idprof 1,2,3,4 (Example: 1=siren,2=siret,3=naf,4=rcs/rm)
- * @param string $htmlname Name of HTML select
- * @param string $preselected Default value to show
- * @param string $country_code FR, IT, ...
- * @param string $morecss More css
- * @return string HTML string with prof id
- */
- public function get_input_id_prof($idprof, $htmlname, $preselected, $country_code, $morecss = 'maxwidth100onsmartphone quatrevingtpercent')
- {
- // phpcs:enable
- global $conf, $langs, $hookmanager;
+ // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+ /**
+ * Return HTML string to use as input of professional id into a HTML page (siren, siret, etc...)
+ *
+ * @param int $idprof 1,2,3,4 (Example: 1=siren,2=siret,3=naf,4=rcs/rm)
+ * @param string $htmlname Name of HTML select
+ * @param string $preselected Default value to show
+ * @param string $country_code FR, IT, ...
+ * @param string $morecss More css
+ * @return string HTML string with prof id
+ */
+ public function get_input_id_prof($idprof, $htmlname, $preselected, $country_code, $morecss = 'maxwidth100onsmartphone quatrevingtpercent')
+ {
+ // phpcs:enable
+ global $conf, $langs, $hookmanager;
- $formlength = 0;
- if (empty($conf->global->MAIN_DISABLEPROFIDRULES)) {
- if ($country_code == 'FR')
- {
- if (isset($idprof)) {
- if ($idprof == 1) $formlength = 9;
- elseif ($idprof == 2) $formlength = 14;
- elseif ($idprof == 3) $formlength = 5; // 4 chiffres et 1 lettre depuis janvier
- elseif ($idprof == 4) $formlength = 32; // No maximum as we need to include a town name in this id
- }
- } elseif ($country_code == 'ES')
- {
- if ($idprof == 1) $formlength = 9; //CIF/NIF/NIE 9 digits
- if ($idprof == 2) $formlength = 12; //NASS 12 digits without /
- if ($idprof == 3) $formlength = 5; //CNAE 5 digits
- if ($idprof == 4) $formlength = 32; //depend of college
- }
- }
+ $formlength = 0;
+ if (empty($conf->global->MAIN_DISABLEPROFIDRULES)) {
+ if ($country_code == 'FR')
+ {
+ if (isset($idprof)) {
+ if ($idprof == 1) $formlength = 9;
+ elseif ($idprof == 2) $formlength = 14;
+ elseif ($idprof == 3) $formlength = 5; // 4 chiffres et 1 lettre depuis janvier
+ elseif ($idprof == 4) $formlength = 32; // No maximum as we need to include a town name in this id
+ }
+ } elseif ($country_code == 'ES')
+ {
+ if ($idprof == 1) $formlength = 9; //CIF/NIF/NIE 9 digits
+ if ($idprof == 2) $formlength = 12; //NASS 12 digits without /
+ if ($idprof == 3) $formlength = 5; //CNAE 5 digits
+ if ($idprof == 4) $formlength = 32; //depend of college
+ }
+ }
- $selected = $preselected;
- if (!$selected && isset($idprof)) {
- if ($idprof == 1 && !empty($this->idprof1)) $selected = $this->idprof1;
- elseif ($idprof == 2 && !empty($this->idprof2)) $selected = $this->idprof2;
- elseif ($idprof == 3 && !empty($this->idprof3)) $selected = $this->idprof3;
- elseif ($idprof == 4 && !empty($this->idprof4)) $selected = $this->idprof4;
- }
+ $selected = $preselected;
+ if (!$selected && isset($idprof)) {
+ if ($idprof == 1 && !empty($this->idprof1)) $selected = $this->idprof1;
+ elseif ($idprof == 2 && !empty($this->idprof2)) $selected = $this->idprof2;
+ elseif ($idprof == 3 && !empty($this->idprof3)) $selected = $this->idprof3;
+ elseif ($idprof == 4 && !empty($this->idprof4)) $selected = $this->idprof4;
+ }
- $maxlength = $formlength;
- if (empty($formlength)) { $formlength = 24; $maxlength = 128; }
+ $maxlength = $formlength;
+ if (empty($formlength)) { $formlength = 24; $maxlength = 128; }
- $out = '';
+ $out = '';
- // Execute hook getInputIdProf to complete or replace $out
- $parameters = array('formlength'=>$formlength, 'selected'=>$preselected, 'idprof'=>$idprof, 'htmlname'=>$htmlname, 'country_code'=>$country_code);
- $reshook = $hookmanager->executeHooks('getInputIdProf', $parameters);
- if (empty($reshook))
- {
- $out .= '';
- }
- $out .= $hookmanager->resPrint;
+ // Execute hook getInputIdProf to complete or replace $out
+ $parameters = array('formlength'=>$formlength, 'selected'=>$preselected, 'idprof'=>$idprof, 'htmlname'=>$htmlname, 'country_code'=>$country_code);
+ $reshook = $hookmanager->executeHooks('getInputIdProf', $parameters);
+ if (empty($reshook))
+ {
+ $out .= '';
+ }
+ $out .= $hookmanager->resPrint;
- return $out;
- }
+ return $out;
+ }
- // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
- /**
- * Return a HTML select with localtax values for thirdparties
- *
- * @param int $local LocalTax
- * @param int $selected Preselected value
- * @param string $htmlname HTML select name
- * @return void
- */
- public function select_localtax($local, $selected, $htmlname)
- {
- // phpcs:enable
- $tax = get_localtax_by_third($local);
+ // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+ /**
+ * Return a HTML select with localtax values for thirdparties
+ *
+ * @param int $local LocalTax
+ * @param int $selected Preselected value
+ * @param string $htmlname HTML select name
+ * @return void
+ */
+ public function select_localtax($local, $selected, $htmlname)
+ {
+ // phpcs:enable
+ $tax = get_localtax_by_third($local);
- $num = $this->db->num_rows($tax);
- $i = 0;
- if ($num)
- {
- $valors = explode(":", $tax);
+ $num = $this->db->num_rows($tax);
+ $i = 0;
+ if ($num)
+ {
+ $valors = explode(":", $tax);
- if (count($valors) > 1)
- {
- //montar select
- print '';
- }
- }
- }
+ if (count($valors) > 1)
+ {
+ //montar select
+ print '';
+ }
+ }
+ }
- /**
- * Return a HTML select for thirdparty type
- *
- * @param int $selected selected value
- * @param string $htmlname HTML select name
- * @param string $htmlidname HTML select id
- * @param string $typeinput HTML output
- * @param string $morecss More css
- * @return string HTML string
- */
- public function selectProspectCustomerType($selected, $htmlname = 'client', $htmlidname = 'customerprospect', $typeinput = 'form', $morecss = '')
- {
+ /**
+ * Return a HTML select for thirdparty type
+ *
+ * @param int $selected selected value
+ * @param string $htmlname HTML select name
+ * @param string $htmlidname HTML select id
+ * @param string $typeinput HTML output
+ * @param string $morecss More css
+ * @return string HTML string
+ */
+ public function selectProspectCustomerType($selected, $htmlname = 'client', $htmlidname = 'customerprospect', $typeinput = 'form', $morecss = '')
+ {
- global $conf, $langs;
+ global $conf, $langs;
- $out = '';
+ $out = '';
- return $out;
- }
+ return $out;
+ }
}
diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index 65e44b86efc..e4bab32a544 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -58,7 +58,7 @@ class FormFile
}
- // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+ // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
/**
* Show form to upload a new file.
*
@@ -70,8 +70,8 @@ class FormFile
* @param int $size Length of input file area. Deprecated.
* @param Object $object Object to use (when attachment is done on an element)
* @param string $options Add an option column
- * @param integer $useajax Use fileupload ajax (0=never, 1=if enabled, 2=always whatever is option).
- * Deprecated 2 should never be used and if 1 is used, option should no be enabled.
+ * @param integer $useajax Use fileupload ajax (0=never, 1=if enabled, 2=always whatever is option).
+ * Deprecated 2 should never be used and if 1 is used, option should no be enabled.
* @param string $savingdocmask Mask to use to define output filename. For example 'XXXXX-__YYYYMMDD__-__file__'
* @param integer $linkfiles 1=Also add form to link files, 0=Do not show form to link files
* @param string $htmlname Name and id of HTML form ('formuserfile' by default, 'formuserfileecm' when used to upload a file in ECM)
@@ -83,14 +83,14 @@ class FormFile
*/
public function form_attach_new_file($url, $title = '', $addcancel = 0, $sectionid = 0, $perm = 1, $size = 50, $object = '', $options = '', $useajax = 1, $savingdocmask = '', $linkfiles = 1, $htmlname = 'formuserfile', $accept = '', $sectiondir = '', $usewithoutform = 0, $capture = 0)
{
- // phpcs:enable
+ // phpcs:enable
global $conf, $langs, $hookmanager;
$hookmanager->initHooks(array('formfile'));
- // Deprecation warning
- if ($useajax == 2) {
- dol_syslog(__METHOD__.": using 2 for useajax is deprecated and should be not used", LOG_WARNING);
- }
+ // Deprecation warning
+ if ($useajax == 2) {
+ dol_syslog(__METHOD__.": using 2 for useajax is deprecated and should be not used", LOG_WARNING);
+ }
if (!empty($conf->browser->layout) && $conf->browser->layout != 'classic') $useajax = 0;
@@ -114,12 +114,12 @@ class FormFile
if (empty($usewithoutform)) // Try to avoid this and set instead the form by the caller.
{
- $out .= '';
- if (empty($sectionid)) $out .= ' ';
+ $out .= '';
+ if (empty($sectionid)) $out .= ' ';
}
$out .= "\n\n";
@@ -232,10 +232,10 @@ class FormFile
if (empty($usewithoutform))
{
- $out .= ' ';
+ $out .= '';
+ $out .= ' ';
}
$out .= "\n\n";
@@ -268,7 +268,7 @@ class FormFile
$res = $hookmanager->executeHooks('formattachOptions', $parameters, $object);
if (empty($res))
{
- print '
';
+ print '
';
print $out;
print '
';
}
@@ -278,7 +278,7 @@ class FormFile
}
}
- // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+ // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
/**
* Show the box with list of available documents for object
*
@@ -303,7 +303,7 @@ class FormFile
*/
public function show_documents($modulepart, $modulesubdir, $filedir, $urlsource, $genallowed, $delallowed = 0, $modelselected = '', $allowgenifempty = 1, $forcenomultilang = 0, $iconPDF = 0, $notused = 0, $noform = 0, $param = '', $title = '', $buttonlabel = '', $codelang = '')
{
- // phpcs:enable
+ // phpcs:enable
$this->numoffiles = 0;
print $this->showdocuments($modulepart, $modulesubdir, $filedir, $urlsource, $genallowed, $delallowed, $modelselected, $allowgenifempty, $forcenomultilang, $iconPDF, $notused, $noform, $param, $title, $buttonlabel, $codelang);
return $this->numoffiles;
@@ -454,13 +454,13 @@ class FormFile
$modellist = ModelePDFExpedition::liste_modeles($this->db);
}
} elseif ($modulepart == 'reception')
- {
- if (is_array($genallowed)) $modellist = $genallowed;
- else {
+ {
+ if (is_array($genallowed)) $modellist = $genallowed;
+ else {
include_once DOL_DOCUMENT_ROOT.'/core/modules/reception/modules_reception.php';
$modellist = ModelePdfReception::liste_modeles($this->db);
}
- } elseif ($modulepart == 'livraison')
+ } elseif ($modulepart == 'livraison')
{
if (is_array($genallowed)) $modellist = $genallowed;
else {
@@ -611,16 +611,16 @@ class FormFile
$modellist = ModelePDFUserGroup::liste_modeles($this->db);
}
} else {
- $submodulepart = $modulepart;
+ $submodulepart = $modulepart;
- // modulepart = 'nameofmodule' or 'nameofmodule:NameOfObject'
- $tmp = explode(':', $modulepart);
- if (!empty($tmp[1])) {
- $modulepart = $tmp[0];
- $submodulepart = $tmp[1];
- }
+ // modulepart = 'nameofmodule' or 'nameofmodule:NameOfObject'
+ $tmp = explode(':', $modulepart);
+ if (!empty($tmp[1])) {
+ $modulepart = $tmp[0];
+ $submodulepart = $tmp[1];
+ }
- // For normalized standard modules
+ // For normalized standard modules
$file = dol_buildpath('/core/modules/'.$modulepart.'/modules_'.strtolower($submodulepart).'.php', 0);
if (file_exists($file))
{
@@ -628,7 +628,7 @@ class FormFile
}
// For normalized external modules.
else {
- $file = dol_buildpath('/'.$modulepart.'/core/modules/'.$modulepart.'/modules_'.strtolower($submodulepart).'.php', 0);
+ $file = dol_buildpath('/'.$modulepart.'/core/modules/'.$modulepart.'/modules_'.strtolower($submodulepart).'.php', 0);
$res = include_once $file;
}
@@ -992,7 +992,7 @@ class FormFile
}
- // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+ // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
/**
* Show list of documents in $filearray (may be they are all in same directory but may not)
* This also sync database if $upload_dir is defined.
@@ -1027,7 +1027,7 @@ class FormFile
*/
public function list_of_documents($filearray, $object, $modulepart, $param = '', $forcedownload = 0, $relativepath = '', $permonobject = 1, $useinecm = 0, $textifempty = '', $maxlength = 0, $title = '', $url = '', $showrelpart = 0, $permtoeditline = -1, $upload_dir = '', $sortfield = '', $sortorder = 'ASC', $disablemove = 1, $addfilterfields = 0, $disablecrop = -1)
{
- // phpcs:enable
+ // phpcs:enable
global $user, $conf, $langs, $hookmanager;
global $sortfield, $sortorder, $maxheightmini;
global $dolibarr_main_url_root;
@@ -1049,7 +1049,7 @@ class FormFile
// For backward compatiblity, we detect file stored into an old path
if (!empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO) && $filearray[0]['level1name'] == 'photos')
{
- $relativepath = preg_replace('/^.*\/produit\//', '', $filearray[0]['path']).'/';
+ $relativepath = preg_replace('/^.*\/produit\//', '', $filearray[0]['path']).'/';
}
// Defined relative dir to DOL_DATA_ROOT
$relativedir = '';
@@ -1233,13 +1233,13 @@ class FormFile
print '
';
if (image_format_supported($file['name']) >= 0)
{
- if ($useinecm == 5 || $useinecm == 6)
- {
- $smallfile = getImageFileNameForSize($file['name'], ''); // There is no thumb for ECM module and Media filemanager, so we use true image. TODO Change this it is slow on image dir.
- } else {
- $smallfile = getImageFileNameForSize($file['name'], '_small'); // For new thumbs using same ext (in lower case however) than original
- }
- if (!dol_is_file($file['path'].'/'.$smallfile)) $smallfile = getImageFileNameForSize($file['name'], '_small', '.png'); // For backward compatibility of old thumbs that were created with filename in lower case and with .png extension
+ if ($useinecm == 5 || $useinecm == 6)
+ {
+ $smallfile = getImageFileNameForSize($file['name'], ''); // There is no thumb for ECM module and Media filemanager, so we use true image. TODO Change this it is slow on image dir.
+ } else {
+ $smallfile = getImageFileNameForSize($file['name'], '_small'); // For new thumbs using same ext (in lower case however) than original
+ }
+ if (!dol_is_file($file['path'].'/'.$smallfile)) $smallfile = getImageFileNameForSize($file['name'], '_small', '.png'); // For backward compatibility of old thumbs that were created with filename in lower case and with .png extension
//print $file['path'].'/'.$smallfile.' ';
$urlforhref = getAdvancedPreviewUrl($modulepart, $relativepath.$fileinfo['filename'].'.'.strtolower($fileinfo['extension']), 1, '&entity='.(!empty($object->entity) ? $object->entity : $conf->entity));
@@ -1353,7 +1353,7 @@ class FormFile
print 'browser->layout != 'phone' && empty($disablemove)) ? ' class="linecolmove tdlineupdown center"' : ' class="linecolmove center"').'>';
print '
';
}
- }
+ }
} else {
print '
';
print '';
@@ -1398,7 +1398,7 @@ class FormFile
}
- // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+ // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
/**
* Show list of documents in a directory
*
@@ -1419,7 +1419,7 @@ class FormFile
*/
public function list_of_autoecmfiles($upload_dir, $filearray, $modulepart, $param, $forcedownload = 0, $relativepath = '', $permissiontodelete = 1, $useinecm = 0, $textifempty = '', $maxlength = 0, $url = '', $addfilterfields = 0)
{
- // phpcs:enable
+ // phpcs:enable
global $user, $conf, $langs, $form;
global $sortfield, $sortorder;
global $search_doc_ref;
@@ -1532,8 +1532,8 @@ class FormFile
$object_instance = new RecruitmentCandidature($this->db);
} elseif ($modulepart == 'banque')
{
- include_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
- $object_instance = new Account($this->db);
+ include_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+ $object_instance = new Account($this->db);
} elseif ($modulepart == 'mrp-mo')
{
include_once DOL_DOCUMENT_ROOT.'/mrp/class/mo.class.php';
@@ -1574,7 +1574,7 @@ class FormFile
'banque'))) {
preg_match('/(.*)\/[^\/]+$/', $relativefile, $reg); $ref = (isset($reg[1]) ? $reg[1] : '');
} else {
- //print 'Error: Value for modulepart = '.$modulepart.' is not yet implemented in function list_of_autoecmfiles'."\n";
+ //print 'Error: Value for modulepart = '.$modulepart.' is not yet implemented in function list_of_autoecmfiles'."\n";
}
if (!$id && !$ref) continue;
@@ -1733,7 +1733,7 @@ class FormFile
print '
';
diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index 1fef9012858..e8f4d42148b 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -37,75 +37,75 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
class FormMail extends Form
{
/**
- * @var DoliDB Database handler.
- */
- public $db;
+ * @var DoliDB Database handler.
+ */
+ public $db;
- /**
- * @var int 1 = Include HTML form tag and show submit button
- * 0 = Do not include form tag and submit button
- * -1 = Do not include form tag but include submit button
- */
+ /**
+ * @var int 1 = Include HTML form tag and show submit button
+ * 0 = Do not include form tag and submit button
+ * -1 = Do not include form tag but include submit button
+ */
public $withform;
- /**
- * @var string name from
- */
+ /**
+ * @var string name from
+ */
public $fromname;
- /**
- * @var string email from
- */
+ /**
+ * @var string email from
+ */
public $frommail;
- /**
- * @var string user, company, robot
- */
- public $fromtype;
+ /**
+ * @var string user, company, robot
+ */
+ public $fromtype;
- /**
- * @var int from ID
- */
- public $fromid;
+ /**
+ * @var int from ID
+ */
+ public $fromid;
- /**
- * @var int also from robot
- */
- public $fromalsorobot;
+ /**
+ * @var int also from robot
+ */
+ public $fromalsorobot;
- /**
- * @var string thirdparty etc
- */
- public $totype;
+ /**
+ * @var string thirdparty etc
+ */
+ public $totype;
- /**
- * @var int ID
- */
- public $toid;
+ /**
+ * @var int ID
+ */
+ public $toid;
- /**
- * @var string replyto name
- */
- public $replytoname;
+ /**
+ * @var string replyto name
+ */
+ public $replytoname;
- /**
- * @var string replyto email
- */
+ /**
+ * @var string replyto email
+ */
public $replytomail;
- /**
- * @var string to name
- */
+ /**
+ * @var string to name
+ */
public $toname;
- /**
- * @var string to email
- */
+ /**
+ * @var string to email
+ */
public $tomail;
- /**
- * @var string trackid
- */
+ /**
+ * @var string trackid
+ */
public $trackid;
public $withsubstit; // Show substitution array
@@ -180,7 +180,7 @@ class FormMail extends Form
$this->withfckeditor = -1; // -1 = Auto
}
- // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+ // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
/**
* Clear list of attached files in send mail form (also stored in session)
*
@@ -188,7 +188,7 @@ class FormMail extends Form
*/
public function clear_attached_files()
{
- // phpcs:enable
+ // phpcs:enable
global $conf, $user;
require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
@@ -203,7 +203,7 @@ class FormMail extends Form
unset($_SESSION["listofmimes".$keytoavoidconflict]);
}
- // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+ // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
/**
* Add a file into the list of attached files (stored in SECTION array)
*
@@ -214,7 +214,7 @@ class FormMail extends Form
*/
public function add_attached_files($path, $file = '', $type = '')
{
- // phpcs:enable
+ // phpcs:enable
$listofpaths = array();
$listofnames = array();
$listofmimes = array();
@@ -237,7 +237,7 @@ class FormMail extends Form
}
}
- // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+ // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
/**
* Remove a file from the list of attached files (stored in SECTION array)
*
@@ -246,7 +246,7 @@ class FormMail extends Form
*/
public function remove_attached_files($keytodelete)
{
- // phpcs:enable
+ // phpcs:enable
$listofpaths = array();
$listofnames = array();
$listofmimes = array();
@@ -267,7 +267,7 @@ class FormMail extends Form
}
}
- // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+ // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
/**
* Return list of attached files (stored in SECTION array)
*
@@ -275,7 +275,7 @@ class FormMail extends Form
*/
public function get_attached_files()
{
- // phpcs:enable
+ // phpcs:enable
$listofpaths = array();
$listofnames = array();
$listofmimes = array();
@@ -287,7 +287,7 @@ class FormMail extends Form
return array('paths'=>$listofpaths, 'names'=>$listofnames, 'mimes'=>$listofmimes);
}
- // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+ // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
/**
* Show the form to input an email
* this->withfile: 0=No attaches files, 1=Show attached files, 2=Can add new attached files
@@ -299,11 +299,11 @@ class FormMail extends Form
*/
public function show_form($addfileaction = 'addfile', $removefileaction = 'removefile')
{
- // phpcs:enable
+ // phpcs:enable
print $this->get_form($addfileaction, $removefileaction);
}
- // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+ // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
/**
* Get the form to input an email
* this->withfile: 0=No attaches files, 1=Show attached files, 2=Can add new attached files
@@ -316,17 +316,17 @@ class FormMail extends Form
*/
public function get_form($addfileaction = 'addfile', $removefileaction = 'removefile')
{
- // phpcs:enable
+ // phpcs:enable
global $conf, $langs, $user, $hookmanager, $form;
- // Required to show preview of mail attachments
- require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
- $formfile = new Formfile($this->db);
+ // Required to show preview of mail attachments
+ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
+ $formfile = new Formfile($this->db);
if (!is_object($form)) $form = new Form($this->db);
// Load translation files required by the page
- $langs->loadLangs(array('other', 'mails'));
+ $langs->loadLangs(array('other', 'mails'));
// Clear temp files. Must be done at beginning, before call of triggers
if (GETPOST('mode', 'alpha') == 'init' || (GETPOST('modelmailselected', 'alpha') && GETPOST('modelmailselected', 'alpha') != '-1'))
@@ -464,7 +464,7 @@ class FormMail extends Form
'propal_send', 'order_send', 'facture_send',
'shipping_send', 'fichinter_send', 'supplier_proposal_send', 'order_supplier_send',
'invoice_supplier_send', 'thirdparty', 'contract', 'user', 'recruitmentcandidature_send', 'all'
- )))
+ )))
{
// If list of template is empty
$out .= '
'."\n";
@@ -486,7 +486,7 @@ class FormMail extends Form
if (is_array($this->substit) && count($this->substit)) $helpforsubstitution .= $langs->trans('AvailableVariables').' : '."\n";
foreach ($this->substit as $key => $val)
{
- $helpforsubstitution .= $key.' -> '.$langs->trans(dol_string_nohtmltag($val)).' ';
+ $helpforsubstitution .= $key.' -> '.$langs->trans(dol_string_nohtmltag(dolGetFirstLineOfText($val))).' ';
}
if (!empty($this->withsubstit)) // Unset or set ->withsubstit=0 to disable this.
{
@@ -733,7 +733,7 @@ class FormMail extends Form
{
$out .= (!is_array($this->withtocc) && !is_numeric($this->withtocc)) ? $this->withtocc : "";
} else {
- $out .= 'withtocc) && !is_numeric($this->withtocc)) ? $this->withtocc : '')).'" />';
+ $out .= 'withtocc) && !is_numeric($this->withtocc)) ? $this->withtocc : '')).'" />';
if (!empty($this->withtocc) && is_array($this->withtocc))
{
$out .= " ".$langs->trans("and")."/".$langs->trans("or")." ";
@@ -854,10 +854,10 @@ class FormMail extends Form
foreach ($listofpaths as $key => $val)
{
$out .= '
';
- // Preview of attachment
- preg_match('#^(/)(\w+)(/)(.+)$#', substr($val, (strlen(DOL_DATA_ROOT)-strlen($val))), $formfile_params);
+ // Preview of attachment
+ preg_match('#^(/)(\w+)(/)(.+)$#', substr($val, (strlen(DOL_DATA_ROOT)-strlen($val))), $formfile_params);
$out .= img_mime($listofnames[$key]).' '.$listofnames[$key];
- $out .= $formfile->showPreview(array(), $formfile_params[2], $formfile_params[4]);
+ $out .= $formfile->showPreview(array(), $formfile_params[2], $formfile_params[4]);
if (!$this->withfilereadonly)
{
$out .= ' ';
@@ -1060,7 +1060,7 @@ class FormMail extends Form
if (!empty($this->withtocccreadonly)) {
$out .= (!is_array($this->withtoccc) && !is_numeric($this->withtoccc)) ? $this->withtoccc : "";
} else {
- $out .= 'withtoccc) && !is_numeric($this->withtoccc)) ? $this->withtoccc : '')).'" />';
+ $out .= 'withtoccc) && !is_numeric($this->withtoccc)) ? $this->withtoccc : '')).'" />';
if (!empty($this->withtoccc) && is_array($this->withtoccc)) {
$out .= " ".$langs->trans("and")."/".$langs->trans("or")." ";
// multiselect array convert html entities into options tags, even if we dont want this, so we encode them a second time
@@ -1185,7 +1185,7 @@ class FormMail extends Form
*/
public function getEMailTemplate($db, $type_template, $user, $outputlangs, $id = 0, $active = 1, $label = '')
{
- $ret = new ModelMail();
+ $ret = new ModelMail();
if ($id == -2 && empty($label)) {
$this->error = 'LabelIsMandatoryWhenIdIs-2';
@@ -1513,9 +1513,9 @@ class ModelMail
public $id;
/**
- * @var string Model mail label
- */
- public $label;
+ * @var string Model mail label
+ */
+ public $label;
public $topic;
public $content;
diff --git a/htdocs/core/class/html.formticket.class.php b/htdocs/core/class/html.formticket.class.php
index ce1b89bf416..a91c28789aa 100644
--- a/htdocs/core/class/html.formticket.class.php
+++ b/htdocs/core/class/html.formticket.class.php
@@ -200,17 +200,17 @@ class FormTicket
// Type
print '
';
+ // TODO Trick to have param removedfile containing nb of image to delete. But this does not works without javascript
+ $out .= ''."\n";
+ $out .= ''."\n";
+ if (count($listofpaths)) {
+ foreach ($listofpaths as $key => $val) {
+ $out .= '
';
- // TODO Trick to have param removedfile containing nb of image to delete. But this does not works without javascript
- $out .= ''."\n";
- $out .= ''."\n";
- if (count($listofpaths)) {
- foreach ($listofpaths as $key => $val) {
- $out .= '
';
+ else print ' ';
+ }
- // User creation (old method using already loaded object and not id is kept for backward compatibility)
- if (!empty($object->user_creation) || !empty($object->user_creation_id))
- {
- if ($usetable) print '
';
- print $langs->trans("CreatedBy");
- if ($usetable) print '
';
- else print ' ';
- }
-
- // User change (old method using already loaded object and not id is kept for backward compatibility)
- if (!empty($object->user_modification) || !empty($object->user_modification_id))
- {
- if ($usetable) print '
';
- print $langs->trans("ModifiedBy");
- if ($usetable) print '
';
- else print ' ';
- }
-
- // User validation (old method using already loaded object and not id is kept for backward compatibility)
- if (!empty($object->user_validation) || !empty($object->user_validation_id))
- {
- if ($usetable) print '
';
- print $langs->trans("ValidatedBy");
- if ($usetable) print '
';
- else print ': ';
- if (is_object($object->user_validation))
- {
- if ($object->user_validation->id) print $object->user_validation->getNomUrl(1, '', 0, 0, 0);
- else print $langs->trans("Unknown");
- } else {
- $userstatic = new User($db);
- $userstatic->fetch($object->user_validation_id ? $object->user_validation_id : $object->user_validation);
+ // User creation (old method using already loaded object and not id is kept for backward compatibility)
+ if (!empty($object->user_creation) || !empty($object->user_creation_id))
+ {
+ if ($usetable) print '
';
+ print $langs->trans("CreatedBy");
+ if ($usetable) print '
';
+ else print ' ';
+ }
- // User approve (old method using already loaded object and not id is kept for backward compatibility)
- if (!empty($object->user_approve) || !empty($object->user_approve_id))
- {
- if ($usetable) print '
';
- print $langs->trans("ApprovedBy");
- if ($usetable) print '
';
- else print ': ';
- if (is_object($object->user_approve))
- {
- if ($object->user_approve->id) print $object->user_approve->getNomUrl(1, '', 0, 0, 0);
- else print $langs->trans("Unknown");
- } else {
- $userstatic = new User($db);
- $userstatic->fetch($object->user_approve_id ? $object->user_approve_id : $object->user_approve);
+ // User change (old method using already loaded object and not id is kept for backward compatibility)
+ if (!empty($object->user_modification) || !empty($object->user_modification_id))
+ {
+ if ($usetable) print '
';
+ print $langs->trans("ModifiedBy");
+ if ($usetable) print '
';
- else print ' ';
- }
+ // User validation (old method using already loaded object and not id is kept for backward compatibility)
+ if (!empty($object->user_validation) || !empty($object->user_validation_id))
+ {
+ if ($usetable) print '
';
+ print $langs->trans("ValidatedBy");
+ if ($usetable) print '
';
+ else print ' ';
+ }
- // User close
- if (!empty($object->user_cloture))
- {
- if ($usetable) print '
';
- print $langs->trans("ClosedBy");
- if ($usetable) print '
';
- else print ': ';
- if (is_object($object->user_cloture))
- {
+ // User approve (old method using already loaded object and not id is kept for backward compatibility)
+ if (!empty($object->user_approve) || !empty($object->user_approve_id))
+ {
+ if ($usetable) print '
';
+ print $langs->trans("ApprovedBy");
+ if ($usetable) print '
';
}
@@ -489,8 +489,8 @@ function dolAddEmailTrackId($email, $trackingid)
*/
function isValidMailDomain($mail)
{
- list($user, $domain) = explode("@", $mail, 2);
- return checkdnsrr($domain, "MX");
+ list($user, $domain) = explode("@", $mail, 2);
+ return checkdnsrr($domain, "MX");
}
/**
@@ -508,38 +508,38 @@ function isValidMailDomain($mail)
*/
function isValidUrl($url, $http = 0, $pass = 0, $port = 0, $path = 0, $query = 0, $anchor = 0)
{
- $ValidUrl = 0;
- $urlregex = '';
+ $ValidUrl = 0;
+ $urlregex = '';
- // SCHEME
- if ($http) $urlregex .= "^(http:\/\/|https:\/\/)";
+ // SCHEME
+ if ($http) $urlregex .= "^(http:\/\/|https:\/\/)";
- // USER AND PASS
- if ($pass) $urlregex .= "([a-z0-9+!*(),;?&=\$_.-]+(\:[a-z0-9+!*(),;?&=\$_.-]+)?@)";
+ // USER AND PASS
+ if ($pass) $urlregex .= "([a-z0-9+!*(),;?&=\$_.-]+(\:[a-z0-9+!*(),;?&=\$_.-]+)?@)";
- // HOSTNAME OR IP
- //$urlregex .= "[a-z0-9+\$_-]+(\.[a-z0-9+\$_-]+)*"; // x allowed (ex. http://localhost, http://routerlogin)
- //$urlregex .= "[a-z0-9+\$_-]+(\.[a-z0-9+\$_-]+)+"; // x.x
- $urlregex .= "([a-z0-9+\$_\\\:-])+(\.[a-z0-9+\$_-][a-z0-9+\$_-]+)*"; // x ou x.xx (2 x ou plus)
- //use only one of the above
+ // HOSTNAME OR IP
+ //$urlregex .= "[a-z0-9+\$_-]+(\.[a-z0-9+\$_-]+)*"; // x allowed (ex. http://localhost, http://routerlogin)
+ //$urlregex .= "[a-z0-9+\$_-]+(\.[a-z0-9+\$_-]+)+"; // x.x
+ $urlregex .= "([a-z0-9+\$_\\\:-])+(\.[a-z0-9+\$_-][a-z0-9+\$_-]+)*"; // x ou x.xx (2 x ou plus)
+ //use only one of the above
- // PORT
- if ($port) $urlregex .= "(\:[0-9]{2,5})";
- // PATH
- if ($path) $urlregex .= "(\/([a-z0-9+\$_-]\.?)+)*\/";
- // GET Query
- if ($query) $urlregex .= "(\?[a-z+&\$_.-][a-z0-9;:@\/&%=+\$_.-]*)";
- // ANCHOR
- if ($anchor) $urlregex .= "(#[a-z_.-][a-z0-9+\$_.-]*)$";
+ // PORT
+ if ($port) $urlregex .= "(\:[0-9]{2,5})";
+ // PATH
+ if ($path) $urlregex .= "(\/([a-z0-9+\$_-]\.?)+)*\/";
+ // GET Query
+ if ($query) $urlregex .= "(\?[a-z+&\$_.-][a-z0-9;:@\/&%=+\$_.-]*)";
+ // ANCHOR
+ if ($anchor) $urlregex .= "(#[a-z_.-][a-z0-9+\$_.-]*)$";
- // check
- if (preg_match('/'.$urlregex.'/i', $url))
- {
- $ValidUrl = 1;
- }
- //print $urlregex.' - '.$url.' - '.$ValidUrl;
+ // check
+ if (preg_match('/'.$urlregex.'/i', $url))
+ {
+ $ValidUrl = 1;
+ }
+ //print $urlregex.' - '.$url.' - '.$ValidUrl;
- return $ValidUrl;
+ return $ValidUrl;
}
/**
@@ -550,21 +550,21 @@ function isValidUrl($url, $http = 0, $pass = 0, $port = 0, $path = 0, $query = 0
*/
function isValidVATID($company)
{
- if ($company->isInEEC()) // Syntax check rules for EEC countries
- {
- /* Disabled because some companies can have an address in Irland and a vat number in France.
+ if ($company->isInEEC()) // Syntax check rules for EEC countries
+ {
+ /* Disabled because some companies can have an address in Irland and a vat number in France.
$vatprefix = $company->country_code;
if ($vatprefix == 'GR') $vatprefix = '(EL|GR)';
elseif ($vatprefix == 'MC') $vatprefix = 'FR'; // Monaco is using french VAT numbers
else $vatprefix = preg_quote($vatprefix, '/');*/
- $vatprefix = '[a-zA-Z][a-zA-Z]';
- if (!preg_match('/^'.$vatprefix.'[a-zA-Z0-9\-\.]{5,14}$/i', str_replace(' ', '', $company->tva_intra)))
- {
- return 0;
- }
- }
+ $vatprefix = '[a-zA-Z][a-zA-Z]';
+ if (!preg_match('/^'.$vatprefix.'[a-zA-Z0-9\-\.]{5,14}$/i', str_replace(' ', '', $company->tva_intra)))
+ {
+ return 0;
+ }
+ }
- return 1;
+ return 1;
}
/**
@@ -576,34 +576,34 @@ function isValidVATID($company)
*/
function clean_url($url, $http = 1)
{
- // Fixed by Matelli (see http://matelli.fr/showcases/patchs-dolibarr/fix-cleaning-url.html)
- // To include the minus sign in a char class, we must not escape it but put it at the end of the class
- // Also, there's no need of escape a dot sign in a class
- if (preg_match('/^(https?:[\\/]+)?([0-9A-Z.-]+\.[A-Z]{2,4})(:[0-9]+)?/i', $url, $regs))
- {
- $proto = $regs[1];
- $domain = $regs[2];
- $port = isset($regs[3]) ? $regs[3] : '';
- //print $url." -> ".$proto." - ".$domain." - ".$port;
- //$url = dol_string_nospecial(trim($url));
- $url = trim($url);
+ // Fixed by Matelli (see http://matelli.fr/showcases/patchs-dolibarr/fix-cleaning-url.html)
+ // To include the minus sign in a char class, we must not escape it but put it at the end of the class
+ // Also, there's no need of escape a dot sign in a class
+ if (preg_match('/^(https?:[\\/]+)?([0-9A-Z.-]+\.[A-Z]{2,4})(:[0-9]+)?/i', $url, $regs))
+ {
+ $proto = $regs[1];
+ $domain = $regs[2];
+ $port = isset($regs[3]) ? $regs[3] : '';
+ //print $url." -> ".$proto." - ".$domain." - ".$port;
+ //$url = dol_string_nospecial(trim($url));
+ $url = trim($url);
- // Si http: defini on supprime le http (Si https on ne supprime pas)
- $newproto = $proto;
- if ($http == 0)
- {
- if (preg_match('/^http:[\\/]+/i', $url))
- {
- $url = preg_replace('/^http:[\\/]+/i', '', $url);
- $newproto = '';
- }
- }
+ // Si http: defini on supprime le http (Si https on ne supprime pas)
+ $newproto = $proto;
+ if ($http == 0)
+ {
+ if (preg_match('/^http:[\\/]+/i', $url))
+ {
+ $url = preg_replace('/^http:[\\/]+/i', '', $url);
+ $newproto = '';
+ }
+ }
- // On passe le nom de domaine en minuscule
- $CleanUrl = preg_replace('/^'.preg_quote($proto.$domain, '/').'/i', $newproto.strtolower($domain), $url);
+ // On passe le nom de domaine en minuscule
+ $CleanUrl = preg_replace('/^'.preg_quote($proto.$domain, '/').'/i', $newproto.strtolower($domain), $url);
- return $CleanUrl;
- } else return $url;
+ return $CleanUrl;
+ } else return $url;
}
@@ -662,12 +662,12 @@ function dolObfuscateEmail($mail, $replace = "*", $nbreplace = 8, $nbdisplaymail
*/
function array2tr($data, $troptions = '', $tdoptions = '')
{
- $text = '