diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php index bc1f9665bc3..2e9bcfdc841 100644 --- a/htdocs/admin/modules.php +++ b/htdocs/admin/modules.php @@ -1300,8 +1300,8 @@ if ($mode == 'marketplace') { print '
| '.$form->textwithpicto($langs->trans("ModuleProviderSites"), $langs->trans("WebSiteDesc")).' | '; - print ''; + print ' | '.$form->textwithpicto($langs->trans("ModuleProviderSites"), $langs->trans("WebSiteDesc")).' | '; + print ''; print ' | '; print ''; print ' | ||
| '.$langs->trans("BankAccount").' | '; + print img_picto('', 'account', 'class="pictofixedwidth"'); $form->select_comptes($filteraccountid, 'accountid', 0, 'courant <> 2', 1); print ' | |||||
| '.$langs->trans("Select")." "; + if ($conf->use_javascript_ajax) { + print ''.$langs->trans("All").' / '.$langs->trans("None").''; + } + print ' | ';
+ }
print ''; if ($type == 'CHQ') { print $langs->trans("DateChequeReceived"); @@ -546,47 +556,51 @@ if ($action == 'new') { print ' | '.$langs->trans("Amount")." | \n"; print ''.$langs->trans("Payment")." | \n"; print ''.$langs->trans("LineRecord")." | \n"; - print ''.$langs->trans("Select")." "; - if ($conf->use_javascript_ajax) { - print ''.$langs->trans("All").' / '.$langs->trans("None").''; + if (empty($conf->main_checkbox_left_column)) { + print ' | '.$langs->trans("Select")." "; + if ($conf->use_javascript_ajax) { + print ''.$langs->trans("All").' / '.$langs->trans("None").''; + } + print ' | ';
}
- print '';
print "|||||||||
| '; + print ''; + print ' | '; + } print ''.dol_print_date($value["paymentdate"], 'day').' | '; - print ''.$value["numero"]." | \n"; - print ''.$value["emetteur"]." | \n"; - print ''.$value["banque"]." | \n"; - print ''.price($value["amount"], 0, $langs, 1, -1, -1, $conf->currency).' | '; + print ''.dolPrintHTML($value["numero"])." | \n"; + print ''.dolPrintHTML($value["emetteur"])." | \n"; + print ''.dolPrintHTML($value["banque"])." | \n"; + print ''.price($value["amount"], 0, $langs, 1, -1, -1, $conf->currency).' | '; // Link to payment - print ''; + print ' | '; $paymentstatic->id = $value["paymentid"]; $paymentstatic->ref = $value["paymentref"]; $paymentstatic->date = $value["paymentdate"]; if ($paymentstatic->id) { print $paymentstatic->getNomUrl(1); - } else { - print ' '; } print ' | '; // Link to bank transaction - print ''; + print ' | '; $accountlinestatic->id = $value["id"]; $accountlinestatic->ref = $value["ref"]; if ($accountlinestatic->id > 0) { print $accountlinestatic->getNomUrl(1); - } else { - print ' '; } print ' | '; - - print ''; - print ''; - print ' | '; + if (empty($conf->main_checkbox_left_column)) { + print ''; + print ''; + print ' | '; + } print ''; diff --git a/htdocs/core/js/lib_head.js.php b/htdocs/core/js/lib_head.js.php index 6a3f82a2ebd..4adbf0ee85c 100644 --- a/htdocs/core/js/lib_head.js.php +++ b/htdocs/core/js/lib_head.js.php @@ -580,7 +580,7 @@ function cleanSerialize(expr) { */ function confirmDolibarr(msg, id, popupWidth = 400, popupHeight = 300, disableCancelButton = 0) { let alink = document.getElementById(id); - let title = 'trans("Note")); ?>'; + let title = 'transnoentitiesnoconv("Note")); ?>'; if (alink.getAttribute("data-alreadyclicked") === "1") { return true; @@ -590,11 +590,11 @@ function confirmDolibarr(msg, id, popupWidth = 400, popupHeight = 300, disableCa let buttons = {}; if (disableCancelButton === 0) { - buttons['trans("Cancel")); ?>'] = function () { + buttons['transnoentitiesnoconv("Cancel")); ?>'] = function () { $(this).dialog("close"); }; } - buttons['trans("OK")); ?>'] = function () { + buttons['transnoentitiesnoconv("Confirm")); ?>'] = function () { console.log("We click OK"); $(this).dialog("close"); alink.setAttribute("data-alreadyclicked", "1"); alink.click(); return false; }; diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 907f7d7cb28..9209bc0a8ba 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -325,6 +325,17 @@ function getDolCurrency() return (string) $conf->currency; } +/** + * Return if render must be optimized for small screen + * + * @return string Value returned + */ +function getDolOptimizeSmallScreen() +{ + global $conf; + return (string) $conf->dol_optimize_smallscreen; +} + /** * Return the current entity * diff --git a/htdocs/ecm/file_card.php b/htdocs/ecm/file_card.php index 7d76fc35f19..404e57e20bd 100644 --- a/htdocs/ecm/file_card.php +++ b/htdocs/ecm/file_card.php @@ -376,7 +376,7 @@ if (!empty($object->share)) { print img_picto('', 'globe').' '; if ($action != 'edit') { - print ''; + print ''; } else { print $fulllink; } diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php index 9acd309810e..3a4e100a982 100644 --- a/htdocs/fourn/facture/list.php +++ b/htdocs/fourn/facture/list.php @@ -208,7 +208,7 @@ $arrayfields = array( 'f.label' => array('label' => "Label", 'checked' => '0', 'position' => 20), 'f.datef' => array('label' => "DateInvoice", 'checked' => '1', 'position' => 25), 'f.date_lim_reglement' => array('label' => "DateDue", 'checked' => '1', 'position' => 27), - 'p.ref' => array('label' => "ProjectRef", 'checked' => '0', 'position' => 30), + 'p.ref' => array('label' => "ProjectRef", 'checked' => '1', 'position' => 30, 'enabled' => (isModEnabled('project') ? '1' : '0')), 's.nom' => array('label' => "ThirdParty", 'checked' => '1', 'position' => 41), 's.name_alias' => array('label' => "AliasNameShort", 'checked' => '0', 'position' => 42), 's.town' => array('label' => "Town", 'checked' => '-1', 'position' => 43), @@ -217,8 +217,8 @@ $arrayfields = array( 'country.code_iso' => array('label' => "Country", 'checked' => '0', 'position' => 46), 'typent.code' => array('label' => "ThirdPartyType", 'checked' => $checkedtypetiers, 'position' => 48), 'f.vat_reverse_charge' => array('label' => "VATReverseCharge", 'checked' => '0', 'position' => 49, 'enabled' => (getDolGlobalString('ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE') ? '1' : '0')), - 'f.fk_mode_reglement' => array('label' => "PaymentMode", 'checked' => '1', 'position' => 52), - 'f.fk_cond_reglement' => array('label' => "PaymentConditionsShort", 'checked' => '1', 'position' => 50), + 'f.fk_mode_reglement' => array('label' => "PaymentMode", 'checked' => '0', 'position' => 52), + 'f.fk_cond_reglement' => array('label' => "PaymentConditionsShort", 'checked' => '0', 'position' => 50), 'ba.label' => array('label' => "BankAccount", 'langfile' => 'banks', 'checked' => '0', 'enabled' => (string) (int) (isModEnabled('bank')), 'position' => 192), 'f.total_ht' => array('label' => "AmountHT", 'checked' => '1', 'position' => 105), 'f.total_vat' => array('label' => "AmountVAT", 'checked' => '0', 'position' => 110), diff --git a/htdocs/langs/en_US/compta.lang b/htdocs/langs/en_US/compta.lang index 8a79602d8e7..c6785cf3e69 100644 --- a/htdocs/langs/en_US/compta.lang +++ b/htdocs/langs/en_US/compta.lang @@ -145,7 +145,7 @@ LastCheckReceiptShort=Latest %s deposit slips LastPaymentForDepositShort=Latest %s %s deposit slips NewCheckReceipt=New discount NewCheckDeposit=New deposit slip -NewCheckDepositOn=Create receipt for deposit on account: %s +NewCheckDepositOn=Create cheque deposit slip NoWaitingChecks=No checks awaiting deposit. NoWaitingPaymentForDeposit=No %s payment awaiting deposit. DateChequeReceived=Check receiving date diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php index 7db06a8de4f..2e3a1c86e17 100644 --- a/htdocs/theme/eldy/global.inc.php +++ b/htdocs/theme/eldy/global.inc.php @@ -334,6 +334,9 @@ input[type="text"]:not(.input-icon-security, .input-icon-user, .input-icon-passw input[type="password"]:not(.input-icon-security, .input-icon-user, .input-icon-password) { height: 28px; } +input.downloadexternallink { + padding-left: 3px; +} .input-icon-user, .input-icon-password { padding-right: 28px !important; } diff --git a/htdocs/theme/eldy/theme_vars.inc.php b/htdocs/theme/eldy/theme_vars.inc.php index c8eb6aef288..3d8fa004106 100644 --- a/htdocs/theme/eldy/theme_vars.inc.php +++ b/htdocs/theme/eldy/theme_vars.inc.php @@ -64,7 +64,7 @@ $colorbacklinepair2 = '252,252,252'; // line pair $colorbacklinepairhover = '240,242,249'; // line hover $colorbacklinepairchecked = '240,242,249'; // line checked $colorbacklinebreak = '248,247,244'; // line break -$colortexttitlenotab = '35,135,140'; // 150,90,121 140,80,10 or 10,140,80 #875a7b green=0,123,140, violet: 0,50,120 +$colortexttitlenotab = '0,135,160'; // 150,90,121 140,80,10 or 10,140,80 #875a7b green=0,123,140, violet: 0,50,120 $colortexttitlenotab2 = '100,0,100'; // 150,90,121 140,80,10 or 10,140,80 #875a7b green=0,123,140, violet: 0,50,120 $colortexttitle = '40, 40, 60'; $colortexttitlelink = '10, 20, 100'; diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php index 51febdc9e87..ab302d7c297 100644 --- a/htdocs/theme/md/style.css.php +++ b/htdocs/theme/md/style.css.php @@ -563,6 +563,10 @@ input { .tableforfield input{ padding: 2px; } +input.downloadexternallink { + padding-left: 3px; +} + .refidno input { margin-top: 0 !important; padding: 0; |