Modify code to match new v6 structure.

htdocs/accountancy/admin/categories_list.php

@@ -546,7 +546,7 @@ if ($id)
             if ($fieldlist[$field]=='accountancy_code_buy'){ $valuetoshow=$langs->trans("AccountancyCodeBuy"); }
             if ($fieldlist[$field]=='pcg_version' || $fieldlist[$field]=='fk_pcg_version') { $valuetoshow=$langs->trans("Pcg_version"); }
             if ($fieldlist[$field]=='range_account')   { $valuetoshow=$langs->trans("Range"); }
-			if ($fieldlist[$field]=='sens')            { $valuetoshow=$langs->trans("Sens"); }
+			if ($fieldlist[$field]=='sens')            { $valuetoshow=$langs->trans("Direction"); }
 			if ($fieldlist[$field]=='category_type')   { $valuetoshow=$langs->trans("Calculated"); }
 
             if ($valuetoshow != '')
@@ -700,7 +700,7 @@ if ($id)
             if ($fieldlist[$field]=='pcg_subtype')     { $valuetoshow=$langs->trans("Pcg_subtype"); }
         	if ($fieldlist[$field]=='type_template')   { $valuetoshow=$langs->trans("TypeOfTemplate"); }
 			if ($fieldlist[$field]=='range_account')   { $valuetoshow=$langs->trans("Range"); }
-			if ($fieldlist[$field]=='sens')            { $valuetoshow=$langs->trans("Sens"); }
+			if ($fieldlist[$field]=='sens')            { $valuetoshow=$langs->trans("Direction"); }
 			if ($fieldlist[$field]=='category_type')   { $valuetoshow=$langs->trans("Calculated"); }
             // Affiche nom du champ
             if ($showfield)

htdocs/accountancy/admin/defaultaccounts.php

@@ -50,23 +50,26 @@ if (! empty($user->rights->accountancy->chartofaccount))
 $action = GETPOST('action', 'alpha');
 
 
+$list_account_main = array (
+    'ACCOUNTING_ACCOUNT_SUPPLIER',
+    'ACCOUNTING_ACCOUNT_CUSTOMER',
+);
+
 $list_account = array (
-		'ACCOUNTING_ACCOUNT_SUPPLIER',
+    'SALARIES_ACCOUNTING_ACCOUNT_PAYMENT',
-		'ACCOUNTING_ACCOUNT_CUSTOMER',
+    'ACCOUNTING_PRODUCT_BUY_ACCOUNT',
-		'SALARIES_ACCOUNTING_ACCOUNT_PAYMENT',
+    'ACCOUNTING_PRODUCT_SOLD_ACCOUNT',
-		'ACCOUNTING_PRODUCT_BUY_ACCOUNT',
+    'ACCOUNTING_SERVICE_BUY_ACCOUNT',
-		'ACCOUNTING_PRODUCT_SOLD_ACCOUNT',
+    'ACCOUNTING_SERVICE_SOLD_ACCOUNT',
-		'ACCOUNTING_SERVICE_BUY_ACCOUNT',
+    'ACCOUNTING_VAT_BUY_ACCOUNT',
-		'ACCOUNTING_SERVICE_SOLD_ACCOUNT',
+    'ACCOUNTING_VAT_SOLD_ACCOUNT',
-		'ACCOUNTING_VAT_BUY_ACCOUNT',
+    'ACCOUNTING_VAT_PAY_ACCOUNT',
-		'ACCOUNTING_VAT_SOLD_ACCOUNT',
+    'ACCOUNTING_ACCOUNT_SUSPENSE',
-		'ACCOUNTING_VAT_PAY_ACCOUNT',
+    'ACCOUNTING_ACCOUNT_TRANSFER_CASH',
-		'ACCOUNTING_ACCOUNT_SUSPENSE',
+    'DONATION_ACCOUNTINGACCOUNT',
-		'ACCOUNTING_ACCOUNT_TRANSFER_CASH',
+    'LOAN_ACCOUNTING_ACCOUNT_CAPITAL',
-		'DONATION_ACCOUNTINGACCOUNT',
+    'LOAN_ACCOUNTING_ACCOUNT_INTEREST',
-		'LOAN_ACCOUNTING_ACCOUNT_CAPITAL',
+    'LOAN_ACCOUNTING_ACCOUNT_INSURANCE'
-		'LOAN_ACCOUNTING_ACCOUNT_INTEREST',
-		'LOAN_ACCOUNTING_ACCOUNT_INSURANCE'
 );
 
 
@@ -94,7 +97,7 @@ if (GETPOST('change_chart'))
 if ($action == 'update') {
 	$error = 0;
 
-	foreach ( $list_account as $constname ) {
+	foreach ( $list_account_main as $constname ) {
 		$constvalue = GETPOST($constname, 'alpha');
 
 		if (! dolibarr_set_const($db, $constname, $constvalue, 'chaine', 0, '', $conf->entity)) {
@@ -102,6 +105,14 @@ if ($action == 'update') {
 		}
 	}
 
+	foreach ( $list_account 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,11 +125,11 @@ if ($action == 'update') {
  * View
  */
 
-llxHeader();
-
 $form = new Form($db);
 $formaccounting = new FormAccounting($db);
 
+llxHeader();
+
 $linkback = '';
 print load_fiche_titre($langs->trans('MenuDefaultAccounts'), $linkback, 'title_accountancy');
 
@@ -129,16 +140,45 @@ 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">';
 
-// Define Chart of accounts
+
+// Define main accounts for thirdparty
 
 print '<table class="noborder" width="100%">';
 
-foreach ( $list_account as $key ) {
+foreach ($list_account_main as $key) {
+
+    print '<tr class="oddeven value">';
+    // Param
+    $label = $langs->trans($key);
+    $keydesc=$key.'_Desc';
+
+    $htmltext = $langs->trans($keydesc);
+    print '<td class="fieldrequired" width="50%">';
+    print $form->textwithpicto($label, $htmltext);
+    print '</td>';
+    // Value
+    print '<td>';  // Do not force align=right, or it align also the content of the select box
+    print $formaccounting->select_account($conf->global->$key, $key, 1, '', 1, 1);
+    print '</td>';
+    print '</tr>';
+}
+
+
+print "</table>\n";
+
+
+print '<br>';
+
+// Define default accounts
+
+print '<table class="noborder" width="100%">';
+
+foreach ($list_account as $key) {
 
 	print '<tr class="oddeven value">';
 	// Param
 	$label = $langs->trans($key);
-	print '<td>' . $label . '</td>';
+	print '<td width="50%">' . $label . '</td>';
 	// Value
 	print '<td>';  // Do not force align=right, or it align also the content of the select box
 	print $formaccounting->select_account($conf->global->$key, $key, 1, '', 1, 1);

htdocs/accountancy/admin/journals_list.php

@@ -371,13 +371,6 @@ if ($id)
 
 print load_fiche_titre($titre,$linkback,$titlepicto);
 
-if (empty($id))
-{
-    print $langs->trans("DictionaryDesc");
-    print " ".$langs->trans("OnlyActiveElementsAreShown")."<br>\n";
-}
-print "<br>\n";
-
 
 // Confirmation de la suppression de la ligne
 if ($action == 'delete')

htdocs/accountancy/bookkeeping/card.php

@@ -48,9 +48,9 @@ $piece_num = GETPOST("piece_num");
 $mesg = '';
 
 $account_number = GETPOST('account_number');
-$code_tiers = GETPOST('code_tiers');
+$subledger_account = GETPOST('subledger_account');
-if ($code_tiers == - 1) {
+if ($subledger_account == - 1) {
-	$code_tiers = null;
+	$subledger_account = null;
 }
 $label_compte = GETPOST('label_compte');
 $debit = price2num(GETPOST('debit'));
@@ -82,7 +82,7 @@ if ($action == "confirm_update") {
 			setEventMessages($book->error, $book->errors, 'errors');
 		} else {
 			$book->numero_compte = $account_number;
-			$book->code_tiers = $code_tiers;
+			$book->subledger_account = $subledger_account;
 			$book->label_compte = $label_compte;
 			$book->debit = $debit;
 			$book->credit = $credit;
@@ -119,7 +119,7 @@ else if ($action == "add") {
 		$book = new BookKeeping($db);
 
 		$book->numero_compte = $account_number;
-		$book->code_tiers = $code_tiers;
+		$book->subledger_account = $subledger_account;
 		$book->label_compte = $label_compte;
 		$book->debit = $debit;
 		$book->credit = $credit;
@@ -368,7 +368,7 @@ if ($action == 'create') {
 				print '<tr class="liste_titre">';
 
 				print_liste_field_titre($langs->trans("AccountAccountingShort"));
-				print_liste_field_titre($langs->trans("Code_tiers"));
+				print_liste_field_titre($langs->trans("subledger_account"));
 				print_liste_field_titre($langs->trans("Labelcompte"));
 				print_liste_field_titre($langs->trans("Debit"), "", "", "", "", 'align="right"');
 				print_liste_field_titre($langs->trans("Credit"), "", "", "", "", 'align="right"');
@@ -390,7 +390,7 @@ if ($action == 'create') {
 						print $formaccounting->select_account($line->numero_compte, 'account_number', 0, array (), 1, 1, '');
 						print '</td>';
 						print '<td>';
-						print $formaccounting->select_auxaccount($line->code_tiers, 'code_tiers', 1);
+						print $formaccounting->select_auxaccount($line->subledger_account, 'subledger_account', 1);
 						print '</td>';
 						print '<td><input type="text" size="15" name="label_compte" value="' . $line->label_compte . '"/></td>';
 						print '<td align="right"><input type="text" size="6" name="debit" value="' . price($line->debit) . '"/></td>';
@@ -403,7 +403,7 @@ if ($action == 'create') {
 						print '</td>';
 					} else {
 						print '<td>' . length_accountg($line->numero_compte) . '</td>';
-						print '<td>' . length_accounta($line->code_tiers) . '</td>';
+						print '<td>' . length_accounta($line->subledger_account) . '</td>';
 						print '<td>' . $line->label_compte . '</td>';
 						print '<td align="right">' . price($line->debit) . '</td>';
 						print '<td align="right">' . price($line->credit) . '</td>';
@@ -434,7 +434,7 @@ if ($action == 'create') {
 					print $formaccounting->select_account($account_number, 'account_number', 0, array (), 1, 1, '');
 					print '</td>';
 					print '<td>';
-					print $formaccounting->select_auxaccount($code_tiers, 'code_tiers', 1);
+					print $formaccounting->select_auxaccount($subledger_account, 'subledger_account', 1);
 					print '</td>';
 					print '<td><input type="text" size="15" name="label_compte" value="' . $label_compte . '"/></td>';
 					print '<td align="right"><input type="text" class="right maxwidth50" name="debit" value="' . price($debit) . '"/></td>';

htdocs/accountancy/bookkeeping/list.php

@@ -171,15 +171,15 @@ if (! empty($search_accountancy_code_end)) {
     $param .= '&search_accountancy_code_end=' . $search_accountancy_code_end;
 }
 if (! empty($search_accountancy_aux_code)) {
-    $filter['t.code_tiers'] = $search_accountancy_aux_code;
+    $filter['t.subledger_account'] = $search_accountancy_aux_code;
     $param .= '&search_accountancy_aux_code=' . $search_accountancy_aux_code;
 }
 if (! empty($search_accountancy_aux_code_start)) {
-    $filter['t.code_tiers>='] = $search_accountancy_aux_code_start;
+    $filter['t.subledger_account>='] = $search_accountancy_aux_code_start;
     $param .= '&search_accountancy_aux_code_start=' . $search_accountancy_aux_code_start;
 }
 if (! empty($search_accountancy_aux_code_end)) {
-    $filter['t.code_tiers<='] = $search_accountancy_aux_code_end;
+    $filter['t.subledger_account<='] = $search_accountancy_aux_code_end;
     $param .= '&search_accountancy_aux_code_end=' . $search_accountancy_aux_code_end;
 }
 if (! empty($search_mvt_label)) {
@@ -365,7 +365,7 @@ $groupby = ' <a class="nohover" href="'.DOL_URL_ROOT.'/accountancy/bookkeeping/l
 
 print_barre_liste($title_page, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $button, $result, $nbtotalofrecords, 'title_accountancy', 0, $groupby, '', $limit);
 
-print '<div class="tabsAction">' . "\n";
+print '<div class="tabsAction tabsActionNoBottom">' . "\n";
 print '<div class="inline-block divButAction"><a class="butAction" href="./card.php?action=create">' . $langs->trans("NewAccountingMvt") . '</a></div>';
 print '<div class="inline-block divButAction"><a class="butActionDelete" name="button_delmvt" href="'.$_SERVER["PHP_SELF"].'?action=delbookkeepingyear'.($param?'&'.$param:'').'">' . $langs->trans("DelBookKeeping") . '</a></div>';
 
@@ -376,26 +376,35 @@ print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre_filter">';
 print '<td class="liste_titre"><input type="text" name="search_mvt_num" size="6" value="' . dol_escape_htmltag($search_mvt_num) . '"></td>';
 print '<td class="liste_titre center">';
+print '<div class="nowrap">';
 print $langs->trans('From') . ': ';
 print $form->select_date($search_date_start, 'date_start', 0, 0, 1);
-print '<br>';
+print '</div>';
+print '<div class="nowrap">';
 print $langs->trans('to') . ': ';
 print $form->select_date($search_date_end, 'date_end', 0, 0, 1);
+print '</div>';
 print '</td>';
 print '<td class="liste_titre"><input type="text" name="search_doc_ref" size="8" value="' . dol_escape_htmltag($search_doc_ref) . '"></td>';
 print '<td class="liste_titre">';
+print '<div class="nowrap">';
 print $langs->trans('From');
 print $formaccounting->select_account($search_accountancy_code_start, 'search_accountancy_code_start', 1, array (), 1, 1, '');
-print '<br>';
+print '</div>';
+print '<div class="nowrap">';
 print $langs->trans('to');
 print $formaccounting->select_account($search_accountancy_code_end, 'search_accountancy_code_end', 1, array (), 1, 1, '');
+print '</div>';
 print '</td>';
 print '<td class="liste_titre">';
+print '<div class="nowrap">';
 print $langs->trans('From');
 print $formaccounting->select_auxaccount($search_accountancy_aux_code_start, 'search_accountancy_aux_code_start', 1);
-print '<br>';
+print '</div>';
+print '<div class="nowrap">';
 print $langs->trans('to');
 print $formaccounting->select_auxaccount($search_accountancy_aux_code_end, 'search_accountancy_aux_code_end', 1);
+print '</div>';
 print '</td>';
 print '<td class="liste_titre">';
 print '<input type="text" size="7" class="flat" name="search_mvt_label" value="' . $search_mvt_label . '"/>';
@@ -414,7 +423,7 @@ print_liste_field_titre($langs->trans("TransactionNumShort"), $_SERVER['PHP_SELF
 print_liste_field_titre($langs->trans("Docdate"), $_SERVER['PHP_SELF'], "t.doc_date", "", $param, 'align="center"', $sortfield, $sortorder);
 print_liste_field_titre($langs->trans("Docref"), $_SERVER['PHP_SELF'], "t.doc_ref", "", $param, "", $sortfield, $sortorder);
 print_liste_field_titre($langs->trans("AccountAccountingShort"), $_SERVER['PHP_SELF'], "t.numero_compte", "", $param, "", $sortfield, $sortorder);
-print_liste_field_titre($langs->trans("Code_tiers"), $_SERVER['PHP_SELF'], "t.code_tiers", "", $param, "", $sortfield, $sortorder);
+print_liste_field_titre($langs->trans("SubledgerAccount"), $_SERVER['PHP_SELF'], "t.subledger_account", "", $param, "", $sortfield, $sortorder);
 print_liste_field_titre($langs->trans("Label"), $_SERVER['PHP_SELF'], "t.label_compte", "", $param, "", $sortfield, $sortorder);
 print_liste_field_titre($langs->trans("Debit"), $_SERVER['PHP_SELF'], "t.debit", "", $param, 'align="right"', $sortfield, $sortorder);
 print_liste_field_titre($langs->trans("Credit"), $_SERVER['PHP_SELF'], "t.credit", "", $param, 'align="right"', $sortfield, $sortorder);
@@ -440,14 +449,15 @@ foreach ($object->lines as $line ) {
 	print '<td align="center">' . dol_print_date($line->doc_date, 'day') . '</td>';
 	print '<td class="nowrap">' . $line->doc_ref . '</td>';
 	print '<td>' . length_accountg($line->numero_compte) . '</td>';
-	print '<td>' . length_accounta($line->code_tiers) . '</td>';
+	print '<td>' . length_accounta($line->subledger_account) . '</td>';
 	print '<td>' . $line->label_compte . '</td>';
-	print '<td align="right">' . price($line->debit) . '</td>';
+	print '<td align="right">' . ($line->debit ? price($line->debit) : ''). '</td>';
-	print '<td align="right">' . price($line->credit) . '</td>';
+	print '<td align="right">' . ($line->credit ? price($line->credit) : '') . '</td>';
 
 	$accountingjournal = new AccountingJournal($db);
-	$accountingjournal->fetch('',$line->code_journal);
+	$result = $accountingjournal->fetch('',$line->code_journal);
-	print '<td align="center">' . $accountingjournal->getNomUrl(0,0,0,'',0) . '</td>';
+	$journaltoshow = (($result > 0)?$accountingjournal->getNomUrl(0,0,0,'',0) : $line->code_journal);
+	print '<td align="center">' . $journaltoshow . '</td>';
 
 	print '<td align="center">';
 	print '<a href="./card.php?piece_num=' . $line->piece_num . '">' . img_edit() . '</a>&nbsp;';

htdocs/accountancy/bookkeeping/listbyaccount.php

@@ -75,10 +75,6 @@ if (empty($search_date_end)) $search_date_end = dol_mktime(0, 0, 0, 12, 31, dol_
 
 $object = new BookKeeping($db);
 
-$formaccounting = new FormAccounting($db);
-$formother = new FormOther($db);
-$form = new Form($db);
-
 
 $options = '';
 $filter = array ();
@@ -126,7 +122,7 @@ if (!GETPOST("button_removefilter_x") && !GETPOST("button_removefilter")) // Bot
  * Action
  */
 
-if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETPOST("button_removefilter")) // All test are required to be compatible with all browsers
+if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETPOST("button_removefilter")) // All tests are required to be compatible with all browsers
 {
 	$search_doc_date = '';
 	$search_accountancy_code = '';
@@ -156,6 +152,10 @@ if ($action == 'delmouvconfirm') {
  * View
  */
 
+$formaccounting = new FormAccounting($db);
+$formother = new FormOther($db);
+$form = new Form($db);
+
 $title_page = $langs->trans("Bookkeeping") . ' ' . strtolower($langs->trans("By")) . ' ' . $langs->trans("AccountAccounting");
 
 llxHeader('', $title_page);
@@ -217,7 +217,7 @@ if ( preg_match('/^asc/i', $sortorder) )
 else
   $sortorder = "desc";
 
-print '<div class="tabsAction">' . "\n";
+print '<div class="tabsAction tabsActionNoBottom">' . "\n";
 print '<div class="inline-block divButAction"><a class="butAction" href="./card.php?action=create">' . $langs->trans("NewAccountingMvt") . '</a></div>';
 print '</div>';
 
@@ -257,7 +257,6 @@ print "</tr>\n";
 
 print '</tr>';
 
-$var = True;
 
 $total_debit = 0;
 $total_credit = 0;
@@ -313,14 +312,14 @@ foreach ( $object->lines as $line ) {
 
     // Affiche un lien vers la facture client/fournisseur
     $doc_ref = preg_replace('/\(.*\)/', '', $line->doc_ref);
-    print strlen(length_accounta($line->code_tiers)) == 0 ? '<td>' . $line->label_compte . '</td>' : '<td>' . $line->label_compte . '<br /><span style="font-size:0.8em">(' . length_accounta($line->code_tiers) . ')</span></td>';
+    print strlen(length_accounta($line->subledger_account)) == 0 ? '<td>' . $line->label_compte . '</td>' : '<td>' . $line->label_compte . '<br /><span style="font-size:0.8em">(' . length_accounta($line->subledger_account) . ')</span></td>';
 
 
-	print '<td align="right">' . price($line->debit) . '</td>';
+	print '<td align="right">' . ($line->debit ? price($line->debit) :''). '</td>';
-	print '<td align="right">' . price($line->credit) . '</td>';
+	print '<td align="right">' . ($line->credit ? price($line->credit) : '') . '</td>';
 	print '<td align="center">' . $line->code_journal . '</td>';
 	print '<td align="center">';
-	print '<a href="./card.php?piece_num=' . $line->piece_num . '">' . img_edit() . '</a>&nbsp;';
+	print '<a href="'.DOL_URL_ROOT.'/accountancy/bookkeeping/card.php?piece_num=' . $line->piece_num . '">' . img_edit() . '</a>&nbsp;';
 	print '<a href="' . $_SERVER['PHP_SELF'] . '?action=delmouv&mvt_num=' . $line->piece_num . $options . '&page=' . $page . '">' . img_delete() . '</a>';
 	print '</td>';
 	print "</tr>\n";
@@ -355,6 +354,4 @@ print "</table>";
 print '</form>';
 
 llxFooter();
-
-
 $db->close();

htdocs/accountancy/bookkeeping/listbyyear.php

@@ -52,14 +52,14 @@ $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_subledger_account = GETPOST('search_subledger_account', 'alpha');
-$search_code_tiers_start = GETPOST('search_code_tiers_start', 'alpha');
+$search_subledger_account_start = GETPOST('search_subledger_account_start', 'alpha');
-if ($search_code_tiers_start == - 1) {
+if ($search_subledger_account_start == - 1) {
-	$search_code_tiers_start = '';
+	$search_subledger_account_start = '';
 }
-$search_code_tiers_end = GETPOST('search_code_tiers_end', 'alpha');
+$search_subledger_account_end = GETPOST('search_subledger_account_end', 'alpha');
-if ($search_code_tiers_end == - 1) {
+if ($search_subledger_account_end == - 1) {
-	$search_code_tiers_end = '';
+	$search_subledger_account_end = '';
 }
 $search_label_compte = GETPOST('search_label_compte', 'alpha');
 $search_sens = GETPOST('search_sens', 'alpha');
@@ -81,15 +81,18 @@ if ($sortfield == "")
 
 $offset = $limit * $page;
 
-llxHeader('', $langs->trans("Bookkeeping"));
 
-if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both test are required to be compatible with all browsers
+/*
+ * Actions
+ */
+
+if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETPOST("button_removefilter")) // All tests are required to be compatible with all browsers
 {
 	$search_doc_type = "";
 	$search_doc_date = "";
 	$search_doc_ref = "";
 	$search_numero_compte = "";
-	$search_code_tiers = "";
+	$search_subledger_account = "";
 	$search_label_compte = "";
 	$search_sens = "";
 	$search_code_journal = "";
@@ -129,17 +132,17 @@ if (! empty($search_numero_compte_end)) {
 	$filter['t.numero_compte<='] = $search_numero_compte_end;
 	$options .= '&amp;search_numero_compte_end=' . $search_numero_compte_end;
 }
-if (! empty($search_code_tiers)) {
+if (! empty($search_subledger_account)) {
-	$filter['t.code_tiers'] = $search_code_tiers;
+	$filter['t.subledger_account'] = $search_subledger_account;
-	$options .= '&amp;search_code_tiers=' . $search_code_tiers;
+	$options .= '&amp;search_subledger_account=' . $search_subledger_account;
 }
-if (! empty($search_code_tiers_start)) {
+if (! empty($search_subledger_account_start)) {
-	$filter['t.code_tiers>='] = $search_code_tiers_start;
+	$filter['t.subledger_account>='] = $search_subledger_account_start;
-	$options .= '&amp;search_code_tiers_start=' . $search_code_tiers_start;
+	$options .= '&amp;search_subledger_account_start=' . $search_subledger_account_start;
 }
-if (! empty($search_code_tiers_end)) {
+if (! empty($search_subledger_account_end)) {
-	$filter['t.code_tiers<='] = $search_code_tiers_end;
+	$filter['t.subledger_account<='] = $search_subledger_account_end;
-	$options .= '&amp;search_code_tiers_end=' . $search_code_tiers_end;
+	$options .= '&amp;search_subledger_account_end=' . $search_subledger_account_end;
 }
 if (! empty($search_label_compte)) {
 	$filter['t.label_compte'] = $search_label_compte;
@@ -154,10 +157,13 @@ if (! empty($search_code_journal)) {
 	$options .= '&amp;search_code_journal=' . $search_code_journal;
 }
 
+
 /*
- * Mode List
+ * Actions
  */
 
+llxHeader('', $langs->trans("Bookkeeping"));
+
 $nbtotalofrecords = '';
 if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
 	$nbtotalofrecords = $object->fetchAll($sortorder, $sortfield, 0, 0);
@@ -188,9 +194,9 @@ print $formaccounting->select_account($search_numero_compte_end, 'search_numero_
 print '</div>';
 print '<div class="liste_titre">';
 print $langs->trans('From') . ' ' . $langs->trans('ThirdPartyAccount') . ': ';
-print $formaccounting->select_auxaccount($search_code_tiers_start, 'search_code_tiers_start', 1);
+print $formaccounting->select_auxaccount($search_subledger_account_start, 'search_subledger_account_start', 1);
 print $langs->trans('To') . ' ' . $langs->trans('ThirdPartyAccount') . ': ';
-print $formaccounting->select_auxaccount($search_code_tiers_end, 'searchcode_tiers_end', 1);
+print $formaccounting->select_auxaccount($search_subledger_account_end, 'search_subledger_account_end', 1);
 print '</div>';
 print "<table class=\"noborder\" width=\"100%\">";
 
@@ -200,7 +206,7 @@ print_liste_field_titre($langs->trans("Doctype"), $_SERVER['PHP_SELF'], "t.doc_t
 print_liste_field_titre($langs->trans("Date"), $_SERVER['PHP_SELF'], "t.doc_date", "", $options, 'align="center"', $sortfield, $sortorder);
 print_liste_field_titre($langs->trans("Docref"), $_SERVER['PHP_SELF'], "t.doc_ref", "", $options, "", $sortfield, $sortorder);
 print_liste_field_titre($langs->trans("AccountAccounting"), $_SERVER['PHP_SELF'], "t.numero_compte", "", $options, "", $sortfield, $sortorder);
-print_liste_field_titre($langs->trans("ThirdPartyAccount"), $_SERVER['PHP_SELF'], "t.code_tiers", "", $options, "", $sortfield, $sortorder);
+print_liste_field_titre($langs->trans("ThirdPartyAccount"), $_SERVER['PHP_SELF'], "t.subledger_account", "", $options, "", $sortfield, $sortorder);
 print_liste_field_titre($langs->trans("Label"), $_SERVER['PHP_SELF'], "t.label_compte", "", $options, "", $sortfield, $sortorder);
 print_liste_field_titre($langs->trans("Debit"), $_SERVER['PHP_SELF'], "t.debit", "", $options, "", $sortfield, $sortorder);
 print_liste_field_titre($langs->trans("Credit"), $_SERVER['PHP_SELF'], "t.credit", "", $options, 'align="center"', $sortfield, $sortorder);
@@ -232,7 +238,7 @@ print '<input type="text" size=6 class="flat" name="search_numero_compte" value=
 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_subledger_account" value="' . $search_subledger_account . '"/>';
 print '</td>';
 
 print '<td class="liste_titre">';
@@ -264,8 +270,6 @@ print '</td>';
 
 print "</tr>\n";
 
-$var = True;
-
 foreach ( $object->lines as $line ) {
 
 	print '<tr class="oddeven">';
@@ -274,7 +278,7 @@ foreach ( $object->lines as $line ) {
 	print '<td align="center">' . dol_print_date($line->doc_date) . '</td>';
 	print '<td>' . $line->doc_ref . '</td>';
 	print '<td>' . length_accountg($line->numero_compte) . '</td>';
-	print '<td>' . length_accounta($line->code_tiers) . '</td>';
+	print '<td>' . length_accounta($line->subledger_account) . '</td>';
 	print '<td>' . $line->label_compte . '</td>';
 	print '<td align="right">' . price($line->debit) . '</td>';
 	print '<td align="right">' . price($line->credit) . '</td>';

htdocs/accountancy/class/accountancycategory.class.php

@@ -332,7 +332,7 @@ class AccountancyCategory
 	}
 
 	/**
-	 * Function to show result of an accounting account from the general ledger with a sens and a period
+	 * Function to show result of an accounting account from the ledger with a direction and a period
 	 *
 	 * @param int $cpt Id accounting account
 	 * @param string $month Specifig month - Can be empty

htdocs/accountancy/class/accountancyexport.class.php

@@ -172,7 +172,7 @@ class AccountancyExport
 			print $date . $this->separator;
 			print $line->doc_ref . $this->separator;
 			print length_accountg($line->numero_compte) . $this->separator;
-			print length_accounta($line->code_tiers) . $this->separator;
+			print length_accounta($line->subledger_account) . $this->separator;
 			print price($line->debit) . $this->separator;
 			print price($line->credit) . $this->separator;
 			print $line->code_journal . $this->separator;
@@ -195,7 +195,7 @@ class AccountancyExport
 			print $date . $separator;
 			print $line->code_journal . $separator;
 			print length_accountg($line->numero_compte) . $separator;
-			print length_accounta($line->code_tiers) . $separator;
+			print length_accounta($line->subledger_account) . $separator;
 			print $line->sens . $separator;
 			print price($line->montant) . $separator;
 			print $line->label_compte . $separator;
@@ -254,7 +254,7 @@ class AccountancyExport
 			print price($line->debit) . $this->separator;
 			print price($line->credit) . $this->separator;
 			print 'E' . $this->separator;
-			print length_accountg($line->code_tiers) . $this->separator;
+			print length_accountg($line->subledger_account) . $this->separator;
 			print $this->end_line;
 		}
 	}
@@ -274,7 +274,7 @@ class AccountancyExport
 			$date = dol_print_date($line->doc_date, '%d/%m/%Y');
 			print $date . $this->separator;
 
-			if (empty($line->code_tiers)) {
+			if (empty($line->subledger_account)) {
 				print 'G' . $this->separator;
 				print length_accounta($line->numero_compte) . $this->separator;
 			} else {
@@ -284,7 +284,7 @@ class AccountancyExport
 				if (substr($line->numero_compte, 0, 3) == '401') {
 					print 'F' . $this->separator;
 				}
-				print length_accountg($line->code_tiers) . $this->separator;
+				print length_accountg($line->subledger_account) . $this->separator;
 			}
 
 			print price($line->debit) . $this->separator;
@@ -307,11 +307,11 @@ class AccountancyExport
 		$this->end_line ="\r\n";
 
 		$i = 1;
-		$date_ecriture = dol_print_date(time(), $conf->global->ACCOUNTING_EXPORT_DATE); // format must be yyyymmdd
+		$date_ecriture = dol_print_date(dol_now(), $conf->global->ACCOUNTING_EXPORT_DATE); // format must be yyyymmdd
 		foreach ( $TData as $data ) {
 			$code_compta = $data->numero_compte;
-			if (! empty($data->code_tiers))
+			if (! empty($data->subledger_account))
-				$code_compta = $data->code_tiers;
+				$code_compta = $data->subledger_account;
 
 			$Tab = array ();
 			$Tab['num_ecriture'] = str_pad($i, 5);
@@ -349,8 +349,8 @@ class AccountancyExport
 		$date_ecriture = dol_print_date(time(), $conf->global->ACCOUNTING_EXPORT_DATE); // format must be ddmmyy
 		foreach ( $TData as $data ) {
 			$code_compta = $data->numero_compte;
-			if (! empty($data->code_tiers))
+			if (! empty($data->subledger_account))
-				$code_compta = $data->code_tiers;
+				$code_compta = $data->subledger_account;
 
 			$Tab = array ();
 			$Tab['type_ligne'] = 'M';
@@ -437,18 +437,20 @@ class AccountancyExport
 			print $date . $this->separator;
 			print '"'.dol_trunc($line->piece_num,15,'right','UTF-8',1).'"'.$this->separator;
 
-			if (empty($line->code_tiers)) {
+			if (empty($line->subledger_account)) {
 				print length_accountg($line->numero_compte) . $this->separator;
 			} else {
+			    // FIXME Because the subledger_account is already an accounting account, does we really need
+			    // to concat 4011 or 401 to it ?
 				if (substr($line->numero_compte, 0, 1) == 'C' || substr($line->numero_compte, 0, 1) == '9') {
-					print '411' . substr(str_replace(" ", "", $line->code_tiers), 0, 5) . $this->separator;
+					print '411' . substr(str_replace(" ", "", $line->subledger_account), 0, 5) . $this->separator;
 				}
 				if (substr($line->numero_compte, 0, 1) == 'F' || substr($line->numero_compte, 0, 1) == '0') {
-					print '401' . substr(str_replace(" ", "", $line->code_tiers), 0, 5) . $this->separator;
+					print '401' . substr(str_replace(" ", "", $line->subledger_account), 0, 5) . $this->separator;
 				}
 			}
 
-			print length_accounta($line->code_tiers) . $this->separator;
+			print length_accounta($line->subledger_account) . $this->separator;
 			print price($line->debit) . $this->separator;
 			print price($line->credit) . $this->separator;
 			print price($line->montant).$this->separator;

htdocs/accountancy/class/accountingjournal.class.php

@@ -62,9 +62,9 @@ class AccountingJournal extends CommonObject
 			$sql.= " FROM ".MAIN_DB_PREFIX."accounting_journal";
 			$sql .= " WHERE";
 			if ($rowid) {
-				$sql .= " rowid = '" . $rowid . "'";
+				$sql .= " rowid = " . (int) $rowid;
 			} elseif ($journal_code) {
-				$sql .= " code = '" . $journal_code . "'";
+				$sql .= " code = '" . $this->db->escape($journal_code) . "'";
 			}
 
 			dol_syslog(get_class($this)."::fetch sql=" . $sql, LOG_DEBUG);

htdocs/accountancy/class/bookkeeping.class.php

@@ -20,14 +20,14 @@
 /**
  *	\file       htdocs/accountancy/class/bookkeeping.class.php
  *	\ingroup    Advanced accountancy
- *	\brief      File of class to manage general ledger
+ *	\brief      File of class to manage Ledger (General Ledger and Subledger)
  */
 
 // Class
 require_once DOL_DOCUMENT_ROOT . '/core/class/commonobject.class.php';
 
 /**
- * Class to manage general ledger
+ * Class to manage Ledger (General Ledger and Subledger)
  */
 class BookKeeping extends CommonObject
 {
@@ -75,7 +75,9 @@ class BookKeeping extends CommonObject
 	public $doc_ref;
 	public $fk_doc;
 	public $fk_docdet;
-	public $code_tiers;
+	public $thirdparty_code;
+	public $subledger_account;
+	public $subledger_label;
 	public $numero_compte;
 	public $label_compte;
 	public $debit;
@@ -127,8 +129,14 @@ class BookKeeping extends CommonObject
 		if (isset($this->fk_docdet)) {
 			$this->fk_docdet = trim($this->fk_docdet);
 		}
-		if (isset($this->code_tiers)) {
+		if (isset($this->thirdparty_code)) {
-			$this->code_tiers = trim($this->code_tiers);
+			$this->thirdparty_code = trim($this->thirdparty_code);
+		}
+		if (isset($this->subledger_account)) {
+			$this->subledger_account = trim($this->subledger_account);
+		}
+		if (isset($this->subledger_label)) {
+			$this->subledger_label = trim($this->subledger_label);
 		}
 		if (isset($this->numero_compte)) {
 			$this->numero_compte = trim($this->numero_compte);
@@ -244,7 +252,9 @@ class BookKeeping extends CommonObject
 				$sql .= ", doc_ref";
 				$sql .= ", fk_doc";
 				$sql .= ", fk_docdet";
-				$sql .= ", code_tiers";
+				$sql .= ", thirdparty_code";
+				$sql .= ", subledger_account";
+				$sql .= ", subledger_label";
 				$sql .= ", numero_compte";
 				$sql .= ", label_compte";
 				$sql .= ", debit";
@@ -259,22 +269,24 @@ class BookKeeping extends CommonObject
 				$sql .= ', entity';
 				$sql .= ") VALUES (";
 				$sql .= "'" . $this->db->idate($this->doc_date) . "'";
-				$sql .= ",'" . $this->doc_type . "'";
+				$sql .= ",'" . $this->db->escape($this->doc_type) . "'";
-				$sql .= ",'" . $this->doc_ref . "'";
+				$sql .= ",'" . $this->db->escape($this->doc_ref) . "'";
 				$sql .= "," . $this->fk_doc;
 				$sql .= "," . $this->fk_docdet;
-				$sql .= ",'" . $this->code_tiers . "'";
+				$sql .= ",'" . $this->db->escape($this->thirdparty_code) . "'";
-				$sql .= ",'" . $this->numero_compte . "'";
+				$sql .= ",'" . $this->db->escape($this->subledger_account) . "'";
+				$sql .= ",'" . $this->db->escape($this->subledger_label) . "'";
+				$sql .= ",'" . $this->db->escape($this->numero_compte) . "'";
 				$sql .= ",'" . $this->db->escape($this->label_compte) . "'";
 				$sql .= "," . $this->debit;
 				$sql .= "," . $this->credit;
 				$sql .= "," . $this->montant;
-				$sql .= ",'" . $this->sens . "'";
+				$sql .= ",'" . $this->db->escape($this->sens) . "'";
-				$sql .= ",'" . $this->fk_user_author . "'";
+				$sql .= ",'" . $this->db->escape($this->fk_user_author) . "'";
 				$sql .= ",'" . $this->db->idate($this->date_create). "'";
-				$sql .= ",'" . $this->code_journal . "'";
+				$sql .= ",'" . $this->db->escape($this->code_journal) . "'";
-				$sql .= ",'" . $this->journal_label . "'";
+				$sql .= ",'" . $this->db->escape($this->journal_label) . "'";
-				$sql .= "," . $this->piece_num;
+				$sql .= "," . $this->db->escape($this->piece_num);
 				$sql .= ", " . (! isset($this->entity) ? '1' : $this->entity);
 				$sql .= ")";
 
@@ -360,8 +372,14 @@ class BookKeeping extends CommonObject
 		if (isset($this->fk_docdet)) {
 			$this->fk_docdet = trim($this->fk_docdet);
 		}
-		if (isset($this->code_tiers)) {
+		if (isset($this->thirdparty_code)) {
-			$this->code_tiers = trim($this->code_tiers);
+			$this->thirdparty_code = trim($this->thirdparty_code);
+		}
+		if (isset($this->subledger_account)) {
+			$this->subledger_account = trim($this->subledger_account);
+		}
+		if (isset($this->subledger_label)) {
+			$this->subledger_label = trim($this->subledger_label);
 		}
 		if (isset($this->numero_compte)) {
 			$this->numero_compte = trim($this->numero_compte);
@@ -409,7 +427,9 @@ class BookKeeping extends CommonObject
 		$sql .= 'doc_ref,';
 		$sql .= 'fk_doc,';
 		$sql .= 'fk_docdet,';
-		$sql .= 'code_tiers,';
+		$sql .= 'thirdparty,';
+		$sql .= 'subledger_account,';
+		$sql .= 'subledger_label,';
 		$sql .= 'numero_compte,';
 		$sql .= 'label_compte,';
 		$sql .= 'debit,';
@@ -428,7 +448,9 @@ class BookKeeping extends CommonObject
 		$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->thirdparty_code) ? 'NULL' : "'" . $this->db->escape($this->thirdparty_code) . "'") . ',';
+		$sql .= ' ' . (! isset($this->subledger_account) ? 'NULL' : "'" . $this->db->escape($this->subledger_account) . "'") . ',';
+		$sql .= ' ' . (! isset($this->subledger_label) ? 'NULL' : "'" . $this->db->escape($this->subledger_label) . "'") . ',';
 		$sql .= ' ' . (! isset($this->numero_compte) ? "'NotDefined'" : "'" . $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 ). ',';
@@ -498,7 +520,9 @@ class BookKeeping extends CommonObject
 		$sql .= " t.doc_ref,";
 		$sql .= " t.fk_doc,";
 		$sql .= " t.fk_docdet,";
-		$sql .= " t.code_tiers,";
+		$sql .= " t.thirdparty_code,";
+		$sql .= " t.subledger_account,";
+		$sql .= " t.subledger_label,";
 		$sql .= " t.numero_compte,";
 		$sql .= " t.label_compte,";
 		$sql .= " t.debit,";
@@ -532,7 +556,9 @@ class BookKeeping extends CommonObject
 				$this->doc_ref = $obj->doc_ref;
 				$this->fk_doc = $obj->fk_doc;
 				$this->fk_docdet = $obj->fk_docdet;
-				$this->code_tiers = $obj->code_tiers;
+				$this->thirdparty_code = $obj->thirdparty_code;
+				$this->subledger_account = $obj->subledger_account;
+				$this->subledger_label = $obj->subledger_label;
 				$this->numero_compte = $obj->numero_compte;
 				$this->label_compte = $obj->label_compte;
 				$this->debit = $obj->debit;
@@ -584,7 +610,9 @@ class BookKeeping extends CommonObject
 		$sql .= " t.doc_ref,";
 		$sql .= " t.fk_doc,";
 		$sql .= " t.fk_docdet,";
-		$sql .= " t.code_tiers,";
+		$sql .= " t.thirdparty_code,";
+		$sql .= " t.subledger_account,";
+		$sql .= " t.subledger_label,";
 		$sql .= " t.numero_compte,";
 		$sql .= " t.label_compte,";
 		$sql .= " t.debit,";
@@ -604,11 +632,11 @@ class BookKeeping extends CommonObject
 					$sqlwhere[] = $key . '=\'' . $this->db->idate($value) . '\'';
 				} elseif ($key == 't.doc_date>=' || $key == 't.doc_date<=') {
 					$sqlwhere[] = $key . '\'' . $this->db->idate($value) . '\'';
-				} elseif ($key == 't.numero_compte>=' || $key == 't.numero_compte<=' || $key == 't.code_tiers>=' || $key == 't.code_tiers<=') {
+				} elseif ($key == 't.numero_compte>=' || $key == 't.numero_compte<=' || $key == 't.subledger_account>=' || $key == 't.subledger_account<=') {
 					$sqlwhere[] = $key . '\'' . $this->db->escape($value) . '\'';
 				} elseif ($key == 't.fk_doc' || $key == 't.fk_docdet' || $key == 't.piece_num') {
 					$sqlwhere[] = $key . '=' . $value;
-				} elseif ($key == 't.code_tiers' || $key == 't.numero_compte') {
+				} elseif ($key == 't.subledger_account' || $key == 't.numero_compte') {
 					$sqlwhere[] = $key . ' LIKE \'' . $this->db->escape($value) . '%\'';
 				} elseif ($key == 't.label_compte') {
 					$sqlwhere[] = $key . ' LIKE \'' . $this->db->escape($value) . '%\'';
@@ -647,7 +675,9 @@ class BookKeeping extends CommonObject
 				$line->doc_ref = $obj->doc_ref;
 				$line->fk_doc = $obj->fk_doc;
 				$line->fk_docdet = $obj->fk_docdet;
-				$line->code_tiers = $obj->code_tiers;
+				$line->thirdparty_code = $obj->thirdparty_code;
+				$line->subledger_account = $obj->subledger_account;
+				$line->subledger_label = $obj->subledger_label;
 				$line->numero_compte = $obj->numero_compte;
 				$line->label_compte = $obj->label_compte;
 				$line->debit = $obj->debit;
@@ -698,7 +728,9 @@ class BookKeeping extends CommonObject
 		$sql .= " t.doc_ref,";
 		$sql .= " t.fk_doc,";
 		$sql .= " t.fk_docdet,";
-		$sql .= " t.code_tiers,";
+		$sql .= " t.thirdparty_code,";
+		$sql .= " t.subledger_account,";
+		$sql .= " t.subledger_label,";
 		$sql .= " t.numero_compte,";
 		$sql .= " t.label_compte,";
 		$sql .= " t.debit,";
@@ -719,11 +751,11 @@ class BookKeeping extends CommonObject
 					$sqlwhere[] = $key . '=\'' . $this->db->idate($value) . '\'';
 				} elseif ($key == 't.doc_date>=' || $key == 't.doc_date<=') {
 					$sqlwhere[] = $key . '\'' . $this->db->idate($value) . '\'';
-				} elseif ($key == 't.numero_compte>=' || $key == 't.numero_compte<=' || $key == 't.code_tiers>=' || $key == 't.code_tiers<=') {
+				} elseif ($key == 't.numero_compte>=' || $key == 't.numero_compte<=' || $key == 't.subledger_account>=' || $key == 't.subledger_account<=') {
 					$sqlwhere[] = $key . '\'' . $this->db->escape($value) . '\'';
 				} elseif ($key == 't.fk_doc' || $key == 't.fk_docdet' || $key == 't.piece_num') {
 					$sqlwhere[] = $key . '=' . $value;
-				} elseif ($key == 't.code_tiers' || $key == 't.numero_compte') {
+				} elseif ($key == 't.subledger_account' || $key == 't.numero_compte') {
 					$sqlwhere[] = $key . ' LIKE \'' . $this->db->escape($value) . '%\'';
 				} else {
 					$sqlwhere[] = $key . ' LIKE \'%' . $this->db->escape($value) . '%\'';
@@ -758,7 +790,9 @@ class BookKeeping extends CommonObject
 				$line->doc_ref = $obj->doc_ref;
 				$line->fk_doc = $obj->fk_doc;
 				$line->fk_docdet = $obj->fk_docdet;
-				$line->code_tiers = $obj->code_tiers;
+				$line->thirdparty_code = $obj->thirdparty_code;
+				$line->subledger_account = $obj->subledger_account;
+				$line->subledger_label = $obj->subledger_label;
 				$line->numero_compte = $obj->numero_compte;
 				$line->label_compte = $obj->label_compte;
 				$line->debit = $obj->debit;
@@ -814,11 +848,11 @@ class BookKeeping extends CommonObject
 					$sqlwhere[] = $key . '=\'' . $this->db->idate($value) . '\'';
 				} elseif ($key == 't.doc_date>=' || $key == 't.doc_date<=') {
 					$sqlwhere[] = $key . '\'' . $this->db->idate($value) . '\'';
-				} elseif ($key == 't.numero_compte>=' || $key == 't.numero_compte<=' || $key == 't.code_tiers>=' || $key == 't.code_tiers<=') {
+				} elseif ($key == 't.numero_compte>=' || $key == 't.numero_compte<=' || $key == 't.subledger_account>=' || $key == 't.subledger_account<=') {
 					$sqlwhere[] = $key . '\'' . $this->db->escape($value) . '\'';
 				} elseif ($key == 't.fk_doc' || $key == 't.fk_docdet' || $key == 't.piece_num') {
 					$sqlwhere[] = $key . '=' . $value;
-				} elseif ($key == 't.code_tiers' || $key == 't.numero_compte') {
+				} elseif ($key == 't.subledger_account' || $key == 't.numero_compte') {
 					$sqlwhere[] = $key . ' LIKE \'' . $this->db->escape($value) . '%\'';
 				} else {
 					$sqlwhere[] = $key . ' LIKE \'%' . $this->db->escape($value) . '%\'';
@@ -890,8 +924,14 @@ class BookKeeping extends CommonObject
 		if (isset($this->fk_docdet)) {
 			$this->fk_docdet = trim($this->fk_docdet);
 		}
-		if (isset($this->code_tiers)) {
+		if (isset($this->thirdparty_code)) {
-			$this->code_tiers = trim($this->code_tiers);
+			$this->thirdparty_code = trim($this->thirdparty_code);
+		}
+		if (isset($this->subledger_account)) {
+			$this->subledger_account = trim($this->subledger_account);
+		}
+		if (isset($this->subledger_label)) {
+			$this->subledger_label = trim($this->subledger_label);
 		}
 		if (isset($this->numero_compte)) {
 			$this->numero_compte = trim($this->numero_compte);
@@ -937,7 +977,9 @@ class BookKeeping extends CommonObject
 		$sql .= ' doc_ref = ' . (isset($this->doc_ref) ? "'" . $this->db->escape($this->doc_ref) . "'" : "null") . ',';
 		$sql .= ' fk_doc = ' . (isset($this->fk_doc) ? $this->fk_doc : "null") . ',';
 		$sql .= ' fk_docdet = ' . (isset($this->fk_docdet) ? $this->fk_docdet : "null") . ',';
-		$sql .= ' code_tiers = ' . (isset($this->code_tiers) ? "'" . $this->db->escape($this->code_tiers) . "'" : "null") . ',';
+		$sql .= ' thirdparty_code = ' . (isset($this->thirdparty_code) ? "'" . $this->db->escape($this->thirdparty_code) . "'" : "null") . ',';
+		$sql .= ' subledger_account = ' . (isset($this->subledger_account) ? "'" . $this->db->escape($this->subledger_account) . "'" : "null") . ',';
+		$sql .= ' subledger_label = ' . (isset($this->subledger_label) ? "'" . $this->db->escape($this->subledger_label) . "'" : "null") . ',';
 		$sql .= ' numero_compte = ' . (isset($this->numero_compte) ? "'" . $this->db->escape($this->numero_compte) . "'" : "null") . ',';
 		$sql .= ' label_compte = ' . (isset($this->label_compte) ? "'" . $this->db->escape($this->label_compte) . "'" : "null") . ',';
 		$sql .= ' debit = ' . (isset($this->debit) ? $this->debit : "null") . ',';
@@ -1196,8 +1238,10 @@ class BookKeeping extends CommonObject
 		$this->doc_ref = '';
 		$this->fk_doc = '';
 		$this->fk_docdet = '';
-		$this->code_tiers = '';
+		$this->thirdparty_code = 'CU001';
-		$this->numero_compte = '';
+		$this->subledger_account = '410CU001';
+		$this->subledger_label = 'My customer company';
+		$this->numero_compte = '410';
 		$this->label_compte = '';
 		$this->debit = 99.9;
 		$this->credit = '';
@@ -1205,8 +1249,8 @@ class BookKeeping extends CommonObject
 		$this->sens = '';
 		$this->fk_user_author = $user->id;
 		$this->import_key = '';
-		$this->code_journal = '';
+		$this->code_journal = 'VT';
-		$this->journal_label = '';
+		$this->journal_label = 'Journal de vente';
 		$this->piece_num = '';
 	}
 
@@ -1281,7 +1325,7 @@ class BookKeeping extends CommonObject
 		global $conf;
 
 		$sql = "SELECT rowid, doc_date, doc_type,";
-		$sql .= " doc_ref, fk_doc, fk_docdet, code_tiers,";
+		$sql .= " doc_ref, fk_doc, fk_docdet, thirdparty_code, subledger_account, subledger_label,";
 		$sql .= " numero_compte, label_compte, debit, credit,";
 		$sql .= " montant, sens, fk_user_author, import_key, code_journal, journal_label, piece_num";
 		$sql .= " FROM " . MAIN_DB_PREFIX . $this->table_element;
@@ -1303,7 +1347,9 @@ class BookKeeping extends CommonObject
 				$line->doc_ref = $obj->doc_ref;
 				$line->fk_doc = $obj->fk_doc;
 				$line->fk_docdet = $obj->fk_docdet;
-				$line->code_tiers = $obj->code_tiers;
+				$line->thirdparty_code = $obj->thirdparty_code;
+				$line->subledger_account = $obj->subledger_account;
+				$line->subledger_label = $obj->subledger_label;
 				$line->numero_compte = $obj->numero_compte;
 				$line->label_compte = $obj->label_compte;
 				$line->debit = $obj->debit;
@@ -1335,7 +1381,7 @@ class BookKeeping extends CommonObject
 		global $conf;
 
 		$sql = "SELECT rowid, doc_date, doc_type,";
-		$sql .= " doc_ref, fk_doc, fk_docdet, code_tiers,";
+		$sql .= " doc_ref, fk_doc, fk_docdet, thirdparty_code, subledger_account, subledger_label,";
 		$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;
@@ -1359,7 +1405,9 @@ class BookKeeping extends CommonObject
 				$line->doc_ref = $obj->doc_ref;
 				$line->fk_doc = $obj->fk_doc;
 				$line->fk_docdet = $obj->fk_docdet;
-				$line->code_tiers = $obj->code_tiers;
+				$line->thirdparty_code = $obj->thirdparty_code;
+				$line->subledger_account = $obj->subledger_account;
+				$line->subledger_label = $obj->subledger_label;
 				$line->numero_compte = $obj->numero_compte;
 				$line->label_compte = $obj->label_compte;
 				$line->debit = $obj->debit;
@@ -1547,7 +1595,9 @@ class BookKeepingLine
 	public $doc_ref;
 	public $fk_doc;
 	public $fk_docdet;
-	public $code_tiers;
+	public $thirdparty_code;
+	public $subledger_account;
+	public $subledger_label;
 	public $numero_compte;
 	public $label_compte;
 	public $debit;

htdocs/accountancy/index.php

@@ -63,8 +63,6 @@ print load_fiche_titre($langs->trans("AccountancyArea"), '', 'title_accountancy'
 
 $step = 0;
 
-print "<br>\n";
-
 print $langs->trans("AccountancyAreaDescIntro")."<br>\n";
 print "<br>\n";print "<br>\n";
 

htdocs/accountancy/journal/bankjournal.php

@@ -364,7 +364,7 @@ if (! $error && $action == 'writebookkeeping') {
 					$bookkeeping->date_create = $now;
 
 					if ($tabtype[$key] == 'payment') {
-						$bookkeeping->code_tiers = $tabcompany[$key]['code_compta'];
+						$bookkeeping->subledger_account = $tabcompany[$key]['code_compta'];
 
 						$sqlmid = 'SELECT fac.facnumber';
 						$sqlmid .= " FROM " . MAIN_DB_PREFIX . "facture fac";
@@ -378,7 +378,7 @@ if (! $error && $action == 'writebookkeeping') {
 							$bookkeeping->doc_ref = $objmid->facnumber;	// Ref of invoice
 						}
 					} else if ($tabtype[$key] == 'payment_supplier') {
-						$bookkeeping->code_tiers = $tabcompany[$key]['code_compta'];
+						$bookkeeping->subledger_account = $tabcompany[$key]['code_compta'];
 
 						$sqlmid = 'SELECT facf.ref_supplier, facf.ref';
 						$sqlmid .= " FROM " . MAIN_DB_PREFIX . "facture_fourn facf";
@@ -392,7 +392,7 @@ if (! $error && $action == 'writebookkeeping') {
 							$bookkeeping->doc_ref = $objmid->ref_supplier . ' (' . $objmid->ref . ')'; // Ref on invoice
 						}
 					} else if ($tabtype[$key] == 'payment_expensereport') {
-						$bookkeeping->code_tiers = $tabuser[$key]['accountancy_code'];
+						$bookkeeping->subledger_account = $tabuser[$key]['accountancy_code'];
 
 						$sqlmid = 'SELECT e.ref';
 						$sqlmid .= " FROM " . MAIN_DB_PREFIX . "expensereport as e";
@@ -405,13 +405,13 @@ if (! $error && $action == 'writebookkeeping') {
 							$bookkeeping->doc_ref = $objmid->ref; // Ref of expensereport
 						}
 					} else if ($tabtype[$key] == 'payment_vat') {
-						$bookkeeping->code_tiers = '';
+						$bookkeeping->subledger_account = '';
 						$bookkeeping->doc_ref = $langs->trans("PaymentVat") . ' (' . $val["paymentvatid"] . ')'; // Rowid of vat payment
 					} else if ($tabtype[$key] == 'payment_donation') {
-						$bookkeeping->code_tiers = '';
+						$bookkeeping->subledger_account = '';
 						$bookkeeping->doc_ref = $langs->trans("Donation") . ' (' . $val["paymentdonationid"] . ')'; // Rowid of donation
 					} else if ($tabtype[$key] == 'payment_salary') {
-						$bookkeeping->code_tiers = '';
+						$bookkeeping->subledger_account = '';
 						$bookkeeping->label_compte = $tabuser[$key]['name'];
 						$bookkeeping->doc_ref = $langs->trans("SalaryPayment") . ' (' . $val["paymentsalid"] . ')'; // Ref of salary payment
 					}
@@ -458,7 +458,7 @@ if (! $error && $action == 'writebookkeeping') {
 					$bookkeeping->date_create = $now;
 
 					if (in_array($tabtype[$key], array('sc', 'payment_sc'))) {   // If payment is payment of social contribution
-						$bookkeeping->code_tiers = '';
+						$bookkeeping->subledger_account = '';
 						$bookkeeping->numero_compte = $k;
 					} else if ($tabtype[$key] == 'payment') {	// If payment is payment of customer invoice, we get ref of invoice
 						$sqlmid = 'SELECT fac.facnumber';
@@ -472,7 +472,7 @@ if (! $error && $action == 'writebookkeeping') {
 							$objmid = $db->fetch_object($resultmid);
 							$bookkeeping->doc_ref = $objmid->facnumber;
 						}
-						$bookkeeping->code_tiers = $tabcompany[$key]['code_compta'];
+						$bookkeeping->subledger_account = $tabcompany[$key]['code_compta'];
 						$bookkeeping->numero_compte = $k;
 					} else if ($tabtype[$key] == 'payment_supplier') {		   // If payment is payment of supplier invoice, we get ref of invoice
 						$sqlmid = 'SELECT facf.ref_supplier,facf.ref';
@@ -486,23 +486,23 @@ if (! $error && $action == 'writebookkeeping') {
 							$objmid = $db->fetch_object($resultmid);
 							$bookkeeping->doc_ref = $objmid->ref_supplier . ' (' . $objmid->ref . ')';
 						}
-						$bookkeeping->code_tiers = $tabcompany[$key]['code_compta'];
+						$bookkeeping->subledger_account = $tabcompany[$key]['code_compta'];
 						$bookkeeping->numero_compte = $k;
 					} else if ($tabtype[$key] == 'payment_vat') {
-						$bookkeeping->code_tiers = '';
+						$bookkeeping->subledger_account = '';
 						$bookkeeping->numero_compte = $k;
 						$bookkeeping->doc_ref = $langs->trans("PaymentVat") . ' (' . $val["paymentvatid"] . ')'; // Rowid of vat
 					} else if ($tabtype[$key] == 'payment_donation') {
-						$bookkeeping->code_tiers = '';
+						$bookkeeping->subledger_account = '';
 						$bookkeeping->numero_compte = $k;
 						$bookkeeping->doc_ref = $langs->trans("Donation") . ' (' . $val["paymentdonationid"] . ')'; // Rowid of donation
 					} else if ($tabtype[$key] == 'payment_salary') {
-						$bookkeeping->code_tiers = $tabuser[$key]['accountancy_code'];
+						$bookkeeping->subledger_account = $tabuser[$key]['accountancy_code'];
 						$bookkeeping->numero_compte = $conf->global->SALARIES_ACCOUNTING_ACCOUNT_PAYMENT;
 						$bookkeeping->label_compte = $tabuser[$key]['name'];
 						$bookkeeping->doc_ref = $langs->trans("SalaryPayment") . ' (' . $val["paymentsalid"] . ')'; // Rowid of salary payment
 					} else if ($tabtype[$key] == 'banktransfert') {
-						$bookkeeping->code_tiers = '';
+						$bookkeeping->subledger_account = '';
 						$bookkeeping->numero_compte = $k;
 					} else {
 						// FIXME Should be a temporary account ???
@@ -758,7 +758,7 @@ if (empty($action) || $action == 'view') {
 		print '<input type="button" class="butAction" style="float: right;" value="' . $langs->trans("Export") . '" onclick="launch_export();" />';
 	}*/
 
-	print '<div class="tabsAction">';
+	print '<div class="tabsAction tabsActionNoBottom">';
 	print '<input type="button" class="butAction" value="' . $langs->trans("WriteBookKeeping") . '" onclick="writebookkeeping();" />';
 	print '</div>';
 

htdocs/accountancy/journal/expensereportsjournal.php

@@ -175,7 +175,8 @@ if ($action == 'writebookkeeping') {
 					$bookkeeping->doc_type = 'expense_report';
 					$bookkeeping->fk_doc = $key;
 					$bookkeeping->fk_docdet = $val["fk_expensereportdet"];
-					$bookkeeping->code_tiers = $tabuser[$key]['user_accountancy_code'];
+					$bookkeeping->subledger_account = $tabuser[$key]['user_accountancy_code'];
+					$bookkeeping->subledger_label = $tabuser[$key]['user_accountancy_code'];
 					$bookkeeping->label_compte = $tabuser[$key]['name'];
 					$bookkeeping->numero_compte = $conf->global->SALARIES_ACCOUNTING_ACCOUNT_PAYMENT;
 					$bookkeeping->montant = $mt;
@@ -222,7 +223,8 @@ if ($action == 'writebookkeeping') {
 						$bookkeeping->doc_type = 'expense_report';
 						$bookkeeping->fk_doc = $key;
 						$bookkeeping->fk_docdet = $val["fk_expensereportdet"];
-						$bookkeeping->code_tiers = '';
+						$bookkeeping->subledger_account = '';
+						$bookkeeping->subledger_label = '';
 						$bookkeeping->label_compte = $accountingaccount->label;
 						$bookkeeping->numero_compte = $k;
 						$bookkeeping->montant = $mt;
@@ -267,7 +269,8 @@ if ($action == 'writebookkeeping') {
 					$bookkeeping->doc_type = 'expense_report';
 					$bookkeeping->fk_doc = $key;
 					$bookkeeping->fk_docdet = $val["fk_expensereportdet"];
-					$bookkeeping->code_tiers = '';
+					$bookkeeping->subledger_account = '';
+					$bookkeeping->subledger_label = '';
 					$bookkeeping->label_compte = $langs->trans("VAT"). ' '.$def_tva[$key];
 					$bookkeeping->numero_compte = $k;
 					$bookkeeping->montant = $mt;
@@ -462,7 +465,7 @@ if (empty($action) || $action == 'view') {
 		print '<input type="button" class="butAction" style="float: right;" value="' . $langs->trans("Export") . '" onclick="launch_export();" />';
 	}*/
 
-	print '<div class="tabsAction">';
+	print '<div class="tabsAction tabsActionNoBottom">';
 	print '<input type="button" class="butAction" value="' . $langs->trans("WriteBookKeeping") . '" onclick="writebookkeeping();" />';
 	print '</div>';
 
@@ -576,7 +579,7 @@ if (empty($action) || $action == 'view') {
 			}
 			else print $accountoshow;
 			print "</td>";
-			print "<td>" . $userstatic->getNomUrl(0, 'user', 16) . ' - ' . $langs->trans("Code_tiers") . "</td>";
+			print "<td>" . $userstatic->getNomUrl(0, 'user', 16) . ' - ' . $langs->trans("subledger_account") . "</td>";
 			print '<td align="right">' . ($mt < 0 ? - price(- $mt) : '') . "</td>";
 			print '<td align="right">' . ($mt >= 0 ? price($mt) : '') . "</td>";
 			print "</tr>";

htdocs/accountancy/journal/purchasesjournal.php

@@ -214,9 +214,10 @@ if ($action == 'writebookkeeping') {
 					$bookkeeping->doc_type = 'supplier_invoice';
 					$bookkeeping->fk_doc = $key;
 					$bookkeeping->fk_docdet = 0;    // Useless, can be several lines that are source of this record to add
-					$bookkeeping->code_tiers = $tabcompany[$key]['code_fournisseur'];
+					$bookkeeping->thirdparty_code = $tabcompany[$key]['code_fournisseur'];
-					$bookkeeping->label_compte = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->refsupplier . ' - ' . $langs->trans("Code_tiers");
+					$bookkeeping->subledger_account = $tabcompany[$key]['code_compta_fournisseur'];
-					$bookkeeping->numero_compte = $tabcompany[$key]['code_compta_fournisseur'];
+					$bookkeeping->label_compte = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->refsupplier . ' - ' . $langs->trans("subledger_account");
+					$bookkeeping->numero_compte = $conf->global->ACCOUNTING_ACCOUNT_SUPPLIER;
 					$bookkeeping->montant = $mt;
 					$bookkeeping->sens = ($mt >= 0) ? 'C' : 'D';
 					$bookkeeping->debit = ($mt <= 0) ? $mt : 0;
@@ -261,7 +262,8 @@ if ($action == 'writebookkeeping') {
 						$bookkeeping->doc_type = 'supplier_invoice';
 						$bookkeeping->fk_doc = $key;
 						$bookkeeping->fk_docdet = 0;    // Useless, can be several lines that are source of this record to add
-						$bookkeeping->code_tiers = '';
+						$bookkeeping->subledger_account = '';
+						$bookkeeping->subledger_label = '';
 						$bookkeeping->label_compte = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->refsupplier . ' - ' . $accountingaccount->label;
 						$bookkeeping->numero_compte = $k;
 						$bookkeeping->montant = $mt;
@@ -306,7 +308,8 @@ if ($action == 'writebookkeeping') {
 					$bookkeeping->doc_type = 'supplier_invoice';
 					$bookkeeping->fk_doc = $key;
 					$bookkeeping->fk_docdet = 0;    // Useless, can be several lines that are source of this record to add
-					$bookkeeping->code_tiers = '';
+					$bookkeeping->subledger_account = '';
+					$bookkeeping->subledger_label = '';
 					$bookkeeping->label_compte = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->refsupplier . ' - ' . $langs->trans("VAT"). ' '.$def_tva[$key];
 					$bookkeeping->numero_compte = $k;
 					$bookkeeping->montant = $mt;
@@ -479,7 +482,7 @@ $companystatic = new Fournisseur($db);
 				print '"' . $date . '"' . $sep;
 				print '"' . $val["ref"] . '"' . $sep;
 				print '"' . length_accounta(html_entity_decode($k)) . '"' . $sep;
-				print '"' . dol_trunc($companystatic->name, 16) . ' - ' . $val["refsuppliersologest"] . ' - ' . $langs->trans("Code_tiers") . '"' . $sep;
+				print '"' . dol_trunc($companystatic->name, 16) . ' - ' . $val["refsuppliersologest"] . ' - ' . $langs->trans("subledger_account") . '"' . $sep;
 				print '"' . ($mt < 0 ? price(- $mt) : '') . '"' . $sep;
 				print '"' . ($mt >= 0 ? price($mt) : '') . '"';
 			}
@@ -518,7 +521,7 @@ if (empty($action) || $action == 'view') {
 		print '<input type="button" class="butAction" style="float: right;" value="' . $langs->trans("Export") . '" onclick="launch_export();" />';
 	}*/
 
-	print '<div class="tabsAction">';
+	print '<div class="tabsAction tabsActionNoBottom">';
 	print '<input type="button" class="butAction" value="' . $langs->trans("WriteBookKeeping") . '" onclick="writebookkeeping();" />';
 	print '</div>';
 
@@ -635,7 +638,7 @@ if (empty($action) || $action == 'view') {
 			}
 			else print $accountoshow;
 			print "</td>";
-			print "<td>" . $companystatic->getNomUrl(0, 'supplier', 16) . ' - ' . $invoicestatic->refsupplier . ' - ' . $langs->trans("Code_tiers") . "</td>";
+			print "<td>" . $companystatic->getNomUrl(0, 'supplier', 16) . ' - ' . $invoicestatic->refsupplier . ' - ' . $langs->trans("subledger_account") . "</td>";
 			// print "</td><td>" . $langs->trans("ThirdParty");
 			// print ' (' . $companystatic->getNomUrl(0, 'supplier', 16) . ')';
 			// print "</td>";

htdocs/accountancy/journal/sellsjournal.php

@@ -231,10 +231,10 @@ if ($action == 'writebookkeeping') {
 					$bookkeeping->doc_type = 'customer_invoice';
 					$bookkeeping->fk_doc = $key;
 					$bookkeeping->fk_docdet = 0;	// Useless, can be several lines that are source of this record to add
-					$bookkeeping->code_tiers = $tabcompany[$key]['code_client'];
+					$bookkeeping->thirdparty_code = $tabcompany[$key]['code_client'];
-					$bookkeeping->numero_compte = $tabcompany[$key]['code_compta'];
+					$bookkeeping->subledger_account = $tabcompany[$key]['code_compta'];
-					// $bookkeeping->label_compte = $tabcompany[$key]['name'];
+					$bookkeeping->numero_compte = $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER;
-					$bookkeeping->label_compte = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("Code_tiers");
+					$bookkeeping->label_compte = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("subledger_account");
 					$bookkeeping->montant = $mt;
 					$bookkeeping->sens = ($mt >= 0) ? 'D' : 'C';
 					$bookkeeping->debit = ($mt >= 0) ? $mt : 0;
@@ -277,7 +277,8 @@ if ($action == 'writebookkeeping') {
 						$bookkeeping->doc_type = 'customer_invoice';
 						$bookkeeping->fk_doc = $key;
 						$bookkeeping->fk_docdet = 0;	// Useless, can be several lines that are source of this record to add;
-						$bookkeeping->code_tiers = '';
+						$bookkeeping->subledger_account = '';
+						$bookkeeping->subledger_label = '';
 						$bookkeeping->numero_compte = $k;
 						$bookkeeping->label_compte = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->ref . ' - ' . $accountingaccount->label;
 						$bookkeeping->montant = $mt;
@@ -321,7 +322,8 @@ if ($action == 'writebookkeeping') {
 					$bookkeeping->doc_type = 'customer_invoice';
 					$bookkeeping->fk_doc = $key;
 					$bookkeeping->fk_docdet = 0;	// Useless, can be several lines that are source of this record to add
-					$bookkeeping->code_tiers = '';
+					$bookkeeping->subledger_account = '';
+					$bookkeeping->subledger_label = '';
 					$bookkeeping->numero_compte = $k;
 					$bookkeeping->label_compte = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("VAT").' '.$def_tva[$key];
 					$bookkeeping->montant = $mt;
@@ -416,7 +418,7 @@ $form = new Form($db);
 				print length_accounta(html_entity_decode($k)) . $sep;
 				print ($mt < 0 ? 'C' : 'D') . $sep;
 				print ($mt <= 0 ? price(- $mt) : $mt) . $sep;
-				print dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("Code_tiers") . $sep;
+				print dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("subledger_account") . $sep;
 				print $val["ref"];
 				print "\n";
 			}
@@ -469,7 +471,7 @@ $form = new Form($db);
 				print '"' . $date . '"' . $sep;
 				print '"' . $val["ref"] . '"' . $sep;
 				print '"' . length_accounta(html_entity_decode($k)) . '"' . $sep;
-				print '"' . dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("Code_tiers") . '"' . $sep;
+				print '"' . dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("subledger_account") . '"' . $sep;
 				print '"' . ($mt >= 0 ? price($mt) : '') . '"' . $sep;
 				print '"' . ($mt < 0 ? price(- $mt) : '') . '"';
 				print "\n";
@@ -535,7 +537,7 @@ if (empty($action) || $action == 'view') {
 	} else {
 		print '<input type="button" class="butAction" style="float: right;" value="' . $langs->trans("Export") . '" onclick="launch_export();" />';
 	}*/
-	print '<div class="tabsAction">';
+	print '<div class="tabsAction tabsActionNoBottom">';
 	print '<input type="button" class="butAction" value="' . $langs->trans("WriteBookKeeping") . '" onclick="writebookkeeping();" />';
 	print '</div>';
 
@@ -602,7 +604,7 @@ if (empty($action) || $action == 'view') {
 			// print "</td><td>" . $langs->trans("ThirdParty");
 			// print ' (' . $companystatic->getNomUrl(0, 'customer', 16) . ')';
 			print '</td>';
-			print "<td>" . $companystatic->getNomUrl(0, 'customer', 16) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("Code_tiers") . "</td>";
+			print "<td>" . $companystatic->getNomUrl(0, 'customer', 16) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("subledger_account") . "</td>";
 			print "<td align='right'>" . ($mt >= 0 ? price($mt) : '') . "</td>";
 			print "<td align='right'>" . ($mt < 0 ? price(- $mt) : '') . "</td>";
 			print "</tr>";

htdocs/core/modules/modAccounting.class.php

@@ -244,7 +244,7 @@ class modAccounting extends DolibarrModules
         */
 
 		$this->rights[$r][0] = 50411;
-		$this->rights[$r][1] = 'Read operations in General Ledger';
+		$this->rights[$r][1] = 'Read operations in Ledger';
 		$this->rights[$r][2] = 'r';
 		$this->rights[$r][3] = 0;
 		$this->rights[$r][4] = 'mouvements';
@@ -252,7 +252,7 @@ class modAccounting extends DolibarrModules
 		$r++;
 
 		$this->rights[$r][0] = 50412;
-		$this->rights[$r][1] = 'Write/Edit operations in General Ledger';
+		$this->rights[$r][1] = 'Write/Edit operations in Ledger';
 		$this->rights[$r][2] = 'w';
 		$this->rights[$r][3] = 0;
 		$this->rights[$r][4] = 'mouvements';
@@ -260,7 +260,7 @@ class modAccounting extends DolibarrModules
 		$r++;
 
 		$this->rights[$r][0] = 50420;
-		$this->rights[$r][1] = 'Report and export reports (turnover, balance, journals, general ledger)';
+		$this->rights[$r][1] = 'Report and export reports (turnover, balance, journals, ledger)';
 		$this->rights[$r][2] = 'r';
 		$this->rights[$r][3] = 0;
 		$this->rights[$r][4] = 'comptarapport';

htdocs/install/mysql/migration/5.0.0-6.0.0.sql

@@ -187,6 +187,7 @@ UPDATE llx_bank_account as ba set fk_accountancy_journal = (SELECT rowid FROM ll
 ALTER TABLE llx_bank_account ADD CONSTRAINT fk_bank_account_accountancy_journal FOREIGN KEY (fk_accountancy_journal) REFERENCES llx_accounting_journal (rowid);
 
 --Update general ledger for FEC format & harmonization
+
 ALTER TABLE llx_accounting_bookkeeping MODIFY COLUMN code_tiers varchar(32);
 ALTER TABLE llx_accounting_bookkeeping CHANGE COLUMN code_tiers thirdparty_code varchar(32);
 

htdocs/langs/en_US/accountancy.lang

@@ -49,8 +49,8 @@ AccountancyAreaDescLoan=STEP %s: Define default accounting accounts for loans. F
 AccountancyAreaDescBank=STEP %s: Define accounting accounts for each bank and financial accounts. For this, go on the card of each financial account. You can start from page %s.
 AccountancyAreaDescProd=STEP %s: Define accounting accounts on your products/services. For this, use the menu entry %s.
 
-AccountancyAreaDescBind=STEP %s: Check the binding between existing %s lines and accounting account is done, so application will be able to journalize transactions in General Ledger in one click. Complete missing bindings. For this, use the menu entry %s.
+AccountancyAreaDescBind=STEP %s: Check the binding between existing %s lines and accounting account is done, so application will be able to journalize transactions in Ledger in one click. Complete missing bindings. For this, use the menu entry %s.
-AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the General Ledger. For this, go into menu <strong>%s</strong>, and click into button <strong>%s</strong>. 
+AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the Ledger. For this, go into menu <strong>%s</strong>, and click into button <strong>%s</strong>. 
 AccountancyAreaDescAnalyze=STEP %s: Add or edit existing transactions and generate reports and exports.
 
 AccountancyAreaDescClosePeriod=STEP %s: Close period so we can't make modification in a future.
@@ -61,6 +61,8 @@ ChangeAndLoad=Change and load
 Addanaccount=Add an accounting account
 AccountAccounting=Accounting account
 AccountAccountingShort=Account
+SubledgerAccount=Subledger Account
+subledger_account=Subledger Account
 ShowAccountingAccount=Show accounting account
 ShowAccountingJournal=Show accounting journal
 AccountAccountingSuggest=Accounting account suggested
@@ -77,8 +79,8 @@ SuppliersVentilation=Supplier invoice binding
 ExpenseReportsVentilation=Expense report binding
 CreateMvts=Create new transaction
 UpdateMvts=Modification of a transaction
-WriteBookKeeping=Journalize transactions in General Ledger
+WriteBookKeeping=Journalize transactions in Ledger
-Bookkeeping=General ledger
+Bookkeeping=Ledger
 AccountBalance=Account balance
 
 CAHTF=Total purchase supplier before tax
@@ -141,16 +143,16 @@ TransactionNumShort=Num. transaction
 AccountingCategory=Accounting account groups
 GroupByAccountAccounting=Group by accounting account
 NotMatch=Not Set
-DeleteMvt=Delete general ledger lines
+DeleteMvt=Delete Ledger lines
 DelYear=Year to delete
 DelJournal=Journal to delete
-ConfirmDeleteMvt=This will delete all lines of the general ledger for year and/or from a specific journal. At least one criteria is required.
+ConfirmDeleteMvt=This will delete all lines of the Ledger for year and/or from a specific journal. At least one criteria is required.
-ConfirmDeleteMvtPartial=This will delete the selected line(s) of the general ledger
+ConfirmDeleteMvtPartial=This will delete the selected line(s) of the Ledger
-DelBookKeeping=Delete record of the general ledger
+DelBookKeeping=Delete record of the Ledger
 FinanceJournal=Finance journal
 ExpenseReportsJournal=Expense reports journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-DescJournalOnlyBindedVisible=This is a view of record that are bound to products/services accountancy account and can be recorded into the General Ledger.
+DescJournalOnlyBindedVisible=This is a view of record that are bound to products/services accountancy account and can be recorded into the Ledger.
 VATAccountNotDefined=Account for VAT not defined
 ThirdpartyAccountNotDefined=Account for third party not defined
 ProductAccountNotDefined=Account for product not defined
@@ -192,7 +194,7 @@ AutomaticBindingDone=Automatic binding done
 ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
 MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
 FicheVentilation=Binding card
-GeneralLedgerIsWritten=Transactions are written in the general ledger
+GeneralLedgerIsWritten=Transactions are written in the Ledger
 GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be dispatched. If there is no other error message, this is probably because they were already dispatched.
 NoNewRecordSaved=No new record dispatched
 ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
@@ -261,4 +263,4 @@ NoJournalDefined=No journal defined
 Binded=Lines bound
 ToBind=Lines to bind
 
-WarningReportNotReliable=Warning, this report is not based on the General Ledger, so does not contains transaction modified manualy in the General ledger. It will be replaced by a more complete report in a next version. 
+WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manualy in the Ledger. It will be replaced by a more complete report in a next version. 

htdocs/langs/en_US/compta.lang

@@ -190,8 +190,10 @@ AccountancyJournal=Accountancy code journal
 ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for collecting VAT - VAT on sales (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for recovered VAT - VAT on purchases (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
-ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account by default for customer third parties (used if not defined on third party card)
+ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
-ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account by default for supplier third parties (used if not defined on third party card)
+ACCOUNTING_ACCOUNT_CUSTOMER_Desc=Dedicated accounting account defined on third party card will be used for Subledger accouting, this one for General Ledger or as default value of Subledger accounting if dedicated customer accouting account on third party is not defined
+ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for supplier third parties
+ACCOUNTING_ACCOUNT_SUPPLIER_Desc=Dedicated accounting account defined on third party card will be used for Subledger accouting, this one for General Ledger or as default value of Subledger accounting if dedicated supplier accouting account on third party is not defined
 CloneTax=Clone a social/fiscal tax
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
 CloneTaxForNextMonth=Clone it for next month