lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Qual: Uniformize code

Browse Source
This commit is contained in:
Laurent Destailleur 2012-08-05 14:37:45 +02:00
parent 14bda09369
commit e53e847083
25 changed files with 133 additions and 151 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -41,6 +41,10 @@ For developers:
- New: Uniformize code. - New: Uniformize code.
- New: Add option WORKFLOW_DISABLE_CREATE_INVOICE_FROM_ORDER and - New: Add option WORKFLOW_DISABLE_CREATE_INVOICE_FROM_ORDER and
WORKFLOW_DISABLE_CLASSIFY_BILLED_FROM_ORDER 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 ***** ***** ChangeLog for 3.2.0 compared to 3.1.3 *****

2
htdocs/admin/prelevement.php
View File

@ -25,7 +25,7 @@
*/ */
require('../main.inc.php'); 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."/core/lib/admin.lib.php");
require_once(DOL_DOCUMENT_ROOT."/compta/bank/class/account.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/bank/class/account.class.php");

2
htdocs/compta/facture/prelevement.php
View File

@ -27,7 +27,7 @@
require("../../main.inc.php"); require("../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT.'/core/lib/invoice.lib.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/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'); require_once(DOL_DOCUMENT_ROOT.'/core/class/discount.class.php');
if (!$user->rights->facture->lire) accessforbidden(); if (!$user->rights->facture->lire) accessforbidden();

2
htdocs/compta/prelevement/bon.php
View File

@ -26,7 +26,7 @@
require("../bank/pre.inc.php"); require("../bank/pre.inc.php");
require_once(DOL_DOCUMENT_ROOT."/core/lib/prelevement.lib.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."/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("bills");
$langs->load("categories"); $langs->load("categories");

2
htdocs/compta/prelevement/bons.php
View File

@ -25,7 +25,7 @@
*/ */
require("../bank/pre.inc.php"); 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("widthdrawals");
$langs->load("categories"); $langs->load("categories");

77
htdocs/compta/prelevement/class/bon-prelevement.class.php → htdocs/compta/prelevement/class/bonprelevement.class.php
View File

@ -2,6 +2,7 @@
/* Copyright (C) 2004-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2004-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2005-2010 Regis Houssin <regis@dolibarr.fr> * Copyright (C) 2005-2010 Regis Houssin <regis@dolibarr.fr>
* Copyright (C) 2010-2012 Juanjo Menent <jmenent@2byte.es> * 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 * 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 * 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 * \ingroup prelevement
* \brief Fichier de la classe des bons de prelevements * \brief Fichier de la classe des bons de prelevements
*/ */
@ -132,19 +133,19 @@ class BonPrelevement extends CommonObject
else else
{ {
$result = -1; $result = -1;
dol_syslog("BonPrelevement::AddFacture Erreur $result"); dol_syslog(get_class($this)."::AddFacture Erreur $result");
} }
} }
else else
{ {
$result = -2; $result = -2;
dol_syslog("BonPrelevement::AddFacture Erreur $result"); dol_syslog(get_class($this)."::AddFacture Erreur $result");
} }
} }
else else
{ {
$result = -3; $result = -3;
dol_syslog("BonPrelevement::AddFacture Erreur $result"); dol_syslog(get_class($this)."::AddFacture Erreur $result");
} }
return $result; return $result;
@ -224,7 +225,7 @@ class BonPrelevement extends CommonObject
} }
else else
{ {
dol_syslog("BonPrelevement::addline Error -2"); dol_syslog(get_class($this)."::addline Error -2");
$result = -2; $result = -2;
} }
@ -269,7 +270,7 @@ class BonPrelevement extends CommonObject
$sql.= " WHERE p.rowid = ".$rowid; $sql.= " WHERE p.rowid = ".$rowid;
$sql.= " AND p.entity = ".$conf->entity; $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); $result=$this->db->query($sql);
if ($result) if ($result)
{ {
@ -298,21 +299,20 @@ class BonPrelevement extends CommonObject
} }
else else
{ {
dol_syslog("BonPrelevement::Fetch Erreur aucune ligne retournee"); dol_syslog(get_class($this)."::Fetch Erreur aucune ligne retournee");
return -1; return -1;
} }
} }
else else
{ {
dol_syslog("BonPrelevement::Fetch Erreur sql=".$sql, LOG_ERR); dol_syslog(get_class($this)."::Fetch Erreur sql=".$sql, LOG_ERR);
return -2; return -2;
} }
} }
/** /**
* Set credite * Set credite and set status of linked invoices
* *
* @deprecated
* @return int <0 if KO, >0 if OK * @return int <0 if KO, >0 if OK
*/ */
function set_credite() function set_credite()
@ -331,7 +331,7 @@ class BonPrelevement extends CommonObject
$result=$this->db->query($sql); $result=$this->db->query($sql);
if (! $result) if (! $result)
{ {
dol_syslog("bon-prelevement::set_credite Erreur 1"); dol_syslog(get_class($this)."::set_credite Erreur 1");
$error++; $error++;
} }
@ -344,7 +344,7 @@ class BonPrelevement extends CommonObject
for ($i = 0; $i < $num; $i++) for ($i = 0; $i < $num; $i++)
{ {
/* Tag invoice as payed */ /* 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 = new Facture($this->db);
$fac->fetch($facs[$i]); $fac->fetch($facs[$i]);
$result = $fac->set_paid($user); $result = $fac->set_paid($user);
@ -360,14 +360,13 @@ class BonPrelevement extends CommonObject
if (! $this->db->query($sql)) if (! $this->db->query($sql))
{ {
dol_syslog("BonPrelevement::set_credite Erreur 1"); dol_syslog(get_class($this)."::set_credite Erreur 1");
$error++; $error++;
} }
} }
/* /*
* Fin de la procedure * Fin de la procedure
*
*/ */
if ($error == 0) if ($error == 0)
{ {
@ -377,20 +376,20 @@ class BonPrelevement extends CommonObject
else else
{ {
$this->db->rollback(); $this->db->rollback();
dol_syslog("BonPrelevement::set_credite ROLLBACK "); dol_syslog(get_class($this)."::set_credite ROLLBACK ");
return -1; return -1;
} }
} }
else else
{ {
dol_syslog("BonPrelevement::set_credite Ouverture transaction SQL impossible "); dol_syslog(get_class($this)."::set_credite Ouverture transaction SQL impossible ");
return -2; return -2;
} }
} }
/** /**
* Set withdrawal to creditet status * Set withdrawal to credited status
* *
* @param User $user id of user * @param User $user id of user
* @param timestamp $date date of action * @param timestamp $date date of action
@ -447,7 +446,7 @@ class BonPrelevement extends CommonObject
$paiement_id = $paiement->create($user); $paiement_id = $paiement->create($user);
if ($paiement_id < 0) if ($paiement_id < 0)
{ {
dol_syslog("BonPrelevement::set_credite AddPayment Error"); dol_syslog(get_class($this)."::set_credite AddPayment Error");
$error++; $error++;
} }
else else
@ -455,26 +454,26 @@ class BonPrelevement extends CommonObject
$result=$paiement->addPaymentToBank($user,'payment','(WithdrawalPayment)',$bankaccount); $result=$paiement->addPaymentToBank($user,'payment','(WithdrawalPayment)',$bankaccount);
if ($result < 0) if ($result < 0)
{ {
dol_syslog("BonPrelevement::set_credite AddPaymentToBank Error"); dol_syslog(get_class($this)."::set_credite AddPaymentToBank Error");
$error++; $error++;
} }
} }
// Update prelevement line // Update prelevement line
// TODO: Translate to ligne-prelevement.class.php // TODO: Translate to ligneprelevement.class.php
$sql = " UPDATE ".MAIN_DB_PREFIX."prelevement_lignes"; $sql = " UPDATE ".MAIN_DB_PREFIX."prelevement_lignes";
$sql.= " SET statut = 2"; $sql.= " SET statut = 2";
$sql.= " WHERE fk_prelevement_bons = ".$this->id; $sql.= " WHERE fk_prelevement_bons = ".$this->id;
if (! $this->db->query($sql)) if (! $this->db->query($sql))
{ {
dol_syslog("BonPrelevement::set_credite Update lines Error"); dol_syslog(get_class($this)."::set_credite Update lines Error");
$error++; $error++;
} }
} }
else else
{ {
dol_syslog("BonPrelevement::set_infocredit Update Bons Error"); dol_syslog(get_class($this)."::set_infocredit Update Bons Error");
$error++; $error++;
} }
@ -496,7 +495,7 @@ class BonPrelevement extends CommonObject
} }
else 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; return -1025;
} }
} }
@ -526,7 +525,7 @@ class BonPrelevement extends CommonObject
$error = 0; $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()) if ($this->db->begin())
{ {
$sql = "UPDATE ".MAIN_DB_PREFIX."prelevement_bons "; $sql = "UPDATE ".MAIN_DB_PREFIX."prelevement_bons ";
@ -550,7 +549,7 @@ class BonPrelevement extends CommonObject
} }
else 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()); dol_syslog($this->db->error());
$error++; $error++;
} }
@ -568,7 +567,7 @@ class BonPrelevement extends CommonObject
else else
{ {
$this->db->rollback(); $this->db->rollback();
dol_syslog("BonPrelevement::set_infotrans ROLLBACK", LOG_ERR); dol_syslog(get_class($this)."::set_infotrans ROLLBACK", LOG_ERR);
return -1; return -1;
} }
@ -576,7 +575,7 @@ class BonPrelevement extends CommonObject
else 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; return -2;
} }
} }
@ -586,7 +585,7 @@ class BonPrelevement extends CommonObject
* *
* @return array id of invoices * @return array id of invoices
*/ */
function _get_list_factures() private function _get_list_factures()
{ {
global $conf; global $conf;
@ -624,7 +623,7 @@ class BonPrelevement extends CommonObject
} }
else else
{ {
dol_syslog("Bon-Prelevement::_get_list_factures Erreur"); dol_syslog(get_class($this)."::_get_list_factures Erreur");
} }
return $arr; return $arr;
@ -662,7 +661,7 @@ class BonPrelevement extends CommonObject
else else
{ {
$error = 1; $error = 1;
dol_syslog("BonPrelevement::SommeAPrelever Erreur -1"); dol_syslog(get_class($this)."::SommeAPrelever Erreur -1");
dol_syslog($this->db->error()); dol_syslog($this->db->error());
} }
} }
@ -704,7 +703,7 @@ class BonPrelevement extends CommonObject
} }
else 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); dol_syslog($this->error, LOG_ERR);
return -1; return -1;
} }
@ -723,7 +722,7 @@ class BonPrelevement extends CommonObject
{ {
global $conf,$langs; 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."/compta/facture/class/facture.class.php");
require_once (DOL_DOCUMENT_ROOT."/societe/class/societe.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 ($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."'"; 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); $resql = $this->db->query($sql);
if ($resql) if ($resql)
{ {
@ -809,7 +808,7 @@ class BonPrelevement extends CommonObject
if ($soc->verif_rib() == 1) if ($soc->verif_rib() == 1)
{ {
$factures_prev[$i] = $fac; $factures_prev[$i] = $fac;
/* second tableau necessaire pour bon-prelevement */ /* second tableau necessaire pour BonPrelevement */
$factures_prev_id[$i] = $fac[0]; $factures_prev_id[$i] = $fac[0];
$i++; $i++;
} }
@ -879,7 +878,7 @@ class BonPrelevement extends CommonObject
$sql.= " WHERE ref LIKE '".$ref."%'"; $sql.= " WHERE ref LIKE '".$ref."%'";
$sql.= " AND entity = ".$conf->entity; $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); $resql = $this->db->query($sql);
if ($resql) if ($resql)
@ -905,7 +904,7 @@ class BonPrelevement extends CommonObject
$sql.= ", '".$this->db->idate($now)."'"; $sql.= ", '".$this->db->idate($now)."'";
$sql.= ")"; $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); $resql = $this->db->query($sql);
if ($resql) if ($resql)
@ -966,7 +965,7 @@ class BonPrelevement extends CommonObject
$sql.= ", fk_prelevement_bons = ".$prev_id; $sql.= ", fk_prelevement_bons = ".$prev_id;
$sql.= " WHERE rowid = ".$fac[1]; $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); $resql=$this->db->query($sql);
if (! $resql) if (! $resql)
{ {
@ -1020,7 +1019,7 @@ class BonPrelevement extends CommonObject
$sql.= " WHERE rowid = ".$prev_id; $sql.= " WHERE rowid = ".$prev_id;
$sql.= " AND entity = ".$conf->entity; $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); $resql=$this->db->query($sql);
if (! $resql) if (! $resql)
{ {
@ -1152,7 +1151,7 @@ class BonPrelevement extends CommonObject
else else
{ {
$result = -1; $result = -1;
dol_syslog("BonPrelevement::AddNotification Error $result"); dol_syslog(get_class($this)."::AddNotification Error $result");
} }
} }

2
htdocs/compta/prelevement/class/ligne-prelevement.class.php → htdocs/compta/prelevement/class/ligneprelevement.class.php
View File

@ -19,7 +19,7 @@
*/ */
/** /**
* \file htdocs/compta/prelevement/class/ligne-prelevement.class.php * \file htdocs/compta/prelevement/class/ligneprelevement.class.php
* \ingroup prelevement * \ingroup prelevement
* \brief Fichier de la classe des lignes de prelevements * \brief Fichier de la classe des lignes de prelevements
*/ */

7
htdocs/compta/prelevement/class/rejet-prelevement.class.php → htdocs/compta/prelevement/class/rejetprelevement.class.php
View File

@ -19,15 +19,14 @@
*/ */
/** /**
* \file htdocs/compta/prelevement/class/rejet-prelevement.class.php * \file htdocs/compta/prelevement/class/rejetprelevement.class.php
* \ingroup prelevement * \ingroup prelevement
* \brief File of class to manage standing orders rejects * \brief File of class to manage standing orders rejects
*/ */
/** /**
\class RejetPrelevement * Class to manage standing orders rejects
\brief Class to manage standing orders rejects
*/ */
class RejetPrelevement class RejetPrelevement
{ {
@ -273,7 +272,7 @@ class RejetPrelevement
* *
* @return void * @return void
*/ */
function _get_list_factures() private function _get_list_factures()
{ {
global $conf; global $conf;

5
htdocs/compta/prelevement/create.php
View File

@ -20,11 +20,12 @@
/** /**
* \file htdocs/compta/prelevement/create.php * \file htdocs/compta/prelevement/create.php
* \brief Prelevement * \ingroup prelevement
* \brief Prelevement creation page
*/ */
require("../bank/pre.inc.php"); 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."/compta/facture/class/facture.class.php");
require_once(DOL_DOCUMENT_ROOT."/societe/class/societe.class.php"); require_once(DOL_DOCUMENT_ROOT."/societe/class/societe.class.php");
require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php");

2
htdocs/compta/prelevement/demandes.php
View File

@ -20,8 +20,10 @@
/** /**
* \file htdocs/compta/prelevement/demandes.php * \file htdocs/compta/prelevement/demandes.php
* \ingroup prelevement
* \brief Page to list withdraw requests * \brief Page to list withdraw requests
*/ */
require("../bank/pre.inc.php"); require("../bank/pre.inc.php");
require_once DOL_DOCUMENT_ROOT."/core/modules/modPrelevement.class.php"; require_once DOL_DOCUMENT_ROOT."/core/modules/modPrelevement.class.php";
require_once DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"; require_once DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php";

4
htdocs/compta/prelevement/factures.php
View File

@ -26,8 +26,8 @@
require("../bank/pre.inc.php"); require("../bank/pre.inc.php");
require_once(DOL_DOCUMENT_ROOT."/core/lib/prelevement.lib.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");
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"); require_once(DOL_DOCUMENT_ROOT."/compta/paiement/class/paiement.class.php");
$langs->load("companies"); $langs->load("companies");

8
htdocs/compta/prelevement/facturesrejets.php
View File

@ -17,8 +17,14 @@
* *
*/ */
/**
* \file htdocs/compta/prelevement/facturesrejets.php
* \ingroup prelevement
* \brief Invoice reject
*/
require("../bank/pre.inc.php"); 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"; require_once DOL_DOCUMENT_ROOT."/compta/paiement/class/paiement.class.php";
$langs->load("categories"); $langs->load("categories");

7
htdocs/compta/prelevement/fiche-rejet.php
View File

@ -20,13 +20,14 @@
/** /**
* \file htdocs/compta/prelevement/fiche-rejet.php * \file htdocs/compta/prelevement/fiche-rejet.php
* \brief Prelevement * \ingroup prelevement
* \brief Withdraw reject
*/ */
require("../bank/pre.inc.php"); require("../bank/pre.inc.php");
require_once(DOL_DOCUMENT_ROOT."/core/lib/prelevement.lib.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");
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"); require_once(DOL_DOCUMENT_ROOT."/compta/paiement/class/paiement.class.php");
$langs->load("categories"); $langs->load("categories");

7
htdocs/compta/prelevement/fiche-stat.php
View File

@ -19,13 +19,14 @@
/** /**
* \file htdocs/compta/prelevement/fiche-stat.php * \file htdocs/compta/prelevement/fiche-stat.php
* \brief Prelevement * \ingroup prelevement
* \brief Prelevement statistics
*/ */
require("../bank/pre.inc.php"); require("../bank/pre.inc.php");
require_once(DOL_DOCUMENT_ROOT."/core/lib/prelevement.lib.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");
require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/ligne-prelevement.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/ligneprelevement.class.php");
// Security check // Security check
if ($user->societe_id > 0) accessforbidden(); if ($user->societe_id > 0) accessforbidden();

2
htdocs/compta/prelevement/fiche.php
View File

@ -25,7 +25,7 @@
require("../bank/pre.inc.php"); require("../bank/pre.inc.php");
require_once(DOL_DOCUMENT_ROOT."/core/lib/prelevement.lib.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) if (!$user->rights->prelevement->bons->lire)
accessforbidden(); accessforbidden();

5
htdocs/compta/prelevement/index.php
View File

@ -20,11 +20,12 @@
/** /**
* \file htdocs/compta/prelevement/index.php * \file htdocs/compta/prelevement/index.php
* \brief Prelevement * \ingroup prelevement
* \brief Prelevement index page
*/ */
require("../bank/pre.inc.php"); 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."/compta/facture/class/facture.class.php");
require_once(DOL_DOCUMENT_ROOT."/societe/class/societe.class.php"); require_once(DOL_DOCUMENT_ROOT."/societe/class/societe.class.php");
require_once(DOL_DOCUMENT_ROOT."/core/lib/prelevement.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/prelevement.lib.php");

8
htdocs/compta/prelevement/ligne.php
View File

@ -1,6 +1,6 @@
<?PHP <?PHP
/* Copyright (C) 2005 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* 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) 2005-2009 Regis Houssin <regis@dolibarr.fr>
* Copyright (C) 2010-2012 Juanjo Menent <jmenent@2byte.es> * Copyright (C) 2010-2012 Juanjo Menent <jmenent@2byte.es>
* *
@ -25,9 +25,9 @@
*/ */
require("../bank/pre.inc.php"); 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/prelevement/class/ligne-prelevement.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/ligneprelevement.class.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"); require_once(DOL_DOCUMENT_ROOT."/compta/paiement/class/paiement.class.php");
// Security check // Security check

9
htdocs/compta/prelevement/lignes.php
View File

@ -20,14 +20,15 @@
/** /**
* \file htdocs/compta/prelevement/lignes.php * \file htdocs/compta/prelevement/lignes.php
* \brief Prelevement * \ingroup prelevement
* \brief Prelevement lines
*/ */
require("../bank/pre.inc.php"); require("../bank/pre.inc.php");
require_once(DOL_DOCUMENT_ROOT."/core/lib/prelevement.lib.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");
require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/ligne-prelevement.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/ligneprelevement.class.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"); require_once(DOL_DOCUMENT_ROOT."/compta/paiement/class/paiement.class.php");
// Security check // Security check

4
htdocs/compta/prelevement/liste.php
View File

@ -24,8 +24,8 @@
* \brief Page liste des prelevements * \brief Page liste des prelevements
*/ */
require("../bank/pre.inc.php"); 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/prelevement/class/ligne-prelevement.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/ligneprelevement.class.php");
$langs->load("withdrawals"); $langs->load("withdrawals");
$langs->load("companies"); $langs->load("companies");

7
htdocs/compta/prelevement/rejets.php
View File

@ -2,6 +2,7 @@
/* Copyright (C) 2005 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2005-2009 Regis Houssin <regis@dolibarr.fr> * Copyright (C) 2005-2009 Regis Houssin <regis@dolibarr.fr>
* Copyright (C) 2010-2012 Juanjo Menent <jmenent@2byte.es> * 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 * 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 * 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("../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"); require_once(DOL_DOCUMENT_ROOT."/compta/paiement/class/paiement.class.php");
$langs->load("withdrawals"); $langs->load("withdrawals");

11
htdocs/compta/prelevement/stats.php
View File

@ -1,6 +1,6 @@
<?PHP <?PHP
/* Copyright (C) 2005 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* 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) 2005-2009 Regis Houssin <regis@dolibarr.fr>
* Copyright (C) 2010-2011 Juanjo Menent <jmenent@2byte.es> * Copyright (C) 2010-2011 Juanjo Menent <jmenent@2byte.es>
* *
@ -19,12 +19,13 @@
*/ */
/** /**
* \file htdocs/compta/prelevement/stats.php * \file htdocs/compta/prelevement/stats.php
* \brief Page de stats des prelevements * \ingroup prelevement
* \brief Page de stats des prelevements
*/ */
require("../bank/pre.inc.php"); 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("withdrawals");
$langs->load("companies"); $langs->load("companies");
@ -192,7 +193,7 @@ if ($resql)
$var=True; $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); $Rejet = new RejetPrelevement($db, $user);
while ($i < $num) while ($i < $num)

22
htdocs/core/class/html.form.class.php
View File

@ -2837,28 +2837,6 @@ class Form
return $out; 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 * Load into the cache vat rates of a country

16
htdocs/core/class/html.formadmin.class.php
View File

@ -44,22 +44,6 @@ class FormAdmin
return 1; 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) * Return html select list with available languages (key='en_US', value='United States' for example)
* *

1
htdocs/install/mysql/migration/3.2.0-3.3.0.sql
View File

@ -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 varchar(128) NOT NULL;
ALTER TABLE llx_product MODIFY ref_ext varchar(128); 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 charges DOUBLE( 24, 8 ) DEFAULT 0 AFTER unitprice;
ALTER TABLE llx_product_fournisseur_price ADD unitcharges DOUBLE( 24, 8 ) DEFAULT 0 AFTER charges; ALTER TABLE llx_product_fournisseur_price ADD unitcharges DOUBLE( 24, 8 ) DEFAULT 0 AFTER charges;

2
scripts/withdrawals/build_withdrawal_file.php
View File

@ -38,7 +38,7 @@ if (substr($sapi_type, 0, 3) == 'cgi') {
$version='1.6'; $version='1.6';
require_once($path."../../htdocs/master.inc.php"); 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."/compta/facture/class/facture.class.php");
require_once(DOL_DOCUMENT_ROOT."/societe/class/societe.class.php"); require_once(DOL_DOCUMENT_ROOT."/societe/class/societe.class.php");
require_once(DOL_DOCUMENT_ROOT."/compta/paiement/class/paiement.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/paiement/class/paiement.class.php");