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

Fix: Supprime colonne obsolete fk_facture dans llx_paiement car gre par llx_paiement_facture

Browse Source 
Fix: la liste de treso ne prend en compte que les factures non payes
This commit is contained in:
Regis Houssin 2007-12-07 21:21:43 +00:00
parent a10968cddc
commit 90cfe4ddcb
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/compta/bank/treso.php
View File

@ -152,13 +152,13 @@ if ($_REQUEST["account"] || $_REQUEST["ref"])
$sql.= " s.rowid as socid, s.nom, s.fournisseur"; $sql.= " s.rowid as socid, s.nom, s.fournisseur";
$sql.= " FROM ".MAIN_DB_PREFIX."facture as f"; $sql.= " FROM ".MAIN_DB_PREFIX."facture as f";
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON f.fk_soc = s.rowid"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON f.fk_soc = s.rowid";
$sql.= " WHERE f.paye = 0 AND fk_statut > 0"; $sql.= " WHERE f.paye = 0 AND fk_statut = 1";
$sql.= " UNION DISTINCT"; $sql.= " UNION DISTINCT";
$sql.= " SELECT ff.rowid as facid, ff.facnumber, (-1*ff.total_ttc), ff.type, ".$db->pdate("ff.date_lim_reglement")." as dlr,"; $sql.= " SELECT ff.rowid as facid, ff.facnumber, (-1*ff.total_ttc), ff.type, ".$db->pdate("ff.date_lim_reglement")." as dlr,";
$sql.= " s.rowid as socid, s.nom, s.fournisseur"; $sql.= " s.rowid as socid, s.nom, s.fournisseur";
$sql.= " FROM ".MAIN_DB_PREFIX."facture_fourn as ff"; $sql.= " FROM ".MAIN_DB_PREFIX."facture_fourn as ff";
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON ff.fk_soc = s.rowid"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON ff.fk_soc = s.rowid";
$sql.= " WHERE ff.paye = 0 AND fk_statut > 0"; $sql.= " WHERE ff.paye = 0 AND fk_statut = 1";
$sql.= " ORDER BY dlr ASC"; $sql.= " ORDER BY dlr ASC";
$result = $db->query($sql); $result = $db->query($sql);

2
mysql/migration/2.1.0-2.2.0.sql
View File

@ -87,6 +87,8 @@ update llx_rights_def set libelle='Cr
-- Supprime colone en doublon avec fk_user_creat -- Supprime colone en doublon avec fk_user_creat
alter table llx_paiement drop column author; alter table llx_paiement drop column author;
-- Supprime colonne obsolete car gérée par llx_paiement_facture
alter table llx_paiement drop column fk_facture;
update llx_actioncomm set fk_action = 9 where fk_action = 10; update llx_actioncomm set fk_action = 9 where fk_action = 10;
update llx_actioncomm set percent = 100 where percent = 0 and datea is not null; update llx_actioncomm set percent = 100 where percent = 0 and datea is not null;

1
mysql/tables/llx_paiement.sql
View File

@ -26,7 +26,6 @@
create table llx_paiement create table llx_paiement
( (
rowid integer AUTO_INCREMENT PRIMARY KEY, rowid integer AUTO_INCREMENT PRIMARY KEY,
fk_facture integer,
datec datetime, -- date de creation datec datetime, -- date de creation
tms timestamp, tms timestamp,
datep datetime, -- payment date datep datetime, -- payment date