diff --git a/htdocs/core/modules/asset/mod_asset_advanced.php b/htdocs/core/modules/asset/mod_asset_advanced.php index a1f800d309d..f6335529016 100644 --- a/htdocs/core/modules/asset/mod_asset_advanced.php +++ b/htdocs/core/modules/asset/mod_asset_advanced.php @@ -76,6 +76,7 @@ class mod_asset_advanced extends ModeleNumRefAsset $tooltip .= $langs->trans("GenericMaskCodes3"); $tooltip .= $langs->trans("GenericMaskCodes4a", $langs->transnoentities("Asset"), $langs->transnoentities("Asset")); $tooltip .= $langs->trans("GenericMaskCodes5"); + //$tooltip .= $langs->trans("GenericMaskCodes5b"); // Parametrage du prefix $text .= ''.$langs->trans("Mask").':'; diff --git a/htdocs/core/modules/barcode/mod_barcode_product_standard.php b/htdocs/core/modules/barcode/mod_barcode_product_standard.php index e325ea94fc4..49103a4f3c0 100644 --- a/htdocs/core/modules/barcode/mod_barcode_product_standard.php +++ b/htdocs/core/modules/barcode/mod_barcode_product_standard.php @@ -90,6 +90,7 @@ class mod_barcode_product_standard extends ModeleNumRefBarCode $tooltip .= '9771234{00000}? (example of ISSN code with prefix 1234)
'; $tooltip .= '9791234{00000}? (example of ISMN code with prefix 1234)
'; //$tooltip.=$langs->trans("GenericMaskCodes5"); + //$tooltip .= $langs->trans("GenericMaskCodes5b"); // Mask parameter //$texte.= ''.$langs->trans("Mask").' ('.$langs->trans("BarCodeModel").'):'; diff --git a/htdocs/core/modules/barcode/mod_barcode_thirdparty_standard.php b/htdocs/core/modules/barcode/mod_barcode_thirdparty_standard.php index e60472fe463..883c6114f7f 100644 --- a/htdocs/core/modules/barcode/mod_barcode_thirdparty_standard.php +++ b/htdocs/core/modules/barcode/mod_barcode_thirdparty_standard.php @@ -103,6 +103,7 @@ class mod_barcode_thirdparty_standard extends ModeleNumRefBarCode $tooltip .= '9771234{00000}? (example of ISSN code with prefix 1234)
'; $tooltip .= '9791234{00000}? (example of ISMN code with prefix 1234)
'; //$tooltip.=$langs->trans("GenericMaskCodes5"); + //$tooltip .= $langs->trans("GenericMaskCodes5b"); // Mask parameter //$texte.= ''.$langs->trans("Mask").' ('.$langs->trans("BarCodeModel").'):'; diff --git a/htdocs/core/modules/bom/mod_bom_advanced.php b/htdocs/core/modules/bom/mod_bom_advanced.php index 2428e79595d..b678053cb30 100644 --- a/htdocs/core/modules/bom/mod_bom_advanced.php +++ b/htdocs/core/modules/bom/mod_bom_advanced.php @@ -77,6 +77,7 @@ class mod_bom_advanced extends ModeleNumRefBoms $tooltip .= $langs->trans("GenericMaskCodes3"); $tooltip .= $langs->trans("GenericMaskCodes4a", $langs->transnoentities("Bom"), $langs->transnoentities("Bom")); $tooltip .= $langs->trans("GenericMaskCodes5"); + //$tooltip .= $langs->trans("GenericMaskCodes5b"); // Parametrage du prefix $texte .= ''.$langs->trans("Mask").':'; diff --git a/htdocs/core/modules/cheque/mod_chequereceipt_thyme.php b/htdocs/core/modules/cheque/mod_chequereceipt_thyme.php index 44eff63035d..a2067fbb447 100644 --- a/htdocs/core/modules/cheque/mod_chequereceipt_thyme.php +++ b/htdocs/core/modules/cheque/mod_chequereceipt_thyme.php @@ -71,6 +71,7 @@ class mod_chequereceipt_thyme extends ModeleNumRefChequeReceipts $tooltip .= $langs->trans("GenericMaskCodes3"); $tooltip .= $langs->trans("GenericMaskCodes4a", $langs->transnoentities("CheckReceiptShort"), $langs->transnoentities("CheckReceiptShort")); $tooltip .= $langs->trans("GenericMaskCodes5"); + //$tooltip .= $langs->trans("GenericMaskCodes5b"); // Parametrage du prefix $texte .= ''.$langs->trans("Mask").':'; diff --git a/htdocs/core/modules/commande/mod_commande_saphir.php b/htdocs/core/modules/commande/mod_commande_saphir.php index aefd2718508..300a282eb2c 100644 --- a/htdocs/core/modules/commande/mod_commande_saphir.php +++ b/htdocs/core/modules/commande/mod_commande_saphir.php @@ -77,6 +77,7 @@ class mod_commande_saphir extends ModeleNumRefCommandes $tooltip .= $langs->trans("GenericMaskCodes3"); $tooltip .= $langs->trans("GenericMaskCodes4a", $langs->transnoentities("Order"), $langs->transnoentities("Order")); $tooltip .= $langs->trans("GenericMaskCodes5"); + $tooltip .= $langs->trans("GenericMaskCodes5b"); // Parametrage du prefix $texte .= ''.$langs->trans("Mask").':'; diff --git a/htdocs/core/modules/contract/mod_contract_magre.php b/htdocs/core/modules/contract/mod_contract_magre.php index ebd7957780f..7f24fa120ce 100644 --- a/htdocs/core/modules/contract/mod_contract_magre.php +++ b/htdocs/core/modules/contract/mod_contract_magre.php @@ -70,6 +70,7 @@ class mod_contract_magre extends ModelNumRefContracts $tooltip .= $langs->trans("GenericMaskCodes3"); $tooltip .= $langs->trans("GenericMaskCodes4a", $langs->transnoentities("Contract"), $langs->transnoentities("Contract")); $tooltip .= $langs->trans("GenericMaskCodes5"); + $tooltip .= $langs->trans("GenericMaskCodes5b"); $texte .= ''.$langs->trans("Mask").':'; $texte .= ''.$form->textwithpicto('', $tooltip, 1, 1).''; diff --git a/htdocs/core/modules/delivery/mod_delivery_saphir.php b/htdocs/core/modules/delivery/mod_delivery_saphir.php index b6669961cd0..64e25c5439b 100644 --- a/htdocs/core/modules/delivery/mod_delivery_saphir.php +++ b/htdocs/core/modules/delivery/mod_delivery_saphir.php @@ -82,6 +82,7 @@ class mod_delivery_saphir extends ModeleNumRefDeliveryOrder $tooltip .= $langs->trans("GenericMaskCodes3"); $tooltip .= $langs->trans("GenericMaskCodes4a", $langs->transnoentities("Delivery"), $langs->transnoentities("Delivery")); $tooltip .= $langs->trans("GenericMaskCodes5"); + $tooltip .= $langs->trans("GenericMaskCodes5b"); // Parametrage du prefix $texte .= ''.$langs->trans("Mask").':'; diff --git a/htdocs/core/modules/expedition/mod_expedition_ribera.php b/htdocs/core/modules/expedition/mod_expedition_ribera.php index 4d85f303169..84b075beb06 100644 --- a/htdocs/core/modules/expedition/mod_expedition_ribera.php +++ b/htdocs/core/modules/expedition/mod_expedition_ribera.php @@ -79,6 +79,7 @@ class mod_expedition_ribera extends ModelNumRefExpedition $tooltip .= $langs->trans("GenericMaskCodes3"); $tooltip .= $langs->trans("GenericMaskCodes4a", $langs->transnoentities("Shipment"), $langs->transnoentities("Shipment")); $tooltip .= $langs->trans("GenericMaskCodes5"); + $tooltip .= $langs->trans("GenericMaskCodes5b"); $texte .= ''.$langs->trans("Mask").':'; $texte .= ''.$form->textwithpicto('', $tooltip, 1, 1).''; diff --git a/htdocs/core/modules/expensereport/mod_expensereport_sand.php b/htdocs/core/modules/expensereport/mod_expensereport_sand.php index 5bb216e5f65..9b95d2a64b4 100644 --- a/htdocs/core/modules/expensereport/mod_expensereport_sand.php +++ b/htdocs/core/modules/expensereport/mod_expensereport_sand.php @@ -81,6 +81,7 @@ class mod_expensereport_sand extends ModeleNumRefExpenseReport $tooltip .= $langs->trans("GenericMaskCodes3"); $tooltip .= $langs->trans("GenericMaskCodes4a", $langs->transnoentities("ExpenseReport"), $langs->transnoentities("ExpenseReport")); $tooltip .= $langs->trans("GenericMaskCodes5"); + $tooltip .= $langs->trans("GenericMaskCodes5b"); // Parametrage du prefix $texte .= ''.$langs->trans("Mask").':'; diff --git a/htdocs/core/modules/facture/mod_facture_mercure.php b/htdocs/core/modules/facture/mod_facture_mercure.php index 4febb418a1b..9c38b5ddc1d 100644 --- a/htdocs/core/modules/facture/mod_facture_mercure.php +++ b/htdocs/core/modules/facture/mod_facture_mercure.php @@ -76,6 +76,7 @@ class mod_facture_mercure extends ModeleNumRefFactures $tooltip .= $langs->trans("GenericMaskCodes3"); $tooltip .= $langs->trans("GenericMaskCodes4a", $langs->transnoentities("Invoice"), $langs->transnoentities("Invoice")); $tooltip .= $langs->trans("GenericMaskCodes5"); + $tooltip .= $langs->trans("GenericMaskCodes5b"); // Setting the prefix $texte .= ''.$langs->trans("Mask").' ('.$langs->trans("InvoiceStandard").'):'; diff --git a/htdocs/core/modules/fichinter/mod_arctic.php b/htdocs/core/modules/fichinter/mod_arctic.php index 33fce191c0e..17b2a50c3a8 100644 --- a/htdocs/core/modules/fichinter/mod_arctic.php +++ b/htdocs/core/modules/fichinter/mod_arctic.php @@ -83,6 +83,7 @@ class mod_arctic extends ModeleNumRefFicheinter $tooltip .= $langs->trans("GenericMaskCodes3"); $tooltip .= $langs->trans("GenericMaskCodes4a", $langs->transnoentities("InterventionCard"), $langs->transnoentities("InterventionCard")); $tooltip .= $langs->trans("GenericMaskCodes5"); + //$tooltip .= $langs->trans("GenericMaskCodes5b"); // Setting the prefix $texte .= ''.$langs->trans("Mask").':'; diff --git a/htdocs/core/modules/holiday/mod_holiday_immaculate.php b/htdocs/core/modules/holiday/mod_holiday_immaculate.php index 434b9614985..efbf22d4524 100644 --- a/htdocs/core/modules/holiday/mod_holiday_immaculate.php +++ b/htdocs/core/modules/holiday/mod_holiday_immaculate.php @@ -70,6 +70,7 @@ class mod_holiday_immaculate extends ModelNumRefHolidays $tooltip .= $langs->trans("GenericMaskCodes3"); $tooltip .= $langs->trans("GenericMaskCodes4a", $langs->transnoentities("Holiday"), $langs->transnoentities("Holiday")); $tooltip .= $langs->trans("GenericMaskCodes5"); + //$tooltip .= $langs->trans("GenericMaskCodes5b"); $texte .= ''.$langs->trans("Mask").':'; $texte .= ''.$form->textwithpicto('', $tooltip, 1, 1).''; diff --git a/htdocs/core/modules/hrm/mod_evaluation_advanced.php b/htdocs/core/modules/hrm/mod_evaluation_advanced.php index f5b236d4594..6a74713e82d 100644 --- a/htdocs/core/modules/hrm/mod_evaluation_advanced.php +++ b/htdocs/core/modules/hrm/mod_evaluation_advanced.php @@ -77,6 +77,7 @@ class mod_evaluation_advanced extends ModeleNumRefEvaluation $tooltip .= $langs->trans("GenericMaskCodes3"); $tooltip .= $langs->trans("GenericMaskCodes4a", $langs->transnoentities("Evaluation"), $langs->transnoentities("Evaluation")); $tooltip .= $langs->trans("GenericMaskCodes5"); + //$tooltip .= $langs->trans("GenericMaskCodes5b"); // Parametrage du prefix $texte .= ''.$langs->trans("Mask").':'; diff --git a/htdocs/core/modules/mrp/mod_mo_advanced.php b/htdocs/core/modules/mrp/mod_mo_advanced.php index fe2948e1ea5..9db9ad49e8d 100644 --- a/htdocs/core/modules/mrp/mod_mo_advanced.php +++ b/htdocs/core/modules/mrp/mod_mo_advanced.php @@ -78,6 +78,7 @@ class mod_mo_advanced extends ModeleNumRefMos $tooltip .= $langs->trans("GenericMaskCodes3"); $tooltip .= $langs->trans("GenericMaskCodes4a", $langs->transnoentities("Mo"), $langs->transnoentities("Mo")); $tooltip .= $langs->trans("GenericMaskCodes5"); + //$tooltip .= $langs->trans("GenericMaskCodes5b"); // Parametrage du prefix $texte .= ''.$langs->trans("Mask").':'; diff --git a/htdocs/core/modules/payment/mod_payment_ant.php b/htdocs/core/modules/payment/mod_payment_ant.php index 4e60a5d8efa..85395060f6e 100644 --- a/htdocs/core/modules/payment/mod_payment_ant.php +++ b/htdocs/core/modules/payment/mod_payment_ant.php @@ -80,6 +80,7 @@ class mod_payment_ant extends ModeleNumRefPayments $tooltip .= $langs->trans("GenericMaskCodes3"); $tooltip .= $langs->trans("GenericMaskCodes4a", $langs->transnoentities("Order"), $langs->transnoentities("Order")); $tooltip .= $langs->trans("GenericMaskCodes5"); + //$tooltip .= $langs->trans("GenericMaskCodes5b"); // Parametrage du prefix $texte .= ''.$langs->trans("Mask").':'; diff --git a/htdocs/core/modules/product/mod_codeproduct_elephant.php b/htdocs/core/modules/product/mod_codeproduct_elephant.php index 03004ad250f..992d7003bda 100644 --- a/htdocs/core/modules/product/mod_codeproduct_elephant.php +++ b/htdocs/core/modules/product/mod_codeproduct_elephant.php @@ -94,6 +94,7 @@ class mod_codeproduct_elephant extends ModeleProductCode $tooltip .= $langs->trans("GenericMaskCodes3"); $tooltip .= $langs->trans("GenericMaskCodes4c"); $tooltip .= $langs->trans("GenericMaskCodes5"); + //$tooltip .= $langs->trans("GenericMaskCodes5b"); // Parametrage du prefix customers $texte .= ''.$langs->trans("Mask").' ('.$langs->trans("ProductCodeModel").'):'; diff --git a/htdocs/core/modules/product_batch/mod_lot_advanced.php b/htdocs/core/modules/product_batch/mod_lot_advanced.php index 9074500bf2b..4f5a8b17726 100644 --- a/htdocs/core/modules/product_batch/mod_lot_advanced.php +++ b/htdocs/core/modules/product_batch/mod_lot_advanced.php @@ -82,6 +82,7 @@ class mod_lot_advanced extends ModeleNumRefBatch $tooltip .= $langs->trans("GenericMaskCodes3"); $tooltip .= $langs->trans("GenericMaskCodes4a", $langs->transnoentities("Batch"), $langs->transnoentities("Batch")); $tooltip .= $langs->trans("GenericMaskCodes5"); + //$tooltip .= $langs->trans("GenericMaskCodes5b"); // Parametrage du prefix $texte .= ''.$langs->trans("Mask").':'; diff --git a/htdocs/core/modules/product_batch/mod_sn_advanced.php b/htdocs/core/modules/product_batch/mod_sn_advanced.php index 20fcb64d382..03085881f53 100644 --- a/htdocs/core/modules/product_batch/mod_sn_advanced.php +++ b/htdocs/core/modules/product_batch/mod_sn_advanced.php @@ -82,6 +82,7 @@ class mod_sn_advanced extends ModeleNumRefBatch $tooltip .= $langs->trans("GenericMaskCodes3"); $tooltip .= $langs->trans("GenericMaskCodes4a", $langs->transnoentities("Batch"), $langs->transnoentities("Batch")); $tooltip .= $langs->trans("GenericMaskCodes5"); + //$tooltip .= $langs->trans("GenericMaskCodes5b"); // Parametrage du prefix $texte .= ''.$langs->trans("Mask").':'; diff --git a/htdocs/core/modules/project/mod_project_universal.php b/htdocs/core/modules/project/mod_project_universal.php index 6ed05b3e728..c70e7438c13 100644 --- a/htdocs/core/modules/project/mod_project_universal.php +++ b/htdocs/core/modules/project/mod_project_universal.php @@ -87,6 +87,7 @@ class mod_project_universal extends ModeleNumRefProjects $tooltip .= $langs->trans("GenericMaskCodes3"); $tooltip .= $langs->trans("GenericMaskCodes4a", $langs->transnoentities("Project"), $langs->transnoentities("Project")); $tooltip .= $langs->trans("GenericMaskCodes5"); + $tooltip .= $langs->trans("GenericMaskCodes5b"); // Prefix settings $texte .= ''.$langs->trans("Mask").':'; diff --git a/htdocs/core/modules/project/task/mod_task_universal.php b/htdocs/core/modules/project/task/mod_task_universal.php index 52b7b9b18d9..fe3efa2e9c6 100644 --- a/htdocs/core/modules/project/task/mod_task_universal.php +++ b/htdocs/core/modules/project/task/mod_task_universal.php @@ -82,6 +82,7 @@ class mod_task_universal extends ModeleNumRefTask $tooltip .= $langs->trans("GenericMaskCodes3"); $tooltip .= $langs->trans("GenericMaskCodes4a", $langs->transnoentities("Task"), $langs->transnoentities("Task")); $tooltip .= $langs->trans("GenericMaskCodes5"); + $tooltip .= $langs->trans("GenericMaskCodes5b"); // Parametrage du prefix $texte .= ''.$langs->trans("Mask").':'; diff --git a/htdocs/core/modules/propale/mod_propale_saphir.php b/htdocs/core/modules/propale/mod_propale_saphir.php index 91772195411..763ac1bc6f4 100644 --- a/htdocs/core/modules/propale/mod_propale_saphir.php +++ b/htdocs/core/modules/propale/mod_propale_saphir.php @@ -83,6 +83,7 @@ class mod_propale_saphir extends ModeleNumRefPropales $tooltip .= $langs->trans("GenericMaskCodes3"); $tooltip .= $langs->trans("GenericMaskCodes4a", $langs->transnoentities("Proposal"), $langs->transnoentities("Proposal")); $tooltip .= $langs->trans("GenericMaskCodes5"); + $tooltip .= $langs->trans("GenericMaskCodes5b"); // Parametrage du prefix $texte .= ''.$langs->trans("Mask").':'; diff --git a/htdocs/core/modules/reception/mod_reception_moonstone.php b/htdocs/core/modules/reception/mod_reception_moonstone.php index 9acf2cfd161..858d3431c97 100644 --- a/htdocs/core/modules/reception/mod_reception_moonstone.php +++ b/htdocs/core/modules/reception/mod_reception_moonstone.php @@ -60,6 +60,7 @@ class mod_reception_moonstone extends ModelNumRefReception $tooltip .= $langs->trans("GenericMaskCodes3"); $tooltip .= $langs->trans("GenericMaskCodes4a", $langs->transnoentities("Reception"), $langs->transnoentities("Reception")); $tooltip .= $langs->trans("GenericMaskCodes5"); + $tooltip .= $langs->trans("GenericMaskCodes5b"); $texte .= ''.$langs->trans("Mask").':'; $texte .= ''.$form->textwithpicto('', $tooltip, 1, 1).''; diff --git a/htdocs/core/modules/societe/mod_codeclient_elephant.php b/htdocs/core/modules/societe/mod_codeclient_elephant.php index c30145891ed..14d3a35f00c 100644 --- a/htdocs/core/modules/societe/mod_codeclient_elephant.php +++ b/htdocs/core/modules/societe/mod_codeclient_elephant.php @@ -97,13 +97,17 @@ class mod_codeclient_elephant extends ModeleThirdPartyCode $tooltip = $langs->trans("GenericMaskCodes", $langs->transnoentities("ThirdParty"), $langs->transnoentities("ThirdParty")); //$tooltip.=$langs->trans("GenericMaskCodes2"); Not required for third party numbering + $tooltip .= $langs->trans("GenericMaskCodes2b").'
'; + $tooltip .= '
'; $tooltip .= $langs->trans("GenericMaskCodes3"); + $tooltip .= '
'; $tooltip .= $langs->trans("GenericMaskCodes4b"); $tooltip .= $langs->trans("GenericMaskCodes5"); + //$tooltip .= $langs->trans("GenericMaskCodes5b"); // Parametrage du prefix customers $texte .= ''.$langs->trans("Mask").' ('.$langs->trans("CustomerCodeModel").'):'; - $texte .= ''.$form->textwithpicto('', $tooltip, 1, 1).''; + $texte .= ''.$form->textwithpicto('', $tooltip, 1, 1, '', 0, 3, 'tooltipelephantcutomer').''; $texte .= '  '; @@ -111,7 +115,7 @@ class mod_codeclient_elephant extends ModeleThirdPartyCode // Parametrage du prefix suppliers $texte .= ''.$langs->trans("Mask").' ('.$langs->trans("SupplierCodeModel").'):'; - $texte .= ''.$form->textwithpicto('', $tooltip, 1, 1).''; + $texte .= ''.$form->textwithpicto('', $tooltip, 1, 1, '', 0, 3, 'tooltipelephantsupplier').''; $texte .= ''; $texte .= ''; diff --git a/htdocs/core/modules/stocktransfer/mod_stocktransfer_advanced.php b/htdocs/core/modules/stocktransfer/mod_stocktransfer_advanced.php index 5860b120342..29bd57db88c 100644 --- a/htdocs/core/modules/stocktransfer/mod_stocktransfer_advanced.php +++ b/htdocs/core/modules/stocktransfer/mod_stocktransfer_advanced.php @@ -78,6 +78,7 @@ class mod_stocktransfer_advanced extends ModeleNumRefStockTransfer $tooltip .= $langs->trans("GenericMaskCodes3"); $tooltip .= $langs->trans("GenericMaskCodes4a", $langs->transnoentities("StockTransfer"), $langs->transnoentities("StockTransfer")); $tooltip .= $langs->trans("GenericMaskCodes5"); + //$tooltip .= $langs->trans("GenericMaskCodes5b"); // Parametrage du prefix $texte .= ''.$langs->trans("Mask").':'; diff --git a/htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_tulip.php b/htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_tulip.php index 7fb38484e21..9ff6846da75 100644 --- a/htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_tulip.php +++ b/htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_tulip.php @@ -91,6 +91,7 @@ class mod_facture_fournisseur_tulip extends ModeleNumRefSuppliersInvoices $tooltip .= $langs->trans("GenericMaskCodes3"); $tooltip .= $langs->trans("GenericMaskCodes4a", $langs->transnoentities("Invoice"), $langs->transnoentities("Invoice")); $tooltip .= $langs->trans("GenericMaskCodes5"); + $tooltip .= $langs->trans("GenericMaskCodes5b"); // Setting the prefix $texte .= ''.$langs->trans("Mask").' ('.$langs->trans("InvoiceStandard").')'; diff --git a/htdocs/core/modules/supplier_order/mod_commande_fournisseur_orchidee.php b/htdocs/core/modules/supplier_order/mod_commande_fournisseur_orchidee.php index a5304052548..8bcebbee4fb 100644 --- a/htdocs/core/modules/supplier_order/mod_commande_fournisseur_orchidee.php +++ b/htdocs/core/modules/supplier_order/mod_commande_fournisseur_orchidee.php @@ -85,6 +85,7 @@ class mod_commande_fournisseur_orchidee extends ModeleNumRefSuppliersOrders $tooltip .= $langs->trans("GenericMaskCodes3"); $tooltip .= $langs->trans("GenericMaskCodes4a", $langs->transnoentities("Order"), $langs->transnoentities("Order")); $tooltip .= $langs->trans("GenericMaskCodes5"); + $tooltip .= $langs->trans("GenericMaskCodes5b"); // Parametrage du prefix $texte .= ''.$langs->trans("Mask").':'; diff --git a/htdocs/core/modules/supplier_payment/mod_supplier_payment_brodator.php b/htdocs/core/modules/supplier_payment/mod_supplier_payment_brodator.php index 6790389a328..c068586dd92 100644 --- a/htdocs/core/modules/supplier_payment/mod_supplier_payment_brodator.php +++ b/htdocs/core/modules/supplier_payment/mod_supplier_payment_brodator.php @@ -81,6 +81,7 @@ class mod_supplier_payment_brodator extends ModeleNumRefSupplierPayments $tooltip .= $langs->trans("GenericMaskCodes3"); $tooltip .= $langs->trans("GenericMaskCodes4a", $langs->transnoentities("Order"), $langs->transnoentities("Order")); $tooltip .= $langs->trans("GenericMaskCodes5"); + $tooltip .= $langs->trans("GenericMaskCodes5b"); // Parametrage du prefix $texte .= ''.$langs->trans("Mask").':'; diff --git a/htdocs/core/modules/supplier_proposal/mod_supplier_proposal_saphir.php b/htdocs/core/modules/supplier_proposal/mod_supplier_proposal_saphir.php index 60b5ec2686c..2c0bba621e8 100644 --- a/htdocs/core/modules/supplier_proposal/mod_supplier_proposal_saphir.php +++ b/htdocs/core/modules/supplier_proposal/mod_supplier_proposal_saphir.php @@ -83,6 +83,7 @@ class mod_supplier_proposal_saphir extends ModeleNumRefSupplierProposal $tooltip .= $langs->trans("GenericMaskCodes3"); $tooltip .= $langs->trans("GenericMaskCodes4a", $langs->transnoentities("CommRequest"), $langs->transnoentities("CommRequest")); $tooltip .= $langs->trans("GenericMaskCodes5"); + $tooltip .= $langs->trans("GenericMaskCodes5b"); $mask = getDolGlobalString('SUPPLIER_PROPOSAL_SAPHIR_MASK'); diff --git a/htdocs/core/modules/takepos/mod_takepos_ref_universal.php b/htdocs/core/modules/takepos/mod_takepos_ref_universal.php index 8eb7c341643..df4c7662c6b 100644 --- a/htdocs/core/modules/takepos/mod_takepos_ref_universal.php +++ b/htdocs/core/modules/takepos/mod_takepos_ref_universal.php @@ -78,6 +78,7 @@ class mod_takepos_ref_universal extends ModeleNumRefTakepos $tooltip .= $langs->trans('GenericMaskCodes3'); $tooltip .= $langs->trans('GenericMaskCodes4a', $langs->transnoentities('CashDesk'), $langs->transnoentities('CashDesk')); $tooltip .= $langs->trans('GenericMaskCodes5'); + //$tooltip .= $langs->trans("GenericMaskCodes5b"); $tooltip .= $langs->trans('CashDeskGenericMaskCodes6'); // Setting up the prefix diff --git a/htdocs/core/modules/ticket/mod_ticket_universal.php b/htdocs/core/modules/ticket/mod_ticket_universal.php index 59f37537851..5e5c3e1a0af 100644 --- a/htdocs/core/modules/ticket/mod_ticket_universal.php +++ b/htdocs/core/modules/ticket/mod_ticket_universal.php @@ -79,6 +79,7 @@ class mod_ticket_universal extends ModeleNumRefTicket $tooltip .= $langs->trans("GenericMaskCodes3"); $tooltip .= $langs->trans("GenericMaskCodes4a", $langs->transnoentities("Ticket"), $langs->transnoentities("Ticket")); $tooltip .= $langs->trans("GenericMaskCodes5"); + //$tooltip .= $langs->trans("GenericMaskCodes5b"); // Prefix settings $texte .= ''.$langs->trans("Mask").':'; diff --git a/htdocs/core/modules/workstation/mod_workstation_advanced.php b/htdocs/core/modules/workstation/mod_workstation_advanced.php index 032083ba641..11c4feb6397 100644 --- a/htdocs/core/modules/workstation/mod_workstation_advanced.php +++ b/htdocs/core/modules/workstation/mod_workstation_advanced.php @@ -78,6 +78,7 @@ class mod_workstation_advanced extends ModeleNumRefWorkstation $tooltip .= $langs->trans("GenericMaskCodes3"); $tooltip .= $langs->trans("GenericMaskCodes4a", $langs->transnoentities("Workstation"), $langs->transnoentities("Workstation")); $tooltip .= $langs->trans("GenericMaskCodes5"); + //$tooltip .= $langs->trans("GenericMaskCodes5b"); // Parametrage du prefix $texte .= ''.$langs->trans("Mask").':'; diff --git a/htdocs/knowledgemanagement/core/modules/knowledgemanagement/mod_knowledgerecord_advanced.php b/htdocs/knowledgemanagement/core/modules/knowledgemanagement/mod_knowledgerecord_advanced.php index 0c1b043f006..1df8f57397b 100644 --- a/htdocs/knowledgemanagement/core/modules/knowledgemanagement/mod_knowledgerecord_advanced.php +++ b/htdocs/knowledgemanagement/core/modules/knowledgemanagement/mod_knowledgerecord_advanced.php @@ -76,6 +76,7 @@ class mod_knowledgerecord_advanced extends ModeleNumRefKnowledgeRecord $tooltip .= $langs->trans("GenericMaskCodes3"); $tooltip .= $langs->trans("GenericMaskCodes4a", $langs->transnoentities("KnowledgeRecord"), $langs->transnoentities("KnowledgeRecord")); $tooltip .= $langs->trans("GenericMaskCodes5"); + $tooltip .= $langs->trans("GenericMaskCodes5b"); // Parametrage du prefix $texte .= ''.$langs->trans("Mask").':'; diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index c35990420e4..cff78b4f4a4 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -365,12 +365,14 @@ UpdateServerOffline=Update server offline WithCounter=Manage a counter GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags can be used:
{000000} corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask.
{000000+000} same as the previous one but an offset corresponding to the number to the right of the + sign is applied starting on the first %s.
{000000@x} same as the previous one but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then the sequence {yy}{mm} or {yyyy}{mm} is also required.
{dd} day (01 to 31).
{mm} month (01 to 12).
{yy}, {yyyy} or {y} year over 2, 4 or 1 numbers.
GenericMaskCodes2={cccc} the client code on n characters
{cccc000} the client code on n characters is followed by a counter dedicated to the customer. This counter dedicated to customer is reset at same time as the global counter.
{tttt} The code of third party type on n characters (see menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.
+GenericMaskCodes2b={uuuu} the n first characters of the lastname of the user that creates the object (n is number of "u"). GenericMaskCodes3=All other characters in the mask will remain intact.
Spaces are not allowed.
GenericMaskCodes3EAN=All other characters in the mask will remain intact (except * or ? in 13th position in EAN13).
Spaces are not allowed.
In EAN13, the last character after the last } in 13th position should be * or ? . It will be replaced by the calculated key.
GenericMaskCodes4a=Example on the 99th %s of the third party TheCompany, with date 2023-01-31:
GenericMaskCodes4b=Example on third party created on 2023-01-31:
GenericMaskCodes4c=Example on product created on 2023-01-31:
-GenericMaskCodes5=ABC{yy}{mm}-{000000} will give ABC2301-000099
{0000+100@1}-ZZZ/{dd}/XXX will give 0199-ZZZ/31/XXX
IN{yy}{mm}-{0000}-{t} will give IN2301-0099-A if the type of company is 'Responsable Inscripto' with code for type that is 'A_RI' +GenericMaskCodes5=ABC{yy}{mm}-{000000} will give ABC2301-000099
{0000+100@1}-ZZZ/{dd}/XXX will give 0199-ZZZ/31/XXX
+GenericMaskCodes5b=IN{yy}{mm}-{0000}-{t} will give IN2301-0099-A if the type of company is 'Responsable Inscripto' with code for type that is 'A_RI' GenericNumRefModelDesc=Returns a customizable number according to a defined mask. ServerAvailableOnIPOrPort=Server is available at address %s on port %s ServerNotAvailableOnIPOrPort=Server is not available at address %s on port %s diff --git a/htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_advanced.php b/htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_advanced.php index 208b4c4a054..026d2f7bad6 100644 --- a/htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_advanced.php +++ b/htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_advanced.php @@ -77,6 +77,7 @@ class mod_myobject_advanced extends ModeleNumRefMyObject $tooltip .= $langs->trans("GenericMaskCodes3"); $tooltip .= $langs->trans("GenericMaskCodes4a", $langs->transnoentities("MyObject"), $langs->transnoentities("MyObject")); $tooltip .= $langs->trans("GenericMaskCodes5"); + $tooltip .= $langs->trans("GenericMaskCodes5b"); // Parametrage du prefix $text .= ''.$langs->trans("Mask").':'; diff --git a/htdocs/partnership/core/modules/partnership/mod_partnership_advanced.php b/htdocs/partnership/core/modules/partnership/mod_partnership_advanced.php index 75596eba9ea..64922513504 100644 --- a/htdocs/partnership/core/modules/partnership/mod_partnership_advanced.php +++ b/htdocs/partnership/core/modules/partnership/mod_partnership_advanced.php @@ -77,6 +77,7 @@ class mod_partnership_advanced extends ModeleNumRefPartnership $tooltip .= $langs->trans("GenericMaskCodes3"); $tooltip .= $langs->trans("GenericMaskCodes4a", $langs->transnoentities("Partnership"), $langs->transnoentities("Partnership")); $tooltip .= $langs->trans("GenericMaskCodes5"); + $tooltip .= $langs->trans("GenericMaskCodes5b"); // Parametrage du prefix $text .= ''.$langs->trans("Mask").':'; diff --git a/htdocs/product/card.php b/htdocs/product/card.php index 14bdea78905..47594425da2 100644 --- a/htdocs/product/card.php +++ b/htdocs/product/card.php @@ -1416,6 +1416,8 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio $tooltip .= '
'.$langs->trans("GenericMaskCodes3"); $tooltip .= '
'.$langs->trans("GenericMaskCodes4a", $langs->transnoentities("Batch"), $langs->transnoentities("Batch")); $tooltip .= '
'.$langs->trans("GenericMaskCodes5"); + //$tooltip .= '
'.$langs->trans("GenericMaskCodes5b"); + if ((getDolGlobalString('PRODUCTBATCH_LOT_ADDON') == 'mod_lot_advanced') || (getDolGlobalString('PRODUCTBATCH_SN_ADDON') == 'mod_sn_advanced')) { print ''.$langs->trans("ManageLotMask").''; @@ -2018,6 +2020,8 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio $tooltip .= '
'.$langs->trans("GenericMaskCodes3"); $tooltip .= '
'.$langs->trans("GenericMaskCodes4a", $langs->transnoentities("Batch"), $langs->transnoentities("Batch")); $tooltip .= '
'.$langs->trans("GenericMaskCodes5"); + //$tooltip .= '
'.$langs->trans("GenericMaskCodes5b"); + print ''.$langs->trans("ManageLotMask").''; $mask = ''; if ($object->status_batch == '1' && getDolGlobalString('PRODUCTBATCH_LOT_USE_PRODUCT_MASKS') && getDolGlobalString('PRODUCTBATCH_LOT_ADDON') == 'mod_lot_advanced') { diff --git a/htdocs/recruitment/core/modules/recruitment/mod_recruitmentcandidature_advanced.php b/htdocs/recruitment/core/modules/recruitment/mod_recruitmentcandidature_advanced.php index c1258703e6c..fdc928a2a0f 100644 --- a/htdocs/recruitment/core/modules/recruitment/mod_recruitmentcandidature_advanced.php +++ b/htdocs/recruitment/core/modules/recruitment/mod_recruitmentcandidature_advanced.php @@ -77,6 +77,7 @@ class mod_recruitmentcandidature_advanced extends ModeleNumRefRecruitmentCandida $tooltip .= $langs->trans("GenericMaskCodes3"); $tooltip .= $langs->trans("GenericMaskCodes4a", $langs->transnoentities("RecruitmentCandidature"), $langs->transnoentities("RecruitmentCandidature")); $tooltip .= $langs->trans("GenericMaskCodes5"); + //$tooltip .= $langs->trans("GenericMaskCodes5b"); // Parametrage du prefix $texte .= ''.$langs->trans("Mask").':'; diff --git a/htdocs/recruitment/core/modules/recruitment/mod_recruitmentjobposition_advanced.php b/htdocs/recruitment/core/modules/recruitment/mod_recruitmentjobposition_advanced.php index 868b4b284e0..eb5d5454365 100644 --- a/htdocs/recruitment/core/modules/recruitment/mod_recruitmentjobposition_advanced.php +++ b/htdocs/recruitment/core/modules/recruitment/mod_recruitmentjobposition_advanced.php @@ -77,6 +77,7 @@ class mod_recruitmentjobposition_advanced extends ModeleNumRefRecruitmentJobPosi $tooltip .= $langs->trans("GenericMaskCodes3"); $tooltip .= $langs->trans("GenericMaskCodes4a", $langs->transnoentities("RecruitmentJobPosition"), $langs->transnoentities("RecruitmentJobPosition")); $tooltip .= $langs->trans("GenericMaskCodes5"); + //$tooltip .= $langs->trans("GenericMaskCodes5b"); // Parametrage du prefix $texte .= ''.$langs->trans("Mask").':';