Format code

htdocs/accountancy/admin/account.php

@@ -17,17 +17,16 @@
  */
 
 /**
- * \file		htdocs/accountancy/admin/account.php
- * \ingroup		Accounting Expert
- * \brief		List accounting account
+ * \file htdocs/accountancy/admin/account.php
+ * \ingroup Accounting Expert
+ * \brief List accounting account
  */
-
 require '../../main.inc.php';
-	
+
 // Class
-require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingaccount.class.php';
-require_once DOL_DOCUMENT_ROOT.'/accountancy/class/html.formventilation.class.php';
+require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
+require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingaccount.class.php';
+require_once DOL_DOCUMENT_ROOT . '/accountancy/class/html.formventilation.class.php';
 
 // Langs
 $langs->load("compta");
@@ -44,12 +43,12 @@ $search_pcgtype = GETPOST("search_pcgtype");
 $search_pcgsubtype = GETPOST("search_pcgsubtype");
 
 // Security check
-if (!$user->admin)
-    accessforbidden();
+if (! $user->admin)
+	accessforbidden();
 
 $sortfield = GETPOST("sortfield", 'alpha');
 $sortorder = GETPOST("sortorder", 'sortorder');
-$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
+$limit = GETPOST('limit') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $page = GETPOST("page", 'int');
 if ($page == - 1) {
 	$page = 0;
@@ -90,11 +89,11 @@ if ($action == 'disable') {
 
 if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both test are required to be compatible with all browsers
 {
-	$search_account="";
-    $search_label="";
-	$search_accountparent="";
-	$search_pcgtype="";
-	$search_pcgsubtype="";
+	$search_account = "";
+	$search_label = "";
+	$search_accountparent = "";
+	$search_pcgtype = "";
+	$search_pcgsubtype = "";
 }
 
 /*
@@ -156,7 +155,7 @@ if ($result) {
 	print_liste_field_titre($langs->trans("Pcgtype"), $_SERVER["PHP_SELF"], "aa.pcg_type", "", $param, "", $sortfield, $sortorder);
 	print_liste_field_titre($langs->trans("Pcgsubtype"), $_SERVER["PHP_SELF"], "aa.pcg_subtype", "", $param, "", $sortfield, $sortorder);
 	print_liste_field_titre($langs->trans("Activated"), $_SERVER["PHP_SELF"], "aa.active", "", $param, "", $sortfield, $sortorder);
-	print_liste_field_titre($langs->trans("Action"),$_SERVER["PHP_SELF"],"",$param,"",'width="60" align="center"',$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("Action"), $_SERVER["PHP_SELF"], "", $param, "", 'width="60" align="center"', $sortfield, $sortorder);
 	print '</tr>';
 	
 	print '<tr class="liste_titre">';
@@ -167,24 +166,23 @@ if ($result) {
 	print '<td class="liste_titre"><input type="text" class="flat" size="15" name="search_pcgsubtype" value="' . $search_pcgsubtype . '"></td>';
 	print '<td class="liste_titre">&nbsp;</td>';
 	print '<td align="right" colspan="2" class="liste_titre">';
-	print '<input type="image" class="liste_titre" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" name="button_search" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
+	print '<input type="image" class="liste_titre" src="' . img_picto($langs->trans("Search"), 'search.png', '', '', 1) . '" name="button_search" value="' . dol_escape_htmltag($langs->trans("Search")) . '" title="' . dol_escape_htmltag($langs->trans("Search")) . '">';
 	print '&nbsp;';
-	print '<input type="image" class="liste_titre" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" name="button_removefilter" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
+	print '<input type="image" class="liste_titre" src="' . img_picto($langs->trans("Search"), 'searchclear.png', '', '', 1) . '" name="button_removefilter" value="' . dol_escape_htmltag($langs->trans("RemoveFilter")) . '" title="' . dol_escape_htmltag($langs->trans("RemoveFilter")) . '">';
 	print '</td>';
 	print '</tr>';
 	
 	$var = false;
 	
-	$accountstatic=new AccountingAccount($db);
+	$accountstatic = new AccountingAccount($db);
 	
-	while ( $i < min($num, $limit) ) 
-	{
+	while ( $i < min($num, $limit) ) {
 		$obj = $db->fetch_object($resql);
 		
-		$accountstatic->id=$obj->rowid;
-		$accountstatic->label=$obj->label;
-		$accountstatic->account_number=$obj->account_number;
-
+		$accountstatic->id = $obj->rowid;
+		$accountstatic->label = $obj->label;
+		$accountstatic->account_number = $obj->account_number;
+		
 		print '<tr ' . $bc[$var] . '>';
 		print '<td>' . $accountstatic->getNomUrl(1) . '</td>';
 		print '<td>' . $obj->label . '</td>';
@@ -217,7 +215,7 @@ if ($result) {
 		print '</td>' . "\n";
 		
 		print "</tr>\n";
-		$var=!$var;
+		$var = ! $var;
 		$i ++;
 	}
 	

htdocs/accountancy/admin/card.php

@@ -18,18 +18,18 @@
  */
 
 /**
- * \file		htdocs/accountancy/admin/card.php
- * \ingroup		Accounting Expert
- * \brief		Card accounting account
+ * \file htdocs/accountancy/admin/card.php
+ * \ingroup Accounting Expert
+ * \brief Card accounting account
  */
 require '../../main.inc.php';
 
 // Class
-require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingaccount.class.php';
-require_once DOL_DOCUMENT_ROOT.'/accountancy/class/html.formventilation.class.php';
+require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
+require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingaccount.class.php';
+require_once DOL_DOCUMENT_ROOT . '/accountancy/class/html.formventilation.class.php';
 
-$error=0;
+$error = 0;
 
 // Langs
 $langs->load("bills");
@@ -42,21 +42,20 @@ $rowid = GETPOST('rowid', 'int');
 $cancel = GETPOST('cancel');
 
 // Security check
-if (!$user->admin)
-    accessforbidden();
+if (! $user->admin)
+	accessforbidden();
 
 $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;
-
+		
 		dol_syslog('accountancy/admin/card.php:: $sql=' . $sql);
 		$result = $db->query($sql);
 		$obj = $db->fetch_object($result);
-
+		
 		$accounting->fk_pcg_version = $obj->pcg_version;
 		$accounting->pcg_type = GETPOST('pcg_type');
 		$accounting->pcg_subtype = GETPOST('pcg_subtype');
@@ -64,9 +63,9 @@ if ($action == 'add')
 		$accounting->account_parent = GETPOST('account_parent', 'int');
 		$accounting->label = GETPOST('label', 'alpha');
 		$accounting->active = 1;
-
+		
 		$res = $accounting->create($user);
-
+		
 		if ($res == 0) {
 		} else {
 			if ($res == - 3) {
@@ -80,27 +79,25 @@ if ($action == 'add')
 		}
 	}
 	Header("Location: account.php");
-}
-else if ($action == 'edit')
-{
+} else if ($action == 'edit') {
 	if (! GETPOST('cancel', 'alpha')) {
 		$result = $accounting->fetch($id);
-
+		
 		$sql = 'SELECT pcg_version FROM ' . MAIN_DB_PREFIX . 'accounting_system WHERE rowid=' . $conf->global->CHARTOFACCOUNTS;
-
+		
 		dol_syslog('accountancy/admin/card.php:: $sql=' . $sql);
 		$result2 = $db->query($sql);
 		$obj = $db->fetch_object($result2);
-
+		
 		$accounting->fk_pcg_version = $obj->pcg_version;
 		$accounting->pcg_type = GETPOST('pcg_type');
 		$accounting->pcg_subtype = GETPOST('pcg_subtype');
 		$accounting->account_number = GETPOST('account_number');
 		$accounting->account_parent = GETPOST('account_parent', 'int');
 		$accounting->label = GETPOST('label', 'alpha');
-
+		
 		$result = $accounting->update($user);
-
+		
 		if ($result > 0) {
 			header("Location: " . $_SERVER["PHP_SELF"] . "?id=" . $id);
 			exit();
@@ -111,19 +108,17 @@ 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)) {
 		$result = $accounting->delete($user);
-
+		
 		if ($result > 0) {
 			Header("Location: account.php");
 		}
 	}
-
+	
 	if ($result < 0) {
 		setEventMessages($accounting->error, $accounting->errors, 'errors');
 	}
@@ -137,16 +132,15 @@ 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";
 	print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
 	print '<input type="hidden" name="action" value="add">';
-
+	
 	dol_fiche_head();
-
+	
 	print '<table class="border" width="100%">';
 	
 	print '<tr><td width="25%"><span class="fieldrequired">' . $langs->trans("AccountNumber") . '</span></td>';
@@ -165,45 +159,42 @@ if ($action == 'create')
 	print '<td>';
 	print $htmlacc->select_pcgsubtype($accounting->pcg_subtype, 'pcg_subtype');
 	print '</td></tr>';
-
+	
 	print '</table>';
-
+	
 	dol_fiche_end();
-
+	
 	print '<div class="center">';
 	print '<input class="button" type="submit" value="' . $langs->trans("Save") . '">';
 	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
 	print '<input class="button" type="submit" name="cancel" value="' . $langs->trans("Cancel") . '">';
 	print '</div>';
-
+	
 	print '</form>';
-}
-else if ($id)
-{
+} else if ($id) {
 	$rowid = $id;
 	$account = $accounting->fetch($rowid);
-
+	
 	if ($account > 0) {
 		dol_htmloutput_mesg($mesg);
-
+		
 		$head = accounting_prepare_head($accounting);
-
-		if ($action == 'update')
-		{
+		
+		if ($action == 'update') {
 			$soc = new Societe($db);
 			if ($object->socid) {
 				$soc->fetch($object->socid);
 			}
-
+			
 			dol_fiche_head($head, 'card', $langs->trans('AccountAccounting'), 0, 'billr');
-
+			
 			print '<form name="update" action="' . $_SERVER["PHP_SELF"] . '" method="POST">' . "\n";
 			print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
 			print '<input type="hidden" name="action" value="edit">';
 			print '<input type="hidden" name="id" value="' . $id . '">';
-
+			
 			print '<table class="border" width="100%">';
-
+			
 			print '<tr><td width="25%"><span class="fieldrequired">' . $langs->trans("AccountNumber") . '</span></td>';
 			print '<td><input name="account_number" size="30" value="' . $accounting->account_number . '"</td></tr>';
 			print '<tr><td><span class="fieldrequired">' . $langs->trans("Label") . '</span></td>';
@@ -220,86 +211,82 @@ else if ($id)
 			print '<td>';
 			print $htmlacc->select_pcgsubtype($accounting->pcg_subtype, 'pcg_subtype');
 			print '</td></tr>';
-
+			
 			print '</table>';
-
+			
 			dol_fiche_end();
-
+			
 			print '<div class="center">';
 			print '<input type="submit" class="button" value="' . $langs->trans("Save") . '">';
 			print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
 			print '<input type="submit" name="cancel" class="button" value="' . $langs->trans("Cancel") . '">';
 			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');
-
+			
 			print '<table class="border" width="100%">';
-
+			
 			// Account number
 			print '<tr><td width="25%">' . $langs->trans("AccountNumber") . '</td>';
 			print '<td>' . $accounting->account_number . '</td>';
 			print '<td align="right" width="25%">' . $linkback . '</td></tr>';
-
+			
 			print '<tr><td>' . $langs->trans("Label") . '</td>';
 			print '<td colspan="2">' . $accounting->label . '</td></tr>';
-
+			
 			$accp = new AccountingAccount($db);
 			if (! empty($accounting->account_parent)) {
 				$accp->fetch($accounting->account_parent, '');
 			}
 			print '<tr><td>' . $langs->trans("Accountparent") . '</td>';
 			print '<td colspan="2">' . $accp->account_number . ' - ' . $accp->label . '</td></tr>';
-
+			
 			print '<tr><td>' . $langs->trans("Pcgtype") . '</td>';
 			print '<td colspan="2">' . $accounting->pcg_type . '</td></tr>';
-
+			
 			print '<tr><td>' . $langs->trans("Pcgsubtype") . '</td>';
 			print '<td colspan="2">' . $accounting->pcg_subtype . '</td></tr>';
-
+			
 			print '<tr><td>' . $langs->trans("Activated") . '</td>';
 			print '<td colspan="2">';
-
+			
 			if (empty($accounting->active)) {
 				print img_picto($langs->trans("Disabled"), 'switch_off');
 			} else {
 				print img_picto($langs->trans("Activated"), 'switch_on');
 			}
-
+			
 			print '</td></tr>';
-
+			
 			print '</table>';
-
+			
 			dol_fiche_end();
-
+			
 			/*
 			 * Barre d'actions
 			 */
-
+			
 			print '<div class="tabsAction">';
-
+			
 			if ($user->admin) {
 				print '<a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?action=update&id=' . $id . '">' . $langs->trans('Modify') . '</a>';
 			} else {
 				print '<a class="butActionRefused" href="#" title="' . dol_escape_htmltag($langs->trans("NotAllowed")) . '">' . $langs->trans('Modify') . '</a>';
 			}
-
+			
 			if ($user->admin) {
 				print '<a class="butActionDelete" href="' . $_SERVER["PHP_SELF"] . '?action=delete&id=' . $id . '">' . $langs->trans('Delete') . '</a>';
 			} else {
 				print '<a class="butActionRefused" href="#" title="' . dol_escape_htmltag($langs->trans("NotAllowed")) . '">' . $langs->trans('Delete') . '</a>';
 			}
-
+			
 			print '</div>';
 		}
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 }

htdocs/accountancy/admin/export.php

@@ -21,16 +21,15 @@
  */
 
 /**
- * \file		htdocs/accountancy/admin/export.php
- * \ingroup		Accounting Expert
- * \brief		Setup page to configure accounting expert module
+ * \file htdocs/accountancy/admin/export.php
+ * \ingroup Accounting Expert
+ * \brief Setup page to configure accounting expert module
  */
-
 require '../../main.inc.php';
 
 // Class
-require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
+require_once DOL_DOCUMENT_ROOT . '/core/lib/admin.lib.php';
+require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
 
 $langs->load("compta");
 $langs->load("bills");
@@ -38,14 +37,14 @@ $langs->load("admin");
 $langs->load("accountancy");
 
 // Security check
-if (!$user->admin)
-    accessforbidden();
+if (! $user->admin)
+	accessforbidden();
 
 $action = GETPOST('action', 'alpha');
 
 // Parameters ACCOUNTING_EXPORT_*
 $main_option = array (
-		'ACCOUNTING_EXPORT_PREFIX_SPEC'
+		'ACCOUNTING_EXPORT_PREFIX_SPEC' 
 );
 
 $model_option = array (
@@ -55,7 +54,7 @@ $model_option = array (
 		'ACCOUNTING_EXPORT_GLOBAL_ACCOUNT',
 		'ACCOUNTING_EXPORT_LABEL',
 		'ACCOUNTING_EXPORT_AMOUNT',
-		'ACCOUNTING_EXPORT_DEVISE'
+		'ACCOUNTING_EXPORT_DEVISE' 
 );
 
 /*
@@ -63,7 +62,7 @@ $model_option = array (
  */
 if ($action == 'update') {
 	$error = 0;
-
+	
 	$format = GETPOST('format', 'alpha');
 	$modelcsv = GETPOST('modelcsv', 'int');
 	
@@ -74,7 +73,7 @@ if ($action == 'update') {
 	} else {
 		$error ++;
 	}
-
+	
 	if (! empty($modelcsv)) {
 		if (! dolibarr_set_const($db, 'ACCOUNTING_EXPORT_MODELCSV', $modelcsv, 'chaine', 0, '', $conf->entity)) {
 			$error ++;
@@ -82,23 +81,23 @@ if ($action == 'update') {
 	} else {
 		$error ++;
 	}
-
-	foreach ($main_option as $constname) {
+	
+	foreach ( $main_option as $constname ) {
 		$constvalue = GETPOST($constname, 'alpha');
-
+		
 		if (! dolibarr_set_const($db, $constname, $constvalue, 'chaine', 0, '', $conf->entity)) {
 			$error ++;
 		}
 	}
-
-	foreach ($model_option as $constname) {
+	
+	foreach ( $model_option as $constname ) {
 		$constvalue = GETPOST($constname, 'alpha');
-
+		
 		if (! dolibarr_set_const($db, $constname, $constvalue, 'chaine', 0, '', $conf->entity)) {
 			$error ++;
 		}
 	}
-
+	
 	if (! $error) {
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	} else {
@@ -114,12 +113,11 @@ llxHeader();
 
 $form = new Form($db);
 
-$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print load_fiche_titre($langs->trans('ConfigAccountingExpert'),$linkback,'title_setup');
+$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();
 
-
 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,37 +138,33 @@ $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"),
-		'txt'=>$langs->trans("txt")
+	$listformat = array (
+			'csv' => $langs->trans("csv"),
+			'txt' => $langs->trans("txt") 
 	);
-	print $form->selectarray("format",$listformat,$conf->global->ACCOUNTING_EXPORT_FORMAT,0);
-
+	print $form->selectarray("format", $listformat, $conf->global->ACCOUNTING_EXPORT_FORMAT, 0);
+	
 	print '</td>';
 }
 print "</td></tr>";
 
 $num = count($main_option);
-if ($num)
-{
-	foreach ($main_option as $key) {
+if ($num) {
+	foreach ( $main_option as $key ) {
 		$var = ! $var;
-
+		
 		print '<tr ' . $bc[$var] . ' class="value">';
-
+		
 		// Param
 		$label = $langs->trans($key);
 		print '<td width="50%">' . $label . '</td>';
-
+		
 		// Value
 		print '<td>';
 		print '<input type="text" size="20" name="' . $key . '" value="' . $conf->global->$key . '">';
@@ -195,22 +189,19 @@ $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"),
-		'2'=>$langs->trans("Modelcsv_CEGID"),
-		'3'=>$langs->trans("Modelcsv_COALA")
+	$listmodelcsv = array (
+			'1' => $langs->trans("Modelcsv_normal"),
+			'2' => $langs->trans("Modelcsv_CEGID"),
+			'3' => $langs->trans("Modelcsv_COALA") 
 	);
-	print $form->selectarray("modelcsv",$listmodelcsv,$conf->global->ACCOUNTING_EXPORT_MODELCSV,0);
-
+	print $form->selectarray("modelcsv", $listmodelcsv, $conf->global->ACCOUNTING_EXPORT_MODELCSV, 0);
+	
 	print '</td>';
 }
 print "</td></tr>";
@@ -223,29 +214,29 @@ 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>';
-
-	foreach ($model_option as $key) {
+	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;
-
+		
 		print '<tr ' . $bc[$var] . ' class="value">';
-
+		
 		// Param
 		$label = $langs->trans($key);
 		print '<td width="50%">' . $label . '</td>';
-
+		
 		// Value
 		print '<td>';
 		print '<input type="text" size="20" name="' . $key . '" value="' . $conf->global->$key . '">';
 		print '</td></tr>';
 	}
-
+	
 	print "</table>\n";
 }
 

htdocs/accountancy/admin/fiscalyear.php

@@ -16,34 +16,37 @@
  */
 
 /**
- *      \file       htdocs/accountancy/admin/fiscalyear.php
- *		\ingroup    fiscal year
- *		\brief      Setup page to configure fiscal year
+ * \file htdocs/accountancy/admin/fiscalyear.php
+ * \ingroup fiscal year
+ * \brief Setup page to configure fiscal year
  */
-
 require '../../main.inc.php';
 
-require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/fiscalyear.class.php';
+require_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php';
+require_once DOL_DOCUMENT_ROOT . '/core/class/fiscalyear.class.php';
 
-$action=GETPOST('action');
+$action = GETPOST('action');
 
 $langs->load("admin");
 $langs->load("compta");
 
-if (! $user->admin) accessforbidden();
+if (! $user->admin)
+	accessforbidden();
 
-$error=0;
+$error = 0;
 
 // List of statut
-static $tmpstatut2label=array(
-		'0'=>'OpenFiscalYear',
-		'1'=>'CloseFiscalYear'
+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();
+$errors = array ();
 
 $object = new Fiscalyear($db);
 
@@ -55,67 +58,59 @@ $object = new Fiscalyear($db);
  * View
  */
 
-$max=100;
+$max = 100;
 
 $form = new Form($db);
 
 $title = $langs->trans('FiscalYears');
 
-llxHeader('',$title,LOG_ERR);
+llxHeader('', $title, LOG_ERR);
 
 print load_fiche_titre($langs->trans('FiscalYears'));
 
 $sql = "SELECT f.rowid, f.label, f.date_start, f.date_end, f.statut, f.entity";
-$sql.= " FROM ".MAIN_DB_PREFIX."accounting_fiscalyear as f";
-$sql.= " WHERE f.entity = ".$conf->entity;
+$sql .= " FROM " . MAIN_DB_PREFIX . "accounting_fiscalyear as f";
+$sql .= " WHERE f.entity = " . $conf->entity;
 
 $result = $db->query($sql);
-if ($result)
-{
-	$var=false;
-    $num = $db->num_rows($result);
-
-    $i = 0;
-
+if ($result) {
+	$var = false;
+	$num = $db->num_rows($result);
+	
+	$i = 0;
+	
 	// Load attribute_label
 	print '<table class="noborder" width="100%">';
 	print '<tr class="liste_titre">';
-	print '<td>'.$langs->trans("Ref").'</td>';
-	print '<td>'.$langs->trans("Label").'</td>';
-	print '<td>'.$langs->trans("DateStart").'</td>';
-	print '<td>'.$langs->trans("DateEnd").'</td>';
-	print '<td align="right">'.$langs->trans("Statut").'</td>';
+	print '<td>' . $langs->trans("Ref") . '</td>';
+	print '<td>' . $langs->trans("Label") . '</td>';
+	print '<td>' . $langs->trans("DateStart") . '</td>';
+	print '<td>' . $langs->trans("DateEnd") . '</td>';
+	print '<td align="right">' . $langs->trans("Statut") . '</td>';
 	print '</tr>';
-
-	if ($num)
-    {
-	    $fiscalyearstatic=new Fiscalyear($db);
-
-		while ($i < $num && $i < $max)
-        {
-            $obj = $db->fetch_object($result);
-            $fiscalyearstatic->id=$obj->rowid;
-            print '<tr '.$bc[$var].'>';
-			print '<td><a href="fiscalyear_card.php?id='.$obj->rowid.'">'.img_object($langs->trans("ShowFiscalYear"),"technic").' '.$obj->rowid.'</a></td>';
-            print '<td align="left">'.$obj->label.'</td>';
-            print '<td align="left">'.dol_print_date($db->jdate($obj->date_start),'day').'</td>';
-			print '<td align="left">'.dol_print_date($db->jdate($obj->date_end),'day').'</td>';
-            print '<td align="right">'.$fiscalyearstatic->LibStatut($obj->statut,5).'</td>';
-            print '</tr>';
-            $var=!$var;
-            $i++;
-        }
-
-    }
-    else
-    {
-        print '<tr '.$bc[$var].'><td colspan="5">'.$langs->trans("None").'</td></tr>';
-    }
-
+	
+	if ($num) {
+		$fiscalyearstatic = new Fiscalyear($db);
+		
+		while ( $i < $num && $i < $max ) {
+			$obj = $db->fetch_object($result);
+			$fiscalyearstatic->id = $obj->rowid;
+			print '<tr ' . $bc[$var] . '>';
+			print '<td><a href="fiscalyear_card.php?id=' . $obj->rowid . '">' . img_object($langs->trans("ShowFiscalYear"), "technic") . ' ' . $obj->rowid . '</a></td>';
+			print '<td align="left">' . $obj->label . '</td>';
+			print '<td align="left">' . dol_print_date($db->jdate($obj->date_start), 'day') . '</td>';
+			print '<td align="left">' . dol_print_date($db->jdate($obj->date_end), 'day') . '</td>';
+			print '<td align="right">' . $fiscalyearstatic->LibStatut($obj->statut, 5) . '</td>';
+			print '</tr>';
+			$var = ! $var;
+			$i ++;
+		}
+	} else {
+		print '<tr ' . $bc[$var] . '><td colspan="5">' . $langs->trans("None") . '</td></tr>';
+	}
+	
 	print '</table>';
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
@@ -123,7 +118,7 @@ dol_fiche_end();
 
 // Buttons
 print '<div class="tabsAction">';
-print '<a class="butAction" href="fiscalyear_card.php?action=create">'.$langs->trans("NewFiscalYear").'</a>';
+print '<a class="butAction" href="fiscalyear_card.php?action=create">' . $langs->trans("NewFiscalYear") . '</a>';
 print '</div>';
 
 llxFooter();

htdocs/accountancy/admin/fiscalyear_card.php

@@ -16,145 +16,123 @@
  */
 
 /**
- *  \file       	htdocs/accountancy/admin/fiscalyear_card.php
- *  \brief      	Page to show a fiscal year
+ * \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';
-
+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;
+$error = 0;
 
-$action = GETPOST('action','alpha');
-$confirm = GETPOST('confirm','alpha');
-$id = GETPOST('id','int');
+$action = GETPOST('action', 'alpha');
+$confirm = GETPOST('confirm', 'alpha');
+$id = GETPOST('id', 'int');
 
 // List of statut
-static $tmpstatut2label=array(
-		'0'=>'OpenFiscalYear',
-		'1'=>'CloseFiscalYear'
+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'));
-
+$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")
-{
-    $result=$object->delete($id);
-    if ($result >= 0)
-    {
-        header("Location: fiscalyear.php");
-        exit;
-    }
-    else
-    {
-        setEventMessages($object->error, $object->errors, 'errors');
-    }
-}
-
-else if ($action == 'add')
-{
-    if (! GETPOST('cancel','alpha'))
-    {
-        $error=0;
-
-		$object->date_start		= $date_start;
-	    $object->date_end		= $date_end;
-		$object->label			= GETPOST('label','alpha');
-        $object->statut     	= GETPOST('statut','int');
-		$object->datec			= dol_now();
-
-        if (empty($object->date_start) && empty($object->date_end))
-        {
-	        setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Date")), null, 'errors');
-            $error++;
-        }
-        if (empty($object->label))
-        {
-	        setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Label")), null, 'errors');
-            $error++;
-        }
-
-        if (! $error)
-        {
+if ($action == 'confirm_delete' && $confirm == "yes") {
+	$result = $object->delete($id);
+	if ($result >= 0) {
+		header("Location: fiscalyear.php");
+		exit();
+	} else {
+		setEventMessages($object->error, $object->errors, 'errors');
+	}
+} 
+
+else if ($action == 'add') {
+	if (! GETPOST('cancel', 'alpha')) {
+		$error = 0;
+		
+		$object->date_start = $date_start;
+		$object->date_end = $date_end;
+		$object->label = GETPOST('label', 'alpha');
+		$object->statut = GETPOST('statut', 'int');
+		$object->datec = dol_now();
+		
+		if (empty($object->date_start) && empty($object->date_end)) {
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Date")), null, 'errors');
+			$error ++;
+		}
+		if (empty($object->label)) {
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Label")), null, 'errors');
+			$error ++;
+		}
+		
+		if (! $error) {
 			$db->begin();
-
-        	$id = $object->create($user);
-
-            if ($id > 0)
-            {
-            	$db->commit();
-
-                header("Location: " . $_SERVER["PHP_SELF"] . "?id=" . $id);
-                exit;
-            }
-            else
-           {
-            	$db->rollback();
-
-            	setEventMessages($object->error, $object->errors, 'errors');
-                $action='create';
-            }
-        }
-        else
-       {
-            $action='create';
-        }
-    }
-    else
-    {
-        header("Location: ./fiscalyear.php");
-        exit;
-    }
-}
+			
+			$id = $object->create($user);
+			
+			if ($id > 0) {
+				$db->commit();
+				
+				header("Location: " . $_SERVER["PHP_SELF"] . "?id=" . $id);
+				exit();
+			} else {
+				$db->rollback();
+				
+				setEventMessages($object->error, $object->errors, 'errors');
+				$action = 'create';
+			}
+		} else {
+			$action = 'create';
+		}
+	} else {
+		header("Location: ./fiscalyear.php");
+		exit();
+	}
+} 
 
 // Update record
-else if ($action == 'update')
-{
-    if (! GETPOST('cancel','alpha'))
-    {
-        $result = $object->fetch($id);
-
-		$object->date_start	= empty($_POST["fiscalyear"])?'':$date_start;
-		$object->date_end	= empty($_POST["fiscalyearend"])?'':$date_end;
-		$object->label		= GETPOST('label','alpha');
-		$object->statut     = GETPOST('statut','int');
-
-        $result = $object->update($user);
-
-        if ($result > 0)
-        {
-            header("Location: " . $_SERVER["PHP_SELF"] . "?id=" . $id);
-            exit;
-        }
-        else
-        {
-	        setEventMessages($object->error, $object->errors, 'errors');
-        }
-    }
-    else
-    {
-        header("Location: " . $_SERVER["PHP_SELF"] . "?id=" . $id);
-        exit;
-    }
+else if ($action == 'update') {
+	if (! GETPOST('cancel', 'alpha')) {
+		$result = $object->fetch($id);
+		
+		$object->date_start = empty($_POST["fiscalyear"]) ? '' : $date_start;
+		$object->date_end = empty($_POST["fiscalyearend"]) ? '' : $date_end;
+		$object->label = GETPOST('label', 'alpha');
+		$object->statut = GETPOST('statut', 'int');
+		
+		$result = $object->update($user);
+		
+		if ($result > 0) {
+			header("Location: " . $_SERVER["PHP_SELF"] . "?id=" . $id);
+			exit();
+		} else {
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
+	} else {
+		header("Location: " . $_SERVER["PHP_SELF"] . "?id=" . $id);
+		exit();
+	}
 }
 
 /*
@@ -167,176 +145,165 @@ $form = new Form($db);
 
 /*
  * Action create
-*/
-if ($action == 'create')
-{
-    print load_fiche_titre($langs->trans("NewFiscalYear"));
-
-    print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
-    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-    print '<input type="hidden" name="action" value="add">';
-
+ */
+if ($action == 'create') {
+	print load_fiche_titre($langs->trans("NewFiscalYear"));
+	
+	print '<form action="' . $_SERVER["PHP_SELF"] . '" method="POST">';
+	print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
+	print '<input type="hidden" name="action" value="add">';
+	
 	dol_fiche_head();
-
-    print '<table class="border" width="100%">';
-
+	
+	print '<table class="border" width="100%">';
+	
 	// Label
-    print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td><td><input name="label" size="32" value="' . GETPOST("label") . '"></td></tr>';
-
+	print '<tr><td class="fieldrequired">' . $langs->trans("Label") . '</td><td><input name="label" size="32" value="' . GETPOST("label") . '"></td></tr>';
+	
 	// Date start
-    print '<tr><td class="fieldrequired">'.$langs->trans("DateStart").'</td><td>';
-    print $form->select_date(($date_start?$date_start:''),'fiscalyear');
-    print '</td></tr>';
-
-    // Date end
-    print '<tr><td class="fieldrequired">'.$langs->trans("DateEnd").'</td><td>';
-    print $form->select_date(($date_end?$date_end:-1),'fiscalyearend');
-    print '</td></tr>';
-
+	print '<tr><td class="fieldrequired">' . $langs->trans("DateStart") . '</td><td>';
+	print $form->select_date(($date_start ? $date_start : ''), 'fiscalyear');
+	print '</td></tr>';
+	
+	// Date end
+	print '<tr><td class="fieldrequired">' . $langs->trans("DateEnd") . '</td><td>';
+	print $form->select_date(($date_end ? $date_end : - 1), 'fiscalyearend');
+	print '</td></tr>';
+	
 	// Statut
-    print '<tr>';
-    print '<td class="fieldrequired">'.$langs->trans("Statut").'</td>';
+	print '<tr>';
+	print '<td class="fieldrequired">' . $langs->trans("Statut") . '</td>';
 	print '<td class="valeur">';
-	print $form->selectarray('statut',$statut2label,GETPOST('statut'));
-    print '</td></tr>';
-
-    print '</table>';
+	print $form->selectarray('statut', $statut2label, GETPOST('statut'));
+	print '</td></tr>';
+	
+	print '</table>';
 	
 	dol_fiche_end();
-
-    print '<div class="center">';
-	print '<input class="button" type="submit" value="'.$langs->trans("Save").'">';
+	
+	print '<div class="center">';
+	print '<input class="button" type="submit" value="' . $langs->trans("Save") . '">';
 	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-    print '<input class="button" type="submit" name="cancel" value="'.$langs->trans("Cancel").'">';
+	print '<input class="button" type="submit" name="cancel" value="' . $langs->trans("Cancel") . '">';
 	print '</div>';
-
-    print '</form>';
-}
-else if ($id)
-{
-    $result = $object->fetch($id);
-    if ($result > 0)
-    {
-        $head = fiscalyear_prepare_head($object);
-
-        if ($action == 'edit')
-        {
-        	dol_fiche_head($head, 'card', $langs->trans("FiscalYearCard"), 0, 'cron');
-
-        	print '<form name="update" action="' . $_SERVER["PHP_SELF"] . '" method="POST">' . "\n";
-            print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-            print '<input type="hidden" name="action" value="update">';
-            print '<input type="hidden" name="id" value="'.$id.'">';
-
-            print '<table class="border" width="100%">';
-
-            // Ref
-            print "<tr>";
-            print '<td width="20%">'.$langs->trans("Ref").'</td><td>';
-            print $object->rowid;
-            print '</td></tr>';
-
-            // Label
-            print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td><td>';
-            print '<input name="label" class="flat" size="32" value="'.$object->label.'">';
-            print '</td></tr>';
-
+	
+	print '</form>';
+} else if ($id) {
+	$result = $object->fetch($id);
+	if ($result > 0) {
+		$head = fiscalyear_prepare_head($object);
+		
+		if ($action == 'edit') {
+			dol_fiche_head($head, 'card', $langs->trans("FiscalYearCard"), 0, 'cron');
+			
+			print '<form name="update" action="' . $_SERVER["PHP_SELF"] . '" method="POST">' . "\n";
+			print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
+			print '<input type="hidden" name="action" value="update">';
+			print '<input type="hidden" name="id" value="' . $id . '">';
+			
+			print '<table class="border" width="100%">';
+			
+			// Ref
+			print "<tr>";
+			print '<td width="20%">' . $langs->trans("Ref") . '</td><td>';
+			print $object->rowid;
+			print '</td></tr>';
+			
+			// Label
+			print '<tr><td class="fieldrequired">' . $langs->trans("Label") . '</td><td>';
+			print '<input name="label" class="flat" size="32" value="' . $object->label . '">';
+			print '</td></tr>';
+			
 			// Date start
-            print '<tr><td class="fieldrequired">'.$langs->trans("DateStart").'</td><td>';
-            print $form->select_date($object->date_start?$object->date_start:-1,'fiscalyear');
-            print '</td></tr>';
-
-            // Date end
-            print '<tr><td class="fieldrequired">'.$langs->trans("DateEnd").'</td><td>';
-            print $form->select_date($object->date_end?$object->date_end:-1,'fiscalyearend');
-            print '</td></tr>';
-
+			print '<tr><td class="fieldrequired">' . $langs->trans("DateStart") . '</td><td>';
+			print $form->select_date($object->date_start ? $object->date_start : - 1, 'fiscalyear');
+			print '</td></tr>';
+			
+			// Date end
+			print '<tr><td class="fieldrequired">' . $langs->trans("DateEnd") . '</td><td>';
+			print $form->select_date($object->date_end ? $object->date_end : - 1, 'fiscalyearend');
+			print '</td></tr>';
+			
 			// Statut
-			print '<tr><td>'.$langs->trans("Statut").'</td><td>';
-			print $form->selectarray('statut',$statut2label,$object->statut);
+			print '<tr><td>' . $langs->trans("Statut") . '</td><td>';
+			print $form->selectarray('statut', $statut2label, $object->statut);
 			print '</td></tr>';
-
-            print '</table>';
-
-            print '<br><div class="center">';
-			print '<input type="submit" class="button" value="'.$langs->trans("Save").'">';
+			
+			print '</table>';
+			
+			print '<br><div class="center">';
+			print '<input type="submit" class="button" value="' . $langs->trans("Save") . '">';
 			print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-            print '<input type="submit" name="cancel" class="button" value="'.$langs->trans("Cancel").'">';
-            print '</div>';
-
-            print '</form>';
-
-            dol_fiche_end();
-        }
-        else
-        {
-            /*
-             * Confirm 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');
-
-        	print '<table class="border" width="100%">';
-
-            $linkback = '<a href="'.DOL_URL_ROOT.'/admin/fiscalyear.php">'.$langs->trans("BackToList").'</a>';
-
-            // Ref
-            print '<tr><td width="25%">'.$langs->trans("Ref").'</td><td width="50%">';
-            print $object->rowid;
+			print '<input type="submit" name="cancel" class="button" value="' . $langs->trans("Cancel") . '">';
+			print '</div>';
+			
+			print '</form>';
+			
+			dol_fiche_end();
+		} else {
+			/*
+			 * Confirm 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');
+			
+			print '<table class="border" width="100%">';
+			
+			$linkback = '<a href="' . DOL_URL_ROOT . '/admin/fiscalyear.php">' . $langs->trans("BackToList") . '</a>';
+			
+			// Ref
+			print '<tr><td width="25%">' . $langs->trans("Ref") . '</td><td width="50%">';
+			print $object->rowid;
 			print '</td><td width="25%">';
 			print $linkback;
-            print '</td></tr>';
-
+			print '</td></tr>';
+			
 			// Label
-            print '<tr><td valign="top">';
-            print $form->editfieldkey("Label",'label',$object->label,$object,$conf->global->MAIN_EDIT_ALSO_INLINE,'alpha:32');
-            print '</td><td colspan="2">';
-            print $form->editfieldval("Label",'label',$object->label,$object,$conf->global->MAIN_EDIT_ALSO_INLINE,'alpha:32');
-            print "</td></tr>";
-
-            // Date start
-            print '<tr><td>';
-            print $form->editfieldkey("Date",'date_start',$object->date_start,$object,$conf->global->MAIN_EDIT_ALSO_INLINE,'datepicker');
-            print '</td><td colspan="2">';
-            print $form->editfieldval("Date",'date_start',$object->date_start,$object,$conf->global->MAIN_EDIT_ALSO_INLINE,'datepicker');
-            print '</td></tr>';
-
+			print '<tr><td valign="top">';
+			print $form->editfieldkey("Label", 'label', $object->label, $object, $conf->global->MAIN_EDIT_ALSO_INLINE, 'alpha:32');
+			print '</td><td colspan="2">';
+			print $form->editfieldval("Label", 'label', $object->label, $object, $conf->global->MAIN_EDIT_ALSO_INLINE, 'alpha:32');
+			print "</td></tr>";
+			
+			// Date start
+			print '<tr><td>';
+			print $form->editfieldkey("Date", 'date_start', $object->date_start, $object, $conf->global->MAIN_EDIT_ALSO_INLINE, 'datepicker');
+			print '</td><td colspan="2">';
+			print $form->editfieldval("Date", 'date_start', $object->date_start, $object, $conf->global->MAIN_EDIT_ALSO_INLINE, 'datepicker');
+			print '</td></tr>';
+			
 			// Date end
-            print '<tr><td>';
-            print $form->editfieldkey("Date",'date_end',$object->date_end,$object,$conf->global->MAIN_EDIT_ALSO_INLINE,'datepicker');
-            print '</td><td colspan="2">';
-            print $form->editfieldval("Date",'date_end',$object->date_end,$object,$conf->global->MAIN_EDIT_ALSO_INLINE,'datepicker');
-            print '</td></tr>';
-
-            // Statut
-            print '<tr><td>'.$langs->trans("Status").'</td><td colspan="2">'.$object->getLibStatut(4).'</td></tr>';
-
-            print "</table>";
-
-            dol_fiche_end();
-
-            /*
-             * Barre d'actions
-            */
-
-            print '<div class="tabsAction">';
-
-            print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit&id='.$id.'">'.$langs->trans('Modify').'</a>';
-
-			print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?action=delete&id='.$id.'">'.$langs->trans('Delete').'</a>';
-
-            print '</div>';
-        }
-    }
-    else
-    {
-        dol_print_error($db);
-    }
+			print '<tr><td>';
+			print $form->editfieldkey("Date", 'date_end', $object->date_end, $object, $conf->global->MAIN_EDIT_ALSO_INLINE, 'datepicker');
+			print '</td><td colspan="2">';
+			print $form->editfieldval("Date", 'date_end', $object->date_end, $object, $conf->global->MAIN_EDIT_ALSO_INLINE, 'datepicker');
+			print '</td></tr>';
+			
+			// Statut
+			print '<tr><td>' . $langs->trans("Status") . '</td><td colspan="2">' . $object->getLibStatut(4) . '</td></tr>';
+			
+			print "</table>";
+			
+			dol_fiche_end();
+			
+			/*
+			 * Barre d'actions
+			 */
+			
+			print '<div class="tabsAction">';
+			
+			print '<a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?action=edit&id=' . $id . '">' . $langs->trans('Modify') . '</a>';
+			
+			print '<a class="butActionDelete" href="' . $_SERVER["PHP_SELF"] . '?action=delete&id=' . $id . '">' . $langs->trans('Delete') . '</a>';
+			
+			print '</div>';
+		}
+	} else {
+		dol_print_error($db);
+	}
 }
 
 llxFooter();

htdocs/accountancy/admin/fiscalyear_info.php

@@ -16,43 +16,41 @@
  */
 
 /**
- *  \file       	htdocs/accountancy/admin/fiscalyear_card.php
- *  \brief      	Page to show info of a fiscal year
+ * \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';
-
+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');
+$id = GETPOST('id', 'int');
 
 // View
 llxHeader();
 
-if ($id)
-{
+if ($id) {
 	$object = new Fiscalyear($db);
 	$object->fetch($id);
 	$object->info($id);
-
+	
 	$head = fiscalyear_prepare_head($object);
-
+	
 	dol_fiche_head($head, 'info', $langs->trans("FiscalYearCard"), 0, 'cron');
-
-    print '<table width="100%"><tr><td>';
-    dol_print_object_info($object);
-    print '</td></tr></table>';
-
-    print '</div>';
+	
+	print '<table width="100%"><tr><td>';
+	dol_print_object_info($object);
+	print '</td></tr></table>';
+	
+	print '</div>';
 }
 
 llxFooter();

htdocs/accountancy/admin/importaccounts.php

@@ -19,17 +19,16 @@
  */
 
 /**
- * \file			htdocs/accountancy/admin/importaccounts.php
- * \ingroup			Accounting Expert
- * \brief			Page import accounting account
+ * \file htdocs/accountancy/admin/importaccounts.php
+ * \ingroup Accounting Expert
+ * \brief Page import accounting account
  */
-
 require '../../main.inc.php';
-	
+
 // Class
-require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingaccount.class.php';
-require_once DOL_DOCUMENT_ROOT.'/accountancy/class/html.formventilation.class.php';
+require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
+require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingaccount.class.php';
+require_once DOL_DOCUMENT_ROOT . '/accountancy/class/html.formventilation.class.php';
 
 // langs
 $langs->load("compta");
@@ -38,8 +37,8 @@ $langs->load("main");
 $langs->load("accountancy");
 
 // Security check
-if (!$user->admin)
-    accessforbidden();
+if (! $user->admin)
+	accessforbidden();
 
 llxHeader('', $langs->trans("ImportAccount"));
 
@@ -92,9 +91,9 @@ if ($_POST["action"] == 'import') {
 }
 
 /*
-* list accounting account from product 
-*
-*/
+ * list accounting account from product 
+ *
+ */
 $page = GETPOST("page");
 if ($page < 0)
 	$page = 0;

htdocs/accountancy/admin/index.php

@@ -23,16 +23,15 @@
  */
 
 /**
- * \file		htdocs/accountancy/admin/index.php
- * \ingroup		Accounting Expert
- * \brief		Setup page to configure accounting expert module
+ * \file htdocs/accountancy/admin/index.php
+ * \ingroup Accounting Expert
+ * \brief Setup page to configure accounting expert module
  */
-
 require '../../main.inc.php';
-	
+
 // Class
-require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
+require_once DOL_DOCUMENT_ROOT . '/core/lib/admin.lib.php';
+require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
 
 $langs->load("compta");
 $langs->load("bills");
@@ -40,16 +39,16 @@ $langs->load("admin");
 $langs->load("accountancy");
 
 // Security check
-if (!$user->admin)
-    accessforbidden();
+if (! $user->admin)
+	accessforbidden();
 
 $action = GETPOST('action', 'alpha');
 
 // Other parameters ACCOUNTING_*
 $list = array (
 		'ACCOUNTING_LIMIT_LIST_VENTILATION',
-        'ACCOUNTING_LENGTH_DESCRIPTION',				// adjust size displayed for lines description for dol_trunc
-		'ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT',		// adjust size displayed for select account description for dol_trunc
+		'ACCOUNTING_LENGTH_DESCRIPTION', // adjust size displayed for lines description for dol_trunc
+		'ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT', // adjust size displayed for select account description for dol_trunc
 		'ACCOUNTING_LENGTH_GACCOUNT',
 		'ACCOUNTING_LENGTH_AACCOUNT',
 		'ACCOUNTING_ACCOUNT_CUSTOMER',
@@ -67,28 +66,27 @@ $list = array (
 /*
  * Actions
  */
- 
-$accounting_mode = defined('ACCOUNTING_MODE')?ACCOUNTING_MODE:'RECETTES-DEPENSES';
-
-if ($action == 'update')
-{
-    $error = 0;
 
-    $accounting_modes = array(
-        'RECETTES-DEPENSES',
-        'CREANCES-DETTES'
-    );
+$accounting_mode = defined('ACCOUNTING_MODE') ? ACCOUNTING_MODE : 'RECETTES-DEPENSES';
 
-    $accounting_mode = GETPOST('accounting_mode','alpha');
+if ($action == 'update') {
+	$error = 0;
 	
-	if (in_array($accounting_mode,$accounting_modes)) {
-
-        if (!dolibarr_set_const($db, 'ACCOUNTING_MODE', $accounting_mode, 'chaine', 0, '', $conf->entity)) {
-            $error++;
-        }
-    } else {
-        $error++;
-    }
+	$accounting_modes = array (
+			'RECETTES-DEPENSES',
+			'CREANCES-DETTES' 
+	);
+	
+	$accounting_mode = GETPOST('accounting_mode', 'alpha');
+	
+	if (in_array($accounting_mode, $accounting_modes)) {
+		
+		if (! dolibarr_set_const($db, 'ACCOUNTING_MODE', $accounting_mode, 'chaine', 0, '', $conf->entity)) {
+			$error ++;
+		}
+	} else {
+		$error ++;
+	}
 	
 	$chartofaccounts = GETPOST('chartofaccounts', 'int');
 	
@@ -101,22 +99,19 @@ if ($action == 'update')
 		$error ++;
 	}
 	
-    foreach ($list as $constname) {
-        $constvalue = GETPOST($constname, 'alpha');
-
-        if (!dolibarr_set_const($db, $constname, $constvalue, 'chaine', 0, '', $conf->entity)) {
-            $error++;
-        }
-    }
-
-    if (! $error)
-    {
-        setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else
-    {
-        setEventMessages($langs->trans("Error"), null, 'errors');
-    }
+	foreach ( $list as $constname ) {
+		$constvalue = GETPOST($constname, 'alpha');
+		
+		if (! dolibarr_set_const($db, $constname, $constvalue, 'chaine', 0, '', $conf->entity)) {
+			$error ++;
+		}
+	}
+	
+	if (! $error) {
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+	} else {
+		setEventMessages($langs->trans("Error"), null, 'errors');
+	}
 }
 
 if ($action == 'setlistsorttodo') {
@@ -152,14 +147,13 @@ llxHeader();
 
 $form = new Form($db);
 
-$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print load_fiche_titre($langs->trans('ConfigAccountingExpert'),$linkback,'title_setup');
+$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 '<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("Configuration"), 0, 'cron');
@@ -169,24 +163,24 @@ print '<table class="noborder" width="100%">';
 // Cas du parametre ACCOUNTING_MODE
 
 print '<tr class="liste_titre">';
-print '<td>'.$langs->trans('OptionMode').'</td><td>'.$langs->trans('Description').'</td>';
+print '<td>' . $langs->trans('OptionMode') . '</td><td>' . $langs->trans('Description') . '</td>';
 print "</tr>\n";
-print '<tr '.$bc[false].'><td width="200"><input type="radio" name="accounting_mode" value="RECETTES-DEPENSES"'.($accounting_mode != 'CREANCES-DETTES' ? ' checked' : '').'> '.$langs->trans('OptionModeTrue').'</td>';
-print '<td colspan="2">'.nl2br($langs->trans('OptionModeTrueDesc'));
+print '<tr ' . $bc[false] . '><td width="200"><input type="radio" name="accounting_mode" value="RECETTES-DEPENSES"' . ($accounting_mode != 'CREANCES-DETTES' ? ' checked' : '') . '> ' . $langs->trans('OptionModeTrue') . '</td>';
+print '<td colspan="2">' . nl2br($langs->trans('OptionModeTrueDesc'));
 // Write info on way to count VAT
-//if (! empty($conf->global->MAIN_MODULE_COMPTABILITE))
-//{
-//	//	print "<br>\n";
-//	//	print nl2br($langs->trans('OptionModeTrueInfoModuleComptabilite'));
-//}
-//else
-//{
-//	//	print "<br>\n";
-//	//	print nl2br($langs->trans('OptionModeTrueInfoExpert'));
-//}
+// if (! empty($conf->global->MAIN_MODULE_COMPTABILITE))
+// {
+// // print "<br>\n";
+// // print nl2br($langs->trans('OptionModeTrueInfoModuleComptabilite'));
+// }
+// else
+// {
+// // print "<br>\n";
+// // print nl2br($langs->trans('OptionModeTrueInfoExpert'));
+// }
 print "</td></tr>\n";
-print '<tr '.$bc[true].'><td width="200"><input type="radio" name="accounting_mode" value="CREANCES-DETTES"'.($accounting_mode == 'CREANCES-DETTES' ? ' checked' : '').'> '.$langs->trans('OptionModeVirtual').'</td>';
-print '<td colspan="2">'.nl2br($langs->trans('OptionModeVirtualDesc'))."</td></tr>\n";
+print '<tr ' . $bc[true] . '><td width="200"><input type="radio" name="accounting_mode" value="CREANCES-DETTES"' . ($accounting_mode == 'CREANCES-DETTES' ? ' checked' : '') . '> ' . $langs->trans('OptionModeVirtual') . '</td>';
+print '<td colspan="2">' . nl2br($langs->trans('OptionModeVirtualDesc')) . "</td></tr>\n";
 
 print "</table>\n";
 
@@ -246,19 +240,18 @@ print '<tr class="liste_titre">';
 print '<td colspan="3">' . $langs->trans('OtherOptions') . '</td>';
 print "</tr>\n";
 
-foreach ($list as $key)
-{
-	$var=!$var;
-
-	print '<tr '.$bc[$var].' class="value">';
-
+foreach ( $list as $key ) {
+	$var = ! $var;
+	
+	print '<tr ' . $bc[$var] . ' class="value">';
+	
 	// Param
-	$label = $langs->trans($key); 
-	print '<td><label for="'.$key.'">'.$label.'</label></td>';
-
+	$label = $langs->trans($key);
+	print '<td><label for="' . $key . '">' . $label . '</label></td>';
+	
 	// Value
 	print '<td>';
-	print '<input type="text" size="20" id="'.$key.'" name="'.$key.'" value="'.$conf->global->$key.'">';
+	print '<input type="text" size="20" id="' . $key . '" name="' . $key . '" value="' . $conf->global->$key . '">';
 	print '</td></tr>';
 }
 
@@ -294,7 +287,7 @@ print "</table>\n";
 
 dol_fiche_end();
 
-print '<div class="center"><input type="submit" class="button" value="'.$langs->trans('Modify').'" name="button"></div>';
+print '<div class="center"><input type="submit" class="button" value="' . $langs->trans('Modify') . '" name="button"></div>';
 
 print '</form>';
 

htdocs/accountancy/admin/journal.php

@@ -22,24 +22,23 @@
  */
 
 /**
- * \file		htdocs/accountancy/admin/journal.php
- * \ingroup		Accounting Expert
- * \brief		Setup page to configure accounting expert module
+ * \file htdocs/accountancy/admin/journal.php
+ * \ingroup Accounting Expert
+ * \brief Setup page to configure accounting expert module
  */
-
 require '../../main.inc.php';
-	
+
 // Class
-require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+require_once DOL_DOCUMENT_ROOT . '/core/lib/admin.lib.php';
+require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
+require_once DOL_DOCUMENT_ROOT . '/core/lib/bank.lib.php';
+require_once DOL_DOCUMENT_ROOT . '/compta/bank/class/account.class.php';
 
 $langs->load("accountancy");
 
 // Security check
-if (!$user->admin)
-    accessforbidden();
+if (! $user->admin)
+	accessforbidden();
 
 $action = GETPOST('action', 'alpha');
 
@@ -49,7 +48,7 @@ $list = array (
 		'ACCOUNTING_PURCHASE_JOURNAL',
 		'ACCOUNTING_SOCIAL_JOURNAL',
 		'ACCOUNTING_MISCELLANEOUS_JOURNAL',
-		'ACCOUNTING_EXPENSEREPORT_JOURNAL'
+		'ACCOUNTING_EXPENSEREPORT_JOURNAL' 
 );
 
 /*
@@ -82,8 +81,8 @@ llxHeader();
 
 $form = new Form($db);
 
-$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print load_fiche_titre($langs->trans('ConfigAccountingExpert'),$linkback,'title_setup');
+$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(null);
 
@@ -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>';
@@ -126,39 +123,37 @@ print "</tr>\n";
 
 // Bank account
 $sql = "SELECT rowid, label, accountancy_journal";
-$sql.= " FROM ".MAIN_DB_PREFIX."bank_account";
-$sql.= " WHERE entity = ".$conf->entity;
-$sql.= " AND clos = 0";
-$sql.= " ORDER BY label";
+$sql .= " FROM " . MAIN_DB_PREFIX . "bank_account";
+$sql .= " WHERE entity = " . $conf->entity;
+$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)
-	{
-		$objp = $db->fetch_object($resql);
-		
-		$var = ! $var;
 	
-		print '<tr ' . $bc[$var] . ' class="value">';
+	if ($numr > 0)
 		
-		// Param
-		print '<td width="50%"><label for="' . $objp->rowid . '">' . $langs->trans("Journal") . ' - ' . $objp->label . '</label></td>';
-	
-		// Value
-		print '<td>';
-		print '<input type="text" size="20" id="' . $objp->rowid . '" name="' . $objp->label . '" value="' . $objp->accountancy_journal . '" disabled>';
-		print '</td></tr>';
-
-		$i++;
-	}
-}
-else dol_print_error($db);
+		while ( $i < $numr ) {
+			$objp = $db->fetch_object($resql);
+			
+			$var = ! $var;
+			
+			print '<tr ' . $bc[$var] . ' class="value">';
+			
+			// Param
+			print '<td width="50%"><label for="' . $objp->rowid . '">' . $langs->trans("Journal") . ' - ' . $objp->label . '</label></td>';
+			
+			// Value
+			print '<td>';
+			print '<input type="text" size="20" id="' . $objp->rowid . '" name="' . $objp->label . '" value="' . $objp->accountancy_journal . '" disabled>';
+			print '</td></tr>';
+			
+			$i ++;
+		}
+} else
+	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

@@ -20,9 +20,9 @@
  */
 
 /**
- * \file		htdocs/accountancy/admin/productaccount.php
- * \ingroup		Accounting Expert
- * \brief		Onglet de gestion de parametrages des ventilations
+ * \file htdocs/accountancy/admin/productaccount.php
+ * \ingroup Accounting Expert
+ * \brief Onglet de gestion de parametrages des ventilations
  */
 require '../../main.inc.php';
 
@@ -68,7 +68,7 @@ $pagenext = $page + 1;
 if (! empty($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION) && $conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION >= $conf->liste_limit) {
 	$limit = $conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION;
 } else {
-	$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
+	$limit = GETPOST('limit') ? GETPOST('limit', 'int') : $conf->liste_limit;
 }
 $offset = $limit * $page;
 
@@ -98,7 +98,7 @@ if ($action == 'update') {
 			$error ++;
 		}
 	}
-
+	
 	if (! empty($btn_changeaccount)) {
 		$msg = '<div><font color="red">' . $langs->trans("Processing") . '...</font></div>';
 		if (! empty($chk_prod)) {
@@ -110,11 +110,11 @@ if ($action == 'update') {
 			$cpt = 0;
 			foreach ( $chk_prod as $productid ) {
 				
-				$accounting_account_id=GETPOST('codeventil_'.$productid);
+				$accounting_account_id = GETPOST('codeventil_' . $productid);
 				
-				$result=$accounting->fetch($accounting_account_id,null,1);
-				if ($result<0) {
-					//setEventMessages(null, $accounting->errors, 'errors');
+				$result = $accounting->fetch($accounting_account_id, null, 1);
+				if ($result < 0) {
+					// setEventMessages(null, $accounting->errors, 'errors');
 					$msg .= '<div><font color="red">' . $langs->trans("ErrorDB") . ' : ' . $langs->trans("Product") . ' ' . $productid . ' ' . $langs->trans("NotVentilatedinAccount") . ' : id=' . $accounting_account_id . '<br/> <pre>' . $sql . '</pre></font></div>';
 				} else {
 					
@@ -141,7 +141,6 @@ if ($action == 'update') {
 			$msg .= '<div><font color="red">' . $langs->trans("AnyLineVentilate") . '</font></div>';
 		}
 		$msg .= '<div><font color="red">' . $langs->trans("EndProcessing") . '</font></div>';
-		
 	}
 }
 
@@ -240,8 +239,8 @@ if ($result) {
 	$i = 0;
 	
 	/*
- * View
- */
+	 * View
+	 */
 	print_barre_liste($langs->trans("ProductAccountingAccountSelect"), $page, $_SERVER["PHP_SELF"], "", $sortfield, $sortorder, '', $num_lines);
 	
 	print '<form action="' . $_SERVER["PHP_SELF"] . '" method="post">';
@@ -359,7 +358,7 @@ if ($result) {
 			// TODO: we shoul set a user defined value to adjust user square / wide screen size
 			// $trunclenghform = defined('ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT') ? ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT : 50;
 			print '<td align="left">';
-			print $form->select_account($compta_prodbuy_id, 'codeventil_'.$product_static->id, 1);
+			print $form->select_account($compta_prodbuy_id, 'codeventil_' . $product_static->id, 1);
 			print '</td>';
 		} else {
 			
@@ -369,7 +368,7 @@ if ($result) {
 			// TODO: we shoul set a user defined value to adjust user square / wide screen size
 			// $trunclenghform = defined('ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT') ? ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT : 50;
 			print '<td align="left">';
-			print $form->select_account($compta_prodsell_id,  'codeventil_'.$product_static->id, 1);
+			print $form->select_account($compta_prodsell_id, 'codeventil_' . $product_static->id, 1);
 			print '</td>';
 		}
 		

htdocs/accountancy/bookkeeping/balancebymonth.php

@@ -20,16 +20,15 @@
  */
 
 /**
- * \file		htdocs/accountancy/bookkeeping/balancebymonth.php
- * \ingroup		Accounting Expert
- * \brief		Balance by month
+ * \file htdocs/accountancy/bookkeeping/balancebymonth.php
+ * \ingroup Accounting Expert
+ * \brief Balance by month
  */
-
 require '../../main.inc.php';
-	
+
 // Class
-require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
+require_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php';
+require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
 
 // Langs
 $langs->load("main");

htdocs/accountancy/bookkeeping/card.php

@@ -18,15 +18,14 @@
  */
 
 /**
- * \file        htdocs/accountancy/bookkeeping/card.php
- * \ingroup     Accounting Expert
- * \brief       Page to show account
+ * \file htdocs/accountancy/bookkeeping/card.php
+ * \ingroup Accounting Expert
+ * \brief Page to show account
  */
-
 require '../../main.inc.php';
 
 // Class
-require_once DOL_DOCUMENT_ROOT.'/accountancy/class/bookkeeping.class.php';
+require_once DOL_DOCUMENT_ROOT . '/accountancy/class/bookkeeping.class.php';
 require_once DOL_DOCUMENT_ROOT . '/accountancy/class/html.formventilation.class.php';
 
 // Langs
@@ -34,8 +33,9 @@ $langs->load("accountancy");
 
 // Security check
 $id = GETPOST('id', 'int');
-if ($user->societe_id > 0)
-    accessforbidden();
+if ($user->societe_id > 0) {
+	accessforbidden();
+}
 
 $action = GETPOST('action');
 $piece_num = GETPOST("piece_num");
@@ -44,150 +44,150 @@ $mesg = '';
 
 $account_number = GETPOST('account_number');
 $code_tiers = GETPOST('code_tiers');
-if ($code_tiers==-1) {
-	$code_tiers=null;
+if ($code_tiers == - 1) {
+	$code_tiers = null;
 }
 $label_compte = GETPOST('label_compte');
 $debit = price2num(GETPOST('debit'));
 $credit = price2num(GETPOST('credit'));
 
-$save=GETPOST('save');
-if (!empty($save)) {
-	$action='add';
+$save = GETPOST('save');
+if (! empty($save)) {
+	$action = 'add';
 }
-$update=GETPOST('update');
-if (!empty($update)) {
-	$action='confirm_update';
+$update = GETPOST('update');
+if (! empty($update)) {
+	$action = 'confirm_update';
 }
 
 if ($action == "confirm_update") {
-
-    $error = 0;
-
-    if ((floatval($debit)!=0.0) && (floatval($credit)!=0.0)) {
-        setEventMessages($langs->trans('ErrorDebitCredit'), null, 'errors');
-        $error ++;
-    }
-
-    if (empty($error)) {
-        $book = new BookKeeping($db);
-
-        $result = $book->fetch($id);
-        if ($result < 0) {
-            setEventMessages($book->error, $book->errors, 'errors');
-        } else {
+	
+	$error = 0;
+	
+	if ((floatval($debit) != 0.0) && (floatval($credit) != 0.0)) {
+		setEventMessages($langs->trans('ErrorDebitCredit'), null, 'errors');
+		$error ++;
+	}
+	
+	if (empty($error)) {
+		$book = new BookKeeping($db);
+		
+		$result = $book->fetch($id);
+		if ($result < 0) {
+			setEventMessages($book->error, $book->errors, 'errors');
+		} else {
 			$book->numero_compte = $account_number;
-            $book->code_tiers = $code_tiers;
-            $book->label_compte = $label_compte;
-            $book->debit = $debit;
-            $book->credit = $credit;
-
-            if (floatval($debit)!=0.0) {
-                $book->montant = $debit;
-                $book->sens = 'D';
-            }
-            if (floatval($credit)!=0.0) {
-                $book->montant = $credit;
-                $book->sens = 'C';
-            }
-
+			$book->code_tiers = $code_tiers;
+			$book->label_compte = $label_compte;
+			$book->debit = $debit;
+			$book->credit = $credit;
+			
+			if (floatval($debit) != 0.0) {
+				$book->montant = $debit;
+				$book->sens = 'D';
+			}
+			if (floatval($credit) != 0.0) {
+				$book->montant = $credit;
+				$book->sens = 'C';
+			}
+			
 			$result = $book->update($user);
-            if ($result < 0) {
-                setEventMessages($book->error, $book->errors, 'errors');
-            } else {
-                setEventMessages($langs->trans('Saved'), null, 'mesgs');
-                $action = '';
-            }
-        }
-    }
-}
+			if ($result < 0) {
+				setEventMessages($book->error, $book->errors, 'errors');
+			} else {
+				setEventMessages($langs->trans('Saved'), null, 'mesgs');
+				$action = '';
+			}
+		}
+	}
+} 
 
 else if ($action == "add") {
-    $error = 0;
-
+	$error = 0;
+	
 	if ((floatval($debit) != 0.0) && (floatval($credit) != 0.0)) {
 		setEventMessages($langs->trans('ErrorDebitCredit'), null, 'errors');
 		$error ++;
 	}
-
-    if (empty($error)) {
-        $book = new BookKeeping($db);
-
+	
+	if (empty($error)) {
+		$book = new BookKeeping($db);
+		
 		$book->numero_compte = $account_number;
-        $book->code_tiers = $code_tiers;
-        $book->label_compte = $label_compte;
-        $book->debit = $debit;
-        $book->credit = $credit;
-        $book->doc_date = GETPOST('doc_date');
-        $book->doc_type = GETPOST('doc_type');
-        $book->piece_num = $piece_num;
-        $book->doc_ref = GETPOST('doc_ref');
-        $book->code_journal = GETPOST('code_journal');
-        $book->fk_doc = GETPOST('fk_doc');
-        $book->fk_docdet = GETPOST('fk_docdet');
-
+		$book->code_tiers = $code_tiers;
+		$book->label_compte = $label_compte;
+		$book->debit = $debit;
+		$book->credit = $credit;
+		$book->doc_date = GETPOST('doc_date');
+		$book->doc_type = GETPOST('doc_type');
+		$book->piece_num = $piece_num;
+		$book->doc_ref = GETPOST('doc_ref');
+		$book->code_journal = GETPOST('code_journal');
+		$book->fk_doc = GETPOST('fk_doc');
+		$book->fk_docdet = GETPOST('fk_docdet');
+		
 		if (floatval($debit) != 0.0) {
-            $book->montant = $debit;
-            $book->sens = 'D';
-        }
+			$book->montant = $debit;
+			$book->sens = 'D';
+		}
 		
 		if (floatval($credit) != 0.0) {
-            $book->montant = $credit;
-            $book->sens = 'C';
-        }
-
-        $result = $book->createStd($user);
-        if ($result < 0) {
-            setEventMessages($book->error, $book->errors, 'errors');
-        } else {
-            setEventMessages($langs->trans('Saved'), null, 'mesgs');
-            $action = '';
-        }
-    }
-}
+			$book->montant = $credit;
+			$book->sens = 'C';
+		}
+		
+		$result = $book->create_std($user);
+		if ($result < 0) {
+			setEventMessages($book->error, $book->errors, 'errors');
+		} else {
+			setEventMessages($langs->trans('Saved'), null, 'mesgs');
+			$action = '';
+		}
+	}
+} 
 
 else if ($action == "confirm_delete") {
-    $book = new BookKeeping($db);
-
-    $result = $book->fetch($id);
-
-    $piece_num = $book->piece_num;
-
-    if ($result < 0) {
-        setEventMessages($book->error, $book->errors, 'errors');
-    } else {
-        $result = $book->delete($user);
-        if ($result < 0) {
-            setEventMessages($book->error, $book->errors, 'errors');
-        }
-    }
-    $action = '';
-}
+	$book = new BookKeeping($db);
+	
+	$result = $book->fetch($id);
+	
+	$piece_num = $book->piece_num;
+	
+	if ($result < 0) {
+		setEventMessages($book->error, $book->errors, 'errors');
+	} else {
+		$result = $book->delete($user);
+		if ($result < 0) {
+			setEventMessages($book->error, $book->errors, 'errors');
+		}
+	}
+	$action = '';
+} 
 
 else if ($action == "confirm_create") {
-    $book = new BookKeeping($db);
-
-    $book->label_compte = '';
-    $book->debit = 0;
-    $book->credit = 0;
-    $book->doc_date = $date_start = dol_mktime(0, 0, 0, GETPOST('doc_datemonth'), GETPOST('doc_dateday'), GETPOST('doc_dateyear'));
-    $book->doc_type = GETPOST('doc_type');
-    $book->piece_num = GETPOST('next_num_mvt');
-    $book->doc_ref = GETPOST('doc_ref');
-    $book->code_journal = GETPOST('code_journal');
-    $book->fk_doc = 0;
-    $book->fk_docdet = 0;
-
-    $book->montant = 0;
-
-    $result = $book->createStd($user);
-    if ($result < 0) {
-        setEventMessages($book->error, $book->errors, 'errors');
-    } else {
-        setEventMessages($langs->trans('Saved'), null, 'mesgs');
-        $action = '';
-        $piece_num = $book->piece_num;
-    }
+	$book = new BookKeeping($db);
+	
+	$book->label_compte = '';
+	$book->debit = 0;
+	$book->credit = 0;
+	$book->doc_date = $date_start = dol_mktime(0, 0, 0, GETPOST('doc_datemonth'), GETPOST('doc_dateday'), GETPOST('doc_dateyear'));
+	$book->doc_type = GETPOST('doc_type');
+	$book->piece_num = GETPOST('next_num_mvt');
+	$book->doc_ref = GETPOST('doc_ref');
+	$book->code_journal = GETPOST('code_journal');
+	$book->fk_doc = 0;
+	$book->fk_docdet = 0;
+	
+	$book->montant = 0;
+	
+	$result = $book->create_std($user);
+	if ($result < 0) {
+		setEventMessages($book->error, $book->errors, 'errors');
+	} else {
+		setEventMessages($langs->trans('Saved'), null, 'mesgs');
+		$action = '';
+		$piece_num = $book->piece_num;
+	}
 }
 
 llxHeader();
@@ -199,115 +199,115 @@ $formventilation = new FormVentilation($db);
  *  Confirmation to delete the command
  */
 if ($action == 'delete') {
-    $formconfirm = $html->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $id, $langs->trans('DeleteMvt'), $langs->trans('ConfirmDeleteMvt'), 'confirm_delete', '', 0, 1);
-    print $formconfirm;
+	$formconfirm = $html->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $id, $langs->trans('DeleteMvt'), $langs->trans('ConfirmDeleteMvt'), 'confirm_delete', '', 0, 1);
+	print $formconfirm;
 }
 
 if ($action == 'create') {
-    print load_fiche_titre($langs->trans("CreateMvts"));
-
-    $code_journal_array = array (
-            $conf->global->ACCOUNTING_SELL_JOURNAL => $conf->global->ACCOUNTING_SELL_JOURNAL,
-            $conf->global->ACCOUNTING_PURCHASE_JOURNAL => $conf->global->ACCOUNTING_PURCHASE_JOURNAL,
-            $conf->global->ACCOUNTING_SOCIAL_JOURNAL => $conf->global->ACCOUNTING_SOCIAL_JOURNAL,
-            $conf->global->ACCOUNTING_MISCELLANEOUS_JOURNAL => $conf->global->ACCOUNTING_MISCELLANEOUS_JOURNAL,
-            $conf->global->ACCOUNTING_EXPENSEREPORT_JOURNAL => $conf->global->ACCOUNTING_EXPENSEREPORT_JOURNAL
-    );
-
-    $sql = 'SELECT DISTINCT accountancy_journal FROM '.MAIN_DB_PREFIX.'bank_account WHERE clos=0';
-    $resql=$db->query($sql);
-    if (!$resql) {
-    	setEventMessages($db->lasterror,null,'errors');
-    } else {
-    	while ($obj_bank=$db->fetch_object($resql)) {
-    		if (!empty($obj_bank->accountancy_journal)) {
-    			$code_journal_array[$obj_bank->accountancy_journal]=$obj_bank->accountancy_journal;
-    		}
-    	}
-    }
-
-    $book = new BookKeeping($db);
-    $next_num_mvt = $book->getNextNumMvt();
-
-    print '<form action="' . $_SERVER["PHP_SELF"] . '" name="create_mvt" method="POST">';
-    print '<input type="hidden" name="action" value="confirm_create">' . "\n";
-    print '<input type="hidden" name="next_num_mvt" value="' . $next_num_mvt . '">' . "\n";
-
-    dol_fiche_head();
-
-    print '<table class="border" width="100%">';
-    print '<tr>';
-    print '<td>' . $langs->trans("NumMvts") . '</td>';
-    print '<td>' . $next_num_mvt . '</td>';
-    print '</tr>';
-    print '<tr>';
-    print '<td>' . $langs->trans("Docdate") . '</td>';
-    print '<td>';
-    print $html->select_date('', 'doc_date', '', '', '', "create_mvt", 1, 1);
-    print '</td>';
-
-    print '</tr>';
-    print '<tr>';
-    print '<td>' . $langs->trans("Codejournal") . '</td>';
-
-    print '<td>' . $html->selectarray('code_journal', $code_journal_array) . '</td>';
-    print '</tr>';
-    print '<tr>';
-    print '<td>' . $langs->trans("Docref") . '</td>';
-    print '<td><input type="text" size="20" name="doc_ref" value=""/></td>';
-    print '</tr>';
-    print '<tr>';
-    print '<td>' . $langs->trans("Doctype") . '</td>';
-    print '<td><input type="text" size="20" name="doc_type" value=""/></td>';
-    print '</tr>';
-    print '</table>';
-
-    dol_fiche_end();
-
-    print '<div align="center"><input type="submit" class="button" value="' . $langs->trans("Create") . '">';
-    print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<input type="button" value="'.$langs->trans("Cancel").'" class="button" onclick="history.go(-1)" />';
-    print '</div>';
-
-    print '</form>';
+	print load_fiche_titre($langs->trans("CreateMvts"));
+	
+	$code_journal_array = array (
+			$conf->global->ACCOUNTING_SELL_JOURNAL => $conf->global->ACCOUNTING_SELL_JOURNAL,
+			$conf->global->ACCOUNTING_PURCHASE_JOURNAL => $conf->global->ACCOUNTING_PURCHASE_JOURNAL,
+			$conf->global->ACCOUNTING_SOCIAL_JOURNAL => $conf->global->ACCOUNTING_SOCIAL_JOURNAL,
+			$conf->global->ACCOUNTING_MISCELLANEOUS_JOURNAL => $conf->global->ACCOUNTING_MISCELLANEOUS_JOURNAL,
+			$conf->global->ACCOUNTING_EXPENSEREPORT_JOURNAL => $conf->global->ACCOUNTING_EXPENSEREPORT_JOURNAL 
+	);
+	
+	$sql = 'SELECT DISTINCT accountancy_journal FROM ' . MAIN_DB_PREFIX . 'bank_account WHERE clos=0';
+	$resql = $db->query($sql);
+	if (! $resql) {
+		setEventMessages($db->lasterror, null, 'errors');
+	} else {
+		while ( $obj_bank = $db->fetch_object($resql) ) {
+			if (! empty($obj_bank->accountancy_journal)) {
+				$code_journal_array[$obj_bank->accountancy_journal] = $obj_bank->accountancy_journal;
+			}
+		}
+	}
+	
+	$book = new BookKeeping($db);
+	$next_num_mvt = $book->getNextNumMvt();
+	
+	print '<form action="' . $_SERVER["PHP_SELF"] . '" name="create_mvt" method="POST">';
+	print '<input type="hidden" name="action" value="confirm_create">' . "\n";
+	print '<input type="hidden" name="next_num_mvt" value="' . $next_num_mvt . '">' . "\n";
+	
+	dol_fiche_head();
+	
+	print '<table class="border" width="100%">';
+	print '<tr>';
+	print '<td>' . $langs->trans("NumMvts") . '</td>';
+	print '<td>' . $next_num_mvt . '</td>';
+	print '</tr>';
+	print '<tr>';
+	print '<td>' . $langs->trans("Docdate") . '</td>';
+	print '<td>';
+	print $html->select_date('', 'doc_date', '', '', '', "create_mvt", 1, 1);
+	print '</td>';
+	
+	print '</tr>';
+	print '<tr>';
+	print '<td>' . $langs->trans("Codejournal") . '</td>';
+	
+	print '<td>' . $html->selectarray('code_journal', $code_journal_array) . '</td>';
+	print '</tr>';
+	print '<tr>';
+	print '<td>' . $langs->trans("Docref") . '</td>';
+	print '<td><input type="text" size="20" name="doc_ref" value=""/></td>';
+	print '</tr>';
+	print '<tr>';
+	print '<td>' . $langs->trans("Doctype") . '</td>';
+	print '<td><input type="text" size="20" name="doc_type" value=""/></td>';
+	print '</tr>';
+	print '</table>';
+	
+	dol_fiche_end();
+	
+	print '<div align="center"><input type="submit" class="button" value="' . $langs->trans("Create") . '">';
+	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<input type="button" value="' . $langs->trans("Cancel") . '" class="button" onclick="history.go(-1)" />';
+	print '</div>';
+	
+	print '</form>';
 } else {
-    $book = new BookKeeping($db);
-    $result = $book->fetchPerMvt($piece_num);
-    if ($result < 0) {
-        setEventMessages($book->error, $book->errors, 'errors');
-    }
-    if (! empty($book->piece_num)) {
-
-        print load_fiche_titre($langs->trans("UpdateMvts"));
-
-        print '<table class="border" width="100%">';
-        print '<tr class="pair">';
-        print '<td>' . $langs->trans("NumMvts") . '</td>';
-        print '<td>' . $book->piece_num . '</td>';
-        print '</tr>';
-        print '<tr class="impair">';
-        print '<td>' . $langs->trans("Docdate") . '</td>';
-        print '<td>' . dol_print_date($book->doc_date, 'daytextshort') . '</td>';
-        print '</tr>';
-        print '<tr class="pair">';
-        print '<td>' . $langs->trans("Codejournal") . '</td>';
-        print '<td>' . $book->code_journal . '</td>';
-        print '</tr>';
-        print '<tr class="impair">';
-        print '<td>' . $langs->trans("Docref") . '</td>';
-        print '<td>' . $book->doc_ref . '</td>';
-        print '</tr>';
-        print '<tr class="pair">';
-        print '<td>' . $langs->trans("Doctype") . '</td>';
-        print '<td>' . $book->doc_type . '</td>';
-        print '</tr>';
-        print '</table>';
-
-        $result = $book->fetch_all_per_mvt($piece_num);
-        if ($result < 0) {
-            setEventMessages($book->error, $book->errors, 'errors');
-        } else {
-
-            print load_fiche_titre($langs->trans("ListeMvts"));
+	$book = new BookKeeping($db);
+	$result = $book->fetch_per_mvt($piece_num);
+	if ($result < 0) {
+		setEventMessages($book->error, $book->errors, 'errors');
+	}
+	if (! empty($book->piece_num)) {
+		
+		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">';
+		print '<td>' . $langs->trans("NumMvts") . '</td>';
+		print '<td>' . $book->piece_num . '</td>';
+		print '</tr>';
+		print '<tr class="impair">';
+		print '<td>' . $langs->trans("Docdate") . '</td>';
+		print '<td>' . dol_print_date($book->doc_date, 'daytextshort') . '</td>';
+		print '</tr>';
+		print '<tr class="pair">';
+		print '<td>' . $langs->trans("Codejournal") . '</td>';
+		print '<td>' . $book->code_journal . '</td>';
+		print '</tr>';
+		print '<tr class="impair">';
+		print '<td>' . $langs->trans("Docref") . '</td>';
+		print '<td>' . $book->doc_ref . '</td>';
+		print '</tr>';
+		print '<tr class="pair">';
+		print '<td>' . $langs->trans("Doctype") . '</td>';
+		print '<td>' . $book->doc_type . '</td>';
+		print '</tr>';
+		print '</table>';
+		
+		$result = $book->fetch_all_per_mvt($piece_num);
+		if ($result < 0) {
+			setEventMessages($book->error, $book->errors, 'errors');
+		} else {
+			
+			print load_fiche_titre($langs->trans("ListeMvts"));
 			
 			print '<form action="' . $_SERVER["PHP_SELF"] . '?piece_num=' . $book->piece_num . '" method="post">';
 			print '<input type="hidden" name="doc_date" value="' . $book->doc_date . '">' . "\n";
@@ -317,101 +317,104 @@ if ($action == 'create') {
 			print '<input type="hidden" name="fk_doc" value="' . $book->fk_doc . '">' . "\n";
 			print '<input type="hidden" name="fk_docdet" value="' . $book->fk_docdet . '">' . "\n";
 			
-            print "<table class=\"noborder\" width=\"100%\">";
-            if (count($book->linesmvt) > 0) {
-
-				$total_debit=0;
-				$total_credit=0;
+			print "<table class=\"noborder\" width=\"100%\">";
+			if (count($book->linesmvt) > 0) {
 				
-                print '<tr class="liste_titre">';
-
-                print_liste_field_titre($langs->trans("Numerocompte"));
-                print_liste_field_titre($langs->trans("Code_tiers"));
-                print_liste_field_titre($langs->trans("Labelcompte"));
-                print_liste_field_titre($langs->trans("Debit"));
-                print_liste_field_titre($langs->trans("Credit"));
-                print_liste_field_titre($langs->trans("Amount"));
-                print_liste_field_titre($langs->trans("Sens"));
-                print_liste_field_titre('');
-
-                print "</tr>\n";
-
-                foreach ( $book->linesmvt as $line ) {
-                    $var = ! $var;
-                    print "<tr $bc[$var]>";
-
-					$total_debit+=$line->debit;
-					$total_credit+=$line->credit;
+				$total_debit = 0;
+				$total_credit = 0;
+				
+				print '<tr class="liste_titre">';
+				
+				print_liste_field_titre($langs->trans("Numerocompte"));
+				print_liste_field_titre($langs->trans("Code_tiers"));
+				print_liste_field_titre($langs->trans("Labelcompte"));
+				print_liste_field_titre($langs->trans("Debit"));
+				print_liste_field_titre($langs->trans("Credit"));
+				print_liste_field_titre($langs->trans("Amount"));
+				print_liste_field_titre($langs->trans("Sens"));
+				print_liste_field_titre('');
+				
+				print "</tr>\n";
+				
+				foreach ( $book->linesmvt as $line ) {
+					$var = ! $var;
+					print "<tr $bc[$var]>";
 					
-                    if ($action == 'update' && $line->id == $id) {
-
+					$total_debit += $line->debit;
+					$total_credit += $line->credit;
 					
+					if ($action == 'update' && $line->id == $id) {
+						
 						print '<td>';
-						print $formventilation->select_account($line->numero_compte, 'account_number', 0, array (), 1, 1,'');
+						print $formventilation->select_account($line->numero_compte, 'account_number', 0, array (), 1, 1, '');
 						print '</td>';
 						print '<td>';
-						print $formventilation->select_auxaccount($line->code_tiers, 'code_tiers',1);
+						print $formventilation->select_auxaccount($line->code_tiers, 'code_tiers', 1);
 						print '</td>';
-                        print '<td><input type="text" size="15" name="label_compte" value="' . $line->label_compte . '"/></td>';
-                        print '<td><input type="text" size="6" name="debit" value="' . price($line->debit) . '"/></td>';
-                        print '<td><input type="text" size="6" name="credit" value="' . price($line->credit) . '"/></td>';
-                        print '<td>' . $line->montant . '</td>';
-                        print '<td>' . $line->sens . '</td>';
-                        print '<td>';
+						print '<td><input type="text" size="15" name="label_compte" value="' . $line->label_compte . '"/></td>';
+						print '<td><input type="text" size="6" name="debit" value="' . price($line->debit) . '"/></td>';
+						print '<td><input type="text" size="6" name="credit" value="' . price($line->credit) . '"/></td>';
+						print '<td>' . $line->montant . '</td>';
+						print '<td>' . $line->sens . '</td>';
+						print '<td>';
 						print '<input type="hidden" name="id" value="' . $line->id . '">' . "\n";
 						print '<input type="submit" class="button" name="update" value="' . $langs->trans("Update") . '">';
-                        print '</td>';
-                    } else {
-                        print '<td>' . $line->numero_compte . '</td>';
-                        print '<td>' . $line->code_tiers . '</td>';
-                        print '<td>' . $line->label_compte . '</td>';
-                        print '<td>' . $line->debit . '</td>';
-                        print '<td>' . $line->credit . '</td>';
-                        print '<td>' . $line->montant . '</td>';
-                        print '<td>' . $line->sens . '</td>';
-
-                        print '<td>';
+						print '</td>';
+					} else {
+						print '<td>' . $line->numero_compte . '</td>';
+						print '<td>' . $line->code_tiers . '</td>';
+						print '<td>' . $line->label_compte . '</td>';
+						print '<td>' . $line->debit . '</td>';
+						print '<td>' . $line->credit . '</td>';
+						print '<td>' . $line->montant . '</td>';
+						print '<td>' . $line->sens . '</td>';
+						
+						print '<td>';
 						print '<a href="./card.php?action=update&amp;id=' . $line->id . '&amp;piece_num=' . $line->piece_num . '">';
-                        print img_edit();
-                        print '</a>&nbsp;';
+						print img_edit();
+						print '</a>&nbsp;';
 						print '<a href="./card.php?action=delete&amp;id=' . $line->id . '&amp;piece_num=' . $line->piece_num . '">';
-                        print img_delete();
-                        print '</a>';
-
-                        print '</td>';
-                    }
-                    print "</tr>\n";
-                }
-
-				if ($total_debit!=$total_credit) {
-					setEventMessages(null, array('MvtNotCorrectlyBalanced',$total_credit,$total_debit),'errors');
+						print img_delete();
+						print '</a>';
+						
+						print '</td>';
+					}
+					print "</tr>\n";
 				}
 				
-                if ($action == "" || $action == 'add') {
-                    $var = ! $var;
-                    print "<tr $bc[$var]>";
+				if ($total_debit != $total_credit) {
+					setEventMessages(null, array (
+							'MvtNotCorrectlyBalanced',
+							$total_credit,
+							$total_debit 
+					), 'errors');
+				}
+				
+				if ($action == "" || $action == 'add') {
+					$var = ! $var;
+					print "<tr $bc[$var]>";
 					print '<td>';
 					print $formventilation->select_account($account_number, 'account_number', 0, array (), 1, 1, '');
 					print '</td>';
 					print '<td>';
-					print $formventilation->select_auxaccount($code_tiers, 'code_tiers',1);
+					print $formventilation->select_auxaccount($code_tiers, 'code_tiers', 1);
 					print '</td>';
-                    print '<td><input type="text" size="15" name="label_compte" value="' . $label_compte . '"/></td>';
-                    print '<td><input type="text" size="6" name="debit" value="' . price($debit) . '"/></td>';
-                    print '<td><input type="text" size="6" name="credit" value="' . price($credit) . '"/></td>';
-                    print '<td></td>';
-                    print '<td></td>';
+					print '<td><input type="text" size="15" name="label_compte" value="' . $label_compte . '"/></td>';
+					print '<td><input type="text" size="6" name="debit" value="' . price($debit) . '"/></td>';
+					print '<td><input type="text" size="6" name="credit" value="' . price($credit) . '"/></td>';
+					print '<td></td>';
+					print '<td></td>';
 					print '<td><input type="submit" class="button" name="save" value="' . $langs->trans("Save") . '"></td>';
-                    print '</tr>';
-                }
-                print '</table>';
-                print '</form>';
-            }
-        }
-    } else {
-        print load_fiche_titre($langs->trans("NoRecords"));
-    }
+					print '</tr>';
+				}
+				print '</table>';
+				print '</form>';
+			}
+		}
+	} else {
+		print load_fiche_titre($langs->trans("NoRecords"));
+	}
 }
 
 llxFooter();
-$db->close();
+$db->close();

htdocs/accountancy/bookkeeping/list.php

@@ -46,10 +46,10 @@ $search_date_end = dol_mktime(0, 0, 0, GETPOST('date_endmonth', 'int'), GETPOST(
 $search_doc_date = dol_mktime(0, 0, 0, GETPOST('doc_datemonth', 'int'), GETPOST('doc_dateday', 'int'), GETPOST('doc_dateyear', 'int'));
 
 if (GETPOST("button_delmvt_x") || GETPOST("button_delmvt")) {
-	$action='delbookkeepingyear';
+	$action = 'delbookkeepingyear';
 }
 if (GETPOST("button_export_csv_x") || GETPOST("button_export_csv")) {
-	$action='export_csv';
+	$action = 'export_csv';
 }
 
 $search_accountancy_code = GETPOST("search_accountancy_code");
@@ -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);
@@ -114,9 +112,8 @@ if (empty($search_date_start)) {
 }
 if ($sortorder == "")
 	$sortorder = "ASC";
-	if ($sortfield == "")
-		$sortfield = "t.rowid";
-
+if ($sortfield == "")
+	$sortfield = "t.rowid";
 
 $options = '';
 $filter = array ();
@@ -181,7 +178,6 @@ if (! empty($search_mvt_num)) {
 	$options .= '&search_mvt_num=' . $search_mvt_num;
 }
 
-
 /*
  * Action
  */
@@ -218,18 +214,18 @@ if ($action == 'delbookkeeping') {
 		if ($result < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
-		//if (!empty($options)) {
-		//	Header("Location: list.php?".urldecode($options));
-		//} else {
-			Header("Location: list.php");
-		//}
+		// if (!empty($options)) {
+		// Header("Location: list.php?".urldecode($options));
+		// } else {
+		Header("Location: list.php");
+		// }
 		exit();
 	}
 } elseif ($action == 'export_csv') {
 	$sep = $conf->global->ACCOUNTING_EXPORT_SEPARATORCSV;
 	$journal = 'bookkepping';
 	
-	include DOL_DOCUMENT_ROOT.'/accountancy/tpl/export_journal.tpl.php';
+	include DOL_DOCUMENT_ROOT . '/accountancy/tpl/export_journal.tpl.php';
 	
 	$result = $object->fetchAll($sortorder, $sortfield, 0, 0, $filter);
 	if ($result < 0) {
@@ -237,32 +233,30 @@ 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');
 			print $date . $sep;
 			print $line->code_journal . $sep;
 			print length_accountg($line->numero_compte) . $sep;
-			print ' '. $sep;
+			print ' ' . $sep;
 			print $line->sens . $sep;
 			print price($line->montant) . $sep;
 			print dol_trunc($line->label_compte, 32) . $sep;
 			print $line->doc_ref . $sep;
 			
 			/*print $line->piece_num . $sep;
-			print length_accounta($line->code_tiers) . $sep;
-			print  . $sep;
-			print price($line->debit) . $sep;
-			print price($line->credit) . $sep;*/
+			 print length_accounta($line->code_tiers) . $sep;
+			 print  . $sep;
+			 print price($line->debit) . $sep;
+			 print price($line->credit) . $sep;*/
 			
 			print "\n";
-		}
-		elseif ($conf->global->ACCOUNTING_EXPORT_MODELCSV == 1) {
+		} elseif ($conf->global->ACCOUNTING_EXPORT_MODELCSV == 1) {
 			
-			//Std export
+			// Std export
 			$date = dol_print_date($line->doc_date, $conf->global->ACCOUNTING_EXPORT_DATE);
 			print $date . $sep;
 			print $line->doc_ref . $sep;
@@ -272,14 +266,14 @@ if ($action == 'delbookkeeping') {
 			print price($line->credit) . $sep;
 			
 			/*print $line->piece_num . $sep;
-			print $line->label_compte . $sep;
-			print price($line->montant) . $sep;
-			print $line->sens . $sep;*/
+			 print $line->label_compte . $sep;
+			 print price($line->montant) . $sep;
+			 print $line->sens . $sep;*/
 			print $line->code_journal . $sep;
 			print "\n";
-		}elseif ($conf->global->ACCOUNTING_EXPORT_MODELCSV == 3) {
+		} elseif ($conf->global->ACCOUNTING_EXPORT_MODELCSV == 3) {
 			
-			//Coala export
+			// Coala export
 			$date = dol_print_date($line->doc_date, '%d/%m/%Y');
 			print $date . $sep;
 			print $line->code_journal . $sep;
@@ -297,7 +291,7 @@ if ($action == 'delbookkeeping') {
 
 else {
 	
-	$title_page=$langs->trans("Bookkeeping") .' '. dol_print_date($search_date_start).'-'.dol_print_date($search_date_end);
+	$title_page = $langs->trans("Bookkeeping") . ' ' . dol_print_date($search_date_start) . '-' . dol_print_date($search_date_end);
 	
 	llxHeader('', $title_page);
 	
@@ -324,15 +318,21 @@ else {
 	}
 	if ($action == 'delbookkeepingyear') {
 		
-		$form_question=array();
-		$delyear=GETPOST('delyear');
+		$form_question = array ();
+		$delyear = GETPOST('delyear');
 		
 		if (empty($delyear)) {
-			$delyear=dol_print_date(dol_now(),'%Y');
+			$delyear = dol_print_date(dol_now(), '%Y');
 		}
-		$year_array=$formventilation->selectyear_accountancy_bookkepping($delyear, 'delyear',0,'array');
+		$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;
@@ -351,33 +351,32 @@ else {
 	 print '</form>';*/
 	
 	print '<form method="GET" id="searchFormList" action="' . $_SERVER["PHP_SELF"] . '">';
-	print '<div class="tabsAction">'."\n";
+	print '<div class="tabsAction">' . "\n";
 	print '<div class="inline-block divButAction"><input type="submit"  name="button_delmvt" class="butAction" value="' . $langs->trans("DelBookKeeping") . '" /></div>';
 	print '<a class="butAction" href="./card.php?action=create">' . $langs->trans("NewAccountingMvt") . '</a>';
-	//print '<a class="butAction" href="' . $_SERVER['PHP_SELF'] . '?action=export_csv">' . $langs->trans("Export") . '</a>';
+	// print '<a class="butAction" href="' . $_SERVER['PHP_SELF'] . '?action=export_csv">' . $langs->trans("Export") . '</a>';
 	print '<div class="inline-block divButAction"><input type="submit" name="button_export_csv" class="butAction" value="' . $langs->trans("Export") . '" /></div>';
 	
 	print '</div>';
 	
-	
 	/*print '<div class="liste_titre">';
-	print $langs->trans('DateStart') . ': ';
-	print $form->select_date($search_date_start, 'date_start', 0, 0, 1);
-	print $langs->trans('DateEnd') . ': ';
-	print $form->select_date($search_date_end, 'date_end', 0, 0, 1);
-	print '</div>';
-	print '<div class="liste_titre">';
-	print $langs->trans('From') . ' ' . $langs->trans('AccountAccounting') . ': ';
-	print $formventilation->select_account($search_accountancy_code_start, 'search_accountancy_code_start', 1, array (), 1, 1, '');
-	print $langs->trans('To') . ' ' . $langs->trans('AccountAccounting') . ': ';
-	print $formventilation->select_account($search_accountancy_code_end, 'search_accountancy_code_end', 1, array (), 1, 1, '');
-	print '</div>';
-	print '<div class="liste_titre">';
-	print $langs->trans('From') . ' ' . $langs->trans('ThirdPartyAccount') . ': ';
-	print $formventilation->select_auxaccount($search_accountancy_aux_code_start, 'search_accountancy_aux_code_start', 1);
-	print $langs->trans('To') . ' ' . $langs->trans('ThirdPartyAccount') . ': ';
-	print $formventilation->select_auxaccount($search_accountancy_aux_code_end, 'search_accountancy_aux_code_end', 1);
-	print '</div>';*/
+	 print $langs->trans('DateStart') . ': ';
+	 print $form->select_date($search_date_start, 'date_start', 0, 0, 1);
+	 print $langs->trans('DateEnd') . ': ';
+	 print $form->select_date($search_date_end, 'date_end', 0, 0, 1);
+	 print '</div>';
+	 print '<div class="liste_titre">';
+	 print $langs->trans('From') . ' ' . $langs->trans('AccountAccounting') . ': ';
+	 print $formventilation->select_account($search_accountancy_code_start, 'search_accountancy_code_start', 1, array (), 1, 1, '');
+	 print $langs->trans('To') . ' ' . $langs->trans('AccountAccounting') . ': ';
+	 print $formventilation->select_account($search_accountancy_code_end, 'search_accountancy_code_end', 1, array (), 1, 1, '');
+	 print '</div>';
+	 print '<div class="liste_titre">';
+	 print $langs->trans('From') . ' ' . $langs->trans('ThirdPartyAccount') . ': ';
+	 print $formventilation->select_auxaccount($search_accountancy_aux_code_start, 'search_accountancy_aux_code_start', 1);
+	 print $langs->trans('To') . ' ' . $langs->trans('ThirdPartyAccount') . ': ';
+	 print $formventilation->select_auxaccount($search_accountancy_aux_code_end, 'search_accountancy_aux_code_end', 1);
+	 print '</div>';*/
 	
 	print '<table class="noborder" width="100%">';
 	print '<tr class="liste_titre">';
@@ -389,8 +388,8 @@ else {
 	print_liste_field_titre($langs->trans("Labelcompte"), $_SERVER['PHP_SELF'], "bk_label_compte", "", $options, "", $sortfield, $sortorder);
 	print_liste_field_titre($langs->trans("Debit"), $_SERVER['PHP_SELF'], "t.debit", "", $options, 'align="right"', $sortfield, $sortorder);
 	print_liste_field_titre($langs->trans("Credit"), $_SERVER['PHP_SELF'], "t.credit", "", $options, 'align="right"', $sortfield, $sortorder);
-	//print_liste_field_titre($langs->trans("Amount"), $_SERVER['PHP_SELF'], "t.montant", "", $options, 'align="center"', $sortfield, $sortorder);
-	//print_liste_field_titre($langs->trans("Sens"), $_SERVER['PHP_SELF'], "t.sens", "", $options, 'align="center"', $sortfield, $sortorder);
+	// print_liste_field_titre($langs->trans("Amount"), $_SERVER['PHP_SELF'], "t.montant", "", $options, 'align="center"', $sortfield, $sortorder);
+	// print_liste_field_titre($langs->trans("Sens"), $_SERVER['PHP_SELF'], "t.sens", "", $options, 'align="center"', $sortfield, $sortorder);
 	print_liste_field_titre($langs->trans("Codejournal"), $_SERVER['PHP_SELF'], "t.code_journal", "", $options, 'align="right"', $sortfield, $sortorder);
 	print_liste_field_titre($langs->trans("Action"), $_SERVER["PHP_SELF"], "", $options, "", 'width="60" align="center"', $sortfield, $sortorder);
 	print "</tr>\n";
@@ -404,37 +403,37 @@ else {
 	print '<br>';
 	print $langs->trans('To') . ': ';
 	print $form->select_date($search_date_end, 'date_end', 0, 0, 1);
-	//print $form->select_date($search_doc_date, 'doc_date', 0, 0, 1);
+	// print $form->select_date($search_doc_date, 'doc_date', 0, 0, 1);
 	print '</td>';
 	print '<td><input type="text" name="search_doc_ref" size="8" value="' . $search_doc_ref . '"></td>';
 	print '<td>';
-	//print $langs->trans('From') . ' ' . $langs->trans('AccountAccounting') . ': ';
+	// print $langs->trans('From') . ' ' . $langs->trans('AccountAccounting') . ': ';
 	print $langs->trans('From');
 	print $formventilation->select_account($search_accountancy_code_start, 'search_accountancy_code_start', 1, array (), 1, 1, '');
-	//print $langs->trans('To') . ' ' . $langs->trans('AccountAccounting') . ': ';
+	// print $langs->trans('To') . ' ' . $langs->trans('AccountAccounting') . ': ';
 	print '<br>';
 	print $langs->trans('To');
 	print $formventilation->select_account($search_accountancy_code_end, 'search_accountancy_code_end', 1, array (), 1, 1, '');
 	print '</td>';
-	//print '<td><input type="text" name="search_accountancy_code" size="8" value="' . $search_accountancy_code . '"></td>';
+	// print '<td><input type="text" name="search_accountancy_code" size="8" value="' . $search_accountancy_code . '"></td>';
 	print '<td>';
-	//print $langs->trans('From') . ' ' . $langs->trans('ThirdPartyAccount') . ': ';
+	// print $langs->trans('From') . ' ' . $langs->trans('ThirdPartyAccount') . ': ';
 	print $langs->trans('From');
 	print $formventilation->select_auxaccount($search_accountancy_aux_code_start, 'search_accountancy_aux_code_start', 1);
-	//print $langs->trans('To') . ' ' . $langs->trans('ThirdPartyAccount') . ': ';
+	// print $langs->trans('To') . ' ' . $langs->trans('ThirdPartyAccount') . ': ';
 	print '<br>';
 	print $langs->trans('To');
 	print $formventilation->select_auxaccount($search_accountancy_aux_code_end, 'search_accountancy_aux_code_end', 1);
 	print '</td>';
-	//print '<td><input type="text" name="search_accountancy_aux_code" size="8" value="' . $search_accountancy_aux_code . '"></td>';
+	// print '<td><input type="text" name="search_accountancy_aux_code" size="8" value="' . $search_accountancy_aux_code . '"></td>';
 	
 	print '<td class="liste_titre">';
-	print '<input type="text" size=6 class="flat" name="search_mvt_label" value="'.$search_mvt_label.'"/>';
+	print '<input type="text" size=6 class="flat" name="search_mvt_label" value="' . $search_mvt_label . '"/>';
 	print '</td>';
 	print '<td>&nbsp;</td>';
 	print '<td>&nbsp;</td>';
-	//print '<td>&nbsp;</td>';
-	//print '<td>&nbsp;</td>';
+	// print '<td>&nbsp;</td>';
+	// print '<td>&nbsp;</td>';
 	print '<td  align="right"><input type="text" name="search_ledger_code" size="3" value="' . $search_ledger_code . '"></td>';
 	print '<td align="right" colspan="2" class="liste_titre">';
 	print '<input type="image" class="liste_titre" src="' . img_picto($langs->trans("Search"), 'search.png', '', '', 1) . '" name="button_search" value="' . dol_escape_htmltag($langs->trans("Search")) . '" title="' . dol_escape_htmltag($langs->trans("Search")) . '">';
@@ -446,14 +445,14 @@ else {
 	
 	$var = True;
 	
-	$total_debit=0;
-	$total_credit=0;
+	$total_debit = 0;
+	$total_credit = 0;
 	
 	foreach ( $object->lines as $line ) {
 		$var = ! $var;
 		
-		$total_debit+=$line->debit;
-		$total_credit+=$line->credit;
+		$total_debit += $line->debit;
+		$total_credit += $line->credit;
 		
 		print "<tr $bc[$var]>";
 		
@@ -465,12 +464,12 @@ else {
 		print '<td>' . $line->label_compte . '</td>';
 		print '<td align="right">' . price($line->debit) . '</td>';
 		print '<td align="right">' . price($line->credit) . '</td>';
-		//print '<td align="right">' . price($line->montant) . '</td>';
-		//print '<td align="center">' . $line->sens . '</td>';
+		// print '<td align="right">' . price($line->montant) . '</td>';
+		// print '<td align="center">' . $line->sens . '</td>';
 		print '<td align="right">' . $line->code_journal . '</td>';
 		print '<td align="center">';
 		print '<a href="./card.php?piece_num=' . $line->piece_num . '">' . img_edit() . '</a>';
-		print '<a href="' . $_SERVER['PHP_SELF'] . '?action=delmouv&mvt_num=' . $line->piece_num .$options.'&page='.$page.'">' . img_delete() . '</a>';
+		print '<a href="' . $_SERVER['PHP_SELF'] . '?action=delmouv&mvt_num=' . $line->piece_num . $options . '&page=' . $page . '">' . img_delete() . '</a>';
 		print '</td>';
 		print "</tr>\n";
 	}

htdocs/accountancy/bookkeeping/listbyyear.php

@@ -40,30 +40,30 @@ $sortfield = GETPOST("sortfield");
 $limit = GETPOST('limit') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $search_date_start = dol_mktime(0, 0, 0, GETPOST('date_startmonth', 'int'), GETPOST('date_startday', 'int'), GETPOST('date_startyear', 'int'));
 $search_date_end = dol_mktime(0, 0, 0, GETPOST('date_endmonth', 'int'), GETPOST('date_endday', 'int'), GETPOST('date_endyear', 'int'));
-$search_doc_type=GETPOST('search_doc_type','alpha');
-$search_doc_date=dol_mktime(0, 0, 0, GETPOST('doc_datemonth', 'int'), GETPOST('doc_dateday', 'int'), GETPOST('doc_dateyear', 'int'));
-$search_doc_ref=GETPOST('search_doc_ref','alpha');
-$search_numero_compte=GETPOST('search_numero_compte','alpha');
-$search_numero_compte_start=GETPOST('search_numero_compte_start','alpha');
-if ($search_numero_compte_start==-1) {
-	$search_numero_compte_start='';
+$search_doc_type = GETPOST('search_doc_type', 'alpha');
+$search_doc_date = dol_mktime(0, 0, 0, GETPOST('doc_datemonth', 'int'), GETPOST('doc_dateday', 'int'), GETPOST('doc_dateyear', 'int'));
+$search_doc_ref = GETPOST('search_doc_ref', 'alpha');
+$search_numero_compte = GETPOST('search_numero_compte', 'alpha');
+$search_numero_compte_start = GETPOST('search_numero_compte_start', 'alpha');
+if ($search_numero_compte_start == - 1) {
+	$search_numero_compte_start = '';
 }
-$search_numero_compte_end=GETPOST('search_numero_compte_end','alpha');
-if ($search_numero_compte_end==-1) {
-	$search_numero_compte_end='';
+$search_numero_compte_end = GETPOST('search_numero_compte_end', 'alpha');
+if ($search_numero_compte_end == - 1) {
+	$search_numero_compte_end = '';
 }
-$search_code_tiers=GETPOST('search_code_tiers','alpha');
-$search_code_tiers_start=GETPOST('search_code_tiers_start','alpha');
-if ($search_code_tiers_start==-1) {
-	$search_code_tiers_start='';
+$search_code_tiers = GETPOST('search_code_tiers', 'alpha');
+$search_code_tiers_start = GETPOST('search_code_tiers_start', 'alpha');
+if ($search_code_tiers_start == - 1) {
+	$search_code_tiers_start = '';
 }
-$search_code_tiers_end=GETPOST('search_code_tiers_end','alpha');
-if ($search_code_tiers_end==-1) {
-	$search_code_tiers_end='';
+$search_code_tiers_end = GETPOST('search_code_tiers_end', 'alpha');
+if ($search_code_tiers_end == - 1) {
+	$search_code_tiers_end = '';
 }
-$search_label_compte=GETPOST('search_label_compte','alpha');
-$search_sens=GETPOST('search_sens','alpha');
-$search_code_journal=GETPOST('search_code_journal','alpha');
+$search_label_compte = GETPOST('search_label_compte', 'alpha');
+$search_sens = GETPOST('search_sens', 'alpha');
+$search_code_journal = GETPOST('search_code_journal', 'alpha');
 
 $object = new BookKeeping($db);
 $form = new Form($db);
@@ -171,7 +171,7 @@ if ($result < 0) {
 	setEventMessages($object->error, $object->errors, 'errors');
 }
 
-print_barre_liste($langs->trans("Bookkeeping") .' '. dol_print_date($search_date_start).'-'.dol_print_date($search_date_end), $page, $_SERVER['PHP_SELF'], $options, $sortfield, $sortorder, '', $result, $nbtotalofrecords);
+print_barre_liste($langs->trans("Bookkeeping") . ' ' . dol_print_date($search_date_start) . '-' . dol_print_date($search_date_end), $page, $_SERVER['PHP_SELF'], $options, $sortfield, $sortorder, '', $result, $nbtotalofrecords);
 
 print '<form method="GET" id="searchFormList" action="' . $_SERVER["PHP_SELF"] . '">';
 print '<div class="liste_titre">';
@@ -181,16 +181,16 @@ print $langs->trans('DateEnd') . ': ';
 print $form->select_date($search_date_end, 'date_end');
 print '</div>';
 print '<div class="liste_titre">';
-print $langs->trans('From').' '.$langs->trans('AccountAccounting') . ': ';
-print $formventilation->select_account($search_numero_compte_start,'search_numero_compte_start', 1, array (), 1, 1,'');
-print $langs->trans('To').' '.$langs->trans('AccountAccounting') . ': ';
-print $formventilation->select_account($search_numero_compte_end,'search_numero_compte_end', 1, array (), 1, 1,'');
+print $langs->trans('From') . ' ' . $langs->trans('AccountAccounting') . ': ';
+print $formventilation->select_account($search_numero_compte_start, 'search_numero_compte_start', 1, array (), 1, 1, '');
+print $langs->trans('To') . ' ' . $langs->trans('AccountAccounting') . ': ';
+print $formventilation->select_account($search_numero_compte_end, 'search_numero_compte_end', 1, array (), 1, 1, '');
 print '</div>';
 print '<div class="liste_titre">';
-print $langs->trans('From').' '.$langs->trans('ThirdPartyAccount') . ': ';
-print $formventilation->select_auxaccount($search_code_tiers_start,'search_code_tiers_start', 1);
-print $langs->trans('To').' '.$langs->trans('ThirdPartyAccount') . ': ';
-print $formventilation->select_auxaccount($search_code_tiers_end,'searchcode_tiers_end', 1);
+print $langs->trans('From') . ' ' . $langs->trans('ThirdPartyAccount') . ': ';
+print $formventilation->select_auxaccount($search_code_tiers_start, 'search_code_tiers_start', 1);
+print $langs->trans('To') . ' ' . $langs->trans('ThirdPartyAccount') . ': ';
+print $formventilation->select_auxaccount($search_code_tiers_end, 'searchcode_tiers_end', 1);
 print '</div>';
 print "<table class=\"noborder\" width=\"100%\">";
 
@@ -213,31 +213,31 @@ print "</tr>\n";
 print '<tr class="liste_titre">';
 
 print '<td class="liste_titre">';
-print '<input type="text" size=4 class="flat" name="search_piece_num" value="'.$search_piece_num.'"/>';
+print '<input type="text" size=4 class="flat" name="search_piece_num" value="' . $search_piece_num . '"/>';
 print '</td>';
 
 print '<td class="liste_titre">';
-print '<input type="text" size=7 class="flat" name="search_doc_type" value="'.$search_doc_type.'"/>';
+print '<input type="text" size=7 class="flat" name="search_doc_type" value="' . $search_doc_type . '"/>';
 print '</td>';
 
 print '<td class="liste_titre">';
-print $form->select_date($search_doc_date,'doc_date',0, 0, 1);
+print $form->select_date($search_doc_date, 'doc_date', 0, 0, 1);
 print '</td>';
 
 print '<td class="liste_titre">';
-print '<input type="text" size=6 class="flat" name="search_doc_ref" value="'.$search_doc_ref.'"/>';
+print '<input type="text" size=6 class="flat" name="search_doc_ref" value="' . $search_doc_ref . '"/>';
 print '</td>';
 
 print '<td class="liste_titre">';
-print '<input type="text" size=6 class="flat" name="search_numero_compte" value="'.$search_numero_compte.'"/>';
+print '<input type="text" size=6 class="flat" name="search_numero_compte" value="' . $search_numero_compte . '"/>';
 print '</td>';
 
 print '<td class="liste_titre">';
-print '<input type="text" size=6 class="flat" name="search_code_tiers" value="'.$search_code_tiers.'"/>';
+print '<input type="text" size=6 class="flat" name="search_code_tiers" value="' . $search_code_tiers . '"/>';
 print '</td>';
 
 print '<td class="liste_titre">';
-print '<input type="text" size=6 class="flat" name="search_label_compte" value="'.$search_label_compte.'"/>';
+print '<input type="text" size=6 class="flat" name="search_label_compte" value="' . $search_label_compte . '"/>';
 print '</td>';
 
 print '<td class="liste_titre">';
@@ -250,11 +250,11 @@ print '<td class="liste_titre">';
 print '</td>';
 
 print '<td class="liste_titre">';
-print '<input type="text" size=2 class="flat" name="search_sens" value="'.$search_sens.'"/>';
+print '<input type="text" size=2 class="flat" name="search_sens" value="' . $search_sens . '"/>';
 print '</td>';
 
 print '<td class="liste_titre">';
-print '<input type="text" size=3 class="flat" name="search_code_journal" value="'.$search_code_journal.'"/>';
+print '<input type="text" size=3 class="flat" name="search_code_journal" value="' . $search_code_journal . '"/>';
 print '</td>';
 
 print '<td class="liste_titre">';

htdocs/accountancy/class/accountancysystem.class.php

@@ -18,9 +18,9 @@
  */
 
 /**
- * \file		htdocs/accountancy/class/accountancysystem.class.php
- * \ingroup		Accounting Expert
- * \brief		File of class to manage accountancy systems
+ * \file htdocs/accountancy/class/accountancysystem.class.php
+ * \ingroup Accounting Expert
+ * \brief File of class to manage accountancy systems
  */
 
 /**
@@ -37,7 +37,7 @@ class AccountancySystem
 	var $label;
 	var $account_number;
 	var $account_parent;
-
+	
 	/**
 	 * Constructor
 	 *
@@ -46,7 +46,7 @@ class AccountancySystem
 	function __construct($db) {
 		$this->db = $db;
 	}
-
+	
 	/**
 	 * Insert accountancy system name into database
 	 *
@@ -55,16 +55,16 @@ class AccountancySystem
 	 */
 	function create($user) {
 		$now = dol_now();
-
+		
 		$sql = "INSERT INTO " . MAIN_DB_PREFIX . "accounting_system";
 		$sql .= " (date_creation, fk_user_author, numero, label)";
 		$sql .= " VALUES (" . $this->db->idate($now) . "," . $user->id . ",'" . $this->numero . "','" . $this->label . "')";
-
+		
 		dol_syslog(get_class($this) . "::create sql=" . $sql, LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			$id = $this->db->last_insert_id(MAIN_DB_PREFIX . "accounting_system");
-
+			
 			if ($id > 0) {
 				$this->rowid = $id;
 				$result = $this->rowid;
@@ -78,7 +78,7 @@ class AccountancySystem
 			$this->error = "AccountancySystem::Create Erreur $result";
 			dol_syslog($this->error, LOG_ERR);
 		}
-
+		
 		return $result;
 	}
 }

htdocs/accountancy/class/accountingaccount.class.php

@@ -20,9 +20,9 @@
  */
 
 /**
- * \file		htdocs/accountancy/class/accountingaccount.class.php
- * \ingroup		Accounting Expert
- * \brief		Fichier de la classe des comptes comptable
+ * \file htdocs/accountancy/class/accountingaccount.class.php
+ * \ingroup Accounting Expert
+ * \brief Fichier de la classe des comptes comptable
  */
 
 /**
@@ -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;
@@ -47,45 +45,43 @@ class AccountingAccount extends CommonObject
 	var $fk_user_author;
 	var $fk_user_modif;
 	var $active;
-
+	
 	/**
 	 * Constructor
 	 *
-	 * @param 	DoliDB	$db		Database handle
+	 * @param DoliDB $db Database handle
 	 */
-	function __construct($db)
-	{
+	function __construct($db) {
 		$this->db = $db;
 	}
-
+	
 	/**
 	 * Load record in memory
 	 *
-	 * @param	int		$rowid					Id
-	 * @param	string	$account_number			Account number
-	 * @param	int		$limittocurentchart		1=Do not load record if it is into another accounting system
-	 * @return 	int								<0 if KO, >0 if OK
+	 * @param int $rowid Id
+	 * @param string $account_number Account number
+	 * @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) {
 			$sql = "SELECT rowid, datec, tms, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, fk_user_author, fk_user_modif, active";
-			$sql.= " FROM " . MAIN_DB_PREFIX . "accounting_account WHERE";
+			$sql .= " FROM " . MAIN_DB_PREFIX . "accounting_account WHERE";
 			if ($rowid) {
 				$sql .= " rowid = '" . $rowid . "'";
 			} elseif ($account_number) {
 				$sql .= " account_number = '" . $account_number . "'";
 			}
-			if (!empty($limittocurentchart)) {
-				$sql .=' AND fk_pcg_version IN (SELECT pcg_version FROM '.MAIN_DB_PREFIX.'accounting_system WHERE rowid='.$conf->global->CHARTOFACCOUNTS.')';
+			if (! empty($limittocurentchart)) {
+				$sql .= ' AND fk_pcg_version IN (SELECT pcg_version FROM ' . MAIN_DB_PREFIX . 'accounting_system WHERE rowid=' . $conf->global->CHARTOFACCOUNTS . ')';
 			}
 			dol_syslog(get_class($this) . "::fetch sql=" . $sql, LOG_DEBUG);
 			$result = $this->db->query($sql);
 			if ($result) {
 				$obj = $this->db->fetch_object($result);
-
+				
 				if ($obj) {
 					$this->id = $obj->rowid;
 					$this->rowid = $obj->rowid;
@@ -100,32 +96,31 @@ class AccountingAccount extends CommonObject
 					$this->fk_user_author = $obj->fk_user_author;
 					$this->fk_user_modif = $obj->fk_user_modif;
 					$this->active = $obj->active;
-
+					
 					return $this->id;
 				} else {
 					return 0;
 				}
 			} else {
-				$this->error="Error " . $this->db->lasterror();
+				$this->error = "Error " . $this->db->lasterror();
 				$this->errors[] = "Error " . $this->db->lasterror();
 			}
 		}
-		return -1;
+		return - 1;
 	}
-
+	
 	/**
 	 * Insert line in accounting_account
 	 *
-	 * @param 	User	$user 			Use making action
-	 * @param	int		$notrigger		Disable triggers
-	 * @return 	int						<0 if KO, >0 if OK
+	 * @param User $user Use making action
+	 * @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();
-
+		
 		// Clean parameters
 		if (isset($this->fk_pcg_version))
 			$this->fk_pcg_version = trim($this->fk_pcg_version);
@@ -143,13 +138,13 @@ class AccountingAccount extends CommonObject
 			$this->fk_user_author = trim($this->fk_user_author);
 		if (isset($this->active))
 			$this->active = trim($this->active);
-
-		// Check parameters
-		// Put here code to add control on parameters values
-
+			
+			// Check parameters
+			// Put here code to add control on parameters values
+			
 		// Insert request
 		$sql = "INSERT INTO " . MAIN_DB_PREFIX . "accounting_account(";
-
+		
 		$sql .= "datec";
 		$sql .= ", entity";
 		$sql .= ", fk_pcg_version";
@@ -160,9 +155,9 @@ class AccountingAccount extends CommonObject
 		$sql .= ", label";
 		$sql .= ", fk_user_author";
 		$sql .= ", active";
-
+		
 		$sql .= ") VALUES (";
-
+		
 		$sql .= " '" . $this->db->idate($now) . "'";
 		$sql .= ", " . $conf->entity;
 		$sql .= ", " . (! isset($this->fk_pcg_version) ? 'NULL' : "'" . $this->db->escape($this->fk_pcg_version) . "'");
@@ -173,34 +168,34 @@ class AccountingAccount extends CommonObject
 		$sql .= ", " . (! isset($this->label) ? 'NULL' : "'" . $this->db->escape($this->label) . "'");
 		$sql .= ", " . $user->id;
 		$sql .= ", " . (! isset($this->active) ? 'NULL' : "'" . $this->db->escape($this->active) . "'");
-
+		
 		$sql .= ")";
-
+		
 		$this->db->begin();
-
+		
 		dol_syslog(get_class($this) . "::create sql=" . $sql, LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if (! $resql) {
 			$error ++;
 			$this->errors[] = "Error " . $this->db->lasterror();
 		}
-
+		
 		if (! $error) {
 			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX . "accounting_account");
-
-//			if (! $notrigger) {
-				// Uncomment this and change MYOBJECT to your own tag if you
-				// want this action calls a trigger.
-
-				// // Call triggers
-				// include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-				// $interface=new Interfaces($this->db);
-				// $result=$interface->run_triggers('MYOBJECT_CREATE',$this,$user,$langs,$conf);
-				// if ($result < 0) { $error++; $this->errors=$interface->errors; }
-				// // End call triggers
-//			}
+			
+			// if (! $notrigger) {
+			// Uncomment this and change MYOBJECT to your own tag if you
+			// want this action calls a trigger.
+			
+			// // Call triggers
+			// include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
+			// $interface=new Interfaces($this->db);
+			// $result=$interface->run_triggers('MYOBJECT_CREATE',$this,$user,$langs,$conf);
+			// if ($result < 0) { $error++; $this->errors=$interface->errors; }
+			// // End call triggers
+			// }
 		}
-
+		
 		// Commit or rollback
 		if ($error) {
 			foreach ( $this->errors as $errmsg ) {
@@ -214,17 +209,16 @@ class AccountingAccount extends CommonObject
 			return $this->id;
 		}
 	}
-
+	
 	/**
 	 * Update record
 	 *
-	 * @param 	User 	$user 	Use making update
-	 * @return 	int 			<0 if KO, >0 if OK
+	 * @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 ";
 		$sql .= " SET fk_pcg_version = " . ($this->fk_pcg_version ? "'" . $this->db->escape($this->fk_pcg_version) . "'" : "null");
 		$sql .= " , pcg_type = " . ($this->pcg_type ? "'" . $this->db->escape($this->pcg_type) . "'" : "null");
@@ -234,9 +228,9 @@ class AccountingAccount extends CommonObject
 		$sql .= " , label = " . ($this->label ? "'" . $this->db->escape($this->label) . "'" : "null");
 		$sql .= " , fk_user_modif = " . $user->id;
 		$sql .= " , active = '" . $this->active . "'";
-
+		
 		$sql .= " WHERE rowid = " . $this->id;
-
+		
 		dol_syslog(get_class($this) . "::update sql=" . $sql, LOG_DEBUG);
 		$result = $this->db->query($sql);
 		if ($result) {
@@ -248,25 +242,24 @@ class AccountingAccount extends CommonObject
 			return - 1;
 		}
 	}
-
+	
 	/**
 	 * Check usage of accounting code
 	 *
-	 * @return 	int 			<0 if KO, >0 if OK
+	 * @return int <0 if KO, >0 if OK
 	 */
-	function checkUsage()
-	{
+	function checkUsage() {
 		global $langs;
-
+		
 		$sql = "(SELECT fk_code_ventilation FROM " . MAIN_DB_PREFIX . "facturedet";
 		$sql .= " WHERE  fk_code_ventilation=" . $this->id . ")";
 		$sql .= "UNION";
 		$sql .= "(SELECT fk_code_ventilation FROM " . MAIN_DB_PREFIX . "facture_fourn_det";
 		$sql .= " WHERE  fk_code_ventilation=" . $this->id . ")";
-
+		
 		dol_syslog(get_class($this) . "::checkUsage sql=" . $sql, LOG_DEBUG);
 		$resql = $this->db->query($sql);
-
+		
 		if ($resql) {
 			$num = $this->db->num_rows($resql);
 			if ($num > 0) {
@@ -280,42 +273,41 @@ class AccountingAccount extends CommonObject
 			return - 1;
 		}
 	}
-
+	
 	/**
 	 * Delete object in database
 	 *
-	 * @param 	User 	$user 			User that deletes
-	 * @param 	int 	$notrigger 		0=triggers after, 1=disable triggers
-	 * @return 	int 					<0 if KO, >0 if OK
+	 * @param User $user User that deletes
+	 * @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();
-
+		
 		if ($result > 0) {
-
+			
 			$this->db->begin();
-
-//			if (! $error) {
-//				if (! $notrigger) {
-					// Uncomment this and change MYOBJECT to your own tag if you
-					// want this action calls a trigger.
-
-					// // Call triggers
-					// include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-					// $interface=new Interfaces($this->db);
-					// $result=$interface->run_triggers('ACCOUNTANCY_ACCOUNT_DELETE',$this,$user,$langs,$conf);
-					// if ($result < 0) { $error++; $this->errors=$interface->errors; }
-					// // End call triggers
-//				}
-//			}
-
+			
+			// if (! $error) {
+			// if (! $notrigger) {
+			// Uncomment this and change MYOBJECT to your own tag if you
+			// want this action calls a trigger.
+			
+			// // Call triggers
+			// include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
+			// $interface=new Interfaces($this->db);
+			// $result=$interface->run_triggers('ACCOUNTANCY_ACCOUNT_DELETE',$this,$user,$langs,$conf);
+			// if ($result < 0) { $error++; $this->errors=$interface->errors; }
+			// // End call triggers
+			// }
+			// }
+			
 			if (! $error) {
 				$sql = "DELETE FROM " . MAIN_DB_PREFIX . "accounting_account";
 				$sql .= " WHERE rowid=" . $this->id;
-
+				
 				dol_syslog(get_class($this) . "::delete sql=" . $sql);
 				$resql = $this->db->query($sql);
 				if (! $resql) {
@@ -323,7 +315,7 @@ class AccountingAccount extends CommonObject
 					$this->errors[] = "Error " . $this->db->lasterror();
 				}
 			}
-
+			
 			// Commit or rollback
 			if ($error) {
 				foreach ( $this->errors as $errmsg ) {
@@ -340,47 +332,48 @@ class AccountingAccount extends CommonObject
 			return - 1;
 		}
 	}
-
+	
 	/**
-	 *	Return clicable name (with picto eventually)
+	 * Return clicable name (with picto eventually)
 	 *
-	 *	@param		int		$withpicto		0=No picto, 1=Include picto into link, 2=Only picto
-	 *	@return		string					Chaine avec URL
+	 * @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='';
-
-		$link = '<a href="'.DOL_URL_ROOT.'/accountancy/admin/card.php?id='.$this->id.'">';
-		$linkend='</a>';
-
-		$picto='billr';
-
-		$label=$langs->trans("Show").': '.$this->account_number.' - '.$this->label;
-
-		if ($withpicto) $result.=($link.img_object($label,$picto).$linkend);
-		if ($withpicto && $withpicto != 2) $result.=' ';
-		if ($withpicto != 2) $result.=$link.$this->account_number.$linkend;
+		
+		$result = '';
+		
+		$link = '<a href="' . DOL_URL_ROOT . '/accountancy/admin/card.php?id=' . $this->id . '">';
+		$linkend = '</a>';
+		
+		$picto = 'billr';
+		
+		$label = $langs->trans("Show") . ': ' . $this->account_number . ' - ' . $this->label;
+		
+		if ($withpicto)
+			$result .= ($link . img_object($label, $picto) . $linkend);
+		if ($withpicto && $withpicto != 2)
+			$result .= ' ';
+		if ($withpicto != 2)
+			$result .= $link . $this->account_number . $linkend;
 		return $result;
 	}
-
+	
 	/**
 	 * Information on record
 	 *
 	 * @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;
-
+		
 		dol_syslog(get_class($this) . '::info sql=' . $sql);
 		$result = $this->db->query($sql);
-
+		
 		if ($result) {
 			if ($this->db->num_rows($result)) {
 				$obj = $this->db->fetch_object($result);
@@ -403,27 +396,26 @@ class AccountingAccount extends CommonObject
 			dol_print_error($this->db);
 		}
 	}
-
+	
 	/**
 	 * Account desactivate
 	 *
-	 * @param	int		$id		Id
-	 * @return 	int 			<0 if KO, >0 if OK
+	 * @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) {
 			$this->db->begin();
-
+			
 			$sql = "UPDATE " . MAIN_DB_PREFIX . "accounting_account ";
 			$sql .= "SET active = '0'";
-			$sql .= " WHERE rowid = ".$this->db->escape($id);
-
+			$sql .= " WHERE rowid = " . $this->db->escape($id);
+			
 			dol_syslog(get_class($this) . "::desactivate sql=" . $sql, LOG_DEBUG);
 			$result = $this->db->query($sql);
-
+			
 			if ($result) {
 				$this->db->commit();
 				return 1;
@@ -436,21 +428,20 @@ class AccountingAccount extends CommonObject
 			return - 1;
 		}
 	}
-
+	
 	/**
 	 * Account activate
 	 *
-	 * @param 	int		$id		Id
-	 * @return 	int 			<0 if KO, >0 if OK
+	 * @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 ";
 		$sql .= "SET active = '1'";
-		$sql .= " WHERE rowid = ".$this->db->escape($id);
-
+		$sql .= " WHERE rowid = " . $this->db->escape($id);
+		
 		dol_syslog(get_class($this) . "::activate sql=" . $sql, LOG_DEBUG);
 		$result = $this->db->query($sql);
 		if ($result) {

htdocs/accountancy/class/bookkeeping.class.php

@@ -218,7 +218,7 @@ class BookKeeping extends CommonObject
 					$this->date_create = $now;
 				}
 				
-				$sql = "INSERT INTO " . MAIN_DB_PREFIX . $this->table_element." (";
+				$sql = "INSERT INTO " . MAIN_DB_PREFIX . $this->table_element . " (";
 				
 				$sql .= "doc_date";
 				$sql .= ", doc_type";
@@ -291,7 +291,6 @@ class BookKeeping extends CommonObject
 			dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
 		}
 		
-		
 		if (! $error) {
 			
 			if (! $notrigger) {
@@ -320,19 +319,18 @@ class BookKeeping extends CommonObject
 	/**
 	 * Create object into database
 	 *
-	 * @param  User $user      User that creates
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 *
+	 * @param User $user User that creates
+	 * @param bool $notrigger false=launch triggers after, true=disable triggers
+	 *       
 	 * @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;
-	
+		
 		// Clean parameters
-	
+		
 		if (isset($this->doc_type)) {
 			$this->doc_type = trim($this->doc_type);
 		}
@@ -378,86 +376,82 @@ class BookKeeping extends CommonObject
 		if (isset($this->piece_num)) {
 			$this->piece_num = trim($this->piece_num);
 		}
-	
-	
-	
+		
 		// Check parameters
 		// Put here code to add control on parameters values
-	
+		
 		// Insert request
 		$sql = 'INSERT INTO ' . MAIN_DB_PREFIX . $this->table_element . '(';
-	
-		$sql.= 'doc_date,';
-		$sql.= 'doc_type,';
-		$sql.= 'doc_ref,';
-		$sql.= 'fk_doc,';
-		$sql.= 'fk_docdet,';
-		$sql.= 'code_tiers,';
-		$sql.= 'numero_compte,';
-		$sql.= 'label_compte,';
-		$sql.= 'debit,';
-		$sql.= 'credit,';
-		$sql.= 'montant,';
-		$sql.= 'sens,';
-		$sql.= 'fk_user_author,';
-		$sql.= 'import_key,';
-		$sql.= 'code_journal,';
-		$sql.= 'piece_num';
-	
-	
+		
+		$sql .= 'doc_date,';
+		$sql .= 'doc_type,';
+		$sql .= 'doc_ref,';
+		$sql .= 'fk_doc,';
+		$sql .= 'fk_docdet,';
+		$sql .= 'code_tiers,';
+		$sql .= 'numero_compte,';
+		$sql .= 'label_compte,';
+		$sql .= 'debit,';
+		$sql .= 'credit,';
+		$sql .= 'montant,';
+		$sql .= 'sens,';
+		$sql .= 'fk_user_author,';
+		$sql .= 'import_key,';
+		$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)."'").',';
-		$sql .= ' '.(! isset($this->doc_type)?'NULL':"'".$this->db->escape($this->doc_type)."'").',';
-		$sql .= ' '.(! isset($this->doc_ref)?'NULL':"'".$this->db->escape($this->doc_ref)."'").',';
-		$sql .= ' '.(empty($this->fk_doc)?'0':$this->fk_doc).',';
-		$sql .= ' '.(empty($this->fk_docdet)?'0':$this->fk_docdet).',';
-		$sql .= ' '.(! isset($this->code_tiers)?'NULL':"'".$this->db->escape($this->code_tiers)."'").',';
-		$sql .= ' '.(! isset($this->numero_compte)?'NULL':"'".$this->db->escape($this->numero_compte)."'").',';
-		$sql .= ' '.(! isset($this->label_compte)?'NULL':"'".$this->db->escape($this->label_compte)."'").',';
-		$sql .= ' '.(! isset($this->debit)?'NULL':"'".$this->debit."'").',';
-		$sql .= ' '.(! isset($this->credit)?'NULL':"'".$this->credit."'").',';
-		$sql .= ' '.(! isset($this->montant)?'NULL':"'".$this->montant."'").',';
-		$sql .= ' '.(! isset($this->sens)?'NULL':"'".$this->db->escape($this->sens)."'").',';
-		$sql .= ' '.$user->id.',';
-		$sql .= ' '.(! isset($this->import_key)?'NULL':"'".$this->db->escape($this->import_key)."'").',';
-		$sql .= ' '.(! isset($this->code_journal)?'NULL':"'".$this->db->escape($this->code_journal)."'").',';
-		$sql .= ' '.(! isset($this->piece_num)?'NULL':$this->piece_num);
-	
-	
+		
+		$sql .= ' ' . (! isset($this->doc_date) || dol_strlen($this->doc_date) == 0 ? 'NULL' : "'" . $this->db->idate($this->doc_date) . "'") . ',';
+		$sql .= ' ' . (! isset($this->doc_type) ? 'NULL' : "'" . $this->db->escape($this->doc_type) . "'") . ',';
+		$sql .= ' ' . (! isset($this->doc_ref) ? 'NULL' : "'" . $this->db->escape($this->doc_ref) . "'") . ',';
+		$sql .= ' ' . (empty($this->fk_doc) ? '0' : $this->fk_doc) . ',';
+		$sql .= ' ' . (empty($this->fk_docdet) ? '0' : $this->fk_docdet) . ',';
+		$sql .= ' ' . (! isset($this->code_tiers) ? 'NULL' : "'" . $this->db->escape($this->code_tiers) . "'") . ',';
+		$sql .= ' ' . (! isset($this->numero_compte) ? 'NULL' : "'" . $this->db->escape($this->numero_compte) . "'") . ',';
+		$sql .= ' ' . (! isset($this->label_compte) ? 'NULL' : "'" . $this->db->escape($this->label_compte) . "'") . ',';
+		$sql .= ' ' . (! isset($this->debit) ? 'NULL' : "'" . $this->debit . "'") . ',';
+		$sql .= ' ' . (! isset($this->credit) ? 'NULL' : "'" . $this->credit . "'") . ',';
+		$sql .= ' ' . (! isset($this->montant) ? 'NULL' : "'" . $this->montant . "'") . ',';
+		$sql .= ' ' . (! isset($this->sens) ? 'NULL' : "'" . $this->db->escape($this->sens) . "'") . ',';
+		$sql .= ' ' . $user->id . ',';
+		$sql .= ' ' . (! isset($this->import_key) ? 'NULL' : "'" . $this->db->escape($this->import_key) . "'") . ',';
+		$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();
-	
+		
 		$resql = $this->db->query($sql);
-		if (!$resql) {
+		if (! $resql) {
 			$error ++;
 			$this->errors[] = 'Error ' . $this->db->lasterror();
 			dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
 		}
-	
-		if (!$error) {
+		
+		if (! $error) {
 			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX . $this->table_element);
-	
-			if (!$notrigger) {
+			
+			if (! $notrigger) {
 				// Uncomment this and change MYOBJECT to your own tag if you
 				// want this action to call a trigger.
-	
-				//// Call triggers
-				//$result=$this->call_trigger('MYOBJECT_CREATE',$user);
-				//if ($result < 0) $error++;
-				//// End call triggers
+				
+				// // Call triggers
+				// $result=$this->call_trigger('MYOBJECT_CREATE',$user);
+				// if ($result < 0) $error++;
+				// // End call triggers
 			}
 		}
-	
+		
 		// Commit or rollback
 		if ($error) {
 			$this->db->rollback();
-	
+			
 			return - 1 * $error;
 		} else {
 			$this->db->commit();
-	
+			
 			return $this->id;
 		}
 	}
@@ -581,11 +575,11 @@ class BookKeeping extends CommonObject
 		$sqlwhere = array ();
 		if (count($filter) > 0) {
 			foreach ( $filter as $key => $value ) {
-				if ($key=='t.doc_date') {
+				if ($key == 't.doc_date') {
 					$sqlwhere[] = $key . '=\'' . $this->db->idate($value) . '\'';
-				} elseif($key=='t.doc_date>=' || $key=='t.doc_date<=') {
+				} elseif ($key == 't.doc_date>=' || $key == 't.doc_date<=') {
 					$sqlwhere[] = $key . '\'' . $this->db->idate($value) . '\'';
-				}  elseif($key=='t.fk_doc' || $key=='t.fk_docdet' ||$key=='t.piece_num') {
+				} elseif ($key == 't.fk_doc' || $key == 't.fk_docdet' || $key == 't.piece_num') {
 					$sqlwhere[] = $key . '=' . $value;
 				} else {
 					$sqlwhere[] = $key . ' LIKE \'%' . $this->db->escape($value) . '%\'';
@@ -815,19 +809,19 @@ class BookKeeping extends CommonObject
 	/**
 	 * Delete bookkepping by importkey
 	 *
-	 * @param	string 	$importkey		Import key
-	 * @return	int						Result
+	 * @param string $importkey Import key
+	 * @return int Result
 	 */
 	function deleteByImportkey($importkey) {
 		$this->db->begin();
-	
+		
 		// first check if line not yet in bookkeeping
 		$sql = "DELETE";
 		$sql .= " FROM " . MAIN_DB_PREFIX . $this->table_element;
 		$sql .= " WHERE import_key = '" . $importkey . "'";
-	
+		
 		$resql = $this->db->query($sql);
-	
+		
 		if (! $resql) {
 			$this->errors[] = "Error " . $this->db->lasterror();
 			foreach ( $this->errors as $errmsg ) {
@@ -837,7 +831,7 @@ class BookKeeping extends CommonObject
 			$this->db->rollback();
 			return - 1;
 		}
-	
+		
 		$this->db->commit();
 		return 1;
 	}
@@ -845,19 +839,19 @@ class BookKeeping extends CommonObject
 	/**
 	 * Delete bookkepping by year
 	 *
-	 * @param	string 	$delyear		year to delete
-	 * @return	int						Result
+	 * @param string $delyear year to delete
+	 * @return int Result
 	 */
 	function deleteByYear($delyear) {
 		$this->db->begin();
-	
+		
 		// first check if line not yet in bookkeeping
 		$sql = "DELETE";
 		$sql .= " FROM " . MAIN_DB_PREFIX . $this->table_element;
-		$sql .= " WHERE YEAR(doc_date) = ".$delyear;
-	
+		$sql .= " WHERE YEAR(doc_date) = " . $delyear;
+		
 		$resql = $this->db->query($sql);
-	
+		
 		if (! $resql) {
 			$this->errors[] = "Error " . $this->db->lasterror();
 			foreach ( $this->errors as $errmsg ) {
@@ -867,7 +861,7 @@ class BookKeeping extends CommonObject
 			$this->db->rollback();
 			return - 1;
 		}
-	
+		
 		$this->db->commit();
 		return 1;
 	}
@@ -875,19 +869,19 @@ class BookKeeping extends CommonObject
 	/**
 	 * Delete bookkepping by piece number
 	 *
-	 * @param	int 	$piecenum		peicenum to delete
-	 * @return	int						Result
+	 * @param int $piecenum peicenum to delete
+	 * @return int Result
 	 */
 	function deleteMvtNum($piecenum) {
 		$this->db->begin();
-	
+		
 		// first check if line not yet in bookkeeping
 		$sql = "DELETE";
 		$sql .= " FROM " . MAIN_DB_PREFIX . $this->table_element;
-		$sql .= " WHERE piece_num = ".$piecenum;
-	
+		$sql .= " WHERE piece_num = " . $piecenum;
+		
 		$resql = $this->db->query($sql);
-	
+		
 		if (! $resql) {
 			$this->errors[] = "Error " . $this->db->lasterror();
 			foreach ( $this->errors as $errmsg ) {
@@ -897,7 +891,7 @@ class BookKeeping extends CommonObject
 			$this->db->rollback();
 			return - 1;
 		}
-	
+		
 		$this->db->commit();
 		return 1;
 	}
@@ -997,7 +991,7 @@ class BookKeeping extends CommonObject
 			$this->doc_type = $obj->doc_type;
 		} else {
 			$this->error = "Error " . $this->db->lasterror();
-			dol_syslog(get_class($this) . "::".__METHOD__ . $this->error, LOG_ERR);
+			dol_syslog(get_class($this) . "::" . __METHOD__ . $this->error, LOG_ERR);
 			return - 1;
 		}
 		
@@ -1079,30 +1073,29 @@ class BookKeeping extends CommonObject
 	/**
 	 * Export bookkeping
 	 *
-	 * @param	string	$model		Model
-	 * @return	int					Result
+	 * @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,";
 		$sql .= " montant, sens, fk_user_author, import_key, code_journal, piece_num";
 		$sql .= " FROM " . MAIN_DB_PREFIX . $this->table_element;
-	
+		
 		dol_syslog(get_class($this) . "::export_bookkeping", LOG_DEBUG);
-	
+		
 		$resql = $this->db->query($sql);
-	
+		
 		if ($resql) {
 			$this->linesexport = array ();
-	
+			
 			$num = $this->db->num_rows($resql);
 			while ( $obj = $this->db->fetch_object($resql) ) {
 				$line = new BookKeepingLine();
-	
+				
 				$line->id = $obj->rowid;
-	
+				
 				$line->doc_date = $this->db->jdate($obj->doc_date);
 				$line->doc_type = $obj->doc_type;
 				$line->doc_ref = $obj->doc_ref;
@@ -1117,15 +1110,13 @@ class BookKeeping extends CommonObject
 				$line->sens = $obj->sens;
 				$line->code_journal = $obj->code_journal;
 				$line->piece_num = $obj->piece_num;
-	
+				
 				$this->linesexport[] = $line;
 			}
 			$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

@@ -19,57 +19,57 @@
  */
 
 /**
- *	\file		htdocs/accountancy/class/html.formventilation.class.php
- *	\ingroup	Accounting Expert
- *	\brief		File of class with all html predefined components
+ * \file htdocs/accountancy/class/html.formventilation.class.php
+ * \ingroup Accounting Expert
+ * \brief File of class with all html predefined components
  */
 
 /**
- *	Class to manage generation of HTML components for bank module
+ * Class to manage generation of HTML components for bank module
  */
 class FormVentilation extends Form
 {
 	var $db;
 	var $error;
-
+	
 	/**
-     * Constructor
-     *
-     * @param		DoliDB		$db      Database handler
-     */
+	 * Constructor
+	 *
+	 * @param DoliDB $db Database handler
+	 */
 	public function __construct($db) {
-        $this->db = $db;
-    }
-
+		$this->db = $db;
+	}
+	
 	/**
-	 *	Return select filter with date of transaction
+	 * Return select filter with date of transaction
 	 *
-	 *	@param	string	$htmlname		Name of select field
-	 *	@param	string	$selectedkey	Value
-	 *	@return	string					HTML edit field
+	 * @param string $htmlname Name of select field
+	 * @param string $selectedkey Value
+	 * @return string HTML edit field
 	 */
 	function select_bookkeeping_importkey($htmlname = 'importkey', $selectedkey = '') {
-		$sql  = 'SELECT DISTINCT import_key from ' . MAIN_DB_PREFIX . 'accounting_bookkeeping';
+		$sql = 'SELECT DISTINCT import_key from ' . MAIN_DB_PREFIX . 'accounting_bookkeeping';
 		$sql .= ' ORDER BY import_key DESC';
-
+		
 		$out = '<SELECT name="' . $htmlname . '">';
-
+		
 		dol_syslog(get_class($this) . "::select_bookkeeping_importkey sql=" . $sql, LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			$i = 0;
 			$num = $this->db->num_rows($resql);
-
+			
 			while ( $i < $num ) {
 				$obj = $this->db->fetch_object($resql);
-
+				
 				$selected = '';
 				if ($selectedkey == $obj->import_key) {
 					$selected = ' selected ';
 				}
-
-				$out .= '<OPTION value="' . $obj->import_key . '"' . $selected . '>' . dol_print_date($obj->import_key,'dayhourtext') . '</OPTION>';
-
+				
+				$out .= '<OPTION value="' . $obj->import_key . '"' . $selected . '>' . dol_print_date($obj->import_key, 'dayhourtext') . '</OPTION>';
+				
 				$i ++;
 			}
 		} else {
@@ -77,48 +77,48 @@ class FormVentilation extends Form
 			dol_syslog(get_class($this) . "::select_bookkeeping_importkey " . $this->error, LOG_ERR);
 			return - 1;
 		}
-
+		
 		$out .= '</SELECT>';
-
+		
 		return $out;
 	}
-
+	
 	/**
-	 *	Return list of accounts with label by chart of accounts
+	 * Return list of accounts with label by chart of accounts
 	 *
-	 *	@param	string	$selectid		Preselected chart of accounts
-	 *	@param	string	$htmlname		Name of field in html form
-	 *	@param	int		$showempty		Add an empty field
-	 *  @param	array	$event			Event options
-     *	@param	int		$select_in		$selectid value is a aa.rowid (0 default) or aa.account_number (1)
-     *	@param	int		$select_out		set value returned by select 0=rowid (default), 1=account_number
+	 * @param string $selectid Preselected chart of accounts
+	 * @param string $htmlname Name of field in html form
+	 * @param int $showempty Add an empty field
+	 * @param array $event Event options
+	 * @param int $select_in $selectid value is a aa.rowid (0 default) or aa.account_number (1)
+	 * @param int $select_out set value returned by select 0=rowid (default), 1=account_number
 	 * @param int $aabase set accountingaccount base class to display empty=all or from 1 to 8 will display only account beginning by
-     *
-	 *	@return	string					String with HTML select
+	 *       
+	 * @return string String with HTML select
 	 */
 	function select_account($selectid, $htmlname = 'account', $showempty = 0, $event = array(), $select_in = 0, $select_out = 0, $aabase = '') {
 		global $conf;
-
+		
 		$out = '';
-
+		
 		$sql = "SELECT DISTINCT aa.account_number, aa.label, aa.rowid, aa.fk_pcg_version";
 		$sql .= " FROM " . MAIN_DB_PREFIX . "accounting_account as aa";
 		$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "accounting_system as asy ON aa.fk_pcg_version = asy.pcg_version";
 		$sql .= " AND asy.rowid = " . $conf->global->CHARTOFACCOUNTS;
 		$sql .= " AND aa.active = 1";
 		$sql .= " ORDER BY aa.account_number";
-
+		
 		dol_syslog(get_class($this) . "::select_account sql=" . $sql, LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql) {
-
+			
 			$out .= ajax_combobox($htmlname, $event);
 			$out .= '<select id="' . $htmlname . '" class="flat" name="' . $htmlname . '">';
 			if ($showempty)
 				$out .= '<option value="-1"></option>';
 			$num = $this->db->num_rows($resql);
-            $trunclength = defined('ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT') ? $conf->global->ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT : '50';
-
+			$trunclength = defined('ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT') ? $conf->global->ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT : '50';
+			
 			$i = 0;
 			if ($num) {
 				while ( $i < $num ) {
@@ -133,8 +133,8 @@ class FormVentilation extends Form
 						$select_value_out = $obj->rowid;
 					if ($select_out == 1)
 						$select_value_out = $obj->account_number;
-					// Remember guy's we store in database llx_facturedet the rowid of accounting_account and not the account_number
-					// Because same account_number can be share between different accounting_system and do have the same meaning
+						// Remember guy's we store in database llx_facturedet the rowid of accounting_account and not the account_number
+						// Because same account_number can be share between different accounting_system and do have the same meaning
 					if (($selectid != '') && $selectid == $select_value_in) {
 						// $out .= '<option value="' . $obj->account_number . '" selected>' . $label . '</option>';
 						$out .= '<option value="' . $select_value_out . '" selected>' . $label . '</option>';
@@ -154,34 +154,34 @@ class FormVentilation extends Form
 		$this->db->free($resql);
 		return $out;
 	}
-
+	
 	/**
-	 *	Return list of accounts with label by class of accounts
+	 * Return list of accounts with label by class of accounts
 	 *
-	 *	@param	string	$selectid		Preselected pcg_type
-	 *	@param	string	$htmlname		Name of field in html form
-	 *	@param	int		$showempty		Add an empty field
-	 *  @param	array	$event			Event options
-     *
-	 *	@return	string					String with HTML select
+	 * @param string $selectid Preselected pcg_type
+	 * @param string $htmlname Name of field in html form
+	 * @param int $showempty Add an empty field
+	 * @param array $event Event options
+	 *       
+	 * @return string String with HTML select
 	 */
 	function select_pcgtype($selectid, $htmlname = 'pcg_type', $showempty = 0, $event = array()) {
 		global $conf;
-
+		
 		$out = '';
-
+		
 		$sql = "SELECT DISTINCT pcg_type ";
 		$sql .= " FROM " . MAIN_DB_PREFIX . "accounting_account as aa";
 		$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "accounting_system as asy ON aa.fk_pcg_version = asy.pcg_version";
 		$sql .= " AND asy.rowid = " . $conf->global->CHARTOFACCOUNTS;
 		$sql .= " ORDER BY pcg_type";
-
+		
 		dol_syslog(get_class($this) . "::select_pcgtype sql=" . $sql, LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql) {
-
+			
 			$out .= ajax_combobox($htmlname, $event);
-
+			
 			$out .= '<select id="' . $htmlname . '" class="flat" name="' . $htmlname . '">';
 			if ($showempty)
 				$out .= '<option value="-1"></option>';
@@ -191,7 +191,7 @@ class FormVentilation extends Form
 				while ( $i < $num ) {
 					$obj = $this->db->fetch_object($resql);
 					$label = $obj->pcg_type;
-
+					
 					if (($selectid != '') && $selectid == $obj->pcg_type) {
 						$out .= '<option value="' . $obj->pcg_type . '" selected>' . $label . '</option>';
 					} else {
@@ -209,34 +209,34 @@ class FormVentilation extends Form
 		$this->db->free($resql);
 		return $out;
 	}
-
+	
 	/**
-	 *	Return list of accounts with label by sub_class of accounts
+	 * Return list of accounts with label by sub_class of accounts
 	 *
-	 *	@param	string	$selectid		Preselected pcg_type
-	 *	@param	string	$htmlname		Name of field in html form
-	 *	@param	int		$showempty		Add an empty field
-	 *  @param	array	$event			Event options
-     *
-	 *	@return	string					String with HTML select
+	 * @param string $selectid Preselected pcg_type
+	 * @param string $htmlname Name of field in html form
+	 * @param int $showempty Add an empty field
+	 * @param array $event Event options
+	 *       
+	 * @return string String with HTML select
 	 */
 	function select_pcgsubtype($selectid, $htmlname = 'pcg_subtype', $showempty = 0, $event = array()) {
 		global $conf;
-
+		
 		$out = '';
-
+		
 		$sql = "SELECT DISTINCT pcg_subtype ";
 		$sql .= " FROM " . MAIN_DB_PREFIX . "accounting_account as aa";
 		$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "accounting_system as asy ON aa.fk_pcg_version = asy.pcg_version";
 		$sql .= " AND asy.rowid = " . $conf->global->CHARTOFACCOUNTS;
 		$sql .= " ORDER BY pcg_subtype";
-
+		
 		dol_syslog(get_class($this) . "::select_pcgsubtype sql=" . $sql, LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql) {
-
+			
 			$out .= ajax_combobox($htmlname, $event);
-
+			
 			$out .= '<select id="' . $htmlname . '" class="flat" name="' . $htmlname . '">';
 			if ($showempty)
 				$out .= '<option value="-1"></option>';
@@ -246,7 +246,7 @@ class FormVentilation extends Form
 				while ( $i < $num ) {
 					$obj = $this->db->fetch_object($resql);
 					$label = $obj->pcg_subtype;
-
+					
 					if (($selectid != '') && $selectid == $obj->pcg_subtype) {
 						$out .= '<option value="' . $obj->pcg_subtype . '" selected>' . $label . '</option>';
 					} else {
@@ -320,8 +320,7 @@ class FormVentilation extends Form
 		}
 		$this->db->free($resql);
 		
-		
-		//Build select
+		// Build select
 		if (count($aux_account) > 0) {
 			
 			$out .= ajax_combobox($htmlname, $event);
@@ -354,7 +353,7 @@ class FormVentilation extends Form
 	function selectyear_accountancy_bookkepping($selected = '', $htmlname = 'yearid', $useempty = 0, $output_format = 'html') {
 		$out = '';
 		$out_array = array ();
-	
+		
 		if ($output_format == 'html') {
 			$out .= '<select class="flat" placeholder="aa" id="' . $htmlname . '" name="' . $htmlname . '"' . $option . ' >';
 		}
@@ -369,34 +368,34 @@ class FormVentilation extends Form
 				$out_array[''] = '';
 			}
 		}
-	
+		
 		$sql = "SELECT DISTINCT date_format(doc_date,'%Y') as dtyear";
 		$sql .= " FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping";
 		$sql .= " ORDER BY doc_date";
-		dol_syslog(get_class($this) . "::".__METHOD__, LOG_DEBUG);
+		dol_syslog(get_class($this) . "::" . __METHOD__, LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			while ( $obj = $this->db->fetch_object($resql) ) {
 				$selected_html = '';
 				if ($selected > 0 && $obj->dtyear == $selected)
 					$selected_html = ' selected';
-					if ($output_format == 'html' || $output_format == 'options') {
-						$out .= '<option value="' . $obj->dtyear . '"' . $selected_html . ' >' . $obj->dtyear . '</option>';
-					} elseif ($output_format == 'array') {
-						$out_array[$obj->dtyear] = $obj->dtyear;
-					}
+				if ($output_format == 'html' || $output_format == 'options') {
+					$out .= '<option value="' . $obj->dtyear . '"' . $selected_html . ' >' . $obj->dtyear . '</option>';
+				} elseif ($output_format == 'array') {
+					$out_array[$obj->dtyear] = $obj->dtyear;
+				}
 			}
 		} else {
 			$this->error = "Error " . $this->db->lasterror();
-			dol_syslog(get_class($this) . "::".__METHOD__ . $this->error, LOG_ERR);
+			dol_syslog(get_class($this) . "::" . __METHOD__ . $this->error, LOG_ERR);
 			return - 1;
 		}
 		$this->db->free($resql);
-	
+		
 		if ($output_format == 'html') {
 			$out .= "</select>\n";
 		}
-	
+		
 		if ($output_format == 'html' || $output_format == 'options') {
 			return $out;
 		} elseif ($output_format == 'array') {

htdocs/accountancy/customer/card.php

@@ -18,16 +18,15 @@
  */
 
 /**
- * \file		htdocs/accountancy/customer/card.php
- * \ingroup		Accountancy
- * \brief		Card customer ventilation
+ * \file htdocs/accountancy/customer/card.php
+ * \ingroup Accountancy
+ * \brief Card customer ventilation
  */
-
 require '../../main.inc.php';
 
 // Class
-require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
-require_once DOL_DOCUMENT_ROOT.'/accountancy/class/html.formventilation.class.php';
+require_once DOL_DOCUMENT_ROOT . '/compta/facture/class/facture.class.php';
+require_once DOL_DOCUMENT_ROOT . '/accountancy/class/html.formventilation.class.php';
 
 // Langs
 $langs->load("bills");
@@ -40,17 +39,16 @@ $id = GETPOST('id');
 // Security check
 if ($user->societe_id > 0)
 	accessforbidden();
-
-/*
+	
+	/*
  * 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;
-
+		
 		dol_syslog("/accounting/customer/card.php sql=" . $sql, LOG_DEBUG);
 		$resql = $db->query($sql);
 		if (! $resql) {
@@ -91,35 +89,35 @@ if (! empty($id)) {
 	if (! empty($conf->multicompany->enabled)) {
 		$sql .= " AND f.entity IN (" . getEntity("facture", 1) . ")";
 	}
-
+	
 	dol_syslog("/accounting/customer/card.php sql=" . $sql, LOG_DEBUG);
 	$result = $db->query($sql);
-
+	
 	if ($result) {
 		$num_lines = $db->num_rows($result);
 		$i = 0;
-
+		
 		if ($num_lines) {
-
+			
 			$objp = $db->fetch_object($result);
-
+			
 			print '<form action="' . $_SERVER["PHP_SELF"] . '?id=' . $id . '" method="post">' . "\n";
 			print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
 			print '<input type="hidden" name="action" value="ventil">';
-
-			print load_fiche_titre($langs->trans('CustomersVentilation'),'','title_setup');
-
-            dol_fiche_head();
-
+			
+			print load_fiche_titre($langs->trans('CustomersVentilation'), '', 'title_setup');
+			
+			dol_fiche_head();
+			
 			print '<table class="border" width="100%">';
-
+			
 			// Ref facture
 			print '<tr><td>' . $langs->trans("Invoice") . '</td>';
 			$facture_static->ref = $objp->facnumber;
 			$facture_static->id = $objp->facid;
 			print '<td>' . $facture_static->getNomUrl(1) . '</td>';
 			print '</tr>';
-
+			
 			print '<tr><td width="20%">' . $langs->trans("Line") . '</td>';
 			print '<td>' . nl2br($objp->description) . '</td></tr>';
 			print '<tr><td width="20%">' . $langs->trans("Account") . '</td><td>';
@@ -127,14 +125,14 @@ if (! empty($id)) {
 			print '</td></tr>';
 			print '</table>';
 			
-            dol_fiche_end();
-
+			dol_fiche_end();
+			
 			print '<div class="center">';
 			print '<input class="button" type="submit" value="' . $langs->trans("Save") . '">';
 			print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
 			print '<input class="button" type="submit" name="cancel" value="' . $langs->trans("Cancel") . '">';
 			print '</div>';
-
+			
 			print '</form>';
 		} else {
 			print "Error";

htdocs/accountancy/customer/index.php

@@ -21,16 +21,15 @@
  */
 
 /**
- * \file		htdocs/accountancy/customer/index.php
- * \ingroup		Accounting Expert
- * \brief		Home customer ventilation
+ * \file htdocs/accountancy/customer/index.php
+ * \ingroup Accounting Expert
+ * \brief Home customer ventilation
  */
-
 require '../../main.inc.php';
 
 // Class
-require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
+require_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php';
+require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
 
 // Langs
 $langs->load("compta");
@@ -44,8 +43,8 @@ if ($user->societe_id > 0)
 	accessforbidden();
 if (! $user->rights->accounting->ventilation->read)
 	accessforbidden();
-
-// Filter
+	
+	// Filter
 $year = $_GET["year"];
 if ($year == 0) {
 	$year_current = strftime("%Y", time());
@@ -58,10 +57,10 @@ if ($year == 0) {
 // Validate History
 $action = GETPOST('action');
 if ($action == 'validatehistory') {
-
+	
 	$error = 0;
 	$db->begin();
-
+	
 	if ($db->type == 'pgsql') {
 		$sql1 = "UPDATE " . MAIN_DB_PREFIX . "facturedet as fd";
 		$sql1 .= " SET fd.fk_code_ventilation = accnt.rowid";
@@ -78,7 +77,7 @@ if ($action == 'validatehistory') {
 	}
 	
 	dol_syslog("htdocs/accountancy/customer/index.php sql=" . $sql, LOG_DEBUG);
-
+	
 	$resql1 = $db->query($sql1);
 	if (! $resql1) {
 		$error ++;
@@ -169,11 +168,11 @@ $resql = $db->query($sql);
 if ($resql) {
 	$i = 0;
 	$num = $db->num_rows($resql);
-
+	
 	while ( $i < $num ) {
 		$row = $db->fetch_row($resql);
-		$var=!$var;
-		print '<tr '.$bc[$var].'><td>' . length_accountg($row[0]) . '</td>';
+		$var = ! $var;
+		print '<tr ' . $bc[$var] . '><td>' . length_accountg($row[0]) . '</td>';
 		print '<td align="left">' . $row[1] . '</td>';
 		print '<td align="right">' . price($row[2]) . '</td>';
 		print '<td align="right">' . price($row[3]) . '</td>';
@@ -242,10 +241,10 @@ $resql = $db->query($sql);
 if ($resql) {
 	$i = 0;
 	$num = $db->num_rows($resql);
-
+	
 	while ( $i < $num ) {
 		$row = $db->fetch_row($resql);
-
+		
 		print '<tr><td>' . $row[0] . '</td>';
 		print '<td align="right">' . price($row[1]) . '</td>';
 		print '<td align="right">' . price($row[2]) . '</td>';
@@ -286,7 +285,7 @@ if (! empty($conf->margin->enabled)) {
 	print '<td width="60" align="center">' . $langs->trans("NovemberMin") . '</td>';
 	print '<td width="60" align="center">' . $langs->trans("DecemberMin") . '</td>';
 	print '<td width="60" align="center"><b>' . $langs->trans("Total") . '</b></td></tr>';
-
+	
 	$sql = "SELECT '" . $langs->trans("Vide") . "' AS 'Marge',";
 	$sql .= "  ROUND(SUM(IF(MONTH(f.datef)=1,(fd.total_ht-(fd.qty * fd.buy_price_ht)),0)),2) AS 'Janvier',";
 	$sql .= "  ROUND(SUM(IF(MONTH(f.datef)=2,(fd.total_ht-(fd.qty * fd.buy_price_ht)),0)),2) AS 'Fevrier',";
@@ -305,7 +304,7 @@ if (! empty($conf->margin->enabled)) {
 	$sql .= "  LEFT JOIN " . MAIN_DB_PREFIX . "facture as f ON f.rowid = fd.fk_facture";
 	$sql .= " WHERE f.datef >= '" . $db->idate(dol_get_first_day($y, 1, false)) . "'";
 	$sql .= "  AND f.datef <= '" . $db->idate(dol_get_last_day($y, 12, false)) . "'";
-
+	
 	if (! empty($conf->multicompany->enabled)) {
 		$sql .= " AND f.entity IN (" . getEntity("facture", 1) . ")";
 	}
@@ -315,10 +314,10 @@ if (! empty($conf->margin->enabled)) {
 	if ($resql) {
 		$i = 0;
 		$num = $db->num_rows($resql);
-
+		
 		while ( $i < $num ) {
 			$row = $db->fetch_row($resql);
-
+			
 			print '<tr><td>' . $row[0] . '</td>';
 			print '<td align="right">' . price($row[1]) . '</td>';
 			print '<td align="right">' . price($row[2]) . '</td>';

htdocs/accountancy/customer/lines.php

@@ -21,17 +21,16 @@
  */
 
 /**
- * \file		htdocs/accountancy/customer/lines.php
- * \ingroup		Accounting Expert
- * \brief		Page of detail of the lines of ventilation of invoices customers
+ * \file htdocs/accountancy/customer/lines.php
+ * \ingroup Accounting Expert
+ * \brief Page of detail of the lines of ventilation of invoices customers
  */
-
 require '../../main.inc.php';
 
 // Class
-require_once DOL_DOCUMENT_ROOT.'/accountancy/class/html.formventilation.class.php';
-require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
-require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+require_once DOL_DOCUMENT_ROOT . '/accountancy/class/html.formventilation.class.php';
+require_once DOL_DOCUMENT_ROOT . '/compta/facture/class/facture.class.php';
+require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php';
 
 // Langs
 $langs->load("bills");
@@ -40,35 +39,36 @@ $langs->load("main");
 $langs->load("accountancy");
 
 $account_parent = GETPOST('account_parent');
-$changeaccount  = GETPOST('changeaccount');
-//Search Getpost
-$search_ref     = GETPOST('search_ref','alpha');
-$search_invoice = GETPOST('search_invoice','alpha');
-$search_label   = GETPOST('search_label','alpha');
-$search_desc    = GETPOST('search_desc','alpha');
-$search_amount  = GETPOST('search_amount','alpha');
-$search_account = GETPOST('search_account','alpha');
-$search_vat     = GETPOST('search_vat','alpha');
+$changeaccount = GETPOST('changeaccount');
+// Search Getpost
+$search_ref = GETPOST('search_ref', 'alpha');
+$search_invoice = GETPOST('search_invoice', 'alpha');
+$search_label = GETPOST('search_label', 'alpha');
+$search_desc = GETPOST('search_desc', 'alpha');
+$search_amount = GETPOST('search_amount', 'alpha');
+$search_account = GETPOST('search_account', 'alpha');
+$search_vat = GETPOST('search_vat', 'alpha');
 
-//Getpost Order and column and limit page
-$sortfield = GETPOST('sortfield','alpha');
-$sortorder = GETPOST('sortorder','alpha');
-$page = GETPOST('page','int');
-if ($page < 0) $page = 0;
+// Getpost Order and column and limit page
+$sortfield = GETPOST('sortfield', 'alpha');
+$sortorder = GETPOST('sortorder', 'alpha');
+$page = GETPOST('page', 'int');
+if ($page < 0)
+	$page = 0;
 
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 if (! empty($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION)) {
 	$limit = $conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION;
 } else if ($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION <= 0) {
-	$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
+	$limit = GETPOST('limit') ? GETPOST('limit', 'int') : $conf->liste_limit;
 } else {
-	$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
+	$limit = GETPOST('limit') ? GETPOST('limit', 'int') : $conf->liste_limit;
 }
 $offset = $limit * $page;
 
-
-if (! $sortfield) $sortfield="f.datef, f.facnumber, l.rowid";
+if (! $sortfield)
+	$sortfield = "f.datef, f.facnumber, l.rowid";
 
 if (! $sortorder) {
 	if ($conf->global->ACCOUNTING_LIST_SORT_VENTILATION_DONE > 0) {
@@ -87,13 +87,13 @@ $formventilation = new FormVentilation($db);
 // Purge search criteria
 if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both test are required to be compatible with all browsers
 {
-    $search_ref='';
-    $search_invoice='';
-    $search_label='';
-    $search_desc='';
-    $search_amount='';
-    $search_account='';
-    $search_vat='';
+	$search_ref = '';
+	$search_invoice = '';
+	$search_label = '';
+	$search_desc = '';
+	$search_amount = '';
+	$search_account = '';
+	$search_vat = '';
 }
 
 if (is_array($changeaccount) && count($changeaccount) > 0) {
@@ -126,7 +126,7 @@ if (is_array($changeaccount) && count($changeaccount) > 0) {
 
 llxHeader('', $langs->trans("CustomersVentilation") . ' - ' . $langs->trans("Dispatched"));
 
-print  '<script type="text/javascript">
+print '<script type="text/javascript">
 			$(function () {
 				$(\'#select-all\').click(function(event) {
 				    // Iterate each checkbox
@@ -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,30 +184,37 @@ 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);
-	else dol_print_error($db);
+	if ($resql)
+		$nbtotalofrecords = $db->num_rows($resql);
+	else
+		dol_print_error($db);
 }
-$sql.= $db->order($sortfield,$sortorder);
-$sql.= $db->plimit($limit + 1,$offset);
+$sql .= $db->order($sortfield, $sortorder);
+$sql .= $db->plimit($limit + 1, $offset);
 
 dol_syslog("/accountancy/customer/lines.php sql=" . $sql, LOG_DEBUG);
 $result = $db->query($sql);
 if ($result) {
 	$num_lines = $db->num_rows($result);
 	$i = 0;
-
-	$param="";
-	if ($search_facture)   $param.="&search_facture=".$search_facture;
-	if ($search_ref) $param.="&search_ref=".$search_ref;
-	if ($search_label)   $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);
+	
+	$param = "";
+	if ($search_facture)
+		$param .= "&search_facture=" . $search_facture;
+	if ($search_ref)
+		$param .= "&search_ref=" . $search_ref;
+	if ($search_label)
+		$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>';
 	
 	print '<form method="POST" action="' . $_SERVER["PHP_SELF"] . '">';
@@ -220,30 +225,30 @@ if ($result) {
 	print '<input type="submit" class="butAction" value="' . $langs->trans("Validate") . '"/></div>';
 	
 	print '<tr class="liste_titre">';
-	print_liste_field_titre($langs->trans("Invoice"), $_SERVER["PHP_SELF"],"f.facnumber","",$param,'',$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("Ref"), $_SERVER["PHP_SELF"],"p.ref","",$param,'',$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("Label"), $_SERVER["PHP_SELF"],"p.label","",$param,'',$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("Description"), $_SERVER["PHP_SELF"],"l.description","",$param,'',$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("Amount"), $_SERVER["PHP_SELF"],"l.total_ht","",$param,'align="center"',$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("VATRate"), $_SERVER["PHP_SELF"],"l.tva_tx","",$param,'align="center"',$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("Account"), $_SERVER["PHP_SELF"],"aa.account_number","",$param,'align="center"',$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("Invoice"), $_SERVER["PHP_SELF"], "f.facnumber", "", $param, '', $sortfield, $sortorder);
+	print_liste_field_titre($langs->trans("Ref"), $_SERVER["PHP_SELF"], "p.ref", "", $param, '', $sortfield, $sortorder);
+	print_liste_field_titre($langs->trans("Label"), $_SERVER["PHP_SELF"], "p.label", "", $param, '', $sortfield, $sortorder);
+	print_liste_field_titre($langs->trans("Description"), $_SERVER["PHP_SELF"], "l.description", "", $param, '', $sortfield, $sortorder);
+	print_liste_field_titre($langs->trans("Amount"), $_SERVER["PHP_SELF"], "l.total_ht", "", $param, 'align="center"', $sortfield, $sortorder);
+	print_liste_field_titre($langs->trans("VATRate"), $_SERVER["PHP_SELF"], "l.tva_tx", "", $param, 'align="center"', $sortfield, $sortorder);
+	print_liste_field_titre($langs->trans("Account"), $_SERVER["PHP_SELF"], "aa.account_number", "", $param, 'align="center"', $sortfield, $sortorder);
 	print_liste_field_titre('');
 	print_liste_field_titre('');
-	print_liste_field_titre($langs->trans("Ventilate").'<br><label id="select-all">'.$langs->trans('All').'</label>/<label id="unselect-all">'.$langs->trans('None').'</label>','','','','','align="center"');
+	print_liste_field_titre($langs->trans("Ventilate") . '<br><label id="select-all">' . $langs->trans('All') . '</label>/<label id="unselect-all">' . $langs->trans('None') . '</label>', '', '', '', '', 'align="center"');
 	print "</tr>\n";
-
+	
 	print '<tr class="liste_titre">';
 	print '<td class="liste_titre"><input type="text" class="flat" name="search_invoice" size="10" value="' . $search_invoice . '"></td>';
 	print '<td class="liste_titre"><input type="text" class="flat" size="15" name="search_ref" value="' . $search_ref . '"></td>';
 	print '<td class="liste_titre"><input type="text" class="flat" size="15" name="search_label" value="' . $search_label . '"></td>';
 	print '<td class="liste_titre"><input type="text" class="flat" size="15" name="search_desc" value="' . $search_desc . '"></td>';
-	print '<td class="liste_titre" align="center"><input type="text" class="flat" size="8" name="search_amount" value="' . $search_amount. '"></td>';
+	print '<td class="liste_titre" align="center"><input type="text" class="flat" size="8" name="search_amount" value="' . $search_amount . '"></td>';
 	print '<td class="liste_titre" align="center"><input type="text" class="flat" size="5" name="search_vat" value="' . $search_vat . '">%</td>';
 	print '<td class="liste_titre" align="center"><input type="text" class="flat" size="15" name="search_account" value="' . $search_account . '"></td>';
 	print '<td class="liste_titre" colspan="2">&nbsp;</td>';
-	print '<td class="liste_titre" align="center"><input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
-	print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
-    print "</td></tr>\n";
+	print '<td class="liste_titre" align="center"><input type="image" class="liste_titre" name="button_search" src="' . img_picto($langs->trans("Search"), 'search.png', '', '', 1) . '" value="' . dol_escape_htmltag($langs->trans("Search")) . '" title="' . dol_escape_htmltag($langs->trans("Search")) . '">';
+	print '<input type="image" class="liste_titre" name="button_removefilter" src="' . img_picto($langs->trans("Search"), 'searchclear.png', '', '', 1) . '" value="' . dol_escape_htmltag($langs->trans("RemoveFilter")) . '" title="' . dol_escape_htmltag($langs->trans("RemoveFilter")) . '">';
+	print "</td></tr>\n";
 	
 	$facture_static = new Facture($db);
 	$product_static = new Product($db);
@@ -292,10 +297,9 @@ if ($result) {
 
 print "</table></form>";
 
-	if ($num_lines > $conf->liste_limit)
-	{
-		print_barre_liste('',$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num_lines,$nbtotalofrecords,'');
-	}
+if ($num_lines > $conf->liste_limit) {
+	print_barre_liste('', $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num_lines, $nbtotalofrecords, '');
+}
 
 llxFooter();
 $db->close();

htdocs/accountancy/customer/list.php

@@ -20,9 +20,9 @@
  */
 
 /**
- * \file		htdocs/accountancy/customer/list.php
- * \ingroup		Accountancy
- * \brief		Ventilation page from customers invoices
+ * \file htdocs/accountancy/customer/list.php
+ * \ingroup Accountancy
+ * \brief Ventilation page from customers invoices
  */
 require '../../main.inc.php';
 
@@ -58,16 +58,16 @@ $btn_ventil = GETPOST('ventil', 'alpha');
 // Getpost Order and column and limit page
 $sortfield = GETPOST('sortfield', 'alpha');
 $sortorder = GETPOST('sortorder', 'alpha');
-$page = GETPOST('page','int');
+$page = GETPOST('page', 'int');
 if ($page < 0)
 	$page = 0;
 
 if (! empty($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION)) {
 	$limit = $conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION;
 } else if ($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION <= 0) {
-	$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
+	$limit = GETPOST('limit') ? GETPOST('limit', 'int') : $conf->liste_limit;
 } else {
-	$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
+	$limit = GETPOST('limit') ? GETPOST('limit', 'int') : $conf->liste_limit;
 }
 $offset = $limit * $page;
 
@@ -88,9 +88,8 @@ if (! $user->rights->accounting->ventilation->dispatch)
 
 $formventilation = new FormVentilation($db);
 $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);
-
+$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")) {
@@ -130,19 +129,19 @@ print '<script type="text/javascript">
  * Action
  */
 
-if ($action == 'ventil' && !empty($btn_ventil)) {
+if ($action == 'ventil' && ! empty($btn_ventil)) {
 	print '<div><font color="red">' . $langs->trans("Processing") . '...</font></div>';
 	if (! empty($codeventil) && ! empty($mesCasesCochees)) {
 		print '<div><font color="red">' . count($mesCasesCochees) . ' ' . $langs->trans("SelectedLines") . '</font></div>';
 		$mesCodesVentilChoisis = $codeventil;
 		$cpt = 0;
-
+		
 		foreach ( $mesCasesCochees as $maLigneCochee ) {
 			$maLigneCourante = explode("_", $maLigneCochee);
 			$monId = $maLigneCourante[0];
 			$monNumLigne = $maLigneCourante[1];
 			$monCompte = $mesCodesVentilChoisis[$monNumLigne];
-
+			
 			$sql = " UPDATE " . MAIN_DB_PREFIX . "facturedet";
 			$sql .= " SET fk_code_ventilation = " . $monCompte;
 			$sql .= " WHERE rowid = " . $monId;
@@ -169,9 +168,9 @@ if ($action == 'ventil' && !empty($btn_ventil)) {
 if (! empty($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION)) {
 	$limit = $conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION;
 } else if ($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION <= 0) {
-	$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
+	$limit = GETPOST('limit') ? GETPOST('limit', 'int') : $conf->liste_limit;
 } else {
-	$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
+	$limit = GETPOST('limit') ? GETPOST('limit', 'int') : $conf->liste_limit;
 }
 
 $offset = $limit * $page;
@@ -231,7 +230,7 @@ if ($result) {
 	print_liste_field_titre($langs->trans("Date"), $_SERVER["PHP_SELF"], "f.datef", "", $param, '', $sortfield, $sortorder);
 	print '&nbsp;&nbsp;';
 	print_liste_field_titre($langs->trans("RowId"), $_SERVER["PHP_SELF"], "l.rowid", "", $param, '', $sortfield, $sortorder);
-
+	
 	print '<form action="' . $_SERVER["PHP_SELF"] . '" method="post">' . "\n";
 	print '<input type="hidden" name="action" value="ventil">';
 	
@@ -241,7 +240,7 @@ if ($result) {
 	print_liste_field_titre($langs->trans("Ref"), $_SERVER["PHP_SELF"], "p.ref", "", $param, '', $sortfield, $sortorder);
 	print_liste_field_titre($langs->trans("Label"), $_SERVER["PHP_SELF"], "p.label", "", $param, '', $sortfield, $sortorder);
 	print_liste_field_titre($langs->trans("Description"), $_SERVER["PHP_SELF"], "l.description", "", $param, '', $sortfield, $sortorder);
-	print_liste_field_titre($langs->trans("Amount"), $_SERVER["PHP_SELF"],"l.total_ht","",$param,'align="center"',$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("Amount"), $_SERVER["PHP_SELF"], "l.total_ht", "", $param, 'align="center"', $sortfield, $sortorder);
 	print_liste_field_titre($langs->trans("VATRate"), $_SERVER["PHP_SELF"], "l.tva_tx", "", $param, 'align="center"', $sortfield, $sortorder);
 	print_liste_field_titre($langs->trans("AccountAccountingSuggest"), '', '', '', '', 'align="center"');
 	print_liste_field_titre($langs->trans("IntoAccount"), '', '', '', '', 'align="center"');
@@ -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

@@ -23,31 +23,30 @@
  */
 
 /**
- *	\file		htdocs/accountancy/journal/bankjournal.php
- *	\ingroup	Accounting Expert
- *	\brief		Page with bank journal
+ * \file htdocs/accountancy/journal/bankjournal.php
+ * \ingroup Accounting Expert
+ * \brief Page with bank journal
  */
-
 require '../../main.inc.php';
 
 // Class
-require_once DOL_DOCUMENT_ROOT.'/core/lib/report.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
-require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
-require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
-require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php';
-require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
-require_once DOL_DOCUMENT_ROOT.'/don/class/paymentdonation.class.php';
-require_once DOL_DOCUMENT_ROOT.'/compta/tva/class/tva.class.php';
-require_once DOL_DOCUMENT_ROOT.'/compta/salaries/class/paymentsalary.class.php';
-require_once DOL_DOCUMENT_ROOT.'/fourn/class/paiementfourn.class.php';
-require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
-require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php';
-require_once DOL_DOCUMENT_ROOT.'/accountancy/class/bookkeeping.class.php';
-require_once DOL_DOCUMENT_ROOT.'/societe/class/client.class.php';
+require_once DOL_DOCUMENT_ROOT . '/core/lib/report.lib.php';
+require_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php';
+require_once DOL_DOCUMENT_ROOT . '/core/lib/bank.lib.php';
+require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
+require_once DOL_DOCUMENT_ROOT . '/societe/class/societe.class.php';
+require_once DOL_DOCUMENT_ROOT . '/user/class/user.class.php';
+require_once DOL_DOCUMENT_ROOT . '/adherents/class/adherent.class.php';
+require_once DOL_DOCUMENT_ROOT . '/compta/sociales/class/chargesociales.class.php';
+require_once DOL_DOCUMENT_ROOT . '/compta/paiement/class/paiement.class.php';
+require_once DOL_DOCUMENT_ROOT . '/don/class/paymentdonation.class.php';
+require_once DOL_DOCUMENT_ROOT . '/compta/tva/class/tva.class.php';
+require_once DOL_DOCUMENT_ROOT . '/compta/salaries/class/paymentsalary.class.php';
+require_once DOL_DOCUMENT_ROOT . '/fourn/class/paiementfourn.class.php';
+require_once DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.facture.class.php';
+require_once DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.class.php';
+require_once DOL_DOCUMENT_ROOT . '/accountancy/class/bookkeeping.class.php';
+require_once DOL_DOCUMENT_ROOT . '/societe/class/client.class.php';
 
 // Langs
 $langs->load("companies");
@@ -57,7 +56,7 @@ $langs->load("bank");
 $langs->load('bills');
 $langs->load("accountancy");
 
-$id_bank_account = GETPOST('id_account','int');
+$id_bank_account = GETPOST('id_account', 'int');
 
 $date_startmonth = GETPOST('date_startmonth');
 $date_startday = GETPOST('date_startday');
@@ -72,8 +71,8 @@ $now = dol_now();
 // Security check
 if ($user->societe_id > 0 && empty($id_bank_account))
 	accessforbidden();
-
-/*
+	
+	/*
  * View
  */
 $year_current = strftime("%Y", dol_now());
@@ -102,7 +101,7 @@ $sql .= " FROM " . MAIN_DB_PREFIX . "bank as b";
 $sql .= " JOIN " . MAIN_DB_PREFIX . "bank_account as ba on b.fk_account=ba.rowid";
 $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "bank_url as bu1 ON bu1.fk_bank = b.rowid AND bu1.type='company'";
 $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe as soc on bu1.url_id=soc.rowid";
-$sql .= " WHERE ba.rowid=".$id_bank_account;
+$sql .= " WHERE ba.rowid=" . $id_bank_account;
 if (! empty($conf->multicompany->enabled)) {
 	$sql .= " AND ba.entity = " . $conf->entity;
 }
@@ -122,13 +121,13 @@ $paymentsalstatic = new PaymentSalary($db);
 
 // Get code of finance journal
 $bank_code_journal = new Account($db);
-$result=$bank_code_journal->fetch($id_bank_account);
-$journal=$bank_code_journal->accountancy_journal;
+$result = $bank_code_journal->fetch($id_bank_account);
+$journal = $bank_code_journal->accountancy_journal;
 
 dol_syslog("accountancy/journal/bankjournal.php", LOG_DEBUG);
 $result = $db->query($sql);
 if ($result) {
-
+	
 	$num = $db->num_rows($result);
 	// Variables
 	$cptfour = (! empty($conf->global->ACCOUNTING_ACCOUNT_SUPPLIER) ? $conf->global->ACCOUNTING_ACCOUNT_SUPPLIER : $langs->trans("CodeNotDef"));
@@ -141,18 +140,17 @@ if ($result) {
 	$tabbq = array ();
 	$tabtp = array ();
 	$tabtype = array ();
-
+	
 	$i = 0;
-	while ( $i < $num )
-	{
+	while ( $i < $num ) {
 		$obj = $db->fetch_object($result);
-
-		$tabcompany[$obj->rowid] = array(
+		
+		$tabcompany[$obj->rowid] = array (
 				'id' => $obj->socid,
 				'name' => $obj->name,
-				'code_client' => $obj->code_compta
+				'code_client' => $obj->code_compta 
 		);
-
+		
 		// Controls
 		$compta_bank = $obj->account_number;
 		if ($obj->label == '(SupplierInvoicePayment)')
@@ -161,8 +159,8 @@ if ($result) {
 			$compta_soc = (! empty($obj->code_compta) ? $obj->code_compta : $cptcli);
 		if ($obj->typeop == '(BankTransfert)')
 			$compta_soc = $conf->global->ACCOUNTING_ACCOUNT_TRANSFER_CASH;
-
-		// Variable bookkeeping
+			
+			// Variable bookkeeping
 		$tabpay[$obj->rowid]["date"] = $obj->do;
 		$tabpay[$obj->rowid]["type_payment"] = $obj->fk_type;
 		$tabpay[$obj->rowid]["ref"] = $obj->label;
@@ -173,111 +171,88 @@ if ($result) {
 			$tabpay[$obj->rowid]["lib"] = dol_trunc($obj->label, 60);
 		}
 		$links = $object->get_url($obj->rowid);
-
+		
 		// get_url may return -1 which is not traversable
-		if (is_array($links))
-		{
-			foreach ( $links as $key => $val )
-			{
+		if (is_array($links)) {
+			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'];
-
+					
 					$tabpay[$obj->rowid]["lib"] .= ' ' . $chargestatic->getNomUrl(2);
 					if (preg_match('/^\((.*)\)$/i', $links[$key]['label'], $reg)) {
 						if ($reg[1] == 'socialcontribution')
 							$reg[1] = 'SocialContribution';
 						$chargestatic->lib = $langs->trans($reg[1]);
-					}
-					else
-					{
+					} else {
 						$chargestatic->lib = $links[$key]['label'];
 					}
 					$chargestatic->ref = $chargestatic->lib;
 					$tabpay[$obj->rowid]["soclib"] = $chargestatic->getNomUrl(1, 30);
-
+					
 					$sqlmid = 'SELECT cchgsoc.accountancy_code';
 					$sqlmid .= " FROM " . MAIN_DB_PREFIX . "c_chargesociales cchgsoc ";
 					$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "chargesociales as chgsoc ON  chgsoc.fk_type=cchgsoc.id";
 					$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiementcharge as paycharg ON  paycharg.fk_charge=chgsoc.rowid";
 					$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "bank_url as bkurl ON  bkurl.url_id=paycharg.rowid";
 					$sqlmid .= " WHERE bkurl.fk_bank=" . $obj->rowid;
-
-
+					
 					dol_syslog("accountancy/journal/bankjournal.php:: sqlmid=" . $sqlmid, LOG_DEBUG);
 					$resultmid = $db->query($sqlmid);
-					if ($resultmid)
-					{
+					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;
 				}
 				/*else {
-					$tabtp [$obj->rowid] [$accountancy_account_salary] += $obj->amount;
-				}*/
+				 $tabtp [$obj->rowid] [$accountancy_account_salary] += $obj->amount;
+				 }*/
 			}
 		}
 		
 		$tabbq[$obj->rowid][$compta_bank] += $obj->amount;
-
+		
 		// if($obj->socid)$tabtp[$obj->rowid][$compta_soc] += $obj->amount;
-
-		$i++;
+		
+		$i ++;
 	}
 } else {
 	dol_print_error($db);
@@ -288,16 +263,13 @@ if ($result) {
  */
 
 // Write bookkeeping
-if ($action == 'writebookkeeping')
-{
-	$now=dol_now();
+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"];
@@ -313,10 +285,10 @@ if ($action == 'writebookkeeping')
 			$bookkeeping->credit = ($mt < 0 ? - $mt : 0);
 			$bookkeeping->code_journal = $journal;
 			$bookkeeping->fk_user_author = $user->id;
-			$bookkeeping->date_create=$now;
-
+			$bookkeeping->date_create = $now;
+			
 			if ($tabtype[$key] == 'payment') {
-
+				
 				$sqlmid = 'SELECT fac.facnumber';
 				$sqlmid .= " FROM " . MAIN_DB_PREFIX . "facture fac ";
 				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiement_facture as payfac ON  payfac.fk_facture=fac.rowid";
@@ -329,7 +301,7 @@ if ($action == 'writebookkeeping')
 					$bookkeeping->doc_ref = $objmid->facnumber;
 				}
 			} else if ($tabtype[$key] == 'payment_supplier') {
-
+				
 				$sqlmid = 'SELECT facf.ref_supplier,facf.ref';
 				$sqlmid .= " FROM " . MAIN_DB_PREFIX . "facture_fourn facf ";
 				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiementfourn_facturefourn as payfacf ON  payfacf.fk_facturefourn=facf.rowid";
@@ -339,10 +311,11 @@ 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 . ')';
+					;
 				}
 			}
-
+			
 			$result = $bookkeeping->create($user);
 			if ($result < 0) {
 				$error ++;
@@ -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"];
@@ -365,13 +337,13 @@ if ($action == 'writebookkeeping')
 			$bookkeeping->credit = ($mt >= 0) ? $mt : 0;
 			$bookkeeping->code_journal = $journal;
 			$bookkeeping->fk_user_author = $user->id;
-			$bookkeeping->date_create=$now;
-
+			$bookkeeping->date_create = $now;
+			
 			if ($tabtype[$key] == 'sc') {
 				$bookkeeping->code_tiers = '';
 				$bookkeeping->numero_compte = $k;
 			} else if ($tabtype[$key] == 'payment') {
-
+				
 				$sqlmid = 'SELECT fac.facnumber';
 				$sqlmid .= " FROM " . MAIN_DB_PREFIX . "facture fac ";
 				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiement_facture as payfac ON  payfac.fk_facture=fac.rowid";
@@ -386,7 +358,7 @@ if ($action == 'writebookkeeping')
 				$bookkeeping->code_tiers = $k;
 				$bookkeeping->numero_compte = $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER;
 			} else if ($tabtype[$key] == 'payment_supplier') {
-
+				
 				$sqlmid = 'SELECT facf.ref_supplier,facf.ref';
 				$sqlmid .= " FROM " . MAIN_DB_PREFIX . "facture_fourn facf ";
 				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiementfourn_facturefourn as payfacf ON  payfacf.fk_facturefourn=facf.rowid";
@@ -396,12 +368,12 @@ 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 . ')';
 				}
 				$bookkeeping->code_tiers = $k;
 				$bookkeeping->numero_compte = $conf->global->ACCOUNTING_ACCOUNT_SUPPLIER;
 			} else if ($tabtype[$key] == 'company') {
-
+				
 				$sqlmid = 'SELECT fac.facnumber';
 				$sqlmid .= " FROM " . MAIN_DB_PREFIX . "facture fac ";
 				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiement_facture as payfac ON  payfac.fk_facture=fac.rowid";
@@ -416,11 +388,11 @@ if ($action == 'writebookkeeping')
 				$bookkeeping->code_tiers = $k;
 				$bookkeeping->numero_compte = $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER;
 			} else {
-
+				
 				$bookkeeping->doc_ref = $k;
 				$bookkeeping->numero_compte = $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER;
 			}
-
+			
 			$result = $bookkeeping->create($user);
 			if ($result < 0) {
 				$error ++;
@@ -428,34 +400,32 @@ if ($action == 'writebookkeeping')
 			}
 		}
 	}
-
+	
 	if (empty($error)) {
 		setEventMessages($langs->trans("GeneralLedgerIsWritten"), null, 'mesgs');
 	}
 }
 // 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';
-
+	
+	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
-	{
+	
+	if ($conf->global->ACCOUNTING_EXPORT_MODELCSV == 2) // Model Cegid Expert Export
+{
 		$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'];
 			$companystatic->name = $tabcompany[$key]['name'];
 			$companystatic->client = $tabcompany[$key]['code_client'];
 			
 			$date = dol_print_date($db->jdate($val["date"]), '%d%m%Y');
-
+			
 			// Bank
 			foreach ( $tabbq[$key] as $k => $mt ) {
 				print $date . $sep;
@@ -468,14 +438,11 @@ if ($action == 'export_csv')
 				print $val["ref"] . $sep;
 				print "\n";
 			}
-
+			
 			// Third party
-			if (is_array ( $tabtp[$key]))
-			{
-				foreach ( $tabtp[$key] as $k => $mt )
-				{
-					if ($mt)
-					{
+			if (is_array($tabtp[$key])) {
+				foreach ( $tabtp[$key] as $k => $mt ) {
+					if ($mt) {
 						print $date . $sep;
 						print $journal . $sep;
 						if ($val["lib"] == '(SupplierInvoicePayment)') {
@@ -491,13 +458,9 @@ if ($action == 'export_csv')
 						print "\n";
 					}
 				}
-			}
-			else
-			{
-				foreach ( $tabbq[$key] as $k => $mt )
-				{
-					if (1)
-					{
+			} else {
+				foreach ( $tabbq[$key] as $k => $mt ) {
+					if (1) {
 						print $date . $sep;
 						print $journal . $sep;
 						print length_accountg($conf->global->ACCOUNTING_ACCOUNT_SUSPENSE) . $sep;
@@ -511,14 +474,14 @@ if ($action == 'export_csv')
 				}
 			}
 		}
-	} else 	// Model Classic Export
-	{
+	} else // Model Classic Export
+{
 		foreach ( $tabpay as $key => $val ) {
 			$date = dol_print_date($db->jdate($val["date"]), 'day');
-
+			
 			$companystatic->id = $tabcompany[$key]['id'];
 			$companystatic->name = $tabcompany[$key]['name'];
-
+			
 			// Bank
 			foreach ( $tabbq[$key] as $k => $mt ) {
 				print '"' . $date . '"' . $sep;
@@ -529,12 +492,10 @@ if ($action == 'export_csv')
 				print '"' . ($mt < 0 ? price(- $mt) : '') . '"';
 				print "\n";
 			}
-
+			
 			// Third party
-			if (is_array ( $tabtp[$key]))
-			{
-				foreach ( $tabtp[$key] as $k => $mt )
-				{
+			if (is_array($tabtp[$key])) {
+				foreach ( $tabtp[$key] as $k => $mt ) {
 					if ($mt) {
 						print '"' . $date . '"' . $sep;
 						print '"' . $val["type_payment"] . '"' . $sep;
@@ -545,13 +506,9 @@ if ($action == 'export_csv')
 						print "\n";
 					}
 				}
-			}
-			else
-			{
-				foreach ( $tabbq[$key] as $k => $mt )
-				{
-					if (1)
-					{
+			} else {
+				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,24 +521,23 @@ if ($action == 'export_csv')
 			}
 		}
 	}
-} 
-else 
-{
+} else {
 	$form = new Form($db);
-
+	
 	llxHeader('', $langs->trans("FinanceJournal"));
-
+	
 	$nom = $langs->trans("FinanceJournal") . ' - ' . $journal;
 	$builddate = time();
 	$description = $langs->trans("DescFinanceJournal") . '<br>';
 	$period = $form->select_date($date_start, 'date_start', 0, 0, 0, '', 1, 0, 1) . ' - ' . $form->select_date($date_end, 'date_end', 0, 0, 0, '', 1, 0, 1);
-
-	$varlink = 'id_account='.$id_bank_account;
-	report_header($nom, $nomlink, $period, $periodlink, $description, $builddate, $exportlink, array('action' => ''), '', $varlink);
-
+	
+	$varlink = 'id_account=' . $id_bank_account;
+	report_header($nom, $nomlink, $period, $periodlink, $description, $builddate, $exportlink, array (
+			'action' => '' 
+	), '', $varlink);
 	
 	print '<input type="button" class="button" style="float: right;" value="' . $langs->trans("Export") . '" onclick="launch_export();" />';
-
+	
 	print '<input type="button" class="button" value="' . $langs->trans("WriteBookKeeping") . '" onclick="writebookkeeping();" />';
 	
 	print '
@@ -597,12 +553,12 @@ else
 		    $("div.fiche div.tabBar form input[name=\"action\"]").val("");
 		}
 	</script>';
-
+	
 	/*
 	 * Show result array
 	 */
 	print '<br><br>';
-
+	
 	$i = 0;
 	print "<table class=\"noborder\" width=\"100%\">";
 	print "<tr class=\"liste_titre\">";
@@ -613,19 +569,19 @@ else
 	print "<td>" . $langs->trans("PaymentMode") . "</td>";
 	print "<td align='right'>" . $langs->trans("Debit") . "</td><td align='right'>" . $langs->trans("Credit") . "</td>";
 	print "</tr>\n";
-
+	
 	$var = true;
 	$r = '';
-
+	
 	foreach ( $tabpay as $key => $val ) {
 		$date = dol_print_date($db->jdate($val["date"]), 'day');
-
+		
 		if ($val["lib"] == '(SupplierInvoicePayment)')
 			$reflabel = $langs->trans('SupplierInvoicePayment');
 		if ($val["lib"] == '(CustomerInvoicePayment)')
 			$reflabel = $langs->trans('CustomerInvoicePayment');
-
-		// Bank
+			
+			// Bank
 		foreach ( $tabbq[$key] as $k => $mt ) {
 			print "<tr " . $bc[$var] . ">";
 			print "<td>" . $date . "</td>";
@@ -637,10 +593,9 @@ else
 			print "<td align='right'>" . ($mt < 0 ? price(- $mt) : '') . "</td>";
 			print "</tr>";
 		}
-
+		
 		// 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
-		{
-			foreach ( $tabbq[$key] as $k => $mt )
-			{
+		} else {
+			foreach ( $tabbq[$key] as $k => $mt ) {
 				print "<tr " . $bc[$var] . ">";
 				print "<td>" . $date . "</td>";
 				print "<td>" . $reflabel . "</td>";
@@ -672,9 +624,9 @@ else
 		}
 		$var = ! $var;
 	}
-
+	
 	print "</table>";
-
+	
 	llxFooter();
 }
 

htdocs/accountancy/journal/index.php

@@ -19,13 +19,12 @@
  */
 
 /**
- * \file		htdocs/accountancy/journal/index.php
- * \ingroup		Accounting Expert
- * \brief		Index
+ * \file htdocs/accountancy/journal/index.php
+ * \ingroup Accounting Expert
+ * \brief Index
  */
-
 require '../../main.inc.php';
-	
+
 // Langs
 $langs->load("compta");
 $langs->load("bills");

htdocs/accountancy/journal/purchasesjournal.php

@@ -22,21 +22,20 @@
  */
 
 /**
- * \file		htdocs/accountancy/journal/purchasesjournal.php
- * \ingroup		Accounting Expert
- * \brief		Page with purchases journal
+ * \file htdocs/accountancy/journal/purchasesjournal.php
+ * \ingroup Accounting Expert
+ * \brief Page with purchases journal
  */
-
 require '../../main.inc.php';
 
 // Class
-require_once DOL_DOCUMENT_ROOT.'/core/lib/report.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
-require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php';
-require_once DOL_DOCUMENT_ROOT.'/accountancy/class/bookkeeping.class.php';
-require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingaccount.class.php';
+require_once DOL_DOCUMENT_ROOT . '/core/lib/report.lib.php';
+require_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php';
+require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
+require_once DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.facture.class.php';
+require_once DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.class.php';
+require_once DOL_DOCUMENT_ROOT . '/accountancy/class/bookkeeping.class.php';
+require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingaccount.class.php';
 
 // Langs
 $langs->load("compta");
@@ -60,8 +59,6 @@ if ($user->societe_id > 0)
 
 $action = GETPOST('action');
 
-
-
 /*
  * Actions
  */
@@ -115,13 +112,13 @@ if ($result) {
 	// les variables
 	$cptfour = (! empty($conf->global->ACCOUNTING_ACCOUNT_SUPPLIER)) ? $conf->global->ACCOUNTING_ACCOUNT_SUPPLIER : $langs->trans("CodeNotDef");
 	$cpttva = (! empty($conf->global->ACCOUNTING_VAT_SOLD_ACCOUNT)) ? $conf->global->ACCOUNTING_VAT_SOLD_ACCOUNT : $langs->trans("CodeNotDef");
-
+	
 	$tabfac = array ();
 	$tabht = array ();
 	$tabtva = array ();
 	$tabttc = array ();
 	$tabcompany = array ();
-
+	
 	$i = 0;
 	while ( $i < $num ) {
 		$obj = $db->fetch_object($result);
@@ -135,9 +132,9 @@ if ($result) {
 				$compta_prod = (! empty($conf->global->ACCOUNTING_SERVICE_BUY_ACCOUNT)) ? $conf->global->ACCOUNTING_SERVICE_BUY_ACCOUNT : $langs->trans("CodeNotDef");
 		}
 		$compta_tva = (! empty($obj->account_tva) ? $obj->account_tva : $cpttva);
-
+		
 		$tabfac[$obj->rowid]["date"] = $obj->df;
-		$tabfac[$obj->rowid]["ref"] = $obj->ref_supplier.' ('.$obj->ref.')';
+		$tabfac[$obj->rowid]["ref"] = $obj->ref_supplier . ' (' . $obj->ref . ')';
 		$tabfac[$obj->rowid]["type"] = $obj->type;
 		$tabfac[$obj->rowid]["description"] = $obj->description;
 		$tabfac[$obj->rowid]["fk_facturefourndet"] = $obj->fdid;
@@ -147,9 +144,9 @@ if ($result) {
 		$tabcompany[$obj->rowid] = array (
 				'id' => $obj->socid,
 				'name' => $obj->name,
-				'code_fournisseur' => $obj->code_compta_fournisseur
+				'code_fournisseur' => $obj->code_compta_fournisseur 
 		);
-
+		
 		$i ++;
 	}
 } else {
@@ -160,11 +157,11 @@ if ($result) {
 if ($action == 'writebookkeeping') {
 	$now = dol_now();
 	$error = 0;
-
+	
 	foreach ( $tabfac as $key => $val ) {
 		foreach ( $tabttc[$key] as $k => $mt ) {
 			// get compte id and label
-
+			
 			$bookkeeping = new BookKeeping($db);
 			$bookkeeping->doc_date = $val["date"];
 			$bookkeeping->doc_ref = $val["ref"];
@@ -181,14 +178,14 @@ if ($action == 'writebookkeeping') {
 			$bookkeeping->credit = ($mt > 0) ? $mt : 0;
 			$bookkeeping->code_journal = $conf->global->ACCOUNTING_PURCHASE_JOURNAL;
 			$bookkeeping->fk_user_author = $user->id;
-
+			
 			$result = $bookkeeping->create($user);
 			if ($result < 0) {
 				$error ++;
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
 		}
-
+		
 		// Product / Service
 		foreach ( $tabht[$key] as $k => $mt ) {
 			if ($mt) {
@@ -211,7 +208,7 @@ if ($action == 'writebookkeeping') {
 					$bookkeeping->credit = ($mt <= 0) ? $mt : 0;
 					$bookkeeping->code_journal = $conf->global->ACCOUNTING_PURCHASE_JOURNAL;
 					$bookkeeping->fk_user_author = $user->id;
-
+					
 					$result = $bookkeeping->create($user);
 					if ($result < 0) {
 						$error ++;
@@ -220,7 +217,7 @@ if ($action == 'writebookkeeping') {
 				}
 			}
 		}
-
+		
 		// VAT
 		// var_dump($tabtva);
 		foreach ( $tabtva[$key] as $k => $mt ) {
@@ -242,7 +239,7 @@ if ($action == 'writebookkeeping') {
 				$bookkeeping->credit = ($mt <= 0) ? $mt : 0;
 				$bookkeeping->code_journal = $conf->global->ACCOUNTING_PURCHASE_JOURNAL;
 				$bookkeeping->fk_user_author = $user->id;
-
+				
 				$result = $bookkeeping->create($user);
 				if ($result < 0) {
 					$error ++;
@@ -251,13 +248,12 @@ if ($action == 'writebookkeeping') {
 			}
 		}
 	}
-
+	
 	if (empty($error)) {
 		setEventMessages($langs->trans("GeneralLedgerIsWritten"), null, 'mesgs');
 	}
 }
 
-
 /*
  * View
  */
@@ -265,26 +261,25 @@ 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';
+	include DOL_DOCUMENT_ROOT . '/accountancy/tpl/export_journal.tpl.php';
 	
-	if ($conf->global->ACCOUNTING_EXPORT_MODELCSV == 2) 	// Model Cegid Expert Export
-	{
+	if ($conf->global->ACCOUNTING_EXPORT_MODELCSV == 2) // Model Cegid Expert Export
+{
 		$sep = ";";
 		
 		foreach ( $tabfac as $key => $val ) {
 			$date = dol_print_date($db->jdate($val["date"]), '%d%m%Y');
-
+			
 			// Product / Service
 			foreach ( $tabht[$key] as $k => $mt ) {
 				$companystatic->id = $tabcompany[$key]['id'];
 				$companystatic->name = $tabcompany[$key]['name'];
 				$companystatic->client = $tabcompany[$key]['code_client'];
-
+				
 				if ($mt) {
 					print $date . $sep;
 					print $purchase_journal . $sep;
@@ -297,7 +292,7 @@ if ($action == 'export_csv')
 					print "\n";
 				}
 			}
-
+			
 			// VAT
 			foreach ( $tabtva[$key] as $k => $mt ) {
 				if ($mt) {
@@ -312,7 +307,7 @@ if ($action == 'export_csv')
 					print "\n";
 				}
 			}
-
+			
 			foreach ( $tabttc[$key] as $k => $mt ) {
 				print $date . $sep;
 				print $purchase_journal . $sep;
@@ -325,19 +320,19 @@ 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');
-
+			
 			$companystatic->id = $tabcompany[$key]['id'];
 			$companystatic->name = $tabcompany[$key]['name'];
 			$companystatic->client = $tabcompany[$key]['code_client'];
-
+			
 			// Product / Service
 			foreach ( $tabht[$key] as $k => $mt ) {
-			$accountingaccount = new AccountingAccount($db);
-		    $accountingaccount->fetch(null, $k);	
+				$accountingaccount = new AccountingAccount($db);
+				$accountingaccount->fetch(null, $k);
 				if ($mt) {
 					print '"' . $date . '"' . $sep;
 					print '"' . $val["ref"] . '"' . $sep;
@@ -360,7 +355,7 @@ if ($action == 'export_csv')
 					print "\n";
 				}
 			}
-
+			
 			// Third party
 			foreach ( $tabttc[$key] as $k => $mt ) {
 				print '"' . $date . '"' . $sep;
@@ -374,11 +369,11 @@ if ($action == 'export_csv')
 		}
 	}
 } else {
-
+	
 	llxHeader('', '', '');
-
+	
 	$form = new Form($db);
-
+	
 	$nom = $langs->trans("PurchasesJournal");
 	$nomlink = '';
 	$periodlink = '';
@@ -390,12 +385,14 @@ 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();" />';
-
+	
 	print '<input type="button" class="button" value="' . $langs->trans("WriteBookKeeping") . '" onclick="writebookkeeping();" />';
-
+	
 	print '
 	<script type="text/javascript">
 		function launch_export() {
@@ -409,12 +406,12 @@ if ($action == 'export_csv')
 		    $("div.fiche div.tabBar form input[name=\"action\"]").val("");
 		}
 	</script>';
-
+	
 	/*
 	 * Show result array
 	 */
 	print '<br><br>';
-
+	
 	$i = 0;
 	print "<table class=\"noborder\" width=\"100%\">";
 	print "<tr class=\"liste_titre\">";
@@ -424,25 +421,25 @@ if ($action == 'export_csv')
 	print "<td>" . $langs->trans("Account") . "</td>";
 	print "<t><td>" . $langs->trans("Type") . "</td><td align='right'>" . $langs->trans("Debit") . "</td><td align='right'>" . $langs->trans("Credit") . "</td>";
 	print "</tr>\n";
-
+	
 	$var = true;
 	$r = '';
-
+	
 	$invoicestatic = new FactureFournisseur($db);
-
+	
 	foreach ( $tabfac as $key => $val ) {
 		$invoicestatic->id = $key;
 		$invoicestatic->ref = $val["ref"];
 		$invoicestatic->type = $val["type"];
 		$invoicestatic->description = html_entity_decode(dol_trunc($val["description"], 32));
-
+		
 		$date = dol_print_date($db->jdate($val["date"]), 'day');
-
+		
 		// Product / Service
 		foreach ( $tabht[$key] as $k => $mt ) {
-		$accountingaccount = new AccountingAccount($db);
-		$accountingaccount->fetch(null, $k);
-
+			$accountingaccount = new AccountingAccount($db);
+			$accountingaccount->fetch(null, $k);
+			
 			if ($mt) {
 				print "<tr " . $bc[$var] . " >";
 				print "<td>" . $date . "</td>";
@@ -467,7 +464,7 @@ if ($action == 'export_csv')
 			}
 		}
 		print "<tr " . $bc[$var] . ">";
-
+		
 		// Third party
 		foreach ( $tabttc[$key] as $k => $mt ) {
 			print "<td>" . $date . "</td>";
@@ -482,10 +479,10 @@ if ($action == 'export_csv')
 			print '<td align="right">' . ($mt >= 0 ? price($mt) : '') . "</td>";
 		}
 		print "</tr>";
-
+		
 		$var = ! $var;
 	}
-
+	
 	print "</table>";
 	
 	// End of page

htdocs/accountancy/journal/sellsjournal.php

@@ -24,21 +24,20 @@
  */
 
 /**
- * \file		htdocs/accountancy/journal/sellsjournal.php
- * \ingroup		Accounting Expert
- * \brief		Page with sells journal
+ * \file htdocs/accountancy/journal/sellsjournal.php
+ * \ingroup Accounting Expert
+ * \brief Page with sells journal
  */
-
 require '../../main.inc.php';
 
 // Class
-require_once DOL_DOCUMENT_ROOT.'/core/lib/report.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
-require_once DOL_DOCUMENT_ROOT.'/societe/class/client.class.php';
-require_once DOL_DOCUMENT_ROOT.'/accountancy/class/bookkeeping.class.php';
-require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingaccount.class.php';
+require_once DOL_DOCUMENT_ROOT . '/core/lib/report.lib.php';
+require_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php';
+require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
+require_once DOL_DOCUMENT_ROOT . '/compta/facture/class/facture.class.php';
+require_once DOL_DOCUMENT_ROOT . '/societe/class/client.class.php';
+require_once DOL_DOCUMENT_ROOT . '/accountancy/class/bookkeeping.class.php';
+require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingaccount.class.php';
 
 // Langs
 $langs->load("compta");
@@ -62,8 +61,6 @@ if ($user->societe_id > 0)
 
 $action = GETPOST('action');
 
-
-
 /*
  * View
  */
@@ -105,10 +102,9 @@ 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 {
-	$sql.= " AND f.type IN (".Facture::TYPE_STANDARD.",".Facture::TYPE_STANDARD.",".Facture::TYPE_CREDIT_NOTE.",".Facture::TYPE_DEPOSIT.",".Facture::TYPE_SITUATION.")";
+	$sql .= " AND f.type IN (" . Facture::TYPE_STANDARD . "," . Facture::TYPE_REPLACEMENT . "," . Facture::TYPE_CREDIT_NOTE . "," . Facture::TYPE_SITUATION . ")";
+} 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)";
 if ($date_start && $date_end)
@@ -123,16 +119,16 @@ if ($result) {
 	$tabtva = array ();
 	$tabttc = array ();
 	$tabcompany = array ();
-
+	
 	$num = $db->num_rows($result);
 	$i = 0;
-
+	
 	while ( $i < $num ) {
 		$obj = $db->fetch_object($result);
 		// les variables
 		$cptcli = (! empty($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER)) ? $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER : $langs->trans("CodeNotDef");
 		$compta_soc = (! empty($obj->code_compta)) ? $obj->code_compta : $cptcli;
-
+		
 		$compta_prod = $obj->compte;
 		if (empty($compta_prod)) {
 			if ($obj->product_type == 0)
@@ -142,12 +138,12 @@ if ($result) {
 		}
 		$cpttva = (! empty($conf->global->ACCOUNTING_VAT_SOLD_ACCOUNT)) ? $conf->global->ACCOUNTING_VAT_SOLD_ACCOUNT : $langs->trans("CodeNotDef");
 		$compta_tva = (! empty($obj->account_tva) ? $obj->account_tva : $cpttva);
-
+		
 		// Situation invoices handling
 		$line = new FactureLigne($db);
 		$line->fetch($obj->rowid);
 		$prev_progress = $line->get_prev_progress();
-		if ($obj->type==Facture::TYPE_SITUATION) {
+		if ($obj->type == Facture::TYPE_SITUATION) {
 			// Avoid divide by 0
 			if ($obj->situation_percent == 0) {
 				$situation_ratio = 0;
@@ -157,7 +153,7 @@ if ($result) {
 		} else {
 			$situation_ratio = 1;
 		}
-
+		
 		// Invoice lines
 		$tabfac[$obj->rowid]["date"] = $obj->df;
 		$tabfac[$obj->rowid]["ref"] = $obj->facnumber;
@@ -176,9 +172,9 @@ if ($result) {
 		$tabcompany[$obj->rowid] = array (
 				'id' => $obj->socid,
 				'name' => $obj->name,
-				'code_client' => $obj->code_compta
+				'code_client' => $obj->code_compta 
 		);
-
+		
 		$i ++;
 	}
 } else {
@@ -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 ($tabttc[$key] as $k => $mt)
-		{
+	
+	foreach ( $tabfac as $key => $val ) {
+		foreach ( $tabttc[$key] as $k => $mt ) {
 			$bookkeeping = new BookKeeping($db);
 			$bookkeeping->doc_date = $val["date"];
 			$bookkeeping->doc_ref = $val["ref"];
@@ -216,16 +209,16 @@ if ($action == 'writebookkeeping')
 			$bookkeeping->credit = ($mt < 0) ? $mt : 0;
 			$bookkeeping->code_journal = $conf->global->ACCOUNTING_SELL_JOURNAL;
 			$bookkeeping->fk_user_author = $user->id;
-
+			
 			$result = $bookkeeping->create($user);
 			if ($result < 0) {
 				$error ++;
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
 		}
-
+		
 		// Product / Service
-		foreach ($tabht[$key] as $k => $mt) {
+		foreach ( $tabht[$key] as $k => $mt ) {
 			if ($mt) {
 				// get compte id and label
 				$accountingaccount = new AccountingAccount($db);
@@ -246,7 +239,7 @@ if ($action == 'writebookkeeping')
 					$bookkeeping->credit = ($mt >= 0) ? $mt : 0;
 					$bookkeeping->code_journal = $conf->global->ACCOUNTING_SELL_JOURNAL;
 					$bookkeeping->fk_user_author = $user->id;
-
+					
 					$result = $bookkeeping->create($user);
 					if ($result < 0) {
 						$error ++;
@@ -255,13 +248,11 @@ if ($action == 'writebookkeeping')
 				}
 			}
 		}
-
+		
 		// VAT
 		// var_dump($tabtva);
-		foreach ($tabtva[$key] as $k => $mt)
-		{
-			if ($mt)
-			{
+		foreach ( $tabtva[$key] as $k => $mt ) {
+			if ($mt) {
 				$bookkeeping = new BookKeeping($db);
 				$bookkeeping->doc_date = $val["date"];
 				$bookkeeping->doc_ref = $val["ref"];
@@ -278,7 +269,7 @@ if ($action == 'writebookkeeping')
 				$bookkeeping->credit = ($mt >= 0) ? $mt : 0;
 				$bookkeeping->code_journal = $conf->global->ACCOUNTING_SELL_JOURNAL;
 				$bookkeeping->fk_user_author = $user->id;
-
+				
 				$result = $bookkeeping->create($user);
 				if ($result < 0) {
 					$error ++;
@@ -287,33 +278,32 @@ if ($action == 'writebookkeeping')
 			}
 		}
 	}
-
+	
 	if (empty($error)) {
 		setEventMessages($langs->trans("GeneralLedgerIsWritten"), null, 'mesgs');
 	}
 }
 
 // Export
-if ($action == 'export_csv')
-{
+if ($action == 'export_csv') {
 	$sep = $conf->global->ACCOUNTING_EXPORT_SEPARATORCSV;
 	$journal = $conf->global->ACCOUNTING_SELL_JOURNAL;
-
-	include DOL_DOCUMENT_ROOT.'/accountancy/tpl/export_journal.tpl.php';
-
+	
+	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
-	{
+	
+	if ($conf->global->ACCOUNTING_EXPORT_MODELCSV == 2) // Model Cegid Expert Export
+{
 		$sep = ";";
-
+		
 		foreach ( $tabfac as $key => $val ) {
 			$companystatic->id = $tabcompany[$key]['id'];
 			$companystatic->name = $tabcompany[$key]['name'];
 			$companystatic->client = $tabcompany[$key]['code_client'];
-
+			
 			$date = dol_print_date($db->jdate($val["date"]), '%d%m%Y');
-
+			
 			foreach ( $tabttc[$key] as $k => $mt ) {
 				print $date . $sep;
 				print $sell_journal . $sep;
@@ -325,7 +315,7 @@ if ($action == 'export_csv')
 				print $val["ref"];
 				print "\n";
 			}
-
+			
 			// Product / Service
 			foreach ( $tabht[$key] as $k => $mt ) {
 				if ($mt) {
@@ -340,7 +330,7 @@ if ($action == 'export_csv')
 					print "\n";
 				}
 			}
-
+			
 			// TVA
 			foreach ( $tabtva[$key] as $k => $mt ) {
 				if ($mt) {
@@ -356,17 +346,15 @@ if ($action == 'export_csv')
 				}
 			}
 		}
-	}
-	else 	// Model Classic Export
-	{
-		foreach ($tabfac as $key => $val)
-		{
+	} else // Model Classic Export
+{
+		foreach ( $tabfac as $key => $val ) {
 			$companystatic->id = $tabcompany[$key]['id'];
 			$companystatic->name = $tabcompany[$key]['name'];
 			$companystatic->client = $tabcompany[$key]['code_client'];
-
+			
 			$date = dol_print_date($db->jdate($val["date"]), 'day');
-
+			
 			foreach ( $tabttc[$key] as $k => $mt ) {
 				print '"' . $date . '"' . $sep;
 				print '"' . $val["ref"] . '"' . $sep;
@@ -376,13 +364,12 @@ if ($action == 'export_csv')
 				print '"' . ($mt < 0 ? price(- $mt) : '') . '"';
 				print "\n";
 			}
-
+			
 			// Product / Service
-			foreach ($tabht[$key] as $k => $mt)
-			{
+			foreach ( $tabht[$key] as $k => $mt ) {
 				$accountingaccount = new AccountingAccount($db);
 				$accountingaccount->fetch(null, $k);
-
+				
 				if ($mt) {
 					print '"' . $date . '"' . $sep;
 					print '"' . $val["ref"] . '"' . $sep;
@@ -393,10 +380,9 @@ if ($action == 'export_csv')
 					print "\n";
 				}
 			}
-
+			
 			// VAT
-			foreach ($tabtva[$key] as $k => $mt)
-			{
+			foreach ( $tabtva[$key] as $k => $mt ) {
 				if ($mt) {
 					print '"' . $date . '"' . $sep;
 					print '"' . $val["ref"] . '"' . $sep;
@@ -410,11 +396,11 @@ if ($action == 'export_csv')
 		}
 	}
 } else {
-
+	
 	$form = new Form($db);
-
+	
 	llxHeader('', $langs->trans("SellsJournal"));
-
+	
 	$nom = $langs->trans("SellsJournal");
 	$nomlink = '';
 	$periodlink = '';
@@ -426,12 +412,14 @@ 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();" />';
-
+	
 	print '<input type="button" class="button" value="' . $langs->trans("WriteBookKeeping") . '" onclick="writebookkeeping();" />';
-
+	
 	print '
 	<script type="text/javascript">
 		function launch_export() {
@@ -445,12 +433,12 @@ if ($action == 'export_csv')
 		    $("div.fiche div.tabBar form input[name=\"action\"]").val("");
 		}
 	</script>';
-
+	
 	/*
 	 * Show result array
 	 */
 	print '<br><br>';
-
+	
 	$i = 0;
 	print "<table class=\"noborder\" width=\"100%\">";
 	print "<tr class=\"liste_titre\">";
@@ -461,24 +449,22 @@ if ($action == 'export_csv')
 	print "<td align='right'>" . $langs->trans("Debit") . "</td>";
 	print "<td align='right'>" . $langs->trans("Credit") . "</td>";
 	print "</tr>\n";
-
+	
 	$var = true;
 	$r = '';
-
+	
 	$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"];
-
+		
 		$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>";
@@ -492,13 +478,12 @@ if ($action == 'export_csv')
 			print "<td align='right'>" . ($mt < 0 ? price(- $mt) : '') . "</td>";
 		}
 		print "</tr>";
-
+		
 		// Product / Service
-		foreach ($tabht[$key] as $k => $mt)
-		{
+		foreach ( $tabht[$key] as $k => $mt ) {
 			$accountingaccount = new AccountingAccount($db);
 			$accountingaccount->fetch(null, $k);
-
+			
 			if ($mt) {
 				print "<tr " . $bc[$var] . ">";
 				print "<td>" . $date . "</td>";
@@ -510,10 +495,9 @@ if ($action == 'export_csv')
 				print "</tr>";
 			}
 		}
-
+		
 		// VAT
-		foreach ($tabtva[$key] as $k => $mt)
-		{
+		foreach ( $tabtva[$key] as $k => $mt ) {
 			if ($mt) {
 				print "<tr " . $bc[$var] . ">";
 				print "<td>" . $date . "</td>";
@@ -525,12 +509,12 @@ if ($action == 'export_csv')
 				print "</tr>";
 			}
 		}
-
+		
 		$var = ! $var;
 	}
-
+	
 	print "</table>";
-
+	
 	// End of page
 	llxFooter();
 }

htdocs/accountancy/supplier/card.php

@@ -22,16 +22,15 @@
  *
  */
 /**
- * \file		htdocs/accountancy/supplier/card.php
- * \ingroup		Accountancy
- * \brief		Card supplier ventilation
+ * \file htdocs/accountancy/supplier/card.php
+ * \ingroup Accountancy
+ * \brief Card supplier ventilation
  */
-
 require '../../main.inc.php';
-	
+
 // Class
-require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
-require_once DOL_DOCUMENT_ROOT.'/accountancy/class/html.formventilation.class.php';
+require_once DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.facture.class.php';
+require_once DOL_DOCUMENT_ROOT . '/accountancy/class/html.formventilation.class.php';
 
 // Langs
 $langs->load("bills");
@@ -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;
@@ -94,7 +92,7 @@ if (! empty($id)) {
 	
 	dol_syslog("/accounting/supplier/card.php sql=" . $sql, LOG_DEBUG);
 	$result = $db->query($sql);
-
+	
 	if ($result) {
 		$num_lines = $db->num_rows($result);
 		$i = 0;
@@ -106,9 +104,9 @@ if (! empty($id)) {
 			print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
 			print '<input type="hidden" name="action" value="ventil">';
 			
-			print load_fiche_titre($langs->trans('SuppliersVentilation'),'','title_setup');
-
-            dol_fiche_head();
+			print load_fiche_titre($langs->trans('SuppliersVentilation'), '', 'title_setup');
+			
+			dol_fiche_head();
 			
 			print '<table class="border" width="100%">';
 			
@@ -127,15 +125,15 @@ if (! empty($id)) {
 			print $formventilation->select_account($objp->fk_code_ventilation, 'codeventil', 1);
 			print '</td></tr>';
 			print '</table>';
-
-            dol_fiche_end();
-
+			
+			dol_fiche_end();
+			
 			print '<div class="center">';
 			print '<input class="button" type="submit" value="' . $langs->trans("Save") . '">';
 			print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
 			print '<input class="button" type="submit" name="cancel" value="' . $langs->trans("Cancel") . '">';
 			print '</div>';
-
+			
 			print '</form>';
 		} else {
 			print "Error";

htdocs/accountancy/supplier/index.php

@@ -19,16 +19,15 @@
  */
 
 /**
- * \file		htdocs/accountancy/supplier/index.php
- * \ingroup		Accounting Expert
- * \brief		Home supplier ventilation
+ * \file htdocs/accountancy/supplier/index.php
+ * \ingroup Accounting Expert
+ * \brief Home supplier ventilation
  */
-
 require '../../main.inc.php';
-	
+
 // Class
-require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
+require_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php';
+require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
 
 // Langs
 $langs->load("compta");
@@ -43,7 +42,7 @@ if ($user->societe_id > 0)
 if (! $user->rights->accounting->ventilation->read)
 	accessforbidden();
 	
-// Filter
+	// Filter
 $year = $_GET["year"];
 if ($year == 0) {
 	$year_current = strftime("%Y", time());
@@ -158,8 +157,8 @@ if ($resql) {
 	while ( $i < $num ) {
 		
 		$row = $db->fetch_row($resql);
-		$var=!$var;
-		print '<tr '.$bc[$var].'><td>' . length_accountg($row[0]) . '</td>';
+		$var = ! $var;
+		print '<tr ' . $bc[$var] . '><td>' . length_accountg($row[0]) . '</td>';
 		print '<td align="left">' . $row[1] . '</td>';
 		print '<td align="right">' . price($row[2]) . '</td>';
 		print '<td align="right">' . price($row[3]) . '</td>';

htdocs/accountancy/supplier/lines.php

@@ -20,18 +20,17 @@
  */
 
 /**
- * \file		htdocs/accountancy/supplier/lines.php
- * \ingroup		Accounting Expert
- * \brief 		Page of detail of the lines of ventilation of invoices suppliers
+ * \file htdocs/accountancy/supplier/lines.php
+ * \ingroup Accounting Expert
+ * \brief Page of detail of the lines of ventilation of invoices suppliers
  */
-
 require '../../main.inc.php';
 
 // Class
-require_once DOL_DOCUMENT_ROOT.'/accountancy/class/html.formventilation.class.php';
-require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
-require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+require_once DOL_DOCUMENT_ROOT . '/accountancy/class/html.formventilation.class.php';
+require_once DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.facture.class.php';
+require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php';
+require_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php';
 
 // Langs
 $langs->load("compta");
@@ -41,43 +40,38 @@ $langs->load("main");
 $langs->load("accountancy");
 
 $account_parent = GETPOST('account_parent');
-$changeaccount  = GETPOST('changeaccount');
-//Search Getpost
-$search_ref     = GETPOST('search_ref','alpha');
-$search_invoice = GETPOST('search_invoice','alpha');
-$search_label   = GETPOST('search_label','alpha');
-$search_desc    = GETPOST('search_desc','alpha');
-$search_amount  = GETPOST('search_amount','alpha');
-$search_account = GETPOST('search_account','alpha');
-$search_vat     = GETPOST('search_vat','alpha');
+$changeaccount = GETPOST('changeaccount');
+// Search Getpost
+$search_ref = GETPOST('search_ref', 'alpha');
+$search_invoice = GETPOST('search_invoice', 'alpha');
+$search_label = GETPOST('search_label', 'alpha');
+$search_desc = GETPOST('search_desc', 'alpha');
+$search_amount = GETPOST('search_amount', 'alpha');
+$search_account = GETPOST('search_account', 'alpha');
+$search_vat = GETPOST('search_vat', 'alpha');
 
-//Getpost Order and column and limit page
-$sortfield = GETPOST('sortfield','alpha');
-$sortorder = GETPOST('sortorder','alpha');
-$page = GETPOST('page','int');
+// Getpost Order and column and limit page
+$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) 
-{
-	$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
-} 
-else 
-{
-	$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
+} 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;
 }
-if (! $sortfield) $sortfield="f.datef, f.ref, l.rowid";
+if (! $sortfield)
+	$sortfield = "f.datef, f.ref, l.rowid";
 
-if (! $sortorder) 
-{
-	if ($conf->global->ACCOUNTING_LIST_SORT_VENTILATION_DONE > 0) 
-    {
+if (! $sortorder) {
+	if ($conf->global->ACCOUNTING_LIST_SORT_VENTILATION_DONE > 0) {
 		$sortorder = " DESC ";
 	}
 }
@@ -93,13 +87,13 @@ $formventilation = new FormVentilation($db);
 // Purge search criteria
 if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both test are required to be compatible with all browsers
 {
-    $search_ref='';
-    $search_invoice='';
-    $search_label='';
-    $search_desc='';
-    $search_amount='';
-    $search_account='';
-    $search_vat='';
+	$search_ref = '';
+	$search_invoice = '';
+	$search_label = '';
+	$search_desc = '';
+	$search_amount = '';
+	$search_account = '';
+	$search_vat = '';
 }
 
 if (is_array($changeaccount) && count($changeaccount) > 0) {
@@ -132,7 +126,7 @@ if (is_array($changeaccount) && count($changeaccount) > 0) {
 
 llxHeader('', $langs->trans("SuppliersVentilation") . ' - ' . $langs->trans("Dispatched"));
 
-print  '<script type="text/javascript">
+print '<script type="text/javascript">
 			$(function () {
 				$(\'#select-all\').click(function(event) {
 				    // Iterate each checkbox
@@ -149,7 +143,6 @@ print  '<script type="text/javascript">
 			});
 			 </script>';
 
- 
 /*
  * Supplier Invoice lines
  */
@@ -179,15 +172,14 @@ 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)) {
 	$sql .= " AND f.entity IN (" . getEntity("facture_fourn", 1) . ")";
 }
-$sql.= $db->order($sortfield,$sortorder);
-$sql.= $db->plimit($limit + 1,$offset);
+$sql .= $db->order($sortfield, $sortorder);
+$sql .= $db->plimit($limit + 1, $offset);
 
 dol_syslog('accountancy/supplier/lines.php::list sql= ' . $sql1);
 $result = $db->query($sql);
@@ -203,23 +195,23 @@ if ($result) {
 	print '<form method="POST" action="' . $_SERVER["PHP_SELF"] . '">';
 	print '<table class="noborder" width="100%">';
 	
-	print '<br><div class="inline-block divButAction">'. $langs->trans("ChangeAccount") . '<br>';
+	print '<br><div class="inline-block divButAction">' . $langs->trans("ChangeAccount") . '<br>';
 	print $formventilation->select_account(GETPOST('account_parent'), 'account_parent', 1);
 	print '<input type="submit" class="butAction" value="' . $langs->trans("Validate") . '" /></div>';
 	
 	print '<tr class="liste_titre">';
-	print_liste_field_titre($langs->trans("Invoice"), $_SERVER["PHP_SELF"],"f.ref","",$param,'',$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("Ref"), $_SERVER["PHP_SELF"],"p.ref","",$param,'',$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("Label"), $_SERVER["PHP_SELF"],"p.label","",$param,'',$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("Description"), $_SERVER["PHP_SELF"],"l.description","",$param,'',$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("Amount"), $_SERVER["PHP_SELF"],"l.total_ht","",$param,'align="center"',$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("VATRate"), $_SERVER["PHP_SELF"],"l.tva_tx","",$param,'align="center"',$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("Account"), $_SERVER["PHP_SELF"],"aa.account_number","",$param,'align="center"',$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("Invoice"), $_SERVER["PHP_SELF"], "f.ref", "", $param, '', $sortfield, $sortorder);
+	print_liste_field_titre($langs->trans("Ref"), $_SERVER["PHP_SELF"], "p.ref", "", $param, '', $sortfield, $sortorder);
+	print_liste_field_titre($langs->trans("Label"), $_SERVER["PHP_SELF"], "p.label", "", $param, '', $sortfield, $sortorder);
+	print_liste_field_titre($langs->trans("Description"), $_SERVER["PHP_SELF"], "l.description", "", $param, '', $sortfield, $sortorder);
+	print_liste_field_titre($langs->trans("Amount"), $_SERVER["PHP_SELF"], "l.total_ht", "", $param, 'align="center"', $sortfield, $sortorder);
+	print_liste_field_titre($langs->trans("VATRate"), $_SERVER["PHP_SELF"], "l.tva_tx", "", $param, 'align="center"', $sortfield, $sortorder);
+	print_liste_field_titre($langs->trans("Account"), $_SERVER["PHP_SELF"], "aa.account_number", "", $param, 'align="center"', $sortfield, $sortorder);
 	print_liste_field_titre('');
 	print_liste_field_titre('');
-	print_liste_field_titre($langs->trans("Ventilate").'<br><label id="select-all">'.$langs->trans('All').'</label>/<label id="unselect-all">'.$langs->trans('None').'</label>','','','','','align="center"');
+	print_liste_field_titre($langs->trans("Ventilate") . '<br><label id="select-all">' . $langs->trans('All') . '</label>/<label id="unselect-all">' . $langs->trans('None') . '</label>', '', '', '', '', 'align="center"');
 	print "</tr>\n";
-
+	
 	print '<tr class="liste_titre"><td><input type="text" class="flat" name="search_invoice" size="10" value="' . $search_invoice . '"></td>';
 	print '<td class="liste_titre"><input type="text" class="flat" size="15" name="search_ref" value="' . $search_ref . '"></td>';
 	print '<td class="liste_titre"><input type="text" class="flat" size="15" name="search_label" value="' . $search_label . '"></td>';
@@ -228,9 +220,9 @@ if ($result) {
 	print '<td class="liste_titre" align="center"><input type="text" class="flat" size="5" name="search_vat" value="' . $search_vat . '">%</td>';
 	print '<td class="liste_titre" align="center"><input type="text" class="flat" size="15" name="search_account" value="' . $search_account . '"></td>';
 	print '<td class="liste_titre" colspan="2">&nbsp;</td>';
-  print '<td class="liste_titre" align="center"><input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
-	print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
-  print "</td></tr>\n";
+	print '<td class="liste_titre" align="center"><input type="image" class="liste_titre" name="button_search" src="' . img_picto($langs->trans("Search"), 'search.png', '', '', 1) . '" value="' . dol_escape_htmltag($langs->trans("Search")) . '" title="' . dol_escape_htmltag($langs->trans("Search")) . '">';
+	print '<input type="image" class="liste_titre" name="button_removefilter" src="' . img_picto($langs->trans("Search"), 'searchclear.png', '', '', 1) . '" value="' . dol_escape_htmltag($langs->trans("RemoveFilter")) . '" title="' . dol_escape_htmltag($langs->trans("RemoveFilter")) . '">';
+	print "</td></tr>\n";
 	
 	$facturefournisseur_static = new FactureFournisseur($db);
 	$product_static = new Product($db);
@@ -278,7 +270,6 @@ if ($result) {
 	print $db->error();
 }
 
-
 print "</table></form>";
 
 llxFooter();

htdocs/accountancy/supplier/list.php

@@ -20,9 +20,9 @@
  */
 
 /**
- * \file		htdocs/accountancy/supplier/list.php
- * \ingroup		Accountancy
- * \brief		Ventilation page from suppliers invoices
+ * \file htdocs/accountancy/supplier/list.php
+ * \ingroup Accountancy
+ * \brief Ventilation page from suppliers invoices
  */
 require '../../main.inc.php';
 
@@ -66,9 +66,9 @@ if ($page < 0)
 if (! empty($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION)) {
 	$limit = $conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION;
 } else if ($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION <= 0) {
-	$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
+	$limit = GETPOST('limit') ? GETPOST('limit', 'int') : $conf->liste_limit;
 } else {
-	$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
+	$limit = GETPOST('limit') ? GETPOST('limit', 'int') : $conf->liste_limit;
 }
 $offset = $limit * $page;
 
@@ -94,8 +94,8 @@ $formventilation = new FormVentilation($db);
 $accounting = new AccountingAccount($db);
 
 // TODO: we should need to check if result is a really exist accountaccount rowid.....
-$aarowid_s = $accounting->fetch('', $conf->global->ACCOUNTING_SERVICE_BUY_ACCOUNT,1);
-$aarowid_p = $accounting->fetch('', $conf->global->ACCOUNTING_PRODUCT_BUY_ACCOUNT,1);
+$aarowid_s = $accounting->fetch('', $conf->global->ACCOUNTING_SERVICE_BUY_ACCOUNT, 1);
+$aarowid_p = $accounting->fetch('', $conf->global->ACCOUNTING_PRODUCT_BUY_ACCOUNT, 1);
 
 // Purge search criteria
 if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both test are required to be compatible with all browsers
@@ -133,7 +133,7 @@ print '<script type="text/javascript">
  * Action
  */
 
-if ($action == 'ventil' && !empty($btn_ventil)) {
+if ($action == 'ventil' && ! empty($btn_ventil)) {
 	print '<div><font color="red">' . $langs->trans("Processing") . '...</font></div>';
 	if ($_POST['codeventil'] && $_POST["mesCasesCochees"]) {
 		print '<div><font color="red">' . count($_POST["mesCasesCochees"]) . ' ' . $langs->trans("SelectedLines") . '</font></div>';
@@ -173,9 +173,9 @@ if ($action == 'ventil' && !empty($btn_ventil)) {
 if (! empty($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION)) {
 	$limit = $conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION;
 } else if ($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION <= 0) {
-	$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
+	$limit = GETPOST('limit') ? GETPOST('limit', 'int') : $conf->liste_limit;
 } else {
-	$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
+	$limit = GETPOST('limit') ? GETPOST('limit', 'int') : $conf->liste_limit;
 }
 
 $offset = $limit * $page;

htdocs/accountancy/tpl/export_journal.tpl.php

@@ -14,10 +14,9 @@
  * 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;
-	
+
 $date_export = dol_print_date($now, '%Y%m%d%H%M%S');
 
 header('Content-Type: text/csv');
@@ -25,4 +24,4 @@ if ($prefix)
 	$filename = $prefix . "_" . "journal_" . $journal . $date_export . "." . $format;
 else
 	$filename = "journal_" . $journal . $date_export . "." . $format;
-header('Content-Disposition: attachment;filename='.$filename);
+header('Content-Disposition: attachment;filename=' . $filename);