From 06690431f2fde4e0f52b20a35bcc477c33fe8b5c Mon Sep 17 00:00:00 2001 From: BENKE Charles Date: Fri, 6 Jun 2014 12:26:05 +0200 Subject: [PATCH 1/5] Update commande.class.php research additionnal models numbering in additional modules folders --- htdocs/commande/class/commande.class.php | 27 +++++++++++++----------- 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php index e2b0f5506fb..97ee6714ef0 100644 --- a/htdocs/commande/class/commande.class.php +++ b/htdocs/commande/class/commande.class.php @@ -131,18 +131,21 @@ class Commande extends CommonOrder if (! empty($conf->global->COMMANDE_ADDON)) { - $mybool=false; - - $file = $conf->global->COMMANDE_ADDON.".php"; - $classname = $conf->global->COMMANDE_ADDON; - - // Include file with class - foreach ($conf->file->dol_document_root as $dirroot) - { - $dir = $dirroot."/core/modules/commande/"; - // Load file with numbering class (if found) - $mybool|=@include_once $dir.$file; - } + $mybool=false; + $dirmodels=array_merge(array('/'),(array) $conf->modules_parts['models']); + foreach ($dirmodels as $reldir) + { + $file = $conf->global->COMMANDE_ADDON.".php"; + $classname = $conf->global->COMMANDE_ADDON; + + // Include file with class + foreach ($conf->file->dol_document_root as $dirroot) + { + $dir = $dirroot.$reldir."/core/modules/commande/"; + // Load file with numbering class (if found) + $mybool|=@include_once $dir.$file; + } + } if (! $mybool) { From d0bab2f7e22c970cf097709b7382f0799dc2d115 Mon Sep 17 00:00:00 2001 From: BENKE Charles Date: Fri, 6 Jun 2014 12:29:20 +0200 Subject: [PATCH 2/5] Update propal.class.php research additionnal models numbering in additional modules folders --- htdocs/comm/propal/class/propal.class.php | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php index 070f0232215..1b8cac86320 100644 --- a/htdocs/comm/propal/class/propal.class.php +++ b/htdocs/comm/propal/class/propal.class.php @@ -2535,16 +2535,21 @@ class Propal extends CommonObject { $mybool=false; - $file = $conf->global->PROPALE_ADDON.".php"; - $classname = $conf->global->PROPALE_ADDON; + $dirmodels=array_merge(array('/'),(array) $conf->modules_parts['models']); + foreach ($dirmodels as $reldir) + { + $file = $conf->global->PROPALE_ADDON.".php"; + $classname = $conf->global->PROPALE_ADDON; + + // Include file with class + foreach ($conf->file->dol_document_root as $dirroot) + { + $dir = $dirroot.$reldir."/core/modules/propale/"; + // Load file with numbering class (if found) + $mybool|=@include_once $dir.$file; + } + } - // Include file with class - foreach ($conf->file->dol_document_root as $dirroot) - { - $dir = $dirroot."/core/modules/propale/"; - // Load file with numbering class (if found) - $mybool|=@include_once $dir.$file; - } if (! $mybool) { From 37c908aa9960fa404391d76e2e1626408d2adb07 Mon Sep 17 00:00:00 2001 From: BENKE Charles Date: Fri, 6 Jun 2014 15:29:45 +0200 Subject: [PATCH 3/5] Update modules_propale.php don't display specific number of version --- htdocs/core/modules/propale/modules_propale.php | 1 + 1 file changed, 1 insertion(+) diff --git a/htdocs/core/modules/propale/modules_propale.php b/htdocs/core/modules/propale/modules_propale.php index 289862c8523..ed2673a1e70 100644 --- a/htdocs/core/modules/propale/modules_propale.php +++ b/htdocs/core/modules/propale/modules_propale.php @@ -138,6 +138,7 @@ abstract class ModeleNumRefPropales if ($this->version == 'development') return $langs->trans("VersionDevelopment"); if ($this->version == 'experimental') return $langs->trans("VersionExperimental"); if ($this->version == 'dolibarr') return DOL_VERSION; + if ($this->version) return $this->version; return $langs->trans("NotAvailable"); } } From f806b4373a11b287372f011970a682fca57bde3a Mon Sep 17 00:00:00 2001 From: BENKE Charles Date: Fri, 6 Jun 2014 15:30:33 +0200 Subject: [PATCH 4/5] Update modules_commande.php don't display specific version --- htdocs/core/modules/commande/modules_commande.php | 1 + 1 file changed, 1 insertion(+) diff --git a/htdocs/core/modules/commande/modules_commande.php b/htdocs/core/modules/commande/modules_commande.php index 1146b1cc181..9116205d287 100644 --- a/htdocs/core/modules/commande/modules_commande.php +++ b/htdocs/core/modules/commande/modules_commande.php @@ -142,6 +142,7 @@ abstract class ModeleNumRefCommandes if ($this->version == 'development') return $langs->trans("VersionDevelopment"); if ($this->version == 'experimental') return $langs->trans("VersionExperimental"); if ($this->version == 'dolibarr') return DOL_VERSION; + if ($this->version) return $this->version; return $langs->trans("NotAvailable"); } } From fa75ef3b57d23a7709f22dcf55c142d81e9df412 Mon Sep 17 00:00:00 2001 From: BENKE Charles Date: Sat, 21 Jun 2014 00:35:11 +0200 Subject: [PATCH 5/5] made change on all the modules_element definition --- htdocs/core/modules/barcode/modules_barcode.class.php | 1 + htdocs/core/modules/contract/modules_contract.php | 1 + htdocs/core/modules/dons/modules_don.php | 1 + htdocs/core/modules/expedition/modules_expedition.php | 1 + htdocs/core/modules/facture/modules_facture.php | 1 + htdocs/core/modules/fichinter/modules_fichinter.php | 1 + htdocs/core/modules/livraison/modules_livraison.php | 1 + htdocs/core/modules/product/modules_product.class.php | 1 + htdocs/core/modules/project/modules_project.php | 1 + htdocs/core/modules/societe/modules_societe.class.php | 2 ++ .../modules/supplier_invoice/modules_facturefournisseur.php | 1 + .../core/modules/supplier_order/modules_commandefournisseur.php | 1 + 12 files changed, 13 insertions(+) diff --git a/htdocs/core/modules/barcode/modules_barcode.class.php b/htdocs/core/modules/barcode/modules_barcode.class.php index 5305ad53cd2..0f87306354a 100644 --- a/htdocs/core/modules/barcode/modules_barcode.class.php +++ b/htdocs/core/modules/barcode/modules_barcode.class.php @@ -109,6 +109,7 @@ abstract class ModeleNumRefBarCode if ($this->version == 'development') return $langs->trans("VersionDevelopment"); if ($this->version == 'experimental') return $langs->trans("VersionExperimental"); if ($this->version == 'dolibarr') return DOL_VERSION; + if ($this->version) return $this->version; return $langs->trans("NotAvailable"); } diff --git a/htdocs/core/modules/contract/modules_contract.php b/htdocs/core/modules/contract/modules_contract.php index 9c54ed4a460..27a77733553 100644 --- a/htdocs/core/modules/contract/modules_contract.php +++ b/htdocs/core/modules/contract/modules_contract.php @@ -138,6 +138,7 @@ class ModelNumRefContracts if ($this->version == 'development') return $langs->trans("VersionDevelopment"); if ($this->version == 'experimental') return $langs->trans("VersionExperimental"); if ($this->version == 'dolibarr') return DOL_VERSION; + if ($this->version) return $this->version; return $langs->trans("NotAvailable"); } } diff --git a/htdocs/core/modules/dons/modules_don.php b/htdocs/core/modules/dons/modules_don.php index c06494fc501..d676d2c6f70 100644 --- a/htdocs/core/modules/dons/modules_don.php +++ b/htdocs/core/modules/dons/modules_don.php @@ -134,6 +134,7 @@ abstract class ModeleNumRefDons if ($this->version == 'development') return $langs->trans("VersionDevelopment"); if ($this->version == 'experimental') return $langs->trans("VersionExperimental"); if ($this->version == 'dolibarr') return DOL_VERSION; + if ($this->version) return $this->version; return $langs->trans("NotAvailable"); } } diff --git a/htdocs/core/modules/expedition/modules_expedition.php b/htdocs/core/modules/expedition/modules_expedition.php index ceddd5064e1..a88ac3ff023 100644 --- a/htdocs/core/modules/expedition/modules_expedition.php +++ b/htdocs/core/modules/expedition/modules_expedition.php @@ -136,6 +136,7 @@ abstract class ModelNumRefExpedition if ($this->version == 'development') return $langs->trans("VersionDevelopment"); if ($this->version == 'experimental') return $langs->trans("VersionExperimental"); if ($this->version == 'dolibarr') return DOL_VERSION; + if ($this->version) return $this->version; return $langs->trans("NotAvailable"); } } diff --git a/htdocs/core/modules/facture/modules_facture.php b/htdocs/core/modules/facture/modules_facture.php index 3253ed00ef9..2077e7255dd 100644 --- a/htdocs/core/modules/facture/modules_facture.php +++ b/htdocs/core/modules/facture/modules_facture.php @@ -137,6 +137,7 @@ abstract class ModeleNumRefFactures if ($this->version == 'development') return $langs->trans("VersionDevelopment"); if ($this->version == 'experimental') return $langs->trans("VersionExperimental"); if ($this->version == 'dolibarr') return DOL_VERSION; + if ($this->version) return $this->version; return $langs->trans("NotAvailable"); } } diff --git a/htdocs/core/modules/fichinter/modules_fichinter.php b/htdocs/core/modules/fichinter/modules_fichinter.php index 51084d7b313..61f73eff366 100644 --- a/htdocs/core/modules/fichinter/modules_fichinter.php +++ b/htdocs/core/modules/fichinter/modules_fichinter.php @@ -136,6 +136,7 @@ abstract class ModeleNumRefFicheinter if ($this->version == 'development') return $langs->trans("VersionDevelopment"); if ($this->version == 'experimental') return $langs->trans("VersionExperimental"); if ($this->version == 'dolibarr') return DOL_VERSION; + if ($this->version) return $this->version; return $langs->trans("NotAvailable"); } } diff --git a/htdocs/core/modules/livraison/modules_livraison.php b/htdocs/core/modules/livraison/modules_livraison.php index 89b226ec066..4d6f888e9a5 100644 --- a/htdocs/core/modules/livraison/modules_livraison.php +++ b/htdocs/core/modules/livraison/modules_livraison.php @@ -139,6 +139,7 @@ abstract class ModeleNumRefDeliveryOrder if ($this->version == 'development') return $langs->trans("VersionDevelopment"); if ($this->version == 'experimental') return $langs->trans("VersionExperimental"); if ($this->version == 'dolibarr') return DOL_VERSION; + if ($this->version) return $this->version; return $langs->trans("NotAvailable"); } } diff --git a/htdocs/core/modules/product/modules_product.class.php b/htdocs/core/modules/product/modules_product.class.php index e708b89b82a..66affcf256a 100644 --- a/htdocs/core/modules/product/modules_product.class.php +++ b/htdocs/core/modules/product/modules_product.class.php @@ -97,6 +97,7 @@ abstract class ModeleProductCode if ($this->version == 'development') return $langs->trans("VersionDevelopment"); if ($this->version == 'experimental') return $langs->trans("VersionExperimental"); if ($this->version == 'dolibarr') return DOL_VERSION; + if ($this->version) return $this->version; return $langs->trans("NotAvailable"); } diff --git a/htdocs/core/modules/project/modules_project.php b/htdocs/core/modules/project/modules_project.php index 2595485eac1..22273be31dd 100644 --- a/htdocs/core/modules/project/modules_project.php +++ b/htdocs/core/modules/project/modules_project.php @@ -134,6 +134,7 @@ abstract class ModeleNumRefProjects if ($this->version == 'development') return $langs->trans("VersionDevelopment"); if ($this->version == 'experimental') return $langs->trans("VersionExperimental"); if ($this->version == 'dolibarr') return DOL_VERSION; + if ($this->version) return $this->version; return $langs->trans("NotAvailable"); } } diff --git a/htdocs/core/modules/societe/modules_societe.class.php b/htdocs/core/modules/societe/modules_societe.class.php index 3bff1f41985..0a7245fc629 100644 --- a/htdocs/core/modules/societe/modules_societe.class.php +++ b/htdocs/core/modules/societe/modules_societe.class.php @@ -134,6 +134,7 @@ abstract class ModeleThirdPartyCode if ($this->version == 'development') return $langs->trans("VersionDevelopment"); if ($this->version == 'experimental') return $langs->trans("VersionExperimental"); if ($this->version == 'dolibarr') return DOL_VERSION; + if ($this->version) return $this->version; return $langs->trans("NotAvailable"); } @@ -303,6 +304,7 @@ abstract class ModeleAccountancyCode if ($this->version == 'development') return $langs->trans("VersionDevelopment"); if ($this->version == 'experimental') return $langs->trans("VersionExperimental"); if ($this->version == 'dolibarr') return DOL_VERSION; + if ($this->version) return $this->version; return $langs->trans("NotAvailable"); } diff --git a/htdocs/core/modules/supplier_invoice/modules_facturefournisseur.php b/htdocs/core/modules/supplier_invoice/modules_facturefournisseur.php index fef936cb100..1a761bab636 100644 --- a/htdocs/core/modules/supplier_invoice/modules_facturefournisseur.php +++ b/htdocs/core/modules/supplier_invoice/modules_facturefournisseur.php @@ -127,6 +127,7 @@ abstract class ModeleNumRefSuppliersInvoices if ($this->version == 'development') return $langs->trans("VersionDevelopment"); if ($this->version == 'experimental') return $langs->trans("VersionExperimental"); if ($this->version == 'dolibarr') return DOL_VERSION; + if ($this->version) return $this->version; return $langs->trans("NotAvailable"); } } diff --git a/htdocs/core/modules/supplier_order/modules_commandefournisseur.php b/htdocs/core/modules/supplier_order/modules_commandefournisseur.php index f7e6b75adc2..a08eb7f7ce4 100644 --- a/htdocs/core/modules/supplier_order/modules_commandefournisseur.php +++ b/htdocs/core/modules/supplier_order/modules_commandefournisseur.php @@ -132,6 +132,7 @@ abstract class ModeleNumRefSuppliersOrders if ($this->version == 'development') return $langs->trans("VersionDevelopment"); if ($this->version == 'experimental') return $langs->trans("VersionExperimental"); if ($this->version == 'dolibarr') return DOL_VERSION; + if ($this->version) return $this->version; return $langs->trans("NotAvailable"); } }