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

Trad: Ajout champ total_ht, total_tva et total_ttc au niveau de lignes detail des entites

Browse Source
This commit is contained in:
Laurent Destailleur 2006-06-22 22:00:23 +00:00
parent e6b77ce921
commit e0c724f3be
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
htdocs/install/upgrade2.php
View File

@ -170,11 +170,11 @@ if (isset($_POST['action']) && $_POST['action'] == 'upgrade')
migrate_modeles($db,$langs,$conf); migrate_modeles($db,$langs,$conf);
// migrate_price_propal($db,$langs,$conf); migrate_price_propal($db,$langs,$conf);
// migrate_price_commande($db,$langs,$conf); migrate_price_commande($db,$langs,$conf);
// migrate_price_facture($db,$langs,$conf); migrate_price_facture($db,$langs,$conf);
// On commit dans tous les cas. // On commit dans tous les cas.
// La procédure etant conçue pour pouvoir passer plusieurs fois quelquesoit la situation. // La procédure etant conçue pour pouvoir passer plusieurs fois quelquesoit la situation.
@ -615,7 +615,7 @@ function migrate_price_facture($db,$langs,$conf)
$sql.= " f.rowid as facid, f.remise_percent as remise_percent_global"; $sql.= " f.rowid as facid, f.remise_percent as remise_percent_global";
$sql.= " FROM ".MAIN_DB_PREFIX."facturedet as fd, ".MAIN_DB_PREFIX."facture as f"; $sql.= " FROM ".MAIN_DB_PREFIX."facturedet as fd, ".MAIN_DB_PREFIX."facture as f";
$sql.= " WHERE fd.fk_facture = f.rowid"; $sql.= " WHERE fd.fk_facture = f.rowid";
$sql.= " AND (fd.total_ttc = 0 AND fd.remise_percent != 100) or fd.total_ttc IS NULL"; $sql.= " AND ((fd.total_ttc = 0 AND fd.remise_percent != 100) or fd.total_ttc IS NULL)";
$resql=$db->query($sql); $resql=$db->query($sql);
if ($resql) if ($resql)
{ {
@ -649,7 +649,7 @@ function migrate_price_facture($db,$langs,$conf)
dolibarr_install_syslog("Line $rowid: facid=$obj->facid pu=$pu qty=$qty tva_taux=$txtva remise_percent=$remise_percent remise_global=$remise_percent_global -> $total_ht, $total_tva, $total_ttc"); dolibarr_install_syslog("Line $rowid: facid=$obj->facid pu=$pu qty=$qty tva_taux=$txtva remise_percent=$remise_percent remise_global=$remise_percent_global -> $total_ht, $total_tva, $total_ttc");
print ". "; print ". ";
$facligne->update(); $facligne->update_total();
/* On touche pas a facture mere /* On touche pas a facture mere
@ -718,7 +718,7 @@ function migrate_price_propal($db,$langs,$conf)
$sql.= " p.rowid as propalid, p.remise_percent as remise_percent_global"; $sql.= " p.rowid as propalid, p.remise_percent as remise_percent_global";
$sql.= " FROM ".MAIN_DB_PREFIX."propaldet as pd, ".MAIN_DB_PREFIX."propal as p"; $sql.= " FROM ".MAIN_DB_PREFIX."propaldet as pd, ".MAIN_DB_PREFIX."propal as p";
$sql.= " WHERE pd.fk_propal = p.rowid"; $sql.= " WHERE pd.fk_propal = p.rowid";
$sql.= " AND (pd.total_ttc = 0 AND pd.remise_percent != 100) or pd.total_ttc IS NULL"; $sql.= " AND ((pd.total_ttc = 0 AND pd.remise_percent != 100) or pd.total_ttc IS NULL)";
$resql=$db->query($sql); $resql=$db->query($sql);
if ($resql) if ($resql)
{ {
@ -752,7 +752,7 @@ function migrate_price_propal($db,$langs,$conf)
dolibarr_install_syslog("Line $rowid: propalid=$obj->facid pu=$pu qty=$qty tva_taux=$txtva remise_percent=$remise_percent remise_global=$remise_percent_global -> $total_ht, $total_tva, $total_ttc"); dolibarr_install_syslog("Line $rowid: propalid=$obj->facid pu=$pu qty=$qty tva_taux=$txtva remise_percent=$remise_percent remise_global=$remise_percent_global -> $total_ht, $total_tva, $total_ttc");
print ". "; print ". ";
$propalligne->update($rowid); $propalligne->update_total($rowid);
/* On touche pas a propal mere /* On touche pas a propal mere
@ -820,7 +820,7 @@ function migrate_price_commande($db,$langs,$conf)
$sql.= " c.rowid as commandeid, c.remise_percent as remise_percent_global"; $sql.= " c.rowid as commandeid, c.remise_percent as remise_percent_global";
$sql.= " FROM ".MAIN_DB_PREFIX."commandedet as cd, ".MAIN_DB_PREFIX."commande as c"; $sql.= " FROM ".MAIN_DB_PREFIX."commandedet as cd, ".MAIN_DB_PREFIX."commande as c";
$sql.= " WHERE cd.fk_commande = c.rowid"; $sql.= " WHERE cd.fk_commande = c.rowid";
$sql.= " AND (cd.total_ttc = 0 AND cd.remise_percent != 100) or cd.total_ttc IS NULL"; $sql.= " AND ((cd.total_ttc = 0 AND cd.remise_percent != 100) or cd.total_ttc IS NULL)";
$resql=$db->query($sql); $resql=$db->query($sql);
if ($resql) if ($resql)
{ {
@ -854,7 +854,7 @@ function migrate_price_commande($db,$langs,$conf)
dolibarr_install_syslog("Line $rowid: commandeid=$obj->facid pu=$pu qty=$qty tva_taux=$txtva remise_percent=$remise_percent remise_global=$remise_percent_global -> $total_ht, $total_tva, $total_ttc"); dolibarr_install_syslog("Line $rowid: commandeid=$obj->facid pu=$pu qty=$qty tva_taux=$txtva remise_percent=$remise_percent remise_global=$remise_percent_global -> $total_ht, $total_tva, $total_ttc");
print ". "; print ". ";
$commandeligne->update($rowid); $commandeligne->update_total($rowid);
/* On touche pas a facture mere /* On touche pas a facture mere
$commande = new Commande($db); $commande = new Commande($db);