Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-01-03 23:52:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Works on migration of relationship tables

Browse Source
This commit is contained in:
Regis Houssin
2009-12-12 20:41:27 +00:00
parent 30ad725fb5
commit 432dc7a009
25 changed files with 209 additions and 635 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
htdocs/compta/commande/fiche.php
View File

@@ -283,7 +283,7 @@ if ($id > 0 || ! empty($ref))
print '</td></tr>';
}
// Conditions et modes de r<>glement
// Conditions et modes de r<>glement
print '<tr><td height="10">';
print '<table class="nobordernopadding" width="100%"><tr><td>';
print $langs->trans('PaymentConditionsShort');
@@ -537,7 +537,7 @@ if ($id > 0 || ! empty($ref))
/*
* Documents g<EFBFBD>n<EFBFBD>r<EFBFBD>s
* Documents generes
*
*/
$comref = dol_sanitizeFileName($commande->ref);
@@ -554,8 +554,11 @@ if ($id > 0 || ! empty($ref))
* Liste des factures
*/
$sql = "SELECT f.rowid,f.facnumber, f.total_ttc, ".$db->pdate("f.datef")." as df";
$sql .= " FROM ".MAIN_DB_PREFIX."facture as f, ".MAIN_DB_PREFIX."co_fa as cf";
$sql .= " WHERE f.rowid = cf.fk_facture AND cf.fk_commande = ". $commande->id;
$sql.= " FROM ".MAIN_DB_PREFIX."facture as f";
$sql.= ", ".MAIN_DB_PREFIX."element_element as el";
$sql.= " WHERE f.rowid = el.fk_target";
$sql.= " AND el.fk_source = ". $commande->id;
$sql.= " AND el.sourcetype = '".$commande->element."'";
$result = $db->query($sql);
if ($result)
@@ -605,7 +608,7 @@ if ($id > 0 || ! empty($ref))
}
else
{
// Commande non trouv<EFBFBD>e
// Commande non trouvee
print "Commande inexistante";
}
}