diff --git a/dev/tools/phan/config.php b/dev/tools/phan/config.php index ea20cb9d1e4..5b058d1b438 100644 --- a/dev/tools/phan/config.php +++ b/dev/tools/phan/config.php @@ -55,7 +55,7 @@ $DEPRECATED_MODULE_MAPPING = array( 'commande' => 'order', 'contrat' => 'contract', 'entrepot' => 'stock', - 'expedition' => 'delivery_note', + 'expedition' => 'shipping', 'facture' => 'invoice', 'ficheinter' => 'intervention', 'product_fournisseur_price' => 'productsupplierprice', @@ -94,7 +94,7 @@ $VALID_MODULE_MAPPING = array( 'datapolicy' => 'DataPolicy', 'dav' => 'Dav', 'debugbar' => 'DebugBar', - 'delivery_note' => 'Expedition', + 'shipping' => 'Expedition', 'deplacement' => 'Deplacement', "documentgeneration" => 'DocumentGeneration', 'don' => 'Don', diff --git a/dev/tools/phan/config_extended.php b/dev/tools/phan/config_extended.php index 7db2b587708..b9e92619b06 100644 --- a/dev/tools/phan/config_extended.php +++ b/dev/tools/phan/config_extended.php @@ -54,7 +54,7 @@ $DEPRECATED_MODULE_MAPPING = array( 'commande' => 'order', 'contrat' => 'contract', 'entrepot' => 'stock', - 'expedition' => 'delivery_note', + 'expedition' => 'shipping', 'facture' => 'invoice', 'ficheinter' => 'intervention', 'product_fournisseur_price' => 'productsupplierprice', @@ -93,7 +93,7 @@ $VALID_MODULE_MAPPING = array( 'datapolicy' => 'DataPolicy', 'dav' => 'Dav', 'debugbar' => 'DebugBar', - 'delivery_note' => 'Expedition', + 'shipping' => 'Expedition', 'deplacement' => 'Deplacement', "documentgeneration" => 'DocumentGeneration', 'don' => 'Don', diff --git a/dev/tools/phan/config_fixer.php b/dev/tools/phan/config_fixer.php index 8033331240b..86f1765defb 100644 --- a/dev/tools/phan/config_fixer.php +++ b/dev/tools/phan/config_fixer.php @@ -23,7 +23,7 @@ $DEPRECATED_MODULE_MAPPING = array( 'commande' => 'order', 'contrat' => 'contract', 'entrepot' => 'stock', - 'expedition' => 'delivery_note', + 'expedition' => 'shipping', 'facture' => 'invoice', 'ficheinter' => 'intervention', 'product_fournisseur_price' => 'productsupplierprice', diff --git a/dev/tools/phan/plugins/DeprecatedModuleNameFixer.php b/dev/tools/phan/plugins/DeprecatedModuleNameFixer.php index d8cfcfb141a..cf8a9bc7c62 100644 --- a/dev/tools/phan/plugins/DeprecatedModuleNameFixer.php +++ b/dev/tools/phan/plugins/DeprecatedModuleNameFixer.php @@ -36,7 +36,7 @@ call_user_func(static function (): void { 'commande' => 'order', 'contrat' => 'contract', 'entrepot' => 'stock', - 'expedition' => 'delivery_note', + 'expedition' => 'shipping', 'facture' => 'invoice', 'ficheinter' => 'intervention', 'product_fournisseur_price' => 'productsupplierprice', diff --git a/htdocs/admin/delivery.php b/htdocs/admin/delivery.php index 0e6339c36f8..123126c693e 100644 --- a/htdocs/admin/delivery.php +++ b/htdocs/admin/delivery.php @@ -58,7 +58,7 @@ include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php'; // Shipment note -if (isModEnabled('delivery_note') && !getDolGlobalString('MAIN_SUBMODULE_EXPEDITION')) { +if (isModEnabled('shipping') && !getDolGlobalString('MAIN_SUBMODULE_EXPEDITION')) { // This option should always be set to on when module is on. dolibarr_set_const($db, "MAIN_SUBMODULE_EXPEDITION", "1", 'chaine', 0, '', $conf->entity); } diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php index 011a66e4a1d..d895854ab2c 100644 --- a/htdocs/admin/dict.php +++ b/htdocs/admin/dict.php @@ -507,7 +507,7 @@ $tabcond[14] = (isModEnabled("product") && (isModEnabled('ecotax') || getDolGlob $tabcond[15] = true; $tabcond[16] = (isModEnabled("societe") && !getDolGlobalString('SOCIETE_DISABLE_PROSPECTS')); $tabcond[17] = (isModEnabled('deplacement') || isModEnabled('expensereport')); -$tabcond[18] = isModEnabled("delivery_note") || isModEnabled("reception"); +$tabcond[18] = isModEnabled("shipping") || isModEnabled("reception"); $tabcond[19] = isModEnabled("societe"); $tabcond[20] = isModEnabled("supplier_order"); $tabcond[21] = isModEnabled("propal"); diff --git a/htdocs/admin/mails_templates.php b/htdocs/admin/mails_templates.php index 830a129b74a..ae1f8bf67d1 100644 --- a/htdocs/admin/mails_templates.php +++ b/htdocs/admin/mails_templates.php @@ -204,7 +204,7 @@ if (isModEnabled('order') && $user->hasRight('commande', 'lire')) { if (isModEnabled('invoice') && $user->hasRight('facture', 'lire')) { $elementList['facture_send'] = img_picto('', 'bill', 'class="pictofixedwidth"').dol_escape_htmltag($langs->trans('MailToSendInvoice')); } -if (isModEnabled("delivery_note")) { +if (isModEnabled("shipping")) { $elementList['shipping_send'] = img_picto('', 'dolly', 'class="pictofixedwidth"').dol_escape_htmltag($langs->trans('MailToSendShipment')); } if (isModEnabled("reception")) { diff --git a/htdocs/admin/stock.php b/htdocs/admin/stock.php index 4c8c5fc51ae..7572ccd69ef 100644 --- a/htdocs/admin/stock.php +++ b/htdocs/admin/stock.php @@ -270,7 +270,7 @@ print ''; print ''; print ''.$langs->trans("DeStockOnShipment").''; print ''; -if (isModEnabled("delivery_note")) { +if (isModEnabled("shipping")) { if ($conf->use_javascript_ajax) { print ajax_constantonoff('STOCK_CALCULATE_ON_SHIPMENT', array(), null, 0, 0, 0, 2, 1, '', '', 'reposition'); } else { @@ -287,7 +287,7 @@ print ''; print ''; print ''.$langs->trans("DeStockOnShipmentOnClosing").''; print ''; -if (isModEnabled("delivery_note")) { +if (isModEnabled("shipping")) { if ($conf->use_javascript_ajax) { print ajax_constantonoff('STOCK_CALCULATE_ON_SHIPMENT_CLOSE', array(), null, 0, 0, 0, 2, 1, '', '', 'reposition'); } else { @@ -461,7 +461,7 @@ if (isModEnabled('order')) { print "\n"; } -if (isModEnabled("delivery_note")) { +if (isModEnabled("shipping")) { print ''; print ''.$langs->trans("StockMustBeEnoughForShipment").''; print ''; diff --git a/htdocs/admin/workflow.php b/htdocs/admin/workflow.php index 1628db01977..e06954b0422 100644 --- a/htdocs/admin/workflow.php +++ b/htdocs/admin/workflow.php @@ -101,13 +101,13 @@ $workflowcodes = array( 'WORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING'=>array( // when shipping validated 'family'=>'classify_order', 'position'=>40, - 'enabled'=>(isModEnabled("delivery_note") && isModEnabled('order')), + 'enabled'=>(isModEnabled("shipping") && isModEnabled('order')), 'picto'=>'order' ), 'WORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING_CLOSED'=>array( // when shipping closed 'family'=>'classify_order', 'position'=>41, - 'enabled'=>(isModEnabled("delivery_note") && isModEnabled('order')), + 'enabled'=>(isModEnabled("shipping") && isModEnabled('order')), 'picto'=>'order' ), 'WORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER'=>array( @@ -166,7 +166,7 @@ $workflowcodes = array( 'WORKFLOW_SHIPPING_CLASSIFY_BILLED_INVOICE' => array( 'family' => 'classify_shipping', 'position' => 91, - 'enabled' => isModEnabled("delivery_note") && isModEnabled("invoice") && getDolGlobalString('WORKFLOW_BILL_ON_SHIPMENT') !== '0', + 'enabled' => isModEnabled("shipping") && isModEnabled("invoice") && getDolGlobalString('WORKFLOW_BILL_ON_SHIPMENT') !== '0', 'picto' => 'shipment' ), diff --git a/htdocs/comm/action/class/cactioncomm.class.php b/htdocs/comm/action/class/cactioncomm.class.php index ac9148579b1..bc6f454539a 100644 --- a/htdocs/comm/action/class/cactioncomm.class.php +++ b/htdocs/comm/action/class/cactioncomm.class.php @@ -228,7 +228,7 @@ class CActionComm if ($obj->module == 'order_supplier' && ((isModEnabled("fournisseur") && !getDolGlobalString('MAIN_USE_NEW_SUPPLIERMOD') && $user->hasRight('fournisseur', 'commande', 'lire')) || (!isModEnabled('supplier_order') && $user->hasRight('supplier_order', 'lire')))) { $qualified = 1; } - if ($obj->module == 'shipping' && isModEnabled("delivery_note") && $user->hasRight('expedition', 'lire')) { + if ($obj->module == 'shipping' && isModEnabled("shipping") && $user->hasRight('expedition', 'lire')) { $qualified = 1; } // For case module = 'myobject@eventorganization' diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php index 4a20bf2dc9e..796f17e710c 100644 --- a/htdocs/comm/card.php +++ b/htdocs/comm/card.php @@ -52,7 +52,7 @@ if (isModEnabled("propal")) { if (isModEnabled('order')) { require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php'; } -if (isModEnabled("delivery_note")) { +if (isModEnabled("shipping")) { require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php'; } if (isModEnabled('contract')) { @@ -74,7 +74,7 @@ if (isModEnabled('contract')) { if (isModEnabled('order')) { $langs->load("orders"); } -if (isModEnabled("delivery_note")) { +if (isModEnabled("shipping")) { $langs->load("sendings"); } if (isModEnabled('invoice')) { @@ -1029,7 +1029,7 @@ if ($object->id > 0) { /* * Latest shipments */ - if (isModEnabled("delivery_note") && $user->hasRight('expedition', 'lire')) { + if (isModEnabled("shipping") && $user->hasRight('expedition', 'lire')) { $sql = 'SELECT e.rowid as id'; $sql .= ', e.ref, e.entity'; $sql .= ', e.date_creation'; diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php index d3c435bf195..e62067bd89a 100644 --- a/htdocs/comm/propal/card.php +++ b/htdocs/comm/propal/card.php @@ -2004,7 +2004,7 @@ if ($action == 'create') { print ''; // Shipping Method - if (isModEnabled("delivery_note")) { + if (isModEnabled("shipping")) { if (getDolGlobalString('SOCIETE_ASK_FOR_SHIPPING_METHOD') && !empty($soc->shipping_method_id)) { $shipping_method_id = $soc->shipping_method_id; } @@ -2695,7 +2695,7 @@ if ($action == 'create') { print ''; // Shipping Method - if (isModEnabled("delivery_note")) { + if (isModEnabled("shipping")) { print ''; print ''; // Shipping Method - if (isModEnabled('delivery_note')) { + if (isModEnabled('shipping')) { print ''; } - if (isModEnabled('order') || isModEnabled("delivery_note")) { + if (isModEnabled('order') || isModEnabled("shipping")) { print ''; // Expeditions - if (isModEnabled('delivery_note') && $user->hasRight('expedition', 'lire')) { + if (isModEnabled('shipping') && $user->hasRight('expedition', 'lire')) { $nblines++; $ret = $batch->loadStatsExpedition($socid); if ($ret < 0) { diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php index e58bd5e34bf..f2cc29f4b74 100644 --- a/htdocs/core/lib/project.lib.php +++ b/htdocs/core/lib/project.lib.php @@ -167,7 +167,7 @@ function project_prepare_head(Project $project, $moreparam = '') if (isModEnabled('intervention')) { $nbElements += $project->getElementCount('intervention', 'fichinter'); } - if (isModEnabled("delivery_note")) { + if (isModEnabled("shipping")) { $nbElements += $project->getElementCount('shipping', 'expedition'); } if (isModEnabled('mrp')) { diff --git a/htdocs/core/lib/propal.lib.php b/htdocs/core/lib/propal.lib.php index dceaf0bc8a3..46cf91ce684 100644 --- a/htdocs/core/lib/propal.lib.php +++ b/htdocs/core/lib/propal.lib.php @@ -42,8 +42,8 @@ function propal_prepare_head($object) $head[$h][2] = 'comm'; $h++; - if ((empty($conf->commande->enabled) && ((isModEnabled("delivery_note") && getDolGlobalInt('MAIN_SUBMODULE_EXPEDITION') && $user->hasRight('expedition', 'lire')) - || (isModEnabled("delivery_note") && getDolGlobalInt('MAIN_SUBMODULE_DELIVERY') && $user->hasRight('expedition', 'delivery', 'lire'))))) { + if ((empty($conf->commande->enabled) && ((isModEnabled("shipping") && getDolGlobalInt('MAIN_SUBMODULE_EXPEDITION') && $user->hasRight('expedition', 'lire')) + || (getDolGlobalInt('MAIN_SUBMODULE_DELIVERY') && $user->hasRight('expedition', 'delivery', 'lire'))))) { $langs->load("sendings"); $text = ''; $head[$h][0] = DOL_URL_ROOT.'/expedition/propal.php?id='.$object->id; diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php index 8ef3b8c9b90..a18a773f390 100644 --- a/htdocs/core/menus/standard/eldy.lib.php +++ b/htdocs/core/menus/standard/eldy.lib.php @@ -151,7 +151,7 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout = // Products-Services $tmpentry = array( - 'enabled'=> (isModEnabled('product') || isModEnabled('service') || isModEnabled('delivery_note')), + 'enabled'=> (isModEnabled('product') || isModEnabled('service') || isModEnabled('shipping')), 'perms'=> ($user->hasRight('product', 'read') || $user->hasRight('service', 'read') || $user->hasRight('expedition', 'lire')), 'module'=>'product|service' ); @@ -1371,7 +1371,7 @@ function get_left_menu_commercial($mainmenu, &$newmenu, $usemenuhider = 1, $left if ($usemenuhider || empty($leftmenu) || $leftmenu == "orders") { $newmenu->add("/commande/list.php?leftmenu=orders&search_status=0", $langs->trans("StatusOrderDraftShort"), 2, $user->hasRight('commande', 'lire')); $newmenu->add("/commande/list.php?leftmenu=orders&search_status=1", $langs->trans("StatusOrderValidated"), 2, $user->hasRight('commande', 'lire')); - if (isModEnabled('delivery_note')) { + if (isModEnabled('shipping')) { $newmenu->add("/commande/list.php?leftmenu=orders&search_status=2", $langs->trans("StatusOrderSentShort"), 2, $user->hasRight('commande', 'lire')); } $newmenu->add("/commande/list.php?leftmenu=orders&search_status=3", $langs->trans("StatusOrderDelivered"), 2, $user->hasRight('commande', 'lire')); @@ -2157,7 +2157,7 @@ function get_left_menu_products($mainmenu, &$newmenu, $usemenuhider = 1, $leftme } // Shipments - if (isModEnabled('delivery_note')) { + if (isModEnabled('shipping')) { $langs->load("sendings"); $newmenu->add("/expedition/index.php?leftmenu=sendings", $langs->trans("Shipments"), 0, $user->hasRight('expedition', 'lire'), '', $mainmenu, 'sendings', 0, '', '', '', img_picto('', 'shipment', 'class="paddingright pictofixedwidth"')); $newmenu->add("/expedition/card.php?action=create2&leftmenu=sendings", $langs->trans("NewSending"), 1, $user->hasRight('expedition', 'creer')); diff --git a/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php b/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php index 6317eabeef8..79b7945c13e 100644 --- a/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php +++ b/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php @@ -69,7 +69,7 @@ if (isModEnabled('deplacement')) { if (isModEnabled('agenda')) { require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php'; } -if (isModEnabled('delivery_note')) { +if (isModEnabled('shipping')) { require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php'; } @@ -992,7 +992,7 @@ class doc_generic_project_odt extends ModelePDFProjects 'class' => 'Expedition', 'table' => 'expedition', 'disableamount' => 1, - 'test' => isModEnabled('delivery_note') && $user->hasRight('expedition', 'lire') + 'test' => isModEnabled('shipping') && $user->hasRight('expedition', 'lire') ), 'trip' => array( 'title' => "ListTripAssociatedProject", diff --git a/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php b/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php index 0de09d491f0..ea792005846 100644 --- a/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php +++ b/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php @@ -189,7 +189,7 @@ class InterfaceWorkflowManager extends DolibarrTriggers } // Set shipment to "Closed" if WORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE is set (deprecated, has been replaced with WORKFLOW_SHIPPING_CLASSIFY_BILLED_INVOICE instead)) - if (isModEnabled("delivery_note") && !empty($conf->workflow->enabled) && getDolGlobalString('WORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE')) { + if (isModEnabled("shipping") && !empty($conf->workflow->enabled) && getDolGlobalString('WORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE')) { $object->fetchObjectLinked('', 'shipping', $object->id, $object->element); if (!empty($object->linkedObjects)) { $totalonlinkedelements = 0; @@ -210,7 +210,7 @@ class InterfaceWorkflowManager extends DolibarrTriggers } } - if (isModEnabled("delivery_note") && !empty($conf->workflow->enabled) && getDolGlobalString('WORKFLOW_SHIPPING_CLASSIFY_BILLED_INVOICE')) { + if (isModEnabled("shipping") && !empty($conf->workflow->enabled) && getDolGlobalString('WORKFLOW_SHIPPING_CLASSIFY_BILLED_INVOICE')) { $object->fetchObjectLinked('', 'shipping', $object->id, $object->element); if (!empty($object->linkedObjects)) { $totalonlinkedelements = 0; @@ -360,7 +360,7 @@ class InterfaceWorkflowManager extends DolibarrTriggers if (($action == 'SHIPPING_VALIDATE') || ($action == 'SHIPPING_CLOSED')) { dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id); - if (isModEnabled('order') && isModEnabled("delivery_note") && !empty($conf->workflow->enabled) && + if (isModEnabled('order') && isModEnabled("shipping") && !empty($conf->workflow->enabled) && ( (getDolGlobalString('WORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING') && ($action == 'SHIPPING_VALIDATE')) || (getDolGlobalString('WORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING_CLOSED') && ($action == 'SHIPPING_CLOSED')) diff --git a/htdocs/core/triggers/interface_50_modNotification_Notification.class.php b/htdocs/core/triggers/interface_50_modNotification_Notification.class.php index a056d47b48d..a66659f0e90 100644 --- a/htdocs/core/triggers/interface_50_modNotification_Notification.class.php +++ b/htdocs/core/triggers/interface_50_modNotification_Notification.class.php @@ -155,7 +155,7 @@ class InterfaceNotification extends DolibarrTriggers $qualified = 0; } elseif ($element == 'withdraw' && !isModEnabled('prelevement')) { $qualified = 0; - } elseif ($element == 'shipping' && !isModEnabled('delivery_note')) { + } elseif ($element == 'shipping' && !isModEnabled('shipping')) { $qualified = 0; } elseif ($element == 'member' && !isModEnabled('member')) { $qualified = 0; diff --git a/htdocs/delivery/card.php b/htdocs/delivery/card.php index 7ee3fd7ea4b..acf107b994a 100644 --- a/htdocs/delivery/card.php +++ b/htdocs/delivery/card.php @@ -38,7 +38,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php'; if (isModEnabled("product") || isModEnabled("service")) { require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; } -if (isModEnabled('delivery_note')) { +if (isModEnabled('shipping')) { require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php'; } if (isModEnabled('stock')) { diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php index 536d9d7bee5..931d2f5e44e 100644 --- a/htdocs/install/upgrade2.php +++ b/htdocs/install/upgrade2.php @@ -2008,7 +2008,7 @@ function migrate_modeles($db, $langs, $conf) } } - if (isModEnabled("delivery_note")) { + if (isModEnabled("shipping")) { include_once DOL_DOCUMENT_ROOT.'/core/modules/expedition/modules_expedition.php'; $modellist = ModelePdfExpedition::liste_modeles($db); if (count($modellist) == 0) { diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php index b77e6844a97..96c1ce01069 100644 --- a/htdocs/product/class/product.class.php +++ b/htdocs/product/class/product.class.php @@ -5891,7 +5891,7 @@ class Product extends CommonObject } $stock_commande_client = $this->stats_commande['qty']; } - if (isModEnabled("delivery_note")) { + if (isModEnabled("shipping")) { require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php'; $filterShipmentStatus = ''; if (getDolGlobalString('STOCK_CALCULATE_ON_SHIPMENT')) { diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php index 456460e2b21..1a33d36a1f5 100644 --- a/htdocs/product/stock/product.php +++ b/htdocs/product/stock/product.php @@ -796,7 +796,7 @@ if ($id > 0 || $ref) { } // Number of product from sales order already sent (partial shipping) - if (isModEnabled("delivery_note")) { + if (isModEnabled("shipping")) { require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php'; $filterShipmentStatus = ''; if (getDolGlobalString('STOCK_CALCULATE_ON_SHIPMENT')) { diff --git a/htdocs/product/stock/replenish.php b/htdocs/product/stock/replenish.php index febc2adf39e..24e9d0d8a10 100644 --- a/htdocs/product/stock/replenish.php +++ b/htdocs/product/stock/replenish.php @@ -425,7 +425,7 @@ if ($usevirtualstock) { $sqlCommandesCli = '0'; } - if (isModEnabled("delivery_note")) { + if (isModEnabled("shipping")) { $sqlExpeditionsCli = "(SELECT ".$db->ifsql("SUM(ed2.qty) IS NULL", "0", "SUM(ed2.qty)")." as qty"; // We need the ifsql because if result is 0 for product p.rowid, we must return 0 and not NULL $sqlExpeditionsCli .= " FROM ".MAIN_DB_PREFIX."expedition as e2,"; $sqlExpeditionsCli .= " ".MAIN_DB_PREFIX."expeditiondet as ed2,"; diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php index 310ecd4704e..68e57451ca3 100644 --- a/htdocs/projet/element.php +++ b/htdocs/projet/element.php @@ -59,7 +59,7 @@ if (isModEnabled('deplacement')) { if (isModEnabled('don')) { require_once DOL_DOCUMENT_ROOT.'/don/class/don.class.php'; } -if (isModEnabled('delivery_note')) { +if (isModEnabled('shipping')) { require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php'; } if (isModEnabled('expensereport')) { @@ -515,7 +515,7 @@ $listofreferent = array( 'lang'=>'sendings', 'buttonnew'=>'CreateShipment', 'testnew'=>0, - 'test'=>isModEnabled('delivery_note') && $user->hasRight('expedition', 'lire') + 'test'=>isModEnabled('shipping') && $user->hasRight('expedition', 'lire') ), 'mrp'=>array( 'name'=>"MO", diff --git a/htdocs/societe/admin/societe.php b/htdocs/societe/admin/societe.php index acfd93d1740..9821a24974b 100644 --- a/htdocs/societe/admin/societe.php +++ b/htdocs/societe/admin/societe.php @@ -877,7 +877,7 @@ if (getDolGlobalString('CONTACT_SHOW_EMAIL_PHONE_TOWN_SELECTLIST')) { print ''; print ''; -if (isModEnabled("delivery_note")) { +if (isModEnabled("shipping")) { if (getDolGlobalInt('MAIN_FEATURES_LEVEL') > 0) { // Visible on experimental only because seems to not be implemented everywhere (only on proposal) print ''; print ''; diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php index 78551cdb6e4..c1001889fcc 100644 --- a/htdocs/supplier_proposal/card.php +++ b/htdocs/supplier_proposal/card.php @@ -1328,7 +1328,7 @@ if ($action == 'create') { } // Shipping Method - if (isModEnabled("delivery_note")) { + if (isModEnabled("shipping")) { print '
'; print $langs->trans('SendingMethod'); diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php index 0e70bdc1b39..911d866b671 100644 --- a/htdocs/comm/propal/list.php +++ b/htdocs/comm/propal/list.php @@ -59,7 +59,7 @@ if (isModEnabled('category')) { // Load translation files required by the page $langs->loadLangs(array('companies', 'propal', 'compta', 'bills', 'orders', 'products', 'deliveries', 'categories')); -if (isModEnabled("delivery_note")) { +if (isModEnabled("shipping")) { $langs->loadLangs(array('sendings')); } @@ -225,7 +225,7 @@ $arrayfields = array( 'p.date_livraison' => array('label' => "DeliveryDate", 'checked' => 0), 'p.date_signature' => array('label' => "DateSigning", 'checked' => 0), 'ava.rowid' => array('label' => "AvailabilityPeriod", 'checked' => 0), - 'p.fk_shipping_method' => array('label' => "SendingMethod", 'checked' => 0, 'enabled' => isModEnabled("delivery_note")), + 'p.fk_shipping_method' => array('label' => "SendingMethod", 'checked' => 0, 'enabled' => isModEnabled("shipping")), 'p.fk_input_reason' => array('label' => "Origin", 'checked' => 0, 'enabled' => 1), 'p.fk_cond_reglement' => array('label' => "PaymentConditionsShort", 'checked' => 0), 'p.fk_mode_reglement' => array('label' => "PaymentMode", 'checked' => 0), diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php index 2bcfe9482e4..1f13f844c5c 100644 --- a/htdocs/commande/card.php +++ b/htdocs/commande/card.php @@ -1953,7 +1953,7 @@ if ($action == 'create' && $usercancreate) { } // Shipping Method - if (isModEnabled('delivery_note')) { + if (isModEnabled('shipping')) { print '
'.$langs->trans('SendingMethod').''; print img_picto('', 'object_dolly', 'class="pictofixedwidth"'); $form->selectShippingMethod(((GETPOSTISSET('shipping_method_id') && GETPOSTINT('shipping_method_id') != 0) ? GETPOST('shipping_method_id') : $shipping_method_id), 'shipping_method_id', '', 1, '', 0, 'maxwidth200 widthcentpercentminusx'); @@ -2593,7 +2593,7 @@ if ($action == 'create' && $usercancreate) { print '
'; $editenable = $usercancreate; print $form->editfieldkey("SendingMethod", 'shippingmethod', '', $object, $editenable); @@ -2995,14 +2995,14 @@ if ($action == 'create' && $usercancreate) { }*/ $numshipping = 0; - if (isModEnabled('delivery_note')) { + if (isModEnabled('shipping')) { $numshipping = $object->countNbOfShipments(); } // Create shipment if ($object->statut > Commande::STATUS_DRAFT && $object->statut < Commande::STATUS_CLOSED && ($object->getNbOfProductsLines() > 0 || getDolGlobalString('STOCK_SUPPORTS_SERVICES'))) { if ((getDolGlobalInt('MAIN_SUBMODULE_EXPEDITION') && $user->hasRight('expedition', 'creer')) || (getDolGlobalInt('MAIN_SUBMODULE_DELIVERY') && $user->hasRight('expedition', 'delivery', 'creer'))) { - $arrayforbutaction[] = array('lang' => 'sendings', 'enabled' => (isModEnabled("delivery_note") && ($object->statut > Commande::STATUS_DRAFT && $object->statut < Commande::STATUS_CLOSED && ($object->getNbOfProductsLines() > 0 || getDolGlobalString('STOCK_SUPPORTS_SERVICES')))), 'perm' => $user->hasRight('expedition', 'creer'), 'label' => 'CreateShipment', 'url' => '/expedition/shipment.php?id='.$object->id); + $arrayforbutaction[] = array('lang' => 'sendings', 'enabled' => (isModEnabled("shipping") && ($object->statut > Commande::STATUS_DRAFT && $object->statut < Commande::STATUS_CLOSED && ($object->getNbOfProductsLines() > 0 || getDolGlobalString('STOCK_SUPPORTS_SERVICES')))), 'perm' => $user->hasRight('expedition', 'creer'), 'label' => 'CreateShipment', 'url' => '/expedition/shipment.php?id='.$object->id); /* if ($user->hasRight('expedition', 'creer')) { print dolGetButtonAction('', $langs->trans('CreateShipment'), 'default', DOL_URL_ROOT.'/expedition/shipment.php?id='.$object->id, ''); diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php index 50a0b8b92d6..b7d2e37c24d 100644 --- a/htdocs/commande/class/commande.class.php +++ b/htdocs/commande/class/commande.class.php @@ -3826,7 +3826,7 @@ class Commande extends CommonOrder $result = ''; - if (isModEnabled("delivery_note") && ($option == '1' || $option == '2')) { + if (isModEnabled("shipping") && ($option == '1' || $option == '2')) { $url = DOL_URL_ROOT.'/expedition/shipment.php?id='.$this->id; } else { $url = DOL_URL_ROOT.'/commande/card.php?id='.$this->id; diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php index ddc15d9eb0c..e01cc02b357 100644 --- a/htdocs/commande/list.php +++ b/htdocs/commande/list.php @@ -184,7 +184,7 @@ $arrayfields = array( 'typent.code' => array('label' => "ThirdPartyType", 'checked' => $checkedtypetiers, 'position' => 55), 'c.date_commande' => array('label' => "OrderDateShort", 'checked' => 1, 'position' => 60, 'csslist' => 'nowraponall'), 'c.date_delivery' => array('label' => "DateDeliveryPlanned", 'checked' => 1, 'enabled' => !getDolGlobalString('ORDER_DISABLE_DELIVERY_DATE'), 'position' => 65, 'csslist' => 'nowraponall'), - 'c.fk_shipping_method' => array('label' => "SendingMethod", 'checked' => -1, 'position' => 66 , 'enabled' => isModEnabled("delivery_note")), + 'c.fk_shipping_method' => array('label' => "SendingMethod", 'checked' => -1, 'position' => 66 , 'enabled' => isModEnabled("shipping")), 'c.fk_cond_reglement' => array('label' => "PaymentConditionsShort", 'checked' => -1, 'position' => 67), 'c.fk_mode_reglement' => array('label' => "PaymentMode", 'checked' => -1, 'position' => 68), 'c.fk_input_reason' => array('label' => "Channel", 'checked' => -1, 'position' => 69), @@ -207,7 +207,7 @@ $arrayfields = array( 'c.date_cloture' => array('label' => "DateClosing", 'checked' => 0, 'position' => 130), 'c.note_public' => array('label' => 'NotePublic', 'checked' => 0, 'enabled' => (!getDolGlobalInt('MAIN_LIST_HIDE_PUBLIC_NOTES')), 'position' => 135, 'searchall' => 1), 'c.note_private' => array('label' => 'NotePrivate', 'checked' => 0, 'enabled' => (!getDolGlobalInt('MAIN_LIST_HIDE_PRIVATE_NOTES')), 'position' => 140), - 'shippable' => array('label' => "Shippable", 'checked' => 1,'enabled' => (isModEnabled("delivery_note")), 'position' => 990), + 'shippable' => array('label' => "Shippable", 'checked' => 1,'enabled' => (isModEnabled("shipping")), 'position' => 990), 'c.facture' => array('label' => "Billed", 'checked' => 1, 'enabled' => (!getDolGlobalString('WORKFLOW_BILL_ON_SHIPMENT')), 'position' => 995), 'c.import_key' => array('type' => 'varchar(14)', 'label' => 'ImportId', 'enabled' => 1, 'visible' => -2, 'position' => 999), 'c.fk_statut' => array('label' => "Status", 'checked' => 1, 'position' => 1000) @@ -905,7 +905,7 @@ if ($search_billed != '' && $search_billed >= 0) { } if ($search_status != '') { if ($search_status <= 3 && $search_status >= -1) { // status from -1 to 3 are real status (other are virtual combination) - if ($search_status == 1 && !isModEnabled('delivery_note')) { + if ($search_status == 1 && !isModEnabled('shipping')) { $sql .= ' AND c.fk_statut IN (1,2)'; // If module expedition disabled, we include order with status "sent" into "validated" } else { $sql .= ' AND c.fk_statut = '.((int) $search_status); // draft, validated, in process or canceled @@ -1162,7 +1162,7 @@ if ($search_status == -2) { $title .= ' - '.$langs->trans('StatusOrderToProcessShort'); } if ($search_status == -3) { - $title .= ' - '.$langs->trans('StatusOrderValidated').', '.(!isModEnabled('delivery_note') ? '' : $langs->trans("StatusOrderSent").', ').$langs->trans('StatusOrderToBill'); + $title .= ' - '.$langs->trans('StatusOrderValidated').', '.(!isModEnabled('shipping') ? '' : $langs->trans("StatusOrderSent").', ').$langs->trans('StatusOrderToBill'); } if ($search_status == -4) { $title .= ' - '.$langs->trans("StatusOrderValidatedShort").'+'.$langs->trans("StatusOrderSentShort"); diff --git a/htdocs/commande/list_det.php b/htdocs/commande/list_det.php index 01aceb429d8..2adbd25a7d0 100644 --- a/htdocs/commande/list_det.php +++ b/htdocs/commande/list_det.php @@ -195,7 +195,7 @@ $arrayfields = array( 'typent.code' => array('label' => "ThirdPartyType", 'checked' => $checkedtypetiers, 'position' => 55), 'c.date_commande' => array('label' => "OrderDateShort", 'checked' => 1, 'position' => 60), 'c.date_delivery' => array('label' => "DateDeliveryPlanned", 'checked' => 1, 'enabled' => !getDolGlobalString('ORDER_DISABLE_DELIVERY_DATE'), 'position' => 65), - 'c.fk_shipping_method' => array('label' => "SendingMethod", 'checked' => -1, 'position' => 66 , 'enabled' => isModEnabled('delivery_note')), + 'c.fk_shipping_method' => array('label' => "SendingMethod", 'checked' => -1, 'position' => 66 , 'enabled' => isModEnabled('shipping')), 'c.fk_cond_reglement' => array('label' => "PaymentConditionsShort", 'checked' => -1, 'position' => 67), 'c.fk_mode_reglement' => array('label' => "PaymentMode", 'checked' => -1, 'position' => 68), 'c.fk_input_reason' => array('label' => "Channel", 'checked' => -1, 'position' => 69), @@ -219,7 +219,7 @@ $arrayfields = array( 'c.date_cloture' => array('label' => "DateClosing", 'checked' => 0, 'position' => 130), 'c.note_public' => array('label' => 'NotePublic', 'checked' => 0, 'enabled' => (!getDolGlobalString('MAIN_LIST_ALLOW_PUBLIC_NOTES')), 'position' => 135), 'c.note_private' => array('label' => 'NotePrivate', 'checked' => 0, 'enabled' => (!getDolGlobalString('MAIN_LIST_ALLOW_PRIVATE_NOTES')), 'position' => 140), - 'shippable' => array('label' => "Shippable", 'checked' => 1,'enabled' => (isModEnabled('delivery_note')), 'position' => 990), + 'shippable' => array('label' => "Shippable", 'checked' => 1,'enabled' => (isModEnabled('shipping')), 'position' => 990), 'c.facture' => array('label' => "Billed", 'checked' => 1, 'enabled' => (!getDolGlobalString('WORKFLOW_BILL_ON_SHIPMENT')), 'position' => 995), 'c.import_key' => array('type' => 'varchar(14)', 'label' => 'ImportId', 'enabled' => 1, 'visible' => -2, 'position' => 999), 'c.fk_statut' => array('label' => "Status", 'checked' => 1, 'position' => 1000) @@ -470,7 +470,7 @@ if ($search_billed != '' && $search_billed >= 0) { } if ($search_status != '') { if ($search_status <= 3 && $search_status >= -1) { // status from -1 to 3 are real status (other are virtual combination) - if ($search_status == 1 && !isModEnabled('delivery_note')) { + if ($search_status == 1 && !isModEnabled('shipping')) { $sql .= ' AND c.fk_statut IN (1,2)'; // If module expedition disabled, we include order with status "sent" into "validated" } else { $sql .= ' AND c.fk_statut = '.((int) $search_status); // draft, validated, in process or canceled @@ -685,7 +685,7 @@ if ($resql) { $title .= ' - '.$langs->trans('StatusOrderToProcessShort'); } if ($search_status == -3) { - $title .= ' - '.$langs->trans('StatusOrderValidated').', '.(!isModEnabled('delivery_note') ? '' : $langs->trans("StatusOrderSent").', ').$langs->trans('StatusOrderToBill'); + $title .= ' - '.$langs->trans('StatusOrderValidated').', '.(!isModEnabled('shipping') ? '' : $langs->trans("StatusOrderSent").', ').$langs->trans('StatusOrderToBill'); } if ($search_status == -4) { $title .= ' - '.$langs->trans("StatusOrderValidatedShort").'+'.$langs->trans("StatusOrderSentShort"); diff --git a/htdocs/contact/card.php b/htdocs/contact/card.php index 0cf70884978..a7b38cc85c7 100644 --- a/htdocs/contact/card.php +++ b/htdocs/contact/card.php @@ -1462,16 +1462,16 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) { print '
'; - if (isModEnabled("delivery_note")) { + if (isModEnabled("shipping")) { print $langs->trans("ContactForOrdersOrShipments"); } else { print $langs->trans("ContactForOrders"); } print ''; $none = $langs->trans("NoContactForAnyOrder"); - if (isModEnabled("delivery_note")) { + if (isModEnabled("shipping")) { $none = $langs->trans("NoContactForAnyOrderOrShipments"); } print $object->ref_commande ? $object->ref_commande : $none; diff --git a/htdocs/core/ajax/selectsearchbox.php b/htdocs/core/ajax/selectsearchbox.php index 00a86ccd9a9..f1d63188307 100644 --- a/htdocs/core/ajax/selectsearchbox.php +++ b/htdocs/core/ajax/selectsearchbox.php @@ -106,7 +106,7 @@ if (isModEnabled('propal') && !getDolGlobalString('MAIN_SEARCHFORM_CUSTOMER_PROP if (isModEnabled('order') && !getDolGlobalString('MAIN_SEARCHFORM_CUSTOMER_ORDER_DISABLED') && $user->hasRight('commande', 'lire')) { $arrayresult['searchintoorder'] = array('position' => 70, 'img' => 'object_order', 'label' => $langs->trans("SearchIntoCustomerOrders", $search_boxvalue), 'text' => img_picto('', 'object_order', 'class="pictofixedwidth"').' '.$langs->trans("SearchIntoCustomerOrders", $search_boxvalue), 'url' => DOL_URL_ROOT.'/commande/list.php'.($search_boxvalue ? '?search_all='.urlencode($search_boxvalue) : '')); } -if (isModEnabled('delivery_note') && !getDolGlobalString('MAIN_SEARCHFORM_CUSTOMER_SHIPMENT_DISABLED') && $user->hasRight('expedition', 'lire')) { +if (isModEnabled('shipping') && !getDolGlobalString('MAIN_SEARCHFORM_CUSTOMER_SHIPMENT_DISABLED') && $user->hasRight('expedition', 'lire')) { $arrayresult['searchintoshipment'] = array('position' => 80, 'img' => 'object_shipment', 'label' => $langs->trans("SearchIntoCustomerShipments", $search_boxvalue), 'text' => img_picto('', 'object_shipment', 'class="pictofixedwidth"').' '.$langs->trans("SearchIntoCustomerShipments", $search_boxvalue), 'url' => DOL_URL_ROOT.'/expedition/list.php'.($search_boxvalue ? '?search_all='.urlencode($search_boxvalue) : '')); } if (isModEnabled('invoice') && !getDolGlobalString('MAIN_SEARCHFORM_CUSTOMER_INVOICE_DISABLED') && $user->hasRight('facture', 'lire')) { diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php index 7e887aaeda2..4c9edcc8868 100644 --- a/htdocs/core/class/commonobject.class.php +++ b/htdocs/core/class/commonobject.class.php @@ -4224,7 +4224,7 @@ abstract class CommonObject } elseif ($objecttype == 'delivery') { $classpath = 'delivery/class'; $subelement = 'delivery'; - $module = 'delivery_note'; + $module = 'shipping'; } elseif ($objecttype == 'invoice_supplier' || $objecttype == 'order_supplier') { $classpath = 'fourn/class'; $module = 'fournisseur'; diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index 3054f4c4a6f..a7905a1b346 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -9181,7 +9181,7 @@ class Form } } elseif ($objecttype == 'shipping' || $objecttype == 'shipment' || $objecttype == 'expedition') { $tplpath = 'expedition'; - if (!isModEnabled('delivery_note')) { + if (!isModEnabled('shipping')) { continue; // Do not show if module disabled } } elseif ($objecttype == 'reception') { @@ -9191,8 +9191,8 @@ class Form } } elseif ($objecttype == 'delivery') { $tplpath = 'delivery'; - if (!isModEnabled('delivery_note')) { - continue; // Do not show if module disabled + if (!getDolGlobalInt('MAIN_SUBMODULE_DELIVERY')) { + continue; // Do not show if sub module disabled } } elseif ($objecttype == 'ficheinter') { $tplpath = 'fichinter'; @@ -9298,7 +9298,7 @@ class Form 'label' => 'LinkToProposal', 'sql' => "SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_client, t.total_ht FROM " . $this->db->prefix() . "societe as s, " . $this->db->prefix() . "propal as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (" . $this->db->sanitize($listofidcompanytoscan) . ') AND t.entity IN (' . getEntity('propal') . ')'), 'shipping' => array( - 'enabled' => isModEnabled('delivery_note'), + 'enabled' => isModEnabled('shipping'), 'perms' => 1, 'label' => 'LinkToExpedition', 'sql' => "SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref FROM " . $this->db->prefix() . "societe as s, " . $this->db->prefix() . "expedition as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (" . $this->db->sanitize($listofidcompanytoscan) . ') AND t.entity IN (' . getEntity('shipping') . ')'), diff --git a/htdocs/core/lib/expedition.lib.php b/htdocs/core/lib/expedition.lib.php index 78975768664..7f89ca4e51a 100644 --- a/htdocs/core/lib/expedition.lib.php +++ b/htdocs/core/lib/expedition.lib.php @@ -35,7 +35,7 @@ function expedition_prepare_head(Expedition $object) { global $langs, $conf, $user; - if (isModEnabled("delivery_note")) { + if (isModEnabled("shipping")) { $langs->load("sendings"); } $langs->load("orders"); diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 7f6d39d0e29..546ab720452 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -8455,7 +8455,7 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null, $substitutionarray['__DIRECTDOWNLOAD_URL_CONTRACT__'] = 'Direct download url of a contract'; $substitutionarray['__DIRECTDOWNLOAD_URL_SUPPLIER_PROPOSAL__'] = 'Direct download url of a supplier proposal'; - if (isModEnabled("delivery_note") && (!is_object($object) || $object->element == 'shipping')) { + if (isModEnabled("shipping") && (!is_object($object) || $object->element == 'shipping')) { $substitutionarray['__SHIPPINGTRACKNUM__'] = 'Shipping tracking number'; $substitutionarray['__SHIPPINGTRACKNUMURL__'] = 'Shipping tracking url'; $substitutionarray['__SHIPPINGMETHOD__'] = 'Shipping method'; diff --git a/htdocs/core/lib/order.lib.php b/htdocs/core/lib/order.lib.php index cb3f380fca3..8516b3a488f 100644 --- a/htdocs/core/lib/order.lib.php +++ b/htdocs/core/lib/order.lib.php @@ -34,7 +34,7 @@ function commande_prepare_head(Commande $object) { global $db, $langs, $conf, $user; - if (isModEnabled("delivery_note")) { + if (isModEnabled("shipping")) { $langs->load("sendings"); } $langs->load("orders"); diff --git a/htdocs/core/lib/product.lib.php b/htdocs/core/lib/product.lib.php index 976e6c4cf15..b7cb8f7e2fc 100644 --- a/htdocs/core/lib/product.lib.php +++ b/htdocs/core/lib/product.lib.php @@ -679,7 +679,7 @@ function show_stats_for_batch($batch, $socid) print '
'.$langs->trans("AskForPreferredShippingMethod").'
'.$langs->trans('SendingMethod').''; print img_picto('', 'dolly', 'class="pictofixedwidth"'); $form->selectShippingMethod(GETPOST('shipping_method_id') > 0 ? GETPOSTINT('shipping_method_id') : "", 'shipping_method_id', '', 1); diff --git a/htdocs/webportal/controllers/propallist.controller.class.php b/htdocs/webportal/controllers/propallist.controller.class.php index 5c6ca9668db..4eb947582c1 100644 --- a/htdocs/webportal/controllers/propallist.controller.class.php +++ b/htdocs/webportal/controllers/propallist.controller.class.php @@ -64,7 +64,7 @@ class PropalListController extends Controller // Load translation files required by the page $langs->loadLangs(array('companies', 'propal', 'compta', 'bills', 'orders', 'products', 'deliveries', 'categories')); - if (isModEnabled('delivery_note')) { + if (isModEnabled('shipping')) { $langs->loadLangs(array('sendings')); } diff --git a/test/phpunit/CommonClassTest.class.php b/test/phpunit/CommonClassTest.class.php index 701dccc6e63..399f972863c 100644 --- a/test/phpunit/CommonClassTest.class.php +++ b/test/phpunit/CommonClassTest.class.php @@ -247,7 +247,7 @@ abstract class CommonClassTest extends TestCase 'commande' => 'order', 'contrat' => 'contract', 'entrepot' => 'stock', - 'expedition' => 'delivery_note', + 'expedition' => 'shipping', 'facture' => 'invoice', 'fichinter' => 'intervention', 'product_fournisseur_price' => 'productsupplierprice', @@ -296,7 +296,7 @@ abstract class CommonClassTest extends TestCase 'datapolicy' => 'DataPolicy', 'dav' => 'Dav', 'debugbar' => 'DebugBar', - 'delivery_note' => 'Expedition', + 'shipping' => 'Expedition', 'deplacement' => 'Deplacement', "documentgeneration" => 'DocumentGeneration', // TODO: fill in proper name 'don' => 'Don',