--- /tmp/dsg/dolibarr/htdocs/core/modules/expedition/github_mod_expedition_ribera.php
+++ /tmp/dsg/dolibarr/htdocs/core/modules/expedition/client_mod_expedition_ribera.php
@@ -31,9 +31,9 @@
class mod_expedition_ribera extends ModelNumRefExpedition
{
/**
- * Dolibarr version of the loaded document
- * @var string
- */
+ * Dolibarr version of the loaded document
+ * @var string
+ */
public $version = 'dolibarr';
/**
@@ -58,9 +58,9 @@
*
* @return string text description
*/
- public function info()
- {
- global $conf, $langs, $db;
+ public function info()
+ {
+ global $conf, $langs, $db;
$langs->load("bills");
@@ -87,22 +87,22 @@
$texte .= '</form>';
return $texte;
- }
+ }
/**
* Return numbering example
*
* @return string Example
*/
- public function getExample()
- {
- global $conf, $langs, $mysoc;
+ public function getExample()
+ {
+ global $conf, $langs, $mysoc;
- $old_code_client = $mysoc->code_client;
- $old_code_type = $mysoc->typent_code;
- $mysoc->code_client = 'CCCCCCCCCC';
- $mysoc->typent_code = 'TTTTTTTTTT';
- $numExample = $this->getNextValue($mysoc, '');
+ $old_code_client = $mysoc->code_client;
+ $old_code_type = $mysoc->typent_code;
+ $mysoc->code_client = 'CCCCCCCCCC';
+ $mysoc->typent_code = 'TTTTTTTTTT';
+ $numExample = $this->getNextValue($mysoc, '');
$mysoc->code_client = $old_code_client;
$mysoc->typent_code = $old_code_type;
@@ -111,7 +111,7 @@
$numExample = $langs->trans('NotConfigured');
}
return $numExample;
- }
+ }
/**
* Return next value
@@ -120,8 +120,8 @@
* @param Object $shipment Shipment object
* @return string Value if OK, 0 if KO
*/
- public function getNextValue($objsoc, $shipment)
- {
+ public function getNextValue($objsoc, $shipment)
+ {
global $db, $conf;
require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
@@ -141,7 +141,7 @@
return $numFinal;
}
- // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+ // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
/**
* Return next free value
*
@@ -149,9 +149,9 @@
* @param Object $objforref Shipment object
* @return string Next free value
*/
- public function expedition_get_num($objsoc, $objforref)
- {
- // phpcs:enable
- return $this->getNextValue($objsoc, $objforref);
- }
+ public function expedition_get_num($objsoc, $objforref)
+ {
+ // phpcs:enable
+ return $this->getNextValue($objsoc, $objforref);
+ }
}
--- /tmp/dsg/dolibarr/htdocs/core/modules/expedition/github_mod_expedition_safor.php
+++ /tmp/dsg/dolibarr/htdocs/core/modules/expedition/client_mod_expedition_safor.php
@@ -29,9 +29,9 @@
class mod_expedition_safor extends ModelNumRefExpedition
{
/**
- * Dolibarr version of the loaded document
- * @var string
- */
+ * Dolibarr version of the loaded document
+ * @var string
+ */
public $version = 'dolibarr';
public $prefix = 'SH';
@@ -59,11 +59,11 @@
*
* @return string text description
*/
- public function info()
- {
- global $langs;
- return $langs->trans("SimpleNumRefModelDesc", $this->prefix);
- }
+ public function info()
+ {
+ global $langs;
+ return $langs->trans("SimpleNumRefModelDesc", $this->prefix);
+ }
/**
@@ -71,7 +71,7 @@
*
* @return string Example
*/
- public function getExample()
+ public function getExample()
{
return $this->prefix."0501-0001";
}
@@ -82,7 +82,7 @@
*
* @return boolean false if conflit, true if ok
*/
- public function canBeActivated()
+ public function canBeActivated()
{
global $conf, $langs, $db;
@@ -117,7 +117,7 @@
* @param Object $shipment Shipment object
* @return string Value if OK, 0 if KO
*/
- public function getNextValue($objsoc, $shipment)
+ public function getNextValue($objsoc, $shipment)
{
global $db, $conf;
@@ -133,7 +133,9 @@
$obj = $db->fetch_object($resql);
if ($obj) $max = intval($obj->max);
else $max = 0;
- } else {
+ }
+ else
+ {
dol_syslog("mod_expedition_safor::getNextValue", LOG_DEBUG);
return -1;
}
@@ -148,7 +150,7 @@
return $this->prefix.$yymm."-".$num;
}
- // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+ // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
/**
* Return next free value
*
@@ -156,9 +158,9 @@
* @param Object $objforref Shipment object
* @return string Next free value
*/
- public function expedition_get_num($objsoc, $objforref)
+ public function expedition_get_num($objsoc, $objforref)
{
- // phpcs:enable
+ // phpcs:enable
return $this->getNextValue($objsoc, $objforref);
}
}
--- /tmp/dsg/dolibarr/htdocs/core/modules/expedition/github_modules_expedition.php
+++ /tmp/dsg/dolibarr/htdocs/core/modules/expedition/client_modules_expedition.php
@@ -36,23 +36,23 @@
*/
abstract class ModelePdfExpedition extends CommonDocGenerator
{
- /**
+ /**
* @var string Error code (or message)
*/
public $error = '';
- // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+ // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
/**
* Return list of active generation models
*
- * @param DoliDB $db Database handler
- * @param integer $maxfilenamelength Max length of value to show
- * @return array List of templates
+ * @param DoliDB $db Database handler
+ * @param integer $maxfilenamelength Max length of value to show
+ * @return array List of templates
*/
public static function liste_modeles($db, $maxfilenamelength = 0)
{
- // phpcs:enable
+ // phpcs:enable
global $conf;
$type = 'shipping';
@@ -80,7 +80,7 @@
*
* @return boolean true if model can be used
*/
- public function isEnabled()
+ public function isEnabled()
{
return true;
}
@@ -90,7 +90,7 @@
*
* @return string text description
*/
- public function info()
+ public function info()
{
global $langs;
$langs->load("sendings");
@@ -102,7 +102,7 @@
*
* @return string Example
*/
- public function getExample()
+ public function getExample()
{
global $langs;
$langs->load("sendings");
@@ -114,7 +114,7 @@
*
* @return boolean false if conflict, true if ok
*/
- public function canBeActivated()
+ public function canBeActivated()
{
return true;
}
@@ -126,7 +126,7 @@
* @param Object $shipment Shipment object
* @return string Value
*/
- public function getNextValue($objsoc, $shipment)
+ public function getNextValue($objsoc, $shipment)
{
global $langs;
return $langs->trans("NotAvailable");
@@ -137,7 +137,7 @@
*
* @return string Value
*/
- public function getVersion()
+ public function getVersion()
{
global $langs;
$langs->load("admin");