Merge branch 'develop' into 12.0_a1

.travis.yml

@@ -285,7 +285,7 @@ script:
   # Ensure we catch errors
   set -e
   #parallel-lint --exclude htdocs/includes --blame .
-  parallel-lint --exclude dev/namespacemig --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 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 .
   set +e
   echo
 

ChangeLog

@@ -21,9 +21,10 @@ Following changes may create regressions for some external modules, but were nec
 ***** ChangeLog for 11.0.0 compared to 10.0.0 *****
 For Users:
 
-NEW: Module BOM is now stable (Module MO - Manufacturing Order is still in development).
+NEW: Module BOM is now stable.
+NEW: Module MO (Manufacturing Order) is available with experimental status.
 NEW: Can set the Address/Contact by default on third parties.
-NEW: Add a dictionary for list of Social networks
+NEW: Add a dictionary to edit list of Social networks.
 NEW: A nicer dashboard for open elements on Home page.
 NEW: Add task widget and add task progress bar
 NEW: Support of deployment of metapackages
@@ -227,6 +228,53 @@ Following changes may create regressions for some external modules, but were nec
 * The jquery plugin/dependency multiselect has been removed. It was not used by Dolibarr core.
 
 
+***** ChangeLog for 10.0.6 compared to 10.0.5 *****
+FIX Regression of 10.0.5 to create/edit proposals and orders.
+FIX: #12760 #12763 #12755 #12765 #12751
+FIX: add product qty in shipment already sent (fix for option STOCK_CALCULATE_ON_SHIPMENT_NEW)
+FIX: an issue that shows all entities stock
+FIX: class Facture undefined in displaying margin information
+FIX: error 500 when getting margin info for objects other than invoices
+FIX: Loan card - Wrong language key used
+FIX: Missing language key for MAIN_MAXTABS_IN_CARD
+FIX: product with empty stock were not visible
+FIX: remove backward compatibility projectid and uses object id instead
+FIX: Some issues on salary payment
+FIX: Some problems on conciliation with others modules
+FIX: typo on language key
+FIX: url new for task time spent in project element tab
+FIX: uses GETPOSTISSET instead of GETPOST for projectfield
+FIX: var transkey not defined in input hidden
+FIX: wrong var name and avoid warning
+
+***** ChangeLog for 10.0.5 compared to 10.0.4 *****
+FIX: 10.0: add URL param "restore_last_search_values=1" to all backlinks pointing to lists
+FIX: 10.0: do not display single-letter values (indicating duration unit without value) in product list
+FIX: #12473
+FIX: #12481 : fix ticket creation from thirdparty, mission $socid var
+FIX: #12482
+FIX: #12644
+FIX: #12665 Mass invoice validation with stock management
+FIX: #12688
+FIX: #12745
+FIX: add and modify category translate form with posted values on errors
+FIX: add URL param "restore_last_search_values=1" to all backlinks that point to a list
+FIX: CommandeFournisseurLigne update function must not be able to return other value than 1 if success
+FIX: contact card state address selected after filling address
+FIX: dol_string_nohtmltag when there is html with windows EOL "<br>\r\n"
+FIX: filter language is an array
+FIX: first col at wrong position in Export 2007 (new)
+FIX: getrights() request
+FIX: Invoice Situation integration into Margin
+FIX: missing nl2br conversion
+FIX: not fee in payout list
+FIX: product_fourn_price_id was assigned too late for logPrice() function
+FIX: Reduce number of request for list of products
+FIX: set due date in object in create invoice
+FIX: units traductions for selectUnits() function
+FIX: when we need to bill several orders, order lines unit is not on bill lines
+NEW: 9.0: allow users to use the mysqldump '--quick' option
+
 ***** ChangeLog for 10.0.4 compared to 10.0.3 *****
 FIX: The pdf templates were using the large logo making PDF too large (and edition of proposal, order, invoice VERY slow)
 FIX: #12258

README-FR.md

@@ -1,9 +1,12 @@
 # DOLIBARR ERP & CRM
 
+![Downloads per day](https://img.shields.io/sourceforge/dw/dolibarr.svg)
+![Build status](https://img.shields.io/travis/Dolibarr/dolibarr/develop.svg)
+
 Dolibarr ERP & CRM est un logiciel moderne pour gérer votre activité (société, association, auto-entrepreneurs, artisans).
 Il est simple d'utilisation et modulaire, vous permettant de n'activez que les fonctions dont vous avez besoin (contacts, fournisseurs, factures, commandes, stocks, agenda, ...).
 
-![ScreenShot](https://www.dolibarr.org/images/dolibarr_screenshot1_640x480.png)
+![ScreenShot](https://www.dolibarr.org/images/dolibarr_screenshot1_1920x1080.jpg)
 
 ## LICENCE
 

README.md

@@ -1,10 +1,7 @@
 # DOLIBARR ERP & CRM
 
 ![Downloads per day](https://img.shields.io/sourceforge/dw/dolibarr.svg)
-
-|7|8|9|10|develop|
-|----------|----------|----------|----------|----------|
-|![Build status](https://img.shields.io/travis/Dolibarr/dolibarr/7.0.svg)|![Build status](https://img.shields.io/travis/Dolibarr/dolibarr/8.0.svg)|![Build status](https://img.shields.io/travis/Dolibarr/dolibarr/9.0.svg)|![Build status](https://img.shields.io/travis/Dolibarr/dolibarr/10.0.svg)|![Build status](https://img.shields.io/travis/Dolibarr/dolibarr/develop.svg)|
+![Build status](https://img.shields.io/travis/Dolibarr/dolibarr/develop.svg)
 
 Dolibarr ERP & CRM is a modern software package to manage your organization's activity (contacts, suppliers, invoices, orders, stocks, agenda…).
 
@@ -14,7 +11,7 @@ You can freely use, study, modify or distribute it according to its Free Softwar
 
 You can use it as a standalone application or as a web application to be able to access it from the Internet or a LAN.
 
-![ScreenShot](https://www.dolibarr.org/images/dolibarr_screenshot1_640x400.png)
+![ScreenShot](https://www.dolibarr.org/images/dolibarr_screenshot1_1920x1080.jpg)
 
 ## LICENSE
 

build/debian/conf.php.install

@@ -231,3 +231,8 @@ $dolibarr_main_prod='0';
 # Default value: 0 (use database value if exist)
 # Examples:
 # $dolibarr_mailing_limit_sendbycli='0';
+
+# dolibarr_distrib
+# A key to identify the distribution used for first installation
+$dolibarr_distrib = 'deb';
+

build/debian/source/include-binaries

@@ -1 +1,2 @@
-htdocs/install/doctemplates/websites/website_template-corporate.zip
+htdocs/install/doctemplates/websites/website_template-corporate.zip
+htdocs/install/doctemplates/websites/website_template-stellar.zip

build/docker/Dockerfile

@@ -3,10 +3,11 @@ FROM php:7.2-apache
 ENV HOST_USER_ID 33
 ENV PHP_INI_DATE_TIMEZONE 'UTC'
 
-RUN apt-get update && apt-get install -y libpng-dev libjpeg-dev libldap2-dev zlib1g-dev libicu-dev g++\
+RUN apt-get update && apt-get install -y libpng-dev libjpeg-dev libldap2-dev libzip-dev zlib1g-dev libicu-dev g++\
 	&& rm -rf /var/lib/apt/lists/* \
 	&& docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \
 	&& docker-php-ext-install gd \
+	&& docker-php-ext-install zip \
 	&& docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ \
         && docker-php-ext-install ldap \
         && docker-php-ext-install mysqli \

build/exe/doliwamp/doliwamp.iss

@@ -110,7 +110,7 @@ Source: "C:\Program Files\Wamp\bin\mysql\mysql5.0.45\*.*"; DestDir: "{app}\bin\m
 ; Mysql data files (does not overwrite if exists)
 Source: "build\exe\doliwamp\mysql\*.*"; DestDir: "{app}\bin\mysql\data\mysql"; Flags: onlyifdoesntexist ignoreversion recursesubdirs; Excludes: ".gitignore,.project,CVS\*,Thumbs.db"
 ; Dolibarr
-Source: "htdocs\*.*"; DestDir: "{app}\www\dolibarr\htdocs"; Flags: ignoreversion recursesubdirs; Excludes: ".gitignore,.project,CVS\*,Thumbs.db,custom\*,custom2\*,documents\*,includes\ckeditor\_source\*,includes\savant\*,includes\phpmailer\*,jquery\plugins\template\*,nltechno*\*,PHPExcel\Shared\PDF\*,PHPExcel\Shared\PCLZip\*,tcpdf\fonts\dejavu-fonts-ttf-2.33\*,tcpdf\fonts\freefont-20100919\*,tcpdf\fonts\utils\*,*\conf.php,*\conf.php.mysql,*\conf.php.old,*\conf.php.postgres,*\conf.php.sav,*\install.forced.php"
+Source: "htdocs\*.*"; DestDir: "{app}\www\dolibarr\htdocs"; Flags: ignoreversion recursesubdirs; Excludes: ".gitignore,.project,CVS\*,Thumbs.db,custom\*,custom2\*,documents\*,includes\ckeditor\_source\*,includes\savant\*,includes\phpmailer\*,jquery\plugins\template\*,nltechno*\*,sabre\sabre\*\tests,PHPExcel\Shared\PDF\*,PHPExcel\Shared\PCLZip\*,tcpdf\fonts\dejavu-fonts-ttf-2.33\*,tcpdf\fonts\freefont-20100919\*,tcpdf\fonts\utils\*,*\conf.php,*\conf.php.mysql,*\conf.php.old,*\conf.php.postgres,*\conf.php.sav,*\install.forced.php"
 Source: "dev\*.*"; DestDir: "{app}\www\dolibarr\dev"; Flags: ignoreversion recursesubdirs; Excludes: ".gitignore,.project,CVS\*,Thumbs.db,dbmodel\*,fpdf\*,initdata\*,initdemo\*,iso-normes\*,licence\*,phpcheckstyle\*,phpunit\*,samples\*,test\*,uml\*,vagrant\*,xdebug\*"
 Source: "doc\*.*"; DestDir: "{app}\www\dolibarr\doc"; Flags: ignoreversion recursesubdirs; Excludes: ".gitignore,.project,CVS\*,Thumbs.db,wiki\*,plaquette\*,dev\*,images\dolibarr_screenshot2.png,images\dolibarr_screenshot3.png,images\dolibarr_screenshot4.png,images\dolibarr_screenshot5.png,images\dolibarr_screenshot6.png,images\dolibarr_screenshot7.png,images\dolibarr_screenshot8.png,images\dolibarr_screenshot9.png,images\dolibarr_screenshot10.png,images\dolibarr_screenshot11.png,images\dolibarr_screenshot12.png"
 Source: "scripts\*.*"; DestDir: "{app}\www\dolibarr\scripts"; Flags: ignoreversion recursesubdirs; Excludes: ".gitignore,.project,CVS\*,Thumbs.db,product\materiel.net.php,product\import-product.php"

build/generate_filelist_xml.php

@@ -146,7 +146,7 @@ $iterator1 = new RecursiveIteratorIterator($dir_iterator1);
 $files = new RegexIterator($iterator1, '#^(?:[A-Z]:)?(?:/(?!(?:'.($includecustom?'':'custom\/|').'documents\/|conf\/|install\/))[^/]+)+/[^/]+\.(?:php|css|html|js|json|tpl|jpg|png|gif|sql|lang)$#i');
 */
 $regextoinclude='\.(php|php3|php4|php5|phtml|phps|phar|inc|css|scss|html|xml|js|json|tpl|jpg|jpeg|png|gif|ico|sql|lang|txt|yml|md|mp3|mp4|wav|mkv|z|gz|zip|rar|tar|less|svg|eot|woff|woff2|ttf|manifest)$';
-$regextoexclude='('.($includecustom?'':'custom|').'documents|conf|install|public\/test|Shared\/PCLZip|nusoap\/lib\/Mail|php\/example|php\/test|geoip\/sample.*\.php|ckeditor\/samples|ckeditor\/adapters)$';  // Exclude dirs
+$regextoexclude='('.($includecustom?'':'custom|').'documents|conf|install|public\/test|sabre\/sabre\/.*\/tests|Shared\/PCLZip|nusoap\/lib\/Mail|php\/example|php\/test|geoip\/sample.*\.php|ckeditor\/samples|ckeditor\/adapters)$';  // Exclude dirs
 $files = dol_dir_list(DOL_DOCUMENT_ROOT, 'files', 1, $regextoinclude, $regextoexclude, 'fullname');
 $dir='';
 $needtoclose=0;

dev/initdata/dbf/import-dbf.php

@@ -0,0 +1,231 @@
+#!/usr/bin/env php
+<?php
+/* Copyright (C) 2016 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2016 Juanjo Menent        <jmenent@2byte.es>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ *
+ * WARNING, THIS WILL LOAD MASS DATA ON YOUR INSTANCE
+ */
+
+/**
+ *  \file       dev/initdata/import-dbf.php
+ * 	\brief      Script example to create a table from a large DBF file (openoffice)
+ *              To purge data, you can have a look at purge-data.php
+ */
+// Test si mode batch
+$sapi_type = php_sapi_name();
+$script_file = basename(__FILE__);
+
+$path = dirname(__FILE__) . '/';
+if (substr($sapi_type, 0, 3) == 'cgi') {
+    echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
+    exit;
+}
+
+// Recupere root dolibarr
+$path = dirname($_SERVER["PHP_SELF"]);
+require $path . "./../htdocs/master.inc.php";
+require $path . "/includes/dbase.class.php";
+
+// Global variables
+$version = DOL_VERSION;
+$confirmed = 1;
+$error = 0;
+
+
+/*
+ * Main
+ */
+
+@set_time_limit(0);
+print "***** " . $script_file . " (" . $version . ") pid=" . dol_getmypid() . " *****\n";
+dol_syslog($script_file . " launched with arg " . implode(',', $argv));
+
+
+$filepath = $argv[1];
+$filepatherr = $filepath . '.err';
+$startchar = empty($argv[2]) ? 0 : (int) $argv[2];
+$deleteTable = empty($argv[3]) ? 1 : 0;
+$startlinenb = empty($argv[3]) ? 1 : (int) $argv[3];
+$endlinenb = empty($argv[4]) ? 0 : (int) $argv[4];
+
+if (empty($filepath)) {
+    print "Usage: php $script_file myfilepath.dbf [removeChatColumnName] [startlinenb] [endlinenb]\n";
+    print "Example: php $script_file myfilepath.dbf 0 2 1002\n";
+    print "\n";
+    exit(-1);
+}
+if (!file_exists($filepath)) {
+    print "Error: File " . $filepath . " not found.\n";
+    print "\n";
+    exit(-1);
+}
+
+$ret = $user->fetch('', 'admin');
+if (!$ret > 0) {
+    print 'A user with login "admin" and all permissions must be created to use this script.' . "\n";
+    exit;
+}
+$user->getrights();
+
+// Ask confirmation
+if (!$confirmed) {
+    print "Hit Enter to continue or CTRL+C to stop...\n";
+    $input = trim(fgets(STDIN));
+}
+
+// Open input and output files
+$fhandle = dbase_open($filepath, 0);
+if (!$fhandle) {
+    print 'Error: Failed to open file ' . $filepath . "\n";
+    exit(1);
+}
+$fhandleerr = fopen($filepatherr, 'w');
+if (!$fhandleerr) {
+    print 'Error: Failed to open file ' . $filepatherr . "\n";
+    exit(1);
+}
+
+$langs->setDefaultLang($defaultlang);
+
+$record_numbers = dbase_numrecords($fhandle);
+$table_name = substr(basename($filepath), 0, strpos(basename($filepath), '.'));
+print 'Info: ' . $record_numbers . " lines in file \n";
+$header = dbase_get_header_info($fhandle);
+if ($deleteTable) {
+    $db->query("DROP TABLE IF EXISTS `$table_name`");
+}
+$sqlCreate = "CREATE TABLE IF NOT EXISTS `$table_name` ( `id` INT(11) NOT NULL AUTO_INCREMENT ";
+$fieldArray = array("`id`");
+foreach ($header as $value) {
+    $fieldName = substr(str_replace('_', '', $value['name']), $startchar);
+    $fieldArray[] = "`$fieldName`";
+    $sqlCreate .= ", `" . $fieldName . "` VARCHAR({$value['length']}) NULL DEFAULT NULL ";
+}
+$sqlCreate .= ", PRIMARY KEY (`id`)) ENGINE = InnoDB";
+$resql = $db->query($sqlCreate);
+if ($resql !== false) {
+    print "Table $table_name created\n";
+} else {
+    var_dump($db->errno());
+    print "Impossible : " . $sqlCreate . "\n";
+    die();
+}
+
+$i = 0;
+$nboflines++;
+
+$fields = implode(',', $fieldArray);
+//var_dump($fieldArray);die();
+$maxLength = 0;
+for ($i = 1; $i <= $record_numbers; $i++) {
+    if ($startlinenb && $i < $startlinenb)
+        continue;
+    if ($endlinenb && $i > $endlinenb)
+        continue;
+    $row = dbase_get_record_with_names($fhandle, $i);
+    if ($row === false || (isset($row["deleted"]) && $row["deleted"] == '1'))
+        continue;
+    $sqlInsert = "INSERT INTO `$table_name`($fields) VALUES (null,";
+    array_shift($row); // remove delete column
+    foreach ($row as $value) {
+        $sqlInsert .= "'" . $db->escape(utf8_encode($value)) . "', ";
+    }
+    replaceable_echo(implode("\t", $row));
+    $sqlInsert = rtrim($sqlInsert, ', ');
+    $sqlInsert .= ")";
+    $resql = $db->query($sqlInsert);
+    if ($resql === false) {
+        print "Impossible : " . $sqlInsert . "\n";
+        var_dump($row, $db->errno());
+        die();
+    }
+	//    $fields = (object) $row;
+	//    var_dump($fields);
+    continue;
+}
+die();
+
+
+
+
+
+// commit or rollback
+print "Nb of lines qualified: " . $nboflines . "\n";
+print "Nb of errors: " . $error . "\n";
+if ($mode != 'confirmforced' && ($error || $mode != 'confirm')) {
+    print "Rollback any changes.\n";
+    $db->rollback();
+} else {
+    print "Commit all changes.\n";
+    $db->commit();
+}
+
+$db->close();
+fclose($fhandle);
+fclose($fhandleerr);
+
+exit($error);
+
+
+/**
+ * replaceable_echo
+ *
+ * @param string 	$message			Message
+ * @param int 		$force_clear_lines	Force clear messages
+ * @return void
+ */
+function replaceable_echo($message, $force_clear_lines = null)
+{
+    static $last_lines = 0;
+
+    if (!is_null($force_clear_lines)) {
+        $last_lines = $force_clear_lines;
+    }
+
+    $toss = array();
+    $status = 0;
+    $term_width = exec('tput cols', $toss, $status);
+    if ($status) {
+        $term_width = 64; // Arbitrary fall-back term width.
+    }
+
+    $line_count = 0;
+    foreach (explode("\n", $message) as $line) {
+        $line_count += count(str_split($line, $term_width));
+    }
+
+    // Erasure MAGIC: Clear as many lines as the last output had.
+    for ($i = 0; $i < $last_lines; $i++) {
+        // Return to the beginning of the line
+        echo "\r";
+        // Erase to the end of the line
+        echo "\033[K";
+        // Move cursor Up a line
+        echo "\033[1A";
+        // Return to the beginning of the line
+        echo "\r";
+        // Erase to the end of the line
+        echo "\033[K";
+        // Return to the beginning of the line
+        echo "\r";
+        // Can be consolodated into
+        // echo "\r\033[K\033[1A\r\033[K\r";
+    }
+
+    $last_lines = $line_count;
+
+    echo $message . "\n";
+}

dev/initdata/dbf/importdb-products.php

@@ -0,0 +1,241 @@
+#!/usr/bin/env php
+<?php
+/* Copyright (C) 2016 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2016 Juanjo Menent        <jmenent@2byte.es>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ *
+ * WARNING, THIS WILL LOAD MASS DATA ON YOUR INSTANCE
+ */
+
+/**
+ *      \file       dev/initdata/import-product.php
+ * 		\brief      Script example to insert products from a csv file.
+ *                  To purge data, you can have a look at purge-data.php
+ */
+// Test si mode batch
+$sapi_type = php_sapi_name();
+$script_file = basename(__FILE__);
+$path = dirname(__FILE__) . '/';
+if (substr($sapi_type, 0, 3) == 'cgi') {
+    echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
+    exit;
+}
+
+// Recupere root dolibarr
+$path = preg_replace('/importdb-products.php/i', '', $_SERVER["PHP_SELF"]);
+require $path . "../../htdocs/master.inc.php";
+require $path . "includes/dbase.class.php";
+include_once DOL_DOCUMENT_ROOT . '/societe/class/societe.class.php';
+include_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php';
+
+//$delimiter = ',';
+//$enclosure = '"';
+//$linelength = 10000;
+//$escape = '/';
+// Global variables
+$version = DOL_VERSION;
+$confirmed = 1;
+$error = 0;
+
+$tvas = [
+    '1' => "20.00",
+    '2' => "5.50",
+    '3' => "0.00",
+    '4' => "20.60",
+    '5' => "19.60",
+];
+$tvasD = [
+    '1' => "20",
+    '2' => "5.5",
+    '3' => "0",
+    '4' => "20",
+    '5' => "20",
+];
+
+/*
+ * Main
+ */
+
+@set_time_limit(0);
+print "***** " . $script_file . " (" . $version . ") pid=" . dol_getmypid() . " *****\n";
+dol_syslog($script_file . " launched with arg " . implode(',', $argv));
+
+$table = $argv[1];
+
+if (empty($argv[1])) {
+    print "Error: Which table ?\n";
+    print "\n";
+    exit(-1);
+}
+
+$ret = $user->fetch('', 'admin');
+if (!$ret > 0) {
+    print 'A user with login "admin" and all permissions must be created to use this script.' . "\n";
+    exit;
+}
+
+$sql = "SELECT * FROM `$table` WHERE 1";
+$resql = $db->query($sql);
+if ($resql)
+while ($fields = $db->fetch_array($resql)) {
+	$errorrecord = 0;
+	if ($fields === false)
+		continue;
+	$nboflines++;
+
+	$produit = new Product($db);
+	$produit->type = 0;
+	$produit->status = 1;
+	$produit->ref = trim($fields['REF']);
+	if ($produit->ref == '')
+		continue;
+	print "Process line nb " . $j . ", ref " . $produit->ref;
+	$produit->label = trim($fields['LIBELLE']);
+	if ($produit->label == '')
+		$produit->label = $produit->ref;
+	if (empty($produit->label))
+		continue;
+	//$produit->description = trim($fields[4] . "\n" . ($fields[5] ? $fields[5] . ' x ' . $fields[6] . ' x ' . $fields[7] : ''));
+	//        $produit->volume = price2num($fields[8]);
+	//        $produit->volume_unit = 0;
+	$produit->weight = price2num($fields['MASSE']);
+	$produit->weight_units = 0;          // -3 = g
+	//$produit->customcode = $fields[10];
+	$produit->barcode = str_pad($fields['CODE'], 12, "0", STR_PAD_LEFT);
+	$produit->barcode_type = '2';
+	$produit->import_key = $fields['CODE'];
+
+	$produit->status = 1;
+	$produit->status_buy = 1;
+
+	$produit->finished = 1;
+
+	//        $produit->multiprices[0] = price2num($fields['TARIF0']);
+	//        $produit->multiprices[1] = price2num($fields['TARIF1']);
+	//        $produit->multiprices[2] = price2num($fields['TARIF2']);
+	//        $produit->multiprices[3] = price2num($fields['TARIF3']);
+	//        $produit->multiprices[4] = price2num($fields['TARIF4']);
+	//        $produit->multiprices[5] = price2num($fields['TARIF5']);
+	//        $produit->multiprices[6] = price2num($fields['TARIF6']);
+	//        $produit->multiprices[7] = price2num($fields['TARIF7']);
+	//        $produit->multiprices[8] = price2num($fields['TARIF8']);
+	//        $produit->multiprices[9] = price2num($fields['TARIF9']);
+	//        $produit->price_min = null;
+	//        $produit->price_min_ttc = null;
+	//        $produit->price = price2num($fields[11]);
+	//        $produit->price_ttc = price2num($fields[12]);
+	//        $produit->price_base_type = 'TTC';
+	//        $produit->tva_tx = price2num($fields[13]);
+	$produit->tva_tx = (int) ($tvas[$fields['CODTVA']]);
+	$produit->tva_npr = 0;
+	//        $produit->cost_price = price2num($fields[16]);
+	//compta
+
+	$produit->accountancy_code_buy = trim($fields['COMACH']);
+	$produit->accountancy_code_sell = trim($fields['COMVEN']);
+	//        $produit->accountancy_code_sell_intra=trim($fields['COMVEN']);
+	//        $produit->accountancy_code_sell_export=trim($fields['COMVEN']);
+	// Extrafields
+	//        $produit->array_options['options_ecotaxdeee'] = price2num($fields[17]);
+
+	$produit->seuil_stock_alerte = $fields['STALERTE'];
+	$ret = $produit->create($user, 0);
+	if ($ret < 0) {
+		print " - Error in create result code = " . $ret . " - " . $produit->errorsToString();
+		$errorrecord++;
+	} else {
+		print " - Creation OK with ref " . $produit->ref . " - id = " . $ret;
+	}
+
+	dol_syslog("Add prices");
+
+	// If we use price level, insert price for each level
+	if (!$errorrecord && 1) {
+		//$ret1 = $produit->updatePrice($produit->price_ttc, $produit->price_base_type, $user, $produit->tva_tx, $produit->price_min, 1, $produit->tva_npr, 0, 0, array());
+		$ret1 = false;
+		for ($i = 0; $i < 10; $i++) {
+			if ($fields['TARIF' . ($i)] == 0)
+				continue;
+			$ret1 = $ret1 || $produit->updatePrice(price2num($fields['TARIF' . ($i)]), 'HT', $user, $produit->tva_tx, $produit->price_min, $i + 1, $produit->tva_npr, 0, 0, array()) < 0;
+		}
+		if ($ret1) {
+			print " - Error in updatePrice result " . $produit->errorsToString();
+			$errorrecord++;
+		} else {
+			print " - updatePrice OK";
+		}
+	}
+
+
+	//        dol_syslog("Add multilangs");
+	// Add alternative languages
+	//        if (!$errorrecord && 1) {
+	//            $produit->multilangs['fr_FR'] = array('label' => $produit->label, 'description' => $produit->description, 'note' => $produit->note_private);
+	//            $produit->multilangs['en_US'] = array('label' => $fields[3], 'description' => $produit->description, 'note' => $produit->note_private);
+	//
+	//            $ret = $produit->setMultiLangs($user);
+	//            if ($ret < 0) {
+	//                print " - Error in setMultiLangs result code = " . $ret . " - " . $produit->errorsToString();
+	//                $errorrecord++;
+	//            } else {
+	//                print " - setMultiLangs OK";
+	//            }
+	//        }
+
+
+	dol_syslog("Add stocks");
+	// stocks
+	if (!$errorrecord && $fields['STOCK'] != 0) {
+		$rets = $produit->correct_stock($user, 1, $fields['STOCK'], 0, 'Stock importé');
+		if ($rets < 0) {
+			print " - Error in correct_stock result " . $produit->errorsToString();
+			$errorrecord++;
+		} else {
+			print " - correct_stock OK";
+		}
+	}
+
+	//update date créa
+	if (!$errorrecord) {
+		$date = substr($fields['DATCREA'], 0, 4) . '-' . substr($fields['DATCREA'], 4, 2) . '-' . substr($fields['DATCREA'], 6, 2);
+		$retd = $db->query("UPDATE `llx_product` SET `datec` = '$date 00:00:00' WHERE `llx_product`.`rowid` = $produit->id");
+		if ($retd < 1) {
+			print " - Error in update date créa result " . $produit->errorsToString();
+			$errorrecord++;
+		} else {
+			print " - update date créa OK";
+		}
+	}
+	print "\n";
+
+	if ($errorrecord) {
+		print( 'Error on record nb ' . $i . " - " . $produit->errorsToString() . "\n");
+		var_dump($db);
+		die();
+		$error++;    // $errorrecord will be reset
+	}
+	$j++;
+} else
+    die("error : $sql");
+
+
+
+
+// commit or rollback
+print "Nb of lines qualified: " . $nboflines . "\n";
+print "Nb of errors: " . $error . "\n";
+$db->close();
+
+exit($error);

dev/initdata/dbf/importdb-thirdparties.php

@@ -0,0 +1,355 @@
+#!/usr/bin/env php
+<?php
+/* Copyright (C) 2016 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2016 Juanjo Menent        <jmenent@2byte.es>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ *
+ * WARNING, THIS WILL LOAD MASS DATA ON YOUR INSTANCE
+ */
+
+/**
+ *      \file       dev/initdata/import-product.php
+ * 		\brief      Script example to insert products from a csv file.
+ *                  To purge data, you can have a look at purge-data.php
+ */
+// Test si mode batch
+$sapi_type = php_sapi_name();
+$script_file = basename(__FILE__);
+$path = dirname(__FILE__) . '/';
+if (substr($sapi_type, 0, 3) == 'cgi') {
+    echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
+    exit;
+}
+
+// Recupere root dolibarr
+$path = preg_replace('/importdb-thirdparties.php/i', '', $_SERVER["PHP_SELF"]);
+require $path . "../../htdocs/master.inc.php";
+require $path . "includes/dbase.class.php";
+include_once DOL_DOCUMENT_ROOT . '/societe/class/societe.class.php';
+include_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php';
+
+//$delimiter = ',';
+//$enclosure = '"';
+//$linelength = 10000;
+//$escape = '/';
+// Global variables
+$version = DOL_VERSION;
+$confirmed = 1;
+$error = 0;
+
+$civilPrivate = array("MLLE",
+    "MM",
+    "MM/MADAME",
+    "MME",
+    "MME.",
+    "MME²",
+    "MMONSIEUR",
+    "MMR",
+    "MOBNSIEUR",
+    "MOMSIEUR",
+    "MON SIEUR",
+    "MONDIAL",
+    "MONIEUR",
+    "MONJSIEUR",
+    "MONNSIEUR",
+    "MONRIEUR",
+    "MONS",
+    "MONSIEÕR",
+    "MONSIER",
+    "MONSIERU",
+    "MONSIEU",
+    "monsieue",
+    "MONSIEUR",
+    "Monsieur     \"",
+    "MONSIEUR    \"",
+    "MONSIEUR   E",
+    "MONSIEUR  DENIS",
+    "MONSIEUR ET MME",
+    "MONSIEUR!",
+    "MONSIEUR.",
+    "MONSIEUR.MADAME",
+    "MONSIEUR3",
+    "MONSIEURN",
+    "MONSIEURT",
+    "MONSIEUR£",
+    "MONSIEYR",
+    "Monsigur",
+    "MONSIIEUR",
+    "MONSIUER",
+    "MONSIZEUR",
+    "MOPNSIEUR",
+    "MOSIEUR",
+    "MR",
+    "Mr  Mme",
+    "Mr - MME",
+    "MR BLANC",
+    "MR ET MME",
+    "mr mm",
+    "MR OU MME",
+    "Mr.",
+    "MR/MME",
+    "MRME",
+    "MRR",
+    "Mrs",
+    "Mademoiselle",
+    "MADAOME",
+    "madamme",
+    "MADAME",
+    "M0NSIEUR",
+    "M.et Madame",
+    "M. ET MR",
+    "M.",
+    "M%",
+    "M MME",
+    "M ET MME",
+    "M",
+    "M CROCE",
+    "M DIEVART",
+);
+
+/*
+ * Main
+ */
+
+@set_time_limit(0);
+print "***** " . $script_file . " (" . $version . ") pid=" . dol_getmypid() . " *****\n";
+dol_syslog($script_file . " launched with arg " . implode(',', $argv));
+
+$table = $argv[1];
+
+if (empty($argv[1])) {
+    print "Error: Quelle table ?\n";
+    print "\n";
+    exit(-1);
+}
+
+$ret = $user->fetch('', 'admin');
+if (!$ret > 0) {
+    print 'A user with login "admin" and all permissions must be created to use this script.' . "\n";
+    exit;
+}
+
+$sql = "SELECT * FROM `$table` WHERE 1 "; //ORDER BY REMISE DESC,`LCIVIL` DESC";
+$resql = $db->query($sql);
+//$db->begin();
+if ($resql)
+while ($fields = $db->fetch_array($resql)) {
+	$i++;
+	$errorrecord = 0;
+
+	if ($startlinenb && $i < $startlinenb)
+		continue;
+	if ($endlinenb && $i > $endlinenb)
+		continue;
+
+	$nboflines++;
+
+	$object = new Societe($db);
+	$object->import_key = $fields['CODE'];
+	$object->state = 1;
+	$object->client = 3;
+	$object->fournisseur = 0;
+
+	$object->name = $fields['FCIVIL'] . ' ' . $fields['FNOM'];
+	//$object->name_alias = $fields[0] != $fields[13] ? trim($fields[0]) : '';
+
+	$date = $fields['DATCREA'] ? $fields['DATCREA'] : ($fields['DATMOD'] ? $fields['DATMOD'] : '20200101');
+	$object->code_client = 'CU' . substr($date, 2, 2) . substr($date, 4, 2) . '-' . str_pad(substr($fields['CODE'], 0, 5), 5, "0", STR_PAD_LEFT);
+
+
+	$object->address = trim($fields['FADR1']);
+	if ($fields['FADR2'])
+		$object->address .= "\n" . trim($fields['FADR2']);
+	if ($fields['FADR3'])
+		$object->address .= "\n" . trim($fields['FADR3']);
+
+	$object->zip = trim($fields['FPOSTE']);
+	$object->town = trim($fields['FVILLE']);
+	if ($fields['FPAYS'])
+		$object->country_id = dol_getIdFromCode($db, trim(ucwords(strtolower($fields['FPAYS']))), 'c_country', 'label', 'rowid');
+	else
+		$object->country_id = 1;
+	$object->phone = trim($fields['FTEL']) ? trim($fields['FTEL']) : trim($fields['FCONTACT']);
+	$object->phone = substr($object->phone, 0, 20);
+	$object->fax = trim($fields['FFAX']) ? trim($fields['FFAX']) : trim($fields['FCONTACT']);
+	$object->fax = substr($object->fax, 0, 20);
+	$object->email = trim($fields['FMAIL']);
+	//        $object->idprof2 = trim($fields[29]);
+	$object->tva_intra = str_replace(['.', ' '], '', $fields['TVAINTRA']);
+	$object->tva_intra = substr($object->tva_intra, 0, 20);
+	$object->default_lang = 'fr_FR';
+
+	$object->cond_reglement_id = dol_getIdFromCode($db, 'PT_ORDER', 'c_payment_term', 'code', 'rowid', 1);
+	$object->multicurrency_code = 'EUR';
+
+	if ($fields['REMISE'] != '0.00') {
+		$object->remise_percent = abs($fields['REMISE']);
+	}
+
+	//        $object->code_client = $fields[9];
+	//        $object->code_fournisseur = $fields[10];
+
+
+	if ($fields['FCIVIL']) {
+		$labeltype = in_array($fields['FCIVIL'], $civilPrivate) ? 'TE_PRIVATE' : 'TE_SMALL';
+		$object->typent_id = dol_getIdFromCode($db, $labeltype, 'c_typent', 'code');
+	}
+
+	// Set price level
+	$object->price_level = $fields['TARIF'] + 1;
+	//        if ($labeltype == 'Revendeur')
+	//            $object->price_level = 2;
+
+	print "Process line nb " . $i . ", code " . $fields['CODE'] . ", name " . $object->name;
+
+
+	// Extrafields
+	$object->array_options['options_banque'] = $fields['BANQUE'];
+	$object->array_options['options_banque2'] = $fields['BANQUE2'];
+	$object->array_options['options_banquevalid'] = $fields['VALID'];
+
+	if (!$errorrecord) {
+		$ret = $object->create($user);
+		if ($ret < 0) {
+			print " - Error in create result code = " . $ret . " - " . $object->errorsToString();
+			$errorrecord++;
+			var_dump($object->code_client, $db);
+			die();
+		} else {
+			print " - Creation OK with name " . $object->name . " - id = " . $ret;
+		}
+	}
+
+	if (!$errorrecord) {
+		dol_syslog("Set price level");
+		$object->set_price_level($object->price_level, $user);
+	}
+	if (!$errorrecord && @$object->remise_percent) {
+		dol_syslog("Set remise client");
+		$object->set_remise_client($object->remise_percent, 'Importé', $user);
+	}
+
+	dol_syslog("Add contact");
+	// Insert an invoice contact if there is an invoice email != standard email
+	if (!$errorrecord && ($fields['LCIVIL'] || $fields['LNOM'])) {
+		$madame = array("MADAME",
+			"MADEMOISELLE",
+			"MELLE",
+			"MLLE",
+			"MM",
+			"Mme",
+			"MNE",
+		);
+		$monsieur = array("M",
+			"M ET MME",
+			"M MME",
+			"M.",
+			"M. MME",
+			"M. OU Mme",
+			"M.ou Madame",
+			"MONSEUR",
+			"MONSIER",
+			"MONSIEU",
+			"MONSIEUR",
+			"monsieur:mme",
+			"MONSIEUR¨",
+			"MONSIEZUR",
+			"MONSIUER",
+			"MONSKIEUR",
+			"MR",
+		);
+		$ret1 = $ret2 = 0;
+
+		$contact = new Contact($db);
+		if (in_array($fields['LCIVIL'], $madame)) {
+			// une dame
+			$contact->civility_id = 'MME';
+			$contact->lastname = $fields['LNOM'];
+		} elseif (in_array($fields['LCIVIL'], $monsieur)) {
+			// un monsieur
+			$contact->civility_id = 'MR';
+			$contact->lastname = $fields['LNOM'];
+		} elseif (in_array($fields['LCIVIL'], ['DOCTEUR'])) {
+			// un monsieur
+			$contact->civility_id = 'DR';
+			$contact->lastname = $fields['LNOM'];
+		} else {
+			// un a rattraper
+			$contact->lastname = $fields['LCIVIL'] . " " . $fields['LNOM'];
+		}
+		$contact->address = trim($fields['LADR1']);
+		if ($fields['LADR2'])
+			$contact->address .= "\n" . trim($fields['LADR2']);
+		if ($fields['LADR3'])
+			$contact->address .= "\n" . trim($fields['LADR3']);
+
+		$contact->zip = trim($fields['LPOSTE']);
+		$contact->town = trim($fields['LVILLE']);
+		if ($fields['FPAYS'])
+			$contact->country_id = dol_getIdFromCode($db, trim(ucwords(strtolower($fields['LPAYS']))), 'c_country', 'label', 'rowid');
+		else
+			$contact->country_id = 1;
+		$contact->email = $fields['LMAIL'];
+		$contact->phone = trim($fields['LTEL']) ? trim($fields['LTEL']) : trim($fields['LCONTACT']);
+		$contact->fax = trim($fields['LFAX']) ? trim($fields['LFAX']) : trim($fields['LCONTACT']);
+		$contact->socid = $object->id;
+
+		$ret1 = $contact->create($user);
+		if ($ret1 > 0) {
+			//$ret2=$contact->add_contact($object->id, 'BILLING');
+		}
+		if ($ret1 < 0 || $ret2 < 0) {
+			print " - Error in create contact result code = " . $ret1 . " " . $ret2 . " - " . $contact->errorsToString();
+			$errorrecord++;
+		} else {
+			print " - create contact OK";
+		}
+	}
+
+
+	//update date créa
+	if (!$errorrecord) {
+		$datec = substr($date, 0, 4) . '-' . substr($date, 4, 2) . '-' . substr($date, 6, 2);
+		$retd = $db->query("UPDATE `llx_societe` SET `datec` = '$datec 00:00:00' WHERE `rowid` = $object->id");
+		if ($retd < 1) {
+			print " - Error in update date créa result " . $object->errorsToString();
+			$errorrecord++;
+		} else {
+			print " - update date créa OK";
+		}
+	}
+	print "\n";
+
+	if ($errorrecord) {
+		print( 'Error on record nb ' . $i . " - " . $object->errorsToString() . "\n");
+		var_dump($db, $object, $contact);
+		//            $db->rollback();
+		die();
+		$error++;    // $errorrecord will be reset
+	}
+	$j++;
+} else
+    die("error : $sql");
+
+$db->commit();
+
+
+
+// commit or rollback
+print "Nb of lines qualified: " . $nboflines . "\n";
+print "Nb of errors: " . $error . "\n";
+$db->close();
+
+exit($error);

dev/initdata/dbf/includes/dbase.class.php

@@ -0,0 +1,402 @@
+<?php
+/**
+ * \file        dev/initdata/dbf/includes/dbase.class.php
+ * \ingroup     dev
+ * \brief       Class to manage DBF databases
+ */
+
+// source : https://github.com/donfbecker/php-dbase
+
+define('DBASE_RDONLY', 0);
+define('DBASE_WRONLY', 1);
+define('DBASE_RDWR', 2);
+define('DBASE_TYPE_DBASE', 0);
+define('DBASE_TYPE_FOXPRO', 1);
+
+/**
+ * Class for DBase
+ */
+class DBase
+{
+    private $fd;
+    private $headerLength = 0;
+    private $fields = array();
+    private $fieldCount = 0;
+    private $recordLength = 0;
+    private $recordCount = 0;
+
+    //resource dbase_open ( string $filename , int $mode )
+    public static function open($filename, $mode)
+	{
+        if (!file_exists($filename))
+            return false;
+        $modes = array('r', 'w', 'r+');
+        $mode = $modes[$mode];
+        $fd = fopen($filename, $mode);
+        if (!$fd)
+            return false;
+        return new DBase($fd);
+    }
+
+    //resource dbase_create ( string $filename , array $fields [, int $type = DBASE_TYPE_DBASE ] )
+    public static function create($filename, $fields, $type = DBASE_TYPE_DBASE)
+	{
+        if (file_exists($filename))
+            return false;
+        $fd = fopen($filename, 'c+');
+        if (!$fd)
+            return false;
+        // Byte 0 (1 byte): Valid dBASE for DOS file; bits 0-2 indicate version number, bit 3
+        // indicates the presence of a dBASE for DOS memo file, bits 4-6 indicate the
+        // presence of a SQL table, bit 7 indicates the presence of any memo file
+        // (either dBASE m PLUS or dBASE for DOS)
+        self::putChar8($fd, 5);
+        // Byte 1-3 (3 bytes): Date of last update; formatted as YYMMDD
+        self::putChar8($fd, date('Y') - 1900);
+        self::putChar8($fd, date('m'));
+        self::putChar8($fd, date('d'));
+        // Byte 4-7 (32-bit number): Number of records in the database file.  Currently 0
+        self::putInt32($fd, 0);
+        // Byte 8-9 (16-bit number): Number of bytes in the header.
+        self::putInt16($fd, 32 + (32 * count($fields)) + 1);
+        // Byte 10-11 (16-bit number): Number of bytes in record.
+        // Make sure the include the byte for deleted flag
+        $len = 1;
+        foreach ($fields as &$field)
+            $len += self::length($field);
+        self::putInt16($fd, $len);
+        // Byte 12-13 (2 bytes): Reserved, 0 filled.
+        self::putInt16($fd, 0);
+        // Byte 14 (1 byte): Flag indicating incomplete transaction
+        // The ISMARKEDO function checks this flag. BEGIN TRANSACTION sets it to 1, END TRANSACTION and ROLLBACK reset it to 0.
+        self::putChar8($fd, 0);
+        // Byte 15 (1 byte): Encryption flag. If this flag is set to 1, the message Database encrypted appears. Changing this flag to 0 removes the message, but does not decrypt the file.
+        self::putChar8($fd, 0);
+        // Byte 16-27 (12 bytes): Reserved for dBASE for DOS in a multi-user environment
+        self::putInt32($fd, 0);
+        self::putInt32($fd, 0);
+        self::putInt32($fd, 0);
+        // Byte 28 (1 byte): Production .mdx file flag; 0x01 if there is a production .mdx file, 0x00 if not
+        self::putChar8($fd, 0);
+        // Byte 29 (1 byte): Language driver ID
+        // (no clue what this is)
+        self::putChar8($fd, 0);
+        // Byte 30-31 (2 bytes): Reserved, 0 filled.
+        self::putInt16($fd, 0);
+        // Byte 32 - n (32 bytes each): Field descriptor array
+        foreach ($fields as &$field) {
+            self::putString($fd, $field[0], 11);       // Byte 0 - 10 (11 bytes): Field name in ASCII (zero-filled)
+            self::putString($fd, $field[1], 1);       // Byte 11 (1 byte): Field type in ASCII (C, D, F, L, M, or N)
+            self::putInt32($fd, 0);                    // Byte 12 - 15 (4 bytes): Reserved
+            self::putChar8($fd, self::length($field)); // Byte 16 (1 byte): Field length in binary. The maximum length of a field is 254 (0xFE).
+            self::putChar8($fd, $field[3]);            // Byte 17 (1 byte): Field decimal count in binary
+            self::putInt16($fd, 0);                    // Byte 18 - 19 (2 bytes): Work area ID
+            self::putChar8($fd, 0);                    // Byte 20 (1 byte): Example (??)
+            self::putInt32($fd, 0);                    // Byte 21 - 30 (10 bytes): Reserved
+            self::putInt32($fd, 0);
+            self::putInt16($fd, 0);
+            self::putChar8($fd, 0);                    // Byte 31 (1 byte): Production MDX field flag; 1 if field has an index tag in the production MDX file, 0 if not
+        }
+        // Byte n + 1 (1 byte): 0x0D as the field descriptor array terminator
+        self::putChar8($fd, 0x0D);
+        return new DBase($fd);
+    }
+
+    // Create DBase instance
+    private function __construct($fd)
+	{
+        $this->fd = $fd;
+        // Byte 4-7 (32-bit number): Number of records in the database file.  Currently 0
+        fseek($this->fd, 4, SEEK_SET);
+        $this->recordCount = self::getInt32($fd);
+        // Byte 8-9 (16-bit number): Number of bytes in the header.
+        fseek($this->fd, 8, SEEK_SET);
+        $this->headerLength = self::getInt16($fd);
+        // Number of fields is (headerLength - 33) / 32)
+        $this->fieldCount = ($this->headerLength - 33) / 32;
+        // Byte 10-11 (16-bit number): Number of bytes in record.
+        fseek($this->fd, 10, SEEK_SET);
+        $this->recordLength = self::getInt16($fd);
+        // Byte 32 - n (32 bytes each): Field descriptor array
+        fseek($fd, 32, SEEK_SET);
+        for ($i = 0; $i < $this->fieldCount; $i++) {
+            $data = fread($this->fd, 32);
+            $field = array_map('trim', unpack('a11name/a1type/c4/c1length/c1precision/s1workid/c1example/c10/c1production', $data));
+            $this->fields[] = $field;
+        }
+    }
+
+    //bool dbase_close ( resource $dbase_identifier )
+    public function close()
+	{
+        fclose($this->fd);
+    }
+
+    //array dbase_get_header_info ( resource $dbase_identifier )
+    public function get_header_info()
+	{
+        return $this->fields;
+    }
+
+    //int dbase_numfields ( resource $dbase_identifier )
+    public function numfields()
+	{
+        return $this->fieldCount;
+    }
+
+    //int dbase_numrecords ( resource $dbase_identifier )
+    public function numrecords()
+	{
+        return $this->recordCount;
+    }
+
+    //bool dbase_add_record ( resource $dbase_identifier , array $record )
+    public function add_record($record)
+	{
+        if (count($record) != $this->fieldCount)
+            return false;
+        // Seek to end of file, minus the end of file marker
+        fseek($this->fd, 0, SEEK_END);
+        // Put the deleted flag
+        self::putChar8($this->fd, 0x20);
+        // Put the record
+        if (!$this->putRecord($record))
+            return false;
+        // Update the record count
+        fseek($this->fd, 4);
+        self::putInt32($this->fd, ++$this->recordCount);
+        return true;
+    }
+
+    //bool dbase_replace_record ( resource $dbase_identifier , array $record , int $record_number )
+    public function replace_record($record, $record_number)
+	{
+        if (count($record) != $this->fieldCount)
+            return false;
+        if ($record_number < 1 || $record_number > $this->recordCount)
+            return false;
+        // Skip to the record location, plus the 1 byte for the deleted flag
+        fseek($this->fd, $this->headerLength + ($this->recordLength * ($record_number - 1)) + 1);
+        return $this->putRecord($record);
+    }
+
+    //bool dbase_delete_record ( resource $dbase_identifier , int $record_number )
+    public function delete_record($record_number)
+	{
+        if ($record_number < 1 || $record_number > $this->recordCount)
+            return false;
+        fseek($this->fd, $this->headerLength + ($this->recordLength * ($record_number - 1)));
+        self::putChar8($this->fd, 0x2A);
+        return true;
+    }
+
+    //array dbase_get_record ( resource $dbase_identifier , int $record_number )
+    public function get_record($record_number)
+	{
+        if ($record_number < 1 || $record_number > $this->recordCount)
+            return false;
+        fseek($this->fd, $this->headerLength + ($this->recordLength * ($record_number - 1)));
+        $record = array(
+            'deleted' => self::getChar8($this->fd) == 0x2A ? 1 : 0
+        );
+        foreach ($this->fields as $i => &$field) {
+            $value = trim(fread($this->fd, $field['length']));
+            if ($field['type'] == 'L') {
+                $value = strtolower($value);
+                if ($value == 't' || $value == 'y')
+                    $value = true;
+                elseif ($value == 'f' || $value == 'n')
+                    $value = false;
+                else
+                    $value = null;
+            }
+            $record[$i] = $value;
+        }
+        return $record;
+    }
+
+    //array dbase_get_record_with_names ( resource $dbase_identifier , int $record_number )
+    public function get_record_with_names($record_number)
+	{
+        if ($record_number < 1 || $record_number > $this->recordCount)
+            return false;
+        $record = $this->get_record($record_number);
+        foreach ($this->fields as $i => &$field) {
+            $record[$field['name']] = $record[$i];
+            unset($record[$i]);
+        }
+        return $record;
+    }
+
+    //bool dbase_pack ( resource $dbase_identifier )
+    public function pack()
+	{
+        $in_offset = $out_offset = $this->headerLength;
+        $new_count = 0;
+        $rec_count = $this->recordCount;
+        while ($rec_count > 0) {
+            fseek($this->fd, $in_offset, SEEK_SET);
+            $record = fread($this->fd, $this->recordLength);
+            $deleted = substr($record, 0, 1);
+            if ($deleted != '*') {
+                fseek($this->fd, $out_offset, SEEK_SET);
+                fwrite($this->fd, $record);
+                $out_offset += $this->recordLength;
+                $new_count++;
+            }
+            $in_offset += $this->recordLength;
+            $rec_count--;
+        }
+        ftruncate($this->fd, $out_offset);
+        // Update the record count
+        fseek($this->fd, 4);
+        self::putInt32($this->fd, $new_count);
+    }
+
+    /*
+     * A few utilitiy functions
+     */
+
+    private static function length($field)
+	{
+        switch ($field[1]) {
+            case 'D': // Date: Numbers and a character to separate month, day, and year (stored internally as 8 digits in YYYYMMDD format)
+                return 8;
+            case 'T': // DateTime (YYYYMMDDhhmmss.uuu) (FoxPro)
+                return 18;
+            case 'M': // Memo (ignored): All ASCII characters (stored internally as 10 digits representing a .dbt block number, right justified, padded with whitespaces)
+            case 'N': // Number: -.0123456789 (right justified, padded with whitespaces)
+            case 'F': // Float: -.0123456789 (right justified, padded with whitespaces)
+            case 'C': // String: All ASCII characters (padded with whitespaces up to the field's length)
+                return $field[2];
+            case 'L': // Boolean: YyNnTtFf? (? when not initialized)
+                return 1;
+        }
+        return 0;
+    }
+
+    /*
+     * Functions for reading and writing bytes
+     */
+
+    private static function getChar8($fd)
+	{
+        return ord(fread($fd, 1));
+    }
+
+    private static function putChar8($fd, $value)
+	{
+        return fwrite($fd, chr($value));
+    }
+
+    private static function getInt16($fd, $n = 1)
+	{
+        $data = fread($fd, 2 * $n);
+        $i = unpack("S$n", $data);
+        if ($n == 1)
+            return (int) $i[1];
+        else
+            return array_merge($i);
+    }
+
+    private static function putInt16($fd, $value)
+	{
+        return fwrite($fd, pack('S', $value));
+    }
+
+    private static function getInt32($fd, $n = 1)
+	{
+        $data = fread($fd, 4 * $n);
+        $i = unpack("L$n", $data);
+        if ($n == 1)
+            return (int) $i[1];
+        else
+            return array_merge($i);
+    }
+
+    private static function putInt32($fd, $value)
+	{
+        return fwrite($fd, pack('L', $value));
+    }
+
+    private static function putString($fd, $value, $length = 254)
+	{
+        $ret = fwrite($fd, pack('A' . $length, $value));
+    }
+
+    private function putRecord($record)
+	{
+        foreach ($this->fields as $i => &$field) {
+            $value = $record[$i];
+            // Number types are right aligned with spaces
+            if ($field['type'] == 'N' || $field['type'] == 'F' && strlen($value) < $field['length']) {
+                $value = str_repeat(' ', $field['length'] - strlen($value)) . $value;
+            }
+            self::putString($this->fd, $value, $field['length']);
+        }
+        return true;
+    }
+}
+
+if (!function_exists('dbase_open')) {
+
+    function dbase_open($filename, $mode)
+	{
+        return DBase::open($filename, $mode);
+    }
+
+    function dbase_create($filename, $fields, $type = DBASE_TYPE_DBASE)
+	{
+        return DBase::create($filename, $fields, $type);
+    }
+
+    function dbase_close($dbase_identifier)
+	{
+        return $dbase_identifier->close();
+    }
+
+    function dbase_get_header_info($dbase_identifier)
+	{
+        return $dbase_identifier->get_header_info();
+    }
+
+    function dbase_numfields($dbase_identifier)
+	{
+        $dbase_identifier->numfields();
+    }
+
+    function dbase_numrecords($dbase_identifier)
+	{
+        return $dbase_identifier->numrecords();
+    }
+
+    function dbase_add_record($dbase_identifier, $record)
+	{
+        return $dbase_identifier->add_record($record);
+    }
+
+    function dbase_delete_record($dbase_identifier, $record_number)
+	{
+        return $dbase_identifier->delete_record($record_number);
+    }
+
+    function dbase_replace_record($dbase_identifier, $record, $record_number)
+	{
+        return $dbase_identifier->replace_record($record, $record_number);
+    }
+
+    function dbase_get_record($dbase_identifier, $record_number)
+	{
+        return $dbase_identifier->get_record($record_number);
+    }
+
+    function dbase_get_record_with_names($dbase_identifier, $record_number)
+	{
+        return $dbase_identifier->get_record_with_names($record_number);
+    }
+
+    function dbase_pack($dbase_identifier)
+	{
+        return $dbase_identifier->pack();
+    }
+}

dev/initdata/generate-invoice.php

@@ -26,7 +26,7 @@
 // Test si mode batch
 $sapi_type = php_sapi_name();
 if (substr($sapi_type, 0, 3) == 'cgi') {
-	echo "Erreur: Vous utilisez l'interpreteur PHP pour le mode CGI. Pour executer mailing-send.php en ligne de commande, vous devez utiliser l'interpreteur PHP pour le mode CLI.\n";
+	echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
 	exit;
 }
 

dev/initdata/generate-order.php

@@ -27,7 +27,7 @@
 // Test si mode batch
 $sapi_type = php_sapi_name();
 if (substr($sapi_type, 0, 3) == 'cgi') {
-    echo "Erreur: Vous utilisez l'interpreteur PHP pour le mode CGI. Pour executer mailing-send.php en ligne de commande, vous devez utiliser l'interpreteur PHP pour le mode CLI.\n";
+    echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
     exit;
 }
 

dev/initdata/generate-product.php

@@ -27,7 +27,7 @@
 // Test si mode batch
 $sapi_type = php_sapi_name();
 if (substr($sapi_type, 0, 3) == 'cgi') {
-    echo "Erreur: Vous utilisez l'interpreteur PHP pour le mode CGI. Pour executer mailing-send.php en ligne de commande, vous devez utiliser l'interpreteur PHP pour le mode CLI.\n";
+    echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
     exit;
 }
 

dev/initdata/generate-proposal.php

@@ -27,7 +27,7 @@
 // Test si mode batch
 $sapi_type = php_sapi_name();
 if (substr($sapi_type, 0, 3) == 'cgi') {
-	echo "Erreur: Vous utilisez l'interpreteur PHP pour le mode CGI. Pour executer mailing-send.php en ligne de commande, vous devez utiliser l'interpreteur PHP pour le mode CLI.\n";
+	echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
 	exit;
 }
 

dev/initdata/generate-thirdparty.php

@@ -27,7 +27,7 @@
 // Test si mode batch
 $sapi_type = php_sapi_name();
 if (substr($sapi_type, 0, 3) == 'cgi') {
-    echo "Erreur: Vous utilisez l'interpreteur PHP pour le mode CGI. Pour executer mailing-send.php en ligne de commande, vous devez utiliser l'interpreteur PHP pour le mode CLI.\n";
+    echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
     exit;
 }
 

dev/initdata/import-products.php

@@ -30,7 +30,7 @@ $sapi_type = php_sapi_name();
 $script_file = basename(__FILE__);
 $path=dirname(__FILE__).'/';
 if (substr($sapi_type, 0, 3) == 'cgi') {
-    echo "Erreur: Vous utilisez l'interpreteur PHP pour le mode CGI. Pour executer mailing-send.php en ligne de commande, vous devez utiliser l'interpreteur PHP pour le mode CLI.\n";
+    echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
     exit;
 }
 

dev/initdata/import-thirdparties.php

@@ -30,7 +30,7 @@ $sapi_type = php_sapi_name();
 $script_file = basename(__FILE__);
 $path=dirname(__FILE__).'/';
 if (substr($sapi_type, 0, 3) == 'cgi') {
-    echo "Erreur: Vous utilisez l'interpreteur PHP pour le mode CGI. Pour executer mailing-send.php en ligne de commande, vous devez utiliser l'interpreteur PHP pour le mode CLI.\n";
+    echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
     exit;
 }
 

dev/initdata/import-users.php

@@ -30,7 +30,7 @@ $sapi_type = php_sapi_name();
 $script_file = basename(__FILE__);
 $path=dirname(__FILE__).'/';
 if (substr($sapi_type, 0, 3) == 'cgi') {
-    echo "Erreur: Vous utilisez l'interpreteur PHP pour le mode CGI. Pour executer mailing-send.php en ligne de commande, vous devez utiliser l'interpreteur PHP pour le mode CLI.\n";
+    echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
     exit;
 }
 

dev/initdata/purge-data.php

@@ -64,6 +64,10 @@ $sqls=array(
         "DELETE FROM ".MAIN_DB_PREFIX."paiement_facture where fk_facture IN (select rowid FROM ".MAIN_DB_PREFIX."facture where datec < '__DATE__')",
         "DELETE FROM ".MAIN_DB_PREFIX."paiement where rowid NOT IN (SELECT fk_paiement FROM ".MAIN_DB_PREFIX."paiement_facture)",
     ),
+    'supplier_payment'=>array(
+    	"DELETE FROM ".MAIN_DB_PREFIX."paiementfourn_facturefourn where fk_facturefourn IN (select rowid FROM ".MAIN_DB_PREFIX."facture_fourn where datec < '__DATE__')",
+    	"DELETE FROM ".MAIN_DB_PREFIX."paiementfourn where rowid NOT IN (SELECT fk_paiementfourn FROM ".MAIN_DB_PREFIX."paiementfourn_facturefourn)",
+    ),
     'bank'=>array(
         "DELETE FROM ".MAIN_DB_PREFIX."bank_class WHERE lineid IN (SELECT rowid FROM ".MAIN_DB_PREFIX."bank WHERE datec < '__DATE__')",
         "DELETE FROM ".MAIN_DB_PREFIX."bank_url WHERE fk_bank IN (SELECT rowid FROM ".MAIN_DB_PREFIX."bank WHERE datec < '__DATE__')",
@@ -103,6 +107,7 @@ $sqls=array(
         "DELETE FROM ".MAIN_DB_PREFIX."commande_fournisseur where date_creation < '__DATE__'",
     ),
 	'supplier_invoice'=>array(
+		'@supplier_payment',
         "DELETE FROM ".MAIN_DB_PREFIX."facture_fourn_det WHERE fk_facture_fourn IN (select rowid FROM ".MAIN_DB_PREFIX."facture_fourn where datec < '__DATE__')",
         "DELETE FROM ".MAIN_DB_PREFIX."facture_fourn where datec < '__DATE__'",
     ),

dev/setup/codesniffer/ruleset.xml

@@ -6,6 +6,7 @@
 	<exclude-pattern type="relative">build/html</exclude-pattern>
 	<exclude-pattern type="relative">build/aps</exclude-pattern>
 	<exclude-pattern type="relative">dev/namespacemig</exclude-pattern>
+	<exclude-pattern type="relative">dev/initdata/dbf/includes</exclude-pattern>
 	<exclude-pattern type="relative">documents</exclude-pattern>
 	<exclude-pattern type="relative">htdocs/core/class/lessc.class.php</exclude-pattern>
 	<exclude-pattern type="relative">htdocs/custom</exclude-pattern>

dev/translation/txpull.sh

@@ -16,7 +16,9 @@ then
 	echo "This pull remote transifex files to local dir."
 	echo "Note:  If you pull a language file (not source), file will be skipped if local file is newer."
 	echo "       Using -f will overwrite local file (does not work with 'all')."
-	echo "Usage: ./dev/translation/txpull.sh (all|xx_XX) [-r dolibarr.file] [-f] [-s]"
+	echo "       Using -s will force fetching of source file (avoid it, use en_US as language instead)."
+	echo "       Using en_US as language parameter will update source language from transifex (en_US is excluded from 'all')."
+	echo "Usage: ./dev/translation/txpull.sh (all|en_US|xx_XX) [-r dolibarr.file] [-f] [-s]"
 	exit
 fi
 

htdocs/accountancy/admin/account.php

@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2013-2016 Olivier Geffroy      <jeff@jeffinfo.com>
- * Copyright (C) 2013-2017 Alexandre Spangaro   <aspangaro@open-dsi.fr>
+ * Copyright (C) 2013-2020 Alexandre Spangaro   <aspangaro@open-dsi.fr>
  * Copyright (C) 2016-2018 Laurent Destailleur  <eldy@users.sourceforge.net>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -41,6 +41,7 @@ $contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'acc
 
 $search_account = GETPOST('search_account', 'alpha');
 $search_label = GETPOST('search_label', 'alpha');
+$search_labelshort = GETPOST('search_labelshort', 'alpha');
 $search_accountparent = GETPOST('search_accountparent', 'alpha');
 $search_pcgtype = GETPOST('search_pcgtype', 'alpha');
 $search_pcgsubtype = GETPOST('search_pcgsubtype', 'alpha');
@@ -64,6 +65,7 @@ if (!$sortorder) $sortorder = "ASC";
 $arrayfields = array(
     'aa.account_number'=>array('label'=>$langs->trans("AccountNumber"), 'checked'=>1),
     'aa.label'=>array('label'=>$langs->trans("Label"), 'checked'=>1),
+	'aa.labelshort'=>array('label'=>$langs->trans("LabelToShow"), 'checked'=>1),
 	'aa.account_parent'=>array('label'=>$langs->trans("Accountparent"), 'checked'=>1),
     'aa.pcg_type'=>array('label'=>$langs->trans("Pcgtype"), 'checked'=>1, 'help'=>'PcgtypeDesc'),
     'aa.pcg_subtype'=>array('label'=>$langs->trans("Pcgsubtype"), 'checked'=>0, 'help'=>'PcgtypeDesc'),
@@ -95,7 +97,8 @@ if (empty($reshook))
     {
     	$search_account = "";
     	$search_label = "";
-    	$search_accountparent = "";
+		$search_labelshort = "";
+		$search_accountparent = "";
     	$search_pcgtype = "";
     	$search_pcgsubtype = "";
 		$search_array_options = array();
@@ -190,7 +193,7 @@ if ($action == 'delete') {
 
 $pcgver = $conf->global->CHARTOFACCOUNTS;
 
-$sql = "SELECT aa.rowid, aa.fk_pcg_version, aa.pcg_type, aa.pcg_subtype, aa.account_number, aa.account_parent , aa.label, aa.active, ";
+$sql = "SELECT aa.rowid, aa.fk_pcg_version, aa.pcg_type, aa.pcg_subtype, aa.account_number, aa.account_parent , aa.label, aa.labelshort, aa.active, ";
 $sql .= " a2.rowid as rowid2, a2.label as label2, a2.account_number as account_number2";
 $sql .= " FROM ".MAIN_DB_PREFIX."accounting_account as aa";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_system as asy ON aa.fk_pcg_version = asy.pcg_version AND aa.entity = ".$conf->entity;
@@ -200,6 +203,7 @@ $sql .= " WHERE asy.rowid = ".$pcgver;
 //print $sql;
 if (strlen(trim($search_account)))			$sql .= natural_search("aa.account_number", $search_account);
 if (strlen(trim($search_label)))			$sql .= natural_search("aa.label", $search_label);
+if (strlen(trim($search_labelshort)))       $sql .= natural_search("aa.labelshort", $search_labelshort);
 if (strlen(trim($search_accountparent)))	$sql .= natural_search("aa.account_parent", $search_accountparent);
 if (strlen(trim($search_pcgtype)))			$sql .= natural_search("aa.pcg_type", $search_pcgtype);
 if (strlen(trim($search_pcgsubtype)))		$sql .= natural_search("aa.pcg_subtype", $search_pcgsubtype);
@@ -232,6 +236,7 @@ if ($resql)
 	if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.$limit;
 	if ($search_account) $param .= '&search_account='.urlencode($search_account);
 	if ($search_label) $param .= '&search_label='.urlencode($search_label);
+	if ($search_labelshort) $param.= '&search_labelshort='.urlencode($search_labelshort);
 	if ($search_accountparent) $param .= '&search_accountparent='.urlencode($search_accountparent);
 	if ($search_pcgtype) $param .= '&search_pcgtype='.urlencode($search_pcgtype);
 	if ($search_pcgsubtype) $param .= '&search_pcgsubtype='.urlencode($search_pcgsubtype);
@@ -316,8 +321,9 @@ if ($resql)
 	print '<tr class="liste_titre_filter">';
 	if (!empty($arrayfields['aa.account_number']['checked']))	print '<td class="liste_titre"><input type="text" class="flat" size="10" name="search_account" value="'.$search_account.'"></td>';
 	if (!empty($arrayfields['aa.label']['checked']))			print '<td class="liste_titre"><input type="text" class="flat" size="20" name="search_label" value="'.$search_label.'"></td>';
+	if (!empty($arrayfields['aa.labelshort']['checked']))		print '<td class="liste_titre"><input type="text" class="flat" size="20" name="search_labelshort" value="' . $search_labelshort . '"></td>';
 	if (!empty($arrayfields['aa.account_parent']['checked']))	print '<td class="liste_titre"><input type="text" class="flat" size="10" name="search_accountparent" value="'.$search_accountparent.'"></td>';
-	if (!empty($arrayfields['aa.pcg_type']['checked']))		print '<td class="liste_titre"><input type="text" class="flat" size="6" name="search_pcgtype" value="'.$search_pcgtype.'"></td>';
+	if (!empty($arrayfields['aa.pcg_type']['checked']))			print '<td class="liste_titre"><input type="text" class="flat" size="6" name="search_pcgtype" value="'.$search_pcgtype.'"></td>';
 	if (!empty($arrayfields['aa.pcg_subtype']['checked']))		print '<td class="liste_titre"><input type="text" class="flat" size="6" name="search_pcgsubtype" value="'.$search_pcgsubtype.'"></td>';
 	if (!empty($arrayfields['aa.active']['checked']))			print '<td class="liste_titre">&nbsp;</td>';
 	print '<td class="liste_titre maxwidthsearch">';
@@ -329,8 +335,9 @@ if ($resql)
     print '<tr class="liste_titre">';
 	if (!empty($arrayfields['aa.account_number']['checked']))	print_liste_field_titre($arrayfields['aa.account_number']['label'], $_SERVER["PHP_SELF"], "aa.account_number", "", $param, '', $sortfield, $sortorder);
 	if (!empty($arrayfields['aa.label']['checked']))			print_liste_field_titre($arrayfields['aa.label']['label'], $_SERVER["PHP_SELF"], "aa.label", "", $param, '', $sortfield, $sortorder);
+	if (!empty($arrayfields['aa.labelshort']['checked']))		print_liste_field_titre($arrayfields['aa.labelshort']['label'], $_SERVER["PHP_SELF"], "aa.labelshort", "", $param, '', $sortfield, $sortorder);
 	if (!empty($arrayfields['aa.account_parent']['checked']))	print_liste_field_titre($arrayfields['aa.account_parent']['label'], $_SERVER["PHP_SELF"], "aa.account_parent", "", $param, '', $sortfield, $sortorder, 'left ');
-	if (!empty($arrayfields['aa.pcg_type']['checked']))		print_liste_field_titre($arrayfields['aa.pcg_type']['label'], $_SERVER["PHP_SELF"], 'aa.pcg_type', '', $param, '', $sortfield, $sortorder, '', $arrayfields['aa.pcg_type']['help']);
+	if (!empty($arrayfields['aa.pcg_type']['checked']))			print_liste_field_titre($arrayfields['aa.pcg_type']['label'], $_SERVER["PHP_SELF"], 'aa.pcg_type', '', $param, '', $sortfield, $sortorder, '', $arrayfields['aa.pcg_type']['help']);
 	if (!empty($arrayfields['aa.pcg_subtype']['checked']))		print_liste_field_titre($arrayfields['aa.pcg_subtype']['label'], $_SERVER["PHP_SELF"], 'aa.pcg_subtype', '', $param, '', $sortfield, $sortorder, '', $arrayfields['aa.pcg_subtype']['help']);
 	if (!empty($arrayfields['aa.active']['checked']))			print_liste_field_titre($arrayfields['aa.active']['label'], $_SERVER["PHP_SELF"], 'aa.active', '', $param, '', $sortfield, $sortorder);
 	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
@@ -368,6 +375,15 @@ if ($resql)
 			if (!$i) $totalarray['nbfield']++;
 		}
 
+		// Account label to show (label short)
+		if (! empty($arrayfields['aa.labelshort']['checked']))
+		{
+			print "<td>";
+			print $obj->labelshort;
+			print "</td>\n";
+			if (! $i) $totalarray['nbfield']++;
+		}
+
 		// Account parent
 		if (!empty($arrayfields['aa.account_parent']['checked']))
 		{

htdocs/accountancy/admin/card.php

@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2013-2014  Olivier Geffroy     <jeff@jeffinfo.com>
- * Copyright (C) 2013-2018  Alexandre Spangaro  <aspangaro@open-dsi.fr>
+ * Copyright (C) 2013-2020  Alexandre Spangaro  <aspangaro@open-dsi.fr>
  * Copyright (C) 2014       Florian Henry       <florian.henry@open-concept.pro>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -97,6 +97,7 @@ if ($action == 'add' && $user->rights->accounting->chartofaccount)
 		$object->account_parent = $account_parent;
 		$object->account_category = GETPOST('account_category', 'alpha');
 		$object->label = GETPOST('label', 'alpha');
+		$object->labelshort = GETPOST('labelshort', 'alpha');
 		$object->active = 1;
 
 		$res = $object->create($user);
@@ -162,6 +163,7 @@ if ($action == 'add' && $user->rights->accounting->chartofaccount)
 		$object->account_parent = $account_parent;
 		$object->account_category = GETPOST('account_category', 'alpha');
 		$object->label = GETPOST('label', 'alpha');
+		$object->labelshort = GETPOST('labelshort', 'alpha');
 
 		$result = $object->update($user);
 
@@ -236,6 +238,10 @@ if ($action == 'create') {
 	print '<tr><td><span class="fieldrequired">'.$langs->trans("Label").'</span></td>';
 	print '<td><input name="label" size="70" value="'.$object->label.'"></td></tr>';
 
+	// Label short
+	print '<tr><td>' . $langs->trans("LabelToShow") . '</td>';
+	print '<td><input name="labelshort" size="70" value="' . $object->labelshort . '"></td></tr>';
+
 	// Account parent
 	print '<tr><td>'.$langs->trans("Accountparent").'</td>';
 	print '<td>';
@@ -254,7 +260,7 @@ if ($action == 'create') {
 	print '<input type="text" name="pcg_type" value="'.dol_escape_htmltag(isset($_POST['pcg_type']) ?GETPOST('pcg_type', 'alpha') : $object->pcg_type).'">';
 	print '</td></tr>';
 
-	// Chart of acounts subtype
+	// Chart of accounts subtype
 	print '<tr><td>'.$langs->trans("Pcgsubtype").'</td>';
 	print '<td>';
 	print '<input type="text" name="pcg_subtype" value="'.dol_escape_htmltag(isset($_POST['pcg_subtype']) ?GETPOST('pcg_subtype', 'alpha') : $object->pcg_subtype).'">';
@@ -301,6 +307,10 @@ elseif ($id > 0 || $ref) {
 			print '<tr><td><span class="fieldrequired">'.$langs->trans("Label").'</span></td>';
 			print '<td><input name="label" size="70" value="'.$object->label.'"</td></tr>';
 
+			// Label short
+			print '<tr><td>' . $langs->trans("LabelToShow") . '</td>';
+			print '<td><input name="labelshort" size="70" value="' . $object->labelshort . '"</td></tr>';
+
 			// Account parent
 			print '<tr><td>'.$langs->trans("Accountparent").'</td>';
 			print '<td>';
@@ -354,6 +364,10 @@ elseif ($id > 0 || $ref) {
 			print '<tr><td class="titlefield">'.$langs->trans("Label").'</td>';
 			print '<td colspan="2">'.$object->label.'</td></tr>';
 
+			// Label to show
+			print '<tr><td class="titlefield">' . $langs->trans("LabelToShow") . '</td>';
+			print '<td colspan="2">' . $object->labelshort . '</td></tr>';
+
 			// Account parent
 			$accp = new AccountingAccount($db);
 			if (!empty($object->account_parent)) {

htdocs/accountancy/class/accountancyexport.class.php

@@ -704,9 +704,9 @@ class AccountancyExport
 		print $end_line;
 
 		foreach ($objectLines as $line) {
-			$date_creation = dol_print_date($line->date_creation, '%d%m%Y');
-			$date_doc = dol_print_date($line->doc_date, '%d%m%Y');
-			$date_valid = dol_print_date($line->date_validated, '%d%m%Y');
+			$date_creation = dol_print_date($line->date_creation, '%Y%m%d');
+			$date_doc = dol_print_date($line->doc_date, '%Y%m%d');
+			$date_valid = dol_print_date($line->date_validated, '%Y%m%d');
 
 			// FEC:JournalCode
 			print $line->code_journal.$separator;

htdocs/accountancy/class/accountingaccount.class.php

@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2013-2014  Olivier Geffroy      <jeff@jeffinfo.com>
- * Copyright (C) 2013-2016  Alexandre Spangaro   <aspangaro@open-dsi.fr>
+ * Copyright (C) 2013-2020  Alexandre Spangaro   <aspangaro@open-dsi.fr>
  * Copyright (C) 2013-2014  Florian Henry        <florian.henry@open-concept.pro>
  * Copyright (C) 2014       Juanjo Menent        <jmenent@2byte.es>
  * Copyright (C) 2015       Ari Elbaz (elarifr)  <github@accedinfo.com>
@@ -120,7 +120,12 @@ class AccountingAccount extends CommonObject
      */
     public $label;
 
-    /**
+	/**
+	 * @var string Label short of account
+	 */
+	public $labelshort;
+
+	/**
      * @var int ID
      */
     public $fk_user_author;
@@ -162,7 +167,7 @@ class AccountingAccount extends CommonObject
 		global $conf;
 
 		if ($rowid || $account_number) {
-			$sql  = "SELECT a.rowid as rowid, a.datec, a.tms, a.fk_pcg_version, a.pcg_type, a.pcg_subtype, a.account_number, a.account_parent, a.label, a.fk_accounting_category, a.fk_user_author, a.fk_user_modif, a.active";
+			$sql  = "SELECT a.rowid as rowid, a.datec, a.tms, a.fk_pcg_version, a.pcg_type, a.pcg_subtype, a.account_number, a.account_parent, a.label, a.labelshort, a.fk_accounting_category, a.fk_user_author, a.fk_user_modif, a.active";
 			$sql .= ", ca.label as category_label";
 			$sql .= " FROM " . MAIN_DB_PREFIX . "accounting_account as a";
 			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_accounting_category as ca ON a.fk_accounting_category = ca.rowid";
@@ -196,6 +201,7 @@ class AccountingAccount extends CommonObject
 					$this->account_number = $obj->account_number;
 					$this->account_parent = $obj->account_parent;
 					$this->label = $obj->label;
+					$this->labelshort = $obj->labelshort;
 					$this->account_category = $obj->fk_accounting_category;
 					$this->account_category_label = $obj->category_label;
 					$this->fk_user_author = $obj->fk_user_author;
@@ -239,6 +245,8 @@ class AccountingAccount extends CommonObject
 			$this->account_number = trim($this->account_number);
 		if (isset($this->label))
 			$this->label = trim($this->label);
+		if (isset($this->labelshort))
+			$this->labelshort = trim($this->labelshort);
 
 		if (empty($this->pcg_type) || $this->pcg_type == '-1')
 		{
@@ -261,6 +269,7 @@ class AccountingAccount extends CommonObject
 		$sql .= ", account_number";
 		$sql .= ", account_parent";
 		$sql .= ", label";
+		$sql .= ", labelshort";
 		$sql .= ", fk_accounting_category";
 		$sql .= ", fk_user_author";
 		$sql .= ", active";
@@ -273,6 +282,7 @@ class AccountingAccount extends CommonObject
 		$sql .= ", " . (empty($this->account_number) ? 'NULL' : "'" . $this->db->escape($this->account_number) . "'");
 		$sql .= ", " . (empty($this->account_parent) ? 0 : (int) $this->account_parent);
 		$sql .= ", " . (empty($this->label) ? "''" : "'" . $this->db->escape($this->label) . "'");
+		$sql .= ", " . (empty($this->labelshort) ? "''" : "'" . $this->db->escape($this->labelshort) . "'");
 		$sql .= ", " . (empty($this->account_category) ? 0 : (int) $this->account_category);
 		$sql .= ", " . $user->id;
 		$sql .= ", " . (int) $this->active;
@@ -344,6 +354,7 @@ class AccountingAccount extends CommonObject
 		$sql .= " , account_number = '" . $this->db->escape($this->account_number) . "'";
 		$sql .= " , account_parent = " . (int) $this->account_parent;
 		$sql .= " , label = " . ($this->label ? "'" . $this->db->escape($this->label) . "'" : "''");
+		$sql .= " , labelshort = " . ($this->labelshort ? "'" . $this->db->escape($this->labelshort) . "'" : "''");
 		$sql .= " , fk_accounting_category = " . (empty($this->account_category) ? 0 : (int) $this->account_category);
 		$sql .= " , fk_user_modif = " . $user->id;
 		$sql .= " , active = " . (int) $this->active;
@@ -461,10 +472,11 @@ class AccountingAccount extends CommonObject
 	 * @param	string  $moretitle					Add more text to title tooltip
 	 * @param	int  	$notooltip					1=Disable tooltip
      * @param	int     $save_lastsearch_value		-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
+	 * @param	int     $withcompletelabel		    0=Short label (field short label), 1=Complete label (field label)
 	 * @return  string	String with URL
 	 */
-    public function getNomUrl($withpicto = 0, $withlabel = 0, $nourl = 0, $moretitle = '', $notooltip = 0, $save_lastsearch_value = -1)
-    {
+    public function getNomUrl($withpicto = 0, $withlabel = 0, $nourl = 0, $moretitle = '', $notooltip = 0, $save_lastsearch_value = -1, $withcompletelabel = 0)
+	{
 		global $langs, $conf, $user;
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
 
@@ -482,11 +494,18 @@ class AccountingAccount extends CommonObject
 		$picto = 'billr';
 		$label='';
 
+		if (empty($this->labelshort) || $withcompletelabel == 1)
+		{
+			$labeltoshow = $this->label;
+		} else {
+			$labeltoshow = $this->labelshort;
+		}
+
 		$label = '<u>' . $langs->trans("ShowAccountingAccount") . '</u>';
 		if (! empty($this->account_number))
 			$label .= '<br><b>'.$langs->trans('AccountAccounting') . ':</b> ' . length_accountg($this->account_number);
-		if (! empty($this->label))
-			$label .= '<br><b>'.$langs->trans('Label') . ':</b> ' . $this->label;
+		if (! empty($labeltoshow))
+			$label .= '<br><b>'.$langs->trans('Label') . ':</b> ' . $labeltoshow;
 		if ($moretitle) $label.=' - '.$moretitle;
 
 		$linkclose='';
@@ -513,7 +532,7 @@ class AccountingAccount extends CommonObject
 		}
 
 		$label_link = length_accountg($this->account_number);
-		if ($withlabel) $label_link .= ' - ' . $this->label;
+		if ($withlabel) $label_link .= ' - ' . $labeltoshow;
 
 		if ($withpicto) $result.=($linkstart.img_object(($notooltip?'':$label), $picto, ($notooltip?'':'class="classfortooltip"'), 0, 0, $notooltip?0:1).$linkend);
 		if ($withpicto && $withpicto != 2) $result .= ' ';

htdocs/accountancy/journal/bankjournal.php

@@ -1155,9 +1155,9 @@ if (empty($action) || $action == 'view') {
 					}
 					else print $accounttoshow;
 					print "</td>";
+
 					// Subledger account
 					print "<td>";
-
 					if (in_array($tabtype[$key], array('payment', 'payment_supplier', 'payment_expensereport', 'payment_salary', 'payment_various')))	// Type of payment with subledger
 					{
 						$accounttoshowsubledger = length_accounta($k);
@@ -1171,7 +1171,12 @@ if (empty($action) || $action == 'view') {
 								//print '<span class="error">'.$langs->trans("ThirdpartyAccountNotDefined").'</span>';
 								if (! empty($tabcompany[$key]['code_compta']))
 								{
-									print '<span class="warning">'.$langs->trans("ThirdpartyAccountNotDefinedOrThirdPartyUnknown", $tabcompany[$key]['code_compta']).'</span>';
+									if (in_array($tabtype[$key], array('payment_various'))) {
+										// For such case, if subledger is not defined, we won't use subledger accounts.
+										print '<span class="warning">'.$langs->trans("ThirdpartyAccountNotDefinedOrThirdPartyUnknownSubledgerIgnored").'</span>';
+									} else {
+										print '<span class="warning">'.$langs->trans("ThirdpartyAccountNotDefinedOrThirdPartyUnknown", $tabcompany[$key]['code_compta']).'</span>';
+									}
 								}
 								else
 								{

htdocs/adherents/card.php

@@ -1747,7 +1747,7 @@ else
 		{
 			print '<tr><td>'.$langs->trans("Categories").'</td>';
 			print '<td colspan="2">';
-			print $form->showCategories($object->id, 'member', 1);
+			print $form->showCategories($object->id, Categorie::TYPE_MEMBER, 1);
 			print '</td></tr>';
 		}
 

htdocs/adherents/subscription.php

@@ -531,7 +531,7 @@ if ($rowid > 0)
 	{
 		print '<tr><td>'.$langs->trans("Categories").'</td>';
 		print '<td colspan="2">';
-		print $form->showCategories($object->id, 'member', 1);
+		print $form->showCategories($object->id, Categorie::TYPE_MEMBER, 1);
 		print '</td></tr>';
 	}
 

htdocs/adherents/type.php

@@ -65,7 +65,7 @@ $subscription = GETPOST("subscription", "int");
 $duration_value = GETPOST('duration_value', 'int');
 $duration_unit = GETPOST('duration_unit', 'alpha');
 $vote = GETPOST("vote", "int");
-$comment = GETPOST("comment", 'alphanohtml');
+$comment = GETPOST("comment", 'none');
 $mail_valid = GETPOST("mail_valid", 'none');
 
 // Security check
@@ -363,7 +363,9 @@ if ($action == 'create')
 	print '</td></tr>';
 
 	print '<tr><td class="tdtop">'.$langs->trans("Description").'</td><td>';
-	print '<textarea name="comment" wrap="soft" class="centpercent" rows="3"></textarea></td></tr>';
+	require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+	$doleditor = new DolEditor('comment', $object->note, '', 280, 'dolibarr_notes', '', false, true, $conf->fckeditor->enabled, 15, '90%');
+	$doleditor->Create();
 
 	print '<tr><td class="tdtop">'.$langs->trans("WelcomeEMail").'</td><td>';
 	require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
@@ -806,10 +808,12 @@ if ($rowid > 0)
 		print '</td></tr>';
 
 		print '<tr><td class="tdtop">'.$langs->trans("Description").'</td><td>';
-		print '<textarea name="comment" wrap="soft" class="centpercent" rows="3">'.$object->note.'</textarea></td></tr>';
+		require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+		$doleditor = new DolEditor('comment', $object->note, '', 280, 'dolibarr_notes', '', false, true, $conf->fckeditor->enabled, 15, '90%');
+		$doleditor->Create();
+		print "</td></tr>";
 
 		print '<tr><td class="tdtop">'.$langs->trans("WelcomeEMail").'</td><td>';
-		require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 		$doleditor = new DolEditor('mail_valid', $object->mail_valid, '', 280, 'dolibarr_notes', '', false, true, $conf->fckeditor->enabled, 15, '90%');
 		$doleditor->Create();
 		print "</td></tr>";

htdocs/admin/company.php

@@ -181,6 +181,13 @@ if (($action == 'update' && !GETPOST("cancel", 'alpha'))
 		}
 	}
 
+	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_FACEBOOK_URL", GETPOST("facebookurl", 'alpha'), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_TWITTER_URL", GETPOST("twitterurl", 'alpha'), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_LINKEDIN_URL", GETPOST("linkedinurl", 'alpha'), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_INSTAGRAM_URL", GETPOST("instagramurl", 'alpha'), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_YOUTUBE_URL", GETPOST("youtubeurl", 'alpha'), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_GITHUB_URL", GETPOST("githuburl", 'alpha'), 'chaine', 0, '', $conf->entity);
+
 	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_MANAGERS", GETPOST("MAIN_INFO_SOCIETE_MANAGERS", 'nohtml'), 'chaine', 0, '', $conf->entity);
 	dolibarr_set_const($db, "MAIN_INFO_GDPR", GETPOST("MAIN_INFO_GDPR", 'nohtml'), 'chaine', 0, '', $conf->entity);
 	dolibarr_set_const($db, "MAIN_INFO_CAPITAL", GETPOST("capital", 'nohtml'), 'chaine', 0, '', $conf->entity);
@@ -407,32 +414,26 @@ print '<table class="noborder centpercent">';
 print '<tr class="liste_titre"><th class="titlefield wordbreak">'.$langs->trans("CompanyInfo").'</th><th>'.$langs->trans("Value").'</th></tr>'."\n";
 
 // Name
-
 print '<tr class="oddeven"><td class="fieldrequired"><label for="name">'.$langs->trans("CompanyName").'</label></td><td>';
 print '<input name="nom" id="name" class="minwidth200" value="'. dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_NOM?$conf->global->MAIN_INFO_SOCIETE_NOM: GETPOST("nom", 'nohtml')) . '"'.(empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '' : ' autofocus="autofocus"').'></td></tr>'."\n";
 
-// Addresse
-
+// Address
 print '<tr class="oddeven"><td><label for="MAIN_INFO_SOCIETE_ADDRESS">'.$langs->trans("CompanyAddress").'</label></td><td>';
 print '<textarea name="MAIN_INFO_SOCIETE_ADDRESS" id="MAIN_INFO_SOCIETE_ADDRESS" class="quatrevingtpercent" rows="'.ROWS_3.'">'. ($conf->global->MAIN_INFO_SOCIETE_ADDRESS?$conf->global->MAIN_INFO_SOCIETE_ADDRESS:GETPOST("MAIN_INFO_SOCIETE_ADDRESS", 'nohtml')) . '</textarea></td></tr>'."\n";
 
-
 print '<tr class="oddeven"><td><label for="MAIN_INFO_SOCIETE_ZIP">'.$langs->trans("CompanyZip").'</label></td><td>';
 print '<input class="minwidth100" name="MAIN_INFO_SOCIETE_ZIP" id="MAIN_INFO_SOCIETE_ZIP" value="'. dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_ZIP?$conf->global->MAIN_INFO_SOCIETE_ZIP:GETPOST("MAIN_INFO_SOCIETE_ZIP", 'alpha')) . '"></td></tr>'."\n";
 
-
 print '<tr class="oddeven"><td><label for="MAIN_INFO_SOCIETE_TOWN">'.$langs->trans("CompanyTown").'</label></td><td>';
 print '<input name="MAIN_INFO_SOCIETE_TOWN" class="minwidth100" id="MAIN_INFO_SOCIETE_TOWN" value="'. dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_TOWN?$conf->global->MAIN_INFO_SOCIETE_TOWN:GETPOST("MAIN_INFO_SOCIETE_TOWN", 'nohtml')) . '"></td></tr>'."\n";
 
 // Country
-
 print '<tr class="oddeven"><td class="fieldrequired"><label for="selectcountry_id">'.$langs->trans("Country").'</label></td><td class="maxwidthonsmartphone">';
 //if (empty($country_selected)) $country_selected=substr($langs->defaultlang,-2);    // By default, country of localization
 print $form->select_country($mysoc->country_id, 'country_id');
 if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
 print '</td></tr>'."\n";
 
-
 print '<tr class="oddeven"><td><label for="state_id">'.$langs->trans("State").'</label></td><td class="maxwidthonsmartphone">';
 $state_id = 0;
 if (!empty($conf->global->MAIN_INFO_SOCIETE_STATE))
@@ -443,22 +444,22 @@ if (!empty($conf->global->MAIN_INFO_SOCIETE_STATE))
 $formcompany->select_departement($state_id, $mysoc->country_code, 'state_id');
 print '</td></tr>'."\n";
 
-
+// Currency
 print '<tr class="oddeven"><td><label for="currency">'.$langs->trans("CompanyCurrency").'</label></td><td>';
 print $form->selectCurrency($conf->currency, "currency");
 print '</td></tr>'."\n";
 
-
+// Phone
 print '<tr class="oddeven"><td><label for="phone">'.$langs->trans("Phone").'</label></td><td>';
 print '<input name="tel" id="phone" value="'.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_TEL).'"></td></tr>';
 print '</td></tr>'."\n";
 
-
+// Fax
 print '<tr class="oddeven"><td><label for="fax">'.$langs->trans("Fax").'</label></td><td>';
 print '<input name="fax" id="fax" value="'.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_FAX).'"></td></tr>';
 print '</td></tr>'."\n";
 
-
+// Email
 print '<tr class="oddeven"><td><label for="email">'.$langs->trans("EMail").'</label></td><td>';
 print '<input name="mail" id="email" class="minwidth200" value="'.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_MAIL).'"></td></tr>';
 print '</td></tr>'."\n";
@@ -516,6 +517,45 @@ print '</td></tr>';
 
 print '</table>';
 
+// Social networks
+print '<br>';
+print '<table class="noborder centpercent">';
+print '<tr class="liste_titre">';
+print '<td class="titlefield">'.$langs->trans("SocialNetworksInformation").'</td><td>'.$langs->trans("Value").'</td>';
+print "</tr>\n";
+
+// Facebook
+print '<tr class="oddeven"><td><label for="facebookurl">'.$langs->trans("SocialNetworksFacebookURL").'</label></td><td>';
+print '<input name="facebookurl" id="facebookurl" class="minwidth300" value="'.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_FACEBOOK_URL).'"></td></tr>';
+print '</td></tr>'."\n";
+
+// Twitter
+print '<tr class="oddeven"><td><label for="twitterurl">'.$langs->trans("SocialNetworksTwitterURL").'</label></td><td>';
+print '<input name="twitterurl" id="twitterurl" class="minwidth300" value="'.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_TWITTER_URL).'"></td></tr>';
+print '</td></tr>'."\n";
+
+// LinkedIn
+print '<tr class="oddeven"><td><label for="linkedinurl">'.$langs->trans("SocialNetworksLinkedinURL").'</label></td><td>';
+print '<input name="linkedinurl" id="linkedinurl" class="minwidth300" value="'.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_LINKEDIN_URL).'"></td></tr>';
+print '</td></tr>'."\n";
+
+// Instagram
+print '<tr class="oddeven"><td><label for="instagramurl">'.$langs->trans("SocialNetworksInstagramURL").'</label></td><td>';
+print '<input name="instagramurl" id="instagramurl" class="minwidth300" value="'.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_INSTAGRAM_URL).'"></td></tr>';
+print '</td></tr>'."\n";
+
+// Youtube
+print '<tr class="oddeven"><td><label for="youtubeurl">'.$langs->trans("SocialNetworksYoutubeURL").'</label></td><td>';
+print '<input name="youtubeurl" id="youtubeurl" class="minwidth300" value="'.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_YOUTUBE_URL).'"></td></tr>';
+print '</td></tr>'."\n";
+
+// Github
+print '<tr class="oddeven"><td><label for="githuburl">'.$langs->trans("SocialNetworksGithubURL").'</label></td><td>';
+print '<input name="githuburl" id="githuburl" class="minwidth300" value="'.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_GITHUB_URL).'"></td></tr>';
+print '</td></tr>'."\n";
+
+print "</table>";
+
 print '<br>';
 
 // IDs of the company (country-specific)
@@ -525,24 +565,20 @@ print '<tr class="liste_titre"><td class="titlefield">'.$langs->trans("CompanyId
 $langs->load("companies");
 
 // Managing Director(s)
-
 print '<tr class="oddeven"><td><label for="director">'.$langs->trans("ManagingDirectors").'</label></td><td>';
 print '<input name="MAIN_INFO_SOCIETE_MANAGERS" id="director" class="minwidth200" value="'.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_MANAGERS).'"></td></tr>';
 
 // GDPR contact
-
 print '<tr class="oddeven"><td>';
 print $form->textwithpicto($langs->trans("GDPRContact"), $langs->trans("GDPRContactDesc"));
 print '</td><td>';
 print '<input name="MAIN_INFO_GDPR" id="director" class="minwidth500" value="'.dol_escape_htmltag($conf->global->MAIN_INFO_GDPR).'"></td></tr>';
 
 // Capital
-
 print '<tr class="oddeven"><td><label for="capital">'.$langs->trans("Capital").'</label></td><td>';
 print '<input name="capital" id="capital" class="minwidth100" value="'.dol_escape_htmltag($conf->global->MAIN_INFO_CAPITAL).'"></td></tr>';
 
 // Juridical Status
-
 print '<tr class="oddeven"><td><label for="forme_juridique_code">'.$langs->trans("JuridicalStatus").'</label></td><td>';
 if ($mysoc->country_code) {
 	print $formcompany->select_juridicalstatus($conf->global->MAIN_INFO_SOCIETE_FORME_JURIDIQUE, $mysoc->country_code, '', 'forme_juridique_code');
@@ -551,7 +587,7 @@ if ($mysoc->country_code) {
 }
 print '</td></tr>';
 
-// ProfID1
+// ProfId1
 if ($langs->transcountry("ProfId1", $mysoc->country_code) != '-')
 {
 	print '<tr class="oddeven"><td><label for="profid1">'.$langs->transcountry("ProfId1", $mysoc->country_code).'</label></td><td>';
@@ -641,14 +677,12 @@ if ($langs->transcountry("ProfId6", $mysoc->country_code) != '-')
 	print '</td></tr>';
 }
 
-// TVA Intra
-
+// Intra-community VAT number
 print '<tr class="oddeven"><td><label for="intra_vat">'.$langs->trans("VATIntra").'</label></td><td>';
 print '<input name="tva" id="intra_vat" class="minwidth200" value="'.dol_escape_htmltag(!empty($conf->global->MAIN_INFO_TVAINTRA) ? $conf->global->MAIN_INFO_TVAINTRA : '').'">';
 print '</td></tr>';
 
 // Object of the company
-
 print '<tr class="oddeven"><td><label for="object">'.$langs->trans("CompanyObject").'</label></td><td>';
 print '<textarea class="flat quatrevingtpercent" name="object" id="object" rows="'.ROWS_5.'">'.(!empty($conf->global->MAIN_INFO_SOCIETE_OBJECT) ? $conf->global->MAIN_INFO_SOCIETE_OBJECT : '').'</textarea></td></tr>';
 print '</td></tr>';

htdocs/admin/emailcollector_card.php

@@ -595,13 +595,17 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 		print '<tr class="drag drop oddeven" id="row-'.$ruleaction['id'].'">';
 		print '<td>';
+		print '<!-- type of action: '.$ruleaction['type'].' -->';
 		print $langs->trans($arrayoftypes[$ruleaction['type']]);
 		if (in_array($ruleaction['type'], array('recordevent')))
 		{
             print $form->textwithpicto('', $langs->transnoentitiesnoconv('IfTrackingIDFoundEventWillBeLinked'));
 		}
+		elseif (in_array($ruleaction['type'], array('loadthirdparty', 'loadandcreatethirdparty'))) {
+			print $form->textwithpicto('', $langs->transnoentitiesnoconv('EmailCollectorLoadThirdPartyHelp'));
+		}
 		print '</td>';
-		print '<td>';
+		print '<td class="wordbreak">';
 		if ($action == 'editoperation' && $ruleaction['id'] == $operationid)
 		{
 		    print '<input type="text" class="quatrevingtquinzepercent" name="operationparam2" value="'.$ruleaction['actionparam'].'"><br>';

htdocs/admin/system/filecheck.php

@@ -75,7 +75,7 @@ print '<br>';
 $file_list = array('missing' => array(), 'updated' => array());
 
 // Local file to compare to
-$xmlshortfile = GETPOST('xmlshortfile', 'alpha') ?GETPOST('xmlshortfile', 'alpha') : '/install/filelist-'.DOL_VERSION.(empty($conf->global->MAIN_FILECHECK_LOCAL_SUFFIX) ? '' : $conf->global->MAIN_FILECHECK_LOCAL_SUFFIX).'.xml';
+$xmlshortfile = GETPOST('xmlshortfile', 'alpha') ?GETPOST('xmlshortfile', 'alpha') : '/install/filelist-'.DOL_VERSION.(empty($conf->global->MAIN_FILECHECK_LOCAL_SUFFIX) ? '' : $conf->global->MAIN_FILECHECK_LOCAL_SUFFIX).'.xml'.(empty($conf->global->MAIN_FILECHECK_LOCAL_EXT) ? '' : $conf->global->MAIN_FILECHECK_LOCAL_EXT);
 $xmlfile = DOL_DOCUMENT_ROOT.$xmlshortfile;
 // Remote file to compare to
 $xmlremote = GETPOST('xmlremote');
@@ -127,6 +127,18 @@ if (GETPOST('target') == 'local')
 {
     if (dol_is_file($xmlfile))
     {
+    	// If file is a zip file (.../filelist-x.y.z.xml.zip), we uncompress it before
+    	if (preg_match('/\.zip$/i', $xmlfile)) {
+    		dol_mkdir($conf->admin->dir_temp);
+    		$xmlfilenew = preg_replace('/\.zip$/i', '', $xmlfile);
+    		$result = dol_uncompress($xmlfile, $conf->admin->dir_temp);
+    		if (empty($result['error'])) {
+    			$xmlfile = $conf->admin->dir_temp.'/'.basename($xmlfilenew);
+    		} else {
+    			print $langs->trans('FailedToUncompressFile').': '.$xmlfile;
+    			$error++;
+    		}
+    	}
         $xml = simplexml_load_file($xmlfile);
     }
     else

htdocs/admin/system/phpinfo.php

@@ -28,6 +28,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
 $langs->load("admin");
+$langs->load("install");
+$langs->load("errors");
 
 if (! $user->admin)
 	accessforbidden();
@@ -66,21 +68,112 @@ if ($maxphp > 0 && $maxphp2 > 0 && $maxphp > $maxphp2)
 	print '<br>';
 }
 
-
 print '<table class="noborder centpercent">';
 print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
 print "\n";
 
+$ErrorPicturePath = "../../theme/eldy/img/error.png";
+$WarningPicturePath = "../../theme/eldy/img/warning.png";
+$OkayPicturePath = "../../theme/eldy/img/tick.png";
 
-// Get PHP version
-$phpversion=version_php();
-print '<tr class="oddeven"><td  width="220px">'.$langs->trans("Version")."</td><td>".$phpversion."</td></tr>\n";
+print '<tr><td width="220">'.$langs->trans("Version").'</td><td>';
 
+$arrayphpminversionerror = array(5,5,0);
+$arrayphpminversionwarning = array(5,5,0);
+if (versioncompare(versionphparray(), $arrayphpminversionerror) < 0)
+{
+    print '<img src="'.$ErrorPicturePath.'" alt="Error"> '.$langs->trans("ErrorPHPVersionTooLow", versiontostring($arrayphpminversionerror));
+}
+elseif (versioncompare(versionphparray(), $arrayphpminversionwarning) < 0)
+{
+    print '<img src="'.$WarningPicturePath.'" alt="Warning"> '.$langs->trans("ErrorPHPVersionTooLow", versiontostring($arrayphpminversionwarning));
+}
+else
+{
+    print '<img src="'.$OkayPicturePath.'" alt="Ok"> '.versiontostring(versionphparray());
+}
+
+print '</td></tr>';
+print '<tr><td>GET and POST support</td><td>';
+
+if (! isset($_GET["testget"]) && ! isset($_POST["testpost"]) && ! isset($_GET["mainmenu"]))
+{
+    print '<img src="'.$WarningPicturePath.'" alt="Warning"> '.$langs->trans("PHPSupportPOSTGETKo");
+    print ' (<a href="'.$_SERVER["PHP_SELF"].'?testget=ok">'.$langs->trans("Recheck").'</a>)';
+}
+else
+{
+    print '<img src="'.$OkayPicturePath.'" alt="Ok"> '.$langs->trans("PHPSupportPOSTGETOk");
+}
+
+print '</td></tr>';
+print '<tr><td>Sessions support</td><td>';
+
+if (! function_exists("session_id"))
+{
+    print '<img src="'.$ErrorPicturePath.'" alt="Error"> '.$langs->trans("ErrorPHPDoesNotSupportSessions");
+}
+else
+{
+    print '<img src="'.$OkayPicturePath.'" alt="Ok"> '.$langs->trans("PHPSupportSessions");
+}
+
+print '</td></tr>';
+print '<tr><td>GD support</td><td>';
+
+if (! function_exists("imagecreate"))
+{
+    print '<img src="'.$WarningPicturePath.'" alt="Warning"> '.$langs->trans("ErrorPHPDoesNotSupportGD");
+}
+else
+{
+    print '<img src="'.$OkayPicturePath.'" alt="Ok"> '.$langs->trans("PHPSupportGD");
+}
+
+print '</td></tr>';
+print '<tr><td>Curl support</td><td>';
+
+if (! function_exists("curl_init"))
+{
+    print '<img src="'.$WarningPicturePath.'" alt="Warning"> '.$langs->trans("ErrorPHPDoesNotSupportCurl");
+}
+else
+{
+    print '<img src="'.$OkayPicturePath.'" alt="Ok"> '.$langs->trans("PHPSupportCurl");
+}
+
+print '</td></tr>';
+print '<tr><td>UTF-8 support</td><td>';
+
+if (! function_exists("utf8_encode"))
+{
+    print '<img src="'.$WarningPicturePath.'" alt="Warning"> '.$langs->trans("ErrorPHPDoesNotSupportUTF8");
+}
+else
+{
+    print '<img src="'.$OkayPicturePath.'" alt="Ok"> '.$langs->trans("PHPSupportUTF8");
+}
+
+print '</td></tr>';
+print '<tr><td>Intl support</td><td>';
+
+if (empty($_SERVER["SERVER_ADMIN"]) || $_SERVER["SERVER_ADMIN"] != 'doliwamp@localhost')
+{
+	if (! function_exists("locale_get_primary_language") || ! function_exists("locale_get_region"))
+	{
+        print '<img src="'.$WarningPicturePath.'" alt="Warning"> '.$langs->trans("ErrorPHPDoesNotSupportIntl");
+	}
+	else
+	{
+        print '<img src="'.$OkayPicturePath.'" alt="Ok"> '.$langs->trans("PHPSupportIntl");
+	}
+}
+
+print '</td></tr>';
 print '</table>';
+
 print '<br>';
 
-
-
 // Get php_info array
 $phparray=phpinfo_array();
 foreach($phparray as $key => $value)

htdocs/admin/user.php

@@ -297,10 +297,7 @@ foreach ($dirmodels as $reldir)
 			                    }
 					    		$htmltooltip .= '<br><br><u>'.$langs->trans("FeaturesSupported").':</u>';
 					    		$htmltooltip .= '<br>'.$langs->trans("Logo").': '.yn($module->option_logo, 1, 1);
-					    		$htmltooltip .= '<br>'.$langs->trans("PaymentMode").': '.yn($module->option_modereg, 1, 1);
-					    		$htmltooltip .= '<br>'.$langs->trans("PaymentConditions").': '.yn($module->option_condreg, 1, 1);
 					    		$htmltooltip .= '<br>'.$langs->trans("MultiLanguage").': '.yn($module->option_multilang, 1, 1);
-					    		$htmltooltip .= '<br>'.$langs->trans("WatermarkOnDraftOrders").': '.yn($module->option_draft_watermark, 1, 1);
 
 
 	                            print '<td class="center">';

htdocs/admin/usergroup.php

@@ -34,7 +34,6 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 
 // Load translation files required by the page
 $langs->loadLangs(array("admin", "members", "users"));
-
 if (!$user->admin) accessforbidden();
 
 $extrafields = new ExtraFields($db);
@@ -244,10 +243,7 @@ foreach ($dirmodels as $reldir)
 			                    }
 					    		$htmltooltip .= '<br><br><u>'.$langs->trans("FeaturesSupported").':</u>';
 					    		$htmltooltip .= '<br>'.$langs->trans("Logo").': '.yn($module->option_logo, 1, 1);
-					    		$htmltooltip .= '<br>'.$langs->trans("PaymentMode").': '.yn($module->option_modereg, 1, 1);
-					    		$htmltooltip .= '<br>'.$langs->trans("PaymentConditions").': '.yn($module->option_condreg, 1, 1);
 					    		$htmltooltip .= '<br>'.$langs->trans("MultiLanguage").': '.yn($module->option_multilang, 1, 1);
-					    		$htmltooltip .= '<br>'.$langs->trans("WatermarkOnDraftOrders").': '.yn($module->option_draft_watermark, 1, 1);
 
 
 	                            print '<td class="center">';

htdocs/barcode/codeinit.php

@@ -202,6 +202,7 @@ print '<br>';
 print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
 print '<input type="hidden" name="mode" value="label">';
 print '<input type="hidden" name="action" value="initbarcodeproducts">';
+print '<input type="hidden" name="token" value="'.newToken().'">';
 
 print '<br>';
 

htdocs/bom/bom_card.php

@@ -97,11 +97,13 @@ if (empty($reshook))
     $backurlforlist = DOL_URL_ROOT.'/bom/bom_list.php';
 
     if (empty($backtopage) || ($cancel && empty($id))) {
-    	//var_dump($backurlforlist);exit;
-    	if (empty($id) && (($action != 'add' && $action != 'create') || $cancel)) $backtopage = $backurlforlist;
-    	else $backtopage = DOL_URL_ROOT.'/bom/bom_card.php?id='.($id > 0 ? $id : '__ID__');
+    	if (empty($backtopage) || ($cancel && strpos($backtopage, '__ID__'))) {
+    		if (empty($id) && (($action != 'add' && $action != 'create') || $cancel)) $backtopage = $backurlforlist;
+    		else $backtopage = dol_buildpath('/bom/bom_card.php', 1).'?id='.($id > 0 ? $id : '__ID__');
+    	}
     }
-	$triggermodname = 'BOM_MODIFY'; // Name of trigger action code to execute when we modify record
+
+    $triggermodname = 'BOM_MODIFY'; // Name of trigger action code to execute when we modify record
 
 	// Actions cancel, add, update, delete or clone
 	include DOL_DOCUMENT_ROOT.'/core/actions_addupdatedelete.inc.php';
@@ -169,7 +171,9 @@ if (empty($reshook))
     		}
     		else
     		{
-    		    unset($_POST['qty_frozen']);
+    			unset($_POST['idprod']);
+    			unset($_POST['qty']);
+    			unset($_POST['qty_frozen']);
     		    unset($_POST['disable_stock_change']);
     		}
 		}
@@ -207,7 +211,9 @@ if (empty($reshook))
 		}
 		else
 		{
-		    unset($_POST['qty_frozen']);
+			unset($_POST['idprod']);
+			unset($_POST['qty']);
+			unset($_POST['qty_frozen']);
 		    unset($_POST['disable_stock_change']);
 		}
 	}
@@ -506,7 +512,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	print '<table class="border centpercent tableforfield">'."\n";
 
 	// Common attributes
-	$keyforbreak = 'description';
+	$keyforbreak = 'efficiency';
 	include DOL_DOCUMENT_ROOT.'/core/tpl/commonfields_view.tpl.php';
 
 	// Other attributes
@@ -622,7 +628,8 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	    			}
 	    			else
 	    			{
-	    				print '<a class="butActionRefused" href="" title="'.$langs->trans("AddAtLeastOneLineFirst").'">'.$langs->trans("Validate").'</a>';
+	    				$langs->load("errors");
+	    				print '<a class="butActionRefused" href="" title="'.$langs->trans("ErrorAddAtLeastOneLineFirst").'">'.$langs->trans("Validate").'</a>';
 	    			}
 	    		}
     		}
@@ -644,7 +651,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
     		{
 	    		if ($object->status == $object::STATUS_VALIDATED && !empty($user->rights->mrp->write))
 	    		{
-	    			print '<a class="butAction" href="'.DOL_URL_ROOT.'/mrp/mo_card.php?action=create&fk_bom='.$object->id.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?id='.$object->id).'">'.$langs->trans("CreateMO").'</a>';
+	    			print '<a class="butAction" href="'.DOL_URL_ROOT.'/mrp/mo_card.php?action=create&fk_bom='.$object->id.'&backtopageforcancel='.urlencode($_SERVER["PHP_SELF"].'?id='.$object->id).'">'.$langs->trans("CreateMO").'</a>';
 	    		}
     		}
 

htdocs/bom/bom_list.php

@@ -71,6 +71,7 @@ if (!$sortfield) $sortfield = "t.".key($object->fields); // Set here default sea
 if (!$sortorder) $sortorder = "ASC";
 
 // Security check
+if (empty($conf->bom->enabled)) accessforbidden('Module not enabled');
 $socid = 0;
 if ($user->socid > 0)	// Protection if external user
 {
@@ -106,8 +107,14 @@ if (is_array($extrafields->attributes[$object->table_element]['label']) && count
 {
 	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val)
 	{
-		if (!empty($extrafields->attributes[$object->table_element]['list'][$key]))
-			$arrayfields["ef.".$key] = array('label'=>$extrafields->attributes[$object->table_element]['label'][$key], 'checked'=>(($extrafields->attributes[$object->table_element]['list'][$key] < 0) ? 0 : 1), 'position'=>$extrafields->attributes[$object->table_element]['pos'][$key], 'enabled'=>(abs($extrafields->attributes[$object->table_element]['list'][$key]) != 3 && $extrafields->attributes[$object->table_element]['perms'][$key]));
+		if (!empty($extrafields->attributes[$object->table_element]['list'][$key])) {
+			$arrayfields["ef.".$key] = array(
+				'label'=>$extrafields->attributes[$object->table_element]['label'][$key],
+				'checked'=>(($extrafields->attributes[$object->table_element]['list'][$key]<0)?0:1),
+				'position'=>$extrafields->attributes[$object->table_element]['pos'][$key],
+				'enabled'=>(abs($extrafields->attributes[$object->table_element]['list'][$key])!=3 && $extrafields->attributes[$object->table_element]['perms'][$key])
+			);
+		}
 	}
 }
 $object->fields = dol_sort_array($object->fields, 'position');
@@ -298,8 +305,8 @@ if (!empty($extrafields->attributes[$object->table_element]['label'])) {
 // Add fields from hooks
 $parameters = array();
 $reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters, $object); // Note that $action and $object may have been modified by hook
-$sql .= $hookmanager->resPrint;
-$sql = preg_replace('/, $/', '', $sql);
+$sql .= preg_replace('/^,/', '', $hookmanager->resPrint);
+$sql = preg_replace('/,\s*$/', '', $sql);
 $sql .= " FROM ".MAIN_DB_PREFIX.$object->table_element." as t";
 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 (t.rowid = ef.fk_object)";
 if ($object->ismultientitymanaged == 1) $sql .= " WHERE t.entity IN (".getEntity($object->element).")";
@@ -308,6 +315,10 @@ foreach ($search as $key => $val)
 {
 	if ($key == 'status' && $search[$key] == -1) continue;
 	$mode_search = (($object->isInt($object->fields[$key]) || $object->isFloat($object->fields[$key])) ? 1 : 0);
+	if (strpos($object->fields[$key]['type'], 'integer:') === 0) {
+		if ($search[$key] == '-1') $search[$key] = '';
+		$mode_search = 2;
+	}
 	if ($search[$key] != '') $sql .= natural_search($key, $search[$key], (($key == 'status') ? 2 : $mode_search));
 }
 if ($search_all) $sql .= natural_search(array_keys($fieldstosearchall), $search_all);
@@ -332,7 +343,7 @@ if (! empty($extrafields->attributes[$object->table_element]['label'])) {
 $parameters=array();
 $reshook=$hookmanager->executeHooks('printFieldListGroupBy',$parameters);    // Note that $action and $object may have been modified by hook
 $sql.=$hookmanager->resPrint;
-$sql=preg_replace('/, $/','', $sql);
+$sql=preg_replace('/,\s*$/','', $sql);
 */
 
 $sql .= $db->order($sortfield, $sortorder);
@@ -350,13 +361,13 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 	}
 }
 // if total of record found is smaller than limit, no need to do paging and to restart another select with limits set.
-if (is_numeric($nbtotalofrecords) && $limit > $nbtotalofrecords)
+if (is_numeric($nbtotalofrecords) && ($limit > $nbtotalofrecords || empty($limit)))
 {
 	$num = $nbtotalofrecords;
 }
 else
 {
-	$sql .= $db->plimit($limit + 1, $offset);
+	if ($limit) $sql .= $db->plimit($limit + 1, $offset);
 
 	$resql = $db->query($sql);
 	if (!$resql)
@@ -369,7 +380,7 @@ else
 }
 
 // Direct jump if only one record found
-if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $search_all)
+if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $search_all && !$page)
 {
 	$obj = $db->fetch_object($resql);
 	$id = $obj->rowid;
@@ -418,7 +429,7 @@ $arrayofmassactions =  array(
 	'enable'=>$langs->trans("Enable"),
 	'disable'=>$langs->trans("Disable"),
 );
-if ($user->rights->bom->delete) $arrayofmassactions['predelete']='<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
+if ($permissiontodelete) $arrayofmassactions['predelete'] = '<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
 if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete'))) $arrayofmassactions=array();
 $massactionbutton=$form->selectMassAction('', $arrayofmassactions);
 
@@ -488,7 +499,10 @@ foreach ($object->fields as $key => $val)
 	{
 		print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'">';
 		if (is_array($val['arrayofkeyval'])) print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth75');
-		else print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'">';
+		elseif (strpos($val['type'], 'integer:') === 0) {
+			print $object->showInputField($val, $key, $search[$key], '', '', 'search_', 'maxwidth150', 1);
+		}
+		elseif (! preg_match('/^(date|timestamp)/', $val['type'])) print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'">';
 		print '</td>';
 	}
 }
@@ -548,17 +562,13 @@ if (is_array($extrafields->attributes[$object->table_element]['computed']) && co
 // --------------------------------------------------------------------
 $i = 0;
 $totalarray = array();
-while ($i < min($num, $limit))
+while ($i < ($limit ? min($num, $limit) : $num))
 {
 	$obj = $db->fetch_object($resql);
 	if (empty($obj)) break; // Should not happen
 
 	// Store properties in $object
-	$object->id = $obj->rowid;
-	foreach ($object->fields as $key => $val)
-	{
-		if (property_exists($obj, $key)) $object->$key = $obj->$key;
-	}
+	$object->setVarsFromFetchObj($obj);
 
     // Show here line of result
     print '<tr class="oddeven">';
@@ -577,21 +587,20 @@ while ($i < min($num, $limit))
         {
 			print '<td'.($cssforfield ? ' class="'.$cssforfield.'"' : '').'>';
 			if ($key == 'status') print $object->getLibStatut(5);
-			elseif (in_array($val['type'], array('date', 'datetime', 'timestamp'))) print $object->showOutputField($val, $key, $db->jdate($obj->$key), '');
-			else print $object->showOutputField($val, $key, $obj->$key, '');
+			else print $object->showOutputField($val, $key, $object->$key, '');
 			print '</td>';
 			if (!$i) $totalarray['nbfield']++;
 			if (!empty($val['isameasure']))
 			{
 				if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 't.'.$key;
-				$totalarray['val']['t.'.$key] += $obj->$key;
+				$totalarray['val']['t.'.$key] += $object->$key;
 			}
         }
     }
 	// Extra fields
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
 	// Fields from hook
-	$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj);
+	$parameters = array('arrayfields'=>$arrayfields, 'object'=>$object, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
 	$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
 	// Action column
@@ -599,13 +608,13 @@ while ($i < min($num, $limit))
 	if ($massactionbutton || $massaction)   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
 	{
 		$selected = 0;
-		if (in_array($obj->rowid, $arrayofselected)) $selected = 1;
-		print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
+		if (in_array($object->id, $arrayofselected)) $selected = 1;
+		print '<input id="cb'.$object->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$object->id.'"'.($selected ? ' checked="checked"' : '').'>';
 	}
 	print '</td>';
 	if (!$i) $totalarray['nbfield']++;
 
-	print '</tr>';
+	print '</tr>'."\n";
 
 	$i++;
 }
@@ -648,8 +657,8 @@ if (in_array('builddoc', $arrayofmassactions) && ($nbtotalofrecords === '' || $n
 	$urlsource .= str_replace('&amp;', '&', $param);
 
 	$filedir = $diroutputmassaction;
-	$genallowed = $user->rights->bom->read;
-	$delallowed = $user->rights->bom->create;
+	$genallowed = $permissiontoread;
+	$delallowed = $permissiontoadd;
 
 	print $formfile->showdocuments('massfilesarea_bom', '', $filedir, $urlsource, 0, $delallowed, '', 1, 1, 0, 48, 1, $param, $title, '', '', '', null, $hidegeneratedfilelistifempty);
 }

htdocs/bom/class/bom.class.php

@@ -63,10 +63,11 @@ class BOM extends CommonObject
 
 
 	/**
-	 *  'type' if the field format.
+	 *  'type' if the field format ('integer', 'integer:ObjectClass:PathToClass[:AddCreateButtonOrNot[:Filter]]', 'varchar(x)', 'double(24,8)', 'real', 'price', 'text', 'html', 'date', 'datetime', 'timestamp', 'duration', 'mail', 'phone', 'url', 'password')
+	 *         Note: Filter can be a string like "(t.ref:like:'SO-%') or (t.date_creation:<:'20160101') or (t.nature:is:NULL)"
 	 *  'label' the translation key.
 	 *  'enabled' is a condition when the field must be managed.
-	 *  'visible' says if field is visible in list (Examples: 0=Not visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create). Using a negative value means field is not shown by default on list but can be selected for viewing)
+	 *  'visible' says if field is visible in list (Examples: 0=Not visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create). 5=Visible on list and view only (not create/not update). Using a negative value means field is not shown by default on list but can be selected for viewing)
 	 *  'noteditable' says if field is not editable (1 or 0)
 	 *  'notnull' is set to 1 if not null in database. Set to -1 if we must set data to null if empty ('' or 0).
 	 *  'default' is a default value for creation (can still be replaced by the global setup of default values)

htdocs/categories/class/api_categories.class.php

@@ -48,6 +48,11 @@ class Categories extends DolibarrApi
         3 => 'member',
         4 => 'contact',
         5 => 'account',
+        //6 => 'project',
+        //7 => 'user',
+        //8 => 'bank_line',
+        //9 => 'warehouse',
+        //10 => 'actioncomm',
     );
 
     /**

htdocs/categories/class/categorie.class.php

@@ -54,6 +54,7 @@ class Categorie extends CommonObject
 	const TYPE_ACCOUNT   = 'bank_account';
     const TYPE_BANK_LINE = 'bank_line';
     const TYPE_WAREHOUSE = 'warehouse';
+    const TYPE_ACTIONCOMM = 'actioncomm';
 
 	/**
 	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
@@ -77,6 +78,7 @@ class Categorie extends CommonObject
 		'user'         => 7,
 		'bank_line'    => 8,
 		'warehouse'    => 9,
+        'actioncomm' => 10,
 	);
 
     /**
@@ -93,6 +95,7 @@ class Categorie extends CommonObject
 		7 => 'user',
 		8 => 'bank_line',
 		9 => 'warehouse',
+        10 => 'actioncomm',
 	);
 
 	/**
@@ -111,6 +114,7 @@ class Categorie extends CommonObject
         'bank_account' => 'account',
         'project'  => 'project',
         'warehouse'=> 'warehouse',
+        'actioncomm' => 'actioncomm',
     );
 
     /**
@@ -129,6 +133,7 @@ class Categorie extends CommonObject
         'bank_account'=> 'account',
         'project'  => 'project',
         'warehouse'=> 'warehouse',
+        'actioncomm' => 'actioncomm',
 	);
 
     /**
@@ -147,6 +152,7 @@ class Categorie extends CommonObject
 		'bank_account'  => 'Account',
         'project'  => 'Project',
         'warehouse'=> 'Entrepot',
+        'actioncomm' => 'ActionComm',
 	);
 
     /**
@@ -164,6 +170,7 @@ class Categorie extends CommonObject
         'account'  => 'bank_account',
         'project'  => 'projet',
         'warehouse'=> 'entrepot',
+        'actioncomm' => 'actioncomm',
 	);
 
 	/**
@@ -214,6 +221,7 @@ class Categorie extends CommonObject
 	 * @see Categorie::TYPE_PROJECT
 	 * @see Categorie::TYPE_BANK_LINE
      * @see Categorie::TYPE_WAREHOUSE
+     * @see Categorie::TYPE_ACTIONCOMM
 	 */
 	public $type;
 

htdocs/categories/index.php

@@ -59,7 +59,13 @@ elseif ($type == Categorie::TYPE_ACCOUNT)   { $title=$langs->trans("AccountsCate
 elseif ($type == Categorie::TYPE_PROJECT)   { $title=$langs->trans("ProjectsCategoriesArea");  $typetext='project'; }
 elseif ($type == Categorie::TYPE_USER)      { $title=$langs->trans("UsersCategoriesArea");     $typetext='user'; }
 elseif ($type == Categorie::TYPE_WAREHOUSE) { $title=$langs->trans("StocksCategoriesArea");    $typetext='warehouse'; }
-else                                        { $title=$langs->trans("CategoriesArea");          $typetext='unknown'; }
+elseif ($type == Categorie::TYPE_ACTIONCOMM) {
+    $title = $langs->trans("ActionCommCategoriesArea");
+    $typetext = 'actioncomm';
+} else {
+    $title = $langs->trans("CategoriesArea");
+    $typetext = 'unknown';
+}
 
 $arrayofjs=array('/includes/jquery/plugins/jquerytreeview/jquery.treeview.js', '/includes/jquery/plugins/jquerytreeview/lib/jquery.cookie.js');
 $arrayofcss=array('/includes/jquery/plugins/jquerytreeview/jquery.treeview.css');

htdocs/comm/action/card.php

@@ -44,6 +44,7 @@ require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 require_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 
 // Load translation files required by the page
 $langs->loadLangs(array("companies", "other", "commercial", "bills", "orders", "agenda"));
@@ -374,6 +375,10 @@ if (empty($reshook) && $action == 'add')
 		{
 			if (!$object->error)
 			{
+				// Category association
+				$categories = GETPOST('categories', 'array');
+				$object->setCategories($categories);
+
 				unset($_SESSION['assignedtouser']);
 
 				$moreparam = '';
@@ -595,6 +600,10 @@ if (empty($reshook) && $action == 'update')
 
 			if ($result > 0)
 			{
+				// Category association
+				$categories = GETPOST('categories', 'array');
+				$object->setCategories($categories);
+
 				unset($_SESSION['assignedtouser']);
 
 				$db->commit();
@@ -1000,6 +1009,14 @@ if ($action == 'create')
 		print '</td></tr>';
 	}
 
+	if ($conf->categorie->enabled) {
+		// Categories
+		print '<tr><td>'.$langs->trans("Categories").'</td><td colspan="3">';
+		$cate_arbo = $form->select_all_categories(Categorie::TYPE_ACTIONCOMM, '', 'parent', 64, 0, 1);
+		print $form->multiselectarray('categories', $cate_arbo, GETPOST('categories', 'array'), '', 0, '', 0, '100%');
+		print "</td></tr>";
+	}
+
 	print '</table>';
 
 
@@ -1411,6 +1428,19 @@ if ($id > 0)
 			print $form->select_dolusers($object->userdoneid > 0 ? $object->userdoneid : -1, 'doneby', 1);
 			print '</td></tr>';
 		}
+		// Tags-Categories
+        if ($conf->categorie->enabled) {
+			print '<tr><td>'.$langs->trans("Categories").'</td><td colspan="3">';
+			$cate_arbo = $form->select_all_categories(Categorie::TYPE_ACTIONCOMM, '', 'parent', 64, 0, 1);
+			$c = new Categorie($db);
+			$cats = $c->containing($object->id, Categorie::TYPE_ACTIONCOMM);
+			$arrayselected = array();
+			foreach ($cats as $cat) {
+				$arrayselected[] = $cat->id;
+			}
+			print $form->multiselectarray('categories', $cate_arbo, $arrayselected, '', 0, '', 0, '100%');
+			print "</td></tr>";
+		}
 
 		print '</table>';
 
@@ -1461,6 +1491,7 @@ if ($id > 0)
 		print '<tr><td class="titlefieldcreate nowrap">'.$langs->trans("Priority").'</td><td>';
 		print '<input type="text" name="priority" value="'.($object->priority ? $object->priority : '').'" size="5">';
 		print '</td></tr>';
+
 		// Object linked
 		if (!empty($object->fk_element) && !empty($object->elementtype))
 		{
@@ -1716,6 +1747,12 @@ if ($id > 0)
 			}
 			print '</td></tr>';
 		}
+		// Categories
+		if ($conf->categorie->enabled) {
+			print '<tr><td class="valignmiddle">'.$langs->trans("Categories").'</td><td colspan="3">';
+			print $form->showCategories($object->id, Categorie::TYPE_ACTIONCOMM, 1);
+			print "</td></tr>";
+		}
 
 		print '</table>';
 

htdocs/comm/action/class/actioncomm.class.php

@@ -1510,6 +1510,50 @@ class ActionComm extends CommonObject
         return $result;
     }
 
+    /**
+     * Sets object to supplied categories.
+     *
+     * Deletes object from existing categories not supplied.
+     * Adds it to non existing supplied categories.
+     * Existing categories are left untouch.
+     *
+     * @param  int[]|int $categories Category or categories IDs
+     * @return void
+     */
+    public function setCategories($categories)
+    {
+        // Handle single category
+        if (! is_array($categories)) {
+            $categories = array($categories);
+        }
+
+        // Get current categories
+        include_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';
+        $c = new Categorie($this->db);
+        $existing = $c->containing($this->id, Categorie::TYPE_ACTIONCOMM, 'id');
+
+        // Diff
+        if (is_array($existing)) {
+            $to_del = array_diff($existing, $categories);
+            $to_add = array_diff($categories, $existing);
+        } else {
+            $to_del = array(); // Nothing to delete
+            $to_add = $categories;
+        }
+
+        // Process
+        foreach($to_del as $del) {
+            if ($c->fetch($del) > 0) {
+                $c->del_type($this, Categorie::TYPE_ACTIONCOMM);
+            }
+        }
+        foreach ($to_add as $add) {
+            if ($c->fetch($add) > 0) {
+                $c->add_type($this, Categorie::TYPE_ACTIONCOMM);
+            }
+        }
+        return;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**

htdocs/comm/action/list.php

@@ -308,7 +308,7 @@ if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND (a.fk_soc IS
 if ($socid > 0) $sql .= " AND s.rowid = ".$socid;
 // We must filter on assignement table
 if ($filtert > 0 || $usergroup > 0) $sql .= " AND ar.fk_actioncomm = a.id AND ar.element_type='user'";
-if ($type) $sql .= " AND c.id = ".$type;
+if ($type) $sql .= " AND c.id = ".(int) $type;
 if ($status == '0') { $sql .= " AND a.percent = 0"; }
 if ($status == '-1') { $sql .= " AND a.percent = -1"; }	// Not applicable
 if ($status == '50') { $sql .= " AND (a.percent > 0 AND a.percent < 100)"; }	// Running already started

htdocs/comm/card.php

@@ -491,7 +491,7 @@ if ($object->id > 0)
 		$langs->load("categories");
 		print '<tr><td>'.$langs->trans("CustomersCategoriesShort").'</td>';
 		print '<td>';
-		print $form->showCategories($object->id, 'customer', 1);
+		print $form->showCategories($object->id, Categorie::TYPE_CUSTOMER, 1);
 		print "</td></tr>";
 	}
 

htdocs/comm/propal/class/propal.class.php

@@ -1800,7 +1800,7 @@ class Propal extends CommonObject
 		$this->newref = $num;
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX."propal";
-		$sql .= " SET ref = '".$num."',";
+		$sql .= " SET ref = '".$this->db->escape($num)."',";
 		$sql .= " fk_statut = ".self::STATUS_VALIDATED.", date_valid='".$this->db->idate($now)."', fk_user_valid=".$user->id;
 		$sql .= " WHERE rowid = ".$this->id." AND fk_statut = ".self::STATUS_DRAFT;
 

htdocs/comm/remise.php

@@ -222,7 +222,7 @@ if ($socid > 0)
 		$sql .= " u.login, u.rowid as user_id";
 		$sql .= " FROM ".MAIN_DB_PREFIX."societe_remise as rc, ".MAIN_DB_PREFIX."user as u";
 		$sql .= " WHERE rc.fk_soc = ".$object->id;
-		$sql .= " AND rc.entity = ".$conf->entity;
+		$sql .= " AND rc.entity IN (".getEntity('discount').")";
 		$sql .= " AND u.rowid = rc.fk_user_author";
 		$sql .= " ORDER BY rc.datec DESC";
 
@@ -281,7 +281,7 @@ if ($socid > 0)
 		$sql .= " u.login, u.rowid as user_id";
 		$sql .= " FROM ".MAIN_DB_PREFIX."societe_remise_supplier as rc, ".MAIN_DB_PREFIX."user as u";
 		$sql .= " WHERE rc.fk_soc = ".$object->id;
-		$sql .= " AND rc.entity = ".$conf->entity;
+		$sql .= " AND rc.entity IN (".getEntity('discount').")";
 		$sql .= " AND u.rowid = rc.fk_user_author";
 		$sql .= " ORDER BY rc.datec DESC";
 

htdocs/commande/class/commande.class.php

@@ -1447,6 +1447,7 @@ class Commande extends CommonOrder
 			$localtaxes_type = getLocalTaxesFromRate($txtva, 0, $this->thirdparty, $mysoc);
 
 			// Clean vat code
+			$reg = array();
 			$vat_src_code = '';
 			if (preg_match('/\((.*)\)/', $txtva, $reg))
 			{

htdocs/compta/bank/card.php

@@ -690,7 +690,7 @@ else
 		// Categories
 		if ($conf->categorie->enabled) {
 			print '<tr><td class="titlefield">'.$langs->trans("Categories").'</td><td>';
-			print $form->showCategories($object->id, 'bank_account', 1);
+			print $form->showCategories($object->id, Categorie::TYPE_ACCOUNT, 1);
 			print "</td></tr>";
 		}
 

htdocs/compta/bank/class/paymentvarious.class.php

@@ -135,9 +135,9 @@ class PaymentVarious extends CommonObject
 		if ($this->tms) $sql.= " tms='".$this->db->idate($this->tms)."',";
 		$sql.= " datep='".$this->db->idate($this->datep)."',";
 		$sql.= " datev='".$this->db->idate($this->datev)."',";
-		$sql.= " sens=".$this->sens.",";
+		$sql.= " sens=".(int) $this->sens.",";
 		$sql.= " amount=".price2num($this->amount).",";
-		$sql.= " fk_typepayment=".$this->fk_typepayment."',";
+		$sql.= " fk_typepayment=".(int) $this->fk_typepayment.",";
 		$sql.= " num_payment='".$this->db->escape($this->num_payment)."',";
 		$sql.= " label='".$this->db->escape($this->label)."',";
 		$sql.= " note='".$this->db->escape($this->note)."',";
@@ -145,8 +145,8 @@ class PaymentVarious extends CommonObject
         $sql.= " subledger_account='".$this->db->escape($this->subledger_account)."',";
 		$sql.= " fk_projet='".$this->db->escape($this->fk_project)."',";
 		$sql.= " fk_bank=".($this->fk_bank > 0 ? $this->fk_bank:"null").",";
-		$sql.= " fk_user_author=".$this->fk_user_author.",";
-		$sql.= " fk_user_modif=".$this->fk_user_modif;
+		$sql.= " fk_user_author=".(int) $this->fk_user_author.",";
+		$sql.= " fk_user_modif=".(int) $this->fk_user_modif;
 		$sql.= " WHERE rowid=".$this->id;
 
 		dol_syslog(get_class($this)."::update", LOG_DEBUG);
@@ -682,4 +682,40 @@ class PaymentVarious extends CommonObject
 			dol_print_error($this->db);
 		}
 	}
+
+	/**
+	 *	Return if a various payment linked to a bank line id was dispatched into bookkeeping
+	 *
+	 *	@return     int         <0 if KO, 0=no, 1=yes
+	 */
+	public function getVentilExportCompta()
+	{
+		$banklineid = $this->fk_bank;
+
+		$alreadydispatched = 0;
+
+		$type = 'bank';
+
+		$sql = " SELECT COUNT(ab.rowid) as nb FROM ".MAIN_DB_PREFIX."accounting_bookkeeping as ab WHERE ab.doc_type='".$type."' AND ab.fk_doc = ".$banklineid;
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			$obj = $this->db->fetch_object($resql);
+			if ($obj)
+			{
+				$alreadydispatched = $obj->nb;
+			}
+		}
+		else
+		{
+			$this->error = $this->db->lasterror();
+			return -1;
+		}
+
+		if ($alreadydispatched)
+		{
+			return 1;
+		}
+		return 0;
+	}
 }

htdocs/compta/bank/releve.php

@@ -38,12 +38,15 @@ require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/paiement/cheque/class/remisecheque.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
+require_once DOL_DOCUMENT_ROOT.'/don/class/paymentdonation.class.php';
+require_once DOL_DOCUMENT_ROOT.'/loan/class/paymentloan.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/paymentvarious.class.php';
 //show files
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions.lib.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array("banks", "categories", "companies", "bills", "trips"));
+$langs->loadLangs(array("banks", "categories", "companies", "bills", "trips", "donations", "loan"));
 
 $action = GETPOST('action', 'alpha');
 $id = GETPOST('account', 'int');
@@ -202,6 +205,9 @@ $paymentvatstatic = new TVA($db);
 $bankstatic = new Account($db);
 $banklinestatic = new AccountLine($db);
 $remisestatic = new RemiseCheque($db);
+$paymentdonationstatic=new PaymentDonation($db);
+$paymentloanstatic=new PaymentLoan($db);
+$paymentvariousstatic=new PaymentVarious($db);
 
 // Must be before button action
 $param = '';
@@ -512,7 +518,28 @@ else
 					print '</a>';
 					$newline = 0;
 				}
-				elseif ($links[$key]['type'] == 'banktransfert') {
+				elseif ($links[$key]['type']=='payment_donation')
+				{
+					$paymentdonationstatic->id=$links[$key]['url_id'];
+					$paymentdonationstatic->ref=$langs->trans("Payment");
+					print ' '.$paymentdonationstatic->getNomUrl(1);
+					$newline = 0;
+				}
+				elseif ($links[$key]['type']=='payment_loan')
+				{
+					$paymentloanstatic->id=$links[$key]['url_id'];
+					$paymentloanstatic->ref=$langs->trans("Payment");
+					print ' '.$paymentloanstatic->getNomUrl(1);
+					$newline = 0;
+				}
+				elseif ($links[$key]['type']=='payment_various')
+				{
+					$paymentvariousstatic->id=$links[$key]['url_id'];
+					$paymentvariousstatic->ref=$langs->trans("Payment");
+					print ' '.$paymentvariousstatic->getNomUrl(1);
+					$newline = 0;
+				}
+				elseif ($links[$key]['type']=='banktransfert') {
 					// Do not show link to transfer since there is no transfer card (avoid confusion). Can already be accessed from transaction detail.
 					if ($objp->amount > 0)
 					{

htdocs/compta/bank/various_payment/card.php

@@ -64,6 +64,7 @@ $object = new PaymentVarious($db);
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('variouscard','globalcard'));
 
+
 /**
  * Actions
  */
@@ -216,6 +217,20 @@ if (empty($reshook))
 			setEventMessages('Error try do delete a line linked to a conciliated bank transaction', null, 'errors');
 		}
 	}
+
+	if ($action == 'setsubledger_account') {
+		$result = $object->fetch($id);
+
+		$object->subledger_account = (GETPOST("subledger_account") > 0 ? GETPOST("subledger_account", "alpha") : "");
+
+		$res = $object->update($user);
+		if ($res > 0) {
+			$db->commit();
+		} else {
+			$db->rollback();
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
+	}
 }
 
 
@@ -412,6 +427,8 @@ if ($action == 'create')
 
 if ($id)
 {
+	$alreadyaccounted = $object->getVentilExportCompta();
+
 	$head=various_payment_prepare_head($object);
 
 	dol_fiche_head($head, 'card', $langs->trans("VariousPayment"), -1, $object->picto);
@@ -495,9 +512,9 @@ if ($id)
 
     // Subledger account
     print '<tr><td class="nowrap">';
-    print $langs->trans("SubledgerAccount");
+    print $form->editfieldkey('SubledgerAccount', 'subledger_account', $object->subledger_account, $object, (!$alreadyaccounted && $user->rights->banque->modifier), 'string', '', 0);
     print '</td><td>';
-    print $object->subledger_account;
+    print $form->editfieldval('SubledgerAccount', 'subledger_account', $object->subledger_account, $object, (!$alreadyaccounted && $user->rights->banque->modifier), 'string', '', 0);
     print '</td></tr>';
 
 	if (!empty($conf->banque->enabled))
@@ -542,7 +559,11 @@ if ($id)
 	{
 		if (!empty($user->rights->banque->modifier))
 		{
-			print '<div class="inline-block divButAction"><a class="butActionDelete" href="card.php?id='.$object->id.'&action=delete">'.$langs->trans("Delete").'</a></div>';
+			if ($alreadyaccounted) {
+				print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("Accounted").'">'.$langs->trans("Delete").'</a></div>';
+			} else {
+				print '<div class="inline-block divButAction"><a class="butActionDelete" href="card.php?id='.$object->id.'&action=delete">'.$langs->trans("Delete").'</a></div>';
+			}
 		}
 		else
 		{

htdocs/compta/facture/card.php

@@ -3206,13 +3206,13 @@ if ($action == 'create')
 
 		$thirdparty = $soc;
 		$discount_type = 0;
-		$backtopage = urlencode($_SERVER["PHP_SELF"].'?socid='.$thirdparty->id.'&action='.$action.'&origin='.GETPOST('origin').'&originid='.GETPOST('originid'));
+		$backtopage = urlencode($_SERVER["PHP_SELF"].'?socid='.$thirdparty->id.'&action='.$action.'&origin='.GETPOST('origin', 'alpha').'&originid='.GETPOST('originid', 'int'));
 		include DOL_DOCUMENT_ROOT.'/core/tpl/object_discounts.tpl.php';
 
 		print '</td></tr>';
 	}
 
-	$datefacture = dol_mktime(12, 0, 0, $_POST['remonth'], $_POST['reday'], $_POST['reyear']);
+	$datefacture = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
 
 	// Date invoice
 	print '<tr><td class="fieldrequired">'.$langs->trans('DateInvoice').'</td><td colspan="2">';
@@ -3223,14 +3223,14 @@ if ($action == 'create')
 	if (!empty($conf->global->INVOICE_POINTOFTAX_DATE))
 	{
 		print '<tr><td class="fieldrequired">'.$langs->trans('DatePointOfTax').'</td><td colspan="2">';
-		$date_pointoftax = dol_mktime(12, 0, 0, $_POST['date_pointoftaxmonth'], $_POST['date_pointoftaxday'], $_POST['date_pointoftaxyear']);
+		$date_pointoftax = dol_mktime(12, 0, 0, GETPOST('date_pointoftaxmonth', 'int'), GETPOST('date_pointoftaxday', 'int'), GETPOST('date_pointoftaxyear', 'int'));
 		print $form->selectDate($date_pointoftax ? $date_pointoftax : -1, 'date_pointoftax', '', '', '', "add", 1, 1);
 		print '</td></tr>';
 	}
 
 	// Payment term
 	print '<tr><td class="nowrap fieldrequired">'.$langs->trans('PaymentConditionsShort').'</td><td colspan="2">';
-	$form->select_conditions_paiements(isset($_POST['cond_reglement_id']) ? $_POST['cond_reglement_id'] : $cond_reglement_id, 'cond_reglement_id');
+	$form->select_conditions_paiements(GETPOSTISSET('cond_reglement_id') ? GETPOST('cond_reglement_id', 'int') : $cond_reglement_id, 'cond_reglement_id');
 	print '</td></tr>';
 
 	if (!empty($conf->global->INVOICE_USE_SITUATION))
@@ -3747,18 +3747,24 @@ elseif ($id > 0 || !empty($ref))
 		$i++;
 		$close[$i]['code'] = 'badcustomer';
 		$i++;
+		$close[$i]['code'] = 'other';
+		$i++;
 		// Help
 		$i = 0;
 		$close[$i]['label'] = $langs->trans("HelpEscompte").'<br><br>'.$langs->trans("ConfirmClassifyPaidPartiallyReasonDiscountVatDesc");
 		$i++;
 		$close[$i]['label'] = $langs->trans("ConfirmClassifyPaidPartiallyReasonBadCustomerDesc");
 		$i++;
+		$close[$i]['label'] = $langs->trans("Other");
+		$i++;
 		// Texte
 		$i = 0;
 		$close[$i]['reason'] = $form->textwithpicto($langs->transnoentities("ConfirmClassifyPaidPartiallyReasonDiscount", $resteapayer, $langs->trans("Currency".$conf->currency)), $close[$i]['label'], 1);
 		$i++;
 		$close[$i]['reason'] = $form->textwithpicto($langs->transnoentities("ConfirmClassifyPaidPartiallyReasonBadCustomer", $resteapayer, $langs->trans("Currency".$conf->currency)), $close[$i]['label'], 1);
 		$i++;
+		$close[$i]['reason'] = $form->textwithpicto($langs->transnoentities("Other"), $close[$i]['label'], 1);
+		$i++;
 		// arrayreasons[code]=reason
 		foreach ($close as $key => $val) {
 			$arrayreasons[$close [$key]['code']] = $close[$key]['reason'];

htdocs/compta/facture/class/facturestats.class.php

@@ -79,7 +79,7 @@ class FactureStats extends Stats
 			$this->field_line='total_ht';
 		}
 
-		$this->where = " f.fk_statut > 0";
+		$this->where = " f.fk_statut >= 0";
 		$this->where.= " AND f.entity IN (".getEntity('invoice').")";
 		if (!$user->rights->societe->client->voir && !$this->socid) $this->where .= " AND f.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id;
 		if ($mode == 'customer') $this->where.=" AND (f.fk_statut <> 3 OR f.close_code <> 'replaced')";	// Exclude replaced invoices as they are duplicated (we count closed invoices for other reasons)

htdocs/compta/stats/cabyuser.php

@@ -170,9 +170,11 @@ elseif ($modecompta == "RECETTES-DEPENSES")
 }
 elseif ($modecompta == "BOOKKEEPING")
 {
+	// TODO
 }
 elseif ($modecompta == "BOOKKEEPINGCOLLECTED")
 {
+	// TODO
 }
 $period = $form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0);
 if ($date_end == dol_time_plus_duree($date_start, 1, 'y') - 1) $periodlink = '<a href="'.$_SERVER["PHP_SELF"].'?year='.($year_start - 1).'&modecompta='.$modecompta.'">'.img_previous().'</a> <a href="'.$_SERVER["PHP_SELF"].'?year='.($year_start + 1).'&modecompta='.$modecompta.'">'.img_next().'</a>';
@@ -387,39 +389,53 @@ if (count($amount)) {
 
         // Amount w/o VAT
         print '<td class="right">';
-        if ($modecompta != 'CREANCES-DETTES')
-        {
+        if ($modecompta == 'RECETTES-DEPENSES') {
             if ($key > 0) {
-                print '<a href="'.DOL_URL_ROOT.'/compta/paiement/list.php?userid='.$key.'">';
+                //print '<a href="'.DOL_URL_ROOT.'/compta/paiement/list.php?userid='.$key.'">';
             } else {
-                print '<a href="'.DOL_URL_ROOT.'/compta/paiement/list.php?userid=-1">';
+                //print '<a href="'.DOL_URL_ROOT.'/compta/paiement/list.php?userid=-1">';
             }
-        } else {
+        }
+        elseif ($modecompta == 'CREANCES-DETTES') {
             if ($key > 0) {
                 print '<a href="'.DOL_URL_ROOT.'/compta/facture/list.php?userid='.$key.'">';
             } else {
-                print '<a href="#">';
+                //print '<a href="#">';
             }
             print price($amount_ht[$key]);
+            if ($key > 0) print '</a>';
         }
         print '</td>';
 
         // Amount with VAT
         print '<td class="right">';
-        if ($modecompta != 'CREANCES-DETTES') {
+        if ($modecompta == 'RECETTES-DEPENSES') {
             if ($key > 0) {
-                print '<a href="'.DOL_URL_ROOT.'/compta/paiement/list.php?userid='.$key.'">';
+                //print '<a href="'.DOL_URL_ROOT.'/compta/paiement/list.php?userid='.$key.'">';
             } else {
-                print '<a href="'.DOL_URL_ROOT.'/compta/paiement/list.php?userid=-1">';
+                //print '<a href="'.DOL_URL_ROOT.'/compta/paiement/list.php?userid=-1">';
             }
-        } else {
+        }
+        elseif ($modecompta == 'CREANCES-DETTES') {
             if ($key > 0) {
                 print '<a href="'.DOL_URL_ROOT.'/compta/facture/list.php?userid='.$key.'">';
             } else {
-                print '<a href="#">';
+                //print '<a href="#">';
             }
         }
         print price($amount[$key]);
+        if ($modecompta == 'RECETTES-DEPENSES') {
+        	if ($key > 0) {
+        		//print '</a>';
+        	} else {
+        		//print '</a>';
+        	}
+        }
+        elseif ($modecompta == 'CREANCES-DETTES') {
+        	if ($key > 0) {
+        		print '</a>';
+        	}
+        }
         print '</td>';
 
         // Percent

htdocs/contact/card.php

@@ -1364,7 +1364,7 @@ else
 		if (!empty($conf->categorie->enabled) && !empty($user->rights->categorie->lire)) {
 			print '<tr><td class="titlefield">'.$langs->trans("Categories").'</td>';
 			print '<td colspan="3">';
-			print $form->showCategories($object->id, 'contact', 1);
+			print $form->showCategories($object->id, Categorie::TYPE_CONTACT, 1);
 			print '</td></tr>';
 		}
 

htdocs/contact/class/contact.class.php

@@ -181,6 +181,10 @@ class Contact extends CommonObject
 	public $phone_mobile;
 	public $fax;
 
+	/**
+	 * Private or public
+	 * @var int
+	 */
 	public $priv;
 
 	public $birthday;

htdocs/contrat/card.php

@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2003-2004  Rodolphe Quiedeville	<rodolphe@quiedeville.org>
- * Copyright (C) 2004-2014  Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2019  Laurent Destailleur		<eldy@users.sourceforge.net>
  * Copyright (C) 2005-2014  Regis Houssin			<regis.houssin@inodbox.com>
  * Copyright (C) 2006       Andre Cianfarani		<acianfa@free.fr>
  * Copyright (C) 2010-2017  Juanjo Menent			<jmenent@2byte.es>
@@ -417,12 +417,12 @@ if (empty($reshook))
 		// Set if we used free entry or predefined product
 		$predef = '';
 		$product_desc = (GETPOST('dp_desc') ?GETPOST('dp_desc') : '');
-		$price_ht = GETPOST('price_ht');
-		$price_ht_devise = GETPOST('multicurrency_price_ht');
-		if (GETPOST('prod_entry_mode') == 'free')
+		$price_ht = price2num(GETPOST('price_ht'));
+		$price_ht_devise = price2num(GETPOST('multicurrency_price_ht'));
+		if (GETPOST('prod_entry_mode', 'alpha') == 'free')
 		{
 			$idprod = 0;
-			$tva_tx = (GETPOST('tva_tx') ? GETPOST('tva_tx') : 0);
+			$tva_tx = (GETPOST('tva_tx', 'alpha') ? GETPOST('tva_tx', 'alpha') : 0);
 		}
 		else
 		{
@@ -430,7 +430,7 @@ if (empty($reshook))
 			$tva_tx = '';
 		}
 
-		$qty = GETPOST('qty'.$predef);
+		$qty = price2num(GETPOST('qty'.$predef));
 		$remise_percent = ((GETPOST('remise_percent'.$predef) != '') ? GETPOST('remise_percent'.$predef) : 0);
 
 		if ($qty == '')
@@ -438,7 +438,7 @@ if (empty($reshook))
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Qty")), null, 'errors');
 			$error++;
 		}
-		if (GETPOST('prod_entry_mode') == 'free' && empty($idprod) && empty($product_desc))
+		if (GETPOST('prod_entry_mode', 'alpha') == 'free' && empty($idprod) && empty($product_desc))
 		{
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Description")), null, 'errors');
 			$error++;

htdocs/contrat/class/contrat.class.php

@@ -1421,9 +1421,18 @@ class Contrat extends CommonObject
 			$pu_ht = price2num($pu_ht);
 			$pu_ttc = price2num($pu_ttc);
 			$pa_ht = price2num($pa_ht);
-			if (!preg_match('/\((.*)\)/', $txtva)) {
-				$txtva = price2num($txtva); // $txtva can have format '5.0(XXX)' or '5'
+
+			// Clean vat code
+			$reg = array();
+			$vat_src_code = '';
+			if (preg_match('/\((.*)\)/', $txtva, $reg))
+			{
+				$vat_src_code = $reg[1];
+				$txtva = preg_replace('/\s*\(.*\)/', '', $txtva); // Remove code into vatrate.
 			}
+
+			$txtva = price2num($txtva);
+
 			$txlocaltax1 = price2num($txlocaltax1);
 			$txlocaltax2 = price2num($txlocaltax2);
 			$remise_percent = price2num($remise_percent);
@@ -1456,15 +1465,7 @@ class Contrat extends CommonObject
 
 			$this->db->begin();
 
-			$localtaxes_type = getLocalTaxesFromRate($txtva, 0, $this->societe, $mysoc);
-
-			// Clean vat code
-			$vat_src_code = '';
-			if (preg_match('/\((.*)\)/', $txtva, $reg))
-			{
-				$vat_src_code = $reg[1];
-				$txtva = preg_replace('/\s*\(.*\)/', '', $txtva); // Remove code into vatrate.
-			}
+			$localtaxes_type = getLocalTaxesFromRate($txtva.($vat_src_code ? ' ('.$vat_src_code.')' : ''), 0, $this->societe, $mysoc);
 
 			// Calcul du total TTC et de la TVA pour la ligne a partir de
 			// qty, pu, remise_percent et txtva

htdocs/core/actions_addupdatedelete.inc.php

@@ -36,7 +36,12 @@ if ($cancel)
 {
 	/*var_dump($cancel);
 	var_dump($backtopage);exit;*/
-	if (!empty($backtopage))
+	if (!empty($backtopageforcancel))
+	{
+		header("Location: ".$backtopageforcancel);
+		exit;
+	}
+	elseif (!empty($backtopage))
 	{
 		header("Location: ".$backtopage);
 		exit;
@@ -142,8 +147,8 @@ if ($action == 'update' && !empty($permissiontoadd))
 			} else {
 				$value = '';
 			}
-		} elseif (in_array($object->fields[$key]['type'], array('price', 'real'))) {
-			$value = price2num(GETPOST($key));
+		} elseif (preg_match('/^(integer|price|real|double)/', $object->fields[$key]['type'])) {
+            $value = price2num(GETPOST($key, 'none'));	// To fix decimal separator according to lang setup
 		} else {
 			$value = GETPOST($key, 'alpha');
 		}

htdocs/core/class/commonobject.class.php

@@ -3522,6 +3522,7 @@ abstract class CommonObject
 		if ($elementTable == 'user') $fieldstatus = "statut";
 		if ($elementTable == 'expensereport') $fieldstatus = "fk_statut";
 		if ($elementTable == 'commande_fournisseur_dispatch') $fieldstatus = "status";
+		if (is_array($this->fields) && array_key_exists('status', $this->fields)) $fieldstatus = 'status';
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX.$elementTable;
 		$sql .= " SET ".$fieldstatus." = ".$status;
@@ -3572,7 +3573,7 @@ abstract class CommonObject
 			else
 			{
 				$this->db->rollback();
-				dol_syslog(get_class($this)."::setStatus ".$this->error, LOG_ERR);
+				dol_syslog(get_class($this)."::setStatut ".$this->error, LOG_ERR);
 				return -1;
 			}
 		}
@@ -5562,16 +5563,17 @@ abstract class CommonObject
 	 * Return HTML string to put an input field into a page
 	 * Code very similar with showInputField of extra fields
 	 *
-	 * @param  array   		$val	       Array of properties for field to show
+	 * @param  array   		$val	       Array of properties for field to show (used only if ->fields not defined)
 	 * @param  string  		$key           Key of attribute
 	 * @param  string  		$value         Preselected value to show (for date type it must be in timestamp format, for amount or price it must be a php numeric value)
 	 * @param  string  		$moreparam     To add more parameters on html input tag
 	 * @param  string  		$keysuffix     Prefix string to add into name and id of field (can be used to avoid duplicate names)
 	 * @param  string  		$keyprefix     Suffix string to add into name and id of field (can be used to avoid duplicate names)
 	 * @param  string|int	$morecss       Value for css to define style/length of field. May also be a numeric.
+	 * @param  int			$nonewbutton   Force to not show the new button on field that are links to object
 	 * @return string
 	 */
-	public function showInputField($val, $key, $value, $moreparam = '', $keysuffix = '', $keyprefix = '', $morecss = 0)
+	public function showInputField($val, $key, $value, $moreparam = '', $keysuffix = '', $keyprefix = '', $morecss = 0, $nonewbutton = 0)
 	{
 		global $conf, $langs, $form;
 
@@ -5581,7 +5583,9 @@ abstract class CommonObject
 			$form = new Form($this->db);
 		}
 
-		$val = $this->fields[$key];
+		if (! empty($this->fields)) {
+			$val = $this->fields[$key];
+		}
 
 		$out = '';
         $type = '';
@@ -6124,7 +6128,7 @@ abstract class CommonObject
 
 			if (!empty($param_list_array[2]))		// If we set to add a create button
 			{
-				if (!GETPOSTISSET('backtopage') && empty($val['disabled']))	// To avoid to open several infinitely the 'Create Object' button and to avoid to have button if field is protected by a "disabled".
+				if (!GETPOSTISSET('backtopage') && empty($val['disabled']) && empty($nonewbutton))	// To avoid to open several times the 'Create Object' button and to avoid to have button if field is protected by a "disabled".
 				{
 		   			list($class, $classfile) = explode(':', $param_list[0]);
 		   			if (file_exists(dol_buildpath(dirname(dirname($classfile)).'/card.php'))) $url_path = dol_buildpath(dirname(dirname($classfile)).'/card.php', 1);
@@ -7383,7 +7387,7 @@ abstract class CommonObject
 	 * @param   stdClass    $obj    Contain data of object from database
      * @return void
 	 */
-	protected function setVarsFromFetchObj(&$obj)
+	public function setVarsFromFetchObj(&$obj)
 	{
 		foreach ($this->fields as $field => $info)
 		{

htdocs/core/class/dolgraph.class.php

@@ -899,7 +899,10 @@ class DolGraph
 		}
 
 		$legends=array();
-		$nblot=count($this->data[0])-1;    // -1 to remove legend
+		$nblot=0;
+		if (is_array($this->data) && is_array($this->data[0])) {
+			$nblot=count($this->data[0])-1;    // -1 to remove legend
+		}
 		if ($nblot < 0) dol_syslog('Bad value for property ->data. Must be set by mydolgraph->SetData before calling mydolgrapgh->draw', LOG_WARNING);
 		$firstlot=0;
 		// Works with line but not with bars
@@ -1124,7 +1127,20 @@ class DolGraph
 		$this->stringtoshow .= '</script>'."\n";
 	}
 
-
+	/**
+	 * Output HTML string to total value
+	 *
+	 * @return	string							HTML string to total value
+	 */
+    public function total()
+	{
+		$value = 0;
+		foreach($this->data as $valarray)	// Loop on each x
+			{
+			$value += $valarray[1];
+		}
+		return $value;
+	}
 
 	/**
 	 * Output HTML string to show graph

htdocs/core/class/html.form.class.php

@@ -591,15 +591,14 @@ class Form
 	 * Generate select HTML to choose massaction
 	 *
 	 * @param	string	$selected		Value auto selected when at least one record is selected. Not a preselected value. Use '0' by default.
-	 * @param	int		$arrayofaction	array('code'=>'label', ...). The code is the key stored into the GETPOST('massaction') when submitting action.
+	 * @param	array		$arrayofaction	array('code'=>'label', ...). The code is the key stored into the GETPOST('massaction') when submitting action.
 	 * @param   int     $alwaysvisible  1=select button always visible
-	 * @return	string					Select list
+	 * @return	string|void					Select list
 	 */
     public function selectMassAction($selected, $arrayofaction, $alwaysvisible = 0)
 	{
 		global $conf, $langs, $hookmanager;
 
-		if (count($arrayofaction) == 0) return;
 
 		$disabled = 0;
 		$ret = '<div class="centpercent center">';
@@ -608,6 +607,8 @@ class Form
 		// Complete list with data from external modules. THe module can use $_SERVER['PHP_SELF'] to know on which page we are, or use the $parameters['currentcontext'] completed by executeHooks.
 		$parameters = array();
 		$reshook = $hookmanager->executeHooks('addMoreMassActions', $parameters); // Note that $action and $object may have been modified by hook
+		// check if there is a mass action
+		if (count($arrayofaction) == 0 && empty($hookmanager->resPrint)) return;
 		if (empty($reshook))
 		{
 			$ret .= '<option value="0"'.($disabled ? ' disabled="disabled"' : '').'>-- '.$langs->trans("SelectAction").' --</option>';
@@ -3007,7 +3008,7 @@ class Form
 	 *  @param	    int		$productid       	Id of product
 	 *  @param      string	$htmlname        	Name of HTML field
 	 *  @param      int		$selected_supplier  Pre-selected supplier if more than 1 result
-	 *  @return	    void
+	 *  @return	    string
 	 */
     public function select_product_fourn_price($productid, $htmlname = 'productfournpriceid', $selected_supplier = '')
 	{
@@ -4129,6 +4130,7 @@ class Form
 			}
 
 			// Now add questions
+			$moreonecolumn = '';
 			$more .= '<div class="tagtable paddingtopbottomonly centpercent noborderspacing">'."\n";
 			foreach ($formquestion as $key => $input)
 			{
@@ -4202,13 +4204,14 @@ class Form
 
 					elseif ($input['type'] == 'onecolumn')
 					{
-						$more .= '<div class="tagtr"><div class="tagtd">';
-						$more .= $input['value'];
-						$more .= '</div></div>'."\n";
+						$moreonecolumn .= '<div class="margintoponly">';
+						$moreonecolumn .= $input['value'];
+						$moreonecolumn .= '</div>'."\n";
 					}
 				}
 			}
 			$more .= '</div>'."\n";
+			$more .= $moreonecolumn;
 		}
 
 		// JQUI method dialog is broken with jmobile, we use standard HTML.
@@ -7839,4 +7842,171 @@ class Form
 
         return $out;
     }
+
+	/**
+	 *  Output a combo list with invoices qualified for a third party
+	 *
+	 *  @param	int		$socid      	Id third party (-1=all, 0=only projects not linked to a third party, id=projects not linked or linked to third party id)
+	 *  @param  int		$selected   	Id invoice preselected
+	 *  @param  string	$htmlname   	Name of HTML select
+	 *	@param	int		$maxlength		Maximum length of label
+	 *	@param	int		$option_only	Return only html options lines without the select tag
+	 *	@param	string	$show_empty		Add an empty line ('1' or string to show for empty line)
+	 *  @param	int		$discard_closed Discard closed projects (0=Keep,1=hide completely,2=Disable)
+     *  @param	int		$forcefocus		Force focus on field (works with javascript only)
+     *  @param	int		$disabled		Disabled
+	 *  @param	string	$morecss        More css added to the select component
+	 *  @param	string	$projectsListId ''=Automatic filter on project allowed. List of id=Filter on project ids.
+	 *  @param	string	$showproject	'all' = Show project info, ''=Hide project info
+	 *  @param	User	$usertofilter	User object to use for filtering
+	 *	@return int         			Nbr of project if OK, <0 if KO
+	 */
+    public function selectInvoice($socid = -1, $selected = '', $htmlname = 'invoiceid', $maxlength = 24, $option_only = 0, $show_empty = '1', $discard_closed = 0, $forcefocus = 0, $disabled = 0, $morecss = 'maxwidth500', $projectsListId = '', $showproject = 'all', $usertofilter = null)
+	{
+		global $user,$conf,$langs;
+
+		require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+
+		if (is_null($usertofilter))
+		{
+			$usertofilter = $user;
+		}
+
+		$out='';
+
+		$hideunselectables = false;
+		if (! empty($conf->global->PROJECT_HIDE_UNSELECTABLES)) $hideunselectables = true;
+
+		if (empty($projectsListId))
+		{
+			if (empty($usertofilter->rights->projet->all->lire))
+			{
+				$projectstatic=new Project($this->db);
+				$projectsListId = $projectstatic->getProjectsAuthorizedForUser($usertofilter, 0, 1);
+			}
+		}
+
+		// Search all projects
+        $sql = 'SELECT f.rowid, f.ref as fref, "nolabel" as flabel, p.rowid as pid, f.ref,
+            p.title, p.fk_soc, p.fk_statut, p.public,';
+		$sql.= ' s.nom as name';
+		$sql.= ' FROM '.MAIN_DB_PREFIX .'projet as p';
+		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe as s ON s.rowid = p.fk_soc,';
+		$sql.= ' '.MAIN_DB_PREFIX.'facture as f';
+		$sql.= " WHERE p.entity IN (".getEntity('project').")";
+		$sql.= " AND f.fk_projet = p.rowid AND f.fk_statut=0"; //Brouillons seulement
+		//if ($projectsListId) $sql.= " AND p.rowid IN (".$projectsListId.")";
+		//if ($socid == 0) $sql.= " AND (p.fk_soc=0 OR p.fk_soc IS NULL)";
+		//if ($socid > 0)  $sql.= " AND (p.fk_soc=".$socid." OR p.fk_soc IS NULL)";
+		$sql.= " GROUP BY f.ref ORDER BY p.ref, f.ref ASC";
+
+		$resql=$this->db->query($sql);
+		if ($resql)
+		{
+			// Use select2 selector
+			if (! empty($conf->use_javascript_ajax))
+			{
+				include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
+	           	$comboenhancement = ajax_combobox($htmlname, '', 0, $forcefocus);
+            	$out.=$comboenhancement;
+            	$morecss='minwidth200imp maxwidth500';
+			}
+
+			if (empty($option_only)) {
+				$out.= '<select class="valignmiddle flat'.($morecss?' '.$morecss:'').'"'.($disabled?' disabled="disabled"':'').' id="'.$htmlname.'" name="'.$htmlname.'">';
+			}
+			if (! empty($show_empty)) {
+				$out.= '<option value="0" class="optiongrey">';
+				if (! is_numeric($show_empty)) $out.=$show_empty;
+				else $out.='&nbsp;';
+				$out.= '</option>';
+			}
+			$num = $this->db->num_rows($resql);
+			$i = 0;
+			if ($num)
+			{
+				while ($i < $num)
+				{
+					$obj = $this->db->fetch_object($resql);
+					// If we ask to filter on a company and user has no permission to see all companies and project is linked to another company, we hide project.
+					if ($socid > 0 && (empty($obj->fk_soc) || $obj->fk_soc == $socid) && empty($usertofilter->rights->societe->lire))
+					{
+						// Do nothing
+					}
+					else
+					{
+						if ($discard_closed == 1 && $obj->fk_statut == Project::STATUS_CLOSED)
+						{
+							$i++;
+							continue;
+						}
+
+						$labeltoshow = '';
+
+						if ($showproject == 'all')
+						{
+							$labeltoshow.=dol_trunc($obj->ref, 18);     // Invoice ref
+							if ($obj->name) $labeltoshow.=' - '.$obj->name; // Soc name
+
+							$disabled=0;
+							if ($obj->fk_statut == Project::STATUS_DRAFT)
+							{
+								$disabled=1;
+								$labeltoshow.=' - '.$langs->trans("Draft");
+							}
+							elseif ($obj->fk_statut == Project::STATUS_CLOSED)
+							{
+								if ($discard_closed == 2) $disabled=1;
+								$labeltoshow.=' - '.$langs->trans("Closed");
+							}
+							elseif ($socid > 0 && (! empty($obj->fk_soc) && $obj->fk_soc != $socid))
+							{
+								$disabled=1;
+								$labeltoshow.=' - '.$langs->trans("LinkedToAnotherCompany");
+							}
+						}
+
+						if (!empty($selected) && $selected == $obj->rowid)
+						{
+							$out.= '<option value="'.$obj->rowid.'" selected';
+							//if ($disabled) $out.=' disabled';						// with select2, field can't be preselected if disabled
+							$out.= '>'.$labeltoshow.'</option>';
+						}
+						else
+						{
+							if ($hideunselectables && $disabled && ($selected != $obj->rowid))
+							{
+								$resultat='';
+							}
+							else
+							{
+								$resultat='<option value="'.$obj->rowid.'"';
+								if ($disabled) $resultat.=' disabled';
+								//if ($obj->public) $labeltoshow.=' ('.$langs->trans("Public").')';
+								//else $labeltoshow.=' ('.$langs->trans("Private").')';
+								$resultat.='>';
+								$resultat.=$labeltoshow;
+								$resultat.='</option>';
+							}
+							$out.= $resultat;
+						}
+					}
+					$i++;
+				}
+			}
+			if (empty($option_only)) {
+				$out.= '</select>';
+			}
+
+			print $out;
+
+			$this->db->free($resql);
+			return $num;
+		}
+		else
+		{
+			dol_print_error($this->db);
+			return -1;
+		}
+	}
 }

htdocs/core/class/html.formaccounting.class.php

@@ -3,7 +3,7 @@
  * Copyright (C) 2013-2014 Olivier Geffroy      <jeff@jeffinfo.com>
  * Copyright (C) 2015      Ari Elbaz (elarifr)  <github@accedinfo.com>
  * Copyright (C) 2016      Marcos García        <marcosgdf@gmail.com>
- * Copyright (C) 2016-2017 Alexandre Spangaro   <aspangaro@open-dsi.fr>
+ * Copyright (C) 2016-2020 Alexandre Spangaro   <aspangaro@open-dsi.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -292,7 +292,7 @@ class FormAccounting extends Form
 		{
     		$trunclength = empty($conf->global->ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT) ? 50 : $conf->global->ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT;
 
-    		$sql = "SELECT DISTINCT aa.account_number, aa.label, aa.rowid, aa.fk_pcg_version";
+    		$sql = "SELECT DISTINCT aa.account_number, aa.label, aa.labelshort, aa.rowid, aa.fk_pcg_version";
     		$sql .= " FROM ".MAIN_DB_PREFIX."accounting_account as aa";
     		$sql .= " INNER JOIN ".MAIN_DB_PREFIX."accounting_system as asy ON aa.fk_pcg_version = asy.pcg_version";
     		$sql .= " AND asy.rowid = ".$conf->global->CHARTOFACCOUNTS;
@@ -312,8 +312,17 @@ class FormAccounting extends Form
     		$selected = 0;
     		while ($obj = $this->db->fetch_object($resql))
     		{
-    			$label = length_accountg($obj->account_number).' - '.$obj->label;
-    			$label = dol_trunc($label, $trunclength);
+				if (empty($obj->labelshort))
+				{
+					$labeltoshow = $obj->label;
+				}
+				else
+				{
+					$labeltoshow = $obj->labelshort;
+				}
+
+				$label = length_accountg($obj->account_number) . ' - ' . $labeltoshow;
+				$label = dol_trunc($label, $trunclength);
 
     			$select_value_in = $obj->rowid;
     			$select_value_out = $obj->rowid;

htdocs/core/class/html.formmargin.class.php

@@ -1,5 +1,5 @@
 <?php
-/* Copyright (c) 2015 Laurent Destailleur  <eldy@users.sourceforge.net>
+/* Copyright (c) 2015-2019 Laurent Destailleur  <eldy@users.sourceforge.net>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -98,7 +98,7 @@ class FormMargin
 
 			$pv = $line->total_ht;
 			$pa_ht = ($pv < 0 ? - $line->pa_ht : $line->pa_ht);      // We choosed to have line->pa_ht always positive in database, so we guess the correct sign
-			if ($object->type == Facture::TYPE_SITUATION) {
+			if ($object->element == 'facture' && $object->type == $object::TYPE_SITUATION) {
 				$pa = $line->qty * $pa_ht * ($line->situation_percent / 100);
 			} else {
 				$pa = $line->qty * $pa_ht;

htdocs/core/class/translate.class.php

@@ -291,7 +291,6 @@ class Translate
 								//if ($key == 'Order') print "Domain=$domain, found a string for key=$key=$tab[0] with value $tab[1]. Currently in cache ".$this->tab_translate[$key]."<br>";
 								if (empty($this->tab_translate[$key]))
 								{ // If translation was already found, we must not continue, even if MAIN_FORCELANGDIR is set (MAIN_FORCELANGDIR is to replace lang dir, not to overwrite entries)
-									$value = preg_replace('/\\n/', "\n", $value); // Parse and render carriage returns
 									if ($key == 'DIRECTION') { // This is to declare direction of language
 										if ($alt < 2 || empty($this->tab_translate[$key])) { // We load direction only for primary files or if not yet loaded
 											$this->tab_translate[$key] = $value;
@@ -307,8 +306,8 @@ class Translate
 									    continue;
 									}
 									else {
-										$this->tab_translate[$key] = $value;
-										//if ($domain == 'orders') print "$tab[0] value $value<br>";
+										// Convert some strings: Parse and render carriage returns. Also, change '\\s' int '\s' because transifex sync pull the string '\s' into string '\\s'
+										$this->tab_translate[$key] = str_replace(array('\\n', '\\\\s'), array("\n", '\s'), $value);
 										if ($usecachekey) {
 											$tabtranslatedomain[$key] = $value;
 										} // To save lang content in cache
@@ -491,9 +490,9 @@ class Translate
 						//print "Domain=$domain, found a string for $tab[0] with value $tab[1]<br>";
 						if (empty($this->tab_translate[$key]))    // If translation was already found, we must not continue, even if MAIN_FORCELANGDIR is set (MAIN_FORCELANGDIR is to replace lang dir, not to overwrite entries)
 						{
-							$value=trim(preg_replace('/\\n/', "\n", $value));
+							// Convert some strings: Parse and render carriage returns. Also, change '\\s' int '\s' because transifex sync pull the string '\s' into string '\\s'
+							$this->tab_translate[$key] = str_replace(array('\\n', '\\\\s'), array("\n", '\s'), $value);
 
-							$this->tab_translate[$key]=$value;
 							if ($usecachekey) $tabtranslatedomain[$key]=$value;	// To save lang content in cache
 						}
 
@@ -618,9 +617,8 @@ class Translate
                 }
             }
 
-            if (! preg_match('/^Format/', $key))
+            if (strpos($key, 'Format') !== 0)
             {
-            	//print $str;
             	$str=sprintf($str, $param1, $param2, $param3, $param4);	// Replace %s and %d except for FormatXXX strings.
             }
 

htdocs/core/lib/company.lib.php

@@ -1328,13 +1328,17 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = '', $noprin
         $sql .= " a.fk_contact,";
         $sql .= " c.code as acode, c.libelle as alabel, c.picto as apicto,";
         $sql .= " u.rowid as user_id, u.login as user_login, u.photo as user_photo, u.firstname as user_firstname, u.lastname as user_lastname";
-        if (is_object($filterobj) && get_class($filterobj) == 'Societe')      $sql .= ", sp.lastname, sp.firstname";
+        if (is_object($filterobj) && in_array(get_class($filterobj), array('Societe', 'Client', 'Fournisseur')))      $sql .= ", sp.lastname, sp.firstname";
+        elseif (is_object($filterobj) && get_class($filterobj) == 'Dolresource') { /* Nothing */ }
+        elseif (is_object($filterobj) && get_class($filterobj) == 'Project') { /* Nothing */ }
         elseif (is_object($filterobj) && get_class($filterobj) == 'Adherent') $sql .= ", m.lastname, m.firstname";
         elseif (is_object($filterobj) && get_class($filterobj) == 'CommandeFournisseur')  $sql .= ", o.ref";
         elseif (is_object($filterobj) && get_class($filterobj) == 'Product')  $sql .= ", o.ref";
         elseif (is_object($filterobj) && get_class($filterobj) == 'Ticket')   $sql .= ", o.ref";
         elseif (is_object($filterobj) && get_class($filterobj) == 'BOM')      $sql .= ", o.ref";
         elseif (is_object($filterobj) && get_class($filterobj) == 'Contrat')  $sql .= ", o.ref";
+        elseif (is_object($filterobj) && is_array($filterobj->fields) && is_array($filterobj->fields['rowid']) && is_array($filterobj->fields['ref']) && $filterobj->table_element && $filterobj->element) $sql .= ", o.ref";
+
         $sql .= " FROM ".MAIN_DB_PREFIX."actioncomm as a";
         $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user as u on u.rowid = a.fk_user_action";
         $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_actioncomm as c ON a.fk_action = c.id";
@@ -1346,23 +1350,26 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = '', $noprin
             $sql .= " AND r.element_type = '".$db->escape($objcon->table_element)."' AND r.fk_element = ".$objcon->id;
         }
 
-        if (is_object($filterobj) && get_class($filterobj) == 'Societe')  $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople as sp ON a.fk_contact = sp.rowid";
+        if (is_object($filterobj) && in_array(get_class($filterobj), array('Societe', 'Client', 'Fournisseur')))  $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople as sp ON a.fk_contact = sp.rowid";
         elseif (is_object($filterobj) && get_class($filterobj) == 'Dolresource') {
             $sql .= " INNER JOIN ".MAIN_DB_PREFIX."element_resources as er";
             $sql .= " ON er.resource_type = 'dolresource'";
             $sql .= " AND er.element_id = a.id";
             $sql .= " AND er.resource_id = ".$filterobj->id;
         }
+        elseif (is_object($filterobj) && get_class($filterobj) == 'Project') { /* Nothing */ }
         elseif (is_object($filterobj) && get_class($filterobj) == 'Adherent') $sql .= ", ".MAIN_DB_PREFIX."adherent as m";
         elseif (is_object($filterobj) && get_class($filterobj) == 'CommandeFournisseur') $sql .= ", ".MAIN_DB_PREFIX."commande_fournisseur as o";
         elseif (is_object($filterobj) && get_class($filterobj) == 'Product') $sql .= ", ".MAIN_DB_PREFIX."product as o";
         elseif (is_object($filterobj) && get_class($filterobj) == 'Ticket') $sql .= ", ".MAIN_DB_PREFIX."ticket as o";
         elseif (is_object($filterobj) && get_class($filterobj) == 'BOM') $sql .= ", ".MAIN_DB_PREFIX."bom_bom as o";
         elseif (is_object($filterobj) && get_class($filterobj) == 'Contrat') $sql .= ", ".MAIN_DB_PREFIX."contrat as o";
+        elseif (is_object($filterobj) && is_array($filterobj->fields) && is_array($filterobj->fields['rowid']) && is_array($filterobj->fields['ref']) && $filterobj->table_element && $filterobj->element) $sql .= ", ".MAIN_DB_PREFIX.$filterobj->table_element." as o";
 
         $sql .= " WHERE a.entity IN (".getEntity('agenda').")";
         if ($force_filter_contact === false) {
             if (is_object($filterobj) && in_array(get_class($filterobj), array('Societe', 'Client', 'Fournisseur')) && $filterobj->id) $sql .= " AND a.fk_soc = ".$filterobj->id;
+            elseif (is_object($filterobj) && get_class($filterobj) == 'Dolresource') { /* Nothing */ }
             elseif (is_object($filterobj) && get_class($filterobj) == 'Project' && $filterobj->id) $sql .= " AND a.fk_project = ".$filterobj->id;
             elseif (is_object($filterobj) && get_class($filterobj) == 'Adherent')
             {
@@ -1394,6 +1401,11 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = '', $noprin
             	$sql .= " AND a.fk_element = o.rowid AND a.elementtype = 'contract'";
             	if ($filterobj->id) $sql .= " AND a.fk_element = ".$filterobj->id;
             }
+            elseif (is_object($filterobj) && is_array($filterobj->fields) && is_array($filterobj->fields['rowid']) && is_array($filterobj->fields['ref']) && $filterobj->table_element && $filterobj->element)
+            {
+            	$sql .= " AND a.fk_element = o.rowid AND a.elementtype = '".$db->escape($filterobj->element)."'";
+            	if ($filterobj->id) $sql .= " AND a.fk_element = ".$filterobj->id;
+            }
         }
 
         // Condition on actioncode
@@ -1612,7 +1624,7 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = '', $noprin
 		$caction = new CActionComm($db);
 		$arraylist = $caction->liste_array(1, 'code', '', (empty($conf->global->AGENDA_USE_EVENT_TYPE) ? 1 : 0), '', 1);
 
-        foreach ($histo as $key=>$value)
+        foreach ($histo as $key => $value)
         {
 			$actionstatic->fetch($histo[$key]['id']); // TODO Do we need this, we already have a lot of data of line into $histo
 
@@ -1693,13 +1705,13 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = '', $noprin
 
             // Date
             $out .= '<td class="center nowrap">';
-            $out .= dol_print_date($histo[$key]['datestart'], 'dayhour');
+            $out .= dol_print_date($histo[$key]['datestart'], 'dayhour', 'tzuserrel');
             if ($histo[$key]['dateend'] && $histo[$key]['dateend'] != $histo[$key]['datestart'])
             {
                 $tmpa = dol_getdate($histo[$key]['datestart'], true);
                 $tmpb = dol_getdate($histo[$key]['dateend'], true);
-                if ($tmpa['mday'] == $tmpb['mday'] && $tmpa['mon'] == $tmpb['mon'] && $tmpa['year'] == $tmpb['year']) $out .= '-'.dol_print_date($histo[$key]['dateend'], 'hour');
-                else $out .= '-'.dol_print_date($histo[$key]['dateend'], 'dayhour');
+                if ($tmpa['mday'] == $tmpb['mday'] && $tmpa['mon'] == $tmpb['mon'] && $tmpa['year'] == $tmpb['year']) $out .= '-'.dol_print_date($histo[$key]['dateend'], 'hour', 'tzuserrel');
+                else $out .= '-'.dol_print_date($histo[$key]['dateend'], 'dayhour', 'tzuserrel');
             }
             $late = 0;
             if ($histo[$key]['percent'] == 0 && $histo[$key]['datestart'] && $histo[$key]['datestart'] < ($now - $delay_warning)) $late = 1;
@@ -1712,7 +1724,7 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = '', $noprin
             // Title of event
             //$out.='<td>'.dol_trunc($histo[$key]['note'], 40).'</td>';
 
-            // Objet lie
+            // Linked object
             $out .= '<td>';
             if (isset($histo[$key]['elementtype']) && !empty($histo[$key]['fk_element']))
             {
@@ -1721,7 +1733,7 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = '', $noprin
             else $out .= '&nbsp;';
             $out .= '</td>';
 
-            // Contact pour cette action
+            // Contact(s) for action
             if (empty($objcon->id) && isset($histo[$key]['contact_id']) && $histo[$key]['contact_id'] > 0)
             {
                 $contactstatic->lastname = $histo[$key]['lastname'];
@@ -1730,15 +1742,15 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = '', $noprin
                 $out .= '<td width="120">'.$contactstatic->getNomUrl(1, '', 10).'</td>';
             } elseif (isset($histo[$key]['socpeopleassigned']) && is_array($histo[$key]['socpeopleassigned']) && count($histo[$key]['socpeopleassigned']) > 0) {
 				$out .= '<td>';
-				foreach ($histo[$key]['socpeopleassigned'] as $cid => $Tab) {
-					$contact = new Contact($db);
+				$contact = new Contact($db);
+				foreach ($histo[$key]['socpeopleassigned'] as $cid => $value) {
 					$result = $contact->fetch($cid);
 
 					if ($result < 0)
 						dol_print_error($db, $contact->error);
 
 					if ($result > 0) {
-						$out .= $contact->getNomUrl(1);
+						$out .= $contact->getNomUrl(1, '', 16);
 						if (isset($histo[$key]['acode']) && $histo[$key]['acode'] == 'AC_TEL') {
 							if (!empty($contact->phone_pro))
 								$out .= '('.dol_print_phone($contact->phone_pro).')';

htdocs/core/lib/files.lib.php

@@ -2082,9 +2082,10 @@ function dol_uncompress($inputfile, $outputdir)
  * @param 	string	$outputfile		Target file name (output directory must exists and be writable)
  * @param 	string	$mode			'zip'
  * @param	string	$excludefiles   A regex pattern. For example: '/\.log$|\/temp\//'
+ * @param	string	$rootdirinzip	Add a root dir level in zip file
  * @return	int						<0 if KO, >0 if OK
  */
-function dol_compress_dir($inputdir, $outputfile, $mode = "zip", $excludefiles = '')
+function dol_compress_dir($inputdir, $outputfile, $mode = "zip", $excludefiles = '', $rootdirinzip = '')
 {
 	$foundhandler=0;
 
@@ -2145,7 +2146,8 @@ function dol_compress_dir($inputdir, $outputfile, $mode = "zip", $excludefiles =
 					{
 						// Get real and relative path for current file
 						$filePath = $file->getRealPath();
-						$relativePath = substr($filePath, strlen($inputdir) + 1);
+						$relativePath = ($rootdirinzip ? $rootdirinzip.'/' : '').substr($filePath, strlen($inputdir) + 1);
+
 						if (empty($excludefiles) || ! preg_match($excludefiles, $filePath))
 						{
 							// Add current file to archive

htdocs/core/lib/functions.lib.php

@@ -838,7 +838,7 @@ function dol_sanitizeFileName($str, $newstr = '_', $unaccent = 1)
 function dol_sanitizePathName($str, $newstr = '_', $unaccent = 1)
 {
 	$filesystem_forbidden_chars = array('<', '>', '?', '*', '|', '"', '°');
-	return dol_string_nospecial($unaccent ?dol_string_unaccent($str) : $str, $newstr, $filesystem_forbidden_chars);
+	return dol_string_nospecial($unaccent ? dol_string_unaccent($str) : $str, $newstr, $filesystem_forbidden_chars);
 }
 
 /**
@@ -1561,13 +1561,13 @@ function dol_banner_tab($object, $paramid, $morehtml = '', $shownav = 1, $fieldi
 	}
 
 	// Add if object was dispatched "into accountancy"
-	if (!empty($conf->accounting->enabled) && in_array($object->element, array('bank', 'facture', 'invoice', 'invoice_supplier', 'expensereport')))
+	if (!empty($conf->accounting->enabled) && in_array($object->element, array('bank', 'facture', 'invoice', 'invoice_supplier', 'expensereport', 'payment_various')))
 	{
 		if (method_exists($object, 'getVentilExportCompta'))
 		{
 			$accounted = $object->getVentilExportCompta();
 			$langs->load("accountancy");
-			$morehtmlstatus .= '</div><div class="statusref statusrefbis">'.($accounted > 0 ? $langs->trans("Accounted") : '<span class="opacitymedium">'.$langs->trans("NotYetAccounted").'</span>');
+			$morehtmlstatus .= '</div><div class="statusref statusrefbis"><span class="opacitymedium">'.($accounted > 0 ? $langs->trans("Accounted") : $langs->trans("NotYetAccounted")).'</span>';
 		}
 	}
 
@@ -1639,13 +1639,14 @@ function dol_bc($var, $moreclass = '')
 }
 
 /**
- *      Return a formated address (part address/zip/town/state) according to country rules
+ *      Return a formated address (part address/zip/town/state) according to country rules.
+ *      See https://en.wikipedia.org/wiki/Address
  *
  *      @param  Object		$object			A company or contact object
- * 	    @param	int			$withcountry		1=Add country into address string
- *      @param	string		$sep				Separator to use to build string
- *      @param	Translate	$outputlangs		Object lang that contains language for text translation.
- *      @param	int		$mode		0=Standard output, 1=Remove address
+ * 	    @param	int			$withcountry	1=Add country into address string
+ *      @param	string		$sep			Separator to use to build string
+ *      @param	Translate	$outputlangs	Object lang that contains language for text translation.
+ *      @param	int			$mode			0=Standard output, 1=Remove address
  *      @return string						Formated string
  *      @see dol_print_address()
  */
@@ -1656,6 +1657,8 @@ function dol_format_address($object, $withcountry = 0, $sep = "\n", $outputlangs
 	$ret = '';
 	$countriesusingstate = array('AU', 'CA', 'US', 'IN', 'GB', 'ES', 'UK', 'TR'); // See also MAIN_FORCE_STATE_INTO_ADDRESS
 
+	// See format of addresses on https://en.wikipedia.org/wiki/Address
+
 	// Address
 	if (empty($mode)) {
 		$ret .= $object->address;
@@ -1692,7 +1695,7 @@ function dol_format_address($object, $withcountry = 0, $sep = "\n", $outputlangs
 	{
 		$ret .= ($ret ? $sep : '').$object->zip;
 		$ret .= ($object->town ? (($object->zip ? ' ' : '').$object->town) : '');
-		$ret .= ($object->state_id ? (' ('.($object->state_id).')') : '');
+		$ret .= ($object->state_code ? (' '.($object->state_code)) : '');
 	}
 	else                                        		// Other: title firstname name \n address lines \n zip town \n country
 	{
@@ -3099,7 +3102,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 				$fakey = 'fa-'.$arrayconvpictotofa[$pictowithouttext];
 			}
 			elseif ($pictowithouttext == 'switch_on') {
-				$morecss = 'font-status4';
+				$morecss .= ($morecss ? ' ' : '').'font-status4';
 				$fakey = 'fa-'.$arrayconvpictotofa[$pictowithouttext];
 			}
 			elseif ($pictowithouttext == 'off') {
@@ -6036,6 +6039,7 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null,
 			$substitutionarray['__REFCLIENT__'] = (isset($object->ref_client) ? $object->ref_client : (isset($object->ref_customer) ? $object->ref_customer : null));
 			$substitutionarray['__REFSUPPLIER__'] = (isset($object->ref_supplier) ? $object->ref_supplier : null);
 			$substitutionarray['__SUPPLIER_ORDER_DATE_DELIVERY__'] = (isset($object->date_livraison) ? dol_print_date($object->date_livraison, 'day', 0, $outputlangs) : '');
+			$substitutionarray['__SUPPLIER_ORDER_DELAY_DELIVERY__'] = (isset($object->availability_code) ? $outputlangs->transnoentities("AvailabilityType".$object->availability_code) : '');
 
 			$birthday = dol_print_date($object->birth, 'day');
 
@@ -7661,6 +7665,7 @@ function natural_search($fields, $value, $mode = 0, $nofirstand = 0)
 				$operator = '=';
 				$newcrit = preg_replace('/([<>=]+)/', '', trim($crit));
 
+				$reg = array();
 				preg_match('/([<>=]+)/', trim($crit), $reg);
 				if ($reg[1])
 				{

htdocs/core/lib/functions2.lib.php

@@ -573,7 +573,7 @@ function isValidVATID($company)
         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)))
+        if (!preg_match('/^'.$vatprefix.'[a-zA-Z0-9\-\.]{5,14}$/i', str_replace(' ', '', $company->tva_intra)))
         {
             return 0;
         }
@@ -732,17 +732,17 @@ function array2table($data, $tableMarkup = 1, $tableoptions = '', $troptions = '
  */
 function get_next_value($db, $mask, $table, $field, $where = '', $objsoc = '', $date = '', $mode = 'next', $bentityon = true, $objuser = null, $forceentity = null)
 {
-    global $conf,$user;
+    global $conf, $user;
 
-    if (! is_object($objsoc)) $valueforccc=$objsoc;
-    elseif ($table == "commande_fournisseur" || $table == "facture_fourn" ) $valueforccc=dol_string_unaccent($objsoc->code_fournisseur);
-    else $valueforccc=dol_string_unaccent($objsoc->code_client);
+    if (!is_object($objsoc)) $valueforccc = $objsoc;
+    elseif ($table == "commande_fournisseur" || $table == "facture_fourn") $valueforccc = dol_string_unaccent($objsoc->code_fournisseur);
+    else $valueforccc = dol_string_unaccent($objsoc->code_client);
 
     $sharetable = $table;
     if ($table == 'facture' || $table == 'invoice') $sharetable = 'invoicenumber'; // for getEntity function
 
     // Clean parameters
-    if ($date == '') $date=dol_now();	// We use local year and month of PHP server to search numbers
+    if ($date == '') $date = dol_now(); // We use local year and month of PHP server to search numbers
     // but we should use local year and month of user
 
     // For debugging
@@ -811,73 +811,73 @@ function get_next_value($db, $mask, $table, $field, $where = '', $objsoc = '', $
     	$lastname = 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX';
     	if (is_object($objuser)) $lastname = $objuser->lastname;
 
-    	$maskuser=$regType[1];
-    	$maskuser_value=substr($lastname, 0, dol_strlen($regType[1]));// get n first characters of user firstname (where n is length in mask)
-    	$maskuser_value=str_pad($maskuser_value, dol_strlen($regType[1]), "#", STR_PAD_RIGHT);				 // we fill on right with # to have same number of char than into mask
+    	$maskuser = $regType[1];
+    	$maskuser_value = substr($lastname, 0, dol_strlen($regType[1])); // get n first characters of user firstname (where n is length in mask)
+    	$maskuser_value = str_pad($maskuser_value, dol_strlen($regType[1]), "#", STR_PAD_RIGHT); // we fill on right with # to have same number of char than into mask
     }
     else
     {
-    	$maskuser='';
-    	$maskuser_value='';
+    	$maskuser = '';
+    	$maskuser_value = '';
     }
 
     // Personalized field {XXX-1} à {XXX-9}
-    $maskperso=array();
-    $maskpersonew=array();
-    $tmpmask=$mask;
+    $maskperso = array();
+    $maskpersonew = array();
+    $tmpmask = $mask;
     while (preg_match('/\{([A-Z]+)\-([1-9])\}/', $tmpmask, $regKey))
     {
-        $maskperso[$regKey[1]]='{'.$regKey[1].'-'.$regKey[2].'}';
-        $maskpersonew[$regKey[1]]=str_pad('', $regKey[2], '_', STR_PAD_RIGHT);
-        $tmpmask=preg_replace('/\{'.$regKey[1].'\-'.$regKey[2].'\}/i', $maskpersonew[$regKey[1]], $tmpmask);
+        $maskperso[$regKey[1]] = '{'.$regKey[1].'-'.$regKey[2].'}';
+        $maskpersonew[$regKey[1]] = str_pad('', $regKey[2], '_', STR_PAD_RIGHT);
+        $tmpmask = preg_replace('/\{'.$regKey[1].'\-'.$regKey[2].'\}/i', $maskpersonew[$regKey[1]], $tmpmask);
     }
 
     if (strstr($mask, 'user_extra_'))
     {
 		$start = "{user_extra_";
 		$end = "\}";
-		$extra= get_string_between($mask, "user_extra_", "}");
+		$extra = get_string_between($mask, "user_extra_", "}");
 		if (!empty($user->array_options['options_'.$extra])) {
-			$mask =  preg_replace('#('.$start.')(.*?)('.$end.')#si', $user->array_options['options_'.$extra], $mask);
+			$mask = preg_replace('#('.$start.')(.*?)('.$end.')#si', $user->array_options['options_'.$extra], $mask);
 		}
     }
-    $maskwithonlyymcode=$mask;
-    $maskwithonlyymcode=preg_replace('/\{(0+)([@\+][0-9\-\+\=]+)?([@\+][0-9\-\+\=]+)?\}/i', $maskcounter, $maskwithonlyymcode);
-    $maskwithonlyymcode=preg_replace('/\{dd\}/i', 'dd', $maskwithonlyymcode);
-    $maskwithonlyymcode=preg_replace('/\{(c+)(0*)\}/i', $maskrefclient, $maskwithonlyymcode);
-    $maskwithonlyymcode=preg_replace('/\{(t+)\}/i', $masktype_value, $maskwithonlyymcode);
-    $maskwithonlyymcode=preg_replace('/\{(u+)\}/i', $maskuser_value, $maskwithonlyymcode);
-    foreach($maskperso as $key => $val)
+    $maskwithonlyymcode = $mask;
+    $maskwithonlyymcode = preg_replace('/\{(0+)([@\+][0-9\-\+\=]+)?([@\+][0-9\-\+\=]+)?\}/i', $maskcounter, $maskwithonlyymcode);
+    $maskwithonlyymcode = preg_replace('/\{dd\}/i', 'dd', $maskwithonlyymcode);
+    $maskwithonlyymcode = preg_replace('/\{(c+)(0*)\}/i', $maskrefclient, $maskwithonlyymcode);
+    $maskwithonlyymcode = preg_replace('/\{(t+)\}/i', $masktype_value, $maskwithonlyymcode);
+    $maskwithonlyymcode = preg_replace('/\{(u+)\}/i', $maskuser_value, $maskwithonlyymcode);
+    foreach ($maskperso as $key => $val)
     {
-        $maskwithonlyymcode=preg_replace('/'.preg_quote($val, '/').'/i', $maskpersonew[$key], $maskwithonlyymcode);
+        $maskwithonlyymcode = preg_replace('/'.preg_quote($val, '/').'/i', $maskpersonew[$key], $maskwithonlyymcode);
     }
-    $maskwithnocode=$maskwithonlyymcode;
-    $maskwithnocode=preg_replace('/\{yyyy\}/i', 'yyyy', $maskwithnocode);
-    $maskwithnocode=preg_replace('/\{yy\}/i', 'yy', $maskwithnocode);
-    $maskwithnocode=preg_replace('/\{y\}/i', 'y', $maskwithnocode);
-    $maskwithnocode=preg_replace('/\{mm\}/i', 'mm', $maskwithnocode);
+    $maskwithnocode = $maskwithonlyymcode;
+    $maskwithnocode = preg_replace('/\{yyyy\}/i', 'yyyy', $maskwithnocode);
+    $maskwithnocode = preg_replace('/\{yy\}/i', 'yy', $maskwithnocode);
+    $maskwithnocode = preg_replace('/\{y\}/i', 'y', $maskwithnocode);
+    $maskwithnocode = preg_replace('/\{mm\}/i', 'mm', $maskwithnocode);
     // Now maskwithnocode = 0000ddmmyyyyccc for example
     // and maskcounter    = 0000 for example
     //print "maskwithonlyymcode=".$maskwithonlyymcode." maskwithnocode=".$maskwithnocode."\n<br>";
     //var_dump($reg);
 
     // If an offset is asked
-    if (! empty($reg[2]) && preg_match('/^\+/', $reg[2])) $maskoffset=preg_replace('/^\+/', '', $reg[2]);
-    if (! empty($reg[3]) && preg_match('/^\+/', $reg[3])) $maskoffset=preg_replace('/^\+/', '', $reg[3]);
+    if (!empty($reg[2]) && preg_match('/^\+/', $reg[2])) $maskoffset = preg_replace('/^\+/', '', $reg[2]);
+    if (!empty($reg[3]) && preg_match('/^\+/', $reg[3])) $maskoffset = preg_replace('/^\+/', '', $reg[3]);
 
     // Define $sqlwhere
-    $sqlwhere='';
-    $yearoffset=0;	// Use year of current $date by default
-    $yearoffsettype=false;		// false: no reset, 0,-,=,+: reset at offset SOCIETE_FISCAL_MONTH_START, x=reset at offset x
+    $sqlwhere = '';
+    $yearoffset = 0; // Use year of current $date by default
+    $yearoffsettype = false; // false: no reset, 0,-,=,+: reset at offset SOCIETE_FISCAL_MONTH_START, x=reset at offset x
 
     // If a restore to zero after a month is asked we check if there is already a value for this year.
-    if (! empty($reg[2]) && preg_match('/^@/', $reg[2]))	$yearoffsettype = preg_replace('/^@/', '', $reg[2]);
-    if (! empty($reg[3]) && preg_match('/^@/', $reg[3]))	$yearoffsettype = preg_replace('/^@/', '', $reg[3]);
+    if (!empty($reg[2]) && preg_match('/^@/', $reg[2]))	$yearoffsettype = preg_replace('/^@/', '', $reg[2]);
+    if (!empty($reg[3]) && preg_match('/^@/', $reg[3]))	$yearoffsettype = preg_replace('/^@/', '', $reg[3]);
 
     //print "yearoffset=".$yearoffset." yearoffsettype=".$yearoffsettype;
     if (is_numeric($yearoffsettype) && $yearoffsettype >= 1)
-        $maskraz=$yearoffsettype; // For backward compatibility
-    elseif ($yearoffsettype === '0' || (! empty($yearoffsettype) && ! is_numeric($yearoffsettype) && $conf->global->SOCIETE_FISCAL_MONTH_START > 1))
+        $maskraz = $yearoffsettype; // For backward compatibility
+    elseif ($yearoffsettype === '0' || (!empty($yearoffsettype) && !is_numeric($yearoffsettype) && $conf->global->SOCIETE_FISCAL_MONTH_START > 1))
         $maskraz = $conf->global->SOCIETE_FISCAL_MONTH_START;
     //print "maskraz=".$maskraz;	// -1=no reset
 
@@ -1161,24 +1161,24 @@ function get_next_value($db, $mask, $table, $field, $where = '', $objsoc = '', $
         if ($maskrefclient)
         {
             //print "maskrefclient=".$maskrefclient." maskwithonlyymcode=".$maskwithonlyymcode." maskwithnocode=".$maskwithnocode." maskrefclient_clientcode=".$maskrefclient_clientcode."\n<br>";exit;
-            $maskrefclient_maskbefore='{'.$maskrefclient.'}';
-            $maskrefclient_maskafter=$maskrefclient_clientcode.str_pad($maskrefclient_counter, dol_strlen($maskrefclient_maskcounter), "0", STR_PAD_LEFT);
+            $maskrefclient_maskbefore = '{'.$maskrefclient.'}';
+            $maskrefclient_maskafter = $maskrefclient_clientcode.str_pad($maskrefclient_counter, dol_strlen($maskrefclient_maskcounter), "0", STR_PAD_LEFT);
             $numFinal = str_replace($maskrefclient_maskbefore, $maskrefclient_maskafter, $numFinal);
         }
 
         // Now we replace the type
         if ($masktype)
         {
-            $masktype_maskbefore='{'.$masktype.'}';
-            $masktype_maskafter=$masktype_value;
+            $masktype_maskbefore = '{'.$masktype.'}';
+            $masktype_maskafter = $masktype_value;
             $numFinal = str_replace($masktype_maskbefore, $masktype_maskafter, $numFinal);
         }
 
         // Now we replace the user
         if ($maskuser)
         {
-        	$maskuser_maskbefore='{'.$maskuser.'}';
-        	$maskuser_maskafter=$maskuser_value;
+        	$maskuser_maskbefore = '{'.$maskuser.'}';
+        	$maskuser_maskafter = $maskuser_value;
         	$numFinal = str_replace($maskuser_maskbefore, $maskuser_maskafter, $numFinal);
         }
     }
@@ -1214,69 +1214,69 @@ function get_string_between($string, $start, $end)
  */
 function check_value($mask, $value)
 {
-    $result=0;
+    $result = 0;
 
-    $hasglobalcounter=false;
+    $hasglobalcounter = false;
     // Extract value for mask counter, mask raz and mask offset
     if (preg_match('/\{(0+)([@\+][0-9]+)?([@\+][0-9]+)?\}/i', $mask, $reg))
     {
-        $masktri=$reg[1].(isset($reg[2])?$reg[2]:'').(isset($reg[3])?$reg[3]:'');
-        $maskcounter=$reg[1];
-        $hasglobalcounter=true;
+        $masktri = $reg[1].(isset($reg[2]) ? $reg[2] : '').(isset($reg[3]) ? $reg[3] : '');
+        $maskcounter = $reg[1];
+        $hasglobalcounter = true;
     }
     else
     {
         // setting some defaults so the rest of the code won't fail if there is a third party counter
-        $masktri='00000';
-        $maskcounter='00000';
+        $masktri = '00000';
+        $maskcounter = '00000';
     }
 
-    $maskraz=-1;
-    $maskoffset=0;
+    $maskraz = -1;
+    $maskoffset = 0;
     if (dol_strlen($maskcounter) < 3) return 'ErrorCounterMustHaveMoreThan3Digits';
 
     // Extract value for third party mask counter
     if (preg_match('/\{(c+)(0*)\}/i', $mask, $regClientRef))
     {
-        $maskrefclient=$regClientRef[1].$regClientRef[2];
-        $maskrefclient_maskclientcode=$regClientRef[1];
-        $maskrefclient_maskcounter=$regClientRef[2];
-        $maskrefclient_maskoffset=0; //default value of maskrefclient_counter offset
-        $maskrefclient_clientcode=substr('', 0, dol_strlen($maskrefclient_maskclientcode));//get n first characters of client code to form maskrefclient_clientcode
-        $maskrefclient_clientcode=str_pad($maskrefclient_clientcode, dol_strlen($maskrefclient_maskclientcode), "#", STR_PAD_RIGHT);//padding maskrefclient_clientcode for having exactly n characters in maskrefclient_clientcode
-        $maskrefclient_clientcode=dol_string_nospecial($maskrefclient_clientcode);//sanitize maskrefclient_clientcode for sql insert and sql select like
+        $maskrefclient = $regClientRef[1].$regClientRef[2];
+        $maskrefclient_maskclientcode = $regClientRef[1];
+        $maskrefclient_maskcounter = $regClientRef[2];
+        $maskrefclient_maskoffset = 0; //default value of maskrefclient_counter offset
+        $maskrefclient_clientcode = substr('', 0, dol_strlen($maskrefclient_maskclientcode)); //get n first characters of client code to form maskrefclient_clientcode
+        $maskrefclient_clientcode = str_pad($maskrefclient_clientcode, dol_strlen($maskrefclient_maskclientcode), "#", STR_PAD_RIGHT); //padding maskrefclient_clientcode for having exactly n characters in maskrefclient_clientcode
+        $maskrefclient_clientcode = dol_string_nospecial($maskrefclient_clientcode); //sanitize maskrefclient_clientcode for sql insert and sql select like
         if (dol_strlen($maskrefclient_maskcounter) > 0 && dol_strlen($maskrefclient_maskcounter) < 3) return 'ErrorCounterMustHaveMoreThan3Digits';
     }
-    else $maskrefclient='';
+    else $maskrefclient = '';
 
     // fail if there is neither a global nor a third party counter
-    if (! $hasglobalcounter && ($maskrefclient_maskcounter == ''))
+    if (!$hasglobalcounter && ($maskrefclient_maskcounter == ''))
     {
         return 'ErrorBadMask';
     }
 
-    $maskwithonlyymcode=$mask;
-    $maskwithonlyymcode=preg_replace('/\{(0+)([@\+][0-9]+)?([@\+][0-9]+)?\}/i', $maskcounter, $maskwithonlyymcode);
-    $maskwithonlyymcode=preg_replace('/\{dd\}/i', 'dd', $maskwithonlyymcode);
-    $maskwithonlyymcode=preg_replace('/\{(c+)(0*)\}/i', $maskrefclient, $maskwithonlyymcode);
-    $maskwithnocode=$maskwithonlyymcode;
-    $maskwithnocode=preg_replace('/\{yyyy\}/i', 'yyyy', $maskwithnocode);
-    $maskwithnocode=preg_replace('/\{yy\}/i', 'yy', $maskwithnocode);
-    $maskwithnocode=preg_replace('/\{y\}/i', 'y', $maskwithnocode);
-    $maskwithnocode=preg_replace('/\{mm\}/i', 'mm', $maskwithnocode);
+    $maskwithonlyymcode = $mask;
+    $maskwithonlyymcode = preg_replace('/\{(0+)([@\+][0-9]+)?([@\+][0-9]+)?\}/i', $maskcounter, $maskwithonlyymcode);
+    $maskwithonlyymcode = preg_replace('/\{dd\}/i', 'dd', $maskwithonlyymcode);
+    $maskwithonlyymcode = preg_replace('/\{(c+)(0*)\}/i', $maskrefclient, $maskwithonlyymcode);
+    $maskwithnocode = $maskwithonlyymcode;
+    $maskwithnocode = preg_replace('/\{yyyy\}/i', 'yyyy', $maskwithnocode);
+    $maskwithnocode = preg_replace('/\{yy\}/i', 'yy', $maskwithnocode);
+    $maskwithnocode = preg_replace('/\{y\}/i', 'y', $maskwithnocode);
+    $maskwithnocode = preg_replace('/\{mm\}/i', 'mm', $maskwithnocode);
     // Now maskwithnocode = 0000ddmmyyyyccc for example
     // and maskcounter    = 0000 for example
     //print "maskwithonlyymcode=".$maskwithonlyymcode." maskwithnocode=".$maskwithnocode."\n<br>";
 
     // If an offset is asked
-    if (! empty($reg[2]) && preg_match('/^\+/', $reg[2])) $maskoffset=preg_replace('/^\+/', '', $reg[2]);
-    if (! empty($reg[3]) && preg_match('/^\+/', $reg[3])) $maskoffset=preg_replace('/^\+/', '', $reg[3]);
+    if (!empty($reg[2]) && preg_match('/^\+/', $reg[2])) $maskoffset = preg_replace('/^\+/', '', $reg[2]);
+    if (!empty($reg[3]) && preg_match('/^\+/', $reg[3])) $maskoffset = preg_replace('/^\+/', '', $reg[3]);
 
     // Define $sqlwhere
 
     // If a restore to zero after a month is asked we check if there is already a value for this year.
-    if (! empty($reg[2]) && preg_match('/^@/', $reg[2]))  $maskraz=preg_replace('/^@/', '', $reg[2]);
-    if (! empty($reg[3]) && preg_match('/^@/', $reg[3]))  $maskraz=preg_replace('/^@/', '', $reg[3]);
+    if (!empty($reg[2]) && preg_match('/^@/', $reg[2]))  $maskraz = preg_replace('/^@/', '', $reg[2]);
+    if (!empty($reg[3]) && preg_match('/^@/', $reg[3]))  $maskraz = preg_replace('/^@/', '', $reg[3]);
     if ($maskraz >= 0)
     {
         if ($maskraz == 99) {
@@ -1286,8 +1286,8 @@ function check_value($mask, $value)
         if ($maskraz > 12) return 'ErrorBadMaskBadRazMonth';
 
         // Define reg
-        if ($maskraz > 1 && ! preg_match('/^(.*)\{(y+)\}\{(m+)\}/i', $maskwithonlyymcode, $reg)) return 'ErrorCantUseRazInStartedYearIfNoYearMonthInMask';
-        if ($maskraz <= 1 && ! preg_match('/^(.*)\{(y+)\}/i', $maskwithonlyymcode, $reg)) return 'ErrorCantUseRazIfNoYearInMask';
+        if ($maskraz > 1 && !preg_match('/^(.*)\{(y+)\}\{(m+)\}/i', $maskwithonlyymcode, $reg)) return 'ErrorCantUseRazInStartedYearIfNoYearMonthInMask';
+        if ($maskraz <= 1 && !preg_match('/^(.*)\{(y+)\}/i', $maskwithonlyymcode, $reg)) return 'ErrorCantUseRazIfNoYearInMask';
         //print "x".$maskwithonlyymcode." ".$maskraz;
     }
     //print "masktri=".$masktri." maskcounter=".$maskcounter." maskraz=".$maskraz." maskoffset=".$maskoffset."<br>\n";
@@ -1616,16 +1616,16 @@ function version_webserver()
  */
 function getListOfModels($db, $type, $maxfilenamelength = 0)
 {
-    global $conf,$langs;
-    $liste=array();
-    $found=0;
-    $dirtoscan='';
+    global $conf, $langs;
+    $liste = array();
+    $found = 0;
+    $dirtoscan = '';
 
     $sql = "SELECT nom as id, nom as doc_template_name, libelle as label, description as description";
-    $sql.= " FROM ".MAIN_DB_PREFIX."document_model";
-    $sql.= " WHERE type = '".$type."'";
-    $sql.= " AND entity IN (0,".$conf->entity.")";
-    $sql.= " ORDER BY description DESC";
+    $sql .= " FROM ".MAIN_DB_PREFIX."document_model";
+    $sql .= " WHERE type = '".$type."'";
+    $sql .= " AND entity IN (0,".$conf->entity.")";
+    $sql .= " ORDER BY description DESC";
 
     dol_syslog('/core/lib/function2.lib.php::getListOfModels', LOG_DEBUG);
     $resql = $db->query($sql);
@@ -1635,48 +1635,48 @@ function getListOfModels($db, $type, $maxfilenamelength = 0)
         $i = 0;
         while ($i < $num)
         {
-            $found=1;
+            $found = 1;
 
             $obj = $db->fetch_object($resql);
 
             // If this generation module needs to scan a directory, then description field is filled
             // with the constant that contains list of directories to scan (COMPANY_ADDON_PDF_ODT_PATH, ...).
-            if (! empty($obj->description))	// A list of directories to scan is defined
+            if (!empty($obj->description))	// A list of directories to scan is defined
             {
                 include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
-                $const=$obj->description;
+                $const = $obj->description;
                 //irtoscan.=($dirtoscan?',':'').preg_replace('/[\r\n]+/',',',trim($conf->global->$const));
-                $dirtoscan= preg_replace('/[\r\n]+/', ',', trim($conf->global->$const));
+                $dirtoscan = preg_replace('/[\r\n]+/', ',', trim($conf->global->$const));
 
-                $listoffiles=array();
+                $listoffiles = array();
 
                 // Now we add models found in directories scanned
-                $listofdir=explode(',', $dirtoscan);
-                foreach($listofdir as $key=>$tmpdir)
+                $listofdir = explode(',', $dirtoscan);
+                foreach ($listofdir as $key=>$tmpdir)
                 {
-                    $tmpdir=trim($tmpdir);
-                    $tmpdir=preg_replace('/DOL_DATA_ROOT/', DOL_DATA_ROOT, $tmpdir);
-                    if (! $tmpdir) { unset($listofdir[$key]); continue; }
+                    $tmpdir = trim($tmpdir);
+                    $tmpdir = preg_replace('/DOL_DATA_ROOT/', DOL_DATA_ROOT, $tmpdir);
+                    if (!$tmpdir) { unset($listofdir[$key]); continue; }
                     if (is_dir($tmpdir))
                     {
                         // all type of template is allowed
-                        $tmpfiles=dol_dir_list($tmpdir, 'files', 0, '', '', 'name', SORT_ASC, 0);
-                        if (count($tmpfiles)) $listoffiles=array_merge($listoffiles, $tmpfiles);
+                        $tmpfiles = dol_dir_list($tmpdir, 'files', 0, '', '', 'name', SORT_ASC, 0);
+                        if (count($tmpfiles)) $listoffiles = array_merge($listoffiles, $tmpfiles);
                     }
                 }
 
                 if (count($listoffiles))
                 {
-                    foreach($listoffiles as $record)
+                    foreach ($listoffiles as $record)
                     {
-                        $max=($maxfilenamelength?$maxfilenamelength:28);
-                        $liste[$obj->id.':'.$record['fullname']]=dol_trunc($record['name'], $max, 'middle');
+                        $max = ($maxfilenamelength ? $maxfilenamelength : 28);
+                        $liste[$obj->id.':'.$record['fullname']] = dol_trunc($record['name'], $max, 'middle');
                     }
                 }
                 else
                 {
-                    $liste[0]=$obj->label.': '.$langs->trans("None");
+                    $liste[0] = $obj->label.': '.$langs->trans("None");
                 }
             }
             else
@@ -1685,14 +1685,14 @@ function getListOfModels($db, $type, $maxfilenamelength = 0)
                 {
                     global $_Avery_Labels;
                     include_once DOL_DOCUMENT_ROOT.'/core/lib/format_cards.lib.php';
-                    foreach($_Avery_Labels as $key => $val)
+                    foreach ($_Avery_Labels as $key => $val)
                     {
-                    	$liste[$obj->id.':'.$key]=($obj->label?$obj->label:$obj->doc_template_name).' '.$val['name'];
+                    	$liste[$obj->id.':'.$key] = ($obj->label ? $obj->label : $obj->doc_template_name).' '.$val['name'];
                     }
                 }
                 else    // Common usage
                 {
-                	$liste[$obj->id]=$obj->label?$obj->label:$obj->doc_template_name;
+                	$liste[$obj->id] = $obj->label ? $obj->label : $obj->doc_template_name;
                 }
             }
             $i++;
@@ -1762,7 +1762,7 @@ function getSoapParams()
     $proxyport = (empty($conf->global->MAIN_PROXY_USE) ?false:$conf->global->MAIN_PROXY_PORT);
     $proxyuser = (empty($conf->global->MAIN_PROXY_USE) ?false:$conf->global->MAIN_PROXY_USER);
     $proxypass = (empty($conf->global->MAIN_PROXY_USE) ?false:$conf->global->MAIN_PROXY_PASS);
-    $timeout  = (empty($conf->global->MAIN_USE_CONNECT_TIMEOUT) ? 10 : $conf->global->MAIN_USE_CONNECT_TIMEOUT); // Connection timeout
+    $timeout = (empty($conf->global->MAIN_USE_CONNECT_TIMEOUT) ? 10 : $conf->global->MAIN_USE_CONNECT_TIMEOUT); // Connection timeout
     $response_timeout = (empty($conf->global->MAIN_USE_RESPONSE_TIMEOUT) ? 30 : $conf->global->MAIN_USE_RESPONSE_TIMEOUT); // Response timeout
     //print extension_loaded('soap');
     if ($proxyuse)
@@ -1797,7 +1797,7 @@ function getSoapParams()
  * Return link url to an object
  *
  * @param 	int		$objectid		Id of record
- * @param 	string	$objecttype		Type of object ('invoice', 'order', 'expedition_bon', ...)
+ * @param 	string	$objecttype		Type of object ('invoice', 'order', 'expedition_bon', 'myobject@mymodule', ...)
  * @param 	int		$withpicto		Picto to show
  * @param 	string	$option			More options
  * @return	string					URL of link to object id/type
@@ -1807,83 +1807,95 @@ function dolGetElementUrl($objectid, $objecttype, $withpicto = 0, $option = '')
 	global $db, $conf, $langs;
 
 	$ret = '';
+	$regs = array();
 
-	// Parse element/subelement (ex: project_task)
-	$module = $element = $subelement = $objecttype;
+	// If we ask an resource form external module (instead of default path)
+	if (preg_match('/^([^@]+)@([^@]+)$/i', $objecttype, $regs)) {
+		$myobject = $regs[1];
+		$module = $regs[2];
+	}
+
+	// Parse $objecttype (ex: project_task)
+	$module = $myobject = $objecttype;
 	if (preg_match('/^([^_]+)_([^_]+)/i', $objecttype, $regs))
 	{
-		$module = $element = $regs[1];
-		$subelement = $regs[2];
+		$module = $regs[1];
+		$myobject = $regs[2];
 	}
 
 	// Generic case for $classpath
-	$classpath = $element.'/class';
+	$classpath = $module.'/class';
 
 	// Special cases, to work with non standard path
 	if ($objecttype == 'facture' || $objecttype == 'invoice') {
 		$classpath = 'compta/facture/class';
-		$module='facture';
-		$subelement='facture';
+		$module = 'facture';
+		$myobject = 'facture';
 	}
 	elseif ($objecttype == 'commande' || $objecttype == 'order') {
 		$classpath = 'commande/class';
-		$module='commande';
-		$subelement='commande';
+		$module = 'commande';
+		$myobject = 'commande';
 	}
-	elseif ($objecttype == 'propal')  {
+	elseif ($objecttype == 'propal') {
 		$classpath = 'comm/propal/class';
 	}
-	elseif ($objecttype == 'supplier_proposal')  {
+	elseif ($objecttype == 'supplier_proposal') {
 		$classpath = 'supplier_proposal/class';
 	}
 	elseif ($objecttype == 'shipping') {
 		$classpath = 'expedition/class';
-		$subelement = 'expedition';
+		$myobject = 'expedition';
 		$module = 'expedition_bon';
 	}
 	elseif ($objecttype == 'delivery') {
 		$classpath = 'livraison/class';
-		$subelement = 'livraison';
+		$myobject = 'livraison';
 		$module = 'livraison_bon';
 	}
 	elseif ($objecttype == 'contract') {
 		$classpath = 'contrat/class';
-		$module='contrat';
-		$subelement='contrat';
+		$module = 'contrat';
+		$myobject = 'contrat';
 	}
 	elseif ($objecttype == 'member') {
 		$classpath = 'adherents/class';
-		$module='adherent';
-		$subelement='adherent';
+		$module = 'adherent';
+		$myobject = 'adherent';
 	}
 	elseif ($objecttype == 'cabinetmed_cons') {
 		$classpath = 'cabinetmed/class';
-		$module='cabinetmed';
-		$subelement='cabinetmedcons';
+		$module = 'cabinetmed';
+		$myobject = 'cabinetmedcons';
 	}
 	elseif ($objecttype == 'fichinter') {
 		$classpath = 'fichinter/class';
-		$module='ficheinter';
-		$subelement='fichinter';
+		$module = 'ficheinter';
+		$myobject = 'fichinter';
 	}
 	elseif ($objecttype == 'task') {
 		$classpath = 'projet/class';
-		$module='projet';
-		$subelement='task';
+		$module = 'projet';
+		$myobject = 'task';
 	}
 	elseif ($objecttype == 'stock') {
 		$classpath = 'product/stock/class';
-		$module='stock';
-		$subelement='stock';
+		$module = 'stock';
+		$myobject = 'stock';
 	}
 	elseif ($objecttype == 'inventory') {
 		$classpath = 'product/inventory/class';
-		$module='stock';
-		$subelement='inventory';
+		$module = 'stock';
+		$myobject = 'inventory';
+	}
+	elseif ($objecttype == 'mo') {
+		$classpath = 'mrp/class';
+		$module = 'mrp';
+		$myobject = 'mo';
 	}
 
 	// Generic case for $classfile and $classname
-	$classfile = strtolower($subelement); $classname = ucfirst($subelement);
+	$classfile = strtolower($myobject); $classname = ucfirst($myobject);
 	//print "objecttype=".$objecttype." module=".$module." subelement=".$subelement." classfile=".$classfile." classname=".$classname;
 
 	if ($objecttype == 'invoice_supplier') {
@@ -1903,6 +1915,7 @@ function dolGetElementUrl($objectid, $objecttype, $withpicto = 0, $option = '')
 		$classfile = 'entrepot';
 		$classname = 'Entrepot';
 	}
+
 	if (!empty($conf->$module->enabled))
 	{
 		$res = dol_include_once('/'.$classpath.'/'.$classfile.'.class.php');
@@ -2048,12 +2061,14 @@ function cleanCorruptedTree($db, $tabletocleantree, $fieldfkparent)
 /**
  *	Get an array with properties of an element
  *
- * @param   string 	$element_type 	Element type: 'action', 'facture', 'project_task' or 'object@modulext'...
+ * @param   string 	$element_type 	Element type: 'action', 'facture', 'project_task' or 'object@mymodule'...
  * @return  array					(module, classpath, element, subelement, classfile, classname)
  */
 function getElementProperties($element_type)
 {
-    // Parse element/subelement (ex: project_task)
+	$regs = array();
+
+	// Parse element/subelement (ex: project_task)
     $module = $element_type;
     $element = $element_type;
     $subelement = $element_type;
@@ -2242,9 +2257,9 @@ function colorStringToArray($stringcolor, $colorifnotfound = array(88, 88, 88))
  */
 function colorValidateHex($color, $allow_white = true)
 {
-    if(!$allow_white && ($color === '#fff' || $color === '#ffffff') ) return false;
+    if (!$allow_white && ($color === '#fff' || $color === '#ffffff')) return false;
 
-    if(preg_match('/^#[a-f0-9]{6}$/i', $color)) //hex color is valid
+    if (preg_match('/^#[a-f0-9]{6}$/i', $color)) //hex color is valid
     {
         return true;
     }
@@ -2262,7 +2277,7 @@ function colorValidateHex($color, $allow_white = true)
  */
 function colorAgressiveness($hex, $ratio = -50, $brightness = 0)
 {
-	if (empty($ratio)) $ratio = 0;	// To avoid null
+	if (empty($ratio)) $ratio = 0; // To avoid null
 
 	// Steps should be between -255 and 255. Negative = darker, positive = lighter
 	$ratio = max(-100, min(100, $ratio));
@@ -2278,7 +2293,7 @@ function colorAgressiveness($hex, $ratio = -50, $brightness = 0)
 	$return = '#';
 
 	foreach ($color_parts as $color) {
-		$color   = hexdec($color); // Convert to decimal
+		$color = hexdec($color); // Convert to decimal
 		if ($ratio > 0)	// We increase aggressivity
 		{
 			if ($color > 127) $color += ((255 - $color) * ($ratio / 100));
@@ -2592,9 +2607,9 @@ function convertBackOfficeMediasLinksToPublicLinks($notetoshow)
 {
     global $dolibarr_main_url_root;
     // Define $urlwithroot
-    $urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
-    $urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;		// This is to use external domain name found into config file
+    $urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
+    $urlwithroot = $urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain name found into config file
     //$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current
-    $notetoshow=preg_replace('/src="[a-zA-Z0-9_\/\-\.]*(viewimage\.php\?modulepart=medias[^"]*)"/', 'src="'.$urlwithroot.'/\1"', $notetoshow);
+    $notetoshow = preg_replace('/src="[a-zA-Z0-9_\/\-\.]*(viewimage\.php\?modulepart=medias[^"]*)"/', 'src="'.$urlwithroot.'/\1"', $notetoshow);
     return $notetoshow;
 }

htdocs/core/lib/project.lib.php

@@ -1072,7 +1072,7 @@ function projectLinesPerDay(&$inc, $parent, $fuser, $lines, &$level, &$projectsr
 					if ($projectstatic->title)
 					{
 						print ' - ';
-						print $projectstatic->title;
+						print '<span class="secondary">'.$projectstatic->title.'</span>';
 					}
 					/*
                     $colspan=5+(empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT)?0:2);
@@ -1451,7 +1451,7 @@ function projectLinesPerWeek(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &$
 					if ($projectstatic->title)
 					{
 						print ' - ';
-						print $projectstatic->title;
+						print '<span class="secondary">'.$projectstatic->title.'</span>';
 					}
 
                     /*$colspan=5+(empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT)?0:2);

htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php

@@ -4,7 +4,7 @@
  * Copyright (C) 2014		Marcos García		<marcosgdf@gmail.com>
  * Copyright (C) 2016		Charlie Benke		<charlie@patas-monkey.com>
  * Copyright (C) 2018-2019  Philippe Grand      <philippe.grand@atoo-net.com>
- * Copyright (C) 2018       Frédéric France     <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2019  Frédéric France     <frederic.france@netlogic.fr>
  *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -119,7 +119,7 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
 		$form = new Form($this->db);
 
 		$texte = $this->description.".<br>\n";
-		$texte .= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+		$texte .= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST" enctype="multipart/form-data">';
 		$texte .= '<input type="hidden" name="token" value="'.newToken().'">';
 		$texte .= '<input type="hidden" name="action" value="setModuleOptions">';
 		$texte .= '<input type="hidden" name="param1" value="EXPEDITION_ADDON_PDF_ODT_PATH">';
@@ -177,7 +177,11 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
    			}
    			$texte .= '</div>';
 		}
-
+        // Add input to upload a new template file.
+        $texte .= '<div>'.$langs->trans("UploadNewTemplate").' <input type="file" name="uploadfile">';
+        $texte .= '<input type="hidden" value="EXPEDITION_ADDON_PDF_ODT_PATH" name="keyforuploaddir">';
+        $texte .= '<input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("Upload")).'" name="upload">';
+        $texte .= '</div>';
 		$texte .= '</td>';
 
 		$texte .= '<td rowspan="2" class="tdtop hideonsmartphone">';

htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php

@@ -3,7 +3,7 @@
  * Copyright (C) 2012		Regis Houssin		<regis.houssin@inodbox.com>
  * Copyright (C) 2014		Marcos García		<marcosgdf@gmail.com>
  * Copyright (C) 2016		Charlie Benke		<charlie@patas-monkey.com>
- * Copyright (C) 2018		Frédéric France		<frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2019  Frédéric France		<frederic.france@netlogic.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -118,7 +118,7 @@ class doc_generic_invoice_odt extends ModelePDFFactures
 		$form = new Form($this->db);
 
 		$texte = $this->description.".<br>\n";
-		$texte .= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+		$texte .= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST" enctype="multipart/form-data">';
 		$texte .= '<input type="hidden" name="token" value="'.newToken().'">';
 		$texte .= '<input type="hidden" name="action" value="setModuleOptions">';
 		$texte .= '<input type="hidden" name="param1" value="FACTURE_ADDON_PDF_ODT_PATH">';
@@ -176,7 +176,11 @@ class doc_generic_invoice_odt extends ModelePDFFactures
    			}
    			$texte .= '</div>';
 		}
-
+        // Add input to upload a new template file.
+        $texte .= '<div>'.$langs->trans("UploadNewTemplate").' <input type="file" name="uploadfile">';
+        $texte .= '<input type="hidden" value="FACTURE_ADDON_PDF_ODT_PATH" name="keyforuploaddir">';
+        $texte .= '<input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("Upload")).'" name="upload">';
+        $texte .= '</div>';
 		$texte .= '</td>';
 
 		$texte .= '<td rowspan="2" class="tdtop hideonsmartphone">';

htdocs/core/modules/mailings/contacts1.modules.php

@@ -105,6 +105,8 @@ class mailing_contacts1 extends MailingTargets
 		$sql.= " WHERE c.entity IN (".getEntity('socpeople').")";
 		$sql.= " AND c.email != ''"; // Note that null != '' is false
 		$sql.= " AND c.no_email = 0";
+		$sql .= " AND (SELECT count(*) FROM ". MAIN_DB_PREFIX . "mailing_unsubscribe WHERE email = c.email) = 0";
+		// exclude unsubscribed users
 		$sql.= " AND c.statut = 1";
 
 		// The request must return a field called "nb" to be understandable by parent::getNbOfRecipients
@@ -384,6 +386,8 @@ class mailing_contacts1 extends MailingTargets
     	$sql.= " WHERE sp.entity IN (".getEntity('socpeople').")";
 		$sql.= " AND sp.email <> ''";
 		$sql.= " AND sp.no_email = 0";
+		$sql .= " AND (SELECT count(*) FROM ". MAIN_DB_PREFIX . "mailing_unsubscribe WHERE email = sp.email) = 0";
+		// Exclude unsubscribed email adresses
 		$sql.= " AND sp.statut = 1";
 		$sql.= " AND sp.email NOT IN (SELECT email FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE fk_mailing=".$mailing_id.")";
 		// Filter on category

htdocs/core/modules/modAgenda.class.php

@@ -219,165 +219,206 @@ class modAgenda extends DolibarrModules
         );
         $r++;
 
-		$this->menu[$r]=array('fk_menu'=>'r=0',
-													'type'=>'left',
-													'titre'=>'Actions',
-													'mainmenu'=>'agenda',
-													'url'=>'/comm/action/index.php?mainmenu=agenda&leftmenu=agenda',
-													'langs'=>'agenda',
-													'position'=>100,
-													'perms'=>'$user->rights->agenda->myactions->read',
-													'enabled'=>'$conf->agenda->enabled',
-													'target'=>'',
-													'user'=>2);
+		$this->menu[$r]=array(
+			'fk_menu'=>'r=0',
+			'type'=>'left',
+			'titre'=>'Actions',
+			'mainmenu'=>'agenda',
+			'url'=>'/comm/action/index.php?mainmenu=agenda&leftmenu=agenda',
+			'langs'=>'agenda',
+			'position'=>100,
+			'perms'=>'$user->rights->agenda->myactions->read',
+			'enabled'=>'$conf->agenda->enabled',
+			'target'=>'',
+			'user'=>2,
+		);
 		$r++;
-		$this->menu[$r]=array('fk_menu'=>'r=1',
-													'type'=>'left',
-													'titre'=>'NewAction',
-													'mainmenu'=>'agenda',
-													'url'=>'/comm/action/card.php?mainmenu=agenda&leftmenu=agenda&action=create',
-													'langs'=>'commercial',
-													'position'=>101,
-													'perms'=>'($user->rights->agenda->myactions->create||$user->rights->agenda->allactions->create)',
-													'enabled'=>'$conf->agenda->enabled',
-													'target'=>'',
-													'user'=>2);
+		$this->menu[$r]=array(
+			'fk_menu'=>'r=1',
+			'type'=>'left',
+			'titre'=>'NewAction',
+			'mainmenu'=>'agenda',
+			'url'=>'/comm/action/card.php?mainmenu=agenda&leftmenu=agenda&action=create',
+			'langs'=>'commercial',
+			'position'=>101,
+			'perms'=>'($user->rights->agenda->myactions->create||$user->rights->agenda->allactions->create)',
+			'enabled'=>'$conf->agenda->enabled',
+			'target'=>'',
+			'user'=>2
+		);
 		$r++;
 		// Calendar
-		$this->menu[$r]=array('fk_menu'=>'r=1',
-													'type'=>'left',
-													'titre'=>'Calendar',
-													'mainmenu'=>'agenda',
-													'url'=>'/comm/action/index.php?action=default&mainmenu=agenda&leftmenu=agenda',
-													'langs'=>'agenda',
-													'position'=>140,
-													'perms'=>'$user->rights->agenda->myactions->read',
-													'enabled'=>'$conf->agenda->enabled',
-													'target'=>'',
-													'user'=>2);
+		$this->menu[$r]=array(
+			'fk_menu'=>'r=1',
+			'type'=>'left',
+			'titre'=>'Calendar',
+			'mainmenu'=>'agenda',
+			'url'=>'/comm/action/index.php?action=default&mainmenu=agenda&leftmenu=agenda',
+			'langs'=>'agenda',
+			'position'=>140,
+			'perms'=>'$user->rights->agenda->myactions->read',
+			'enabled'=>'$conf->agenda->enabled',
+			'target'=>'',
+			'user'=>2
+		);
 		$r++;
-		$this->menu[$r]=array('fk_menu'=>'r=3',
-													'type'=>'left',
-													'titre'=>'MenuToDoMyActions',
-													'mainmenu'=>'agenda',
-													'url'=>'/comm/action/index.php?action=default&mainmenu=agenda&leftmenu=agenda&status=todo&filter=mine',
-													'langs'=>'agenda',
-													'position'=>141,
-													'perms'=>'$user->rights->agenda->myactions->read',
-													'enabled'=>'$conf->agenda->enabled',
-													'target'=>'',
-													'user'=>2);
+		$this->menu[$r]=array(
+			'fk_menu'=>'r=3',
+			'type'=>'left',
+			'titre'=>'MenuToDoMyActions',
+			'mainmenu'=>'agenda',
+			'url'=>'/comm/action/index.php?action=default&mainmenu=agenda&leftmenu=agenda&status=todo&filter=mine',
+			'langs'=>'agenda',
+			'position'=>141,
+			'perms'=>'$user->rights->agenda->myactions->read',
+			'enabled'=>'$conf->agenda->enabled',
+			'target'=>'',
+			'user'=>2
+		);
 		$r++;
-		$this->menu[$r]=array('fk_menu'=>'r=3',
-													'type'=>'left',
-													'titre'=>'MenuDoneMyActions',
-													'mainmenu'=>'agenda',
-													'url'=>'/comm/action/index.php?action=default&mainmenu=agenda&leftmenu=agenda&status=done&filter=mine',
-													'langs'=>'agenda',
-													'position'=>142,
-													'perms'=>'$user->rights->agenda->myactions->read',
-													'enabled'=>'$conf->agenda->enabled',
-													'target'=>'',
-													'user'=>2);
+		$this->menu[$r]=array(
+			'fk_menu'=>'r=3',
+			'type'=>'left',
+			'titre'=>'MenuDoneMyActions',
+			'mainmenu'=>'agenda',
+			'url'=>'/comm/action/index.php?action=default&mainmenu=agenda&leftmenu=agenda&status=done&filter=mine',
+			'langs'=>'agenda',
+			'position'=>142,
+			'perms'=>'$user->rights->agenda->myactions->read',
+			'enabled'=>'$conf->agenda->enabled',
+			'target'=>'',
+			'user'=>2
+		);
 		$r++;
-		$this->menu[$r]=array('fk_menu'=>'r=3',
-													'type'=>'left',
-													'titre'=>'MenuToDoActions',
-													'mainmenu'=>'agenda',
-													'url'=>'/comm/action/index.php?action=default&mainmenu=agenda&leftmenu=agenda&status=todo&filtert=-1',
-													'langs'=>'agenda',
-													'position'=>143,
-													'perms'=>'$user->rights->agenda->allactions->read',
-													'enabled'=>'$user->rights->agenda->allactions->read',
-													'target'=>'',
-													'user'=>2);
+		$this->menu[$r]=array(
+			'fk_menu'=>'r=3',
+			'type'=>'left',
+			'titre'=>'MenuToDoActions',
+			'mainmenu'=>'agenda',
+			'url'=>'/comm/action/index.php?action=default&mainmenu=agenda&leftmenu=agenda&status=todo&filtert=-1',
+			'langs'=>'agenda',
+			'position'=>143,
+			'perms'=>'$user->rights->agenda->allactions->read',
+			'enabled'=>'$user->rights->agenda->allactions->read',
+			'target'=>'',
+			'user'=>2
+		);
 		$r++;
-		$this->menu[$r]=array('fk_menu'=>'r=3',
-													'type'=>'left',
-													'titre'=>'MenuDoneActions',
-													'mainmenu'=>'agenda',
-													'url'=>'/comm/action/index.php?action=default&mainmenu=agenda&leftmenu=agenda&status=done&filtert=-1',
-													'langs'=>'agenda',
-													'position'=>144,
-													'perms'=>'$user->rights->agenda->allactions->read',
-													'enabled'=>'$user->rights->agenda->allactions->read',
-													'target'=>'',
-													'user'=>2);
+		$this->menu[$r]=array(
+			'fk_menu'=>'r=3',
+			'type'=>'left',
+			'titre'=>'MenuDoneActions',
+			'mainmenu'=>'agenda',
+			'url'=>'/comm/action/index.php?action=default&mainmenu=agenda&leftmenu=agenda&status=done&filtert=-1',
+			'langs'=>'agenda',
+			'position'=>144,
+			'perms'=>'$user->rights->agenda->allactions->read',
+			'enabled'=>'$user->rights->agenda->allactions->read',
+			'target'=>'',
+			'user'=>2
+		);
 
 		// List
 		$r++;
-		$this->menu[$r]=array('fk_menu'=>'r=1',
-													'type'=>'left',
-													'titre'=>'List',
-													'mainmenu'=>'agenda',
-													'url'=>'/comm/action/list.php?mainmenu=agenda&leftmenu=agenda',
-													'langs'=>'agenda',
-													'position'=>110,
-													'perms'=>'$user->rights->agenda->myactions->read',
-													'enabled'=>'$conf->agenda->enabled',
-													'target'=>'',
-													'user'=>2);
+		$this->menu[$r]=array(
+			'fk_menu'=>'r=1',
+			'type'=>'left',
+			'titre'=>'List',
+			'mainmenu'=>'agenda',
+			'url'=>'/comm/action/list.php?mainmenu=agenda&leftmenu=agenda',
+			'langs'=>'agenda',
+			'position'=>110,
+			'perms'=>'$user->rights->agenda->myactions->read',
+			'enabled'=>'$conf->agenda->enabled',
+			'target'=>'',
+			'user'=>2
+		);
 		$r++;
-		$this->menu[$r]=array('fk_menu'=>'r=8',
-													'type'=>'left',
-													'titre'=>'MenuToDoMyActions',
-													'mainmenu'=>'agenda',
-													'url'=>'/comm/action/list.php?mainmenu=agenda&leftmenu=agenda&status=todo&filter=mine',
-													'langs'=>'agenda',
-													'position'=>111,
-													'perms'=>'$user->rights->agenda->myactions->read',
-													'enabled'=>'$conf->agenda->enabled',
-													'target'=>'',
-													'user'=>2);
+		$this->menu[$r]=array(
+			'fk_menu'=>'r=8',
+			'type'=>'left',
+			'titre'=>'MenuToDoMyActions',
+			'mainmenu'=>'agenda',
+			'url'=>'/comm/action/list.php?mainmenu=agenda&leftmenu=agenda&status=todo&filter=mine',
+			'langs'=>'agenda',
+			'position'=>111,
+			'perms'=>'$user->rights->agenda->myactions->read',
+			'enabled'=>'$conf->agenda->enabled',
+			'target'=>'',
+			'user'=>2
+		);
 		$r++;
-		$this->menu[$r]=array('fk_menu'=>'r=8',
-													'type'=>'left',
-													'titre'=>'MenuDoneMyActions',
-													'mainmenu'=>'agenda',
-													'url'=>'/comm/action/list.php?mainmenu=agenda&leftmenu=agenda&status=done&filter=mine',
-													'langs'=>'agenda',
-													'position'=>112,
-													'perms'=>'$user->rights->agenda->myactions->read',
-													'enabled'=>'$conf->agenda->enabled',
-													'target'=>'',
-													'user'=>2);
+		$this->menu[$r]=array(
+			'fk_menu'=>'r=8',
+			'type'=>'left',
+			'titre'=>'MenuDoneMyActions',
+			'mainmenu'=>'agenda',
+			'url'=>'/comm/action/list.php?mainmenu=agenda&leftmenu=agenda&status=done&filter=mine',
+			'langs'=>'agenda',
+			'position'=>112,
+			'perms'=>'$user->rights->agenda->myactions->read',
+			'enabled'=>'$conf->agenda->enabled',
+			'target'=>'',
+			'user'=>2
+		);
 		$r++;
-		$this->menu[$r]=array('fk_menu'=>'r=8',
-													'type'=>'left',
-													'titre'=>'MenuToDoActions',
-													'mainmenu'=>'agenda',
-													'url'=>'/comm/action/list.php?mainmenu=agenda&leftmenu=agenda&status=todo&filtert=-1',
-													'langs'=>'agenda',
-													'position'=>113,
-													'perms'=>'$user->rights->agenda->allactions->read',
-													'enabled'=>'$user->rights->agenda->allactions->read',
-													'target'=>'',
-													'user'=>2);
+		$this->menu[$r]=array(
+			'fk_menu'=>'r=8',
+			'type'=>'left',
+			'titre'=>'MenuToDoActions',
+			'mainmenu'=>'agenda',
+			'url'=>'/comm/action/list.php?mainmenu=agenda&leftmenu=agenda&status=todo&filtert=-1',
+			'langs'=>'agenda',
+			'position'=>113,
+			'perms'=>'$user->rights->agenda->allactions->read',
+			'enabled'=>'$user->rights->agenda->allactions->read',
+			'target'=>'',
+			'user'=>2
+		);
 		$r++;
-		$this->menu[$r]=array('fk_menu'=>'r=8',
-													'type'=>'left',
-													'titre'=>'MenuDoneActions',
-													'mainmenu'=>'agenda',
-													'url'=>'/comm/action/list.php?mainmenu=agenda&leftmenu=agenda&status=done&filtert=-1',
-													'langs'=>'agenda',
-													'position'=>114,
-													'perms'=>'$user->rights->agenda->allactions->read',
-													'enabled'=>'$user->rights->agenda->allactions->read',
-													'target'=>'',
-													'user'=>2);
+		$this->menu[$r]=array(
+			'fk_menu'=>'r=8',
+			'type'=>'left',
+			'titre'=>'MenuDoneActions',
+			'mainmenu'=>'agenda',
+			'url'=>'/comm/action/list.php?mainmenu=agenda&leftmenu=agenda&status=done&filtert=-1',
+			'langs'=>'agenda',
+			'position'=>114,
+			'perms'=>'$user->rights->agenda->allactions->read',
+			'enabled'=>'$user->rights->agenda->allactions->read',
+			'target'=>'',
+			'user'=>2
+		);
 		$r++;
 		// Reports
-		$this->menu[$r]=array('fk_menu'=>'r=1',
-													'type'=>'left',
-													'titre'=>'Reportings',
-													'mainmenu'=>'agenda',
-													'url'=>'/comm/action/rapport/index.php?mainmenu=agenda&leftmenu=agenda',
-													'langs'=>'agenda',
-													'position'=>160,
-													'perms'=>'$user->rights->agenda->allactions->read',
-													'enabled'=>'$conf->agenda->enabled',
-													'target'=>'',
-													'user'=>2);
+		$this->menu[$r]=array(
+			'fk_menu'=>'r=1',
+			'type'=>'left',
+			'titre'=>'Reportings',
+			'mainmenu'=>'agenda',
+			'url'=>'/comm/action/rapport/index.php?mainmenu=agenda&leftmenu=agenda',
+			'langs'=>'agenda',
+			'position'=>160,
+			'perms'=>'$user->rights->agenda->allactions->read',
+			'enabled'=>'$conf->agenda->enabled',
+			'target'=>'',
+			'user'=>2
+		);
+		$r++;
+		// Categories
+		$this->menu[$r]=array(
+			'fk_menu' => 'r=1',
+			'type' => 'left',
+			'titre' => 'Categories',
+			'mainmenu' => 'agenda',
+			'url'=>'/categories/index.php?mainmenu=agenda&leftmenu=agenda&type=10',
+			'langs' => 'agenda',
+			'position' => 170,
+			'perms' => '$user->rights->agenda->allactions->read',
+			'enabled' => '$conf->categorie->enabled&&$conf->categorie->enabled',
+			'target' => '',
+			'user' => 2
+		);
 		$r++;
 
 
@@ -394,20 +435,26 @@ class modAgenda extends DolibarrModules
 			'cac.libelle'=>"ActionType",
 			's.rowid'=>"IdCompany",'s.nom'=>'CompanyName','s.address'=>'Address','s.zip'=>'Zip','s.town'=>'Town',
 			'co.code'=>'CountryCode','s.phone'=>'Phone','s.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3','s.idprof4'=>'ProfId4','s.idprof5'=>'ProfId5','s.idprof6'=>'ProfId6',
-			's.code_compta'=>'CustomerAccountancyCode','s.code_compta_fournisseur'=>'SupplierAccountancyCode','s.tva_intra'=>'VATIntra');
+			's.code_compta'=>'CustomerAccountancyCode','s.code_compta_fournisseur'=>'SupplierAccountancyCode','s.tva_intra'=>'VATIntra',
+			'p.ref' => 'ProjectRef',
+		);
 		$this->export_TypeFields_array[$r]=array('ac.ref_ext'=>"Text",'ac.datec'=>"Date",'ac.datep'=>"Date",
 			'ac.datep2'=>"Date",'ac.label'=>"Text",'ac.note'=>"Text",'ac.percent'=>"Numeric",
 			'ac.durationp'=>"Duree",
 			'cac.libelle'=>"List:c_actioncomm:libelle:libelle",
 			's.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text',
 			'co.code'=>'Text','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','s.idprof5'=>'Text','s.idprof6'=>'Text',
-			's.code_compta'=>'Text','s.code_compta_fournisseur'=>'Text','s.tva_intra'=>'Text');
+			's.code_compta'=>'Text','s.code_compta_fournisseur'=>'Text','s.tva_intra'=>'Text',
+			'p.ref' => 'Text',
+		);
 		$this->export_entities_array[$r]=array('ac.id'=>"action",'ac.ref_ext'=>"action",'ac.datec'=>"action",'ac.datep'=>"action",
 			'ac.datep2'=>"action",'ac.label'=>"action",'ac.note'=>"action",'ac.percent'=>"action",'ac.durationp'=>"action",
 			'cac.libelle'=>"action",
 			's.rowid'=>"company",'s.nom'=>'company','s.address'=>'company','s.zip'=>'company','s.town'=>'company',
 			'co.code'=>'company','s.phone'=>'company','s.siren'=>'company','s.siret'=>'company','s.ape'=>'company','s.idprof4'=>'company','s.idprof5'=>'company','s.idprof6'=>'company',
-			's.code_compta'=>'company','s.code_compta_fournisseur'=>'company','s.tva_intra'=>'company',);
+			's.code_compta'=>'company','s.code_compta_fournisseur'=>'company','s.tva_intra'=>'company',
+			'p.ref' => 'project',
+		);
 
 		$this->export_sql_start[$r]='SELECT DISTINCT ';
 		$this->export_sql_end[$r]  =' FROM  '.MAIN_DB_PREFIX.'actioncomm as ac';
@@ -417,6 +464,7 @@ class modAgenda extends DolibarrModules
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'societe as s on ac.fk_soc = s.rowid';
 		if (! empty($user) && empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'societe_commerciaux as sc ON sc.fk_soc = s.rowid';
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as co on s.fk_pays = co.rowid';
+		$this->export_sql_end[$r] .= " LEFT JOIN " . MAIN_DB_PREFIX . "projet as p ON p.rowid = ac.fk_project";
 		$this->export_sql_end[$r] .=' WHERE ac.entity IN ('.getEntity('agenda').')';
 		if (empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .=' AND (sc.fk_user = '.(empty($user)?0:$user->id).' OR ac.fk_soc IS NULL)';
 		if (empty($user->rights->agenda->allactions->read)) $this->export_sql_end[$r] .=' AND acr.fk_element = '.(empty($user)?0:$user->id);

htdocs/core/modules/modCategorie.class.php

@@ -185,7 +185,7 @@ class modCategorie extends DolibarrModules
 		$this->export_sql_end[$r] .=' AND u.type = 2';	// Customer/Prospect categories
 
         // Add extra fields
-        $sql="SELECT name, label, type, param FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'societe'";
+        $sql="SELECT name, label, type, param FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'societe' AND entity IN (0, ".$conf->entity.")";
         $resql=$this->db->query($sql);
         if ($resql)    // This can fail when class is used on old database (during migration for example)
         {
@@ -350,7 +350,7 @@ class modCategorie extends DolibarrModules
 		); // We define here only fields that use another picto
 
         // Add extra fields
-        $sql="SELECT name, label, type, param FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'socpeople'";
+        $sql="SELECT name, label, type, param FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'socpeople' AND entity IN (0, ".$conf->entity.")";
         $resql=$this->db->query($sql);
         if ($resql)    // This can fail when class is used on old database (during migration for example)
         {

htdocs/core/modules/modExpedition.class.php

@@ -65,8 +65,8 @@ class modExpedition extends DolibarrModules
 		                    "/expedition/sending/temp",
 		                    "/expedition/receipt",
 		                    "/expedition/receipt/temp",
-							"/doctemplates/shipment",
-							"/doctemplates/delivery"
+							"/doctemplates/shipments",
+							"/doctemplates/deliveries"
 		                    );
 
 		// Config pages
@@ -98,7 +98,7 @@ class modExpedition extends DolibarrModules
 
 		$this->const[$r][0] = "EXPEDITION_ADDON_PDF_ODT_PATH";
 		$this->const[$r][1] = "chaine";
-		$this->const[$r][2] = "DOL_DATA_ROOT/doctemplates/shipment";
+		$this->const[$r][2] = "DOL_DATA_ROOT/doctemplates/shipments";
 		$this->const[$r][3] = "";
 		$this->const[$r][4] = 0;
 		$r++;
@@ -119,7 +119,7 @@ class modExpedition extends DolibarrModules
 
 		$this->const[$r][0] = "LIVRAISON_ADDON_PDF_ODT_PATH";
 		$this->const[$r][1] = "chaine";
-		$this->const[$r][2] = "DOL_DATA_ROOT/doctemplates/delivery";
+		$this->const[$r][2] = "DOL_DATA_ROOT/doctemplates/deliveries";
 		$this->const[$r][3] = "";
 		$this->const[$r][4] = 0;
 		$r++;
@@ -127,7 +127,7 @@ class modExpedition extends DolibarrModules
 		$this->const[$r][0] = "MAIN_SUBMODULE_EXPEDITION";
 		$this->const[$r][1] = "chaine";
 		$this->const[$r][2] = "1";
-		$this->const[$r][3] = "Enable shipments";
+		$this->const[$r][3] = "Enable delivery receipts";
 		$this->const[$r][4] = 0;
 		$r++;
 
@@ -326,8 +326,8 @@ class modExpedition extends DolibarrModules
 		$this->remove($options);
 
 		//ODT template
-		$src = DOL_DOCUMENT_ROOT.'/install/doctemplates/shipment/template_shipment.odt';
-		$dirodt = DOL_DATA_ROOT.'/doctemplates/shipment';
+		$src = DOL_DOCUMENT_ROOT.'/install/doctemplates/shipments/template_shipment.odt';
+		$dirodt = DOL_DATA_ROOT.'/doctemplates/shipments';
 		$dest = $dirodt.'/template_shipment.odt';
 
 		if (file_exists($src) && !file_exists($dest))

htdocs/core/modules/modFournisseur.class.php

@@ -320,7 +320,7 @@ class modFournisseur extends DolibarrModules
 		);
 		$this->export_dependencies_array[$r]=array('invoice_line'=>'fd.rowid','product'=>'fd.rowid'); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them
 		// Add extra fields object
-		$sql="SELECT name, label, type, param FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'facture_fourn'";
+		$sql="SELECT name, label, type, param FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'facture_fourn' AND entity IN (0, ".$conf->entity.")";
 		$resql=$this->db->query($sql);
 		if ($resql)    // This can fail when class is used on old database (during migration for example)
 		{
@@ -357,7 +357,7 @@ class modFournisseur extends DolibarrModules
 		}
 		// End add extra fields
 		// Add extra fields line
-		$sql="SELECT name, label, type, param FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'facture_fourn_det'";
+		$sql="SELECT name, label, type, param FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'facture_fourn_det' AND entity IN (0, ".$conf->entity.")";
 		$resql=$this->db->query($sql);
 		if ($resql)    // This can fail when class is used on old database (during migration for example)
 		{
@@ -440,7 +440,7 @@ class modFournisseur extends DolibarrModules
 		    'p.datep'=>'payment','p.num_paiement'=>'payment','project.rowid'=>'project','project.ref'=>'project','project.title'=>'project');
 		$this->export_dependencies_array[$r]=array('payment'=>'p.rowid'); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them
 		// Add extra fields object
-		$sql="SELECT name, label, type, param FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'facture_fourn'";
+		$sql="SELECT name, label, type, param FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'facture_fourn' AND entity IN (0, ".$conf->entity.")";
 		$resql=$this->db->query($sql);
 		if ($resql)    // This can fail when class is used on old database (during migration for example)
 		{
@@ -527,7 +527,7 @@ class modFournisseur extends DolibarrModules
 		);
 		$this->export_dependencies_array[$r]=array('order_line'=>'fd.rowid','product'=>'fd.rowid'); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them
 		// Add extra fields object
-		$sql="SELECT name, label, type, param FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'commande_fournisseur'";
+		$sql="SELECT name, label, type, param FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'commande_fournisseur' AND entity IN (0, ".$conf->entity.")";
 		$resql=$this->db->query($sql);
 		if ($resql)    // This can fail when class is used on old database (during migration for example)
 		{
@@ -565,7 +565,7 @@ class modFournisseur extends DolibarrModules
 		}
 		// End add extra fields object
 		// Add extra fields line
-		$sql="SELECT name, label, type, param FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'commande_fournisseurdet'";
+		$sql="SELECT name, label, type, param FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'commande_fournisseurdet' AND entity IN (0, ".$conf->entity.")";
 		$resql=$this->db->query($sql);
 		if ($resql)    // This can fail when class is used on old database (during migration for example)
 		{

htdocs/core/modules/modSociete.class.php

@@ -449,7 +449,7 @@ class modSociete extends DolibarrModules
             's.multicurrency_code' => 'MulticurrencyCurrency'
         );
         // Add extra fields
-        $sql = "SELECT name, label, fieldrequired FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'societe' AND entity = ".$conf->entity;
+        $sql = "SELECT name, label, fieldrequired FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'societe' AND entity IN (0, ".$conf->entity.")";
         $resql = $this->db->query($sql);
         if ($resql)    // This can fail when class is used on old database (during migration for example)
         {
@@ -597,7 +597,7 @@ class modSociete extends DolibarrModules
             's.note_public' => "NotePublic"
         );
         // Add extra fields
-        $sql = "SELECT name, label, fieldrequired FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'socpeople' AND entity = ".$conf->entity;
+        $sql = "SELECT name, label, fieldrequired FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'socpeople' AND entity IN (0, ".$conf->entity.")";
         $resql = $this->db->query($sql);
         if ($resql)    // This can fail when class is used on an old database (during a migration for example)
         {

htdocs/core/modules/modSupplierProposal.class.php

@@ -93,7 +93,7 @@ class modSupplierProposal extends DolibarrModules
 
 		$this->const[$r][0] = "SUPPLIER_PROPOSAL_ADDON_PDF_ODT_PATH";
 		$this->const[$r][1] = "chaine";
-		$this->const[$r][2] = "DOL_DATA_ROOT/doctemplates/supplier_proposal";
+		$this->const[$r][2] = "DOL_DATA_ROOT/doctemplates/supplier_proposals";
 		$this->const[$r][3] = "";
 		$this->const[$r][4] = 0;
 
@@ -215,8 +215,8 @@ class modSupplierProposal extends DolibarrModules
 		$this->remove($options);
 
 		//ODT template
-		$src=DOL_DOCUMENT_ROOT.'/install/doctemplates/supplier_proposal/template_supplier_proposal.odt';
-		$dirodt=DOL_DATA_ROOT.'/doctemplates/supplier_proposal';
+		$src=DOL_DOCUMENT_ROOT.'/install/doctemplates/supplier_proposals/template_supplier_proposal.odt';
+		$dirodt=DOL_DATA_ROOT.'/doctemplates/supplier_proposals';
 		$dest=$dirodt.'/template_supplier_proposal.odt';
 
 		if (file_exists($src) && ! file_exists($dest))

htdocs/core/modules/societe/doc/doc_generic_odt.modules.php

@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2010-2011 Laurent Destailleur <ely@users.sourceforge.net>
  * Copyright (C) 2016	   Charlie Benke	   <charlie@patas-monkey.com>
- * Copyright (C) 2018      Frédéric France     <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2019 Frédéric France     <frederic.france@netlogic.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -100,7 +100,7 @@ class doc_generic_odt extends ModeleThirdPartyDoc
 		$form = new Form($this->db);
 
 		$texte = $this->description.".<br>\n";
-		$texte .= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+		$texte .= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST" enctype="multipart/form-data">';
 		$texte .= '<input type="hidden" name="token" value="'.newToken().'">';
 		$texte .= '<input type="hidden" name="action" value="setModuleOptions">';
 		$texte .= '<input type="hidden" name="param1" value="COMPANY_ADDON_PDF_ODT_PATH">';
@@ -160,7 +160,11 @@ class doc_generic_odt extends ModeleThirdPartyDoc
    			}
    			$texte .= '</div>';
 		}
-
+        // Add input to upload a new template file.
+        $texte .= '<div>'.$langs->trans("UploadNewTemplate").' <input type="file" name="uploadfile">';
+        $texte .= '<input type="hidden" value="COMPANY_ADDON_PDF_ODT_PATH" name="keyforuploaddir">';
+        $texte .= '<input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("Upload")).'" name="upload">';
+        $texte .= '</div>';
 		$texte .= '</td>';
 
 		$texte .= '<td rowspan="2" class="tdtop hideonsmartphone">';

htdocs/core/search_page.php

@@ -115,7 +115,7 @@ print "\n";
 print "<!-- Begin SearchForm -->\n";
 print '<div class="center"><div class="center" style="padding: 6px;">';
 print '<style>.menu_titre { padding-top: 7px; }</style>';
-print '<div id="blockvmenusearch">'."\n";
+print '<div id="blockvmenusearch" class="tagtable center searchpage">'."\n";
 print $searchform;
 print '</div>'."\n";
 print '</div></div>';

htdocs/core/tpl/commonfields_add.tpl.php

@@ -56,7 +56,7 @@ foreach($object->fields as $key => $val)
 	if (in_array($val['type'], array('int', 'integer'))) $value = GETPOST($key, 'int');
 	elseif ($val['type'] == 'text' || $val['type'] == 'html') $value = GETPOST($key, 'none');
 	else $value = GETPOST($key, 'alpha');
-	print $object->showInputField($val, $key, $value, '', '', '', 0, $object->table_element);
+	print $object->showInputField($val, $key, $value, '', '', '', 0);
 	print '</td>';
 	print '</tr>';
 }

htdocs/core/tpl/commonfields_edit.tpl.php

@@ -55,8 +55,8 @@ foreach($object->fields as $key => $val)
 	elseif ($val['type'] == 'text' || $val['type'] == 'html') $value = GETPOSTISSET($key)?GETPOST($key, 'none'):$object->$key;
 	else $value = GETPOSTISSET($key)?GETPOST($key, 'alpha'):$object->$key;
 	//var_dump($val.' '.$key.' '.$value);
-	if ($val['noteditable']) print $object->showOutputField($val, $key, $value, '', '', '', 0, $object->table_element);
-	else print $object->showInputField($val, $key, $value, '', '', '', 0, $object->table_element);
+	if ($val['noteditable']) print $object->showOutputField($val, $key, $value, '', '', '', 0);
+	else print $object->showInputField($val, $key, $value, '', '', '', 0);
 	print '</td>';
 	print '</tr>';
 }

htdocs/core/tpl/commonfields_view.tpl.php

@@ -39,8 +39,10 @@ $object->fields = dol_sort_array($object->fields, 'position');
 
 foreach ($object->fields as $key => $val)
 {
+	if (!empty($keyforbreak) && $key == $keyforbreak) break; // key used for break on second column
+
 	// Discard if extrafield is a hidden field on form
-	if (abs($val['visible']) != 1 && abs($val['visible']) != 3 && abs($val['visible']) != 4) continue;
+	if (abs($val['visible']) != 1 && abs($val['visible']) != 3 && abs($val['visible']) != 4 && abs($val['visible']) != 5) continue;
 
 	if (array_key_exists('enabled', $val) && isset($val['enabled']) && !verifCond($val['enabled'])) continue; // We don't want this field
 	if (in_array($key, array('ref', 'status'))) continue; // Ref and status are already in dol_banner
@@ -58,12 +60,11 @@ foreach ($object->fields as $key => $val)
 	print '<td class="valuefield fieldname_'.$key;
 	if ($val['type'] == 'text') print ' wordbreak';
 	print '">';
+
 	print $object->showOutputField($val, $key, $value, '', '', '', 0);
 	//print dol_escape_htmltag($object->$key, 1, 1);
 	print '</td>';
 	print '</tr>';
-
-	if (!empty($keyforbreak) && $key == $keyforbreak) break; // key used for break on second column
 }
 
 print '</table>';
@@ -80,11 +81,17 @@ foreach ($object->fields as $key => $val)
 {
 	if ($alreadyoutput)
 	{
-		if (!empty($keyforbreak) && $key == $keyforbreak) $alreadyoutput = 0; // key used for break on second column
-		continue;
+		if (!empty($keyforbreak) && $key == $keyforbreak) {
+			$alreadyoutput = 0; // key used for break on second column
+		}
+		else {
+			continue;
+		}
 	}
 
-	if (abs($val['visible']) != 1) continue; // Discard such field from form
+	// Discard if extrafield is a hidden field on form
+	if (abs($val['visible']) != 1 && abs($val['visible']) != 3 && abs($val['visible']) != 4 && abs($val['visible']) != 5) continue;
+
 	if (array_key_exists('enabled', $val) && isset($val['enabled']) && !$val['enabled']) continue; // We don't want this field
 	if (in_array($key, array('ref', 'status'))) continue; // Ref and status are already in dol_banner
 

htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php

@@ -31,7 +31,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/triggers/dolibarrtriggers.class.php';
 class InterfaceActionsBlockedLog extends DolibarrTriggers
 {
 	public $family = 'system';
-	public $description = "Triggers of this module add action for BlockedLog module.";
+	public $description = "Triggers of this module add action for BlockedLog module (Module of unalterable logs).";
 
 	/**
 	 * Version of the trigger
@@ -45,7 +45,7 @@ class InterfaceActionsBlockedLog extends DolibarrTriggers
 	public $picto = 'technic';
 
 	/**
-	 * Function called on Dolibarrr payment or invoice event.
+	 * Function called on Dolibarr payment or invoice event.
 	 *
 	 * @param string		$action		Event action code
 	 * @param Object		$object     Object

htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php

@@ -46,7 +46,7 @@ class InterfaceTicketEmail extends DolibarrTriggers
 
         $this->name = preg_replace('/^Interface/i', '', get_class($this));
         $this->family = "ticket";
-        $this->description = "Triggers of the module ticket";
+        $this->description = "Triggers of the module ticket to send notifications to internal users and to third-parties";
         $this->version = 'dolibarr'; // 'development', 'experimental', 'dolibarr' or version
         $this->picto = 'ticket';
     }

htdocs/emailcollector/class/emailcollector.class.php

@@ -106,7 +106,7 @@ class EmailCollector extends CommonObject
         'source_directory' => array('type'=>'varchar(255)', 'label'=>'MailboxSourceDirectory', 'visible'=>-1, 'enabled'=>1, 'position'=>103, 'notnull'=>1, 'default' => 'Inbox', 'help'=>'Example: INBOX'),
         //'filter' => array('type'=>'text', 'label'=>'Filter', 'visible'=>1, 'enabled'=>1, 'position'=>105),
         //'actiontodo' => array('type'=>'varchar(255)', 'label'=>'ActionToDo', 'visible'=>1, 'enabled'=>1, 'position'=>106),
-        'target_directory' => array('type'=>'varchar(255)', 'label'=>'MailboxTargetDirectory', 'visible'=>1, 'enabled'=>1, 'position'=>110, 'notnull'=>0, 'comment'=>"Where to store messages once processed"),
+        'target_directory' => array('type'=>'varchar(255)', 'label'=>'MailboxTargetDirectory', 'visible'=>1, 'enabled'=>1, 'position'=>110, 'notnull'=>0, 'help'=>"EmailCollectorTargetDir"),
         'maxemailpercollect' => array('type'=>'integer', 'label'=>'MaxEmailCollectPerCollect', 'visible'=>-1, 'enabled'=>1, 'position'=>111, 'default'=>100),
         'datelastresult' => array('type'=>'datetime', 'label'=>'DateLastCollectResult', 'visible'=>1, 'enabled'=>'$action != "create" && $action != "edit"', 'position'=>121, 'notnull'=>-1,),
         'codelastresult' => array('type'=>'varchar(16)', 'label'=>'CodeLastResult', 'visible'=>1, 'enabled'=>'$action != "create" && $action != "edit"', 'position'=>122, 'notnull'=>-1,),

htdocs/fourn/card.php

@@ -312,7 +312,7 @@ if ($object->id > 0)
 	    $langs->load("categories");
     	print '<tr><td>'.$langs->trans("SuppliersCategoriesShort").'</td>';
     	print '<td>';
-    	print $form->showCategories($object->id, 'supplier', 1);
+    	print $form->showCategories($object->id, Categorie::TYPE_SUPPLIER, 1);
     	print "</td></tr>";
 	}
 

htdocs/fourn/class/api_supplier_invoices.class.php

@@ -208,7 +208,7 @@ class SupplierInvoices extends DolibarrApi
         foreach($request_data as $field => $value) {
             $this->invoice->$field = $value;
         }
-        if(! array_keys($request_data, 'date')) {
+        if(! array_key_exists('date', $request_data)) {
             $this->invoice->date = dol_now();
         }
 

htdocs/fourn/commande/card.php

@@ -1907,13 +1907,10 @@ elseif (!empty($object->id))
 		 $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&lineid='.$lineid, $langs->trans('DeleteProductLine'), $langs->trans('ConfirmDeleteProductLine'), 'confirm_deleteline', '', 0, 1);
 	}
 
-	if (!$formconfirm)
-	{
-		$parameters = array('lineid'=>$lineid);
-		$reshook = $hookmanager->executeHooks('formConfirm', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-		if (empty($reshook)) $formconfirm .= $hookmanager->resPrint;
-		elseif ($reshook > 0) $formconfirm = $hookmanager->resPrint;
-	}
+	$parameters = array('lineid'=>$lineid);
+	$reshook = $hookmanager->executeHooks('formConfirm', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+	if (empty($reshook)) $formconfirm .= $hookmanager->resPrint;
+	elseif ($reshook > 0) $formconfirm = $hookmanager->resPrint;
 
 	// Print form confirm
 	print $formconfirm;

htdocs/includes/odtphp/odf.php

@@ -525,7 +525,7 @@ IMG;
 	public function addImageToManifest($file)
 	{
 		// Get the file extension
-		$ext = substr(strrchr($val, '.'), 1);
+		$ext = substr(strrchr($file, '.'), 1);
 		// Create the correct image XML entry to add to the manifest (this is necessary because ODT format requires that we keep a list of the images in the manifest.xml)
 		$add = ' <manifest:file-entry manifest:media-type="image/'.$ext.'" manifest:full-path="Pictures/'.$file.'"/>'."\n";
 		// Append the image to the manifest
@@ -539,7 +539,7 @@ IMG;
 	 * @throws OdfException
 	 * @return void
 	 */
-	public function exportAsAttachedFile($name="")
+	public function exportAsAttachedFile($name = "")
 	{
 		$this->_save();
 		if (headers_sent($filename, $linenum)) {
@@ -772,6 +772,4 @@ IMG;
 		$this->contentXml = preg_replace($searchreg, "", $this->contentXml);
 		return  $matches[1];
 	}
-
 }
-

htdocs/install/mysql/data/llx_c_action_trigger.sql

@@ -124,10 +124,10 @@ insert into llx_c_action_trigger (code,label,description,elementtype,rang) value
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('BOM_CLOSE','BOM disabled','Executed when a BOM is disabled','bom',652);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('BOM_REOPEN','BOM reopen','Executed when a BOM is re-open','bom',653);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('BOM_DELETE','BOM deleted','Executed when a BOM deleted','bom',654);
-insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('MO_VALIDATE','MO validated','Executed when a MO is validated','bom',660);
-insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('MO_PRODUCED','MO produced','Executed when a MO is produced','bom',661);
-insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('MO_DELETE','MO deleted','Executed when a MO is deleted','bom',662);
-insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('MO_CANCEL','MO canceled','Executed when a MO is canceled','bom',663);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('MRP_MO_VALIDATE','MO validated','Executed when a MO is validated','bom',660);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('MRP_MO_PRODUCED','MO produced','Executed when a MO is produced','bom',661);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('MRP_MO_DELETE','MO deleted','Executed when a MO is deleted','bom',662);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('MRP_MO_CANCEL','MO canceled','Executed when a MO is canceled','bom',663);
 -- actions not enabled by default : they are excluded when we enable the module Agenda (except TASK_...)
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('TASK_CREATE','Task created','Executed when a project task is created','project',150);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('TASK_MODIFY','Task modified','Executed when a project task is modified','project',151);

htdocs/install/mysql/migration/10.0.0-11.0.0.sql

@@ -59,6 +59,8 @@ ALTER TABLE llx_emailcollector_emailcollectoraction ADD COLUMN position integer
 
 -- For v11
 
+ALTER TABLE llx_product_price MODIFY COLUMN tva_tx double(6,3) DEFAULT 0 NOT NULL;
+
 ALTER TABLE llx_facturedet MODIFY COLUMN situation_percent real DEFAULT 100;
 UPDATE llx_facturedet SET situation_percent = 100 WHERE situation_percent IS NULL AND fk_prev_id IS NULL;
 
@@ -73,7 +75,7 @@ UPDATE llx_holiday SET ref = rowid WHERE ref IS NULL;
 -- VPGSQL8.2 ALTER TABLE llx_holiday ALTER COLUMN ref SET NOT NULL;
 
 ALTER TABLE llx_c_email_senderprofile MODIFY COLUMN active tinyint DEFAULT 1 NOT NULL;
- 
+
 insert into llx_c_type_container (code,label,module,active) values ('menu',     'Menu',     'system', 1);
 
 INSERT INTO llx_c_ticket_type (code, pos, label, active, use_default, description) VALUES('HELP',    '15', 'Request for functionnal help',  1, 0, NULL);
@@ -520,36 +522,39 @@ insert into llx_c_action_trigger (code,label,description,elementtype,rang) value
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('BOM_REOPEN','BOM reopen','Executed when a BOM is re-open','bom',653);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('BOM_DELETE','BOM deleted','Executed when a BOM deleted','bom',654);
 
-insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('MO_VALIDATE','MO validated','Executed when a MO is validated','bom',660);
-insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('MO_PRODUCED','MO produced','Executed when a MO is produced','bom',661);
-insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('MO_DELETE','MO deleted','Executed when a MO is deleted','bom',662);
-insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('MO_CANCEL','MO canceled','Executed when a MO is canceled','bom',663);
+DELETE FROM llx_c_action_trigger where code LIKE 'MO_%';
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('MRP_MO_VALIDATE','MO validated','Executed when a MO is validated','bom',660);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('MRP_MO_PRODUCED','MO produced','Executed when a MO is produced','bom',661);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('MRP_MO_DELETE','MO deleted','Executed when a MO is deleted','bom',662);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('MRP_MO_CANCEL','MO canceled','Executed when a MO is canceled','bom',663);
 
 ALTER TABLE llx_comment ADD COLUMN fk_user_modif  integer DEFAULT NULL;
 
 
 CREATE TABLE llx_mrp_production(
-	rowid integer AUTO_INCREMENT PRIMARY KEY NOT NULL, 
-	fk_mo integer NOT NULL, 
+	rowid integer AUTO_INCREMENT PRIMARY KEY NOT NULL,
+	fk_mo integer NOT NULL,
 	position integer NOT NULL DEFAULT 0,
-	fk_product integer NOT NULL, 
+	fk_product integer NOT NULL,
 	fk_warehouse integer,
-	qty integer NOT NULL DEFAULT 1,
+	qty real NOT NULL DEFAULT 1,
     qty_frozen smallint DEFAULT 0,
-    disable_stock_change smallint DEFAULT 0, 
+    disable_stock_change smallint DEFAULT 0,
 	batch varchar(30),
 	role varchar(10),      			-- 'toconsume' or 'toproduce' (initialized at MO creation), 'consumed' or 'produced' (added after MO validation)
 	fk_mrp_production integer,		-- if role = 'consumed', id of line with role 'toconsume', if role = 'produced' id of line with role 'toproduce'
 	fk_stock_movement integer,		-- id of stock movement when movements are validated
-	date_creation datetime NOT NULL, 
-	tms timestamp, 
-	fk_user_creat integer NOT NULL, 
-	fk_user_modif integer, 
+	date_creation datetime NOT NULL,
+	tms timestamp,
+	fk_user_creat integer NOT NULL,
+	fk_user_modif integer,
 	import_key varchar(14)
 ) ENGINE=innodb;
+ALTER TABLE llx_mrp_production MODIFY COLUMN qty real NOT NULL DEFAULT 1;
 
 ALTER TABLE llx_mrp_production ADD COLUMN qty_frozen smallint DEFAULT 0;
 ALTER TABLE llx_mrp_production ADD COLUMN disable_stock_change smallint DEFAULT 0;
+
 ALTER TABLE llx_mrp_production ADD CONSTRAINT fk_mrp_production_mo FOREIGN KEY (fk_mo) REFERENCES llx_mrp_mo (rowid);
 ALTER TABLE llx_mrp_production ADD CONSTRAINT fk_mrp_production_product FOREIGN KEY (fk_product) REFERENCES llx_product (rowid);
 ALTER TABLE llx_mrp_production ADD CONSTRAINT fk_mrp_production_stock_movement FOREIGN KEY (fk_stock_movement) REFERENCES llx_stock_mouvement (rowid);
@@ -559,3 +564,5 @@ ALTER TABLE llx_mrp_production ADD INDEX idx_mrp_production_fk_mo (fk_mo);
 ALTER TABLE llx_emailcollector_emailcollector ADD UNIQUE INDEX uk_emailcollector_emailcollector_ref(ref, entity);
 
 ALTER TABLE llx_website ADD COLUMN use_manifest integer;
+
+ALTER TABLE llx_facture_rec MODIFY COLUMN fk_cond_reglement integer NOT NULL DEFAULT 1;

htdocs/install/mysql/migration/11.0.0-12.0.0.sql

@@ -69,6 +69,13 @@ DELETE FROM llx_c_regions WHERE fk_pays = 1 AND code_region = 82;
 DELETE FROM llx_c_regions WHERE fk_pays = 1 AND code_region = 83;
 DELETE FROM llx_c_regions WHERE fk_pays = 1 AND code_region = 91;
 
+ALTER TABLE llx_bookmark DROP INDEX uk_bookmark_url;
+ALTER TABLE llx_bookmark DROP INDEX uk_bookmark_title;
+
+ALTER TABLE llx_bookmark MODIFY COLUMN url TEXT;
+
+ALTER TABLE llx_bookmark ADD UNIQUE uk_bookmark_title (fk_user, entity, title);
+
 
 ALTER TABLE llx_societe_rib ADD COLUMN stripe_account varchar(128);
 
@@ -76,7 +83,7 @@ create table llx_object_lang
 (
   rowid          integer AUTO_INCREMENT PRIMARY KEY,
   fk_object      integer      DEFAULT 0 NOT NULL,
-  type_object    varchar(32)  NOT NULL,					-- 'thirdparty', 'contact', '...'
+  type_object    varchar(32)  NOT NULL,
   property       varchar(32)  NOT NULL,
   lang           varchar(5)   DEFAULT 0 NOT NULL,
   value          text,
@@ -84,8 +91,25 @@ create table llx_object_lang
 )ENGINE=innodb;
 
 
-
 ALTER TABLE llx_object_lang ADD UNIQUE INDEX uk_object_lang (fk_object, type_object, property, lang);
 
 
+CREATE TABLE llx_categorie_actioncomm
+(
+  fk_categorie integer NOT NULL,
+  fk_actioncomm integer NOT NULL,
+  import_key varchar(14)
+) ENGINE=innodb;
 
+ALTER TABLE llx_categorie_actioncomm ADD PRIMARY KEY pk_categorie_actioncomm (fk_categorie, fk_actioncomm);
+ALTER TABLE llx_categorie_actioncomm ADD INDEX idx_categorie_actioncomm_fk_categorie (fk_categorie);
+ALTER TABLE llx_categorie_actioncomm ADD INDEX idx_categorie_actioncomm_fk_actioncomm (fk_actioncomm);
+
+ALTER TABLE llx_categorie_actioncomm ADD CONSTRAINT fk_categorie_actioncomm_categorie_rowid FOREIGN KEY (fk_categorie) REFERENCES llx_categorie (rowid);
+ALTER TABLE llx_categorie_actioncomm ADD CONSTRAINT fk_categorie_actioncomm_fk_actioncomm FOREIGN KEY (fk_actioncomm) REFERENCES llx_actioncomm (id);
+
+
+ALTER TABLE llx_accounting_account ADD COLUMN labelshort varchar(255) DEFAULT NULL after label;
+
+ALTER TABLE llx_subscription ADD COLUMN fk_user_creat   integer DEFAULT NULL;
+ALTER TABLE llx_subscription ADD COLUMN fk_user_valid   integer DEFAULT NULL;

htdocs/install/mysql/migration/repair.sql

@@ -201,6 +201,13 @@ delete from llx_element_element where sourcetype='commande' and fk_source not in
 DELETE FROM llx_actioncomm_resources WHERE fk_actioncomm not in (select id from llx_actioncomm);
 
 
+-- Fix: delete orphelin links in llx_bank_url
+DELETE from llx_bank_url where type = 'payment' and url_id not in (select rowid from llx_paiement);
+DELETE from llx_bank_url where type = 'payment_supplier' and url_id not in (select rowid from llx_paiementfourn);
+DELETE from llx_bank_url where type = 'company' and url_id not in (select rowid from llx_societe);
+--SELECT * from llx_bank where rappro = 0 and label LIKE '(CustomerInvoicePayment%)' and rowid not in (select fk_bank from llx_bank_url where type = 'payment');
+--SELECT * from llx_bank where rappro = 0 and label LIKE '(SupplierInvoicePayment%)' and rowid not in (select fk_bank from llx_bank_url where type = 'payment_supplier');
+
 -- Fix link on parent that were removed
 DROP table tmp_user;
 CREATE TABLE tmp_user as (select * from llx_user);
@@ -462,7 +469,10 @@ update llx_facturedet set product_type = 1 where product_type = 0 AND fk_product
 update llx_facture_fourn_det set product_type = 0 where product_type = 1 AND fk_product > 0 AND fk_product IN (SELECT rowid FROM llx_product WHERE fk_product_type = 0);
 update llx_facture_fourn_det set product_type = 1 where product_type = 0 AND fk_product > 0 AND fk_product IN (SELECT rowid FROM llx_product WHERE fk_product_type = 1);
  
- 
+
+DELETE FROM llx_mrp_production where qty = 0;
+
+
 UPDATE llx_accounting_bookkeeping set date_creation = tms where date_creation IS NULL;