diff --git a/htdocs/fourn/facture/paiementfourn.class.php b/htdocs/fourn/facture/paiementfourn.class.php index 76af64fcfc9f6b481e52136b0485e7eee01cbb34..4eb27ca31daa04bb115967be28eb4024f17c73ac 100644 --- a/htdocs/fourn/facture/paiementfourn.class.php +++ b/htdocs/fourn/facture/paiementfourn.class.php @@ -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); } diff --git a/htdocs/paiement.class.php b/htdocs/paiement.class.php index b568dc2e963c12402be10d540464e7a90e1ad381..5acbd996144894b97f2646bcf7d916ff0311d7bc 100644 --- a/htdocs/paiement.class.php +++ b/htdocs/paiement.class.php @@ -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); } diff --git a/mysql/data/data.sql b/mysql/data/data.sql index a3c477619e33834741dc0859749c1037bc175f87..09824e7458d83a320a0a5f9b696702b847e0fe30 100644 --- a/mysql/data/data.sql +++ b/mysql/data/data.sql @@ -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 diff --git a/mysql/migration/1.1.0-2.0.0.sql b/mysql/migration/1.1.0-2.0.0.sql index b64f2a0035930975ba4f1e9578a5697999d22c89..127bfa0d86a302525f73a6eb7bd98eeda55322ca 100644 --- a/mysql/migration/1.1.0-2.0.0.sql +++ b/mysql/migration/1.1.0-2.0.0.sql @@ -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);