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

CONTRIBUTING.md

@@ -47,8 +47,8 @@ Long description (Can span accross multiple lines).
 
 Where KEYWORD is one of:
 
-- "FIXED:" for bug fixes (May be followed by the bug number i.e: #456)
+- "FIXED:" for bug fixes. In upper case to appear into ChangeLog. (May be followed by the bug number i.e: #456)
-- "NEW:" for new features (May be followed by the task number i.e: #123)
+- "NEW:" for new features. In upper case to appear into ChangeLog. (May be followed by the task number i.e: #123)
 - void, don't put a keyword if the commit is not introducing feature or closing a bug.
 
 ### Resources

COPYRIGHT

@@ -12,18 +12,17 @@ Dolibarr uses some external libraries released under different licenses. This is
 Component              Version       License                     GPL Compatible  Usage
 -------------------------------------------------------------------------------------
 PHP libraries:
-AdoDb-Date             0.32          Modified BSD License        Yes             Date convertion (not into rpm package)
+AdoDb-Date             0.33          Modified BSD License        Yes             Date convertion (not into rpm package)
 ChromePHP              4.3.3         Apache Software License 2.0 Yes             Return server log to chrome browser console
 CKEditor               4.3.3         LGPL-2.1+                   Yes             Editor WYSIWYG
-FPDI                   1.4.2         Apache Software License 2.0 Yes             PDF templates management
+FPDI                   1.5.2         Apache Software License 2.0 Yes             PDF templates management
-FPDF_TPL               1.2           Apache Software License 2.0 Yes             PDF templates management
 GeoIP                  1.4           LGPL-2.1+                   Yes             Sample code to make geoip convert (not into deb package)
 NuSoap                 0.9.5         LGPL 2.1+                   Yes             Library to develop SOAP Web services (not into rpm and deb package)
 odtPHP                 1.0.1         GPL-2+  b                   Yes             Library to build/edit ODT files
-PHPExcel               1.7.8         LGPL-2.1+                   Yes             Read/Write XLS files, read ODS files
+PHPExcel               1.8.0         LGPL-2.1+                   Yes             Read/Write XLS files, read ODS files
 php-iban               1.4.6         LGPL-3+                     Yes             Parse and validate IBAN (and IIBAN) bank account information in PHP
 PHPPrintIPP            1.3           GPL-2+                      Yes             Library to send print IPP requests
-TCPDF                  6.0.093       LGPL-3+                     Yes             PDF generation
+TCPDF                  6.2.6         LGPL-3+                     Yes             PDF generation
 
 JS libraries:
 jQuery                 1.8.2         MIT License                 Yes             JS library

ChangeLog

@@ -14,8 +14,10 @@ For users:
   MARGIN_PMP_AS_DEFAULT_BUY_PRICE to replace with first supplier price.
 - Introduce option MAIN_HTML_TITLE to start to control format of html title content.
 - Add extrafields on bank account cards.
-- Added delay between mails in Newsletter module
+- Added delay between mails in Newsletter module.
-- [ task #1793 ] Create new permission to restrict commercial agent margin to logged user
+- [ task #1793 ] Create new permission to restrict commercial agent margin to logged user.
+- Add experimental module ask supplier price to request supplier quotation.
+- Add experimental module batch management.
 
 For translators:
 - Update language files.
@@ -25,6 +27,12 @@ For developers:
 - New: Function yn can show a visual checkbox.
 - New: Introduced select2 jquery plugin.
 
+WARNING: Following changes may create regression for some external modules, but was necessary to make
+Dolibarr better:
+- Removed hoo supplierorderdao into supplier order creation. This is a business event, so we must use the 
+  trigger ORDER_SUPPLIER_CREATE instead.
+
+
 
 ***** ChangeLog for 3.7 compared to 3.6.* *****
 For users:
@@ -220,6 +228,10 @@ Dolibarr better:
 - Fix: [ bug #1832 ] SQL error when adding a product with no price defined to an object
 - Fix: [ bug #1826 ] Supplier payment types are not translated into fourn/facture/paiement.php
 - Fix: [ bug #1830 ] Salaries payment only allows checking accounts
+- Fix: [ bug #1825 ] External agenda: hide/show checkbox doesn't work
+- Fix: [ bug #1790 ] Email form behaves in an unexpected way when pressing Enter key
+- Fix: Bad SEPA xml file creation
+- Fix: [ bug #1892 ] PHP Fatal error when using USER_UPDATE_SESSION trigger and adding a supplier invoice payment
 
 ***** ChangeLog for 3.6.2 compared to 3.6.1 *****
 - Fix: fix ErrorBadValueForParamNotAString error message in price customer multiprice.
@@ -386,6 +398,7 @@ Fix: [ bug #1752 ] Date filter of margins module, filters since 12H instead of 0
 Fix: [ bug #1757 ] Sorting breaks product/service statistics
 Fix: [ bug #1797 ] Tulip supplier invoice module takes creation date instead of invoice date
 Fix: [ bug #1792 ] Users are not allowed to see margins module index page when no product view permission is enabled
+Fix: [ bug #1846 ] Browser IE11 not detected
 
 ***** ChangeLog for 3.5.6 compared to 3.5.5 *****
 Fix: Avoid missing class error for fetch_thirdparty method #1973

README-FR.md

@@ -21,8 +21,9 @@ vous devez vous réorienter vers DoliWamp (la version tout-en-un
 de Dolibarr pour Windows), DoliDeb (la version tout-en-un pour Debian ou
 Ubuntu) ou DoliRpm (la version tout-en-un de Dolibarr pour Fedora, Redhat,
 OpenSuse, Mandriva ou Mageia).
-Vous pouvez les télécharger à l'adresse: 
+
-http://www.dolibarr.org/downloads/
+Vous pouvez les télécharger depuis la rubrique *download* du portail officiel: 
+http://www.dolibarr.org/
 
 Si vous avez déjà installé un serveur Web avec PHP et une base de donnée (Mysql),
 vous pouvez installer Dolibarr avec cette version de la manière suivante:

README.md

@@ -22,7 +22,7 @@ Other licenses apply for some included dependencies. See [COPYRIGHT](COPYRIGHT)
 
 ### Download
 
-Official releases are available on the [website](http://www.dolibarr.org/downloads).
+Releases can be downloaded from [official website](http://www.dolibarr.org/).
 
 ### Simple setup
 

build/debian/changelog

@@ -1,6 +1,6 @@
-dolibarr (3.7.0-3) UNRELEASED; urgency=low
+dolibarr (3.8.0-3) UNRELEASED; urgency=low
 
   [ Laurent Destailleur (eldy) ]
   * New upstream release.
     
- -- Laurent Destailleur (eldy) <eldy@users.sourceforge.net>  Tue, 21 Oct 2014 12:00:00 +0100
+ -- Laurent Destailleur (eldy) <eldy@users.sourceforge.net>  Tue, 3 Mar 2015 12:00:00 +0100

build/generate_filecheck_xml.php

@@ -0,0 +1,70 @@
+#!/usr/bin/php
+<?php
+/* Copyright (C) 2015 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
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *      \file       build/generate_filecheck_xml.php
+ *		\ingroup    dev
+ * 		\brief      This script create a xml checksum file
+ */
+
+$sapi_type = php_sapi_name();
+$script_file = basename(__FILE__);
+$path=dirname(__FILE__).'/';
+
+// Test if batch mode
+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;
+}
+
+
+// Main
+parse_str($argv[1]);
+//$outputfile=dirname(__FILE__).'/../htdocs/install/filelist-'.$release.'.xml';
+$outputfile=dirname(__FILE__).'/../htdocs/install/filelist.xml';
+$fp = fopen($outputfile,'w');
+fputs($fp, '<?xml version="1.0" encoding="UTF-8" ?>'."\n");
+fputs($fp, '<checksum_list>'."\n");
+fputs($fp, '<dolibarr_root_dir version="'.$release.'">'."\n");
+$dir_iterator = new RecursiveDirectoryIterator(dirname(__FILE__).'/../htdocs/');
+$iterator = new RecursiveIteratorIterator($dir_iterator);
+// need to ignore document custom etc
+$files = new RegexIterator($iterator, '#^(?:[A-Z]:)?(?:/(?!(?:custom|documents|conf|install|nltechno))[^/]+)+/[^/]+\.(?:php|css|html|js|json|tpl|jpg|png|gif|sql|lang)$#i');
+$dir='';
+$needtoclose=0;
+foreach ($files as $file) {
+    $newdir = str_replace(dirname(__FILE__).'/../htdocs', '', dirname($file));
+    if ($newdir!=$dir) {
+        if ($needtoclose)
+            fputs($fp, '</dir>'."\n");
+        fputs($fp, '<dir name="'.$newdir.'" >'."\n");
+        $dir = $newdir;
+        $needtoclose=1;
+    }
+    if (filetype($file)=="file") {
+        fputs($fp, '<md5file name="'.basename($file).'">'.md5_file($file).'</md5file>'."\n");
+    }
+}
+fputs($fp, '</dir>'."\n");
+fputs($fp, '</dolibarr_root_dir>'."\n");
+fputs($fp, '</checksum_list>'."\n");
+fclose($fp);
+
+print "File ".$outputfile." generated\n";
+
+exit(0);

build/makepack-dolibarr.pl

@@ -204,7 +204,10 @@ else {
 	my $NUM_SCRIPT;
 	my $cpt=0;
 	while (! $found) {
-		printf(" %2d - %-14s  (%s)\n",$cpt,"ALL (1..9)","Need ".join(",",values %REQUIREMENTTARGET));
+		$cpt=0;
+		printf(" %2d - %-14s  (%s)\n",$cpt,"ALL (1..10)","Need ".join(",",values %REQUIREMENTTARGET));
+		$cpt++;
+		printf(" %2d - %-14s\n",$cpt,"Generate check file");
 		foreach my $target (@LISTETARGET) {
 			$cpt++;
 			printf(" %2d - %-14s  (%s)\n",$cpt,$target,"Need ".$REQUIREMENTTARGET{$target});
@@ -215,7 +218,7 @@ else {
 		printf(" %2d - %-14s  (%s)\n",$cpt,"SF (publish)","Need ".join(",",values %REQUIREMENTPUBLISH));
 	
 		# Ask which target to build
-		print "Choose one package number or several separated with space (0 - ".$cpt."): ";
+		print "Choose one target number or several separated with space (0 - ".$cpt."): ";
 		$NUM_SCRIPT=<STDIN>; 
 		chomp($NUM_SCRIPT);
 		if ($NUM_SCRIPT !~ /^[0-9\s]+$/)
@@ -232,30 +235,30 @@ else {
 	if ($NUM_SCRIPT eq "98") {
 		$CHOOSEDPUBLISH{"ASSO"}=1;
 	}
-	else 
+	elsif ($NUM_SCRIPT eq "99") {
-	{
+		$CHOOSEDPUBLISH{"SF"}=1;
-		if ($NUM_SCRIPT eq "99") {
+	}
-			$CHOOSEDPUBLISH{"SF"}=1;
+	elsif ($NUM_SCRIPT eq "0") {
+		$CHOOSEDTARGET{"-CHKSUM"}=1;
+		foreach my $key (@LISTETARGET) {
+			if ($key ne 'SNAPSHOT' && $key ne 'ASSO' && $key ne 'SF') { $CHOOSEDTARGET{$key}=1; }
 		}
-		else {
+	}
-			if ($NUM_SCRIPT eq "0") {
+	elsif ($NUM_SCRIPT eq "1") {
-				foreach my $key (@LISTETARGET) {
+		$CHOOSEDTARGET{"-CHKSUM"}=1
-					if ($key ne 'SNAPSHOT' && $key ne 'ASSO' && $key ne 'SF') { $CHOOSEDTARGET{$key}=1; }
+	}
-				}
+	else {
-			}
+		foreach my $num (split(/\s+/,$NUM_SCRIPT)) {
-			else {
+			$CHOOSEDTARGET{$LISTETARGET[$num-2]}=1;
-				foreach my $num (split(/\s+/,$NUM_SCRIPT)) {
-					$CHOOSEDTARGET{$LISTETARGET[$num-1]}=1;
-				}
-			}
 		}
 	}
 }
 
+
 # Test if requirement is ok
 #--------------------------
 $atleastonerpm=0;
-foreach my $target (keys %CHOOSEDTARGET) {
+foreach my $target (sort keys %CHOOSEDTARGET) {
 	if ($target =~ /RPM/i)
 	{
 		if ($atleastonerpm && ($DESTI eq "$SOURCE/build"))
@@ -297,20 +300,32 @@ foreach my $target (keys %CHOOSEDTARGET) {
 
 print "\n";
 
-# Check if there is at least on target to build
+# Build xml check file
+#-----------------------
+if ($CHOOSEDTARGET{'-CHKSUM'})
+{
+   	print 'Create xml check file with md5 checksum with command php '.$SOURCE.'/build/generate_filecheck_xml.php release='.$MAJOR.'.'.$MINOR.'.'.$BUILD."\n";
+  	$ret=`php $SOURCE/build/generate_filecheck_xml.php release=$MAJOR.$MINOR.$BUILD`;
+  	print $ret."\n";
+}
+
+
+#print join(',',sort keys %CHOOSEDTARGET)."\n";
+
+# Check if there is at least one target to build
 #----------------------------------------------
 $nboftargetok=0;
 $nboftargetneedbuildroot=0;
 $nbofpublishneedtag=0;
-foreach my $target (keys %CHOOSEDTARGET) {
+foreach my $target (sort keys %CHOOSEDTARGET) {
 	if ($CHOOSEDTARGET{$target} < 0) { next; }
-	if ($target ne 'EXE' && $target ne 'EXEDOLIWAMP') 
+	if ($target ne 'EXE' && $target ne 'EXEDOLIWAMP' && $target ne '-CHKSUM') 
 	{
 		$nboftargetneedbuildroot++;
 	}
 	$nboftargetok++;
 }
-foreach my $target (keys %CHOOSEDPUBLISH) {
+foreach my $target (sort keys %CHOOSEDPUBLISH) {
 	if ($CHOOSEDPUBLISH{$target} < 0) { next; }
 	if ($target eq 'ASSO') { $nbofpublishneedtag++; }
 	if ($target eq 'SF') { $nbofpublishneedtag++; }
@@ -436,15 +451,18 @@ if ($nboftargetok) {
 		$ret=`rm -fr $BUILDROOT/$PROJECT/documents`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/document`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/documents`;
+		# Removed known external modules to avoir any error when packaging on test env 
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/ancotec*`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/bootstrap*`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/custom*`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/factory*`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/management*`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/multicompany*`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/nltechno*`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/pos*`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/public/test`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/teclib*`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/timesheet*`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/themes/oblyon*`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/themes/eldy/*.new`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/test`;
@@ -474,10 +492,11 @@ if ($nboftargetok) {
 
 	# Build package for each target
 	#------------------------------
-	foreach my $target (keys %CHOOSEDTARGET) 
+	foreach my $target (sort keys %CHOOSEDTARGET) 
 	{
 		if ($CHOOSEDTARGET{$target} < 0) { next; }
-	
+		if ($target eq '-CHKSUM') { next; }
+		
 		print "\nBuild package for target $target\n";
 
 		if ($target eq 'SNAPSHOT') 
@@ -979,7 +998,7 @@ if ($nboftargetok) {
 
 	# Publish package for each target
 	#--------------------------------
-	foreach my $target (keys %CHOOSEDPUBLISH) 
+	foreach my $target (sort keys %CHOOSEDPUBLISH) 
 	{
 		if ($CHOOSEDPUBLISH{$target} < 0) { next; }
 	
@@ -1062,7 +1081,8 @@ if ($nboftargetok) {
 }
 
 print "\n----- Summary -----\n";
-foreach my $target (keys %CHOOSEDTARGET) {
+foreach my $target (sort keys %CHOOSEDTARGET) {
+	if ($target eq '-CHKSUM') { print "Checksum was generated"; next; }
 	if ($CHOOSEDTARGET{$target} < 0) {
 		print "Package $target not built (bad requirement).\n";
 	} else {

build/rpm/dolibarr_fedora.spec

@@ -174,6 +174,7 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/cron
 %_datadir/dolibarr/htdocs/ecm
 %_datadir/dolibarr/htdocs/expedition
+%_datadir/dolibarr/htdocs/expensereport
 %_datadir/dolibarr/htdocs/exports
 %_datadir/dolibarr/htdocs/externalsite
 %_datadir/dolibarr/htdocs/fichinter

build/rpm/dolibarr_generic.spec

@@ -254,6 +254,7 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/cron
 %_datadir/dolibarr/htdocs/ecm
 %_datadir/dolibarr/htdocs/expedition
+%_datadir/dolibarr/htdocs/expensereport
 %_datadir/dolibarr/htdocs/exports
 %_datadir/dolibarr/htdocs/externalsite
 %_datadir/dolibarr/htdocs/fichinter

build/rpm/dolibarr_mandriva.spec

@@ -171,6 +171,7 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/cron
 %_datadir/dolibarr/htdocs/ecm
 %_datadir/dolibarr/htdocs/expedition
+%_datadir/dolibarr/htdocs/expensereport
 %_datadir/dolibarr/htdocs/exports
 %_datadir/dolibarr/htdocs/externalsite
 %_datadir/dolibarr/htdocs/fichinter

build/rpm/dolibarr_opensuse.spec

@@ -182,6 +182,7 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/cron
 %_datadir/dolibarr/htdocs/ecm
 %_datadir/dolibarr/htdocs/expedition
+%_datadir/dolibarr/htdocs/expensereport
 %_datadir/dolibarr/htdocs/exports
 %_datadir/dolibarr/htdocs/externalsite
 %_datadir/dolibarr/htdocs/fichinter

dev/dolibarr_changes.txt

@@ -23,6 +23,21 @@ Replace call to serialize_val with no bugged value
 
 
 
+FPDI:
+-----
+Replace:
+	$this->_readXref($this->_xref, $this->_findXref());
+with:
+    try {
+	        $this->_readXref($this->_xref, $this->_findXref());
+    }
+    catch(Exception $e)
+    {
+        	print $e->getMessage();
+        	exit;
+    }
+
+
 TCPDF:
 ------
 * Removed all fonts except 
@@ -47,6 +62,19 @@ In htdocs/includes/tcpdf/tcpdf.php
 * Renamed getmypid into dol_getmypid().
 
 
+TCPDI:
+------
+Add fpdf_tpl.php 1.2
+Add tcpdi.php
+Add tcpdi_parser.php and replace:
+require_once(dirname(__FILE__).'/include/tcpdf_filters.php');
+with:
+require_once(dirname(__FILE__).'/../tcpdf/include/tcpdf_filters.php');
+
+
+
+
+
 JSGANTT:
 --------
 * Replace in function JSGantt.taskLink

dev/fixdosfiles.sh

@@ -10,6 +10,7 @@
 # Syntax
 if [ "x$1" != "xlist" -a "x$1" != "xfix" ]
 then
+	echo "This script clean files with CR+LF into files with LF only. All source files are included, also files into includes."
 	echo "Usage: fixdosfiles.sh [list|fix]"
 fi
 

dev/skeletons/skeleton_class.class.php

@@ -136,7 +136,7 @@ class Skeleton_Class extends CommonObject
      *
      *  @param	int		$id    	Id object
      *  @param	string	$ref	Ref
-     *  @return int          	<0 if KO, >0 if OK
+     *  @return int          	<0 if KO, 0 if not found, >0 if OK
      */
     function fetch($id,$ref='')
     {
@@ -154,7 +154,8 @@ class Skeleton_Class extends CommonObject
         $resql=$this->db->query($sql);
         if ($resql)
         {
-            if ($this->db->num_rows($resql))
+        	$numrows = $this->db->num_rows($resql);
+            if ($numrows)
             {
                 $obj = $this->db->fetch_object($resql);
 
@@ -165,7 +166,7 @@ class Skeleton_Class extends CommonObject
             }
             $this->db->free($resql);
 
-            return 1;
+            return ($numrows?1:0);
         }
         else
         {

htdocs/accountancy/journal/bankjournal.php

@@ -103,9 +103,7 @@ $sql .= " FROM " . MAIN_DB_PREFIX . "bank as b";
 $sql .= " JOIN " . MAIN_DB_PREFIX . "bank_account as ba on b.fk_account=ba.rowid";
 $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "bank_url as bu1 ON bu1.fk_bank = b.rowid AND bu1.type='company'";
 $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe as soc on bu1.url_id=soc.rowid";
-// To isolate the cash of the other accounts
+$sql .= " WHERE ba.rowid=".$id_accountancy_journal;
-$sql .= " WHERE ba.courant <> 2";
-$sql .= " AND ba.rowid=".$id_accountancy_journal;
 if (! empty($conf->multicompany->enabled)) {
 	$sql .= " AND ba.entity = " . $conf->entity;
 }
@@ -143,9 +141,9 @@ if ($result) {
 		$obj = $db->fetch_object($result);
 
 		$tabcompany[$obj->rowid] = array(
-			'id' => $obj->socid,
+				'id' => $obj->socid,
-			'name' => $obj->name,
+				'name' => $obj->name,
-			'code_client' => $obj->code_compta
+				'code_client' => $obj->code_compta
 		);
 
 		// Controls
@@ -172,133 +170,96 @@ if ($result) {
 		// get_url may return -1 which is not traversable
 		if (is_array($links))
 		{
-			foreach ($links as $key => $val)
+		
+		foreach ( $links as $key => $val )
+		{
+			$tabtype[$obj->rowid] = $links[$key]['type'];
+
+
+			if ($links[$key]['type'] == 'payment')
 			{
-				$tabtype[$obj->rowid] = $links[$key]['type'];
+				$paymentstatic->id = $links[$key]['url_id'];
-
+				$tabpay[$obj->rowid]["lib"] .= ' ' . $paymentstatic->getNomUrl(2);
-
-				if ($links[$key]['type'] == 'payment')
-				{
-					$paymentstatic->id = $links[$key]['url_id'];
-					$tabpay[$obj->rowid]["lib"] .= ' ' . $paymentstatic->getNomUrl(2);
-				}
-				else if ($links[$key]['type'] == 'payment_supplier')
-				{
-					$paymentsupplierstatic->id = $links[$key]['url_id'];
-					$paymentsupplierstatic->ref = $links[$key]['url_id'];
-					$tabpay[$obj->rowid]["lib"] .= ' ' . $paymentsupplierstatic->getNomUrl(2);
-				}
-				else if ($links[$key]['type'] == 'company')
-				{
-					$societestatic->id = $links[$key]['url_id'];
-					$societestatic->name = $links[$key]['label'];
-					$tabpay[$obj->rowid]["soclib"] = $societestatic->getNomUrl(1, '', 30);
-					$tabtp[$obj->rowid][$compta_soc] += $obj->amount;
-				}
-				else if ($links[$key]['type'] == 'sc')
-				{
-					$chargestatic->id = $links[$key]['url_id'];
-					$chargestatic->ref = $links[$key]['url_id'];
-
-					$tabpay[$obj->rowid]["lib"] .= ' ' . $chargestatic->getNomUrl(2);
-					if (preg_match('/^\((.*)\)$/i', $links[$key]['label'], $reg)) {
-						if ($reg[1] == 'socialcontribution')
-							$reg[1] = 'SocialContribution';
-						$chargestatic->lib = $langs->trans($reg[1]);
-					}
-					else if ($links[$key]['type'] == 'company')
-					{
-						$societestatic->id = $links[$key]['url_id'];
-						$societestatic->name = $links[$key]['label'];
-						$tabpay[$obj->rowid]["soclib"] = $societestatic->getNomUrl(1, '', 30);
-						$tabtp[$obj->rowid][$compta_soc] += $obj->amount;
-					}
-					else if ($links[$key]['type'] == 'sc')
-					{
-						$chargestatic->id = $links[$key]['url_id'];
-						$chargestatic->ref = $links[$key]['url_id'];
-
-						$tabpay[$obj->rowid]["lib"] .= ' ' . $chargestatic->getNomUrl(2);
-						if (preg_match('/^\((.*)\)$/i', $links[$key]['label'], $reg)) {
-							if ($reg[1] == 'socialcontribution')
-								$reg[1] = 'SocialContribution';
-							$chargestatic->lib = $langs->trans($reg[1]);
-						}
-						else
-						{
-							$chargestatic->lib = $links[$key]['label'];
-						}
-						$chargestatic->ref = $chargestatic->lib;
-						$tabpay[$obj->rowid]["soclib"] = $chargestatic->getNomUrl(1, 30);
-
-						$sqlmid = 'SELECT cchgsoc.accountancy_code';
-						$sqlmid .= " FROM " . MAIN_DB_PREFIX . "c_chargesociales cchgsoc ";
-						$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "chargesociales as chgsoc ON  chgsoc.fk_type=cchgsoc.id";
-						$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiementcharge as paycharg ON  paycharg.fk_charge=chgsoc.rowid";
-						$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "bank_url as bkurl ON  bkurl.url_id=paycharg.rowid";
-						$sqlmid .= " WHERE bkurl.fk_bank=" . $obj->rowid;
-
-						dol_syslog("accountancy/journal/bankjournal.php:: sqlmid=" . $sqlmid, LOG_DEBUG);
-						$resultmid = $db->query($sqlmid);
-						if ($resultmid)
-						{
-							$objmid = $db->fetch_object($resultmid);
-							$tabtp[$obj->rowid][$objmid->accountancy_code] += $obj->amount;
-						}
-					}
-					else if ($links[$key]['type'] == 'payment_vat')
-					{
-						$paymentvatstatic->id = $links[$key]['url_id'];
-						$paymentvatstatic->ref = $links[$key]['url_id'];
-						$tabpay[$obj->rowid]["lib"] .= ' ' . $paymentvatstatic->getNomUrl(2);
-						$tabtp[$obj->rowid][$cpttva] += $obj->amount;
-					}
-					else if ($links[$key]['type'] == 'payment_salary')
-					{
-						$paymentsalstatic->id = $links[$key]['url_id'];
-						$paymentsalstatic->ref = $links[$key]['url_id'];
-						$tabpay[$obj->rowid]["lib"] .= ' ' . $paymentsalstatic->getNomUrl(2);
-						$tabtp[$obj->rowid][$accountancy_account_salary] += $obj->amount;
-					}
-					else if ($links[$key]['type'] == 'banktransfert')
-					{
-						$tabpay[$obj->rowid]["lib"] .= ' ' . $paymentvatstatic->getNomUrl(2);
-						$tabtp[$obj->rowid][$cpttva] += $obj->amount;
-					}
-					/*else {
-						$tabtp [$obj->rowid] [$accountancy_account_salary] += $obj->amount;
-					}*/
-				}
-				else if ($links[$key]['type'] == 'payment_vat')
-				{
-					$paymentvatstatic->id = $links[$key]['url_id'];
-					$paymentvatstatic->ref = $links[$key]['url_id'];
-					$tabpay[$obj->rowid]["lib"] .= ' ' . $paymentvatstatic->getNomUrl(2);
-					$tabtp[$obj->rowid][$cpttva] += $obj->amount;
-				}
-				else if ($links[$key]['type'] == 'payment_salary')
-				{
-					$paymentsalstatic->id = $links[$key]['url_id'];
-					$paymentsalstatic->ref = $links[$key]['url_id'];
-					$tabpay[$obj->rowid]["lib"] .= ' ' . $paymentsalstatic->getNomUrl(2);
-					$tabtp[$obj->rowid][$accountancy_account_salary] += $obj->amount;
-				}
-				else if ($links[$key]['type'] == 'banktransfert')
-				{
-					$tabpay[$obj->rowid]["lib"] .= ' ' . $paymentvatstatic->getNomUrl(2);
-					$tabtp[$obj->rowid][$cpttva] += $obj->amount;
-				}
-				/*else {
-					$tabtp [$obj->rowid] [$accountancy_account_salary] += $obj->amount;
-				}*/
 			}
-		}
+			else if ($links[$key]['type'] == 'payment_supplier')
+			{
+				$paymentsupplierstatic->id = $links[$key]['url_id'];
+				$paymentsupplierstatic->ref = $links[$key]['url_id'];
+				$tabpay[$obj->rowid]["lib"] .= ' ' . $paymentsupplierstatic->getNomUrl(2);
+			}
+			else if ($links[$key]['type'] == 'company')
+			{
+				$societestatic->id = $links[$key]['url_id'];
+				$societestatic->name = $links[$key]['label'];
+				$tabpay[$obj->rowid]["soclib"] = $societestatic->getNomUrl(1, '', 30);
+				$tabtp[$obj->rowid][$compta_soc] += $obj->amount;
+			}
+			else if ($links[$key]['type'] == 'sc')
+			{
+				$chargestatic->id = $links[$key]['url_id'];
+				$chargestatic->ref = $links[$key]['url_id'];
 
+				$tabpay[$obj->rowid]["lib"] .= ' ' . $chargestatic->getNomUrl(2);
+				if (preg_match('/^\((.*)\)$/i', $links[$key]['label'], $reg)) {
+					if ($reg[1] == 'socialcontribution')
+						$reg[1] = 'SocialContribution';
+					$chargestatic->lib = $langs->trans($reg[1]);
+				}
+				else
+				{
+					$chargestatic->lib = $links[$key]['label'];
+				}
+				$chargestatic->ref = $chargestatic->lib;
+				$tabpay[$obj->rowid]["soclib"] = $chargestatic->getNomUrl(1, 30);
+
+				$sqlmid = 'SELECT cchgsoc.accountancy_code';
+				$sqlmid .= " FROM " . MAIN_DB_PREFIX . "c_chargesociales cchgsoc ";
+				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "chargesociales as chgsoc ON  chgsoc.fk_type=cchgsoc.id";
+				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiementcharge as paycharg ON  paycharg.fk_charge=chgsoc.rowid";
+				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "bank_url as bkurl ON  bkurl.url_id=paycharg.rowid";
+				$sqlmid .= " WHERE bkurl.fk_bank=" . $obj->rowid;
+
+
+				dol_syslog("accountancy/journal/bankjournal.php:: sqlmid=" . $sqlmid, LOG_DEBUG);
+				$resultmid = $db->query($sqlmid);
+				if ($resultmid)
+				{
+					$objmid = $db->fetch_object($resultmid);
+					$tabtp[$obj->rowid][$objmid->accountancy_code] += $obj->amount;
+				}
+			}
+			else if ($links[$key]['type'] == 'payment_vat')
+			{
+				$paymentvatstatic->id = $links[$key]['url_id'];
+				$paymentvatstatic->ref = $links[$key]['url_id'];
+				$tabpay[$obj->rowid]["lib"] .= ' ' . $paymentvatstatic->getNomUrl(2);
+				$tabtp[$obj->rowid][$cpttva] += $obj->amount;
+			}
+			else if ($links[$key]['type'] == 'payment_salary')
+			{
+				$paymentsalstatic->id = $links[$key]['url_id'];
+				$paymentsalstatic->ref = $links[$key]['url_id'];
+				$paymentsalstatic->label = $links[$key]['label'];
+				$tabpay[$obj->rowid]["lib"] .= ' ' . $paymentsalstatic->getNomUrl(2);
+				$tabtp[$obj->rowid][$accountancy_account_salary] += $obj->amount;
+			}
+			else if ($links[$key]['type'] == 'banktransfert')
+			{
+				$tabpay[$obj->rowid]["lib"] .= ' ' . $paymentvatstatic->getNomUrl(2);
+				$tabtp[$obj->rowid][$cpttva] += $obj->amount;
+			}
+			/*else {
+				$tabtp [$obj->rowid] [$accountancy_account_salary] += $obj->amount;
+			}*/
+		}
+		
+		}
+		
 		$tabbq[$obj->rowid][$compta_bank] += $obj->amount;
 
 		// if($obj->socid)$tabtp[$obj->rowid][$compta_soc] += $obj->amount;
 
-		$i ++;
+		$i++;
 	}
 } else {
 	dol_print_error($db);
@@ -306,17 +267,16 @@ if ($result) {
 
 /*
  * Actions
- * FIXME Action should be before any view
  */
 
 // Write bookkeeping
 if ($action == 'writeBookKeeping')
 {
 	$error = 0;
-	foreach ($tabpay as $key => $val)
+	foreach ( $tabpay as $key => $val )
 	{
 		// Bank
-		foreach ($tabbq[$key] as $k => $mt)
+		foreach ( $tabbq[$key] as $k => $mt )
 		{
 			$bookkeeping = new BookKeeping($db);
 			$bookkeeping->doc_date = $val["date"];
@@ -368,7 +328,7 @@ if ($action == 'writeBookKeeping')
 			}
 		}
 		// Third party
-		foreach ($tabtp[$key] as $k => $mt)
+		foreach ( $tabtp[$key] as $k => $mt )
 		{
 			$bookkeeping = new BookKeeping($db);
 			$bookkeeping->doc_date = $val["date"];
@@ -467,6 +427,7 @@ if ($action == 'export_csv')
 		foreach ( $tabpay as $key => $val ) {
 			$date = dol_print_date($db->jdate($val["date"]), '%d%m%Y');
 
+
 			$companystatic->id = $tabcompany[$key]['id'];
 			$companystatic->name = $tabcompany[$key]['name'];
 
@@ -484,21 +445,44 @@ if ($action == 'export_csv')
 			}
 
 			// Third party
-			foreach ( $tabtp[$key] as $k => $mt ) {
+			if (is_array ( $tabtp[$key]))
-				if ($mt) {
+			{
-					print $date . $sep;
+				foreach ( $tabtp[$key] as $k => $mt )
-					print $bank_journal . $sep;
+				{
-					if ($val["lib"] == '(SupplierInvoicePayment)') {
+					if ($mt)
-						print length_accountg($conf->global->ACCOUNTING_ACCOUNT_SUPPLIER) . $sep;
+					{
-					} else {
+						print $date . $sep;
-						print length_accountg($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER) . $sep;
+						print $bank_journal . $sep;
+						if ($val["lib"] == '(SupplierInvoicePayment)') {
+							print length_accountg($conf->global->ACCOUNTING_ACCOUNT_SUPPLIER) . $sep;
+						} else {
+							print length_accountg($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER) . $sep;
+						}
+						print length_accounta(html_entity_decode($k)) . $sep;
+						print ($mt < 0 ? 'D' : 'C') . $sep;
+						print ($mt <= 0 ? price(- $mt) : $mt) . $sep;
+						print $val["type_payment"] . $sep;
+						print $val["ref"] . $sep;
+						print "\n";
+					}
+				}
+			}
+			else
+			{
+				foreach ( $tabbq[$key] as $k => $mt )
+				{
+					if (1)
+					{
+						print $date . $sep;
+						print $bank_journal . $sep;
+						print $conf->global->ACCOUNTING_ACCOUNT_SUSPENSE . $sep;
+						print $sep;
+						print ($mt < 0 ? 'D' : 'C') . $sep;
+						print ($mt <= 0 ? price(- $mt) : $mt) . $sep;
+						print $val["type_payment"] . $sep;
+						print $val["ref"] . $sep;
+						print "\n";
 					}
-					print length_accounta(html_entity_decode($k)) . $sep;
-					print ($mt < 0 ? 'D' : 'C') . $sep;
-					print ($mt <= 0 ? price(- $mt) : $mt) . $sep;
-					print $val["type_payment"] . $sep;
-					print $val["ref"] . $sep;
-					print "\n";
 				}
 			}
 		}
@@ -522,15 +506,35 @@ if ($action == 'export_csv')
 			}
 
 			// Third party
-			foreach ( $tabtp[$key] as $k => $mt ) {
+			if (is_array ( $tabtp[$key]))
-				if ($mt) {
+			{
-					print '"' . $date . '"' . $sep;
+				foreach ( $tabtp[$key] as $k => $mt )
-					print '"' . $val["type_payment"] . '"' . $sep;
+				{
-					print '"' . length_accounta(html_entity_decode($k)) . '"' . $sep;
+					if ($mt) {
-					print '"' . $companystatic->name . '"' . $sep;
+						print '"' . $date . '"' . $sep;
-					print '"' . ($mt < 0 ? price(- $mt) : '') . '"' . $sep;
+						print '"' . $val["type_payment"] . '"' . $sep;
-					print '"' . ($mt >= 0 ? price($mt) : '') . '"';
+						print '"' . length_accounta(html_entity_decode($k)) . '"' . $sep;
-					print "\n";
+						print '"' . $companystatic->name . '"' . $sep;
+						print '"' . ($mt < 0 ? price(- $mt) : '') . '"' . $sep;
+						print '"' . ($mt >= 0 ? price($mt) : '') . '"';
+						print "\n";
+					}
+				}
+			}
+			else
+			{
+				foreach ( $tabbq[$key] as $k => $mt )
+				{
+					if (1)
+					{
+						print '"' . $date . '"' . $sep;
+						print '"' . $val["ref"] . '"' . $sep;
+						print '"' . $conf->global->ACCOUNTING_ACCOUNT_SUSPENSE . '"' . $sep;
+						print '"' . $langs->trans("Bank") . '"' . $sep;
+						print '"' . ($mt < 0 ? price(- $mt) : '') . '"' . $sep;
+						print '"' . ($mt >= 0 ? price($mt) : '') . '"';
+						print "\n";
+					}
 				}
 			}
 		}
@@ -544,13 +548,53 @@ else
 	llxHeader('', $langs->trans("BankJournal"));
 
 	$namereport = $langs->trans("BankJournal");
-	$namelink = '';
+	$description = $langs->trans("DescBankJournal");
-	$periodlink = '';
-	$exportlink = '';
-	$builddate = time();
-	$description = $langs->trans("DescBankJournal") . '<br>';
 	$period = $form->select_date($date_start, 'date_start', 0, 0, 0, '', 1, 0, 1) . ' - ' . $form->select_date($date_end, 'date_end', 0, 0, 0, '', 1, 0, 1);
-	report_header($namereport, $namelink, $period, $periodlink, $description, $builddate, $exportlink, array('action' => ''));
+
+	// Report
+	$h=0;
+	$head[$h][0] = $_SERVER["PHP_SELF"].'?id_account='.$id_accountancy_journal;
+	$head[$h][1] = $langs->trans("Report");
+	$head[$h][2] = 'report';
+
+	dol_fiche_head($head, $hselected);
+
+	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'?id_account='.$id_accountancy_journal.'">';
+	print '<table width="100%" class="border">';
+
+	// Title
+	print '<tr>';
+	print '<td valign="top" width="110">'.$langs->trans("ReportName").'</td>';
+	print '<td colspan="3">'.$namereport.'</td>';
+	print '</td>';
+	print '</tr>';
+
+	// Period report
+	print '<tr>';
+	print '<td>'.$langs->trans("ReportPeriod").'</td>';
+	if (! $periodlink) print '<td colspan="3">';
+	else print '<td>';
+	if ($period) print $period;
+	if ($periodlink) print '</td><td colspan="2">'.$periodlink;
+	print '</td>';
+	print '</tr>';
+
+	// Description
+	print '<tr>';
+	print '<td valign="top">'.$langs->trans("ReportDescription").'</td>';
+	print '<td colspan="3">'.$description.'</td>';
+	print '</tr>';
+
+	print '<tr>';
+	print '<td colspan="4" align="center"><input type="submit" class="button" name="submit" value="'.$langs->trans("Refresh").'"></td>';
+	print '</tr>';
+
+	print '</table>';
+
+	print '</form>';
+
+	print '</div>';
+	// End report
 
 	print '<input type="button" class="button" style="float: right;" value="' . $langs->trans("Export") . '" onclick="launch_export();" />';
 
@@ -611,20 +655,36 @@ else
 		}
 
 		// Third party
-		foreach ( $tabtp[$key] as $k => $mt ) {
+		if (is_array ( $tabtp[$key]))
-			if ($k != 'type') {
+		{
+			foreach ( $tabtp[$key] as $k => $mt ) {
+				if ($k != 'type') {
+					print "<tr " . $bc[$var] . ">";
+					print "<td>" . $date . "</td>";
+					print "<td>" . $val["soclib"] . "</td>";
+					print "<td>" . length_accounta($k) . "</td>";
+					print "<td>" . $langs->trans('ThirdParty') . " (" . $val['soclib'] . ")</td>";
+					print "<td>" . $val["type_payment"] . "</td>";
+					print "<td align='right'>" . ($mt < 0 ? price(- $mt) : '') . "</td>";
+					print "<td align='right'>" . ($mt >= 0 ? price($mt) : '') . "</td>";
+					print "</tr>";
+				}
+			}
+		}
+		else
+		{
+			foreach ( $tabbq[$key] as $k => $mt )
+			{
 				print "<tr " . $bc[$var] . ">";
 				print "<td>" . $date . "</td>";
-				print "<td>" . $val["soclib"] . "</td>";
+				print "<td>" . $reflabel . "</td>";
-				print "<td>" . length_accounta($k) . "</td>";
+				print "<td>" . $conf->global->ACCOUNTING_ACCOUNT_SUSPENSE . "</td>";
-				print "<td>" . $langs->trans('ThirdParty') . " (" . $val['soclib'] . ")</td>";
+				print "<td>" . $langs->trans('ThirdParty') . "</td>";
-				print "<td>" . $val["type_payment"] . "</td>";
 				print "<td align='right'>" . ($mt < 0 ? price(- $mt) : '') . "</td>";
 				print "<td align='right'>" . ($mt >= 0 ? price($mt) : '') . "</td>";
 				print "</tr>";
 			}
 		}
-
 		$var = ! $var;
 	}
 

htdocs/accountancy/journal/cashjournal.php

@@ -1,533 +0,0 @@
-<?php
-/* Copyright (C) 2007-2010	Laurent Destailleur	<eldy@users.sourceforge.net>
- * Copyright (C) 2007-2010	Jean Heimburger		<jean@tiaris.info>
- * Copyright (C) 2011		Juanjo Menent		<jmenent@2byte.es>
- * Copyright (C) 2012		Regis Houssin		<regis@dolibarr.fr>
- * Copyright (C) 2013		Christophe Battarel	<christophe.battarel@altairis.fr>
- * Copyright (C) 2013-2015  Alexandre Spangaro	<alexandre.spangaro@gmail.com>
- * Copyright (C) 2013-2014  Florian Henry	    <florian.henry@open-concept.pro>
- * Copyright (C) 2013-2014  Olivier Geffroy     <jeff@jeffinfo.com>
- *
- * 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 <http://www.gnu.org/licenses/>.
- */
-
-/**
- * \file		htdocs/accountancy/journal/cashjournal.php
- * \ingroup		Accounting Expert
- * \brief		Page with cash journal
- */
-
-require '../../main.inc.php';
-
-// Class
-require_once DOL_DOCUMENT_ROOT.'/core/lib/report.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
-require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
-require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php';
-require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
-require_once DOL_DOCUMENT_ROOT.'/compta/tva/class/tva.class.php';
-require_once DOL_DOCUMENT_ROOT.'/fourn/class/paiementfourn.class.php';
-require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
-require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php';
-require_once DOL_DOCUMENT_ROOT.'/accountancy/class/bookkeeping.class.php';
-
-// Langs
-$langs->load("companies");
-$langs->load("other");
-$langs->load("compta");
-$langs->load("bank");
-$langs->load("accountancy");
-
-$date_startmonth = GETPOST('date_startmonth');
-$date_startday = GETPOST('date_startday');
-$date_startyear = GETPOST('date_startyear');
-$date_endmonth = GETPOST('date_endmonth');
-$date_endday = GETPOST('date_endday');
-$date_endyear = GETPOST('date_endyear');
-
-// Security check
-if ($user->societe_id > 0)
-	accessforbidden();
-
-$action = GETPOST('action');
-
-/*
- * View
- */
-
-$year_current = strftime("%Y", dol_now());
-$pastmonth = strftime("%m", dol_now()) - 1;
-$pastmonthyear = $year_current;
-if ($pastmonth == 0) {
-	$pastmonth = 12;
-	$pastmonthyear --;
-}
-
-$date_start = dol_mktime(0, 0, 0, $date_startmonth, $date_startday, $date_startyear);
-$date_end = dol_mktime(23, 59, 59, $date_endmonth, $date_endday, $date_endyear);
-
-if (empty($date_start) || empty($date_end)) // We define date_start and date_end
-{
-	$date_start = dol_get_first_day($pastmonthyear, $pastmonth, false);
-	$date_end = dol_get_last_day($pastmonthyear, $pastmonth, false);
-}
-
-$p = explode(":", $conf->global->MAIN_INFO_SOCIETE_COUNTRY);
-$idpays = $p[0];
-
-$sql = "SELECT b.rowid , b.dateo as do, b.datev as dv, b.amount, b.label, b.rappro, b.num_releve, b.num_chq, b.fk_type, soc.code_compta, ba.courant,";
-$sql .= " soc.code_compta_fournisseur, soc.rowid as socid, soc.nom as name, ba.account_number, bu1.type as typeop";
-$sql .= " FROM " . MAIN_DB_PREFIX . "bank as b";
-$sql .= " JOIN " . MAIN_DB_PREFIX . "bank_account as ba on b.fk_account=ba.rowid";
-$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "bank_url as bu1 ON bu1.fk_bank = b.rowid AND bu1.type='company'";
-$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe as soc on bu1.url_id=soc.rowid";
-
-// Code opération type caisse
-$sql .= " WHERE ba.courant = 2";
-if (! empty($conf->multicompany->enabled)) {
-	$sql .= " AND ba.entity = " . $conf->entity;
-}
-
-if ($date_start && $date_end)
-	$sql .= " AND b.dateo >= '" . $db->idate($date_start) . "' AND b.dateo <= '" . $db->idate($date_end) . "'";
-$sql .= " ORDER BY b.datev";
-
-$object = new Account($db);
-$paymentstatic = new Paiement($db);
-$paymentsupplierstatic = new PaiementFourn($db);
-$societestatic = new Societe($db);
-$chargestatic = new ChargeSociales($db);
-$paymentvatstatic = new TVA($db);
-
-dol_syslog("accountancy/journal/cashjournal.php:: sql=" . $sql, LOG_DEBUG);
-$result = $db->query($sql);
-if ($result) {
-
-	$num = $db->num_rows($result);
-	// les variables
-	$cptfour = (! empty($conf->global->ACCOUNTING_ACCOUNT_SUPPLIER) ? $conf->global->ACCOUNTING_ACCOUNT_SUPPLIER : $langs->trans("CodeNotDef"));
-	$cptcli = (! empty($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER) ? $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER : $langs->trans("CodeNotDef"));
-	$cpttva = (! empty($conf->global->ACCOUNTING_ACCOUNT_SUSPENSE) ? $conf->global->ACCOUNTING_ACCOUNT_SUSPENSE : $langs->trans("CodeNotDef"));
-	$cptsociale = (! empty($conf->global->ACCOUNTING_ACCOUNT_SUSPENSE) ? $conf->global->ACCOUNTING_ACCOUNT_SUSPENSE : $langs->trans("CodeNotDef"));
-
-	$tabpay = array ();
-	$tabbq = array ();
-	$tabtp = array ();
-	$tabcompany = array ();
-	$tabtype = array ();
-
-	$i = 0;
-	while ($i < $num)
-	{
-		$obj = $db->fetch_object($result);
-
-		// controls
-		$compta_bank = $obj->account_number;
-		if ($obj->label == '(SupplierInvoicePayment)')
-			$compta_soc = (! empty($obj->code_compta_fournisseur) ? $obj->code_compta_fournisseur : $cptfour);
-		if ($obj->label == '(CustomerInvoicePayment)')
-			$compta_soc = (! empty($obj->code_compta) ? $obj->code_compta : $cptcli);
-		if ($obj->typeop == '(BankTransfert)')
-			$compta_soc = $conf->global->ACCOUNTING_ACCOUNT_TRANSFER_CASH;
-
-			// variable bookkeeping
-
-		$tabpay[$obj->rowid]["date"] = $obj->do;
-		$tabpay[$obj->rowid]["ref"] = $obj->label;
-		$tabpay[$obj->rowid]["fk_bank"] = $obj->rowid;
-		if (preg_match('/^\((.*)\)$/i', $obj->label, $reg)) {
-			$tabpay[$obj->rowid]["lib"] = $langs->trans($reg[1]);
-		} else {
-			$tabpay[$obj->rowid]["lib"] = dol_trunc($obj->label, 60);
-		}
-		$links = $object->get_url($obj->rowid);
-
-		// get_url may return -1 which is not traversable
-		if (is_array($links))
-		{
-			foreach ( $links as $key => $val )
-			{
-				$tabtype[$obj->rowid] = $links[$key]['type'];
-
-				if ($links[$key]['type'] == 'payment') {
-					$paymentstatic->id = $links[$key]['url_id'];
-					$tabpay[$obj->rowid]["lib"] .= ' ' . $paymentstatic->getNomUrl(2);
-				} else if ($links[$key]['type'] == 'payment_supplier') {
-					$paymentsupplierstatic->id = $links[$key]['url_id'];
-					$paymentsupplierstatic->ref = $links[$key]['url_id'];
-					$tabpay[$obj->rowid]["lib"] .= ' ' . $paymentsupplierstatic->getNomUrl(2);
-				} else if ($links[$key]['type'] == 'company') {
-
-					$societestatic->id = $links[$key]['url_id'];
-					$societestatic->name = $links[$key]['label'];
-					$tabpay[$obj->rowid]["soclib"] = $societestatic->getNomUrl(1, '', 30);
-					$tabtp[$obj->rowid][$compta_soc] += $obj->amount;
-				} else if ($links[$key]['type'] == 'sc') {
-
-					$chargestatic->id = $links[$key]['url_id'];
-					$chargestatic->ref = $links[$key]['url_id'];
-
-					$tabpay[$obj->rowid]["lib"] .= ' ' . $chargestatic->getNomUrl(2);
-					if (preg_match('/^\((.*)\)$/i', $links[$key]['label'], $reg)) {
-						if ($reg[1] == 'socialcontribution')
-							$reg[1] = 'SocialContribution';
-						$chargestatic->lib = $langs->trans($reg[1]);
-					} else {
-						$chargestatic->lib = $links[$key]['label'];
-					}
-					$chargestatic->ref = $chargestatic->lib;
-					$tabpay[$obj->rowid]["soclib"] = $chargestatic->getNomUrl(1, 30);
-
-					$sqlmid = 'SELECT cchgsoc.accountancy_code';
-					$sqlmid .= " FROM " . MAIN_DB_PREFIX . "c_chargesociales cchgsoc ";
-					$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "chargesociales as chgsoc ON  chgsoc.fk_type=cchgsoc.id";
-					$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiementcharge as paycharg ON  paycharg.fk_charge=chgsoc.rowid";
-					$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "bank_url as bkurl ON  bkurl.url_id=paycharg.rowid";
-					$sqlmid .= " WHERE bkurl.fk_bank=" . $obj->rowid;
-					dol_syslog("accountancy/journal/cashjournal.php:: sqlmid=" . $sqlmid, LOG_DEBUG);
-					$resultmid = $db->query($sqlmid);
-					if ($resultmid) {
-						$objmid = $db->fetch_object($resultmid);
-						$tabtp[$obj->rowid][$objmid->accountancy_code] += $obj->amount;
-					}
-					/*else {
-						$tabtp [$obj->rowid] [$cptsociale] += $obj->amount;
-					}*/
-				}
-			}
-		}
-
-		$tabbq[$obj->rowid][$compta_bank] += $obj->amount;
-
-		// if($obj->socid)$tabtp[$obj->rowid][$compta_soc] += $obj->amount;
-
-		$i ++;
-	}
-} else {
-	dol_print_error($db);
-}
-
-/*
- * Actions
-*/
-
-// write bookkeeping
-if ($action == 'writeBookKeeping')
-{
-	$error = 0;
-	foreach ( $tabpay as $key => $val )
-	{
-		// cash
-		foreach ( $tabbq[$key] as $k => $mt )
-		{
-			$bookkeeping = new BookKeeping($db);
-			$bookkeeping->doc_date = $val["date"];
-			$bookkeeping->doc_ref = $val["ref"];
-			$bookkeeping->doc_type = 'cash';
-			$bookkeeping->fk_doc = $key;
-			$bookkeeping->fk_docdet = $val["fk_bank"];
-			$bookkeeping->code_tiers = $tabcompany[$key]['code_client'];
-			$bookkeeping->numero_compte = $k;
-			$bookkeeping->label_compte = $compte->label;
-			$bookkeeping->montant = ($mt < 0 ? - $mt : $mt);
-			$bookkeeping->sens = ($mt >= 0) ? 'D' : 'C';
-			$bookkeeping->debit = ($mt >= 0 ? $mt : 0);
-			$bookkeeping->credit = ($mt < 0 ? - $mt : 0);
-			$bookkeeping->code_journal = $conf->global->ACCOUNTING_CASH_JOURNAL;
-
-			if ($tabtype[$key] == 'payment')
-			{
-				$sqlmid = 'SELECT fac.facnumber';
-				$sqlmid .= " FROM " . MAIN_DB_PREFIX . "facture fac ";
-				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiement_facture as payfac ON  payfac.fk_facture=fac.rowid";
-				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiement as pay ON  payfac.fk_paiement=pay.rowid";
-				$sqlmid .= " WHERE pay.fk_bank=" . $key;
-				dol_syslog("accountancy/journal/cashjournal.php:: sqlmid=" . $sqlmid, LOG_DEBUG);
-				$resultmid = $db->query($sqlmid);
-				if ($resultmid) {
-					$objmid = $db->fetch_object($resultmid);
-					$bookkeeping->doc_ref = $objmid->facnumber;
-				}
-			} else if ($tabtype[$key] == 'payment_supplier') {
-
-				$sqlmid = 'SELECT facf.facnumber';
-				$sqlmid .= " FROM " . MAIN_DB_PREFIX . "facture_fourn facf ";
-				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiementfourn_facturefourn as payfacf ON  payfacf.fk_facturefourn=facf.rowid";
-				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiementfourn as payf ON  payfacf.fk_paiementfourn=payf.rowid";
-				$sqlmid .= " WHERE payf.fk_bank=" . $key;
-				dol_syslog("accountancy/journal/cashjournal.php:: sqlmid=" . $sqlmid, LOG_DEBUG);
-				$resultmid = $db->query($sqlmid);
-				if ($resultmid) {
-					$objmid = $db->fetch_object($resultmid);
-					$bookkeeping->doc_ref = $objmid->facnumber;
-				}
-			}
-
-			$result = $bookkeeping->create();
-			if ($result < 0) {
-				$error ++;
-				setEventMessage($object->errors, 'errors');
-			}
-		}
-		// third party
-		foreach ( $tabtp[$key] as $k => $mt ) {
-
-			$bookkeeping = new BookKeeping($db);
-			$bookkeeping->doc_date = $val["date"];
-			$bookkeeping->doc_ref = $val["ref"];
-			$bookkeeping->doc_type = 'cash';
-			$bookkeeping->fk_doc = $key;
-			$bookkeeping->fk_docdet = $val["fk_bank"];
-			$bookkeeping->label_compte = $tabcompany[$key]['name'];
-			$bookkeeping->montant = ($mt < 0 ? - $mt : $mt);
-			$bookkeeping->sens = ($mt < 0) ? 'D' : 'C';
-			$bookkeeping->debit = ($mt < 0 ? - $mt : 0);
-			$bookkeeping->credit = ($mt >= 0 ? $mt : 0);
-			$bookkeeping->code_journal = $conf->global->ACCOUNTING_CASH_JOURNAL;
-
-			if ($tabtype[$key] == 'sc') {
-				$bookkeeping->code_tiers = '';
-				$bookkeeping->numero_compte = $k;
-			} else if ($tabtype[$key] == 'payment') {
-
-				$sqlmid = 'SELECT fac.facnumber';
-				$sqlmid .= " FROM " . MAIN_DB_PREFIX . "facture fac ";
-				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiement_facture as payfac ON  payfac.fk_facture=fac.rowid";
-				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiement as pay ON  payfac.fk_paiement=pay.rowid";
-				$sqlmid .= " WHERE pay.fk_bank=" . $key;
-				dol_syslog("accountancy/journal/cashjournal.php:: sqlmid=" . $sqlmid, LOG_DEBUG);
-				$resultmid = $db->query($sqlmid);
-				if ($resultmid) {
-					$objmid = $db->fetch_object($resultmid);
-					$bookkeeping->doc_ref = $objmid->facnumber;
-				}
-				$bookkeeping->code_tiers = $k;
-				$bookkeeping->numero_compte = $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER;
-			} else if ($tabtype[$key] == 'payment_supplier') {
-
-				$sqlmid = 'SELECT facf.facnumber';
-				$sqlmid .= " FROM " . MAIN_DB_PREFIX . "facture_fourn facf ";
-				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiementfourn_facturefourn as payfacf ON  payfacf.fk_facturefourn=facf.rowid";
-				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiementfourn as payf ON  payfacf.fk_paiementfourn=payf.rowid";
-				$sqlmid .= " WHERE payf.fk_bank=" . $key;
-				dol_syslog("accountancy/journal/cashjournal.php:: sqlmid=" . $sqlmid, LOG_DEBUG);
-				$resultmid = $db->query($sqlmid);
-				if ($resultmid) {
-					$objmid = $db->fetch_object($resultmid);
-					$bookkeeping->doc_ref = $objmid->facnumber;
-				}
-				$bookkeeping->code_tiers = $k;
-				$bookkeeping->numero_compte = $conf->global->ACCOUNTING_ACCOUNT_SUPPLIER;
-			} else if ($tabtype[$key] == 'company') {
-
-				$sqlmid = 'SELECT fac.facnumber';
-				$sqlmid .= " FROM " . MAIN_DB_PREFIX . "facture fac ";
-				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiement_facture as payfac ON  payfac.fk_facture=fac.rowid";
-				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiement as pay ON  payfac.fk_paiement=pay.rowid";
-				$sqlmid .= " WHERE pay.fk_bank=" . $key;
-				dol_syslog("accountancy/journal/cashjournal.php:: sqlmid=" . $sqlmid, LOG_DEBUG);
-				$resultmid = $db->query($sqlmid);
-				if ($resultmid) {
-					$objmid = $db->fetch_object($resultmid);
-					$bookkeeping->doc_ref = $objmid->facnumber;
-				}
-				$bookkeeping->code_tiers = $k;
-				$bookkeeping->numero_compte = $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER;
-			} else {
-
-				$bookkeeping->doc_ref = $k;
-				$bookkeeping->numero_compte = $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER;
-			}
-
-			$result = $bookkeeping->create();
-			if ($result < 0) {
-				$error ++;
-				setEventMessage($object->errors, 'errors');
-			}
-		}
-	}
-
-	if (empty($error)) {
-		setEventMessage($langs->trans('Success'), 'mesgs');
-	}
-}
-// Export
-if ($action == 'export_csv') {
-	$sep = $conf->global->ACCOUNTING_EXPORT_SEPARATORCSV;
-	$cash_journal = $conf->global->ACCOUNTING_CASH_JOURNAL;
-
-	header('Content-Type: text/csv');
-	header('Content-Disposition:attachment;filename=journal_caisse.csv');
-
-	if ($conf->global->ACCOUNTING_EXPORT_MODELCSV == 2) 	// Model Cegid Expert Export
-	{
-		$sep = ";";
-
-		foreach ( $tabpay as $key => $val ) {
-			$date = dol_print_date($db->jdate($val["date"]), '%d%m%Y');
-
-			// Cash
-			foreach ( $tabbq[$key] as $k => $mt ) {
-				print $date . $sep;
-				print $cash_journal . $sep;
-				print length_accountg(html_entity_decode($k)) . $sep;
-				print $sep;
-				print ($mt < 0 ? 'C' : 'D') . $sep;
-				print ($mt <= 0 ? price(- $mt) : $mt) . $sep;
-				print $val["type_payment"] . $sep;
-				print $val["ref"] . $sep;
-				print "\n";
-			}
-
-			// Third party
-			foreach ( $tabtp[$key] as $k => $mt ) {
-				if ($mt) {
-					print $date . $sep;
-					print $cash_journal . $sep;
-					if ($val["lib"] == '(SupplierInvoicePayment)') {
-						print length_accountg($conf->global->ACCOUNTING_ACCOUNT_SUPPLIER) . $sep;
-					} else {
-						print length_accountg($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER) . $sep;
-					}
-					print length_accounta(html_entity_decode($k)) . $sep;
-					print ($mt < 0 ? 'D' : 'C') . $sep;
-					print ($mt <= 0 ? price(- $mt) : $mt) . $sep;
-					print $val["type_payment"] . $sep;
-					print $val["ref"] . $sep;
-					print "\n";
-				}
-			}
-		}
-	} else 	// Model Classic Export
-	{
-		foreach ( $tabpay as $key => $val ) {
-			$date = dol_print_date($db->jdate($val["date"]), 'day');
-
-			// Cash
-			foreach ( $tabbq[$key] as $k => $mt ) {
-				print '"' . $date . '"' . $sep;
-				print '"' . $val["ref"] . '"' . $sep;
-				print '"' . length_accountg(html_entity_decode($k)) . '"' . $sep;
-				print '"' . $langs->trans("Cash") . '"' . $sep;
-				print '"' . ($mt >= 0 ? price($mt) : '') . '"' . $sep;
-				print '"' . ($mt < 0 ? price(- $mt) : '') . '"';
-				print "\n";
-			}
-			
-			// Third party
-			foreach ( $tabtp[$key] as $k => $mt ) {
-				if ($mt) {
-					print '"' . $date . '"' . $sep;
-					print '"' . $val["ref"] . '"' . $sep;
-					print '"' . length_accounta(html_entity_decode($k)) . '"' . $sep;
-					print '"' . $langs->trans("ThirdParty") . '"' . $sep;
-					print '"' . ($mt < 0 ? price(- $mt) : '') . '"' . $sep;
-					print '"' . ($mt >= 0 ? price($mt) : '') . '"';
-					print "\n";
-				}
-			}
-		}
-	}
-} else {
-
-	$form = new Form($db);
-
-	llxHeader('', $langs->trans("CashJournal"), '');
-
-	$name = $langs->trans("CashJournal");
-	$nomlink = '';
-	$periodlink = '';
-	$exportlink = '';
-	$builddate = time();
-	$description = $langs->trans("DescCashJournal") . '<br>';
-	$period = $form->select_date($date_start, 'date_start', 0, 0, 0, '', 1, 0, 1) . ' - ' . $form->select_date($date_end, 'date_end', 0, 0, 0, '', 1, 0, 1);
-	report_header($name, $nomlink, $period, $periodlink, $description, $builddate, $exportlink, array('action' => ''));
-
-	print '<input type="button" class="button" style="float: right;" value="' . $langs->trans("Export") . '" onclick="launch_export();" />';
-
-	print '<input type="button" class="button" value="' . $langs->trans("WriteBookKeeping") . '" onclick="writeBookKeeping();" />';
-
-	print '
-	<script type="text/javascript">
-		function launch_export() {
-		    $("div.fiche div.tabBar form input[name=\"action\"]").val("export_csv");
-			$("div.fiche div.tabBar form input[type=\"submit\"]").click();
-		    $("div.fiche div.tabBar form input[name=\"action\"]").val("");
-		}
-		function writeBookKeeping() {
-		    $("div.fiche div.tabBar form input[name=\"action\"]").val("writeBookKeeping");
-			$("div.fiche div.tabBar form input[type=\"submit\"]").click();
-		    $("div.fiche div.tabBar form input[name=\"action\"]").val("");
-		}
-	</script>';
-
-	/*
-	 * Show result array
-	 */
-	print '<br><br>';
-
-	$i = 0;
-	print "<table class=\"noborder\" width=\"100%\">";
-	print "<tr class=\"liste_titre\">";
-	print "<td>" . $langs->trans("Date") . "</td>";
-	print "<td>" . $langs->trans("Piece") . ' (' . $langs->trans("InvoiceRef") . ")</td>";
-	print "<td>" . $langs->trans("Account") . "</td>";
-	print "<td align='right'>" . $langs->trans("Debit") . "</td><td align='right'>" . $langs->trans("Credit") . "</td>";
-	print "</tr>\n";
-
-	$var = true;
-	$r = '';
-
-	foreach ( $tabpay as $key => $val ) {
-		$date = dol_print_date($db->jdate($val["date"]), 'day');
-
-		// Cash
-		foreach ( $tabbq[$key] as $k => $mt ) {
-			if (1) {
-				print "<tr " . $bc[$var] . " >";
-				print "<td>" . $date . "</td>";
-				print "<td>" . $val["lib"] . "</td>";
-				print "<td>" . length_accountg($k) . "</td>";
-				print '<td align="right">' . ($mt >= 0 ? price($mt) : '') . "</td>";
-				print '<td align="right">' . ($mt < 0 ? price(- $mt) : '') . "</td>";
-				print "</tr>";
-			}
-		}
-
-		// third party
-		foreach ( $tabtp[$key] as $k => $mt ) {
-			if ($k != 'type') {
-				print "<tr " . $bc[$var] . ">";
-
-				print "<td>" . $date . "</td>";
-				print "<td>" . $val["soclib"] . "</td>";
-
-				print "<td>" . length_accounta($k) . "</td>";
-				print '<td align="right">' . ($mt < 0 ? price(- $mt) : '') . "</td>";
-				print '<td align="right">' . ($mt >= 0 ? price($mt) : '') . "</td>";
-			}
-		}
-
-		$var = ! $var;
-	}
-
-	print "</table>";
-
-	// End of page
-	llxFooter();
-}
-$db->close();

htdocs/adherents/admin/adherent_extrafields.php

@@ -58,6 +58,8 @@ require DOL_DOCUMENT_ROOT.'/core/actions_extrafields.inc.php';
  * View
  */
 
+$textobject = $langs->transnoentitiesnoconv("Members");
+
 $help_url='EN:Module_Foundations|FR:Module_Adhérents|ES:Módulo_Miembros';
 llxHeader('',$langs->trans("MembersSetup"),$help_url);
 
@@ -70,42 +72,7 @@ $head = member_admin_prepare_head();
 
 dol_fiche_head($head, 'attributes', $langs->trans("Members"), 0, 'user');
 
-
+require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
-print $langs->trans("DefineHereComplementaryAttributes", $langs->transnoentitiesnoconv("Members")).'<br>'."\n";
-print '<br>';
-
-// Load attribute_label
-$extrafields->fetch_name_optionals_label($elementtype);
-
-print "<table summary=\"listofattributes\" class=\"noborder\" width=\"100%\">";
-
-print '<tr class="liste_titre">';
-print '<td>'.$langs->trans("Label").'</td>';
-print '<td>'.$langs->trans("AttributeCode").'</td>';
-print '<td>'.$langs->trans("Type").'</td>';
-print '<td align="right">'.$langs->trans("Size").'</td>';
-print '<td align="center">'.$langs->trans("Unique").'</td>';
-print '<td align="center">'.$langs->trans("Required").'</td>';
-print '<td width="80">&nbsp;</td>';
-print "</tr>\n";
-
-$var=True;
-foreach($extrafields->attribute_type as $key => $value)
-{
-	$var=!$var;
-	print "<tr ".$bc[$var].">";
-    print "<td>".$extrafields->attribute_label[$key]."</td>\n";
-	print "<td>".$key."</td>\n";
-	print "<td>".$type2label[$extrafields->attribute_type[$key]]."</td>\n";
-	print '<td align="right">'.$extrafields->attribute_size[$key]."</td>\n";
-    print '<td align="center">'.yn($extrafields->attribute_unique[$key])."</td>\n";
-    print '<td align="center">'.yn($extrafields->attribute_required[$key])."</td>\n";
-	print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=edit&attrname='.$key.'">'.img_edit().'</a>';
-	print "&nbsp; <a href=\"".$_SERVER["PHP_SELF"]."?action=delete&attrname=".$key."\">".img_delete()."</a></td>\n";
-	print "</tr>";
-}
-
-print "</table>";
 
 dol_fiche_end();
 

htdocs/adherents/admin/adherent_type_extrafields.php

@@ -74,42 +74,7 @@ $head = member_admin_prepare_head();
 
 dol_fiche_head($head, 'attributes_type', $langs->trans("Members"), 0, 'user');
 
-
+require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
-print $langs->trans("DefineHereComplementaryAttributes",$textobject).'<br>'."\n";
-print '<br>';
-
-// Load attribute_label
-$extrafields->fetch_name_optionals_label($elementtype);
-
-print "<table summary=\"listofattributes\" class=\"noborder\" width=\"100%\">";
-
-print '<tr class="liste_titre">';
-print '<td>'.$langs->trans("Label").'</td>';
-print '<td>'.$langs->trans("AttributeCode").'</td>';
-print '<td>'.$langs->trans("Type").'</td>';
-print '<td align="right">'.$langs->trans("Size").'</td>';
-print '<td align="center">'.$langs->trans("Unique").'</td>';
-print '<td align="center">'.$langs->trans("Required").'</td>';
-print '<td width="80">&nbsp;</td>';
-print "</tr>\n";
-
-$var=True;
-foreach($extrafields->attribute_type as $key => $value)
-{
-	$var=!$var;
-	print "<tr ".$bc[$var].">";
-    print "<td>".$extrafields->attribute_label[$key]."</td>\n";
-	print "<td>".$key."</td>\n";
-	print "<td>".$type2label[$extrafields->attribute_type[$key]]."</td>\n";
-	print '<td align="right">'.$extrafields->attribute_size[$key]."</td>\n";
-    print '<td align="center">'.yn($extrafields->attribute_unique[$key])."</td>\n";
-    print '<td align="center">'.yn($extrafields->attribute_required[$key])."</td>\n";
-	print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=edit&attrname='.$key.'">'.img_edit().'</a>';
-	print "&nbsp; <a href=\"".$_SERVER["PHP_SELF"]."?action=delete&attrname=".$key."\">".img_delete()."</a></td>\n";
-	print "</tr>";
-}
-
-print "</table>";
 
 dol_fiche_end();
 

htdocs/adherents/card.php

@@ -302,6 +302,7 @@ if (empty($reshook))
 
 			// Fill array 'array_options' with data from add form
 			$ret = $extrafields->setOptionalsFromPost($extralabels,$object);
+			if ($ret < 0) $error++;
 
 			// Check if we need to also synchronize user information
 			$nosyncuser=0;
@@ -471,6 +472,7 @@ if (empty($reshook))
 
 		// Fill array 'array_options' with data from add form
 		$ret = $extrafields->setOptionalsFromPost($extralabels,$object);
+		if ($ret < 0) $error++;
 
 		// Check parameters
 		if (empty($morphy) || $morphy == "-1") {

htdocs/adherents/class/adherent.class.php

@@ -1721,8 +1721,8 @@ class Adherent extends CommonObject
     /**
      *      Load indicators for dashboard (this->nbtodo and this->nbtodolate)
      *
-     *      @param	User	$user   	Objet user
+     *      @param	User	$user   		Objet user
-     *      @return WorkboardResponse|int <0 if KO, WorkboardResponse if OK
+     *      @return WorkboardResponse|int 	<0 if KO, WorkboardResponse if OK
      */
     function load_board($user)
     {

htdocs/adherents/type.php

@@ -89,6 +89,7 @@ if ($action == 'add' && $user->rights->adherent->configurer)
 
 		// Fill array 'array_options' with data from add form
 		$ret = $extrafields->setOptionalsFromPost($extralabels,$adht);
+		if ($ret < 0) $error++;
 
 		if ($adht->libelle)
 		{
@@ -126,6 +127,7 @@ if ($action == 'update' && $user->rights->adherent->configurer)
 
 		// Fill array 'array_options' with data from add form
 		$ret = $extrafields->setOptionalsFromPost($extralabels,$adht);
+		if ($ret < 0) $error++;
 
 		$adht->update($user);
 

htdocs/admin/agenda_extrafields.php

@@ -76,41 +76,7 @@ $head=agenda_prepare_head();
 
 dol_fiche_head($head, 'attributes', $langs->trans("Agenda"), 0, 'action');
 
-print $langs->trans("DefineHereComplementaryAttributes", $langs->transnoentitiesnoconv("Agenda")).'<br>'."\n";
+require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
-print '<br>';
-
-// Load attribute_label
-$extrafields->fetch_name_optionals_label($elementtype);
-
-print "<table summary=\"listofattributes\" class=\"noborder\" width=\"100%\">";
-
-print '<tr class="liste_titre">';
-print '<td>'.$langs->trans("Label").'</td>';
-print '<td>'.$langs->trans("AttributeCode").'</td>';
-print '<td>'.$langs->trans("Type").'</td>';
-print '<td align="right">'.$langs->trans("Size").'</td>';
-print '<td align="center">'.$langs->trans("Unique").'</td>';
-print '<td align="center">'.$langs->trans("Required").'</td>';
-print '<td width="80">&nbsp;</td>';
-print "</tr>\n";
-
-$var=True;
-foreach($extrafields->attribute_type as $key => $value)
-{
-    $var=!$var;
-    print "<tr ".$bc[$var].">";
-    print "<td>".$extrafields->attribute_label[$key]."</td>\n";
-    print "<td>".$key."</td>\n";
-    print "<td>".$type2label[$extrafields->attribute_type[$key]]."</td>\n";
-    print '<td align="right">'.$extrafields->attribute_size[$key]."</td>\n";
-    print '<td align="center">'.yn($extrafields->attribute_unique[$key])."</td>\n";
-    print '<td align="center">'.yn($extrafields->attribute_required[$key])."</td>\n";
-    print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=edit&attrname='.$key.'">'.img_edit().'</a>';
-    print "&nbsp; <a href=\"".$_SERVER["PHP_SELF"]."?action=delete&attrname=$key\">".img_delete()."</a></td>\n";
-    print "</tr>";
-}
-
-print "</table>";
 
 dol_fiche_end();
 

htdocs/admin/agenda_extsites.php

@@ -41,7 +41,7 @@ $actiontest=GETPOST('test','alpha');
 $actionsave=GETPOST('save','alpha');
 
 if (empty($conf->global->AGENDA_EXT_NB)) $conf->global->AGENDA_EXT_NB=5;
-$MAXAGENDA=empty($conf->global->AGENDA_EXT_NB)?5:$conf->global->AGENDA_EXT_NB;
+$MAXAGENDA=$conf->global->AGENDA_EXT_NB;
 
 // List of aviable colors
 $colorlist=array('BECEDD','DDBECE','BFDDBE','F598B4','F68654','CBF654','A4A4A5');

htdocs/admin/askpricesupplier.php

@@ -0,0 +1,599 @@
+<?php
+/* Copyright (C) 2003-2004 Rodolphe Quiedeville        <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2011 Laurent Destailleur         <eldy@users.sourceforge.net>
+ * Copyright (C) 2004      Sebastien Di Cintio         <sdicintio@ressource-toi.org>
+ * Copyright (C) 2004      Benoit Mortier              <benoit.mortier@opensides.be>
+ * Copyright (C) 2004      Eric Seigne                 <eric.seigne@ryxeo.com>
+ * Copyright (C) 2005-2012 Regis Houssin               <regis.houssin@capnetworks.com>
+ * Copyright (C) 2008      Raphael Bertrand (Resultic) <raphael.bertrand@resultic.fr>
+ * Copyright (C) 2011-2013 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 <http://www.gnu.org/licenses/>.
+ */
+
+require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/comm/askpricesupplier/class/askpricesupplier.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/askpricesupplier.lib.php';
+$langs->load("admin");
+$langs->load("errors");
+$langs->load('other');
+$langs->load('askpricesupplier');
+
+if (! $user->admin) accessforbidden();
+
+$action = GETPOST('action','alpha');
+$value = GETPOST('value','alpha');
+$label = GETPOST('label','alpha');
+$scandir = GETPOST('scandir','alpha');
+$type='askpricesupplier';
+
+/*
+ * Actions
+ */
+$error=0;
+if ($action == 'updateMask')
+{
+	$maskconstaskpricesupplier=GETPOST('maskconstaskpricesupplier','alpha');
+	$maskaskpricesupplier=GETPOST('maskaskpricesupplier','alpha');
+	if ($maskconstaskpricesupplier) $res = dolibarr_set_const($db,$maskconstaskpricesupplier,$maskaskpricesupplier,'chaine',0,'',$conf->entity);
+
+	if (! $res > 0) $error++;
+
+ 	if (! $error)
+	{
+		setEventMessage($langs->trans("SetupSaved"));
+	}
+	else
+	{
+		setEventMessage($langs->trans("Error"),'errors');
+	}
+}
+
+if ($action == 'specimen')
+{
+	$modele=GETPOST('module','alpha');
+
+	$askpricesupplier = new AskPriceSupplier($db);
+	$askpricesupplier->initAsSpecimen();
+
+	// Search template files
+	$file=''; $classname=''; $filefound=0;
+	$dirmodels=array_merge(array('/'),(array) $conf->modules_parts['models']);
+	foreach($dirmodels as $reldir)
+	{
+	    $file=dol_buildpath($reldir."core/modules/askpricesupplier/doc/pdf_".$modele.".modules.php");
+		if (file_exists($file))
+		{
+			$filefound=1;
+			$classname = "pdf_".$modele;
+			break;
+		}
+	}
+
+	if ($filefound)
+	{
+		require_once $file;
+
+		$module = new $classname($db);
+
+		if ($module->write_file($askpricesupplier,$langs) > 0)
+		{
+			header("Location: ".DOL_URL_ROOT."/document.php?modulepart=askpricesupplier&file=SPECIMEN.pdf");
+			return;
+		}
+		else
+		{
+			setEventMessage($module->error,'errors');
+			dol_syslog($module->error, LOG_ERR);
+		}
+	}
+	else
+	{
+		setEventMessage($langs->trans("ErrorModuleNotFound"),'errors');
+		dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
+	}
+}
+
+if ($action == 'set_ASKPRICESUPPLIER_DRAFT_WATERMARK')
+{
+	$draft = GETPOST('ASKPRICESUPPLIER_DRAFT_WATERMARK','alpha');
+
+	$res = dolibarr_set_const($db, "ASKPRICESUPPLIER_DRAFT_WATERMARK",trim($draft),'chaine',0,'',$conf->entity);
+	if (! $res > 0) $error++;
+
+ 	if (! $error)
+	{
+		setEventMessage($langs->trans("SetupSaved"));
+	}
+	else
+	{
+		setEventMessage($langs->trans("Error"),'errors');
+	}
+}
+
+if ($action == 'set_ASKPRICESUPPLIER_FREE_TEXT')
+{
+	$freetext = GETPOST('ASKPRICESUPPLIER_FREE_TEXT');	// No alpha here, we want exact string
+
+	$res = dolibarr_set_const($db, "ASKPRICESUPPLIER_FREE_TEXT",$freetext,'chaine',0,'',$conf->entity);
+
+	if (! $res > 0) $error++;
+
+ 	if (! $error)
+	{
+		setEventMessage($langs->trans("SetupSaved"));
+	}
+	else
+	{
+		setEventMessage($langs->trans("Error"),'errors');
+	}
+}
+
+if ($action == 'set_BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER')
+{
+    $res = dolibarr_set_const($db, "BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER",$value,'chaine',0,'',$conf->entity);
+
+    if (! $res > 0) $error++;
+
+    if (! $error)
+    {
+        setEventMessage($langs->trans("SetupSaved"));
+    }
+    else
+    {
+        setEventMessage($langs->trans("Error"),'errors');
+    }
+}
+
+// Define constants for submodules that contains parameters (forms with param1, param2, ... and value1, value2, ...)
+if ($action == 'setModuleOptions')
+{
+	$post_size=count($_POST);
+
+	$db->begin();
+
+	for($i=0;$i < $post_size;$i++)
+	{
+		if (array_key_exists('param'.$i,$_POST))
+		{
+			$param=GETPOST("param".$i,'alpha');
+			$value=GETPOST("value".$i,'alpha');
+			if ($param) $res = dolibarr_set_const($db,$param,$value,'chaine',0,'',$conf->entity);
+			if (! $res > 0) $error++;
+		}
+	}
+	if (! $error)
+	{
+		$db->commit();
+		setEventMessage($langs->trans("SetupSaved"));
+	}
+	else
+	{
+		$db->rollback();
+		setEventMessage($langs->trans("Error"),'errors');
+	}
+}
+
+// Activate a model
+if ($action == 'set')
+{
+	$ret = addDocumentModel($value, $type, $label, $scandir);
+}
+
+else if ($action == 'del')
+{
+	$ret = delDocumentModel($value, $type);
+	if ($ret > 0)
+	{
+        if ($conf->global->ASKPRICESUPPLIER_ADDON_PDF == "$value") dolibarr_del_const($db, 'ASKPRICESUPPLIER_ADDON_PDF',$conf->entity);
+	}
+}
+
+else if ($action == 'setdoc')
+{
+    if (dolibarr_set_const($db, "ASKPRICESUPPLIER_ADDON_PDF",$value,'chaine',0,'',$conf->entity))
+	{
+		$conf->global->ASKPRICESUPPLIER_ADDON_PDF = $value;
+	}
+
+	// On active le modele
+	$ret = delDocumentModel($value, $type);
+	if ($ret > 0)
+	{
+		$ret = addDocumentModel($value, $type, $label, $scandir);
+	}
+}
+
+else if ($action == 'setmod')
+{
+	// TODO Verifier si module numerotation choisi peut etre active
+	// par appel methode canBeActivated
+
+	dolibarr_set_const($db, "ASKPRICESUPPLIER_ADDON",$value,'chaine',0,'',$conf->entity);
+}
+
+
+/*
+ * Affiche page
+ */
+
+$dirmodels=array_merge(array('/'),(array) $conf->modules_parts['models']);
+
+
+llxHeader('',$langs->trans("AskPriceSupplierSetup"));
+
+$form=new Form($db);
+
+//if ($mesg) print $mesg;
+
+$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
+print_fiche_titre($langs->trans("AskPriceSupplierSetup"),$linkback,'setup');
+
+$head = askpricesupplier_admin_prepare_head();
+
+dol_fiche_head($head, 'general', $langs->trans("CommRequests"), 0, 'askpricesupplier');
+
+/*
+ *  Module numerotation
+ */
+print_titre($langs->trans("AskPriceSupplierNumberingModules"));
+
+print '<table class="noborder" width="100%">';
+print '<tr class="liste_titre">';
+print '<td>'.$langs->trans("Name")."</td>\n";
+print '<td>'.$langs->trans("Description")."</td>\n";
+print '<td class="nowrap">'.$langs->trans("Example")."</td>\n";
+print '<td align="center" width="60">'.$langs->trans("Status").'</td>';
+print '<td align="center" width="16">'.$langs->trans("ShortInfo").'</td>';
+print '</tr>'."\n";
+
+clearstatcache();
+foreach ($dirmodels as $reldir)
+{
+	$dir = dol_buildpath($reldir."core/modules/askpricesupplier/");
+
+	if (is_dir($dir))
+	{
+		$handle = opendir($dir);
+		if (is_resource($handle))
+		{
+			$var=true;
+
+			while (($file = readdir($handle))!==false)
+			{
+				if (substr($file, 0, 21) == 'mod_askpricesupplier_' && substr($file, dol_strlen($file)-3, 3) == 'php')
+				{
+					$file = substr($file, 0, dol_strlen($file)-4);
+
+					require_once $dir.$file.'.php';
+
+					$module = new $file;
+
+					// Show modules according to features level
+					if ($module->version == 'development'  && $conf->global->MAIN_FEATURES_LEVEL < 2) continue;
+					if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue;
+
+					if ($module->isEnabled())
+					{
+						$var=!$var;
+						print '<tr '.$bc[$var].'><td>'.$module->nom."</td><td>\n";
+						print $module->info();
+						print '</td>';
+
+                        // Show example of numbering module
+                        print '<td class="nowrap">';
+                        $tmp=$module->getExample();
+                        if (preg_match('/^Error/',$tmp)) print '<div class="error">'.$langs->trans($tmp).'</div>';
+                        elseif ($tmp=='NotConfigured') print $langs->trans($tmp);
+                        else print $tmp;
+                        print '</td>'."\n";
+
+						print '<td align="center">';
+						if ($conf->global->ASKPRICESUPPLIER_ADDON == "$file")
+						{
+							print img_picto($langs->trans("Activated"),'switch_on');
+						}
+						else
+						{
+							print '<a href="'.$_SERVER["PHP_SELF"].'?action=setmod&amp;value='.$file.'">';
+							print img_picto($langs->trans("Disabled"),'switch_off');
+							print '</a>';
+						}
+						print '</td>';
+
+						$askpricesupplier=new AskPriceSupplier($db);
+						$askpricesupplier->initAsSpecimen();
+
+						// Info
+						$htmltooltip='';
+						$htmltooltip.=''.$langs->trans("Version").': <b>'.$module->getVersion().'</b><br>';
+						$askpricesupplier->type=0;
+						$nextval=$module->getNextValue($mysoc,$askpricesupplier);
+                        if ("$nextval" != $langs->trans("NotAvailable")) {  // Keep " on nextval
+                            $htmltooltip.=''.$langs->trans("NextValue").': ';
+                            if ($nextval) {
+                                if (preg_match('/^Error/',$nextval) || $nextval=='NotConfigured')
+                                    $nextval = $langs->trans($nextval);
+                                $htmltooltip.=$nextval.'<br>';
+                            } else {
+                                $htmltooltip.=$langs->trans($module->error).'<br>';
+                            }
+                        }
+
+						print '<td align="center">';
+						print $form->textwithpicto('',$htmltooltip,1,0);
+						print '</td>';
+
+						print "</tr>\n";
+					}
+				}
+			}
+			closedir($handle);
+		}
+	}
+}
+print "</table><br>\n";
+
+
+/*
+ * Document templates generators
+ */
+
+print_titre($langs->trans("AskPriceSupplierPDFModules"));
+
+// Load array def with activated templates
+$def = array();
+$sql = "SELECT nom";
+$sql.= " FROM ".MAIN_DB_PREFIX."document_model";
+$sql.= " WHERE type = '".$type."'";
+$sql.= " AND entity = ".$conf->entity;
+$resql=$db->query($sql);
+if ($resql)
+{
+	$i = 0;
+	$num_rows=$db->num_rows($resql);
+	while ($i < $num_rows)
+	{
+		$array = $db->fetch_array($resql);
+		array_push($def, $array[0]);
+		$i++;
+	}
+}
+else
+{
+	dol_print_error($db);
+}
+
+
+print "<table class=\"noborder\" width=\"100%\">\n";
+print "<tr class=\"liste_titre\">\n";
+print "  <td>".$langs->trans("Name")."</td>\n";
+print "  <td>".$langs->trans("Description")."</td>\n";
+print '<td align="center" width="40">'.$langs->trans("Status")."</td>\n";
+print '<td align="center" width="40">'.$langs->trans("Default")."</td>\n";
+print '<td align="center" width="40">'.$langs->trans("ShortInfo").'</td>';
+print '<td align="center" width="40">'.$langs->trans("Preview").'</td>';
+print "</tr>\n";
+
+clearstatcache();
+
+$var=true;
+foreach ($dirmodels as $reldir)
+{
+    foreach (array('','/doc') as $valdir)
+    {
+    	$dir = dol_buildpath($reldir."core/modules/askpricesupplier".$valdir);
+
+        if (is_dir($dir))
+        {
+            $handle=opendir($dir);
+            if (is_resource($handle))
+            {
+                while (($file = readdir($handle))!==false)
+                {
+                    $filelist[]=$file;
+                }
+                closedir($handle);
+                arsort($filelist);
+
+                foreach($filelist as $file)
+                {
+                    if (preg_match('/\.modules\.php$/i',$file) && preg_match('/^(pdf_|doc_)/',$file))
+                    {
+                    	if (file_exists($dir.'/'.$file))
+                    	{
+                    		$name = substr($file, 4, dol_strlen($file) -16);
+	                        $classname = substr($file, 0, dol_strlen($file) -12);
+
+	                        require_once $dir.'/'.$file;
+	                        $module = new $classname($db);
+
+	                        $modulequalified=1;
+	                        if ($module->version == 'development'  && $conf->global->MAIN_FEATURES_LEVEL < 2) $modulequalified=0;
+	                        if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) $modulequalified=0;
+
+	                        if ($modulequalified)
+	                        {
+	                            $var = !$var;
+	                            print '<tr '.$bc[$var].'><td width="100">';
+	                            print (empty($module->name)?$name:$module->name);
+	                            print "</td><td>\n";
+	                            if (method_exists($module,'info')) print $module->info($langs);
+	                            else print $module->description;
+	                            print '</td>';
+
+	                            // Active
+	                            if (in_array($name, $def))
+	                            {
+	                            	print '<td align="center">'."\n";
+	                            	print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&amp;value='.$name.'">';
+	                            	print img_picto($langs->trans("Enabled"),'switch_on');
+	                            	print '</a>';
+	                            	print '</td>';
+	                            }
+	                            else
+	                            {
+	                                print "<td align=\"center\">\n";
+	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"),'switch_off').'</a>';
+	                                print "</td>";
+	                            }
+
+	                            // Defaut
+	                            print "<td align=\"center\">";
+	                            if ($conf->global->ASKPRICESUPPLIER_ADDON_PDF == "$name")
+	                            {
+	                                print img_picto($langs->trans("Default"),'on');
+	                            }
+	                            else
+	                            {
+	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"),'off').'</a>';
+	                            }
+	                            print '</td>';
+
+	                           // Info
+	                            $htmltooltip =    ''.$langs->trans("Name").': '.$module->name;
+	                            $htmltooltip.='<br>'.$langs->trans("Type").': '.($module->type?$module->type:$langs->trans("Unknown"));
+	                            if ($module->type == 'pdf')
+	                            {
+	                                $htmltooltip.='<br>'.$langs->trans("Width").'/'.$langs->trans("Height").': '.$module->page_largeur.'/'.$module->page_hauteur;
+	                            }
+								$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("Discounts").': '.yn($module->option_escompte,1,1);
+								//$htmltooltip.='<br>'.$langs->trans("CreditNote").': '.yn($module->option_credit_note,1,1);
+								$htmltooltip.='<br>'.$langs->trans("WatermarkOnDraftProposal").': '.yn($module->option_draft_watermark,1,1);
+
+
+	                            print '<td align="center">';
+	                            print $form->textwithpicto('',$htmltooltip,1,0);
+	                            print '</td>';
+
+	                            // Preview
+	                            print '<td align="center">';
+	                            if ($module->type == 'pdf')
+	                            {
+	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"),'bill').'</a>';
+	                            }
+	                            else
+	                            {
+	                                print img_object($langs->trans("PreviewNotAvailable"),'generic');
+	                            }
+	                            print '</td>';
+
+	                            print "</tr>\n";
+	                        }
+                    	}
+                    }
+                }
+            }
+        }
+    }
+}
+
+print '</table>';
+print '<br>';
+
+
+/*
+ * Other options
+ *
+ */
+print_titre($langs->trans("OtherOptions"));
+
+$var=true;
+print "<table class=\"noborder\" width=\"100%\">";
+print "<tr class=\"liste_titre\">";
+print "<td>".$langs->trans("Parameter")."</td>\n";
+print '<td width="60" align="center">'.$langs->trans("Value")."</td>\n";
+print "<td>&nbsp;</td>\n";
+print "</tr>";
+
+$var=! $var;
+print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
+print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+print '<input type="hidden" name="action" value="set_ASKPRICESUPPLIER_FREE_TEXT">';
+print '<tr '.$bc[$var].'><td colspan="2">';
+print $langs->trans("FreeLegalTextOnAskPriceSupplier").' ('.$langs->trans("AddCRIfTooLong").')<br>';
+print '<textarea name="ASKPRICESUPPLIER_FREE_TEXT" class="flat" cols="120">'.$conf->global->ASKPRICESUPPLIER_FREE_TEXT.'</textarea>';
+print '</td><td align="right">';
+print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
+print "</td></tr>\n";
+print '</form>';
+
+$var=!$var;
+print "<form method=\"post\" action=\"".$_SERVER["PHP_SELF"]."\">";
+print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+print "<input type=\"hidden\" name=\"action\" value=\"set_ASKPRICESUPPLIER_DRAFT_WATERMARK\">";
+print '<tr '.$bc[$var].'><td colspan="2">';
+print $langs->trans("WatermarkOnDraftAskPriceSupplier").'<br>';
+print '<input size="50" class="flat" type="text" name="ASKPRICESUPPLIER_DRAFT_WATERMARK" value="'.$conf->global->ASKPRICESUPPLIER_DRAFT_WATERMARK.'">';
+print '</td><td align="right">';
+print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
+print "</td></tr>\n";
+print '</form>';
+
+if ($conf->banque->enabled)
+{
+    $var=!$var;
+    print '<tr '.$bc[$var].'><td>';
+    print $langs->trans("BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER").'</td><td>&nbsp</td><td align="right">';
+    if (! empty($conf->use_javascript_ajax))
+    {
+        print ajax_constantonoff('BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER');
+    }
+    else
+    {
+        if (empty($conf->global->BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER))
+        {
+            print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER&amp;value=1">'.img_picto($langs->trans("Disabled"),'switch_off').'</a>';
+        }
+        else
+        {
+            print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER&amp;value=0">'.img_picto($langs->trans("Enabled"),'switch_on').'</a>';
+        }
+    }
+    print '</td></tr>';
+}
+else
+{
+    $var=!$var;
+    print '<tr '.$bc[$var].'><td>';
+    print $langs->trans("BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER").'</td><td>&nbsp;</td><td align="center">'.$langs->trans('NotAvailable').'</td></tr>';
+}
+
+print '</table>';
+
+
+
+/*
+ *  Directory
+ */
+print '<br>';
+print_titre($langs->trans("PathToDocuments"));
+
+print "<table class=\"noborder\" width=\"100%\">\n";
+print "<tr class=\"liste_titre\">\n";
+print "  <td>".$langs->trans("Name")."</td>\n";
+print "  <td>".$langs->trans("Value")."</td>\n";
+print "</tr>\n";
+print "<tr ".$bc[false].">\n  <td width=\"140\">".$langs->trans("PathDirectory")."</td>\n  <td>".$conf->askpricesupplier->dir_output."</td>\n</tr>\n";
+print "</table>\n<br>";
+
+$db->close();
+
+llxFooter();

htdocs/admin/bank_extrafields.php

@@ -59,6 +59,8 @@ require DOL_DOCUMENT_ROOT.'/core/actions_extrafields.inc.php';
  * View
  */
 
+$textobject = $langs->transnoentitiesnoconv("Bank");
+
 llxHeader('',$langs->trans("BankSetupModule"),$help_url);
 
 
@@ -70,45 +72,7 @@ $head = bank_admin_prepare_head(null);
 
 dol_fiche_head($head, 'attributes', $langs->trans("BankSetupModule"), 0, 'account');
 
-
+require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
-print $langs->trans("DefineHereComplementaryAttributes",$textobject).'<br>'."\n";
-print '<br>';
-
-// Load attribute_label
-$extrafields->fetch_name_optionals_label($elementtype);
-
-print "<table summary=\"listofattributes\" class=\"noborder\" width=\"100%\">";
-
-print '<tr class="liste_titre">';
-print '<td align="center">'.$langs->trans("Position").'</td>';
-print '<td>'.$langs->trans("Label").'</td>';
-print '<td>'.$langs->trans("AttributeCode").'</td>';
-print '<td>'.$langs->trans("Type").'</td>';
-print '<td align="right">'.$langs->trans("Size").'</td>';
-print '<td align="center">'.$langs->trans("Unique").'</td>';
-print '<td align="center">'.$langs->trans("Required").'</td>';
-print '<td width="80">&nbsp;</td>';
-print "</tr>\n";
-
-$var=True;
-foreach($extrafields->attribute_type as $key => $value)
-{
-    $var=!$var;
-    print "<tr ".$bc[$var].">";
-    print "<td>".$extrafields->attribute_pos[$key]."</td>\n";
-    print "<td>".$extrafields->attribute_label[$key]."</td>\n";
-    print "<td>".$key."</td>\n";
-    print "<td>".$type2label[$extrafields->attribute_type[$key]]."</td>\n";
-    print '<td align="right">'.$extrafields->attribute_size[$key]."</td>\n";
-    print '<td align="center">'.yn($extrafields->attribute_unique[$key])."</td>\n";
-    print '<td align="center">'.yn($extrafields->attribute_required[$key])."</td>\n";
-    print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=edit&attrname='.$key.'">'.img_edit().'</a>';
-    print "&nbsp; <a href=\"".$_SERVER["PHP_SELF"]."?action=delete&attrname=$key\">".img_delete()."</a></td>\n";
-    print "</tr>";
-    //      $i++;
-}
-
-print "</table>";
 
 dol_fiche_end();
 

htdocs/admin/expensereport.php

@@ -0,0 +1,499 @@
+<?php
+/* Copyright (C) 2003-2004 Rodolphe Quiedeville         <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2015 Laurent Destailleur          <eldy@users.sourceforge.net>
+ * Copyright (C) 2004      Sebastien Di Cintio          <sdicintio@ressource-toi.org>
+ * Copyright (C) 2004      Benoit Mortier               <benoit.mortier@opensides.be>
+ * Copyright (C) 2005-2014 Regis Houssin                <regis.houssin@capnetworks.com>
+ * Copyright (C) 2008      Raphael Bertrand (Resultic)  <raphael.bertrand@resultic.fr>
+ * Copyright (C) 2011-2013 Juanjo Menent			    <jmenent@2byte.es>
+ * Copyright (C) 2011-2013 Philippe Grand			    <philippe.grand@atoo-net.com>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *	\file       htdocs/admin/expensereport.php
+ *	\ingroup    expensereport
+ *	\brief      Setup page of module ExpenseReport
+ */
+
+require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/expensereport.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
+
+$langs->load("admin");
+$langs->load("errors");
+$langs->load("trips");
+$langs->load('other');
+
+if (! $user->admin) accessforbidden();
+
+$action = GETPOST('action','alpha');
+$value = GETPOST('value','alpha');
+$label = GETPOST('label','alpha');
+$scandir = GETPOST('scandir','alpha');
+$type='expensereport';
+
+
+/*
+ * Actions
+ */
+if ($action == 'updateMask')
+{
+	$maskconst=GETPOST('maskconst','alpha');
+	$maskvalue=GETPOST('maskvalue','alpha');
+	if ($maskconst) $res = dolibarr_set_const($db,$maskconst,$maskvalue,'chaine',0,'',$conf->entity);
+
+	if (! $res > 0) $error++;
+
+ 	if (! $error)
+    {
+        setEventMessage($langs->trans("SetupSaved"));
+    }
+    else
+    {
+        setEventMessage($langs->trans("Error"),'errors');
+    }
+}
+
+else if ($action == 'specimen') // For fiche inter
+{
+	$modele= GETPOST('module','alpha');
+
+	$inter = new ExpenseReport($db);
+	$inter->initAsSpecimen();
+
+	// Search template files
+	$file=''; $classname=''; $filefound=0;
+	$dirmodels=array_merge(array('/'),(array) $conf->modules_parts['models']);
+	foreach($dirmodels as $reldir)
+	{
+	    $file=dol_buildpath($reldir."core/modules/expensereport/doc/pdf_".$modele.".modules.php",0);
+		if (file_exists($file))
+		{
+			$filefound=1;
+			$classname = "pdf_".$modele;
+			break;
+		}
+	}
+
+	if ($filefound)
+	{
+		require_once $file;
+
+		$module = new $classname($db);
+
+		if ($module->write_file($inter,$langs) > 0)
+		{
+			header("Location: ".DOL_URL_ROOT."/document.php?modulepart=expensereport&file=SPECIMEN.pdf");
+			return;
+		}
+		else
+		{
+			setEventMessage($obj->error,'errors');
+			dol_syslog($obj->error, LOG_ERR);
+		}
+	}
+	else
+	{
+		setEventMessage($langs->trans("ErrorModuleNotFound"),'errors');
+		dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
+	}
+}
+
+// Define constants for submodules that contains parameters (forms with param1, param2, ... and value1, value2, ...)
+if ($action == 'setModuleOptions')
+{
+	$post_size=count($_POST);
+
+	$db->begin();
+
+	for($i=0;$i < $post_size;$i++)
+	{
+		if (array_key_exists('param'.$i,$_POST))
+		{
+			$param=GETPOST("param".$i,'alpha');
+			$value=GETPOST("value".$i,'alpha');
+			if ($param) $res = dolibarr_set_const($db,$param,$value,'chaine',0,'',$conf->entity);
+			if (! $res > 0) $error++;
+		}
+	}
+	if (! $error)
+	{
+		$db->commit();
+		setEventMessage($langs->trans("SetupSaved"));
+	}
+	else
+	{
+		$db->rollback();
+		setEventMessage($langs->trans("Error"),'errors');
+	}
+}
+
+// Activate a model
+else if ($action == 'set')
+{
+	$ret = addDocumentModel($value, $type, $label, $scandir);
+}
+
+else if ($action == 'del')
+{
+	$ret = delDocumentModel($value, $type);
+	if ($ret > 0)
+	{
+        if ($conf->global->EXPENSEREPORT_ADDON_PDF == "$value") dolibarr_del_const($db, 'EXPENSEREPORT_ADDON_PDF',$conf->entity);
+	}
+}
+
+// Set default model
+else if ($action == 'setdoc')
+{
+	if (dolibarr_set_const($db, "EXPENSEREPORT_ADDON_PDF",$value,'chaine',0,'',$conf->entity))
+	{
+		// La constante qui a ete lue en avant du nouveau set
+		// on passe donc par une variable pour avoir un affichage coherent
+		$conf->global->EXPENSEREPORT_ADDON_PDF = $value;
+	}
+
+	// On active le modele
+	$ret = delDocumentModel($value, $type);
+	if ($ret > 0)
+	{
+		$ret = addDocumentModel($value, $type, $label, $scandir);
+	}
+}
+
+else if ($action == 'setmod')
+{
+	// TODO Verifier si module numerotation choisi peut etre active
+	// par appel methode canBeActivated
+
+	dolibarr_set_const($db, "EXPENSEREPORT_ADDON",$value,'chaine',0,'',$conf->entity);
+}
+
+else if ($action == 'set_EXPENSEREPORT_FREE_TEXT')
+{
+	$freetext= GETPOST('EXPENSEREPORT_FREE_TEXT','alpha');
+	$res = dolibarr_set_const($db, "EXPENSEREPORT_FREE_TEXT",$freetext,'chaine',0,'',$conf->entity);
+
+	if (! $res > 0) $error++;
+
+ 	if (! $error)
+    {
+        setEventMessage($langs->trans("SetupSaved"));
+    }
+    else
+    {
+        setEventMessage($langs->trans("Error"),'errors');
+    }
+}
+
+else if ($action == 'set_EXPENSEREPORT_DRAFT_WATERMARK')
+{
+	$draft= GETPOST('EXPENSEREPORT_DRAFT_WATERMARK','alpha');
+
+	$res = dolibarr_set_const($db, "EXPENSEREPORT_DRAFT_WATERMARK",trim($draft),'chaine',0,'',$conf->entity);
+
+	if (! $res > 0) $error++;
+
+ 	if (! $error)
+    {
+        setEventMessage($langs->trans("SetupSaved"));
+    }
+    else
+    {
+        setEventMessage($langs->trans("Error"),'errors');
+    }
+}
+
+
+
+/*
+ * View
+ */
+
+$dirmodels=array_merge(array('/'),(array) $conf->modules_parts['models']);
+
+llxHeader();
+
+$form=new Form($db);
+
+$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
+print_fiche_titre($langs->trans("ExpenseReportsSetup"),$linkback,'setup');
+
+
+$head=expensereport_admin_prepare_head();
+
+dol_fiche_head($head, 'expensereport', $langs->trans("ExpenseReports"), 0, 'trip');
+
+// Interventions numbering model
+/*
+print_titre($langs->trans("FicheinterNumberingModules"));
+
+print '<table class="noborder" width="100%">';
+print '<tr class="liste_titre">';
+print '<td width="100">'.$langs->trans("Name").'</td>';
+print '<td>'.$langs->trans("Description").'</td>';
+print '<td>'.$langs->trans("Example").'</td>';
+print '<td align="center" width="60">'.$langs->trans("Status").'</td>';
+print '<td align="center" width="80">'.$langs->trans("ShortInfo").'</td>';
+print "</tr>\n";
+
+clearstatcache();
+
+foreach ($dirmodels as $reldir)
+{
+	$dir = dol_buildpath($reldir."core/modules/fichinter/");
+
+	if (is_dir($dir))
+	{
+		$handle = opendir($dir);
+		if (is_resource($handle))
+		{
+			$var=true;
+
+			while (($file = readdir($handle))!==false)
+			{
+				if (preg_match('/^(mod_.*)\.php$/i',$file,$reg))
+				{
+					$file = $reg[1];
+					$classname = substr($file,4);
+
+					require_once $dir.$file.'.php';
+
+					$module = new $file;
+
+					if ($module->isEnabled())
+					{
+						// Show modules according to features level
+						if ($module->version == 'development'  && $conf->global->MAIN_FEATURES_LEVEL < 2) continue;
+						if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue;
+
+						$var=!$var;
+						print '<tr '.$bc[$var].'><td>'.$module->nom."</td><td>\n";
+						print $module->info();
+						print '</td>';
+
+                        // Show example of numbering model
+                        print '<td class="nowrap">';
+                        $tmp=$module->getExample();
+                        if (preg_match('/^Error/',$tmp)) print '<div class="error">'.$langs->trans($tmp).'</div>';
+                        elseif ($tmp=='NotConfigured') print $langs->trans($tmp);
+                        else print $tmp;
+                        print '</td>'."\n";
+
+						print '<td align="center">';
+						if ($conf->global->FICHEINTER_ADDON == $classname)
+						{
+							print img_picto($langs->trans("Activated"),'switch_on');
+						}
+						else
+						{
+							print '<a href="'.$_SERVER["PHP_SELF"].'?action=setmod&amp;value='.$classname.'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"),'switch_off').'</a>';
+						}
+						print '</td>';
+
+						$ficheinter=new Fichinter($db);
+						$ficheinter->initAsSpecimen();
+
+						// Info
+						$htmltooltip='';
+						$htmltooltip.=''.$langs->trans("Version").': <b>'.$module->getVersion().'</b><br>';
+						$nextval=$module->getNextValue($mysoc,$ficheinter);
+                        if ("$nextval" != $langs->trans("NotAvailable")) {   // Keep " on nextval
+                            $htmltooltip.=''.$langs->trans("NextValue").': ';
+                            if ($nextval) {
+                                if (preg_match('/^Error/',$nextval) || $nextval=='NotConfigured')
+                                    $nextval = $langs->trans($nextval);
+                                $htmltooltip.=$nextval.'<br>';
+                            } else {
+                                $htmltooltip.=$langs->trans($module->error).'<br>';
+                            }
+                        }
+						print '<td align="center">';
+						print $form->textwithpicto('',$htmltooltip,1,0);
+						print '</td>';
+
+						print '</tr>';
+					}
+				}
+			}
+			closedir($handle);
+		}
+	}
+}
+
+print '</table><br>';
+*/
+
+/*
+ *  Documents models for Interventions
+ */
+
+print_titre($langs->trans("TemplatePDFExpenseReports"));
+
+// Defini tableau def des modeles
+$type='expensereport';
+$def = array();
+$sql = "SELECT nom";
+$sql.= " FROM ".MAIN_DB_PREFIX."document_model";
+$sql.= " WHERE type = '".$type."'";
+$sql.= " AND entity = ".$conf->entity;
+$resql=$db->query($sql);
+if ($resql)
+{
+	$i = 0;
+	$num_rows=$db->num_rows($resql);
+	while ($i < $num_rows)
+	{
+		$array = $db->fetch_array($resql);
+		array_push($def, $array[0]);
+		$i++;
+	}
+}
+else
+{
+	dol_print_error($db);
+}
+
+
+print '<table class="noborder" width="100%">';
+print '<tr class="liste_titre">';
+print '<td>'.$langs->trans("Name").'</td>';
+print '<td>'.$langs->trans("Description").'</td>';
+print '<td align="center" width="60">'.$langs->trans("Status")."</td>\n";
+print '<td align="center" width="60">'.$langs->trans("Default")."</td>\n";
+print '<td align="center" width="80">'.$langs->trans("ShortInfo").'</td>';
+print '<td align="center" width="80">'.$langs->trans("Preview").'</td>';
+print "</tr>\n";
+
+clearstatcache();
+
+$var=true;
+foreach ($dirmodels as $reldir)
+{
+	$dir = dol_buildpath($reldir."core/modules/expensereport/doc");
+
+	if (is_dir($dir))
+	{
+		$handle=opendir($dir);
+		if (is_resource($handle))
+		{
+			while (($file = readdir($handle))!==false)
+			{
+				$filelist[]=$file;
+			}
+			closedir($handle);
+			arsort($filelist);
+
+			foreach($filelist as $file)
+			{
+				if (preg_match('/\.modules\.php$/i',$file) && preg_match('/^(pdf_|doc_)/',$file))
+		    	{
+
+		    		if (file_exists($dir.'/'.$file))
+		    		{
+		    			$var=!$var;
+
+		    			$name = substr($file, 4, dol_strlen($file) -16);
+		    			$classname = substr($file, 0, dol_strlen($file) -12);
+
+		    			require_once $dir.'/'.$file;
+		    			$module = new $classname($db);
+
+		    			$modulequalified=1;
+		    			if ($module->version == 'development'  && $conf->global->MAIN_FEATURES_LEVEL < 2) $modulequalified=0;
+		    			if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) $modulequalified=0;
+
+		    			if ($modulequalified)
+		    			{
+		    				print '<tr '.$bc[$var].'><td width="100">';
+		    				print (empty($module->name)?$name:$module->name);
+		    				print "</td><td>\n";
+		    				if (method_exists($module,'info')) print $module->info($langs);
+		    				else print $module->description;
+		    				print '</td>';
+
+		    				// Active
+		    				if (in_array($name, $def))
+		    				{
+		    					print "<td align=\"center\">\n";
+		    					print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&amp;value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'">';
+		    					print img_picto($langs->trans("Enabled"),'switch_on');
+		    					print '</a>';
+		    					print "</td>";
+		    				}
+		    				else
+		    				{
+		    					print "<td align=\"center\">\n";
+		    					print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"),'switch_off').'</a>';
+		    					print "</td>";
+		    				}
+
+		    				// Default
+		    				print "<td align=\"center\">";
+		    				if ($conf->global->EXPENSEREPORT_ADDON_PDF == "$name")
+		    				{
+		    					print img_picto($langs->trans("Default"),'on');
+		    				}
+		    				else
+		    				{
+		    					print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"),'off').'</a>';
+		    				}
+		    				print '</td>';
+
+		    				// Info
+		    				$htmltooltip =    ''.$langs->trans("Name").': '.$module->name;
+		    				$htmltooltip.='<br>'.$langs->trans("Type").': '.($module->type?$module->type:$langs->trans("Unknown"));
+		    				$htmltooltip.='<br>'.$langs->trans("Width").'/'.$langs->trans("Height").': '.$module->page_largeur.'/'.$module->page_hauteur;
+		    				$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 align="center">';
+		    				print $form->textwithpicto('',$htmltooltip,-1,0);
+		    				print '</td>';
+
+		    				// Preview
+		    				print '<td align="center">';
+		    				if ($module->type == 'pdf')
+		    				{
+		    					print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"),'intervention').'</a>';
+		    				}
+		    				else
+		    				{
+		    					print img_object($langs->trans("PreviewNotAvailable"),'generic');
+		    				}
+		    				print '</td>';
+
+		    				print '</tr>';
+		    			}
+		    		}
+		    	}
+		    }
+		}
+	}
+}
+
+print '</table>';
+
+dol_fiche_end();
+
+
+llxFooter();
+
+$db->close();

htdocs/admin/fichinter.php

@@ -221,7 +221,7 @@ else if ($action == 'set_FICHINTER_DRAFT_WATERMARK')
 elseif ($action == 'set_FICHINTER_PRINT_PRODUCTS')
 {
 	$val = GETPOST('FICHINTER_PRINT_PRODUCTS','alpha');
-	$res = dolibarr_set_const($db, "FICHINTER_PRINT_PRODUCTS",($val == 'on'),'bool',0,'',$conf->entity);
+	$res = dolibarr_set_const($db, "FICHINTER_PRINT_PRODUCTS",($val == 'on' ? 1 : 0),'bool',0,'',$conf->entity);
 
 	if (! $res > 0) $error++;
 

htdocs/admin/notification.php

@@ -33,6 +33,7 @@ $langs->load("orders");
 $langs->load("propal");
 $langs->load("bills");
 $langs->load("errors");
+$langs->load("mails");
 
 // Security check
 if (!$user->admin)
@@ -76,7 +77,9 @@ if ($action == 'setvalue' && $user->admin)
  *	View
  */
 
-llxHeader();
+$form=new Form($db);
+
+llxHeader('',$langs->trans("NotificationSetup"));
 
 $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
 print_fiche_titre($langs->trans("NotificationSetup"),$linkback,'setup');
@@ -132,9 +135,19 @@ foreach($listofnotifiedevents as $notifiedevent)
     print '<td>'.$elementLabel.'</td>';
     print '<td>'.$notifiedevent['code'].'</td>';
     print '<td>'.$label.'</td>';
+    print '<td>';
     $param='NOTIFICATION_FIXEDEMAIL_'.$notifiedevent['code'];
-    print '<td><input type="email" size="32" name="'.$param.'" value="'.dol_escape_htmltag(GETPOST($param)?GETPOST($param,'alpha'):$conf->global->$param).'">';
+    $value=GETPOST($param)?GETPOST($param,'alpha'):$conf->global->$param;
-	if (! empty($conf->global->$param) && ! isValidEmail($conf->global->$param)) print ' '.img_warning($langs->trans("ErrorBadEMail"));
+    $s='<input type="text" size="32" name="'.$param.'" value="'.dol_escape_htmltag($value).'">';		// Do not use type="email" here, we must be able to enter a list of email with , separator.
+    $arrayemail=explode(',',$value);
+	$showwarning=0;
+	foreach($arrayemail as $key=>$valuedet)
+	{
+		$valuedet=trim($valuedet);
+		if (! empty($valuedet) && ! isValidEmail($valuedet)) $showwarning++;
+	}
+    if ((! empty($conf->global->$param)) && $showwarning) $s.=' '.img_warning($langs->trans("ErrorBadEMail"));
+    print $form->textwithpicto($s,$langs->trans("YouCanUseCommaSeparatorForSeveralRecipients"));
     print '</td>';
     print '</tr>';
 }

htdocs/admin/order_extrafields.php

@@ -77,42 +77,7 @@ $head = order_admin_prepare_head();
 
 dol_fiche_head($head, 'attributes', $langs->trans("Orders"), 0, 'order');
 
-
+require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
-print $langs->trans("DefineHereComplementaryAttributes",$textobject).'<br>'."\n";
-print '<br>';
-
-// Load attribute_label
-$extrafields->fetch_name_optionals_label($elementtype);
-
-print "<table summary=\"listofattributes\" class=\"noborder\" width=\"100%\">";
-
-print '<tr class="liste_titre">';
-print '<td>'.$langs->trans("Label").'</td>';
-print '<td>'.$langs->trans("AttributeCode").'</td>';
-print '<td>'.$langs->trans("Type").'</td>';
-print '<td align="right">'.$langs->trans("Size").'</td>';
-print '<td align="center">'.$langs->trans("Unique").'</td>';
-print '<td align="center">'.$langs->trans("Required").'</td>';
-print '<td width="80">&nbsp;</td>';
-print "</tr>\n";
-
-$var=True;
-foreach($extrafields->attribute_type as $key => $value)
-{
-    $var=!$var;
-    print "<tr ".$bc[$var].">";
-    print "<td>".$extrafields->attribute_label[$key]."</td>\n";
-    print "<td>".$key."</td>\n";
-    print "<td>".$type2label[$extrafields->attribute_type[$key]]."</td>\n";
-    print '<td align="right">'.$extrafields->attribute_size[$key]."</td>\n";
-    print '<td align="center">'.yn($extrafields->attribute_unique[$key])."</td>\n";
-    print '<td align="center">'.yn($extrafields->attribute_required[$key])."</td>\n";
-    print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=edit&attrname='.$key.'">'.img_edit().'</a>';
-    print "&nbsp; <a href=\"".$_SERVER["PHP_SELF"]."?action=delete&attrname=$key\">".img_delete()."</a></td>\n";
-    print "</tr>";
-}
-
-print "</table>";
 
 dol_fiche_end();
 

htdocs/admin/orderdet_extrafields.php

@@ -66,7 +66,7 @@ require DOL_DOCUMENT_ROOT.'/core/actions_extrafields.inc.php';
  * View
  */
 
-$textobject=$langs->transnoentitiesnoconv("Orders");
+$textobject=$langs->transnoentitiesnoconv("OrderLines");
 
 llxHeader('',$langs->trans("OrdersSetup"));
 
@@ -76,44 +76,9 @@ print "<br>\n";
 
 $head = order_admin_prepare_head();
 
-dol_fiche_head($head, 'attributeslines', $langs->trans("Orders"), 0, 'order');
+dol_fiche_head($head, 'attributeslines', $langs->trans("OrderLines"), 0, 'order');
 
-
+require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
-print $langs->trans("DefineHereComplementaryAttributes",$textobject).'<br>'."\n";
-print '<br>';
-
-// Load attribute_label
-$extrafields->fetch_name_optionals_label($elementtype);
-
-print "<table summary=\"listofattributes\" class=\"noborder\" width=\"100%\">";
-
-print '<tr class="liste_titre">';
-print '<td>'.$langs->trans("Label").'</td>';
-print '<td>'.$langs->trans("AttributeCode").'</td>';
-print '<td>'.$langs->trans("Type").'</td>';
-print '<td align="right">'.$langs->trans("Size").'</td>';
-print '<td align="center">'.$langs->trans("Unique").'</td>';
-print '<td align="center">'.$langs->trans("Required").'</td>';
-print '<td width="80">&nbsp;</td>';
-print "</tr>\n";
-
-$var=True;
-foreach($extrafields->attribute_type as $key => $value)
-{
-    $var=!$var;
-    print "<tr ".$bc[$var].">";
-    print "<td>".$extrafields->attribute_label[$key]."</td>\n";
-    print "<td>".$key."</td>\n";
-    print "<td>".$type2label[$extrafields->attribute_type[$key]]."</td>\n";
-    print '<td align="right">'.$extrafields->attribute_size[$key]."</td>\n";
-    print '<td align="center">'.yn($extrafields->attribute_unique[$key])."</td>\n";
-    print '<td align="center">'.yn($extrafields->attribute_required[$key])."</td>\n";
-    print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=edit&attrname='.$key.'">'.img_edit().'</a>';
-    print "&nbsp; <a href=\"".$_SERVER["PHP_SELF"]."?action=delete&attrname=$key\">".img_delete()."</a></td>\n";
-    print "</tr>";
-}
-
-print "</table>";
 
 dol_fiche_end();
 

htdocs/admin/pdf.php

@@ -51,7 +51,7 @@ if ($action == 'update')
 {
 	dolibarr_set_const($db, "MAIN_PDF_FORMAT",    $_POST["MAIN_PDF_FORMAT"],'chaine',0,'',$conf->entity);
 
-	
+
     dolibarr_set_const($db, "MAIN_PROFID1_IN_ADDRESS",    $_POST["MAIN_PROFID1_IN_ADDRESS"],'chaine',0,'',$conf->entity);
 	dolibarr_set_const($db, "MAIN_PROFID2_IN_ADDRESS",    $_POST["MAIN_PROFID2_IN_ADDRESS"],'chaine',0,'',$conf->entity);
 	dolibarr_set_const($db, "MAIN_PROFID3_IN_ADDRESS",    $_POST["MAIN_PROFID3_IN_ADDRESS"],'chaine',0,'',$conf->entity);
@@ -222,7 +222,7 @@ if ($action == 'edit')	// Edit
     print '<tr '.$bc[$var].'><td>'.$langs->trans("HideAnyVATInformationOnPDF").'</td><td>';
 	print $form->selectyesno('MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT',(! empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT))?$conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT:0,1);
     print '</td></tr>';
-    
+
     // Hide Tva Intra on adress
     $var=!$var;
     print '<tr '.$bc[$var].'><td>'.$langs->trans("ShowVATIntaInAddress").'</td><td>';
@@ -385,14 +385,14 @@ else	// Show
     print '<table summary="more" class="noborder" width="100%">';
     print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td width="200px" colspan="2">'.$langs->trans("Value").'</td></tr>';
 
-    
+
     // Hide any PDF informations
     $var=!$var;
     print '<tr '.$bc[$var].'><td>'.$langs->trans("HideAnyVATInformationOnPDF").'</td><td colspan="2">';
     print yn($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT,1);
     print '</td></tr>';
 
-    
+
 	// Encrypt and protect PDF
 	$var=!$var;
 	print "<tr ".$bc[$var].">";
@@ -417,16 +417,16 @@ else	// Show
 		print '<a href="'.$_SERVER["PHP_SELF"].'?action=disable_pdfsecurity">'.$langs->trans("Disable").'</a>';
 	}
 	print "</td>";
-	
+
 	print "</td>";
 	print '</tr>';
-	
+
 	// Hide Tva Intra on adress
 	$var=!$var;
 	print '<tr '.$bc[$var].'><td>'.$langs->trans("ShowVATIntaInAddress").'</td><td colspan="2">';
 	print yn($conf->global->MAIN_TVAINTRA_NOT_IN_ADDRESS,1);
 	print '</td></tr>';
-	
+
 	//Desc
 	$var=!$var;
 	print '<tr '.$bc[$var].'><td>'.$langs->trans("HideDescOnPDF").'</td><td colspan="2">';
@@ -501,6 +501,13 @@ else	// Show
 		print ' ('.@constant('FPDI_PATH').')';
 		$i++;
 	}
+	if (class_exists('TCPDI'))
+	{
+		if ($i) print ' + ';
+		print 'TCPDI';
+		print ' ('.@constant('TCPDI_PATH').')';
+		$i++;
+	}
 	print '<!-- $conf->global->MAIN_USE_FPDF = '.$conf->global->MAIN_USE_FPDF.' -->';
 	print '</td>'."\n";
 	print '</tr>'."\n";

htdocs/admin/perms.php

@@ -67,7 +67,7 @@ llxHeader('',$langs->trans("DefaultRights"));
 print_fiche_titre($langs->trans("SecuritySetup"),'','setup');
 
 print $langs->trans("DefaultRightsDesc");
-print " ".$langs->trans("OnlyActiveElementsAreShown")."<br>\n";
+print " ".$langs->trans("OnlyActiveElementsAreShown")."<br><br>\n";
 
 $db->begin();
 
@@ -115,16 +115,15 @@ foreach ($modulesdir as $dir)
 
 $db->commit();
 
-// Show warning about external users
-print info_admin(showModulesExludedForExternal($modules)).'<br>'."\n";
-print "<br>\n";
-
-
 $head=security_prepare_head();
 
 dol_fiche_head($head, 'default', $langs->trans("Security"));
 
 
+// Show warning about external users
+print info_admin(showModulesExludedForExternal($modules)).'<br>'."\n";
+
+
 print '<table class="noborder" width="100%">';
 
 // Affiche lignes des permissions

htdocs/admin/security_file.php

@@ -208,7 +208,7 @@ $formfile->form_attach_new_file($_SERVER['PHP_SELF'], $langs->trans("FormToTestF
 
 // List of document
 $filearray=dol_dir_list($upload_dir, "files", 0, '', '', 'name', SORT_ASC, 1);
-$formfile->list_of_documents($filearray, '', 'admin_temp', '');
+$formfile->list_of_documents($filearray, null, 'admin_temp', '');
 
 llxFooter();
 $db->close();

htdocs/admin/stock.php

@@ -87,6 +87,9 @@ if($action)
 	if($action == 'STOCK_MUST_BE_ENOUGH_FOR_SHIPMENT') {
 	    $res = dolibarr_set_const($db, "STOCK_MUST_BE_ENOUGH_FOR_SHIPMENT", GETPOST('STOCK_MUST_BE_ENOUGH_FOR_SHIPMENT','alpha'),'chaine',0,'',$conf->entity);
 	}
+	if($action == 'INDEPENDANT_SUBPRODUCT_STOCK') {
+	    $res = dolibarr_set_const($db, "INDEPENDANT_SUBPRODUCT_STOCK", GETPOST('INDEPENDANT_SUBPRODUCT_STOCK','alpha'),'chaine',0,'',$conf->entity);
+	}
 
 	if (! $res > 0) $error++;
 
@@ -136,6 +139,8 @@ print "  <td align=\"right\" width=\"160\">&nbsp;</td>\n";
 print '</tr>'."\n";
 $var=true;
 
+$found=0;
+
 if (! empty($conf->facture->enabled))
 {
 	$var=!$var;
@@ -148,6 +153,7 @@ if (! empty($conf->facture->enabled))
 	print $form->selectyesno("STOCK_CALCULATE_ON_BILL",$conf->global->STOCK_CALCULATE_ON_BILL,1,$disabled);
 	print '<input type="submit" class="button" value="'.$langs->trans("Modify").'"'.$disabled.'>';
 	print "</form>\n</td>\n</tr>\n";
+	$found++;
 }
 
 if (! empty($conf->commande->enabled))
@@ -162,6 +168,7 @@ if (! empty($conf->commande->enabled))
 	print $form->selectyesno("STOCK_CALCULATE_ON_VALIDATE_ORDER",$conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER,1,$disabled);
 	print '<input type="submit" class="button" value="'.$langs->trans("Modify").'"'.$disabled.'>';
 	print "</form>\n</td>\n</tr>\n";
+	$found++;
 }
 
 if (! empty($conf->expedition->enabled))
@@ -176,7 +183,17 @@ if (! empty($conf->expedition->enabled))
 	print $form->selectyesno("STOCK_CALCULATE_ON_SHIPMENT",$conf->global->STOCK_CALCULATE_ON_SHIPMENT,1,$disabled);
 	print '<input type="submit" class="button" value="'.$langs->trans("Modify").'"'.$disabled.'>';
 	print "</form>\n</td>\n</tr>\n";
+	$found++;
 }
+
+if (! $found)
+{
+	$var=!$var;
+	print "<tr ".$bc[$var].">";
+	print '<td colspan="2">'.$langs->trans("NoModueToManageStockDecrease").'</td>';
+	print "</tr>\n";
+}
+
 print '</table>';
 
 print '<br>';
@@ -189,6 +206,8 @@ print "  <td align=\"right\" width=\"160\">&nbsp;</td>\n";
 print '</tr>'."\n";
 $var=true;
 
+$found=0;
+
 if (! empty($conf->fournisseur->enabled))
 {
 	$var=!$var;
@@ -201,6 +220,7 @@ if (! empty($conf->fournisseur->enabled))
 	print $form->selectyesno("STOCK_CALCULATE_ON_SUPPLIER_BILL",$conf->global->STOCK_CALCULATE_ON_SUPPLIER_BILL,1,$disabled);
 	print '<input type="submit" class="button" value="'.$langs->trans("Modify").'"'.$disabled.'>';
 	print "</form>\n</td>\n</tr>\n";
+	$found++;
 }
 
 if (! empty($conf->fournisseur->enabled))
@@ -215,6 +235,7 @@ if (! empty($conf->fournisseur->enabled))
 	print $form->selectyesno("STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER",$conf->global->STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER,1,$disabled);
 	print '<input type="submit" class="button" value="'.$langs->trans("Modify").'"'.$disabled.'>';
 	print "</form>\n</td>\n</tr>\n";
+	$found++;
 }
 if (! empty($conf->fournisseur->enabled))
 {
@@ -228,65 +249,76 @@ if (! empty($conf->fournisseur->enabled))
 	print $form->selectyesno("STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER",$conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER,1,$disabled);
 	print '<input type="submit" class="button" value="'.$langs->trans("Modify").'"'.$disabled.'>';
 	print "</form>\n</td>\n</tr>\n";
+	$found++;
+}
+
+if (! $found)
+{
+	$var=!$var;
+	print "<tr ".$bc[$var].">";
+	print '<td colspan="2">'.$langs->trans("NoModueToManageStockIncrease").'</td>';
+	print "</tr>\n";
 }
 
 print '</table>';
 
 // Optio to force stock to be enough before adding a line into document
-print '<br>';
+if ($conf->invoice->enabled || $conf->order->enabled || $conf->expedition->enabled)
-print '<table class="noborder" width="100%">';
+{
-print '<tr class="liste_titre">';
+	print '<br>';
-print "  <td>".$langs->trans("RuleForStockAvailability")."</td>\n";
+	print '<table class="noborder" width="100%">';
-print "  <td align=\"right\" width=\"160\">&nbsp;</td>\n";
+	print '<tr class="liste_titre">';
-print '</tr>'."\n";
+	print "  <td>".$langs->trans("RuleForStockAvailability")."</td>\n";
+	print "  <td align=\"right\" width=\"160\">&nbsp;</td>\n";
+	print '</tr>'."\n";
 
-if($conf->invoice->enabled) {
+	if($conf->invoice->enabled) {
-	$var = !$var;
+		$var = !$var;
-	print "<tr ".$bc[$var].">";
+		print "<tr ".$bc[$var].">";
-	print '<td width="60%">'.$langs->trans("StockMustBeEnoughForInvoice").'</td>';
+		print '<td width="60%">'.$langs->trans("StockMustBeEnoughForInvoice").'</td>';
-	print '<td width="160" align="right">';
+		print '<td width="160" align="right">';
-	print "<form method=\"post\" action=\"stock.php\">";
+		print "<form method=\"post\" action=\"stock.php\">";
-	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-	print "<input type=\"hidden\" name=\"action\" value=\"STOCK_MUST_BE_ENOUGH_FOR_INVOICE\">";
+		print "<input type=\"hidden\" name=\"action\" value=\"STOCK_MUST_BE_ENOUGH_FOR_INVOICE\">";
-	print $form->selectyesno("STOCK_MUST_BE_ENOUGH_FOR_INVOICE",$conf->global->STOCK_MUST_BE_ENOUGH_FOR_INVOICE,1);
+		print $form->selectyesno("STOCK_MUST_BE_ENOUGH_FOR_INVOICE",$conf->global->STOCK_MUST_BE_ENOUGH_FOR_INVOICE,1);
-	print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
+		print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
-	print '</form>';
+		print '</form>';
-	print "</td>\n";
+		print "</td>\n";
-	print "</tr>\n";
+		print "</tr>\n";
+	}
+
+	if($conf->order->enabled) {
+		$var = !$var;
+		print "<tr ".$bc[$var].">";
+		print '<td width="60%">'.$langs->trans("StockMustBeEnoughForOrder").'</td>';
+		print '<td width="160" align="right">';
+		print "<form method=\"post\" action=\"stock.php\">";
+		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+		print "<input type=\"hidden\" name=\"action\" value=\"STOCK_MUST_BE_ENOUGH_FOR_ORDER\">";
+		print $form->selectyesno("STOCK_MUST_BE_ENOUGH_FOR_ORDER",$conf->global->STOCK_MUST_BE_ENOUGH_FOR_ORDER,1);
+		print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
+		print '</form>';
+		print "</td>\n";
+		print "</tr>\n";
+	}
+
+	if($conf->expedition->enabled) {
+		$var = !$var;
+		print "<tr ".$bc[$var].">";
+		print '<td width="60%">'.$langs->trans("StockMustBeEnoughForShipment").'</td>';
+		print '<td width="160" align="right">';
+		print "<form method=\"post\" action=\"stock.php\">";
+		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+		print "<input type=\"hidden\" name=\"action\" value=\"STOCK_MUST_BE_ENOUGH_FOR_SHIPMENT\">";
+		print $form->selectyesno("STOCK_MUST_BE_ENOUGH_FOR_SHIPMENT",$conf->global->STOCK_MUST_BE_ENOUGH_FOR_SHIPMENT,1);
+		print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
+		print '</form>';
+		print "</td>\n";
+		print "</tr>\n";
+	}
+	print '</table>';
 }
 
-if($conf->order->enabled) {
-	$var = !$var;
-	print "<tr ".$bc[$var].">";
-	print '<td width="60%">'.$langs->trans("StockMustBeEnoughForOrder").'</td>';
-	print '<td width="160" align="right">';
-	print "<form method=\"post\" action=\"stock.php\">";
-	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-	print "<input type=\"hidden\" name=\"action\" value=\"STOCK_MUST_BE_ENOUGH_FOR_ORDER\">";
-	print $form->selectyesno("STOCK_MUST_BE_ENOUGH_FOR_ORDER",$conf->global->STOCK_MUST_BE_ENOUGH_FOR_ORDER,1);
-	print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
-	print '</form>';
-	print "</td>\n";
-	print "</tr>\n";
-}
-
-if($conf->expedition->enabled) {
-	$var = !$var;
-	print "<tr ".$bc[$var].">";
-	print '<td width="60%">'.$langs->trans("StockMustBeEnoughForShipment").'</td>';
-	print '<td width="160" align="right">';
-	print "<form method=\"post\" action=\"stock.php\">";
-	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-	print "<input type=\"hidden\" name=\"action\" value=\"STOCK_MUST_BE_ENOUGH_FOR_SHIPMENT\">";
-	print $form->selectyesno("STOCK_MUST_BE_ENOUGH_FOR_SHIPMENT",$conf->global->STOCK_MUST_BE_ENOUGH_FOR_SHIPMENT,1);
-	print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
-	print '</form>';
-	print "</td>\n";
-	print "</tr>\n";
-}
-print '</table>';
-
-
 $virtualdiffersfromphysical=0;
 if (! empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT)
 	|| ! empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER)
@@ -339,9 +371,29 @@ print '</form>';
 print "</td>\n";
 print "</tr>\n";
 print '<br>';
-print '</table>';
-print '<br>';
 
+/* I keep the option/feature, but hidden to end users for the moment. If feature is used by module, no need to have users see it.
+If not used by a module, I still need to understand in which case user may need this now we can set rule on product page.
+if ($conf->global->PRODUIT_SOUSPRODUITS) 
+{
+	$var=!$var;
+	
+	print "<tr ".$bc[$var].">";
+	print '<td width="60%">'.$langs->trans("IndependantSubProductStock").'</td>';
+	
+	print '<td width="160" align="right">';
+	print "<form method=\"post\" action=\"stock.php\">";
+	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+	print "<input type=\"hidden\" name=\"action\" value=\"INDEPENDANT_SUBPRODUCT_STOCK\">";
+	print $form->selectyesno("INDEPENDANT_SUBPRODUCT_STOCK",$conf->global->INDEPENDANT_SUBPRODUCT_STOCK,1);
+	print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
+	print '</form>';
+	print "</td>\n";
+	print "</tr>\n";
+}
+*/
+
+print '</table>';
 
 llxFooter();
 

htdocs/admin/supplierinvoice_extrafields.php

@@ -31,6 +31,7 @@ require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/fourn.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 
+$langs->load("orders");
 
 if (!$user->admin)
 	accessforbidden();
@@ -80,42 +81,7 @@ $head = supplierorder_admin_prepare_head();
 
 dol_fiche_head($head, 'supplierinvoice', $langs->trans("Suppliers"), 0, 'company');
 
-
+require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
-print $langs->trans("DefineHereComplementaryAttributes",$textobject).'<br>'."\n";
-print '<br>';
-
-// Load attribute_label
-$extrafields->fetch_name_optionals_label($elementtype);
-
-print "<table summary=\"listofattributes\" class=\"noborder\" width=\"100%\">";
-
-print '<tr class="liste_titre">';
-print '<td>'.$langs->trans("Label").'</td>';
-print '<td>'.$langs->trans("AttributeCode").'</td>';
-print '<td>'.$langs->trans("Type").'</td>';
-print '<td align="right">'.$langs->trans("Size").'</td>';
-print '<td align="center">'.$langs->trans("Unique").'</td>';
-print '<td align="center">'.$langs->trans("Required").'</td>';
-print '<td width="80">&nbsp;</td>';
-print "</tr>\n";
-
-$var=True;
-foreach($extrafields->attribute_type as $key => $value)
-{
-    $var=!$var;
-    print "<tr ".$bc[$var].">";
-    print "<td>".$extrafields->attribute_label[$key]."</td>\n";
-    print "<td>".$key."</td>\n";
-    print "<td>".$type2label[$extrafields->attribute_type[$key]]."</td>\n";
-    print '<td align="right">'.$extrafields->attribute_size[$key]."</td>\n";
-    print '<td align="center">'.yn($extrafields->attribute_unique[$key])."</td>\n";
-    print '<td align="center">'.yn($extrafields->attribute_required[$key])."</td>\n";
-    print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=edit&attrname='.$key.'">'.img_edit().'</a>';
-    print "&nbsp; <a href=\"".$_SERVER["PHP_SELF"]."?action=delete&attrname=$key\">".img_delete()."</a></td>\n";
-    print "</tr>";
-}
-
-print "</table>";
 
 dol_fiche_end();
 

htdocs/admin/supplierinvoicedet_extrafields.php

@@ -81,42 +81,7 @@ $head = supplierorder_admin_prepare_head();
 
 dol_fiche_head($head, 'supplierinvoicedet', $langs->trans("Suppliers"), 0, 'company');
 
-
+require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
-print $langs->trans("DefineHereComplementaryAttributes",$textobject).'<br>'."\n";
-print '<br>';
-
-// Load attribute_label
-$extrafields->fetch_name_optionals_label($elementtype);
-
-print "<table summary=\"listofattributes\" class=\"noborder\" width=\"100%\">";
-
-print '<tr class="liste_titre">';
-print '<td>'.$langs->trans("Label").'</td>';
-print '<td>'.$langs->trans("AttributeCode").'</td>';
-print '<td>'.$langs->trans("Type").'</td>';
-print '<td align="right">'.$langs->trans("Size").'</td>';
-print '<td align="center">'.$langs->trans("Unique").'</td>';
-print '<td align="center">'.$langs->trans("Required").'</td>';
-print '<td width="80">&nbsp;</td>';
-print "</tr>\n";
-
-$var=True;
-foreach($extrafields->attribute_type as $key => $value)
-{
-    $var=!$var;
-    print "<tr ".$bc[$var].">";
-    print "<td>".$extrafields->attribute_label[$key]."</td>\n";
-    print "<td>".$key."</td>\n";
-    print "<td>".$type2label[$extrafields->attribute_type[$key]]."</td>\n";
-    print '<td align="right">'.$extrafields->attribute_size[$key]."</td>\n";
-    print '<td align="center">'.yn($extrafields->attribute_unique[$key])."</td>\n";
-    print '<td align="center">'.yn($extrafields->attribute_required[$key])."</td>\n";
-    print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=edit&attrname='.$key.'">'.img_edit().'</a>';
-    print "&nbsp; <a href=\"".$_SERVER["PHP_SELF"]."?action=delete&attrname=$key\">".img_delete()."</a></td>\n";
-    print "</tr>";
-}
-
-print "</table>";
 
 dol_fiche_end();
 

htdocs/admin/supplierorder_extrafields.php

@@ -77,42 +77,7 @@ $head = supplierorder_admin_prepare_head();
 
 dol_fiche_head($head, 'supplierorder', $langs->trans("Suppliers"), 0, 'company');
 
-
+require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
-print $langs->trans("DefineHereComplementaryAttributes",$textobject).'<br>'."\n";
-print '<br>';
-
-// Load attribute_label
-$extrafields->fetch_name_optionals_label($elementtype);
-
-print "<table summary=\"listofattributes\" class=\"noborder\" width=\"100%\">";
-
-print '<tr class="liste_titre">';
-print '<td>'.$langs->trans("Label").'</td>';
-print '<td>'.$langs->trans("AttributeCode").'</td>';
-print '<td>'.$langs->trans("Type").'</td>';
-print '<td align="right">'.$langs->trans("Size").'</td>';
-print '<td align="center">'.$langs->trans("Unique").'</td>';
-print '<td align="center">'.$langs->trans("Required").'</td>';
-print '<td width="80">&nbsp;</td>';
-print "</tr>\n";
-
-$var=True;
-foreach($extrafields->attribute_type as $key => $value)
-{
-    $var=!$var;
-    print "<tr ".$bc[$var].">";
-    print "<td>".$extrafields->attribute_label[$key]."</td>\n";
-    print "<td>".$key."</td>\n";
-    print "<td>".$type2label[$extrafields->attribute_type[$key]]."</td>\n";
-    print '<td align="right">'.$extrafields->attribute_size[$key]."</td>\n";
-    print '<td align="center">'.yn($extrafields->attribute_unique[$key])."</td>\n";
-    print '<td align="center">'.yn($extrafields->attribute_required[$key])."</td>\n";
-    print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=edit&attrname='.$key.'">'.img_edit().'</a>';
-    print "&nbsp; <a href=\"".$_SERVER["PHP_SELF"]."?action=delete&attrname=$key\">".img_delete()."</a></td>\n";
-    print "</tr>";
-}
-
-print "</table>";
 
 dol_fiche_end();
 

htdocs/admin/supplierorderdet_extrafields.php

@@ -78,42 +78,7 @@ $head = supplierorder_admin_prepare_head();
 
 dol_fiche_head($head, 'supplierorderdet', $langs->trans("Suppliers"), 0, 'company');
 
-
+require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
-print $langs->trans("DefineHereComplementaryAttributes",$textobject).'<br>'."\n";
-print '<br>';
-
-// Load attribute_label
-$extrafields->fetch_name_optionals_label($elementtype);
-
-print "<table summary=\"listofattributes\" class=\"noborder\" width=\"100%\">";
-
-print '<tr class="liste_titre">';
-print '<td>'.$langs->trans("Label").'</td>';
-print '<td>'.$langs->trans("AttributeCode").'</td>';
-print '<td>'.$langs->trans("Type").'</td>';
-print '<td align="right">'.$langs->trans("Size").'</td>';
-print '<td align="center">'.$langs->trans("Unique").'</td>';
-print '<td align="center">'.$langs->trans("Required").'</td>';
-print '<td width="80">&nbsp;</td>';
-print "</tr>\n";
-
-$var=True;
-foreach($extrafields->attribute_type as $key => $value)
-{
-    $var=!$var;
-    print "<tr ".$bc[$var].">";
-    print "<td>".$extrafields->attribute_label[$key]."</td>\n";
-    print "<td>".$key."</td>\n";
-    print "<td>".$type2label[$extrafields->attribute_type[$key]]."</td>\n";
-    print '<td align="right">'.$extrafields->attribute_size[$key]."</td>\n";
-    print '<td align="center">'.yn($extrafields->attribute_unique[$key])."</td>\n";
-    print '<td align="center">'.yn($extrafields->attribute_required[$key])."</td>\n";
-    print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=edit&attrname='.$key.'">'.img_edit().'</a>';
-    print "&nbsp; <a href=\"".$_SERVER["PHP_SELF"]."?action=delete&attrname=$key\">".img_delete()."</a></td>\n";
-    print "</tr>";
-}
-
-print "</table>";
 
 dol_fiche_end();
 

htdocs/admin/system/browser.php

@@ -44,7 +44,7 @@ llxHeader();
 
 print_fiche_titre($langs->trans("InfoBrowser"),'','setup');
 
-$tmp=getBrowserInfo();
+$tmp=getBrowserInfo($_SERVER["HTTP_USER_AGENT"]);
 
 // Browser
 $var=true;

htdocs/admin/system/constall.php

@@ -73,8 +73,10 @@ $configfileparameters=array(
 							'?dolibarr_main_auth_ldap_debug',
                             'separator',
                             '?dolibarr_lib_ADODB_PATH',
-                            '?dolibarr_lib_TCPDF_PATH',
+							'?dolibarr_lib_FPDF_PATH',
-                            '?dolibarr_lib_FPDI_PATH',
+	                        '?dolibarr_lib_TCPDF_PATH',
+							'?dolibarr_lib_FPDI_PATH',
+                            '?dolibarr_lib_TCPDI_PATH',
 							'?dolibarr_lib_NUSOAP_PATH',
                             '?dolibarr_lib_PHPEXCEL_PATH',
                             '?dolibarr_lib_GEOIP_PATH',

htdocs/admin/system/dolibarr.php

@@ -266,9 +266,10 @@ $configfileparameters=array(
 		'?dolibarr_main_auth_ldap_debug' => 'dolibarr_main_auth_ldap_debug',
 		'separator3' => '',
 		'?dolibarr_lib_ADODB_PATH' => 'dolibarr_lib_ADODB_PATH',
-		'?dolibarr_lib_TCPDF_PATH' => 'dolibarr_lib_TCPDF_PATH',
 		'?dolibarr_lib_FPDF_PATH' => 'dolibarr_lib_FPDF_PATH',
+		'?dolibarr_lib_TCPDF_PATH' => 'dolibarr_lib_TCPDF_PATH',
 		'?dolibarr_lib_FPDI_PATH' => 'dolibarr_lib_FPDI_PATH',
+		'?dolibarr_lib_TCPDI_PATH' => 'dolibarr_lib_TCPDI_PATH',
 		'?dolibarr_lib_NUSOAP_PATH' => 'dolibarr_lib_NUSOAP_PATH',
 		'?dolibarr_lib_PHPEXCEL_PATH' => 'dolibarr_lib_PHPEXCEL_PATH',
 		'?dolibarr_lib_GEOIP_PATH' => 'dolibarr_lib_GEOIP_PATH',
@@ -332,7 +333,7 @@ foreach($configfileparameters as $key => $value)
 				{
 					if ($i > 0) print ', ';
 					print $value2;
-					if (! is_readable($value2)) 
+					if (! is_readable($value2))
 					{
 						$langs->load("errors");
 						print ' '.img_warning($langs->trans("ErrorCantReadDir",$value2));

htdocs/admin/system/filecheck.php

@@ -0,0 +1,138 @@
+<?php
+/* Copyright (C) 2005-2012  Laurent Destailleur     <eldy@users.sourceforge.net>
+ * Copyright (C) 2007       Rodolphe Quiedeville    <rodolphe@quiedeville.org>
+ * Copyright (C) 2007-2012  Regis Houssin           <regis.houssin@capnetworks.com>
+ * Copyright (C) 2015       Frederic France         <frederic.france@free.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
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *  \file       htdocs/admin/system/filecheck.php
+ *  \brief      Page to check Dolibarr files integrity
+ */
+
+require '../../main.inc.php';
+
+$langs->load("admin");
+
+if (!$user->admin)
+    accessforbidden();
+
+
+/*
+ * View
+ */
+
+llxHeader();
+
+print_fiche_titre($langs->trans("FileCheckDolibarr"),'','setup');
+
+// Version
+$var = true;
+print '<table class="noborder" width="100%">';
+print '<tr class="liste_titre"><td>'.$langs->trans("Version").'</td><td>'.$langs->trans("Value").'</td></tr>'."\n";
+$var = ! $var;
+print '<tr '.$bc[$var].'><td width="300">'.$langs->trans("VersionLastInstall").'</td><td>'.$conf->global->MAIN_VERSION_LAST_INSTALL.'</td></tr>'."\n";
+$var = ! $var;
+print '<tr '.$bc[$var].'><td width="300">'.$langs->trans("VersionLastUpgrade").'</td><td>'.$conf->global->MAIN_VERSION_LAST_UPGRADE.'</td></tr>'."\n";
+$var = ! $var;
+print '<tr '.$bc[$var].'><td width="300">'.$langs->trans("VersionProgram").'</td><td>'.DOL_VERSION;
+// If current version differs from last upgrade
+if (empty($conf->global->MAIN_VERSION_LAST_UPGRADE)) {
+    // Compare version with last install database version (upgrades never occured)
+    if (DOL_VERSION != $conf->global->MAIN_VERSION_LAST_INSTALL)
+        print ' '.img_warning($langs->trans("RunningUpdateProcessMayBeRequired",DOL_VERSION,$conf->global->MAIN_VERSION_LAST_INSTALL));
+} else {
+    // Compare version with last upgrade database version
+    if (DOL_VERSION != $conf->global->MAIN_VERSION_LAST_UPGRADE)
+        print ' '.img_warning($langs->trans("RunningUpdateProcessMayBeRequired",DOL_VERSION,$conf->global->MAIN_VERSION_LAST_UPGRADE));
+}
+print '</td></tr>'."\n";
+print '</table>';
+print '<br>';
+
+
+// Modified or missing files
+$file_list = array('missing' => array(), 'updated' => array());
+$xmlfile = DOL_DOCUMENT_ROOT.'/core/filelist-'.DOL_VERSION.'.xml';
+if (file_exists($xmlfile)) {
+    $xml = simplexml_load_file($xmlfile);
+    if ($xml) {
+        $ret = getFilesUpdated($xml->dolibarr_root_dir[0]);
+        print '<table class="noborder">';
+        print '<tr class="liste_titre">';
+        print '<td>' . $langs->trans("FilesMissing") . '</td>';
+        print '</tr>'."\n";
+        $var = true;
+        foreach ($file_list['missing'] as $file) {
+            $var = !$var;
+            print '<tr ' . $bc[$var] . '>';
+            print '<td>'.$file.'</td>' . "\n";
+            print "</tr>\n";
+        }
+        print '</table>';
+        print '<table class="noborder">';
+        print '<tr class="liste_titre">';
+        print '<td>' . $langs->trans("FilesUpdated") . '</td>';
+        print '</tr>'."\n";
+        $var = true;
+        foreach ($file_list['updated'] as $file) {
+            $var = !$var;
+            print '<tr ' . $bc[$var] . '>';
+            print '<td>'.$file.'</td>' . "\n";
+            print "</tr>\n";
+        }
+        print '</table>';
+    }
+} else {
+    print $langs->trans('XmlNotFound') . ': ' . DOL_DOCUMENT_ROOT . '/core/filelist-' . DOL_VERSION . '.xml';
+}
+
+llxFooter();
+
+$db->close();
+
+
+/**
+ * Function to get list of updated or modified files
+ *
+ * @param   SimpleXMLElement   $dir           SimpleXMLElement of files to test
+ * @param   string   $path          Path of file
+ * @return  array                   Array of filenames
+ */
+function getFilesUpdated(SimpleXMLElement $dir, $path = '')
+{
+    global $file_list;
+    $exclude = 'install';
+
+    foreach ($dir->md5file as $file) {
+        $filename = $path.$file['name'];
+
+        if (preg_match('#'.$exclude.'#', $filename))
+            continue;
+
+        if (!file_exists(DOL_DOCUMENT_ROOT.'/'.$filename)) {
+            $file_list['missing'][] = $filename;
+        } else {
+            $md5_local = md5_file(DOL_DOCUMENT_ROOT.'/'.$filename);
+            if ($md5_local != (string) $file)
+                $file_list['updated'][] = $filename;
+        }
+    }
+
+    foreach ($dir->dir as $subdir)
+        getFilesUpdated($subdir, $path.$subdir['name'].'/');
+return $file_list;
+}

htdocs/categories/admin/categorie_extrafields.php

@@ -69,42 +69,7 @@ $head = categoriesadmin_prepare_head();
 
 dol_fiche_head($head, 'attributes_categories', $langs->trans("Categories"), 0, 'category');
 
-print $langs->trans("DefineHereComplementaryAttributes",$textobject).'<br>'."\n";
+require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
-print '<br>';
-
-// Load attribute_label
-$extrafields->fetch_name_optionals_label($elementtype);
-
-print "<table summary=\"listofattributes\" class=\"noborder\" width=\"100%\">";
-
-print '<tr class="liste_titre">';
-print '<td>'.$langs->trans("Label").'</td>';
-print '<td>'.$langs->trans("AttributeCode").'</td>';
-print '<td>'.$langs->trans("Type").'</td>';
-print '<td align="right">'.$langs->trans("Size").'</td>';
-print '<td align="center">'.$langs->trans("Unique").'</td>';
-print '<td align="center">'.$langs->trans("Required").'</td>';
-print '<td width="80">&nbsp;</td>';
-print "</tr>\n";
-
-$var=True;
-foreach($extrafields->attribute_type as $key => $value)
-{
-    $var=!$var;
-    print "<tr ".$bc[$var].">";
-    print "<td>".$extrafields->attribute_label[$key]."</td>\n";
-    print "<td>".$key."</td>\n";
-    print "<td>".$type2label[$extrafields->attribute_type[$key]]."</td>\n";
-    print '<td align="right">'.$extrafields->attribute_size[$key]."</td>\n";
-    print '<td align="center">'.yn($extrafields->attribute_unique[$key])."</td>\n";
-    print '<td align="center">'.yn($extrafields->attribute_required[$key])."</td>\n";
-    print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=edit&attrname='.$key.'">'.img_edit().'</a>';
-    print "&nbsp; <a href=\"".$_SERVER["PHP_SELF"]."?action=delete&attrname=$key\">".img_delete()."</a></td>\n";
-    print "</tr>";
-    //      $i++;
-}
-
-print "</table>";
 
 dol_fiche_end();
 

htdocs/categories/card.php

@@ -127,6 +127,7 @@ if ($action == 'add' && $user->rights->categorie->creer)
 	if ($parent != "-1") $object->fk_parent = $parent;
 
 	$ret = $extrafields->setOptionalsFromPost($extralabels,$object);
+	if ($ret < 0) $error++;
 
 	if (! $object->label)
 	{

htdocs/categories/class/categorie.class.php

@@ -1330,17 +1330,23 @@ class Categorie extends CommonObject
 	 *  Build thumb
 	 *
 	 *  @param      string	$file           Chemin du fichier d'origine
-	 *  @param      int		$maxWidth       Largeur maximum que dois faire la miniature (160 par defaut)
-	 *  @param      int		$maxHeight      Hauteur maximum que dois faire la miniature (120 par defaut)
 	 *	@return		void
 	 */
-	function add_thumb($file, $maxWidth = 160, $maxHeight = 120)
+	function add_thumb($file)
 	{
-		require_once DOL_DOCUMENT_ROOT .'/core/lib/images.lib.php';
+		global $maxwidthsmall, $maxheightsmall, $maxwidthmini, $maxheightmini, $quality;
+
+		require_once DOL_DOCUMENT_ROOT .'/core/lib/images.lib.php';		// This define also $maxwidthsmall, $quality, ...
 
 		if (file_exists($file))
 		{
-			vignette($file,$maxWidth,$maxHeight);
+			// Create small thumbs for company (Ratio is near 16/9)
+	        // Used on logon for example
+	        $imgThumbSmall = vignette($file, $maxwidthsmall, $maxheightsmall, '_small', $quality);
+
+	        // Create mini thumbs for company (Ratio is near 16/9)
+	        // Used on menu or for setup page for example
+	        $imgThumbMini = vignette($file, $maxwidthmini, $maxheightmini, '_mini', $quality);
 		}
 	}
 

htdocs/categories/edit.php

@@ -90,7 +90,8 @@ if ($action == 'update' && $user->rights->categorie->creer)
 	if (empty($categorie->error))
 	{
 		$ret = $extrafields->setOptionalsFromPost($extralabels,$categorie);
-		
+		if ($ret < 0) $error++;
+
 		if ($categorie->update($user) > 0)
 		{
 			header('Location: '.DOL_URL_ROOT.'/categories/viewcat.php?id='.$categorie->id.'&type='.$type);

htdocs/comm/action/card.php

@@ -275,6 +275,7 @@ if ($action == 'add')
 
 	// Fill array 'array_options' with data from add form
 	$ret = $extrafields->setOptionalsFromPost($extralabels,$object);
+	if ($ret < 0) $error++;
 
 	if (! $error)
 	{
@@ -430,6 +431,7 @@ if ($action == 'update')
 
 		// Fill array 'array_options' with data from add form
 		$ret = $extrafields->setOptionalsFromPost($extralabels,$object);
+		if ($ret < 0) $error++;
 
 		if (! $error)
 		{

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

@@ -185,12 +185,12 @@ class ActionComm extends CommonObject
         $now=dol_now();
 
         // Check parameters
-        if (empty($this->userownerid)) 
+        if (empty($this->userownerid))
         {
         	$this->errors[]='ErrorPropertyUserowneridNotDefined';
         	return -1;
         }
-        
+
         // Clean parameters
         $this->label=dol_trunc(trim($this->label),128);
         $this->location=dol_trunc(trim($this->location),128);
@@ -222,7 +222,7 @@ class ActionComm extends CommonObject
         $userdoneid=$this->userdoneid;
 
         // Be sure assigned user is defined as an array of array('id'=>,'mandatory'=>,...).
-        if (empty($this->userassigned) || count($this->userassigned) == 0 || ! is_array($this->userassigned)) 
+        if (empty($this->userassigned) || count($this->userassigned) == 0 || ! is_array($this->userassigned))
         	$this->userassigned = array($userownerid=>array('id'=>$userownerid));
 
         if (! $this->type_id || ! $this->type_code)
@@ -314,9 +314,9 @@ class ActionComm extends CommonObject
 			        {
 			        	$val=array('id'=>$val);
 			        }
-					
+
 					$sql ="INSERT INTO ".MAIN_DB_PREFIX."actioncomm_resources(fk_actioncomm, element_type, fk_element, mandatory, transparency, answer_status)";
-					$sql.=" VALUES(".$this->id.", 'user', ".$val['id'].", ".($val['mandatory']?$val['mandatory']:'0').", ".($val['transparency']?$val['transparency']:'0').", ".($val['answer_status']?$val['answer_status']:'0').")";
+					$sql.=" VALUES(".$this->id.", 'user', ".$val['id'].", ".(empty($val['mandatory'])?'0':$val['mandatory']).", ".(empty($val['transparency'])?'0':$val['transparency']).", ".(empty($val['answer_status'])?'0':$val['answer_status']).")";
 
 					$resql = $this->db->query($sql);
 					if (! $resql)
@@ -680,7 +680,7 @@ class ActionComm extends CommonObject
 				foreach($this->userassigned as $key => $val)
 				{
 					$sql ="INSERT INTO ".MAIN_DB_PREFIX."actioncomm_resources(fk_actioncomm, element_type, fk_element, mandatory, transparency, answer_status)";
-					$sql.=" VALUES(".$this->id.", 'user', ".$val['id'].", ".($val['manadatory']?$val['manadatory']:'0').", ".($val['transparency']?$val['transparency']:'0').", ".($val['answer_status']?$val['answer_status']:'0').")";
+					$sql.=" VALUES(".$this->id.", 'user', ".$val['id'].", ".(empty($val['manadatory'])?'0':$val['manadatory']).", ".(empty($val['transparency'])?'0':$val['transparency']).", ".(empty($val['answer_status'])?'0':$val['answer_status']).")";
 
 					$resql = $this->db->query($sql);
 					if (! $resql)

htdocs/comm/action/class/ical.class.php

@@ -23,10 +23,11 @@
  *       \ingroup    agenda
  *       \brief      File of class to parse ical calendars
  */
+require_once DOL_DOCUMENT_ROOT.'/core/lib/xcal.lib.php';
 
 
 /**
- *		Class to parse ICal calendars
+ *		Class to read/parse ICal calendars
  */
 class ICal
 {
@@ -107,6 +108,7 @@ class ICal
         if (!stristr($this->file_text[0],'BEGIN:VCALENDAR')) return 'error not VCALENDAR';
 
         $insidealarm=0;
+        $tmpkey='';$tmpvalue='';
         foreach ($this->file_text as $text)
         {
             $text = trim($text); // trim one line
@@ -137,7 +139,7 @@ class ICal
                     case "BEGIN:DAYLIGHT":
                     case "BEGIN:VTIMEZONE":
                     case "BEGIN:STANDARD":
-                        $type = $value; // save tu array under value key
+                        $type = $value; // save array under value key
                         break;
 
                     case "END:VTODO": // end special text - goto VCALENDAR key
@@ -159,8 +161,31 @@ class ICal
                         $insidealarm=0;
                         break;
 
-                    default: // no special string
+                    default: // no special string (SUMMARY, DESCRIPTION, ...)
-                        if (! $insidealarm) $this->add_to_array($type, $key, $value); // add to array
+						if ($tmpvalue)
+						{
+							$tmpvalue .= $text;
+							if (! preg_match('/=$/',$text))	// No more lines
+							{
+								$key=$tmpkey;
+								$value=quotedPrintDecode(preg_replace('/^ENCODING=QUOTED-PRINTABLE:/i','',$tmpvalue));
+								$tmpkey='';
+								$tmpvalue='';
+							}
+						}
+                    	elseif (preg_match('/^ENCODING=QUOTED-PRINTABLE:/i',$value))
+                    	{
+                    		if (preg_match('/=$/',$value))
+                    		{
+                    			$tmpkey=$key;
+                    			$tmpvalue=$tmpvalue.preg_replace('/=$/',"",$value);	// We must wait to have next line to have complete message
+                    		}
+                    		else
+                    		{
+                    			$value=quotedPrintDecode(preg_replace('/^ENCODING=QUOTED-PRINTABLE:/i','',$tmpvalue.$value));
+                    		}
+                    	}                    	//$value=quotedPrintDecode($tmpvalue.$value);
+                    	if (! $insidealarm && ! $tmpkey) $this->add_to_array($type, $key, $value); // add to array
                         break;
                 }
             }

htdocs/comm/action/index.php

@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2001-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2003      Eric Seigne          <erics@rycks.com>
- * Copyright (C) 2004-2014 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2015 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2011      Juanjo Menent        <jmenent@2byte.es>
  * Copyright (C) 2014      Cedric GROSS         <c.gross@kreiz-it.fr>
@@ -39,6 +39,9 @@ if (! empty($conf->projet->enabled)) {
 
 if (! isset($conf->global->AGENDA_MAX_EVENTS_DAY_VIEW)) $conf->global->AGENDA_MAX_EVENTS_DAY_VIEW=3;
 
+if (empty($conf->global->AGENDA_EXT_NB)) $conf->global->AGENDA_EXT_NB=5;
+$MAXAGENDA=$conf->global->AGENDA_EXT_NB;
+
 $filter=GETPOST("filter",'',3);
 $filtert = GETPOST("usertodo","int",3)?GETPOST("usertodo","int",3):GETPOST("filtert","int",3);
 $usergroup = GETPOST("usergroup","int",3);
@@ -170,7 +173,7 @@ $listofextcals=array();
 if (empty($conf->global->AGENDA_DISABLE_EXT))
 {
     $i=0;
-    while($i < $conf->global->AGENDA_EXT_NB)
+    while($i < $MAXAGENDA)
     {
         $i++;
         $source='AGENDA_EXT_SRC'.$i;
@@ -188,7 +191,7 @@ if (empty($conf->global->AGENDA_DISABLE_EXT))
 if (empty($user->conf->AGENDA_DISABLE_EXT))
 {
 	$i=0;
-	while($i < $conf->global->AGENDA_EXT_NB)
+	while($i < $MAXAGENDA)
 	{
 		$i++;
 		$source='AGENDA_EXT_SRC_'.$user->id.'_'.$i;
@@ -360,16 +363,16 @@ if (! empty($conf->use_javascript_ajax))
 	{
 		foreach ($showextcals as $val)
 		{
-			$htmlname = dol_string_nospecial($val['name']);
+			$htmlname = md5($val['name']);
 			$s.='<script type="text/javascript">' . "\n";
 			$s.='jQuery(document).ready(function () {' . "\n";
-			$s.='		jQuery("#check_' . $htmlname . '").click(function() {';
+			$s.='		jQuery("#check_ext' . $htmlname . '").click(function() {';
 			$s.=' 		/* alert("'.$htmlname.'"); */';
-			$s.=' 		jQuery(".family_' . $htmlname . '").toggle();';
+			$s.=' 		jQuery(".family_ext' . $htmlname . '").toggle();';
 			$s.='		});' . "\n";
 			$s.='});' . "\n";
 			$s.='</script>' . "\n";
-			$s.='<div class="nowrap float"><input type="checkbox" id="check_' . $htmlname . '" name="check_' . $htmlname . '" checked="true"> ' . $val ['name'] . ' &nbsp; </div>';
+			$s.='<div class="nowrap float"><input type="checkbox" id="check_ext' . $htmlname . '" name="check_ext' . $htmlname . '" checked="true"> ' . $val ['name'] . ' &nbsp; </div>';
 		}
 	}
 	$s.='<div class="nowrap float"><input type="checkbox" id="check_birthday" name="check_birthday"> '.$langs->trans("AgendaShowBirthdayEvents").' &nbsp; </div>';
@@ -1170,7 +1173,7 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
                     		$numicals[dol_string_nospecial($event->icalname)]++;
                     	}
                     	$color=$event->icalcolor;
-                    	$cssclass=(! empty($event->icalname)?'family_'.dol_string_nospecial($event->icalname):'family_other unmovable');
+                    	$cssclass=(! empty($event->icalname)?'family_ext'.md5($event->icalname):'family_other unmovable');
                     }
                     else if ($event->type_code == 'BIRTHDAY')
                     {

htdocs/comm/action/peruser.php

@@ -305,16 +305,16 @@ if ($conf->use_javascript_ajax)
 		{
 			foreach ($showextcals as $val)
 			{
-				$htmlname = dol_string_nospecial($val['name']);
+				$htmlname = md5($val['name']);
 				$s.='<script type="text/javascript">' . "\n";
 				$s.='jQuery(document).ready(function () {' . "\n";
-				$s.='		jQuery("#check_' . $htmlname . '").click(function() {';
+				$s.='		jQuery("#check_ext' . $htmlname . '").click(function() {';
 				$s.=' 		/* alert("'.$htmlname.'"); */';
-				$s.=' 		jQuery(".family_' . $htmlname . '").toggle();';
+				$s.=' 		jQuery(".family_ext' . $htmlname . '").toggle();';
 				$s.='		});' . "\n";
 				$s.='});' . "\n";
 				$s.='</script>' . "\n";
-				$s.='<div class="nowrap float"><input type="checkbox" id="check_' . $htmlname . '" name="check_' . $htmlname . '" checked="true"> ' . $val ['name'] . ' &nbsp; </div>';
+				$s.='<div class="nowrap float"><input type="checkbox" id="check_ext' . $htmlname . '" name="check_ext' . $htmlname . '" checked="true"> ' . $val ['name'] . ' &nbsp; </div>';
 			}
 		}
 	}
@@ -869,7 +869,7 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, &
 					}
 
 					$color=$event->icalcolor;
-					$cssclass=(! empty($event->icalname)?'family_'.dol_string_nospecial($event->icalname):'family_other unsortable');
+					$cssclass=(! empty($event->icalname)?'family_ext'.md5($event->icalname):'family_other unsortable');
 				}
 				else if ($event->type_code == 'BIRTHDAY')
 				{

htdocs/comm/admin/askpricesupplier_extrafields.php

@@ -0,0 +1,151 @@
+<?php
+/* Copyright (C) 2001-2002	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
+ * Copyright (C) 2003		Jean-Louis Bergamo		<jlb@j1b.org>
+ * Copyright (C) 2004-2011	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2012		Regis Houssin			<regis.houssin@capnetworks.com>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/askpricesupplier.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+
+$langs->load("companies");
+$langs->load("admin");
+$langs->load('askpricesupplier');
+
+$extrafields = new ExtraFields($db);
+$form = new Form($db);
+
+// List of supported format
+$tmptype2label=ExtraFields::$type2label;
+$type2label=array('');
+foreach ($tmptype2label as $key => $val) $type2label[$key]=$langs->trans($val);
+
+$action=GETPOST('action', 'alpha');
+$attrname=GETPOST('attrname', 'alpha');
+$elementtype='askpricesupplier'; //Must be the $table_element of the class that manage extrafield
+
+if (!$user->admin) accessforbidden();
+
+
+/*
+ * Actions
+ */
+
+require DOL_DOCUMENT_ROOT.'/core/actions_extrafields.inc.php';
+
+
+
+/*
+ * View
+ */
+
+$textobject=$langs->transnoentitiesnoconv("CommRequests");
+
+
+llxHeader('',$langs->trans("AskPriceSupplierSetup"));
+
+
+$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
+print_fiche_titre($langs->trans("AskPriceSupplierSetup"),$linkback,'setup');
+
+
+$head = askpricesupplier_admin_prepare_head();
+
+dol_fiche_head($head, 'attributes', $langs->trans("CommRequests"), 0, 'askpricesupplier');
+
+
+print $langs->trans("DefineHereComplementaryAttributes",$textobject).'<br>'."\n";
+print '<br>';
+
+// Load attribute_label
+$extrafields->fetch_name_optionals_label($elementtype);
+
+print "<table summary=\"listofattributes\" class=\"noborder\" width=\"100%\">";
+
+print '<tr class="liste_titre">';
+print '<td align="center">'.$langs->trans("Position").'</td>';
+print '<td>'.$langs->trans("Label").'</td>';
+print '<td>'.$langs->trans("AttributeCode").'</td>';
+print '<td>'.$langs->trans("Type").'</td>';
+print '<td align="right">'.$langs->trans("Size").'</td>';
+print '<td align="center">'.$langs->trans("Unique").'</td>';
+print '<td align="center">'.$langs->trans("Required").'</td>';
+print '<td width="80">&nbsp;</td>';
+print "</tr>\n";
+
+$var=True;
+foreach($extrafields->attribute_type as $key => $value)
+{
+    $var=!$var;
+    print "<tr ".$bc[$var].">";
+    print "<td>".$extrafields->attribute_pos[$key]."</td>\n";
+    print "<td>".$extrafields->attribute_label[$key]."</td>\n";
+    print "<td>".$key."</td>\n";
+    print "<td>".$type2label[$extrafields->attribute_type[$key]]."</td>\n";
+    print '<td align="right">'.$extrafields->attribute_size[$key]."</td>\n";
+    print '<td align="center">'.yn($extrafields->attribute_unique[$key])."</td>\n";
+    print '<td align="center">'.yn($extrafields->attribute_required[$key])."</td>\n";
+    print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=edit&attrname='.$key.'">'.img_edit().'</a>';
+    print "&nbsp; <a href=\"".$_SERVER["PHP_SELF"]."?action=delete&attrname=$key\">".img_delete()."</a></td>\n";
+    print "</tr>";
+    //      $i++;
+}
+
+print "</table>";
+
+dol_fiche_end();
+
+
+// Buttons
+if ($action != 'create' && $action != 'edit')
+{
+    print '<div class="tabsAction">';
+    print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=create">'.$langs->trans("NewAttribute").'</a></div>';
+    print "</div>";
+}
+
+
+/* ************************************************************************** */
+/*                                                                            */
+/* Creation d'un champ optionnel
+ /*                                                                            */
+/* ************************************************************************** */
+
+if ($action == 'create')
+{
+    print "<br>";
+    print_titre($langs->trans('NewAttribute'));
+
+    require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
+}
+
+/* ************************************************************************** */
+/*                                                                            */
+/* Edition d'un champ optionnel                                               */
+/*                                                                            */
+/* ************************************************************************** */
+if ($action == 'edit' && ! empty($attrname))
+{
+    print "<br>";
+    print_titre($langs->trans("FieldEdition", $attrname));
+
+    require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
+}
+
+llxFooter();
+
+$db->close();

htdocs/comm/admin/askpricesupplierdet_extrafields.php

@@ -0,0 +1,153 @@
+<?php
+/* Copyright (C) 2001-2002	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
+ * Copyright (C) 2003		Jean-Louis Bergamo		<jlb@j1b.org>
+ * Copyright (C) 2004-2013	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2012		Regis Houssin			<regis.houssin@capnetworks.com>
+ * Copyright (C) 2012		Florian Henry			<florian.henry@open-concept.pro>
+ * Copyright (C) 2013		Philippe Grand			<philippe.grand@atoo-net.com>
+ * Copyright (C) 2013		Florian Henry			<florian.henry@open-concept.pro>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/askpricesupplier.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+
+
+if (!$user->admin)
+	accessforbidden();
+
+$langs->load("admin");
+$langs->load("other");
+$langs->load("askpricesupplier");
+
+$extrafields = new ExtraFields($db);
+$form = new Form($db);
+
+// List of supported format
+$tmptype2label=ExtraFields::$type2label;
+$type2label=array('');
+foreach ($tmptype2label as $key => $val) $type2label[$key]=$langs->trans($val);
+
+$action=GETPOST('action', 'alpha');
+$attrname=GETPOST('attrname', 'alpha');
+
+$elementtype='askpricesupplierdet'; //Must be the $table_element of the class that manage extrafield
+
+if (!$user->admin) accessforbidden();
+
+
+/*
+ * Actions
+ */
+
+require DOL_DOCUMENT_ROOT.'/core/actions_extrafields.inc.php';
+
+
+
+/*
+ * View
+ */
+
+$textobject=$langs->transnoentitiesnoconv("CommRequests");
+
+llxHeader('',$langs->trans("AskPriceSupplierSetup"));
+
+$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
+print_fiche_titre($langs->trans("AskPriceSupplierSetup"),$linkback,'setup');
+
+$head = askpricesupplier_admin_prepare_head();
+
+dol_fiche_head($head, 'attributeslines', $langs->trans("CommRequests"), 0, 'askpricesupplier');
+
+
+print $langs->trans("DefineHereComplementaryAttributes",$textobject).'<br>'."\n";
+print '<br>';
+
+// Load attribute_label
+$extrafields->fetch_name_optionals_label($elementtype);
+
+print "<table summary=\"listofattributes\" class=\"noborder\" width=\"100%\">";
+
+print '<tr class="liste_titre">';
+print '<td>'.$langs->trans("Label").'</td>';
+print '<td>'.$langs->trans("AttributeCode").'</td>';
+print '<td>'.$langs->trans("Type").'</td>';
+print '<td align="right">'.$langs->trans("Size").'</td>';
+print '<td align="center">'.$langs->trans("Unique").'</td>';
+print '<td align="center">'.$langs->trans("Required").'</td>';
+print '<td width="80">&nbsp;</td>';
+print "</tr>\n";
+
+$var=True;
+foreach($extrafields->attribute_type as $key => $value)
+{
+    $var=!$var;
+    print "<tr ".$bc[$var].">";
+    print "<td>".$extrafields->attribute_label[$key]."</td>\n";
+    print "<td>".$key."</td>\n";
+    print "<td>".$type2label[$extrafields->attribute_type[$key]]."</td>\n";
+    print '<td align="right">'.$extrafields->attribute_size[$key]."</td>\n";
+    print '<td align="center">'.yn($extrafields->attribute_unique[$key])."</td>\n";
+    print '<td align="center">'.yn($extrafields->attribute_required[$key])."</td>\n";
+    print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=edit&attrname='.$key.'">'.img_edit().'</a>';
+    print "&nbsp; <a href=\"".$_SERVER["PHP_SELF"]."?action=delete&attrname=$key\">".img_delete()."</a></td>\n";
+    print "</tr>";
+}
+
+print "</table>";
+
+dol_fiche_end();
+
+
+// Buttons
+if ($action != 'create' && $action != 'edit')
+{
+    print '<div class="tabsAction">';
+    print "<a class=\"butAction\" href=\"".$_SERVER["PHP_SELF"]."?action=create\">".$langs->trans("NewAttribute")."</a>";
+    print "</div>";
+}
+
+
+/* ************************************************************************** */
+/*                                                                            */
+/* Creation d'un champ optionnel											  */
+/*                                                                            */
+/* ************************************************************************** */
+
+if ($action == 'create')
+{
+    print "<br>";
+    print_titre($langs->trans('NewAttribute'));
+
+    require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
+}
+
+/* ************************************************************************** */
+/*                                                                            */
+/* Edition d'un champ optionnel                                               */
+/*                                                                            */
+/* ************************************************************************** */
+if ($action == 'edit' && ! empty($attrname))
+{
+    print "<br>";
+    print_titre($langs->trans("FieldEdition", $attrname));
+
+    require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
+}
+
+llxFooter();
+
+$db->close();

htdocs/comm/admin/propal_extrafields.php

@@ -61,10 +61,8 @@ require DOL_DOCUMENT_ROOT.'/core/actions_extrafields.inc.php';
 
 $textobject=$langs->transnoentitiesnoconv("Proposals");
 
-
 llxHeader('',$langs->trans("PropalSetup"));
 
-
 $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
 print_fiche_titre($langs->trans("PropalSetup"),$linkback,'setup');
 
@@ -73,45 +71,7 @@ $head = propal_admin_prepare_head();
 
 dol_fiche_head($head, 'attributes', $langs->trans("Proposals"), 0, 'propal');
 
-
+require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
-print $langs->trans("DefineHereComplementaryAttributes",$textobject).'<br>'."\n";
-print '<br>';
-
-// Load attribute_label
-$extrafields->fetch_name_optionals_label($elementtype);
-
-print "<table summary=\"listofattributes\" class=\"noborder\" width=\"100%\">";
-
-print '<tr class="liste_titre">';
-print '<td align="center">'.$langs->trans("Position").'</td>';
-print '<td>'.$langs->trans("Label").'</td>';
-print '<td>'.$langs->trans("AttributeCode").'</td>';
-print '<td>'.$langs->trans("Type").'</td>';
-print '<td align="right">'.$langs->trans("Size").'</td>';
-print '<td align="center">'.$langs->trans("Unique").'</td>';
-print '<td align="center">'.$langs->trans("Required").'</td>';
-print '<td width="80">&nbsp;</td>';
-print "</tr>\n";
-
-$var=True;
-foreach($extrafields->attribute_type as $key => $value)
-{
-    $var=!$var;
-    print "<tr ".$bc[$var].">";
-    print "<td>".$extrafields->attribute_pos[$key]."</td>\n";
-    print "<td>".$extrafields->attribute_label[$key]."</td>\n";
-    print "<td>".$key."</td>\n";
-    print "<td>".$type2label[$extrafields->attribute_type[$key]]."</td>\n";
-    print '<td align="right">'.$extrafields->attribute_size[$key]."</td>\n";
-    print '<td align="center">'.yn($extrafields->attribute_unique[$key])."</td>\n";
-    print '<td align="center">'.yn($extrafields->attribute_required[$key])."</td>\n";
-    print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=edit&attrname='.$key.'">'.img_edit().'</a>';
-    print "&nbsp; <a href=\"".$_SERVER["PHP_SELF"]."?action=delete&attrname=$key\">".img_delete()."</a></td>\n";
-    print "</tr>";
-    //      $i++;
-}
-
-print "</table>";
 
 dol_fiche_end();
 

htdocs/comm/admin/propaldet_extrafields.php

@@ -78,42 +78,7 @@ $head = propal_admin_prepare_head();
 
 dol_fiche_head($head, 'attributeslines', $langs->trans("Proposals"), 0, 'propal');
 
-
+require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
-print $langs->trans("DefineHereComplementaryAttributes",$textobject).'<br>'."\n";
-print '<br>';
-
-// Load attribute_label
-$extrafields->fetch_name_optionals_label($elementtype);
-
-print "<table summary=\"listofattributes\" class=\"noborder\" width=\"100%\">";
-
-print '<tr class="liste_titre">';
-print '<td>'.$langs->trans("Label").'</td>';
-print '<td>'.$langs->trans("AttributeCode").'</td>';
-print '<td>'.$langs->trans("Type").'</td>';
-print '<td align="right">'.$langs->trans("Size").'</td>';
-print '<td align="center">'.$langs->trans("Unique").'</td>';
-print '<td align="center">'.$langs->trans("Required").'</td>';
-print '<td width="80">&nbsp;</td>';
-print "</tr>\n";
-
-$var=True;
-foreach($extrafields->attribute_type as $key => $value)
-{
-    $var=!$var;
-    print "<tr ".$bc[$var].">";
-    print "<td>".$extrafields->attribute_label[$key]."</td>\n";
-    print "<td>".$key."</td>\n";
-    print "<td>".$type2label[$extrafields->attribute_type[$key]]."</td>\n";
-    print '<td align="right">'.$extrafields->attribute_size[$key]."</td>\n";
-    print '<td align="center">'.yn($extrafields->attribute_unique[$key])."</td>\n";
-    print '<td align="center">'.yn($extrafields->attribute_required[$key])."</td>\n";
-    print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=edit&attrname='.$key.'">'.img_edit().'</a>';
-    print "&nbsp; <a href=\"".$_SERVER["PHP_SELF"]."?action=delete&attrname=$key\">".img_delete()."</a></td>\n";
-    print "</tr>";
-}
-
-print "</table>";
 
 dol_fiche_end();
 

htdocs/comm/askpricesupplier/document.php

@@ -0,0 +1,127 @@
+<?php
+/* Copyright (C) 2003-2004 Rodolphe Quiedeville  <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2009 Laurent Destailleur   <eldy@users.sourceforge.net>
+ * Copyright (C) 2005      Marc Barilley / Ocebo <marc@ocebo.com>
+ * Copyright (C) 2005-2012 Regis Houssin         <regis.houssin@capnetworks.com>
+ * Copyright (C) 2013      Cédric Salvador       <csalvador@gpcsolutions.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
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *       \file       htdocs/comm/propal/document.php
+ *       \ingroup    propal
+ *       \brief      Management page of documents attached to a business proposal
+ */
+
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/comm/askpricesupplier/class/askpricesupplier.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/askpricesupplier.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
+
+$langs->load('compta');
+$langs->load('other');
+
+$action		= GETPOST('action','alpha');
+$confirm	= GETPOST('confirm','alpha');
+$id			= GETPOST('id','int');
+$ref		= GETPOST('ref','alpha');
+
+// Security check
+$socid='';
+if (! empty($user->societe_id))
+{
+	$action='';
+	$socid = $user->societe_id;
+}
+$result = restrictedArea($user, 'askpricesupplier', $id);
+
+// Get parameters
+$sortfield = GETPOST("sortfield",'alpha');
+$sortorder = GETPOST("sortorder",'alpha');
+$page = GETPOST("page",'int');
+if ($page == -1) { $page = 0; }
+$offset = $conf->liste_limit * $page;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
+if (! $sortorder) $sortorder="ASC";
+if (! $sortfield) $sortfield="name";
+
+$object = new AskPriceSupplier($db);
+$object->fetch($id,$ref);
+if ($object->id > 0)
+{
+	$object->fetch_thirdparty();
+	$upload_dir = $conf->askpricesupplier->dir_output.'/'.dol_sanitizeFileName($object->ref);
+	include_once DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_pre_headers.tpl.php';
+}
+
+
+/*
+ * View
+ */
+
+llxHeader('',$langs->trans('CommRequest'),'EN:Ask_Price_Supplier|FR:Demande_de_prix_fournisseur');
+
+$form = new Form($db);
+
+if ($object->id > 0)
+{
+	$upload_dir = $conf->askpricesupplier->dir_output.'/'.dol_sanitizeFileName($object->ref);
+
+	$head = askpricesupplier_prepare_head($object);
+	dol_fiche_head($head, 'document', $langs->trans('CommRequest'), 0, 'askpricesupplier');
+
+	// Construit liste des fichiers
+	$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
+	$totalsize=0;
+	foreach($filearray as $key => $file)
+	{
+		$totalsize+=$file['size'];
+	}
+
+	print '<table class="border"width="100%">';
+
+	$linkback='<a href="'.DOL_URL_ROOT.'/comm/askpricesupplier/list.php'.(! empty($socid)?'?socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>';
+
+	// Ref
+	print '<tr><td width="25%">'.$langs->trans('Ref').'</td><td colspan="3">';
+	print $form->showrefnav($object,'ref',$linkback,1,'ref','ref','');
+	print '</td></tr>';
+	
+	// Supplier
+	print "<tr><td>".$langs->trans("Supplier")."</td>";
+	print '<td colspan="3">'.$object->thirdparty->getNomUrl(1).'</td></tr>';
+
+	print '<tr><td>'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.count($filearray).'</td></tr>';
+	print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.$totalsize.' '.$langs->trans("bytes").'</td></tr>';
+
+	print '</table>';
+
+	print '</div>';
+
+	$modulepart = 'askpricesupplier';
+	$permission = $user->rights->askpricesupplier->creer;
+	$param = '&id=' . $object->id;
+	include_once DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_post_headers.tpl.php';
+}
+else
+{
+	print $langs->trans("ErrorUnknown");
+}
+
+llxFooter();
+$db->close();

htdocs/comm/askpricesupplier/index.php

@@ -0,0 +1,377 @@
+<?php
+/* Copyright (C) 2003-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *	\file       htdocs/comm/propal/index.php
+ *	\ingroup    propal
+ *	\brief      Home page of proposal area
+ */
+
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
+require_once DOL_DOCUMENT_ROOT .'/comm/askpricesupplier/class/askpricesupplier.class.php';
+
+$langs->load("askpricesupplier");
+$langs->load("companies");
+
+// Security check
+$socid=GETPOST('socid','int');
+if (isset($user->societe_id) && $user->societe_id  > 0)
+{
+	$action = '';
+	$socid = $user->societe_id;
+}
+$result = restrictedArea($user, 'askpricesupplier');
+
+
+/*
+ * View
+ */
+$now=dol_now();
+$askpricesupplierstatic=new AskPriceSupplier($db);
+$companystatic=new Societe($db);
+$form = new Form($db);
+$formfile = new FormFile($db);
+$help_url="EN:Module_Ask_Price_Supplier|FR:Module_Demande_de_prix_fournisseur";
+
+llxHeader("",$langs->trans("AskPriceSupplierArea"),$help_url);
+
+print_fiche_titre($langs->trans("AskPriceSupplierArea"));
+
+print '<div class="fichecenter"><div class="fichethirdleft">';
+
+
+/*
+ * Search form
+ */
+$var=false;
+print '<table class="noborder nohover" width="100%">';
+print '<form method="post" action="'.DOL_URL_ROOT.'/comm/askpricesupplier/list.php">';
+print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("SearchRequest").'</td></tr>';
+print '<tr '.$bc[$var].'><td>';
+print $langs->trans("Ref").':</td><td><input type="text" class="flat" name="sref" size=18></td><td rowspan="2"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
+print '<tr '.$bc[$var].'><td class="nowrap">'.$langs->trans("Other").':</td><td><input type="text" class="flat" name="sall" size="18"></td>';
+print '</tr>';
+print "</form></table><br>\n";
+
+
+/*
+ * Statistics
+ */
+
+$sql = "SELECT count(p.rowid), p.fk_statut";
+$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
+$sql.= ", ".MAIN_DB_PREFIX."askpricesupplier as p";
+if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+$sql.= " WHERE p.fk_soc = s.rowid";
+$sql.= " AND p.entity = ".$conf->entity;
+if ($user->societe_id) $sql.=' AND p.fk_soc = '.$user->societe_id;
+if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+$sql.= " AND p.fk_statut IN (0,1,2,3,4)";
+$sql.= " GROUP BY p.fk_statut";
+$resql = $db->query($sql);
+if ($resql)
+{
+    $num = $db->num_rows($resql);
+    $i = 0;
+
+    $total=0;
+    $totalinprocess=0;
+    $dataseries=array();
+    $vals=array();
+    // -1=Canceled, 0=Draft, 1=Validated, (2=Accepted/On process not managed for customer orders), 3=Closed (Sent/Received, billed or not)
+    while ($i < $num)
+    {
+        $row = $db->fetch_row($resql);
+        if ($row)
+        {
+            //if ($row[1]!=-1 && ($row[1]!=3 || $row[2]!=1))
+            {
+                $vals[$row[1]]=$row[0];
+                $totalinprocess+=$row[0];
+            }
+            $total+=$row[0];
+        }
+        $i++;
+    }
+    $db->free($resql);
+
+    print '<table class="noborder" width="100%">';
+    print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("Statistics").' - '.$langs->trans("CommRequests").'</td></tr>'."\n";
+    $var=true;
+    $listofstatus=array(0,1,2,3,4);
+    foreach ($listofstatus as $status)
+    {
+        $dataseries[]=array('label'=>$askpricesupplierstatic->LibStatut($status,1),'data'=>(isset($vals[$status])?(int) $vals[$status]:0));
+        if (! $conf->use_javascript_ajax)
+        {
+            $var=!$var;
+            print "<tr ".$bc[$var].">";
+            print '<td>'.$askpricesupplierstatic->LibStatut($status,0).'</td>';
+            print '<td align="right"><a href="list.php?statut='.$status.'">'.(isset($vals[$status])?$vals[$status]:0).'</a></td>';
+            print "</tr>\n";
+        }
+    }
+    if ($conf->use_javascript_ajax)
+    {
+        print '<tr><td align="center" colspan="2">';
+        $data=array('series'=>$dataseries);
+        dol_print_graph('stats',300,180,$data,1,'pie',1);
+        print '</td></tr>';
+    }
+
+    print '<tr class="liste_total"><td>'.$langs->trans("Total").'</td><td align="right">'.$total.'</td></tr>';
+    print "</table><br>";
+}
+else
+{
+    dol_print_error($db);
+}
+
+
+/*
+ * Draft askprice
+ */
+if (! empty($conf->askpricesupplier->enabled))
+{
+	$sql = "SELECT c.rowid, c.ref, s.nom as socname, s.rowid as socid, s.canvas, s.client";
+	$sql.= " FROM ".MAIN_DB_PREFIX."askpricesupplier as c";
+	$sql.= ", ".MAIN_DB_PREFIX."societe as s";
+	if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+	$sql.= " WHERE c.fk_soc = s.rowid";
+	$sql.= " AND c.entity = ".$conf->entity;
+	$sql.= " AND c.fk_statut = 0";
+	if ($socid) $sql.= " AND c.fk_soc = ".$socid;
+	if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+
+	$resql=$db->query($sql);
+	if ($resql)
+	{
+		print '<table class="noborder" width="100%">';
+		print '<tr class="liste_titre">';
+		print '<td colspan="2">'.$langs->trans("DraftRequests").'</td></tr>';
+		$langs->load("askpricesupplier");
+		$num = $db->num_rows($resql);
+		if ($num)
+		{
+			$i = 0;
+			$var = True;
+			while ($i < $num)
+			{
+				$var=!$var;
+				$obj = $db->fetch_object($resql);
+				print "<tr ".$bc[$var].">";
+
+				$askpricesupplierstatic->id=$obj->rowid;
+				$askpricesupplierstatic->ref=$obj->ref;
+				print '<td class="nowrap">'.$askpricesupplierstatic->getNomUrl(1).'</td>';
+
+				$companystatic->id=$obj->socid;
+				$companystatic->name=$obj->socname;
+				$companystatic->client=$obj->client;
+				$companystatic->canvas=$obj->canvas;
+				print '<td>'.$companystatic->getNomUrl(1,'customer',24).'</td>';
+
+				print '</tr>';
+				$i++;
+			}
+		}
+		print "</table><br>";
+	}
+}
+
+print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
+
+
+$max=5;
+
+/*
+ * Last modified askprice
+ */
+
+$sql = "SELECT c.rowid, c.ref, c.fk_statut, s.nom as socname, s.rowid as socid, s.canvas, s.client,";
+$sql.= " date_cloture as datec";
+$sql.= " FROM ".MAIN_DB_PREFIX."askpricesupplier as c";
+$sql.= ", ".MAIN_DB_PREFIX."societe as s";
+if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+$sql.= " WHERE c.fk_soc = s.rowid";
+$sql.= " AND c.entity = ".$conf->entity;
+//$sql.= " AND c.fk_statut > 2";
+if ($socid) $sql .= " AND c.fk_soc = ".$socid;
+if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+$sql.= " ORDER BY c.tms DESC";
+$sql.= $db->plimit($max, 0);
+
+$resql=$db->query($sql);
+if ($resql)
+{
+	print '<table class="noborder" width="100%">';
+	print '<tr class="liste_titre">';
+	print '<td colspan="4">'.$langs->trans("LastModifiedRequests",$max).'</td></tr>';
+
+	$num = $db->num_rows($resql);
+	if ($num)
+	{
+		$i = 0;
+		$var = True;
+		while ($i < $num)
+		{
+			$var=!$var;
+			$obj = $db->fetch_object($resql);
+
+			print "<tr ".$bc[$var].">";
+			print '<td width="20%" class="nowrap">';
+
+			$askpricesupplierstatic->id=$obj->rowid;
+			$askpricesupplierstatic->ref=$obj->ref;
+
+			print '<table class="nobordernopadding"><tr class="nocellnopadd">';
+			print '<td width="96" class="nobordernopadding nowrap">';
+			print $askpricesupplierstatic->getNomUrl(1);
+			print '</td>';
+
+			print '<td width="16" class="nobordernopadding nowrap">';
+			print '&nbsp;';
+			print '</td>';
+
+			print '<td width="16" align="right" class="nobordernopadding">';
+			$filename=dol_sanitizeFileName($obj->ref);
+			$filedir=$conf->askpricesupplier->dir_output . '/' . dol_sanitizeFileName($obj->ref);
+			$urlsource=$_SERVER['PHP_SELF'].'?id='.$obj->rowid;
+			print $formfile->getDocumentsLink($askpricesupplierstatic->element, $filename, $filedir);
+			print '</td></tr></table>';
+
+			print '</td>';
+
+			$companystatic->id=$obj->socid;
+			$companystatic->name=$obj->socname;
+			$companystatic->client=$obj->client;
+			$companystatic->canvas=$obj->canvas;
+			print '<td>'.$companystatic->getNomUrl(1,'customer').'</td>';
+
+			print '<td>'.dol_print_date($db->jdate($obj->datec),'day').'</td>';
+			print '<td align="right">'.$askpricesupplierstatic->LibStatut($obj->fk_statut,5).'</td>';
+			print '</tr>';
+			$i++;
+		}
+	}
+	print "</table><br>";
+}
+else dol_print_error($db);
+
+
+/*
+ * Opened askprice
+ */
+if (! empty($conf->askpricesupplier->enabled) && $user->rights->askpricesupplier->lire)
+{
+	$langs->load("askpricesupplier");
+
+	$now=dol_now();
+
+	$sql = "SELECT s.nom as socname, s.rowid as socid, s.canvas, s.client, p.rowid as askpricesupplierid, p.total as total_ttc, p.total_ht, p.ref, p.fk_statut, p.datec as dp";
+	$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
+	$sql.= ", ".MAIN_DB_PREFIX."askpricesupplier as p";
+	if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+	$sql.= " WHERE p.fk_soc = s.rowid";
+	$sql.= " AND p.entity = ".$conf->entity;
+	$sql.= " AND p.fk_statut = 1";
+	if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+	if ($socid) $sql.= " AND s.rowid = ".$socid;
+	$sql.= " ORDER BY p.rowid DESC";
+
+	$result=$db->query($sql);
+	if ($result)
+	{
+		$total = 0;
+		$num = $db->num_rows($result);
+		$i = 0;
+		if ($num > 0)
+		{
+			$var=true;
+
+			print '<table class="noborder" width="100%">';
+			print '<tr class="liste_titre"><td colspan="5">'.$langs->trans("RequestsOpened").' <a href="'.DOL_URL_ROOT.'/comm/askpricesupplier/list.php?viewstatut=1"><span class="badge">'.$num.'</span></a></td></tr>';
+
+			$nbofloop=min($num, (empty($conf->global->MAIN_MAXLIST_OVERLOAD)?500:$conf->global->MAIN_MAXLIST_OVERLOAD));
+			while ($i < $nbofloop)
+			{
+				$obj = $db->fetch_object($result);
+				$var=!$var;
+				print '<tr '.$bc[$var].'>';
+
+				// Ref
+				print '<td class="nowrap" width="140">';
+
+				$askpricesupplierstatic->id=$obj->askpricesupplierid;
+				$askpricesupplierstatic->ref=$obj->ref;
+
+				print '<table class="nobordernopadding"><tr class="nocellnopadd">';
+				print '<td class="nobordernopadding nowrap">';
+				print $askpricesupplierstatic->getNomUrl(1);
+				print '</td>';
+				print '<td width="18" class="nobordernopadding nowrap">';
+				if ($db->jdate($obj->dfv) < ($now - $conf->askpricesupplier->cloture->warning_delay)) print img_warning($langs->trans("Late"));
+				print '</td>';
+				print '<td width="16" align="center" class="nobordernopadding">';
+				$filename=dol_sanitizeFileName($obj->ref);
+				$filedir=$conf->askpricesupplier->dir_output . '/' . dol_sanitizeFileName($obj->ref);
+				$urlsource=$_SERVER['PHP_SELF'].'?id='.$obj->askpricesupplierid;
+				print $formfile->getDocumentsLink($askpricesupplierstatic->element, $filename, $filedir);
+				print '</td></tr></table>';
+
+				print "</td>";
+
+				$companystatic->id=$obj->socid;
+				$companystatic->name=$obj->socname;
+				$companystatic->client=$obj->client;
+				$companystatic->canvas=$obj->canvas;
+				print '<td align="left">'.$companystatic->getNomUrl(1,'customer',44).'</td>'."\n";
+
+				print '<td align="right">';
+				print dol_print_date($db->jdate($obj->dp),'day').'</td>'."\n";
+				print '<td align="right">'.price($obj->total_ttc).'</td>';
+				print '<td align="center" width="14">'.$askpricesupplierstatic->LibStatut($obj->fk_statut,3).'</td>'."\n";
+				print '</tr>'."\n";
+				$i++;
+				$total += $obj->total_ttc;
+			}
+			if ($num > $nbofloop)
+			{
+				print '<tr class="liste_total"><td colspan="5">'.$langs->trans("XMoreLines", ($num - $nbofloop))."</td></tr>";
+			}
+			else if ($total>0)
+			{
+				print '<tr class="liste_total"><td colspan="3">'.$langs->trans("Total")."</td><td align=\"right\">".price($total)."</td><td>&nbsp;</td></tr>";
+			}
+			print "</table><br>";
+		}
+	}
+	else
+	{
+		dol_print_error($db);
+	}
+}
+
+print '</div></div></div>';
+
+llxFooter();
+
+$db->close();

htdocs/comm/askpricesupplier/info.php

@@ -0,0 +1,65 @@
+<?php
+/* Copyright (C) 2004		Rodolphe Quiedeville	<rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2006	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2012	Regis Houssin			<regis.houssin@capnetworks.com>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *      \file       htdocs/comm/propal/info.php
+ *      \ingroup    propal
+ *      \brief      Page d'affichage des infos d'une proposition commerciale
+ */
+
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/comm/askpricesupplier/class/askpricesupplier.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/askpricesupplier.lib.php';
+
+$langs->load('askpricesupplier');
+$langs->load('compta');
+
+$id=GETPOST('id','int');
+$socid=GETPOST('socid','int');
+
+// Security check
+if (! empty($user->societe_id)) $socid=$user->societe_id;
+$result = restrictedArea($user, 'askpricesupplier', $id);
+
+
+/*
+ *	View
+ */
+
+llxHeader('',$langs->trans('CommRequest'),'EN:Ask_Price_Supplier|FR:Demande_de_prix_fournisseur');
+
+$object = new AskPriceSupplier($db);
+$object->fetch($id);
+$object->fetch_thirdparty();
+
+$head = askpricesupplier_prepare_head($object);
+dol_fiche_head($head, 'info', $langs->trans('CommRequest'), 0, 'askpricesupplier');
+
+$object->info($object->id);
+
+print '<table width="100%"><tr><td>';
+dol_print_object_info($object);
+print '</td></tr></table>';
+
+print '</div>';
+
+
+llxFooter();
+$db->close();

htdocs/comm/askpricesupplier/list.php

@@ -0,0 +1,425 @@
+<?php
+/* Copyright (C) 2001-2007 Rodolphe Quiedeville  <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2011 Laurent Destailleur   <eldy@users.sourceforge.net>
+ * Copyright (C) 2004      Eric Seigne           <eric.seigne@ryxeo.com>
+ * Copyright (C) 2005      Marc Barilley / Ocebo <marc@ocebo.com>
+ * Copyright (C) 2005-2013 Regis Houssin         <regis.houssin@capnetworks.com>
+ * Copyright (C) 2006      Andre Cianfarani      <acianfa@free.fr>
+ * Copyright (C) 2010-2011 Juanjo Menent         <jmenent@2byte.es>
+ * Copyright (C) 2010-2011 Philippe Grand        <philippe.grand@atoo-net.com>
+ * Copyright (C) 2012      Christophe Battarel   <christophe.battarel@altairis.fr>
+ * Copyright (C) 2013      Cédric Salvador       <csalvador@gpcsolutions.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
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *	\file       	htdocs/comm/propal/list.php
+ *	\ingroup    	propal
+ *	\brief      	Page of commercial proposals card and list
+ */
+
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaskpricesupplier.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/comm/askpricesupplier/class/askpricesupplier.class.php';
+if (! empty($conf->projet->enabled))
+	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+
+$langs->load('companies');
+$langs->load('askpricesupplier');
+$langs->load('compta');
+$langs->load('bills');
+$langs->load('orders');
+$langs->load('products');
+
+$socid=GETPOST('socid','int');
+
+$search_user=GETPOST('search_user','int');
+$search_sale=GETPOST('search_sale','int');
+$search_ref=GETPOST('sf_ref')?GETPOST('sf_ref','alpha'):GETPOST('search_ref','alpha');
+$search_societe=GETPOST('search_societe','alpha');
+$search_montant_ht=GETPOST('search_montant_ht','alpha');
+$search_author=GETPOST('search_author','alpha');
+$viewstatut=$db->escape(GETPOST('viewstatut'));
+$object_statut=$db->escape(GETPOST('askpricesupplier_statut'));
+
+$sall=GETPOST("sall");
+$mesg=(GETPOST("msg") ? GETPOST("msg") : GETPOST("mesg"));
+$year=GETPOST("year");
+$month=GETPOST("month");
+
+// Nombre de ligne pour choix de produit/service predefinis
+$NBLINES=4;
+
+// Security check
+$module='askpricesupplier';
+$dbtable='';
+$objectid='';
+if (! empty($user->societe_id))	$socid=$user->societe_id;
+if (! empty($socid))
+{
+	$objectid=$socid;
+	$module='societe';
+	$dbtable='&societe';
+}
+$result = restrictedArea($user, $module, $objectid, $dbtable);
+
+if (GETPOST("button_removefilter") || GETPOST("button_removefilter_x"))	// Both tests are required to be compatible with all browsers
+{
+    $search_categ='';
+    $search_user='';
+    $search_sale='';
+    $search_ref='';
+    $search_societe='';
+    $search_montant_ht='';
+    $search_author='';
+    $year='';
+    $month='';
+	$viewstatut='';
+	$object_statut='';
+}
+
+if($object_statut != '')
+$viewstatut=$object_statut;
+
+
+// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+$hookmanager->initHooks(array('askpricesupplierlist'));
+
+
+
+/*
+ * Actions
+ */
+
+
+$parameters=array('socid'=>$socid);
+$reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+
+
+
+/*
+ * View
+ */
+
+llxHeader('',$langs->trans('CommRequest'),'EN:Ask_Price_Supplier|FR:Demande_de_prix_fournisseur');
+
+$form = new Form($db);
+$formother = new FormOther($db);
+$formfile = new FormFile($db);
+$formaskpricesupplier = new FormAskPriceSupplier($db);
+$companystatic=new Societe($db);
+
+$now=dol_now();
+
+$sortfield = GETPOST("sortfield",'alpha');
+$sortorder = GETPOST("sortorder",'alpha');
+$page = GETPOST("page",'int');
+if ($page == -1) { $page = 0; }
+$offset = $conf->liste_limit * $page;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
+
+if (! $sortfield) $sortfield='p.date_livraison';
+if (! $sortorder) $sortorder='DESC';
+$limit = $conf->liste_limit;
+
+
+$sql = 'SELECT s.rowid, s.nom as name, s.town, s.client, s.code_client,';
+$sql.= ' p.rowid as askpricesupplierid, p.note_private, p.total_ht, p.ref, p.fk_statut, p.fk_user_author, p.date_livraison as dp,';
+if (! $user->rights->societe->client->voir && ! $socid) $sql .= " sc.fk_soc, sc.fk_user,";
+$sql.= ' u.login';
+$sql.= ' FROM '.MAIN_DB_PREFIX.'societe as s, '.MAIN_DB_PREFIX.'askpricesupplier as p';
+if ($sall) $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'askpricesupplierdet as pd ON p.rowid=pd.fk_askpricesupplier';
+$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'user as u ON p.fk_user_author = u.rowid';
+// We'll need this table joined to the select in order to filter by sale
+if ($search_sale > 0 || (! $user->rights->societe->client->voir && ! $socid)) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+if ($search_user > 0)
+{
+    $sql.=", ".MAIN_DB_PREFIX."element_contact as c";
+    $sql.=", ".MAIN_DB_PREFIX."c_type_contact as tc";
+}
+$sql.= ' WHERE p.fk_soc = s.rowid';
+$sql.= ' AND p.entity = '.$conf->entity;
+if (! $user->rights->societe->client->voir && ! $socid) //restriction
+{
+	$sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+}
+if ($search_ref) {
+	$sql .= natural_search('p.ref', $search_ref);
+}
+if ($search_societe) {
+	$sql .= natural_search('s.nom', $search_societe);
+}
+if ($search_author)
+{
+	$sql.= " AND u.login LIKE '%".$db->escape(trim($search_author))."%'";
+}
+if ($search_montant_ht)
+{
+	$sql.= " AND p.total_ht='".$db->escape(price2num(trim($search_montant_ht)))."'";
+}
+if ($sall) {
+    $sql .= natural_search(array('s.nom', 'p.note_private', 'p.note_public', 'pd.description'), $sall);
+}
+if ($socid) $sql.= ' AND s.rowid = '.$socid;
+if ($viewstatut <> '')
+{
+	$sql.= ' AND p.fk_statut IN ('.$viewstatut.')';
+}
+if ($month > 0)
+{
+    if ($year > 0 && empty($day))
+    $sql.= " AND p.date_livraison BETWEEN '".$db->idate(dol_get_first_day($year,$month,false))."' AND '".$db->idate(dol_get_last_day($year,$month,false))."'";
+    else if ($year > 0 && ! empty($day))
+    $sql.= " AND p.date_livraison BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $month, $day, $year))."' AND '".$db->idate(dol_mktime(23, 59, 59, $month, $day, $year))."'";
+    else
+    $sql.= " AND date_format(p.date_livraison, '%m') = '".$month."'";
+}
+else if ($year > 0)
+{
+	$sql.= " AND p.date_livraison BETWEEN '".$db->idate(dol_get_first_day($year,1,false))."' AND '".$db->idate(dol_get_last_day($year,12,false))."'";
+}
+if ($search_sale > 0) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$search_sale;
+if ($search_user > 0)
+{
+    $sql.= " AND c.fk_c_type_contact = tc.rowid AND tc.element='askpricesupplier' AND tc.source='internal' AND c.element_id = p.rowid AND c.fk_socpeople = ".$search_user;
+}
+
+
+$sql.= ' ORDER BY '.$sortfield.' '.$sortorder.', p.ref DESC';
+
+$nbtotalofrecords = 0;
+if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
+{
+	$result = $db->query($sql);
+	$nbtotalofrecords = $db->num_rows($result);
+}
+
+
+$sql.= $db->plimit($limit + 1,$offset);
+$result=$db->query($sql);
+
+if ($result)
+{
+	$objectstatic=new AskPriceSupplier($db);
+	$userstatic=new User($db);
+	$num = $db->num_rows($result);
+
+ 	if ($socid)
+	{
+		$soc = new Societe($db);
+		 $soc->fetch($socid);
+	}
+
+	$param='&socid='.$socid.'&viewstatut='.$viewstatut;
+	if ($month)              $param.='&month='.$month;
+	if ($year)               $param.='&year='.$year;
+    if ($search_ref)         $param.='&search_ref=' .$search_ref;
+    if ($search_societe)     $param.='&search_societe=' .$search_societe;
+	if ($search_user > 0)    $param.='&search_user='.$search_user;
+	if ($search_sale > 0)    $param.='&search_sale='.$search_sale;
+	if ($search_montant_ht)  $param.='&search_montant_ht='.$search_montant_ht;
+	if ($search_author)  	 $param.='&search_author='.$search_author;
+	print_barre_liste($langs->trans('ListOfAskPriceSupplier').' '.($socid?'- '.$soc->name:''), $page, $_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num,$nbtotalofrecords);
+
+	// Lignes des champs de filtre
+	print '<form method="GET" action="'.$_SERVER["PHP_SELF"].'">';
+
+	$i = 0;
+	print '<table class="liste" width="100%">';
+
+	$moreforfilter='';
+
+ 	// If the user can view prospects other than his'
+ 	if ($user->rights->societe->client->voir || $socid)
+ 	{
+ 		$langs->load("commercial");
+	 	$moreforfilter.=$langs->trans('ThirdPartiesOfSaleRepresentative'). ': ';
+		$moreforfilter.=$formother->select_salesrepresentatives($search_sale,'search_sale',$user);
+	 	$moreforfilter.=' &nbsp; &nbsp; &nbsp; ';
+ 	}
+	// If the user can view prospects other than his'
+	if ($user->rights->societe->client->voir || $socid)
+	{
+	    $moreforfilter.=$langs->trans('LinkedToSpecificUsers'). ': ';
+	    $moreforfilter.=$form->select_dolusers($search_user,'search_user',1);
+	}
+	if (! empty($moreforfilter))
+	{
+	    print '<tr class="liste_titre">';
+	    print '<td class="liste_titre" colspan="10">';
+	    print $moreforfilter;
+	    print '</td></tr>';
+	}
+
+	print '<tr class="liste_titre">';
+	print_liste_field_titre($langs->trans('Ref'),$_SERVER["PHP_SELF"],'p.ref','',$param,'',$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans('Company'),$_SERVER["PHP_SELF"],'s.nom','',$param,'',$sortfield,$sortorder);	
+	print_liste_field_titre($langs->trans('AskPriceSupplierDate'),$_SERVER["PHP_SELF"],'p.date_livraison','',$param, 'align="center"',$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans('AmountHT'),$_SERVER["PHP_SELF"],'p.total_ht','',$param, 'align="right"',$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans('Author'),$_SERVER["PHP_SELF"],'u.login','',$param,'align="center"',$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans('Status'),$_SERVER["PHP_SELF"],'p.fk_statut','',$param,'align="right"',$sortfield,$sortorder);
+	print_liste_field_titre('');
+	print "</tr>\n";
+
+	print '<tr class="liste_titre">';
+	print '<td class="liste_titre">';
+	print '<input class="flat" size="6" type="text" name="search_ref" value="'.$search_ref.'">';
+	print '</td>';	
+	print '<td class="liste_titre" align="left">';
+	print '<input class="flat" type="text" size="12" name="search_societe" value="'.$search_societe.'">';
+	print '</td>';
+	
+	// Date
+	print '<td class="liste_titre" colspan="1" align="center">';
+	//print $langs->trans('Month').': ';
+	print '<input class="flat" type="text" size="1" maxlength="2" name="month" value="'.$month.'">';
+	//print '&nbsp;'.$langs->trans('Year').': ';
+	$syear = $year;
+	$formother->select_year($syear,'year',1, 20, 5);
+	print '</td>';
+		
+	// Amount
+	print '<td class="liste_titre" align="right">';
+	print '<input class="flat" type="text" size="10" name="search_montant_ht" value="'.$search_montant_ht.'">';
+	print '</td>';
+	// Author
+	print '<td class="liste_titre" align="center">';
+	print '<input class="flat" size="10" type="text" name="search_author" value="'.$search_author.'">';
+	print '</td>';
+	print '<td class="liste_titre" align="right">';
+	$formaskpricesupplier->selectAskPriceSupplierStatus($viewstatut,1);
+	print '</td>';
+
+	print '<td class="liste_titre" align="right">';
+	print '<input type="image" name="button_search" class="liste_titre" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
+	print '<input type="image" name="button_removefilter" class="liste_titre" src="'.img_picto($langs->trans("RemoveFilter"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
+	print '</td>';
+
+	print "</tr>\n";
+
+	$var=true;
+	$total=0;
+	$subtotal=0;
+
+	while ($i < min($num,$limit))
+	{
+		$objp = $db->fetch_object($result);
+		$now = dol_now();
+		$var=!$var;
+		print '<tr '.$bc[$var].'>';
+		print '<td class="nowrap">';
+
+		$objectstatic->id=$objp->askpricesupplierid;
+		$objectstatic->ref=$objp->ref;
+
+		print '<table class="nobordernopadding"><tr class="nocellnopadd">';
+		print '<td class="nobordernopadding nowrap">';
+		print $objectstatic->getNomUrl(1);
+		print '</td>';
+
+		print '<td style="min-width: 20px" class="nobordernopadding nowrap">';
+		if ($objp->fk_statut == 1 && $db->jdate($objp->dfv) < ($now - $conf->askpricesupplier->cloture->warning_delay)) print img_warning($langs->trans("Late"));
+		if (! empty($objp->note_private))
+		{
+			print ' <span class="note">';
+			print '<a href="'.DOL_URL_ROOT.'/comm/askpricesupplier/note.php?id='.$objp->askpricesupplierid.'">'.img_picto($langs->trans("ViewPrivateNote"),'object_generic').'</a>';
+			print '</span>';
+		}
+		print '</td>';
+
+		// Ref
+		print '<td width="16" align="right" class="nobordernopadding hideonsmartphone">';
+		$filename=dol_sanitizeFileName($objp->ref);
+		$filedir=$conf->askpricesupplier->dir_output . '/' . dol_sanitizeFileName($objp->ref);
+		$urlsource=$_SERVER['PHP_SELF'].'?id='.$objp->askpricesupplierid;
+		print $formfile->getDocumentsLink($objectstatic->element, $filename, $filedir);
+		print '</td></tr></table>';
+
+		print "</td>\n";
+		
+		$url = DOL_URL_ROOT.'/comm/card.php?socid='.$objp->rowid;
+
+		// Company
+		$companystatic->id=$objp->rowid;
+		$companystatic->name=$objp->name;
+		$companystatic->client=$objp->client;
+		$companystatic->code_client=$objp->code_client;
+		print '<td>';
+		print $companystatic->getNomUrl(1,'customer');
+		print '</td>';
+		
+		// Date askprice
+		print '<td align="center">';
+		print dol_print_date($db->jdate($objp->dp), 'day');
+		print "</td>\n";
+		
+		print '<td align="right">'.price($objp->total_ht)."</td>\n";
+
+		$userstatic->id=$objp->fk_user_author;
+		$userstatic->login=$objp->login;
+		print '<td align="center">';
+		if ($userstatic->id) print $userstatic->getLoginUrl(1);
+		else print '&nbsp;';
+		print "</td>\n";
+
+		print '<td align="right">'.$objectstatic->LibStatut($objp->fk_statut,5)."</td>\n";
+
+		print '<td>&nbsp;</td>';
+
+		print "</tr>\n";
+
+		$total += $objp->total_ht;
+		$subtotal += $objp->total_ht;
+
+		$i++;
+	}
+
+	if ($total>0)
+	{
+		if($num<$limit){
+			$var=!$var;
+			print '<tr class="liste_total"><td align="left">'.$langs->trans("TotalHT").'</td>';
+			print '<td colspan="3" align="right">'.price($total).'</td><td colspan="3"></td>';
+			print '</tr>';
+		}
+		else
+		{
+			$var=!$var;
+			print '<tr class="liste_total"><td align="left">'.$langs->trans("TotalHTforthispage").'</td>';
+			print '<td colspan="3" align="right">'.price($total).'</td><td colspan="3"></td>';
+			print '</tr>';
+		}
+
+	}
+
+	print '</table>';
+
+	print '</form>';
+
+	$db->free($result);
+}
+else
+{
+	dol_print_error($db);
+}
+
+// End of page
+llxFooter();
+$db->close();

htdocs/comm/askpricesupplier/note.php

@@ -0,0 +1,113 @@
+<?php
+/* Copyright (C) 2004      Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004      Eric Seigne          <eric.seigne@ryxeo.com>
+ * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
+ * Copyright (C) 2013      Florian Henry		  	<florian.henry@open-concept.pro>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *	\file       htdocs/comm/propal/note.php
+ *	\ingroup    propal
+ *	\brief      Fiche d'information sur une proposition commerciale
+ */
+
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/comm/askpricesupplier/class/askpricesupplier.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/askpricesupplier.lib.php';
+
+$langs->load('askpricesupplier');
+$langs->load('compta');
+$langs->load('bills');
+
+$id = GETPOST('id','int');
+$ref=GETPOST('ref','alpha');
+$action=GETPOST('action','alpha');
+
+// Security check
+if ($user->societe_id) $socid=$user->societe_id;
+$result = restrictedArea($user, 'askpricesupplier', $id, 'askpricesupplier');
+
+$object = new AskPriceSupplier($db);
+
+
+
+/******************************************************************************/
+/*                     Actions                                                */
+/******************************************************************************/
+
+$permissionnote=$user->rights->askpricesupplier->creer;	// Used by the include of actions_setnotes.inc.php
+
+include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php';	// Must be include, not includ_once
+
+
+
+/******************************************************************************/
+/* Affichage fiche                                                            */
+/******************************************************************************/
+
+llxHeader('',$langs->trans('CommRequest'),'EN:Ask_Price_Supplier|FR:Demande_de_prix_fournisseur');
+
+$form = new Form($db);
+
+if ($id > 0 || ! empty($ref))
+{
+	if ($mesg) print $mesg;
+
+	$now=dol_now();
+
+	if ($object->fetch($id, $ref))
+	{
+		$societe = new Societe($db);
+		if ( $societe->fetch($object->socid) )
+		{
+			$head = askpricesupplier_prepare_head($object);
+			dol_fiche_head($head, 'note', $langs->trans('CommRequest'), 0, 'askpricesupplier');
+
+			print '<table class="border" width="100%">';
+
+			$linkback = '<a href="'.DOL_URL_ROOT.'/comm/askpricesupplier/list.php'.(! empty($socid)?'?socid='.$socid:'').'">'.$langs->trans('BackToList').'</a>';
+
+			// Ref
+			print '<tr><td width="25%">'.$langs->trans('Ref').'</td><td colspan="3">';
+			print $form->showrefnav($object,'ref',$linkback,1,'ref','ref','');
+			print '</td></tr>';
+			
+			// Customer
+			if ( is_null($object->client) )
+				$object->fetch_thirdparty();
+			print "<tr><td>".$langs->trans("Supplier")."</td>";
+			print '<td colspan="3">'.$object->client->getNomUrl(1).'</td></tr>';
+			
+			print '<tr><td>'.$langs->trans('AskPriceSupplierDate').'</td><td colspan="3">';
+			print dol_print_date($object->date_livraison,'daytext');
+			print '</td>';
+			print '</tr>';
+			
+			print "</table>";
+
+			print '<br>';
+
+			include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php';
+
+			dol_fiche_end();
+		}
+	}
+}
+
+
+llxFooter();
+$db->close();

htdocs/comm/askpricesupplier/tpl/linkedobjectblock.tpl.php

@@ -0,0 +1,74 @@
+<?php
+/* Copyright (C) 2010-2011  Regis Houssin <regis.houssin@capnetworks.com>
+ * Copyright (C) 2013       Juanjo Menent <jmenent@2byte.es>
+ * Copyright (C) 2014       Marcos García <marcosgdf@gmail.com>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+?>
+
+<!-- BEGIN PHP TEMPLATE -->
+
+<?php
+
+global $user;
+
+$langs = $GLOBALS['langs'];
+$linkedObjectBlock = $GLOBALS['linkedObjectBlock'];
+
+echo '<br>';
+print_titre($langs->trans('RelatedAskPriceSupplier'));
+?>
+<table class="noborder allwidth">
+<tr class="liste_titre">
+	<td><?php echo $langs->trans("Ref"); ?></td>
+	<td></td>
+	<td align="center"><?php echo $langs->trans("Date"); ?></td>
+	<td align="right"><?php echo $langs->trans("AmountHTShort"); ?></td>
+	<td align="right"><?php echo $langs->trans("Status"); ?></td>
+</tr>
+<?php
+$var=true;
+$total=0;
+foreach($linkedObjectBlock as $object)
+{
+	$var=!$var;
+?>
+<tr <?php echo $bc[$var]; ?> ><td>
+	<a href="<?php echo DOL_URL_ROOT.'/comm/askpricesupplier/card.php?id='.$object->id ?>"><?php echo img_object($langs->trans("ShowAskPriceSupplier"),"askpricesupplier").' '.$object->ref; ?></a></td>
+	<td></td>
+	<td align="center"><?php echo dol_print_date($object->datec,'day'); ?></td>
+	<td align="right"><?php
+		if ($user->rights->askpricesupplier->lire) {
+			$total = $total + $object->total_ht;
+			echo price($object->total_ht);
+		} ?></td>
+	<td align="right"><?php echo $object->getLibStatut(3); ?></td>
+</tr>
+<?php
+}
+
+?>
+<tr class="liste_total">
+	<td align="left" colspan="3"><?php echo $langs->trans('TotalHT'); ?></td>
+	<td align="right"><?php
+		if ($user->rights->askpricesupplier->lire) {
+			echo price($total);
+		} ?></td>
+	<td>&nbsp;</td>
+</tr>
+</table>
+
+<!-- END PHP TEMPLATE -->

htdocs/comm/card.php

@@ -143,10 +143,10 @@ if (empty($reshook))
 	}
 
 	// update outstandng limit
-	if ($action == 'setOutstandingBill')
+	if ($action == 'setoutstanding_limit')
 	{
 		$object->fetch($id);
-		$object->outstanding_limit=GETPOST('OutstandingBill');
+		$object->outstanding_limit=GETPOST('setoutstanding_limit');
 		$result=$object->set_OutstandingBill($user);
 		if ($result < 0) setEventMessage($object->error,'errors');
 	}
@@ -393,13 +393,14 @@ if ($id > 0)
 	{
 		print '<tr>';
 		print '<td>';
-		print $form->editfieldkey("OutstandingBill",'OutstandingBill',$object->outstanding_limit,$object,$user->rights->societe->creer);
+		print $form->editfieldkey("OutstandingBill",'outstanding_limit',$object->outstanding_limit,$object,$user->rights->societe->creer);
 		print '</td><td colspan="3">';
-		print $form->editfieldval("OutstandingBill",'OutstandingBill',$object->outstanding_limit,$object,$user->rights->societe->creer,'amount',($object->outstanding_limit != '' ? price($object->outstanding_limit) : ''));
+		$limit_field_type = (! empty($conf->global->MAIN_USE_JQUERY_JEDITABLE)) ? 'numeric' : 'amount';
+		print $form->editfieldval("OutstandingBill",'outstanding_limit',$object->outstanding_limit,$object,$user->rights->societe->creer,$limit_field_type,($object->outstanding_limit != '' ? price($object->outstanding_limit) : ''));
 		// display amount and link to unpaid bill
 		$outstandigBills = $object->get_OutstandingBill();
 		if ($outstandigBills != 0)
-			print " / <a href='".DOL_URL_ROOT."/compta/facture/list.php?socid=".$object->id."&search_status=1'>".price($outstandigBills).'</a>';
+			print " (".$langs->trans("CurrentOutstandingBill")." <a href='".DOL_URL_ROOT."/compta/facture/list.php?socid=".$object->id."&search_status=1'>".price($outstandigBills, '', $langs, 0, 0, -1, $conf->currency).'</a>)';
 		print '</td>';
 		print '</tr>';
 	}

htdocs/comm/index.php

@@ -103,6 +103,21 @@ if (! empty($conf->commande->enabled) && $user->rights->commande->lire)
 	print "</table></form><br>\n";
 }
 
+// Search supplier order
+if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->commande->lire)
+{
+	$var=false;
+	print '<form method="post" action="'.DOL_URL_ROOT.'/fourn/commande/list.php">';
+	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+	print '<table class="noborder nohover" width="100%">';
+	print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("SearchASupplierOrder").'</td></tr>';
+	print '<tr '.$bc[$var].'><td>';
+	print '<label for="search_ref">'.$langs->trans("Ref").'</label>:</td><td><input type="text" class="flat" name="search_ref" id="search_ref" size=18></td><td rowspan="2"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
+	print '<tr '.$bc[$var].'><td class="nowrap"><label for="search_all">'.$langs->trans("Other").'</label>:</td><td><input type="text" class="flat" name="search_all" id="search_all" size="18"></td>';
+	print '</tr>';
+	print "</table></form><br>\n";
+}
+
 // Search contract
 if (! empty($conf->contrat->enabled) && $user->rights->contrat->lire)
 {

htdocs/comm/mailing/class/mailing.class.php

@@ -57,7 +57,7 @@ class Mailing extends CommonObject
 
 	var $date_creat;
 	var $date_valid;
-	
+
 	var $extraparams=array();
 
 	public $statut_dest=array();
@@ -78,12 +78,12 @@ class Mailing extends CommonObject
 		$this->statuts[1] = 'MailingStatusValidated';
 		$this->statuts[2] = 'MailingStatusSentPartialy';
 		$this->statuts[3] = 'MailingStatusSentCompletely';
-		
+
 		$this->statut_dest[-1] = 'MailingStatusError';
 		$this->statut_dest[1] = 'MailingStatusSent';
 		$this->statut_dest[2] = 'MailingStatusRead';
 		$this->statut_dest[3] = 'MailingStatusNotContact';
-				
+
 	}
 
 	/**
@@ -186,7 +186,7 @@ class Mailing extends CommonObject
 	function fetch($rowid)
 	{
 		global $conf;
-		
+
 		$sql = "SELECT m.rowid, m.titre, m.sujet, m.body, m.bgcolor, m.bgimage";
 		$sql.= ", m.email_from, m.email_replyto, m.email_errorsto";
 		$sql.= ", m.statut, m.nbemail";
@@ -211,14 +211,14 @@ class Mailing extends CommonObject
 				$this->statut			= $obj->statut;
 				$this->nbemail			= $obj->nbemail;
 				$this->titre			= $obj->titre;
-				
+
-				$this->sujet			= $obj->sujet;				
+				$this->sujet			= $obj->sujet;
 				if (!empty($conf->global->FCKEDITOR_ENABLE_MAILING) && dol_textishtml(dol_html_entity_decode($obj->body, ENT_COMPAT | ENT_HTML401))) {
 					$this->body				= dol_html_entity_decode($obj->body, ENT_COMPAT | ENT_HTML401);
 				}else {
 					$this->body				= $obj->body;
 				}
-				
+
 				$this->bgcolor			= $obj->bgcolor;
 				$this->bgimage			= $obj->bgimage;
 
@@ -232,7 +232,7 @@ class Mailing extends CommonObject
 				$this->date_creat		= $this->db->jdate($obj->date_creat);
 				$this->date_valid		= $this->db->jdate($obj->date_valid);
 				$this->date_envoi		= $this->db->jdate($obj->date_envoi);
-				
+
 				$this->extraparams		= (array) json_decode($obj->extraparams, true);
 
 				return 1;
@@ -267,6 +267,8 @@ class Mailing extends CommonObject
 
 		$object=new Mailing($this->db);
 
+		$object->context['createfromclone']='createfromclone';
+
 		$this->db->begin();
 
 		// Load source object
@@ -313,13 +315,13 @@ class Mailing extends CommonObject
 		{
 			//Clone target
 			if (!empty($option2)) {
-				
+
 				require_once DOL_DOCUMENT_ROOT .'/core/modules/mailings/modules_mailings.php';
-				
+
 				$mailing_target = new MailingTargets($this->db);
-				
+
 				$target_array=array();
-				
+
 				$sql = "SELECT fk_contact, ";
 				$sql.=" lastname,   ";
 				$sql.=" firstname,";
@@ -330,7 +332,7 @@ class Mailing extends CommonObject
 				$sql.=" source_type ";
 				$sql.= " FROM ".MAIN_DB_PREFIX."mailing_cibles ";
 				$sql.= " WHERE fk_mailing = ".$fromid;
-				
+
 				dol_syslog(get_class($this)."::createFromClone", LOG_DEBUG);
 				$result=$this->db->query($sql);
 				if ($result)
@@ -338,17 +340,17 @@ class Mailing extends CommonObject
 					if ($this->db->num_rows($result))
 					{
 						while ($obj = $this->db->fetch_object($result)) {
-						
+
 							$target_array[]=array('fk_contact'=>$obj->fk_contact,
 							'lastname'=>$obj->lastname,
 							'firstname'=>$obj->firstname,
-							'email'=>$obj->email, 
+							'email'=>$obj->email,
 							'other'=>$obj->other,
 							'source_url'=>$obj->source_url,
 							'source_id'=>$obj->source_id,
 							'source_type'=>$obj->source_type);
 						}
-						
+
 					}
 				}
 				else
@@ -356,12 +358,14 @@ class Mailing extends CommonObject
 					$this->error=$this->db->lasterror();
 					return -1;
 				}
-				
+
 				$mailing_target->add_to_target($object->id, $target_array);
 			}
 
 		}
 
+		unset($object->context['createfromclone']);
+
 		// End
 		if (! $error)
 		{
@@ -514,7 +518,7 @@ class Mailing extends CommonObject
 		}
 	}
 
-	
+
 	/**
 	 *  Renvoi le libelle d'un statut donne
 	 *
@@ -526,7 +530,7 @@ class Mailing extends CommonObject
 	{
 		global $langs;
 		$langs->load('mails');
-	
+
 		if ($mode == 0)
 		{
 			return $langs->trans($this->statut_dest[$statut]);
@@ -563,10 +567,10 @@ class Mailing extends CommonObject
 			if ($statut==2) return $langs->trans("MailingStatusRead").' '.img_picto($langs->trans("MailingStatusRead"),'statut6');
 			if ($statut==3) return $langs->trans("MailingStatusNotContact").' '.img_picto($langs->trans("MailingStatusNotContact"),'statut8');
 		}
-		
+
-		
+
-		
+
-		
+
 	}
 
 }

htdocs/comm/propal.php

@@ -53,6 +53,7 @@ $langs->load('orders');
 $langs->load('products');
 $langs->load("deliveries");
 $langs->load('sendings');
+if (!empty($conf->incoterm->enabled)) $langs->load('incoterm');
 if (! empty($conf->margin->enabled))
 	$langs->load('margins');
 
@@ -241,6 +242,12 @@ if (empty($reshook))
 		$object->set_ref_client($user, $_POST['ref_client']);
 	}
 
+	// Set incoterm
+	elseif ($action == 'set_incoterms' && !empty($conf->incoterm->enabled))
+    {
+    	$result = $object->setIncoterms(GETPOST('incoterm_id', 'int'), GETPOST('location_incoterms', 'alpha'));
+    }
+
 	// Create proposal
 	else if ($action == 'add' && $user->rights->propal->creer)
 	{
@@ -296,6 +303,8 @@ if (empty($reshook))
 					$object->author = $user->id; // deprecated
 					$object->note = GETPOST('note');
 					$object->statut = 0;
+					$object->fk_incoterms = GETPOST('incoterm_id', 'int');
+					$object->location_incoterms = GETPOST('location_incoterms', 'alpha');
 
 					$id = $object->create_from($user);
 				} else {
@@ -319,6 +328,8 @@ if (empty($reshook))
 				$object->modelpdf = GETPOST('model');
 				$object->author = $user->id; // deprecated
 				$object->note = GETPOST('note');
+				$object->fk_incoterms = GETPOST('incoterm_id', 'int');
+				$object->location_incoterms = GETPOST('location_incoterms', 'alpha');
 
 				$object->origin = GETPOST('origin');
 				$object->origin_id = GETPOST('originid');
@@ -435,12 +446,12 @@ if (empty($reshook))
 										// Extrafields
 										if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && method_exists($lines[$i], 'fetch_optionals')) {
 											$lines[$i]->fetch_optionals($lines[$i]->rowid);
-											$array_option = $lines[$i]->array_options;
+											$array_options = $lines[$i]->array_options;
 										}
 
 										$tva_tx=get_default_tva($mysoc, $object->thirdparty);
 
-										$result = $object->addline($desc, $lines[$i]->subprice, $lines[$i]->qty, $tva_tx, $lines[$i]->localtax1_tx, $lines[$i]->localtax2_tx, $lines[$i]->fk_product, $lines[$i]->remise_percent, 'HT', 0, $lines[$i]->info_bits, $product_type, $lines[$i]->rang, $lines[$i]->special_code, $fk_parent_line, $lines[$i]->fk_fournprice, $lines[$i]->pa_ht, $label, $date_start, $date_end, $array_option);
+										$result = $object->addline($desc, $lines[$i]->subprice, $lines[$i]->qty, $tva_tx, $lines[$i]->localtax1_tx, $lines[$i]->localtax2_tx, $lines[$i]->fk_product, $lines[$i]->remise_percent, 'HT', 0, $lines[$i]->info_bits, $product_type, $lines[$i]->rang, $lines[$i]->special_code, $fk_parent_line, $lines[$i]->fk_fournprice, $lines[$i]->pa_ht, $label, $date_start, $date_end, $array_options);
 
 										if ($result > 0) {
 											$lineid = $result;
@@ -652,7 +663,7 @@ if (empty($reshook))
 		// Extrafields
 		$extrafieldsline = new ExtraFields($db);
 		$extralabelsline = $extrafieldsline->fetch_name_optionals_label($object->table_element_line);
-		$array_option = $extrafieldsline->getOptionalsFromPost($extralabelsline, $predef);
+		$array_options = $extrafieldsline->getOptionalsFromPost($extralabelsline, $predef);
 		// Unset extrafield
 		if (is_array($extralabelsline)) {
 			// Get extra fields
@@ -812,7 +823,7 @@ if (empty($reshook))
 				setEventMessage($mesg, 'errors');
 			} else {
 				// Insert line
-				$result = $object->addline($desc, $pu_ht, $qty, $tva_tx, $localtax1_tx, $localtax2_tx, $idprod, $remise_percent, $price_base_type, $pu_ttc, $info_bits, $type, - 1, 0, GETPOST('fk_parent_line'), $fournprice, $buyingprice, $label, $date_start, $date_end, $array_option);
+				$result = $object->addline($desc, $pu_ht, $qty, $tva_tx, $localtax1_tx, $localtax2_tx, $idprod, $remise_percent, $price_base_type, $pu_ttc, $info_bits, $type, - 1, 0, GETPOST('fk_parent_line'), $fournprice, $buyingprice, $label, $date_start, $date_end, $array_options);
 
 				if ($result > 0) {
 					$db->commit();
@@ -895,7 +906,7 @@ if (empty($reshook))
 		// Extrafields
 		$extrafieldsline = new ExtraFields($db);
 		$extralabelsline = $extrafieldsline->fetch_name_optionals_label($object->table_element_line);
-		$array_option = $extrafieldsline->getOptionalsFromPost($extralabelsline);
+		$array_options = $extrafieldsline->getOptionalsFromPost($extralabelsline);
 		// Unset extrafield
 		if (is_array($extralabelsline)) {
 			// Get extra fields
@@ -940,7 +951,7 @@ if (empty($reshook))
 		if (! $error) {
 			$db->begin();
 
-			$result = $object->updateline(GETPOST('lineid'), $pu_ht, GETPOST('qty'), GETPOST('remise_percent'), $vat_rate, $localtax1_rate, $localtax2_rate, $description, 'HT', $info_bits, $special_code, GETPOST('fk_parent_line'), 0, $fournprice, $buyingprice, $label, $type, $date_start, $date_end, $array_option);
+			$result = $object->updateline(GETPOST('lineid'), $pu_ht, GETPOST('qty'), GETPOST('remise_percent'), $vat_rate, $localtax1_rate, $localtax2_rate, $description, 'HT', $info_bits, $special_code, GETPOST('fk_parent_line'), 0, $fournprice, $buyingprice, $label, $type, $date_start, $date_end, $array_options);
 
 			if ($result >= 0) {
 				$db->commit();
@@ -987,6 +998,11 @@ if (empty($reshook))
 		if (GETPOST('model')) {
 			$object->setDocModel($user, GETPOST('model'));
 		}
+	    if (GETPOST('fk_bank')) { // this field may come from an external module
+            $object->fk_bank = GETPOST('fk_bank');
+        } else {
+            $object->fk_bank = $object->fk_account;
+        }
 
 		// Define output language
 		$outputlangs = $langs;
@@ -1110,10 +1126,10 @@ if (empty($reshook))
 		// Fill array 'array_options' with data from update form
 		$extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
 		$ret = $extrafields->setOptionalsFromPost($extralabels, $object, GETPOST('attribute'));
-		if ($ret < 0)
+		if ($ret < 0) $error++;
-			$error ++;
 
-		if (! $error) {
+		if (! $error)
+		{
 			// Actions on extra fields (by external module or standard code)
 			// FIXME le hook fait double emploi avec le trigger !!
 			$hookmanager->initHooks(array('propaldao'));
@@ -1388,6 +1404,16 @@ if ($action == 'create')
 	print $form->selectarray('model', $liste, ($conf->global->PROPALE_ADDON_PDF_ODT_DEFAULT ? $conf->global->PROPALE_ADDON_PDF_ODT_DEFAULT : $conf->global->PROPALE_ADDON_PDF));
 	print "</td></tr>";
 
+	// Incoterms
+	if (!empty($conf->incoterm->enabled))
+	{
+		print '<tr>';
+		print '<td><label for="incoterm_id">'.$form->textwithpicto($langs->trans("IncotermLabel"), $soc->libelle_incoterms, 1).'</label></td>';
+        print '<td colspan="3" class="maxwidthonsmartphone">';
+        print $form->select_incoterms((!empty($soc->fk_incoterms) ? $soc->fk_incoterms : ''), (!empty($soc->location_incoterms)?$soc->location_incoterms:''));
+		print '</td></tr>';
+	}
+
 	// Project
 	if (! empty($conf->projet->enabled) && $socid > 0)
 	{
@@ -1948,6 +1974,29 @@ if ($action == 'create')
 	    print '</tr>';
 	}
 
+	// Incoterms
+	if (!empty($conf->incoterm->enabled))
+	{
+		print '<tr><td>';
+        print '<table width="100%" class="nobordernopadding"><tr><td>';
+        print $langs->trans('IncotermLabel');
+        print '<td><td align="right">';
+        if ($user->rights->propal->creer) print '<a href="'.DOL_URL_ROOT.'/comm/propal.php?id='.$object->id.'&action=editincoterm">'.img_edit().'</a>';
+        else print '&nbsp;';
+        print '</td></tr></table>';
+        print '</td>';
+        print '<td colspan="3">';
+		if ($action != 'editincoterm')
+		{
+			print $form->textwithpicto($object->display_incoterms(), $object->libelle_incoterms, 1);
+		}
+		else
+		{
+			print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms)?$object->location_incoterms:''), $_SERVER['PHP_SELF'].'?id='.$object->id);
+		}
+        print '</td></tr>';
+	}
+
 	// Other attributes
 	$cols = 3;
 	include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';

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

@@ -117,6 +117,11 @@ class Propal extends CommonObject
     var $labelstatut_short=array();
 
     var $specimen;
+	
+	//Incorterms
+	var $fk_incoterms;
+	var $location_incoterms;
+	var $libelle_incoterms;  //Used into tooltip
 
 
     /**
@@ -235,27 +240,30 @@ class Propal extends CommonObject
                 return -5;
             }
 
-            $propalligne=new PropaleLigne($this->db);
+            $line=new PropaleLigne($this->db);
-            $propalligne->fk_propal=$this->id;
+
-            $propalligne->fk_remise_except=$remise->id;
+            $this->line->context = $this->context;
-            $propalligne->desc=$remise->description;   	// Description ligne
+
-            $propalligne->tva_tx=$remise->tva_tx;
+            $line->fk_propal=$this->id;
-            $propalligne->subprice=-$remise->amount_ht;
+            $line->fk_remise_except=$remise->id;
-            $propalligne->fk_product=0;					// Id produit predefini
+            $line->desc=$remise->description;   	// Description ligne
-            $propalligne->qty=1;
+            $line->tva_tx=$remise->tva_tx;
-            $propalligne->remise=0;
+            $line->subprice=-$remise->amount_ht;
-            $propalligne->remise_percent=0;
+            $line->fk_product=0;					// Id produit predefini
-            $propalligne->rang=-1;
+            $line->qty=1;
-            $propalligne->info_bits=2;
+            $line->remise=0;
+            $line->remise_percent=0;
+            $line->rang=-1;
+            $line->info_bits=2;
 
             // TODO deprecated
-            $propalligne->price=-$remise->amount_ht;
+            $line->price=-$remise->amount_ht;
 
-            $propalligne->total_ht  = -$remise->amount_ht;
+            $line->total_ht  = -$remise->amount_ht;
-            $propalligne->total_tva = -$remise->amount_tva;
+            $line->total_tva = -$remise->amount_tva;
-            $propalligne->total_ttc = -$remise->amount_ttc;
+            $line->total_ttc = -$remise->amount_ttc;
 
-            $result=$propalligne->insert();
+            $result=$line->insert();
             if ($result > 0)
             {
                 $result=$this->update_price(1);
@@ -272,7 +280,7 @@ class Propal extends CommonObject
             }
             else
             {
-                $this->error=$propalligne->error;
+                $this->error=$line->error;
                 $this->db->rollback();
                 return -2;
             }
@@ -311,12 +319,12 @@ class Propal extends CommonObject
      *      @param		string		$label				???
      *		@param      int			$date_start       	Start date of the line
      *		@param      int			$date_end         	End date of the line
-     *      @param		array		$array_option		extrafields array
+     *      @param		array		$array_options		extrafields array
      *    	@return    	int         	    			>0 if OK, <0 if KO
      *
      *    	@see       	add_product
      */
-	function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1=0.0, $txlocaltax2=0.0, $fk_product=0, $remise_percent=0.0, $price_base_type='HT', $pu_ttc=0.0, $info_bits=0, $type=0, $rang=-1, $special_code=0, $fk_parent_line=0, $fk_fournprice=0, $pa_ht=0, $label='',$date_start='', $date_end='',$array_option=0)
+	function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1=0.0, $txlocaltax2=0.0, $fk_product=0, $remise_percent=0.0, $price_base_type='HT', $pu_ttc=0.0, $info_bits=0, $type=0, $rang=-1, $special_code=0, $fk_parent_line=0, $fk_fournprice=0, $pa_ht=0, $label='',$date_start='', $date_end='',$array_options=0)
     {
     	global $mysoc;
 
@@ -389,6 +397,8 @@ class Propal extends CommonObject
             // Insert line
             $this->line=new PropaleLigne($this->db);
 
+            $this->line->context = $this->context;
+
             $this->line->fk_propal=$this->id;
             $this->line->label=$label;
             $this->line->desc=$desc;
@@ -435,8 +445,8 @@ class Propal extends CommonObject
             $this->line->price=$price;
             $this->line->remise=$remise;
 
-            if (is_array($array_option) && count($array_option)>0) {
+            if (is_array($array_options) && count($array_options)>0) {
-            	$this->line->array_options=$array_option;
+            	$this->line->array_options=$array_options;
             }
 
             $result=$this->line->insert();
@@ -491,10 +501,10 @@ class Propal extends CommonObject
      *  @param		int			$type				0/1=Product/service
      *	@param      int			$date_start       	Start date of the line
      *	@param      int			$date_end         	End date of the line
-	 *  @param		array		$array_option		extrafields array
+	 *  @param		array		$array_options		extrafields array
      *  @return     int     		        		0 if OK, <0 if KO
      */
-	function updateline($rowid, $pu, $qty, $remise_percent, $txtva, $txlocaltax1=0.0, $txlocaltax2=0.0, $desc='', $price_base_type='HT', $info_bits=0, $special_code=0, $fk_parent_line=0, $skip_update_total=0, $fk_fournprice=0, $pa_ht=0, $label='', $type=0, $date_start='', $date_end='', $array_option=0)
+	function updateline($rowid, $pu, $qty, $remise_percent, $txtva, $txlocaltax1=0.0, $txlocaltax2=0.0, $desc='', $price_base_type='HT', $info_bits=0, $special_code=0, $fk_parent_line=0, $skip_update_total=0, $fk_fournprice=0, $pa_ht=0, $label='', $type=0, $date_start='', $date_end='', $array_options=0)
     {
         global $mysoc;
 
@@ -541,6 +551,8 @@ class Propal extends CommonObject
             // Update line
             $this->line=new PropaleLigne($this->db);
 
+            $this->line->context = $this->context;
+
             // Stock previous line records
             $staticline=new PropaleLigne($this->db);
             $staticline->fetch($rowid);
@@ -594,8 +606,8 @@ class Propal extends CommonObject
             $this->line->price=$price;
             $this->line->remise=$remise;
 
-            if (is_array($array_option) && count($array_option)>0) {
+            if (is_array($array_options) && count($array_options)>0) {
-            	$this->line->array_options=$array_option;
+            	$this->line->array_options=$array_options;
             }
 
             $result=$this->line->update();
@@ -741,6 +753,8 @@ class Propal extends CommonObject
         $sql.= ", fk_availability";
         $sql.= ", fk_input_reason";
         $sql.= ", fk_projet";
+        $sql.= ", fk_incoterms";
+        $sql.= ", location_incoterms";
         $sql.= ", entity";
         $sql.= ") ";
         $sql.= " VALUES (";
@@ -768,6 +782,8 @@ class Propal extends CommonObject
         $sql.= ", ".$this->availability_id;
         $sql.= ", ".$this->demand_reason_id;
         $sql.= ", ".($this->fk_project?$this->fk_project:"null");
+        $sql.= ", ".(int) $this->fk_incoterms;
+        $sql.= ", '".$this->db->escape($this->location_incoterms)."'";
         $sql.= ", ".$conf->entity;
         $sql.= ")";
 
@@ -949,6 +965,8 @@ class Propal extends CommonObject
     {
         global $user,$langs,$conf,$hookmanager;
 
+        $this->context['createfromclone']='createfromclone';
+
         $error=0;
         $now=dol_now();
 
@@ -1042,6 +1060,8 @@ class Propal extends CommonObject
             // End call triggers
         }
 
+        unset($this->context['createfromclone']);
+
         // End
         if (! $error)
         {
@@ -1084,6 +1104,8 @@ class Propal extends CommonObject
         $sql.= ", p.fk_mode_reglement";
         $sql.= ', p.fk_account';
         $sql.= ", p.fk_shipping_method";
+        $sql.= ", p.fk_incoterms, p.location_incoterms";
+        $sql.= ", i.libelle as libelle_incoterms";
         $sql.= ", c.label as statut_label";
         $sql.= ", ca.code as availability_code, ca.label as availability";
         $sql.= ", dr.code as demand_reason_code, dr.label as demand_reason";
@@ -1094,6 +1116,7 @@ class Propal extends CommonObject
         $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_payment_term as cr ON p.fk_cond_reglement = cr.rowid';
         $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_availability as ca ON p.fk_availability = ca.rowid';
         $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_input_reason as dr ON p.fk_input_reason = dr.rowid';
+		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_incoterms as i ON p.fk_incoterms = i.rowid';
         $sql.= " WHERE p.fk_statut = c.id";
         $sql.= " AND p.entity = ".$conf->entity;
         if ($ref) $sql.= " AND p.ref='".$ref."'";
@@ -1161,6 +1184,11 @@ class Propal extends CommonObject
                 $this->user_valid_id  = $obj->fk_user_valid;
                 $this->user_close_id  = $obj->fk_user_cloture;
 
+				//Incoterms
+				$this->fk_incoterms = $obj->fk_incoterms;
+				$this->location_incoterms = $obj->location_incoterms;									
+				$this->libelle_incoterms = $obj->libelle_incoterms;
+				
                 if ($obj->fk_statut == 0)
                 {
                     $this->brouillon = 1;
@@ -1192,6 +1220,11 @@ class Propal extends CommonObject
                 $result = $this->db->query($sql);
                 if ($result)
                 {
+                	require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+                	$extrafieldsline=new ExtraFields($this->db);
+                	$line = new PropaleLigne($this->db);
+                	$extralabelsline=$extrafieldsline->fetch_name_optionals_label($line->table_element,true);
+                	
                     $num = $this->db->num_rows($result);
                     $i = 0;
 
@@ -1201,7 +1234,8 @@ class Propal extends CommonObject
 
                         $line                   = new PropaleLigne($this->db);
 
-                        $line->rowid			= $objp->rowid;
+                        $line->rowid			= $objp->rowid; //Deprecated
+                        $line->id				= $objp->rowid;
                         $line->fk_propal		= $objp->fk_propal;
                         $line->fk_parent_line	= $objp->fk_parent_line;
                         $line->product_type     = $objp->product_type;
@@ -1242,6 +1276,8 @@ class Propal extends CommonObject
                         $line->date_start  		= $objp->date_start;
                         $line->date_end  		= $objp->date_end;
 
+                        $line->fetch_optionals($line->id,$extralabelsline);
+                        
                         $this->lines[$i]        = $line;
                         //dol_syslog("1 ".$line->fk_product);
                         //print "xx $i ".$this->lines[$i]->fk_product;
@@ -1255,12 +1291,6 @@ class Propal extends CommonObject
                     return -1;
                 }
 
-                // Retreive all extrafield for propal
-                // fetch optionals attributes and labels
-                require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
-                $extrafields=new ExtraFields($this->db);
-                $extralabels=$extrafields->fetch_name_optionals_label($this->table_element,true);
-                $this->fetch_optionals($this->id,$extralabels);
 
                 return 1;
             }
@@ -3112,6 +3142,7 @@ class PropaleLigne  extends CommonObject
         if (empty($this->special_code)) $this->special_code=0;
         if (empty($this->fk_parent_line)) $this->fk_parent_line=0;
         if (empty($this->fk_fournprice)) $this->fk_fournprice=0;
+        if (empty($this->subprice)) $this->subprice=0;
 
 		if (empty($this->pa_ht)) $this->pa_ht=0;
 

htdocs/comm/propal/list.php

@@ -182,9 +182,9 @@ if ($search_author)
 {
 	$sql.= " AND u.login LIKE '%".$db->escape(trim($search_author))."%'";
 }
-if ($search_montant_ht)
+if ($search_montant_ht != '')
 {
-	$sql.= " AND p.total_ht='".$db->escape(price2num(trim($search_montant_ht)))."'";
+	$sql.= natural_search("p.total_ht", $search_montant_ht, 1);
 }
 if ($sall) {
     $sql .= natural_search(array('s.nom', 'p.note_private', 'p.note_public', 'pd.description'), $sall);
@@ -316,12 +316,12 @@ if ($result)
 	print '</td>';
 	print '<td class="liste_titre" colspan="1">&nbsp;</td>';
 	// Amount
-	print '<td class="liste_titre" align="center">';
+	print '<td class="liste_titre" align="right">';
-	print '<input class="flat" type="text" size="10" name="search_montant_ht" value="'.$search_montant_ht.'">';
+	print '<input class="flat" type="text" size="6" name="search_montant_ht" value="'.$search_montant_ht.'">';
 	print '</td>';
 	// Author
 	print '<td class="liste_titre" align="center">';
-	print '<input class="flat" size="10" type="text" name="search_author" value="'.$search_author.'">';
+	print '<input class="flat" size="6" type="text" name="search_author" value="'.$search_author.'">';
 	print '</td>';
 	print '<td class="liste_titre" align="right">';
 	$formpropal->selectProposalStatus($viewstatut,1);

htdocs/comm/prospect/list.php

@@ -197,7 +197,7 @@ $form=new Form($db);
 $sql = "SELECT s.rowid, s.nom as name, s.zip, s.town, s.datec, s.status as status, s.code_client, s.client,";
 $sql.= " st.libelle as stcomm, s.prefix_comm, s.fk_stcomm, s.fk_prospectlevel,";
 $sql.= " d.nom as departement";
-if ((!$user->rights->societe->client->voir && !$socid) || $search_sale) $sql .= ", sc.fk_soc, sc.fk_user"; // We need these fields in order to filter by sale (including the case where the user can only see his prospects)
+if ((!$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql .= ", sc.fk_soc, sc.fk_user"; // We need these fields in order to filter by sale (including the case where the user can only see his prospects)
 $sql .= " FROM ".MAIN_DB_PREFIX."c_stcomm as st";
 $sql.= ", ".MAIN_DB_PREFIX."societe as s";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_departements as d on (d.rowid = s.fk_departement)";

htdocs/commande/card.php

@@ -55,6 +55,7 @@ $langs->load('propal');
 $langs->load('deliveries');
 $langs->load('sendings');
 $langs->load('products');
+if (!empty($conf->incoterm->enabled)) $langs->load('incoterm');
 if (! empty($conf->margin->enabled))
 	$langs->load('margins');
 
@@ -84,15 +85,15 @@ $extrafields = new ExtraFields($db);
 $extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
 
 // Load object
-if ($id > 0 || ! empty($ref)) {
+include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php';  // Must be include, not includ_once
-	$ret = $object->fetch($id, $ref);
-	$ret = $object->fetch_thirdparty();
-}
 
 // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
 $hookmanager->initHooks(array('ordercard','globalcard'));
 
 $permissionnote = $user->rights->commande->creer; // Used by the include of actions_setnotes.inc.php
+$permissionedit = $user->rights->commande->creer; // Used by the include of actions_lineupdown.inc.php
+
+
 
 /*
  * Actions
@@ -104,7 +105,11 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
 
 if (empty($reshook))
 {
-	include DOL_DOCUMENT_ROOT . '/core/actions_setnotes.inc.php'; // Must be include, not includ_once
+	if ($cancel) $action='';
+
+	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; 	// Must be include, not include_once
+
+	include DOL_DOCUMENT_ROOT.'/core/actions_lineupdown.inc.php';	// Must be include, not include_once
 
 	// Action clone object
 	if ($action == 'confirm_clone' && $confirm == 'yes' && $user->rights->commande->creer)
@@ -215,13 +220,13 @@ if (empty($reshook))
 		if ($datecommande == '') {
 			setEventMessage($langs->trans('ErrorFieldRequired', $langs->transnoentities('Date')), 'errors');
 			$action = 'create';
-			$error ++;
+			$error++;
 		}
 
 		if ($socid < 1) {
 			setEventMessage($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Customer")), 'errors');
 			$action = 'create';
-			$error ++;
+			$error++;
 		}
 
 		if (! $error) {
@@ -246,7 +251,9 @@ if (empty($reshook))
 	        $object->shipping_method_id = GETPOST('shipping_method_id', 'int');
 			$object->fk_delivery_address = GETPOST('fk_address');
 			$object->contactid = GETPOST('contactid');
-
+			$object->fk_incoterms = GETPOST('incoterm_id', 'int');
+			$object->location_incoterms = GETPOST('location_incoterms', 'alpha');
+			
 			// If creation from another object of another module (Example: origin=propal, originid=1)
 			if (! empty($origin) && ! empty($originid))
 			{
@@ -281,8 +288,7 @@ if (empty($reshook))
 
 				// Fill array 'array_options' with data from add form
 				$ret = $extrafields->setOptionalsFromPost($extralabels, $object);
-				if ($ret < 0)
+				if ($ret < 0) $error++;
-					$error ++;
 
 				if (! $error)
 				{
@@ -338,13 +344,13 @@ if (empty($reshook))
 								                                                                                                      // trigger used
 								{
 									$lines[$i]->fetch_optionals($lines[$i]->rowid);
-									$array_option = $lines[$i]->array_options;
+									$array_options = $lines[$i]->array_options;
 								}
 
-								$result = $object->addline($desc, $lines[$i]->subprice, $lines[$i]->qty, $lines[$i]->tva_tx, $lines[$i]->localtax1_tx, $lines[$i]->localtax2_tx, $lines[$i]->fk_product, $lines[$i]->remise_percent, $lines[$i]->info_bits, $lines[$i]->fk_remise_except, 'HT', 0, $date_start, $date_end, $product_type, $lines[$i]->rang, $lines[$i]->special_code, $fk_parent_line, $lines[$i]->fk_fournprice, $lines[$i]->pa_ht, $label, $array_option);
+								$result = $object->addline($desc, $lines[$i]->subprice, $lines[$i]->qty, $lines[$i]->tva_tx, $lines[$i]->localtax1_tx, $lines[$i]->localtax2_tx, $lines[$i]->fk_product, $lines[$i]->remise_percent, $lines[$i]->info_bits, $lines[$i]->fk_remise_except, 'HT', 0, $date_start, $date_end, $product_type, $lines[$i]->rang, $lines[$i]->special_code, $fk_parent_line, $lines[$i]->fk_fournprice, $lines[$i]->pa_ht, $label, $array_options);
 
 								if ($result < 0) {
-									$error ++;
+									$error++;
 									break;
 								}
 
@@ -359,14 +365,14 @@ if (empty($reshook))
 							$reshook = $hookmanager->executeHooks('createFrom', $parameters, $object, $action); // Note that $action and $object may have been
 							                                                                               // modified by hook
 							if ($reshook < 0)
-								$error ++;
+								$error++;
 						} else {
 							setEventMessage($srcobject->error, 'errors');
-							$error ++;
+							$error++;
 						}
 					} else {
 						setEventMessage($object->error, 'errors');
-						$error ++;
+						$error++;
 					}
 				} else {
 					// Required extrafield left blank, error message already defined by setOptionalsFromPost()
@@ -375,10 +381,10 @@ if (empty($reshook))
 			} else {
 				// Fill array 'array_options' with data from add form
 				$ret = $extrafields->setOptionalsFromPost($extralabels, $object);
-				if ($ret < 0)
+				if ($ret < 0) $error++;
-					$error ++;
 
-				if (! $error) {
+				if (! $error)
+				{
 					$object_id = $object->create($user);
 
 					// If some invoice's lines already known
@@ -402,7 +408,7 @@ if (empty($reshook))
 					$result = $object->add_contact(GETPOST('contactid'), 'CUSTOMER', 'external');
 					if ($result < 0) {
 						setEventMessage($langs->trans("ErrorFailedToAddContact"), 'errors');
-						$error ++;
+						$error++;
 					}
 				}
 
@@ -512,6 +518,12 @@ if (empty($reshook))
 		}
 	}
 
+	// Set incoterm
+	elseif ($action == 'set_incoterms' && !empty($conf->incoterm->enabled))
+    {
+    	$result = $object->setIncoterms(GETPOST('incoterm_id', 'int'), GETPOST('location_incoterms', 'alpha'));
+    }
+	
 	// bank account
 	else if ($action == 'setbankaccount' && $user->rights->commande->creer) {
 	    $result=$object->setBankAccount(GETPOST('fk_account', 'int'));
@@ -556,7 +568,7 @@ if (empty($reshook))
 		// Extrafields
 		$extrafieldsline = new ExtraFields($db);
 		$extralabelsline = $extrafieldsline->fetch_name_optionals_label($object->table_element_line);
-		$array_option = $extrafieldsline->getOptionalsFromPost($extralabelsline, $predef);
+		$array_options = $extrafieldsline->getOptionalsFromPost($extralabelsline, $predef);
 		// Unset extrafield
 		if (is_array($extralabelsline)) {
 			// Get extra fields
@@ -567,24 +579,24 @@ if (empty($reshook))
 
 		if (empty($idprod) && ($price_ht < 0) && ($qty < 0)) {
 			setEventMessage($langs->trans('ErrorBothFieldCantBeNegative', $langs->transnoentitiesnoconv('UnitPriceHT'), $langs->transnoentitiesnoconv('Qty')), 'errors');
-			$error ++;
+			$error++;
 		}
 		if (GETPOST('prod_entry_mode') == 'free' && empty($idprod) && GETPOST('type') < 0) {
 			setEventMessage($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Type')), 'errors');
-			$error ++;
+			$error++;
 		}
 		if (GETPOST('prod_entry_mode') == 'free' && empty($idprod) && (! ($price_ht >= 0) || $price_ht == '')) 	// Unit price can be 0 but not ''
 		{
 			setEventMessage($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("UnitPriceHT")), 'errors');
-			$error ++;
+			$error++;
 		}
 		if ($qty == '') {
 			setEventMessage($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Qty')), 'errors');
-			$error ++;
+			$error++;
 		}
 		if (GETPOST('prod_entry_mode') == 'free' && empty($idprod) && empty($product_desc)) {
 			setEventMessage($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Description')), 'errors');
-			$error ++;
+			$error++;
 		}
 
 		if (! $error && ($qty >= 0) && (! empty($product_desc) || ! empty($idprod))) {
@@ -729,7 +741,7 @@ if (empty($reshook))
 				setEventMessage($mesg, 'errors');
 			} else {
 				// Insert line
-				$result = $object->addline($desc, $pu_ht, $qty, $tva_tx, $localtax1_tx, $localtax2_tx, $idprod, $remise_percent, $info_bits, 0, $price_base_type, $pu_ttc, $date_start, $date_end, $type, - 1, 0, GETPOST('fk_parent_line'), $fournprice, $buyingprice, $label, $array_option);
+				$result = $object->addline($desc, $pu_ht, $qty, $tva_tx, $localtax1_tx, $localtax2_tx, $idprod, $remise_percent, $info_bits, 0, $price_base_type, $pu_ttc, $date_start, $date_end, $type, - 1, 0, GETPOST('fk_parent_line'), $fournprice, $buyingprice, $label, $array_options);
 
 				if ($result > 0) {
 					$ret = $object->fetch($object->id); // Reload to get new records
@@ -786,9 +798,10 @@ if (empty($reshook))
 	}
 
 	/*
-	 *  Mise a jour d'une ligne dans la commande
+	 *  Update a line
-	*/
+	 */
-	else if ($action == 'updateligne' && $user->rights->commande->creer && GETPOST('save') == $langs->trans('Save')) {
+	else if ($action == 'updateline' && $user->rights->commande->creer && GETPOST('save') == $langs->trans('Save'))
+	{
 		// Clean parameters
 		$date_start='';
 		$date_end='';
@@ -815,7 +828,7 @@ if (empty($reshook))
 		// Extrafields Lines
 		$extrafieldsline = new ExtraFields($db);
 		$extralabelsline = $extrafieldsline->fetch_name_optionals_label($object->table_element_line);
-		$array_option = $extrafieldsline->getOptionalsFromPost($extralabelsline);
+		$array_options = $extrafieldsline->getOptionalsFromPost($extralabelsline);
 		// Unset extrafield POST Data
 		if (is_array($extralabelsline)) {
 			foreach ($extralabelsline as $key => $value) {
@@ -839,7 +852,7 @@ if (empty($reshook))
 
 			if ($price_min && (price2num($pu_ht) * (1 - price2num(GETPOST('remise_percent')) / 100) < price2num($price_min))) {
 				setEventMessage($langs->trans("CantBeLessThanMinPrice", price(price2num($price_min, 'MU'), 0, $langs, 0, 0, - 1, $conf->currency)), 'errors');
-				$error ++;
+				$error++;
 			}
 		} else {
 			$type = GETPOST('type');
@@ -848,12 +861,12 @@ if (empty($reshook))
 			// Check parameters
 			if (GETPOST('type') < 0) {
 				setEventMessage($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Type")), 'errors');
-				$error ++;
+				$error++;
 			}
 		}
 
 		if (! $error) {
-			$result = $object->updateline(GETPOST('lineid'), $description, $pu_ht, GETPOST('qty'), GETPOST('remise_percent'), $vat_rate, $localtax1_rate, $localtax2_rate, 'HT', $info_bits, $date_start, $date_end, $type, GETPOST('fk_parent_line'), 0, $fournprice, $buyingprice, $label, 0, $array_option);
+			$result = $object->updateline(GETPOST('lineid'), $description, $pu_ht, GETPOST('qty'), GETPOST('remise_percent'), $vat_rate, $localtax1_rate, $localtax2_rate, 'HT', $info_bits, $date_start, $date_end, $type, GETPOST('fk_parent_line'), 0, $fournprice, $buyingprice, $label, 0, $array_options);
 
 			if ($result >= 0) {
 				if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
@@ -891,7 +904,7 @@ if (empty($reshook))
 		}
 	}
 
-	else if ($action == 'updateligne' && $user->rights->commande->creer && GETPOST('cancel') == $langs->trans('Cancel')) {
+	else if ($action == 'updateline' && $user->rights->commande->creer && GETPOST('cancel') == $langs->trans('Cancel')) {
 		header('Location: ' . $_SERVER['PHP_SELF'] . '?id=' . $object->id); // Pour reaffichage de la fiche en cours d'edition
 		exit();
 	}
@@ -1045,67 +1058,18 @@ if (empty($reshook))
 		}
 	}
 
-	/*
+	if ($action == 'builddoc') // In get or post
-	 * Ordonnancement des lignes
-	*/
-
-	else if ($action == 'up' && $user->rights->commande->creer) {
-		$object->line_up(GETPOST('rowid'));
-
-		// Define output language
-		$outputlangs = $langs;
-		$newlang = '';
-		if ($conf->global->MAIN_MULTILANGS && empty($newlang) && ! empty($_REQUEST['lang_id']))
-			$newlang = $_REQUEST['lang_id'];
-		if ($conf->global->MAIN_MULTILANGS && empty($newlang))
-			$newlang = $object->thirdparty->default_lang;
-		if (! empty($newlang)) {
-			$outputlangs = new Translate("", $conf);
-			$outputlangs->setDefaultLang($newlang);
-		}
-
-		if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
-			$object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
-		}
-
-		header('Location: ' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '#' . GETPOST('rowid'));
-		exit();
-	}
-
-	else if ($action == 'down' && $user->rights->commande->creer) {
-		$object->line_down(GETPOST('rowid'));
-
-		// Define output language
-		$outputlangs = $langs;
-		$newlang = '';
-		if ($conf->global->MAIN_MULTILANGS && empty($newlang) && ! empty($_REQUEST['lang_id']))
-			$newlang = $_REQUEST['lang_id'];
-		if ($conf->global->MAIN_MULTILANGS && empty($newlang))
-			$newlang = $object->thirdparty->default_lang;
-		if (! empty($newlang)) {
-			$outputlangs = new Translate("", $conf);
-			$outputlangs->setDefaultLang($newlang);
-		}
-		if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
-			$object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
-		}
-
-		header('Location: ' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '#' . GETPOST('rowid'));
-		exit();
-	}
-
-	else if ($action == 'builddoc') // In get or post
 	{
-		/*
-		 * Generate order document
-		 * define into /core/modules/commande/modules_commande.php
-		 */
-
 		// Save last template used to generate document
 		if (GETPOST('model'))
 			$object->setDocModel($user, GETPOST('model', 'alpha'));
+		    if (GETPOST('fk_bank')) { // this field may come from an external module
+            $object->fk_bank = GETPOST('fk_bank');
+        } else {
+            $object->fk_bank = $object->fk_account;
+        }
 
-			// Define output language
+		// Define output language
 		$outputlangs = $langs;
 		$newlang = '';
 		if ($conf->global->MAIN_MULTILANGS && empty($newlang) && ! empty($_REQUEST['lang_id']))
@@ -1125,8 +1089,10 @@ if (empty($reshook))
 	}
 
 	// Remove file in doc form
-	else if ($action == 'remove_file') {
+	if ($action == 'remove_file')
-		if ($object->id > 0) {
+	{
+		if ($object->id > 0)
+		{
 			require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
 
 			$langs->load("other");
@@ -1141,14 +1107,15 @@ if (empty($reshook))
 		}
 	}
 
-	else if ($action == 'update_extras') {
+	if ($action == 'update_extras')
+	{
 		// Fill array 'array_options' with data from update form
 		$extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
 		$ret = $extrafields->setOptionalsFromPost($extralabels, $object, GETPOST('attribute'));
-		if ($ret < 0)
+		if ($ret < 0) $error++;
-			$error ++;
 
-		if (! $error) {
+		if (! $error)
+		{
 			// Actions on extra fields (by external module or standard code)
 			// FIXME le hook fait double emploi avec le trigger !!
 			$hookmanager->initHooks(array('orderdao'));
@@ -1158,10 +1125,10 @@ if (empty($reshook))
 			if (empty($reshook)) {
 				$result = $object->insertExtraFields();
 				if ($result < 0) {
-					$error ++;
+					$error++;
 				}
 			} else if ($reshook < 0)
-				$error ++;
+				$error++;
 		}
 
 		if ($error)
@@ -1452,6 +1419,16 @@ if ($action == 'create' && $user->rights->commande->creer)
 		print '</td></tr>';
 	}
 
+	// Incoterms
+	if (!empty($conf->incoterm->enabled))
+	{
+		print '<tr>';
+		print '<td><label for="incoterm_id">'.$form->textwithpicto($langs->trans("IncotermLabel"), $objectsrc->libelle_incoterms, 1).'</label></td>';
+        print '<td colspan="3" class="maxwidthonsmartphone">';
+        print $form->select_incoterms((!empty($objectsrc->fk_incoterms) ? $objectsrc->fk_incoterms : ''), (!empty($objectsrc->location_incoterms)?$objectsrc->location_incoterms:''));
+		print '</td></tr>';
+	}
+
 	// Other attributes
 	$parameters = array('objectsrc' => $objectsrc, 'colspan' => ' colspan="3"', 'socid'=>$socid);
 	$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by
@@ -1727,9 +1704,7 @@ if ($action == 'create' && $user->rights->commande->creer)
 			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id, $langs->trans('Cancel'), $text, 'confirm_cancel', $formquestion, 0, 1);
 		}
 
-		/*
+		// Confirmation to delete line
-		 * Confirmation de la suppression d'une ligne produit
-		 */
 		if ($action == 'ask_deleteline')
 		{
 			$formconfirm=$form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&lineid='.$lineid, $langs->trans('DeleteProductLine'), $langs->trans('ConfirmDeleteProductLine'), 'confirm_deleteline', '', 0, 1);
@@ -2013,7 +1988,30 @@ if ($action == 'create' && $user->rights->commande->creer)
 			print '</td>';
 			print '</tr>';
 		}
-
+		
+		// Incoterms
+		if (!empty($conf->incoterm->enabled))
+		{			
+			print '<tr><td>';
+	        print '<table width="100%" class="nobordernopadding"><tr><td>';
+	        print $langs->trans('IncotermLabel');
+	        print '<td><td align="right">';
+	        if ($user->rights->commande->creer) print '<a href="'.DOL_URL_ROOT.'/commande/card.php?id='.$object->id.'&action=editincoterm">'.img_edit().'</a>';
+	        else print '&nbsp;';
+	        print '</td></tr></table>';
+	        print '</td>';
+	        print '<td colspan="3">';
+			if ($action != 'editincoterm')
+			{
+				print $form->textwithpicto($object->display_incoterms(), $object->libelle_incoterms, 1);
+			}
+			else 
+			{
+				print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms)?$object->location_incoterms:''), $_SERVER['PHP_SELF'].'?id='.$object->id);
+			}
+	        print '</td></tr>';
+		}
+	
 		// Other attributes
 		$cols = 3;
 		include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
@@ -2101,7 +2099,7 @@ if ($action == 'create' && $user->rights->commande->creer)
 
 		print '	<form name="addproduct" id="addproduct" action="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . (($action != 'editline') ? '#add' : '#line_' . GETPOST('lineid')) . '" method="POST">
 		<input type="hidden" name="token" value="' . $_SESSION ['newtoken'] . '">
-		<input type="hidden" name="action" value="' . (($action != 'editline') ? 'addline' : 'updateligne') . '">
+		<input type="hidden" name="action" value="' . (($action != 'editline') ? 'addline' : 'updateline') . '">
 		<input type="hidden" name="mode" value="">
 		<input type="hidden" name="id" value="' . $object->id . '">
 		';
@@ -2245,7 +2243,11 @@ if ($action == 'create' && $user->rights->commande->creer)
 				}
 
 				// Cancel order
-				if ($object->statut == 1 && $user->rights->commande->annuler) {
+				if ($object->statut == 1 && 
+				    ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->commande->cloturer))
+			       	|| (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->commande->order_advance->annuler)))
+				) 
+				{
 					print '<div class="inline-block divButAction"><a class="butActionDelete" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;action=cancel">' . $langs->trans('Cancel') . '</a></div>';
 				}
 

htdocs/commande/class/commande.class.php

@@ -106,6 +106,11 @@ class Commande extends CommonOrder
 
     var $lines = array();
 
+	//Incorterms
+	var $fk_incoterms;
+	var $location_incoterms;
+	var $libelle_incoterms;  //Used into tooltip
+
 
     /**
      *	Constructor
@@ -672,6 +677,7 @@ class Commande extends CommonOrder
         $sql.= ", model_pdf, fk_cond_reglement, fk_mode_reglement, fk_account, fk_availability, fk_input_reason, date_livraison, fk_delivery_address";
         $sql.= ", fk_shipping_method";
         $sql.= ", remise_absolue, remise_percent";
+		$sql.= ", fk_incoterms, location_incoterms";
         $sql.= ", entity";
         $sql.= ")";
         $sql.= " VALUES ('(PROV)',".$this->socid.", '".$this->db->idate($now)."', ".$user->id;
@@ -694,6 +700,8 @@ class Commande extends CommonOrder
         $sql.= ", ".($this->shipping_method_id>0?$this->shipping_method_id:'NULL');
         $sql.= ", ".($this->remise_absolue>0?$this->remise_absolue:'NULL');
         $sql.= ", ".($this->remise_percent>0?$this->remise_percent:0);
+        $sql.= ", ".(int) $this->fk_incoterms;
+        $sql.= ", '".$this->db->escape($this->location_incoterms)."'";
         $sql.= ", ".$conf->entity;
         $sql.= ")";
 
@@ -877,6 +885,8 @@ class Commande extends CommonOrder
 
         $error=0;
 
+        $this->context['createfromclone'] = 'createfromclone';
+
         $this->db->begin();
 
 		// get extrafields so they will be clone
@@ -941,6 +951,8 @@ class Commande extends CommonOrder
             // End call triggers
         }
 
+        unset($this->context['createfromclone']);
+
         // End
         if (! $error)
         {
@@ -1088,8 +1100,8 @@ class Commande extends CommonOrder
      *	@param      int				$fk_remise_except	Id remise
      *	@param      string			$price_base_type	HT or TTC
      *	@param      float			$pu_ttc    		    Prix unitaire TTC
-     *	@param      int		$date_start       	Start date of the line - Added by Matelli (See http://matelli.fr/showcases/patchs-dolibarr/add-dates-in-order-lines.html)
+     *	@param      int				$date_start       	Start date of the line - Added by Matelli (See http://matelli.fr/showcases/patchs-dolibarr/add-dates-in-order-lines.html)
-     *	@param      int		$date_end         	End date of the line - Added by Matelli (See http://matelli.fr/showcases/patchs-dolibarr/add-dates-in-order-lines.html)
+     *	@param      int				$date_end         	End date of the line - Added by Matelli (See http://matelli.fr/showcases/patchs-dolibarr/add-dates-in-order-lines.html)
      *	@param      int				$type				Type of line (0=product, 1=service)
      *	@param      int				$rang             	Position of line
      *	@param		int				$special_code		Special code (also used by externals modules!)
@@ -1097,7 +1109,7 @@ class Commande extends CommonOrder
      *  @param		int				$fk_fournprice		Id supplier price
      *  @param		int				$pa_ht				Buying price (without tax)
      *  @param		string			$label				Label
-	 *  @param		array			$array_option		extrafields array
+	 *  @param		array			$array_options		extrafields array
      *	@return     int             					>0 if OK, <0 if KO
      *
      *	@see        add_product
@@ -1107,7 +1119,7 @@ class Commande extends CommonOrder
      *	par l'appelant par la methode get_default_tva(societe_vendeuse,societe_acheteuse,produit)
      *	et le desc doit deja avoir la bonne valeur (a l'appelant de gerer le multilangue)
      */
-	function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1=0, $txlocaltax2=0, $fk_product=0, $remise_percent=0, $info_bits=0, $fk_remise_except=0, $price_base_type='HT', $pu_ttc=0, $date_start='', $date_end='', $type=0, $rang=-1, $special_code=0, $fk_parent_line=0, $fk_fournprice=null, $pa_ht=0, $label='',$array_option=0)
+	function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1=0, $txlocaltax2=0, $fk_product=0, $remise_percent=0, $info_bits=0, $fk_remise_except=0, $price_base_type='HT', $pu_ttc=0, $date_start='', $date_end='', $type=0, $rang=-1, $special_code=0, $fk_parent_line=0, $fk_fournprice=null, $pa_ht=0, $label='',$array_options=0)
     {
     	global $mysoc, $conf, $langs;
 
@@ -1200,6 +1212,8 @@ class Commande extends CommonOrder
             // Insert line
             $this->line=new OrderLine($this->db);
 
+            $this->line->context = $this->context;
+
             $this->line->fk_commande=$this->id;
             $this->line->label=$label;
             $this->line->desc=$desc;
@@ -1244,8 +1258,8 @@ class Commande extends CommonOrder
             $this->line->price=$price;
             $this->line->remise=$remise;
 
-			if (is_array($array_option) && count($array_option)>0) {
+			if (is_array($array_options) && count($array_options)>0) {
-				$this->line->array_options=$array_option;
+				$this->line->array_options=$array_options;
 			}
 
             $result=$this->line->insert();
@@ -1314,6 +1328,8 @@ class Commande extends CommonOrder
 
             $line=new OrderLine($this->db);
 
+            $line->context = $this->context;
+
             $line->fk_product=$idproduct;
             $line->desc=$prod->description;
             $line->qty=$qty;
@@ -1381,6 +1397,8 @@ class Commande extends CommonOrder
         $sql.= ', c.fk_shipping_method';
         $sql.= ', c.fk_projet, c.remise_percent, c.remise, c.remise_absolue, c.source, c.facture as billed';
         $sql.= ', c.note_private, c.note_public, c.ref_client, c.ref_ext, c.ref_int, c.model_pdf, c.fk_delivery_address, c.extraparams';
+        $sql.= ', c.fk_incoterms, c.location_incoterms';
+        $sql.= ", i.libelle as libelle_incoterms";
         $sql.= ', p.code as mode_reglement_code, p.libelle as mode_reglement_libelle';
         $sql.= ', cr.code as cond_reglement_code, cr.libelle as cond_reglement_libelle, cr.libelle_facture as cond_reglement_libelle_doc';
         $sql.= ', ca.code as availability_code';
@@ -1390,6 +1408,7 @@ class Commande extends CommonOrder
         $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement as p ON (c.fk_mode_reglement = p.id)';
         $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_availability as ca ON (c.fk_availability = ca.rowid)';
         $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_input_reason as dr ON (c.fk_input_reason = ca.rowid)';
+		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_incoterms as i ON c.fk_incoterms = i.rowid';
         $sql.= " WHERE c.entity = ".$conf->entity;
         if ($id)   	  $sql.= " AND c.rowid=".$id;
         if ($ref)     $sql.= " AND c.ref='".$this->db->escape($ref)."'";
@@ -1445,6 +1464,11 @@ class Commande extends CommonOrder
                 $this->shipping_method_id   = ($obj->fk_shipping_method>0)?$obj->fk_shipping_method:null;
                 $this->fk_delivery_address	= $obj->fk_delivery_address;
 
+				//Incoterms
+				$this->fk_incoterms = $obj->fk_incoterms;
+				$this->location_incoterms = $obj->location_incoterms;									
+				$this->libelle_incoterms = $obj->libelle_incoterms;
+
                 $this->extraparams			= (array) json_decode($obj->extraparams, true);
 
                 $this->lines				= array();
@@ -2338,10 +2362,10 @@ class Commande extends CommonOrder
      *  @param		int				$pa_ht				Price (without tax) of product when it was bought
      *  @param		string			$label				Label
      *  @param		int				$special_code		Special code (also used by externals modules!)
-	 *  @param		array			$array_option		extrafields array
+	 *  @param		array			$array_options		extrafields array
      *  @return   	int              					< 0 if KO, > 0 if OK
      */
-	function updateline($rowid, $desc, $pu, $qty, $remise_percent, $txtva, $txlocaltax1=0.0,$txlocaltax2=0.0, $price_base_type='HT', $info_bits=0, $date_start='', $date_end='', $type=0, $fk_parent_line=0, $skip_update_total=0, $fk_fournprice=null, $pa_ht=0, $label='', $special_code=0, $array_option=0)
+	function updateline($rowid, $desc, $pu, $qty, $remise_percent, $txtva, $txlocaltax1=0.0,$txlocaltax2=0.0, $price_base_type='HT', $info_bits=0, $date_start='', $date_end='', $type=0, $fk_parent_line=0, $skip_update_total=0, $fk_fournprice=null, $pa_ht=0, $label='', $special_code=0, $array_options=0)
     {
         global $conf, $mysoc;
 
@@ -2396,6 +2420,8 @@ class Commande extends CommonOrder
             // Update line
             $this->line=new OrderLine($this->db);
 
+            $this->line->context = $this->context;
+
             // Stock previous line records
             $staticline=new OrderLine($this->db);
             $staticline->fetch($rowid);
@@ -2448,8 +2474,8 @@ class Commande extends CommonOrder
             $this->line->price=$price;
             $this->line->remise=$remise;
 
-			if (is_array($array_option) && count($array_option)>0) {
+			if (is_array($array_options) && count($array_options)>0) {
-				$this->line->array_options=$array_option;
+				$this->line->array_options=$array_options;
 			}
 
             $result=$this->line->update();
@@ -3506,7 +3532,7 @@ class OrderLine extends CommonOrderLine
 				}
 			}
 
-            if (! $notrigger)
+            if (! $error && ! $notrigger)
             {
 	            // Call trigger
 	            $result=$this->call_trigger('LINEORDER_INSERT',$user);

htdocs/commande/list.php

@@ -51,6 +51,7 @@ $sall=GETPOST('sall');
 $socid=GETPOST('socid','int');
 $search_user=GETPOST('search_user','int');
 $search_sale=GETPOST('search_sale','int');
+$search_total_ht=GETPOST('search_total_ht','alpha');
 
 // Security check
 $id = (GETPOST('orderid')?GETPOST('orderid'):GETPOST('id','int'));
@@ -79,6 +80,7 @@ if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both
     $search_ref='';
     $search_ref_customer='';
     $search_company='';
+    $search_total_ht='';
     $orderyear='';
     $ordermonth='';
     $deliverymonth='';
@@ -96,6 +98,7 @@ $parameters=array('socid'=>$socid);
 $reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hook
 if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
+
 /*
  * View
  */
@@ -198,7 +201,10 @@ if ($search_user > 0)
 {
     $sql.= " AND ec.fk_c_type_contact = tc.rowid AND tc.element='commande' AND tc.source='internal' AND ec.element_id = c.rowid AND ec.fk_socpeople = ".$search_user;
 }
-
+if ($search_total_ht != '')
+{
+	$sql.= natural_search('c.total_ht', $search_total_ht, 1);
+}
 $sql.= ' ORDER BY '.$sortfield.' '.$sortorder;
 
 $nbtotalofrecords = 0;
@@ -252,7 +258,8 @@ if ($resql)
 	if ($search_ref_customer)	$param.='&search_ref_customer='.$search_ref_customer;
 	if ($search_user > 0) 		$param.='&search_user='.$search_user;
 	if ($search_sale > 0) 		$param.='&search_sale='.$search_sale;
-
+	if ($search_total_ht != '') $param.='&search_total_ht='.$search_total_ht;
+	
 	$num = $db->num_rows($resql);
 	print_barre_liste($title, $page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num,$nbtotalofrecords);
 	$i = 0;
@@ -316,7 +323,9 @@ if ($resql)
     print '<input class="flat" type="text" size="1" maxlength="2" name="deliverymonth" value="'.$deliverymonth.'">';
     $formother->select_year($deliveryyear?$deliveryyear:-1,'deliveryyear',1, 20, 5);
 	print '</td>';
-	print '<td class="liste_titre">&nbsp;</td>';
+	print '<td class="liste_titre" align="right">';
+	print '<input class="flat" type="text" size="6" name="search_total_ht" value="'.$search_total_ht.'">';
+	print '</td>';
 	print '<td class="liste_titre" align="right"><input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
 	print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
 	print "</td></tr>\n";
@@ -328,7 +337,8 @@ if ($resql)
 
     $generic_commande = new Commande($db);
     $generic_product = new Product($db);
-    while ($i < min($num,$limit)) {
+    while ($i < min($num,$limit)) 
+    {
         $objp = $db->fetch_object($resql);
         $var=!$var;
         print '<tr '.$bc[$var].'>';
@@ -366,19 +376,22 @@ if ($resql)
                     // stock order and stock order_supplier
                     $stock_order=0;
                     $stock_order_supplier=0;
-                    if (! empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT)) {
+                    if (! empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT))
-                        if (! empty($conf->commande->enabled)) {
+                    {
+                        if (! empty($conf->commande->enabled))
+                        {
                             if (empty($productstat_cache[$generic_commande->lines[$lig]->fk_product]['stats_order_customer'])) {
-                                $generic_product->load_stats_commande(0,'1,2',true);
+                                $generic_product->load_stats_commande(0,'1,2');
                                 $productstat_cache[$generic_commande->lines[$lig]->fk_product]['stats_order_customer'] = $generic_product->stats_commande['qty'];
                             } else {
                                 $generic_product->stats_commande['qty'] = $productstat_cache[$generic_commande->lines[$lig]->fk_product]['stats_order_customer'];
                             }
                             $stock_order=$generic_product->stats_commande['qty'];
                         }
-                        if (! empty($conf->fournisseur->enabled)) {
+                        if (! empty($conf->fournisseur->enabled))
+                        {
                             if (empty($productstat_cache[$generic_commande->lines[$lig]->fk_product]['stats_order_supplier'])) {
-                                $generic_product->load_stats_commande_fournisseur(0,'3',true);
+                                $generic_product->load_stats_commande_fournisseur(0,'3');
                                 $productstat_cache[$generic_commande->lines[$lig]->fk_product]['stats_order_supplier'] = $generic_product->stats_commande_fournisseur['qty'];
                             } else {
                                 $generic_product->stats_commande_fournisseur['qty'] = $productstat_cache[$generic_commande->lines[$lig]->fk_product]['stats_order_supplier'];

htdocs/compta/bank/bankid_fr.php

@@ -1,477 +0,0 @@
-<?php
-/* Copyright (C) 2002-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2003      Jean-Louis Bergamo   <jlb@j1b.org>
- * Copyright (C) 2004-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copytight (C) 2005-2009 Regis Houssin        <regis.houssin@capnetworks.com>
- *
- * 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 <http://www.gnu.org/licenses/>.
- */
-
-/**
- *  \file       htdocs/compta/bank/bankid_fr.php
- *  \ingroup    banque
- *  \brief      Fiche creation compte bancaire
- */
-
-require('../../main.inc.php');
-require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
-
-$langs->load("banks");
-$langs->load("categories");
-$langs->load("bills");
-
-$action=GETPOST('action');
-$id=GETPOST('id','int');
-$ref=GETPOST('ref');
-
-// Security check
-if (isset($_GET["id"]) || isset($_GET["ref"]))
-{
-	$id = isset($_GET["id"])?$_GET["id"]:(isset($_GET["ref"])?$_GET["ref"]:'');
-}
-$fieldid = isset($_GET["ref"])?'ref':'rowid';
-if ($user->societe_id) $socid=$user->societe_id;
-$result=restrictedArea($user,'banque',$id,'bank_account&bank_account','','',$fieldid);
-
-
-/*
- * Actions
- */
-
-if ($action == 'update' && ! $_POST["cancel"])
-{
-	// Modification
-	$account = new Account($db);
-	$account->fetch($id);
-
-	$account->bank            = trim($_POST["bank"]);
-	$account->code_banque     = trim($_POST["code_banque"]);
-	$account->code_guichet    = trim($_POST["code_guichet"]);
-	$account->number          = trim($_POST["number"]);
-	$account->cle_rib         = trim($_POST["cle_rib"]);
-	$account->bic             = trim($_POST["bic"]);
-	$account->iban            = trim($_POST["iban"]);
-	$account->domiciliation   = trim($_POST["domiciliation"]);
-	$account->proprio 	      = trim($_POST["proprio"]);
-	$account->owner_address   = trim($_POST["owner_address"]);
-	$account->state_id  	  = trim($_POST["state_id"]);
-	//$account->country_id       = trim($_POST["country_id"]);		// We do not change this.
-
-	if ($account->id)
-	{
-		$result = $account->update_bban($user);
-		if ($result >= 0)
-		{
-			$_GET["id"]=$_POST["id"];   // Force chargement page en mode visu
-		}
-		else
-		{
-			setEventMessage($account->error, 'errors');
-			$action='edit';     // Force chargement page edition
-		}
-	}
-}
-
-if ($action == 'confirm_delete' && $_POST["confirm"] == "yes" && $user->rights->banque->configurer)
-{
-	// Modification
-	$account = new Account($db);
-	$account->fetch($id);
-	$account->delete();
-
-	header("Location: ".DOL_URL_ROOT."/compta/bank/index.php");
-	exit;
-}
-
-
-/*
- * View
- */
-
-llxHeader();
-
-$form = new Form($db);
-
-/* ************************************************************************** */
-/*                                                                            */
-/* Affichage page en mode creation                                            */
-/*                                                                            */
-/* ************************************************************************** */
-
-if (($_GET["id"] || $_GET["ref"]) && $action != 'edit')
-{
-	$account = new Account($db);
-	if ($_GET["id"])
-	{
-		$result=$account->fetch($id);
-	}
-	if ($_GET["ref"])
-	{
-		$result=$account->fetch(0,$_GET["ref"]);
-		$_GET["id"]=$account->id;
-	}
-
-	// Onglets
-	$head=bank_prepare_head($account);
-	dol_fiche_head($head, 'bankid', $langs->trans("FinancialAccount"),0,'account');
-
-	// Confirmation de la suppression
-	if ($action == 'delete')
-	{
-		print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$account->id,$langs->trans("DeleteAccount"),$langs->trans("ConfirmDeleteAccount"),"confirm_delete");
-
-	}
-
-
-	print '<table class="border" width="100%">';
-
-	$linkback = '<a href="'.DOL_URL_ROOT.'/compta/bank/index.php">'.$langs->trans("BackToList").'</a>';
-
-	// Ref
-	print '<tr><td valign="top" width="25%">'.$langs->trans("Ref").'</td>';
-	print '<td colspan="3">';
-	print $form->showrefnav($account, 'ref', $linkback, 1, 'ref');
-	print '</td></tr>';
-
-	// Label
-	print '<tr><td valign="top">'.$langs->trans("Label").'</td>';
-	print '<td colspan="3">'.$account->label.'</td></tr>';
-
-	// Type
-	print '<tr><td valign="top">'.$langs->trans("AccountType").'</td>';
-	print '<td colspan="3">'.$account->type_lib[$account->type].'</td></tr>';
-
-	// Currency
-	print '<tr><td valign="top">'.$langs->trans("Currency").'</td>';
-	print '<td colspan="3">';
-	$selectedcode=$account->account_currency_code;
-	if (! $selectedcode) $selectedcode=$conf->currency;
-	print $langs->trans("Currency".$selectedcode);
-	print '</td></tr>';
-
-	// Status
-	print '<tr><td valign="top">'.$langs->trans("Status").'</td>';
-	print '<td colspan="3">'.$account->getLibStatut(4).'</td></tr>';
-
-	if ($account->type == 0 || $account->type == 1)
-	{
-	    // Country
-	    print '<tr><td valign="top">'.$langs->trans("BankAccountCountry").'</td><td colspan="3">';
-	    $img=picto_from_langcode($account->country_code);
-	    print $img?$img.' ':'';
-	    print getCountry($account->getCountryCode(), 0, $db);
-	    print "</td></tr>\n";
-
-		print '<tr><td valign="top">'.$langs->trans("BankName").'</td>';
-		print '<td colspan="3">'.$account->bank.'</td></tr>';
-
-		// Show fields of bank account
-		$fieldlists='BankCode DeskCode AccountNumber BankAccountNumberKey';
-		if (! empty($conf->global->BANK_SHOW_ORDER_OPTION))
-		{
-			if (is_numeric($conf->global->BANK_SHOW_ORDER_OPTION))
-			{
-				if ($conf->global->BANK_SHOW_ORDER_OPTION == '1') $fieldlists='BankCode DeskCode BankAccountNumberKey AccountNumber';
-			}
-			else $fieldlists=$conf->global->BANK_SHOW_ORDER_OPTION;
-		}
-		$fieldlistsarray=explode(' ',$fieldlists);
-
-		foreach($fieldlistsarray as $val)
-		{
-			if ($val == 'BankCode')
-			{
-				if ($account->useDetailedBBAN() == 1)
-				{
-					print '<tr><td>'.$langs->trans("BankCode").'</td>';
-					print '<td colspan="3">'.$account->code_banque.'</td>';
-					print '</tr>';
-				}
-			}
-			if ($val == 'DeskCode')
-			{
-				if ($account->useDetailedBBAN() == 1)
-				{
-					print '<tr><td>'.$langs->trans("DeskCode").'</td>';
-					print '<td colspan="3">'.$account->code_guichet.'</td>';
-					print '</tr>';
-				}
-			}
-
-			if ($val == 'BankCode')
-			{
-				if ($account->useDetailedBBAN() == 2)
-		        {
-		            print '<tr><td>'.$langs->trans("BankCode").'</td>';
-		            print '<td colspan="3">'.$account->code_banque.'</td>';
-		            print '</tr>';
-		        }
-			}
-
-			if ($val == 'AccountNumber')
-			{
-				print '<tr><td>'.$langs->trans("BankAccountNumber").'</td>';
-				print '<td colspan="3">'.$account->number.'</td>';
-				print '</tr>';
-			}
-
-			if ($val == 'BankAccountNumberKey')
-			{
-				if ($account->useDetailedBBAN() == 1)
-				{
-					print '<tr><td>'.$langs->trans("BankAccountNumberKey").'</td>';
-					print '<td colspan="3">'.$account->cle_rib.'</td>';
-					print '</tr>';
-				}
-			}
-		}
-
-		$ibankey="IBANNumber";
-		$bickey="BICNumber";
-		if ($account->getCountryCode() == 'IN') $ibankey="IFSC";
-		if ($account->getCountryCode() == 'IN') $bickey="SWIFT";
-
-		print '<tr><td valign="top">'.$langs->trans($ibankey).'</td>';
-		print '<td colspan="3">'.$account->iban.'&nbsp;';
-        if (! empty($account->iban)) {
-            if (! checkIbanForAccount($account)) {
-                print img_picto($langs->trans("IbanNotValid"),'warning');
-            } else {
-                print img_picto($langs->trans("IbanValid"),'info');
-            }
-        }
-        print '</td></tr>';
-
-		print '<tr><td valign="top">'.$langs->trans($bickey).'</td>';
-		print '<td colspan="3">'.$account->bic.'&nbsp;';
-        if (! empty($account->bic)) {
-            if (! checkSwiftForAccount($account)) {
-                print img_picto($langs->trans("SwiftNotValid"),'warning');
-            } else {
-                print img_picto($langs->trans("SwiftValid"),'info');
-            }
-        }
-        print '</td></tr>';
-
-		print '<tr><td valign="top">'.$langs->trans("BankAccountDomiciliation").'</td><td colspan="3">';
-		print nl2br($account->domiciliation);
-		print "</td></tr>\n";
-
-		print '<tr><td valign="top">'.$langs->trans("BankAccountOwner").'</td><td colspan="3">';
-		print $account->proprio;
-		print "</td></tr>\n";
-
-		print '<tr><td valign="top">'.$langs->trans("BankAccountOwnerAddress").'</td><td colspan="3">';
-		print nl2br($account->owner_address);
-		print "</td></tr>\n";
-
-	}
-
-	print '</table>';
-
-
-	// Check BBAN
-	if (! checkBanForAccount($account))
-	{
-	    print '<div class="warning">'.$langs->trans("RIBControlError").'</div>';
-	}
-
-	print "\n</div>\n";
-
-
-	/*
- 	 * Barre d'actions
-	 */
-
-	print '<div class="tabsAction">';
-
-	if ($user->rights->banque->configurer)
-	{
-		print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit&id='.$account->id.'">'.$langs->trans("Modify").'</a>';
-	}
-
-	print '</div>';
-
-}
-
-/* ************************************************************************** */
-/*                                                                            */
-/* Edition                                                                    */
-/*                                                                            */
-/* ************************************************************************** */
-
-if ($_GET["id"] && $action == 'edit' && $user->rights->banque->configurer)
-{
-	$account = new Account($db);
-	$account->fetch($id);
-
-	print_fiche_titre($langs->trans("EditFinancialAccount"));
-	print "<br>";
-
-	print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$account->id.'" method="post">';
-	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-	print '<input type="hidden" name="action" value="update">';
-	print '<input type="hidden" name="id" value="'.$_GET["id"].'">'."\n\n";
-
-	print '<table class="border" width="100%">';
-
-	// Ref
-	print '<tr><td valign="top" width="25%">'.$langs->trans("Ref").'</td>';
-	print '<td colspan="3">'.$account->ref;
-	print '</td></tr>';
-
-	// Label
-	print '<tr><td valign="top">'.$langs->trans("Label").'</td>';
-	print '<td colspan="3">'.$account->label;
-	print '</td></tr>';
-
-	// Type
-	print '<tr><td valign="top">'.$langs->trans("AccountType").'</td>';
-	print '<td colspan="3">'.$account->type_lib[$account->type];
-	print '</td></tr>';
-
-	// Currency
-	print '<tr><td valign="top">'.$langs->trans("Currency").'</td>';
-	print '<td colspan="3">';
-	$selectedcode=$account->account_currency_code;
-	if (! $selectedcode) $selectedcode=$conf->currency;
-	print $langs->trans("Currency".$selectedcode);
-	print '</td></tr>';
-
-	// Status
-	print '<tr><td valign="top">'.$langs->trans("Status").'</td>';
-	print '<td colspan="3">'.$account->getLibStatut(4);
-	print '</td></tr>';
-
-	if ($account->type == 0 || $account->type == 1)
-	{
-		print '<tr><td valign="top">'.$langs->trans("BankAccountCountry").'</td><td colspan="3">';
-	    $img=picto_from_langcode($account->country_code);
-	    print $img?$img.' ':'';
-		print getCountry($account->getCountryCode(), 0, $db);
-		print "</td></tr>\n";
-
-		// If bank account
-		print '<tr><td valign="top">'.$langs->trans("BankName").'</td>';
-		print '<td colspan="3"><input size="30" type="text" class="flat" name="bank" value="'.$account->bank.'"></td>';
-		print '</tr>';
-
-		// Show fields of bank account
-		$fieldlists='BankCode DeskCode AccountNumber BankAccountNumberKey';
-		if (! empty($conf->global->BANK_SHOW_ORDER_OPTION))
-		{
-			if (is_numeric($conf->global->BANK_SHOW_ORDER_OPTION))
-			{
-				if ($conf->global->BANK_SHOW_ORDER_OPTION == '1') $fieldlists='BankCode DeskCode BankAccountNumberKey AccountNumber';
-			}
-			else $fieldlists=$conf->global->BANK_SHOW_ORDER_OPTION;
-		}
-		$fieldlistsarray=explode(' ',$fieldlists);
-
-		foreach($fieldlistsarray as $val)
-		{
-			if ($val == 'BankCode')
-			{
-				if ($account->useDetailedBBAN()  == 1)
-				{
-					print '<tr><td>'.$langs->trans("BankCode").'</td>';
-					print '<td><input size="8" type="text" class="flat" name="code_banque" value="'.$account->code_banque.'"></td>';
-					print '</tr>';
-				}
-			}
-
-			if ($val == 'DeskCode')
-			{
-				if ($account->useDetailedBBAN()  == 1)
-				{
-					print '<tr><td>'.$langs->trans("DeskCode").'</td>';
-					print '<td><input size="8" type="text" class="flat" name="code_guichet" value="'.$account->code_guichet.'"></td>';
-					print '</tr>';
-				}
-			}
-
-			if ($val == 'BankCode')
-			{
-				if ($account->useDetailedBBAN()  == 2)
-		        {
-		            print '<tr><td>'.$langs->trans("BankCode").'</td>';
-		            print '<td><input size="8" type="text" class="flat" name="code_banque" value="'.$account->code_banque.'"></td>';
-		            print '</tr>';
-		        }
-			}
-
-			if ($val == 'AccountNumber')
-			{
-				print '<td>'.$langs->trans("BankAccountNumber").'</td>';
-				print '<td><input size="18" type="text" class="flat" name="number" value="'.$account->number.'"></td>';
-				print '</tr>';
-			}
-
-			if ($val == 'BankAccountNumberKey')
-			{
-				if ($account->useDetailedBBAN() == 1)
-				{
-					print '<td>'.$langs->trans("BankAccountNumberKey").'</td>';
-					print '<td><input size="3" type="text" class="flat" name="cle_rib" value="'.$account->cle_rib.'"></td>';
-					print '</tr>';
-				}
-			}
-		}
-
-		$ibankey="IBANNumber";
-		$bickey="BICNumber";
-		if ($account->getCountryCode() == 'IN') $ibankey="IFSC";
-		if ($account->getCountryCode() == 'IN') $bickey="SWIFT";
-
-		// IBAN
-		print '<tr><td valign="top">'.$langs->trans($ibankey).'</td>';
-		print '<td colspan="3"><input size="34" maxlength="34" type="text" class="flat" name="iban" value="'.$account->iban.'"></td></tr>';
-
-		print '<tr><td valign="top">'.$langs->trans($bickey).'</td>';
-		print '<td colspan="3"><input size="11" maxlength="11" type="text" class="flat" name="bic" value="'.$account->bic.'"></td></tr>';
-
-		print '<tr><td valign="top">'.$langs->trans("BankAccountDomiciliation").'</td><td colspan="3">';
-		print "<textarea class=\"flat\" name=\"domiciliation\" rows=\"2\" cols=\"40\">";
-		print $account->domiciliation;
-		print "</textarea></td></tr>";
-
-		print '<tr><td valign="top">'.$langs->trans("BankAccountOwner").'</td>';
-		print '<td colspan="3"><input size="30" type="text" class="flat" name="proprio" value="'.$account->proprio.'">';
-		print '</td></tr>';
-
-		print '<tr><td valign="top">'.$langs->trans("BankAccountOwnerAddress").'</td><td colspan="3">';
-		print "<textarea class=\"flat\" name=\"owner_address\" rows=\"2\" cols=\"40\">";
-		print $account->owner_address;
-		print "</textarea></td></tr>";
-
-	}
-
-	print '</table>';
-
-	print '<br>';
-
-	print '<div align="center">';
-	print '<input value="'.$langs->trans("Save").'" type="submit" class="button">';
-	print ' &nbsp; <input name="cancel" value="'.$langs->trans("Cancel").'" type="submit" class="button">';
-	print '</div>';
-
-	print '</form>';
-}
-
-
-llxFooter();
-
-$db->close();

htdocs/compta/bank/budget.php

@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2001-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copytight (C) 2005-2009 Regis Houssin        <regis.houssin@capnetworks.com>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@capnetworks.com>
  *
  * 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

htdocs/compta/bank/card.php

@@ -2,8 +2,8 @@
 /* Copyright (C) 2002-2003	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
  * Copyright (C) 2003		Jean-Louis Bergamo		<jlb@j1b.org>
  * Copyright (C) 2004-2012	Laurent Destailleur		<eldy@users.sourceforge.net>
- * Copytight (C) 2005-2009	Regis Houssin			<regis.houssin@capnetworks.com>
+ * Copyright (C) 2005-2009	Regis Houssin			<regis.houssin@capnetworks.com>
- * Copytight (C) 2014		Alexandre Spangaro		<alexandre.spangaro@gmail.com>
+ * Copyright (C) 2014-2015	Alexandre Spangaro		<alexandre.spangaro@gmail.com>
  *
  * 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
@@ -21,19 +21,20 @@
 
 /**
  *	    \file       htdocs/compta/bank/card.php
- *      \ingroup    banque
+ *      \ingroup    bank
  *		\brief      Page to create/view a bank account
  */
 
 require('../../main.inc.php');
-require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php';
+require_once DOL_DOCUMENT_ROOT . '/core/lib/bank.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+require_once DOL_DOCUMENT_ROOT . '/core/lib/company.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
+require_once DOL_DOCUMENT_ROOT . '/core/class/html.formcompany.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formbank.class.php';
+require_once DOL_DOCUMENT_ROOT . '/core/class/html.formbank.class.php';
-require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+require_once DOL_DOCUMENT_ROOT . '/compta/bank/class/account.class.php';
 require_once DOL_DOCUMENT_ROOT . '/core/class/extrafields.class.php';
 
 $langs->load("banks");
+$langs->load("bills");
 $langs->load("categories");
 $langs->load("companies");
 $langs->load("compta");
@@ -71,6 +72,18 @@ if ($_POST["action"] == 'add')
     $account->rappro        = (isset($_POST["norappro"]) && $_POST["norappro"])?0:1;
     $account->url           = $_POST["url"];
 
+	$account->bank            = trim($_POST["bank"]);
+    $account->code_banque     = trim($_POST["code_banque"]);
+    $account->code_guichet    = trim($_POST["code_guichet"]);
+    $account->number          = trim($_POST["number"]);
+    $account->cle_rib         = trim($_POST["cle_rib"]);
+    $account->bic             = trim($_POST["bic"]);
+    $account->iban            = trim($_POST["iban"]);
+    $account->domiciliation   = trim($_POST["domiciliation"]);
+
+    $account->proprio 	      = trim($_POST["proprio"]);
+    $account->owner_address   = trim($_POST["owner_address"]);
+
     $account->account_number  = trim($_POST["account_number"]);
 	$account->accountancy_journal  = trim($_POST["accountancy_journal"]);
 
@@ -82,8 +95,8 @@ if ($_POST["action"] == 'add')
     $account->state_id  	  = $_POST["account_state_id"];
     $account->country_id      = $_POST["account_country_id"];
 
-    $account->min_allowed     = $_POST["account_min_allowed"];
+    $account->min_allowed     = GETPOST("account_min_allowed",'int');
-    $account->min_desired     = $_POST["account_min_desired"];
+    $account->min_desired     = GETPOST("account_min_desired",'int');
     $account->comment         = trim($_POST["account_comment"]);
 
     if ($conf->global->MAIN_BANK_ACCOUNTANCY_CODE_ALWAYS_REQUIRED && empty($account->account_number))
@@ -157,8 +170,8 @@ if ($_POST["action"] == 'update' && ! $_POST["cancel"])
     $account->state_id        = $_POST["account_state_id"];
     $account->country_id      = $_POST["account_country_id"];
 
-    $account->min_allowed     = $_POST["account_min_allowed"];
+    $account->min_allowed     = GETPOST("account_min_allowed",'int');
-    $account->min_desired     = $_POST["account_min_desired"];
+    $account->min_desired     = GETPOST("account_min_desired",'int');
     $account->comment         = trim($_POST["account_comment"]);
 
     if ($conf->global->MAIN_BANK_ACCOUNTANCY_CODE_ALWAYS_REQUIRED && empty($account->account_number))
@@ -233,8 +246,12 @@ if ($action == 'create')
 
     if ($conf->use_javascript_ajax)
     {
-        print "\n".'<script type="text/javascript" language="javascript">';
+		print "\n".'<script type="text/javascript" language="javascript">';
         print 'jQuery(document).ready(function () {
+                    jQuery("#selecttype").change(function() {
+                        document.formsoc.action.value="create";
+                        document.formsoc.submit();
+                    });
                     jQuery("#selectaccount_country_id").change(function() {
                         document.formsoc.action.value="create";
                         document.formsoc.submit();
@@ -251,12 +268,12 @@ if ($action == 'create')
 	print '<table class="border" width="100%">';
 
 	// Ref
-	print '<tr><td valign="top" class="fieldrequired"  width="25%">'.$langs->trans("Ref").'</td>';
+	print '<tr><td valign="top" class="fieldrequired" width="25%">'.$langs->trans("Ref").'</td>';
 	print '<td colspan="3"><input size="8" type="text" class="flat" name="ref" value="'.($_POST["ref"]?$_POST["ref"]:$account->ref).'" maxlength="12"></td></tr>';
 
 	// Label
 	print '<tr><td valign="top" class="fieldrequired">'.$langs->trans("LabelBankCashAccount").'</td>';
-	print '<td colspan="3"><input size="30" type="text" class="flat" name="label" value="'.$_POST["label"].'"></td></tr>';
+	print '<td colspan="3"><input size="30" type="text" class="flat" name="label" value="'.GETPOST("label").'"></td></tr>';
 
 	// Type
 	print '<tr><td valign="top" class="fieldrequired">'.$langs->trans("AccountType").'</td>';
@@ -280,15 +297,17 @@ if ($action == 'create')
     print $form->selectarray("clos",array(0=>$account->status[0],1=>$account->status[1]),(isset($_POST["clos"])?$_POST["clos"]:$account->clos));
     print '</td></tr>';
 
-	// Country
+    // Country
-	print '<tr><td valign="top" class="fieldrequired">'.$langs->trans("BankAccountCountry").'</td>';
-	print '<td colspan="3">';
 	$selectedcode='';
 	if (isset($_POST["account_country_id"]))
 	{
 		$selectedcode=$_POST["account_country_id"]?$_POST["account_country_id"]:$account->country_code;
 	}
 	else if (empty($selectedcode)) $selectedcode=$mysoc->country_code;
+	$account->country_code = getCountry($selectedcode, 2);	// Force country code on account to have following field on bank fields matching country rules
+
+	print '<tr><td valign="top" class="fieldrequired">'.$langs->trans("BankAccountCountry").'</td>';
+	print '<td colspan="3">';
 	print $form->select_country($selectedcode,'account_country_id');
 	if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
 	print '</td></tr>';
@@ -314,10 +333,10 @@ if ($action == 'create')
 	print '<td colspan="3">';
     // Editor wysiwyg
 	require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-	$doleditor=new DolEditor('account_comment',$account->comment,'',200,'dolibarr_notes','',false,true,$conf->global->FCKEDITOR_ENABLE_SOCIETE,10,70);
+	$doleditor=new DolEditor('account_comment',(GETPOST("account_comment")?GETPOST("account_comment"):$account->comment),'',90,'dolibarr_notes','',false,true,$conf->global->FCKEDITOR_ENABLE_SOCIETE,4,70);
 	$doleditor->Create();
 	print '</td></tr>';
-    
+
  	// Other attributes
 	$parameters=array('colspan' => 3);
 	$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$account,$action);    // Note that $action and $object may have been modified by hook
@@ -326,7 +345,6 @@ if ($action == 'create')
 		print $account->showOptionals($extrafields,'edit',$parameters);
 	}
 
-
 	print '</table>';
 
 	print '<br>';
@@ -335,7 +353,7 @@ if ($action == 'create')
 
 	// Sold
 	print '<tr><td valign="top" width="25%">'.$langs->trans("InitialBankBalance").'</td>';
-	print '<td colspan="3"><input size="12" type="text" class="flat" name="solde" value="'.($_POST["solde"]?$_POST["solde"]:price2num($account->solde)).'"></td></tr>';
+	print '<td colspan="3"><input size="12" type="text" class="flat" name="solde" value="'.(GETPOST("solde")?GETPOST("solde"):price2num($account->solde)).'"></td></tr>';
 
 	print '<tr><td valign="top">'.$langs->trans("Date").'</td>';
 	print '<td colspan="3">';
@@ -349,27 +367,126 @@ if ($action == 'create')
 	print '<td colspan="3"><input size="12" type="text" class="flat" name="account_min_desired" value="'.($_POST["account_min_desired"]?$_POST["account_min_desired"]:$account->account_min_desired).'"></td></tr>';
 
 	print '</table>';
-
 	print '<br>';
 
+	if ($_POST["type"] == 0 || $_POST["type"] == 1)
+	{
+		print '<table class="border" width="100%">';
+
+		// If bank account
+		print '<tr><td valign="top" width="25%">'.$langs->trans("BankName").'</td>';
+		print '<td colspan="3"><input size="30" type="text" class="flat" name="bank" value="'.$account->bank.'"></td>';
+		print '</tr>';
+
+		// Show fields of bank account
+		$fieldlists='BankCode DeskCode AccountNumber BankAccountNumberKey';
+		if (! empty($conf->global->BANK_SHOW_ORDER_OPTION))
+		{
+			if (is_numeric($conf->global->BANK_SHOW_ORDER_OPTION))
+			{
+				if ($conf->global->BANK_SHOW_ORDER_OPTION == '1') $fieldlists='BankCode DeskCode BankAccountNumberKey AccountNumber';
+			}
+			else $fieldlists=$conf->global->BANK_SHOW_ORDER_OPTION;
+		}
+		$fieldlistsarray=explode(' ',$fieldlists);
+
+		foreach($fieldlistsarray as $val)
+		{
+			if ($val == 'BankCode')
+			{
+				if ($account->useDetailedBBAN()  == 1)
+				{
+					print '<tr><td>'.$langs->trans("BankCode").'</td>';
+					print '<td><input size="8" type="text" class="flat" name="code_banque" value="'.$account->code_banque.'"></td>';
+					print '</tr>';
+				}
+			}
+
+			if ($val == 'DeskCode')
+			{
+				if ($account->useDetailedBBAN()  == 1)
+				{
+					print '<tr><td>'.$langs->trans("DeskCode").'</td>';
+					print '<td><input size="8" type="text" class="flat" name="code_guichet" value="'.$account->code_guichet.'"></td>';
+					print '</tr>';
+				}
+			}
+
+			if ($val == 'BankCode')
+			{
+				if ($account->useDetailedBBAN()  == 2)
+				{
+					print '<tr><td>'.$langs->trans("BankCode").'</td>';
+					print '<td><input size="8" type="text" class="flat" name="code_banque" value="'.$account->code_banque.'"></td>';
+					print '</tr>';
+				}
+			}
+
+			if ($val == 'AccountNumber')
+			{
+				print '<td>'.$langs->trans("BankAccountNumber").'</td>';
+				print '<td><input size="18" type="text" class="flat" name="number" value="'.$account->number.'"></td>';
+				print '</tr>';
+			}
+
+			if ($val == 'BankAccountNumberKey')
+			{
+				if ($account->useDetailedBBAN() == 1)
+				{
+					print '<td>'.$langs->trans("BankAccountNumberKey").'</td>';
+					print '<td><input size="3" type="text" class="flat" name="cle_rib" value="'.$account->cle_rib.'"></td>';
+					print '</tr>';
+				}
+			}
+		}
+		$ibankey="IBANNumber";
+		$bickey="BICNumber";
+		if ($account->getCountryCode() == 'IN') $ibankey="IFSC";
+		if ($account->getCountryCode() == 'IN') $bickey="SWIFT";
+
+		// IBAN
+		print '<tr><td>'.$langs->trans($ibankey).'</td>';
+		print '<td colspan="3"><input size="34" maxlength="34" type="text" class="flat" name="iban" value="'.$account->iban.'"></td></tr>';
+
+		print '<tr><td>'.$langs->trans($bickey).'</td>';
+		print '<td colspan="3"><input size="11" maxlength="11" type="text" class="flat" name="bic" value="'.$account->bic.'"></td></tr>';
+
+		print '<tr><td valign="top">'.$langs->trans("BankAccountDomiciliation").'</td><td colspan="3">';
+		print "<textarea class=\"flat\" name=\"domiciliation\" rows=\"2\" cols=\"40\">";
+		print $account->domiciliation;
+		print "</textarea></td></tr>";
+
+		print '<tr><td valign="top">'.$langs->trans("BankAccountOwner").'</td>';
+		print '<td colspan="3"><input size="30" type="text" class="flat" name="proprio" value="'.$account->proprio.'">';
+		print '</td></tr>';
+
+		print '<tr><td valign="top">'.$langs->trans("BankAccountOwnerAddress").'</td><td colspan="3">';
+		print "<textarea class=\"flat\" name=\"owner_address\" rows=\"2\" cols=\"40\">";
+		print $account->owner_address;
+		print "</textarea></td></tr>";
+
+		print '</table>';
+		print '<br>';
+	}
+
 	print '<table class="border" width="100%">';
 	// Accountancy code
     if (! empty($conf->global->MAIN_BANK_ACCOUNTANCY_CODE_ALWAYS_REQUIRED))
     {
         print '<tr><td valign="top" class="fieldrequired"  width="25%">'.$langs->trans("AccountancyCode").'</td>';
-        print '<td colspan="3"><input type="text" name="account_number" value="'.$account->account_number.'"></td></tr>';
+        print '<td colspan="3"><input type="text" name="account_number" value="'.(GETPOST("account_number")?GETPOST('account_number'):$account->account_number).'"></td></tr>';
     }
     else
     {
         print '<tr><td valign="top"  width="25%">'.$langs->trans("AccountancyCode").'</td>';
-        print '<td colspan="3"><input type="text" name="account_number" value="'.$account->account_number.'"></td></tr>';
+        print '<td colspan="3"><input type="text" name="account_number" value="'.(GETPOST("account_number")?GETPOST('account_number'):$account->account_number).'"></td></tr>';
     }
 
 	// Accountancy journal
 	if (! empty($conf->accounting->enabled))
 	{
 		print '<tr><td valign="top">'.$langs->trans("AccountancyJournal").'</td>';
-	    print '<td colspan="3"><input type="text" name="accountancy_journal" value="'.$account->accountancy_journal.'"></td></tr>';
+	    print '<td colspan="3"><input type="text" name="accountancy_journal" value="'.(GETPOST("accountancy_journal")?GETPOST('accountancy_journal'):$account->accountancy_journal).'"></td></tr>';
 	}
 
 	print '</table>';
@@ -482,7 +599,7 @@ else
 		print "</td></tr>\n";
 
 		print '<tr><td valign="top">'.$langs->trans("Comment").'</td>';
-		print '<td colspan="3">'.$account->comment.'</td></tr>';
+		print '<td colspan="3">'.dol_htmlentitiesbr($account->comment).'</td></tr>';
 
 		// Other attributes
 		$parameters=array('colspan' => 3);
@@ -495,6 +612,118 @@ else
 		print '</table>';
 
 		print '<br>';
+
+		if ($account->type == 0 || $account->type == 1)
+		{
+			print '<table class="border" width="100%">';
+
+			print '<tr><td valign="top" width="25%">'.$langs->trans("BankName").'</td>';
+			print '<td colspan="3">'.$account->bank.'</td></tr>';
+
+			// Show fields of bank account
+			$fieldlists='BankCode DeskCode AccountNumber BankAccountNumberKey';
+			if (! empty($conf->global->BANK_SHOW_ORDER_OPTION))
+			{
+				if (is_numeric($conf->global->BANK_SHOW_ORDER_OPTION))
+				{
+					if ($conf->global->BANK_SHOW_ORDER_OPTION == '1') $fieldlists='BankCode DeskCode BankAccountNumberKey AccountNumber';
+				}
+				else $fieldlists=$conf->global->BANK_SHOW_ORDER_OPTION;
+			}
+			$fieldlistsarray=explode(' ',$fieldlists);
+
+			foreach($fieldlistsarray as $val)
+			{
+				if ($val == 'BankCode')
+				{
+					if ($account->useDetailedBBAN() == 1)
+					{
+						print '<tr><td>'.$langs->trans("BankCode").'</td>';
+						print '<td colspan="3">'.$account->code_banque.'</td>';
+						print '</tr>';
+					}
+				}
+				if ($val == 'DeskCode')
+				{
+					if ($account->useDetailedBBAN() == 1)
+					{
+						print '<tr><td>'.$langs->trans("DeskCode").'</td>';
+						print '<td colspan="3">'.$account->code_guichet.'</td>';
+						print '</tr>';
+					}
+				}
+
+				if ($val == 'BankCode')
+				{
+					if ($account->useDetailedBBAN() == 2)
+					{
+						print '<tr><td>'.$langs->trans("BankCode").'</td>';
+						print '<td colspan="3">'.$account->code_banque.'</td>';
+						print '</tr>';
+					}
+				}
+
+				if ($val == 'AccountNumber')
+				{
+					print '<tr><td>'.$langs->trans("BankAccountNumber").'</td>';
+					print '<td colspan="3">'.$account->number.'</td>';
+					print '</tr>';
+				}
+
+				if ($val == 'BankAccountNumberKey')
+				{
+					if ($account->useDetailedBBAN() == 1)
+					{
+						print '<tr><td>'.$langs->trans("BankAccountNumberKey").'</td>';
+						print '<td colspan="3">'.$account->cle_rib.'</td>';
+						print '</tr>';
+					}
+				}
+			}
+
+			$ibankey="IBANNumber";
+			$bickey="BICNumber";
+			if ($account->getCountryCode() == 'IN') $ibankey="IFSC";
+			if ($account->getCountryCode() == 'IN') $bickey="SWIFT";
+
+			print '<tr><td valign="top">'.$langs->trans($ibankey).'</td>';
+			print '<td colspan="3">'.$account->iban.'&nbsp;';
+			if (! empty($account->iban)) {
+				if (! checkIbanForAccount($account)) {
+					print img_picto($langs->trans("IbanNotValid"),'warning');
+				} else {
+					print img_picto($langs->trans("IbanValid"),'info');
+				}
+			}
+			print '</td></tr>';
+
+			print '<tr><td valign="top">'.$langs->trans($bickey).'</td>';
+			print '<td colspan="3">'.$account->bic.'&nbsp;';
+			if (! empty($account->bic)) {
+				if (! checkSwiftForAccount($account)) {
+					print img_picto($langs->trans("SwiftNotValid"),'warning');
+				} else {
+					print img_picto($langs->trans("SwiftValid"),'info');
+				}
+			}
+			print '</td></tr>';
+
+			print '<tr><td valign="top">'.$langs->trans("BankAccountDomiciliation").'</td><td colspan="3">';
+			print nl2br($account->domiciliation);
+			print "</td></tr>\n";
+
+			print '<tr><td valign="top">'.$langs->trans("BankAccountOwner").'</td><td colspan="3">';
+			print $account->proprio;
+			print "</td></tr>\n";
+
+			print '<tr><td valign="top">'.$langs->trans("BankAccountOwnerAddress").'</td><td colspan="3">';
+			print nl2br($account->owner_address);
+			print "</td></tr>\n";
+
+			print '</table>';
+			print '<br>';
+		}
+
 		print '<table class="border" width="100%">';
 		// Accountancy code
 		print '<tr><td valign="top" width="25%">'.$langs->trans("AccountancyCode").'</td>';
@@ -549,6 +778,13 @@ else
         {
             print "\n".'<script type="text/javascript" language="javascript">';
             print 'jQuery(document).ready(function () {
+                        jQuery("#selecttype").change(function() {
+                            document.formsoc.action.value="edit";
+                            document.formsoc.submit();
+                        });
+                   })'."\n";
+
+			print 'jQuery(document).ready(function () {
                         jQuery("#selectaccount_country_id").change(function() {
                             document.formsoc.action.value="edit";
                             document.formsoc.submit();
@@ -598,11 +834,13 @@ else
 
 		// Country
 		$account->country_id=$account->country_id?$account->country_id:$mysoc->country_id;
-		print '<tr><td valign="top" class="fieldrequired">'.$langs->trans("Country").'</td>';
-		print '<td colspan="3">';
 		$selectedcode=$account->country_code;
 		if (isset($_POST["account_country_id"])) $selectedcode=$_POST["account_country_id"];
 		else if (empty($selectedcode)) $selectedcode=$mysoc->country_code;
+		$account->country_code = getCountry($selectedcode, 2);	// Force country code on account to have following field on bank fields matching country rules
+
+		print '<tr><td valign="top" class="fieldrequired">'.$langs->trans("Country").'</td>';
+		print '<td colspan="3">';
 		print $form->select_country($selectedcode,'account_country_id');
 		if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
 		print '</td></tr>';
@@ -643,9 +881,9 @@ else
 		// Comment
 		print '<tr><td valign="top">'.$langs->trans("Comment").'</td>';
 		print '<td colspan="3">';
-	   // Editor wysiwyg
+	    // Editor wysiwyg
 		require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-		$doleditor=new DolEditor('account_comment',(isset($_POST["account_comment"])?$_POST["account_comment"]:$account->comment),'',200,'dolibarr_notes','',false,true,$conf->global->FCKEDITOR_ENABLE_SOCIETE,10,70);
+		$doleditor=new DolEditor('account_comment',(GETPOST("account_comment")?GETPOST("account_comment"):$account->comment),'',90,'dolibarr_notes','',false,true,$conf->global->FCKEDITOR_ENABLE_SOCIETE,4,70);
 		$doleditor->Create();
 		print '</td></tr>';
 
@@ -656,11 +894,110 @@ else
 		{
 			print $account->showOptionals($extrafields,'edit');
 		}
-
-
 		print '</table>';
-
 		print '<br>';
+
+		if ($_POST["type"] == 0 || $_POST["type"] == 1)
+		{
+			print '<table class="border" width="100%">';
+
+			// If bank account
+			print '<tr><td valign="top" width="25%">'.$langs->trans("BankName").'</td>';
+			print '<td colspan="3"><input size="30" type="text" class="flat" name="bank" value="'.$account->bank.'"></td>';
+			print '</tr>';
+
+			// Show fields of bank account
+			$fieldlists='BankCode DeskCode AccountNumber BankAccountNumberKey';
+			if (! empty($conf->global->BANK_SHOW_ORDER_OPTION))
+			{
+				if (is_numeric($conf->global->BANK_SHOW_ORDER_OPTION))
+				{
+					if ($conf->global->BANK_SHOW_ORDER_OPTION == '1') $fieldlists='BankCode DeskCode BankAccountNumberKey AccountNumber';
+				}
+				else $fieldlists=$conf->global->BANK_SHOW_ORDER_OPTION;
+			}
+			$fieldlistsarray=explode(' ',$fieldlists);
+
+			foreach($fieldlistsarray as $val)
+			{
+				if ($val == 'BankCode')
+				{
+					if ($account->useDetailedBBAN()  == 1)
+					{
+						print '<tr><td>'.$langs->trans("BankCode").'</td>';
+						print '<td><input size="8" type="text" class="flat" name="code_banque" value="'.$account->code_banque.'"></td>';
+						print '</tr>';
+					}
+				}
+
+				if ($val == 'DeskCode')
+				{
+					if ($account->useDetailedBBAN()  == 1)
+					{
+						print '<tr><td>'.$langs->trans("DeskCode").'</td>';
+						print '<td><input size="8" type="text" class="flat" name="code_guichet" value="'.$account->code_guichet.'"></td>';
+						print '</tr>';
+					}
+				}
+
+				if ($val == 'BankCode')
+				{
+					if ($account->useDetailedBBAN()  == 2)
+					{
+						print '<tr><td>'.$langs->trans("BankCode").'</td>';
+						print '<td><input size="8" type="text" class="flat" name="code_banque" value="'.$account->code_banque.'"></td>';
+						print '</tr>';
+					}
+				}
+
+				if ($val == 'AccountNumber')
+				{
+					print '<td>'.$langs->trans("BankAccountNumber").'</td>';
+					print '<td><input size="18" type="text" class="flat" name="number" value="'.$account->number.'"></td>';
+					print '</tr>';
+				}
+
+				if ($val == 'BankAccountNumberKey')
+				{
+					if ($account->useDetailedBBAN() == 1)
+					{
+						print '<td>'.$langs->trans("BankAccountNumberKey").'</td>';
+						print '<td><input size="3" type="text" class="flat" name="cle_rib" value="'.$account->cle_rib.'"></td>';
+						print '</tr>';
+					}
+				}
+			}
+
+			$ibankey="IBANNumber";
+			$bickey="BICNumber";
+			if ($account->getCountryCode() == 'IN') $ibankey="IFSC";
+			if ($account->getCountryCode() == 'IN') $bickey="SWIFT";
+
+			// IBAN
+			print '<tr><td valign="top">'.$langs->trans($ibankey).'</td>';
+			print '<td colspan="3"><input size="34" maxlength="34" type="text" class="flat" name="iban" value="'.$account->iban.'"></td></tr>';
+
+			print '<tr><td valign="top">'.$langs->trans($bickey).'</td>';
+			print '<td colspan="3"><input size="11" maxlength="11" type="text" class="flat" name="bic" value="'.$account->bic.'"></td></tr>';
+
+			print '<tr><td valign="top">'.$langs->trans("BankAccountDomiciliation").'</td><td colspan="3">';
+			print "<textarea class=\"flat\" name=\"domiciliation\" rows=\"2\" cols=\"40\">";
+			print $account->domiciliation;
+			print "</textarea></td></tr>";
+
+			print '<tr><td valign="top">'.$langs->trans("BankAccountOwner").'</td>';
+			print '<td colspan="3"><input size="30" type="text" class="flat" name="proprio" value="'.$account->proprio.'">';
+			print '</td></tr>';
+
+			print '<tr><td valign="top">'.$langs->trans("BankAccountOwnerAddress").'</td><td colspan="3">';
+			print "<textarea class=\"flat\" name=\"owner_address\" rows=\"2\" cols=\"40\">";
+			print $account->owner_address;
+			print "</textarea></td></tr>";
+
+			print '</table>';
+			print '<br>';
+		}
+
 		print '<table class="border" width="100%">';
 
 		// Accountancy code

htdocs/compta/bank/categ.php

@@ -1,8 +1,8 @@
 <?php
 /* Copyright (C) 2001-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2013 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copytight (C) 2005-2009 Regis Houssin        <regis.houssin@capnetworks.com>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@capnetworks.com>
- * Copytight (C) 2013      Charles-Fr BENKE		<charles.fr@benke.fr>
+ * Copyright (C) 2013      Charles-Fr BENKE		<charles.fr@benke.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

htdocs/compta/bank/class/account.class.php

@@ -1,11 +1,12 @@
 <?php
-/* Copyright (C) 2001-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+/* Copyright (C) 2001-2007	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
- * Copyright (C) 2003      Jean-Louis Bergamo   <jlb@j1b.org>
+ * Copyright (C) 2003		Jean-Louis Bergamo		<jlb@j1b.org>
- * Copyright (C) 2004-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2012	Laurent Destailleur		<eldy@users.sourceforge.net>
- * Copyright (C) 2004      Christophe Combelles <ccomb@free.fr>
+ * Copyright (C) 2004		Christophe Combelles	<ccomb@free.fr>
- * Copyright (C) 2005-2010 Regis Houssin        <regis.houssin@capnetworks.com>
+ * Copyright (C) 2005-2010	Regis Houssin			<regis.houssin@capnetworks.com>
- * Copytight (C) 2013	   Florian Henry        <florian.henry@open-concept.pro>
+ * Copyright (C) 2013		Florian Henry			<florian.henry@open-concept.pro>
- * Copyright (C) 2015      Marcos García           <marcosgdf@gmail.com>
+ * Copyright (C) 2015		Marcos García			<marcosgdf@gmail.com>
+ * Copyright (C) 2015		Alexandre Spangaro		<alexandre.spangaro@gmail.com>
  *
  * 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
@@ -23,7 +24,7 @@
 
 /**
  *	\file       htdocs/compta/bank/class/account.class.php
- *	\ingroup    banque
+ *	\ingroup    bank
  *	\brief      File of class to manage bank accounts
  */
 require_once DOL_DOCUMENT_ROOT .'/core/class/commonobject.class.php';
@@ -389,7 +390,17 @@ class Account extends CommonObject
         $sql.= ", entity";
         $sql.= ", account_number";
 		$sql.= ", accountancy_journal";
-        $sql.= ", currency_code";
+		$sql.= ", bank";
+        $sql.= ", code_banque";
+        $sql.= ", code_guichet";
+        $sql.= ", number";
+        $sql.= ", cle_rib";
+        $sql.= ", bic";
+        $sql.= ", iban_prefix";
+        $sql.= ", domiciliation";
+        $sql.= ", proprio";
+        $sql.= ", owner_address";
+		$sql.= ", currency_code";
         $sql.= ", rappro";
         $sql.= ", min_allowed";
         $sql.= ", min_desired";
@@ -403,6 +414,16 @@ class Account extends CommonObject
         $sql.= ", ".$conf->entity;
         $sql.= ", '".$this->db->escape($this->account_number)."'";
 		$sql.= ", '".$this->db->escape($this->accountancy_journal)."'";
+		$sql.= ", '".$this->db->escape($this->bank)."'";
+        $sql.= ", '".$this->code_banque."'";
+        $sql.= ", '".$this->code_guichet."'";
+        $sql.= ", '".$this->number."'";
+        $sql.= ", '".$this->cle_rib."'";
+        $sql.= ", '".$this->bic."'";
+        $sql.= ", '".$this->iban."'";
+        $sql.= ", '".$this->db->escape($this->domiciliation)."'";
+        $sql.= ", '".$this->db->escape($this->proprio)."'";
+        $sql.= ", '".$this->db->escape($this->owner_address)."'";
         $sql.= ", '".$this->currency_code."'";
         $sql.= ", ".$this->rappro;
         $sql.= ", ".price2num($this->min_allowed);
@@ -447,7 +468,7 @@ class Account extends CommonObject
                     $this->error=$this->db->lasterror();
                     return -3;
                 }
-                
+
                 // Actions on extra fields (by external module or standard code)
                 $hookmanager->initHooks(array('bankdao'));
                 $parameters=array('id'=>$this->id);
@@ -492,8 +513,6 @@ class Account extends CommonObject
         global $langs,$conf, $hookmanager;
 
         // Clean parameters
-        if (! $this->min_allowed) $this->min_allowed=0;
-        if (! $this->min_desired) $this->min_desired=0;
         $this->state_id = ($this->state_id?$this->state_id:$this->state_id);
         $this->country_id = ($this->country_id?$this->country_id:$this->country_id);
 
@@ -524,10 +543,21 @@ class Account extends CommonObject
         $sql.= ",account_number = '".$this->account_number."'";
 		$sql.= ",accountancy_journal = '".$this->accountancy_journal."'";
 
+		$sql.= ",bank  = '".$this->db->escape($this->bank)."'";
+        $sql.= ",code_banque='".$this->code_banque."'";
+        $sql.= ",code_guichet='".$this->code_guichet."'";
+        $sql.= ",number='".$this->number."'";
+        $sql.= ",cle_rib='".$this->cle_rib."'";
+        $sql.= ",bic='".$this->bic."'";
+        $sql.= ",iban_prefix = '".$this->iban."'";
+        $sql.= ",domiciliation='".$this->db->escape($this->domiciliation)."'";
+        $sql.= ",proprio = '".$this->db->escape($this->proprio)."'";
+        $sql.= ",owner_address = '".$this->db->escape($this->owner_address)."'";
+
         $sql.= ",currency_code = '".$this->currency_code."'";
 
-        $sql.= ",min_allowed = '".price2num($this->min_allowed)."'";
+        $sql.= ",min_allowed = ".($this->min_allowed != '' ? price2num($this->min_allowed) : "null");
-        $sql.= ",min_desired = '".price2num($this->min_desired)."'";
+        $sql.= ",min_desired = ".($this->min_desired != '' ? price2num($this->min_desired) : "null");
         $sql.= ",comment     = '".$this->db->escape($this->comment)."'";
 
         $sql.= ",state_id = ".($this->state_id>0?"'".$this->state_id."'":"null");
@@ -540,7 +570,7 @@ class Account extends CommonObject
         $result = $this->db->query($sql);
         if ($result)
         {
-        	
+
         	// Actions on extra fields (by external module or standard code)
         	$hookmanager->initHooks(array('bankdao'));
         	$parameters=array('id'=>$this->id);
@@ -557,8 +587,8 @@ class Account extends CommonObject
         		}
         	}
         	else if ($reshook < 0) return -1;
-        	
+
-        	
+
             return 1;
         }
         else
@@ -704,15 +734,15 @@ class Account extends CommonObject
                 $this->min_allowed    = $obj->min_allowed;
                 $this->min_desired    = $obj->min_desired;
                 $this->comment        = $obj->comment;
-                
+
                 // Retreive all extrafield for thirdparty
                 // fetch optionals attributes and labels
                 require_once(DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php');
                 $extrafields=new ExtraFields($this->db);
                 $extralabels=$extrafields->fetch_name_optionals_label($this->table_element,true);
                 $this->fetch_optionals($this->id,$extralabels);
-                
+
-                
+
                 return 1;
             }
             else
@@ -744,7 +774,7 @@ class Account extends CommonObject
         dol_syslog(get_class($this)."::delete", LOG_DEBUG);
         $result = $this->db->query($sql);
         if ($result) {
-        	
+
         	// Remove extrafields
         	if ((empty($conf->global->MAIN_EXTRAFIELDS_DISABLED))) // For avoid conflicts if trigger used
         	{
@@ -755,7 +785,7 @@ class Account extends CommonObject
         			dol_syslog(get_class($this)."::delete error -4 ".$this->error, LOG_ERR);
         		}
         	}
-        	
+
             return 1;
         }
         else {
@@ -887,7 +917,7 @@ class Account extends CommonObject
      *
      *      @param	User	$user        		Objet user
      *		@param	int		$filteraccountid	To get info for a particular account id
-     *      @return WorkboardResponse|int <0 if KO, WorkboardResponse if OK
+     *      @return WorkboardResponse|int 		<0 if KO, WorkboardResponse if OK
      */
     function load_board($user,$filteraccountid=0)
     {
@@ -910,6 +940,8 @@ class Account extends CommonObject
 	        $langs->load("banks");
 	        $now=dol_now();
 
+            require_once DOL_DOCUMENT_ROOT.'/core/class/workboardresponse.class.php';
+
 	        $response = new WorkboardResponse();
 	        $response->warning_delay=$conf->bank->rappro->warning_delay/60/60/24;
 	        $response->label=$langs->trans("TransactionsToConciliate");
@@ -1042,7 +1074,7 @@ class Account extends CommonObject
      *
      * @return		int        0=No bank code need + Account number is enough
      *                         1=Need 2 fields for bank code: Bank, Desk (France, Spain, ...) + Account number and key
-     *                         2=Neek 1 field for bank code:  Bank only (Sort code for Great Britain, BSB for Australia) + Account number
+     *                         2=Need 1 field for bank code:  Bank only (Sort code for Great Britain, BSB for Australia) + Account number
      */
     function useDetailedBBAN()
     {

htdocs/compta/bank/class/bankcateg.class.php

@@ -300,7 +300,9 @@ class BankCateg // extends CommonObject
 
         $object=new BankCateg($this->db);
 
-        $this->db->begin();
+		$object->context['createfromclone'] = 'createfromclone';
+
+		$this->db->begin();
 
         // Load source object
         $object->fetch($fromid);
@@ -327,6 +329,8 @@ class BankCateg // extends CommonObject
 
         }
 
+        unset($object->context['createfromclone']);
+
         // End
         if (! $error)
         {

htdocs/compta/bank/index.php

@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2001-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2014 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copytight (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
+ * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
  *
  * 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
@@ -174,7 +174,11 @@ foreach ($accounts as $key=>$type)
 		$total[$acc->currency_code] += $solde;
 	}
 }
-if (! $found) print '<tr '.$bc[$var].'><td colspan="6">'.$langs->trans("None").'</td></tr>';
+if (! $found)
+{
+	$var = !$var;
+	print '<tr '.$bc[false].'><td colspan="6">'.$langs->trans("None").'</td></tr>';
+}
 // Total
 foreach ($total as $key=>$solde)
 {

htdocs/compta/bank/treso.php

@@ -1,5 +1,5 @@
 <?php
-/* Copytight (C) 2005-2009 Regis Houssin               <regis.houssin@capnetworks.com>
+/* Copyright (C) 2005-2009 Regis Houssin               <regis.houssin@capnetworks.com>
  * Copyright (C) 2008-2009 Laurent Destailleur (Eldy)  <eldy@users.sourceforge.net>
  * Copyright (C) 2008      Raphael Bertrand (Resultic) <raphael.bertrand@resultic.fr>
  *

htdocs/compta/bank/virement.php

@@ -1,8 +1,8 @@
 <?php
 /* Copyright (C) 2001-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copytight (C) 2005-2009 Regis Houssin        <regis.houssin@capnetworks.com>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@capnetworks.com>
- * Copytight (C) 2012	   Juanjo Menent        <jmenent@2byte.es>
+ * Copyright (C) 2012	   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

htdocs/compta/charges/index.php

@@ -93,9 +93,10 @@ if ($conf->salaries->enabled)
 
 		print_fiche_titre($langs->trans("SalariesPayments").($year?' ('.$langs->trans("Year").' '.$year.')':''), '', '');
 
-		$sql = "SELECT s.rowid, s.amount, s.label, s.datev as dm";
+		$sql = "SELECT s.rowid, s.amount, s.label, s.datev as dm, s.salary, u.salary as current_salary";
-		$sql.= " FROM ".MAIN_DB_PREFIX."payment_salary as s";
+		$sql.= " FROM ".MAIN_DB_PREFIX."payment_salary as s, ".MAIN_DB_PREFIX."user as u";
-		$sql.= " WHERE s.entity = ".$conf->entity;
+		$sql.= " WHERE s.entity IN (".getEntity('user',1).")";
+		$sql.= " AND u.rowid = s.fk_user";
 		if ($year > 0)
 		{
 			// Si period renseignee on l'utilise comme critere de date, sinon on prend date echeance,
@@ -132,11 +133,11 @@ if ($conf->salaries->enabled)
 
 		        print "<td>".$obj->label."</td>\n";
 
-		        print '<td align="right">'.price($obj->amount)."</td>";
+		        print '<td align="right">'.($obj->salary?price($obj->salary):'')."</td>";
 
 		        // Ref payment
-				    $sal_static->id=$obj->rowid;
+				$sal_static->id=$obj->rowid;
-			    	$sal_static->ref=$obj->rowid;
+			    $sal_static->ref=$obj->rowid;
 		        print '<td align="left">'.$sal_static->getNomUrl(1)."</td>\n";
 
 		        print '<td align="center">'.dol_print_date($db->jdate($obj->dm),'day')."</td>\n";
@@ -146,7 +147,7 @@ if ($conf->salaries->enabled)
 		        $i++;
 		    }
 		    print '<tr class="liste_total"><td colspan="2">'.$langs->trans("Total").'</td>';
-		    print '<td align="right">'.price($total)."</td>";
+		    print '<td align="right">'."</td>";
 		    print '<td align="center">&nbsp;</td>';
 		    print '<td align="center">&nbsp;</td>';
 		    print '<td align="right">'.price($total)."</td>";

htdocs/compta/deplacement/card.php

@@ -128,7 +128,7 @@ else if ($action == 'add' && $user->rights->deplacement->creer)
 	        setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Date")), 'errors');
             $error++;
         }
-        if ($object->type == '-1') 	// Otherwise it is TF_LUNCH,...
+        if ($object->type == '-1')
         {
 	        setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Type")), 'errors');
             $error++;

htdocs/compta/facture.php

@@ -58,6 +58,7 @@ $langs->load('compta');
 $langs->load('products');
 $langs->load('banks');
 $langs->load('main');
+if (!empty($conf->incoterm->enabled)) $langs->load('incoterm');
 if (! empty($conf->margin->enabled))
 	$langs->load('margins');
 
@@ -318,6 +319,12 @@ if (empty($reshook))
 			dol_print_error($db, $object->error);
 	}
 
+	// Set incoterm
+	elseif ($action == 'set_incoterms' && !empty($conf->incoterm->enabled))
+    {
+    	$result = $object->setIncoterms(GETPOST('incoterm_id', 'int'), GETPOST('location_incoterms', 'alpha'));
+    }
+	
 	// bank account
 	else if ($action == 'setbankaccount' && $user->rights->facture->creer)
 	{
@@ -646,7 +653,7 @@ if (empty($reshook))
 		// Fill array 'array_options' with data from add form
 		$extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
 		$ret = $extrafields->setOptionalsFromPost($extralabels, $object);
-		if ($ret < 0) $error ++;
+		if ($ret < 0) $error++;
 
 		// Replacement invoice
 		if ($_POST['type'] == Facture::TYPE_REPLACEMENT)
@@ -680,6 +687,8 @@ if (empty($reshook))
 	            $object->fk_account         = GETPOST('fk_account', 'int');
 				$object->remise_absolue		= $_POST['remise_absolue'];
 				$object->remise_percent		= $_POST['remise_percent'];
+				$object->fk_incoterms 		= GETPOST('incoterm_id', 'int');
+				$object->location_incoterms = GETPOST('location_incoterms', 'alpha');
 
 				// Proprietes particulieres a facture de remplacement
 				$object->fk_facture_source = $_POST['fac_replacement'];
@@ -724,6 +733,8 @@ if (empty($reshook))
 	            $object->fk_account         = GETPOST('fk_account', 'int');
 				$object->remise_absolue		= $_POST['remise_absolue'];
 				$object->remise_percent		= $_POST['remise_percent'];
+				$object->fk_incoterms 		= GETPOST('incoterm_id', 'int');
+				$object->location_incoterms = GETPOST('location_incoterms', 'alpha');
 
 				// Proprietes particulieres a facture avoir
 				$object->fk_facture_source = $_POST['fac_avoir'];
@@ -852,6 +863,8 @@ if (empty($reshook))
 				$object->amount				= $_POST['amount'];
 				$object->remise_absolue		= $_POST['remise_absolue'];
 				$object->remise_percent		= $_POST['remise_percent'];
+				$object->fk_incoterms 		= GETPOST('incoterm_id', 'int');
+				$object->location_incoterms = GETPOST('location_incoterms', 'alpha');
 
 				if (GETPOST('type') == Facture::TYPE_SITUATION)
 				{
@@ -1061,10 +1074,10 @@ if (empty($reshook))
 										// Extrafields
 										if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && method_exists($lines[$i], 'fetch_optionals')) {
 											$lines[$i]->fetch_optionals($lines[$i]->rowid);
-											$array_option = $lines[$i]->array_options;
+											$array_options = $lines[$i]->array_options;
 										}
 
-										$result = $object->addline($desc, $lines[$i]->subprice, $lines[$i]->qty, $lines[$i]->tva_tx, $lines[$i]->localtax1_tx, $lines[$i]->localtax2_tx, $lines[$i]->fk_product, $lines[$i]->remise_percent, $date_start, $date_end, 0, $lines[$i]->info_bits, $lines[$i]->fk_remise_except, 'HT', 0, $product_type, $lines[$i]->rang, $lines[$i]->special_code, $object->origin, $lines[$i]->rowid, $fk_parent_line, $lines[$i]->fk_fournprice, $lines[$i]->pa_ht, $label, $array_option, $lines[$i]->situation_percent, $lines[$i]->fk_prev_id);
+										$result = $object->addline($desc, $lines[$i]->subprice, $lines[$i]->qty, $lines[$i]->tva_tx, $lines[$i]->localtax1_tx, $lines[$i]->localtax2_tx, $lines[$i]->fk_product, $lines[$i]->remise_percent, $date_start, $date_end, 0, $lines[$i]->info_bits, $lines[$i]->fk_remise_except, 'HT', 0, $product_type, $lines[$i]->rang, $lines[$i]->special_code, $object->origin, $lines[$i]->rowid, $fk_parent_line, $lines[$i]->fk_fournprice, $lines[$i]->pa_ht, $label, $array_options, $lines[$i]->situation_percent, $lines[$i]->fk_prev_id);
 
 										if ($result > 0) {
 											$lineid = $result;
@@ -1196,7 +1209,7 @@ if (empty($reshook))
 		// Extrafields
 		$extrafieldsline = new ExtraFields($db);
 		$extralabelsline = $extrafieldsline->fetch_name_optionals_label($object->table_element_line);
-		$array_option = $extrafieldsline->getOptionalsFromPost($extralabelsline, $predef);
+		$array_options = $extrafieldsline->getOptionalsFromPost($extralabelsline, $predef);
 		// Unset extrafield
 		if (is_array($extralabelsline)) {
 			// Get extra fields
@@ -1374,7 +1387,7 @@ if (empty($reshook))
 				setEventMessage($mesg, 'errors');
 			} else {
 				// Insert line
-				$result = $object->addline($desc, $pu_ht, $qty, $tva_tx, $localtax1_tx, $localtax2_tx, $idprod, $remise_percent, $date_start, $date_end, 0, $info_bits, '', $price_base_type, $pu_ttc, $type, - 1, $special_code, '', 0, GETPOST('fk_parent_line'), $fournprice, $buyingprice, $label, $array_option, $_POST['progress']);
+				$result = $object->addline($desc, $pu_ht, $qty, $tva_tx, $localtax1_tx, $localtax2_tx, $idprod, $remise_percent, $date_start, $date_end, 0, $info_bits, '', $price_base_type, $pu_ttc, $type, - 1, $special_code, '', 0, GETPOST('fk_parent_line'), $fournprice, $buyingprice, $label, $array_options, $_POST['progress']);
 
 				if ($result > 0)
 				{
@@ -1469,7 +1482,7 @@ if (empty($reshook))
 		// Extrafields
 		$extrafieldsline = new ExtraFields($db);
 		$extralabelsline = $extrafieldsline->fetch_name_optionals_label($object->table_element_line);
-		$array_option = $extrafieldsline->getOptionalsFromPost($extralabelsline);
+		$array_options = $extrafieldsline->getOptionalsFromPost($extralabelsline);
 		// Unset extrafield
 		if (is_array($extralabelsline)) {
 			// Get extra fields
@@ -1528,7 +1541,7 @@ if (empty($reshook))
 
 		// Update line
 		if (! $error) {
-			$result = $object->updateline(GETPOST('lineid'), $description, $pu_ht, $qty, GETPOST('remise_percent'), $date_start, $date_end, $vat_rate, $localtax1_rate, $localtax2_rate, 'HT', $info_bits, $type, GETPOST('fk_parent_line'), 0, $fournprice, $buyingprice, $label, 0, $array_option, GETPOST('progress'));
+			$result = $object->updateline(GETPOST('lineid'), $description, $pu_ht, $qty, GETPOST('remise_percent'), $date_start, $date_end, $vat_rate, $localtax1_rate, $localtax2_rate, 'HT', $info_bits, $type, GETPOST('fk_parent_line'), 0, $fournprice, $buyingprice, $label, 0, $array_options, GETPOST('progress'));
 
 			if ($result >= 0) {
 				if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
@@ -1788,8 +1801,7 @@ if (empty($reshook))
 		// Fill array 'array_options' with data from add form
 		$extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
 		$ret = $extrafields->setOptionalsFromPost($extralabels, $object, GETPOST('attribute'));
-		if ($ret < 0)
+		if ($ret < 0) $error++;
-			$error ++;
 
 		if (! $error) {
 			// Actions on extra fields (by external module or standard code)
@@ -1950,11 +1962,11 @@ if ($action == 'create')
 		// Outstanding Bill
 		$outstandigBills = $soc->get_OutstandingBill();
 		print ' (' . $langs->trans('CurrentOutstandingBill') . ': ';
-		print price($outstandigBills, '', $langs, 0, 0, - 1, $conf->currency);
+		print price($outstandigBills, '', $langs, 0, 0, -1, $conf->currency);
 		if ($soc->outstanding_limit != '')
 		{
 			if ($outstandigBills > $soc->outstanding_limit) print img_warning($langs->trans("OutstandingBillReached"));
-			print ' / ' . price($soc->outstanding_limit);
+			print ' / ' . price($soc->outstanding_limit, '', $langs, 0, 0, -1, $conf->currency);
 		}
 		print ')';
 		print '</td>';
@@ -2268,6 +2280,16 @@ if ($action == 'create')
 		print '</td></tr>';
 	}
 
+	// Incoterms
+	if (!empty($conf->incoterm->enabled))
+	{
+		print '<tr>';
+		print '<td><label for="incoterm_id">'.$form->textwithpicto($langs->trans("IncotermLabel"), $objectsrc->libelle_incoterms, 1).'</label></td>';
+        print '<td colspan="3" class="maxwidthonsmartphone">';
+        print $form->select_incoterms((!empty($objectsrc->fk_incoterms) ? $objectsrc->fk_incoterms : ''), (!empty($objectsrc->location_incoterms)?$objectsrc->location_incoterms:''));
+		print '</td></tr>';
+	}
+	
 	// Other attributes
 	$parameters = array('objectsrc' => $objectsrc,'colspan' => ' colspan="3"');
 	$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by
@@ -3367,6 +3389,29 @@ if ($action == 'create')
 		print '</td>';
 		print '</tr>';
 	}
+	
+	// Incoterms
+	if (!empty($conf->incoterm->enabled))
+	{			
+		print '<tr><td>';
+        print '<table width="100%" class="nobordernopadding"><tr><td>';
+        print $langs->trans('IncotermLabel');
+        print '<td><td align="right">';
+        if ($user->rights->facture->creer) print '<a href="'.DOL_URL_ROOT.'/compta/facture.php?facid='.$object->id.'&action=editincoterm">'.img_edit().'</a>';
+        else print '&nbsp;';
+        print '</td></tr></table>';
+        print '</td>';
+        print '<td colspan="3">';
+		if ($action != 'editincoterm')
+		{
+			print $form->textwithpicto($object->display_incoterms(), $object->libelle_incoterms, 1);
+		}
+		else 
+		{
+			print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms)?$object->location_incoterms:''), $_SERVER['PHP_SELF'].'?id='.$object->id);
+		}
+        print '</td></tr>';
+	}
 
 	// Other attributes
 	$cols = 5;
@@ -3858,13 +3903,13 @@ if ($action == 'create')
 		$formmail->withdeliveryreceipt = 1;
 		$formmail->withcancel = 1;
 		// Tableau des substitutions
-		$formmail->substit ['__FACREF__'] = $object->ref;
+		$formmail->substit['__FACREF__'] = $object->ref;
-		$formmail->substit ['__SIGNATURE__'] = $user->signature;
+		$formmail->substit['__SIGNATURE__'] = $user->signature;
-		$formmail->substit ['__REFCLIENT__'] = $object->ref_client;
+		$formmail->substit['__REFCLIENT__'] = $object->ref_client;
-		$formmail->substit ['__THIRPARTY_NAME__'] = $object->thirdparty->name;
+		$formmail->substit['__THIRPARTY_NAME__'] = $object->thirdparty->name;
-		$formmail->substit ['__PROJECT_REF__'] = (is_object($object->projet)?$object->projet->ref:'');
+		$formmail->substit['__PROJECT_REF__'] = (is_object($object->projet)?$object->projet->ref:'');
-		$formmail->substit ['__PERSONALIZED__'] = '';
+		$formmail->substit['__PERSONALIZED__'] = '';
-		$formmail->substit ['__CONTACTCIVNAME__'] = '';
+		$formmail->substit['__CONTACTCIVNAME__'] = '';
 
 		// Find the good contact adress
 		$custcontact = '';
@@ -3873,7 +3918,7 @@ if ($action == 'create')
 
 		if (is_array($contactarr) && count($contactarr) > 0) {
 			foreach ($contactarr as $contact) {
-				if ($contact ['libelle'] == $langs->trans('TypeContact_facture_external_BILLING')) {	// TODO Use code and not label
+				if ($contact['libelle'] == $langs->trans('TypeContact_facture_external_BILLING')) {	// TODO Use code and not label
 
 					require_once DOL_DOCUMENT_ROOT . '/contact/class/contact.class.php';
 
@@ -3884,15 +3929,15 @@ if ($action == 'create')
 			}
 
 			if (! empty($custcontact)) {
-				$formmail->substit ['__CONTACTCIVNAME__'] = $custcontact;
+				$formmail->substit['__CONTACTCIVNAME__'] = $custcontact;
 			}
 		}
 
 		// Tableau des parametres complementaires du post
-		$formmail->param ['action'] = $action;
+		$formmail->param['action'] = $action;
-		$formmail->param ['models'] = $modelmail;
+		$formmail->param['models'] = $modelmail;
-		$formmail->param ['facid'] = $object->id;
+		$formmail->param['facid'] = $object->id;
-		$formmail->param ['returnurl'] = $_SERVER["PHP_SELF"] . '?id=' . $object->id;
+		$formmail->param['returnurl'] = $_SERVER["PHP_SELF"] . '?id=' . $object->id;
 
 		// Init list of files
 		if (GETPOST("mode") == 'init') {

htdocs/compta/facture/admin/facture_cust_extrafields.php

@@ -62,10 +62,8 @@ require DOL_DOCUMENT_ROOT.'/core/actions_extrafields.inc.php';
 
 $textobject=strtolower($langs->transnoentitiesnoconv("BillsCustomers"));
 
-
 llxHeader('',$langs->trans("BillsSetup"));
 
-
 $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
 print_fiche_titre($langs->trans("BillsSetup"),$linkback,'setup');
 print '<br>';
@@ -74,44 +72,7 @@ $head = invoice_admin_prepare_head();
 
 dol_fiche_head($head, 'attributes', $langs->trans("Invoices"), 0, 'invoice');
 
-
+require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
-print $langs->trans("DefineHereComplementaryAttributes",$textobject).'<br><br>'."\n";
-
-// Load attribute_label
-$extrafields->fetch_name_optionals_label($elementtype);
-
-print "<table summary=\"listofattributes\" class=\"noborder\" width=\"100%\">";
-
-print '<tr class="liste_titre">';
-print '<td align="center">'.$langs->trans("Position").'</td>';
-print '<td>'.$langs->trans("Label").'</td>';
-print '<td>'.$langs->trans("AttributeCode").'</td>';
-print '<td>'.$langs->trans("Type").'</td>';
-print '<td align="right">'.$langs->trans("Size").'</td>';
-print '<td align="center">'.$langs->trans("Unique").'</td>';
-print '<td align="center">'.$langs->trans("Required").'</td>';
-print '<td width="80">&nbsp;</td>';
-print "</tr>\n";
-
-$var=True;
-foreach($extrafields->attribute_type as $key => $value)
-{
-    $var=!$var;
-    print "<tr ".$bc[$var].">";
-    print "<td>".$extrafields->attribute_pos[$key]."</td>\n";
-    print "<td>".$extrafields->attribute_label[$key]."</td>\n";
-    print "<td>".$key."</td>\n";
-    print "<td>".$type2label[$extrafields->attribute_type[$key]]."</td>\n";
-    print '<td align="right">'.$extrafields->attribute_size[$key]."</td>\n";
-    print '<td align="center">'.yn($extrafields->attribute_unique[$key])."</td>\n";
-    print '<td align="center">'.yn($extrafields->attribute_required[$key])."</td>\n";
-    print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=edit&attrname='.$key.'">'.img_edit().'</a>';
-    print "&nbsp; <a href=\"".$_SERVER["PHP_SELF"]."?action=delete&attrname=$key\">".img_delete()."</a></td>\n";
-    print "</tr>";
-    // $i++;
-}
-
-print "</table>";
 
 dol_fiche_end();
 
@@ -147,7 +108,7 @@ if ($action == 'create')
 if ($action == 'edit' && ! empty($attrname))
 {
 	$langs->load("members");
-	
+
 	print "<br>";
     print_titre($langs->trans("FieldEdition", $attrname));
 

htdocs/compta/facture/admin/facturedet_cust_extrafields.php

@@ -63,10 +63,8 @@ require DOL_DOCUMENT_ROOT.'/core/actions_extrafields.inc.php';
 
 $textobject=strtolower($langs->transnoentitiesnoconv("BillsCustomers"));
 
-
 llxHeader('',$langs->trans("BillsSetup"));
 
-
 $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
 print_fiche_titre($langs->trans("BillsSetup"),$linkback,'setup');
 print '<br>';
@@ -75,44 +73,7 @@ $head = invoice_admin_prepare_head();
 
 dol_fiche_head($head, 'attributeslines', $langs->trans("Invoices"), 0, 'invoice');
 
-
+require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
-print $langs->trans("DefineHereComplementaryAttributes",$textobject).'<br><br>'."\n";
-
-// Load attribute_label
-$extrafields->fetch_name_optionals_label($elementtype);
-
-print "<table summary=\"listofattributes\" class=\"noborder\" width=\"100%\">";
-
-print '<tr class="liste_titre">';
-print '<td align="center">'.$langs->trans("Position").'</td>';
-print '<td>'.$langs->trans("Label").'</td>';
-print '<td>'.$langs->trans("AttributeCode").'</td>';
-print '<td>'.$langs->trans("Type").'</td>';
-print '<td align="right">'.$langs->trans("Size").'</td>';
-print '<td align="center">'.$langs->trans("Unique").'</td>';
-print '<td align="center">'.$langs->trans("Required").'</td>';
-print '<td width="80">&nbsp;</td>';
-print "</tr>\n";
-
-$var=True;
-foreach($extrafields->attribute_type as $key => $value)
-{
-    $var=!$var;
-    print "<tr ".$bc[$var].">";
-    print "<td>".$extrafields->attribute_pos[$key]."</td>\n";
-    print "<td>".$extrafields->attribute_label[$key]."</td>\n";
-    print "<td>".$key."</td>\n";
-    print "<td>".$type2label[$extrafields->attribute_type[$key]]."</td>\n";
-    print '<td align="right">'.$extrafields->attribute_size[$key]."</td>\n";
-    print '<td align="center">'.yn($extrafields->attribute_unique[$key])."</td>\n";
-    print '<td align="center">'.yn($extrafields->attribute_required[$key])."</td>\n";
-    print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=edit&attrname='.$key.'">'.img_edit().'</a>';
-    print "&nbsp; <a href=\"".$_SERVER["PHP_SELF"]."?action=delete&attrname=$key\">".img_delete()."</a></td>\n";
-    print "</tr>";
-    // $i++;
-}
-
-print "</table>";
 
 dol_fiche_end();
 

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

@@ -131,6 +131,11 @@ class Facture extends CommonInvoice
 	var $specimen;
 
 	var $fac_rec;
+	
+	//Incoterms
+	var $fk_incoterms;
+	var $location_incoterms;
+	var $libelle_incoterms;  //Used into tooltip
 
 	/**
 	 * @var int Situation cycle reference number
@@ -245,6 +250,8 @@ class Facture extends CommonInvoice
 			$this->mode_reglement_id = $_facrec->mode_reglement_id;
 			$this->remise_absolue    = $_facrec->remise_absolue;
 			$this->remise_percent    = $_facrec->remise_percent;
+			$this->fk_incoterms		 = $_facrec->fk_incoterms;
+			$this->location_incoterms= $_facrec->location_incoterms;
 
 			// Clean parametres
 			if (! $this->type) $this->type = self::TYPE_STANDARD;
@@ -279,6 +286,7 @@ class Facture extends CommonInvoice
 		$sql.= ", fk_facture_source, fk_user_author, fk_projet";
 		$sql.= ", fk_cond_reglement, fk_mode_reglement, date_lim_reglement, model_pdf";
 		$sql.= ", situation_cycle_ref, situation_counter, situation_final";
+		$sql.= ", fk_incoterms, location_incoterms";
 		$sql.= ")";
 		$sql.= " VALUES (";
 		$sql.= "'(PROV)'";
@@ -304,6 +312,8 @@ class Facture extends CommonInvoice
 		$sql.= ", ".($this->situation_cycle_ref?"'".$this->db->escape($this->situation_cycle_ref)."'":"null");
 		$sql.= ", ".($this->situation_counter?"'".$this->db->escape($this->situation_counter)."'":"null");
 		$sql.= ", ".($this->situation_final?$this->situation_final:0);
+		$sql.= ", ".(int) $this->fk_incoterms;
+        $sql.= ", '".$this->db->escape($this->location_incoterms)."'";
 		$sql.=")";
 
 		dol_syslog(get_class($this)."::create", LOG_DEBUG);
@@ -639,6 +649,8 @@ class Facture extends CommonInvoice
 
 		$error=0;
 
+		$this->context['createfromclone'] = 'createfromclone';
+
 		$this->db->begin();
 
 		// get extrafields so they will be clone
@@ -725,6 +737,8 @@ class Facture extends CommonInvoice
             // End call triggers
 		}
 
+		unset($this->context['createfromclone']);
+
 		// End
 		if (! $error)
 		{
@@ -921,9 +935,12 @@ class Facture extends CommonInvoice
 		$sql.= ', f.fk_account';
 		$sql.= ', p.code as mode_reglement_code, p.libelle as mode_reglement_libelle';
 		$sql.= ', c.code as cond_reglement_code, c.libelle as cond_reglement_libelle, c.libelle_facture as cond_reglement_libelle_doc';
+        $sql.= ', f.fk_incoterms, f.location_incoterms';
+        $sql.= ", i.libelle as libelle_incoterms";
 		$sql.= ' FROM '.MAIN_DB_PREFIX.'facture as f';
 		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_payment_term as c ON f.fk_cond_reglement = c.rowid';
 		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement as p ON f.fk_mode_reglement = p.id';
+		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_incoterms as i ON f.fk_incoterms = i.rowid';
 		$sql.= ' WHERE f.entity = '.$conf->entity;
 		if ($rowid)   $sql.= " AND f.rowid=".$rowid;
 		if ($ref)     $sql.= " AND f.facnumber='".$this->db->escape($ref)."'";
@@ -983,6 +1000,11 @@ class Facture extends CommonInvoice
 				$this->situation_final      = $obj->situation_final;
 				$this->extraparams			= (array) json_decode($obj->extraparams, true);
 
+				//Incoterms
+				$this->fk_incoterms = $obj->fk_incoterms;
+				$this->location_incoterms = $obj->location_incoterms;									
+				$this->libelle_incoterms = $obj->libelle_incoterms;
+				
 				if ($this->statut == 0)	$this->brouillon = 1;
 
 				// Retreive all extrafield for invoice
@@ -2030,12 +2052,12 @@ class Facture extends CommonInvoice
 	 * 		@param		int			$fk_fournprice		Supplier price id (to calculate margin) or ''
 	 * 		@param		int			$pa_ht				Buying price of line (to calculate margin) or ''
 	 * 		@param		string		$label				Label of the line (deprecated, do not use)
-	 *		@param		array		$array_option		extrafields array
+	 *		@param		array		$array_options		extrafields array
 	 *      @param      int         $situation_percent  Situation advance percentage
 	 *      @param      int         $fk_prev_id         Previous situation line id reference
 	 *    	@return    	int             				<0 if KO, Id of line if OK
 	 */
-	function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1=0, $txlocaltax2=0, $fk_product=0, $remise_percent=0, $date_start='', $date_end='', $ventil=0, $info_bits=0, $fk_remise_except='', $price_base_type='HT', $pu_ttc=0, $type=self::TYPE_STANDARD, $rang=-1, $special_code=0, $origin='', $origin_id=0, $fk_parent_line=0, $fk_fournprice=null, $pa_ht=0, $label='', $array_option=0, $situation_percent=100, $fk_prev_id='')
+	function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1=0, $txlocaltax2=0, $fk_product=0, $remise_percent=0, $date_start='', $date_end='', $ventil=0, $info_bits=0, $fk_remise_except='', $price_base_type='HT', $pu_ttc=0, $type=self::TYPE_STANDARD, $rang=-1, $special_code=0, $origin='', $origin_id=0, $fk_parent_line=0, $fk_fournprice=null, $pa_ht=0, $label='', $array_options=0, $situation_percent=100, $fk_prev_id='')
 	{
 		global $mysoc, $conf, $langs;
 
@@ -2120,6 +2142,9 @@ class Facture extends CommonInvoice
 
 			// Insert line
 			$this->line=new FactureLigne($this->db);
+
+			$this->line->context = $this->context;
+
 			$this->line->fk_facture=$this->id;
 			$this->line->label=$label;	// deprecated
 			$this->line->desc=$desc;
@@ -2155,8 +2180,8 @@ class Facture extends CommonInvoice
 			$this->line->fk_fournprice = $fk_fournprice;
 			$this->line->pa_ht = $pa_ht;
 
-			if (is_array($array_option) && count($array_option)>0) {
+			if (is_array($array_options) && count($array_options)>0) {
-				$this->line->array_options=$array_option;
+				$this->line->array_options=$array_options;
 			}
 
 			$result=$this->line->insert();
@@ -2210,11 +2235,11 @@ class Facture extends CommonInvoice
 	 * 	@param		int			$pa_ht				Price (without tax) of product when it was bought
 	 * 	@param		string		$label				Label of the line (deprecated, do not use)
 	 * 	@param		int			$special_code		Special code (also used by externals modules!)
-     *  @param		array		$array_option		extrafields array
+     *  @param		array		$array_options		extrafields array
 	 * @param       int         $situation_percent  Situation advance percentage
 	 *  @return    	int             				< 0 if KO, > 0 if OK
 	 */
-	function updateline($rowid, $desc, $pu, $qty, $remise_percent, $date_start, $date_end, $txtva, $txlocaltax1=0, $txlocaltax2=0, $price_base_type='HT', $info_bits=0, $type= self::TYPE_STANDARD, $fk_parent_line=0, $skip_update_total=0, $fk_fournprice=null, $pa_ht=0, $label='', $special_code=0, $array_option=0, $situation_percent=0)
+	function updateline($rowid, $desc, $pu, $qty, $remise_percent, $date_start, $date_end, $txtva, $txlocaltax1=0, $txlocaltax2=0, $price_base_type='HT', $info_bits=0, $type= self::TYPE_STANDARD, $fk_parent_line=0, $skip_update_total=0, $fk_fournprice=null, $pa_ht=0, $label='', $special_code=0, $array_options=0, $situation_percent=0)
 	{
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
 
@@ -2263,7 +2288,9 @@ class Facture extends CommonInvoice
 			// Update line into database
 			$this->line=new FactureLigne($this->db);
 
-			// Stock previous line records
+            $this->line->context = $this->context;
+
+            // Stock previous line records
 			$staticline=new FactureLigne($this->db);
 			$staticline->fetch($rowid);
 			$this->line->oldline = $staticline;
@@ -2313,8 +2340,8 @@ class Facture extends CommonInvoice
 			}
 			$this->line->pa_ht = $pa_ht;
 
-			if (is_array($array_option) && count($array_option)>0) {
+			if (is_array($array_options) && count($array_options)>0) {
-				$this->line->array_options=$array_option;
+				$this->line->array_options=$array_options;
 			}
 
 			$result=$this->line->update();
@@ -2403,6 +2430,8 @@ class Facture extends CommonInvoice
 
 		$line=new FactureLigne($this->db);
 
+        $line->context = $this->context;
+
 		// For triggers
 		$line->fetch($rowid);
 
@@ -3220,6 +3249,8 @@ class Facture extends CommonInvoice
 		$this->note_public='This is a comment (public)';
 		$this->note_private='This is a comment (private)';
 		$this->note='This is a comment (private)';
+		$this->fk_incoterms=0;
+		$this->location_incoterms='';
 
 		if (empty($option) || $option != 'nolines')
 		{

htdocs/compta/facture/class/paymentterm.class.php

@@ -33,6 +33,7 @@ class PaymentTerm // extends CommonObject
 	var $errors=array();				//!< To return several error codes (or messages)
 	//public  $element='c_payment_term';			//!< Id that identify managed objects
 	//public  $table_element='c_payment_term';	//!< Name of table without prefix where object is stored
+	var $context =array();
 
     var $id;
 
@@ -409,6 +410,8 @@ class PaymentTerm // extends CommonObject
 
 		$object=new PaymentTerm($this->db);
 
+		$object->context['createfromclone'] = 'createfromclone';
+
 		$this->db->begin();
 
 		// Load source object
@@ -436,6 +439,8 @@ class PaymentTerm // extends CommonObject
 
 		}
 
+		unset($this->context['createfromclone']);
+
 		// End
 		if (! $error)
 		{

htdocs/compta/facture/list.php

@@ -187,13 +187,13 @@ if ($search_societe)
 {
     $sql .= natural_search('s.nom', $search_societe);
 }
-if ($search_montant_ht)
+if ($search_montant_ht != '')
 {
-    $sql.= ' AND f.total = \''.$db->escape(price2num(trim($search_montant_ht))).'\'';
+    $sql.= natural_search('f.total', $search_montant_ht, 1);
 }
-if ($search_montant_ttc)
+if ($search_montant_ttc != '')
 {
-    $sql.= ' AND f.total_ttc = \''.$db->escape(price2num(trim($search_montant_ttc))).'\'';
+    $sql.= natural_search('f.total_ttc', $search_montant_ttc, 1);
 }
 if ($search_status != '')
 {
@@ -263,8 +263,8 @@ if ($resql)
     if ($search_societe)     $param.='&search_societe=' .$search_societe;
     if ($search_sale > 0)    $param.='&search_sale=' .$search_sale;
     if ($search_user > 0)    $param.='&search_user=' .$search_user;
-    if ($search_montant_ht)  $param.='&search_montant_ht='.$search_montant_ht;
+    if ($search_montant_ht != '')  $param.='&search_montant_ht='.$search_montant_ht;
-    if ($search_montant_ttc) $param.='&search_montant_ttc='.$search_montant_ttc;
+    if ($search_montant_ttc != '') $param.='&search_montant_ttc='.$search_montant_ttc;
     print_barre_liste($langs->trans('BillsCustomers').' '.($socid?' '.$soc->name:''),$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num,$nbtotalofrecords);
 
     $i = 0;
@@ -323,9 +323,9 @@ if ($resql)
     print '</td>';
     print '<td class="liste_titre" align="left">&nbsp;</td>';
     print '<td class="liste_titre" align="left"><input class="flat" type="text" name="search_societe" value="'.$search_societe.'"></td>';
-    print '<td class="liste_titre" align="right"><input class="flat" type="text" size="10" name="search_montant_ht" value="'.$search_montant_ht.'"></td>';
+    print '<td class="liste_titre" align="right"><input class="flat" type="text" size="6" name="search_montant_ht" value="'.$search_montant_ht.'"></td>';
     print '<td class="liste_titre" align="right">&nbsp;</td>';
-    print '<td class="liste_titre" align="right"><input class="flat" type="text" size="10" name="search_montant_ttc" value="'.$search_montant_ttc.'"></td>';
+    print '<td class="liste_titre" align="right"><input class="flat" type="text" size="6" name="search_montant_ttc" value="'.$search_montant_ttc.'"></td>';
     print '<td class="liste_titre" align="right">&nbsp;</td>';
     print '<td class="liste_titre" align="right"><input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
 	print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';

htdocs/compta/hrm.php

@@ -2,6 +2,7 @@
 /* Copyright (C) 2011		Dimitri Mouillard	<dmouillard@teclib.com>
  * Copyright (C) 2013-2014	Laurent Destailleur	<eldy@users.sourceforge.net>
  * Copyright (C) 2012-2014	Regis Houssin		<regis.houssin@capnetworks.com>
+ * Copyright (C) 2015		Alexandre Spangaro	<alexandre.spangaro@gmail.com>
  *
  * 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
@@ -31,7 +32,8 @@ require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
 require_once DOL_DOCUMENT_ROOT.'/user/class/usergroup.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/compta/deplacement/class/deplacement.class.php';
+if ($conf->deplacement->enabled) require_once DOL_DOCUMENT_ROOT.'/compta/deplacement/class/deplacement.class.php';
+if ($conf->expensereport->enabled) require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
 require_once DOL_DOCUMENT_ROOT.'/holiday/class/holiday.class.php';
 
 $langs->load('users');
@@ -69,6 +71,39 @@ print_fiche_titre($langs->trans("HRMArea"));
 
 print '<div class="fichecenter"><div class="fichethirdleft">';
 
+/*
+ * Search expenses
+ */
+if (! empty($conf->deplacement->enabled) && $user->rights->deplacement->lire)
+{
+	$langs->load("trips");
+    print '<form method="post" action="'.DOL_URL_ROOT.'/compta/deplacement/list.php">';
+    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+    print '<table class="noborder nohover" width="100%">';
+    print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("SearchATripAndExpense").'</td></tr>';
+    print "<tr ".$bc[0].">";
+    print "<td><label for=\"search_ref\">".$langs->trans("Ref").'</label>:</td><td><input type="text" name="search_ref" id="search_ref" class="flat" size="18"></td>';
+    print '<td><input type="submit" value="'.$langs->trans("Search").'" class="button"></td>';
+    //print "<tr ".$bc[0]."><td><label for=\"sall\">".$langs->trans("Other").'</label>:</td><td><input type="text" name="sall" id="sall" class="flat" size="18"></td>';
+    print '</tr>';
+    print "</table></form><br>";
+}
+
+if (! empty($conf->expensereport->enabled) && $user->rights->expensereport->lire)
+{
+	$langs->load("trips");
+    print '<form method="post" action="'.DOL_URL_ROOT.'/expensereport/list.php">';
+    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+    print '<table class="noborder nohover" width="100%">';
+    print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("SearchATripAndExpense").'</td></tr>';
+    print "<tr ".$bc[0].">";
+    print "<td><label for=\"search_ref\">".$langs->trans("Ref").'</label>:</td><td><input type="text" name="search_ref" id="search_ref" class="flat" size="18"></td>';
+    print '<td><input type="submit" value="'.$langs->trans("Search").'" class="button"></td>';
+    //print "<tr ".$bc[0]."><td><label for=\"sall\">".$langs->trans("Other").'</label>:</td><td><input type="text" name="sall" id="sall" class="flat" size="18"></td>';
+    print '</tr>';
+    print "</table></form><br>";
+}
+
 
 if (! empty($conf->holiday->enabled))
 {
@@ -89,25 +124,6 @@ if (! empty($conf->holiday->enabled))
 }
 
 
-/*
- * Search expenses
- */
-if (! empty($conf->deplacement->enabled) && $user->rights->deplacement->lire)
-{
-	$langs->load("trips");
-    print '<form method="post" action="'.DOL_URL_ROOT.'/compta/deplacement/list.php">';
-    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-    print '<table class="noborder nohover" width="100%">';
-    print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("SearchATripAndExpense").'</td></tr>';
-    print "<tr ".$bc[0].">";
-    print "<td><label for=\"search_ref\">".$langs->trans("Ref").'</label>:</td><td><input type="text" name="search_ref" id="search_ref" class="flat" size="18"></td>';
-    print '<td><input type="submit" value="'.$langs->trans("Search").'" class="button"></td>';
-    //print "<tr ".$bc[0]."><td><label for=\"sall\">".$langs->trans("Other").'</label>:</td><td><input type="text" name="sall" id="sall" class="flat" size="18"></td>';
-    print '</tr>';
-    print "</table></form><br>";
-}
-
-
 print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
 
 $max=10;
@@ -115,65 +131,131 @@ $max=10;
 $langs->load("boxes");
 
 // Last trips
-$sql = "SELECT u.rowid as uid, u.lastname, u.firstname, d.rowid, d.dated as date, d.tms as dm, d.km, d.fk_statut";
+if (! empty($conf->deplacement->enabled) && $user->rights->deplacement->lire)
-$sql.= " FROM ".MAIN_DB_PREFIX."deplacement as d, ".MAIN_DB_PREFIX."user as u";
-if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-$sql.= " WHERE u.rowid = d.fk_user";
-$sql.= " AND d.entity = ".$conf->entity;
-if (empty($user->rights->deplacement->readall) && empty($user->rights->deplacement->lire_tous)) $sql.=' AND d.fk_user IN ('.join(',',$childids).')';
-if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND d.fk_soc = s. rowid AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-if (!empty($socid)) $sql.= " AND d.fk_soc = ".$socid;
-$sql.= $db->order("d.tms","DESC");
-$sql.= $db->plimit($max, 0);
-
-$result = $db->query($sql);
-if ($result)
 {
-    $var=false;
+	$sql = "SELECT u.rowid as uid, u.lastname, u.firstname, d.rowid, d.dated as date, d.tms as dm, d.km, d.fk_statut";
-    $num = $db->num_rows($result);
+	$sql.= " FROM ".MAIN_DB_PREFIX."deplacement as d, ".MAIN_DB_PREFIX."user as u";
+	if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+	$sql.= " WHERE u.rowid = d.fk_user";
+	$sql.= " AND d.entity = ".$conf->entity;
+	if (empty($user->rights->deplacement->readall) && empty($user->rights->deplacement->lire_tous)) $sql.=' AND d.fk_user IN ('.join(',',$childids).')';
+	if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND d.fk_soc = s. rowid AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+	if (!empty($socid)) $sql.= " AND d.fk_soc = ".$socid;
+	$sql.= $db->order("d.tms","DESC");
+	$sql.= $db->plimit($max, 0);
 
-    $i = 0;
+	$result = $db->query($sql);
+	if ($result)
+	{
+		$var=false;
+		$num = $db->num_rows($result);
 
-    print '<table class="noborder" width="100%">';
+		$i = 0;
-    print '<tr class="liste_titre">';
-    print '<td colspan="2">'.$langs->trans("BoxTitleLastModifiedExpenses",min($max,$num)).'</td>';
-    print '<td align="right">'.$langs->trans("FeesKilometersOrAmout").'</td>';
-    print '<td align="right">'.$langs->trans("DateModificationShort").'</td>';
-    print '<td width="16">&nbsp;</td>';
-    print '</tr>';
-    if ($num)
-    {
-        $total_ttc = $totalam = $total = 0;
 
-        $deplacementstatic=new Deplacement($db);
+		print '<table class="noborder" width="100%">';
-        $userstatic=new User($db);
+		print '<tr class="liste_titre">';
-        while ($i < $num && $i < $max)
+		print '<td colspan="2">'.$langs->trans("BoxTitleLastModifiedExpenses",min($max,$num)).'</td>';
-        {
+		print '<td align="right">'.$langs->trans("FeesKilometersOrAmout").'</td>';
-            $obj = $db->fetch_object($result);
+		print '<td align="right">'.$langs->trans("DateModificationShort").'</td>';
-            $deplacementstatic->ref=$obj->rowid;
+		print '<td width="16">&nbsp;</td>';
-            $deplacementstatic->id=$obj->rowid;
+		print '</tr>';
-            $userstatic->id=$obj->uid;
+		if ($num)
-            $userstatic->lastname=$obj->lastname;
+		{
-            $userstatic->firstname=$obj->firstname;
+			$total_ttc = $totalam = $total = 0;
-            print '<tr '.$bc[$var].'>';
-            print '<td>'.$deplacementstatic->getNomUrl(1).'</td>';
-            print '<td>'.$userstatic->getNomUrl(1).'</td>';
-            print '<td align="right">'.$obj->km.'</td>';
-            print '<td align="right">'.dol_print_date($db->jdate($obj->dm),'day').'</td>';
-            print '<td>'.$deplacementstatic->LibStatut($obj->fk_statut,3).'</td>';
-            print '</tr>';
-            $var=!$var;
-            $i++;
-        }
 
-    }
+			$deplacementstatic=new Deplacement($db);
-    else
+			$userstatic=new User($db);
-    {
+			while ($i < $num && $i < $max)
-        print '<tr '.$bc[$var].'><td colspan="5">'.$langs->trans("None").'</td></tr>';
+			{
-    }
+				$obj = $db->fetch_object($result);
-    print '</table><br>';
+				$deplacementstatic->ref=$obj->rowid;
+				$deplacementstatic->id=$obj->rowid;
+				$userstatic->id=$obj->uid;
+				$userstatic->lastname=$obj->lastname;
+				$userstatic->firstname=$obj->firstname;
+				print '<tr '.$bc[$var].'>';
+				print '<td>'.$deplacementstatic->getNomUrl(1).'</td>';
+				print '<td>'.$userstatic->getNomUrl(1).'</td>';
+				print '<td align="right">'.$obj->km.'</td>';
+				print '<td align="right">'.dol_print_date($db->jdate($obj->dm),'day').'</td>';
+				print '<td>'.$deplacementstatic->LibStatut($obj->fk_statut,3).'</td>';
+				print '</tr>';
+				$var=!$var;
+				$i++;
+			}
+
+		}
+		else
+		{
+			print '<tr '.$bc[$var].'><td colspan="5">'.$langs->trans("None").'</td></tr>';
+		}
+		print '</table><br>';
+	}
+	else dol_print_error($db);
+}
+
+if (! empty($conf->expensereport->enabled) && $user->rights->expensereport->lire)
+{
+	$sql = "SELECT u.rowid as uid, u.lastname, u.firstname, x.rowid, x.date_debut as date, x.tms as dm, x.total_ttc";
+	$sql.= " FROM ".MAIN_DB_PREFIX."expensereport as x, ".MAIN_DB_PREFIX."user as u";
+	if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+	$sql.= " WHERE u.rowid = x.fk_user_author";
+	$sql.= " AND x.entity = ".$conf->entity;
+	if (empty($user->rights->expensereport->readall) && empty($user->rights->expensereport->lire_tous)) $sql.=' AND x.fk_user_author IN ('.join(',',$childids).')';
+	//if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND x.fk_soc = s. rowid AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+	//if (!empty($socid)) $sql.= " AND x.fk_soc = ".$socid;
+	$sql.= $db->order("x.tms","DESC");
+	$sql.= $db->plimit($max, 0);
+
+	$result = $db->query($sql);
+	if ($result)
+	{
+		$var=false;
+		$num = $db->num_rows($result);
+
+		$i = 0;
+
+		print '<table class="noborder" width="100%">';
+		print '<tr class="liste_titre">';
+		print '<td colspan="2">'.$langs->trans("BoxTitleLastModifiedExpenses",min($max,$num)).'</td>';
+		print '<td align="right">'.$langs->trans("FeesAmount").'</td>';
+		print '<td align="right">'.$langs->trans("DateModificationShort").'</td>';
+		print '<td width="16">&nbsp;</td>';
+		print '</tr>';
+		if ($num)
+		{
+			$total_ttc = $totalam = $total = 0;
+
+			$expensereportstatic=new ExpenseReport($db);
+			$userstatic=new User($db);
+			while ($i < $num && $i < $max)
+			{
+				$obj = $db->fetch_object($result);
+				$expensereportstatic->ref=$obj->rowid;
+				$expensereportstatic->id=$obj->rowid;
+				$userstatic->id=$obj->uid;
+				$userstatic->lastname=$obj->lastname;
+				$userstatic->firstname=$obj->firstname;
+				print '<tr '.$bc[$var].'>';
+				print '<td>'.$expensereportstatic->getNomUrl(1).'</td>';
+				print '<td>'.$userstatic->getNomUrl(1).'</td>';
+				print '<td align="right">'.$obj->total_ttc.'</td>';
+				print '<td align="right">'.dol_print_date($db->jdate($obj->dm),'day').'</td>';
+				//print '<td>'.$expensereportstatic->LibStatut($obj->fk_statut,3).'</td>';
+				print '</tr>';
+				$var=!$var;
+				$i++;
+			}
+
+		}
+		else
+		{
+			print '<tr '.$bc[$var].'><td colspan="5">'.$langs->trans("None").'</td></tr>';
+		}
+		print '</table><br>';
+	}
+	else dol_print_error($db);
 }
-else dol_print_error($db);
 
 
 print '</div></div></div>';

htdocs/compta/prelevement/class/bonprelevement.class.php

@@ -897,7 +897,7 @@ class BonPrelevement extends CommonObject
 
 				$sql = "SELECT substring(ref from char_length(ref) - 1)";
 				$sql.= " FROM ".MAIN_DB_PREFIX."prelevement_bons";
-				$sql.= " WHERE ref LIKE '%".$ref."%'";
+				$sql.= " WHERE ref LIKE '%".$this->db->escape($ref)."%'";
 				$sql.= " AND entity = ".$conf->entity;
 				$sql.= " ORDER BY ref DESC LIMIT 1";
 
@@ -935,13 +935,13 @@ class BonPrelevement extends CommonObject
 	                else
 	                {
 	                    $error++;
-	                    dol_syslog(__METHOD__."::Create withdraw receipt ".$this->db->error(), LOG_ERR);
+	                    dol_syslog(__METHOD__."::Create withdraw receipt ".$this->db->lasterror(), LOG_ERR);
 	                }
 				}
 				else
 				{
 					$error++;
-					dol_syslog(__METHOD__."::Get last withdraw receipt ".$this->db->error(), LOG_ERR);
+					dol_syslog(__METHOD__."::Get last withdraw receipt ".$this->db->lasterror(), LOG_ERR);
 				}
             }
 
@@ -975,10 +975,7 @@ class BonPrelevement extends CommonObject
                             $error++;
                         }
 
-                        /*
+                        // Update invoice requests as done
-                         * Update orders
-                         *
-                         */
                         $sql = "UPDATE ".MAIN_DB_PREFIX."prelevement_facture_demande";
                         $sql.= " SET traite = 1";
                         $sql.= ", date_traite = '".$this->db->idate($now)."'";
@@ -1025,7 +1022,7 @@ class BonPrelevement extends CommonObject
 
                     $bonprev->factures = $factures_prev_id;
 
-                    //Build file
+                    // Generation of SEPA file
                     $bonprev->generate();
                 }
                 dol_syslog(__METHOD__."::End withdraw receipt, file ".$filebonprev, LOG_DEBUG);
@@ -1034,7 +1031,6 @@ class BonPrelevement extends CommonObject
             /*
              * Update total
              */
-
             $sql = "UPDATE ".MAIN_DB_PREFIX."prelevement_bons";
             $sql.= " SET amount = ".price2num($bonprev->total);
             $sql.= " WHERE rowid = ".$prev_id;
@@ -1047,9 +1043,6 @@ class BonPrelevement extends CommonObject
                 dol_syslog(__METHOD__."::Error update total: ".$this->db->error(), LOG_ERR);
             }
 
-            /*
-             * Rollback or Commit
-             */
             if (!$error)
             {
                 $this->db->commit();
@@ -1256,13 +1249,28 @@ class BonPrelevement extends CommonObject
 			$fileDebiteurSection = '';
 			$fileEmetteurSection = '';
 			$i = 0;
+			$j = 0;
 			$this->total = 0;
 
 			/*
 			 * section Debiteur (sepa Debiteurs bloc lines)
 			 */
-			$sql = "SELECT soc.code_client as code, soc.address, soc.zip, soc.town, soc.datec, c.code as country_code,";
+
-			$sql.= " pl.client_nom as name, pl.code_banque as cb, pl.code_guichet as cg, pl.number as cc, pl.amount as somme,";
+			$sql = "SELECT f.facnumber as fac FROM ".MAIN_DB_PREFIX."prelevement_lignes as pl, ".MAIN_DB_PREFIX."facture as f, ".MAIN_DB_PREFIX."prelevement_facture as pf, ".MAIN_DB_PREFIX."societe as soc, ".MAIN_DB_PREFIX."c_country as p, ".MAIN_DB_PREFIX."societe_rib as rib WHERE pl.fk_prelevement_bons = ".$this->id." AND pl.rowid = pf.fk_prelevement_lignes AND pf.fk_facture = f.rowid AND soc.fk_pays = p.rowid AND soc.rowid = f.fk_soc AND rib.fk_soc = f.fk_soc AND rib.default_rib = 1";
+			$resql=$this->db->query($sql);
+			if ($resql)
+			{
+				$num = $this->db->num_rows($resql);
+				while ($j < $num)
+				{
+					$objfac = $this->db->fetch_object($resql);
+					$ListOfFactures = $ListOfFactures . $objfac->fac . ",";
+					$j++;
+				}
+			}
+
+			$sql = "SELECT soc.code_client as code, soc.address, soc.zip, soc.town, soc.datec, p.code as country_code,";
+			$sql.= " pl.client_nom as nom, pl.code_banque as cb, pl.code_guichet as cg, pl.number as cc, pl.amount as somme,";
 			$sql.= " f.facnumber as fac, pf.fk_facture as idfac, rib.iban_prefix as iban, rib.bic as bic, rib.rowid as drum";
 			$sql.= " FROM";
 			$sql.= " ".MAIN_DB_PREFIX."prelevement_lignes as pl,";
@@ -1286,7 +1294,7 @@ class BonPrelevement extends CommonObject
 				while ($i < $num)
 				{
 					$obj = $this->db->fetch_object($resql);
-					$fileDebiteurSection .= $this->EnregDestinataireSEPA($obj->code, $obj->name, $obj->address, $obj->zip, $obj->town, $obj->country_code, $obj->cb, $obj->cg, $obj->cc, $obj->somme, $obj->facnumber, $obj->idfac, $obj->iban, $obj->bic, $obj->datec, $obj->drum);
+					$fileDebiteurSection .= $this->EnregDestinataireSEPA($obj->code, $obj->nom, $obj->address, $obj->zip, $obj->town, $obj->country_code, $obj->cb, $obj->cg, $obj->cc, $obj->somme, $ListOfFactures, $obj->idfac, $obj->iban, $obj->bic, $obj->datec, $obj->drum);
 					$this->total = $this->total + $obj->somme;
 					$i++;
 				}
@@ -1321,13 +1329,14 @@ class BonPrelevement extends CommonObject
 			fputs($this->file, '			<CtrlSum>'.$this->total.'</CtrlSum>'.$CrLf);
 			fputs($this->file, '			<InitgPty>'.$CrLf);
 			fputs($this->file, '				<Nm>'.$this->raison_sociale.'</Nm>'.$CrLf);
-/*			fputs($this->file, '				<Id>'.$CrLf);
+			fputs($this->file, '				<Id>'.$CrLf);
-			fputs($this->file, '					<Othr>'.$CrLf);
+			fputs($this->file, '				    <PrvtId>'.$CrLf);
-			fputs($this->file, '						<Id>0533883248</Id>'.$CrLf);
-			fputs($this->file, '						<Issr>KBO-BCE</Issr>'.$CrLf);
 			fputs($this->file, '					<Othr>'.$CrLf);
+			fputs($this->file, '						<Id>'.$conf->global->PRELEVEMENT_ICS.'</Id>'.$CrLf);
+			fputs($this->file, '					</Othr>'.$CrLf);
+			fputs($this->file, '				    </PrvtId>'.$CrLf);
 			fputs($this->file, '				</Id>'.$CrLf);
-*/			fputs($this->file, '			</InitgPty>'.$CrLf);
+			fputs($this->file, '			</InitgPty>'.$CrLf);
 			fputs($this->file, '		</GrpHdr>'.$CrLf);
 			// SEPA File Emetteur
 			if ($result != -2)
@@ -1504,15 +1513,19 @@ class BonPrelevement extends CommonObject
      *	@param	string		$row_idfac			pf.fk_facture AS idfac,
      *	@param	string		$row_iban			rib.iban_prefix AS iban,
      *	@param	string		$row_bic			rib.bic AS bic,
-     *	@param	string		$row_datec			soc.datec,
+     *	@param	string		$row_datec			rib.datec,
-     *	@param	string		$row_drum			soc.rowid AS drum
+     *	@param	string		$row_drum			rib.rowid AS drum
      *	@return	string							Return string with SEPA part DrctDbtTxInf
      */
     function EnregDestinataireSEPA($row_code_client, $row_nom, $row_address, $row_zip, $row_town, $row_country_code, $row_cb, $row_cg, $row_cc, $row_somme, $row_facnumber, $row_idfac, $row_iban, $row_bic, $row_datec, $row_drum)
     {
 		$CrLf = "\n";
 		$Rowing = sprintf("%06d", $row_idfac);
+
+		// Define value for RUM
+		// Example:  RUMCustomerCode-CustomerBankAccountId-01424448606	(note: Date is date of creation of CustomerBankAccountId)
 		$Date_Rum = strtotime($row_datec);
+		$DtOfSgntr = dol_print_date($row_datec, '%Y-%m-%d');
 		$pre = ($date_Rum > 1359673200) ? 'Rum' : '++R';
 		$Rum = $pre.$row_code_client.$row_drum.'-0'.date('U', $Date_Rum);
 		$XML_DEBITOR ='';
@@ -1520,11 +1533,11 @@ class BonPrelevement extends CommonObject
 		$XML_DEBITOR .='				<PmtId>'.$CrLf;
 		$XML_DEBITOR .='					<EndToEndId>'.('AS-'.$row_facnumber.'-'.$Rowing).'</EndToEndId>'.$CrLf;
 		$XML_DEBITOR .='				</PmtId>'.$CrLf;
-		$XML_DEBITOR .='				<InstdAmt Ccy.="EUR">'.round($row_somme, 2).'</InstdAmt>'.$CrLf;
+		$XML_DEBITOR .='				<InstdAmt Ccy="EUR">'.round($row_somme, 2).'</InstdAmt>'.$CrLf;
 		$XML_DEBITOR .='				<DrctDbtTx>'.$CrLf;
 		$XML_DEBITOR .='					<MndtRltdInf>'.$CrLf;
 		$XML_DEBITOR .='						<MndtId>'.$Rum.'</MndtId>'.$CrLf;
-		$XML_DEBITOR .='						<DtOfSgntr>'.$row_datec.'</DtOfSgntr>'.$CrLf;
+		$XML_DEBITOR .='						<DtOfSgntr>'.$DtOfSgntr.'</DtOfSgntr>'.$CrLf;
 		$XML_DEBITOR .='						<AmdmntInd>false</AmdmntInd>'.$CrLf;
 		$XML_DEBITOR .='					</MndtRltdInf>'.$CrLf;
 		$XML_DEBITOR .='				</DrctDbtTx>'.$CrLf;
@@ -1537,17 +1550,18 @@ class BonPrelevement extends CommonObject
 		$XML_DEBITOR .='					<Nm>'.strtoupper(dol_string_unaccent($row_nom)).'</Nm>'.$CrLf;
 		$XML_DEBITOR .='					<PstlAdr>'.$CrLf;
 		$XML_DEBITOR .='						<Ctry>'.$row_country_code.'</Ctry>'.$CrLf;
-		$XML_DEBITOR .='						<AdrLine>'.strtr($row_adr, array(CHR(13) => ", ", CHR(10) => "")).'</AdrLine>'.$CrLf;
+		$XML_DEBITOR .='						<AdrLine>'.strtr($row_address, array(CHR(13) => ", ", CHR(10) => "")).'</AdrLine>'.$CrLf;
 		$XML_DEBITOR .='						<AdrLine>'.dol_string_unaccent($row_zip.' '.$row_town).'</AdrLine>'.$CrLf;
 		$XML_DEBITOR .='					</PstlAdr>'.$CrLf;
 		$XML_DEBITOR .='				</Dbtr>'.$CrLf;
 		$XML_DEBITOR .='				<DbtrAcct>'.$CrLf;
 		$XML_DEBITOR .='					<Id>'.$CrLf;
-		$XML_DEBITOR .='						<IBAN>'.$row_iban.'</IBAN>'.$CrLf;
+		$XML_DEBITOR .='						<IBAN>'.preg_replace('/\s/', '', $row_iban).'</IBAN>'.$CrLf;
 		$XML_DEBITOR .='					</Id>'.$CrLf;
 		$XML_DEBITOR .='				</DbtrAcct>'.$CrLf;
 		$XML_DEBITOR .='				<RmtInf>'.$CrLf;
-		$XML_DEBITOR .='					<Ustrd>'.($row_facnumber.'/'.$Rowing.'/'.$Rum).'</Ustrd>'.$CrLf;
+	//	$XML_DEBITOR .='					<Ustrd>'.($row_facnumber.'/'.$Rowing.'/'.$Rum).'</Ustrd>'.$CrLf;
+		$XML_DEBITOR .='					<Ustrd>'.$row_facnumber.'</Ustrd>'.$CrLf;
 		$XML_DEBITOR .='				</RmtInf>'.$CrLf;
 		$XML_DEBITOR .='			</DrctDbtTxInf>'.$CrLf;
 		return $XML_DEBITOR;
@@ -1629,7 +1643,7 @@ class BonPrelevement extends CommonObject
      *	@param	int		$nombre			0 or 1
      *	@param	float	$total			Total
      *	@param	string	$CrLf			End of line character
-     *	@return	string					String with SEAP Sender
+     *	@return	string					String with SEPA Sender
      */
     function EnregEmetteurSEPA($configuration, $ladate, $nombre, $total, $CrLf='\n')
     {	// SEPA INITIALISATION

htdocs/compta/salaries/card.php

@@ -67,8 +67,8 @@ if ($action == 'add' && $_POST["cancel"] <> $langs->trans("Cancel"))
 	$datesp=dol_mktime(12,0,0, $_POST["datespmonth"], $_POST["datespday"], $_POST["datespyear"]);
 	$dateep=dol_mktime(12,0,0, $_POST["dateepmonth"], $_POST["dateepday"], $_POST["dateepyear"]);
 
-	$sal->accountid=GETPOST("accountid");
+	$sal->accountid=GETPOST("accountid","int");
-	$sal->fk_user=GETPOST("fk_user");
+	$sal->fk_user=GETPOST("fk_user","int");
 	$sal->datev=$datev;
 	$sal->datep=$datep;
 	$sal->amount=price2num(GETPOST("amount"));
@@ -80,6 +80,11 @@ if ($action == 'add' && $_POST["cancel"] <> $langs->trans("Cancel"))
 	$sal->num_payment=GETPOST("num_payment");
 	$sal->fk_user_creat=$user->id;
 
+	// Set user current salary as ref salaray for the payment
+	$fuser=new User($db);
+	$fuser->fetch(GETPOST("fk_user","int"));
+	$sal->salary=$fuser->salary;
+
 	if (empty($datep) || empty($datev) || empty($datesp) || empty($dateep))
 	{
 		setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Date")),'errors');

htdocs/compta/salaries/class/paymentsalary.class.php

@@ -324,6 +324,7 @@ class PaymentSalary extends CommonObject
 		$sql.= ", datep";
 		$sql.= ", datev";
 		$sql.= ", amount";
+		$sql.= ", salary";
 		$sql.= ", fk_typepayment";
 		$sql.= ", num_payment";
 		if ($this->note) $sql.= ", note";
@@ -338,7 +339,8 @@ class PaymentSalary extends CommonObject
 		$sql.= "'".$this->fk_user."'";
 		$sql.= ", '".$this->db->idate($this->datep)."'";
 		$sql.= ", '".$this->db->idate($this->datev)."'";
-		$sql.= ", '".$this->amount."'";
+		$sql.= ", ".$this->amount;
+		$sql.= ", ".($this->salary > 0 ? $this->salary : "null");
 		$sql.= ", '".$this->type_payment."'";
 		$sql.= ", '".$this->num_payment."'";
 		if ($this->note) $sql.= ", '".$this->db->escape($this->note)."'";

htdocs/compta/salaries/index.php

@@ -1,5 +1,6 @@
 <?php
-/* Copyright (C) 2011-2014 Alexandre Spangaro   <alexandre.spangaro@gmail.com>
+/* Copyright (C) 2011-2014 Alexandre Spangaro  <alexandre.spangaro@gmail.com>
+ * Copyright (C) 2015      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
@@ -82,7 +83,8 @@ $form = new Form($db);
 $salstatic = new PaymentSalary($db);
 $userstatic = new User($db);
 
-$sql = "SELECT u.rowid as uid, u.lastname, u.firstname, s.rowid, s.fk_user, s.amount, s.label, s.datev as dm, s.fk_typepayment as type, s.num_payment,";
+$sql = "SELECT u.rowid as uid, u.lastname, u.firstname, u.login, u.email, u.admin, u.salary as current_salary, u.fk_societe as fk_soc,";
+$sql.= " s.rowid, s.fk_user, s.amount, s.salary, s.label, s.datev as dm, s.fk_typepayment as type, s.num_payment,";
 $sql.= " pst.code as payment_code";
 $sql.= " FROM ".MAIN_DB_PREFIX."payment_salary as s";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as pst ON s.fk_typepayment = pst.id,";
@@ -93,7 +95,7 @@ $sql.= " AND s.entity = ".$conf->entity;
 // Search criteria
 if ($search_ref)	$sql.=" AND s.rowid=".$search_ref;
 if ($search_label) 	$sql.=" AND s.label LIKE '%".$db->escape($search_label)."%'";
-if ($search_amount) $sql.=" AND s.amount='".$db->escape(price2num(trim($search_amount)))."'";
+if ($search_amount) $sql.=natural_search("s.amount", $search_amount, 1);
 if ($filtre) {
     $filtre=str_replace(":","=",$filtre);
     $sql .= " AND ".$filtre;
@@ -124,9 +126,10 @@ if ($result)
     print '<tr class="liste_titre">';
 		print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"s.rowid","",$param,"",$sortfield,$sortorder);
 		print_liste_field_titre($langs->trans("Person"),$_SERVER["PHP_SELF"],"u.rowid","",$param,"",$sortfield,$sortorder);
+		print_liste_field_titre($langs->trans("ExpectedToPay"),$_SERVER["PHP_SELF"],"s.salary","",$param,"",$sortfield,$sortorder);
 		print_liste_field_titre($langs->trans("Label"),$_SERVER["PHP_SELF"],"s.label","",$param,'align="left"',$sortfield,$sortorder);
 		print_liste_field_titre($langs->trans("DatePayment"),$_SERVER["PHP_SELF"],"s.datev","",$param,'align="left"',$sortfield,$sortorder);
-		print_liste_field_titre($langs->trans("Type"),$_SERVER["PHP_SELF"],"type","",$param,'align="left"',$sortfield,$sortorder);
+		print_liste_field_titre($langs->trans("PaymentMode"),$_SERVER["PHP_SELF"],"type","",$param,'align="left"',$sortfield,$sortorder);
 		print_liste_field_titre($langs->trans("PayedByThisPayment"),$_SERVER["PHP_SELF"],"s.amount","",$param,'align="right"',$sortfield,$sortorder);
 		print_liste_field_titre("");
     print "</tr>\n";
@@ -136,6 +139,9 @@ if ($result)
 	print '<td class="liste_titre" align="left">';
 	print '<input class="flat" type="text" size="3" name="search_ref" value="'.$search_ref.'">';
 	print '</td>';
+	// People
+	print '<td class="liste_titre">&nbsp;</td>';
+	// Current salary
 	print '<td class="liste_titre">&nbsp;</td>';
 	// Label
 	print '<td class="liste_titre"><input type="text" class="flat" size="14" name="search_label" value="'.$search_label.'"></td>';
@@ -159,10 +165,19 @@ if ($result)
         $userstatic->id=$obj->uid;
         $userstatic->lastname=$obj->lastname;
         $userstatic->firstname=$obj->firstname;
+        $userstatic->admin=$obj->admin;
+        $userstatic->login=$obj->login;
+        $userstatic->email=$obj->email;
+        $userstatic->societe_id=$obj->fk_soc;
         $salstatic->id=$obj->rowid;
 		$salstatic->ref=$obj->rowid;
-        print "<td>".$salstatic->getNomUrl(1)."</td>\n";
+        // Ref
+		print "<td>".$salstatic->getNomUrl(1)."</td>\n";
+		// User name
 		print "<td>".$userstatic->getNomUrl(1)."</td>\n";
+		// Current salary
+		print "<td>".($obj->salary?price($obj->salary):'')."</td>\n";
+		// Label payment
         print "<td>".dol_trunc($obj->label,40)."</td>\n";
         print '<td align="left">'.dol_print_date($db->jdate($obj->dm),'day')."</td>\n";
         // Type
@@ -176,7 +191,7 @@ if ($result)
 
         $i++;
     }
-    print '<tr class="liste_total"><td colspan="5" class="liste_total">'.$langs->trans("Total").'</td>';
+    print '<tr class="liste_total"><td colspan="6" class="liste_total">'.$langs->trans("Total").'</td>';
     print '<td  class="liste_total" align="right">'.price($total,0,$outputlangs,1,-1,-1,$conf->currency)."</td>";
 	print "<td>&nbsp;</td></tr>";
 

htdocs/compta/sociales/class/paymentsocialcontribution.class.php

@@ -384,6 +384,8 @@ class PaymentSocialContribution extends CommonObject
 
 		$object=new PaymentSocialContribution($this->db);
 
+		$object->context['createfromclone'] = 'createfromclone';
+
 		$this->db->begin();
 
 		// Load source object
@@ -411,6 +413,8 @@ class PaymentSocialContribution extends CommonObject
 
 		}
 
+		unset($this->context['createfromclone']);
+
 		// End
 		if (! $error)
 		{

htdocs/conf/conf.php.example

@@ -204,7 +204,7 @@ $dolibarr_main_authentication='dolibarr';
 //##################
 
 // dolibarr_main_force_https
-// This parameter allows to force the HTTPS mode. 
+// This parameter allows to force the HTTPS mode.
 // 0 = No forced redirect
 // 1 = Force redirect to https, until SCRIPT_URI start with https into response
 // 2 = Force redirect to https, until SERVER["HTTPS"] is 'on' into response
@@ -212,9 +212,9 @@ $dolibarr_main_authentication='dolibarr';
 // Warning: If you enable this parameter, your web server must be configured to
 // respond URL with https protocol. 
 // According to your web server setup, some values may works and other not. Try 
-// different values (1,2 or 'http://my.domain.com') if you experience problems.
+// different values (1,2 or 'https://my.domain.com') if you experience problems.
 // Default value: 0
-// Possible values: 0, 1, 2 or 'http://my.domain.com'
+// Possible values: 0, 1, 2 or 'https://my.domain.com'
 // Examples:
 // $dolibarr_main_force_https='0';
 //