diff --git a/ChangeLog b/ChangeLog
index cbad6f0a8ba57fdefde593a9122ce66db37c7af9..c071f0e36282ba7e7e1ec661a8fd49aa25da6efb 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 a5c02129e37079dc36d6c17fc416a31bf0df32ba..1b4cd867dd9e7ee96e7c9f31998d748596f51746 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 8f688dc93d9ed9e567ba0dc53bf0bb061b43ef7f..47f6c7ff0f85be2d0e69b9f7cfc9dc487234631c 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 1934434a7e2f1401384eba5d1ea345556234a7e0..c63e9521d0062957f74d73b0eab5a2c9733b856b 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 '<table class="border" width="100%">';
diff --git a/htdocs/compta/prelevement/bons.php b/htdocs/compta/prelevement/bons.php
index 764993d2471a1886e7f07a2e4a2b8c84d5dcd47d..25387018ac0d41a4116cb65860c5c57865d4cede 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 "<tr $bc[$var]><td>";
-
+
print $bon->LibStatut($obj->statut,2);
print " ";
-
+
print '<a href="fiche.php?id='.$obj->rowid.'">'.$obj->ref."</a></td>\n";
print '<td align="center">'.dol_print_date($db->jdate($obj->datec),'day')."</td>\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 9fd3029437d38d60584e8f0a3dafe45ad0b6e806..9bef9a46617f2c7e07b40b81f26a9d91257cbc12 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 <rodolphe@quiedeville.org>
* Copyright (C) 2005-2010 Regis Houssin <regis@dolibarr.fr>
* Copyright (C) 2010-2012 Juanjo Menent <jmenent@2byte.es>
+ * Copyright (C) 2010-2012 Laurent Destailleur <eldy@users.sourceforge.net>
*
* 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 c3231f07acbc42436079be02f83bf4ba7852fda2..d3b625b16eb5277df7385289afea8d9da5e79447 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 b6f8a967f10158f5f2e6d0693533904eca799d45..07981443bbdcfea0ed2ac32711ad900faeac28f6 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 7c8f346017c3024bc431972924925e8cfef89e23..51df78b78367bf4caa84875a58c21b9f4606b5fd 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 ef2914f696f0bbaa756dc532948e43b70e705909..4f6134664ed9137fbced7fc9634800dfe7934027 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 6fb8239e5e6936afe07a96cce1a5d457c630de98..088afb188f87aaf756113719af5f9c633687cde0 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 '<table class="border" width="100%">';
@@ -70,7 +70,7 @@ if ($prev_id)
print '<tr><td width="20%">'.$langs->trans('Status').'</td>';
print '<td>'.$bon->getLibStatut(1).'</td>';
print '</tr>';
-
+
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 '</td></tr>';
}
-
+
print '</table>';
print '</div>';
diff --git a/htdocs/compta/prelevement/facturesrejets.php b/htdocs/compta/prelevement/facturesrejets.php
index eacb3befcc15ba571beb626b18991ea47eadc687..1266c1eee6909515dc2c4de32fb6f6af39271ebb 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 1e4b95364bd960edb155b5ef3e9e8dc52ce43632..6adf25293de6572f13238c2311296cd928885f95 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 '<tr><td width="20%">'.$langs->trans('Status').'</td>';
print '<td>'.$bon->getLibStatut(1).'</td>';
print '</tr>';
-
+
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 '</td></tr>';
}
-
+
print '</table>';
print '</div>';
@@ -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 8611eaa63b0a9137a3554298d19c4a82a042652f..0ef042b97052474c6558515c01a257b563927dff 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 '<tr><td width="20%">'.$langs->trans('Status').'</td>';
print '<td>'.$bon->getLibStatut(1).'</td>';
print '</tr>';
-
+
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 '</td></tr>';
}
-
+
print '</table>';
print '</div>';
@@ -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 "<tr $bc[$var]><td>";
-
+
print $ligne->LibStatut($row[1],1);
print '</td><td align="right">';
diff --git a/htdocs/compta/prelevement/fiche.php b/htdocs/compta/prelevement/fiche.php
index 50f24fdca907c62c685cba8f90a56a756c5a83f1..d01e622bb1ddae8d9128c3e28fa69e0c09f13884 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 dad1f127ca135a85b72205949b7add401ae2ca05..414c1a388f3a768ad591a0033f9cd1c211c29f08 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 2db6f0f85d5609c1b965f9bd0beaebaa735fe80d..5013687b7296c1a7533f57230ccb6f4c3d230380 100644
--- a/htdocs/compta/prelevement/ligne.php
+++ b/htdocs/compta/prelevement/ligne.php
@@ -1,6 +1,6 @@
<?PHP
/* Copyright (C) 2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2005-2008 Laurent Destailleur <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2012 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2009 Regis Houssin <regis@dolibarr.fr>
* Copyright (C) 2010-2012 Juanjo Menent <jmenent@2byte.es>
*
@@ -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 '<tr><td width="20%">'.$langs->trans("WithdrawalReceipt").'</td><td>';
print '<a href="fiche.php?id='.$lipre->bon_rowid.'">'.$lipre->bon_ref.'</a></td></tr>';
print '<tr><td width="20%">'.$langs->trans("Date").'</td><td>'.dol_print_date($bon->datec,'day').'</td></tr>';
- print '<tr><td width="20%">'.$langs->trans("Amount").'</td><td>'.price($lipre->amount).'</td></tr>';
+ print '<tr><td width="20%">'.$langs->trans("Amount").'</td><td>'.price($lipre->amount).'</td></tr>';
print '<tr><td width="20%">'.$langs->trans("Status").'</td><td>';
-
+
print $lipre->LibStatut($lipre->statut,1).'</td></tr>';
-
+
if ($lipre->statut == 3)
{
$rej = new RejetPrelevement($db, $user);
@@ -165,37 +165,37 @@ if ($id)
print '<tr class="liste_titre">';
print '<td colspan="3">'.$langs->trans("WithdrawalRefused").'</td></tr>';
-
+
//Select yes/no
print '<tr><td class="valid">'.$langs->trans("WithdrawalRefusedConfirm").' '.$soc->nom.' ?</td>';
print '<td colspan="2" class="valid">';
print $form->selectyesno("confirm",1,0);
print '</td></tr>';
-
+
//Date
print '<tr><td class="valid">'.$langs->trans("RefusedData").'</td>';
print '<td colspan="2" class="valid">';
print $form->select_date('','','','','',"confirm_rejet");
print '</td></tr>';
-
+
//Reason
print '<tr><td class="valid">'.$langs->trans("RefusedReason").'</td>';
print '<td class="valid">';
print $form->selectarray("motif", $rej->motifs);
print '</td></tr>';
-
+
//Facturer
print '<tr><td class="valid">'.$langs->trans("RefusedInvoicing").'</td>';
print '<td class="valid" colspan="2">';
print $form->selectarray("facturer", $rej->facturer);
print '</td></tr>';
print '</table><br>';
-
+
//Confirm Button
print '<center><input type="submit" class="valid" value='.$langs->trans("Confirm").'><center>';
print '</form>';
}
-
+
/* ************************************************************************** */
/* */
/* Barre d'action */
@@ -210,7 +210,7 @@ if ($id)
{
print "<a class=\"butAction\" href=\"ligne.php?action=rejet&id=$lipre->id\">".$langs->trans("StandingOrderReject")."</a>";
}
- else
+ else
{
print "<a class=\"butActionRefused\" href=\"#\">".$langs->trans("StandingOrderReject")."</a>";
}
diff --git a/htdocs/compta/prelevement/lignes.php b/htdocs/compta/prelevement/lignes.php
index a3a1086ff32d51e541d970f60e3f811ea6e956fb..f93e4f21e2aa42c956bbc3a97a378bab189390d2 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 '<tr><td width="20%">'.$langs->trans('Status').'</td>';
print '<td>'.$bon->getLibStatut(1).'</td>';
print '</tr>';
-
+
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 '</td></tr>';
}
-
+
print '</table>';
print '</div>';
@@ -159,10 +160,10 @@ if ($result)
$obj = $db->fetch_object($result);
print "<tr $bc[$var]><td>";
-
+
print $ligne->LibStatut($obj->statut,2);
print " ";
-
+
print '<a href="'.DOL_URL_ROOT.'/compta/prelevement/ligne.php?id='.$obj->rowid.'">';
print substr('000000'.$obj->rowid, -6);
print '</a></td>';
diff --git a/htdocs/compta/prelevement/liste.php b/htdocs/compta/prelevement/liste.php
index b091cfba4b9e0e50407671fd6ba807abbdd8b218..1ba540731ad81ed1be16346c883dccd3cdfcd9c7 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 '<a href="'.DOL_URL_ROOT.'/compta/prelevement/ligne.php?id='.$obj->rowid_ligne.'">';
print substr('000000'.$obj->rowid_ligne, -6);
print '</a></td>';
print '<td>';
-
+
print $bon->LibStatut($obj->statut,2);
print " ";
-
+
print '<a href="fiche.php?id='.$obj->rowid.'">'.$obj->ref."</a></td>\n";
print '<td><a href="'.DOL_URL_ROOT.'/compta/facture.php?facid='.$obj->facid.'">';
diff --git a/htdocs/compta/prelevement/rejets.php b/htdocs/compta/prelevement/rejets.php
index 354f3f57c866f6b4813d6d779e8ab096f538bd5d..812fee4dae5df10430b3aefcd4960cb8bafbbbc9 100644
--- a/htdocs/compta/prelevement/rejets.php
+++ b/htdocs/compta/prelevement/rejets.php
@@ -2,6 +2,7 @@
/* Copyright (C) 2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2005-2009 Regis Houssin <regis@dolibarr.fr>
* Copyright (C) 2010-2012 Juanjo Menent <jmenent@2byte.es>
+ * Copyright (C) 2005-2012 Laurent Destailleur <eldy@users.sourceforge.net>
*
* 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 62ec73caa6429aff9e647bb02adbede6e5811f2a..7d5e1eba9a9aff973ad933a9126cd0fb88b4e192 100644
--- a/htdocs/compta/prelevement/stats.php
+++ b/htdocs/compta/prelevement/stats.php
@@ -1,6 +1,6 @@
<?PHP
/* Copyright (C) 2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2005-2010 Laurent Destailleur <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2012 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2009 Regis Houssin <regis@dolibarr.fr>
* Copyright (C) 2010-2011 Juanjo Menent <jmenent@2byte.es>
*
@@ -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 4d39abb4da82ce29b9652666bcc34839ab0b48d9..29433cfb63b9c5a9b04e329af66572a81d2ab62c 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 720353497066ea488f2cbedfce0e93d055bb5237..a3b886af78a67d47c91b661e8b0cc2b45d2603a2 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 ad45d6125efd20b07f3ecbf4da0b7f8c5f8b76f4..88401d22179acd0f2408e6ff00637e583ae8c12c 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 65aee784f2f3cee63e72e1f8aa4a523786415bdd..168f63913e8e44b6b48cd01b92cfe89181c2a499 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");