diff --git a/htdocs/compta/bank/treso.php b/htdocs/compta/bank/treso.php index 8ac7d764c2d..236e540e0a2 100644 --- a/htdocs/compta/bank/treso.php +++ b/htdocs/compta/bank/treso.php @@ -118,9 +118,9 @@ if ($_REQUEST["account"] || $_REQUEST["ref"]) // Ligne de titre tableau des ecritures print ''; - print ''.$langs->trans("Invoices").''; + print ''.$langs->trans("DateEcheance").''; + print ''.$langs->trans("Description").''; print ''.$langs->trans("ThirdParty").''; - print ''.$langs->trans("DateEcheance").''; print ''.$langs->trans("Debit").''; print ''.$langs->trans("Credit").''; print ''.$langs->trans("BankBalance").''; @@ -132,18 +132,12 @@ if ($_REQUEST["account"] || $_REQUEST["ref"]) $var=!$var; print ''; print ''.$langs->trans("CurrentBalance").''; - print ' '; - print ''; - - $var=!$var; - print ''; - print ' '; print ''.price($solde).''; print ''; $var=!$var; print ''; - print ''.$langs->trans("RemainderToPay").''; + print ''.$langs->trans("RemainderToPay").':'; print ' '; print ''; @@ -239,7 +233,6 @@ if ($_REQUEST["account"] || $_REQUEST["ref"]) $num = sizeOf($tab_sqlobj); - $var=False; //$num = $db->num_rows($result); $i = 0; while ($i < $num) @@ -266,7 +259,7 @@ if ($_REQUEST["account"] || $_REQUEST["ref"]) $societestatic->id = $obj->socid; $societestatic->nom = $obj->nom; - $refcomp=$societestatic->getNomUrl(0,'',24); + $refcomp=$societestatic->getNomUrl(1,'',24); $paiement = -1*$facturefournstatic->getSommePaiement(); // Payment already done } @@ -280,7 +273,7 @@ if ($_REQUEST["account"] || $_REQUEST["ref"]) $societestatic->id = $obj->socid; $societestatic->nom = $obj->nom; - $refcomp=$societestatic->getNomUrl(0,'',24); + $refcomp=$societestatic->getNomUrl(1,'',24); $paiement = $facturestatic->getSommePaiement(); // Payment already done } @@ -299,9 +292,9 @@ if ($_REQUEST["account"] || $_REQUEST["ref"]) $solde += $total_ttc; print ""; + print ''.dolibarr_print_date($obj->dlr,"day").""; print "".$ref.""; print "".$refcomp.""; - print ''.dolibarr_print_date($obj->dlr,"day").""; if ($obj->total_ttc < 0) { print "".price($total_ttc)." "; }; if ($obj->total_ttc >= 0) { print " ".price($total_ttc).""; }; print "".price($solde).""; @@ -314,6 +307,13 @@ if ($_REQUEST["account"] || $_REQUEST["ref"]) dolibarr_print_error($db); } + // Solde actuel + $var=!$var; + print ''; + print ''.$langs->trans("FutureBalance").''; + print ''.price($solde).''; + print ''; + print ""; } diff --git a/htdocs/langs/en_US/banks.lang b/htdocs/langs/en_US/banks.lang index 951c76e2711..d562b327840 100644 --- a/htdocs/langs/en_US/banks.lang +++ b/htdocs/langs/en_US/banks.lang @@ -24,6 +24,7 @@ BalanceMinimalDesired=Minimum desired balance InitialBankBalance=Initial balance EndBankBalance=End balance CurrentBalance=Current balance +FutureBalance=Future balance ShowAllTimeBalance=Show balance from start Reconciliation=Reconciliation RIB=RIB @@ -112,6 +113,7 @@ ConfirmDeleteTransaction=Are you sure you want to delete this transaction ? ThisWillAlsoDeleteBankRecord=This will also delete generated bank transactions BankMovements=Movements CashBudget=Cash budget +PlannedTransactions=Planned transactions ExportDataset_banque_1=Bank transactions and account statement TransactionOnTheOtherAccount=Transaction on the other account TransactionWithOtherAccount=Account transfert diff --git a/htdocs/langs/fr_FR/banks.lang b/htdocs/langs/fr_FR/banks.lang index 079dc805db1..885167b3a28 100644 --- a/htdocs/langs/fr_FR/banks.lang +++ b/htdocs/langs/fr_FR/banks.lang @@ -25,7 +25,7 @@ InitialBankBalance=Solde initial EndBankBalance=Solde final CurrentBalance=Solde actuel FutureBalance=Solde futur -ShowAllTimeBalance=Afficher balance depuis debut +ShowAllTimeBalance=Afficher solde depuis debut Reconciliation=Rapprochement RIB=RIB IBAN=Identifiant IBAN diff --git a/htdocs/lib/bank.lib.php b/htdocs/lib/bank.lib.php index def2b363b61..b3de1af521d 100644 --- a/htdocs/lib/bank.lib.php +++ b/htdocs/lib/bank.lib.php @@ -50,6 +50,14 @@ function bank_prepare_head($obj) $head[$h][2] = 'journal'; $h++; +// if ($conf->global->MAIN_FEATURES_LEVEL >= 1) +// { + $head[$h][0] = DOL_URL_ROOT."/compta/bank/treso.php?account=".$obj->id; + $head[$h][1] = $langs->trans("PlannedTransactions"); + $head[$h][2] = 'cash'; + $h++; +// } + $head[$h][0] = DOL_URL_ROOT."/compta/bank/annuel.php?account=".$obj->id; $head[$h][1] = $langs->trans("IOMonthlyReporting"); $head[$h][2] = 'annual'; @@ -60,14 +68,6 @@ function bank_prepare_head($obj) $head[$h][2] = 'graph'; $h++; -// if ($conf->global->MAIN_FEATURES_LEVEL >= 1) -// { - $head[$h][0] = DOL_URL_ROOT."/compta/bank/treso.php?account=".$obj->id; - $head[$h][1] = $langs->trans("CashBudget"); - $head[$h][2] = 'cash'; - $h++; -// } - if ($obj->courant != 2) { $head[$h][0] = DOL_URL_ROOT."/compta/bank/releve.php?account=".$obj->id;