From 380cae761abd903efbfe1d5edf86436249fcd28c Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 25 Jun 2022 04:06:18 +0200 Subject: [PATCH 1/8] doc --- htdocs/expedition/card.php | 2 +- htdocs/expedition/class/expedition.class.php | 6 ++++++ htdocs/product/stock/class/mouvementstock.class.php | 12 +++++++----- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php index 0b32229ae65..95d183153d4 100644 --- a/htdocs/expedition/card.php +++ b/htdocs/expedition/card.php @@ -2155,7 +2155,7 @@ elseif ($id || $ref) //if ($filter) $sql.= $filter; $sql .= " ORDER BY obj.fk_product"; - dol_syslog("get list of shipment lines", LOG_DEBUG); + dol_syslog("expedition/card.php get list of shipment lines", LOG_DEBUG); $resql = $db->query($sql); if ($resql) { diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php index bcccd2aee2a..8ba9dd4fbbc 100644 --- a/htdocs/expedition/class/expedition.class.php +++ b/htdocs/expedition/class/expedition.class.php @@ -801,6 +801,12 @@ class Expedition extends CommonObject } } } + + // If stock is now 0, we can remove entry into llx_product_stock, but only if there is no child lines into llx_product_batch (detail of batch, because we can imagine + // having a lot1/qty=X and lot2/qty=-X, so 0 but we must not loose repartition of different lot. + $sql = "DELETE FROM ".MAIN_DB_PREFIX."product_stock WHERE reel = 0 AND rowid NOT IN (SELECT fk_product_stock FROM ".MAIN_DB_PREFIX."product_batch as pb)"; + $resql = $this->db->query($sql); + // We do not test error, it can fails if there is child in batch details } else { diff --git a/htdocs/product/stock/class/mouvementstock.class.php b/htdocs/product/stock/class/mouvementstock.class.php index 5c44019b1fc..25596a24684 100644 --- a/htdocs/product/stock/class/mouvementstock.class.php +++ b/htdocs/product/stock/class/mouvementstock.class.php @@ -571,11 +571,13 @@ class MouvementStock extends CommonObject } } - // If stock is now 0, we can remove entry into llx_product_stock, but only if there is no child lines into llx_product_batch (detail of batch, because we can imagine - // having a lot1/qty=X and lot2/qty=-X, so 0 but we must not loose repartition of different lot. - $sql = "DELETE FROM ".MAIN_DB_PREFIX."product_stock WHERE reel = 0 AND rowid NOT IN (SELECT fk_product_stock FROM ".MAIN_DB_PREFIX."product_batch as pb)"; - $resql = $this->db->query($sql); - // We do not test error, it can fails if there is child in batch details + if (empty($donotcleanemptyline)) { + // If stock is now 0, we can remove entry into llx_product_stock, but only if there is no child lines into llx_product_batch (detail of batch, because we can imagine + // having a lot1/qty=X and lot2/qty=-X, so 0 but we must not loose repartition of different lot. + $sql = "DELETE FROM ".MAIN_DB_PREFIX."product_stock WHERE reel = 0 AND rowid NOT IN (SELECT fk_product_stock FROM ".MAIN_DB_PREFIX."product_batch as pb)"; + $resql = $this->db->query($sql); + // We do not test error, it can fails if there is child in batch details + } } // Add movement for sub products (recursive call) From eeaa4f8205c6314b0ba2dbf332f79283effc98ae Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 25 Jun 2022 04:06:55 +0200 Subject: [PATCH 2/8] Revert "doc" This reverts commit 380cae761abd903efbfe1d5edf86436249fcd28c. --- htdocs/expedition/card.php | 2 +- htdocs/expedition/class/expedition.class.php | 6 ------ htdocs/product/stock/class/mouvementstock.class.php | 12 +++++------- 3 files changed, 6 insertions(+), 14 deletions(-) diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php index 95d183153d4..0b32229ae65 100644 --- a/htdocs/expedition/card.php +++ b/htdocs/expedition/card.php @@ -2155,7 +2155,7 @@ elseif ($id || $ref) //if ($filter) $sql.= $filter; $sql .= " ORDER BY obj.fk_product"; - dol_syslog("expedition/card.php get list of shipment lines", LOG_DEBUG); + dol_syslog("get list of shipment lines", LOG_DEBUG); $resql = $db->query($sql); if ($resql) { diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php index 8ba9dd4fbbc..bcccd2aee2a 100644 --- a/htdocs/expedition/class/expedition.class.php +++ b/htdocs/expedition/class/expedition.class.php @@ -801,12 +801,6 @@ class Expedition extends CommonObject } } } - - // If stock is now 0, we can remove entry into llx_product_stock, but only if there is no child lines into llx_product_batch (detail of batch, because we can imagine - // having a lot1/qty=X and lot2/qty=-X, so 0 but we must not loose repartition of different lot. - $sql = "DELETE FROM ".MAIN_DB_PREFIX."product_stock WHERE reel = 0 AND rowid NOT IN (SELECT fk_product_stock FROM ".MAIN_DB_PREFIX."product_batch as pb)"; - $resql = $this->db->query($sql); - // We do not test error, it can fails if there is child in batch details } else { diff --git a/htdocs/product/stock/class/mouvementstock.class.php b/htdocs/product/stock/class/mouvementstock.class.php index 25596a24684..5c44019b1fc 100644 --- a/htdocs/product/stock/class/mouvementstock.class.php +++ b/htdocs/product/stock/class/mouvementstock.class.php @@ -571,13 +571,11 @@ class MouvementStock extends CommonObject } } - if (empty($donotcleanemptyline)) { - // If stock is now 0, we can remove entry into llx_product_stock, but only if there is no child lines into llx_product_batch (detail of batch, because we can imagine - // having a lot1/qty=X and lot2/qty=-X, so 0 but we must not loose repartition of different lot. - $sql = "DELETE FROM ".MAIN_DB_PREFIX."product_stock WHERE reel = 0 AND rowid NOT IN (SELECT fk_product_stock FROM ".MAIN_DB_PREFIX."product_batch as pb)"; - $resql = $this->db->query($sql); - // We do not test error, it can fails if there is child in batch details - } + // If stock is now 0, we can remove entry into llx_product_stock, but only if there is no child lines into llx_product_batch (detail of batch, because we can imagine + // having a lot1/qty=X and lot2/qty=-X, so 0 but we must not loose repartition of different lot. + $sql = "DELETE FROM ".MAIN_DB_PREFIX."product_stock WHERE reel = 0 AND rowid NOT IN (SELECT fk_product_stock FROM ".MAIN_DB_PREFIX."product_batch as pb)"; + $resql = $this->db->query($sql); + // We do not test error, it can fails if there is child in batch details } // Add movement for sub products (recursive call) From b65c9f4ead820183c3197b769f4196e75ce091e1 Mon Sep 17 00:00:00 2001 From: Christian Foellmann Date: Sat, 25 Jun 2022 15:04:28 +0200 Subject: [PATCH 3/8] fix PRODUCT_DISABLE_ACCOUNTING - hide fields on product/card view --- htdocs/product/card.php | 182 ++++++++++++++++++++-------------------- 1 file changed, 92 insertions(+), 90 deletions(-) diff --git a/htdocs/product/card.php b/htdocs/product/card.php index 98f264bb09e..49c70b05641 100644 --- a/htdocs/product/card.php +++ b/htdocs/product/card.php @@ -2187,106 +2187,108 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) { } } - // Accountancy sell code - print ''; - print $langs->trans("ProductAccountancySellCode"); - print ''; - if (!empty($conf->accounting->enabled)) { - if (!empty($object->accountancy_code_sell)) { - $accountingaccount = new AccountingAccount($db); - $accountingaccount->fetch('', $object->accountancy_code_sell, 1); - - print $accountingaccount->getNomUrl(0, 1, 1, '', 1); - } - } else { - print $object->accountancy_code_sell; - } - print ''; - - // Accountancy sell code intra-community - if ($mysoc->isInEEC()) { + if (empty($conf->global->PRODUCT_DISABLE_ACCOUNTING)) { + // Accountancy sell code print ''; - print $langs->trans("ProductAccountancySellIntraCode"); + print $langs->trans("ProductAccountancySellCode"); print ''; if (!empty($conf->accounting->enabled)) { - if (!empty($object->accountancy_code_sell_intra)) { - $accountingaccount2 = new AccountingAccount($db); - $accountingaccount2->fetch('', $object->accountancy_code_sell_intra, 1); + if (!empty($object->accountancy_code_sell)) { + $accountingaccount = new AccountingAccount($db); + $accountingaccount->fetch('', $object->accountancy_code_sell, 1); - print $accountingaccount2->getNomUrl(0, 1, 1, '', 1); + print $accountingaccount->getNomUrl(0, 1, 1, '', 1); } } else { - print $object->accountancy_code_sell_intra; + print $object->accountancy_code_sell; + } + print ''; + + // Accountancy sell code intra-community + if ($mysoc->isInEEC()) { + print ''; + print $langs->trans("ProductAccountancySellIntraCode"); + print ''; + if (!empty($conf->accounting->enabled)) { + if (!empty($object->accountancy_code_sell_intra)) { + $accountingaccount2 = new AccountingAccount($db); + $accountingaccount2->fetch('', $object->accountancy_code_sell_intra, 1); + + print $accountingaccount2->getNomUrl(0, 1, 1, '', 1); + } + } else { + print $object->accountancy_code_sell_intra; + } + print ''; + } + + // Accountancy sell code export + print ''; + print $langs->trans("ProductAccountancySellExportCode"); + print ''; + if (!empty($conf->accounting->enabled)) { + if (!empty($object->accountancy_code_sell_export)) { + $accountingaccount3 = new AccountingAccount($db); + $accountingaccount3->fetch('', $object->accountancy_code_sell_export, 1); + + print $accountingaccount3->getNomUrl(0, 1, 1, '', 1); + } + } else { + print $object->accountancy_code_sell_export; + } + print ''; + + // Accountancy buy code + print ''; + print $langs->trans("ProductAccountancyBuyCode"); + print ''; + if (!empty($conf->accounting->enabled)) { + if (!empty($object->accountancy_code_buy)) { + $accountingaccount4 = new AccountingAccount($db); + $accountingaccount4->fetch('', $object->accountancy_code_buy, 1); + + print $accountingaccount4->getNomUrl(0, 1, 1, '', 1); + } + } else { + print $object->accountancy_code_buy; + } + print ''; + + // Accountancy buy code intra-community + if ($mysoc->isInEEC()) { + print ''; + print $langs->trans("ProductAccountancyBuyIntraCode"); + print ''; + if (!empty($conf->accounting->enabled)) { + if (!empty($object->accountancy_code_buy_intra)) { + $accountingaccount5 = new AccountingAccount($db); + $accountingaccount5->fetch('', $object->accountancy_code_buy_intra, 1); + + print $accountingaccount5->getNomUrl(0, 1, 1, '', 1); + } + } else { + print $object->accountancy_code_buy_intra; + } + print ''; + } + + // Accountancy buy code export + print ''; + print $langs->trans("ProductAccountancyBuyExportCode"); + print ''; + if (!empty($conf->accounting->enabled)) { + if (!empty($object->accountancy_code_buy_export)) { + $accountingaccount6 = new AccountingAccount($db); + $accountingaccount6->fetch('', $object->accountancy_code_buy_export, 1); + + print $accountingaccount6->getNomUrl(0, 1, 1, '', 1); + } + } else { + print $object->accountancy_code_buy_export; } print ''; } - // Accountancy sell code export - print ''; - print $langs->trans("ProductAccountancySellExportCode"); - print ''; - if (!empty($conf->accounting->enabled)) { - if (!empty($object->accountancy_code_sell_export)) { - $accountingaccount3 = new AccountingAccount($db); - $accountingaccount3->fetch('', $object->accountancy_code_sell_export, 1); - - print $accountingaccount3->getNomUrl(0, 1, 1, '', 1); - } - } else { - print $object->accountancy_code_sell_export; - } - print ''; - - // Accountancy buy code - print ''; - print $langs->trans("ProductAccountancyBuyCode"); - print ''; - if (!empty($conf->accounting->enabled)) { - if (!empty($object->accountancy_code_buy)) { - $accountingaccount4 = new AccountingAccount($db); - $accountingaccount4->fetch('', $object->accountancy_code_buy, 1); - - print $accountingaccount4->getNomUrl(0, 1, 1, '', 1); - } - } else { - print $object->accountancy_code_buy; - } - print ''; - - // Accountancy buy code intra-community - if ($mysoc->isInEEC()) { - print ''; - print $langs->trans("ProductAccountancyBuyIntraCode"); - print ''; - if (!empty($conf->accounting->enabled)) { - if (!empty($object->accountancy_code_buy_intra)) { - $accountingaccount5 = new AccountingAccount($db); - $accountingaccount5->fetch('', $object->accountancy_code_buy_intra, 1); - - print $accountingaccount5->getNomUrl(0, 1, 1, '', 1); - } - } else { - print $object->accountancy_code_buy_intra; - } - print ''; - } - - // Accountancy buy code export - print ''; - print $langs->trans("ProductAccountancyBuyExportCode"); - print ''; - if (!empty($conf->accounting->enabled)) { - if (!empty($object->accountancy_code_buy_export)) { - $accountingaccount6 = new AccountingAccount($db); - $accountingaccount6->fetch('', $object->accountancy_code_buy_export, 1); - - print $accountingaccount6->getNomUrl(0, 1, 1, '', 1); - } - } else { - print $object->accountancy_code_buy_export; - } - print ''; - // Description print ''.$langs->trans("Description").''.(dol_textishtml($object->description) ? $object->description : dol_nl2br($object->description, 1, true)).''; From 55d90ec560c631f4b6086f055bf1e6957efb4c64 Mon Sep 17 00:00:00 2001 From: Christian Foellmann Date: Sat, 25 Jun 2022 16:24:55 +0200 Subject: [PATCH 4/8] set the target for SOC links on proposals and invoices to the customer tab --- htdocs/comm/propal/card.php | 2 +- htdocs/compta/facture/card.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php index b40092abfaa..c56f1840ab7 100644 --- a/htdocs/comm/propal/card.php +++ b/htdocs/comm/propal/card.php @@ -1590,7 +1590,7 @@ if ($action == 'create') { $shipping_method_id = 0; if ($socid > 0) { print ''; - print $soc->getNomUrl(1); + print $soc->getNomUrl(1, 'customer'); print ''; print ''; if (!empty($conf->global->SOCIETE_ASK_FOR_SHIPPING_METHOD) && !empty($soc->shipping_method_id)) { diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php index 49d86c1ceb6..b31d65fdcaf 100644 --- a/htdocs/compta/facture/card.php +++ b/htdocs/compta/facture/card.php @@ -3053,7 +3053,7 @@ if ($action == 'create') { // If thirdparty known and not a predefined invoiced without a recurring rule print ''.$langs->trans('Customer').''; print ''; - print $soc->getNomUrl(1); + print $soc->getNomUrl(1, 'customer'); print ''; // Outstanding Bill $arrayoutstandingbills = $soc->getOutstandingBills(); From e381e646b3e7025fef2dcd2688e9dbf26f1227e2 Mon Sep 17 00:00:00 2001 From: daraelmin Date: Sat, 25 Jun 2022 21:22:30 +0200 Subject: [PATCH 5/8] Fix css class declared in wrong param In print_liste_field_titre CSS class name can only be added in prefix parameter (except 'class="right"' for backward compatibility) If the title is centered, the field should be also --- htdocs/accountancy/bookkeeping/card.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/htdocs/accountancy/bookkeeping/card.php b/htdocs/accountancy/bookkeeping/card.php index efa9fc03c78..062fd03e7f9 100644 --- a/htdocs/accountancy/bookkeeping/card.php +++ b/htdocs/accountancy/bookkeeping/card.php @@ -637,7 +637,7 @@ if ($action == 'create') { print_liste_field_titre("Debit", "", "", "", "", 'class="right"'); print_liste_field_titre("Credit", "", "", "", "", 'class="right"'); if (empty($object->date_validation)) { - print_liste_field_titre("Action", "", "", "", "", 'width="60" class="center"'); + print_liste_field_titre("Action", "", "", "", "", 'width="60"', "", "", 'center '); } else { print_liste_field_titre(""); } @@ -704,9 +704,7 @@ if ($action == 'create') { print ''; print ''; print ''; - print ''; - print ''; - print ''; + print ''; } } else { print ''; From 082c7091fc8089f28a0d0ca666f3a5676c8bdb8d Mon Sep 17 00:00:00 2001 From: Christian Foellmann Date: Sun, 26 Jun 2022 15:46:48 +0200 Subject: [PATCH 6/8] fix PRODUCT_DISABLE_ACCOUNTING + STOCK_SUPPORT_SERVICES on products/services list page --- htdocs/product/list.php | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/htdocs/product/list.php b/htdocs/product/list.php index ad2876c894e..7a03ca4f70a 100644 --- a/htdocs/product/list.php +++ b/htdocs/product/list.php @@ -223,19 +223,19 @@ $arrayfields = array( 'p.numbuyprice'=>array('label'=>"BuyingPriceNumShort", 'checked'=>0, 'enabled'=>(!empty($user->rights->fournisseur->lire)), 'position'=>43), 'p.pmp'=>array('label'=>"PMPValueShort", 'checked'=>0, 'enabled'=>(!empty($user->rights->fournisseur->lire)), 'position'=>44), 'p.cost_price'=>array('label'=>"CostPrice", 'checked'=>0, 'enabled'=>(!empty($user->rights->fournisseur->lire)), 'position'=>45), - 'p.seuil_stock_alerte'=>array('label'=>"StockLimit", 'checked'=>0, 'enabled'=>(!empty($conf->stock->enabled) && $user->rights->stock->lire && $contextpage != 'service'), 'position'=>50), - 'p.desiredstock'=>array('label'=>"DesiredStock", 'checked'=>1, 'enabled'=>(!empty($conf->stock->enabled) && $user->rights->stock->lire && $contextpage != 'service'), 'position'=>51), - 'p.stock'=>array('label'=>"PhysicalStock", 'checked'=>1, 'enabled'=>(!empty($conf->stock->enabled) && $user->rights->stock->lire && $contextpage != 'service'), 'position'=>52), - 'stock_virtual'=>array('label'=>"VirtualStock", 'checked'=>1, 'enabled'=>(!empty($conf->stock->enabled) && $user->rights->stock->lire && $contextpage != 'service' && $virtualdiffersfromphysical), 'position'=>53), + 'p.seuil_stock_alerte'=>array('label'=>"StockLimit", 'checked'=>0, 'enabled'=>(!empty($conf->stock->enabled) && $user->rights->stock->lire && ($contextpage != 'servicelist' || !empty($conf->global->STOCK_SUPPORTS_SERVICES))), 'position'=>50), + 'p.desiredstock'=>array('label'=>"DesiredStock", 'checked'=>1, 'enabled'=>(!empty($conf->stock->enabled) && $user->rights->stock->lire && ($contextpage != 'servicelist' || !empty($conf->global->STOCK_SUPPORTS_SERVICES))), 'position'=>51), + 'p.stock'=>array('label'=>"PhysicalStock", 'checked'=>1, 'enabled'=>(!empty($conf->stock->enabled) && $user->rights->stock->lire && ($contextpage != 'servicelist' || !empty($conf->global->STOCK_SUPPORTS_SERVICES))), 'position'=>52), + 'stock_virtual'=>array('label'=>"VirtualStock", 'checked'=>1, 'enabled'=>(!empty($conf->stock->enabled) && $user->rights->stock->lire && ($contextpage != 'servicelist' || !empty($conf->global->STOCK_SUPPORTS_SERVICES)) && $virtualdiffersfromphysical), 'position'=>53), 'p.tobatch'=>array('label'=>"ManageLotSerial", 'checked'=>0, 'enabled'=>(!empty($conf->productbatch->enabled)), 'position'=>60), 'p.fk_country'=>array('label'=>"Country", 'checked'=>0, 'position'=>100), 'p.fk_state'=>array('label'=>"State", 'checked'=>0, 'position'=>101), - $alias_product_perentity . '.accountancy_code_sell'=>array('label'=>"ProductAccountancySellCode", 'checked'=>0, 'position'=>400), - $alias_product_perentity . '.accountancy_code_sell_intra'=>array('label'=>"ProductAccountancySellIntraCode", 'checked'=>0, 'enabled'=>$isInEEC, 'position'=>401), - $alias_product_perentity . '.accountancy_code_sell_export'=>array('label'=>"ProductAccountancySellExportCode", 'checked'=>0, 'position'=>402), - $alias_product_perentity . '.accountancy_code_buy'=>array('label'=>"ProductAccountancyBuyCode", 'checked'=>0, 'position'=>403), - $alias_product_perentity . '.accountancy_code_buy_intra'=>array('label'=>"ProductAccountancyBuyIntraCode", 'checked'=>0, 'enabled'=>$isInEEC, 'position'=>404), - $alias_product_perentity . '.accountancy_code_buy_export'=>array('label'=>"ProductAccountancyBuyExportCode", 'checked'=>0, 'position'=>405), + $alias_product_perentity . '.accountancy_code_sell'=>array('label'=>"ProductAccountancySellCode", 'checked'=>0, 'enabled'=>empty($conf->global->PRODUCT_DISABLE_ACCOUNTING), 'position'=>400), + $alias_product_perentity . '.accountancy_code_sell_intra'=>array('label'=>"ProductAccountancySellIntraCode", 'checked'=>0, 'enabled'=>$isInEEC && empty($conf->global->PRODUCT_DISABLE_ACCOUNTING), 'position'=>401), + $alias_product_perentity . '.accountancy_code_sell_export'=>array('label'=>"ProductAccountancySellExportCode", 'checked'=>0, 'enabled'=>empty($conf->global->PRODUCT_DISABLE_ACCOUNTING), 'position'=>402), + $alias_product_perentity . '.accountancy_code_buy'=>array('label'=>"ProductAccountancyBuyCode", 'checked'=>0, 'enabled'=>empty($conf->global->PRODUCT_DISABLE_ACCOUNTING), 'position'=>403), + $alias_product_perentity . '.accountancy_code_buy_intra'=>array('label'=>"ProductAccountancyBuyIntraCode", 'checked'=>0, 'enabled'=>$isInEEC && empty($conf->global->PRODUCT_DISABLE_ACCOUNTING), 'position'=>404), + $alias_product_perentity . '.accountancy_code_buy_export'=>array('label'=>"ProductAccountancyBuyExportCode", 'checked'=>0, 'enabled'=>empty($conf->global->PRODUCT_DISABLE_ACCOUNTING), 'position'=>405), 'p.datec'=>array('label'=>"DateCreation", 'checked'=>0, 'position'=>500), 'p.tms'=>array('label'=>"DateModificationShort", 'checked'=>0, 'position'=>500), 'p.tosell'=>array('label'=>$langs->transnoentitiesnoconv("Status").' ('.$langs->transnoentitiesnoconv("Sell").')', 'checked'=>1, 'position'=>1000), @@ -1206,7 +1206,7 @@ if ($resql) { if (!empty($arrayfields['p.seuil_stock_alerte']['checked'])) { print_liste_field_titre($arrayfields['p.seuil_stock_alerte']['label'], $_SERVER["PHP_SELF"], "p.seuil_stock_alerte", "", $param, '', $sortfield, $sortorder, 'right '); } - if (!empty($arrayfields['p.desiredstock']['checked'])) { + if (!empty($arrayfields['p.desiredstock']['checked']) ) { print_liste_field_titre($arrayfields['p.desiredstock']['label'], $_SERVER["PHP_SELF"], "p.desiredstock", "", $param, '', $sortfield, $sortorder, 'right '); } if (!empty($arrayfields['p.stock']['checked'])) { From 149fc6ed83a68065b8a079c5619252dc83f85ac1 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 27 Jun 2022 11:26:57 +0200 Subject: [PATCH 7/8] Update list.php --- htdocs/product/list.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/product/list.php b/htdocs/product/list.php index 7a03ca4f70a..942a76585cc 100644 --- a/htdocs/product/list.php +++ b/htdocs/product/list.php @@ -1206,7 +1206,7 @@ if ($resql) { if (!empty($arrayfields['p.seuil_stock_alerte']['checked'])) { print_liste_field_titre($arrayfields['p.seuil_stock_alerte']['label'], $_SERVER["PHP_SELF"], "p.seuil_stock_alerte", "", $param, '', $sortfield, $sortorder, 'right '); } - if (!empty($arrayfields['p.desiredstock']['checked']) ) { + if (!empty($arrayfields['p.desiredstock']['checked'])) { print_liste_field_titre($arrayfields['p.desiredstock']['label'], $_SERVER["PHP_SELF"], "p.desiredstock", "", $param, '', $sortfield, $sortorder, 'right '); } if (!empty($arrayfields['p.stock']['checked'])) { From 69cbe48a75ca8c4d00bfd4c179ee0418f5a1760b Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 27 Jun 2022 12:07:34 +0200 Subject: [PATCH 8/8] doc --- htdocs/expedition/card.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php index 27202bf6455..03595b022a5 100644 --- a/htdocs/expedition/card.php +++ b/htdocs/expedition/card.php @@ -2092,7 +2092,7 @@ if ($action == 'create') { //if ($filter) $sql.= $filter; $sql .= " ORDER BY obj.fk_product"; - dol_syslog("get list of shipment lines", LOG_DEBUG); + dol_syslog("expedition/card.php get list of shipment lines", LOG_DEBUG); $resql = $db->query($sql); if ($resql) { $num = $db->num_rows($resql);