diff --git a/ChangeLog b/ChangeLog index cbad6f0a8ba..c071f0e3628 100644 --- a/ChangeLog +++ b/ChangeLog @@ -41,6 +41,10 @@ For developers: - New: Uniformize code. - New: Add option WORKFLOW_DISABLE_CREATE_INVOICE_FROM_ORDER and WORKFLOW_DISABLE_CLASSIFY_BILLED_FROM_ORDER +- New: removed deprecated methods + ldap::connect, formadmin::select_lang, + html::select_tva + ***** ChangeLog for 3.2.0 compared to 3.1.3 ***** diff --git a/htdocs/admin/prelevement.php b/htdocs/admin/prelevement.php index a5c02129e37..1b4cd867dd9 100644 --- a/htdocs/admin/prelevement.php +++ b/htdocs/admin/prelevement.php @@ -25,7 +25,7 @@ */ require('../main.inc.php'); -require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/bon-prelevement.class.php"); +require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/bonprelevement.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT."/compta/bank/class/account.class.php"); diff --git a/htdocs/compta/facture/prelevement.php b/htdocs/compta/facture/prelevement.php index 8f688dc93d9..47f6c7ff0f8 100644 --- a/htdocs/compta/facture/prelevement.php +++ b/htdocs/compta/facture/prelevement.php @@ -27,7 +27,7 @@ require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT.'/core/lib/invoice.lib.php'); require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/bon-prelevement.class.php"); +require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/bonprelevement.class.php"); require_once(DOL_DOCUMENT_ROOT.'/core/class/discount.class.php'); if (!$user->rights->facture->lire) accessforbidden(); diff --git a/htdocs/compta/prelevement/bon.php b/htdocs/compta/prelevement/bon.php index 1934434a7e2..c63e9521d00 100644 --- a/htdocs/compta/prelevement/bon.php +++ b/htdocs/compta/prelevement/bon.php @@ -26,7 +26,7 @@ require("../bank/pre.inc.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/prelevement.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); -require_once DOL_DOCUMENT_ROOT."/compta/prelevement/class/bon-prelevement.class.php"; +require_once DOL_DOCUMENT_ROOT."/compta/prelevement/class/bonprelevement.class.php"; $langs->load("bills"); $langs->load("categories"); @@ -49,7 +49,7 @@ if ($id > 0 || ! empty($ref)) if ($object->fetch($id) == 0) { - $head = prelevement_prepare_head($object); + $head = prelevement_prepare_head($object); dol_fiche_head($head, 'preview', 'Prelevement : '. $object->ref); print ''; diff --git a/htdocs/compta/prelevement/bons.php b/htdocs/compta/prelevement/bons.php index 764993d2471..25387018ac0 100644 --- a/htdocs/compta/prelevement/bons.php +++ b/htdocs/compta/prelevement/bons.php @@ -25,7 +25,7 @@ */ require("../bank/pre.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/bon-prelevement.class.php"); +require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/bonprelevement.class.php"); $langs->load("widthdrawals"); $langs->load("categories"); @@ -98,10 +98,10 @@ if ($result) $var=!$var; print "\n"; print '\n"; diff --git a/htdocs/compta/prelevement/class/bon-prelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php similarity index 94% rename from htdocs/compta/prelevement/class/bon-prelevement.class.php rename to htdocs/compta/prelevement/class/bonprelevement.class.php index 9fd3029437d..9bef9a46617 100644 --- a/htdocs/compta/prelevement/class/bon-prelevement.class.php +++ b/htdocs/compta/prelevement/class/bonprelevement.class.php @@ -2,6 +2,7 @@ /* Copyright (C) 2004-2005 Rodolphe Quiedeville * Copyright (C) 2005-2010 Regis Houssin * Copyright (C) 2010-2012 Juanjo Menent + * Copyright (C) 2010-2012 Laurent Destailleur * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -18,7 +19,7 @@ */ /** - * \file htdocs/compta/prelevement/class/bon-prelevement.class.php + * \file htdocs/compta/prelevement/class/bonprelevement.class.php * \ingroup prelevement * \brief Fichier de la classe des bons de prelevements */ @@ -132,19 +133,19 @@ class BonPrelevement extends CommonObject else { $result = -1; - dol_syslog("BonPrelevement::AddFacture Erreur $result"); + dol_syslog(get_class($this)."::AddFacture Erreur $result"); } } else { $result = -2; - dol_syslog("BonPrelevement::AddFacture Erreur $result"); + dol_syslog(get_class($this)."::AddFacture Erreur $result"); } } else { $result = -3; - dol_syslog("BonPrelevement::AddFacture Erreur $result"); + dol_syslog(get_class($this)."::AddFacture Erreur $result"); } return $result; @@ -224,7 +225,7 @@ class BonPrelevement extends CommonObject } else { - dol_syslog("BonPrelevement::addline Error -2"); + dol_syslog(get_class($this)."::addline Error -2"); $result = -2; } @@ -269,7 +270,7 @@ class BonPrelevement extends CommonObject $sql.= " WHERE p.rowid = ".$rowid; $sql.= " AND p.entity = ".$conf->entity; - dol_syslog("Bon-prelevement::fetch sql=".$sql, LOG_DEBUG); + dol_syslog(get_class($this)."::fetch sql=".$sql, LOG_DEBUG); $result=$this->db->query($sql); if ($result) { @@ -298,21 +299,20 @@ class BonPrelevement extends CommonObject } else { - dol_syslog("BonPrelevement::Fetch Erreur aucune ligne retournee"); + dol_syslog(get_class($this)."::Fetch Erreur aucune ligne retournee"); return -1; } } else { - dol_syslog("BonPrelevement::Fetch Erreur sql=".$sql, LOG_ERR); + dol_syslog(get_class($this)."::Fetch Erreur sql=".$sql, LOG_ERR); return -2; } } /** - * Set credite + * Set credite and set status of linked invoices * - * @deprecated * @return int <0 if KO, >0 if OK */ function set_credite() @@ -331,7 +331,7 @@ class BonPrelevement extends CommonObject $result=$this->db->query($sql); if (! $result) { - dol_syslog("bon-prelevement::set_credite Erreur 1"); + dol_syslog(get_class($this)."::set_credite Erreur 1"); $error++; } @@ -344,7 +344,7 @@ class BonPrelevement extends CommonObject for ($i = 0; $i < $num; $i++) { /* Tag invoice as payed */ - dol_syslog("BonPrelevement::set_credite set_paid fac ".$facs[$i]); + dol_syslog(get_class($this)."::set_credite set_paid fac ".$facs[$i]); $fac = new Facture($this->db); $fac->fetch($facs[$i]); $result = $fac->set_paid($user); @@ -360,14 +360,13 @@ class BonPrelevement extends CommonObject if (! $this->db->query($sql)) { - dol_syslog("BonPrelevement::set_credite Erreur 1"); + dol_syslog(get_class($this)."::set_credite Erreur 1"); $error++; } } /* * Fin de la procedure - * */ if ($error == 0) { @@ -377,20 +376,20 @@ class BonPrelevement extends CommonObject else { $this->db->rollback(); - dol_syslog("BonPrelevement::set_credite ROLLBACK "); + dol_syslog(get_class($this)."::set_credite ROLLBACK "); return -1; } } else { - dol_syslog("BonPrelevement::set_credite Ouverture transaction SQL impossible "); + dol_syslog(get_class($this)."::set_credite Ouverture transaction SQL impossible "); return -2; } } /** - * Set withdrawal to creditet status + * Set withdrawal to credited status * * @param User $user id of user * @param timestamp $date date of action @@ -447,7 +446,7 @@ class BonPrelevement extends CommonObject $paiement_id = $paiement->create($user); if ($paiement_id < 0) { - dol_syslog("BonPrelevement::set_credite AddPayment Error"); + dol_syslog(get_class($this)."::set_credite AddPayment Error"); $error++; } else @@ -455,26 +454,26 @@ class BonPrelevement extends CommonObject $result=$paiement->addPaymentToBank($user,'payment','(WithdrawalPayment)',$bankaccount); if ($result < 0) { - dol_syslog("BonPrelevement::set_credite AddPaymentToBank Error"); + dol_syslog(get_class($this)."::set_credite AddPaymentToBank Error"); $error++; } } // Update prelevement line - // TODO: Translate to ligne-prelevement.class.php + // TODO: Translate to ligneprelevement.class.php $sql = " UPDATE ".MAIN_DB_PREFIX."prelevement_lignes"; $sql.= " SET statut = 2"; $sql.= " WHERE fk_prelevement_bons = ".$this->id; if (! $this->db->query($sql)) { - dol_syslog("BonPrelevement::set_credite Update lines Error"); + dol_syslog(get_class($this)."::set_credite Update lines Error"); $error++; } } else { - dol_syslog("BonPrelevement::set_infocredit Update Bons Error"); + dol_syslog(get_class($this)."::set_infocredit Update Bons Error"); $error++; } @@ -496,7 +495,7 @@ class BonPrelevement extends CommonObject } else { - dol_syslog("bon-prelevement::set_infocredit 1025 Open SQL transaction impossible "); + dol_syslog(get_class($this)."::set_infocredit 1025 Open SQL transaction impossible "); return -1025; } } @@ -526,7 +525,7 @@ class BonPrelevement extends CommonObject $error = 0; - dol_syslog("bon-prelevement::set_infotrans Start",LOG_INFO); + dol_syslog(get_class($this)."::set_infotrans Start",LOG_INFO); if ($this->db->begin()) { $sql = "UPDATE ".MAIN_DB_PREFIX."prelevement_bons "; @@ -550,7 +549,7 @@ class BonPrelevement extends CommonObject } else { - dol_syslog("bon-prelevement::set_infotrans Erreur 1", LOG_ERR); + dol_syslog(get_class($this)."::set_infotrans Erreur 1", LOG_ERR); dol_syslog($this->db->error()); $error++; } @@ -568,7 +567,7 @@ class BonPrelevement extends CommonObject else { $this->db->rollback(); - dol_syslog("BonPrelevement::set_infotrans ROLLBACK", LOG_ERR); + dol_syslog(get_class($this)."::set_infotrans ROLLBACK", LOG_ERR); return -1; } @@ -576,7 +575,7 @@ class BonPrelevement extends CommonObject else { - dol_syslog("BonPrelevement::set_infotrans Ouverture transaction SQL impossible", LOG_CRIT); + dol_syslog(get_class($this)."::set_infotrans Ouverture transaction SQL impossible", LOG_CRIT); return -2; } } @@ -586,7 +585,7 @@ class BonPrelevement extends CommonObject * * @return array id of invoices */ - function _get_list_factures() + private function _get_list_factures() { global $conf; @@ -624,7 +623,7 @@ class BonPrelevement extends CommonObject } else { - dol_syslog("Bon-Prelevement::_get_list_factures Erreur"); + dol_syslog(get_class($this)."::_get_list_factures Erreur"); } return $arr; @@ -662,7 +661,7 @@ class BonPrelevement extends CommonObject else { $error = 1; - dol_syslog("BonPrelevement::SommeAPrelever Erreur -1"); + dol_syslog(get_class($this)."::SommeAPrelever Erreur -1"); dol_syslog($this->db->error()); } } @@ -704,7 +703,7 @@ class BonPrelevement extends CommonObject } else { - $this->error="BonPrelevement::SommeAPrelever Erreur -1 sql=".$this->db->error(); + $this->error=get_class($this)."::SommeAPrelever Erreur -1 sql=".$this->db->error(); dol_syslog($this->error, LOG_ERR); return -1; } @@ -723,7 +722,7 @@ class BonPrelevement extends CommonObject { global $conf,$langs; - dol_syslog("BonPrelevement::Create banque=$banque agence=$agence"); + dol_syslog(get_class($this)."::Create banque=$banque agence=$agence"); require_once (DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"); require_once (DOL_DOCUMENT_ROOT."/societe/class/societe.class.php"); @@ -765,7 +764,7 @@ class BonPrelevement extends CommonObject if ($banque == 1) $sql.= " AND sr.code_banque = '".$conf->global->PRELEVEMENT_CODE_BANQUE."'"; if ($agence == 1) $sql.= " AND sr.code_guichet = '".$conf->global->PRELEVEMENT_CODE_GUICHET."'"; - dol_syslog("Bon-Prelevement::Create sql=".$sql, LOG_DEBUG); + dol_syslog(get_class($this)."::Create sql=".$sql, LOG_DEBUG); $resql = $this->db->query($sql); if ($resql) { @@ -809,7 +808,7 @@ class BonPrelevement extends CommonObject if ($soc->verif_rib() == 1) { $factures_prev[$i] = $fac; - /* second tableau necessaire pour bon-prelevement */ + /* second tableau necessaire pour BonPrelevement */ $factures_prev_id[$i] = $fac[0]; $i++; } @@ -864,7 +863,7 @@ class BonPrelevement extends CommonObject * We create withdraw receipt and build withdraw into disk */ $this->db->begin(); - + $now=dol_now(); /* @@ -879,7 +878,7 @@ class BonPrelevement extends CommonObject $sql.= " WHERE ref LIKE '".$ref."%'"; $sql.= " AND entity = ".$conf->entity; - dol_syslog("Bon-Prelevement::Create sql=".$sql, LOG_DEBUG); + dol_syslog(get_class($this)."::Create sql=".$sql, LOG_DEBUG); $resql = $this->db->query($sql); if ($resql) @@ -905,7 +904,7 @@ class BonPrelevement extends CommonObject $sql.= ", '".$this->db->idate($now)."'"; $sql.= ")"; - dol_syslog("Bon-Prelevement::Create sql=".$sql, LOG_DEBUG); + dol_syslog(get_class($this)."::Create sql=".$sql, LOG_DEBUG); $resql = $this->db->query($sql); if ($resql) @@ -966,7 +965,7 @@ class BonPrelevement extends CommonObject $sql.= ", fk_prelevement_bons = ".$prev_id; $sql.= " WHERE rowid = ".$fac[1]; - dol_syslog("Bon-Prelevement::Create sql=".$sql, LOG_DEBUG); + dol_syslog(get_class($this)."::Create sql=".$sql, LOG_DEBUG); $resql=$this->db->query($sql); if (! $resql) { @@ -1020,7 +1019,7 @@ class BonPrelevement extends CommonObject $sql.= " WHERE rowid = ".$prev_id; $sql.= " AND entity = ".$conf->entity; - dol_syslog("Bon-Prelevement::Create sql=".$sql, LOG_DEBUG); + dol_syslog(get_class($this)."::Create sql=".$sql, LOG_DEBUG); $resql=$this->db->query($sql); if (! $resql) { @@ -1140,7 +1139,7 @@ class BonPrelevement extends CommonObject if ($this->DeleteNotification($user, $action) == 0) { $now=dol_now(); - + $sql = "INSERT INTO ".MAIN_DB_PREFIX."notify_def (datec,fk_user, fk_soc, fk_contact, fk_action)"; $sql .= " VALUES (".$db->idate($now).",".$user.", 'NULL', 'NULL', '".$action."')"; @@ -1152,7 +1151,7 @@ class BonPrelevement extends CommonObject else { $result = -1; - dol_syslog("BonPrelevement::AddNotification Error $result"); + dol_syslog(get_class($this)."::AddNotification Error $result"); } } diff --git a/htdocs/compta/prelevement/class/ligne-prelevement.class.php b/htdocs/compta/prelevement/class/ligneprelevement.class.php similarity index 98% rename from htdocs/compta/prelevement/class/ligne-prelevement.class.php rename to htdocs/compta/prelevement/class/ligneprelevement.class.php index c3231f07acb..d3b625b16eb 100644 --- a/htdocs/compta/prelevement/class/ligne-prelevement.class.php +++ b/htdocs/compta/prelevement/class/ligneprelevement.class.php @@ -19,7 +19,7 @@ */ /** - * \file htdocs/compta/prelevement/class/ligne-prelevement.class.php + * \file htdocs/compta/prelevement/class/ligneprelevement.class.php * \ingroup prelevement * \brief Fichier de la classe des lignes de prelevements */ diff --git a/htdocs/compta/prelevement/class/rejet-prelevement.class.php b/htdocs/compta/prelevement/class/rejetprelevement.class.php similarity index 97% rename from htdocs/compta/prelevement/class/rejet-prelevement.class.php rename to htdocs/compta/prelevement/class/rejetprelevement.class.php index b6f8a967f10..07981443bbd 100644 --- a/htdocs/compta/prelevement/class/rejet-prelevement.class.php +++ b/htdocs/compta/prelevement/class/rejetprelevement.class.php @@ -19,15 +19,14 @@ */ /** - * \file htdocs/compta/prelevement/class/rejet-prelevement.class.php + * \file htdocs/compta/prelevement/class/rejetprelevement.class.php * \ingroup prelevement * \brief File of class to manage standing orders rejects */ /** - \class RejetPrelevement - \brief Class to manage standing orders rejects + * Class to manage standing orders rejects */ class RejetPrelevement { @@ -273,7 +272,7 @@ class RejetPrelevement * * @return void */ - function _get_list_factures() + private function _get_list_factures() { global $conf; diff --git a/htdocs/compta/prelevement/create.php b/htdocs/compta/prelevement/create.php index 7c8f346017c..51df78b7836 100644 --- a/htdocs/compta/prelevement/create.php +++ b/htdocs/compta/prelevement/create.php @@ -20,11 +20,12 @@ /** * \file htdocs/compta/prelevement/create.php - * \brief Prelevement + * \ingroup prelevement + * \brief Prelevement creation page */ require("../bank/pre.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/bon-prelevement.class.php"); +require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/bonprelevement.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"); require_once(DOL_DOCUMENT_ROOT."/societe/class/societe.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); diff --git a/htdocs/compta/prelevement/demandes.php b/htdocs/compta/prelevement/demandes.php index ef2914f696f..4f6134664ed 100644 --- a/htdocs/compta/prelevement/demandes.php +++ b/htdocs/compta/prelevement/demandes.php @@ -20,8 +20,10 @@ /** * \file htdocs/compta/prelevement/demandes.php + * \ingroup prelevement * \brief Page to list withdraw requests */ + require("../bank/pre.inc.php"); require_once DOL_DOCUMENT_ROOT."/core/modules/modPrelevement.class.php"; require_once DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"; diff --git a/htdocs/compta/prelevement/factures.php b/htdocs/compta/prelevement/factures.php index 6fb8239e5e6..088afb188f8 100644 --- a/htdocs/compta/prelevement/factures.php +++ b/htdocs/compta/prelevement/factures.php @@ -26,8 +26,8 @@ require("../bank/pre.inc.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/prelevement.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/bon-prelevement.class.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/rejet-prelevement.class.php"); +require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/bonprelevement.class.php"); +require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/rejetprelevement.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/paiement/class/paiement.class.php"); $langs->load("companies"); @@ -51,7 +51,7 @@ if ($prev_id) if ($bon->fetch($prev_id) == 0) { - $head = prelevement_prepare_head($bon); + $head = prelevement_prepare_head($bon); dol_fiche_head($head, 'invoices', $langs->trans("WithdrawalReceipt"), '', 'payment'); print '
"; - + print $bon->LibStatut($obj->statut,2); print " "; - + print ''.$obj->ref."'.dol_print_date($db->jdate($obj->datec),'day')."
'; @@ -70,7 +70,7 @@ if ($prev_id) print ''; print ''; print ''; - + if($bon->date_trans <> 0) { $muser = new User($db); @@ -89,7 +89,7 @@ if ($prev_id) print dol_print_date($bon->date_credit,'day'); print ''; } - + print '
'.$langs->trans('Status').''.$bon->getLibStatut(1).'
'; print ''; diff --git a/htdocs/compta/prelevement/facturesrejets.php b/htdocs/compta/prelevement/facturesrejets.php index eacb3befcc1..1266c1eee69 100644 --- a/htdocs/compta/prelevement/facturesrejets.php +++ b/htdocs/compta/prelevement/facturesrejets.php @@ -17,8 +17,14 @@ * */ +/** + * \file htdocs/compta/prelevement/facturesrejets.php + * \ingroup prelevement + * \brief Invoice reject + */ + require("../bank/pre.inc.php"); -require_once DOL_DOCUMENT_ROOT."/compta/prelevement/class/rejet-prelevement.class.php"; +require_once DOL_DOCUMENT_ROOT."/compta/prelevement/class/rejetprelevement.class.php"; require_once DOL_DOCUMENT_ROOT."/compta/paiement/class/paiement.class.php"; $langs->load("categories"); diff --git a/htdocs/compta/prelevement/fiche-rejet.php b/htdocs/compta/prelevement/fiche-rejet.php index 1e4b95364bd..6adf25293de 100644 --- a/htdocs/compta/prelevement/fiche-rejet.php +++ b/htdocs/compta/prelevement/fiche-rejet.php @@ -20,13 +20,14 @@ /** * \file htdocs/compta/prelevement/fiche-rejet.php - * \brief Prelevement + * \ingroup prelevement + * \brief Withdraw reject */ require("../bank/pre.inc.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/prelevement.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/bon-prelevement.class.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/rejet-prelevement.class.php"); +require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/bonprelevement.class.php"); +require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/rejetprelevement.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/paiement/class/paiement.class.php"); $langs->load("categories"); @@ -68,7 +69,7 @@ if ($prev_id) print ''.$langs->trans('Status').''; print ''.$bon->getLibStatut(1).''; print ''; - + if($bon->date_trans <> 0) { $muser = new User($db); @@ -87,7 +88,7 @@ if ($prev_id) print dol_print_date($bon->date_credit,'day'); print ''; } - + print ''; print ''; @@ -135,7 +136,7 @@ if ($resql) $var=True; $total = 0; - + while ($i < $num) { $obj = $db->fetch_object($resql); diff --git a/htdocs/compta/prelevement/fiche-stat.php b/htdocs/compta/prelevement/fiche-stat.php index 8611eaa63b0..0ef042b9705 100644 --- a/htdocs/compta/prelevement/fiche-stat.php +++ b/htdocs/compta/prelevement/fiche-stat.php @@ -19,13 +19,14 @@ /** * \file htdocs/compta/prelevement/fiche-stat.php - * \brief Prelevement + * \ingroup prelevement + * \brief Prelevement statistics */ require("../bank/pre.inc.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/prelevement.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/bon-prelevement.class.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/ligne-prelevement.class.php"); +require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/bonprelevement.class.php"); +require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/ligneprelevement.class.php"); // Security check if ($user->societe_id > 0) accessforbidden(); @@ -69,7 +70,7 @@ if ($prev_id) print ''.$langs->trans('Status').''; print ''.$bon->getLibStatut(1).''; print ''; - + if($bon->date_trans <> 0) { $muser = new User($db); @@ -88,7 +89,7 @@ if ($prev_id) print dol_print_date($bon->date_credit,'day'); print ''; } - + print ''; print ''; @@ -104,7 +105,7 @@ if ($prev_id) * */ $ligne=new LignePrelevement($db,$user); - + $sql = "SELECT sum(pl.amount), pl.statut"; $sql.= " FROM ".MAIN_DB_PREFIX."prelevement_lignes as pl"; $sql.= " WHERE pl.fk_prelevement_bons = ".$prev_id; @@ -128,7 +129,7 @@ if ($prev_id) $row = $db->fetch_row($resql); print ""; - + print $ligne->LibStatut($row[1],1); print ''; diff --git a/htdocs/compta/prelevement/fiche.php b/htdocs/compta/prelevement/fiche.php index 50f24fdca90..d01e622bb1d 100644 --- a/htdocs/compta/prelevement/fiche.php +++ b/htdocs/compta/prelevement/fiche.php @@ -25,7 +25,7 @@ require("../bank/pre.inc.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/prelevement.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/bon-prelevement.class.php"); +require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/bonprelevement.class.php"); if (!$user->rights->prelevement->bons->lire) accessforbidden(); diff --git a/htdocs/compta/prelevement/index.php b/htdocs/compta/prelevement/index.php index dad1f127ca1..414c1a388f3 100644 --- a/htdocs/compta/prelevement/index.php +++ b/htdocs/compta/prelevement/index.php @@ -20,11 +20,12 @@ /** * \file htdocs/compta/prelevement/index.php - * \brief Prelevement + * \ingroup prelevement + * \brief Prelevement index page */ require("../bank/pre.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/bon-prelevement.class.php"); +require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/bonprelevement.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"); require_once(DOL_DOCUMENT_ROOT."/societe/class/societe.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/prelevement.lib.php"); diff --git a/htdocs/compta/prelevement/ligne.php b/htdocs/compta/prelevement/ligne.php index 2db6f0f85d5..5013687b729 100644 --- a/htdocs/compta/prelevement/ligne.php +++ b/htdocs/compta/prelevement/ligne.php @@ -1,6 +1,6 @@ - * Copyright (C) 2005-2008 Laurent Destailleur + * Copyright (C) 2005-2012 Laurent Destailleur * Copyright (C) 2005-2009 Regis Houssin * Copyright (C) 2010-2012 Juanjo Menent * @@ -25,9 +25,9 @@ */ require("../bank/pre.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/bon-prelevement.class.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/ligne-prelevement.class.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/rejet-prelevement.class.php"); +require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/bonprelevement.class.php"); +require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/ligneprelevement.class.php"); +require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/rejetprelevement.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/paiement/class/paiement.class.php"); // Security check @@ -110,11 +110,11 @@ if ($id) print ''.$langs->trans("WithdrawalReceipt").''; print ''.$lipre->bon_ref.''; print ''.$langs->trans("Date").''.dol_print_date($bon->datec,'day').''; - print ''.$langs->trans("Amount").''.price($lipre->amount).''; + print ''.$langs->trans("Amount").''.price($lipre->amount).''; print ''.$langs->trans("Status").''; - + print $lipre->LibStatut($lipre->statut,1).''; - + if ($lipre->statut == 3) { $rej = new RejetPrelevement($db, $user); @@ -165,37 +165,37 @@ if ($id) print ''; print ''.$langs->trans("WithdrawalRefused").''; - + //Select yes/no print ''.$langs->trans("WithdrawalRefusedConfirm").' '.$soc->nom.' ?'; print ''; print $form->selectyesno("confirm",1,0); print ''; - + //Date print ''.$langs->trans("RefusedData").''; print ''; print $form->select_date('','','','','',"confirm_rejet"); print ''; - + //Reason print ''.$langs->trans("RefusedReason").''; print ''; print $form->selectarray("motif", $rej->motifs); print ''; - + //Facturer print ''.$langs->trans("RefusedInvoicing").''; print ''; print $form->selectarray("facturer", $rej->facturer); print ''; print '
'; - + //Confirm Button print '
'; print ''; } - + /* ************************************************************************** */ /* */ /* Barre d'action */ @@ -210,7 +210,7 @@ if ($id) { print "id\">".$langs->trans("StandingOrderReject").""; } - else + else { print "".$langs->trans("StandingOrderReject").""; } diff --git a/htdocs/compta/prelevement/lignes.php b/htdocs/compta/prelevement/lignes.php index a3a1086ff32..f93e4f21e2a 100644 --- a/htdocs/compta/prelevement/lignes.php +++ b/htdocs/compta/prelevement/lignes.php @@ -20,14 +20,15 @@ /** * \file htdocs/compta/prelevement/lignes.php - * \brief Prelevement + * \ingroup prelevement + * \brief Prelevement lines */ require("../bank/pre.inc.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/prelevement.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/bon-prelevement.class.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/ligne-prelevement.class.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/rejet-prelevement.class.php"); +require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/bonprelevement.class.php"); +require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/ligneprelevement.class.php"); +require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/rejetprelevement.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/paiement/class/paiement.class.php"); // Security check @@ -76,7 +77,7 @@ if ($prev_id) print ''.$langs->trans('Status').''; print ''.$bon->getLibStatut(1).''; print ''; - + if($bon->date_trans <> 0) { $muser = new User($db); @@ -95,7 +96,7 @@ if ($prev_id) print dol_print_date($bon->date_credit,'day'); print ''; } - + print ''; print ''; @@ -159,10 +160,10 @@ if ($result) $obj = $db->fetch_object($result); print ""; - + print $ligne->LibStatut($obj->statut,2); print " "; - + print ''; print substr('000000'.$obj->rowid, -6); print ''; diff --git a/htdocs/compta/prelevement/liste.php b/htdocs/compta/prelevement/liste.php index b091cfba4b9..1ba540731ad 100644 --- a/htdocs/compta/prelevement/liste.php +++ b/htdocs/compta/prelevement/liste.php @@ -24,8 +24,8 @@ * \brief Page liste des prelevements */ require("../bank/pre.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/bon-prelevement.class.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/ligne-prelevement.class.php"); +require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/bonprelevement.class.php"); +require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/ligneprelevement.class.php"); $langs->load("withdrawals"); $langs->load("companies"); @@ -143,16 +143,16 @@ if ($result) print $ligne->LibStatut($obj->statut_ligne,2); print " "; - + print ''; print substr('000000'.$obj->rowid_ligne, -6); print ''; print ''; - + print $bon->LibStatut($obj->statut,2); print " "; - + print ''.$obj->ref."\n"; print ''; diff --git a/htdocs/compta/prelevement/rejets.php b/htdocs/compta/prelevement/rejets.php index 354f3f57c86..812fee4dae5 100644 --- a/htdocs/compta/prelevement/rejets.php +++ b/htdocs/compta/prelevement/rejets.php @@ -2,6 +2,7 @@ /* Copyright (C) 2005 Rodolphe Quiedeville * Copyright (C) 2005-2009 Regis Houssin * Copyright (C) 2010-2012 Juanjo Menent + * Copyright (C) 2005-2012 Laurent Destailleur * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -18,11 +19,13 @@ */ /** - * + * \file htdocs/compta/prelevement/rejets.php + * \ingroup prelevement + * \brief Reject page */ require("../bank/pre.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/rejet-prelevement.class.php"); +require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/rejetprelevement.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/paiement/class/paiement.class.php"); $langs->load("withdrawals"); diff --git a/htdocs/compta/prelevement/stats.php b/htdocs/compta/prelevement/stats.php index 62ec73caa64..7d5e1eba9a9 100644 --- a/htdocs/compta/prelevement/stats.php +++ b/htdocs/compta/prelevement/stats.php @@ -1,6 +1,6 @@ - * Copyright (C) 2005-2010 Laurent Destailleur + * Copyright (C) 2005-2012 Laurent Destailleur * Copyright (C) 2005-2009 Regis Houssin * Copyright (C) 2010-2011 Juanjo Menent * @@ -19,12 +19,13 @@ */ /** - * \file htdocs/compta/prelevement/stats.php - * \brief Page de stats des prelevements + * \file htdocs/compta/prelevement/stats.php + * \ingroup prelevement + * \brief Page de stats des prelevements */ require("../bank/pre.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/ligne-prelevement.class.php"); +require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/ligneprelevement.class.php"); $langs->load("withdrawals"); $langs->load("companies"); @@ -192,7 +193,7 @@ if ($resql) $var=True; - require_once DOL_DOCUMENT_ROOT."/compta/prelevement/class/rejet-prelevement.class.php"; + require_once DOL_DOCUMENT_ROOT."/compta/prelevement/class/rejetprelevement.class.php"; $Rejet = new RejetPrelevement($db, $user); while ($i < $num) diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index 4d39abb4da8..29433cfb63b 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -427,7 +427,7 @@ class Form { if ($type == 'info' || $type == 'help') return $text; } - + if ($type == 'info') $img = img_help(0, $alt); elseif ($type == 'help') $img = img_help(1, $alt); elseif ($type == 'superadmin') $img = img_picto($alt, 'redstar'); @@ -2837,28 +2837,6 @@ class Form return $out; } - /** - * Output an HTML select vat rate - * - * @param string $htmlname Nom champ html - * @param float $selectedrate Forcage du taux tva pre-selectionne. Mettre '' pour aucun forcage. - * @param Societe $societe_vendeuse Object societe vendeuse - * @param Societe $societe_acheteuse Object societe acheteuse - * @param int $idprod Id product - * @param int $info_bits Miscellaneous information on line - * @param string $type ''=Unknown, 0=Product, 1=Service (Used if idprod not defined) - * Si vendeur non assujeti a TVA, TVA par defaut=0. Fin de regle. - * Si le (pays vendeur = pays acheteur) alors la TVA par defaut=TVA du produit vendu. Fin de regle. - * Si (vendeur et acheteur dans Communaute europeenne) et bien vendu = moyen de transports neuf (auto, bateau, avion), TVA par defaut=0 (La TVA doit etre paye par l'acheteur au centre d'impots de son pays et non au vendeur). Fin de regle. - * Si (vendeur et acheteur dans Communaute europeenne) et bien vendu autre que transport neuf alors la TVA par defaut=TVA du produit vendu. Fin de regle. - * Sinon la TVA proposee par defaut=0. Fin de regle. - * @return void - * @deprecated - */ - function select_tva($htmlname='tauxtva', $selectedrate='', $societe_vendeuse='', $societe_acheteuse='', $idprod=0, $info_bits=0, $type='') - { - print $this->load_tva($htmlname, $selectedrate, $societe_vendeuse, $societe_acheteuse, $idprod, $info_bits, $type); - } /** * Load into the cache vat rates of a country diff --git a/htdocs/core/class/html.formadmin.class.php b/htdocs/core/class/html.formadmin.class.php index 72035349706..a3b886af78a 100644 --- a/htdocs/core/class/html.formadmin.class.php +++ b/htdocs/core/class/html.formadmin.class.php @@ -44,22 +44,6 @@ class FormAdmin return 1; } - /** - * Output list with available languages - * - * @param string $selected Langue pre-selectionnee - * @param string $htmlname Nom de la zone select - * @param int $showauto Affiche choix auto - * @param int $filter Array of keys to exclude in list - * @param int $showempty Add empty value - * @return void - * @deprecated Use select_language instead - */ - function select_lang($selected='',$htmlname='lang_id',$showauto=0,$filter=0,$showempty=0) - { - print $this->select_language($selected,$htmlname,$showauto,$filter,$showempty); - } - /** * Return html select list with available languages (key='en_US', value='United States' for example) * diff --git a/htdocs/install/mysql/migration/3.2.0-3.3.0.sql b/htdocs/install/mysql/migration/3.2.0-3.3.0.sql index ad45d6125ef..88401d22179 100755 --- a/htdocs/install/mysql/migration/3.2.0-3.3.0.sql +++ b/htdocs/install/mysql/migration/3.2.0-3.3.0.sql @@ -41,6 +41,7 @@ ALTER TABLE llx_mailing ADD COLUMN extraparams varchar(255); ALTER TABLE llx_product MODIFY ref varchar(128) NOT NULL; ALTER TABLE llx_product MODIFY ref_ext varchar(128); +ALTER TABLE llx_product_fournisseur_price DROP COLUMN fk_product_fournisseur; ALTER TABLE llx_product_fournisseur_price ADD charges DOUBLE( 24, 8 ) DEFAULT 0 AFTER unitprice; ALTER TABLE llx_product_fournisseur_price ADD unitcharges DOUBLE( 24, 8 ) DEFAULT 0 AFTER charges; diff --git a/scripts/withdrawals/build_withdrawal_file.php b/scripts/withdrawals/build_withdrawal_file.php index 65aee784f2f..168f63913e8 100644 --- a/scripts/withdrawals/build_withdrawal_file.php +++ b/scripts/withdrawals/build_withdrawal_file.php @@ -38,7 +38,7 @@ if (substr($sapi_type, 0, 3) == 'cgi') { $version='1.6'; require_once($path."../../htdocs/master.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/bon-prelevement.class.php"); +require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/bonprelevement.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"); require_once(DOL_DOCUMENT_ROOT."/societe/class/societe.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/paiement/class/paiement.class.php");