diff --git a/htdocs/accountancy/index.php b/htdocs/accountancy/index.php index 1207620a46d..a412dad7374 100644 --- a/htdocs/accountancy/index.php +++ b/htdocs/accountancy/index.php @@ -26,10 +26,6 @@ // Load Dolibarr environment require '../main.inc.php'; -require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; -require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php'; -require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php'; - /** * @var Conf $conf * @var DoliDB $db @@ -38,6 +34,9 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php'; * @var Translate $langs * @var User $user */ +require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php'; // Load translation files required by the page $langs->loadLangs(array("compta", "bills", "other", "accountancy", "loans", "banks", "admin", "dict")); @@ -154,6 +153,8 @@ if (isModEnabled('accounting')) { print '
'; print "
\n"; + print '
'; + // STEPS $step++; $s = img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescJournalSetup", $step, '{s}'); @@ -199,6 +200,7 @@ if (isModEnabled('accounting')) { print $s; print "
\n"; } + print '
'; print "
\n"; @@ -206,6 +208,8 @@ if (isModEnabled('accounting')) { print "
\n"; print "
\n"; + print '
'; + $step++; $s = img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescDefault", $step, '{s}'); $s = str_replace('{s}', ''.$langs->transnoentitiesnoconv("Setup").' - '.$langs->transnoentitiesnoconv("MenuDefaultAccounts").'', $s); @@ -247,6 +251,8 @@ if (isModEnabled('accounting')) { print $s; print "
\n"; + print '
'; + print '
'; } @@ -260,6 +266,8 @@ if (isModEnabled('accounting')) { $langs->loadLangs(array('bills', 'trips')); + print '
'; + $step++; $s = img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescBind", chr(64 + $step), $langs->transnoentitiesnoconv("BillsCustomers"), '{s}')."\n"; $s = str_replace('{s}', ''.$langs->transnoentitiesnoconv("TransferInAccounting").' - '.$langs->transnoentitiesnoconv("CustomersVentilation").'', $s); @@ -293,6 +301,9 @@ if (isModEnabled('accounting')) { $s = img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescClosePeriod", chr(64 + $step))."
\n"; print $s; + print '
'; + + if (!empty($resultboxes['boxlista']) || !empty($resultboxes['boxlistb'])) { print "
\n"; print '
'; diff --git a/htdocs/adherents/index.php b/htdocs/adherents/index.php index 1b9358901bd..68e8888ac19 100644 --- a/htdocs/adherents/index.php +++ b/htdocs/adherents/index.php @@ -31,12 +31,6 @@ // Load Dolibarr environment require '../main.inc.php'; -require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php'; -require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php'; -require_once DOL_DOCUMENT_ROOT.'/adherents/class/subscription.class.php'; -require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php'; - - /** * @var Conf $conf * @var DoliDB $db @@ -44,6 +38,10 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php'; * @var Translate $langs * @var User $user */ +require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php'; +require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php'; +require_once DOL_DOCUMENT_ROOT.'/adherents/class/subscription.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php'; // Load translation files required by the page $langs->loadLangs(array("companies", "members")); @@ -108,7 +106,7 @@ if ($conf->use_javascript_ajax) { $boxgraph .= '
'; $boxgraph .= ''; - $boxgraph .= ''; + $boxgraph .= ''; $boxgraph .= '
'.$langs->trans("Statistics").($numberyears ? ' ('.($year - $numberyears).' - '.$year.')' : '').'
'.$langs->trans("Statistics").' - '.$langs->trans("Status").' '.($numberyears ? ' ('.($year - $numberyears).' - '.$year.')' : '').'
'; require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherentstats.class.php'; diff --git a/htdocs/langs/en_US/products.lang b/htdocs/langs/en_US/products.lang index 5b6cf1bdce9..e8985d18281 100644 --- a/htdocs/langs/en_US/products.lang +++ b/htdocs/langs/en_US/products.lang @@ -52,6 +52,7 @@ Stock=Stock MenuStocks=Stocks Stocks=Stocks and location (warehouse) of products Movements=Movements +ProductStatus=Products or services status Sell=Sell Buy=Purchase OnSell=For sale diff --git a/htdocs/product/index.php b/htdocs/product/index.php index 2c604eaf269..63dd7beaf24 100644 --- a/htdocs/product/index.php +++ b/htdocs/product/index.php @@ -32,11 +32,6 @@ // Load Dolibarr environment require '../main.inc.php'; -require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; -require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php'; -require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; -require_once DOL_DOCUMENT_ROOT.'/product/dynamic_price/class/price_parser.class.php'; - /** * @var Conf $conf * @var DoliDB $db @@ -44,6 +39,10 @@ require_once DOL_DOCUMENT_ROOT.'/product/dynamic_price/class/price_parser.class. * @var Translate $langs * @var User $user */ +require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/product/dynamic_price/class/price_parser.class.php'; $type = GETPOST("type", 'intcomma'); if ($type == '' && !$user->hasRight('produit', 'lire') && $user->hasRight('service', 'lire')) { @@ -204,7 +203,7 @@ if ((isModEnabled("product") || isModEnabled("service")) && ($user->hasRight("pr if ($conf->use_javascript_ajax) { $graph .= '
'; $graph .= ''; - $graph .= ''; + $graph .= ''; $graph .= '
'.$langs->trans("Statistics").'
'.$langs->trans("Statistics").' - '.$langs->trans("ProductStatus").'
'; $SommeA = $prodser[0]['sell']; diff --git a/htdocs/societe/index.php b/htdocs/societe/index.php index b5e35a82996..b54346765e0 100644 --- a/htdocs/societe/index.php +++ b/htdocs/societe/index.php @@ -30,10 +30,6 @@ // Load Dolibarr environment require '../main.inc.php'; -require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php'; -require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php'; -require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php'; - /** * @var Conf $conf * @var DoliDB $db @@ -41,6 +37,9 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php'; * @var Translate $langs * @var User $user */ +require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php'; +require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php'; // Load translation files required by the page $langs->load("companies"); @@ -159,7 +158,7 @@ if ($result) { $thirdpartygraph = '
'; $thirdpartygraph .= ''."\n"; -$thirdpartygraph .= ''; +$thirdpartygraph .= ''; if (!empty($conf->use_javascript_ajax) && ((round($third['prospect']) ? 1 : 0) + (round($third['customer']) ? 1 : 0) + (round($third['supplier']) ? 1 : 0) + (round($third['other']) ? 1 : 0) >= 2)) { $thirdpartygraph .= '
'.$langs->trans("Statistics").'
'.$langs->trans("Statistics").' - '.$langs->trans("NatureOfThirdParty").'
'; $dataseries = array(); diff --git a/htdocs/theme/eldy/dropdown.inc.php b/htdocs/theme/eldy/dropdown.inc.php index 15b0b70fc17..f73cdcfeb88 100644 --- a/htdocs/theme/eldy/dropdown.inc.php +++ b/htdocs/theme/eldy/dropdown.inc.php @@ -272,7 +272,7 @@ a.top-menu-dropdown-link { .dropdown-menu > .user-footer { border-top: 1px solid #f0f0f0; background-color: #f9f9f9; - padding: 10px; + padding: 20px; border-bottom-left-radius: 6px; border-bottom-right-radius: 6px; } @@ -290,7 +290,7 @@ a.top-menu-dropdown-link { .dropdown-menu > .user-body, .dropdown-body { - padding: 15px; + padding: 20px; border-bottom: 1px solid #f4f4f4; border-top: 1px solid #f0f0f0; white-space: normal; diff --git a/htdocs/theme/md/dropdown.inc.php b/htdocs/theme/md/dropdown.inc.php index ab53d015bb7..14a164dadc8 100644 --- a/htdocs/theme/md/dropdown.inc.php +++ b/htdocs/theme/md/dropdown.inc.php @@ -287,7 +287,7 @@ a.top-menu-dropdown-link { .dropdown-menu > .user-footer { background-color: #f9f9f9; - padding: 10px; + padding: 20px; } .user-footer:after { @@ -303,7 +303,7 @@ a.top-menu-dropdown-link { } .dropdown-menu > .user-body { - padding: 15px; + padding: 20px; } .dropdown-menu > .user-body, .dropdown-body{ border-bottom: 1px solid #f4f4f4;