From 734bd4d2fba75eb19a4246a225177b9d9f0c1994 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 12 Feb 2018 10:15:58 +0100
Subject: [PATCH 1/5] Fix menu visible in dev only

---
 htdocs/core/menus/standard/auguria.lib.php | 2 +-
 htdocs/core/menus/standard/eldy.lib.php    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/menus/standard/auguria.lib.php b/htdocs/core/menus/standard/auguria.lib.php
index 4dae9628c30..bf00f3d3ba9 100644
--- a/htdocs/core/menus/standard/auguria.lib.php
+++ b/htdocs/core/menus/standard/auguria.lib.php
@@ -382,7 +382,7 @@ function print_left_auguria_menu($db,$menu_array_before,$menu_array_after,&$tabM
 					if ($objp->nature == 9) $nature="hasnew";
 
 					// To enable when page exists
-					if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
+					if ($conf->global->MAIN_FEATURES_LEVEL < 2)
 					{
 						if ($nature == 'various' || $nature == 'hasnew') $nature='';
 					}
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index d2dba66c53c..077b6c8ba64 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -993,7 +993,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 				if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_admin/',$leftmenu)) $newmenu->add("/accountancy/admin/export.php?mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("ExportOptions"),2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_export', 60);
 
 				// Fiscal year
-				if ($conf->global->MAIN_FEATURES_LEVEL > 0)     // Not yet used. In a future will lock some periods.
+				if ($conf->global->MAIN_FEATURES_LEVEL > 1)     // Not yet used. In a future will lock some periods.
 				{
 				    if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_admin/',$leftmenu)) $newmenu->add("/accountancy/admin/fiscalyear.php?mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("FiscalPeriod"), 2, $user->rights->accounting->fiscalyear, '', $mainmenu, 'fiscalyear');
 				}
@@ -1054,7 +1054,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 								if ($objp->nature == 9) $nature="hasnew";
 
 								// To enable when page exists
-								if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
+								if ($conf->global->MAIN_FEATURES_LEVEL < 2)
 								{
 									if ($nature == 'various' || $nature == 'hasnew') $nature='';
 								}

From 09dfd5eb9f82e602da0dabab303b7d1eba8c6abd Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 12 Feb 2018 12:02:01 +0100
Subject: [PATCH 2/5] Fix journalization protection

---
 htdocs/accountancy/bookkeeping/list.php       |   2 +-
 htdocs/accountancy/customer/lines.php         |   4 +-
 htdocs/accountancy/journal/bankjournal.php    |   2 +-
 .../journal/expensereportsjournal.php         |   3 +-
 .../accountancy/journal/purchasesjournal.php  | 164 ++++++++++--------
 htdocs/accountancy/journal/sellsjournal.php   | 134 ++++++++------
 htdocs/langs/en_US/accountancy.lang           |   3 +-
 7 files changed, 183 insertions(+), 129 deletions(-)

diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php
index 42328fbc1ed..094dcd81b50 100644
--- a/htdocs/accountancy/bookkeeping/list.php
+++ b/htdocs/accountancy/bookkeeping/list.php
@@ -730,7 +730,7 @@ if ($num > 0)
 print "</table>";
 print '</div>';
 
-// TODO Replace this with mass action
+// TODO Replace this with mass delete action
 print '<div class="tabsAction tabsActionNoBottom">' . "\n";
 print '<a class="butActionDelete" name="button_delmvt" href="'.$_SERVER["PHP_SELF"].'?action=delbookkeepingyear'.($param?'&'.$param:'').'">' . $langs->trans("DelBookKeeping") . '</a>';
 print '</div>';
diff --git a/htdocs/accountancy/customer/lines.php b/htdocs/accountancy/customer/lines.php
index 673e927fbeb..2d197de8c9f 100644
--- a/htdocs/accountancy/customer/lines.php
+++ b/htdocs/accountancy/customer/lines.php
@@ -163,7 +163,7 @@ print '<script type="text/javascript">
 /*
  * Customer Invoice lines
  */
-$sql = "SELECT f.rowid, f.facnumber, f.type, f.datef, f.ref_client,";
+$sql = "SELECT f.rowid as facid, f.facnumber, f.type, f.datef, f.ref_client,";
 $sql .= " fd.rowid, fd.description, fd.product_type, fd.total_ht, fd.total_tva, fd.tva_tx, fd.vat_src_code, fd.total_ttc,";
 $sql .= " s.rowid as socid, s.nom as name, s.code_compta, s.code_client,";
 $sql .= " p.rowid as product_id, p.ref as product_ref, p.label as product_label, p.accountancy_code_sell, aa.rowid as fk_compte, aa.account_number, aa.label as label_compte,";
@@ -333,7 +333,7 @@ if ($result) {
 		$codecompta = length_accountg($objp->account_number) . ' - ' . $objp->label_compte;
 
 		$facture_static->ref = $objp->facnumber;
-		$facture_static->id = $objp->rowid;
+		$facture_static->id = $objp->facid;
 
 		$product_static->ref = $objp->product_ref;
 		$product_static->id = $objp->product_id;
diff --git a/htdocs/accountancy/journal/bankjournal.php b/htdocs/accountancy/journal/bankjournal.php
index 8b9215f5c4c..f67956c1a74 100644
--- a/htdocs/accountancy/journal/bankjournal.php
+++ b/htdocs/accountancy/journal/bankjournal.php
@@ -634,7 +634,7 @@ if (! $error && $action == 'writebookkeeping') {
 			}
 		}
 
-		if ($totaldebit != $totalcredit)
+		if (price2num($totaldebit) != price2num($totalcredit))
 		{
 			$error++;
 			$errorforline++;
diff --git a/htdocs/accountancy/journal/expensereportsjournal.php b/htdocs/accountancy/journal/expensereportsjournal.php
index 13b97ffb8d3..2b5aa063887 100644
--- a/htdocs/accountancy/journal/expensereportsjournal.php
+++ b/htdocs/accountancy/journal/expensereportsjournal.php
@@ -344,7 +344,8 @@ if ($action == 'writebookkeeping') {
 			}
 		}
 
-		if ($totaldebit != $totalcredit)
+		// Protection against a bug on line before
+		if (price2num($totaldebit) != price2num($totalcredit))
 		{
 			$error++;
 			$errorforline++;
diff --git a/htdocs/accountancy/journal/purchasesjournal.php b/htdocs/accountancy/journal/purchasesjournal.php
index 7f25cd63df8..7794cccf658 100644
--- a/htdocs/accountancy/journal/purchasesjournal.php
+++ b/htdocs/accountancy/journal/purchasesjournal.php
@@ -222,6 +222,8 @@ if ($action == 'writebookkeeping') {
 	$companystatic = new Societe($db);
 	$invoicestatic = new FactureFournisseur($db);
 
+	$errorforinvoice = array();
+
 	foreach ($tabfac as $key => $val) {		// Loop on each invoice
 
 		$errorforline = 0;
@@ -257,9 +259,10 @@ if ($action == 'writebookkeeping') {
 			if ($alreadydispatched) $replacedinvoice = 2;
 		}
 
-		// If not already into bookkeeping, we won't add it, if yes, add the counterpart ???.
+		// If not already into bookkeeping, we won't add it. If yes, do nothing (should not happen because creating replacement not possible if invoice is accounted)
 		if ($replacedinvoice == 1)
 		{
+			$db->rollback();
 			continue;
 		}
 
@@ -267,7 +270,7 @@ if ($action == 'writebookkeeping') {
 		if (! $errorforline)
 		{
 			foreach ( $tabttc[$key] as $k => $mt ) {
-				if ($mt) {
+				//if ($mt) {
 					$bookkeeping = new BookKeeping($db);
 					$bookkeeping->doc_date = $val["date"];
 					$bookkeeping->date_lim_reglement = $val["datereg"];
@@ -298,16 +301,18 @@ if ($action == 'writebookkeeping') {
 						{
 							$error++;
 							$errorforline++;
+							$errorforinvoice[$key]=1;
 							//setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->fk_doc.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
 						}
 						else
 						{
 							$error++;
 							$errorforline++;
+							$errorforinvoice[$key]=1;
 							setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
 						}
 					}
-				}
+				//}
 			}
 		}
 
@@ -315,7 +320,7 @@ if ($action == 'writebookkeeping') {
 		if (! $errorforline)
 		{
 			foreach ( $tabht[$key] as $k => $mt ) {
-				if ($mt) {
+				//if ($mt) {
 					// get compte id and label
 					$accountingaccount = new AccountingAccount($db);
 					if ($accountingaccount->fetch(null, $k, true)) {
@@ -349,17 +354,19 @@ if ($action == 'writebookkeeping') {
 							{
 								$error++;
 								$errorforline++;
+								$errorforinvoice[$key]=1;
 								//setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->fk_doc.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
 							}
 							else
 							{
 								$error++;
 								$errorforline++;
+								$errorforinvoice[$key]=1;
 								setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
 							}
 						}
 					}
-				}
+				//}
 			}
 		}
 
@@ -406,12 +413,14 @@ if ($action == 'writebookkeeping') {
 							{
 								$error++;
 								$errorforline++;
+								$errorforinvoice[$key]=1;
 								//setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->fk_doc.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
 							}
 							else
 							{
 								$error++;
 								$errorforline++;
+								$errorforinvoice[$key]=1;
 								setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
 							}
 						}
@@ -456,12 +465,14 @@ if ($action == 'writebookkeeping') {
 						{
 							$error++;
 							$errorforline++;
+							$errorforinvoice[$key]=1;
 							//setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->fk_doc.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
 						}
 						else
 						{
 							$error++;
 							$errorforline++;
+							$errorforinvoice[$key]=1;
 							setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
 						}
 					}
@@ -469,13 +480,20 @@ if ($action == 'writebookkeeping') {
 			}
 		}
 
-		if ($totaldebit != $totalcredit)
+		// Protection against a bug on line before
+		if (price2num($totaldebit) != price2num($totalcredit))
 		{
 			$error++;
 			$errorforline++;
+			$errorforinvoice[$key]=1;
 			setEventMessages('Try to insert a non balanced transaction in book for '.$invoicestatic->ref.'. Canceled. Surely a bug.', null, 'errors');
 		}
 
+		// Check totaldebit is also same than total of invoice. If not, some record are not yet ready to be journalized
+
+
+
+
 		if (! $errorforline)
 		{
 			$db->commit();
@@ -567,7 +585,7 @@ if ($action == 'exportcsv') {
 			if ($alreadydispatched) $replacedinvoice = 2;
 		}
 
-		// If not already into bookkeeping, we won't add it, if yes, add the counterpart ???.
+		// If not already into bookkeeping, we won't add it. If yes, do nothing (should not happen because creating replacement not possible if invoice is accounted)
 		if ($replacedinvoice == 1)
 		{
 			continue;
@@ -575,26 +593,28 @@ if ($action == 'exportcsv') {
 
 		// Third party
 		foreach ( $tabttc[$key] as $k => $mt ) {
-			print '"' . $key . '"' . $sep;
-			print '"' . $date . '"' . $sep;
-			print '"' . $val["refsologest"] . '"' . $sep;
-			print '"' . utf8_decode ( dol_trunc($companystatic->name, 32) ). '"' . $sep;
-			print '"' . length_accounta(html_entity_decode($k)) . '"' . $sep;
-			print '"' . $conf->global->ACCOUNTING_ACCOUNT_SUPPLIER . '"' . $sep;
-			print '"' . length_accounta(html_entity_decode($k)) . '"' . $sep;
-			print '"' . $langs->trans("Code_tiers") . '"' . $sep;
-			print '"' . utf8_decode ( dol_trunc($companystatic->name, 16) ) . ' - ' . $val["refsuppliersologest"] . ' - ' . $langs->trans("Code_tiers") . '"' . $sep;
-			print '"' . ($mt < 0 ? price(- $mt) : '') . '"' . $sep;
-			print '"' . ($mt >= 0 ? price($mt) : '') . '"'. $sep;
-			print '"' . $journal . '"' ;
-			print "\n";
+			//if ($mt) {
+				print '"' . $key . '"' . $sep;
+				print '"' . $date . '"' . $sep;
+				print '"' . $val["refsologest"] . '"' . $sep;
+				print '"' . utf8_decode ( dol_trunc($companystatic->name, 32) ). '"' . $sep;
+				print '"' . length_accounta(html_entity_decode($k)) . '"' . $sep;
+				print '"' . $conf->global->ACCOUNTING_ACCOUNT_SUPPLIER . '"' . $sep;
+				print '"' . length_accounta(html_entity_decode($k)) . '"' . $sep;
+				print '"' . $langs->trans("Code_tiers") . '"' . $sep;
+				print '"' . utf8_decode ( dol_trunc($companystatic->name, 16) ) . ' - ' . $val["refsuppliersologest"] . ' - ' . $langs->trans("Code_tiers") . '"' . $sep;
+				print '"' . ($mt < 0 ? price(- $mt) : '') . '"' . $sep;
+				print '"' . ($mt >= 0 ? price($mt) : '') . '"'. $sep;
+				print '"' . $journal . '"' ;
+				print "\n";
+			//}
 		}
 
 		// Product / Service
 		foreach ( $tabht[$key] as $k => $mt ) {
 			$accountingaccount = new AccountingAccount($db);
 			$accountingaccount->fetch(null, $k, true);
-			if ($mt) {
+			//if ($mt) {
 				print '"' . $key . '"' . $sep;
 				print '"' . $date . '"' . $sep;
 				print '"' . $val["refsologest"] . '"' . $sep;
@@ -608,7 +628,7 @@ if ($action == 'exportcsv') {
 				print '"' . ($mt < 0 ? price(- $mt) : '') . '"'. $sep;
 				print '"' . $journal . '"' ;
 				print "\n";
-			}
+			//}
 		}
 
 		// VAT
@@ -787,37 +807,40 @@ if (empty($action) || $action == 'view') {
 			print '<td align="right"></td>';
 			print '<td align="right"></td>';
 			print "</tr>";
+
 			continue;
 		}
 
 		// Third party
 		foreach ( $tabttc[$key] as $k => $mt ) {
-			print '<tr class="oddeven">';
-			print "<td><!-- Thirdparty --></td>";
-			print "<td>" . $date . "</td>";
-			print "<td>" . $invoicestatic->getNomUrl(1) . "</td>";
-			// Account
-			print "<td>";
-			$accountoshow = length_accounta($conf->global->ACCOUNTING_ACCOUNT_SUPPLIER);
-			if (empty($accountoshow) || $accountoshow == 'NotDefined')
-			{
-				print '<span class="error">'.$langs->trans("MainAccountForCustomersNotDefined").'</span>';
-			}
-			else print $accountoshow;
-			print '</td>';
-			// Subledger account
-			print "<td>";
-			$accountoshow = length_accounta($k);
-			if (empty($accountoshow) || $accountoshow == 'NotDefined')
-			{
-				print '<span class="error">'.$langs->trans("ThirdpartyAccountNotDefined").'</span>';
-			}
-			else print $accountoshow;
-			print '</td>';
-			print "<td>" . $companystatic->getNomUrl(0, 'supplier', 16) . ' - ' . $invoicestatic->ref_supplier . ' - ' . $langs->trans("SubledgerAccount") . "</td>";
-			print '<td align="right">' . ($mt < 0 ? - price(- $mt) : '') . "</td>";
-			print '<td align="right">' . ($mt >= 0 ? price($mt) : '') . "</td>";
-			print "</tr>";
+			//if ($mt) {
+				print '<tr class="oddeven">';
+				print "<td><!-- Thirdparty --></td>";
+				print "<td>" . $date . "</td>";
+				print "<td>" . $invoicestatic->getNomUrl(1) . "</td>";
+				// Account
+				print "<td>";
+				$accountoshow = length_accounta($conf->global->ACCOUNTING_ACCOUNT_SUPPLIER);
+				if (empty($accountoshow) || $accountoshow == 'NotDefined')
+				{
+					print '<span class="error">'.$langs->trans("MainAccountForCustomersNotDefined").'</span>';
+				}
+				else print $accountoshow;
+				print '</td>';
+				// Subledger account
+				print "<td>";
+				$accountoshow = length_accounta($k);
+				if (empty($accountoshow) || $accountoshow == 'NotDefined')
+				{
+					print '<span class="error">'.$langs->trans("ThirdpartyAccountNotDefined").'</span>';
+				}
+				else print $accountoshow;
+				print '</td>';
+				print "<td>" . $companystatic->getNomUrl(0, 'supplier', 16) . ' - ' . $invoicestatic->ref_supplier . ' - ' . $langs->trans("SubledgerAccount") . "</td>";
+				print '<td align="right">' . ($mt < 0 ? - price(- $mt) : '') . "</td>";
+				print '<td align="right">' . ($mt >= 0 ? price($mt) : '') . "</td>";
+				print "</tr>";
+			//}
 		}
 
 		// Product / Service
@@ -825,7 +848,7 @@ if (empty($action) || $action == 'view') {
 			$accountingaccount = new AccountingAccount($db);
 			$accountingaccount->fetch(null, $k, true);
 
-			if ($mt) {
+			//if ($mt) {
 				print '<tr class="oddeven">';
 				print "<td><!-- Product --></td>";
 				print "<td>" . $date . "</td>";
@@ -848,7 +871,7 @@ if (empty($action) || $action == 'view') {
 				print '<td align="right">' . ($mt >= 0 ? price($mt) : '') . "</td>";
 				print '<td align="right">' . ($mt < 0 ? price(- $mt) : '') . "</td>";
 				print "</tr>";
-			}
+			//}
 		}
 
 		// VAT
@@ -890,27 +913,28 @@ if (empty($action) || $action == 'view') {
 		if (is_array($tabother[$key]))
 		{
 			foreach ( $tabother[$key] as $k => $mt ) {
-
-				print '<tr class="oddeven">';
-				print "<td><!-- VAT counterpart NPR --></td>";
-				print "<td>" . $date . "</td>";
-				print "<td>" . $invoicestatic->getNomUrl(1) . "</td>";
-				// Account
-				print "<td>";
-				$accountoshow = length_accountg($k);
-				if (empty($accountoshow) || $accountoshow == 'NotDefined')
-				{
-					print '<span class="error">'.$langs->trans("VATAccountNotDefined").' ('.$langs->trans("NPR counterpart").'). Set ACCOUNTING_COUNTERPART_VAT_NPR to the subvention account'.'</span>';
+				if ($mt) {
+					print '<tr class="oddeven">';
+					print "<td><!-- VAT counterpart NPR --></td>";
+					print "<td>" . $date . "</td>";
+					print "<td>" . $invoicestatic->getNomUrl(1) . "</td>";
+					// Account
+					print "<td>";
+					$accountoshow = length_accountg($k);
+					if (empty($accountoshow) || $accountoshow == 'NotDefined')
+					{
+						print '<span class="error">'.$langs->trans("VATAccountNotDefined").' ('.$langs->trans("NPR counterpart").'). Set ACCOUNTING_COUNTERPART_VAT_NPR to the subvention account'.'</span>';
+					}
+					else print $accountoshow;
+					print '</td>';
+					// Subledger account
+					print "<td>";
+					print '</td>';
+					print "<td>" . $companystatic->getNomUrl(0, 'supplier', 16) . ' - ' . $invoicestatic->ref_supplier . ' - ' . $langs->trans("VAT") . " NPR (counterpart)</td>";
+					print '<td align="right">' . ($mt < 0 ? - price(- $mt) : '') . "</td>";
+					print '<td align="right">' . ($mt >= 0 ? price($mt) : '') . "</td>";
+					print "</tr>";
 				}
-				else print $accountoshow;
-				print '</td>';
-				// Subledger account
-				print "<td>";
-				print '</td>';
-				print "<td>" . $companystatic->getNomUrl(0, 'supplier', 16) . ' - ' . $invoicestatic->ref_supplier . ' - ' . $langs->trans("VAT") . " NPR (counterpart)</td>";
-				print '<td align="right">' . ($mt < 0 ? - price(- $mt) : '') . "</td>";
-				print '<td align="right">' . ($mt >= 0 ? price($mt) : '') . "</td>";
-				print "</tr>";
 			}
 		}
 	}
diff --git a/htdocs/accountancy/journal/sellsjournal.php b/htdocs/accountancy/journal/sellsjournal.php
index d8d20978ab7..81f0bd1c5c8 100644
--- a/htdocs/accountancy/journal/sellsjournal.php
+++ b/htdocs/accountancy/journal/sellsjournal.php
@@ -101,9 +101,9 @@ $sql .= " JOIN " . MAIN_DB_PREFIX . "facture as f ON f.rowid = fd.fk_facture";
 $sql .= " JOIN " . MAIN_DB_PREFIX . "societe as s ON s.rowid = f.fk_soc";
 //$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "c_tva as ct ON ((fd.vat_src_code <> '' AND fd.vat_src_code = ct.code) OR (fd.vat_src_code = '' AND fd.tva_tx = ct.taux)) AND ct.fk_pays = '" . $idpays . "'";
 $sql .= " WHERE fd.fk_code_ventilation > 0";
-$sql .= " AND f.entity IN (".getEntity('facture', 0).')';	// We don't share object for accountancy
+$sql .= " AND f.entity IN (".getEntity('facture', 0).')';	// We don't share object for accountancy, we use source object sharing
 $sql .= " AND f.fk_statut > 0"; // TODO Facture annulée ?
-if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
+if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {	// Non common setup
 	$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_REPLACEMENT . "," . Facture::TYPE_CREDIT_NOTE . "," . Facture::TYPE_DEPOSIT . "," . Facture::TYPE_SITUATION . ")";
@@ -226,6 +226,8 @@ if ($action == 'writebookkeeping') {
 	$companystatic = new Societe($db);
 	$invoicestatic = new Facture($db);
 
+	$errorforinvoice = array();
+
 	foreach ($tabfac as $key => $val) {		// Loop on each invoice
 
 		$errorforline = 0;
@@ -259,9 +261,10 @@ if ($action == 'writebookkeeping') {
 			if ($alreadydispatched) $replacedinvoice = 2;
 		}
 
-		// If not already into bookkeeping, we won't add it, if yes, add the counterpart ???.
+		// If not already into bookkeeping, we won't add it. If yes, do nothing (should not happen because creating replacement not possible if invoice is accounted)
 		if ($replacedinvoice == 1)
 		{
+			$db->rollback();
 			continue;
 		}
 
@@ -269,7 +272,7 @@ if ($action == 'writebookkeeping') {
 		if (! $errorforline)
 		{
 			foreach ( $tabttc[$key] as $k => $mt ) {
-				if ($mt) {
+				//if ($mt) {
 					$bookkeeping = new BookKeeping($db);
 					$bookkeeping->doc_date = $val["date"];
 					$bookkeeping->date_lim_reglement = $val["datereg"];
@@ -300,16 +303,18 @@ if ($action == 'writebookkeeping') {
 						{
 							$error++;
 							$errorforline++;
+							$errorforinvoice[$key]=1;
 							//setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->fk_doc.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
 						}
 						else
 						{
 							$error++;
 							$errorforline++;
+							$errorforinvoice[$key]=1;
 							setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
 						}
 					}
-				}
+				//}
 			}
 		}
 
@@ -317,7 +322,7 @@ if ($action == 'writebookkeeping') {
 		if (! $errorforline)
 		{
 			foreach ( $tabht[$key] as $k => $mt ) {
-				if ($mt) {
+				//if ($mt) {
 					// get compte id and label
 					$accountingaccount = new AccountingAccount($db);
 					if ($accountingaccount->fetch(null, $k, true)) {
@@ -351,22 +356,23 @@ if ($action == 'writebookkeeping') {
 							{
 								$error++;
 								$errorforline++;
+								$errorforinvoice[$key]=1;
 								//setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->fk_doc.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
 							}
 							else
 							{
 								$error++;
 								$errorforline++;
+								$errorforinvoice[$key]=1;
 								setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
 							}
 						}
 					}
-				}
+				//}
 			}
 		}
 
 		// VAT
-		// var_dump($tabtva);
 		if (! $errorforline)
 		{
 			$listoftax=array(0, 1, 2);
@@ -408,12 +414,14 @@ if ($action == 'writebookkeeping') {
 							{
 								$error++;
 								$errorforline++;
+								$errorforinvoice[$key]=1;
 								//setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->fk_doc.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
 							}
 							else
 							{
 								$error++;
 								$errorforline++;
+								$errorforinvoice[$key]=1;
 								setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
 							}
 						}
@@ -422,13 +430,28 @@ if ($action == 'writebookkeeping') {
 			}
 		}
 
-		if ($totaldebit != $totalcredit)
+		// Protection against a bug on line before
+		if (price2num($totaldebit) != price2num($totalcredit))
 		{
 			$error++;
 			$errorforline++;
+			$errorforinvoice[$key]=1;
 			setEventMessages('Try to insert a non balanced transaction in book for '.$invoicestatic->ref.'. Canceled. Surely a bug.', null, 'errors');
 		}
 
+		// Check totaldebit is also same than total of invoice. If not, some record are not yet ready to be journalized,
+		// so we refuse to journalize any lines of the invoice.
+		/*$tmpinvoice = new Facture($db);
+		$tmpinvoice->fetch($key);
+		//var_dump($key); var_dump($tmpinvoice->ref); var_dump(price2num($tmpinvoice->total_ttc,'MT')); var_dump($totaldebit);
+		if (price2num($tmpinvoice->total_ttc,'MT') != price2num($totaldebit))
+		{
+			$error++;
+			$errorforline++;
+			$errorforinvoice[$key]=1;
+			setEventMessages($langs->trans('ErrorInvoiceContainsLinesNotYetBounded', $tmpinvoice->ref), null, 'errors');
+		}*/
+
 		if (! $errorforline)
 		{
 			$db->commit();
@@ -522,7 +545,7 @@ if ($action == 'exportcsv') {
 			if ($alreadydispatched) $replacedinvoice = 2;
 		}
 
-		// If not already into bookkeeping, we won't add it, if yes, add the counterpart ???.
+		// If not already into bookkeeping, we won't add it. If yes, do nothing (should not happen because creating replacement not possible if invoice is accounted)
 		if ($replacedinvoice == 1)
 		{
 			continue;
@@ -530,26 +553,28 @@ if ($action == 'exportcsv') {
 
 		// Third party
 		foreach ($tabttc[$key] as $k => $mt) {
-			print '"' . $key . '"' . $sep;
-			print '"' . $date . '"' . $sep;
-			print '"' . $val["ref"] . '"' . $sep;
-			print '"' . utf8_decode(dol_trunc($companystatic->name, 32)) . '"' . $sep;
-			print '"' . length_accounta(html_entity_decode($k)) . '"' . $sep;
-			print '"' . $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER . '"' . $sep;
-			print '"' . length_accounta(html_entity_decode($k)) . '"' . $sep;
-			print '"' . $langs->trans("Code_tiers") . '"' . $sep;
-			print '"' . utf8_decode(dol_trunc($companystatic->name, 16)) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("Code_tiers") . '"' . $sep;
-			print '"' . ($mt >= 0 ? price($mt) : '') . '"' . $sep;
-			print '"' . ($mt < 0 ? price(- $mt) : '') . '"' . $sep;
-			print '"' . $journal . '"';
-			print "\n";
+			//if ($mt) {
+				print '"' . $key . '"' . $sep;
+				print '"' . $date . '"' . $sep;
+				print '"' . $val["ref"] . '"' . $sep;
+				print '"' . utf8_decode(dol_trunc($companystatic->name, 32)) . '"' . $sep;
+				print '"' . length_accounta(html_entity_decode($k)) . '"' . $sep;
+				print '"' . $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER . '"' . $sep;
+				print '"' . length_accounta(html_entity_decode($k)) . '"' . $sep;
+				print '"' . $langs->trans("Code_tiers") . '"' . $sep;
+				print '"' . utf8_decode(dol_trunc($companystatic->name, 16)) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("Code_tiers") . '"' . $sep;
+				print '"' . ($mt >= 0 ? price($mt) : '') . '"' . $sep;
+				print '"' . ($mt < 0 ? price(- $mt) : '') . '"' . $sep;
+				print '"' . $journal . '"';
+				print "\n";
+			//}
 		}
 
 		// Product / Service
 		foreach ($tabht[$key] as $k => $mt) {
 			$accountingaccount = new AccountingAccount($db);
 			$accountingaccount->fetch(null, $k, true);
-			if ($mt) {
+			//if ($mt) {
 				print '"' . $key . '"' . $sep;
 				print '"' . $date . '"' . $sep;
 				print '"' . $val["ref"] . '"' . $sep;
@@ -563,7 +588,7 @@ if ($action == 'exportcsv') {
 				print '"' . ($mt >= 0 ? price($mt) : '') . '"' . $sep;
 				print '"' . $journal . '"';
 				print "\n";
-			}
+			//}
 		}
 
 		// VAT
@@ -719,38 +744,41 @@ if (empty($action) || $action == 'view') {
 			print '<td align="right"></td>';
 			print '<td align="right"></td>';
 			print "</tr>";
+
 			continue;
 		}
 
 		// Third party
 		foreach ($tabttc[$key] as $k => $mt)
 		{
-			print '<tr class="oddeven">';
-			print "<td><!-- Thirdparty --></td>";
-			print "<td>" . $date . "</td>";
-			print "<td>" . $invoicestatic->getNomUrl(1) . "</td>";
-			// Account
-			print "<td>";
-			$accountoshow = length_accounta($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER);
-			if (empty($accountoshow) || $accountoshow == 'NotDefined')
-			{
-				print '<span class="error">'.$langs->trans("MainAccountForCustomersNotDefined").'</span>';
-			}
-			else print $accountoshow;
-			print '</td>';
-			// Subledger account
-			print "<td>";
-			$accountoshow = length_accounta($k);
-			if (empty($accountoshow) || $accountoshow == 'NotDefined')
-			{
-				print '<span class="error">'.$langs->trans("ThirdpartyAccountNotDefined").'</span>';
-			}
-			else print $accountoshow;
-			print '</td>';
-			print "<td>" . $companystatic->getNomUrl(0, 'customer', 16) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("SubledgerAccount") . "</td>";
-			print '<td align="right">' . ($mt >= 0 ? price($mt) : '') . "</td>";
-			print '<td align="right">' . ($mt < 0 ? price(- $mt) : '') . "</td>";
-			print "</tr>";
+			//if ($mt) {
+				print '<tr class="oddeven">';
+				print "<td><!-- Thirdparty --></td>";
+				print "<td>" . $date . "</td>";
+				print "<td>" . $invoicestatic->getNomUrl(1) . "</td>";
+				// Account
+				print "<td>";
+				$accountoshow = length_accounta($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER);
+				if (empty($accountoshow) || $accountoshow == 'NotDefined')
+				{
+					print '<span class="error">'.$langs->trans("MainAccountForCustomersNotDefined").'</span>';
+				}
+				else print $accountoshow;
+				print '</td>';
+				// Subledger account
+				print "<td>";
+				$accountoshow = length_accounta($k);
+				if (empty($accountoshow) || $accountoshow == 'NotDefined')
+				{
+					print '<span class="error">'.$langs->trans("ThirdpartyAccountNotDefined").'</span>';
+				}
+				else print $accountoshow;
+				print '</td>';
+				print "<td>" . $companystatic->getNomUrl(0, 'customer', 16) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("SubledgerAccount") . "</td>";
+				print '<td align="right">' . ($mt >= 0 ? price($mt) : '') . "</td>";
+				print '<td align="right">' . ($mt < 0 ? price(- $mt) : '') . "</td>";
+				print "</tr>";
+			//}
 		}
 
 		// Product / Service
@@ -759,7 +787,7 @@ if (empty($action) || $action == 'view') {
 			$accountingaccount = new AccountingAccount($db);
 			$accountingaccount->fetch(null, $k, true);
 
-			if ($mt) {
+			//if ($mt) {
 				print '<tr class="oddeven">';
 				print "<td><!-- Product --></td>";
 				print "<td>" . $date . "</td>";
@@ -782,7 +810,7 @@ if (empty($action) || $action == 'view') {
 				print "<td align='right'>" . ($mt < 0 ? price(- $mt) : '') . "</td>";
 				print "<td align='right'>" . ($mt >= 0 ? price($mt) : '') . "</td>";
 				print "</tr>";
-			}
+			//}
 		}
 
 		// VAT
diff --git a/htdocs/langs/en_US/accountancy.lang b/htdocs/langs/en_US/accountancy.lang
index c23e13a6bff..987ab6b31a6 100644
--- a/htdocs/langs/en_US/accountancy.lang
+++ b/htdocs/langs/en_US/accountancy.lang
@@ -220,7 +220,7 @@ ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting accoun
 MvtNotCorrectlyBalanced=Movement not correctly balanced. Credit = %s. Debit = %s
 FicheVentilation=Binding card
 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.
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be journalized. If there is no other error message, this is probably because they were already journalized.
 NoNewRecordSaved=No more record to journalize
 ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
 ChangeBinding=Change the binding
@@ -284,6 +284,7 @@ Formula=Formula
 ## Error
 SomeMandatoryStepsOfSetupWereNotDone=Some mandatory steps of setup was not done, please complete them
 ErrorNoAccountingCategoryForThisCountry=No accounting account group available for country %s (See Home - Setup - Dictionaries)
+ErrorInvoiceContainsLinesNotYetBounded=You try to journalize some lines of the invoice <strong>%s</strong>, but some other lines are not yet bounded to accounting account. Journalization of all invoice lines for this invoice are refused.
 ExportNotSupported=The export format setuped is not supported into this page
 BookeppingLineAlreayExists=Lines already existing into bookeeping
 NoJournalDefined=No journal defined

From caa136bed3a013ef238f5a80c790e0a0f8cb3bc8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 12 Feb 2018 13:31:32 +0100
Subject: [PATCH 3/5] FIX Debug journalization: Avoid journalizing if all lines
 not bound

---
 htdocs/accountancy/bookkeeping/list.php       |  4 +-
 htdocs/accountancy/customer/list.php          |  2 +-
 .../accountancy/journal/purchasesjournal.php  | 79 ++++++++++++++-----
 htdocs/accountancy/journal/sellsjournal.php   | 74 ++++++++++++-----
 htdocs/accountancy/supplier/list.php          |  2 +-
 htdocs/langs/en_US/accountancy.lang           |  1 +
 htdocs/langs/en_US/bills.lang                 |  2 +-
 7 files changed, 119 insertions(+), 45 deletions(-)

diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php
index 094dcd81b50..ad8be2608c1 100644
--- a/htdocs/accountancy/bookkeeping/list.php
+++ b/htdocs/accountancy/bookkeeping/list.php
@@ -695,8 +695,8 @@ if ($num > 0)
 
 		// Action column
 		print '<td align="center">';
-		print '<a href="./card.php?piece_num=' . $line->piece_num . '">' . img_edit() . '</a>&nbsp;';
-		print '<a href="' . $_SERVER['PHP_SELF'] . '?action=delmouv&mvt_num=' . $line->piece_num . $param . '&page=' . $page . '">' . img_delete() . '</a>';
+		print '<a href="'.DOL_URL_ROOT.'/accountancy/bookkeeping/card.php?piece_num=' . $line->piece_num . $param . '&page=' . $page . ($sortfield ? '&sortfield='.$sortfield : '') . ($sortorder ? '&sortorder='.$sortorder : '') . '">' . img_edit() . '</a>&nbsp;';
+		print '<a href="' . $_SERVER['PHP_SELF'] . '?action=delmouv&mvt_num=' . $line->piece_num . $param . '&page=' . $page . ($sortfield ? '&sortfield='.$sortfield : '') . ($sortorder ? '&sortorder='.$sortorder : '') . '">' . img_delete() . '</a>';
 		print '</td>';
 		if (! $i) $totalarray['nbfield']++;
 
diff --git a/htdocs/accountancy/customer/list.php b/htdocs/accountancy/customer/list.php
index 904c8668b94..4d9d7532d7e 100644
--- a/htdocs/accountancy/customer/list.php
+++ b/htdocs/accountancy/customer/list.php
@@ -223,7 +223,7 @@ $sql.= " LEFT JOIN " . MAIN_DB_PREFIX . "accounting_account as aa ON p.accountan
 $sql.= " LEFT JOIN " . MAIN_DB_PREFIX . "accounting_account as aa2 ON p.accountancy_code_sell_intra = aa2.account_number AND aa2.fk_pcg_version = '" . $chartaccountcode."'";
 $sql.= " LEFT JOIN " . MAIN_DB_PREFIX . "accounting_account as aa3 ON p.accountancy_code_sell_export = aa3.account_number AND aa3.fk_pcg_version = '" . $chartaccountcode."'";
 $sql.= " WHERE f.fk_statut > 0 AND l.fk_code_ventilation <= 0";
-$sql.= " AND product_type <= 2";
+$sql.= " AND l.product_type <= 2";
 // Add search filter like
 if ($search_lineid) {
     $sql .= natural_search("l.rowid", $search_lineid, 1);
diff --git a/htdocs/accountancy/journal/purchasesjournal.php b/htdocs/accountancy/journal/purchasesjournal.php
index 7794cccf658..e7ab6adbba4 100644
--- a/htdocs/accountancy/journal/purchasesjournal.php
+++ b/htdocs/accountancy/journal/purchasesjournal.php
@@ -98,14 +98,12 @@ $sql = "SELECT f.rowid, f.ref, f.type, f.datef as df, f.libelle,f.ref_supplier,
 $sql .= " fd.rowid as fdid, fd.description, fd.product_type, fd.total_ht, fd.tva as total_tva, fd.total_localtax1, fd.total_localtax2, fd.tva_tx, fd.total_ttc, fd.vat_src_code,";
 $sql .= " s.rowid as socid, s.nom as name, s.fournisseur, s.code_client, s.code_fournisseur, s.code_compta, s.code_compta_fournisseur,";
 $sql .= " p.accountancy_code_buy , aa.rowid as fk_compte, aa.account_number as compte, aa.label as label_compte";
-//$sql .= " ct.accountancy_code_buy as account_tva";
 $sql .= " FROM " . MAIN_DB_PREFIX . "facture_fourn_det as fd";
-//$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "c_tva as ct ON fd.tva_tx = ct.taux AND ct.fk_pays = '" . $idpays . "'";
 $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "product as p ON p.rowid = fd.fk_product";
 $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "accounting_account as aa ON aa.rowid = fd.fk_code_ventilation";
 $sql .= " JOIN " . MAIN_DB_PREFIX . "facture_fourn as f ON f.rowid = fd.fk_facture_fourn";
 $sql .= " JOIN " . MAIN_DB_PREFIX . "societe as s ON s.rowid = f.fk_soc";
-$sql .= " WHERE f.fk_statut > 0"; // TODO Facture annulée ?
+$sql .= " WHERE f.fk_statut > 0";
 $sql .= " AND fd.fk_code_ventilation > 0";
 $sql .= " AND f.entity IN (" . getEntity('facture_fourn', 0) . ")";  // We don't share object for accountancy
 if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
@@ -214,6 +212,29 @@ if ($result) {
 	dol_print_error($db);
 }
 
+$errorforinvoice = array();
+
+// Loop in invoices to detect lines with not binding lines
+foreach ($tabfac as $key => $val) {		// Loop on each invoice
+	$sql = "SELECT COUNT(fd.rowid) as nb";
+	$sql.= " FROM " . MAIN_DB_PREFIX . "facture_fourn_det as fd";
+	$sql.= " WHERE fd.product_type <= 2 AND fd.fk_code_ventilation <= 0";
+	$sql.= " AND fd.total_ttc <> 0 AND fk_facture_fourn = ".$key;
+	$resql=$db->query($sql);
+	if ($resql)
+	{
+		$obj = $db->fetch_object($resql);
+		if ($obj->nb > 0)
+		{
+			$errorforinvoice[$key]='somelinesarenotbound';
+		}
+	}
+	else dol_print_error($db);
+}
+//var_dump($errorforinvoice);exit;
+
+
+
 // Bookkeeping Write
 if ($action == 'writebookkeeping') {
 	$now = dol_now();
@@ -222,8 +243,6 @@ if ($action == 'writebookkeeping') {
 	$companystatic = new Societe($db);
 	$invoicestatic = new FactureFournisseur($db);
 
-	$errorforinvoice = array();
-
 	foreach ($tabfac as $key => $val) {		// Loop on each invoice
 
 		$errorforline = 0;
@@ -301,14 +320,14 @@ if ($action == 'writebookkeeping') {
 						{
 							$error++;
 							$errorforline++;
-							$errorforinvoice[$key]=1;
+							$errorforinvoice[$key]='alreadyjournalized';
 							//setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->fk_doc.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
 						}
 						else
 						{
 							$error++;
 							$errorforline++;
-							$errorforinvoice[$key]=1;
+							$errorforinvoice[$key]='other';
 							setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
 						}
 					}
@@ -354,14 +373,14 @@ if ($action == 'writebookkeeping') {
 							{
 								$error++;
 								$errorforline++;
-								$errorforinvoice[$key]=1;
+								$errorforinvoice[$key]='alreadyjournalized';
 								//setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->fk_doc.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
 							}
 							else
 							{
 								$error++;
 								$errorforline++;
-								$errorforinvoice[$key]=1;
+								$errorforinvoice[$key]='other';
 								setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
 							}
 						}
@@ -413,14 +432,14 @@ if ($action == 'writebookkeeping') {
 							{
 								$error++;
 								$errorforline++;
-								$errorforinvoice[$key]=1;
+								$errorforinvoice[$key]='alreadyjournalized';
 								//setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->fk_doc.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
 							}
 							else
 							{
 								$error++;
 								$errorforline++;
-								$errorforinvoice[$key]=1;
+								$errorforinvoice[$key]='other';
 								setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
 							}
 						}
@@ -431,7 +450,7 @@ if ($action == 'writebookkeeping') {
 
 		// Counterpart of VAT for VAT NPR
 		// var_dump($tabother);
-		if (! $errorforline)
+		if (! $errorforline && is_array($tabother[$key]))
 		{
 			foreach ( $tabother[$key] as $k => $mt ) {
 				if ($mt) {
@@ -465,14 +484,14 @@ if ($action == 'writebookkeeping') {
 						{
 							$error++;
 							$errorforline++;
-							$errorforinvoice[$key]=1;
+							$errorforinvoice[$key]='alreadyjournalized';
 							//setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->fk_doc.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
 						}
 						else
 						{
 							$error++;
 							$errorforline++;
-							$errorforinvoice[$key]=1;
+							$errorforinvoice[$key]='other';
 							setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
 						}
 					}
@@ -485,14 +504,17 @@ if ($action == 'writebookkeeping') {
 		{
 			$error++;
 			$errorforline++;
-			$errorforinvoice[$key]=1;
+			$errorforinvoice[$key]='amountsnotbalanced';
 			setEventMessages('Try to insert a non balanced transaction in book for '.$invoicestatic->ref.'. Canceled. Surely a bug.', null, 'errors');
 		}
 
-		// Check totaldebit is also same than total of invoice. If not, some record are not yet ready to be journalized
-
-
-
+		// Error if some lines are not binded/ready to be journalized
+		if ($errorforinvoice[$key] == 'somelinesarenotbound')
+		{
+			$error++;
+			$errorforline++;
+			setEventMessages($langs->trans('ErrorInvoiceContainsLinesNotYetBounded', $val['ref']), null, 'errors');
+		}
 
 		if (! $errorforline)
 		{
@@ -810,6 +832,25 @@ if (empty($action) || $action == 'view') {
 
 			continue;
 		}
+		if ($errorforinvoice[$key] == 'somelinesarenotbound')
+		{
+			print '<tr class="oddeven">';
+			print "<td><!-- Some lines are not bound --></td>";
+			print "<td>" . $date . "</td>";
+			print "<td>" . $invoicestatic->getNomUrl(1) . "</td>";
+			// Account
+			print "<td>";
+			print '<span class="error">'.$langs->trans('ErrorInvoiceContainsLinesNotYetBoundedShort', $val['ref']).'</span>';
+			print '</td>';
+			// Subledger account
+			print "<td>";
+			print '</td>';
+			print "<td>";
+			print "</td>";
+			print '<td align="right"></td>';
+			print '<td align="right"></td>';
+			print "</tr>";
+		}
 
 		// Third party
 		foreach ( $tabttc[$key] as $k => $mt ) {
diff --git a/htdocs/accountancy/journal/sellsjournal.php b/htdocs/accountancy/journal/sellsjournal.php
index 81f0bd1c5c8..4ed70d41c4b 100644
--- a/htdocs/accountancy/journal/sellsjournal.php
+++ b/htdocs/accountancy/journal/sellsjournal.php
@@ -93,16 +93,14 @@ $sql = "SELECT f.rowid, f.facnumber, f.type, f.datef as df, f.ref_client, f.date
 $sql .= " fd.rowid as fdid, fd.description, fd.product_type, fd.total_ht, fd.total_tva, fd.total_localtax1, fd.total_localtax2, fd.tva_tx, fd.total_ttc, fd.situation_percent, fd.vat_src_code,";
 $sql .= " s.rowid as socid, s.nom as name, s.code_client, s.code_fournisseur, s.code_compta, s.code_compta_fournisseur,";
 $sql .= " p.rowid as pid, p.ref as pref, p.accountancy_code_sell, aa.rowid as fk_compte, aa.account_number as compte, aa.label as label_compte";
-//$sql .= " ct.accountancy_code_sell as account_tva";
 $sql .= " FROM " . MAIN_DB_PREFIX . "facturedet as fd";
 $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "product as p ON p.rowid = fd.fk_product";
 $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "accounting_account as aa ON aa.rowid = fd.fk_code_ventilation";
 $sql .= " JOIN " . MAIN_DB_PREFIX . "facture as f ON f.rowid = fd.fk_facture";
 $sql .= " JOIN " . MAIN_DB_PREFIX . "societe as s ON s.rowid = f.fk_soc";
-//$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "c_tva as ct ON ((fd.vat_src_code <> '' AND fd.vat_src_code = ct.code) OR (fd.vat_src_code = '' AND fd.tva_tx = ct.taux)) AND ct.fk_pays = '" . $idpays . "'";
 $sql .= " WHERE fd.fk_code_ventilation > 0";
 $sql .= " AND f.entity IN (".getEntity('facture', 0).')';	// We don't share object for accountancy, we use source object sharing
-$sql .= " AND f.fk_statut > 0"; // TODO Facture annulée ?
+$sql .= " AND f.fk_statut > 0";
 if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {	// Non common setup
 	$sql .= " AND f.type IN (" . Facture::TYPE_STANDARD . "," . Facture::TYPE_REPLACEMENT . "," . Facture::TYPE_CREDIT_NOTE . "," . Facture::TYPE_SITUATION . ")";
 } else {
@@ -218,6 +216,28 @@ if ($result) {
 	dol_print_error($db);
 }
 
+$errorforinvoice = array();
+
+// Loop in invoices to detect lines with not binding lines
+foreach ($tabfac as $key => $val) {		// Loop on each invoice
+	$sql = "SELECT COUNT(fd.rowid) as nb";
+	$sql.= " FROM " . MAIN_DB_PREFIX . "facturedet as fd";
+	$sql.= " WHERE fd.product_type <= 2 AND fd.fk_code_ventilation <= 0";
+	$sql.= " AND fd.total_ttc <> 0 AND fk_facture = ".$key;
+	$resql=$db->query($sql);
+	if ($resql)
+	{
+		$obj = $db->fetch_object($resql);
+		if ($obj->nb > 0)
+		{
+			$errorforinvoice[$key]='somelinesarenotbound';
+		}
+	}
+	else dol_print_error($db);
+}
+//var_dump($errorforinvoice);exit;
+
+
 // Bookkeeping Write
 if ($action == 'writebookkeeping') {
 	$now = dol_now();
@@ -226,8 +246,6 @@ if ($action == 'writebookkeeping') {
 	$companystatic = new Societe($db);
 	$invoicestatic = new Facture($db);
 
-	$errorforinvoice = array();
-
 	foreach ($tabfac as $key => $val) {		// Loop on each invoice
 
 		$errorforline = 0;
@@ -303,14 +321,14 @@ if ($action == 'writebookkeeping') {
 						{
 							$error++;
 							$errorforline++;
-							$errorforinvoice[$key]=1;
+							$errorforinvoice[$key]='alreadyjournalized';
 							//setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->fk_doc.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
 						}
 						else
 						{
 							$error++;
 							$errorforline++;
-							$errorforinvoice[$key]=1;
+							$errorforinvoice[$key]='other';
 							setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
 						}
 					}
@@ -356,14 +374,14 @@ if ($action == 'writebookkeeping') {
 							{
 								$error++;
 								$errorforline++;
-								$errorforinvoice[$key]=1;
+								$errorforinvoice[$key]='alreadyjournalized';
 								//setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->fk_doc.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
 							}
 							else
 							{
 								$error++;
 								$errorforline++;
-								$errorforinvoice[$key]=1;
+								$errorforinvoice[$key]='other';
 								setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
 							}
 						}
@@ -414,14 +432,14 @@ if ($action == 'writebookkeeping') {
 							{
 								$error++;
 								$errorforline++;
-								$errorforinvoice[$key]=1;
+								$errorforinvoice[$key]='alreadyjournalized';
 								//setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->fk_doc.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
 							}
 							else
 							{
 								$error++;
 								$errorforline++;
-								$errorforinvoice[$key]=1;
+								$errorforinvoice[$key]='other';
 								setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
 							}
 						}
@@ -435,22 +453,17 @@ if ($action == 'writebookkeeping') {
 		{
 			$error++;
 			$errorforline++;
-			$errorforinvoice[$key]=1;
+			$errorforinvoice[$key]='amountsnotbalanced';
 			setEventMessages('Try to insert a non balanced transaction in book for '.$invoicestatic->ref.'. Canceled. Surely a bug.', null, 'errors');
 		}
 
-		// Check totaldebit is also same than total of invoice. If not, some record are not yet ready to be journalized,
-		// so we refuse to journalize any lines of the invoice.
-		/*$tmpinvoice = new Facture($db);
-		$tmpinvoice->fetch($key);
-		//var_dump($key); var_dump($tmpinvoice->ref); var_dump(price2num($tmpinvoice->total_ttc,'MT')); var_dump($totaldebit);
-		if (price2num($tmpinvoice->total_ttc,'MT') != price2num($totaldebit))
+		// Error if some lines are not binded/ready to be journalized
+		if ($errorforinvoice[$key] == 'somelinesarenotbound')
 		{
 			$error++;
 			$errorforline++;
-			$errorforinvoice[$key]=1;
-			setEventMessages($langs->trans('ErrorInvoiceContainsLinesNotYetBounded', $tmpinvoice->ref), null, 'errors');
-		}*/
+			setEventMessages($langs->trans('ErrorInvoiceContainsLinesNotYetBounded', $val['ref']), null, 'errors');
+		}
 
 		if (! $errorforline)
 		{
@@ -747,6 +760,25 @@ if (empty($action) || $action == 'view') {
 
 			continue;
 		}
+		if ($errorforinvoice[$key] == 'somelinesarenotbound')
+		{
+			print '<tr class="oddeven">';
+			print "<td><!-- Some lines are not bound --></td>";
+			print "<td>" . $date . "</td>";
+			print "<td>" . $invoicestatic->getNomUrl(1) . "</td>";
+			// Account
+			print "<td>";
+			print '<span class="error">'.$langs->trans('ErrorInvoiceContainsLinesNotYetBoundedShort', $val['ref']).'</span>';
+			print '</td>';
+			// Subledger account
+			print "<td>";
+			print '</td>';
+			print "<td>";
+			print "</td>";
+			print '<td align="right"></td>';
+			print '<td align="right"></td>';
+			print "</tr>";
+		}
 
 		// Third party
 		foreach ($tabttc[$key] as $k => $mt)
diff --git a/htdocs/accountancy/supplier/list.php b/htdocs/accountancy/supplier/list.php
index 49d81d5d11d..c19e1d2716c 100644
--- a/htdocs/accountancy/supplier/list.php
+++ b/htdocs/accountancy/supplier/list.php
@@ -222,7 +222,7 @@ $sql.= " INNER JOIN " . MAIN_DB_PREFIX . "facture_fourn_det as l ON f.rowid = l.
 $sql.= " LEFT JOIN " . MAIN_DB_PREFIX . "product as p ON p.rowid = l.fk_product";
 $sql.= " LEFT JOIN " . MAIN_DB_PREFIX . "accounting_account as aa ON p.accountancy_code_buy = aa.account_number AND aa.fk_pcg_version = '" . $chartaccountcode."'";
 $sql.= " WHERE f.fk_statut > 0 AND l.fk_code_ventilation <= 0";
-$sql.= " AND product_type <= 2";
+$sql.= " AND l.product_type <= 2";
 // Add search filter like
 if ($search_lineid) {
     $sql .= natural_search("l.rowid", $search_lineid, 1);
diff --git a/htdocs/langs/en_US/accountancy.lang b/htdocs/langs/en_US/accountancy.lang
index 987ab6b31a6..28a77095084 100644
--- a/htdocs/langs/en_US/accountancy.lang
+++ b/htdocs/langs/en_US/accountancy.lang
@@ -285,6 +285,7 @@ Formula=Formula
 SomeMandatoryStepsOfSetupWereNotDone=Some mandatory steps of setup was not done, please complete them
 ErrorNoAccountingCategoryForThisCountry=No accounting account group available for country %s (See Home - Setup - Dictionaries)
 ErrorInvoiceContainsLinesNotYetBounded=You try to journalize some lines of the invoice <strong>%s</strong>, but some other lines are not yet bounded to accounting account. Journalization of all invoice lines for this invoice are refused.
+ErrorInvoiceContainsLinesNotYetBoundedShort=Some lines on invoice are not bound to accounting account.
 ExportNotSupported=The export format setuped is not supported into this page
 BookeppingLineAlreayExists=Lines already existing into bookeeping
 NoJournalDefined=No journal defined
diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang
index 5ed49679e04..668090129ff 100644
--- a/htdocs/langs/en_US/bills.lang
+++ b/htdocs/langs/en_US/bills.lang
@@ -119,7 +119,7 @@ StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=Draft (needs to be validated)
 BillStatusPaid=Paid
 BillStatusPaidBackOrConverted=Credit note refund or converted into discount
-BillStatusConverted=Paid (ready for final invoice)
+BillStatusConverted=Paid (ready for consumption in final invoice)
 BillStatusCanceled=Abandoned
 BillStatusValidated=Validated (needs to be paid)
 BillStatusStarted=Started

From 284e6f1ad3640e9bd9971b74576568c6d72d21c2 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 12 Feb 2018 13:39:06 +0100
Subject: [PATCH 4/5] Better position of error check

---
 .../accountancy/journal/purchasesjournal.php  | 20 +++++++++----------
 htdocs/accountancy/journal/sellsjournal.php   | 20 +++++++++----------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/htdocs/accountancy/journal/purchasesjournal.php b/htdocs/accountancy/journal/purchasesjournal.php
index e7ab6adbba4..ec21937c8ff 100644
--- a/htdocs/accountancy/journal/purchasesjournal.php
+++ b/htdocs/accountancy/journal/purchasesjournal.php
@@ -285,6 +285,14 @@ if ($action == 'writebookkeeping') {
 			continue;
 		}
 
+		// Error if some lines are not binded/ready to be journalized
+		if ($errorforinvoice[$key] == 'somelinesarenotbound')
+		{
+			$error++;
+			$errorforline++;
+			setEventMessages($langs->trans('ErrorInvoiceContainsLinesNotYetBounded', $val['ref']), null, 'errors');
+		}
+
 		// Thirdparty
 		if (! $errorforline)
 		{
@@ -499,8 +507,8 @@ if ($action == 'writebookkeeping') {
 			}
 		}
 
-		// Protection against a bug on line before
-		if (price2num($totaldebit) != price2num($totalcredit))
+		// Protection against a bug on lines before
+		if (! $errorforline && (price2num($totaldebit) != price2num($totalcredit)))
 		{
 			$error++;
 			$errorforline++;
@@ -508,14 +516,6 @@ if ($action == 'writebookkeeping') {
 			setEventMessages('Try to insert a non balanced transaction in book for '.$invoicestatic->ref.'. Canceled. Surely a bug.', null, 'errors');
 		}
 
-		// Error if some lines are not binded/ready to be journalized
-		if ($errorforinvoice[$key] == 'somelinesarenotbound')
-		{
-			$error++;
-			$errorforline++;
-			setEventMessages($langs->trans('ErrorInvoiceContainsLinesNotYetBounded', $val['ref']), null, 'errors');
-		}
-
 		if (! $errorforline)
 		{
 			$db->commit();
diff --git a/htdocs/accountancy/journal/sellsjournal.php b/htdocs/accountancy/journal/sellsjournal.php
index 4ed70d41c4b..5088841b3d1 100644
--- a/htdocs/accountancy/journal/sellsjournal.php
+++ b/htdocs/accountancy/journal/sellsjournal.php
@@ -286,6 +286,14 @@ if ($action == 'writebookkeeping') {
 			continue;
 		}
 
+		// Error if some lines are not binded/ready to be journalized
+		if ($errorforinvoice[$key] == 'somelinesarenotbound')
+		{
+			$error++;
+			$errorforline++;
+			setEventMessages($langs->trans('ErrorInvoiceContainsLinesNotYetBounded', $val['ref']), null, 'errors');
+		}
+
 		// Thirdparty
 		if (! $errorforline)
 		{
@@ -448,8 +456,8 @@ if ($action == 'writebookkeeping') {
 			}
 		}
 
-		// Protection against a bug on line before
-		if (price2num($totaldebit) != price2num($totalcredit))
+		// Protection against a bug on lines before
+		if (! $errorforline && (price2num($totaldebit) != price2num($totalcredit)))
 		{
 			$error++;
 			$errorforline++;
@@ -457,14 +465,6 @@ if ($action == 'writebookkeeping') {
 			setEventMessages('Try to insert a non balanced transaction in book for '.$invoicestatic->ref.'. Canceled. Surely a bug.', null, 'errors');
 		}
 
-		// Error if some lines are not binded/ready to be journalized
-		if ($errorforinvoice[$key] == 'somelinesarenotbound')
-		{
-			$error++;
-			$errorforline++;
-			setEventMessages($langs->trans('ErrorInvoiceContainsLinesNotYetBounded', $val['ref']), null, 'errors');
-		}
-
 		if (! $errorforline)
 		{
 			$db->commit();

From 12e48e07ae4284d8c8bce919bba9d3c339d93a10 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 12 Feb 2018 13:50:26 +0100
Subject: [PATCH 5/5] Fix deletion of ledger line when editing transaction

---
 htdocs/accountancy/bookkeeping/card.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/htdocs/accountancy/bookkeeping/card.php b/htdocs/accountancy/bookkeeping/card.php
index 593c71188e8..f0042f962bb 100644
--- a/htdocs/accountancy/bookkeeping/card.php
+++ b/htdocs/accountancy/bookkeeping/card.php
@@ -615,8 +615,8 @@ if ($action == 'create')
 							print '<input type="text" name="subledger_account" value="'.$line->subledger_account.'">';
 						}
 						print '</td>';
-						print '<td><input type="text" size="15" name="label_compte" value="' . $line->label_compte . '"/></td>';
-						print '<td><input type="text" size="15" name="label_operation" value="' . $line->label_operation. '"/></td>';
+						print '<td><input type="text" class="minwidth100" name="label_compte" value="' . $line->label_compte . '"/></td>';
+						print '<td><input type="text" class="minwidth300" name="label_operation" value="' . $line->label_operation. '"/></td>';
 						print '<td align="right"><input type="text" size="6" class="right" name="debit" value="' . price($line->debit) . '"/></td>';
 						print '<td align="right"><input type="text" size="6" class="right" name="credit" value="' . price($line->credit) . '"/></td>';
 						print '<td>';
@@ -636,8 +636,8 @@ if ($action == 'create')
 						print img_edit();
 						print '</a> &nbsp;';
 
-						$actiontodelete='detele';
-						if ($mode == '_tmp') $actiontodelete='confirm_delete';
+						$actiontodelete='delete';
+						if ($mode == '_tmp' || $action != 'delmouv') $actiontodelete='confirm_delete';
 
 						print '<a href="' . $_SERVER["PHP_SELF"] . '?action='.$actiontodelete.'&id=' . $line->id . '&piece_num=' . $line->piece_num . '&mode='.$mode.'">';
 						print img_delete();
@@ -673,8 +673,8 @@ if ($action == 'create')
 						print '<input type="text" name="subledger_account" value="">';
 					}
 					print '</td>';
-					print '<td><input type="text" size="15" name="label_compte" value="' . $line->label_compte . '"/></td>';
-					print '<td><input type="text" size="15" name="label_operation" value="' . $line->label_operation. '"/></td>';
+					print '<td><input type="text" class="minwidth100" name="label_compte" value="' . $line->label_compte . '"/></td>';
+					print '<td><input type="text" class="minwidth300" name="label_operation" value="' . $line->label_operation. '"/></td>';
 					print '<td align="right"><input type="text" size="6" class="right" name="debit" value="' . ($debit ? price($debit) : '') . '"/></td>';
 					print '<td align="right"><input type="text" size="6" class="right" name="credit" value="' . ($credit ? price($credit) : '') . '"/></td>';
 					print '<td><input type="submit" class="button" name="save" value="' . $langs->trans("Add") . '"></td>';