Merge pull request #5671 from aspangaro/5.0-p3

Fix: Presentation on financial account
This commit is contained in:
Juanjo Menent 2016-08-31 02:08:33 +02:00 committed by GitHub
commit 8155c09d49
8 changed files with 22 additions and 11 deletions

View File

@ -177,8 +177,9 @@ if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->banque->m
/*
* View
*/
llxHeader('',$langs->trans("FinancialAccount").'-'.$langs->trans("Transactions"));
$title = $langs->trans("FinancialAccount").' - '.$langs->trans("Transactions");
$helpurl = "";
llxHeader('',$title,$helpurl);
$societestatic=new Societe($db);
$userstatic=new User($db);

View File

@ -53,8 +53,9 @@ else
$year_end=$year_start+2;
}
llxHeader();
$title = $langs->trans("FinancialAccount").' - '.$langs->trans("IOMonthlyReporting");
$helpurl = "";
llxHeader('',$title,$helpurl);
$form = new Form($db);

View File

@ -249,7 +249,9 @@ if (! empty($conf->accounting->enabled)) $formaccountancy = New FormVentilation(
$countrynotdefined=$langs->trans("ErrorSetACountryFirst").' ('.$langs->trans("SeeAbove").')';
llxHeader();
$title = $langs->trans("FinancialAccount") . " - " . $langs->trans("Card");
$helpurl = "";
llxHeader("",$title,$helpurl);
// Creation

View File

@ -139,8 +139,9 @@ else if ($action == 'confirm_deletefile' && $confirm == 'yes') {
/*
* View
*/
llxHeader();
$title = $langs->trans("FinancialAccount").' - '.$langs->trans("Documents");
$helpurl = "";
llxHeader('',$title,$helpurl);
$form = new Form($db);

View File

@ -53,7 +53,9 @@ $error=0;
* View
*/
llxHeader();
$title = $langs->trans("FinancialAccount").' - '.$langs->trans("Graph");
$helpurl = "";
llxHeader('',$title,$helpurl);
$form = new Form($db);

View File

@ -81,7 +81,9 @@ $pagenext = $page + 1;
* View
*/
llxHeader();
$title = $langs->trans("FinancialAccount").' - '.$langs->trans("AccountStatements");
$helpurl = "";
llxHeader('',$title,$helpurl);
$form = new Form($db);
$societestatic=new Societe($db);

View File

@ -55,7 +55,9 @@ $page=isset($_GET["page"])?$_GET["page"]:0;
* View
*/
llxHeader();
$title = $langs->trans("FinancialAccount").' - '.$langs->trans("PlannedTransactions");
$helpurl = "";
llxHeader('',$title,$helpurl);
$societestatic = new Societe($db);
$facturestatic=new Facture($db);

View File

@ -38,7 +38,7 @@ function bank_prepare_head(Account $object)
$head = array();
$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';
$h++;