Merge remote-tracking branch 'origin/bankStatementDocument' into bankStatementDocument
This commit is contained in:
commit
f18bca7687
@ -103,7 +103,7 @@ if ($id > 0 || !empty($ref)) {
|
|||||||
$upload_dir = $conf->bank->dir_output . "/".$id."/statement/" . dol_sanitizeFileName($num);
|
$upload_dir = $conf->bank->dir_output . "/".$id."/statement/" . dol_sanitizeFileName($num);
|
||||||
|
|
||||||
// Onglets
|
// Onglets
|
||||||
$head = account_statement_prepare_head($object,$num);
|
$head = account_statement_prepare_head($object, $num);
|
||||||
dol_fiche_head($head, 'document', $langs->trans("FinancialAccount"), -1, 'account');
|
dol_fiche_head($head, 'document', $langs->trans("FinancialAccount"), -1, 'account');
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -362,7 +362,7 @@ else
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
// Onglets
|
// Onglets
|
||||||
$head=account_statement_prepare_head($object,$numref);
|
$head=account_statement_prepare_head($object, $numref);
|
||||||
dol_fiche_head($head, 'statement', $langs->trans("FinancialAccount"), 0, 'account');
|
dol_fiche_head($head, 'statement', $langs->trans("FinancialAccount"), 0, 'account');
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -165,7 +165,7 @@ function bank_admin_prepare_head($object)
|
|||||||
* @param Object $num val to account statement
|
* @param Object $num val to account statement
|
||||||
* @return array Array of tabs to shoc
|
* @return array Array of tabs to shoc
|
||||||
*/
|
*/
|
||||||
function account_statement_prepare_head($object,$num)
|
function account_statement_prepare_head($object, $num)
|
||||||
{
|
{
|
||||||
global $langs, $conf, $user,$db;
|
global $langs, $conf, $user,$db;
|
||||||
$h = 0;
|
$h = 0;
|
||||||
|
|||||||
@ -120,5 +120,5 @@ $formfile->list_of_documents(
|
|||||||
print "<br>";
|
print "<br>";
|
||||||
|
|
||||||
//List of links
|
//List of links
|
||||||
$formfile->listOfLinks($object, $permission, $action, GETPOST('linkid', 'int'), $param,$relativepathwithnofile);
|
$formfile->listOfLinks($object, $permission, $action, GETPOST('linkid', 'int'), $param, $relativepathwithnofile);
|
||||||
print "<br>";
|
print "<br>";
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user