Debug v21

Dolibarr · Nov 21, 2024 · d04e0a7 · d04e0a7
1 parent 2d135b4
commit d04e0a7
Show file tree

Hide file tree

Showing 5 changed files with 67 additions and 23 deletions.
diff --git a/htdocs/compta/bank/bankentries_list.php b/htdocs/compta/bank/bankentries_list.php
@@ -554,7 +554,11 @@
 
 	// Bank card
 	$head = bank_prepare_head($object);
-	print dol_get_fiche_head($head, 'journal', $langs->trans("FinancialAccount"), 0, 'account');
+	$activetab = 'journal';
+	if ($action == 'reconcile') {
+		$activetab = 'reconcile';
+	}
+	print dol_get_fiche_head($head, $activetab, $langs->trans("FinancialAccount"), 0, 'account');
 
 	$linkback = '<a href="'.DOL_URL_ROOT.'/compta/bank/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
@@ -566,7 +570,7 @@
 	/*
 	 * Buttons actions
 	 */
-
+	/* Moved into tab
 	if ($action != 'reconcile') {
 		if ($object->canBeConciliated() > 0) {
 			$allowautomaticconciliation = false; // TODO
@@ -598,6 +602,7 @@
 			}
 		}
 	}
+	*/
 }
 
 $sql = "SELECT b.rowid, b.dateo as do, b.datev as dv, b.amount, b.label, b.rappro as conciliated, b.num_releve, b.num_chq,";
@@ -1032,8 +1037,8 @@
 		print '<input type="submit" class="button" name="confirm_reconcile" value="'.$langs->trans("Conciliate").'">';
 		print ' <span class="opacitymedium">'.$langs->trans("otherwise").'</span> ';
 		print '<input type="submit" class="button small" name="confirm_savestatement" value="'.$langs->trans("SaveStatementOnly").'">';
-		print ' <span class="opacitymedium">'.$langs->trans("or").'</span> ';
-		print '<input type="submit" name="cancel" class="button button-cancel small" value="'.$langs->trans("Cancel").'">';
+		//print ' <span class="opacitymedium">'.$langs->trans("or").'</span> ';
+		//print '<input type="submit" name="cancel" class="button button-cancel small" value="'.$langs->trans("Cancel").'">';
 		print '</div>';
 
 		print '<br>';

diff --git a/htdocs/compta/bank/releve.php b/htdocs/compta/bank/releve.php
@@ -310,7 +310,7 @@
 
 		print dol_get_fiche_end();
 
-
+		/* Moved as a tab
 		if ($object->canBeConciliated() > 0) {
 			$allowautomaticconciliation = false; // TODO
 			$titletoconciliatemanual = $langs->trans("Conciliate");
@@ -339,6 +339,7 @@
 				}
 			}
 		}
+		*/
 
 		// List of mass actions available
 		$arrayofmassactions = array(

diff --git a/htdocs/core/lib/bank.lib.php b/htdocs/core/lib/bank.lib.php
@@ -38,7 +38,8 @@
  */
 function bank_prepare_head(Account $object)
 {
-	global $db, $langs, $conf;
+	global $db, $langs, $conf, $user;
+
 	$h = 0;
 	$head = array();
 
@@ -52,23 +53,44 @@ function bank_prepare_head(Account $object)
 	$head[$h][2] = 'journal';
 	$h++;
 
-	//    if ($conf->global->MAIN_FEATURES_LEVEL >= 1)
-	//    {
-	$head[$h][0] = DOL_URL_ROOT."/compta/bank/treso.php?account=".$object->id;
-	$head[$h][1] = $langs->trans("PlannedTransactions");
-	$head[$h][2] = 'cash';
-	$h++;
-	//    }
-
-	$head[$h][0] = DOL_URL_ROOT."/compta/bank/annuel.php?account=".$object->id;
-	$head[$h][1] = $langs->trans("IOMonthlyReporting");
-	$head[$h][2] = 'annual';
-	$h++;
+	if ($object->canBeConciliated() > 0) {
+		$allowautomaticconciliation = false; // TODO
+		$titletoconciliatemanual = $langs->trans("Conciliate");
+		$titletoconciliateauto = $langs->trans("Conciliate");
+		if ($allowautomaticconciliation) {
+			$titletoconciliatemanual .= ' ('.$langs->trans("Manual").')';
+			$titletoconciliateauto .= ' ('.$langs->trans("Auto").')';
+		}
 
-	$head[$h][0] = DOL_URL_ROOT."/compta/bank/graph.php?account=".$object->id;
-	$head[$h][1] = $langs->trans("Graph");
-	$head[$h][2] = 'graph';
-	$h++;
+		$param = '';
+
+		// If not cash account and can be reconciliate
+		if ($user->hasRight('banque', 'consolidate')) {
+			$head[$h][0] = DOL_URL_ROOT."/compta/bank/bankentries_list.php?id=".$object->id.'&action=reconcile&sortfield=b.datev,b.dateo,b.rowid&sortorder=asc,asc,asc&search_conciliated=0&search_account='.$object->id.$param;
+			$head[$h][1] = $titletoconciliatemanual;
+			$head[$h][2] = 'reconcile';
+			$h++;
+		}/* else {
+			$buttonreconcile = '<a class="butActionRefused classfortooltip" title="'.$langs->trans("NotEnoughPermissions").'" href="#">'.$titletoconciliatemanual.'</a>';
+		}*/
+
+		if ($allowautomaticconciliation) {
+			// If not cash account and can be reconciliate
+			if ($user->hasRight('banque', 'consolidate')) {
+				$newparam = $param;
+				$newparam = preg_replace('/search_conciliated=\d+/i', '', $newparam);
+
+				$head[$h][0] = DOL_URL_ROOT."/compta/bank/bankentries_list.php?id=".$object->id.'&action=reconcile&sortfield=b.datev,b.dateo,b.rowid&sortorder=asc,asc,asc&search_conciliated=0&search_account='.$object->id.$newparam;
+				$head[$h][1] = $titletoconciliateauto;
+				$head[$h][2] = 'reconcileauto';
+				$h++;
+
+				//$buttonreconcile .= ' <a class="butAction" style="margin-bottom: 5px !important; margin-top: 5px !important" href="'.DOL_URL_ROOT.'/compta/bank/bankentries_list.php?action=reconcile&sortfield=b.datev,b.dateo,b.rowid&sortorder=asc,asc,asc&search_conciliated=0'.$newparam.'">'.$titletoconciliateauto.'</a>';
+			}/* else {
+				$buttonreconcile .= ' <a class="butActionRefused" style="margin-bottom: 5px !important; margin-top: 5px !important" title="'.$langs->trans("NotEnoughPermissions").'" href="#">'.$titletoconciliateauto.'</a>';
+			}*/
+		}
+	}
 
 	if ($object->type != Account::TYPE_CASH || getDolGlobalString('BANK_CAN_RECONCILIATE_CASHACCOUNT')) {
 		$nbReceipts = 0;
@@ -110,6 +132,21 @@ function bank_prepare_head(Account $object)
 	$head[$h][2] = 'document';
 	$h++;
 
+	$head[$h][0] = DOL_URL_ROOT."/compta/bank/annuel.php?account=".$object->id;
+	$head[$h][1] = $langs->trans("IOMonthlyReporting");
+	$head[$h][2] = 'annual';
+	$h++;
+
+	$head[$h][0] = DOL_URL_ROOT."/compta/bank/graph.php?account=".$object->id;
+	$head[$h][1] = $langs->trans("Graph");
+	$head[$h][2] = 'graph';
+	$h++;
+
+	$head[$h][0] = DOL_URL_ROOT."/compta/bank/treso.php?account=".$object->id;
+	$head[$h][1] = $langs->trans("PlannedTransactions");
+	$head[$h][2] = 'cash';
+	$h++;
+
 	// Show more tabs from modules
 	// Entries must be declared in modules descriptor with line
 	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab

diff --git a/htdocs/langs/en_US/banks.lang b/htdocs/langs/en_US/banks.lang
@@ -133,7 +133,7 @@ DeleteTransaction=Delete entry
 ConfirmDeleteTransaction=Are you sure you want to delete this entry?
 ThisWillAlsoDeleteBankRecord=This will also delete generated bank entry
 BankMovements=Movements
-PlannedTransactions=Planned entries
+PlannedTransactions=Upcoming entries
 Graph=Graphs
 ExportDataset_banque_1=Bank entries and account statement
 ExportDataset_banque_2=Deposit slip

diff --git a/htdocs/langs/en_US/stocks.lang b/htdocs/langs/en_US/stocks.lang
@@ -348,3 +348,4 @@ QtyViewed=Quantity viewed
 QtyStock=Quantity on stock
 QtyRegulated=Quantity on stock correction
 InventoryEntrepot=Warehouse identity
+SelectedWarehouse=Select a warehouse