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

Fix SticklerCi

Browse Source
This commit is contained in:
Alexandre SPANGARO 2020-07-06 04:47:27 +02:00
parent 1855d54019
commit 82c96a4f83
5 changed files with 34 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/core/class/html.form.class.php
View File

@ -3608,8 +3608,7 @@ class Form
return $num; return $num;
} }
else else {
{
dol_print_error($this->db); dol_print_error($this->db);
return -1; return -1;
} }
@ -4721,8 +4720,7 @@ class Form
print '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">'; print '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
print '</form>'; print '</form>';
} }
else else {
{
if ($selected) if ($selected)
{ {
$this->load_cache_transport_mode(); $this->load_cache_transport_mode();

2
htdocs/core/modules/modIntracommreport.class.php
View File

@ -36,7 +36,7 @@ class modIntracommreport extends DolibarrModules
* *
* @param DoliDB $db Database handler * @param DoliDB $db Database handler
*/ */
function __construct($db) public function __construct($db)
{ {
global $conf, $langs; global $conf, $langs;

3
htdocs/fourn/facture/card.php
View File

@ -2661,8 +2661,7 @@ if ($action == 'create')
{ {
$form->formTransportMode($_SERVER['PHP_SELF'].'?id='.$object->id, $object->transport_mode_id, 'transport_mode_id', 1, 1); $form->formTransportMode($_SERVER['PHP_SELF'].'?id='.$object->id, $object->transport_mode_id, 'transport_mode_id', 1, 1);
} }
else else {
{
$form->formTransportMode($_SERVER['PHP_SELF'].'?id='.$object->id, $object->transport_mode_id, 'none'); $form->formTransportMode($_SERVER['PHP_SELF'].'?id='.$object->id, $object->transport_mode_id, 'none');
} }
print '</td></tr>'; print '</td></tr>';

12
htdocs/intracommreport/card.php
View File

@ -53,14 +53,12 @@ if ($user->rights->intracommreport->delete && $action == 'confirm_delete' && $co
header("Location: ".$backtopage); header("Location: ".$backtopage);
exit; exit;
} }
else else {
{
header("Location: list.php"); header("Location: list.php");
exit; exit;
} }
} }
else else {
{
$errmesg=$object->error; $errmesg=$object->error;
} }
} }
@ -100,14 +98,12 @@ if ($action == 'add' && $user->rights->intracommreport->write) {
header("Location: ".$_SERVER["PHP_SELF"]); header("Location: ".$_SERVER["PHP_SELF"]);
exit; exit;
} }
else else {
{
setEventMessages($object->error, $object->errors, 'errors'); setEventMessages($object->error, $object->errors, 'errors');
$action = 'create'; $action = 'create';
} }
} }
else else {
{
$action = 'create'; $action = 'create';
} }
} }

15
htdocs/intracommreport/class/intracommreport.class.php
View File

@ -94,8 +94,9 @@ class IntracommReport extends CommonObject
* @param int $mode O for create, R for regenerate (Look always 0 ment toujours 0 within the framework of XML exchanges according to documentation) * @param int $mode O for create, R for regenerate (Look always 0 ment toujours 0 within the framework of XML exchanges according to documentation)
* @param string $type introduction or expedition * @param string $type introduction or expedition
* @param string $period_reference Period of reference * @param string $period_reference Period of reference
* @return void
*/ */
function getXML($mode = 'O', $type = 'introduction', $period_reference = '') public function getXML($mode = 'O', $type = 'introduction', $period_reference = '')
{ {
global $db, $conf, $mysoc; global $db, $conf, $mysoc;
@ -144,7 +145,7 @@ class IntracommReport extends CommonObject
} }
// $type_declaration tjrs = "expedition" à voir si ça évolue // $type_declaration tjrs = "expedition" à voir si ça évolue
function getXMLDes($period_year, $period_month, $type_declaration = 'expedition') public function getXMLDes($period_year, $period_month, $type_declaration = 'expedition')
{ {
global $db, $conf, $mysoc; global $db, $conf, $mysoc;
@ -166,7 +167,7 @@ class IntracommReport extends CommonObject
else return 0; else return 0;
} }
function addItemsFact(&$declaration, $type, $period_reference, $exporttype = 'deb') public function addItemsFact(&$declaration, $type, $period_reference, $exporttype = 'deb')
{ {
global $db, $conf; global $db, $conf;
@ -219,7 +220,7 @@ class IntracommReport extends CommonObject
return 1; return 1;
} }
function getSQLFactLines($type, $period_reference, $exporttype = 'deb') public function getSQLFactLines($type, $period_reference, $exporttype = 'deb')
{ {
global $mysoc, $conf; global $mysoc, $conf;
@ -258,7 +259,7 @@ class IntracommReport extends CommonObject
return $sql; return $sql;
} }
function addItemXMl(&$declaration, &$res, $code_douane_spe = '', $i) public function addItemXMl(&$declaration, &$res, $code_douane_spe = '', $i)
{ {
$item = $declaration->addChild('Item'); $item = $declaration->addChild('Item');
@ -281,7 +282,7 @@ class IntracommReport extends CommonObject
$item->addChild('regionCode', substr($res->zip, 0, 2)); $item->addChild('regionCode', substr($res->zip, 0, 2));
} }
function addItemXMlDes($declaration, &$res, $code_douane_spe = '', $i) public function addItemXMlDes($declaration, &$res, $code_douane_spe = '', $i)
{ {
$item = $declaration->addChild('ligne_des'); $item = $declaration->addChild('ligne_des');
$item->addChild('numlin_des', $i); $item->addChild('numlin_des', $i);
@ -292,7 +293,7 @@ class IntracommReport extends CommonObject
/** /**
* Cette fonction ajoute un item en récupérant le code douane du produit ayant le plus haut montant dans la facture * Cette fonction ajoute un item en récupérant le code douane du produit ayant le plus haut montant dans la facture
*/ */
function addItemFraisDePort(&$declaration, &$TLinesFraisDePort, $type, &$categ_fraisdeport, $i) public function addItemFraisDePort(&$declaration, &$TLinesFraisDePort, $type, &$categ_fraisdeport, $i)
{ {
global $db, $conf; global $db, $conf;