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

Use isModEnabled

Browse Source
This commit is contained in:
Alexandre SPANGARO 2022-09-25 06:06:06 +02:00
parent 3eba955992
commit 2a8b32ff98
6 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
htdocs/reception/card.php
View File

@ -752,7 +752,7 @@ if ($action == 'create') {
$author = new User($db); $author = new User($db);
$author->fetch($objectsrc->user_author_id); $author->fetch($objectsrc->user_author_id);
if (!empty($conf->stock->enabled)) { if (isModEnabled('stock')) {
$entrepot = new Entrepot($db); $entrepot = new Entrepot($db);
} }
@ -1039,7 +1039,7 @@ if ($action == 'create') {
print ' / <a href="#" id="autoreset">'.$langs->trans("Reset").'</a>)'; print ' / <a href="#" id="autoreset">'.$langs->trans("Reset").'</a>)';
} }
print '</td>'; print '</td>';
if (!empty($conf->stock->enabled)) { if (isModEnabled('stock')) {
print '<td class="left">'.$langs->trans("Warehouse").' ('.$langs->trans("Stock").')</td>'; print '<td class="left">'.$langs->trans("Warehouse").' ('.$langs->trans("Stock").')</td>';
} }
if (isModEnabled('productbatch')) { if (isModEnabled('productbatch')) {
@ -1173,7 +1173,7 @@ if ($action == 'create') {
$warehouseObject = null; $warehouseObject = null;
if (!empty($conf->stock->enabled)) { // If warehouse was already selected or if product is not a predefined, we go into this part with no multiwarehouse selection if (isModEnabled('stock')) { // If warehouse was already selected or if product is not a predefined, we go into this part with no multiwarehouse selection
print '<!-- Case warehouse already known or product not a predefined product -->'; print '<!-- Case warehouse already known or product not a predefined product -->';
$stock = + $product->stock_warehouse[$dispatchLines[$indiceAsked]['ent']]->real; // Convert to number $stock = + $product->stock_warehouse[$dispatchLines[$indiceAsked]['ent']]->real; // Convert to number
@ -1200,7 +1200,7 @@ if ($action == 'create') {
} }
// Stock // Stock
if (!empty($conf->stock->enabled)) { if (isModEnabled('stock')) {
print '<td class="left">'; print '<td class="left">';
if ($line->product_type == Product::TYPE_PRODUCT || !empty($conf->global->STOCK_SUPPORTS_SERVICES)) { // Type of product need stock change ? if ($line->product_type == Product::TYPE_PRODUCT || !empty($conf->global->STOCK_SUPPORTS_SERVICES)) { // Type of product need stock change ?
// Show warehouse combo list // Show warehouse combo list
@ -1686,7 +1686,7 @@ if ($action == 'create') {
} }
if ($action == 'editline') { if ($action == 'editline') {
$editColspan = 3; $editColspan = 3;
if (empty($conf->stock->enabled)) { if (!isModEnabled('stock')) {
$editColspan--; $editColspan--;
} }
if (empty($conf->productbatch->enabled)) { if (empty($conf->productbatch->enabled)) {
@ -1698,7 +1698,7 @@ if ($action == 'create') {
} else { } else {
print $langs->trans("QtyReceived").' - '; print $langs->trans("QtyReceived").' - ';
} }
if (!empty($conf->stock->enabled)) { if (isModEnabled('stock')) {
print $langs->trans("WarehouseSource").' - '; print $langs->trans("WarehouseSource").' - ';
} }
if (isModEnabled('productbatch')) { if (isModEnabled('productbatch')) {
@ -1718,7 +1718,7 @@ if ($action == 'create') {
} else { } else {
print '<td class="center">'.$langs->trans("QtyReceived").'</td>'; print '<td class="center">'.$langs->trans("QtyReceived").'</td>';
} }
if (!empty($conf->stock->enabled)) { if (isModEnabled('stock')) {
print '<td class="left">'.$langs->trans("WarehouseSource").'</td>'; print '<td class="left">'.$langs->trans("WarehouseSource").'</td>';
} }
@ -1889,7 +1889,7 @@ if ($action == 'create') {
print ' - '.$receptionline_var['qty']; print ' - '.$receptionline_var['qty'];
$htmltext = $langs->trans("DateValidation").' : '.(empty($receptionline_var['date_valid']) ? $langs->trans("Draft") : dol_print_date($receptionline_var['date_valid'], 'dayhour')); $htmltext = $langs->trans("DateValidation").' : '.(empty($receptionline_var['date_valid']) ? $langs->trans("Draft") : dol_print_date($receptionline_var['date_valid'], 'dayhour'));
if (!empty($conf->stock->enabled) && $receptionline_var['warehouse'] > 0) { if (isModEnabled('stock') && $receptionline_var['warehouse'] > 0) {
$warehousestatic->fetch($receptionline_var['warehouse']); $warehousestatic->fetch($receptionline_var['warehouse']);
$htmltext .= '<br>'.$langs->trans("From").' : '.$warehousestatic->getNomUrl(1, '', 0, 1); $htmltext .= '<br>'.$langs->trans("From").' : '.$warehousestatic->getNomUrl(1, '', 0, 1);
} }
@ -1904,7 +1904,7 @@ if ($action == 'create') {
if ($action == 'editline' && $lines[$i]->id == $line_id) { if ($action == 'editline' && $lines[$i]->id == $line_id) {
// edit mode // edit mode
print '<td colspan="'.$editColspan.'" class="center"><table class="nobordernopadding">'; print '<td colspan="'.$editColspan.'" class="center"><table class="nobordernopadding">';
if (!empty($conf->stock->enabled)) { if (isModEnabled('stock')) {
if ($lines[$i]->fk_product > 0) { if ($lines[$i]->fk_product > 0) {
print '<!-- case edit 1 -->'; print '<!-- case edit 1 -->';
print '<tr>'; print '<tr>';
@ -1944,7 +1944,7 @@ if ($action == 'create') {
print '<td class="center linecolqtytoreceive">'.$lines[$i]->qty.'</td>'; print '<td class="center linecolqtytoreceive">'.$lines[$i]->qty.'</td>';
// Warehouse source // Warehouse source
if (!empty($conf->stock->enabled)) { if (isModEnabled('stock')) {
if ($lines[$i]->fk_entrepot > 0) { if ($lines[$i]->fk_entrepot > 0) {
$entrepot = new Entrepot($db); $entrepot = new Entrepot($db);
$entrepot->fetch($lines[$i]->fk_entrepot); $entrepot->fetch($lines[$i]->fk_entrepot);

10
htdocs/reception/class/reception.class.php
View File

@ -546,7 +546,7 @@ class Reception extends CommonObject
} }
// If stock increment is done on reception (recommanded choice) // If stock increment is done on reception (recommanded choice)
if (!$error && !empty($conf->stock->enabled) && !empty($conf->global->STOCK_CALCULATE_ON_RECEPTION)) { if (!$error && isModEnabled('stock') && !empty($conf->global->STOCK_CALCULATE_ON_RECEPTION)) {
require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php'; require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
$langs->load("agenda"); $langs->load("agenda");
@ -824,7 +824,7 @@ class Reception extends CommonObject
} }
$fk_product = 0; $fk_product = 0;
if (!empty($conf->stock->enabled) && !empty($supplierorderline->fk_product)) { if (isModEnabled('stock') && !empty($supplierorderline->fk_product)) {
$fk_product = $supplierorderline->fk_product; $fk_product = $supplierorderline->fk_product;
if (!($entrepot_id > 0) && empty($conf->global->STOCK_WAREHOUSE_NOT_REQUIRED_FOR_RECEPTIONS)) { if (!($entrepot_id > 0) && empty($conf->global->STOCK_WAREHOUSE_NOT_REQUIRED_FOR_RECEPTIONS)) {
@ -1554,7 +1554,7 @@ class Reception extends CommonObject
// If stock increment is done on closing // If stock increment is done on closing
if (!$error && !empty($conf->stock->enabled) && !empty($conf->global->STOCK_CALCULATE_ON_RECEPTION_CLOSE)) { if (!$error && isModEnabled('stock') && !empty($conf->global->STOCK_CALCULATE_ON_RECEPTION_CLOSE)) {
require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php'; require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
$langs->load("agenda"); $langs->load("agenda");
@ -1719,7 +1719,7 @@ class Reception extends CommonObject
$this->billed = 0; $this->billed = 0;
// If stock increment is done on closing // If stock increment is done on closing
if (!$error && !empty($conf->stock->enabled) && !empty($conf->global->STOCK_CALCULATE_ON_RECEPTION_CLOSE)) { if (!$error && isModEnabled('stock') && !empty($conf->global->STOCK_CALCULATE_ON_RECEPTION_CLOSE)) {
require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php'; require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
$numref = $this->ref; $numref = $this->ref;
$langs->load("agenda"); $langs->load("agenda");
@ -1851,7 +1851,7 @@ class Reception extends CommonObject
dol_syslog(__METHOD__, LOG_DEBUG); dol_syslog(__METHOD__, LOG_DEBUG);
if ($this->db->query($sql)) { if ($this->db->query($sql)) {
// If stock increment is done on closing // If stock increment is done on closing
if (!$error && !empty($conf->stock->enabled) && !empty($conf->global->STOCK_CALCULATE_ON_RECEPTION)) { if (!$error && isModEnabled('stock') && !empty($conf->global->STOCK_CALCULATE_ON_RECEPTION)) {
require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php'; require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
$langs->load("agenda"); $langs->load("agenda");

2
htdocs/reception/list.php
View File

@ -716,7 +716,7 @@ if ($massaction == 'createbills') {
print $langs->trans('ValidateInvoices'); print $langs->trans('ValidateInvoices');
print '</td>'; print '</td>';
print '<td>'; print '<td>';
if (!empty($conf->stock->enabled) && !empty($conf->global->STOCK_CALCULATE_ON_BILL)) { if (isModEnabled('stock') && !empty($conf->global->STOCK_CALCULATE_ON_BILL)) {
print $form->selectyesno('validate_invoices', 0, 1, 1); print $form->selectyesno('validate_invoices', 0, 1, 1);
print ' ('.$langs->trans("AutoValidationNotPossibleWhenStockIsDecreasedOnInvoiceValidation").')'; print ' ('.$langs->trans("AutoValidationNotPossibleWhenStockIsDecreasedOnInvoiceValidation").')';
} else { } else {

2
htdocs/societe/card.php
View File

@ -2967,7 +2967,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
print '</td></tr>'; print '</td></tr>';
// Warehouse // Warehouse
if (!empty($conf->stock->enabled) && !empty($conf->global->SOCIETE_ASK_FOR_WAREHOUSE)) { if (isModEnabled('stock') && !empty($conf->global->SOCIETE_ASK_FOR_WAREHOUSE)) {
$langs->load('stocks'); $langs->load('stocks');
require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php'; require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
$formproduct = new FormProduct($db); $formproduct = new FormProduct($db);

12
htdocs/user/card.php
View File

@ -58,7 +58,7 @@ if (isModEnabled('adherent')) {
if (isModEnabled('categorie')) { if (isModEnabled('categorie')) {
require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php'; require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
} }
if (!empty($conf->stock->enabled)) { if (isModEnabled('stock')) {
require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php'; require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
} }
@ -470,7 +470,7 @@ if (empty($reshook)) {
$object->dateendvalidity = $dateendvalidity; $object->dateendvalidity = $dateendvalidity;
$object->birth = $dateofbirth; $object->birth = $dateofbirth;
if (!empty($conf->stock->enabled)) { if (isModEnabled('stock')) {
$object->fk_warehouse = GETPOST('fk_warehouse', 'int'); $object->fk_warehouse = GETPOST('fk_warehouse', 'int');
} }
@ -727,7 +727,7 @@ $formother = new FormOther($db);
$formcompany = new FormCompany($db); $formcompany = new FormCompany($db);
$formadmin = new FormAdmin($db); $formadmin = new FormAdmin($db);
$formfile = new FormFile($db); $formfile = new FormFile($db);
if (!empty($conf->stock->enabled)) { if (isModEnabled('stock')) {
$formproduct = new FormProduct($db); $formproduct = new FormProduct($db);
} }
@ -1229,7 +1229,7 @@ if ($action == 'create' || $action == 'adduserldap') {
// TODO Move this into tab RH (HierarchicalResponsible must be on both tab) // TODO Move this into tab RH (HierarchicalResponsible must be on both tab)
// Default warehouse // Default warehouse
if (!empty($conf->stock->enabled) && !empty($conf->global->MAIN_DEFAULT_WAREHOUSE_USER)) { if (isModEnabled('stock') && !empty($conf->global->MAIN_DEFAULT_WAREHOUSE_USER)) {
print '<tr><td>'.$langs->trans("DefaultWarehouse").'</td><td>'; print '<tr><td>'.$langs->trans("DefaultWarehouse").'</td><td>';
print $formproduct->selectWarehouses($object->fk_warehouse, 'fk_warehouse', 'warehouseopen', 1); print $formproduct->selectWarehouses($object->fk_warehouse, 'fk_warehouse', 'warehouseopen', 1);
print '</td></tr>'; print '</td></tr>';
@ -1598,7 +1598,7 @@ if ($action == 'create' || $action == 'adduserldap') {
print "</tr>\n"; print "</tr>\n";
// Default warehouse // Default warehouse
if (!empty($conf->stock->enabled) && !empty($conf->global->MAIN_DEFAULT_WAREHOUSE_USER)) { if (isModEnabled('stock') && !empty($conf->global->MAIN_DEFAULT_WAREHOUSE_USER)) {
require_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php'; require_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php';
print '<tr><td>'.$langs->trans("DefaultWarehouse").'</td><td>'; print '<tr><td>'.$langs->trans("DefaultWarehouse").'</td><td>';
if ($object->fk_warehouse > 0) { if ($object->fk_warehouse > 0) {
@ -2533,7 +2533,7 @@ if ($action == 'create' || $action == 'adduserldap') {
print '</table><hr><table class="border centpercent">'; print '</table><hr><table class="border centpercent">';
// Default warehouse // Default warehouse
if (!empty($conf->stock->enabled) && !empty($conf->global->MAIN_DEFAULT_WAREHOUSE_USER)) { if (isModEnabled('stock') && !empty($conf->global->MAIN_DEFAULT_WAREHOUSE_USER)) {
print '<tr><td class="titlefield">'.$langs->trans("DefaultWarehouse").'</td><td>'; print '<tr><td class="titlefield">'.$langs->trans("DefaultWarehouse").'</td><td>';
print $formproduct->selectWarehouses($object->fk_warehouse, 'fk_warehouse', 'warehouseopen', 1); print $formproduct->selectWarehouses($object->fk_warehouse, 'fk_warehouse', 'warehouseopen', 1);
print ' <a href="'.DOL_URL_ROOT.'/product/stock/card.php?action=create&token='.newToken().'&backtopage='.urlencode($_SERVER['PHP_SELF'].'?id='.$object->id.'&action=edit&token='.newToken()).'"><span class="fa fa-plus-circle valignmiddle paddingleft" title="'.$langs->trans("AddWarehouse").'"></span></a>'; print ' <a href="'.DOL_URL_ROOT.'/product/stock/card.php?action=create&token='.newToken().'&backtopage='.urlencode($_SERVER['PHP_SELF'].'?id='.$object->id.'&action=edit&token='.newToken()).'"><span class="fa fa-plus-circle valignmiddle paddingleft" title="'.$langs->trans("AddWarehouse").'"></span></a>';

2
htdocs/user/list.php
View File

@ -667,7 +667,7 @@ if (isModEnabled('categorie') && $user->hasRight("categorie", "read")) {
$moreforfilter .= '</div>'; $moreforfilter .= '</div>';
} }
// Filter on warehouse // Filter on warehouse
if (!empty($conf->stock->enabled) && !empty($conf->global->MAIN_DEFAULT_WAREHOUSE_USER)) { if (isModEnabled('stock') && !empty($conf->global->MAIN_DEFAULT_WAREHOUSE_USER)) {
require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php'; require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
$formproduct = new FormProduct($db); $formproduct = new FormProduct($db);
$moreforfilter .= '<div class="divsearchfield">'; $moreforfilter .= '<div class="divsearchfield">';