From de76fe4951f60268eec2c1c72bebba3abc64f89e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <ldestailleur@teclib.com>
Date: Thu, 7 Aug 2014 14:57:08 +0200
Subject: [PATCH] Fix: Missing join into request.
Conflicts:
htdocs/compta/facture.php
---
htdocs/compta/facture.php | 30 ++++++++++++++++--------------
1 file changed, 16 insertions(+), 14 deletions(-)
diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index 07960ed2c2c..bd5cdb0e9c8 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -2006,15 +2006,7 @@ $now=dol_now();
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
$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">';
$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.= ", ".MAIN_DB_PREFIX."commande as c";
- $sql.= ' WHERE c.fk_soc = '.$soc->id.'';
+ $sql .= " FROM " . MAIN_DB_PREFIX . "societe as s";
+ $sql .= ", " . MAIN_DB_PREFIX . "commande as c";
+ $sql .= ' WHERE c.fk_soc = s.rowid AND c.fk_soc = ' . $soc->id . '';
$resqlorderlist = $db->query($sql);
if ($resqlorderlist)
--
GitLab