N'affiche que les modes de paiements actifs

This commit is contained in:
Laurent Destailleur 2005-09-02 20:02:15 +00:00
parent 2b12cc69fa
commit d0bce4b07f
4 changed files with 24 additions and 21 deletions

View File

@ -56,7 +56,7 @@ class PaiementFourn
*
*
*/
function Fetch($id,$user)
function fetch($id,$user)
{
/*
*/
@ -190,26 +190,28 @@ class PaiementFourn
return 1;
}
/*
*
*
*
/**
* \brief Affiche la liste des modes de paiement possible
* \param name nom du champ select
* \param filtre filtre sur un sens de paiement particulier, norme ISO (CRDT=Mode propre à un crédit, DBIT=mode propre à un débit)
* \param id ???
*/
function select($name, $filtre='', $id='')
{
$form = new Form($this->db);
if ($filtre == 'crédit')
if ($filtre == 'CRDT' || $filtre == 'crédit')
{
$sql = "SELECT id, libelle FROM ".MAIN_DB_PREFIX."c_paiement WHERE type IN (0,2) ORDER BY libelle";
$sql = "SELECT id, libelle FROM ".MAIN_DB_PREFIX."c_paiement WHERE active=1 AND type IN (0,2) ORDER BY libelle";
}
elseif ($filtre == 'débit')
elseif ($filtre == 'DBIT' || $filtre == 'débit')
{
$sql = "SELECT id, libelle FROM ".MAIN_DB_PREFIX."c_paiement WHERE type IN (1,2) ORDER BY libelle";
$sql = "SELECT id, libelle FROM ".MAIN_DB_PREFIX."c_paiement WHERE active=1 AND type IN (1,2) ORDER BY libelle";
}
else
{
$sql = "SELECT id, libelle FROM ".MAIN_DB_PREFIX."c_paiement ORDER BY libelle";
$sql = "SELECT id, libelle FROM ".MAIN_DB_PREFIX."c_paiement WHERE active=1 ORDER BY libelle";
}
$form->select($name, $sql, $id);
}

View File

@ -202,15 +202,15 @@ class Paiement
if ($filtre == 'CRDT')
{
$sql = "SELECT id, libelle FROM ".MAIN_DB_PREFIX."c_paiement WHERE type IN (0,2) ORDER BY libelle";
$sql = "SELECT id, libelle FROM ".MAIN_DB_PREFIX."c_paiement WHERE active=1 AND type IN (0,2) ORDER BY libelle";
}
elseif ($filtre == 'DBIT')
{
$sql = "SELECT id, libelle FROM ".MAIN_DB_PREFIX."c_paiement WHERE type IN (1,2) ORDER BY libelle";
$sql = "SELECT id, libelle FROM ".MAIN_DB_PREFIX."c_paiement WHERE active=1 AND type IN (1,2) ORDER BY libelle";
}
else
{
$sql = "SELECT id, libelle FROM ".MAIN_DB_PREFIX."c_paiement ORDER BY libelle";
$sql = "SELECT id, libelle FROM ".MAIN_DB_PREFIX."c_paiement WHERE active=1 ORDER BY libelle";
}
$form->select($name, $sql, $id);
}

View File

@ -520,14 +520,14 @@ insert into llx_c_forme_juridique (fk_pays, code, libelle) values (2,'110','GEIE
--
delete from llx_c_paiement;
insert into llx_c_paiement (id,code,libelle,type) values (0, '', '-', 3);
insert into llx_c_paiement (id,code,libelle,type) values (1, 'TIP', 'TIP', 1);
insert into llx_c_paiement (id,code,libelle,type) values (2, 'VIR', 'Virement', 2);
insert into llx_c_paiement (id,code,libelle,type) values (3, 'PRE', 'Prélèvement', 1);
insert into llx_c_paiement (id,code,libelle,type) values (4, 'LIQ', 'Liquide', 0);
insert into llx_c_paiement (id,code,libelle,type) values (5, 'VAD', 'Paiement en ligne', 0);
insert into llx_c_paiement (id,code,libelle,type) values (6, 'CB', 'Carte Bancaire', 1);
insert into llx_c_paiement (id,code,libelle,type) values (7, 'CHQ', 'Chèque', 2);
insert into llx_c_paiement (id,code,libelle,type,active) values (0, '', '-', 3,1);
insert into llx_c_paiement (id,code,libelle,type,active) values (1, 'TIP', 'TIP', 2,1);
insert into llx_c_paiement (id,code,libelle,type,active) values (2, 'VIR', 'Virement', 2,1);
insert into llx_c_paiement (id,code,libelle,type,active) values (3, 'PRE', 'Prélèvement', 2,1);
insert into llx_c_paiement (id,code,libelle,type,active) values (4, 'LIQ', 'Liquide', 2,1);
insert into llx_c_paiement (id,code,libelle,type,active) values (5, 'VAD', 'Paiement en ligne', 2,0);
insert into llx_c_paiement (id,code,libelle,type,active) values (6, 'CB', 'Carte Bancaire', 2,1);
insert into llx_c_paiement (id,code,libelle,type,active) values (7, 'CHQ', 'Chèque', 2,1);
--
-- Pays

View File

@ -683,6 +683,7 @@ update llx_const set visible='0' where name='MAIN_UPLOAD_DOC';
update llx_const set visible='0' where name='MAIN_TITLE';
update llx_bank set fk_type = 'VAD' where fk_type = 'WWW';
update llx_bank set fk_type = 'LIQ' where fk_type = 'DEP';
alter table llx_socpeople change civilite civilite varchar(6);