Merge pull request #1 from Dolibarr/develop

Update my fork from original

.travis.yml

@@ -289,16 +289,30 @@ script:
 
 - |
   echo "Unit testing"
-  # Ensure we catch errors
+  # Ensure we catch errors. Set this to +e if you want to go to this end to see log file.
   set -e
   phpunit -d memory_limit=-1 -c test/phpunit/phpunittest.xml test/phpunit/AllTests.php
   set +e
-  echo
+
+- |
+  #echo "Output dolibarr.log"
+  #echo cat documents/dolibarr.log
+
+after_script:
+- |
+  # Dolibarr log file
+  #echo "After script"
+  #cat documents/dolibarr.log
+
 
 after_success:
+- |
+  echo Success
 
 after_failure:
 - |
+  echo Failure
+  # This part of code seems to be never executed, error or not ???
   echo "Debugging informations"
   # Upgrade log files
   cat *.log
@@ -314,5 +328,3 @@ after_failure:
     echo
   fi
 
-after_script:
-

.tx/config

@@ -356,6 +356,12 @@ source_file = htdocs/langs/en_US/withdrawals.lang
 source_lang = en_US
 type = MOZILLAPROPERTIES
 
+[dolibarr.websites]
+file_filter = htdocs/langs/<lang>/withdrawals.lang
+source_file = htdocs/langs/en_US/withdrawals.lang
+source_lang = en_US
+type = MOZILLAPROPERTIES
+
 [dolibarr.workflow]
 file_filter = htdocs/langs/<lang>/workflow.lang
 source_file = htdocs/langs/en_US/workflow.lang

ChangeLog

@@ -115,6 +115,7 @@ NEW: Use new select2 component for juridical status, country and state selection
 NEW: When creating order, proposal or invoice from thirdparty card, the project is asked during creation. A link to create project if it does not exists is also available. 
 NEW: Uniformize form creation of proposal to add public and private notes during creation like for order and invoice.
 NEW: More robust antiXSS engine.
+NEW: Compatibility with Mysql 5.7+
 
 For developers:
 NEW: The search box and the bookmarks are now rendered by the menu manager.

htdocs/accountancy/admin/account.php

@@ -21,7 +21,6 @@
  * \ingroup Accounting Expert
  * \brief List accounting account
  */
-
 require '../../main.inc.php';
 
 // Class
@@ -177,8 +176,7 @@ if ($result) {
 	
 	$accountstatic = new AccountingAccount($db);
 	
-	while ( $i < min($num, $limit) ) 
+	while ( $i < min($num, $limit) ) {
-	{
 		$obj = $db->fetch_object($resql);
 		
 		$accountstatic->id = $obj->rowid;

htdocs/accountancy/admin/card.php

@@ -48,8 +48,7 @@ if (!$user->admin)
 $accounting = new AccountingAccount($db);
 
 // Action
-if ($action == 'add')
+if ($action == 'add') {
-{
 	if (! $cancel) {
 		$sql = 'SELECT pcg_version FROM ' . MAIN_DB_PREFIX . 'accounting_system WHERE rowid=' . $conf->global->CHARTOFACCOUNTS;
 		
@@ -80,9 +79,7 @@ if ($action == 'add')
 		}
 	}
 	Header("Location: account.php");
-}
+} else if ($action == 'edit') {
-else if ($action == 'edit')
-{
 	if (! GETPOST('cancel', 'alpha')) {
 		$result = $accounting->fetch($id);
 		
@@ -111,9 +108,7 @@ else if ($action == 'edit')
 		header("Location: " . $_SERVER["PHP_SELF"] . "?id=" . $id);
 		exit();
 	}
-}
+} else if ($action == 'delete') {
-else if ($action == 'delete')
-{
 	$result = $accounting->fetch($id);
 	
 	if (! empty($accounting->id)) {
@@ -137,8 +132,7 @@ llxheader('', $langs->trans('AccountAccounting'));
 $form = new Form($db);
 $htmlacc = new FormVentilation($db);
 
-if ($action == 'create')
+if ($action == 'create') {
-{
 	print load_fiche_titre($langs->trans('NewAccount'));
 	
 	print '<form name="add" action="' . $_SERVER["PHP_SELF"] . '" method="POST">' . "\n";
@@ -177,9 +171,7 @@ if ($action == 'create')
 	print '</div>';
 	
 	print '</form>';
-}
+} else if ($id) {
-else if ($id)
-{
 	$rowid = $id;
 	$account = $accounting->fetch($rowid);
 	
@@ -188,8 +180,7 @@ else if ($id)
 		
 		$head = accounting_prepare_head($accounting);
 		
-		if ($action == 'update')
+		if ($action == 'update') {
-		{
 			$soc = new Societe($db);
 			if ($object->socid) {
 				$soc->fetch($object->socid);
@@ -232,9 +223,7 @@ else if ($id)
 			print '</div>';
 			
 			print '</form>';
-		}
+		} else {
-		else
-		{
 			$linkback = '<a href="../admin/account.php">' . $langs->trans("BackToChartofaccounts") . '</a>';
 			
 			dol_fiche_head($head, 'card', $langs->trans('AccountAccounting'), 0, 'billr');
@@ -297,9 +286,7 @@ else if ($id)
 			
 			print '</div>';
 		}
-	}
+	} else {
-	else
-	{
 		dol_print_error($db);
 	}
 }

htdocs/accountancy/admin/export.php

@@ -25,7 +25,6 @@
  * \ingroup Accounting Expert
  * \brief Setup page to configure accounting expert module
  */
-
 require '../../main.inc.php';
 
 // Class
@@ -119,7 +118,6 @@ print load_fiche_titre($langs->trans('ConfigAccountingExpert'),$linkback,'title_
 
 $head = admin_accounting_prepare_head();
 
-
 print '<form action="' . $_SERVER["PHP_SELF"] . '" method="post">';
 print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
 print '<input type="hidden" name="action" value="update">';
@@ -140,14 +138,11 @@ $var = ! $var;
 
 print '<tr ' . $bc[$var] . '>';
 print '<td width="50%">' . $langs->trans("Selectformat") . '</td>';
-if (! $conf->use_javascript_ajax)
+if (! $conf->use_javascript_ajax) {
-{
 	print '<td class="nowrap">';
 	print $langs->trans("NotAvailableWhenAjaxDisabled");
 	print "</td>";
-}
+} else {
-else
-{
 	print '<td>';
 	$listformat = array (
 			'csv' => $langs->trans("csv"),
@@ -160,8 +155,7 @@ else
 print "</td></tr>";
 
 $num = count($main_option);
-if ($num)
+if ($num) {
-{
 	foreach ( $main_option as $key ) {
 		$var = ! $var;
 		
@@ -195,14 +189,11 @@ $var = ! $var;
 
 print '<tr ' . $bc[$var] . '>';
 print '<td width="50%">' . $langs->trans("Selectmodelcsv") . '</td>';
-if (! $conf->use_javascript_ajax)
+if (! $conf->use_javascript_ajax) {
-{
 	print '<td class="nowrap">';
 	print $langs->trans("NotAvailableWhenAjaxDisabled");
 	print "</td>";
-}
+} else {
-else
-{
 	print '<td>';
 	$listmodelcsv = array (
 			'1' => $langs->trans("Modelcsv_normal"),
@@ -223,13 +214,13 @@ print "<br>\n";
  */
 
 $num2 = count($model_option);
-if ($num2)
+if ($num2) {
-{
 	print '<table class="noborder" width="100%">';
 	print '<tr class="liste_titre">';
 	print '<td colspan="3">' . $langs->trans('OtherOptions') . '</td>';
 	print "</tr>\n";
-	if ($conf->global->ACCOUNTING_EXPORT_MODELCSV > 1) print '<tr><td colspan="2" bgcolor="red"><b>' . $langs->trans('OptionsDeactivatedForThisExportModel') . '</b></td></tr>';
+	if ($conf->global->ACCOUNTING_EXPORT_MODELCSV > 1)
+		print '<tr><td colspan="2" bgcolor="red"><b>' . $langs->trans('OptionsDeactivatedForThisExportModel') . '</b></td></tr>';
 	
 	foreach ( $model_option as $key ) {
 		$var = ! $var;

htdocs/accountancy/admin/fiscalyear.php

@@ -20,7 +20,6 @@
  * \ingroup fiscal year
  * \brief Setup page to configure fiscal year
  */
-
 require '../../main.inc.php';
 
 require_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php';
@@ -31,7 +30,8 @@ $action=GETPOST('action');
 $langs->load("admin");
 $langs->load("compta");
 
-if (! $user->admin) accessforbidden();
+if (! $user->admin)
+	accessforbidden();
 
 $error = 0;
 
@@ -40,8 +40,11 @@ static $tmpstatut2label=array(
 		'0' => 'OpenFiscalYear',
 		'1' => 'CloseFiscalYear' 
 );
-$statut2label=array('');
+$statut2label = array (
-foreach ($tmpstatut2label as $key => $val) $statut2label[$key]=$langs->trans($val);
+		'' 
+);
+foreach ( $tmpstatut2label as $key => $val )
+	$statut2label[$key] = $langs->trans($val);
 
 $errors = array ();
 
@@ -70,8 +73,7 @@ $sql.= " FROM ".MAIN_DB_PREFIX."accounting_fiscalyear as f";
 $sql .= " WHERE f.entity = " . $conf->entity;
 
 $result = $db->query($sql);
-if ($result)
+if ($result) {
-{
 	$var = false;
 	$num = $db->num_rows($result);
 	
@@ -87,12 +89,10 @@ if ($result)
 	print '<td align="right">' . $langs->trans("Statut") . '</td>';
 	print '</tr>';
 	
-	if ($num)
+	if ($num) {
-    {
 		$fiscalyearstatic = new Fiscalyear($db);
 		
-		while ($i < $num && $i < $max)
+		while ( $i < $num && $i < $max ) {
-        {
 			$obj = $db->fetch_object($result);
 			$fiscalyearstatic->id = $obj->rowid;
 			print '<tr ' . $bc[$var] . '>';
@@ -105,17 +105,12 @@ if ($result)
 			$var = ! $var;
 			$i ++;
 		}
-
+	} else {
-    }
-    else
-    {
 		print '<tr ' . $bc[$var] . '><td colspan="5">' . $langs->trans("None") . '</td></tr>';
 	}
 	
 	print '</table>';
-}
+} else {
-else
-{
 	dol_print_error($db);
 }
 

htdocs/accountancy/admin/fiscalyear_card.php

@@ -19,18 +19,17 @@
  * \file htdocs/accountancy/admin/fiscalyear_card.php
  * \brief Page to show a fiscal year
  */
-
 require '../../main.inc.php';
 
 require_once DOL_DOCUMENT_ROOT . '/core/lib/fiscalyear.lib.php';
 require_once DOL_DOCUMENT_ROOT . '/core/class/fiscalyear.class.php';
 
-
 $langs->load("admin");
 $langs->load("compta");
 
 // Security check
-if (! $user->admin) accessforbidden();
+if (! $user->admin)
+	accessforbidden();
 
 $error = 0;
 
@@ -43,37 +42,33 @@ static $tmpstatut2label=array(
 		'0' => 'OpenFiscalYear',
 		'1' => 'CloseFiscalYear' 
 );
-$statut2label=array('');
+$statut2label = array (
-foreach ($tmpstatut2label as $key => $val) $statut2label[$key]=$langs->trans($val);
+		'' 
+);
+foreach ( $tmpstatut2label as $key => $val )
+	$statut2label[$key] = $langs->trans($val);
 
 $object = new Fiscalyear($db);
 
 $date_start = dol_mktime(0, 0, 0, GETPOST('fiscalyearmonth', 'int'), GETPOST('fiscalyearday', 'int'), GETPOST('fiscalyearyear', 'int'));
 $date_end = dol_mktime(0, 0, 0, GETPOST('fiscalyearendmonth', 'int'), GETPOST('fiscalyearendday', 'int'), GETPOST('fiscalyearendyear', 'int'));
 
-
 /*
  * Actions
  */
 
-if ($action == 'confirm_delete' && $confirm == "yes")
+if ($action == 'confirm_delete' && $confirm == "yes") {
-{
 	$result = $object->delete($id);
-    if ($result >= 0)
+	if ($result >= 0) {
-    {
 		header("Location: fiscalyear.php");
-        exit;
+		exit();
-    }
+	} else {
-    else
-    {
 		setEventMessages($object->error, $object->errors, 'errors');
 	}
 } 
 
-else if ($action == 'add')
+else if ($action == 'add') {
-{
+	if (! GETPOST('cancel', 'alpha')) {
-    if (! GETPOST('cancel','alpha'))
-    {
 		$error = 0;
 		
 		$object->date_start = $date_start;
@@ -82,55 +77,43 @@ else if ($action == 'add')
 		$object->statut = GETPOST('statut', 'int');
 		$object->datec = dol_now();
 		
-        if (empty($object->date_start) && empty($object->date_end))
+		if (empty($object->date_start) && empty($object->date_end)) {
-        {
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Date")), null, 'errors');
 			$error ++;
 		}
-        if (empty($object->label))
+		if (empty($object->label)) {
-        {
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Label")), null, 'errors');
 			$error ++;
 		}
 		
-        if (! $error)
+		if (! $error) {
-        {
 			$db->begin();
 			
 			$id = $object->create($user);
 			
-            if ($id > 0)
+			if ($id > 0) {
-            {
 				$db->commit();
 				
 				header("Location: " . $_SERVER["PHP_SELF"] . "?id=" . $id);
-                exit;
+				exit();
-            }
+			} else {
-            else
-           {
 				$db->rollback();
 				
 				setEventMessages($object->error, $object->errors, 'errors');
 				$action = 'create';
 			}
-        }
+		} else {
-        else
-       {
 			$action = 'create';
 		}
-    }
+	} else {
-    else
-    {
 		header("Location: ./fiscalyear.php");
-        exit;
+		exit();
 	}
 } 
 
 // Update record
-else if ($action == 'update')
+else if ($action == 'update') {
-{
+	if (! GETPOST('cancel', 'alpha')) {
-    if (! GETPOST('cancel','alpha'))
-    {
 		$result = $object->fetch($id);
 		
 		$object->date_start = empty($_POST["fiscalyear"]) ? '' : $date_start;
@@ -140,20 +123,15 @@ else if ($action == 'update')
 		
 		$result = $object->update($user);
 		
-        if ($result > 0)
+		if ($result > 0) {
-        {
 			header("Location: " . $_SERVER["PHP_SELF"] . "?id=" . $id);
-            exit;
+			exit();
-        }
+		} else {
-        else
-        {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
-    }
+	} else {
-    else
-    {
 		header("Location: " . $_SERVER["PHP_SELF"] . "?id=" . $id);
-        exit;
+		exit();
 	}
 }
 
@@ -168,8 +146,7 @@ $form = new Form($db);
 /*
  * Action create
  */
-if ($action == 'create')
+if ($action == 'create') {
-{
 	print load_fiche_titre($langs->trans("NewFiscalYear"));
 	
 	print '<form action="' . $_SERVER["PHP_SELF"] . '" method="POST">';
@@ -211,16 +188,12 @@ if ($action == 'create')
 	print '</div>';
 	
 	print '</form>';
-}
+} else if ($id) {
-else if ($id)
-{
 	$result = $object->fetch($id);
-    if ($result > 0)
+	if ($result > 0) {
-    {
 		$head = fiscalyear_prepare_head($object);
 		
-        if ($action == 'edit')
+		if ($action == 'edit') {
-        {
 			dol_fiche_head($head, 'card', $langs->trans("FiscalYearCard"), 0, 'cron');
 			
 			print '<form name="update" action="' . $_SERVER["PHP_SELF"] . '" method="POST">' . "\n";
@@ -267,16 +240,12 @@ else if ($id)
 			print '</form>';
 			
 			dol_fiche_end();
-        }
+		} else {
-        else
-        {
 			/*
 			 * Confirm delete
 			 */
-            if ($action == 'delete')
+			if ($action == 'delete') {
-            {
 				print $form->formconfirm($_SERVER["PHP_SELF"] . "?id=" . $id, $langs->trans("DeleteFiscalYear"), $langs->trans("ConfirmDeleteFiscalYear"), "confirm_delete");
-
 			}
 			
 			dol_fiche_head($head, 'card', $langs->trans("FiscalYearCard"), 0, 'cron');
@@ -332,9 +301,7 @@ else if ($id)
 			
 			print '</div>';
 		}
-    }
+	} else {
-    else
-    {
 		dol_print_error($db);
 	}
 }

htdocs/accountancy/admin/fiscalyear_info.php

@@ -19,27 +19,25 @@
  * \file htdocs/accountancy/admin/fiscalyear_card.php
  * \brief Page to show info of a fiscal year
  */
-
 require '../../main.inc.php';
 
 require_once DOL_DOCUMENT_ROOT . '/core/lib/fiscalyear.lib.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT . '/core/class/fiscalyear.class.php';
 
-
 $langs->load("admin");
 $langs->load("compta");
 
 // Security check
-if (! $user->admin) accessforbidden();
+if (! $user->admin)
+	accessforbidden();
 
 $id = GETPOST('id', 'int');
 
 // View
 llxHeader();
 
-if ($id)
+if ($id) {
-{
 	$object = new Fiscalyear($db);
 	$object->fetch($id);
 	$object->info($id);

htdocs/accountancy/admin/importaccounts.php

@@ -23,7 +23,6 @@
  * \ingroup Accounting Expert
  * \brief Page import accounting account
  */
-
 require '../../main.inc.php';
 
 // Class

htdocs/accountancy/admin/index.php

@@ -27,7 +27,6 @@
  * \ingroup Accounting Expert
  * \brief Setup page to configure accounting expert module
  */
-
 require '../../main.inc.php';
 
 // Class
@@ -74,8 +73,7 @@ $list_account = array (
 
 $accounting_mode = defined('ACCOUNTING_MODE') ? ACCOUNTING_MODE : 'RECETTES-DEPENSES';
 
-if ($action == 'update')
+if ($action == 'update') {
-{
 	$error = 0;
 	
 	$accounting_modes = array (
@@ -121,12 +119,9 @@ if ($action == 'update')
 		}
 	}
 	
-    if (! $error)
+	if (! $error) {
-    {
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
+	} else {
-    else
-    {
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
 }
@@ -163,14 +158,13 @@ if ($action == 'setlistsortdone') {
 llxHeader();
 
 $form = new Form($db);
-$formaccountancy = New FormVentilation($db);
+$formaccountancy = new FormVentilation($db);
 
 $linkback = '<a href="' . DOL_URL_ROOT . '/admin/modules.php">' . $langs->trans("BackToModuleList") . '</a>';
 print load_fiche_titre($langs->trans('ConfigAccountingExpert'), $linkback, 'title_setup');
 
 $head = admin_accounting_prepare_head($accounting);
 
-
 print '<form action="' . $_SERVER["PHP_SELF"] . '" method="post">';
 print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
 print '<input type="hidden" name="action" value="update">';
@@ -259,8 +253,7 @@ print '<tr class="liste_titre">';
 print '<td colspan="3">' . $langs->trans('OtherOptions') . '</td>';
 print "</tr>\n";
 
-foreach ($list as $key)
+foreach ( $list as $key ) {
-{
 	$var = ! $var;
 	
 	print '<tr ' . $bc[$var] . ' class="value">';
@@ -275,8 +268,7 @@ foreach ($list as $key)
 	print '</td></tr>';
 }
 
-foreach ($list_account as $key)
+foreach ( $list_account as $key ) {
-{
 	$var = ! $var;
 	
 	print '<tr ' . $bc[$var] . ' class="value">';

htdocs/accountancy/admin/journal.php

@@ -26,7 +26,6 @@
  * \ingroup Accounting Expert
  * \brief Setup page to configure accounting expert module
  */
-
 require '../../main.inc.php';
 
 // Class
@@ -115,10 +114,8 @@ foreach ( $list as $key ) {
 
 print "</table>\n";
 
-
 print '<br>';
 
-
 print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre">';
 print '<td colspan="3">' . $langs->trans('JournalFinancial') . '</td>';
@@ -132,15 +129,13 @@ $sql.= " AND clos = 0";
 $sql .= " ORDER BY label";
 
 $resql = $db->query($sql);
-if ($resql)
+if ($resql) {
-{
 	$numr = $db->num_rows($resql);
 	$i = 0;
 	
 	if ($numr > 0)
 		
-	while ($i < $numr)
+		while ( $i < $numr ) {
-	{
 			$objp = $db->fetch_object($resql);
 			
 			$var = ! $var;
@@ -157,8 +152,8 @@ if ($resql)
 			
 			$i ++;
 		}
-}
+} else
-else dol_print_error($db);
+	dol_print_error($db);
 $db->free($resql);
 
 print "</table>\n";
@@ -169,6 +164,5 @@ print '<div class="center"><input type="submit" class="button" value="' . $langs
 
 print '</form>';
 
-
 llxFooter();
 $db->close();

htdocs/accountancy/admin/productaccount.php

@@ -22,7 +22,11 @@
 /**
  * \file htdocs/accountancy/admin/productaccount.php
  * \ingroup Accounting Expert
+<<<<<<< HEAD
  * \brief To define accounting account on product / service
+=======
+ * \brief Onglet de gestion de parametrages des ventilations
+>>>>>>> refs/remotes/origin/3.9
  */
 require '../../main.inc.php';
 
@@ -42,8 +46,12 @@ $langs->load("main");
 $langs->load("accountancy");
 
 // Security check
-if (!$user->admin) accessforbidden();
+if (! $user->admin) {
-if (empty($conf->accounting->enabled)) accessforbidden();
+	accessforbidden();
+}
+if (empty($conf->accounting->enabled)) {
+	accessforbidden();
+}
 	
 // search & action GETPOST
 $action = GETPOST('action');
@@ -77,10 +85,12 @@ if (! empty($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION) && $conf->global->
 }
 $offset = $limit * $page;
 
-if (! $sortfield)
+if (! $sortfield) {
 	$sortfield = "p.ref";
-if (! $sortorder)
+}
+if (! $sortorder) {
 	$sortorder = "ASC";
+}
 	
 // Sales or Purchase mode ?
 if ($action == 'update') {
@@ -146,7 +156,6 @@ if ($action == 'update') {
 			$msg .= '<div><font color="red">' . $langs->trans("AnyLineVentilate") . '</font></div>';
 		}
 		$msg .= '<div><font color="red">' . $langs->trans("EndProcessing") . '</font></div>';
-		
 	}
 }
 
@@ -236,7 +245,7 @@ if ($result) {
 	$num_lines = $db->num_rows($result);
 	$i = 0;
 	
-	print load_fiche_titre($langs->trans("InitAccountancy"),'','title_setup');
+	print_barre_liste($langs->trans("ProductAccountingAccountSelect"), $page, $_SERVER["PHP_SELF"], "", $sortfield, $sortorder, '', $num_lines);
 	print '<br>';
 	
 	print $langs->trans("InitAccountancyDesc") . '<br>';
@@ -345,8 +354,7 @@ if ($result) {
 		print '<td style="' . $code_sell_p_l_differ . '">' . nl2br(dol_trunc($obj->description, $trunclengh)) . '</td>';
 		
 		// Accounting account buy
-		if ($accounting_product_mode == 'ACCOUNTANCY_BUY')
+		if ($accounting_product_mode == 'ACCOUNTANCY_BUY') {
-		{
 			// print '<td align="left">' . $obj->accountancy_code_buy . '</td>';
 			// TODO: replace by select
 			// print '<td align="left">' . $compta_prodbuy . '</td>';
@@ -355,9 +363,7 @@ if ($result) {
 			print '<td align="left">';
 			print $form->select_account($compta_prodbuy_id, 'codeventil_' . $product_static->id, 1);
 			print '</td>';
-		} 
+		} else {
-		else
-		{	
 			// Accounting account sell
 			// print '<td align="left">' . $obj->accountancy_code_sell . '</td>';
 			// TODO: replace by select

htdocs/accountancy/bookkeeping/balancebymonth.php

@@ -24,7 +24,6 @@
  * \ingroup Accounting Expert
  * \brief Balance by month
  */
-
 require '../../main.inc.php';
 
 // Class

htdocs/accountancy/bookkeeping/card.php

@@ -22,7 +22,6 @@
  * \ingroup Accounting Expert
  * \brief Page to show account
  */
-
 require '../../main.inc.php';
 
 // Class
@@ -34,8 +33,9 @@ $langs->load("accountancy");
 
 // Security check
 $id = GETPOST('id', 'int');
-if ($user->societe_id > 0)
+if ($user->societe_id > 0) {
 	accessforbidden();
+}
 
 $action = GETPOST('action');
 $piece_num = GETPOST("piece_num");
@@ -277,7 +277,7 @@ if ($action == 'create') {
 	}
 	if (! empty($book->piece_num)) {
 		
-        print load_fiche_titre($langs->trans("UpdateMvts"));
+		print load_fiche_titre($langs->trans("UpdateMvts"), '<a href="list.php">' . $langs->trans('BackToList') . '</a>');
 		
 		print '<table class="border" width="100%">';
 		print '<tr class="pair">';
@@ -345,7 +345,6 @@ if ($action == 'create') {
 					
 					if ($action == 'update' && $line->id == $id) {
 						
-					
 						print '<td>';
 						print $formventilation->select_account($line->numero_compte, 'account_number', 0, array (), 1, 1, '');
 						print '</td>';
@@ -384,7 +383,11 @@ if ($action == 'create') {
 				}
 				
 				if ($total_debit != $total_credit) {
-					setEventMessages(null, array('MvtNotCorrectlyBalanced',$total_credit,$total_debit),'errors');
+					setEventMessages(null, array (
+							'MvtNotCorrectlyBalanced',
+							$total_credit,
+							$total_debit 
+					), 'errors');
 				}
 				
 				if ($action == "" || $action == 'add') {

htdocs/accountancy/bookkeeping/list.php

@@ -79,8 +79,6 @@ $search_ledger_code = GETPOST('search_ledger_code', 'alpha');
 
 $limit = GETPOST('limit') ? GETPOST('limit', 'int') : $conf->liste_limit;
 
-
-
 $offset = $limit * $page;
 
 $object = new BookKeeping($db);
@@ -117,7 +115,6 @@ if ($sortorder == "")
 if ($sortfield == "")
 	$sortfield = "t.rowid";
 
-
 $options = '';
 $filter = array ();
 if (! empty($search_date_start)) {
@@ -181,7 +178,6 @@ if (! empty($search_mvt_num)) {
 	$options .= '&search_mvt_num=' . $search_mvt_num;
 }
 
-
 /*
  * Action
  */
@@ -238,8 +234,7 @@ if ($action == 'delbookkeeping') {
 	
 	foreach ( $object->lines as $line ) {
 		
-		if ($conf->global->ACCOUNTING_EXPORT_MODELCSV == 2) 	
+		if ($conf->global->ACCOUNTING_EXPORT_MODELCSV == 2) {
-		{
 			$sep = ";";
 			// Model Cegid Expert Export
 			$date = dol_print_date($line->doc_date, '%d%m%Y');
@@ -259,8 +254,7 @@ if ($action == 'delbookkeeping') {
 			 print price($line->credit) . $sep;*/
 			
 			print "\n";
-		}
+		} elseif ($conf->global->ACCOUNTING_EXPORT_MODELCSV == 1) {
-		elseif ($conf->global->ACCOUNTING_EXPORT_MODELCSV == 1) {
 			
 			// Std export
 			$date = dol_print_date($line->doc_date, $conf->global->ACCOUNTING_EXPORT_DATE);
@@ -332,7 +326,13 @@ else {
 		}
 		$year_array = $formventilation->selectyear_accountancy_bookkepping($delyear, 'delyear', 0, 'array');
 		
-		$form_question['delyear']=array('name'=>'delyear','type'=>'select','label'=>$langs->trans('DelYear'),'values'=>$year_array,'default'=>$delyear);
+		$form_question['delyear'] = array (
+				'name' => 'delyear',
+				'type' => 'select',
+				'label' => $langs->trans('DelYear'),
+				'values' => $year_array,
+				'default' => $delyear 
+		);
 		
 		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"], $langs->trans('DeleteMvt'), $langs->trans('ConfirmDeleteMvt'), 'delbookkeepingyearconfirm', $form_question, 0, 1);
 		print $formconfirm;
@@ -359,7 +359,6 @@ else {
 	
 	print '</div>';
 	
-	
 	/*print '<div class="liste_titre">';
 	 print $langs->trans('DateStart') . ': ';
 	 print $form->select_date($search_date_start, 'date_start', 0, 0, 1);

htdocs/accountancy/bookkeeping/listbyyear.php

@@ -74,6 +74,7 @@ if (empty($search_date_start)) {
 	$search_date_start = dol_mktime(0, 0, 0, 1, 1, dol_print_date(dol_now(), '%Y'));
 	$search_date_end = dol_mktime(0, 0, 0, 12, 31, dol_print_date(dol_now(), '%Y'));
 }
+
 if ($sortorder == "")
 	$sortorder = "ASC";
 if ($sortfield == "")

htdocs/accountancy/class/accountingaccount.class.php

@@ -33,10 +33,8 @@ class AccountingAccount extends CommonObject
 	var $db;
 	var $error;
 	var $errors;
-
 	var $id;
 	var $rowid;
-
 	var $datec; // Creation date
 	var $fk_pcg_version;
 	var $pcg_type;
@@ -53,8 +51,7 @@ class AccountingAccount extends CommonObject
 	 *
 	 * @param DoliDB $db Database handle
 	 */
-	function __construct($db)
+	function __construct($db) {
-	{
 		$this->db = $db;
 	}
 	
@@ -66,8 +63,7 @@ class AccountingAccount extends CommonObject
 	 * @param int $limittocurentchart 1=Do not load record if it is into another accounting system
 	 * @return int <0 if KO, >0 if OK
 	 */
-	function fetch($rowid = null, $account_number = null, $limittocurentchart=0)
+	function fetch($rowid = null, $account_number = null, $limittocurentchart = 0) {
-	{
 		global $conf;
 		
 		if ($rowid || $account_number) {
@@ -120,8 +116,7 @@ class AccountingAccount extends CommonObject
 	 * @param int $notrigger Disable triggers
 	 * @return int <0 if KO, >0 if OK
 	 */
-	function create($user, $notrigger = 0)
+	function create($user, $notrigger = 0) {
-	{
 		global $conf;
 		$error = 0;
 		$now = dol_now();
@@ -221,8 +216,7 @@ class AccountingAccount extends CommonObject
 	 * @param User $user Use making update
 	 * @return int <0 if KO, >0 if OK
 	 */
-	function update($user)
+	function update($user) {
-	{
 		$this->db->begin();
 		
 		$sql = "UPDATE " . MAIN_DB_PREFIX . "accounting_account ";
@@ -254,8 +248,7 @@ class AccountingAccount extends CommonObject
 	 *
 	 * @return int <0 if KO, >0 if OK
 	 */
-	function checkUsage()
+	function checkUsage() {
-	{
 		global $langs;
 		
 		$sql = "(SELECT fk_code_ventilation FROM " . MAIN_DB_PREFIX . "facturedet";
@@ -288,8 +281,7 @@ class AccountingAccount extends CommonObject
 	 * @param int $notrigger 0=triggers after, 1=disable triggers
 	 * @return int <0 if KO, >0 if OK
 	 */
-	function delete($user, $notrigger = 0)
+	function delete($user, $notrigger = 0) {
-	{
 		$error = 0;
 		
 		$result = $this->checkUsage();
@@ -347,8 +339,7 @@ class AccountingAccount extends CommonObject
 	 * @param int $withpicto 0=No picto, 1=Include picto into link, 2=Only picto
 	 * @return string Chaine avec URL
 	 */
-	function getNomUrl($withpicto=0)
+	function getNomUrl($withpicto = 0) {
-	{
 		global $langs;
 		
 		$result = '';
@@ -360,9 +351,12 @@ class AccountingAccount extends CommonObject
 		
 		$label = $langs->trans("Show") . ': ' . $this->account_number . ' - ' . $this->label;
 		
-		if ($withpicto) $result.=($link.img_object($label,$picto).$linkend);
+		if ($withpicto)
-		if ($withpicto && $withpicto != 2) $result.=' ';
+			$result .= ($link . img_object($label, $picto) . $linkend);
-		if ($withpicto != 2) $result.=$link.$this->account_number.$linkend;
+		if ($withpicto && $withpicto != 2)
+			$result .= ' ';
+		if ($withpicto != 2)
+			$result .= $link . $this->account_number . $linkend;
 		return $result;
 	}
 	
@@ -372,8 +366,7 @@ class AccountingAccount extends CommonObject
 	 * @param int $id of record
 	 * @return void
 	 */
-	function info($id)
+	function info($id) {
-	{
 		$sql = 'SELECT a.rowid, a.datec, a.fk_user_author, a.fk_user_modif, a.tms';
 		$sql .= ' FROM ' . MAIN_DB_PREFIX . 'accounting_account as a';
 		$sql .= ' WHERE a.rowid = ' . $id;
@@ -410,8 +403,7 @@ class AccountingAccount extends CommonObject
 	 * @param int $id Id
 	 * @return int <0 if KO, >0 if OK
 	 */
-	function account_desactivate($id)
+	function account_desactivate($id) {
-	{
 		$result = $this->checkUsage();
 		
 		if ($result > 0) {
@@ -443,8 +435,7 @@ class AccountingAccount extends CommonObject
 	 * @param int $id Id
 	 * @return int <0 if KO, >0 if OK
 	 */
-	function account_activate($id)
+	function account_activate($id) {
-	{
 		$this->db->begin();
 		
 		$sql = "UPDATE " . MAIN_DB_PREFIX . "accounting_account ";

htdocs/accountancy/class/bookkeeping.class.php

@@ -291,7 +291,6 @@ class BookKeeping extends CommonObject
 			dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
 		}
 		
-		
 		if (! $error) {
 			
 			if (! $notrigger) {
@@ -325,8 +324,7 @@ class BookKeeping extends CommonObject
 	 *       
 	 * @return int <0 if KO, Id of created object if OK
 	 */
-	public function createStd(User $user, $notrigger = false)
+	public function createStd(User $user, $notrigger = false) {
-	{
 		dol_syslog(__METHOD__, LOG_DEBUG);
 		
 		$error = 0;
@@ -379,8 +377,6 @@ class BookKeeping extends CommonObject
 			$this->piece_num = trim($this->piece_num);
 		}
 		
-	
-	
 		// Check parameters
 		// Put here code to add control on parameters values
 		
@@ -404,7 +400,6 @@ class BookKeeping extends CommonObject
 		$sql .= 'code_journal,';
 		$sql .= 'piece_num';
 		
-	
 		$sql .= ') VALUES (';
 		
 		$sql .= ' ' . (! isset($this->doc_date) || dol_strlen($this->doc_date) == 0 ? 'NULL' : "'" . $this->db->idate($this->doc_date) . "'") . ',';
@@ -424,7 +419,6 @@ class BookKeeping extends CommonObject
 		$sql .= ' ' . (! isset($this->code_journal) ? 'NULL' : "'" . $this->db->escape($this->code_journal) . "'") . ',';
 		$sql .= ' ' . (! isset($this->piece_num) ? 'NULL' : $this->piece_num);
 		
-	
 		$sql .= ')';
 		
 		$this->db->begin();
@@ -585,8 +579,12 @@ class BookKeeping extends CommonObject
 					$sqlwhere[] = $key . '=\'' . $this->db->idate($value) . '\'';
 				} elseif ($key == 't.doc_date>=' || $key == 't.doc_date<=') {
 					$sqlwhere[] = $key . '\'' . $this->db->idate($value) . '\'';
+				} elseif ($key == 't.numero_compte>=' || $key == 't.numero_compte<=' || $key == 't.code_tiers>=' || $key == 't.code_tiers<=') {
+					$sqlwhere[] = $key . '\'' . $this->db->escape($value) . '\'';
 				} elseif ($key == 't.fk_doc' || $key == 't.fk_docdet' || $key == 't.piece_num') {
 					$sqlwhere[] = $key . '=' . $value;
+				} elseif ($key == 't.code_tiers' || $key == 't.numero_compte') {
+					$sqlwhere[] = $key . ' LIKE \'' . $this->db->escape($value) . '%\'';
 				} else {
 					$sqlwhere[] = $key . ' LIKE \'%' . $this->db->escape($value) . '%\'';
 				}
@@ -1069,7 +1067,7 @@ class BookKeeping extends CommonObject
 			}
 		} else {
 			$this->error = "Error " . $this->db->lasterror();
-			dol_syslog(get_class($this) . "::fetch_per_mvt " . $this->error, LOG_ERR);
+			dol_syslog(get_class($this) . "::fetch_all_per_mvt " . $this->error, LOG_ERR);
 			return - 1;
 		}
 		
@@ -1082,8 +1080,7 @@ class BookKeeping extends CommonObject
 	 * @param string $model Model
 	 * @return int Result
 	 */
-	function export_bookkeping($model = 'ebp')
+	function export_bookkeping($model = 'ebp') {
-	{
 		$sql = "SELECT rowid, doc_date, doc_type,";
 		$sql .= " doc_ref, fk_doc, fk_docdet, code_tiers,";
 		$sql .= " numero_compte, label_compte, debit, credit,";
@@ -1123,9 +1120,7 @@ class BookKeeping extends CommonObject
 			$this->db->free($resql);
 			
 			return $num;
-		}
+		} else {
-		else
-		{
 			$this->error = "Error " . $this->db->lasterror();
 			dol_syslog(get_class($this) . "::export_bookkeping " . $this->error, LOG_ERR);
 			return - 1;

htdocs/accountancy/class/html.formventilation.class.php

@@ -1,7 +1,7 @@
 <?php
-/* Copyright (C) 2013-2014 Florian Henry        <florian.henry@open-concept.pro>
+/* Copyright (C) 2013-2016 Florian Henry        <florian.henry@open-concept.pro>
  * Copyright (C) 2013-2014 Olivier Geffroy      <jeff@jeffinfo.com>
- * Copyright (C) 2013-2015 Alexandre Spangaro   <aspangaro.dolibarr@gmail.com>
+ * Copyright (C) 2013-2016 Alexandre Spangaro   <aspangaro.dolibarr@gmail.com>
  * Copyright (C) 2015      Ari Elbaz (elarifr)  <github@accedinfo.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -322,7 +322,6 @@ class FormVentilation extends Form
 		}
 		$this->db->free($resql);
 		
-		
 		// Build select
 		if (count($aux_account) > 0) {
 			

htdocs/accountancy/customer/card.php

@@ -22,7 +22,6 @@
  * \ingroup Accountancy
  * \brief Card customer ventilation
  */
-
 require '../../main.inc.php';
 
 // Class
@@ -45,8 +44,7 @@ if ($user->societe_id > 0)
  * Actions
  */
 if ($action == 'ventil' && $user->rights->accounting->ventilation->dispatch) {
-	if (! GETPOST('cancel', 'alpha'))
+	if (! GETPOST('cancel', 'alpha')) {
-	{
 		$sql = " UPDATE " . MAIN_DB_PREFIX . "facturedet";
 		$sql .= " SET fk_code_ventilation = " . $codeventil;
 		$sql .= " WHERE rowid = " . $id;

htdocs/accountancy/customer/index.php

@@ -25,7 +25,6 @@
  * \ingroup Accounting Expert
  * \brief Home customer ventilation
  */
-
 require '../../main.inc.php';
 
 // Class
@@ -88,6 +87,50 @@ if ($action == 'validatehistory') {
 		$db->commit();
 		setEventMessages($langs->trans('Dispatched'), null, 'mesgs');
 	}
+} elseif ($action == 'fixaccountancycode') {
+	$error = 0;
+	$db->begin();
+	
+	$sql1 = "UPDATE " . MAIN_DB_PREFIX . "facturedet as fd";
+	$sql1 .= " SET fd.fk_code_ventilation = 0";
+	$sql1 .= ' WHERE fd.fk_code_ventilation NOT IN ';
+	$sql1 .= '	(SELECT accnt.rowid ';
+	$sql1 .= '	FROM ' . MAIN_DB_PREFIX . 'accountingaccount as accnt';
+	$sql1 .= '	INNER JOIN ' . MAIN_DB_PREFIX . 'accounting_system as syst';
+	$sql1 .= '	ON accnt.fk_pcg_version = syst.pcg_version AND syst.rowid=' . $conf->global->CHARTOFACCOUNTS . ')';
+	
+	dol_syslog("htdocs/accountancy/customer/index.php fixaccountancycode", LOG_DEBUG);
+	
+	$resql1 = $db->query($sql1);
+	if (! $resql1) {
+		$error ++;
+		$db->rollback();
+		setEventMessage($db->lasterror(), 'errors');
+	} else {
+		$db->commit();
+		setEventMessage($langs->trans('Done'), 'mesgs');
+	}
+} elseif ($action == 'cleanaccountancycode') {
+	$error = 0;
+	$db->begin();
+	
+	$sql1 = "UPDATE " . MAIN_DB_PREFIX . "facturedet as fd";
+	$sql1 .= " SET fd.fk_code_ventilation = 0";
+	$sql1 .= " WHERE fd.fk_facture IN ( SELECT f.rowid FROM " . MAIN_DB_PREFIX . "facture as f";
+	$sql1 .= " WHERE f.datef >= '" . $db->idate(dol_get_first_day($year_current, 1, false)) . "'";
+	$sql1 .= "  AND f.datef <= '" . $db->idate(dol_get_last_day($year_current, 12, false)) . "')";
+	
+	dol_syslog("htdocs/accountancy/customer/index.php fixaccountancycode", LOG_DEBUG);
+	
+	$resql1 = $db->query($sql1);
+	if (! $resql1) {
+		$error ++;
+		$db->rollback();
+		setEventMessage($db->lasterror(), 'errors');
+	} else {
+		$db->commit();
+		setEventMessage($langs->trans('Done'), 'mesgs');
+	}
 }
 
 /*
@@ -101,7 +144,11 @@ $textnextyear = '&nbsp;<a href="' . $_SERVER["PHP_SELF"] . '?year=' . ($year_cur
 print load_fiche_titre($langs->trans("CustomersVentilation") . " " . $textprevyear . " " . $langs->trans("Year") . " " . $year_start . " " . $textnextyear);
 
 print '<b>' . $langs->trans("DescVentilCustomer") . '</b>';
-print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER['PHP_SELF'] . '?action=validatehistory">' . $langs->trans("ValidateHistory") . '</a></div>';
+print '<div class="inline-block divButAction">';
+print '<a class="butAction" href="' . $_SERVER['PHP_SELF'] . '?year=' . $year_current . '&action=validatehistory">' . $langs->trans("ValidateHistory") . '</a>';
+print '<a class="butAction" href="' . $_SERVER['PHP_SELF'] . '?year=' . $year_current . '&action=fixaccountancycode">' . $langs->trans("CleanFixHistory", $year_current) . '</a>';
+print '<a class="butAction" href="' . $_SERVER['PHP_SELF'] . '?year=' . $year_current . '&action=cleanaccountancycode">' . $langs->trans("CleanHistory", $year_current) . '</a>';
+print '</div>';
 
 $sql = "SELECT count(*) FROM " . MAIN_DB_PREFIX . "facturedet as fd";
 $sql .= " , " . MAIN_DB_PREFIX . "facture as f";

htdocs/accountancy/customer/lines.php

@@ -25,7 +25,6 @@
  * \ingroup Accounting Expert
  * \brief Page of detail of the lines of ventilation of invoices customers
  */
-
 require '../../main.inc.php';
 
 // Class
@@ -54,7 +53,8 @@ $search_vat     = GETPOST('search_vat','alpha');
 $sortfield = GETPOST('sortfield', 'alpha');
 $sortorder = GETPOST('sortorder', 'alpha');
 $page = GETPOST('page', 'int');
-if ($page < 0) $page = 0;
+if ($page < 0)
+	$page = 0;
 
 $pageprev = $page - 1;
 $pagenext = $page + 1;
@@ -67,8 +67,8 @@ if (! empty($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION)) {
 }
 $offset = $limit * $page;
 
-
+if (! $sortfield)
-if (! $sortfield) $sortfield="f.datef, f.facnumber, l.rowid";
+	$sortfield = "f.datef, f.facnumber, l.rowid";
 
 if (! $sortorder) {
 	if ($conf->global->ACCOUNTING_LIST_SORT_VENTILATION_DONE > 0) {
@@ -147,7 +147,6 @@ print  '<script type="text/javascript">
  * Action
  */
 
-
 /*
  * Customer Invoice lines
  */
@@ -177,8 +176,7 @@ if (strlen(trim($search_amount))) {
 if (strlen(trim($search_account))) {
 	$sql .= " AND aa.account_number like '%" . $search_account . "%'";
 }
-if (strlen(trim($search_vat))) 
+if (strlen(trim($search_vat))) {
-{
 	$sql .= " AND (l.tva_tx like '" . $search_vat . "%')";
 }
 if (! empty($conf->multicompany->enabled)) {
@@ -186,11 +184,12 @@ if (! empty($conf->multicompany->enabled)) {
 }
 // Count total nb of records with no order and no limits
 $nbtotalofrecords = 0;
-if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
+if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
-{
 	$resql = $db->query($sql);
-	if ($resql) $nbtotalofrecords = $db->num_rows($resql);
+	if ($resql)
-	else dol_print_error($db);
+		$nbtotalofrecords = $db->num_rows($resql);
+	else
+		dol_print_error($db);
 }
 $sql .= $db->order($sortfield, $sortorder);
 $sql .= $db->plimit($limit + 1, $offset);
@@ -202,12 +201,18 @@ if ($result) {
 	$i = 0;
 	
 	$param = "";
-	if ($search_facture)   $param.="&search_facture=".$search_facture;
+	if ($search_facture)
-	if ($search_ref) $param.="&search_ref=".$search_ref;
+		$param .= "&search_facture=" . $search_facture;
-	if ($search_label)   $param.="&search_label=".$search_label;
+	if ($search_ref)
-	if ($search_desc)   $param.="&search_desc=".$search_desc;
+		$param .= "&search_ref=" . $search_ref;
-	if ($search_account)   $param.="&search_account=".$search_account;
+	if ($search_label)
-	if ($filter)       $param.="&filter=".$filter;	
+		$param .= "&search_label=" . $search_label;
+	if ($search_desc)
+		$param .= "&search_desc=" . $search_desc;
+	if ($search_account)
+		$param .= "&search_account=" . $search_account;
+	if ($filter)
+		$param .= "&filter=" . $filter;
 	
 	print_barre_liste($langs->trans("InvoiceLinesDone"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num_lines, $nbtotalofrecords);
 	print '<td align="left"><b>' . $langs->trans("DescVentilDoneCustomer") . '</b></td>';
@@ -292,8 +297,7 @@ if ($result) {
 
 print "</table></form>";
 
-	if ($num_lines > $conf->liste_limit)
+if ($num_lines > $conf->liste_limit) {
-	{
 	print_barre_liste('', $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num_lines, $nbtotalofrecords, '');
 }
 

htdocs/accountancy/customer/list.php

@@ -91,7 +91,6 @@ $accounting = new AccountingAccount($db);
 $aarowid_s = $accounting->fetch('', $conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT, 1);
 $aarowid_p = $accounting->fetch('', $conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT, 1);
 
-
 // Purge search criteria
 if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) {
 	$search_ref = '';
@@ -149,7 +148,7 @@ if ($action == 'ventil' && !empty($btn_ventil)) {
 			
 			dol_syslog("/accountancy/customer/list.php sql=" . $sql, LOG_DEBUG);
 			if ($db->query($sql)) {
-				print '<div><font color="green">' . $langs->trans("Lineofinvoice") . ' ' . $monId . ' - ' . $langs->trans("VentilatedinAccount") . ' : ' . $monCompte . '</font></div>';
+				print '<div><font color="green">' . $langs->trans("Lineofinvoice") . ' ' . $monId . ' ' . $langs->trans("VentilatedinAccount") . ' : ' . $monCompte . '</font></div>';
 			} else {
 				print '<div><font color="red">' . $langs->trans("ErrorDB") . ' : ' . $langs->trans("Lineofinvoice") . ' ' . $monId . ' ' . $langs->trans("NotVentilatedinAccount") . ' : ' . $monCompte . '<br/> <pre>' . $sql . '</pre></font></div>';
 			}
@@ -282,7 +281,6 @@ if ($result) {
 		$code_sell_p_notset = '';
 		$objp->aarowid_suggest = $objp->aarowid;
 		
-		
 		if (! empty($objp->code_sell)) {
 			$objp->code_sell_p = $objp->code_sell;
 		} else {
@@ -332,7 +330,8 @@ if ($result) {
 		print '<td align="right">';
 		print price($objp->total_ht);
 		print '</td>';
-		if ($objp->vat_tx_l <> $objp->vat_tx_p) $code_vat_differ = 'font-weight:bold; text-decoration:blink; color:red';
+		if ($objp->vat_tx_l != $objp->vat_tx_p)
+			$code_vat_differ = 'font-weight:bold; text-decoration:blink; color:red';
 		print '<td style="' . $code_vat_differ . '" align="center">';
 		print price($objp->tva_tx_line);
 		print '</td>';

htdocs/accountancy/journal/bankjournal.php

@@ -27,7 +27,6 @@
  * \ingroup Accounting Expert
  * \brief Page with bank journal
  */
-
 require '../../main.inc.php';
 
 // Class
@@ -143,8 +142,7 @@ if ($result) {
 	$tabtype = array ();
 	
 	$i = 0;
-	while ( $i < $num )
+	while ( $i < $num ) {
-	{
 		$obj = $db->fetch_object($result);
 		
 		$tabcompany[$obj->rowid] = array (
@@ -175,39 +173,28 @@ if ($result) {
 		$links = $object->get_url($obj->rowid);
 		
 		// get_url may return -1 which is not traversable
-		if (is_array($links))
+		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')
+				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') {
-				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') {
-				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'] == 'user') {
-				else if ($links[$key]['type'] == 'user')
-				{
 					$userstatic->id = $links[$key]['url_id'];
 					$userstatic->name = $links[$key]['label'];
 					$tabpay[$obj->rowid]["soclib"] = $userstatic->getNomUrl(1, '', 30);
 					// $tabtp[$obj->rowid][$compta_user] += $obj->amount;
-				}
+				} else if ($links[$key]['type'] == 'sc') {
-				else if ($links[$key]['type'] == 'sc')
-				{
 					$chargestatic->id = $links[$key]['url_id'];
 					$chargestatic->ref = $links[$key]['url_id'];
 					
@@ -216,9 +203,7 @@ if ($result) {
 						if ($reg[1] == 'socialcontribution')
 							$reg[1] = 'SocialContribution';
 						$chargestatic->lib = $langs->trans($reg[1]);
-					}
+					} else {
-					else
-					{
 						$chargestatic->lib = $links[$key]['label'];
 					}
 					$chargestatic->ref = $chargestatic->lib;
@@ -231,39 +216,29 @@ if ($result) {
 					$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)
+					if ($resultmid) {
-					{
 						$objmid = $db->fetch_object($resultmid);
 						$tabtp[$obj->rowid][$objmid->accountancy_code] += $obj->amount;
 					}
-				}
+				} else if ($links[$key]['type'] == 'payment_donation') {
-				else if ($links[$key]['type'] == 'payment_donation')
-				{
 					$paymentdonstatic->id = $links[$key]['url_id'];
 					$paymentdonstatic->fk_donation = $links[$key]['url_id'];
 					$tabpay[$obj->rowid]["lib"] .= ' ' . $langs->trans("PaymentDonation");
 					$tabtp[$obj->rowid][$accountancy_account_pay_donation] += $obj->amount;
-				}
+				} else if ($links[$key]['type'] == 'payment_vat') {
-				else if ($links[$key]['type'] == 'payment_vat')
-				{
 					$paymentvatstatic->id = $links[$key]['url_id'];
 					$paymentvatstatic->ref = $links[$key]['url_id'];
 					$tabpay[$obj->rowid]["lib"] .= ' ' . $langs->trans("PaymentVat");
 					$tabtp[$obj->rowid][$accountancy_account_pay_vat] += $obj->amount;
-				}
+				} else if ($links[$key]['type'] == 'payment_salary') {
-				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') {
-				else if ($links[$key]['type'] == 'banktransfert')
-				{
 					$tabpay[$obj->rowid]["lib"] .= ' ' . $paymentvatstatic->getNomUrl(2);
 					$tabtp[$obj->rowid][$cpttva] += $obj->amount;
 				}
@@ -288,16 +263,13 @@ if ($result) {
  */
 
 // Write bookkeeping
-if ($action == 'writebookkeeping')
+if ($action == 'writebookkeeping') {
-{
 	$now = dol_now();
 	
 	$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"];
 			$bookkeeping->doc_ref = $val["ref"];
@@ -339,7 +311,8 @@ if ($action == 'writebookkeeping')
 				$resultmid = $db->query($sqlmid);
 				if ($resultmid) {
 					$objmid = $db->fetch_object($resultmid);
-					$bookkeeping->doc_ref = $objmid->ref_supplier.' ('.$objmid->ref.')';;
+					$bookkeeping->doc_ref = $objmid->ref_supplier . ' (' . $objmid->ref . ')';
+					;
 				}
 			}
 			
@@ -350,8 +323,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"];
 			$bookkeeping->doc_ref = $val["ref"];
@@ -434,20 +406,19 @@ if ($action == 'writebookkeeping')
 	}
 }
 // Export
-if ($action == 'export_csv')
+if ($action == 'export_csv') {
-{
 	$sep = $conf->global->ACCOUNTING_EXPORT_SEPARATORCSV;
 	
 	include DOL_DOCUMENT_ROOT . '/accountancy/tpl/export_journal.tpl.php';
 	
 	$companystatic = new Client($db);
 	
-	if ($conf->global->ACCOUNTING_EXPORT_MODELCSV == 2) 	// Model Cegid Expert Export
+	// Model Cegid Expert Export
+	if ($conf->global->ACCOUNTING_EXPORT_MODELCSV == 2) 
 	{
 		$sep = ";";
 		
-		foreach ($tabpay as $key => $val) 
+		foreach ( $tabpay as $key => $val ) {
-		{
 			$date = dol_print_date($db->jdate($val["date"]), '%d%m%Y');
 			
 			$companystatic->id = $tabcompany[$key]['id'];
@@ -470,12 +441,9 @@ if ($action == 'export_csv')
 			}
 			
 			// Third party
-			if (is_array ( $tabtp[$key]))
+			if (is_array($tabtp[$key])) {
-			{
+				foreach ( $tabtp[$key] as $k => $mt ) {
-				foreach ( $tabtp[$key] as $k => $mt )
+					if ($mt) {
-				{
-					if ($mt)
-					{
 						print $date . $sep;
 						print $journal . $sep;
 						if ($val["lib"] == '(SupplierInvoicePayment)') {
@@ -491,13 +459,8 @@ if ($action == 'export_csv')
 						print "\n";
 					}
 				}
-			}
+			} else {
-			else
+				foreach ( $tabbq[$key] as $k => $mt ) {
-			{
-				foreach ( $tabbq[$key] as $k => $mt )
-				{
-					if (1)
-					{
 						print $date . $sep;
 						print $journal . $sep;
 						print length_accountg($conf->global->ACCOUNTING_ACCOUNT_SUSPENSE) . $sep;
@@ -510,9 +473,8 @@ if ($action == 'export_csv')
 					}
 				}
 			}
-		}
+	} else {
-	} else 	// Model Classic Export
+		// Model Classic Export
-	{
 		foreach ( $tabpay as $key => $val ) {
 			$date = dol_print_date($db->jdate($val["date"]), 'day');
 			
@@ -531,10 +493,8 @@ if ($action == 'export_csv')
 			}
 			
 			// Third party
-			if (is_array ( $tabtp[$key]))
+			if (is_array($tabtp[$key])) {
-			{
+				foreach ( $tabtp[$key] as $k => $mt ) {
-				foreach ( $tabtp[$key] as $k => $mt )
-				{
 					if ($mt) {
 						print '"' . $date . '"' . $sep;
 						print '"' . $val["type_payment"] . '"' . $sep;
@@ -545,13 +505,8 @@ if ($action == 'export_csv')
 						print "\n";
 					}
 				}
-			}
+			} else {
-			else
+				foreach ( $tabbq[$key] as $k => $mt ) {
-			{
-				foreach ( $tabbq[$key] as $k => $mt )
-				{
-					if (1)
-					{
 					print '"' . $date . '"' . $sep;
 					print '"' . $val["ref"] . '"' . $sep;
 					print '"' . length_accountg($conf->global->ACCOUNTING_ACCOUNT_SUSPENSE) . '"' . $sep;
@@ -564,9 +519,7 @@ if ($action == 'export_csv')
 		}
 	}
 }
-} 
+else {
-else 
-{
 	$form = new Form($db);
 	
 	llxHeader('', $langs->trans("FinanceJournal"));
@@ -577,8 +530,9 @@ else
 	$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);
 	
 	$varlink = 'id_account=' . $id_bank_account;
-	
+	report_header($nom, $nomlink, $period, $periodlink, $description, $builddate, $exportlink, array (
-	report_header($nom, $nomlink, $period, $periodlink, $description, $builddate, $exportlink, array('action' => ''), '', $varlink);
+			'action' => '' 
+	), '', $varlink);
 	
 	print '<input type="button" class="button" style="float: right;" value="' . $langs->trans("Export") . '" onclick="launch_export();" />';
 	
@@ -620,10 +574,12 @@ else
 	foreach ( $tabpay as $key => $val ) {
 		$date = dol_print_date($db->jdate($val["date"]), 'day');
 		
-		if ($val["lib"] == '(SupplierInvoicePayment)')
+		if ($val["lib"] == '(SupplierInvoicePayment)') {
 			$reflabel = $langs->trans('SupplierInvoicePayment');
-		if ($val["lib"] == '(CustomerInvoicePayment)')
+		}
+		if ($val["lib"] == '(CustomerInvoicePayment)') {
 			$reflabel = $langs->trans('CustomerInvoicePayment');
+		}
 			
 			// Bank
 		foreach ( $tabbq[$key] as $k => $mt ) {
@@ -639,8 +595,7 @@ else
 		}
 		
 		// Third party
-		if (is_array ( $tabtp[$key]))
+		if (is_array($tabtp[$key])) {
-		{
 			foreach ( $tabtp[$key] as $k => $mt ) {
 				if ($k != 'type') {
 					print "<tr " . $bc[$var] . ">";
@@ -654,11 +609,8 @@ else
 					print "</tr>";
 				}
 			}
-		}
+		} else {
-		else
+			foreach ( $tabbq[$key] as $k => $mt ) {
-		{
-			foreach ( $tabbq[$key] as $k => $mt )
-			{
 				print "<tr " . $bc[$var] . ">";
 				print "<td>" . $date . "</td>";
 				print "<td>" . $reflabel . "</td>";
@@ -677,5 +629,4 @@ else
 	
 	llxFooter();
 }
-
 $db->close();

htdocs/accountancy/journal/index.php

@@ -23,7 +23,6 @@
  * \ingroup Accounting Expert
  * \brief Index
  */
-
 require '../../main.inc.php';
 
 // Langs

htdocs/accountancy/journal/purchasesjournal.php

@@ -26,7 +26,6 @@
  * \ingroup Accounting Expert
  * \brief Page with purchases journal
  */
-
 require '../../main.inc.php';
 
 // Class
@@ -60,8 +59,6 @@ if ($user->societe_id > 0)
 
 $action = GETPOST('action');
 
-
-
 /*
  * Actions
  */
@@ -257,7 +254,6 @@ if ($action == 'writebookkeeping') {
 	}
 }
 
-
 /*
  * View
  */
@@ -265,14 +261,14 @@ if ($action == 'writebookkeeping') {
 $companystatic = new Fournisseur($db);
 
 // Export
-if ($action == 'export_csv')
+if ($action == 'export_csv') {
-{
 	$sep = $conf->global->ACCOUNTING_EXPORT_SEPARATORCSV;
 	$journal = $conf->global->ACCOUNTING_PURCHASE_JOURNAL;
 	
 	include DOL_DOCUMENT_ROOT . '/accountancy/tpl/export_journal.tpl.php';
 	
-	if ($conf->global->ACCOUNTING_EXPORT_MODELCSV == 2) 	// Model Cegid Expert Export
+	// Model Cegid Expert Export
+	if ($conf->global->ACCOUNTING_EXPORT_MODELCSV == 2) 
 	{
 		$sep = ";";
 		
@@ -325,8 +321,8 @@ if ($action == 'export_csv')
 				print "\n";
 			}
 		}
-	} else 	// Model Classic Export
+	} else {
-	{
+		// Model Classic Export
 		foreach ( $tabfac as $key => $val ) {
 			$date = dol_print_date($db->jdate($val["date"]), 'day');
 			
@@ -385,12 +381,16 @@ if ($action == 'export_csv')
 	$exportlink = '';
 	$builddate = time();
 	$description = $langs->trans("DescPurchasesJournal") . '<br>';
-	if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS))
+	if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
 		$description .= $langs->trans("DepositsAreNotIncluded");
-	else
+	} else {
 		$description .= $langs->trans("DepositsAreIncluded");
+	}
+	
 	$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($nom, $nomlink, $period, $periodlink, $description, $builddate, $exportlink, array('action' => ''));
+	report_header($nom, $nomlink, $period, $periodlink, $description, $builddate, $exportlink, array (
+			'action' => '' 
+	));
 	
 	print '<input type="button" class="button" style="float: right;" value="' . $langs->trans("Export") . '" onclick="launch_export();" />';
 	

htdocs/accountancy/journal/sellsjournal.php

@@ -28,7 +28,6 @@
  * \ingroup Accounting Expert
  * \brief Page with sells journal
  */
-
 require '../../main.inc.php';
 
 // Class
@@ -62,8 +61,6 @@ if ($user->societe_id > 0)
 
 $action = GETPOST('action');
 
-
-
 /*
  * View
  */
@@ -106,8 +103,7 @@ if (! empty($conf->multicompany->enabled)) {
 $sql .= " AND f.fk_statut > 0";
 if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
 	$sql .= " AND f.type IN (" . Facture::TYPE_STANDARD . "," . Facture::TYPE_REPLACEMENT . "," . Facture::TYPE_CREDIT_NOTE . "," . Facture::TYPE_SITUATION . ")";
-}
+} else {
-else {
 	$sql .= " AND f.type IN (" . Facture::TYPE_STANDARD . "," . Facture::TYPE_STANDARD . "," . Facture::TYPE_CREDIT_NOTE . "," . Facture::TYPE_DEPOSIT . "," . Facture::TYPE_SITUATION . ")";
 }
 $sql .= " AND fd.product_type IN (0,1)";
@@ -191,15 +187,12 @@ if ($result) {
  */
 
 // Bookkeeping Write
-if ($action == 'writebookkeeping')
+if ($action == 'writebookkeeping') {
-{
 	$now = dol_now();
 	$error = 0;
 	
-	foreach ($tabfac as $key => $val)
+	foreach ( $tabfac as $key => $val ) {
-	{
+		foreach ( $tabttc[$key] as $k => $mt ) {
-		foreach ($tabttc[$key] as $k => $mt)
-		{
 			$bookkeeping = new BookKeeping($db);
 			$bookkeeping->doc_date = $val["date"];
 			$bookkeeping->doc_ref = $val["ref"];
@@ -258,10 +251,8 @@ if ($action == 'writebookkeeping')
 		
 		// VAT
 		// var_dump($tabtva);
-		foreach ($tabtva[$key] as $k => $mt)
+		foreach ( $tabtva[$key] as $k => $mt ) {
-		{
+			if ($mt) {
-			if ($mt)
-			{
 				$bookkeeping = new BookKeeping($db);
 				$bookkeeping->doc_date = $val["date"];
 				$bookkeeping->doc_ref = $val["ref"];
@@ -294,16 +285,16 @@ if ($action == 'writebookkeeping')
 }
 
 // Export
-if ($action == 'export_csv')
+if ($action == 'export_csv') {
-{
 	$sep = $conf->global->ACCOUNTING_EXPORT_SEPARATORCSV;
-	$journal = $conf->global->ACCOUNTING_SELL_JOURNAL;
+	$sell_journal = $conf->global->ACCOUNTING_SELL_JOURNAL;
 	
 	include DOL_DOCUMENT_ROOT . '/accountancy/tpl/export_journal.tpl.php';
 	
 	$companystatic = new Client($db);
 	
-	if ($conf->global->ACCOUNTING_EXPORT_MODELCSV == 2) 	// Model Cegid Expert Export
+	// Model Cegid Expert Export
+	if ($conf->global->ACCOUNTING_EXPORT_MODELCSV == 2) 
 	{
 		$sep = ";";
 		
@@ -328,14 +319,15 @@ if ($action == 'export_csv')
 			
 			// Product / Service
 			foreach ( $tabht[$key] as $k => $mt ) {
-				if ($mt) {
+				$accountingaccount_static = new AccountingAccount($db);
+				if ($accountingaccount_static->fetch(null, $k)) {
 					print $date . $sep;
 					print $sell_journal . $sep;
 					print length_accountg(html_entity_decode($k)) . $sep;
 					print $sep;
 					print ($mt < 0 ? 'D' : 'C') . $sep;
 					print ($mt <= 0 ? price(- $mt) : $mt) . $sep;
-					print dol_trunc($val["description"], 32) . $sep;
+					print dol_trunc($accountingaccount_static->label, 32) . $sep;
 					print $val["ref"];
 					print "\n";
 				}
@@ -356,11 +348,9 @@ if ($action == 'export_csv')
 				}
 			}
 		}
-	}
+	} else {
-	else 	// Model Classic Export
+		// Model Classic Export
-	{
+		foreach ( $tabfac as $key => $val ) {
-		foreach ($tabfac as $key => $val)
-		{
 			$companystatic->id = $tabcompany[$key]['id'];
 			$companystatic->name = $tabcompany[$key]['name'];
 			$companystatic->client = $tabcompany[$key]['code_client'];
@@ -378,8 +368,7 @@ if ($action == 'export_csv')
 			}
 			
 			// Product / Service
-			foreach ($tabht[$key] as $k => $mt)
+			foreach ( $tabht[$key] as $k => $mt ) {
-			{
 				$accountingaccount = new AccountingAccount($db);
 				$accountingaccount->fetch(null, $k);
 				
@@ -395,8 +384,7 @@ if ($action == 'export_csv')
 			}
 			
 			// VAT
-			foreach ($tabtva[$key] as $k => $mt)
+			foreach ( $tabtva[$key] as $k => $mt ) {
-			{
 				if ($mt) {
 					print '"' . $date . '"' . $sep;
 					print '"' . $val["ref"] . '"' . $sep;
@@ -426,7 +414,9 @@ if ($action == 'export_csv')
 	else
 		$description .= $langs->trans("DepositsAreIncluded");
 	$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($nom, $nomlink, $period, $periodlink, $description, $builddate, $exportlink, array('action' => ''));
+	report_header($nom, $nomlink, $period, $periodlink, $description, $builddate, $exportlink, array (
+			'action' => '' 
+	));
 	
 	print '<input type="button" class="button" style="float: right;" value="' . $langs->trans("Export") . '" onclick="launch_export();" />';
 	
@@ -468,8 +458,7 @@ if ($action == 'export_csv')
 	$invoicestatic = new Facture($db);
 	$companystatic = new Client($db);
 	
-	foreach ($tabfac as $key => $val)
+	foreach ( $tabfac as $key => $val ) {
-	{
 		$invoicestatic->id = $key;
 		$invoicestatic->ref = $val["ref"];
 		$invoicestatic->type = $val["type"];
@@ -477,8 +466,7 @@ if ($action == 'export_csv')
 		$date = dol_print_date($db->jdate($val["date"]), 'day');
 		
 		// Third party
-		foreach ($tabttc[$key] as $k => $mt)
+		foreach ( $tabttc[$key] as $k => $mt ) {
-		{
 			print "<tr " . $bc[$var] . ">";
 			print "<td>" . $date . "</td>";
 			print "<td>" . $invoicestatic->getNomUrl(1) . "</td>";
@@ -494,8 +482,7 @@ if ($action == 'export_csv')
 		print "</tr>";
 		
 		// Product / Service
-		foreach ($tabht[$key] as $k => $mt)
+		foreach ( $tabht[$key] as $k => $mt ) {
-		{
 			$accountingaccount = new AccountingAccount($db);
 			$accountingaccount->fetch(null, $k);
 			
@@ -512,8 +499,7 @@ if ($action == 'export_csv')
 		}
 		
 		// VAT
-		foreach ($tabtva[$key] as $k => $mt)
+		foreach ( $tabtva[$key] as $k => $mt ) {
-		{
 			if ($mt) {
 				print "<tr " . $bc[$var] . ">";
 				print "<td>" . $date . "</td>";

htdocs/accountancy/supplier/card.php

@@ -26,7 +26,6 @@
  * \ingroup Accountancy
  * \brief Card supplier ventilation
  */
-
 require '../../main.inc.php';
 
 // Class
@@ -46,8 +45,7 @@ if ($user->societe_id > 0)
 	accessforbidden();
 
 if ($action == 'ventil' && $user->rights->accounting->ventilation->dispatch) {
-	if (! GETPOST('cancel', 'alpha'))
+	if (! GETPOST('cancel', 'alpha')) {
-	{
 		$sql = " UPDATE " . MAIN_DB_PREFIX . "facture_fourn_det";
 		$sql .= " SET fk_code_ventilation = " . $codeventil;
 		$sql .= " WHERE rowid = " . $id;

htdocs/accountancy/supplier/index.php

@@ -23,7 +23,6 @@
  * \ingroup Accounting Expert
  * \brief Home supplier ventilation
  */
-
 require '../../main.inc.php';
 
 // Class
@@ -84,6 +83,50 @@ if ($action == 'validatehistory') {
 		$db->commit();
 		setEventMessages($langs->trans('Dispatched'), null, 'mesgs');
 	}
+} elseif ($action == 'fixaccountancycode') {
+	$error = 0;
+	$db->begin();
+	
+	$sql1 = "UPDATE " . MAIN_DB_PREFIX . "facture_fourn_det as fd";
+	$sql1 .= " SET fd.fk_code_ventilation = 0";
+	$sql1 .= ' WHERE fd.fk_code_ventilation NOT IN ';
+	$sql1 .= '	(SELECT accnt.rowid ';
+	$sql1 .= '	FROM ' . MAIN_DB_PREFIX . 'accountingaccount as accnt';
+	$sql1 .= '	INNER JOIN ' . MAIN_DB_PREFIX . 'accounting_system as syst';
+	$sql1 .= '	ON accnt.fk_pcg_version = syst.pcg_version AND syst.rowid=' . $conf->global->CHARTOFACCOUNTS . ')';
+	
+	dol_syslog("htdocs/accountancy/customer/index.php fixaccountancycode", LOG_DEBUG);
+	
+	$resql1 = $db->query($sql1);
+	if (! $resql1) {
+		$error ++;
+		$db->rollback();
+		setEventMessage($db->lasterror(), 'errors');
+	} else {
+		$db->commit();
+		setEventMessage($langs->trans('Done'), 'mesgs');
+	}
+} elseif ($action == 'cleanaccountancycode') {
+	$error = 0;
+	$db->begin();
+	
+	$sql1 = "UPDATE " . MAIN_DB_PREFIX . "facture_fourn_det as fd";
+	$sql1 .= " SET fd.fk_code_ventilation = 0";
+	$sql1 .= " WHERE fd.fk_facture_fourn IN ( SELECT f.rowid FROM " . MAIN_DB_PREFIX . "facture_fourn as f";
+	$sql1 .= " WHERE f.datef >= '" . $db->idate(dol_get_first_day($year_current, 1, false)) . "'";
+	$sql1 .= "  AND f.datef <= '" . $db->idate(dol_get_last_day($year_current, 12, false)) . "')";
+	
+	dol_syslog("htdocs/accountancy/customer/index.php fixaccountancycode", LOG_DEBUG);
+	
+	$resql1 = $db->query($sql1);
+	if (! $resql1) {
+		$error ++;
+		$db->rollback();
+		setEventMessage($db->lasterror(), 'errors');
+	} else {
+		$db->commit();
+		setEventMessage($langs->trans('Done'), 'mesgs');
+	}
 }
 
 /*
@@ -98,7 +141,11 @@ $textnextyear = '&nbsp;<a href="' . $_SERVER["PHP_SELF"] . '?year=' . ($year_cur
 print load_fiche_titre($langs->trans("SuppliersVentilation") . "&nbsp;" . $textprevyear . "&nbsp;" . $langs->trans("Year") . "&nbsp;" . $year_start . "&nbsp;" . $textnextyear);
 
 print '<b>' . $langs->trans("DescVentilSupplier") . '</b>';
-print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER['PHP_SELF'] . '?action=validatehistory">' . $langs->trans("ValidateHistory") . '</a></div>';
+print '<div class="inline-block divButAction">';
+print '<a class="butAction" href="' . $_SERVER['PHP_SELF'] . '?year=' . $year_current . '&action=validatehistory">' . $langs->trans("ValidateHistory") . '</a>';
+print '<a class="butAction" href="' . $_SERVER['PHP_SELF'] . '?year=' . $year_current . '&action=fixaccountancycode">' . $langs->trans("CleanFixHistory", $year_current) . '</a>';
+print '<a class="butAction" href="' . $_SERVER['PHP_SELF'] . '?year=' . $year_current . '&action=cleanaccountancycode">' . $langs->trans("CleanHistory", $year_current) . '</a>';
+print '</div>';
 
 $y = $year_current;
 

htdocs/accountancy/supplier/lines.php

@@ -24,7 +24,6 @@
  * \ingroup Accounting Expert
  * \brief Page of detail of the lines of ventilation of invoices suppliers
  */
-
 require '../../main.inc.php';
 
 // Class
@@ -56,28 +55,23 @@ $sortfield = GETPOST('sortfield','alpha');
 $sortorder = GETPOST('sortorder', 'alpha');
 $page = GETPOST('page', 'int');
 
-if ($page < 0) $page = 0;
+if ($page < 0)
+	$page = 0;
 $offset = $conf->liste_limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (! empty($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION)) 
+if (! empty($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION)) {
-{
 	$limit = $conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION;
-} 
+} else if ($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION <= 0) {
-else if ($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION <= 0) 
+	$limit = GETPOST('limit') ? GETPOST('limit', 'int') : $conf->liste_limit;
-{
+} else {
 	$limit = GETPOST('limit') ? GETPOST('limit', 'int') : $conf->liste_limit;
 }
-else 
+if (! $sortfield)
-{
+	$sortfield = "f.datef, f.ref, l.rowid";
-	$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
-}
-if (! $sortfield) $sortfield="f.datef, f.ref, l.rowid";
 
-if (! $sortorder) 
+if (! $sortorder) {
-{
+	if ($conf->global->ACCOUNTING_LIST_SORT_VENTILATION_DONE > 0) {
-	if ($conf->global->ACCOUNTING_LIST_SORT_VENTILATION_DONE > 0) 
-    {
 		$sortorder = " DESC ";
 	}
 }
@@ -149,7 +143,6 @@ print  '<script type="text/javascript">
 			});
 			 </script>';
 
- 
 /*
  * Supplier Invoice lines
  */
@@ -179,8 +172,7 @@ if (strlen(trim($search_amount))) {
 if (strlen(trim($search_account))) {
 	$sql .= " AND aa.account_number like '%" . $search_account . "%'";
 }
-if (strlen(trim($search_vat))) 
+if (strlen(trim($search_vat))) {
-{
 	$sql .= " AND (l.tva_tx like '" . $search_vat . "%')";
 }
 if (! empty($conf->multicompany->enabled)) {
@@ -278,7 +270,6 @@ if ($result) {
 	print $db->error();
 }
 
-
 print "</table></form>";
 
 llxFooter();

htdocs/accountancy/tpl/export_journal.tpl.php

@@ -14,7 +14,6 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
- 
 $prefix = $conf->global->ACCOUNTING_EXPORT_PREFIX_SPEC;
 $format = $conf->global->ACCOUNTING_EXPORT_FORMAT;
 

htdocs/admin/barcode.php

@@ -78,6 +78,11 @@ else if ($action == 'update')
 		$res = dolibarr_set_const($db, "GENBARCODE_BARCODETYPE_THIRDPARTY", $coder_id,'chaine',0,'',$conf->entity);
 	}
 }
+else if ($action == 'updateengine')
+{
+    // TODO Update engines.
+    
+}
 
 // define constants for models generator that need parameters
 if ($action == 'setModuleOptions')
@@ -190,6 +195,10 @@ $var=true;
 print '<br>';
 print load_fiche_titre($langs->trans("BarcodeEncodeModule"),'','');
 
+print "<form method=\"post\" action=\"".$_SERVER["PHP_SELF"]."\">";
+print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+print "<input type=\"hidden\" name=\"action\" value=\"updateengine\">";
+
 print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("Name").'</td>';
@@ -282,11 +291,18 @@ if ($resql)
 }
 print "</table>\n";
 
+if (empty($conf->use_javascript_ajax))
+{
+    // TODO Implement code behind action updateengine
+    //print '<div class="center"><input type="submit" class="button" name="save" value="'.$langs->trans("Save").'"></div>';
+}
+print '</form>';
+
 print "<br>";
 
+
 /*
- * Autres options
+ * Other options
- *
  */
 print load_fiche_titre($langs->trans("OtherOptions"),'','');
 

htdocs/compta/facture/class/facture-rec.class.php

@@ -186,10 +186,13 @@ class FactureRec extends Facture
 	/**
 	 *	Recupere l'objet facture et ses lignes de factures
 	 *
-	 *	@param	int		$rowid      Id de la facture a recuperer
+	 *	@param      int		$rowid       	Id of object to load
-	 *	@return int         		>0 si ok, <0 si ko
+	 * 	@param		string	$ref			Reference of invoice
+	 * 	@param		string	$ref_ext		External reference of invoice
+	 * 	@param		int		$ref_int		Internal reference of other object
+	 *	@return     int         			>0 if OK, <0 if KO, 0 if not found
 	 */
-	function fetch($rowid)
+	function fetch($rowid, $ref='', $ref_ext='', $ref_int='')
 	{
 		$sql = 'SELECT f.titre,f.fk_soc,f.amount,f.tva,f.total,f.total_ttc,f.remise_percent,f.remise_absolue,f.remise';
 		$sql.= ', f.date_lim_reglement as dlr';
@@ -203,8 +206,13 @@ class FactureRec extends Facture
 		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement as p ON f.fk_mode_reglement = p.id';
 		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."element_element as el ON el.fk_target = f.rowid AND el.targettype = 'facture'";
 		$sql.= ' WHERE f.rowid='.$rowid;
+		if ($ref)     $sql.= " AND f.titre='".$this->db->escape($ref)."'";
+		/* This field are not used for template invoice
+		if ($ref_ext) $sql.= " AND f.ref_ext='".$this->db->escape($ref_ext)."'";
+		if ($ref_int) $sql.= " AND f.ref_int='".$this->db->escape($ref_int)."'";
+		*/
 		
-        dol_syslog("FactureRec::Fetch rowid=".$rowid."", LOG_DEBUG);
+        dol_syslog(get_class($this)."::fetch rowid=".$rowid, LOG_DEBUG);
 		$result = $this->db->query($sql);
 		if ($result)
 		{
@@ -353,32 +361,49 @@ class FactureRec extends Facture
 
 
 	/**
-	 * 		Delete current invoice
+	 * 	Delete template invoice
 	 *
+	 *	@param     	int		$rowid      	Id of invoice to delete. If empty, we delete current instance of invoice
+	 *	@param		int		$notrigger		1=Does not execute triggers, 0= execute triggers
+	 *	@param		int		$idwarehouse	Id warehouse to use for stock change.
 	 *	@return		int						<0 if KO, >0 if OK
 	 */
-	function delete()
+	function delete($rowid=0, $notrigger=0, $idwarehouse=-1)
 	{
-		$sql = "DELETE FROM ".MAIN_DB_PREFIX."facturedet_rec WHERE fk_facture = ".$this->id;
+	    if (empty($rowid)) $rowid=$this->id;
+	    
+	    dol_syslog(get_class($this)."::delete rowid=".$rowid, LOG_DEBUG);
+	    
+        $error=0;
+		$this->db->begin();
+		
+		$sql = "DELETE FROM ".MAIN_DB_PREFIX."facturedet_rec WHERE fk_facture = ".$rowid;
 		dol_syslog($sql);
 		if ($this->db->query($sql))
 		{
-			$sql = "DELETE FROM ".MAIN_DB_PREFIX."facture_rec WHERE rowid = ".$this->id;
+			$sql = "DELETE FROM ".MAIN_DB_PREFIX."facture_rec WHERE rowid = ".$rowid;
 			dol_syslog($sql);
-			if ($this->db->query($sql))
+			if (! $this->db->query($sql))
 			{
+				$this->error=$this->db->lasterror();
+				$error=-1;
+			}
+		}
+		else
+		{
+			$this->error=$this->db->lasterror();
+			$error=-2;
+		}
+		
+		if (! $error)
+		{
+		    $this->db->commit();
 		    return 1;
 		}
 		else
 		{
-				$this->error=$this->db->lasterror();
+	        $this->db->rollback();
-				return -1;
+	        return $error;
-			}
-		}
-		else
-		{
-			$this->error=$this->db->lasterror();
-			return -2;
 		}
 	}
 
@@ -507,22 +532,30 @@ class FactureRec extends Facture
 	/**
 	 *	Return clicable name (with picto eventually)
 	 *
-	 *	@param		int		$withpicto		0=No picto, 1=Include picto into link, 2=Only picto
+	 * @param	int		$withpicto       Add picto into link
-	 *	@param		string	$option			Sur quoi pointe le lien ('', 'withdraw')
+	 * @param  string	$option          Where point the link
-	 *	@return		string					Chaine avec URL
+	 * @param  int		$max             Maxlength of ref
+	 * @param  int		$short           1=Return just URL
+	 * @param  string   $moretitle       Add more text to title tooltip
+	 * @return string 			         String with URL
 	 */
-	function getNomUrl($withpicto=0,$option='')
+	function getNomUrl($withpicto=0,$option='',$max=0,$short=0,$moretitle='')
 	{
 		global $langs;
 
 		$result='';
         $label=$langs->trans("ShowInvoice").': '.$this->ref;
         
-        $link = '<a href="'.DOL_URL_ROOT.'/compta/facture/fiche-rec.php?facid='.$this->id.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
+        $url = DOL_URL_ROOT.'/compta/facture/fiche-rec.php?facid='.$this->id;
-		$linkend='</a>';
+        
+        if ($short) return $url;
         
 		$picto='bill';
         
+		$link = '<a href="'.$url.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
+		$linkend='</a>';
+
+
 
         if ($withpicto) $result.=($link.img_object($label, $picto, 'class="classfortooltip"').$linkend);
 		if ($withpicto && $withpicto != 2) $result.=' ';

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

@@ -1803,7 +1803,7 @@ class Facture extends CommonInvoice
        	|| (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->facture->invoice_advance->validate)))
 		{
 			$this->error='Permission denied';
-			dol_syslog(get_class($this)."::validate ".$this->error, LOG_ERR);
+			dol_syslog(get_class($this)."::validate ".$this->error.' MAIN_USE_ADVANCED_PERMS='.$conf->global->MAIN_USE_ADVANCED_PERMS, LOG_ERR);
 			return -1;
 		}
 

htdocs/compta/paiement/card.php

@@ -201,8 +201,13 @@ if ($action == 'valide')
 
 print '<table class="border" width="100%">';
 
+$linkback = '<a href="' . DOL_URL_ROOT . '/compta/paiement/list.php">' . $langs->trans("BackToList") . '</a>';
+
+
 // Ref
-print '<tr><td width="20%">'.$langs->trans('Ref').'</td><td colspan="3">'.$object->ref.'</td></tr>';
+print '<tr><td width="20%">'.$langs->trans('Ref').'</td><td colspan="3">';
+print $form->showrefnav($object, 'ref', $linkback, 1, 'ref', 'ref', '');
+print '</td></tr>';
 
 // Date payment
 print '<tr><td>'.$form->editfieldkey("Date",'datep',$object->date,$object,$user->rights->facture->paiement).'</td><td colspan="3">';

htdocs/compta/paiement/class/paiement.class.php

@@ -103,7 +103,7 @@ class Paiement extends CommonObject
 			{
 				$obj = $this->db->fetch_object($resql);
 				$this->id             = $obj->rowid;
-				$this->ref            = $obj->ref;
+				$this->ref            = $obj->ref?$obj->ref:$obj->rowid;
 				$this->date           = $this->db->jdate($obj->dp);
 				$this->datepaye       = $this->db->jdate($obj->dp);
 				$this->numero         = $obj->num_paiement;

htdocs/compta/paiement/list.php

@@ -53,8 +53,9 @@ $companystatic=new Societe($db);
 $search_ref=GETPOST("search_ref","int");
 $search_account=GETPOST("search_account","int");
 $search_paymenttype=GETPOST("search_paymenttype");
-$search_amount=GETPOST("search_amount");
+$search_amount=GETPOST("search_amount",'alpha');    // alpha because we must be able to search on "< x"
-$search_company=GETPOST("search_company");
+$search_company=GETPOST("search_company",'alpha');
+$search_payment_num=GETPOST('search_payment_num','alpha');
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
@@ -72,6 +73,7 @@ if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both
 	$search_account="";
 	$search_amount="";
     $search_paymenttype="";
+    $search_payment_num="";
 	$search_company="";
     $day='';
     $year='';
@@ -168,6 +170,7 @@ else
     if ($search_ref)       		    $sql .=natural_search('p.ref', $search_ref);
     if ($search_account > 0)      	$sql .=" AND b.fk_account=".$search_account;
     if ($search_paymenttype != "")  $sql .=" AND c.code='".$db->escape($search_paymenttype)."'";
+    if ($search_payment_num != '')  $sql .=" AND p.num_paiement = '".$db->escape($search_payment_num)."'";
     if ($search_amount)      		$sql .=" AND p.amount='".$db->escape(price2num($search_amount))."'";
     if ($search_company)     		$sql .= natural_search('s.nom', $search_company);
 	// Add where from hooks
@@ -209,6 +212,7 @@ if ($resql)
     print_liste_field_titre($langs->trans("Date"),$_SERVER["PHP_SELF"],"dp","",$paramlist,'align="center"',$sortfield,$sortorder);
     print_liste_field_titre($langs->trans("ThirdParty"),$_SERVER["PHP_SELF"],"s.nom","",$paramlist,"",$sortfield,$sortorder);
     print_liste_field_titre($langs->trans("Type"),$_SERVER["PHP_SELF"],"c.libelle","",$paramlist,"",$sortfield,$sortorder);
+    print_liste_field_titre($langs->trans("Numero"),$_SERVER["PHP_SELF"],"p.num_paiement","",$paramlist,"",$sortfield,$sortorder);
     print_liste_field_titre($langs->trans("Account"),$_SERVER["PHP_SELF"],"ba.label","",$paramlist,"",$sortfield,$sortorder);
     print_liste_field_titre($langs->trans("Amount"),$_SERVER["PHP_SELF"],"p.amount","",$paramlist,'align="right"',$sortfield,$sortorder);
     //print_liste_field_titre($langs->trans("Invoices"),"","","",$paramlist,'align="left"',$sortfield,$sortorder);
@@ -237,6 +241,9 @@ if ($resql)
     print '<td>';
     $form->select_types_paiements($search_paymenttype,'search_paymenttype','',2,1,1);
     print '</td>';
+    print '<td align="left">';
+    print '<input class="flat" type="text" size="4" name="search_payment_num" value="'.$search_payment_num.'">';
+    print '</td>';
     print '<td>';
     $form->select_comptes($search_account,'search_account',0,'',1);
     print '</td>';
@@ -279,7 +286,7 @@ if ($resql)
         else print '&nbsp;';
         print '</td>';
 
-        print '<td>'.$langs->trans("PaymentTypeShort".$objp->paiement_code).' '.$objp->num_paiement.'</td>';
+        print '<td>'.$langs->trans("PaymentTypeShort".$objp->paiement_code).'</td><td>'.$objp->num_paiement.'</td>';
         print '<td>';
         if ($objp->bid)
         {

htdocs/compta/resultat/clientfourn.php

@@ -621,6 +621,87 @@ if (! empty($conf->salaries->enabled))
 	print '</tr>';
 }
 
+/*
+ * Expense
+ */
+
+if (! empty($conf->expensereport->enabled))
+{
+	$langs->load('trips');
+	if ($modecompta == 'CREANCES-DETTES') {
+		$sql = "SELECT p.rowid, p.ref, u.firstname, u.lastname, date_format(date_valid,'%Y-%m') as dm, sum(p.total_ht) as amount_ht,sum(p.total_ttc) as amount_ttc";
+		$sql.= " FROM ".MAIN_DB_PREFIX."expensereport as p";
+		$sql.= " INNER JOIN ".MAIN_DB_PREFIX."user as u ON u.rowid=p.fk_user_author";
+		$sql.= " WHERE p.entity = ".getEntity('expensereport',1);
+		$sql.= " AND p.fk_statut>5";
+		
+		$column='p.date_valid';
+		
+	} else {
+		$sql = "SELECT p.rowid, p.ref, u.firstname, u.lastname, date_format(pe.datep,'%Y-%m') as dm, sum(p.total_ht) as amount_ht,sum(p.total_ttc) as amount_ttc";
+		$sql.= " FROM ".MAIN_DB_PREFIX."expensereport as p";
+		$sql.= " INNER JOIN ".MAIN_DB_PREFIX."user as u ON u.rowid=p.fk_user_author";
+		$sql.= " INNER JOIN ".MAIN_DB_PREFIX."payment_expensereport as pe ON pe.fk_expensereport = p.rowid";
+		$sql.= " INNER JOIN ".MAIN_DB_PREFIX."c_paiement as c ON pe.fk_typepayment = c.id";
+		$sql.= " WHERE p.entity = ".getEntity('expensereport',1);
+		$sql.= " AND p.fk_statut=6";
+		
+		$column='pe.datep';
+	}
+
+	print '<tr><td colspan="4">'.$langs->trans("ExpenseReport").'</td></tr>';
+	
+	if (! empty($date_start) && ! empty($date_end))
+		$sql.= " AND $column >= '".$db->idate($date_start)."' AND $column <= '".$db->idate($date_end)."'";
+
+		$sql.= " GROUP BY p.rowid, p.ref, u.firstname, u.lastname, dm";
+		$sql.= " ORDER BY p.ref";
+
+		dol_syslog("get expense report outcome");
+		$result=$db->query($sql);
+		$subtotal_ht = 0;
+		$subtotal_ttc = 0;
+		if ($result)
+		{
+			$num = $db->num_rows($result);
+			$var=true;
+			if ($num)
+			{
+				while ($obj = $db->fetch_object($result))
+				{
+					$total_ht -= $obj->amount_ht;
+					$total_ttc -= $obj->amount_ttc;
+					$subtotal_ht += $obj->amount_ht;
+					$subtotal_ttc += $obj->amount_ttc;
+
+					$var = !$var;
+					print "<tr ".$bc[$var]."><td>&nbsp;</td>";
+
+					print "<td>".$langs->trans("ExpenseReport")." <a href=\"".DOL_URL_ROOT."/expensereport/card.php?id=".$obj->rowid."\">".$obj->ref.' ('.$obj->firstname." ".$obj->lastname.")</a></td>\n";
+
+					if ($modecompta == 'CREANCES-DETTES') print '<td align="right">'.price(-$obj->amount_ht).'</td>';
+					print '<td align="right">'.price(-$obj->amount_ttc).'</td>';
+					print '</tr>';
+				}
+			}
+			else
+			{
+				$var = !$var;
+				print "<tr ".$bc[$var]."><td>&nbsp;</td>";
+				print '<td colspan="3">'.$langs->trans("None").'</td>';
+				print '</tr>';
+			}
+		}
+		else
+		{
+			dol_print_error($db);
+		}
+		print '<tr class="liste_total">';
+		if ($modecompta == 'CREANCES-DETTES')
+			print '<td colspan="3" align="right">'.price(-$subtotal_ht).'</td>';
+			print '<td colspan="3" align="right">'.price(-$subtotal_ttc).'</td>';
+			print '</tr>';
+}
 
 /*
  * Donation

htdocs/compta/resultat/index.php

@@ -521,6 +521,58 @@ if (! empty($conf->salaries->enabled))
     }
 }
 
+if (! empty($conf->expensereport->enabled))
+{
+	$langs->load('trips');
+	if ($modecompta == 'CREANCES-DETTES') {
+		$sql = "SELECT date_format(date_valid,'%Y-%m') as dm, sum(p.total_ht) as amount_ht,sum(p.total_ttc) as amount_ttc";
+		$sql.= " FROM ".MAIN_DB_PREFIX."expensereport as p";
+		$sql.= " INNER JOIN ".MAIN_DB_PREFIX."user as u ON u.rowid=p.fk_user_author";
+		$sql.= " WHERE p.entity = ".getEntity('expensereport',1);
+		$sql.= " AND p.fk_statut>5";
+
+		$column='p.date_valid';
+
+	} else {
+		$sql = "SELECT date_format(pe.datep,'%Y-%m') as dm, sum(p.total_ht) as amount_ht,sum(p.total_ttc) as amount_ttc";
+		$sql.= " FROM ".MAIN_DB_PREFIX."expensereport as p";
+		$sql.= " INNER JOIN ".MAIN_DB_PREFIX."user as u ON u.rowid=p.fk_user_author";
+		$sql.= " INNER JOIN ".MAIN_DB_PREFIX."payment_expensereport as pe ON pe.fk_expensereport = p.rowid";
+		$sql.= " INNER JOIN ".MAIN_DB_PREFIX."c_paiement as c ON pe.fk_typepayment = c.id";
+		$sql.= " WHERE p.entity = ".getEntity('expensereport',1);
+		$sql.= " AND p.fk_statut=6";
+
+		$column='pe.datep';
+	}
+
+	$sql.= " GROUP BY dm";
+
+	dol_syslog("get expense report outcome");
+	$result=$db->query($sql);
+	$subtotal_ht = 0;
+	$subtotal_ttc = 0;
+	if ($result)
+	{
+		$num = $db->num_rows($result);
+		if ($num)
+		{
+			while ($obj = $db->fetch_object($result))
+			{
+				if (! isset($decaiss[$obj->dm])) $decaiss[$obj->dm]=0;
+				$decaiss[$obj->dm] += $obj->amount_ht;
+				
+				if (! isset($decaiss_ttc[$obj->dm])) $decaiss_ttc[$obj->dm]=0;
+				$decaiss_ttc[$obj->dm] += $obj->amount_ttc;
+
+			}
+		}
+	}
+	else
+	{
+		dol_print_error($db);
+	}
+}
+
 /*
  * Donation get dunning paiement
  */

htdocs/contact/card.php

@@ -512,9 +512,11 @@ else
 								$(\'textarea[name="address"]\').val("'.dol_escape_js($objsoc->address).'");
 								$(\'input[name="zipcode"]\').val("'.dol_escape_js($objsoc->zip).'");
 								$(\'input[name="town"]\').val("'.dol_escape_js($objsoc->town).'");
-								$(\'select[name="country_id"]\').val("'.dol_escape_js($objsoc->country_id).'");
+								console.log("Set state_id to '.dol_escape_js($objsoc->state_id).'");
-								$(\'select[name="state_id"]\').val("'.dol_escape_js($objsoc->state_id).'");
+								$(\'select[name="state_id"]\').val("'.dol_escape_js($objsoc->state_id).'").trigger("change");
-								$(\'input[name="email"]\').val("'.dol_escape_js($objsoc->email).'");
+								/* set country at end because it will trigger page refresh */
+								console.log("Set country id to '.dol_escape_js($objsoc->country_id).'");
+								$(\'select[name="country_id"]\').val("'.dol_escape_js($objsoc->country_id).'").trigger("change");   /* trigger required to update select2 components */
                             });
 						})'."\n";
 				print '</script>'."\n";
@@ -750,11 +752,14 @@ else
 							});
 
 							$("#copyaddressfromsoc").click(function() {
-								$(\'textarea[name="address"]\').text("'.dol_escape_js($objsoc->address).'");
+								$(\'textarea[name="address"]\').val("'.dol_escape_js($objsoc->address).'");
 								$(\'input[name="zipcode"]\').val("'.dol_escape_js($objsoc->zip).'");
 								$(\'input[name="town"]\').val("'.dol_escape_js($objsoc->town).'");
-								$(\'select[name="country_id"]\').val("'.dol_escape_js($objsoc->country_id).'");
+								console.log("Set state_id to '.dol_escape_js($objsoc->state_id).'");
-								$(\'select[name="state_id"]\').val("'.dol_escape_js($objsoc->state_id).'");
+								$(\'select[name="state_id"]\').val("'.dol_escape_js($objsoc->state_id).'").trigger("change");
+								/* set country at end because it will trigger page refresh */
+								console.log("Set country id to '.dol_escape_js($objsoc->country_id).'");
+								$(\'select[name="country_id"]\').val("'.dol_escape_js($objsoc->country_id).'").trigger("change");   /* trigger required to update select2 components */
             				});
 						})'."\n";
 				print '</script>'."\n";

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

@@ -5100,6 +5100,67 @@ class Form
 			print '</div>';
 		}
 
+		if ((in_array('fichinter',$restrictlinksto)) && ! empty($conf->ficheinter->enabled))
+		{
+			$linktoelem.=($linktoelem?' &nbsp; ':'').'<a href="#" id="linktoorder">' . $langs->trans('LinkedFichinter') . '</a>';
+
+			print '
+				<script type="text/javascript" language="javascript">
+				jQuery(document).ready(function() {
+					jQuery("#linktoorder").click(function() {
+						jQuery("#orderlist").toggle();
+						jQuery("#linktoorder").toggle();
+					});
+				});
+				</script>
+				';
+
+			print '<div id="orderlist"'.(empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)?' style="display:none"':'').'>';
+
+			$sql = "SELECT s.rowid as socid, s.nom as name, s.client, f.rowid, f.ref";
+			$sql .= " FROM " . MAIN_DB_PREFIX . "societe as s";
+			$sql .= ", " . MAIN_DB_PREFIX . "fichinter as f";
+			$sql .= ' WHERE f.fk_soc = s.rowid';
+
+			$resqlorderlist = $this->db->query($sql);
+			if ($resqlorderlist)
+			{
+				$num = $this->db->num_rows($resqlorderlist);
+				$i = 0;
+
+				print '<br><form action="" method="POST" name="LinkedFichinter">';
+				print '<table class="noborder">';
+				print '<tr class="liste_titre">';
+				print '<td class="nowrap"></td>';
+				print '<td align="center">' . $langs->trans("Ref") . '</td>';
+				print '<td align="left">' . $langs->trans("Company") . '</td>';
+				print '</tr>';
+				while ($i < $num)
+				{
+					$objp = $this->db->fetch_object($resqlorderlist);
+
+					$var = ! $var;
+					print '<tr ' . $bc [$var] . '>';
+					print '<td aling="left">';
+					print '<input type="radio" name="LinkedFichinter" value=' . $objp->rowid . '>';
+					print '<td align="center">' . $objp->ref . '</td>';
+					print '<td>' . $objp->name . '</td>';
+					print '</td>';
+					print '</tr>';
+
+					$i ++;
+				}
+				print '</table>';
+				print '<div class="center"><input type="submit" class="button" value="' . $langs->trans('ToLink') . '">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<input type="submit" class="button" name="cancel" value="' . $langs->trans('Cancel') . '"></div>';
+				print '</form>';
+				$this->db->free($resqlorderlist);
+			} else {
+				dol_print_error($this->db);
+			}
+
+			print '</div>';
+		}
+
         if (((! is_array($restrictlinksto)) || in_array('supplier_order',$restrictlinksto))
 			&& ! empty($conf->fournisseur->enabled))
 		{

htdocs/core/class/menu.class.php

@@ -55,7 +55,7 @@ class Menu
      * @param   string	$titre      Label of menu to add
      * @param   integer	$level      Level of menu to add
      * @param   int		$enabled    Menu active or not (0=Not active, 1=Active, 2=Active but grey)
-     * @param   string	$target		Target lien
+     * @param   string	$target		Target link
      * @param	string	$mainmenu	Main menu ('home', 'companies', 'products', ...)
      * @param	string	$leftmenu	Left menu ('setup', 'system', 'admintools', ...)
      * @param	int		$position	Position (not used yet)
@@ -74,7 +74,7 @@ class Menu
      * @param   string	$titre      Label of menu to add
      * @param   integer	$level      Level of menu to add
      * @param   int		$enabled    Menu active or not
-     * @param   string	$target		Target lien
+     * @param   string	$target		Target link
      * @param	string	$mainmenu	Main menu ('home', 'companies', 'products', ...)
      * @param	string	$leftmenu	Left menu ('setup', 'system', 'admintools', ...)
      * @param	int		$position	Position (not used yet)

htdocs/core/lib/functions.lib.php

@@ -5113,6 +5113,8 @@ function printCommonFooter($zone='private')
 	if (! empty($conf->global->MAIN_HTML_FOOTER)) print $conf->global->MAIN_HTML_FOOTER."\n";
 
 	print "\n";
+	if (! empty($conf->use_javascript_ajax))
+	{
     	print '<script type="text/javascript" language="javascript">jQuery(document).ready(function() {'."\n";
     	
     	print '<!-- If page_y set, we set scollbar with it -->'."\n";
@@ -5128,6 +5130,7 @@ function printCommonFooter($zone='private')
     	print '});'."\n";
     	
     	print '</script>'."\n";
+	}
 	
 	// Google Analytics (need Google module)
 	if (! empty($conf->google->enabled) && ! empty($conf->global->MAIN_GOOGLE_AN_ID))

htdocs/core/lib/functions2.lib.php

@@ -894,7 +894,7 @@ function get_next_value($db,$mask,$table,$field,$where='',$objsoc='',$date='',$m
         if ($where) $sql.=$where;
         if ($sqlwhere) $sql.=' AND '.$sqlwhere;
 
-        dol_syslog("functions2::get_next_value", LOG_DEBUG);
+        dol_syslog("functions2::get_next_value mode=".$mode."", LOG_DEBUG);
         $resql=$db->query($sql);
         if ($resql)
         {

htdocs/core/menus/init_menu_auguria.sql

@@ -208,22 +208,40 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->tax->enabled && empty($conf->global->TAX_DISABLE_VAT_MENUS) && $leftmenu=="tax_vat"', __HANDLER__, 'left', 2302__+MAX_llx_menu__, 'accountancy', '', 2300__+MAX_llx_menu__, '/compta/tva/reglement.php?leftmenu=tax_vat', 'List', 2, 'companies', '$user->rights->tax->charges->lire', '', 0, 1, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->tax->enabled && empty($conf->global->TAX_DISABLE_VAT_MENUS) && $leftmenu=="tax_vat"', __HANDLER__, 'left', 2303__+MAX_llx_menu__, 'accountancy', '', 2300__+MAX_llx_menu__, '/compta/tva/clients.php?leftmenu=tax_vat', 'ReportByCustomers', 2, 'companies', '$user->rights->tax->charges->lire', '', 0, 2, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->tax->enabled && empty($conf->global->TAX_DISABLE_VAT_MENUS) && $leftmenu=="tax_vat"', __HANDLER__, 'left', 2304__+MAX_llx_menu__, 'accountancy', '', 2300__+MAX_llx_menu__, '/compta/tva/quadri_detail.php?leftmenu=tax_vat', 'ReportByQuarter', 2, 'companies', '$user->rights->tax->charges->lire', '', 0, 3, __ENTITY__);
--- Ventilation (accounting)
+-- Accounting Expert
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled', __HANDLER__, 'left', 2400__+MAX_llx_menu__, 'accountancy', 'ventil_customer', 6__+MAX_llx_menu__, '/accountancy/customer/index.php?leftmenu=ventil_customer', 'CustomersVentilation', 0, 'accountancy', '$user->rights->accounting->ventilation->read', '', 0, 8, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled', __HANDLER__, 'left', 2400__+MAX_llx_menu__, 'accountancy', 'accounting', 6__+MAX_llx_menu__, '/accountancy/customer/index.php?leftmenu=accounting', 'MenuAccountancy', 0, 'accountancy', '(! empty($conf->accounting->enabled) || $user->rights->accounting->ventilation->read || $user->rights->accounting->ventilation->dispatch || $user->rights->compta->resultat->lire', '', 0, 7, __ENTITY__);
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="ventil_customer"', __HANDLER__, 'left', 2401__+MAX_llx_menu__, 'accountancy', '', 2400__+MAX_llx_menu__, '/accountancy/customer/list.php', 'ToDispatch', 1, 'accountancy', '$user->rights->accounting->ventilation->dispatch', '', 0, 0, __ENTITY__);
+	-- Dispatch
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="ventil_customer"', __HANDLER__, 'left', 2402__+MAX_llx_menu__, 'accountancy', '', 2400__+MAX_llx_menu__, '/accountancy/customer/lines.php', 'Dispatched', 1, 'accountancy', '$user->rights->accounting->ventilation->read', '', 0, 1, __ENTITY__);
+	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled', __HANDLER__, 'left', 2401__+MAX_llx_menu__, 'accountancy', 'dispatch_customer', 2400__+MAX_llx_menu__, '/accountancy/customer/index.php?leftmenu=dispatch_customer', 'CustomersVentilation', 1, 'accountancy', '$user->rights->accounting->ventilation->read', '', 0, 1, __ENTITY__);
-
+	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="dispatch_customer"', __HANDLER__, 'left', 2402__+MAX_llx_menu__, 'accountancy', '', 2401__+MAX_llx_menu__, '/accountancy/customer/list.php', 'ToDispatch', 2, 'accountancy', '$user->rights->accounting->ventilation->dispatch', '', 0, 2, __ENTITY__);
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $conf->supplier_invoice->enabled', __HANDLER__, 'left', 2410__+MAX_llx_menu__, 'accountancy', 'ventil_supplier', 6__+MAX_llx_menu__, '/accountancy/supplier/index.php?leftmenu=ventil_supplier', 'SuppliersVentilation', 0, 'accountancy', '$user->rights->accounting->ventilation->read', '', 0, 9, __ENTITY__);
+	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="dispatch_customer"', __HANDLER__, 'left', 2403__+MAX_llx_menu__, 'accountancy', '', 2401__+MAX_llx_menu__, '/accountancy/customer/lines.php', 'Dispatched', 2, 'accountancy', '$user->rights->accounting->ventilation->read', '', 0, 3, __ENTITY__);
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $conf->supplier_invoice->enabled && $leftmenu=="ventil_supplier"', __HANDLER__, 'left', 2411__+MAX_llx_menu__, 'accountancy', '', 2410__+MAX_llx_menu__, '/accountancy/supplier/list.php', 'ToDispatch', 1, 'accountancy', '$user->rights->accounting->ventilation->dispatch', '', 0, 0, __ENTITY__);
+	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $conf->fournisseur->enabled', __HANDLER__, 'left', 2410__+MAX_llx_menu__, 'accountancy', 'ventil_supplier', 2400__+MAX_llx_menu__, '/accountancy/supplier/index.php?leftmenu=dispatch_supplier', 'SuppliersVentilation', 1, 'accountancy', '$user->rights->accounting->ventilation->read', '', 0, 4, __ENTITY__);
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $conf->supplier_invoice->enabled && $leftmenu=="ventil_supplier"', __HANDLER__, 'left', 2412__+MAX_llx_menu__, 'accountancy', '', 2410__+MAX_llx_menu__, '/accountancy/supplier/lines.php', 'Dispatched', 1, 'accountancy', '$user->rights->accounting->ventilation->read', '', 0, 1, __ENTITY__);
+	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $conf->fournisseur->enabled && $leftmenu=="dispatch_supplier"', __HANDLER__, 'left', 2411__+MAX_llx_menu__, 'accountancy', '', 2410__+MAX_llx_menu__, '/accountancy/supplier/list.php', 'ToDispatch', 2, 'accountancy', '$user->rights->accounting->ventilation->dispatch', '', 0, 5, __ENTITY__);
--- Rapports
+	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $conf->fournisseur->enabled && $leftmenu=="dispatch_supplier"', __HANDLER__, 'left', 2412__+MAX_llx_menu__, 'accountancy', '', 2410__+MAX_llx_menu__, '/accountancy/supplier/lines.php', 'Dispatched', 2, 'accountancy', '$user->rights->accounting->ventilation->read', '', 0, 6, __ENTITY__);
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled || $conf->accounting->enabled', __HANDLER__, 'left', 2700__+MAX_llx_menu__, 'accountancy', 'ca', 6__+MAX_llx_menu__, '/compta/resultat/index.php?leftmenu=ca&mainmenu=accountancy', 'Reportings', 0, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 11, __ENTITY__);
+	-- Journals
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled || $conf->accounting->enabled && $leftmenu=="ca"', __HANDLER__, 'left', 2701__+MAX_llx_menu__, 'accountancy', '', 2700__+MAX_llx_menu__, '/compta/resultat/index.php?leftmenu=ca', 'ReportInOut', 1, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 0, __ENTITY__);
+	-- insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled', __HANDLER__, 'left', 2420__+MAX_llx_menu__, 'accountancy', 'journal', 2400__+MAX_llx_menu__, '/accountancy/journal/index.php?leftmenu=journal', 'Journaux', 1, 'accountancy', '$user->rights->accounting->comptarapport->lire', '', 0, 7, __ENTITY__);
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled || $conf->accounting->enabled && $leftmenu=="ca"', __HANDLER__, 'left', 2702__+MAX_llx_menu__, 'accountancy', '', 2701__+MAX_llx_menu__, '/compta/resultat/clientfourn.php?leftmenu=ca', 'ByCompanies', 2, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 0, __ENTITY__);
+	-- General Ledger
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled || $conf->accounting->enabled && $leftmenu=="ca"', __HANDLER__, 'left', 2703__+MAX_llx_menu__, 'accountancy', '', 2700__+MAX_llx_menu__, '/compta/stats/index.php?leftmenu=ca', 'ReportTurnover', 1, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 1, __ENTITY__);
+	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled', __HANDLER__, 'left', 2430__+MAX_llx_menu__, 'accountancy', 'bookkeeping', 2400__+MAX_llx_menu__, '/accountancy/bookkeeping/list.php?leftmenu=bookkeeping', 'Bookkeeping', 1, 'accountancy', '$user->rights->accounting->mouvements->lire', '', 0, 15, __ENTITY__);
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled || $conf->accounting->enabled && $leftmenu=="ca"', __HANDLER__, 'left', 2704__+MAX_llx_menu__, 'accountancy', '', 2703__+MAX_llx_menu__, '/compta/stats/casoc.php?leftmenu=ca', 'ByCompanies', 2, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 0, __ENTITY__);
+	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="bookkeeping"', __HANDLER__, 'left', 2431__+MAX_llx_menu__, 'accountancy', '', 2430__+MAX_llx_menu__, '/accountancy/bookkeeping/listbyyear.php', 'ByYear', 2, 'accountancy', '$user->rights->accounting->mouvements->lire', '', 0, 16, __ENTITY__);
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled || $conf->accounting->enabled && $leftmenu=="ca"', __HANDLER__, 'left', 2705__+MAX_llx_menu__, 'accountancy', '', 2703__+MAX_llx_menu__, '/compta/stats/cabyuser.php?leftmenu=ca', 'ByUsers', 2, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 1, __ENTITY__);
+	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="bookkeeping"', __HANDLER__, 'left', 2432__+MAX_llx_menu__, 'accountancy', '', 2430__+MAX_llx_menu__, '/accountancy/bookkeeping/balancebymonth.php', 'AccountBalanceByMonth', 2, 'accountancy', '$user->rights->accounting->mouvements->lire', '', 0, 16, __ENTITY__);
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled || $conf->accounting->enabled && $leftmenu=="ca"', __HANDLER__, 'left', 2708__+MAX_llx_menu__, 'accountancy', '', 2703__+MAX_llx_menu__, '/compta/stats/cabyprodserv.php?leftmenu=ca', 'ByProductsAndServices', 2, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 1, __ENTITY__);
+	-- Reports
+	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled', __HANDLER__, 'left', 2440__+MAX_llx_menu__, 'accountancy', 'report', 2400__+MAX_llx_menu__, '/compta/resultat/index.php?leftmenu=ca&mainmenu=accountancy', 'Reportings', 1, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 17, __ENTITY__);
+	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="ca"', __HANDLER__, 'left', 2441__+MAX_llx_menu__, 'accountancy', '', 2440__+MAX_llx_menu__, '/compta/resultat/index.php?leftmenu=ca', 'ReportInOut', 2, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 18, __ENTITY__);
+	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="ca"', __HANDLER__, 'left', 2442__+MAX_llx_menu__, 'accountancy', '', 2440__+MAX_llx_menu__, '/compta/resultat/clientfourn.php?leftmenu=ca', 'ByCompanies', 3, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 19, __ENTITY__);
+	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="ca"', __HANDLER__, 'left', 2443__+MAX_llx_menu__, 'accountancy', '', 2440__+MAX_llx_menu__, '/compta/stats/index.php?leftmenu=ca', 'ReportTurnover', 2, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 20, __ENTITY__);
+	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="ca"', __HANDLER__, 'left', 2444__+MAX_llx_menu__, 'accountancy', '', 2440__+MAX_llx_menu__, '/compta/stats/casoc.php?leftmenu=ca', 'ByCompanies', 3, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 21, __ENTITY__);
+	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="ca"', __HANDLER__, 'left', 2445__+MAX_llx_menu__, 'accountancy', '', 2440__+MAX_llx_menu__, '/compta/stats/cabyuser.php?leftmenu=ca', 'ByUsers', 3, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 22, __ENTITY__);
+	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="ca"', __HANDLER__, 'left', 2446__+MAX_llx_menu__, 'accountancy', '', 2440__+MAX_llx_menu__, '/compta/stats/cabyprodserv.php?leftmenu=ca', 'ByProductsAndServices', 3, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 23, __ENTITY__);
+	-- Admin
+	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled', __HANDLER__, 'left', 2450__+MAX_llx_menu__, 'home', '', 2400__+MAX_llx_menu__, '/accountancy/admin/fiscalyear.php?leftmenu=setup', 'Fiscalyear', 1, 'admin', '$user->rights->accounting->fiscalyear', '', 0, 24, __ENTITY__);
+	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled', __HANDLER__, 'left', 2451__+MAX_llx_menu__, 'home', '', 2400__+MAX_llx_menu__, '/accountancy/admin/account.php?mainmenu=accountancy', 'Chartofaccounts', 1, 'admin', '$user->rights->accounting->chartofaccount', '', 0, 25, __ENTITY__);
+-- Rapports compta simple
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled', __HANDLER__, 'left', 2700__+MAX_llx_menu__, 'accountancy', 'ca', 6__+MAX_llx_menu__, '/compta/resultat/index.php?leftmenu=ca&mainmenu=accountancy', 'Reportings', 0, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 11, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled && $leftmenu=="ca"', __HANDLER__, 'left', 2701__+MAX_llx_menu__, 'accountancy', '', 2700__+MAX_llx_menu__, '/compta/resultat/index.php?leftmenu=ca', 'ReportInOut', 1, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 0, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled && $leftmenu=="ca"', __HANDLER__, 'left', 2702__+MAX_llx_menu__, 'accountancy', '', 2701__+MAX_llx_menu__, '/compta/resultat/clientfourn.php?leftmenu=ca', 'ByCompanies', 2, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 0, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled && $leftmenu=="ca"', __HANDLER__, 'left', 2703__+MAX_llx_menu__, 'accountancy', '', 2700__+MAX_llx_menu__, '/compta/stats/index.php?leftmenu=ca', 'ReportTurnover', 1, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 1, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled && $leftmenu=="ca"', __HANDLER__, 'left', 2704__+MAX_llx_menu__, 'accountancy', '', 2703__+MAX_llx_menu__, '/compta/stats/casoc.php?leftmenu=ca', 'ByCompanies', 2, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 0, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled && $leftmenu=="ca"', __HANDLER__, 'left', 2705__+MAX_llx_menu__, 'accountancy', '', 2703__+MAX_llx_menu__, '/compta/stats/cabyuser.php?leftmenu=ca', 'ByUsers', 2, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 1, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled && $leftmenu=="ca"', __HANDLER__, 'left', 2708__+MAX_llx_menu__, 'accountancy', '', 2703__+MAX_llx_menu__, '/compta/stats/cabyprodserv.php?leftmenu=ca', 'ByProductsAndServices', 2, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 1, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled && $leftmenu=="ca"', __HANDLER__, 'left', 2706__+MAX_llx_menu__, 'accountancy', '', 2700__+MAX_llx_menu__, '/compta/journal/sellsjournal.php?leftmenu=ca', 'SellsJournal', 1, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 1, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled && $leftmenu=="ca"', __HANDLER__, 'left', 2707__+MAX_llx_menu__, 'accountancy', '', 2700__+MAX_llx_menu__, '/compta/journal/purchasesjournal.php?leftmenu=ca', 'PurchasesJournal', 1, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 1, __ENTITY__);
 -- Book Keeping

htdocs/core/menus/standard/auguria.lib.php

@@ -294,10 +294,8 @@ function print_left_auguria_menu($db,$menu_array_before,$menu_array_after,&$tabM
 
 	if (! empty($conf->accounting->enabled) && !empty($user->rights->accounting->mouvements->lire) && $mainmenu == 'accountancy') 	// Entry in accountancy journal for each bank account
 	{
-		$newmenu->add('/accountancy/journal/index.php?leftmenu=journal',$langs->trans("Journaux"),0,$user->rights->banque->lire);
+		$newmenu->add('',$langs->trans("Journaux"),0,$user->rights->accounting->comptarapport->lire,'','accountancy','accounting');
 
-		if ($leftmenu == 'journal')
-		{
 		$sql = "SELECT rowid, label, accountancy_journal";
 		$sql.= " FROM ".MAIN_DB_PREFIX."bank_account";
 		$sql.= " WHERE entity = ".$conf->entity;
@@ -311,11 +309,10 @@ function print_left_auguria_menu($db,$menu_array_before,$menu_array_after,&$tabM
 			$i = 0;
 
 			if ($numr > 0)
-
 			while ($i < $numr)
 			{
 				$objp = $db->fetch_object($resql);
-					$newmenu->add('/accountancy/journal/bankjournal.php?id_account='.$objp->rowid,$langs->trans("Journal").' - '.$objp->label,1,$user->rights->accounting->comptarapport->lire);
+				$newmenu->add('/accountancy/journal/bankjournal.php?id_account='.$objp->rowid,$langs->trans("Journal").' - '.$objp->label,1,$user->rights->accounting->comptarapport->lire,'','accountancy','accounting');
 				$i++;
 			}
 		}
@@ -326,7 +323,6 @@ function print_left_auguria_menu($db,$menu_array_before,$menu_array_after,&$tabM
 		$newmenu->add("/accountancy/journal/sellsjournal.php?leftmenu=journal",$langs->trans("SellsJournal"),1,$user->rights->accounting->comptarapport->lire);
 		$newmenu->add("/accountancy/journal/purchasesjournal.php?leftmenu=journal",$langs->trans("PurchasesJournal"),1,$user->rights->accounting->comptarapport->lire);
 	}
-	}
 
 	if ($conf->ftp->enabled && $mainmenu == 'ftp')	// Entry for FTP
 	{

htdocs/core/modules/expensereport/doc/pdf_standard.modules.php

@@ -112,8 +112,13 @@ class pdf_standard extends ModeleExpenseReport
 		$this->posxup = 162;
         $this->posxqty = 176;
         $this->postotalttc = 186;
-		if ($this->page_largeur < 210) // To work with US executive format
+        if (empty($conf->projet->enabled)) {
-		{
+            $this->posxtva-=20;
+            $this->posxup-=20;
+            $this->posxqty-=20;
+            $this->postotalttc-=20;
+        }
+        if ($this->page_largeur < 210) { // To work with US executive format
             $this->posxdate-=20;
             $this->posxtype-=20;
             $this->posxprojet-=20;
@@ -335,10 +340,12 @@ class pdf_standard extends ModeleExpenseReport
 					$pdf->SetXY($this->posxtype, $curY);
 					$pdf->MultiCell($this->posxprojet-$this->posxtype-1, 3,$outputlangs->transnoentities($object->lines[$i]->type_fees_code), 0, 'C');
 
+					if (! empty($conf->projet->enabled)) {
                         // Project
                         $pdf->SetFont('','', $default_font_size - 1);
                         $pdf->SetXY($this->posxprojet, $curY);
                         $pdf->MultiCell($this->posxtva-$this->posxprojet-1, 3,$object->lines[$i]->projet_ref, 0, 'C');
+                    }
 
 					// VAT Rate
 					if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT))
@@ -768,14 +775,15 @@ class pdf_standard extends ModeleExpenseReport
 		$pdf->SetXY($this->posxtype - 1, $tab_top + 1);
         $pdf->MultiCell($this->posxprojet - $this->posxtype - 1, 2, $outputlangs->transnoentities("Type"), '', 'C');
 
+        if (!empty($conf->projet->enabled)) {
             // Project
             $pdf->line($this->posxprojet - 1, $tab_top, $this->posxprojet - 1, $tab_top + $tab_height);
             $pdf->SetXY($this->posxprojet - 1, $tab_top + 1);
             $pdf->MultiCell($this->posxtva - $this->posxprojet - 1, 2, $outputlangs->transnoentities("Project"), '', 'C');
+        }
 
         // VAT
-		if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT))
+        if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT)) {
-		{
             $pdf->line($this->posxtva - 1, $tab_top, $this->posxtva - 1, $tab_top + $tab_height);
             $pdf->SetXY($this->posxtva - 1, $tab_top + 1);
             $pdf->MultiCell($this->posxup - $this->posxtva - 1, 2, $outputlangs->transnoentities("VAT"), '', 'C');

htdocs/core/modules/modProductBatch.class.php

@@ -119,7 +119,8 @@ class modProductBatch extends DolibarrModules
 		$sql = array();
 
 		if (! empty($conf->cashdesk->enabled)) {
-    		if (!$conf->global->CASHDESK_NO_DECREASE_STOCK) {
+    		if (empty($conf->global->CASHDESK_NO_DECREASE_STOCK)) {
+    		    include_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
     		    $res = dolibarr_set_const($db,"CASHDESK_NO_DECREASE_STOCK",1,'chaine',0,'',$conf->entity);
     		}
 		}

htdocs/core/modules/modUser.class.php

@@ -210,9 +210,9 @@ class modUser extends DolibarrModules
 		$this->export_code[$r]=$this->rights_class.'_'.$r;
 		$this->export_label[$r]='Liste des utilisateurs Dolibarr et attributs';
 		$this->export_permission[$r]=array(array("user","user","export"));
-		$this->export_fields_array[$r]=array('u.rowid'=>"Id",'u.login'=>"Login",'u.lastname'=>"Lastname",'u.firstname'=>"Firstname",'u.office_phone'=>'Phone','u.office_fax'=>'Fax','u.email'=>'EMail','u.datec'=>"DateCreation",'u.tms'=>"DateLastModification",'u.admin'=>"Administrator",'u.statut'=>'Status','u.note'=>"Note",'u.datelastlogin'=>'LastConnexion','u.datepreviouslogin'=>'PreviousConnexion','u.fk_socpeople'=>"IdContact",'u.fk_soc'=>"IdCompany",'u.fk_member'=>"MemberId");
+		$this->export_fields_array[$r]=array('u.rowid'=>"Id",'u.login'=>"Login",'u.lastname'=>"Lastname",'u.firstname'=>"Firstname",'u.accountancy_code'=>"UserAccountancyCode",'u.office_phone'=>'Phone','u.office_fax'=>'Fax','u.email'=>'EMail','u.datec'=>"DateCreation",'u.tms'=>"DateLastModification",'u.admin'=>"Administrator",'u.statut'=>'Status','u.note'=>"Note",'u.datelastlogin'=>'LastConnexion','u.datepreviouslogin'=>'PreviousConnexion','u.fk_socpeople'=>"IdContact",'u.fk_soc'=>"IdCompany",'u.fk_member'=>"MemberId");
-		$this->export_TypeFields_array[$r]=array('u.login'=>"Text",'u.lastname'=>"Text",'u.firstname'=>"Text",'u.office_phone'=>'Text','u.office_fax'=>'Text','u.email'=>'Text','u.datec'=>"Date",'u.tms'=>"Date",'u.admin'=>"Boolean",'u.statut'=>'Status','u.note'=>"Text",'u.datelastlogin'=>'Date','u.datepreviouslogin'=>'Date','u.fk_soc'=>"List:societe:nom:rowid",'u.fk_member'=>"List:adherent:firstname");
+		$this->export_TypeFields_array[$r]=array('u.login'=>"Text",'u.lastname'=>"Text",'u.firstname'=>"Text",'u.accountancy_code'=>'Text','u.office_phone'=>'Text','u.office_fax'=>'Text','u.email'=>'Text','u.datec'=>"Date",'u.tms'=>"Date",'u.admin'=>"Boolean",'u.statut'=>'Status','u.note'=>"Text",'u.datelastlogin'=>'Date','u.datepreviouslogin'=>'Date','u.fk_soc'=>"List:societe:nom:rowid",'u.fk_member'=>"List:adherent:firstname");
-		$this->export_entities_array[$r]=array('u.rowid'=>"user",'u.login'=>"user",'u.lastname'=>"user",'u.firstname'=>"user",'u.office_phone'=>'user','u.office_fax'=>'user','u.email'=>'user','u.datec'=>"user",'u.tms'=>"user",'u.admin'=>"user",'u.statut'=>'user','u.note'=>"user",'u.datelastlogin'=>'user','u.datepreviouslogin'=>'user','u.fk_socpeople'=>"contact",'u.fk_soc'=>"company",'u.fk_member'=>"member");
+		$this->export_entities_array[$r]=array('u.rowid'=>"user",'u.login'=>"user",'u.lastname'=>"user",'u.firstname'=>"user",'u.accountancy_code'=>'user','u.office_phone'=>'user','u.office_fax'=>'user','u.email'=>'user','u.datec'=>"user",'u.tms'=>"user",'u.admin'=>"user",'u.statut'=>'user','u.note'=>"user",'u.datelastlogin'=>'user','u.datepreviouslogin'=>'user','u.fk_socpeople'=>"contact",'u.fk_soc'=>"company",'u.fk_member'=>"member");
         if (empty($conf->adherent->enabled))
         {
             unset($this->export_fields_array[$r]['u.fk_member']);

htdocs/core/tpl/objectline_edit.tpl.php

@@ -252,6 +252,10 @@ if (! empty($conf->margin->enabled))
 			jQuery("input[name='np_marginRate']:first").val('');
 			jQuery("input[name='np_markRate']:first").val('');
 		});
+		jQuery("#remise_percent").keyup(function() {
+			jQuery("input[name='np_marginRate']:first").val('');
+			jQuery("input[name='np_markRate']:first").val('');
+		});
 		jQuery("#buying_price").keyup(function() {
 			jQuery("input[name='np_marginRate']:first").val('');
 			jQuery("input[name='np_markRate']:first").val('');

htdocs/expensereport/card.php

@@ -1652,7 +1652,7 @@ else
 						print '<tr class="liste_titre">';
 						print '<td style="text-align:center;">'.$langs->trans('Piece').'</td>';
 						print '<td style="text-align:center;">'.$langs->trans('Date').'</td>';
-						print '<td>'.$langs->trans('Project').'</td>';
+						if (! empty($conf->projet->enabled)) print '<td>'.$langs->trans('Project').'</td>';
 						print '<td style="text-align:center;">'.$langs->trans('Type').'</td>';
 						print '<td style="text-align:left;">'.$langs->trans('Description').'</td>';
 						print '<td style="text-align:right;">'.$langs->trans('VAT').'</td>';
@@ -1680,6 +1680,8 @@ else
 								print img_picto($langs->trans("Document"), "object_generic");
 								print ' <span>'.$piece_comptable.'</span></td>';
 								print '<td style="text-align:center;">'.dol_print_date($db->jdate($objp->date), 'day').'</td>';
+								if (! empty($conf->projet->enabled))
+								{
     								print '<td>';
     								if ($objp->projet_id > 0)
     								{
@@ -1688,6 +1690,7 @@ else
     									print $projecttmp->getNomUrl(1);
     								}
     								print '</td>';
+								}
 								print '<td style="text-align:center;">'.$langs->trans("TF_".strtoupper($objp->type_fees_libelle)).'</td>';
 								print '<td style="text-align:left;">'.$objp->comments.'</td>';
 								print '<td style="text-align:right;">'.vatrate($objp->vatrate,true).'</td>';
@@ -1729,9 +1732,12 @@ else
 									print '</td>';
 
 									// Select project
+									if (! empty($conf->projet->enabled))
+									{
     									print '<td>';
     									$formproject->select_projects(-1, $objp->fk_projet,'fk_projet', 0, 0, 1, 1);
     									print '</td>';
+									}
 									
 									// Select type
 									print '<td style="text-align:center;">';
@@ -1790,7 +1796,7 @@ else
 						print '<tr class="liste_titre">';
 						print '<td colspan="2"></td>';
 						//print '<td style="text-align:center;">'.$langs->trans('Date').'</td>';
-						print '<td>'.$langs->trans('Project').'</td>';
+						if (! empty($conf->projet->enabled)) print '<td>'.$langs->trans('Project').'</td>';
 						print '<td align="center">'.$langs->trans('Type').'</td>';
 						print '<td>'.$langs->trans('Description').'</td>';
 						print '<td style="text-align:right;">'.$langs->trans('VAT').'</td>';
@@ -1810,9 +1816,12 @@ else
 						print '</td>';
 
 						// Select project
+						if (! empty($conf->projet->enabled))
+						{
     						print '<td>';
     						$formproject->select_projects(-1, $fk_projet, 'fk_projet', 0, 0, 1, 1);
     						print '</td>';
+						}
 						
 						// Select type
 						print '<td align="center">';
@@ -1829,7 +1838,6 @@ else
 						$defaultvat=-1;
 						if (! empty($conf->global->EXPENSEREPORT_NO_DEFAULT_VAT)) $conf->global->MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS = 'none';
 						print '<select class="flat" name="vatrate">';
-						print '<option name="none" value="" selected>';
 						print $form->load_tva('vatrate', ($vatrate!=''?$vatrate:$defaultvat), $mysoc, '', 0, 0, '', true);
 						print '</select>';
 						print '</td>';
@@ -2087,7 +2095,28 @@ if($user->rights->expensereport->export && $object->fk_statut>0 && $action != 'e
 
 print '</div>';
 
+if ($action != 'create' && $action != 'edit' && ($id || $ref))
+{
+    $permissiondellink=$user->rights->facture->creer;	// Used by the include of actions_dellink.inc.php
+	include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php';		// Must be include, not include_once
 
+    // Link invoice to intervention
+    if (GETPOST('LinkedFichinter')) {
+        $object->fetch($id);
+        $object->fetch_thirdparty();
+        $result = $object->add_object_linked('fichinter', GETPOST('LinkedFichinter'));
+    }
+    // Linked object block
+    $somethingshown = $form->showLinkedObjectBlock($object);
+
+    // Show links to link elements
+    $linktoelements=array();
+    if($conf->global->EXPENSES_LINK_TO_INTERVENTION) $linktoelements[]='fichinter';
+    $linktoelem='';
+    $linktoelem = $form->showLinkToObjectBlock($object,$linktoelements);
+    if ($linktoelem) print '<br>'.$linktoelem;
+
+}
 llxFooter();
 
 $db->close();

htdocs/fichinter/info.php

@@ -35,7 +35,7 @@ $id = GETPOST('id','int');
 
 // Security check
 if ($user->societe_id) $socid=$user->societe_id;
-$result = restrictedArea($user, 'ficheinter', $fichinterid, 'fichinter');
+$result = restrictedArea($user, 'ficheinter', $id, 'fichinter');
 
 $object = new Fichinter($db);
 

htdocs/install/mysql/migration/3.8.0-3.9.0.sql

@@ -584,8 +584,3 @@ ALTER TABLE llx_accounting_bookkeeping MODIFY COLUMN doc_ref varchar(300) NOT NU
 ALTER TABLE llx_holiday ADD COLUMN tms timestamp;
 ALTER TABLE llx_holiday ADD COLUMN entity integer DEFAULT 1 NOT NULL;
 
--- VAT rates Luxembourg
-UPDATE llx_c_tva SET taux='17' WHERE rowid=1401 AND fk_pays=140;
-UPDATE llx_c_tva SET taux='14' WHERE rowid=1402 AND fk_pays=140;
-UPDATE llx_c_tva SET taux='8'  WHERE rowid=1403 AND fk_pays=140;
-UPDATE llx_c_tva SET note='VAT intermediary rate' WHERE rowid=1403 AND fk_pays=140;

htdocs/install/mysql/migration/3.9.0-4.0.0.sql

@@ -41,3 +41,42 @@ ALTER TABLE llx_facture ADD INDEX idx_facture_fk_statut (fk_statut);
 
 UPDATE llx_projet as p set p.opp_percent = (SELECT percent FROM llx_c_lead_status as cls WHERE cls.rowid = p.fk_opp_status)  WHERE p.opp_percent IS NULL AND p.fk_opp_status IS NOT NULL;
  
+ 
+
+CREATE TABLE llx_website
+(
+	rowid         integer AUTO_INCREMENT NOT NULL PRIMARY KEY,
+	entity        integer DEFAULT 1,
+	shortname     varchar(24) NOT NULL,
+	description   varchar(255),
+	status		  integer,
+    date_creation     datetime,
+    date_modification datetime,
+	tms           timestamp
+) ENGINE=innodb;
+ 
+ALTER TABLE llx_website ADD UNIQUE INDEX uk_website_shortname (shortname, entity);
+
+CREATE TABLE llx_website_page
+(
+	rowid         integer AUTO_INCREMENT NOT NULL PRIMARY KEY,
+	fk_website    integer,
+	pageurl       varchar(16) NOT NULL,
+	title         varchar(255),						
+	description   varchar(255),						
+	keywords      varchar(255),
+	content		  text,
+    status        integer,
+    date_creation     datetime,
+    date_modification datetime,
+	tms           timestamp
+) ENGINE=innodb;
+
+ALTER TABLE llx_website_page ADD UNIQUE INDEX uk_website_page_url (fk_website,pageurl);
+
+ALTER TABLE llx_website_page ADD CONSTRAINT fk_website_page_website FOREIGN KEY (fk_website) REFERENCES llx_website (rowid);
+
+
+
+ 
+ 

htdocs/install/mysql/tables/llx_website.key.sql

@@ -16,8 +16,5 @@
 --
 -- ===========================================================================
 
-ALTER TABLE llx_website_page ADD UNIQUE INDEX uk_website_page_url (fk_website,pageurl);
+ALTER TABLE llx_website ADD UNIQUE INDEX uk_website_shortname (shortname, entity);
-
-ALTER TABLE llx_website_page ADD CONSTRAINT fk_website_page_website FOREIGN KEY (fk_website) REFERENCES llx_website (rowid);
-
 

htdocs/install/mysql/tables/llx_website.sql

@@ -20,7 +20,7 @@
 CREATE TABLE llx_website
 (
 	rowid         integer AUTO_INCREMENT NOT NULL PRIMARY KEY,
-	entity        integer,
+	entity        integer DEFAULT 1,
 	shortname     varchar(24) NOT NULL,
 	description   varchar(255),
 	status		  integer,

htdocs/install/mysql/tables/llx_website_pages.key.sql

@@ -20,4 +20,3 @@ ALTER TABLE llx_website_page ADD UNIQUE INDEX uk_website_page_url (fk_website,pa
 
 ALTER TABLE llx_website_page ADD CONSTRAINT fk_website_page_website FOREIGN KEY (fk_website) REFERENCES llx_website (rowid);
 
-

htdocs/install/upgrade2.php

@@ -396,6 +396,21 @@ if (! GETPOST("action") || preg_match('/upgrade/i',GETPOST('action')))
         	migrate_reload_menu($db,$langs,$conf,$versionto);
         }
         
+        // Scripts for last version
+        $afterversionarray=explode('.','3.9.9');
+        $beforeversionarray=explode('.','4.0.9');
+        if (versioncompare($versiontoarray,$afterversionarray) >= 0 && versioncompare($versiontoarray,$beforeversionarray) <= 0)
+        {
+        	// Reload modules (this must be always and only into last targeted version)
+        	$listofmodule=array(
+        			'MAIN_MODULE_FACTURE'=>'newboxdefonly',
+        	);
+        	migrate_reload_modules($db,$langs,$conf,$listofmodule);
+        
+        	// Reload menus (this must be always and only into last targeted version)
+        	migrate_reload_menu($db,$langs,$conf,$versionto);
+        }
+
         print '<tr><td colspan="4"><br>'.$langs->trans("MigrationFinished").'</td></tr>';
 
         // On commit dans tous les cas.

htdocs/langs/en_US/compta.lang

@@ -221,3 +221,4 @@ OtherCountriesCustomersReport=Foreign customers report
 BasedOnTwoFirstLettersOfVATNumberBeingDifferentFromYourCompanyCountry=Based on the two first letters of the VAT number being different from your own company's country code
 SameCountryCustomersWithVAT=National customers report
 BasedOnTwoFirstLettersOfVATNumberBeingTheSameAsYourCompanyCountry=Based on the two first letters of the VAT number being the same as your own company's country code
+LinkedFichinter=Link to an intervention

htdocs/langs/en_US/users.lang

@@ -122,3 +122,4 @@ LoginUsingOpenID=Use OpenID to login
 WeeklyHours=Weekly hours
 ColorUser=Color of the user
 DisabledInMonoUserMode=Disabled in maintenance mode
+UserAccountancyCode=User accountancy code

htdocs/langs/en_US/website.lang

@@ -0,0 +1,5 @@
+# Dolibarr language file - Source file is en_US - website 
+Shortname=Code
+WebsiteSetupDesc=Create here as much entry as number of different websites you need. Then go into menu Websites to edit them.
+DeleteWebsite=Delete website
+ConfirmDeleteWebsite=Are you sure you want to delete this web site. All its pages and content will also be removed. 

htdocs/langs/en_US/workflow.lang

@@ -1,4 +1,4 @@
-# Dolibarr language file - Source file is en_US - admin 
+# Dolibarr language file - Source file is en_US - workflow 
 WorkflowSetup=Workflow module setup
 WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is open (you can do things in the order you want). You can activate the automatic actions you are interested in.
 ThereIsNoWorkflowToModify=There is no workflow modifications available with the activated modules.

htdocs/langs/fr_FR/compta.lang

@@ -221,3 +221,4 @@ OtherCountriesCustomersReport=Rapport client étranger
 BasedOnTwoFirstLettersOfVATNumberBeingDifferentFromYourCompanyCountry=Basé sur les deux premières lettres du numéro de TVA étant différent du code de pays de votre propre entreprise
 SameCountryCustomersWithVAT=Rapport clients nationaux
 BasedOnTwoFirstLettersOfVATNumberBeingTheSameAsYourCompanyCountry=Basé sur les deux premières lettres du numéro de TVA étant les mêmes que le code pays de votre propre entreprise
+LinkedFichinter=Lier à une intervention

htdocs/main.inc.php

@@ -1943,12 +1943,15 @@ if (! function_exists("llxFooter"))
         if (! empty($delayedhtmlcontent)) print $delayedhtmlcontent;
         
 		// Wrapper to show tooltips
+        if ($conf->use_javascript_ajax)
+        {
     		print "\n<!-- JS CODE TO ENABLE tipTip on all object with class classfortooltip -->\n";
     		print '<script type="text/javascript">
             	jQuery(document).ready(function () {
             		jQuery(".classfortooltip").tipTip({maxWidth: "'.dol_size(600,'width').'px", edgeOffset: 10, delay: 50, fadeIn: 50, fadeOut: 50});
             	});
             </script>' . "\n";
+        }
         
 		// A div for the address popup
 		print "\n<!-- A div to allow dialog popup -->\n";

htdocs/product/class/product.class.php

@@ -4068,8 +4068,7 @@ class Product extends CommonObject
 	{
 		global $conf, $db;
 
-		// FIXME USing * into select is forbidden
+		$sql = "SELECT rowid, level, fk_level, var_percent, var_min_percent FROM ".MAIN_DB_PREFIX."product_pricerules";
-		$sql = "SELECT * FROM ".MAIN_DB_PREFIX."product_pricerules";
 		$query = $db->query($sql);
 
 		$rules = array();

htdocs/product/list.php

@@ -314,6 +314,7 @@ else
 		    setEventMessages($langs->trans("ProductDeleted", GETPOST('delprod')), null, 'mesgs');
 	    }
 
+	    if ($search_categ > 0) $param.="&search_categ=".$search_categ;
     	if ($sref) $param="&sref=".$sref;
     	if ($search_ref_supplier) $param="&search_ref_supplier=".$search_ref_supplier;
     	if ($sbarcode) $param.=($sbarcode?"&sbarcode=".$sbarcode:"");

htdocs/websites/frametop.php

@@ -23,9 +23,16 @@
  */
 
 require ("../main.inc.php");
+//require_once (DOL_DOCUMENT_ROOT."/websites/class/website.class.php");
 
 $langs->load("externalsite");
 
 top_htmlhead("","");
 top_menu("","","_top");
 
+
+/*
+$website = new Website($db);
+$listofwebsites = $website->fetchAll();
+*/
+print 'rrr';

htdocs/websites/index.php

@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2004-2010 Laurent Destailleur <eldy@users.sourceforge.net>
+/* Copyright (C) 2004-2012 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
@@ -13,59 +13,154 @@
  *
  * 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/externalsite/frames.php
+ *   	\file       htdocs/admin/website.php
- *     \ingroup    externalsite
+ *		\ingroup    website
- *     \brief      Page that build two frames: One for menu, the other for the target page to show
+ *		\brief      Page to setup the module Website
- *     \author	   Laurent Destailleur
  */
 
 require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 
-$langs->load("externalsite");
+$langs->load("admin");
+$langs->load("other");
+$langs->load("website");
 
-if (empty($conf->global->EXTERNALSITE_URL))
+if (! $user->admin) accessforbidden();
+
+$action = GETPOST('action','alpha');
+
+$conf->dol_hide_leftmenu = 1;
+
+
+$website='website1';
+
+
+
+/*
+ * Actions
+ */
+
+// Action mise a jour ou ajout d'une constante
+if ($action == 'update')
 {
-	llxHeader();
+
-	print '<div class="error">'.$langs->trans('ExternalSiteModuleNotComplete').'</div>';
+    
-	llxFooter();
+    
+	if (! $res > 0) $error++;
+
+	if (! $error)
+	{
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+	}
+	else
+	{
+		setEventMessages($langs->trans("Error"), null, 'errors');
+	}
 }
 
-$mainmenu=GETPOST('mainmenu', 'alpha');
-$leftmenu=GETPOST('leftmenu', 'alpha');
-$idmenu=GETPOST('idmenu', 'int');
-$theme=GETPOST('theme', 'alpha');
-$codelang=GETPOST('lang', 'alpha');
-
-print "
-<html>
-<head>
-<title>Dolibarr frame for external web site</title>
-</head>
-
-<frameset ".(empty($conf->global->MAIN_MENU_INVERT)?"rows":"cols")."=\"".($heightforframes+50).",*\" border=0 framespacing=0 frameborder=0>
-    <frame name=\"barre\" src=\"frametop.php?mainmenu=".$mainmenu."&leftmenu=".$leftmenu."&idmenu=".$idmenu.($theme?'&theme='.$theme:'').($codelang?'&lang='.$codelang:'')."&nobackground=1\" noresize scrolling=\"NO\" noborder>
-    <frame name=\"main\" src=\"".$conf->global->EXTERNALSITE_URL."\">
-    <noframes>
-    <body>
-
-    </body>
-    </noframes>
-</frameset>
-
-<noframes>
-<body>
-	<br><div class=\"center\">
-	Sorry, your browser is too old or not correctly configured to view this area.<br>
-	Your browser must support frames.<br>
-	</div>
-</body>
-</noframes>
-
-</html>
-";
 
 
+
+/*
+ * View
+ */
+
+$_SESSION['website_mode'] = 'edit';
+
+
+$form = new Form($db);
+
+$help_url='';
+
+llxHeader('',$langs->trans("WebsiteSetup"),$help_url);
+
+
+$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
+print load_fiche_titre($langs->trans("WebsiteSetup"),$linkback,'title_setup');
+
+
+$head = array();
+
+
+/*
+ * Edit mode
+ */
+
+if ($_SESSION['website_mode'] == 'edit')
+{
+    print "\n".'<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+    print '<input type="hidden" name="action" value="update">';
+    
+    dol_fiche_head($head, 'general', $langs->trans("Page").': '.$langs->trans("Home"), 0, 'globe');
+    
+    print load_fiche_titre($langs->trans("SEO"),'','');
+    
+    print '<table class="noborder" width="100%">';
+    print '<tr class="liste_titre">';
+    print '<td>'.$langs->trans("Description").'</td>';
+    print '<td>'.$langs->trans("Value").'</td>';
+    print "</tr>\n";
+    
+    print '<tr><td>';
+    print $langs->trans('WEBSITE_PAGEURL');
+    print '</td><td>';
+    print '/public/websites/'.$website.'/index.php?page=home';
+    print '</td></tr>';
+    
+    print '<tr><td>';
+    print $langs->trans('WEBSITE_TITLE');
+    print '</td><td>';
+    print '<input type="text" class="flat" size="96" name="WEBSITE_TITLE" value="'.dol_escape_htmltag($obj->WEBSITE_TITLE).'">';
+    print '</td></tr>';
+    
+    print '<tr><td>';
+    print $langs->trans('WEBSITE_DESCRIPTION');
+    print '</td><td>';
+    print '<input type="text" class="flat" size="96" name="WEBSITE_DESCRIPTION" value="'.dol_escape_htmltag($obj->WEBSITE_DESCRIPTION).'">';
+    print '</td></tr>';
+    
+    print '<tr><td>';
+    print $langs->trans('WEBSITE_KEYWORDS');
+    print '</td><td>';
+    print '<input type="text" class="flat" size="128" name="WEBSITE_KEYWORDS" value="'.dol_escape_htmltag($obj->WEBSITE_KEYWORDS).'">';
+    print '</td></tr>';
+    
+    print '</table>';
+    
+    print '<br>';
+    
+    
+    /*
+     * Editing global variables not related to a specific theme
+     */
+    
+    print load_fiche_titre($langs->trans("Other"),'','');
+    
+    require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+    $doleditor=new DolEditor('WEBSITE_HEADER',$obj->value,'',160,'dolibarr_notes','',false,false,$conf->fckeditor->enabled,5,60);
+    $doleditor->Create();
+    
+    require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+    $doleditor=new DolEditor('WEBSITE_CONTENT',$obj->value,'',160,'dolibarr_notes','',false,false,$conf->fckeditor->enabled,5,60);
+    $doleditor->Create();
+    
+    require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+    $doleditor=new DolEditor('WEBSITE_FOOTER',$obj->value,'',160,'dolibarr_notes','',false,false,$conf->fckeditor->enabled,5,60);
+    $doleditor->Create();
+    
+    dol_fiche_end();
+    
+    print '<div align="center"><input type="submit" class="button" value="'.$langs->trans("Update").'" name="update"></div>';
+    
+    print '</form>';
+}
+
+
+
+llxFooter();
+
+$db->close();

htdocs/websites/indexold.php

@@ -0,0 +1,65 @@
+<?php
+/* Copyright (C) 2004-2010 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       htdocs/externalsite/frames.php
+ *     \ingroup    externalsite
+ *     \brief      Page that build two frames: One for menu, the other for the target page to show
+ *     \author	   Laurent Destailleur
+ */
+
+require '../main.inc.php';
+
+$langs->load("website");
+
+
+$mainmenu=GETPOST('mainmenu', 'alpha');
+$leftmenu=GETPOST('leftmenu', 'alpha');
+$idmenu=GETPOST('idmenu', 'int');
+$theme=GETPOST('theme', 'alpha');
+$codelang=GETPOST('lang', 'alpha');
+
+print "
+<html>
+<head>
+<title>Dolibarr frame for web site menu</title>
+</head>
+
+<frameset ".(empty($conf->global->MAIN_MENU_INVERT)?"rows":"cols")."=\"".($heightforframes+50).",*\" border=0 framespacing=0 frameborder=0>
+    <frame name=\"barre\" src=\"frametop.php?mainmenu=".$mainmenu."&leftmenu=".$leftmenu."&idmenu=".$idmenu.($theme?'&theme='.$theme:'').($codelang?'&lang='.$codelang:'')."&nobackground=1\" noresize scrolling=\"NO\" noborder>
+    <frame name=\"main\" src=\"framebottom.php\">
+    <noframes>
+    <body>
+
+    </body>
+    </noframes>
+</frameset>
+
+<noframes>
+<body>
+	<br><div class=\"center\">
+	Sorry, your browser is too old or not correctly configured to view this area.<br>
+	Your browser must support frames.<br>
+	</div>
+</body>
+</noframes>
+
+</html>
+";
+
+

test/phpunit/FunctionsLibTest.php

@@ -853,8 +853,8 @@ class FunctionsLibTest extends PHPUnit_Framework_TestCase
     	// Test RULE ES-ES
     	$vat1=get_default_localtax($companyes,$companyes,1,0);
     	$vat2=get_default_localtax($companyes,$companyes,2,0);
-    	$this->assertEquals(5.2,$vat1);
+    	$this->assertEquals($vat1, 5.2);
-    	$this->assertEquals(-19,$vat2);
+    	$this->assertStringStartsWith((string) $vat2, '-19:-15:-9');       // Can be -19 (old version) or '-19:-15:-9' (new setup)
 
     	// Test RULE ES-IT
     	$vat1=get_default_localtax($companyes,$companyit,1,0);

test/phpunit/ModulesTest.php

@@ -130,10 +130,10 @@ class ModulesTest extends PHPUnit_Framework_TestCase
 		$modulelist=array('Accounting','Adherent','Agenda','Banque','Barcode','Bookmark',
 		'CashDesk','Categorie','ClickToDial','Commande','Comptabilite','Contrat','Cron','Deplacement','DocumentGeneration','Don','DynamicPrices',
 		'ECM','Expedition','Export','ExternalRss','ExternalSite',
-		'Facture','Fckeditor','Ficheinter','Fournisseur','FTP','GeoIPMaxmind','Gravatar','Holiday','Import','Label','Ldap',
+		'Facture','Fckeditor','Ficheinter','Fournisseur','FTP','GeoIPMaxmind','Gravatar','Holiday','HRM','Import','Incoterm','Label','Ldap','Loan',
 		'Mailing','MailmanSpip','Margin',
-		'Notification','OpenSurvey','Paybox','Paypal','Prelevement','Product','ProductBatch','Projet','Propale',
+		'Notification','Oauth','OpenSurvey','Paybox','Paypal','Prelevement','Product','ProductBatch','Projet','Propale','ReceiptPrinter','Resource',
-		'Salaries','Service','Skype','Societe','Stock','WebServicesClient','Syslog','Tax','User','WebServices','Workflow');
+		'Salaries','Service','Skype','Societe','Stock','SupplierProposal','Syslog','Tax','User','WebServices','WebServicesClient','Websites','Workflow');
 		foreach($modulelist as $modlabel)
 		{
     		require_once(DOL_DOCUMENT_ROOT.'/core/modules/mod'.$modlabel.'.class.php');
@@ -142,7 +142,7 @@ class ModulesTest extends PHPUnit_Framework_TestCase
             $result=$mod->remove();
             $result=$mod->init();
         	$this->assertLessThan($result, 0, $modlabel);
-        	print __METHOD__." result=".$result."\n";
+        	print __METHOD__." test remove/init for module ".$modlabel.", result=".$result."\n";
 		}
 
         return 0;