lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Debug v16

Browse Source
This commit is contained in:
Laurent Destailleur 2022-07-29 14:50:21 +02:00
parent aca6b848d2
commit 7404e8fb75
3 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
htdocs/compta/index.php
View File

@ -102,19 +102,24 @@ print load_fiche_titre($langs->trans("AccountancyTreasuryArea"), '', 'bill');
print '<div class="fichecenter"><div class="fichethirdleft">'; print '<div class="fichecenter"><div class="fichethirdleft">';
print getNumberInvoicesPieChart('customers'); if (isModEnabled('facture')) {
print '<br>'; print getNumberInvoicesPieChart('customers');
print '<br>';
}
if (!empty($conf->fournisseur->enabled)) { if (isModEnabled('fournisseur') || isModEnabled('supplier_invoice')) {
print getNumberInvoicesPieChart('fourn'); print getNumberInvoicesPieChart('fourn');
print '<br>'; print '<br>';
} }
print getCustomerInvoiceDraftTable($max, $socid); if (isModEnabled('facture')) {
print getCustomerInvoiceDraftTable($max, $socid);
if (!empty($conf->fournisseur->enabled)) {
print '<br>'; print '<br>';
}
if (isModEnabled('fournisseur') || isModEnabled('supplier_invoice')) {
print getDraftSupplierTable($max, $socid); print getDraftSupplierTable($max, $socid);
print '<br>';
} }
print '</div><div class="fichetwothirdright">'; print '</div><div class="fichetwothirdright">';
@ -273,7 +278,7 @@ if (isModEnabled('facture') && !empty($user->rights->facture->lire)) {
// Last modified supplier invoices // Last modified supplier invoices
if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) && $user->rights->fournisseur->facture->lire) || (!empty($conf->supplier_invoice->enabled) && $user->rights->supplier_invoice->lire)) { if ((isModEnabled('fournisseur') && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) && $user->rights->fournisseur->facture->lire) || (isModEnabled('supplier_invoice') && $user->rights->supplier_invoice->lire)) {
$langs->load("boxes"); $langs->load("boxes");
$facstatic = new FactureFournisseur($db); $facstatic = new FactureFournisseur($db);
@ -400,7 +405,7 @@ if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SU
// Latest donations // Latest donations
if (!empty($conf->don->enabled) && !empty($user->rights->don->lire)) { if (isModEnabled('don') && !empty($user->rights->don->lire)) {
include_once DOL_DOCUMENT_ROOT.'/don/class/don.class.php'; include_once DOL_DOCUMENT_ROOT.'/don/class/don.class.php';
$langs->load("boxes"); $langs->load("boxes");
@ -490,7 +495,7 @@ if (!empty($conf->don->enabled) && !empty($user->rights->don->lire)) {
/** /**
* Social contributions to pay * Social contributions to pay
*/ */
if (!empty($conf->tax->enabled) && !empty($user->rights->tax->charges->lire)) { if (isModEnabled('tax') && !empty($user->rights->tax->charges->lire)) {
if (!$socid) { if (!$socid) {
$chargestatic = new ChargeSociales($db); $chargestatic = new ChargeSociales($db);
@ -582,7 +587,7 @@ if (!empty($conf->tax->enabled) && !empty($user->rights->tax->charges->lire)) {
/* /*
* Customers orders to be billed * Customers orders to be billed
*/ */
if (isModEnabled('facture') && !empty($conf->commande->enabled) && $user->rights->commande->lire && empty($conf->global->WORKFLOW_DISABLE_CREATE_INVOICE_FROM_ORDER)) { if (isModEnabled('facture') && isModEnabled('commande') && $user->rights->commande->lire && empty($conf->global->WORKFLOW_DISABLE_CREATE_INVOICE_FROM_ORDER)) {
$commandestatic = new Commande($db); $commandestatic = new Commande($db);
$langs->load("orders"); $langs->load("orders");

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

@ -254,7 +254,9 @@ function supplier_invoice_rec_prepare_head($object)
function getNumberInvoicesPieChart($mode) function getNumberInvoicesPieChart($mode)
{ {
global $conf, $db, $langs, $user; global $conf, $db, $langs, $user;
if (isModEnabled('facture') && !empty($user->rights->facture->lire)) { if (($mode == 'customers' && isModEnabled('facture') && !empty($user->rights->facture->lire))
|| ($mode = 'suppliers') && (isModEnabled('fournisseur') || isModEnabled('supplier_invoice')) && !empty($user->rights->facture->lire)
) {
include DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/theme_vars.inc.php'; include DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/theme_vars.inc.php';
$now = date_create(date('Y-m-d', dol_now())); $now = date_create(date('Y-m-d', dol_now()));

2
htdocs/langs/en_US/admin.lang
View File

@ -1130,7 +1130,7 @@ ValueOfConstantKey=Value of a configuration constant
ConstantIsOn=Option %s is on ConstantIsOn=Option %s is on
NbOfDays=No. of days NbOfDays=No. of days
AtEndOfMonth=At end of month AtEndOfMonth=At end of month
CurrentNext=Current/Next CurrentNext=A given day in month
Offset=Offset Offset=Offset
AlwaysActive=Always active AlwaysActive=Always active
Upgrade=Upgrade Upgrade=Upgrade