From 1222d9053736bc158a2388fc4ae199ea9f9e436f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Thu, 14 Mar 2019 16:40:44 +0100 Subject: [PATCH 1/3] phpcs fix --- htdocs/admin/propal.php | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/htdocs/admin/propal.php b/htdocs/admin/propal.php index e9a037b98c9..1ba9ed50cac 100644 --- a/htdocs/admin/propal.php +++ b/htdocs/admin/propal.php @@ -70,7 +70,7 @@ if ($action == 'updateMask') } } -else if ($action == 'specimen') +elseif ($action == 'specimen') { $modele=GETPOST('module', 'alpha'); @@ -115,13 +115,13 @@ else if ($action == 'specimen') } } -else if ($action == 'setribchq') +elseif ($action == 'setribchq') { - $rib = GETPOST('rib','alpha'); - $chq = GETPOST('chq','alpha'); + $rib = GETPOST('rib', 'alpha'); + $chq = GETPOST('chq', 'alpha'); - $res = dolibarr_set_const($db, "FACTURE_RIB_NUMBER",$rib,'chaine',0,'',$conf->entity); - $res = dolibarr_set_const($db, "FACTURE_CHQ_NUMBER",$chq,'chaine',0,'',$conf->entity); + $res = dolibarr_set_const($db, "FACTURE_RIB_NUMBER", $rib, 'chaine', 0, '', $conf->entity); + $res = dolibarr_set_const($db, "FACTURE_CHQ_NUMBER", $chq, 'chaine', 0, '', $conf->entity); if (! $res > 0) $error++; @@ -135,7 +135,7 @@ else if ($action == 'setribchq') } } -else if ($action == 'set_PROPALE_DRAFT_WATERMARK') +elseif ($action == 'set_PROPALE_DRAFT_WATERMARK') { $draft = GETPOST('PROPALE_DRAFT_WATERMARK', 'alpha'); @@ -152,7 +152,7 @@ else if ($action == 'set_PROPALE_DRAFT_WATERMARK') } } -else if ($action == 'set_PROPOSAL_FREE_TEXT') +elseif ($action == 'set_PROPOSAL_FREE_TEXT') { $freetext = GETPOST('PROPOSAL_FREE_TEXT', 'none'); // No alpha here, we want exact string @@ -170,7 +170,7 @@ else if ($action == 'set_PROPOSAL_FREE_TEXT') } } -else if ($action == 'setdefaultduration') +elseif ($action == 'setdefaultduration') { $res = dolibarr_set_const($db, "PROPALE_VALIDITY_DURATION", $value, 'chaine', 0, '', $conf->entity); @@ -186,7 +186,7 @@ else if ($action == 'setdefaultduration') } } -else if ($action == 'set_BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL') +elseif ($action == 'set_BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL') { $res = dolibarr_set_const($db, "BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL", $value, 'chaine', 0, '', $conf->entity); @@ -203,7 +203,7 @@ else if ($action == 'set_BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL') } // Activate a model -else if ($action == 'set') +elseif ($action == 'set') { $ret = addDocumentModel($value, $type, $label, $scandir); } @@ -526,7 +526,7 @@ print ''; if (empty($conf->facture->enabled)) { print '
'; - print load_fiche_titre($langs->trans("SuggestedPaymentModesIfNotDefinedInProposal"),'',''); + print load_fiche_titre($langs->trans("SuggestedPaymentModesIfNotDefinedInProposal"), '', ''); print '
'; print ''; @@ -608,7 +608,7 @@ if (empty($conf->facture->enabled)) print ''; + print '>'.$langs->trans("OwnerOfBankAccount", $row[1]).''; $i++; } From 321a919fb1801bb5065763828edefd60299b56e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Thu, 14 Mar 2019 16:42:35 +0100 Subject: [PATCH 2/3] Update result.php --- htdocs/compta/resultat/result.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/htdocs/compta/resultat/result.php b/htdocs/compta/resultat/result.php index 59984ee444c..f505b97a5fc 100644 --- a/htdocs/compta/resultat/result.php +++ b/htdocs/compta/resultat/result.php @@ -289,12 +289,12 @@ elseif ($modecompta=="BOOKKEEPING") $sommes = array(); $totPerAccount = array(); if (!is_array($cats) && $cats<0) { - setEventMessages(null,$AccCat->errors,'errors'); + setEventMessages(null, $AccCat->errors, 'errors'); } elseif (is_array($cats) && count($cats)>0) { - foreach ($cats as $cat) // Loop on each group - { - if (!empty($cat['category_type'])) // category calculed - { + foreach ($cats as $cat) { + // Loop on each group + if (!empty($cat['category_type'])) { + // category calculed // When we enter here, $sommes was filled by group of accounts $formula = $cat['formula']; From f25ce3b40c87961b16fd6eb88bdb59651e3d3df2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Thu, 14 Mar 2019 16:43:52 +0100 Subject: [PATCH 3/3] Update facture.php --- htdocs/admin/facture.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/htdocs/admin/facture.php b/htdocs/admin/facture.php index e1d65250b6d..327c1f6bbd8 100644 --- a/htdocs/admin/facture.php +++ b/htdocs/admin/facture.php @@ -78,7 +78,7 @@ if ($action == 'updateMask') } } -else if ($action == 'specimen') +elseif ($action == 'specimen') { $modele=GETPOST('module', 'alpha'); @@ -164,7 +164,7 @@ elseif ($action == 'setmod') dolibarr_set_const($db, "FACTURE_ADDON", $value, 'chaine', 0, '', $conf->entity); } -else if ($action == 'setribchq') +elseif ($action == 'setribchq') { $rib = GETPOST('rib', 'alpha'); $chq = GETPOST('chq', 'alpha'); @@ -184,7 +184,7 @@ else if ($action == 'setribchq') } } -else if ($action == 'set_FACTURE_DRAFT_WATERMARK') +elseif ($action == 'set_FACTURE_DRAFT_WATERMARK') { $draft = GETPOST('FACTURE_DRAFT_WATERMARK', 'alpha'); @@ -202,7 +202,7 @@ else if ($action == 'set_FACTURE_DRAFT_WATERMARK') } } -else if ($action == 'set_INVOICE_FREE_TEXT') +elseif ($action == 'set_INVOICE_FREE_TEXT') { $freetext = GETPOST('INVOICE_FREE_TEXT', 'none'); // No alpha here, we want exact string @@ -220,7 +220,7 @@ else if ($action == 'set_INVOICE_FREE_TEXT') } } -else if ($action == 'setforcedate') +elseif ($action == 'setforcedate') { $forcedate = GETPOST('forcedate', 'alpha'); @@ -238,7 +238,7 @@ else if ($action == 'setforcedate') } } -else if ($action == 'setDefaultPDFModulesByType') +elseif ($action == 'setDefaultPDFModulesByType') { $invoicetypemodels = GETPOST('invoicetypemodels');