Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Fix: CRLF

Browse Source
This commit is contained in:
Laurent Destailleur
2014-05-21 19:54:40 +02:00
parent c82ff0a146
commit 4a7e9e4d0b
11 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/core/db/pgsql.class.php
View File

@@ -214,7 +214,7 @@ class DoliDBPgsql extends DoliDB
// nuke unsigned // nuke unsigned
$line=preg_replace('/(int\w+|smallint)\s+unsigned/i','\\1',$line); $line=preg_replace('/(int\w+|smallint)\s+unsigned/i','\\1',$line);
$line=preg_replace('/as signed/i','as integer',$line); $line=preg_replace('/as signed/i','as integer',$line);
// blob -> text // blob -> text
$line=preg_replace('/\w*blob/i','text',$line); $line=preg_replace('/\w*blob/i','text',$line);

2
htdocs/core/lib/functions2.lib.php
View File

@@ -802,7 +802,7 @@ function get_next_value($db,$mask,$table,$field,$where='',$objsoc='',$date='',$m
if ($counter >= pow(10, dol_strlen($maskcounter))) if ($counter >= pow(10, dol_strlen($maskcounter)))
{ {
$counter='ErrorMaxNumberReachForThisMask'; $counter='ErrorMaxNumberReachForThisMask';
} }
if (! empty($maskrefclient_maskcounter)) if (! empty($maskrefclient_maskcounter))
{ {

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

@@ -123,8 +123,8 @@ class mod_contract_serpis extends ModelNumRefContracts
$date=$contract->date_contrat; $date=$contract->date_contrat;
$yymm = strftime("%y%m",$date); $yymm = strftime("%y%m",$date);
if ($max >= (pow(10, 4) - 1)) $num=$max+1; // If counter > 9999, we do not format on 4 chars, we take number as it is if ($max >= (pow(10, 4) - 1)) $num=$max+1; // If counter > 9999, we do not format on 4 chars, we take number as it is
else $num = sprintf("%04s",$max+1); else $num = sprintf("%04s",$max+1);
dol_syslog("mod_contract_serpis::getNextValue return ".$this->prefix.$yymm."-".$num); dol_syslog("mod_contract_serpis::getNextValue return ".$this->prefix.$yymm."-".$num);
return $this->prefix.$yymm."-".$num; return $this->prefix.$yymm."-".$num;

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

@@ -123,8 +123,8 @@ class mod_expedition_safor extends ModelNumRefExpedition
$date=time(); $date=time();
$yymm = strftime("%y%m",$date); $yymm = strftime("%y%m",$date);
if ($max >= (pow(10, 4) - 1)) $num=$max+1; // If counter > 9999, we do not format on 4 chars, we take number as it is if ($max >= (pow(10, 4) - 1)) $num=$max+1; // If counter > 9999, we do not format on 4 chars, we take number as it is
else $num = sprintf("%04s",$max+1); else $num = sprintf("%04s",$max+1);
dol_syslog("mod_expedition_safor::getNextValue return ".$this->prefix.$yymm."-".$num); dol_syslog("mod_expedition_safor::getNextValue return ".$this->prefix.$yymm."-".$num);
return $this->prefix.$yymm."-".$num; return $this->prefix.$yymm."-".$num;

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

@@ -135,8 +135,8 @@ class mod_livraison_jade extends ModeleNumRefDeliveryOrder
if (empty($date)) $date=dol_now(); if (empty($date)) $date=dol_now();
$yymm = strftime("%y%m",$date); $yymm = strftime("%y%m",$date);
if ($max >= (pow(10, 4) - 1)) $num=$max+1; // If counter > 9999, we do not format on 4 chars, we take number as it is if ($max >= (pow(10, 4) - 1)) $num=$max+1; // If counter > 9999, we do not format on 4 chars, we take number as it is
else $num = sprintf("%04s",$max+1); else $num = sprintf("%04s",$max+1);
dol_syslog("mod_livraison_jade::getNextValue return ".$this->prefix.$yymm."-".$num); dol_syslog("mod_livraison_jade::getNextValue return ".$this->prefix.$yymm."-".$num);
return $this->prefix.$yymm."-".$num; return $this->prefix.$yymm."-".$num;

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

@@ -131,8 +131,8 @@ class mod_project_simple extends ModeleNumRefProjects
//$yymm = strftime("%y%m",time()); //$yymm = strftime("%y%m",time());
$yymm = strftime("%y%m",$date); $yymm = strftime("%y%m",$date);
if ($max >= (pow(10, 4) - 1)) $num=$max+1; // If counter > 9999, we do not format on 4 chars, we take number as it is if ($max >= (pow(10, 4) - 1)) $num=$max+1; // If counter > 9999, we do not format on 4 chars, we take number as it is
else $num = sprintf("%04s",$max+1); else $num = sprintf("%04s",$max+1);
dol_syslog("mod_project_simple::getNextValue return ".$this->prefix.$yymm."-".$num); dol_syslog("mod_project_simple::getNextValue return ".$this->prefix.$yymm."-".$num);
return $this->prefix.$yymm."-".$num; return $this->prefix.$yymm."-".$num;

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

@@ -131,8 +131,8 @@ class mod_task_simple extends ModeleNumRefTask
//$yymm = strftime("%y%m",time()); //$yymm = strftime("%y%m",time());
$yymm = strftime("%y%m",$date); $yymm = strftime("%y%m",$date);
if ($max >= (pow(10, 4) - 1)) $num=$max+1; // If counter > 9999, we do not format on 4 chars, we take number as it is if ($max >= (pow(10, 4) - 1)) $num=$max+1; // If counter > 9999, we do not format on 4 chars, we take number as it is
else $num = sprintf("%04s",$max+1); else $num = sprintf("%04s",$max+1);
dol_syslog("mod_task_simple::getNextValue return ".$this->prefix.$yymm."-".$num); dol_syslog("mod_task_simple::getNextValue return ".$this->prefix.$yymm."-".$num);
return $this->prefix.$yymm."-".$num; return $this->prefix.$yymm."-".$num;

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

@@ -131,8 +131,8 @@ class mod_propale_marbre extends ModeleNumRefPropales
$date = time(); $date = time();
$yymm = strftime("%y%m",$date); $yymm = strftime("%y%m",$date);
if ($max >= (pow(10, 4) - 1)) $num=$max+1; // If counter > 9999, we do not format on 4 chars, we take number as it is if ($max >= (pow(10, 4) - 1)) $num=$max+1; // If counter > 9999, we do not format on 4 chars, we take number as it is
else $num = sprintf("%04s",$max+1); else $num = sprintf("%04s",$max+1);
dol_syslog("mod_propale_marbre::getNextValue return ".$this->prefix.$yymm."-".$num); dol_syslog("mod_propale_marbre::getNextValue return ".$this->prefix.$yymm."-".$num);
return $this->prefix.$yymm."-".$num; return $this->prefix.$yymm."-".$num;

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

@@ -140,8 +140,8 @@ class mod_codeclient_monkey extends ModeleThirdPartyCode
$date = dol_now(); $date = dol_now();
$yymm = strftime("%y%m",$date); $yymm = strftime("%y%m",$date);
if ($max >= (pow(10, 4) - 1)) $num=$max+1; // If counter > 9999, we do not format on 4 chars, we take number as it is if ($max >= (pow(10, 4) - 1)) $num=$max+1; // If counter > 9999, we do not format on 4 chars, we take number as it is
else $num = sprintf("%04s",$max+1); else $num = sprintf("%04s",$max+1);
dol_syslog(get_class($this)."::getNextValue return ".$prefix.$yymm."-".$num); dol_syslog(get_class($this)."::getNextValue return ".$prefix.$yymm."-".$num);
return $prefix.$yymm."-".$num; return $prefix.$yymm."-".$num;

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

@@ -158,8 +158,8 @@ class mod_facture_fournisseur_cactus extends ModeleNumRefSuppliersInvoices
$date=$object->date; // This is invoice date (not creation date) $date=$object->date; // This is invoice date (not creation date)
$yymm = strftime("%y%m",$date); $yymm = strftime("%y%m",$date);
if ($max >= (pow(10, 4) - 1)) $num=$max+1; // If counter > 9999, we do not format on 4 chars, we take number as it is if ($max >= (pow(10, 4) - 1)) $num=$max+1; // If counter > 9999, we do not format on 4 chars, we take number as it is
else $num = sprintf("%04s",$max+1); else $num = sprintf("%04s",$max+1);
dol_syslog(get_class($this)."::getNextValue return ".$prefix.$yymm."-".$num); dol_syslog(get_class($this)."::getNextValue return ".$prefix.$yymm."-".$num);
return $prefix.$yymm."-".$num; return $prefix.$yymm."-".$num;

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

@@ -126,8 +126,8 @@ class mod_commande_fournisseur_muguet extends ModeleNumRefSuppliersOrders
if (empty($date)) $date=$object->date; // Creation date is order date for suppliers orders if (empty($date)) $date=$object->date; // Creation date is order date for suppliers orders
$yymm = strftime("%y%m",$date); $yymm = strftime("%y%m",$date);
if ($max >= (pow(10, 4) - 1)) $num=$max+1; // If counter > 9999, we do not format on 4 chars, we take number as it is if ($max >= (pow(10, 4) - 1)) $num=$max+1; // If counter > 9999, we do not format on 4 chars, we take number as it is
else $num = sprintf("%04s",$max+1); else $num = sprintf("%04s",$max+1);
return $this->prefix.$yymm."-".$num; return $this->prefix.$yymm."-".$num;
} }