diff --git a/dev/setup/codesniffer/ruleset.xml b/dev/setup/codesniffer/ruleset.xml index bbe101112d0..fa19bc94372 100644 --- a/dev/setup/codesniffer/ruleset.xml +++ b/dev/setup/codesniffer/ruleset.xml @@ -374,6 +374,9 @@ + + + 0 diff --git a/dev/translation/autotranslator.class.php b/dev/translation/autotranslator.class.php index 47d6a25ec15..0a84bf03b70 100644 --- a/dev/translation/autotranslator.class.php +++ b/dev/translation/autotranslator.class.php @@ -65,7 +65,6 @@ class autoTranslator //ini_set('default_charset','UTF-8'); ini_set('default_charset',$this->_outputpagecode); $this->parse_refLangTranslationFiles(); - } /** diff --git a/htdocs/adherents/canvas/default/actions_adherentcard_default.class.php b/htdocs/adherents/canvas/default/actions_adherentcard_default.class.php index 451f46f899f..a03712daa79 100644 --- a/htdocs/adherents/canvas/default/actions_adherentcard_default.class.php +++ b/htdocs/adherents/canvas/default/actions_adherentcard_default.class.php @@ -117,7 +117,6 @@ class ActionsAdherentCardDefault extends ActionsAdherentCardCommon { $this->LoadListDatas($limit, $offset, $sortfield, $sortorder); } - } diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php index bf4fe0d73c2..7a4cc378baf 100644 --- a/htdocs/adherents/class/adherent.class.php +++ b/htdocs/adherents/class/adherent.class.php @@ -690,7 +690,6 @@ class Adherent extends CommonObject $this->db->rollback(); return -1; } - } /** @@ -2107,7 +2106,6 @@ class Adherent extends CommonObject $this->error=$this->db->error(); return -1; } - } /** diff --git a/htdocs/admin/tools/eaccelerator.php b/htdocs/admin/tools/eaccelerator.php index 9999734a8f8..a3205c11a27 100644 --- a/htdocs/admin/tools/eaccelerator.php +++ b/htdocs/admin/tools/eaccelerator.php @@ -181,7 +181,6 @@ function create_script_table($list) print ''; } print ''; - } /** diff --git a/htdocs/api/class/api_access.class.php b/htdocs/api/class/api_access.class.php index d067d6e2ad6..abd8df94275 100644 --- a/htdocs/api/class/api_access.class.php +++ b/htdocs/api/class/api_access.class.php @@ -196,6 +196,5 @@ class DolibarrApiAccess implements iAuthenticate return $requires ? static::$role == 'admin' || in_array(static::$role, (array) $requires) : true; - } } diff --git a/htdocs/blockedlog/class/authority.class.php b/htdocs/blockedlog/class/authority.class.php index 11bb3aa2d0f..b976857a522 100644 --- a/htdocs/blockedlog/class/authority.class.php +++ b/htdocs/blockedlog/class/authority.class.php @@ -54,7 +54,6 @@ class BlockedLogAuthority { $this->db = $db; - } /** @@ -90,7 +89,6 @@ class BlockedLogAuthority { return md5($this->signature.$this->blockchain); - } /** @@ -103,7 +101,6 @@ class BlockedLogAuthority { return ($hash === $this->getBlockchainHash() ); - } /** @@ -116,7 +113,6 @@ class BlockedLogAuthority { $this->blockchain.=$block; - } /** @@ -197,7 +193,6 @@ class BlockedLogAuthority $this->error=$this->db->error(); return -1; } - } /** @@ -252,7 +247,6 @@ class BlockedLogAuthority $this->db->rollback(); return -1; } - } /** @@ -291,7 +285,6 @@ class BlockedLogAuthority $this->db->rollback(); return -1; } - } /** @@ -340,5 +333,4 @@ class BlockedLogAuthority return 1; } - } diff --git a/htdocs/blockedlog/class/blockedlog.class.php b/htdocs/blockedlog/class/blockedlog.class.php index 654709cec6f..59268d15c90 100644 --- a/htdocs/blockedlog/class/blockedlog.class.php +++ b/htdocs/blockedlog/class/blockedlog.class.php @@ -283,7 +283,6 @@ class BlockedLog } return ''.$langs->trans('ImpossibleToReloadObject', $this->element, $this->fk_object).''; - } /** @@ -676,7 +675,6 @@ class BlockedLog $this->error=$this->db->error(); return -1; } - } @@ -716,8 +714,6 @@ class BlockedLog if($res===false) return false; return true; - - } /** diff --git a/htdocs/bookmarks/class/bookmark.class.php b/htdocs/bookmarks/class/bookmark.class.php index 9491b10c267..005e73acad7 100644 --- a/htdocs/bookmarks/class/bookmark.class.php +++ b/htdocs/bookmarks/class/bookmark.class.php @@ -226,7 +226,6 @@ class Bookmark extends CommonObject $this->error=$this->db->lasterror(); return -1; } - } /** diff --git a/htdocs/cashdesk/class/Facturation.class.php b/htdocs/cashdesk/class/Facturation.class.php index ac26a326962..48339044576 100644 --- a/htdocs/cashdesk/class/Facturation.class.php +++ b/htdocs/cashdesk/class/Facturation.class.php @@ -167,7 +167,6 @@ class Facturation $_SESSION['poscart']=$newcartarray; $this->raz(); - } /** @@ -269,7 +268,6 @@ class Facturation $this->prixTotalHt('RESET'); $this->montantTva('RESET'); $this->prixTotalTtc('RESET'); - } @@ -324,7 +322,6 @@ class Facturation { $this->ref = $aRef; } - } /** @@ -348,7 +345,6 @@ class Facturation { $this->qte = $aQte; } - } /** @@ -372,7 +368,6 @@ class Facturation { $this->stock = $aStock; } - } /** @@ -396,7 +391,6 @@ class Facturation { $this->remise_percent = $aRemisePercent; } - } /** @@ -421,7 +415,6 @@ class Facturation $this->montant_remise = $aMontantRemise; } - } /** @@ -446,7 +439,6 @@ class Facturation $this->prix = $aPrix; } - } /** @@ -470,7 +462,6 @@ class Facturation $this->tva = $aTva; } - } /** @@ -518,7 +509,6 @@ class Facturation $this->mode_reglement = $aModeReglement; } - } /** @@ -543,7 +533,6 @@ class Facturation $this->montant_encaisse = $aMontantEncaisse; } - } /** @@ -567,7 +556,6 @@ class Facturation $this->montant_rendu = $aMontantRendu; } - } /** @@ -637,7 +625,6 @@ class Facturation $this->montant_tva = $aMontantTva; } - } /** diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php index 42c884fa8b3..1adb2da8822 100644 --- a/htdocs/comm/action/class/actioncomm.class.php +++ b/htdocs/comm/action/class/actioncomm.class.php @@ -437,7 +437,6 @@ class ActionComm extends CommonObject $this->error=$this->db->lasterror(); return -1; } - } /** @@ -648,7 +647,6 @@ class ActionComm extends CommonObject } return $num; - } /** diff --git a/htdocs/comm/action/class/api_agendaevents.class.php b/htdocs/comm/action/class/api_agendaevents.class.php index e5818a9f462..dedc515f61c 100644 --- a/htdocs/comm/action/class/api_agendaevents.class.php +++ b/htdocs/comm/action/class/api_agendaevents.class.php @@ -293,7 +293,6 @@ class AgendaEvents extends DolibarrApi 'message' => 'Agenda Event deleted' ) ); - } /** diff --git a/htdocs/comm/action/class/ical.class.php b/htdocs/comm/action/class/ical.class.php index 708b52c9151..df348e4db51 100644 --- a/htdocs/comm/action/class/ical.class.php +++ b/htdocs/comm/action/class/ical.class.php @@ -44,7 +44,6 @@ class ICal */ public function __construct() { - } /** diff --git a/htdocs/comm/mailing/class/mailing.class.php b/htdocs/comm/mailing/class/mailing.class.php index 1078ea84c94..506a2e99f31 100644 --- a/htdocs/comm/mailing/class/mailing.class.php +++ b/htdocs/comm/mailing/class/mailing.class.php @@ -93,7 +93,6 @@ class Mailing extends CommonObject $this->statut_dest[1] = 'MailingStatusSent'; $this->statut_dest[2] = 'MailingStatusRead'; $this->statut_dest[3] = 'MailingStatusReadAndUnsubscribe'; // Read but ask to not be contacted anymore - } /** diff --git a/htdocs/comm/propal/class/api_proposals.class.php b/htdocs/comm/propal/class/api_proposals.class.php index 0313add9cae..fc721912462 100644 --- a/htdocs/comm/propal/class/api_proposals.class.php +++ b/htdocs/comm/propal/class/api_proposals.class.php @@ -491,7 +491,6 @@ class Proposals extends DolibarrApi 'message' => 'Commercial Proposal deleted' ) ); - } /** diff --git a/htdocs/commande/class/api_orders.class.php b/htdocs/commande/class/api_orders.class.php index c0266d76d70..60011592afe 100644 --- a/htdocs/commande/class/api_orders.class.php +++ b/htdocs/commande/class/api_orders.class.php @@ -473,7 +473,6 @@ class Orders extends DolibarrApi 'message' => 'Order deleted' ) ); - } /** diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php index 2a7be254fd8..c392684d967 100644 --- a/htdocs/commande/class/commande.class.php +++ b/htdocs/commande/class/commande.class.php @@ -3411,7 +3411,6 @@ class Commande extends CommonOrder if ($statut==self::STATUS_CLOSED && ($billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return ''.$langs->trans('StatusOrderProcessed').$billedtext.' '.img_picto($langs->trans('StatusOrderProcessed').$billedtext,'statut6'); if ($statut==self::STATUS_CLOSED && (! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return ''.$langs->trans('StatusOrderDelivered').' '.img_picto($langs->trans('StatusOrderDelivered'),'statut6'); } - } diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php index 46c3e168a1b..405237a98fa 100644 --- a/htdocs/compta/bank/class/account.class.php +++ b/htdocs/compta/bank/class/account.class.php @@ -1170,7 +1170,6 @@ class Account extends CommonObject } return $solde; - } /** @@ -1513,7 +1512,6 @@ class Account extends CommonObject */ function info($id) { - } /** @@ -1558,7 +1556,6 @@ class Account extends CommonObject //Get the order the properties are shown return $fieldarray; - } /** diff --git a/htdocs/compta/deplacement/class/deplacement.class.php b/htdocs/compta/deplacement/class/deplacement.class.php index d9172219abe..9304ac75b87 100644 --- a/htdocs/compta/deplacement/class/deplacement.class.php +++ b/htdocs/compta/deplacement/class/deplacement.class.php @@ -154,7 +154,6 @@ class Deplacement extends CommonObject $this->db->rollback(); return -1; } - } /** diff --git a/htdocs/compta/facture/class/facture-rec.class.php b/htdocs/compta/facture/class/facture-rec.class.php index 59966827ae5..03fbb9086b1 100644 --- a/htdocs/compta/facture/class/facture-rec.class.php +++ b/htdocs/compta/facture/class/facture-rec.class.php @@ -1858,7 +1858,6 @@ class FactureLigneRec extends CommonInvoiceLine $this->db->rollback(); return -2; } - } } diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php index 5e5eca7337f..7b743ad0b36 100644 --- a/htdocs/compta/facture/class/facture.class.php +++ b/htdocs/compta/facture/class/facture.class.php @@ -1551,7 +1551,6 @@ class Facture extends CommonInvoice } } } - } /** diff --git a/htdocs/compta/paiement/class/cpaiement.class.php b/htdocs/compta/paiement/class/cpaiement.class.php index 1919b5fa94c..1c10e78c1b7 100644 --- a/htdocs/compta/paiement/class/cpaiement.class.php +++ b/htdocs/compta/paiement/class/cpaiement.class.php @@ -369,8 +369,6 @@ class Cpaiement $this->active = ''; $this->accountancy_code = ''; $this->module = ''; - - } } diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php index 76224451c0a..b041c6acab7 100644 --- a/htdocs/compta/prelevement/class/bonprelevement.class.php +++ b/htdocs/compta/prelevement/class/bonprelevement.class.php @@ -164,7 +164,6 @@ class BonPrelevement extends CommonObject } return $result; - } /** @@ -1457,7 +1456,6 @@ class BonPrelevement extends CommonObject if (! empty($conf->global->MAIN_UMASK)) @chmod($this->file, octdec($conf->global->MAIN_UMASK)); return $result; - } @@ -1687,7 +1685,6 @@ class BonPrelevement extends CommonObject fputs($this->file, substr(" ",0,5)); fputs($this->file, "\n"); - } /** diff --git a/htdocs/compta/prelevement/class/rejetprelevement.class.php b/htdocs/compta/prelevement/class/rejetprelevement.class.php index 606208b5193..75c67146d6d 100644 --- a/htdocs/compta/prelevement/class/rejetprelevement.class.php +++ b/htdocs/compta/prelevement/class/rejetprelevement.class.php @@ -69,7 +69,6 @@ class RejetPrelevement $this->facturer[0]=$langs->trans("NoInvoiceRefused"); $this->facturer[1]=$langs->trans("InvoiceRefused"); - } /** @@ -198,7 +197,6 @@ class RejetPrelevement dol_syslog("RejetPrelevement::Create Rollback"); $this->db->rollback(); } - } /** @@ -327,7 +325,6 @@ class RejetPrelevement } return $arr; - } /** diff --git a/htdocs/compta/sociales/class/cchargesociales.class.php b/htdocs/compta/sociales/class/cchargesociales.class.php index de382423cc5..aab637a693c 100644 --- a/htdocs/compta/sociales/class/cchargesociales.class.php +++ b/htdocs/compta/sociales/class/cchargesociales.class.php @@ -523,8 +523,6 @@ class Cchargesociales $this->fk_pays = ''; $this->module = ''; $this->accountancy_code = ''; - - } } diff --git a/htdocs/compta/sociales/class/chargesociales.class.php b/htdocs/compta/sociales/class/chargesociales.class.php index 229cbef2442..41d91235150 100644 --- a/htdocs/compta/sociales/class/chargesociales.class.php +++ b/htdocs/compta/sociales/class/chargesociales.class.php @@ -289,7 +289,6 @@ class ChargeSociales extends CommonObject $this->db->rollback(); return -1; } - } diff --git a/htdocs/compta/sociales/class/paymentsocialcontribution.class.php b/htdocs/compta/sociales/class/paymentsocialcontribution.class.php index b61132ee145..1c80161736c 100644 --- a/htdocs/compta/sociales/class/paymentsocialcontribution.class.php +++ b/htdocs/compta/sociales/class/paymentsocialcontribution.class.php @@ -501,8 +501,6 @@ class PaymentSocialContribution extends CommonObject $this->fk_bank=''; $this->fk_user_creat=''; $this->fk_user_modif=''; - - } diff --git a/htdocs/contact/canvas/default/actions_contactcard_default.class.php b/htdocs/contact/canvas/default/actions_contactcard_default.class.php index bfcb5a21142..01007d28aa8 100644 --- a/htdocs/contact/canvas/default/actions_contactcard_default.class.php +++ b/htdocs/contact/canvas/default/actions_contactcard_default.class.php @@ -116,7 +116,6 @@ class ActionsContactCardDefault extends ActionsContactCardCommon { $this->LoadListDatas($limit, $offset, $sortfield, $sortorder); } - } diff --git a/htdocs/contrat/class/api_contracts.class.php b/htdocs/contrat/class/api_contracts.class.php index 8c206554ee1..1a3d90e9662 100644 --- a/htdocs/contrat/class/api_contracts.class.php +++ b/htdocs/contrat/class/api_contracts.class.php @@ -537,7 +537,6 @@ class Contracts extends DolibarrApi 'message' => 'Contract deleted' ) ); - } /** diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php index 537d18245fd..7fd4d923bc1 100644 --- a/htdocs/contrat/class/contrat.class.php +++ b/htdocs/contrat/class/contrat.class.php @@ -45,22 +45,22 @@ class Contrat extends CommonObject * @var string ID to identify managed object */ public $element='contrat'; - + /** * @var string Name of table without prefix where object is stored */ public $table_element='contrat'; - + public $table_element_line='contratdet'; public $fk_element='fk_contrat'; public $picto='contract'; - + /** * 0=No test on entity, 1=Test with field entity, 2=Test with link by societe * @var int */ public $ismultientitymanaged = 1; - + /** * 0=Default, 1=View may be restricted to sales representative only if no permission to see all or to company of external user if external user * @var integer @@ -520,7 +520,6 @@ class Contrat extends CommonObject $this->db->rollback(); return -1; } - } /** @@ -699,7 +698,6 @@ class Contrat extends CommonObject $this->error=$this->db->error(); return -1; } - } /** @@ -2465,7 +2463,7 @@ class ContratLigne extends CommonObjectLine * @var string ID to identify managed object */ public $element='contratdet'; - + /** * @var string Name of table without prefix where object is stored */ @@ -2475,7 +2473,7 @@ class ContratLigne extends CommonObjectLine * @var int ID */ public $id; - + var $ref; var $tms; diff --git a/htdocs/core/boxes/box_clients.php b/htdocs/core/boxes/box_clients.php index fc31baee716..a3383370e40 100644 --- a/htdocs/core/boxes/box_clients.php +++ b/htdocs/core/boxes/box_clients.php @@ -163,7 +163,6 @@ class box_clients extends ModeleBoxes 'text' => $langs->trans("ReadPermissionNotAllowed") ); } - } /** diff --git a/htdocs/core/boxes/box_comptes.php b/htdocs/core/boxes/box_comptes.php index b951e0fe79b..5e0582fd49c 100644 --- a/htdocs/core/boxes/box_comptes.php +++ b/htdocs/core/boxes/box_comptes.php @@ -174,7 +174,6 @@ class box_comptes extends ModeleBoxes 'text' => $langs->trans("ReadPermissionNotAllowed") ); } - } /** diff --git a/htdocs/core/boxes/box_factures_fourn_imp.php b/htdocs/core/boxes/box_factures_fourn_imp.php index 9f696eac2b9..75561643526 100644 --- a/htdocs/core/boxes/box_factures_fourn_imp.php +++ b/htdocs/core/boxes/box_factures_fourn_imp.php @@ -191,7 +191,6 @@ class box_factures_fourn_imp extends ModeleBoxes 'text' => $langs->trans("ReadPermissionNotAllowed") ); } - } /** diff --git a/htdocs/core/boxes/box_fournisseurs.php b/htdocs/core/boxes/box_fournisseurs.php index 1bfd7d7ac16..6878c1780a5 100644 --- a/htdocs/core/boxes/box_fournisseurs.php +++ b/htdocs/core/boxes/box_fournisseurs.php @@ -150,7 +150,6 @@ class box_fournisseurs extends ModeleBoxes 'text' => $langs->trans("ReadPermissionNotAllowed") ); } - } /** diff --git a/htdocs/core/boxes/box_goodcustomers.php b/htdocs/core/boxes/box_goodcustomers.php index 334cbc0fc56..16668987a40 100644 --- a/htdocs/core/boxes/box_goodcustomers.php +++ b/htdocs/core/boxes/box_goodcustomers.php @@ -159,7 +159,6 @@ class box_goodcustomers extends ModeleBoxes 'text' => $langs->trans("ReadPermissionNotAllowed") ); } - } /** diff --git a/htdocs/core/boxes/box_graph_product_distribution.php b/htdocs/core/boxes/box_graph_product_distribution.php index 9ed59422466..66c3bf1145a 100644 --- a/htdocs/core/boxes/box_graph_product_distribution.php +++ b/htdocs/core/boxes/box_graph_product_distribution.php @@ -401,7 +401,6 @@ class box_graph_product_distribution extends ModeleBoxes 'text' => $mesg ); } - } /** diff --git a/htdocs/core/boxes/box_lastlogin.php b/htdocs/core/boxes/box_lastlogin.php index 38745616aa4..c8149c6384b 100644 --- a/htdocs/core/boxes/box_lastlogin.php +++ b/htdocs/core/boxes/box_lastlogin.php @@ -98,7 +98,6 @@ class box_lastlogin extends ModeleBoxes 'td' => '', 'text' => $tmp, ); - } diff --git a/htdocs/core/boxes/box_members.php b/htdocs/core/boxes/box_members.php index 063a7390808..3b556e6d5db 100644 --- a/htdocs/core/boxes/box_members.php +++ b/htdocs/core/boxes/box_members.php @@ -168,7 +168,6 @@ class box_members extends ModeleBoxes 'text' => $langs->trans("ReadPermissionNotAllowed") ); } - } /** diff --git a/htdocs/core/boxes/box_project.php b/htdocs/core/boxes/box_project.php index 6c959deb303..cb45c12351e 100644 --- a/htdocs/core/boxes/box_project.php +++ b/htdocs/core/boxes/box_project.php @@ -184,7 +184,6 @@ class box_project extends ModeleBoxes 'td' => '', 'text' => " ", ); - } /** diff --git a/htdocs/core/boxes/box_services_contracts.php b/htdocs/core/boxes/box_services_contracts.php index 38532ca3d2f..87cf179daaf 100644 --- a/htdocs/core/boxes/box_services_contracts.php +++ b/htdocs/core/boxes/box_services_contracts.php @@ -222,7 +222,6 @@ class box_services_contracts extends ModeleBoxes 'text' => $langs->trans("ReadPermissionNotAllowed") ); } - } /** diff --git a/htdocs/core/boxes/box_task.php b/htdocs/core/boxes/box_task.php index 7d40ee8482d..9625cfa1bea 100644 --- a/htdocs/core/boxes/box_task.php +++ b/htdocs/core/boxes/box_task.php @@ -137,7 +137,6 @@ class box_task extends ModeleBoxes $this->info_box_contents[$i][] = array('td' => 'align="right" ', 'text' => ConvertSecondToTime($totalplannedtot,'all',25200,5)); $this->info_box_contents[$i][] = array('td' => 'align="right" ', 'text' => ConvertSecondToTime($totaldurationtot,'all',25200,5)); $this->info_box_contents[$i][] = array('td' => '', 'text' => ""); - } /** diff --git a/htdocs/core/class/CMailFile.class.php b/htdocs/core/class/CMailFile.class.php index f5382a91550..51f2ae671ef 100644 --- a/htdocs/core/class/CMailFile.class.php +++ b/htdocs/core/class/CMailFile.class.php @@ -471,7 +471,6 @@ class CMailFile // -------------------------------------- $this->error = 'Bad value for sendmode'; } - } diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php index 8f3f763f0b2..c0ac94461e0 100644 --- a/htdocs/core/class/commondocgenerator.class.php +++ b/htdocs/core/class/commondocgenerator.class.php @@ -767,7 +767,6 @@ abstract class CommonDocGenerator } return $array_to_fill; - } diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php index 1b9e9c73224..111ae066821 100644 --- a/htdocs/core/class/commonobject.class.php +++ b/htdocs/core/class/commonobject.class.php @@ -1063,7 +1063,6 @@ abstract class CommonObject dol_print_error($this->db); return -1; } - } /** @@ -2026,7 +2025,6 @@ abstract class CommonObject $this->db->commit(); return 1; } - } @@ -4622,7 +4620,6 @@ abstract class CommonObject if (isset($conf->global->$keyforfieldname)) return $conf->global->$keyforfieldname; // TODO Ad here a scan into table llx_overwrite_default with a filter on $this->element and $fieldname - } diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php index c86051d7088..34b2fd97c55 100644 --- a/htdocs/core/class/conf.class.php +++ b/htdocs/core/class/conf.class.php @@ -666,7 +666,6 @@ class Conf $this->loghandlers[$handler] = $loghandlerinstance; } } - } } diff --git a/htdocs/core/class/coreobject.class.php b/htdocs/core/class/coreobject.class.php index fbd7b7b1448..215ad36ba60 100644 --- a/htdocs/core/class/coreobject.class.php +++ b/htdocs/core/class/coreobject.class.php @@ -75,7 +75,6 @@ class CoreObject extends CommonObject { return false; } - } /** @@ -271,7 +270,6 @@ class CoreObject extends CommonObject $this->db->rollback(); return -1; } - } /** diff --git a/htdocs/core/class/doleditor.class.php b/htdocs/core/class/doleditor.class.php index 860d89afea8..98fed20a691 100644 --- a/htdocs/core/class/doleditor.class.php +++ b/htdocs/core/class/doleditor.class.php @@ -135,7 +135,6 @@ class DolEditor $this->height = $height; $this->width = $width; } - } /** diff --git a/htdocs/core/class/dolreceiptprinter.class.php b/htdocs/core/class/dolreceiptprinter.class.php index eb40e974ca9..57f2e42922c 100644 --- a/htdocs/core/class/dolreceiptprinter.class.php +++ b/htdocs/core/class/dolreceiptprinter.class.php @@ -204,7 +204,6 @@ class dolReceiptPrinter extends Escpos 'dol_print_if_customer_tax_number', 'dol_print_if_customer_account_balance_positive', ); - } /** diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php index 2d0398dae16..06a096337ba 100644 --- a/htdocs/core/class/extrafields.class.php +++ b/htdocs/core/class/extrafields.class.php @@ -460,7 +460,6 @@ class ExtraFields { return 0; } - } /** @@ -500,7 +499,6 @@ class ExtraFields { return 0; } - } /** @@ -610,7 +608,6 @@ class ExtraFields { return 0; } - } /** diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php index 15e22944d83..8d550a922b4 100644 --- a/htdocs/core/class/html.formfile.class.php +++ b/htdocs/core/class/html.formfile.class.php @@ -1658,7 +1658,6 @@ class FormFile // Include template include DOL_DOCUMENT_ROOT.'/core/tpl/ajax/fileupload_view.tpl.php'; - } /** diff --git a/htdocs/core/class/link.class.php b/htdocs/core/class/link.class.php index 0d695baaf8d..fd3616a9414 100644 --- a/htdocs/core/class/link.class.php +++ b/htdocs/core/class/link.class.php @@ -385,7 +385,6 @@ class Link extends CommonObject $this->db->rollback(); return -1; } - } } diff --git a/htdocs/core/class/rssparser.class.php b/htdocs/core/class/rssparser.class.php index 34738c09bf7..587575ccd49 100644 --- a/htdocs/core/class/rssparser.class.php +++ b/htdocs/core/class/rssparser.class.php @@ -786,6 +786,5 @@ function xml2php($xml) } return $array; - } diff --git a/htdocs/core/class/smtps.class.php b/htdocs/core/class/smtps.class.php index c18e2232c01..ea7d5a769fa 100644 --- a/htdocs/core/class/smtps.class.php +++ b/htdocs/core/class/smtps.class.php @@ -1165,7 +1165,6 @@ class SMTPs $this->_setErr(102, 'eMail type not defined.'); return false; } - } /** diff --git a/htdocs/core/lib/bank.lib.php b/htdocs/core/lib/bank.lib.php index 3116d85287a..ded980e3246 100644 --- a/htdocs/core/lib/bank.lib.php +++ b/htdocs/core/lib/bank.lib.php @@ -215,7 +215,6 @@ function checkSwiftForAccount($account) } else { return false; } - } /** diff --git a/htdocs/core/lib/date.lib.php b/htdocs/core/lib/date.lib.php index 084c06a08e1..1b10f6d4233 100644 --- a/htdocs/core/lib/date.lib.php +++ b/htdocs/core/lib/date.lib.php @@ -439,7 +439,6 @@ function dol_get_next_week($day, $week, $month, $year) $tmparray=dol_getdate($time,true); return array('year' => $tmparray['year'], 'month' => $tmparray['mon'], 'day' => $tmparray['mday']); - } /** Return GMT time for first day of a month or year diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php index a7001d357b8..feb41f5dffd 100644 --- a/htdocs/core/lib/files.lib.php +++ b/htdocs/core/lib/files.lib.php @@ -651,7 +651,6 @@ function dolReplaceInFile($srcfile, $arrayreplacement, $destfile='', $newmask=0, function dolReplaceRegExInFile($srcfile, $arrayreplacement, $destfile='', $newmask=0, $indexdatabase=0) { // TODO - } /** diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 8a06a0d7764..412b1427f46 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -4859,7 +4859,6 @@ function get_localtax_by_third($local) } return 0; - } diff --git a/htdocs/core/lib/resource.lib.php b/htdocs/core/lib/resource.lib.php index bf586b83f88..6dcc7825153 100644 --- a/htdocs/core/lib/resource.lib.php +++ b/htdocs/core/lib/resource.lib.php @@ -114,5 +114,4 @@ function resource_admin_prepare_head() complete_head_from_modules($conf,$langs,null,$head,$h,'resource_admin','remove'); return $head; - } diff --git a/htdocs/core/menus/standard/empty.php b/htdocs/core/menus/standard/empty.php index a9d8e2f9a41..172b6c483c5 100644 --- a/htdocs/core/menus/standard/empty.php +++ b/htdocs/core/menus/standard/empty.php @@ -57,7 +57,6 @@ class MenuManager */ function loadMenu() { - } diff --git a/htdocs/core/modules/bank/doc/pdf_ban.modules.php b/htdocs/core/modules/bank/doc/pdf_ban.modules.php index 710d996757c..8b1a9d165ef 100644 --- a/htdocs/core/modules/bank/doc/pdf_ban.modules.php +++ b/htdocs/core/modules/bank/doc/pdf_ban.modules.php @@ -280,8 +280,6 @@ class pdf_ban extends ModeleBankAccountDoc global $conf,$mysoc; $default_font_size = pdf_getPDFFontSize($outputlangs); - - } /** @@ -368,7 +366,6 @@ class pdf_ban extends ModeleBankAccountDoc } } */ - } /** diff --git a/htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php b/htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php index 2061b03d2ae..5ec25f994df 100644 --- a/htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php +++ b/htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php @@ -423,7 +423,6 @@ class pdf_sepamandate extends ModeleBankAccountDoc global $conf,$mysoc; $default_font_size = pdf_getPDFFontSize($outputlangs); - } @@ -592,7 +591,6 @@ class pdf_sepamandate extends ModeleBankAccountDoc } } */ - } /** diff --git a/htdocs/core/modules/barcode/mod_barcode_product_standard.php b/htdocs/core/modules/barcode/mod_barcode_product_standard.php index 3e233eb1843..f494219c445 100644 --- a/htdocs/core/modules/barcode/mod_barcode_product_standard.php +++ b/htdocs/core/modules/barcode/mod_barcode_product_standard.php @@ -253,7 +253,6 @@ class mod_barcode_product_standard extends ModeleNumRefBarCode { return -2; } - } /** diff --git a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php index c3a5d143c48..224688b9982 100644 --- a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php +++ b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php @@ -654,7 +654,6 @@ class pdf_einstein extends ModelePDFCommandes */ function _tableau_versements(&$pdf, $object, $posy, $outputlangs) { - } diff --git a/htdocs/core/modules/dons/html_cerfafr.modules.php b/htdocs/core/modules/dons/html_cerfafr.modules.php index c9d2b4984ad..a8334e050c7 100644 --- a/htdocs/core/modules/dons/html_cerfafr.modules.php +++ b/htdocs/core/modules/dons/html_cerfafr.modules.php @@ -424,5 +424,4 @@ $chif2=array('', 'dix', 'vingt', 'trente', 'quarante', 'cinquante', 'soixante', return $somme. ' et zéro '. $dev2; else return $somme. $trio_c. ' ' .$secon_c. ' ' . $dev2; - } diff --git a/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php b/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php index 84a9831223b..af534ec1571 100644 --- a/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php +++ b/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php @@ -832,7 +832,6 @@ class pdf_rouget extends ModelePdfExpedition } } - } /** diff --git a/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php b/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php index 2d6a8850ed8..e974f72fabd 100644 --- a/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php +++ b/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php @@ -776,7 +776,6 @@ class pdf_standard extends ModeleExpenseReport } } } - } /** diff --git a/htdocs/core/modules/export/export_csv.modules.php b/htdocs/core/modules/export/export_csv.modules.php index 10014eb6d6c..77f754a504b 100644 --- a/htdocs/core/modules/export/export_csv.modules.php +++ b/htdocs/core/modules/export/export_csv.modules.php @@ -76,7 +76,6 @@ class ExportCsv extends ModeleExports // If driver use an external library, put its name here $this->label_lib='Dolibarr'; $this->version_lib=DOL_VERSION; - } /** diff --git a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php index 7eb5abe1e5c..3762cfc2d0a 100644 --- a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php +++ b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php @@ -910,7 +910,6 @@ class pdf_crabe extends ModelePDFFactures $this->error=$this->db->lasterror(); return -1; } - } diff --git a/htdocs/core/modules/mailings/advthirdparties.modules.php b/htdocs/core/modules/mailings/advthirdparties.modules.php index 08249104909..53ca23a9880 100644 --- a/htdocs/core/modules/mailings/advthirdparties.modules.php +++ b/htdocs/core/modules/mailings/advthirdparties.modules.php @@ -277,7 +277,6 @@ class mailing_advthirdparties extends MailingTargets $s.=''; return $s; - } diff --git a/htdocs/core/modules/mailings/thirdparties.modules.php b/htdocs/core/modules/mailings/thirdparties.modules.php index f7a2ed5bc3c..523f26290b7 100644 --- a/htdocs/core/modules/mailings/thirdparties.modules.php +++ b/htdocs/core/modules/mailings/thirdparties.modules.php @@ -309,7 +309,6 @@ class mailing_thirdparties extends MailingTargets $s.=''; $s.=''; return $s; - } diff --git a/htdocs/core/modules/mailings/xinputuser.modules.php b/htdocs/core/modules/mailings/xinputuser.modules.php index 794de3d9294..f733f6de134 100644 --- a/htdocs/core/modules/mailings/xinputuser.modules.php +++ b/htdocs/core/modules/mailings/xinputuser.modules.php @@ -157,7 +157,6 @@ class mailing_xinputuser extends MailingTargets $this->error = $langs->trans("ErrorBadEmail",$email); return -1; } - } } diff --git a/htdocs/core/modules/member/modules_cards.php b/htdocs/core/modules/member/modules_cards.php index 4e3e1a2dac4..9c277df6108 100644 --- a/htdocs/core/modules/member/modules_cards.php +++ b/htdocs/core/modules/member/modules_cards.php @@ -163,7 +163,5 @@ function members_card_pdf_create($db, $arrayofmembers, $modele, $outputlangs, $o dol_print_error('',$langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists",$file)); return -1; } - - } diff --git a/htdocs/core/modules/modAccounting.class.php b/htdocs/core/modules/modAccounting.class.php index ba56042ec61..8aef56a4e57 100644 --- a/htdocs/core/modules/modAccounting.class.php +++ b/htdocs/core/modules/modAccounting.class.php @@ -287,6 +287,5 @@ class modAccounting extends DolibarrModules 'aa.account_parent'=>array('rule'=>'zeroifnull'), ); $this->import_examplevalues_array[$r]=array('aa.fk_pcg_version'=>"PCG99-ABREGE",'aa.account_number'=>"707",'aa.label'=>"Product sales",'aa.account_parent'=>"1407","aa.fk_accounting_category"=>"","aa.pcg_type"=>"PROD",'aa.pcg_subtype'=>'PRODUCT','aa.active'=>'1','aa.datec'=>"2017-04-28"); - } } diff --git a/htdocs/core/modules/modAdherent.class.php b/htdocs/core/modules/modAdherent.class.php index de84c653060..4c22f4b31b4 100644 --- a/htdocs/core/modules/modAdherent.class.php +++ b/htdocs/core/modules/modAdherent.class.php @@ -362,7 +362,6 @@ class modAdherent extends DolibarrModules 'test'=>true, ), ); - } diff --git a/htdocs/core/modules/modAgenda.class.php b/htdocs/core/modules/modAgenda.class.php index d5620d6805b..405e60c0190 100644 --- a/htdocs/core/modules/modAgenda.class.php +++ b/htdocs/core/modules/modAgenda.class.php @@ -419,7 +419,6 @@ class modAgenda extends DolibarrModules if (empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .=' AND (sc.fk_user = '.(empty($user)?0:$user->id).' OR ac.fk_soc IS NULL)'; if (empty($user->rights->agenda->allactions->read)) $this->export_sql_end[$r] .=' AND acr.fk_element = '.(empty($user)?0:$user->id); $this->export_sql_end[$r] .=' ORDER BY ac.datep'; - } } diff --git a/htdocs/core/modules/modBanque.class.php b/htdocs/core/modules/modBanque.class.php index 602085b9f5a..3ca1a082580 100644 --- a/htdocs/core/modules/modBanque.class.php +++ b/htdocs/core/modules/modBanque.class.php @@ -199,7 +199,6 @@ class modBanque extends DolibarrModules $this->export_sql_end[$r] .=' AND p.fk_paiement = 7'; $this->export_sql_end[$r] .=' AND ba.entity IN ('.getEntity('bank_account').')'; $this->export_sql_order[$r] =' ORDER BY b.datev, b.num_releve'; - } diff --git a/htdocs/core/modules/modBookmark.class.php b/htdocs/core/modules/modBookmark.class.php index 191e12bc2eb..db844393cd0 100644 --- a/htdocs/core/modules/modBookmark.class.php +++ b/htdocs/core/modules/modBookmark.class.php @@ -101,6 +101,5 @@ class modBookmark extends DolibarrModules // Menus //------- $this->menu = 1; // This module add menu entries. They are coded into menu manager. - } } diff --git a/htdocs/core/modules/modComptabilite.class.php b/htdocs/core/modules/modComptabilite.class.php index 41349d214fc..3c523a61ab4 100644 --- a/htdocs/core/modules/modComptabilite.class.php +++ b/htdocs/core/modules/modComptabilite.class.php @@ -98,7 +98,6 @@ class modComptabilite extends DolibarrModules // Menus //------- $this->menu = 1; // This module add menu entries. They are coded into menu manager. - } diff --git a/htdocs/core/modules/modDon.class.php b/htdocs/core/modules/modDon.class.php index dacfad736bf..76bdb2ccb63 100644 --- a/htdocs/core/modules/modDon.class.php +++ b/htdocs/core/modules/modDon.class.php @@ -140,7 +140,6 @@ class modDon extends DolibarrModules // Menus //------- $this->menu = 1; // This module add menu entries. They are coded into menu manager. - } diff --git a/htdocs/core/modules/modDynamicPrices.class.php b/htdocs/core/modules/modDynamicPrices.class.php index c7bc152ff64..a164bec953c 100644 --- a/htdocs/core/modules/modDynamicPrices.class.php +++ b/htdocs/core/modules/modDynamicPrices.class.php @@ -82,6 +82,5 @@ class modDynamicPrices extends DolibarrModules $this->rights = array(); $this->rights_class = 'dynamicprices'; $r=0; - } } diff --git a/htdocs/core/modules/modExport.class.php b/htdocs/core/modules/modExport.class.php index b88438f5fe1..9b0d2e42a45 100644 --- a/htdocs/core/modules/modExport.class.php +++ b/htdocs/core/modules/modExport.class.php @@ -94,6 +94,5 @@ class modExport extends DolibarrModules // Menus //------- $this->menu = 1; // This module add menu entries. They are coded into menu manager. - } } diff --git a/htdocs/core/modules/modExternalSite.class.php b/htdocs/core/modules/modExternalSite.class.php index 18bb0b000b2..374e9b2f02a 100644 --- a/htdocs/core/modules/modExternalSite.class.php +++ b/htdocs/core/modules/modExternalSite.class.php @@ -113,7 +113,6 @@ class modExternalSite extends DolibarrModules 'user'=>0 ); $r++; - } } diff --git a/htdocs/core/modules/modFicheinter.class.php b/htdocs/core/modules/modFicheinter.class.php index 7db2ac45e30..d30da2d3664 100644 --- a/htdocs/core/modules/modFicheinter.class.php +++ b/htdocs/core/modules/modFicheinter.class.php @@ -196,7 +196,6 @@ class modFicheinter extends DolibarrModules $this->export_sql_end[$r] .=' WHERE f.fk_soc = s.rowid'; $this->export_sql_end[$r] .=' AND f.entity IN ('.getEntity('intervention').')'; $r++; - } diff --git a/htdocs/core/modules/modHRM.class.php b/htdocs/core/modules/modHRM.class.php index d713b4edc4a..5da8cf74e71 100644 --- a/htdocs/core/modules/modHRM.class.php +++ b/htdocs/core/modules/modHRM.class.php @@ -120,7 +120,6 @@ class modHRM extends DolibarrModules // Menus //------- $this->menu = 1; // This module add menu entries. They are coded into menu manager. - } /** diff --git a/htdocs/core/modules/modImport.class.php b/htdocs/core/modules/modImport.class.php index ffaac0bf29e..42bbc07c616 100644 --- a/htdocs/core/modules/modImport.class.php +++ b/htdocs/core/modules/modImport.class.php @@ -91,6 +91,5 @@ class modImport extends DolibarrModules // Menus //------- $this->menu = 1; // This module add menu entries. They are coded into menu manager. - } } diff --git a/htdocs/core/modules/modLabel.class.php b/htdocs/core/modules/modLabel.class.php index 563dddca3cc..915b9e732a1 100644 --- a/htdocs/core/modules/modLabel.class.php +++ b/htdocs/core/modules/modLabel.class.php @@ -90,7 +90,6 @@ class modLabel extends DolibarrModules $this->rights[4][1] = 'Supprimer les etiquettes'; // libelle de la permission $this->rights[4][3] = 0; // La permission est-elle une permission par defaut $this->rights[4][4] = 'supprimer'; - } /** diff --git a/htdocs/core/modules/modLoan.class.php b/htdocs/core/modules/modLoan.class.php index 70386a1647a..662ded1da21 100644 --- a/htdocs/core/modules/modLoan.class.php +++ b/htdocs/core/modules/modLoan.class.php @@ -145,7 +145,6 @@ class modLoan extends DolibarrModules // Exports //-------- $r=0; - } diff --git a/htdocs/core/modules/modMailing.class.php b/htdocs/core/modules/modMailing.class.php index 062b9113e76..749369ee8e9 100644 --- a/htdocs/core/modules/modMailing.class.php +++ b/htdocs/core/modules/modMailing.class.php @@ -133,7 +133,6 @@ class modMailing extends DolibarrModules // Menus //------- $this->menu = 1; // This module add menu entries. They are coded into menu manager. - } diff --git a/htdocs/core/modules/modMailmanSpip.class.php b/htdocs/core/modules/modMailmanSpip.class.php index 8403147fd74..e1a8f7c2cd6 100644 --- a/htdocs/core/modules/modMailmanSpip.class.php +++ b/htdocs/core/modules/modMailmanSpip.class.php @@ -83,6 +83,5 @@ class modMailmanSpip extends DolibarrModules // Menus //------- $this->menu = 1; // This module add menu entries. They are coded into menu manager. - } } diff --git a/htdocs/core/modules/modModuleBuilder.class.php b/htdocs/core/modules/modModuleBuilder.class.php index 3f106de6c78..b27a03cc798 100644 --- a/htdocs/core/modules/modModuleBuilder.class.php +++ b/htdocs/core/modules/modModuleBuilder.class.php @@ -98,6 +98,5 @@ class modModuleBuilder extends DolibarrModules 'enabled'=>'$conf->modulebuilder->enabled && preg_match(\'/^(admintools|all)/\',$leftmenu) && ($user->admin || $conf->global->MODULEBUILDER_FOREVERYONE)', 'target'=>'_modulebuilder', 'user'=>0); - } } diff --git a/htdocs/core/modules/modOauth.class.php b/htdocs/core/modules/modOauth.class.php index 74689230525..674b7c88fe7 100644 --- a/htdocs/core/modules/modOauth.class.php +++ b/htdocs/core/modules/modOauth.class.php @@ -119,8 +119,6 @@ class modOauth extends DolibarrModules // 'user'=>0); // 0=Menu for internal users, 1=external users, 2=both //$r++; - - } diff --git a/htdocs/core/modules/modPrelevement.class.php b/htdocs/core/modules/modPrelevement.class.php index cc74273d29c..afa7ac3abb8 100644 --- a/htdocs/core/modules/modPrelevement.class.php +++ b/htdocs/core/modules/modPrelevement.class.php @@ -135,7 +135,6 @@ class modPrelevement extends DolibarrModules // Menus //------- $this->menu = 1; // This module add menu entries. They are coded into menu manager. - } diff --git a/htdocs/core/modules/modPrinting.class.php b/htdocs/core/modules/modPrinting.class.php index ea086e2dbbe..d66e8d21d6f 100644 --- a/htdocs/core/modules/modPrinting.class.php +++ b/htdocs/core/modules/modPrinting.class.php @@ -117,7 +117,5 @@ class modPrinting extends DolibarrModules 'user'=>0); // 0=Menu for internal users, 1=external users, 2=both $r++; - - } } diff --git a/htdocs/core/modules/modProductBatch.class.php b/htdocs/core/modules/modProductBatch.class.php index ac968233772..dd5fa032394 100644 --- a/htdocs/core/modules/modProductBatch.class.php +++ b/htdocs/core/modules/modProductBatch.class.php @@ -104,7 +104,6 @@ class modProductBatch extends DolibarrModules // Exports $r=0; - } /** diff --git a/htdocs/core/modules/modPropale.class.php b/htdocs/core/modules/modPropale.class.php index 5b3b2fdd4d8..68f3a222e96 100644 --- a/htdocs/core/modules/modPropale.class.php +++ b/htdocs/core/modules/modPropale.class.php @@ -283,6 +283,5 @@ class modPropale extends DolibarrModules ); return $this->_init($sql,$options); - } } diff --git a/htdocs/core/modules/modReceiptPrinter.class.php b/htdocs/core/modules/modReceiptPrinter.class.php index b2ed975a404..1622b2a8766 100644 --- a/htdocs/core/modules/modReceiptPrinter.class.php +++ b/htdocs/core/modules/modReceiptPrinter.class.php @@ -119,8 +119,6 @@ class modReceiptPrinter extends DolibarrModules // 'user'=>0); // 0=Menu for internal users, 1=external users, 2=both $r++; - - } diff --git a/htdocs/core/modules/modResource.class.php b/htdocs/core/modules/modResource.class.php index b088a301c6b..d125a9c55ac 100644 --- a/htdocs/core/modules/modResource.class.php +++ b/htdocs/core/modules/modResource.class.php @@ -285,7 +285,6 @@ class modResource extends DolibarrModules $this->import_regex_array[$r]=array('s.datec'=>'^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]( [0-9][0-9]:[0-9][0-9]:[0-9][0-9])?$'); $this->import_examplevalues_array[$r]=array('r.ref'=>"REF1",'r.fk_code_type_resource'=>"Code from dictionary resource type",'r.datec'=>"2017-01-01 or 2017-01-01 12:30:00"); $this->import_updatekeys_array[$r]=array('r.rf'=>'ResourceFormLabel_ref'); - } /** diff --git a/htdocs/core/modules/modStock.class.php b/htdocs/core/modules/modStock.class.php index 9622e087699..e6064d57ec0 100644 --- a/htdocs/core/modules/modStock.class.php +++ b/htdocs/core/modules/modStock.class.php @@ -348,7 +348,6 @@ class modStock extends DolibarrModules $this->import_run_sql_after_array[$r]=array( // Because we may change data that are denormalized, we must update dernormalized data after. 'UPDATE llx_product p SET p.stock= (SELECT SUM(ps.reel) FROM llx_product_stock ps WHERE ps.fk_product = p.rowid);' ); - } diff --git a/htdocs/core/modules/modTax.class.php b/htdocs/core/modules/modTax.class.php index 91ed84366de..7dacae51b67 100644 --- a/htdocs/core/modules/modTax.class.php +++ b/htdocs/core/modules/modTax.class.php @@ -174,7 +174,6 @@ class modTax extends DolibarrModules $this->import_examplevalues_array[$r]=array('t.label'=>"VAT Payment 1st quarter 2016",'t.fk_typepayment'=>"CHQ (must be id or code found into dictionary)", 't.datep'=>"2016-04-02", 't.datev'=>"2016-03-31", 't.amount'=>1000, 't.num_payment'=>'123456' ); - } diff --git a/htdocs/core/modules/modUser.class.php b/htdocs/core/modules/modUser.class.php index 19e146a6e8c..c9a69a7e053 100644 --- a/htdocs/core/modules/modUser.class.php +++ b/htdocs/core/modules/modUser.class.php @@ -291,7 +291,6 @@ class modUser extends DolibarrModules 'u.email'=>"test@mycompany.com",'u.salary'=>"10000",'u.note'=>"This is an example of note for record",'u.datec'=>"2015-01-01 or 2015-01-01 12:30:00" ); $this->import_updatekeys_array[$r]=array('u.lastname'=>'Lastname','u.firstname'=>'Firstname','u.login'=>'Login'); - } diff --git a/htdocs/core/modules/printsheet/modules_labels.php b/htdocs/core/modules/printsheet/modules_labels.php index 047d7aeed76..8c64c202f9d 100644 --- a/htdocs/core/modules/printsheet/modules_labels.php +++ b/htdocs/core/modules/printsheet/modules_labels.php @@ -164,7 +164,5 @@ function doc_label_pdf_create($db, $arrayofrecords, $modele, $outputlangs, $outp dol_print_error('',$langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists",$file)); return -1; } - - } diff --git a/htdocs/core/modules/product/mod_codeproduct_elephant.php b/htdocs/core/modules/product/mod_codeproduct_elephant.php index 32941ca1ec9..ec31adfb609 100644 --- a/htdocs/core/modules/product/mod_codeproduct_elephant.php +++ b/htdocs/core/modules/product/mod_codeproduct_elephant.php @@ -303,7 +303,6 @@ class mod_codeproduct_elephant extends ModeleProductCode { return -2; } - } } diff --git a/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php b/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php index 5bede258b07..ce2d0fec7d3 100644 --- a/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php +++ b/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php @@ -177,7 +177,6 @@ class doc_generic_project_odt extends ModelePDFProjects $resarray = $this->fill_substitutionarray_with_extrafields($task,$resarray,$extrafields,'task',$outputlangs); return $resarray; - } /** diff --git a/htdocs/core/modules/project/doc/pdf_timespent.modules.php b/htdocs/core/modules/project/doc/pdf_timespent.modules.php index 6bcfe287b70..a03b1ee8a57 100644 --- a/htdocs/core/modules/project/doc/pdf_timespent.modules.php +++ b/htdocs/core/modules/project/doc/pdf_timespent.modules.php @@ -582,7 +582,6 @@ class pdf_timespent extends ModelePDFProjects } } */ - } /** diff --git a/htdocs/core/modules/propale/doc/pdf_azur.modules.php b/htdocs/core/modules/propale/doc/pdf_azur.modules.php index 4d52707649e..5393c5b9804 100644 --- a/htdocs/core/modules/propale/doc/pdf_azur.modules.php +++ b/htdocs/core/modules/propale/doc/pdf_azur.modules.php @@ -839,7 +839,6 @@ class pdf_azur extends ModelePDFPropales */ function _tableau_versements(&$pdf, $object, $posy, $outputlangs) { - } diff --git a/htdocs/core/modules/rapport/pdf_paiement.class.php b/htdocs/core/modules/rapport/pdf_paiement.class.php index a645b105610..3e050f12b9e 100644 --- a/htdocs/core/modules/rapport/pdf_paiement.class.php +++ b/htdocs/core/modules/rapport/pdf_paiement.class.php @@ -80,7 +80,6 @@ class pdf_paiement } // which type of document will be generated: clients (client) or providers (fourn) invoices $this->doc_type = "client"; - } diff --git a/htdocs/core/modules/security/generate/modGeneratePassPerso.class.php b/htdocs/core/modules/security/generate/modGeneratePassPerso.class.php index 60537bca1d3..d0ae019bf09 100644 --- a/htdocs/core/modules/security/generate/modGeneratePassPerso.class.php +++ b/htdocs/core/modules/security/generate/modGeneratePassPerso.class.php @@ -113,7 +113,6 @@ class modGeneratePassPerso extends ModeleGenPassword //$this->All = str_shuffle($this->Maj. $this->Min. $this->Nb. $this->Spe); //$this->All = $this->Maj. $this->Min. $this->Nb. $this->Spe; //$this->All = $this->Spe; - } /** diff --git a/htdocs/core/modules/societe/mod_codeclient_elephant.php b/htdocs/core/modules/societe/mod_codeclient_elephant.php index 993bb2ed2b3..c9cc44c8479 100644 --- a/htdocs/core/modules/societe/mod_codeclient_elephant.php +++ b/htdocs/core/modules/societe/mod_codeclient_elephant.php @@ -323,7 +323,6 @@ class mod_codeclient_elephant extends ModeleThirdPartyCode { return -2; } - } } diff --git a/htdocs/core/modules/stock/doc/pdf_standard.modules.php b/htdocs/core/modules/stock/doc/pdf_standard.modules.php index 6adcd2e9cb7..9cc092875bf 100644 --- a/htdocs/core/modules/stock/doc/pdf_standard.modules.php +++ b/htdocs/core/modules/stock/doc/pdf_standard.modules.php @@ -898,7 +898,6 @@ class pdf_standard extends ModelePDFStock $pdf->SetLineStyle(array('dash'=>'0','color'=>array(220,26,26))); $pdf->line($this->marge_gauche, $tab_top+11, $this->page_largeur-$this->marge_droite, $tab_top+11); $pdf->SetLineStyle(array('dash'=>0)); - } /** diff --git a/htdocs/core/modules/stock/doc/pdf_stdmovement.modules.php b/htdocs/core/modules/stock/doc/pdf_stdmovement.modules.php index 5f8a62a90c6..3413a49549a 100644 --- a/htdocs/core/modules/stock/doc/pdf_stdmovement.modules.php +++ b/htdocs/core/modules/stock/doc/pdf_stdmovement.modules.php @@ -900,7 +900,6 @@ class pdf_stdmovement extends ModelePDFMovement $pdf->SetLineStyle(array('dash'=>'0','color'=>array(220,26,26))); $pdf->line($this->marge_gauche, $tab_top+11, $this->page_largeur-$this->marge_droite, $tab_top+11); $pdf->SetLineStyle(array('dash'=>0)); - } /** diff --git a/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php b/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php index be563f4d495..158aecb8c49 100644 --- a/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php +++ b/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php @@ -923,7 +923,6 @@ class pdf_canelle extends ModelePDFSuppliersInvoices $pdf->SetXY($this->postotalht-1, $tab_top+1); $pdf->MultiCell(30,2, $outputlangs->transnoentities("TotalHTShort"),'','C'); } - } /** @@ -1015,7 +1014,6 @@ class pdf_canelle extends ModelePDFSuppliersInvoices $this->error=$this->db->lasterror(); return -1; } - } /** diff --git a/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php b/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php index 9294ff1a47e..0b4e9a89dff 100644 --- a/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php +++ b/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php @@ -715,7 +715,6 @@ class pdf_muscadet extends ModelePDFSuppliersOrders */ function _tableau_versements(&$pdf, $object, $posy, $outputlangs) { - } diff --git a/htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php b/htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php index 1bd1b89cd38..fcbb7094c3a 100644 --- a/htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php +++ b/htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php @@ -567,7 +567,6 @@ class pdf_standard extends ModelePDFSuppliersPayments // Date $pdf->SetXY($this->page_largeur - $this->marge_droite - 30, $posy); $pdf->MultiCell(150, 4, date("d").' '.$outputlangs->transnoentitiesnoconv(date("F")).' '.date("Y"), 0, 'L', 1); - } @@ -613,7 +612,6 @@ class pdf_standard extends ModelePDFSuppliersPayments // Output Rect //$this->printRect($pdf,$this->marge_gauche, $tab_top, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $tab_height, $hidetop, $hidebottom); // Rect prend une longueur en 3eme param et 4eme param - } diff --git a/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php b/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php index 7d7009a3c58..4a594e71191 100644 --- a/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php +++ b/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php @@ -707,7 +707,6 @@ class pdf_aurore extends ModelePDFSupplierProposal */ function _tableau_versements(&$pdf, $object, $posy, $outputlangs) { - } diff --git a/htdocs/dav/dav.class.php b/htdocs/dav/dav.class.php index 9e5121112d0..7d6ea446493 100644 --- a/htdocs/dav/dav.class.php +++ b/htdocs/dav/dav.class.php @@ -106,7 +106,6 @@ class CdavLib } return $sql; - } /** diff --git a/htdocs/don/class/don.class.php b/htdocs/don/class/don.class.php index 9aa55945d2b..1c22b27bfc4 100644 --- a/htdocs/don/class/don.class.php +++ b/htdocs/don/class/don.class.php @@ -691,7 +691,6 @@ class Don extends CommonObject dol_print_error($this->db); return -1; } - } /** diff --git a/htdocs/don/class/paymentdonation.class.php b/htdocs/don/class/paymentdonation.class.php index a4d89c36457..ec9535e51b7 100644 --- a/htdocs/don/class/paymentdonation.class.php +++ b/htdocs/don/class/paymentdonation.class.php @@ -490,8 +490,6 @@ class PaymentDonation extends CommonObject $this->fk_bank=''; $this->fk_user_creat=''; $this->fk_user_modif=''; - - } diff --git a/htdocs/ecm/class/ecmdirectory.class.php b/htdocs/ecm/class/ecmdirectory.class.php index 3e3559847b8..93499706614 100644 --- a/htdocs/ecm/class/ecmdirectory.class.php +++ b/htdocs/ecm/class/ecmdirectory.class.php @@ -786,7 +786,6 @@ class EcmDirectory // extends CommonObject } } return $result; - } diff --git a/htdocs/expedition/class/api_shipments.class.php b/htdocs/expedition/class/api_shipments.class.php index 0e07c3706a4..109b847fc62 100644 --- a/htdocs/expedition/class/api_shipments.class.php +++ b/htdocs/expedition/class/api_shipments.class.php @@ -472,7 +472,6 @@ class Shipments extends DolibarrApi 'message' => 'Shipment deleted' ) ); - } /** diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php index a4bcfeb2281..8c1c3cb8d20 100644 --- a/htdocs/expedition/class/expedition.class.php +++ b/htdocs/expedition/class/expedition.class.php @@ -1294,7 +1294,6 @@ class Expedition extends CommonObject $this->db->rollback(); return -1; } - } /** @@ -1703,7 +1702,6 @@ class Expedition extends CommonObject $this->lines[]=$line; $xnbp++; } - } /** @@ -1841,7 +1839,6 @@ class Expedition extends CommonObject $sql.= ' WHERE rowid='.$id; $resql = $this->db->query($sql); - } /** @@ -1857,7 +1854,6 @@ class Expedition extends CommonObject $sql.= ' WHERE rowid='.$id; $resql = $this->db->query($sql); - } diff --git a/htdocs/expensereport/class/api_expensereports.class.php b/htdocs/expensereport/class/api_expensereports.class.php index d83714356a2..80c22fb961a 100644 --- a/htdocs/expensereport/class/api_expensereports.class.php +++ b/htdocs/expensereport/class/api_expensereports.class.php @@ -445,7 +445,6 @@ class ExpenseReports extends DolibarrApi 'message' => 'Expense Report deleted' ) ); - } /** diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php index 5de34c41caa..0fb1ef518fb 100644 --- a/htdocs/expensereport/class/expensereport.class.php +++ b/htdocs/expensereport/class/expensereport.class.php @@ -895,7 +895,6 @@ class ExpenseReport extends CommonObject return -1; } } - } /** @@ -1756,8 +1755,6 @@ class ExpenseReport extends CommonObject $this->error = 'ErrorExpenseNotDraft'; return -3; } - - } /** diff --git a/htdocs/expensereport/class/paymentexpensereport.class.php b/htdocs/expensereport/class/paymentexpensereport.class.php index 417ba0fdb4a..bb0654c634a 100644 --- a/htdocs/expensereport/class/paymentexpensereport.class.php +++ b/htdocs/expensereport/class/paymentexpensereport.class.php @@ -488,8 +488,6 @@ class PaymentExpenseReport extends CommonObject $this->fk_bank=''; $this->fk_user_creat=''; $this->fk_user_modif=''; - - } diff --git a/htdocs/fichinter/class/api_interventions.class.php b/htdocs/fichinter/class/api_interventions.class.php index 7701af5fe91..7a258c8c864 100644 --- a/htdocs/fichinter/class/api_interventions.class.php +++ b/htdocs/fichinter/class/api_interventions.class.php @@ -317,7 +317,6 @@ class Interventions extends DolibarrApi 'message' => 'Intervention deleted' ) ); - } /** diff --git a/htdocs/fichinter/class/fichinter.class.php b/htdocs/fichinter/class/fichinter.class.php index 7c772d460a5..f34bb56c540 100644 --- a/htdocs/fichinter/class/fichinter.class.php +++ b/htdocs/fichinter/class/fichinter.class.php @@ -274,7 +274,6 @@ class Fichinter extends CommonObject $this->db->rollback(); return -1; } - } /** diff --git a/htdocs/fourn/class/fournisseur.class.php b/htdocs/fourn/class/fournisseur.class.php index ba486e066cc..a177fdd26a1 100644 --- a/htdocs/fourn/class/fournisseur.class.php +++ b/htdocs/fourn/class/fournisseur.class.php @@ -141,7 +141,6 @@ class Fournisseur extends Societe $this->error=$this->db->error(); return -1; } - } /** diff --git a/htdocs/fourn/class/fournisseur.commande.dispatch.class.php b/htdocs/fourn/class/fournisseur.commande.dispatch.class.php index f5933b453ed..f81507141fb 100644 --- a/htdocs/fourn/class/fournisseur.commande.dispatch.class.php +++ b/htdocs/fourn/class/fournisseur.commande.dispatch.class.php @@ -547,8 +547,6 @@ class CommandeFournisseurDispatch extends CommonObject $this->batch=''; $this->eatby=''; $this->sellby=''; - - } /** diff --git a/htdocs/fourn/class/fournisseur.product.class.php b/htdocs/fourn/class/fournisseur.product.class.php index 8f77d152036..098fba679f3 100644 --- a/htdocs/fourn/class/fournisseur.product.class.php +++ b/htdocs/fourn/class/fournisseur.product.class.php @@ -181,7 +181,6 @@ class ProductFournisseur extends Product $this->db->rollback(); return -1; } - } diff --git a/htdocs/holiday/class/holiday.class.php b/htdocs/holiday/class/holiday.class.php index 833b46b2bca..0f86476be04 100644 --- a/htdocs/holiday/class/holiday.class.php +++ b/htdocs/holiday/class/holiday.class.php @@ -1018,7 +1018,6 @@ class Holiday extends CommonObject $statut.= ''."\n"; print $statut; - } /** @@ -1248,7 +1247,6 @@ class Holiday extends CommonObject return -1; } } - } /** @@ -1326,7 +1324,6 @@ class Holiday extends CommonObject $sql.= " WHERE fk_user = '".$user_id."'"; $this->db->query($sql); - } diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/OLERead.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/OLERead.php index 261bdde5812..444d8ec641f 100644 --- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/OLERead.php +++ b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/OLERead.php @@ -289,7 +289,6 @@ class PHPExcel_Shared_OLERead { $offset += self::PROPERTY_STORAGE_BLOCK_SIZE; } - } /** diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/Chart.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/Chart.php index 4846910fa29..93e85582d5c 100644 --- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/Chart.php +++ b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/Chart.php @@ -1042,7 +1042,6 @@ class PHPExcel_Writer_Excel2007_Chart extends } $objWriter->endElement(); - } /** @@ -1322,7 +1321,6 @@ class PHPExcel_Writer_Excel2007_Chart extends $objWriter->endElement(); } $objWriter->endElement(); - } /** diff --git a/htdocs/loan/class/loan.class.php b/htdocs/loan/class/loan.class.php index ce7a1a9c57f..94008db546d 100644 --- a/htdocs/loan/class/loan.class.php +++ b/htdocs/loan/class/loan.class.php @@ -286,7 +286,6 @@ class Loan extends CommonObject $this->db->rollback(); return -1; } - } diff --git a/htdocs/modulebuilder/template/class/api_mymodule.class.php b/htdocs/modulebuilder/template/class/api_mymodule.class.php index 50527690bbb..36b8b1d3fa8 100644 --- a/htdocs/modulebuilder/template/class/api_mymodule.class.php +++ b/htdocs/modulebuilder/template/class/api_mymodule.class.php @@ -279,7 +279,6 @@ class MyModuleApi extends DolibarrApi 'message' => 'MyObject deleted' ) ); - } diff --git a/htdocs/multicurrency/class/multicurrency.class.php b/htdocs/multicurrency/class/multicurrency.class.php index c7822961570..ea1f6b56dd5 100644 --- a/htdocs/multicurrency/class/multicurrency.class.php +++ b/htdocs/multicurrency/class/multicurrency.class.php @@ -488,7 +488,6 @@ class MultiCurrency extends CommonObject $this->rate = new CurrencyRate($this->db); return $this->rate->fetch($obj->rowid); } - } /** diff --git a/htdocs/paypal/lib/paypal.lib.php b/htdocs/paypal/lib/paypal.lib.php index 4855799c508..4a6dbe63768 100644 --- a/htdocs/paypal/lib/paypal.lib.php +++ b/htdocs/paypal/lib/paypal.lib.php @@ -287,7 +287,6 @@ function print_paypal_redirect($paymentAmount,$currencyCodeType,$paymentType,$re return $mesg; } - } /** diff --git a/htdocs/product/canvas/product/actions_card_product.class.php b/htdocs/product/canvas/product/actions_card_product.class.php index a6a182fc64f..c0722fcd765 100644 --- a/htdocs/product/canvas/product/actions_card_product.class.php +++ b/htdocs/product/canvas/product/actions_card_product.class.php @@ -238,7 +238,6 @@ class ActionsCardProduct { $this->LoadListDatas($limit, $offset, $sortfield, $sortorder); } - } diff --git a/htdocs/product/canvas/service/actions_card_service.class.php b/htdocs/product/canvas/service/actions_card_service.class.php index 108c6ccb748..afda34aec23 100644 --- a/htdocs/product/canvas/service/actions_card_service.class.php +++ b/htdocs/product/canvas/service/actions_card_service.class.php @@ -217,7 +217,6 @@ class ActionsCardService { $this->LoadListDatas($limit, $offset, $sortfield, $sortorder); } - } diff --git a/htdocs/product/class/html.formproduct.class.php b/htdocs/product/class/html.formproduct.class.php index 9161581eaae..99fd6c07ede 100644 --- a/htdocs/product/class/html.formproduct.class.php +++ b/htdocs/product/class/html.formproduct.class.php @@ -33,7 +33,7 @@ class FormProduct * @var DoliDB Database handler. */ public $db; - + /** * @var string Error code (or message) */ @@ -188,7 +188,6 @@ class FormProduct } return $final_label; - } /** diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php index 78415504477..ee98537a195 100644 --- a/htdocs/product/class/product.class.php +++ b/htdocs/product/class/product.class.php @@ -47,12 +47,12 @@ class Product extends CommonObject * @var string ID to identify managed object */ public $element='product'; - + /** * @var string Name of table without prefix where object is stored */ public $table_element='product'; - + public $fk_element='fk_product'; protected $childtables=array('supplier_proposaldet', 'propaldet','commandedet','facturedet','contratdet','facture_fourn_det','commande_fournisseurdet'); // To test if we can delete object public $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe @@ -647,7 +647,6 @@ class Product extends CommonObject dol_syslog(get_class($this)."::Create fails verify ".join(',',$this->errors), LOG_WARNING); return -3; } - } @@ -3014,7 +3013,6 @@ class Product extends CommonObject { return 1; } - } /** diff --git a/htdocs/product/class/productbatch.class.php b/htdocs/product/class/productbatch.class.php index 0c0ed55855f..87815d5b07b 100644 --- a/htdocs/product/class/productbatch.class.php +++ b/htdocs/product/class/productbatch.class.php @@ -395,8 +395,6 @@ class Productbatch extends CommonObject $this->eatby=''; $this->batch=''; $this->import_key=''; - - } /** diff --git a/htdocs/product/class/propalmergepdfproduct.class.php b/htdocs/product/class/propalmergepdfproduct.class.php index 23282586d22..d79e68b9f48 100644 --- a/htdocs/product/class/propalmergepdfproduct.class.php +++ b/htdocs/product/class/propalmergepdfproduct.class.php @@ -632,8 +632,6 @@ class Propalmergepdfproduct extends CommonObject $this->datec=''; $this->tms=''; $this->import_key=''; - - } } diff --git a/htdocs/product/stock/class/entrepot.class.php b/htdocs/product/stock/class/entrepot.class.php index f8e60f135b9..59e966035d4 100644 --- a/htdocs/product/stock/class/entrepot.class.php +++ b/htdocs/product/stock/class/entrepot.class.php @@ -93,7 +93,6 @@ class Entrepot extends CommonObject { $this->statuts[self::STATUS_OPEN_ALL] = 'Opened'; } - } /** @@ -167,7 +166,6 @@ class Entrepot extends CommonObject $this->db->rollback(); return -1; } - } /** @@ -301,7 +299,6 @@ class Entrepot extends CommonObject $this->error=$this->db->lasterror(); return -1; } - } @@ -714,7 +711,6 @@ class Entrepot extends CommonObject } return $TChildWarehouses; - } /** diff --git a/htdocs/product/stock/class/productstockentrepot.class.php b/htdocs/product/stock/class/productstockentrepot.class.php index 01379e8859c..5dbaa95f395 100644 --- a/htdocs/product/stock/class/productstockentrepot.class.php +++ b/htdocs/product/stock/class/productstockentrepot.class.php @@ -572,8 +572,6 @@ class ProductStockEntrepot extends CommonObject $this->seuil_stock_alerte = ''; $this->desiredstock = ''; $this->import_key = ''; - - } } diff --git a/htdocs/projet/class/api_projects.class.php b/htdocs/projet/class/api_projects.class.php index e5a73590d75..6deacab7204 100644 --- a/htdocs/projet/class/api_projects.class.php +++ b/htdocs/projet/class/api_projects.class.php @@ -483,7 +483,6 @@ class Projects extends DolibarrApi 'message' => 'Project deleted' ) ); - } /** diff --git a/htdocs/projet/class/api_tasks.class.php b/htdocs/projet/class/api_tasks.class.php index cd79a12cecc..294c0f0faae 100644 --- a/htdocs/projet/class/api_tasks.class.php +++ b/htdocs/projet/class/api_tasks.class.php @@ -487,7 +487,6 @@ class Tasks extends DolibarrApi 'message' => 'Task deleted' ) ); - } diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php index 91cc8dbbcad..17c36bb5a54 100644 --- a/htdocs/projet/class/project.class.php +++ b/htdocs/projet/class/project.class.php @@ -1607,7 +1607,6 @@ class Project extends CommonObject }else { return 1; } - } /** @@ -1640,7 +1639,6 @@ class Project extends CommonObject }else { return 1; } - } /** diff --git a/htdocs/projet/ganttchart.inc.php b/htdocs/projet/ganttchart.inc.php index bc85e5bae78..dc76e098b59 100644 --- a/htdocs/projet/ganttchart.inc.php +++ b/htdocs/projet/ganttchart.inc.php @@ -271,8 +271,6 @@ function constructGanttLine($tarr, $task, $task_dependencies, $level=0, $project $s.= "g.AddTaskItem(new JSGantt.TaskItem('".$taskid."', '".dol_escape_js(trim($name))."', '".$start_date."', '".$end_date."', '".$css."', '".$link."', ".$task['task_milestone'].", '".dol_escape_js($resources)."', ".($percent >= 0 ? $percent : 0).", ".$line_is_auto_group.", '".$parent."', 1, '".$dependency."', '".(empty($task["task_is_group"]) ? (($percent >= 0 && $percent != '') ? $percent.'%' : '') : '')."', '".dol_escape_js($note)."', g));"; echo $s; - - } /** diff --git a/htdocs/resource/class/dolresource.class.php b/htdocs/resource/class/dolresource.class.php index f08e3e75921..b6eaca2143e 100644 --- a/htdocs/resource/class/dolresource.class.php +++ b/htdocs/resource/class/dolresource.class.php @@ -570,7 +570,6 @@ class Dolresource extends CommonObject $this->error = $this->db->lasterror(); return -1; } - } /** @@ -648,7 +647,6 @@ class Dolresource extends CommonObject $this->error = $this->db->lasterror(); return -1; } - } /** @@ -726,7 +724,6 @@ class Dolresource extends CommonObject $this->error = $this->db->lasterror(); return -1; } - } /** @@ -874,7 +871,6 @@ class Dolresource extends CommonObject $i++; } return $i; - } diff --git a/htdocs/societe/class/address.class.php b/htdocs/societe/class/address.class.php index 43e46008910..7f89e081e8b 100644 --- a/htdocs/societe/class/address.class.php +++ b/htdocs/societe/class/address.class.php @@ -228,7 +228,6 @@ class Address return $result; } } - } /** diff --git a/htdocs/societe/class/api_thirdparties.class.php b/htdocs/societe/class/api_thirdparties.class.php index 3e39768ada9..07bc59f4757 100644 --- a/htdocs/societe/class/api_thirdparties.class.php +++ b/htdocs/societe/class/api_thirdparties.class.php @@ -1527,7 +1527,6 @@ class Thirdparties extends DolibarrApi $i++; } } - } /** diff --git a/htdocs/societe/class/client.class.php b/htdocs/societe/class/client.class.php index 59eea72c2c7..b0e275dbab8 100644 --- a/htdocs/societe/class/client.class.php +++ b/htdocs/societe/class/client.class.php @@ -88,7 +88,6 @@ class Client extends Societe $this->error=$this->db->lasterror(); return -1; } - } /** diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php index 5c3363bc4c8..b50343d03d8 100644 --- a/htdocs/societe/class/societe.class.php +++ b/htdocs/societe/class/societe.class.php @@ -2428,7 +2428,6 @@ class Societe extends CommonObject { dol_print_error($this->db); } - } @@ -3825,7 +3824,6 @@ class Societe extends CommonObject if ($statut==1) return $langs->trans("Customer"); if ($statut==2) return $langs->trans("Prospect"); if ($statut==3) return $langs->trans("ProspectCustomer"); - } diff --git a/htdocs/stripe/class/stripe.class.php b/htdocs/stripe/class/stripe.class.php index b8472d0b821..eda7bca78b9 100644 --- a/htdocs/stripe/class/stripe.class.php +++ b/htdocs/stripe/class/stripe.class.php @@ -47,7 +47,6 @@ class Stripe extends CommonObject public function __construct($db) { $this->db = $db; - } diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php index 40c6a6b9f19..ab4c66f0799 100644 --- a/htdocs/user/class/user.class.php +++ b/htdocs/user/class/user.class.php @@ -562,7 +562,6 @@ class User extends CommonObject $this->db->commit(); return 1; } - } @@ -686,7 +685,6 @@ class User extends CommonObject $this->db->commit(); return 1; } - } @@ -1253,7 +1251,6 @@ class User extends CommonObject $this->db->rollback(); return $result; } - } /** @@ -1661,7 +1658,6 @@ class User extends CommonObject $this->db->rollback(); return -2; } - } /** @@ -3158,7 +3154,6 @@ class User extends CommonObject $this->errors[] = $this->db->lasterror(); return -1; } - } } diff --git a/htdocs/user/class/usergroup.class.php b/htdocs/user/class/usergroup.class.php index 8f89b4a2e35..0da00e64caf 100644 --- a/htdocs/user/class/usergroup.class.php +++ b/htdocs/user/class/usergroup.class.php @@ -385,7 +385,6 @@ class UserGroup extends CommonObject $this->db->commit(); return 1; } - } @@ -511,7 +510,6 @@ class UserGroup extends CommonObject $this->db->commit(); return 1; } - } diff --git a/htdocs/website/class/website.class.php b/htdocs/website/class/website.class.php index be6770743bc..103d0ffca39 100644 --- a/htdocs/website/class/website.class.php +++ b/htdocs/website/class/website.class.php @@ -762,8 +762,6 @@ class Website extends CommonObject $this->fk_user_modif = $user->id; $this->date_creation = dol_now(); $this->tms = dol_now(); - - } diff --git a/test/phpunit/ExportTest.php b/test/phpunit/ExportTest.php index 364eaf7568d..eb9d0b733f1 100644 --- a/test/phpunit/ExportTest.php +++ b/test/phpunit/ExportTest.php @@ -128,31 +128,31 @@ class ExportTest extends PHPUnit_Framework_TestCase public function testExportOther() { global $conf,$user,$langs,$db; - + $model='csv'; - + // Creation of class to export using model ExportXXX $dir = DOL_DOCUMENT_ROOT . "/core/modules/export/"; $file = "export_".$model.".modules.php"; $classname = "Export".$model; require_once $dir.$file; $objmodel = new $classname($this->db); - + // First test without option USE_STRICT_CSV_RULES unset($conf->global->USE_STRICT_CSV_RULES); - + $valtotest='A simple string'; print __METHOD__." valtotest=".$valtotest."\n"; $result = $objmodel->csvClean($valtotest, $langs->charset_output); print __METHOD__." result=".$result."\n"; $this->assertEquals($result, 'A simple string'); - + $valtotest='A string with , and ; inside'; print __METHOD__." valtotest=".$valtotest."\n"; $result = $objmodel->csvClean($valtotest, $langs->charset_output); print __METHOD__." result=".$result."\n"; $this->assertEquals($result, '"A string with , and ; inside"'); - + $valtotest='A string with " inside'; print __METHOD__." valtotest=".$valtotest."\n"; $result = $objmodel->csvClean($valtotest, $langs->charset_output); @@ -164,48 +164,47 @@ class ExportTest extends PHPUnit_Framework_TestCase $result = $objmodel->csvClean($valtotest, $langs->charset_output); print __METHOD__." result=".$result."\n"; $this->assertEquals($result, '"A string with "" inside and \n carriage returns"'); - + $valtotest='A string with html
content inside
'."\n"; print __METHOD__." valtotest=".$valtotest."\n"; $result = $objmodel->csvClean($valtotest, $langs->charset_output); print __METHOD__." result=".$result."\n"; $this->assertEquals($result, '"A string with html
content inside"'); - + // Same tests with strict mode $conf->global->USE_STRICT_CSV_RULES=1; - + $valtotest='A simple string'; print __METHOD__." valtotest=".$valtotest."\n"; $result = $objmodel->csvClean($valtotest, $langs->charset_output); print __METHOD__." result=".$result."\n"; $this->assertEquals($result, 'A simple string'); - + $valtotest='A string with , and ; inside'; print __METHOD__." valtotest=".$valtotest."\n"; $result = $objmodel->csvClean($valtotest, $langs->charset_output); print __METHOD__." result=".$result."\n"; $this->assertEquals($result, '"A string with , and ; inside"'); - + $valtotest='A string with " inside'; print __METHOD__." valtotest=".$valtotest."\n"; $result = $objmodel->csvClean($valtotest, $langs->charset_output); print __METHOD__." result=".$result."\n"; $this->assertEquals($result, '"A string with "" inside"'); - + $valtotest='A string with " inside and '."\r\n".' carriage returns'; print __METHOD__." valtotest=".$valtotest."\n"; $result = $objmodel->csvClean($valtotest, $langs->charset_output); print __METHOD__." result=".$result."\n"; $this->assertEquals($result, "\"A string with \"\" inside and \r\n carriage returns\""); - + $valtotest='A string with html
content inside
'."\n"; print __METHOD__." valtotest=".$valtotest."\n"; $result = $objmodel->csvClean($valtotest, $langs->charset_output); print __METHOD__." result=".$result."\n"; $this->assertEquals($result, '"A string with html
content inside"'); - } - + /** * Test export function for a personalized dataset * @@ -353,5 +352,5 @@ class ExportTest extends PHPUnit_Framework_TestCase return true; } - + } diff --git a/test/phpunit/Functions2LibTest.php b/test/phpunit/Functions2LibTest.php index 470a570bf6e..a9df42b8b1c 100644 --- a/test/phpunit/Functions2LibTest.php +++ b/test/phpunit/Functions2LibTest.php @@ -138,7 +138,6 @@ class Functions2LibTest extends PHPUnit_Framework_TestCase */ public function testIsValidMailDomain() { - } /** @@ -241,10 +240,9 @@ class Functions2LibTest extends PHPUnit_Framework_TestCase print __METHOD__." for ".$ip." result=".$result."\n"; $this->assertEquals(2,$result,$ip); - $ip='192.168.0.0'; - $result=is_ip($ip); + $ip='192.168.0.0'; + $result=is_ip($ip); print __METHOD__." for ".$ip." result=".$result."\n"; - $this->assertEquals(2,$result,$ip); - + $this->assertEquals(2,$result,$ip); } } diff --git a/test/phpunit/FunctionsLibTest.php b/test/phpunit/FunctionsLibTest.php index e32b17ec09d..a96e36c3262 100644 --- a/test/phpunit/FunctionsLibTest.php +++ b/test/phpunit/FunctionsLibTest.php @@ -110,7 +110,8 @@ class FunctionsLibTest extends PHPUnit_Framework_TestCase print __METHOD__."\n"; } - /** + + /** * End phpunit tests * * @return void @@ -121,7 +122,6 @@ class FunctionsLibTest extends PHPUnit_Framework_TestCase } - /** * testIsValidMXRecord * @@ -390,7 +390,6 @@ class FunctionsLibTest extends PHPUnit_Framework_TestCase $input='This is a text with html comments '; // we suppose this is not enough to be html content $after=dol_textishtml($input); $this->assertFalse($after); - } @@ -837,7 +836,6 @@ class FunctionsLibTest extends PHPUnit_Framework_TestCase $object->country_code='CA'; $phone=dol_print_phone('1234567890', $object->country_code, 0, 0, 0, ' '); $this->assertEquals('(123) 456-7890', $phone, 'Phone for CA 1'); - } @@ -1008,7 +1006,6 @@ class FunctionsLibTest extends PHPUnit_Framework_TestCase // Test RULE 5 (FR-US) $vat=get_default_tva($companyfr,$companyus,0); $this->assertEquals(0,$vat,'RULE 5 ECOMMERCE_200238EC'); - } /**