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

Fix: Missing join into request.

Browse Source 
Conflicts:
	htdocs/compta/facture.php
This commit is contained in:
Laurent Destailleur 2014-08-07 14:57:08 +02:00
parent 8c728ac638
commit de76fe4951
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
htdocs/compta/facture.php
View File

@ -2006,15 +2006,7 @@ $now=dol_now();
llxHeader('',$langs->trans('Bill'),'EN:Customers_Invoices|FR:Factures_Clients|ES:Facturas_a_clientes'); llxHeader('',$langs->trans('Bill'),'EN:Customers_Invoices|FR:Factures_Clients|ES:Facturas_a_clientes');
print '
<script type="text/javascript" language="javascript">
jQuery(document).ready(function() {
jQuery("#linktoorder").click(function() {
jQuery("#commande").toggle();
});
});
</script>
';
/********************************************************************* /*********************************************************************
@ -3812,16 +3804,26 @@ else if ($id > 0 || ! empty($ref))
// Linked object block // Linked object block
$somethingshown=$object->showLinkedObjectBlock(); $somethingshown=$object->showLinkedObjectBlock();
if (empty($somethingshown) && $object->statut > 0) if (empty($somethingshown) && ! empty($conf->commande->enabled))
{ {
print '<br><a href="#" id="linktoorder">' . $langs->trans('LinkedOrder') . '</a>'; print '<br><a href="#" id="linktoorder">' . $langs->trans('LinkedOrder') . '</a>';
print '
<script type="text/javascript" language="javascript">
jQuery(document).ready(function() {
jQuery("#linktoorder").click(function() {
jQuery("#commande").toggle();
});
});
</script>
';
print '<div id="commande" style="display:none">'; print '<div id="commande" style="display:none">';
$sql = "SELECT s.rowid as socid, s.nom as name, s.client, c.rowid, c.ref, c.ref_client, c.total_ht"; $sql = "SELECT s.rowid as socid, s.nom as name, s.client, c.rowid, c.ref, c.ref_client, c.total_ht";
$sql .= " FROM " . MAIN_DB_PREFIX . "societe as s"; $sql .= " FROM " . MAIN_DB_PREFIX . "societe as s";
$sql .= ", " . MAIN_DB_PREFIX . "commande as c"; $sql .= ", " . MAIN_DB_PREFIX . "commande as c";
$sql.= ' WHERE c.fk_soc = '.$soc->id.''; $sql .= ' WHERE c.fk_soc = s.rowid AND c.fk_soc = ' . $soc->id . '';
$resqlorderlist = $db->query($sql); $resqlorderlist = $db->query($sql);
if ($resqlorderlist) if ($resqlorderlist)