Merge pull request #5671 from aspangaro/5.0-p3
Fix: Presentation on financial account
This commit is contained in:
commit
8155c09d49
@ -177,8 +177,9 @@ if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->banque->m
|
|||||||
/*
|
/*
|
||||||
* View
|
* View
|
||||||
*/
|
*/
|
||||||
|
$title = $langs->trans("FinancialAccount").' - '.$langs->trans("Transactions");
|
||||||
llxHeader('',$langs->trans("FinancialAccount").'-'.$langs->trans("Transactions"));
|
$helpurl = "";
|
||||||
|
llxHeader('',$title,$helpurl);
|
||||||
|
|
||||||
$societestatic=new Societe($db);
|
$societestatic=new Societe($db);
|
||||||
$userstatic=new User($db);
|
$userstatic=new User($db);
|
||||||
|
|||||||
@ -53,8 +53,9 @@ else
|
|||||||
$year_end=$year_start+2;
|
$year_end=$year_start+2;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$title = $langs->trans("FinancialAccount").' - '.$langs->trans("IOMonthlyReporting");
|
||||||
llxHeader();
|
$helpurl = "";
|
||||||
|
llxHeader('',$title,$helpurl);
|
||||||
|
|
||||||
$form = new Form($db);
|
$form = new Form($db);
|
||||||
|
|
||||||
|
|||||||
@ -249,7 +249,9 @@ if (! empty($conf->accounting->enabled)) $formaccountancy = New FormVentilation(
|
|||||||
|
|
||||||
$countrynotdefined=$langs->trans("ErrorSetACountryFirst").' ('.$langs->trans("SeeAbove").')';
|
$countrynotdefined=$langs->trans("ErrorSetACountryFirst").' ('.$langs->trans("SeeAbove").')';
|
||||||
|
|
||||||
llxHeader();
|
$title = $langs->trans("FinancialAccount") . " - " . $langs->trans("Card");
|
||||||
|
$helpurl = "";
|
||||||
|
llxHeader("",$title,$helpurl);
|
||||||
|
|
||||||
|
|
||||||
// Creation
|
// Creation
|
||||||
|
|||||||
@ -139,8 +139,9 @@ else if ($action == 'confirm_deletefile' && $confirm == 'yes') {
|
|||||||
/*
|
/*
|
||||||
* View
|
* View
|
||||||
*/
|
*/
|
||||||
|
$title = $langs->trans("FinancialAccount").' - '.$langs->trans("Documents");
|
||||||
llxHeader();
|
$helpurl = "";
|
||||||
|
llxHeader('',$title,$helpurl);
|
||||||
|
|
||||||
$form = new Form($db);
|
$form = new Form($db);
|
||||||
|
|
||||||
|
|||||||
@ -53,7 +53,9 @@ $error=0;
|
|||||||
* View
|
* View
|
||||||
*/
|
*/
|
||||||
|
|
||||||
llxHeader();
|
$title = $langs->trans("FinancialAccount").' - '.$langs->trans("Graph");
|
||||||
|
$helpurl = "";
|
||||||
|
llxHeader('',$title,$helpurl);
|
||||||
|
|
||||||
$form = new Form($db);
|
$form = new Form($db);
|
||||||
|
|
||||||
|
|||||||
@ -81,7 +81,9 @@ $pagenext = $page + 1;
|
|||||||
* View
|
* View
|
||||||
*/
|
*/
|
||||||
|
|
||||||
llxHeader();
|
$title = $langs->trans("FinancialAccount").' - '.$langs->trans("AccountStatements");
|
||||||
|
$helpurl = "";
|
||||||
|
llxHeader('',$title,$helpurl);
|
||||||
|
|
||||||
$form = new Form($db);
|
$form = new Form($db);
|
||||||
$societestatic=new Societe($db);
|
$societestatic=new Societe($db);
|
||||||
|
|||||||
@ -55,7 +55,9 @@ $page=isset($_GET["page"])?$_GET["page"]:0;
|
|||||||
* View
|
* View
|
||||||
*/
|
*/
|
||||||
|
|
||||||
llxHeader();
|
$title = $langs->trans("FinancialAccount").' - '.$langs->trans("PlannedTransactions");
|
||||||
|
$helpurl = "";
|
||||||
|
llxHeader('',$title,$helpurl);
|
||||||
|
|
||||||
$societestatic = new Societe($db);
|
$societestatic = new Societe($db);
|
||||||
$facturestatic=new Facture($db);
|
$facturestatic=new Facture($db);
|
||||||
|
|||||||
@ -38,7 +38,7 @@ function bank_prepare_head(Account $object)
|
|||||||
$head = array();
|
$head = array();
|
||||||
|
|
||||||
$head[$h][0] = DOL_URL_ROOT . '/compta/bank/card.php?id=' . $object->id;
|
$head[$h][0] = DOL_URL_ROOT . '/compta/bank/card.php?id=' . $object->id;
|
||||||
$head[$h][1] = $langs->trans("AccountCard");
|
$head[$h][1] = $langs->trans("Card");
|
||||||
$head[$h][2] = 'bankname';
|
$head[$h][2] = 'bankname';
|
||||||
$h++;
|
$h++;
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user