css
This commit is contained in:
parent
b31856eaf8
commit
42900e2c8c
7 changed files with 34 additions and 26 deletions
|
|
@ -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 '<hr>';
|
||||
print "<br>\n";
|
||||
|
||||
print '<div class="info">';
|
||||
|
||||
// STEPS
|
||||
$step++;
|
||||
$s = img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescJournalSetup", $step, '{s}');
|
||||
|
|
@ -199,6 +200,7 @@ if (isModEnabled('accounting')) {
|
|||
print $s;
|
||||
print "<br>\n";
|
||||
}
|
||||
print '</div>';
|
||||
|
||||
|
||||
print "<br>\n";
|
||||
|
|
@ -206,6 +208,8 @@ if (isModEnabled('accounting')) {
|
|||
print "<br>\n";
|
||||
print "<br>\n";
|
||||
|
||||
print '<div class="info">';
|
||||
|
||||
$step++;
|
||||
$s = img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescDefault", $step, '{s}');
|
||||
$s = str_replace('{s}', '<a href="'.DOL_URL_ROOT.'/accountancy/admin/defaultaccounts.php?leftmenu=accountancy_admin" target="setupaccountancy"><strong>'.$langs->transnoentitiesnoconv("Setup").' - '.$langs->transnoentitiesnoconv("MenuDefaultAccounts").'</strong></a>', $s);
|
||||
|
|
@ -247,6 +251,8 @@ if (isModEnabled('accounting')) {
|
|||
print $s;
|
||||
print "<br>\n";
|
||||
|
||||
print '</div>';
|
||||
|
||||
print '<br>';
|
||||
}
|
||||
|
||||
|
|
@ -260,6 +266,8 @@ if (isModEnabled('accounting')) {
|
|||
|
||||
$langs->loadLangs(array('bills', 'trips'));
|
||||
|
||||
print '<div class="info">';
|
||||
|
||||
$step++;
|
||||
$s = img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescBind", chr(64 + $step), $langs->transnoentitiesnoconv("BillsCustomers"), '{s}')."\n";
|
||||
$s = str_replace('{s}', '<a href="'.DOL_URL_ROOT.'/accountancy/customer/index.php" target="setupaccountancy"><strong>'.$langs->transnoentitiesnoconv("TransferInAccounting").' - '.$langs->transnoentitiesnoconv("CustomersVentilation").'</strong></a>', $s);
|
||||
|
|
@ -293,6 +301,9 @@ if (isModEnabled('accounting')) {
|
|||
$s = img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescClosePeriod", chr(64 + $step))."<br>\n";
|
||||
print $s;
|
||||
|
||||
print '</div>';
|
||||
|
||||
|
||||
if (!empty($resultboxes['boxlista']) || !empty($resultboxes['boxlistb'])) {
|
||||
print "<br>\n";
|
||||
print '<br>';
|
||||
|
|
|
|||
|
|
@ -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 .= '<div class="div-table-responsive-no-min">';
|
||||
$boxgraph .= '<table class="noborder nohover centpercent">';
|
||||
$boxgraph .= '<tr class="liste_titre"><th colspan="2">'.$langs->trans("Statistics").($numberyears ? ' ('.($year - $numberyears).' - '.$year.')' : '').'</th></tr>';
|
||||
$boxgraph .= '<tr class="liste_titre"><th colspan="2">'.$langs->trans("Statistics").' - '.$langs->trans("Status").' '.($numberyears ? ' ('.($year - $numberyears).' - '.$year.')' : '').'</th></tr>';
|
||||
$boxgraph .= '<tr><td class="center" colspan="2">';
|
||||
|
||||
require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherentstats.class.php';
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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 .= '<div class="div-table-responsive-no-min">';
|
||||
$graph .= '<table class="noborder centpercent">';
|
||||
$graph .= '<tr class="liste_titre"><th>'.$langs->trans("Statistics").'</th></tr>';
|
||||
$graph .= '<tr class="liste_titre"><th>'.$langs->trans("Statistics").' - '.$langs->trans("ProductStatus").'</th></tr>';
|
||||
$graph .= '<tr><td class="center nopaddingleftimp nopaddingrightimp">';
|
||||
|
||||
$SommeA = $prodser[0]['sell'];
|
||||
|
|
|
|||
|
|
@ -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 = '<div class="div-table-responsive-no-min">';
|
||||
$thirdpartygraph .= '<table class="noborder nohover centpercent">'."\n";
|
||||
$thirdpartygraph .= '<tr class="liste_titre"><th colspan="2">'.$langs->trans("Statistics").'</th></tr>';
|
||||
$thirdpartygraph .= '<tr class="liste_titre"><th colspan="2">'.$langs->trans("Statistics").' - '.$langs->trans("NatureOfThirdParty").'</th></tr>';
|
||||
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 .= '<tr><td class="center" colspan="2">';
|
||||
$dataseries = array();
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
Loading…
Reference in a new issue