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

Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source 
Conflicts:
	htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_standard.php
This commit is contained in:
Laurent Destailleur 2020-06-01 04:09:52 +02:00
commit c8d0476728
26 changed files with 128 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/core/modules/bom/mod_bom_standard.php
View File

@ -83,7 +83,7 @@ class mod_bom_standard extends ModeleNumRefboms
$coyymm = ''; $max = '';
$posindice = 8;
$posindice = strlen($this->prefix) + 6;
$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
$sql .= " FROM ".MAIN_DB_PREFIX."bom";
$sql .= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
@ -116,8 +116,8 @@ class mod_bom_standard extends ModeleNumRefboms
{
global $db, $conf;
// D'abord on recupere la valeur max
$posindice = 9;
// First we get the max value
$posindice = strlen($this->prefix) + 6;
$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
$sql .= " FROM ".MAIN_DB_PREFIX."bom_bom";
$sql .= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";

6
htdocs/core/modules/cheque/mod_chequereceipt_mint.php
View File

@ -80,7 +80,7 @@ class mod_chequereceipt_mint extends ModeleNumRefChequeReceipts
$payyymm = ''; $max = '';
$posindice = 9;
$posindice = strlen($this->prefix) + 6;
$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
$sql .= " FROM ".MAIN_DB_PREFIX."bordereau_cheque";
$sql .= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
@ -113,8 +113,8 @@ class mod_chequereceipt_mint extends ModeleNumRefChequeReceipts
{
global $db, $conf;
// D'abord on recupere la valeur max
$posindice = 9;
// First, we get the max value
$posindice = strlen($this->prefix) + 6;
$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
$sql .= " FROM ".MAIN_DB_PREFIX."bordereau_cheque";
$sql .= " WHERE ref like '".$db->escape($this->prefix)."____-%'";

6
htdocs/core/modules/commande/mod_commande_marbre.php
View File

@ -83,7 +83,7 @@ class mod_commande_marbre extends ModeleNumRefCommandes
$coyymm = ''; $max = '';
$posindice = 8;
$posindice = strlen($this->prefix) + 6;
$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
$sql .= " FROM ".MAIN_DB_PREFIX."commande";
$sql .= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
@ -116,8 +116,8 @@ class mod_commande_marbre extends ModeleNumRefCommandes
{
global $db, $conf;
// D'abord on recupere la valeur max
$posindice = 8;
// First, we get the max value
$posindice = strlen($this->prefix) + 6;
$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
$sql .= " FROM ".MAIN_DB_PREFIX."commande";
$sql .= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";

4
htdocs/core/modules/contract/mod_contract_serpis.php
View File

@ -93,7 +93,7 @@ class mod_contract_serpis extends ModelNumRefContracts
$coyymm = ''; $max = '';
$posindice = 8;
$posindice = strlen($this->prefix) + 6;
$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
$sql .= " FROM ".MAIN_DB_PREFIX."contrat";
$sql .= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
@ -126,7 +126,7 @@ class mod_contract_serpis extends ModelNumRefContracts
{
global $db, $conf;
$posindice = 8;
$posindice = strlen($this->prefix) + 6;
$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
$sql .= " FROM ".MAIN_DB_PREFIX."contrat";
$sql .= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";

4
htdocs/core/modules/expedition/mod_expedition_safor.php
View File

@ -88,7 +88,7 @@ class mod_expedition_safor extends ModelNumRefExpedition
$coyymm = ''; $max = '';
$posindice = 8;
$posindice = strlen($this->prefix) + 6;
$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
$sql .= " FROM ".MAIN_DB_PREFIX."expedition";
$sql .= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
@ -121,7 +121,7 @@ class mod_expedition_safor extends ModelNumRefExpedition
{
global $db, $conf;
$posindice = 8;
$posindice = strlen($this->prefix) + 6;
$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
$sql .= " FROM ".MAIN_DB_PREFIX."expedition";
$sql .= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";

4
htdocs/core/modules/expensereport/mod_expensereport_jade.php
View File

@ -89,7 +89,7 @@ class mod_expensereport_jade extends ModeleNumRefExpenseReport
$coyymm = ''; $max = '';
$posindice = 8;
$posindice = strlen($this->prefix) + 6;
$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
$sql .= " FROM ".MAIN_DB_PREFIX."expensereport";
$sql .= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
@ -174,7 +174,7 @@ class mod_expensereport_jade extends ModeleNumRefExpenseReport
}
// First we get the max value
$posindice = 8;
$posindice = strlen($this->prefix) + 6;
$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
$sql .= " FROM ".MAIN_DB_PREFIX."expensereport";
$sql .= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";

9
htdocs/core/modules/facture/mod_facture_mars.php
View File

@ -98,7 +98,7 @@ class mod_facture_mars extends ModeleNumRefFactures
// Check invoice num
$fayymm = ''; $max = '';
$posindice = 8;
$posindice = strlen($this->prefixinvoice) + 6;
$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED) as max"; // This is standard SQL
$sql .= " FROM ".MAIN_DB_PREFIX."facture";
$sql .= " WHERE ref LIKE '".$db->escape($this->prefixinvoice)."____-%'";
@ -120,7 +120,7 @@ class mod_facture_mars extends ModeleNumRefFactures
// Check credit note num
$fayymm = '';
$posindice = 8;
$posindice = strlen($this->prefixcreditnote) + 6;
$sql = "SELECT MAX(SUBSTRING(ref FROM ".$posindice.")) as max"; // This is standard SQL
$sql .= " FROM ".MAIN_DB_PREFIX."facture";
$sql .= " WHERE ref LIKE '".$db->escape($this->prefixcreditnote)."____-%'";
@ -152,15 +152,14 @@ class mod_facture_mars extends ModeleNumRefFactures
public function getNextValue($objsoc, $invoice, $mode = 'next')
{
global $db;
$prefix = $this->prefixinvoice;
$prefix = $this->prefixinvoice;
if ($invoice->type == 1) $prefix = $this->prefixreplacement;
elseif ($invoice->type == 2) $prefix = $this->prefixcreditnote;
elseif ($invoice->type == 3) $prefix = $this->prefixdeposit;
else $prefix = $this->prefixinvoice;
// First we get the max value
$posindice = 8;
$posindice = strlen($prefix) + 6;
$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max"; // This is standard SQL
$sql .= " FROM ".MAIN_DB_PREFIX."facture";
$sql .= " WHERE ref LIKE '".$prefix."____-%'";

11
htdocs/core/modules/facture/mod_facture_terre.php
View File

@ -108,7 +108,7 @@ class mod_facture_terre extends ModeleNumRefFactures
// Check invoice num
$fayymm = ''; $max = '';
$posindice = 8;
$posindice = strlen($this->prefixinvoice) + 6;
$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max"; // This is standard SQL
$sql .= " FROM ".MAIN_DB_PREFIX."facture";
$sql .= " WHERE ref LIKE '".$db->escape($this->prefixinvoice)."____-%'";
@ -130,7 +130,7 @@ class mod_facture_terre extends ModeleNumRefFactures
// Check credit note num
$fayymm = '';
$posindice = 8;
$posindice = strlen($this->prefixcreditnote) + 6;
$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max"; // This is standard SQL
$sql .= " FROM ".MAIN_DB_PREFIX."facture";
$sql .= " WHERE ref LIKE '".$db->escape($this->prefixcreditnote)."____-%'";
@ -151,7 +151,7 @@ class mod_facture_terre extends ModeleNumRefFactures
// Check deposit num
$fayymm = '';
$posindice = 8;
$posindice = strlen($this->prefixdeposit) + 6;
$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max"; // This is standard SQL
$sql .= " FROM ".MAIN_DB_PREFIX."facture";
$sql .= " WHERE ref LIKE '".$db->escape($this->prefixdeposit)."____-%'";
@ -186,11 +186,12 @@ class mod_facture_terre extends ModeleNumRefFactures
dol_syslog(get_class($this)."::getNextValue mode=".$mode, LOG_DEBUG);
$prefix = $this->prefixinvoice;
if ($invoice->type == 2) $prefix = $this->prefixcreditnote;
elseif ($invoice->type == 3) $prefix = $this->prefixdeposit;
else $prefix = $this->prefixinvoice;
// First we get the max value
$posindice = 8;
$posindice = strlen($prefix) + 6;
$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max"; // This is standard SQL
$sql .= " FROM ".MAIN_DB_PREFIX."facture";
$sql .= " WHERE ref LIKE '".$prefix."____-%'";

6
htdocs/core/modules/fichinter/mod_pacific.php
View File

@ -91,7 +91,7 @@ class mod_pacific extends ModeleNumRefFicheinter
$fayymm = ''; $max = '';
$posindice = 8;
$posindice = strlen($this->prefix) + 6;
$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
$sql .= " FROM ".MAIN_DB_PREFIX."fichinter";
$sql .= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
@ -124,8 +124,8 @@ class mod_pacific extends ModeleNumRefFicheinter
{
global $db, $conf;
// D'abord on recupere la valeur max
$posindice = 8;
// First, we get the max value
$posindice = strlen($this->prefix) + 6;
$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
$sql .= " FROM ".MAIN_DB_PREFIX."fichinter";
$sql .= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";

4
htdocs/core/modules/holiday/mod_holiday_madonna.php
View File

@ -94,7 +94,7 @@ class mod_holiday_madonna extends ModelNumRefHolidays
$coyymm = ''; $max = '';
$posindice = 8;
$posindice = strlen($this->prefix) + 6;
$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
$sql .= " FROM ".MAIN_DB_PREFIX."holiday";
$sql .= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
@ -127,7 +127,7 @@ class mod_holiday_madonna extends ModelNumRefHolidays
{
global $db, $conf;
$posindice = 8;
$posindice = strlen($this->prefix) + 6;
$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
$sql .= " FROM ".MAIN_DB_PREFIX."holiday";
$sql .= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";

6
htdocs/core/modules/livraison/mod_livraison_jade.php
View File

@ -96,7 +96,7 @@ class mod_livraison_jade extends ModeleNumRefDeliveryOrder
// Check invoice num
$fayymm = ''; $max = '';
$posindice = 8;
$posindice = strlen($this->prefix) + 6;
$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max"; // This is standard SQL
$sql .= " FROM ".MAIN_DB_PREFIX."livraison";
$sql .= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
@ -129,8 +129,8 @@ class mod_livraison_jade extends ModeleNumRefDeliveryOrder
{
global $db, $conf;
// D'abord on recupere la valeur max
$posindice = 8;
// First, we get the max value
$posindice = strlen($this->prefix) + 6;
$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max"; // This is standard SQL
$sql .= " FROM ".MAIN_DB_PREFIX."livraison";
$sql .= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";

6
htdocs/core/modules/mrp/mod_mo_standard.php
View File

@ -83,7 +83,7 @@ class mod_mo_standard extends ModeleNumRefMos
$coyymm = ''; $max = '';
$posindice = 8;
$posindice = strlen($this->prefix) + 6;
$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
$sql .= " FROM ".MAIN_DB_PREFIX."mrp_mo";
$sql .= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
@ -116,8 +116,8 @@ class mod_mo_standard extends ModeleNumRefMos
{
global $db, $conf;
// D'abord on recupere la valeur max
$posindice = 9;
// First, we get the max value
$posindice = strlen($this->prefix) + 6;
$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
$sql .= " FROM ".MAIN_DB_PREFIX."mrp_mo";
$sql .= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";

6
htdocs/core/modules/payment/mod_payment_cicada.php
View File

@ -90,7 +90,7 @@ class mod_payment_cicada extends ModeleNumRefPayments
$payyymm = ''; $max = '';
$posindice = 9;
$posindice = strlen($this->prefix) + 6;
$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
$sql .= " FROM ".MAIN_DB_PREFIX."paiement";
$sql .= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
@ -123,8 +123,8 @@ class mod_payment_cicada extends ModeleNumRefPayments
{
global $db, $conf;
// D'abord on recupere la valeur max
$posindice = 9;
// First, we get the max value
$posindice = strlen($this->prefix) + 6;
$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
$sql .= " FROM ".MAIN_DB_PREFIX."paiement";
$sql .= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";

6
htdocs/core/modules/project/mod_project_simple.php
View File

@ -92,7 +92,7 @@ class mod_project_simple extends ModeleNumRefProjects
$coyymm = ''; $max = '';
$posindice = 8;
$posindice = strlen($this->prefix) + 6;
$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
$sql .= " FROM ".MAIN_DB_PREFIX."projet";
$sql .= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
@ -125,8 +125,8 @@ class mod_project_simple extends ModeleNumRefProjects
{
global $db, $conf;
// D'abord on recupere la valeur max
$posindice = 8;
// First, we get the max value
$posindice = strlen($this->prefix) + 6;
$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
$sql .= " FROM ".MAIN_DB_PREFIX."projet";
$sql .= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";

6
htdocs/core/modules/project/task/mod_task_simple.php
View File

@ -92,7 +92,7 @@ class mod_task_simple extends ModeleNumRefTask
$coyymm = ''; $max = '';
$posindice = 8;
$posindice = strlen($this->prefix) + 6;
$sql = "SELECT MAX(CAST(SUBSTRING(task.ref FROM ".$posindice.") AS SIGNED)) as max";
$sql .= " FROM ".MAIN_DB_PREFIX."projet_task AS task, ";
$sql .= MAIN_DB_PREFIX."projet AS project WHERE task.fk_projet=project.rowid";
@ -126,8 +126,8 @@ class mod_task_simple extends ModeleNumRefTask
{
global $db, $conf;
// D'abord on recupere la valeur max
$posindice = 8;
// First, we get the max value
$posindice = strlen($this->prefix) + 6;
$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
$sql .= " FROM ".MAIN_DB_PREFIX."projet_task";
$sql .= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";

6
htdocs/core/modules/propale/mod_propale_marbre.php
View File

@ -92,7 +92,7 @@ class mod_propale_marbre extends ModeleNumRefPropales
$pryymm = ''; $max = '';
$posindice = 8;
$posindice = strlen($this->prefix) + 6;
$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
$sql .= " FROM ".MAIN_DB_PREFIX."propal";
$sql .= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
@ -126,8 +126,8 @@ class mod_propale_marbre extends ModeleNumRefPropales
{
global $db, $conf;
// D'abord on recupere la valeur max
$posindice = 8;
// First, we get the max value
$posindice = strlen($this->prefix) + 6;
$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max"; // This is standard SQL
$sql .= " FROM ".MAIN_DB_PREFIX."propal";
$sql .= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";

4
htdocs/core/modules/reception/mod_reception_beryl.php
View File

@ -68,7 +68,7 @@ class mod_reception_beryl extends ModelNumRefReception
$coyymm = ''; $max = '';
$posindice = 8;
$posindice = strlen($this->prefix) + 6;
$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
$sql .= " FROM ".MAIN_DB_PREFIX."reception";
$sql .= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
@ -101,7 +101,7 @@ class mod_reception_beryl extends ModelNumRefReception
{
global $db, $conf;
$posindice = 9;
$posindice = strlen($this->prefix) + 6;
$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
$sql .= " FROM ".MAIN_DB_PREFIX."reception";
$sql .= " WHERE ref like '".$db->escape($this->prefix)."____-%'";

4
htdocs/core/modules/societe/mod_codeclient_monkey.php
View File

@ -129,8 +129,8 @@ class mod_codeclient_monkey extends ModeleThirdPartyCode
return -1;
}
// D'abord on recupere la valeur max (reponse immediate car champ indexe)
$posindice = 8;
// First, we get the max value (reponse immediate car champ indexe)
$posindice = strlen($prefix) + 6;
$sql = "SELECT MAX(CAST(SUBSTRING(".$field." FROM ".$posindice.") AS SIGNED)) as max"; // This is standard SQL
$sql .= " FROM ".MAIN_DB_PREFIX."societe";
$sql .= " WHERE ".$field." LIKE '".$prefix."____-%'";

14
htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_cactus.php
View File

@ -101,7 +101,7 @@ class mod_facture_fournisseur_cactus extends ModeleNumRefSuppliersInvoices
// Check invoice num
$siyymm = ''; $max = '';
$posindice = 8;
$posindice = strlen($this->prefixinvoice) + 6;
$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn";
$sql .= " WHERE ref LIKE '".$db->escape($this->prefixinvoice)."____-%'";
@ -122,7 +122,7 @@ class mod_facture_fournisseur_cactus extends ModeleNumRefSuppliersInvoices
// Check credit note num
$siyymm = '';
$posindice = 8;
$posindice = strlen($this->prefixcreditnote) + 6;
$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max"; // This is standard SQL
$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn";
$sql .= " WHERE ref LIKE '".$db->escape($this->prefixcreditnote)."____-%'";
@ -143,7 +143,7 @@ class mod_facture_fournisseur_cactus extends ModeleNumRefSuppliersInvoices
// Check deposit num
$siyymm = '';
$posindice = 8;
$posindice = strlen($this->prefixdeposit) + 6;
$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max"; // This is standard SQL
$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn";
$sql .= " WHERE ref LIKE '".$db->escape($this->prefixdeposit)."____-%'";
@ -174,12 +174,12 @@ class mod_facture_fournisseur_cactus extends ModeleNumRefSuppliersInvoices
{
global $db, $conf;
$prefix = $this->prefixinvoice;
if ($object->type == 2) $prefix = $this->prefixcreditnote;
elseif ($facture->type == 3) $prefix = $this->prefixdeposit;
else $prefix = $this->prefixinvoice;
elseif ($object->type == 3) $prefix = $this->prefixdeposit;
// D'abord on recupere la valeur max
$posindice = 8;
// First, we get the max value
$posindice = strlen($prefix) + 6;
$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max"; // This is standard SQL
$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn";
$sql .= " WHERE ref LIKE '".$prefix."____-%'";

6
htdocs/core/modules/supplier_order/mod_commande_fournisseur_muguet.php
View File

@ -102,7 +102,7 @@ class mod_commande_fournisseur_muguet extends ModeleNumRefSuppliersOrders
$coyymm = ''; $max = '';
$posindice = 8;
$posindice = strlen($this->prefix) + 6;
$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
$sql .= " FROM ".MAIN_DB_PREFIX."commande_fournisseur";
$sql .= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
@ -134,8 +134,8 @@ class mod_commande_fournisseur_muguet extends ModeleNumRefSuppliersOrders
{
global $db, $conf;
// D'abord on recupere la valeur max
$posindice = 8;
// First, we get the max value
$posindice = strlen($this->prefix) + 6;
$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
$sql .= " FROM ".MAIN_DB_PREFIX."commande_fournisseur";
$sql .= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";

6
htdocs/core/modules/supplier_payment/mod_supplier_payment_bronan.php
View File

@ -90,7 +90,7 @@ class mod_supplier_payment_bronan extends ModeleNumRefSupplierPayments
$payyymm = ''; $max = '';
$posindice = 9;
$posindice = strlen($this->prefix) + 6;
$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
$sql .= " FROM ".MAIN_DB_PREFIX."paiementfourn";
$sql .= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
@ -123,8 +123,8 @@ class mod_supplier_payment_bronan extends ModeleNumRefSupplierPayments
{
global $db, $conf;
// D'abord on recupere la valeur max
$posindice = 10;
// First, we get the max value
$posindice = strlen($this->prefix) + 6;
$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
$sql .= " FROM ".MAIN_DB_PREFIX."paiementfourn";
$sql .= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";

6
htdocs/core/modules/supplier_proposal/mod_supplier_proposal_marbre.php
View File

@ -92,7 +92,7 @@ class mod_supplier_proposal_marbre extends ModeleNumRefSupplierProposal
$pryymm = ''; $max = '';
$posindice = 8;
$posindice = strlen($this->prefix) + 6;
$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
$sql .= " FROM ".MAIN_DB_PREFIX."supplier_proposal";
$sql .= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
@ -126,8 +126,8 @@ class mod_supplier_proposal_marbre extends ModeleNumRefSupplierProposal
{
global $db, $conf;
// D'abord on recupere la valeur max
$posindice = 8;
// First, we get the max value
$posindice = strlen($this->prefix) + 6;
$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max"; // This is standard SQL
$sql .= " FROM ".MAIN_DB_PREFIX."supplier_proposal";
$sql .= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";

10
htdocs/core/modules/takepos/mod_takepos_ref_simple.php
View File

@ -41,7 +41,7 @@ class mod_takepos_ref_simple extends ModeleNumRefTakepos
* Prefix
* @var string
*/
public $prefix = 'TK';
public $prefix = 'TC';
/**
* @var string Error code (or message)
@ -89,7 +89,11 @@ class mod_takepos_ref_simple extends ModeleNumRefTakepos
$pryymm = '';
$max = '';
$posindice = 8;
$pos_source = 0;
// First, we get the max value
$posindice = strlen($this->prefix.$pos_source.'-____-') + 1;
$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
$sql .= " FROM ".MAIN_DB_PREFIX."facture";
$sql .= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
@ -127,7 +131,7 @@ class mod_takepos_ref_simple extends ModeleNumRefTakepos
$pos_source = is_object($invoice) && $invoice->pos_source > 0 ? $invoice->pos_source : 0;
// D'abord on recupere la valeur max
// First, we get the max value
$posindice = strlen($this->prefix.$pos_source.'-____-') + 1;
$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max"; // This is standard SQL
$sql .= " FROM ".MAIN_DB_PREFIX."facture";

6
htdocs/core/modules/ticket/mod_ticket_simple.php
View File

@ -89,7 +89,7 @@ class mod_ticket_simple extends ModeleNumRefTicket
$coyymm = '';
$max = '';
$posindice = 8;
$posindice = strlen($this->prefix) + 6;
$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
$sql .= " FROM ".MAIN_DB_PREFIX."ticket";
$search = $this->prefix."____-%";
@ -123,8 +123,8 @@ class mod_ticket_simple extends ModeleNumRefTicket
{
global $db, $conf;
// D'abord on recupere la valeur max
$posindice = 8;
// First, we get the max value
$posindice = strlen($this->prefix) + 6;
$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
$sql .= " FROM ".MAIN_DB_PREFIX."ticket";
$search = $this->prefix."____-%";

17
htdocs/modulebuilder/template/admin/setup.php
View File

@ -61,6 +61,7 @@ $arrayofparameters = array(
);
$error = 0;
$setupnotempty = 0;
/*
@ -168,8 +169,8 @@ elseif ($action == 'setdoc')
// TODO Check if numbering module chosen can be activated
// by calling method canBeActivated
$tmpobjectkey = GETPOST('object');
dolibarr_set_const($db, strtoupper($tmpobjectkey)."_ADDON", $value, 'chaine', 0, '', $conf->entity);
$constforval = 'MYMODULE_'.strtoupper($tmpobjectkey)."_ADDON";
dolibarr_set_const($db, $constforval, $value, 'chaine', 0, '', $conf->entity);
}
@ -230,6 +231,8 @@ if ($action == 'edit')
foreach ($arrayofparameters as $key => $val)
{
$setupnotempty++;
print '<tr class="oddeven"><td>';
$tooltiphelp = (($langs->trans($key.'Tooltip') != $key.'Tooltip') ? $langs->trans($key.'Tooltip') : '');
print $form->textwithpicto($langs->trans($key), $tooltiphelp);
@ -252,12 +255,12 @@ $myTmpObjects = array();
$myTmpObjects['MyObject']=array('includerefgeneration'=>0, 'includedocgeneration'=>0);
foreach($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
if ($myTmpObjectArray['includerefgeneration']) {
/*
* Orders Numbering model
*/
$setupnotempty++;
print load_fiche_titre($langs->trans("NumberingModules", $myTmpObjectKey), '', '');
@ -317,7 +320,7 @@ foreach($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
{
print img_picto($langs->trans("Activated"), 'switch_on');
} else {
print '<a href="'.$_SERVER["PHP_SELF"].'?action=setmod&amp;value='.$file.'">';
print '<a href="'.$_SERVER["PHP_SELF"].'?action=setmod&object='.strtolower($myTmpObjectKey).'&value='.$file.'">';
print img_picto($langs->trans("Disabled"), 'switch_off');
print '</a>';
}
@ -357,11 +360,11 @@ foreach($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
print "</table><br>\n";
}
if ($myTmpObjectArray['includedocgeneration']) {
/*
* Document templates generators
*/
$setupnotempty++;
$type = strtolower($myTmpObjectKey);
print load_fiche_titre($langs->trans("DocumentModules", $myTmpObjectKey), '', '');
@ -387,7 +390,6 @@ foreach($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
dol_print_error($db);
}
print "<table class=\"noborder\" width=\"100%\">\n";
print "<tr class=\"liste_titre\">\n";
print '<td>'.$langs->trans("Name").'</td>';
@ -510,6 +512,9 @@ foreach($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
}
}
if (empty($setupnotempty)) {
print '<br>'.$langs->trans("NothingToSetup");
}
// Page end
dol_fiche_end();

6
htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_standard.php
View File

@ -85,7 +85,7 @@ class mod_myobject_standard extends ModeleNumRefMyObject
$coyymm = ''; $max = '';
$posindice = 8;
$posindice = strlen($this->prefix) + 6;
$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
$sql .= " FROM ".MAIN_DB_PREFIX."mymodule_myobject";
$sql .= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
@ -121,8 +121,8 @@ class mod_myobject_standard extends ModeleNumRefMyObject
{
global $db, $conf;
// First we get the max value
$posindice = 9;
// first we get the max value
$posindice = strlen($this->prefix) + 6;
$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
$sql .= " FROM ".MAIN_DB_PREFIX."mymodule_myobject";
$sql .= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";