diff --git a/htdocs/admin/bank.php b/htdocs/admin/bank.php index afd0540cca3..ed113d54c78 100644 --- a/htdocs/admin/bank.php +++ b/htdocs/admin/bank.php @@ -24,6 +24,7 @@ * \ingroup bank * \brief Page to setup the bank module */ + require '../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php'; @@ -209,13 +210,13 @@ print dol_get_fiche_head($head, 'general', $langs->trans("BankSetupModule"), -1, //Show bank account order print load_fiche_titre($langs->trans("BankOrderShow"), '', ''); +print '
'; print ''; print ''; -print ''; -print ''; +print ''; +print ''; print ''; print ''; -print ''; print "\n"; $bankorder[0][0] = $langs->trans("BankOrderGlobal"); @@ -248,16 +249,16 @@ while ($i < $nbofbank) { print img_picto($langs->trans("Activated"), 'on'); print ''; } else { - print ''; } - print ''; print ''."\n"; $i++; } print '
'.$langs->trans("Name").''.$langs->trans("Description").''.$langs->trans("Name").''.$langs->trans("Description").''.$langs->trans("Example").''.$langs->trans("Status").' 
'; + print ''; print img_picto($langs->trans("Disabled"), 'off'); print ' 
'."\n"; +print "
"; print '

'; @@ -287,15 +288,16 @@ if ($resql) { dol_print_error($db); } -print "\n"; -print "\n"; +print '
'; +print '
';"\n"; +print ''."\n"; print ''; -print ''; +print ''; print '\n"; print '\n"; print ''; print ''; -print "\n"; +print ''."\n"; clearstatcache(); @@ -400,18 +402,20 @@ foreach ($dirmodels as $reldir) { } } print '
'.$langs->trans("Name").''.$langs->trans("Description").''.$langs->trans("Description").''.$langs->trans("Status")."'.$langs->trans("Default")."'.$langs->trans("ShortInfo").''.$langs->trans("Preview").'
'; -//} +print ''; print '

'; print load_fiche_titre($langs->trans("BankColorizeMovement"), '', ''); -print ''; -print "\n"; + +print '
'; +print '
';"\n"; +print ''."\n"; print ''; -print ''."\n"; +print ''."\n"; print "\n"; -print '"; // Active @@ -448,6 +452,7 @@ if (getDolGlobalInt('BANK_COLORIZE_MOVEMENT')) { } } print '
'.$langs->trans("Name").''.$langs->trans("Value").''.$langs->trans("Value").'
'; +print '
'; print $langs->trans('BankColorizeMovementDesc'); print "
'; +print ''; print '

'; @@ -458,14 +463,15 @@ print '

'; print load_fiche_titre($langs->trans("Other"), '', ''); -print "\n"; -print "\n"; +print '
'; +print '
';"\n"; +print ''."\n"; print ''; print ''; -print '\n"; +print '\n"; print "\n"; -print '\n"; // Allow SEPA Mandate OnLine Sign if (!getDolGlobalInt('SOCIETE_DISABLE_BANKACCOUNT')) { print ''; - print ''; - print ''; + print ''; + print ''; } - print '
'.$langs->trans("Name").''.$langs->trans("Description").''.$langs->trans("Status")."'.$langs->trans("Status")."
'; +print '
'; print $langs->trans('AccountStatement'); print "\n"; print $langs->trans('AutoReportLastAccountStatement'); @@ -487,14 +493,16 @@ print "
'.$langs->trans("AllowOnLineSign").''.$langs->trans("BankAccountModelModule").''; + print ''.$langs->trans("AllowOnLineSign").''.$langs->trans("BankAccountModelModule").''; print ajax_constantonoff('SOCIETE_RIB_ALLOW_ONLINESIGN', array(), null, 0, 0, 0, 2, 0, 1); print '
'; +print ''; + print dol_get_fiche_end(); print $form->buttonsSaveCancel("Save", ''); diff --git a/htdocs/admin/chequereceipts.php b/htdocs/admin/chequereceipts.php index 98d2c80579c..24901454e6d 100644 --- a/htdocs/admin/chequereceipts.php +++ b/htdocs/admin/chequereceipts.php @@ -112,6 +112,7 @@ print dol_get_fiche_head($head, 'checkreceipts', $langs->trans("BankSetupModule" print load_fiche_titre($langs->trans("ChequeReceiptsNumberingModule"), '', ''); +print '
'; print ''; print ''; print ''; @@ -185,7 +186,7 @@ foreach ($dirmodels as $reldir) { if ($conf->global->CHEQUERECEIPTS_ADDON == $file || $conf->global->CHEQUERECEIPTS_ADDON.'.php' == $file) { print img_picto($langs->trans("Activated"), 'switch_on'); } else { - print ''.img_picto($langs->trans("Disabled"), 'switch_off').''; + print ''.img_picto($langs->trans("Disabled"), 'switch_off').''; } print ''; @@ -230,6 +231,7 @@ foreach ($dirmodels as $reldir) { } print '
'.$langs->trans("Name").'
'; +print '
'; print '
'; diff --git a/htdocs/core/lib/bank.lib.php b/htdocs/core/lib/bank.lib.php index 56476cef4be..f568ecb603f 100644 --- a/htdocs/core/lib/bank.lib.php +++ b/htdocs/core/lib/bank.lib.php @@ -36,7 +36,7 @@ */ function bank_prepare_head(Account $object) { - global $db, $langs, $conf, $user; + global $db, $langs, $conf; $h = 0; $head = array(); @@ -131,7 +131,9 @@ function bank_prepare_head(Account $object) */ function bank_admin_prepare_head($object) { - global $langs, $conf, $user, $db; + global $langs, $conf, $db; + + $langs->loadLangs(array("compta")); $extrafields = new ExtraFields($db); $extrafields->fetch_name_optionals_label('bank_account'); @@ -191,7 +193,7 @@ function bank_admin_prepare_head($object) */ function account_statement_prepare_head($object, $num) { - global $langs, $conf, $user, $db; + global $langs, $conf, $db; $h = 0; $head = array(); diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php index aa72026f563..31523e331e8 100644 --- a/htdocs/core/lib/company.lib.php +++ b/htdocs/core/lib/company.lib.php @@ -443,7 +443,7 @@ function societe_prepare_head(Societe $object) */ function societe_prepare_head2($object) { - global $langs, $conf, $user; + global $langs; $h = 0; $head = array(); @@ -469,7 +469,7 @@ function societe_prepare_head2($object) */ function societe_admin_prepare_head() { - global $langs, $conf, $user, $db; + global $langs, $conf, $db; $extrafields = new ExtraFields($db); $extrafields->fetch_name_optionals_label('societe'); diff --git a/htdocs/core/modules/cheque/mod_chequereceipt_mint.php b/htdocs/core/modules/cheque/mod_chequereceipt_mint.php index 034fa63437e..7edddab5f26 100644 --- a/htdocs/core/modules/cheque/mod_chequereceipt_mint.php +++ b/htdocs/core/modules/cheque/mod_chequereceipt_mint.php @@ -109,9 +109,9 @@ class mod_chequereceipt_mint extends ModeleNumRefChequeReceipts /** * Return next free value * - * @param Societe $objsoc Object thirdparty - * @param Object $object Object we need next value for - * @return string Value if KO, <0 if KO + * @param Societe $objsoc Object thirdparty + * @param RemiseCheque $object Object we need next value for + * @return string Value if KO, <0 if KO */ public function getNextValue($objsoc, $object) { diff --git a/htdocs/core/modules/cheque/mod_chequereceipt_thyme.php b/htdocs/core/modules/cheque/mod_chequereceipt_thyme.php index 25100994aeb..a1ef07305b5 100644 --- a/htdocs/core/modules/cheque/mod_chequereceipt_thyme.php +++ b/htdocs/core/modules/cheque/mod_chequereceipt_thyme.php @@ -109,9 +109,9 @@ class mod_chequereceipt_thyme extends ModeleNumRefChequeReceipts /** * Return next free value * - * @param Societe $objsoc Object thirdparty - * @param Object $object Object we need next value for - * @return string Value if KO, <0 if KO + * @param Societe $objsoc Object thirdparty + * @param RemiseCheque $object Object we need next value for + * @return string Value if KO, <0 if KO */ public function getNextValue($objsoc, $object) { @@ -127,7 +127,7 @@ class mod_chequereceipt_thyme extends ModeleNumRefChequeReceipts return 0; } - $numFinal = get_next_value($db, $mask, 'bordereau_cheque', 'ref', '', $objsoc, $object->date_bordereau); + $numFinal = get_next_value($db, $mask, 'bordereau_cheque', 'ref', '', $objsoc, empty($object) ? dol_now() : $object->date_bordereau); return $numFinal; } diff --git a/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php b/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php index 476f649c5fb..4151646b545 100644 --- a/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php +++ b/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php @@ -54,7 +54,7 @@ class doc_generic_order_odt extends ModelePDFCommandes */ public function __construct($db) { - global $conf, $langs, $mysoc; + global $langs, $mysoc; // Load translation files required by the page $langs->loadLangs(array("main", "companies"));