This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Lx-Office CRM".
The branch master has been updated
via 7f98caabdbf3dcfdb34333704664220e18a12db0 (commit)
from 83534f0f5f4ede59dd776ac9312cdf738218b456 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 7f98caabdbf3dcfdb34333704664220e18a12db0
Author: Holger Lindemann <hli@...>
Date: Tue Jun 12 17:38:38 2012 +0200
Zeiterfassung, Auftrag geschlossen abfragen
-----------------------------------------------------------------------
Summary of changes:
inc/crmLib.php | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Full change list:
diff --git a/inc/crmLib.php b/inc/crmLib.php
index edb3e7a..3f3f235 100644
--- a/inc/crmLib.php
+++ b/inc/crmLib.php
@@ -2906,7 +2906,7 @@ function getOneTT($id,$event=true) {
* Alle Zeiteinträge, untere Maske, holen
*****************************************************/
function getTTEvents($id,$alle,$evtid,$abr=False) {
- $sql = "SELECT t.*,COALESCE(e.name,e.login) AS user,oe.ordnumber FROM tt_event t ";
+ $sql = "SELECT t.*,COALESCE(e.name,e.login) AS user,oe.ordnumber,oe.closed FROM tt_event t ";
$sql .= "LEFT JOIN employee e ON e.id=t.uid LEFT JOIN oe ON t.cleared=oe.id WHERE ttid = $id ";
if ( !$alle ) $sql .= "AND (cleared < 1 OR cleared IS NUll) ";
if ( $GLOBALS['clearonly'] AND $abr ) $sql .= 'AND uid = '.$_SESSION['loginCRM'].' ';
hooks/post-receive
--
Lx-Office CRM
|