Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

CSS

Browse Source
This commit is contained in:
Laurent Destailleur 2023-10-09 13:23:22 +02:00
parent 797d5d6dc6
commit 19aea3d9b5
7 changed files with 47 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
htdocs/admin/bank.php
View File

@ -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 '<div class="div-table-responsive-no-min">';
print '<table class="noborder centpercent">';
print '<tr class="liste_titre">';
print '<td width="140">'.$langs->trans("Name").'</td>';
print '<td>'.$langs->trans("Description").'</td>';
print '<td>'.$langs->trans("Name").'</td>';
print '<td class="minwidth100">'.$langs->trans("Description").'</td>';
print '<td>'.$langs->trans("Example").'</td>';
print '<td class="center">'.$langs->trans("Status").'</td>';
print '<td class="center" width="60">&nbsp;</td>';
print "</tr>\n";
$bankorder[0][0] = $langs->trans("BankOrderGlobal");
@ -248,16 +249,16 @@ while ($i < $nbofbank) {
print img_picto($langs->trans("Activated"), 'on');
print '</td>';
} else {
print '<td class="center"><a href="'.$_SERVER['PHP_SELF'].'?action=setbankorder&token='.newToken().'&value='.$i.'">';
print '<td class="center"><a href="'.$_SERVER['PHP_SELF'].'?action=setbankorder&token='.newToken().'&value='.((int) $i).'">';
print img_picto($langs->trans("Disabled"), 'off');
print '</a></td>';
}
print '<td>&nbsp;</td>';
print '</tr>'."\n";
$i++;
}
print '</table>'."\n";
print "</div>";
print '<br><br>';
@ -287,15 +288,16 @@ if ($resql) {
dol_print_error($db);
}
print "<table class=\"noborder\" width=\"100%\">\n";
print "<tr class=\"liste_titre\">\n";
print '<div class="div-table-responsive-no-min">';
print '<table class="noborder centpercent">';"\n";
print '<tr class="liste_titre">'."\n";
print '<td>'.$langs->trans("Name").'</td>';
print '<td>'.$langs->trans("Description").'</td>';
print '<td class="minwidth100">'.$langs->trans("Description").'</td>';
print '<td class="center" width="60">'.$langs->trans("Status")."</td>\n";
print '<td class="center" width="60">'.$langs->trans("Default")."</td>\n";
print '<td class="center" width="38">'.$langs->trans("ShortInfo").'</td>';
print '<td class="center" width="38">'.$langs->trans("Preview").'</td>';
print "</tr>\n";
print '</tr>'."\n";
clearstatcache();
@ -400,18 +402,20 @@ foreach ($dirmodels as $reldir) {
}
}
print '</table>';
//}
print '</div>';
print '<br><br>';
print load_fiche_titre($langs->trans("BankColorizeMovement"), '', '');
print '<table class="noborder centpercent">';
print "<tr class=\"liste_titre\">\n";
print '<div class="div-table-responsive-no-min">';
print '<table class="noborder centpercent">';"\n";
print '<tr class="liste_titre">'."\n";
print '<td colspan="4">'.$langs->trans("Name").'</td>';
print '<td align="center" width="100">'.$langs->trans("Value").'</td>'."\n";
print '<td align="center" width="75">'.$langs->trans("Value").'</td>'."\n";
print "</tr>\n";
print '<tr class="oddeven"><td colspan="4" width="100">';
print '<tr class="oddeven"><td colspan="4">';
print $langs->trans('BankColorizeMovementDesc');
print "</td>";
// Active
@ -448,6 +452,7 @@ if (getDolGlobalInt('BANK_COLORIZE_MOVEMENT')) {
}
}
print '</table>';
print '</div>';
print '<br><br>';
@ -458,14 +463,15 @@ print '<br><br>';
print load_fiche_titre($langs->trans("Other"), '', '');
print "<table class=\"noborder\" width=\"100%\">\n";
print "<tr class=\"liste_titre\">\n";
print '<div class="div-table-responsive-no-min">';
print '<table class="noborder centpercent">';"\n";
print '<tr class="liste_titre">'."\n";
print '<td>'.$langs->trans("Name").'</td>';
print '<td>'.$langs->trans("Description").'</td>';
print '<td class="center" width="60">'.$langs->trans("Status")."</td>\n";
print '<td class="center width75">'.$langs->trans("Status")."</td>\n";
print "</tr>\n";
print '<tr class="oddeven"><td width="100">';
print '<tr class="oddeven"><td>';
print $langs->trans('AccountStatement');
print "</td><td>\n";
print $langs->trans('AutoReportLastAccountStatement');
@ -487,14 +493,16 @@ print "</tr>\n";
// Allow SEPA Mandate OnLine Sign
if (!getDolGlobalInt('SOCIETE_DISABLE_BANKACCOUNT')) {
print '<tr class="oddeven">';
print '<td>'.$langs->trans("AllowOnLineSign").'</td><td>'.$langs->trans("BankAccountModelModule").'</td>';
print '<td class="center" colspan="2">';
print '<td>'.$langs->trans("AllowOnLineSign").'</td>';
print '<td>'.$langs->trans("BankAccountModelModule").'</td>';
print '<td class="center">';
print ajax_constantonoff('SOCIETE_RIB_ALLOW_ONLINESIGN', array(), null, 0, 0, 0, 2, 0, 1);
print '</td></tr>';
}
print '</table>';
print '</div>';
print dol_get_fiche_end();
print $form->buttonsSaveCancel("Save", '');

4
htdocs/admin/chequereceipts.php
View File

@ -112,6 +112,7 @@ print dol_get_fiche_head($head, 'checkreceipts', $langs->trans("BankSetupModule"
print load_fiche_titre($langs->trans("ChequeReceiptsNumberingModule"), '', '');
print '<div class="div-table-responsive-no-min">';
print '<table class="noborder centpercent">';
print '<tr class="liste_titre">';
print '<td>'.$langs->trans("Name").'</td>';
@ -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 '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmod&token='.newToken().'&value='.preg_replace('/\.php$/', '', $file).'&scan_dir='.$module->scandir.'&label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmod&token='.newToken().'&value='.preg_replace('/\.php$/', '', $file).'&label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
}
print '</td>';
@ -230,6 +231,7 @@ foreach ($dirmodels as $reldir) {
}
print '</table>';
print '</div>';
print '<br>';

8
htdocs/core/lib/bank.lib.php
View File

@ -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();

4
htdocs/core/lib/company.lib.php
View File

@ -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');

6
htdocs/core/modules/cheque/mod_chequereceipt_mint.php
View File

@ -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)
{

8
htdocs/core/modules/cheque/mod_chequereceipt_thyme.php
View File

@ -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;
}

2
htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
View File

@ -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"));