From cb2d72d5c16df6bf5172a155fa00396fa3615a6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Sun, 16 Sep 2018 09:22:49 +0200 Subject: [PATCH 01/40] reduce complexity libstatut societe class --- htdocs/societe/class/societe.class.php | 56 +++++++++++++------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php index 53dc04218fa..70d4e4801c2 100644 --- a/htdocs/societe/class/societe.class.php +++ b/htdocs/societe/class/societe.class.php @@ -529,7 +529,7 @@ class Societe extends CommonObject $this->add_commercial($user, $this->commercial_id); } // si un commercial cree un client il lui est affecte automatiquement - else if (empty($user->rights->societe->client->voir)) + elseif (empty($user->rights->societe->client->voir)) { $this->add_commercial($user, $user->id); } @@ -652,15 +652,15 @@ class Societe extends CommonObject { $this->errors[] = 'ErrorBadCustomerCodeSyntax'; } - if ($rescode == -2) + elseif ($rescode == -2) { $this->errors[] = 'ErrorCustomerCodeRequired'; } - if ($rescode == -3) + elseif ($rescode == -3) { $this->errors[] = 'ErrorCustomerCodeAlreadyUsed'; } - if ($rescode == -4) + elseif ($rescode == -4) { $this->errors[] = 'ErrorPrefixRequired'; } @@ -677,15 +677,15 @@ class Societe extends CommonObject { $this->errors[] = 'ErrorBadSupplierCodeSyntax'; } - if ($rescode == -2) + elseif ($rescode == -2) { $this->errors[] = 'ErrorSupplierCodeRequired'; } - if ($rescode == -3) + elseif ($rescode == -3) { $this->errors[] = 'ErrorSupplierCodeAlreadyUsed'; } - if ($rescode == -5) + elseif ($rescode == -5) { $this->errors[] = 'ErrorprefixRequired'; } @@ -1064,7 +1064,7 @@ class Societe extends CommonObject $error++; } } - else if ($result < 0) + elseif ($result < 0) { $this->error=$lmember->error; $error++; @@ -1960,37 +1960,37 @@ class Societe extends CommonObject $label.= '' . $langs->trans("ShowCustomer") . ''; $linkstart = ''; $linkstart = ''; $linkstart = ''; $linkstart = ''; $linkstart = ''; $linkstart = ''; $linkstart = ''; $linkstart = 'trans("InActivity"); + elseif ($statut==1) return $langs->trans("InActivity"); } - if ($mode == 1) + elseif ($mode == 1) { if ($statut==0) return $langs->trans("ActivityCeased"); - if ($statut==1) return $langs->trans("InActivity"); + elseif ($statut==1) return $langs->trans("InActivity"); } - if ($mode == 2) + elseif ($mode == 2) { if ($statut==0) return img_picto($langs->trans("ActivityCeased"),'statut5', 'class="pictostatus"').' '.$langs->trans("ActivityCeased"); - if ($statut==1) return img_picto($langs->trans("InActivity"),'statut4', 'class="pictostatus"').' '.$langs->trans("InActivity"); + elseif ($statut==1) return img_picto($langs->trans("InActivity"),'statut4', 'class="pictostatus"').' '.$langs->trans("InActivity"); } - if ($mode == 3) + elseif ($mode == 3) { if ($statut==0) return img_picto($langs->trans("ActivityCeased"),'statut5', 'class="pictostatus"'); - if ($statut==1) return img_picto($langs->trans("InActivity"),'statut4', 'class="pictostatus"'); + elseif ($statut==1) return img_picto($langs->trans("InActivity"),'statut4', 'class="pictostatus"'); } - if ($mode == 4) + elseif ($mode == 4) { if ($statut==0) return img_picto($langs->trans("ActivityCeased"),'statut5', 'class="pictostatus"').' '.$langs->trans("ActivityCeased"); - if ($statut==1) return img_picto($langs->trans("InActivity"),'statut4', 'class="pictostatus"').' '.$langs->trans("InActivity"); + elseif ($statut==1) return img_picto($langs->trans("InActivity"),'statut4', 'class="pictostatus"').' '.$langs->trans("InActivity"); } - if ($mode == 5) + elseif ($mode == 5) { if ($statut==0) return ''.$langs->trans("ActivityCeased").' '.img_picto($langs->trans("ActivityCeased"),'statut5', 'class="pictostatus"'); - if ($statut==1) return ''.$langs->trans("InActivity").' '.img_picto($langs->trans("InActivity"),'statut4', 'class="pictostatus"'); + elseif ($statut==1) return ''.$langs->trans("InActivity").' '.img_picto($langs->trans("InActivity"),'statut4', 'class="pictostatus"'); } - if ($mode == 6) + elseif ($mode == 6) { if ($statut==0) return ''.$langs->trans("ActivityCeased").' '.img_picto($langs->trans("ActivityCeased"),'statut5', 'class="pictostatus"'); - if ($statut==1) return ''.$langs->trans("InActivity").' '.img_picto($langs->trans("InActivity"),'statut4', 'class="pictostatus"'); + elseif ($statut==1) return ''.$langs->trans("InActivity").' '.img_picto($langs->trans("InActivity"),'statut4', 'class="pictostatus"'); } } From 7b3b020533651551a0edb37257b56ae799a521d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Sun, 16 Sep 2018 09:41:38 +0200 Subject: [PATCH 02/40] completely comment unused code --- .../facture/class/paymentterm.class.php | 56 +++++++------------ 1 file changed, 21 insertions(+), 35 deletions(-) diff --git a/htdocs/compta/facture/class/paymentterm.class.php b/htdocs/compta/facture/class/paymentterm.class.php index 619487e9574..31e362445f0 100644 --- a/htdocs/compta/facture/class/paymentterm.class.php +++ b/htdocs/compta/facture/class/paymentterm.class.php @@ -135,18 +135,17 @@ class PaymentTerm // extends CommonObject { $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."c_payment_term"); - if (! $notrigger) - { - // Uncomment this and change MYOBJECT to your own tag if you - // want this action call a trigger. + // Uncomment this and change MYOBJECT to your own tag if you + // want this action call a trigger. + //if (! $notrigger) { - //// Call triggers - //include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; - //$interface=new Interfaces($this->db); - //$result=$interface->run_triggers('MYOBJECT_CREATE',$this,$user,$langs,$conf); - //if ($result < 0) { $error++; $this->errors=$interface->errors; } - //// End call triggers - } + // // Call triggers + // include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; + // $interface=new Interfaces($this->db); + // $result=$interface->run_triggers('MYOBJECT_CREATE',$this,$user,$langs,$conf); + // if ($result < 0) { $error++; $this->errors=$interface->errors; } + // // End call triggers + //} } // Commit or rollback @@ -311,21 +310,16 @@ class PaymentTerm // extends CommonObject $resql = $this->db->query($sql); if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); } - if (! $error) - { - if (! $notrigger) - { - // Uncomment this and change MYOBJECT to your own tag if you - // want this action call a trigger. - + // Uncomment this and change MYOBJECT to your own tag if you + // want this action call a trigger. + //if (! $error && ! $notrigger) { // Call triggers //include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; //$interface=new Interfaces($this->db); //$result=$interface->run_triggers('MYOBJECT_MODIFY',$this,$user,$langs,$conf); //if ($result < 0) { $error++; $this->errors=$interface->errors; } // End call triggers - } - } + //} // Commit or rollback if ($error) @@ -367,21 +361,16 @@ class PaymentTerm // extends CommonObject $resql = $this->db->query($sql); if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); } - if (! $error) - { - if (! $notrigger) - { - // Uncomment this and change MYOBJECT to your own tag if you - // want this action call a trigger. - + // Uncomment this and change MYOBJECT to your own tag if you + // want this action call a trigger. + //if (! $error && ! $notrigger) { //// Call triggers //include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; //$interface=new Interfaces($this->db); //$result=$interface->run_triggers('MYOBJECT_DELETE',$this,$user,$langs,$conf); //if ($result < 0) { $error++; $this->errors=$interface->errors; } //// End call triggers - } - } + //} // Commit or rollback if ($error) @@ -439,12 +428,9 @@ class PaymentTerm // extends CommonObject $error++; } - if (! $error) - { - - - - } + //if (! $error) + //{ + //} unset($this->context['createfromclone']); From 2f633857af0de94d4e05b5d499ed82ba15467f42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Sun, 16 Sep 2018 11:26:39 +0200 Subject: [PATCH 03/40] clean datepicker --- htdocs/core/datepicker.php | 58 ++++++++++++++++++-------------------- 1 file changed, 27 insertions(+), 31 deletions(-) diff --git a/htdocs/core/datepicker.php b/htdocs/core/datepicker.php index a53f26f52a1..43957d6bd06 100644 --- a/htdocs/core/datepicker.php +++ b/htdocs/core/datepicker.php @@ -66,18 +66,19 @@ else } // Define tradMonths javascript array (we define this in datapicker AND in parent page to avoid errors with IE8) -$tradTemp=array($langs->trans("January"), -$langs->trans("February"), -$langs->trans("March"), -$langs->trans("April"), -$langs->trans("May"), -$langs->trans("June"), -$langs->trans("July"), -$langs->trans("August"), -$langs->trans("September"), -$langs->trans("October"), -$langs->trans("November"), -$langs->trans("December") +$tradTemp=array( + $langs->trans("January"), + $langs->trans("February"), + $langs->trans("March"), + $langs->trans("April"), + $langs->trans("May"), + $langs->trans("June"), + $langs->trans("July"), + $langs->trans("August"), + $langs->trans("September"), + $langs->trans("October"), + $langs->trans("November"), + $langs->trans("December") ); print '