diff --git a/build/exe/doliwamp/doliwamp.iss b/build/exe/doliwamp/doliwamp.iss index d0191e7f785..4e77d880df0 100644 --- a/build/exe/doliwamp/doliwamp.iss +++ b/build/exe/doliwamp/doliwamp.iss @@ -22,7 +22,8 @@ AppVerName=DoliWamp-3.2.0-beta OutputBaseFilename=DoliWamp-3.2.0-beta ; Define full path from wich all relative path are defined ; You must modify this to put here your dolibarr root directory -SourceDir=c:\Documents and Settings\ldestail\git\dolibarr +;SourceDir=C:\Documents and Settings\ldestail\git\dolibarrold +SourceDir=Z:\home\ldestail\git\dolibarrold ; ----- End of change ;OutputManifestFile=build\doliwampbuild.log AppId=doliwamp diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl index f1d7bed8418..e991273597f 100644 --- a/build/makepack-dolibarr.pl +++ b/build/makepack-dolibarr.pl @@ -24,7 +24,7 @@ $RPMSUBVERSION="auto"; # auto use value found into BUILD "RPM_OPENSUSE"=>"rpmbuild", "DEB"=>"dpkg", "APS"=>"zip", -"EXEDOLIWAMP"=>"iscc.exe" +"EXEDOLIWAMP"=>"ISCC.exe" ); %ALTERNATEPATH=( "7z"=>"7-ZIP", @@ -38,7 +38,7 @@ $FILENAMEZIP="$PROJECT-$MAJOR.$MINOR.$BUILD"; $FILENAMERPM="$PROJECT-$MAJOR.$MINOR.$BUILD-$RPMSUBVERSION"; $FILENAMEDEB="${PROJECT}_${MAJOR}.${MINOR}.${BUILD}"; $FILENAMEAPS="$PROJECT-$MAJOR.$MINOR.$BUILD.app"; -$FILENAMEEXEDOLIWAMP="$PROJECT-$MAJOR.$MINOR.$BUILD"; +$FILENAMEEXEDOLIWAMP="DoliWamp-$MAJOR.$MINOR.$BUILD"; if (-d "/usr/src/redhat") { $RPMDIR="/usr/src/redhat"; } # redhat if (-d "/usr/src/RPM") { $RPMDIR="/usr/src/RPM"; } # mandrake @@ -763,8 +763,10 @@ if ($nboftargetok) { print "Remove target $FILENAMEEXEDOLIWAMP.exe...\n"; unlink "$NEWDESTI/$FILENAMEEXEDOLIWAMP.exe"; - print "Compil exe $FILENAMEEXEDOLIWAMP.exe file from iss file \"$SOURCE\\build\\exe\\doliwamp\\doliwamp.iss\"\n"; - $cmd= "iscc.exe \"$SOURCE\\build\\exe\\doliwamp\\doliwamp.iss\""; + $SOURCEBACK=$SOURCE; + $SOURCEBACK =~ s/\//\\/g; + print "Compil exe $FILENAMEEXEDOLIWAMP.exe file from iss file \"$SOURCEBACK\\build\\exe\\doliwamp\\doliwamp.iss\"\n"; + $cmd= "ISCC.exe \"$SOURCEBACK\\build\\exe\\doliwamp\\doliwamp.iss\""; print "$cmd\n"; $ret= `$cmd`; #print "$ret\n"; @@ -772,6 +774,8 @@ if ($nboftargetok) { # Move to final dir print "Move \"$SOURCE\\build\\$FILENAMEEXEDOLIWAMP.exe\" to $NEWDESTI/$FILENAMEEXEDOLIWAMP.exe\n"; rename("$SOURCE/build/$FILENAMEEXEDOLIWAMP.exe","$NEWDESTI/$FILENAMEEXEDOLIWAMP.exe"); + print "Move $SOURCE/build/$FILENAMEEXEDOLIWAMP.exe to $NEWDESTI/$FILENAMEEXEDOLIWAMP.exe\n"; + $ret=`mv "$SOURCE/build/$FILENAMEEXEDOLIWAMP.exe" "$NEWDESTI/$FILENAMEEXEDOLIWAMP.exe"`; next; } } diff --git a/htdocs/comm/propal/index.php b/htdocs/comm/propal/index.php index 65867a55128..c3f07553948 100644 --- a/htdocs/comm/propal/index.php +++ b/htdocs/comm/propal/index.php @@ -1,7 +1,7 @@ * Copyright (C) 2004-2011 Laurent Destailleur - * Copyright (C) 2005-2009 Regis Houssin + * Copyright (C) 2005-2012 Regis Houssin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -48,6 +48,7 @@ if ($user->societe_id > 0) */ $propalstatic=new Propal($db); +$companystatic=new Societe($db); $form = new Form($db); $formfile = new FormFile($db); $help_url="EN:Module_Commercial_Proposals|FR:Module_Propositions_commerciales|ES:Módulo Presupuestos"; @@ -155,7 +156,7 @@ else */ if ($conf->propal->enabled) { - $sql = "SELECT c.rowid, c.ref, s.nom, s.rowid as socid"; + $sql = "SELECT c.rowid, c.ref, s.nom as socname, s.rowid as socid, s.canvas, s.client"; $sql.= " FROM ".MAIN_DB_PREFIX."propal as c"; $sql.= ", ".MAIN_DB_PREFIX."societe as s"; if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; @@ -182,9 +183,18 @@ if ($conf->propal->enabled) $var=!$var; $obj = $db->fetch_object($resql); print ""; - print ''; - print "".img_object($langs->trans("ShowPropal"),"propal").' '.$obj->ref.""; - print ''.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($obj->nom,24).''; + + $propalstatic->id=$obj->rowid; + $propalstatic->ref=$obj->ref; + print ''.$propalstatic->getNomUrl(1).''; + + $companystatic->id=$obj->socid; + $companystatic->name=$obj->socname; + $companystatic->client=$obj->client; + $companystatic->canvas=$obj->canvas; + print ''.$companystatic->getNomUrl(1,'customer',24).''; + + print ''; $i++; } } @@ -201,7 +211,7 @@ $max=5; * Last modified proposals */ -$sql = "SELECT c.rowid, c.ref, c.fk_statut, s.nom, s.rowid as socid,"; +$sql = "SELECT c.rowid, c.ref, c.fk_statut, s.nom as socname, s.rowid as socid, s.canvas, s.client,"; $sql.= " date_cloture as datec"; $sql.= " FROM ".MAIN_DB_PREFIX."propal as c"; $sql.= ", ".MAIN_DB_PREFIX."societe as s"; @@ -255,7 +265,12 @@ if ($resql) print ''; - print ''.img_object($langs->trans("ShowCompany"),"company").' '.$obj->nom.''; + $companystatic->id=$obj->socid; + $companystatic->name=$obj->socname; + $companystatic->client=$obj->client; + $companystatic->canvas=$obj->canvas; + print ''.$companystatic->getNomUrl(1,'customer').''; + print ''.dol_print_date($db->jdate($obj->datec),'day').''; print ''.$propalstatic->LibStatut($obj->fk_statut,5).''; print ''; @@ -274,7 +289,7 @@ if ($conf->propal->enabled && $user->rights->propale->lire) { $langs->load("propal"); - $sql = "SELECT s.nom, s.rowid, p.rowid as propalid, p.total as total_ttc, p.total_ht, p.ref, p.fk_statut, p.datep as dp"; + $sql = "SELECT s.nom as socname, s.rowid as socid, s.canvas, s.client, p.rowid as propalid, p.total as total_ttc, p.total_ht, p.ref, p.fk_statut, p.datep as dp"; $sql.= " FROM ".MAIN_DB_PREFIX."societe as s"; $sql.= ", ".MAIN_DB_PREFIX."propal as p"; if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; @@ -324,8 +339,13 @@ if ($conf->propal->enabled && $user->rights->propale->lire) print ''; print ""; + + $companystatic->id=$obj->socid; + $companystatic->name=$obj->socname; + $companystatic->client=$obj->client; + $companystatic->canvas=$obj->canvas; + print ''.$companystatic->getNomUrl(1,'customer',44).''."\n"; - print ''.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($obj->nom,44).''."\n"; print ''; print dol_print_date($db->jdate($obj->dp),'day').''."\n"; print ''.price($obj->total_ttc).''; diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php index d876dad3a80..a2c19812434 100644 --- a/htdocs/core/class/conf.class.php +++ b/htdocs/core/class/conf.class.php @@ -357,11 +357,7 @@ class Conf $this->product->limit_size=$this->global->PRODUIT_LIMIT_SIZE; // conf->theme et $this->css - if (empty($this->global->MAIN_THEME)) - { - if (isset($_SERVER["HTTP_USER_AGENT"]) && preg_match('/(epiphany|iceweasel)/i',$_SERVER["HTTP_USER_AGENT"])) $this->global->MAIN_THEME="auguria"; - else $this->global->MAIN_THEME="eldy"; - } + if (empty($this->global->MAIN_THEME)) $this->global->MAIN_THEME="eldy"; $this->theme=$this->global->MAIN_THEME; $this->css = "/theme/".$this->theme."/style.css.php"; diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 0cc6ca201c9..c76924f5822 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -138,6 +138,7 @@ function getBrowserInfo() elseif (preg_match('/chrome(\/|\s)([\d\.]+)/i', $_SERVER["HTTP_USER_AGENT"], $reg)) { $name='chrome'; $version=$reg[2]; } // we can have 'chrome (Mozilla...) chrome x.y' in one string elseif (preg_match('/chrome/i', $_SERVER["HTTP_USER_AGENT"], $reg)) { $name='chrome'; } elseif (preg_match('/iceweasel/i',$_SERVER["HTTP_USER_AGENT"])) { $name='iceweasel'; $version=$reg[2]; } + elseif (preg_match('/epiphany/i',$_SERVER["HTTP_USER_AGENT"])) { $name='epiphany'; $version=$reg[2]; } elseif ((empty($phone) || preg_match('/iphone/i',$_SERVER["HTTP_USER_AGENT"])) && preg_match('/safari(\/|\s)([\d\.]*)/i',$_SERVER["HTTP_USER_AGENT"], $reg)) { $name='safari'; $version=$reg[2]; } // Safari is often present in string for mobile but its not. elseif (preg_match('/opera(\/|\s)([\d\.]*)/i', $_SERVER["HTTP_USER_AGENT"], $reg)) { $name='opera'; $version=$reg[2]; } elseif (preg_match('/msie(\/|\s)([\d\.]*)/i', $_SERVER["HTTP_USER_AGENT"], $reg)) { $name='ie'; $version=$reg[2]; } // MS products at end diff --git a/htdocs/document.php b/htdocs/document.php index d4a91010466..6c8c7c59c7f 100644 --- a/htdocs/document.php +++ b/htdocs/document.php @@ -54,7 +54,7 @@ $action=GETPOST('action','alpha'); $original_file=GETPOST('file','alpha'); // Do not use urldecode here ($_GET are already decoded by PHP). $modulepart=GETPOST('modulepart','alpha'); $urlsource=GETPOST('urlsource','alpha'); -$entity=GETPOST('entity','int'); +$entity=GETPOST('entity')?GETPOST('entity','int'):$conf->entity; // Security check if (empty($modulepart)) accessforbidden('Bad value for parameter modulepart'); @@ -440,6 +440,7 @@ if ($modulepart) } } + // Basic protection (against external users only) if ($user->societe_id > 0) { diff --git a/htdocs/fourn/facture/impayees.php b/htdocs/fourn/facture/impayees.php index 427607b542c..988b66930ec 100644 --- a/htdocs/fourn/facture/impayees.php +++ b/htdocs/fourn/facture/impayees.php @@ -4,6 +4,7 @@ * Copyright (C) 2004-2012 Laurent Destailleur * Copyright (C) 2005-2012 Regis Houssin * Copyright (C) 2012-2012 Vinicius Nogueira + * Copyright (C) 2012 Juanjo Menent * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -69,6 +70,14 @@ $companystatic=new Societe($db); $sortfield = GETPOST("sortfield",'alpha'); $sortorder = GETPOST("sortorder",'alpha'); + +$search_ref = GETPOST('search_ref','alpha'); +$search_ref_supplier = GETPOST('search_ref_supplier','alpha'); +$search_societe = GETPOST('search_societe','alpha'); +$search_montant_ht = GETPOST('search_montant_ht','int'); +$search_montant_ttc = GETPOST('search_montant_ttc','int'); + + $page = GETPOST("page",'int'); if ($page == -1) { $page = 0; } $offset = $conf->liste_limit * $page; @@ -105,28 +114,28 @@ if ($user->rights->fournisseur->facture->lire) } } - if ($_GET["search_ref"]) + if ($search_ref) { - $sql .= " AND f.rowid like '%".$_GET["search_ref"]."%'"; + $sql .= " AND f.rowid like '%".$search_ref."%'"; } - if ($_GET["search_ref_supplier"]) + if ($search_ref_supplier) { - $sql .= " AND f.facnumber like '%".$_GET["search_ref_supplier"]."%'"; + $sql .= " AND f.facnumber like '%".$search_ref_supplier."%'"; } - if ($_GET["search_societe"]) + if ($search_societe) { - $sql .= " AND s.nom like '%".$_GET["search_societe"]."%'"; + $sql .= " AND s.nom like '%".$search_societe."%'"; } - if ($_GET["search_montant_ht"]) + if ($search_montant_ht) { - $sql .= " AND f.total_ht = '".$_GET["search_montant_ht"]."'"; + $sql .= " AND f.total_ht = '".$search_montant_ht."'"; } - if ($_GET["search_montant_ttc"]) + if ($search_montant_ttc) { - $sql .= " AND f.total_ttc = '".$_GET["search_montant_ttc"]."'"; + $sql .= " AND f.total_ttc = '".$search_montant_ttc."'"; } if (dol_strlen($_POST["sf_ref"]) > 0) @@ -153,6 +162,13 @@ if ($user->rights->fournisseur->facture->lire) $param =''; if ($socid) $param.="&socid=".$socid; + + if ($search_ref) $param.='&search_ref='.urlencode($search_ref); + if ($search_ref_supplier) $param.='&search_ref_supplier='.urlencode($search_ref_supplier); + if ($search_societe) $param.='&search_societe='.urlencode($search_societe); + if ($search_montant_ht) $param.='&search_montant_ht='.urlencode($search_montant_ht); + if ($search_montant_ttc) $param.='&search_montant_ttc='.urlencode($search_montant_ttc); + $param.=($option?"&option=".$option:""); if ($late) $param.='&late='.urlencode($late); $urlsource.=str_replace('&','&',$param); @@ -187,17 +203,17 @@ if ($user->rights->fournisseur->facture->lire) // Lines with filter fields print ''; print ''; - print ''; + print ''; print ''; - print ''; + print ''; print ' '; print ' '; print ''; - print ''; + print ''; print ''; - print ''; + print ''; print ''; - print ''; + print ''; print ''; print ''; print ''; diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 309b93c9984..56d97ff11fc 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -1222,7 +1222,7 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a $loginhtmltext.='
'.$langs->trans("CurrentTheme").': '.$conf->theme; $s=picto_from_langcode($langs->getDefaultLang()); $loginhtmltext.='
'.$langs->trans("CurrentUserLanguage").': '.($s?$s.' ':'').$langs->getDefaultLang(); - $loginhtmltext.='
'.$langs->trans("Browser").': '.$conf->browser->name.' ('.$_SERVER['HTTP_USER_AGENT'].')'; + $loginhtmltext.='
'.$langs->trans("Browser").': '.$conf->browser->name.($conf->browser->version?' '.$conf->browser->version:'').' ('.$_SERVER['HTTP_USER_AGENT'].')'; if (! empty($conf->browser->phone)) $loginhtmltext.='
'.$langs->trans("Phone").': '.$conf->browser->phone; if (! empty($_SESSION["disablemodules"])) $loginhtmltext.='
'.$langs->trans("DisabledModules").':
'.join(', ',explode(',',$_SESSION["disablemodules"])); diff --git a/htdocs/product/liste.php b/htdocs/product/liste.php index 4338139e62c..6663a9f527e 100644 --- a/htdocs/product/liste.php +++ b/htdocs/product/liste.php @@ -82,6 +82,7 @@ if (isset($_POST["button_removefilter_x"])) $sref=""; $sbarcode=""; $snom=""; + $search_categ=0; } if ($conf->categorie->enabled && GETPOST('catid')) @@ -190,6 +191,7 @@ else $param="&sref=".$sref.($sbarcode?"&sbarcode=".$sbarcode:"")."&snom=".$snom."&sall=".$sall."&tosell=".$tosell."&tobuy=".$tobuy; $param.=($fourn_id?"&fourn_id=".$fourn_id:""); + $param.=($search_categ?"&search_categ=".$search_categ:""); $param.=isset($type)?"&type=".$type:""; print_barre_liste($texte, $page, "liste.php", $param, $sortfield, $sortorder,'',$num); diff --git a/htdocs/projet/tasks/contact.php b/htdocs/projet/tasks/contact.php index 69543c2a163..f4b4d03fd23 100644 --- a/htdocs/projet/tasks/contact.php +++ b/htdocs/projet/tasks/contact.php @@ -1,7 +1,7 @@ - * Copyright (C) 2006-2010 Laurent Destailleur - * Copyright (C) 2010 Regis Houssin +/* Copyright (C) 2005 Rodolphe Quiedeville + * Copyright (C) 2006-2010 Laurent Destailleur + * Copyright (C) 2010-2012 Regis Houssin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -33,17 +33,21 @@ require_once(DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'); $langs->load("projects"); $langs->load("companies"); -$taskid = isset($_GET["id"])?$_GET["id"]:''; -$id = GETPOST('id','int'); -$ref= GETPOST('ref'); -$action=GETPOST('action'); -$withproject=GETPOST('withproject'); +$id=GETPOST('id','int'); +$ref=GETPOST('ref','alpha'); +$action=GETPOST('action','alpha'); +$confirm=GETPOST('confirm','alpha'); +$withproject=GETPOST('withproject','int'); +$project_ref=GETPOST('project_ref','alpha'); // Security check $socid=0; if ($user->societe_id > 0) $socid = $user->societe_id; -//$result = restrictedArea($user, 'projet', $taskid, 'projet_task'); -if (!$user->rights->projet->lire) accessforbidden(); +//$result = restrictedArea($user, 'projet', $id, 'projet_task'); +if (! $user->rights->projet->lire) accessforbidden(); + +$object = new Task($db); +$projectstatic = new Project($db); /* @@ -53,31 +57,28 @@ if (!$user->rights->projet->lire) accessforbidden(); // Add new contact if ($action == 'addcontact' && $user->rights->projet->creer) { + $result = $object->fetch($id); - $result = 0; - $task = new Task($db); - $result = $task->fetch($taskid); - - if ($result > 0 && $taskid > 0) + if ($result > 0 && $id > 0) { - $result = $task->add_contact($_POST["contactid"], $_POST["type"], $_POST["source"]); + $result = $object->add_contact($_POST["contactid"], $_POST["type"], $_POST["source"]); } if ($result >= 0) { - Header("Location: contact.php?id=".$task->id); + Header("Location: ".$_SERVER["PHP_SELF"]."?id=".$object->id.($withproject?'&withproject=1':'')); exit; } else { - if ($task->error == 'DB_ERROR_RECORD_ALREADY_EXISTS') + if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS') { $langs->load("errors"); $mesg = '
'.$langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType").'
'; } else { - $mesg = '
'.$task->error.'
'; + $mesg = '
'.$object->error.'
'; } } } @@ -85,10 +86,9 @@ if ($action == 'addcontact' && $user->rights->projet->creer) // bascule du statut d'un contact if ($action == 'swapstatut' && $user->rights->projet->creer) { - $task = new Task($db); - if ($task->fetch($taskid)) + if ($object->fetch($id)) { - $result=$task->swapContactStatus(GETPOST('ligne')); + $result=$object->swapContactStatus(GETPOST('ligne')); } else { @@ -99,13 +99,12 @@ if ($action == 'swapstatut' && $user->rights->projet->creer) // Efface un contact if ($action == 'deleteline' && $user->rights->projet->creer) { - $task = new Task($db); - $task->fetch($taskid); - $result = $task->delete_contact($_GET["lineid"]); + $object->fetch($id); + $result = $object->delete_contact($_GET["lineid"]); if ($result >= 0) { - Header("Location: contact.php?id=".$task->id); + Header("Location: ".$_SERVER["PHP_SELF"]."?id=".$object->id.($withproject?'&withproject=1':'')); exit; } else @@ -114,6 +113,23 @@ if ($action == 'deleteline' && $user->rights->projet->creer) } } +// Retreive First Task ID of Project if withprojet is on to allow project prev next to work +if (! empty($project_ref) && ! empty($withproject)) +{ + if ($projectstatic->fetch(0,$project_ref) > 0) + { + $tasksarray=$object->getTasksArray(0, 0, $projectstatic->id, $socid, 0); + if (count($tasksarray) > 0) + { + $id=$tasksarray[0]->id; + } + else + { + Header("Location: ".DOL_URL_ROOT.'/projet/tasks.php?id='.$projectstatic->id.($withproject?'&withproject=1':'').(empty($mode)?'':'&mode='.$mode)); + exit; + } + } +} /* * View @@ -125,8 +141,6 @@ $form = new Form($db); $formcompany = new FormCompany($db); $contactstatic = new Contact($db); $userstatic = new User($db); -$project = new Project($db); -$task = new Task($db); /* *************************************************************************** */ @@ -137,19 +151,19 @@ $task = new Task($db); if ($id > 0 || ! empty($ref)) { - if ($task->fetch($id,$ref) > 0) + if ($object->fetch($id) > 0) { - $result=$project->fetch($task->fk_project); - if (! empty($project->socid)) $project->societe->fetch($project->socid); + $result=$projectstatic->fetch($object->fk_project); + if (! empty($projectstatic->socid)) $projectstatic->societe->fetch($projectstatic->socid); - $userWrite = $project->restrictedProjectArea($user,'write'); + $userWrite = $projectstatic->restrictedProjectArea($user,'write'); if ($withproject) { // Tabs for project $tab='tasks'; - $head=project_prepare_head($project); - dol_fiche_head($head, $tab, $langs->trans("Project"),0,($project->public?'projectpub':'project')); + $head=project_prepare_head($projectstatic); + dol_fiche_head($head, $tab, $langs->trans("Project"),0,($projectstatic->public?'projectpub':'project')); $param=($mode=='mine'?'&mode=mine':''); @@ -162,28 +176,28 @@ if ($id > 0 || ! empty($ref)) // Define a complementary filter for search of next/prev ref. if (! $user->rights->projet->all->lire) { - $projectsListId = $project->getProjectsAuthorizedForUser($user,$mine,0); - $project->next_prev_filter=" rowid in (".(count($projectsListId)?join(',',array_keys($projectsListId)):'0').")"; + $projectsListId = $projectstatic->getProjectsAuthorizedForUser($user,$mine,0); + $projectstatic->next_prev_filter=" rowid in (".(count($projectsListId)?join(',',array_keys($projectsListId)):'0').")"; } - print $form->showrefnav($project,'ref','',1,'ref','ref','',$param); + print $form->showrefnav($projectstatic,'project_ref','',1,'ref','ref','',$param.'&withproject=1'); print ''; - print ''.$langs->trans("Label").''.$project->title.''; + print ''.$langs->trans("Label").''.$projectstatic->title.''; print ''.$langs->trans("Company").''; - if (! empty($project->societe->id)) print $project->societe->getNomUrl(1); + if (! empty($projectstatic->societe->id)) print $projectstatic->societe->getNomUrl(1); else print ' '; print ''; print ''; // Visibility print ''.$langs->trans("Visibility").''; - if ($project->public) print $langs->trans('SharedProject'); + if ($projectstatic->public) print $langs->trans('SharedProject'); else print $langs->trans('PrivateProject'); print ''; // Statut - print ''.$langs->trans("Status").''.$project->getLibStatut(4).''; + print ''.$langs->trans("Status").''.$projectstatic->getLibStatut(4).''; print ''; @@ -193,12 +207,12 @@ if ($id > 0 || ! empty($ref)) } // To verify role of users - //$userAccess = $project->restrictedProjectArea($user); // We allow task affected to user even if a not allowed project - //$arrayofuseridoftask=$task->getListContactId('internal'); + //$userAccess = $projectstatic->restrictedProjectArea($user); // We allow task affected to user even if a not allowed project + //$arrayofuseridoftask=$object->getListContactId('internal'); dol_htmloutput_mesg($mesg); - $head = task_prepare_head($task); + $head = task_prepare_head($object); dol_fiche_head($head, 'task_contact', $langs->trans("Task"), 0, 'projecttask'); @@ -208,33 +222,33 @@ if ($id > 0 || ! empty($ref)) print ''; $param=(GETPOST('withproject')?'&withproject=1':''); - $linkback=GETPOST('withproject')?''.$langs->trans("BackToList").'':''; + $linkback=GETPOST('withproject')?''.$langs->trans("BackToList").'':''; // Ref print ''; // Label - print ''; + print ''; // Project if (empty($withproject)) { print ''; // Customer print ""; print ''; } @@ -269,6 +283,7 @@ if ($id > 0 || ! empty($ref)) print ''; print ''; print ''; + print ''; // Ligne ajout pour contact interne print ""; @@ -283,11 +298,11 @@ if ($id > 0 || ! empty($ref)) print ''; print ''; print ''; print ''; @@ -295,13 +310,13 @@ if ($id > 0 || ! empty($ref)) print ''; // Line to add an external contact. Only if project linked to a third party. - if ($project->socid) + if ($projectstatic->socid) { - print ''; + print ''; print ''; print ''; print ''; - print ''; + print ''; $var=!$var; print ""; @@ -311,18 +326,18 @@ if ($id > 0 || ! empty($ref)) print ''; print ''; print ''; print ''; print ''; // Icon update et delete @@ -415,7 +430,7 @@ if ($id > 0 || ! empty($ref)) if ($user->rights->projet->creer) { print ' '; - print ''; + print ''; print img_delete(); print ''; } diff --git a/htdocs/projet/tasks/document.php b/htdocs/projet/tasks/document.php index 12840e9dd34..65a758ee137 100644 --- a/htdocs/projet/tasks/document.php +++ b/htdocs/projet/tasks/document.php @@ -1,5 +1,7 @@ +/* Copyright (C) 2010-2012 Regis Houssin + * Copyright (C) 2006-2012 Laurent Destailleur + * Copyright (C) 2012 Florian Henry * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -32,12 +34,14 @@ require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); $langs->load('projects'); $langs->load('other'); -$action=GETPOST('action'); +$action=GETPOST('action','alpha'); +$confirm=GETPOST('confirm','alpha'); $mine = $_REQUEST['mode']=='mine' ? 1 : 0; //if (! $user->rights->projet->all->lire) $mine=1; // Special for projects $id = GETPOST('id','int'); -$ref= GETPOST('ref'); -$withproject=GETPOST('withproject'); +$ref= GETPOST('ref','alpha'); +$withproject=GETPOST('withproject','int'); +$project_ref = GETPOST('project_ref','alpha'); // Security check $socid=0; @@ -57,22 +61,10 @@ if (! $sortorder) $sortorder="ASC"; if (! $sortfield) $sortfield="name"; +$object = new Task($db); +$projectstatic = new Project($db); -$task = new Task($db); -if ($task->fetch($id,$ref) > 0) -{ - $projectstatic = new Project($db); - $projectstatic->fetch($task->fk_project); - - if (! empty($projectstatic->socid)) $projectstatic->societe->fetch($projectstatic->socid); - - $upload_dir = $conf->projet->dir_output.'/'.dol_sanitizeFileName($projectstatic->ref).'/'.dol_sanitizeFileName($task->ref); -} -else -{ - dol_print_error($db); -} /* @@ -118,143 +110,172 @@ if ($action=='delete') $mesg = '
'.$langs->trans("FileWasRemoved").'
'; } +// Retreive First Task ID of Project if withprojet is on to allow project prev next to work +if (! empty($project_ref) && ! empty($withproject)) +{ + if ($projectstatic->fetch(0,$project_ref) > 0) + { + $tasksarray=$object->getTasksArray(0, 0, $projectstatic->id, $socid, 0); + if (count($tasksarray) > 0) + { + $id=$tasksarray[0]->id; + $object->fetch($id); + } + else + { + Header("Location: ".DOL_URL_ROOT.'/projet/tasks.php?id='.$projectstatic->id.($withproject?'&withproject=1':'').(empty($mode)?'':'&mode='.$mode)); + exit; + } + } +} + +// Find upload dir after retreive is task if necessary +if ($id > 0 || ! empty($ref)) +{ + if ($object->fetch($id,$ref) > 0) + { + $projectstatic->fetch($object->fk_project); + + if (! empty($projectstatic->socid)) $projectstatic->societe->fetch($projectstatic->socid); + + $upload_dir = $conf->projet->dir_output.'/'.dol_sanitizeFileName($projectstatic->ref).'/'.dol_sanitizeFileName($object->ref); + } + else + { + dol_print_error($db); + } +} /* * View */ $form = new Form($db); -$project = new Project($db); -$task = new Task($db); llxHeader('',$langs->trans('Project')); -if ($id > 0 || ! empty($ref)) +if ($object->id > 0) { - if ($task->fetch($id,$ref) >= 0) - { - $result=$project->fetch($task->fk_project); - if (! empty($project->socid)) $project->societe->fetch($project->socid); + if (! empty($projectstatic->socid)) $projectstatic->societe->fetch($projectstatic->socid); - $userWrite = $project->restrictedProjectArea($user,'write'); + $userWrite = $projectstatic->restrictedProjectArea($user,'write'); - if ($withproject) + if (! empty($withproject)) + { + // Tabs for project + $tab='tasks'; + $head=project_prepare_head($projectstatic); + dol_fiche_head($head, $tab, $langs->trans("Project"),0,($projectstatic->public?'projectpub':'project')); + + $param=($mode=='mine'?'&mode=mine':''); + + print '
'.$langs->trans('Ref').''; - if (! GETPOST('withproject') || empty($project->id)) + if (! GETPOST('withproject') || empty($projectstatic->id)) { - $projectsListId = $project->getProjectsAuthorizedForUser($user,$mine,1); - $task->next_prev_filter=" fk_projet in (".$projectsListId.")"; + $projectsListId = $projectstatic->getProjectsAuthorizedForUser($user,$mine,1); + $object->next_prev_filter=" fk_projet in (".$projectsListId.")"; } - else $task->next_prev_filter=" fk_projet = ".$project->id; - print $form->showrefnav($task,'id',$linkback,1,'rowid','ref','',$param); + else $object->next_prev_filter=" fk_projet = ".$projectstatic->id; + print $form->showrefnav($object,'id',$linkback,1,'rowid','ref','',$param); print '
'.$langs->trans("Label").''.$task->label.'
'.$langs->trans("Label").''.$object->label.'
'.$langs->trans("Project").''; - print $project->getNomUrl(1); + print $projectstatic->getNomUrl(1); print '
".$langs->trans("Company")."'; - if ($project->societe->id > 0) print $project->societe->getNomUrl(1); + if ($projectstatic->societe->id > 0) print $projectstatic->societe->getNomUrl(1); else print ' '; print '
'; // On recupere les id des users deja selectionnes - $contactsofproject=$project->getListContactId('internal'); + $contactsofproject=$projectstatic->getListContactId('internal'); $form->select_users($user->id,'contactid',0,'',0,'',$contactsofproject); print ''; - $formcompany->selectTypeContact($task, '', 'type','internal','rowid'); + $formcompany->selectTypeContact($object, '', 'type','internal','rowid'); print '
'; - $thirdpartyofproject=$project->getListContactId('thirdparty'); - $selectedCompany = isset($_GET["newcompany"])?$_GET["newcompany"]:$project->societe->id; - $selectedCompany = $formcompany->selectCompaniesForNewContact($task, 'id', $selectedCompany, 'newcompany',$thirdpartyofproject); + $thirdpartyofproject=$projectstatic->getListContactId('thirdparty'); + $selectedCompany = isset($_GET["newcompany"])?$_GET["newcompany"]:$projectstatic->societe->id; + $selectedCompany = $formcompany->selectCompaniesForNewContact($object, 'id', $selectedCompany, 'newcompany',$thirdpartyofproject); print ''; - $contactofproject=$project->getListContactId('external'); + $contactofproject=$projectstatic->getListContactId('external'); $nbofcontacts=$form->select_contacts($selectedCompany,'','contactid',0,'',$contactofproject); if ($nbofcontacts == 0) print $langs->trans("NoContactDefined"); print ''; - $formcompany->selectTypeContact($task, '', 'type','external','rowid'); + $formcompany->selectTypeContact($object, '', 'type','external','rowid'); print ' 0 || ! empty($ref)) foreach(array('internal','external') as $source) { - $tab = $task->liste_contact(-1,$source); + $tab = $object->liste_contact(-1,$source); $num=count($tab); $i = 0; @@ -405,9 +420,9 @@ if ($id > 0 || ! empty($ref)) // Statut print ''; // Activation desativation du contact - if ($task->statut >= 0) print ''; + if ($object->statut >= 0) print ''; print $contactstatic->LibStatut($tab[$i]['status'],3); - if ($task->statut >= 0) print ''; + if ($object->statut >= 0) print ''; print '
'; + + // Ref + print ''; - $head = task_prepare_head($task); - dol_fiche_head($head, 'task_document', $langs->trans("Task"), 0, 'projecttask'); + print ''; - $param=(GETPOST('withproject')?'&withproject=1':''); - $linkback=GETPOST('withproject')?''.$langs->trans("BackToList").'':''; + print ''; + print ''; - // Files list constructor - $filearray=dol_dir_list($upload_dir,"files",0,'','\.meta$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1); - $totalsize=0; - foreach($filearray as $key => $file) - { - $totalsize+=$file['size']; - } + // Visibility + print ''; - print '
'; + print $langs->trans("Ref"); + print ''; + // Define a complementary filter for search of next/prev ref. + if (! $user->rights->projet->all->lire) { - // Tabs for project - $tab='tasks'; - $head=project_prepare_head($project); - dol_fiche_head($head, $tab, $langs->trans("Project"),0,($project->public?'projectpub':'project')); - - $param=($mode=='mine'?'&mode=mine':''); - - print ''; - - // Ref - print ''; - - print ''; - - print ''; - print ''; - - // Visibility - print ''; - - // Statut - print ''; - - print '
'; - print $langs->trans("Ref"); - print ''; - // Define a complementary filter for search of next/prev ref. - if (! $user->rights->projet->all->lire) - { - $projectsListId = $project->getProjectsAuthorizedForUser($user,$mine,0); - $project->next_prev_filter=" rowid in (".(count($projectsListId)?join(',',array_keys($projectsListId)):'0').")"; - } - print $form->showrefnav($project,'ref','',1,'ref','ref','',$param); - print '
'.$langs->trans("Label").''.$project->title.'
'.$langs->trans("Company").''; - if (! empty($project->societe->id)) print $project->societe->getNomUrl(1); - else print ' '; - print '
'.$langs->trans("Visibility").''; - if ($project->public) print $langs->trans('SharedProject'); - else print $langs->trans('PrivateProject'); - print '
'.$langs->trans("Status").''.$project->getLibStatut(4).'
'; - - dol_fiche_end(); - - print '
'; + $projectsListId = $projectstatic->getProjectsAuthorizedForUser($user,$mine,0); + $projectstatic->next_prev_filter=" rowid in (".(count($projectsListId)?join(',',array_keys($projectsListId)):'0').")"; } + print $form->showrefnav($projectstatic,'project_ref','',1,'ref','ref','',$param.'&withproject=1'); + print '
'.$langs->trans("Label").''.$projectstatic->title.'
'.$langs->trans("Company").''; + if (! empty($projectstatic->societe->id)) print $projectstatic->societe->getNomUrl(1); + else print ' '; + print '
'.$langs->trans("Visibility").''; + if ($projectstatic->public) print $langs->trans('SharedProject'); + else print $langs->trans('PrivateProject'); + print '
'; + // Statut + print ''; - // Ref - print ''; - print ''; + print '
'.$langs->trans("Status").''.$projectstatic->getLibStatut(4).'
'; - print $langs->trans("Ref"); - print ''; - if (! GETPOST('withproject') || empty($project->id)) - { - $projectsListId = $project->getProjectsAuthorizedForUser($user,$mine,1); - $task->next_prev_filter=" fk_projet in (".$projectsListId.")"; - } - else $task->next_prev_filter=" fk_projet = ".$project->id; - print $form->showrefnav($task,'id',$linkback,1,'rowid','ref','',$param); - print '
'; - // Label - print ''.$langs->trans("Label").''.$task->label.''; + dol_fiche_end(); - // Project - if (empty($withproject)) - { - print ''.$langs->trans("Project").''; - print $projectstatic->getNomUrl(1); - print ''; + print '
'; + } - // Third party - print ''.$langs->trans("Company").''; - if ($projectstatic->societe->id) print $projectstatic->societe->getNomUrl(1); - else print ' '; - print ''; - } + $head = task_prepare_head($object); + dol_fiche_head($head, 'task_document', $langs->trans("Task"), 0, 'projecttask'); - // Files infos - print ''.$langs->trans("NbOfAttachedFiles").''.count($filearray).''; - print ''.$langs->trans("TotalSizeOfAttachedFiles").''.$totalsize.' '.$langs->trans("bytes").''; + $param=(GETPOST('withproject')?'&withproject=1':''); + $linkback=GETPOST('withproject')?''.$langs->trans("BackToList").'':''; - print "\n"; + // Files list constructor + $filearray=dol_dir_list($upload_dir,"files",0,'','\.meta$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1); + $totalsize=0; + foreach($filearray as $key => $file) + { + $totalsize+=$file['size']; + } - dol_fiche_end(); + print ''; - print '
'; + // Ref + print ''; + print ''; - dol_htmloutput_mesg($mesg); + // Label + print ''; + + // Project + if (empty($withproject)) + { + print ''; + + // Third party + print ''; + } + + // Files infos + print ''; + print ''; + + print "
'; + print $langs->trans("Ref"); + print ''; + if (empty($withproject) || empty($projectstatic->id)) + { + $projectsListId = $projectstatic->getProjectsAuthorizedForUser($user,$mine,1); + $object->next_prev_filter=" fk_projet in (".$projectsListId.")"; + } + else $object->next_prev_filter=" fk_projet = ".$projectstatic->id; + print $form->showrefnav($object,'id',$linkback,1,'rowid','ref','',$param); + print '
'.$langs->trans("Label").''.$object->label.'
'.$langs->trans("Project").''; + print $projectstatic->getNomUrl(1); + print '
'.$langs->trans("Company").''; + if ($projectstatic->societe->id) print $projectstatic->societe->getNomUrl(1); + else print ' '; + print '
'.$langs->trans("NbOfAttachedFiles").''.count($filearray).'
'.$langs->trans("TotalSizeOfAttachedFiles").''.$totalsize.' '.$langs->trans("bytes").'
\n"; + + dol_fiche_end(); + + print '
'; + + dol_htmloutput_mesg($mesg); - // Affiche formulaire upload - $formfile=new FormFile($db); - $formfile->form_attach_new_file(DOL_URL_ROOT.'/projet/tasks/document.php?id='.$task->id,'',0,0,$user->rights->projet->creer); + // Affiche formulaire upload + $formfile=new FormFile($db); + $formfile->form_attach_new_file(DOL_URL_ROOT.'/projet/tasks/document.php?id='.$object->id.($withproject?'&withproject=1':''),'',0,0,$user->rights->projet->creer); - // List of document - $param='&id='.$task->id; - $formfile->list_of_documents($filearray,$task,'projet',$param,0,dol_sanitizeFileName($project->ref).'/'.dol_sanitizeFileName($task->ref).'/'); - } + // List of document + $param='&id='.$object->id; + $formfile->list_of_documents($filearray,$object,'projet',$param,0,dol_sanitizeFileName($projectstatic->ref).'/'.dol_sanitizeFileName($object->ref).'/'); } else { @@ -266,4 +287,4 @@ else llxFooter(); $db->close(); -?> +?> \ No newline at end of file diff --git a/htdocs/projet/tasks/note.php b/htdocs/projet/tasks/note.php index 5946dd5d23c..11cf96ca9c7 100644 --- a/htdocs/projet/tasks/note.php +++ b/htdocs/projet/tasks/note.php @@ -1,5 +1,5 @@ +/* Copyright (C) 2010-2012 Regis Houssin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -28,12 +28,14 @@ require_once(DOL_DOCUMENT_ROOT."/core/lib/project.lib.php"); $langs->load('projects'); -$action=GETPOST('action'); +$action=GETPOST('action','alpha'); +$confirm=GETPOST('confirm','alpha'); $mine = $_REQUEST['mode']=='mine' ? 1 : 0; //if (! $user->rights->projet->all->lire) $mine=1; // Special for projects $id = GETPOST('id','int'); $ref= GETPOST('ref', 'alpha'); -$withproject=GETPOST('withproject'); +$withproject=GETPOST('withproject','int'); +$project_ref = GETPOST('project_ref','alpha'); // Security check $socid=0; @@ -42,7 +44,39 @@ if (!$user->rights->projet->lire) accessforbidden(); //$result = restrictedArea($user, 'projet', $id, '', 'task'); // TODO ameliorer la verification $object = new Task($db); -$object->fetch($id, $ref); +$projectstatic = new Project($db); + +if ($id > 0 || ! empty($ref)) +{ + if ($object->fetch($id,$ref) > 0) + { + $projectstatic->fetch($object->fk_project); + if (! empty($projectstatic->socid)) $projectstatic->societe->fetch($projectstatic->socid); + } + else + { + dol_print_error($db); + } +} + + +// Retreive First Task ID of Project if withprojet is on to allow project prev next to work +if (! empty($project_ref) && ! empty($withproject)) +{ + if ($projectstatic->fetch(0,$project_ref) > 0) + { + $tasksarray=$object->getTasksArray(0, 0, $projectstatic->id, $socid, 0); + if (count($tasksarray) > 0) + { + $id=$tasksarray[0]->id; + $object->fetch($id); + } + else + { + Header("Location: ".DOL_URL_ROOT.'/projet/tasks.php?id='.$projectstatic->id.(empty($mode)?'':'&mode='.$mode)); + } + } +} /* @@ -70,24 +104,20 @@ else if ($action == 'setnote_private' && $user->rights->ficheinter->creer) llxHeader(); $form = new Form($db); -$project = new Project($db); $userstatic = new User($db); $now=dol_now(); -if ($id > 0 || ! empty($ref)) +if ($object->id > 0) { - $result=$project->fetch($object->fk_project); - if (! empty($project->socid)) $project->societe->fetch($project->socid); + $userWrite = $projectstatic->restrictedProjectArea($user,'write'); - $userWrite = $project->restrictedProjectArea($user,'write'); - - if ($withproject) + if (! empty($withproject)) { // Tabs for project $tab='tasks'; - $head=project_prepare_head($project); - dol_fiche_head($head, $tab, $langs->trans("Project"),0,($project->public?'projectpub':'project')); + $head=project_prepare_head($projectstatic); + dol_fiche_head($head, $tab, $langs->trans("Project"),0,($projectstatic->public?'projectpub':'project')); $param=($mode=='mine'?'&mode=mine':''); @@ -100,30 +130,30 @@ if ($id > 0 || ! empty($ref)) // Define a complementary filter for search of next/prev ref. if (! $user->rights->projet->all->lire) { - $projectsListId = $project->getProjectsAuthorizedForUser($user,$mine,0); - $project->next_prev_filter=" rowid in (".(count($projectsListId)?join(',',array_keys($projectsListId)):'0').")"; + $projectsListId = $projectstatic->getProjectsAuthorizedForUser($user,$mine,0); + $projectstatic->next_prev_filter=" rowid in (".(count($projectsListId)?join(',',array_keys($projectsListId)):'0').")"; } - print $form->showrefnav($project,'ref','',1,'ref','ref','',$param); + print $form->showrefnav($projectstatic,'project_ref','',1,'ref','ref','',$param.'&withproject=1'); print ''; // Project - print ''.$langs->trans("Label").''.$project->title.''; + print ''.$langs->trans("Label").''.$projectstatic->title.''; // Company print ''.$langs->trans("Company").''; - if (! empty($project->societe->id)) print $project->societe->getNomUrl(1); + if (! empty($projectstatic->societe->id)) print $projectstatic->societe->getNomUrl(1); else print ' '; print ''; print ''; // Visibility print ''.$langs->trans("Visibility").''; - if ($project->public) print $langs->trans('SharedProject'); + if ($projectstatic->public) print $langs->trans('SharedProject'); else print $langs->trans('PrivateProject'); print ''; // Statut - print ''.$langs->trans("Status").''.$project->getLibStatut(4).''; + print ''.$langs->trans("Status").''.$projectstatic->getLibStatut(4).''; print ''; @@ -138,16 +168,16 @@ if ($id > 0 || ! empty($ref)) print ''; $param=(GETPOST('withproject')?'&withproject=1':''); - $linkback=GETPOST('withproject')?''.$langs->trans("BackToList").'':''; + $linkback=GETPOST('withproject')?''.$langs->trans("BackToList").'':''; // Ref print ''; @@ -158,12 +188,12 @@ if ($id > 0 || ! empty($ref)) if (empty($withproject)) { print ''; // Third party print ''; } @@ -180,7 +210,7 @@ if ($id > 0 || ! empty($ref)) dol_fiche_end(); } -llxFooter(); +llxFooter(); $db->close(); ?> diff --git a/htdocs/projet/tasks/task.php b/htdocs/projet/tasks/task.php index 261dbd2d985..b31b2ccb328 100644 --- a/htdocs/projet/tasks/task.php +++ b/htdocs/projet/tasks/task.php @@ -1,7 +1,7 @@ - * Copyright (C) 2006-2011 Laurent Destailleur - * Copyright (C) 2010 Regis Houssin +/* Copyright (C) 2005 Rodolphe Quiedeville + * Copyright (C) 2006-2012 Laurent Destailleur + * Copyright (C) 2010-2012 Regis Houssin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -19,7 +19,7 @@ /** * \file htdocs/projet/tasks/task.php - * \ingroup projet + * \ingroup project * \brief Page of a project task */ @@ -29,17 +29,20 @@ require_once(DOL_DOCUMENT_ROOT."/projet/class/task.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/project.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formother.class.php"); -$taskid = GETPOST('id','int'); -$taskref = GETPOST("ref"); -$id = GETPOST('id','int'); -$ref= GETPOST('ref'); -$action=GETPOST('action'); -$withproject=GETPOST('withproject'); +$id=GETPOST('id','int'); +$ref=GETPOST('ref','alpha'); +$action=GETPOST('action','alpha'); +$confirm=GETPOST('confirm','alpha'); +$withproject=GETPOST('withproject','int'); +$project_ref=GETPOST('project_ref','alpha'); // Security check $socid=0; if ($user->societe_id > 0) $socid = $user->societe_id; -if (!$user->rights->projet->lire) accessforbidden(); +if (! $user->rights->projet->lire) accessforbidden(); + +$object = new Task($db); +$projectstatic = new Project($db); /* @@ -57,44 +60,38 @@ if ($action == 'update' && ! $_POST["cancel"] && $user->rights->projet->creer) } if (! $error) { - $task = new Task($db); - $task->fetch($id); + $object->fetch($id); $tmparray=explode('_',$_POST['task_parent']); $task_parent=$tmparray[1]; if (empty($task_parent)) $task_parent = 0; // If task_parent is '' - $task->label = $_POST["label"]; - $task->description = $_POST['description']; - $task->fk_task_parent = $task_parent; - $task->date_start = dol_mktime(12,0,0,$_POST['dateomonth'],$_POST['dateoday'],$_POST['dateoyear']); - $task->date_end = dol_mktime(12,0,0,$_POST['dateemonth'],$_POST['dateeday'],$_POST['dateeyear']); - $task->progress = $_POST['progress']; + $object->label = $_POST["label"]; + $object->description = $_POST['description']; + $object->fk_task_parent = $task_parent; + $object->date_start = dol_mktime(12,0,0,$_POST['dateomonth'],$_POST['dateoday'],$_POST['dateoyear']); + $object->date_end = dol_mktime(12,0,0,$_POST['dateemonth'],$_POST['dateeday'],$_POST['dateeyear']); + $object->progress = $_POST['progress']; - $result=$task->update($user); - - $taskid=$task->id; // On retourne sur la fiche tache + $result=$object->update($user); } else { - $taskid=$_POST["id"]; $action='edit'; } } -if ($action == 'confirm_delete' && $_POST["confirm"] == "yes" && $user->rights->projet->supprimer) +if ($action == 'confirm_delete' && $confirm == "yes" && $user->rights->projet->supprimer) { - $task = new Task($db); - if ($task->fetch($id) >= 0 ) + if ($object->fetch($id) >= 0 ) { - $projet = new Project($db); - $result=$projet->fetch($task->fk_projet); - if (! empty($projet->socid)) + $result=$projecstatict->fetch($object->fk_projet); + if (! empty($projecstatic->socid)) { - $projet->societe->fetch($projet->socid); + $projecstatic->societe->fetch($projecstatic->socid); } - if ($task->delete($user) > 0) + if ($object->delete($user) > 0) { Header("Location: index.php"); exit; @@ -102,12 +99,28 @@ if ($action == 'confirm_delete' && $_POST["confirm"] == "yes" && $user->rights-> else { $langs->load("errors"); - $mesg='
'.$langs->trans($task->error).'
'; - $_POST["action"]=''; + $mesg='
'.$langs->trans($object->error).'
'; + $action=''; } } } +// Retreive First Task ID of Project if withprojet is on to allow project prev next to work +if (! empty($project_ref) && ! empty($withproject)) +{ + if ($projectstatic->fetch('',$project_ref) > 0) + { + $tasksarray=$object->getTasksArray(0, 0, $projectstatic->id, $socid, 0); + if (count($tasksarray) > 0) + { + $id=$tasksarray[0]->id; + } + else + { + Header("Location: ".DOL_URL_ROOT.'/projet/tasks.php?id='.$projectstatic->id.(empty($mode)?'':'&mode='.$mode)); + } + } +} /* * View @@ -117,24 +130,22 @@ llxHeader("",$langs->trans("Task")); $form = new Form($db); $formother = new FormOther($db); -$project = new Project($db); -$task = new Task($db); -if ($taskid) +if ($id > 0 || ! empty($ref)) { - if ($task->fetch($taskid) > 0) + if ($object->fetch($id) > 0) { - $result=$project->fetch($task->fk_project); - if (! empty($project->socid)) $project->societe->fetch($project->socid); + $result=$projectstatic->fetch($object->fk_project); + if (! empty($projectstatic->socid)) $projectstatic->societe->fetch($projectstatic->socid); - $userWrite = $project->restrictedProjectArea($user,'write'); + $userWrite = $projectstatic->restrictedProjectArea($user,'write'); - if ($withproject) + if (! empty($withproject)) { // Tabs for project $tab='tasks'; - $head=project_prepare_head($project); - dol_fiche_head($head, $tab, $langs->trans("Project"),0,($project->public?'projectpub':'project')); + $head=project_prepare_head($projectstatic); + dol_fiche_head($head, $tab, $langs->trans("Project"),0,($projectstatic->public?'projectpub':'project')); $param=($mode=='mine'?'&mode=mine':''); @@ -147,28 +158,28 @@ if ($taskid) // Define a complementary filter for search of next/prev ref. if (! $user->rights->projet->all->lire) { - $projectsListId = $project->getProjectsAuthorizedForUser($user,$mine,0); - $project->next_prev_filter=" rowid in (".(count($projectsListId)?join(',',array_keys($projectsListId)):'0').")"; + $projectsListId = $projectstatic->getProjectsAuthorizedForUser($user,$mine,0); + $projectstatic->next_prev_filter=" rowid in (".(count($projectsListId)?join(',',array_keys($projectsListId)):'0').")"; } - print $form->showrefnav($project,'ref','',1,'ref','ref','',$param); + print $form->showrefnav($projectstatic,'project_ref','',1,'ref','ref','',$param.'&withproject=1'); print ''; - print ''; + print ''; print ''; print ''; // Visibility print ''; // Statut - print ''; + print ''; print '
'.$langs->trans("Ref").''; - if (! GETPOST('withproject') || empty($project->id)) + if (empty($withproject) || empty($projectstatic->id)) { - $projectsListId = $project->getProjectsAuthorizedForUser($user,$mine,1); + $projectsListId = $projectstatic->getProjectsAuthorizedForUser($user,$mine,1); $object->next_prev_filter=" fk_projet in (".$projectsListId.")"; } - else $object->next_prev_filter=" fk_projet = ".$project->id; + else $object->next_prev_filter=" fk_projet = ".$projectstatic->id; print $form->showrefnav($object,'id',$linkback,1,'rowid','ref','',$param); print '
'.$langs->trans("Project").''; - print $project->getNomUrl(1); + print $projectstatic->getNomUrl(1); print '
'.$langs->trans("Company").''; - if ($project->societe->id > 0) print $project->societe->getNomUrl(1); + if ($projectstatic->societe->id > 0) print $projectstatic->societe->getNomUrl(1); else print' '; print '
'.$langs->trans("Label").''.$project->title.'
'.$langs->trans("Label").''.$projectstatic->title.'
'.$langs->trans("Company").''; - if (! empty($project->societe->id)) print $project->societe->getNomUrl(1); + if (! empty($projectstatic->societe->id)) print $projectstatic->societe->getNomUrl(1); else print ' '; print '
'.$langs->trans("Visibility").''; - if ($project->public) print $langs->trans('SharedProject'); + if ($projectstatic->public) print $langs->trans('SharedProject'); else print $langs->trans('PrivateProject'); print '
'.$langs->trans("Status").''.$project->getLibStatut(4).'
'.$langs->trans("Status").''.$projectstatic->getLibStatut(4).'
'; @@ -184,7 +195,7 @@ if ($taskid) if ($user->rights->projet->all->creer || $user->rights->projet->creer) { - if ($project->public || $userWrite > 0) + if ($projectstatic->public || $userWrite > 0) { print ''.$langs->trans('AddTask').''; } @@ -202,12 +213,12 @@ if ($taskid) */ // To verify role of users - //$userAccess = $project->restrictedProjectArea($user); // We allow task affected to user even if a not allowed project - //$arrayofuseridoftask=$task->getListContactId('internal'); + //$userAccess = $projectstatic->restrictedProjectArea($user); // We allow task affected to user even if a not allowed project + //$arrayofuseridoftask=$object->getListContactId('internal'); dol_htmloutput_mesg($mesg); - $head=task_prepare_head($task); + $head=task_prepare_head($object); dol_fiche_head($head, 'task_task', $langs->trans("Task"),0,'projecttask'); if ($action == 'edit' && $user->rights->projet->creer) @@ -216,56 +227,56 @@ if ($taskid) print ''; print ''; print ''; - print ''; + print ''; print ''; // Ref print ''; - print ''; + print ''; // Label print ''; - print ''; + print ''; // Project if (empty($withproject)) { print ''; // Third party print ''; } // Task parent print ''; // Date start print ''; // Date end print ''; // Progress print ''; // Description print ''; print ''; print '
'.$langs->trans("Ref").''.$task->ref.'
'.$object->ref.'
'.$langs->trans("Label").'
'.$langs->trans("Project").''; - print $project->getNomUrl(1); + print $projectstatic->getNomUrl(1); print '
'.$langs->trans("Company").''; - if ($project->societe->id) print $project->societe->getNomUrl(1); + if ($projectstatic->societe->id) print $projectstatic->societe->getNomUrl(1); else print ' '; print '
'.$langs->trans("ChildOfTask").''; - print $formother->selectProjectTasks($task->fk_task_parent,$project->id, 'task_parent', $user->admin?0:1, 0); + print $formother->selectProjectTasks($object->fk_task_parent,$projectstatic->id, 'task_parent', $user->admin?0:1, 0); print '
'.$langs->trans("DateStart").''; - print $form->select_date($task->date_start,'dateo'); + print $form->select_date($object->date_start,'dateo'); print '
'.$langs->trans("DateEnd").''; - print $form->select_date($task->date_end?$task->date_end:-1,'datee'); + print $form->select_date($object->date_end?$object->date_end:-1,'datee'); print '
'.$langs->trans("Progress").''; - print $formother->select_percent($task->progress,'progress'); + print $formother->select_percent($object->progress,'progress'); print '
'.$langs->trans("Description").''; - print ''; + print ''; print '
'; @@ -283,7 +294,7 @@ if ($taskid) * Fiche tache en mode visu */ $param=($withproject?'&withproject=1':''); - $linkback=$withproject?''.$langs->trans("BackToList").'':''; + $linkback=$withproject?''.$langs->trans("BackToList").'':''; if ($action == 'delete') { @@ -297,51 +308,51 @@ if ($taskid) print ''; print $langs->trans("Ref"); print ''; - if (! GETPOST('withproject') || empty($project->id)) + if (! GETPOST('withproject') || empty($projectstatic->id)) { - $projectsListId = $project->getProjectsAuthorizedForUser($user,$mine,1); - $task->next_prev_filter=" fk_projet in (".$projectsListId.")"; + $projectsListId = $projectstatic->getProjectsAuthorizedForUser($user,$mine,1); + $object->next_prev_filter=" fk_projet in (".$projectsListId.")"; } - else $task->next_prev_filter=" fk_projet = ".$project->id; - print $form->showrefnav($task,'id',$linkback,1,'rowid','ref','',$param); + else $object->next_prev_filter=" fk_projet = ".$projectstatic->id; + print $form->showrefnav($object,'id',$linkback,1,'rowid','ref','',$param); print ''; print ''; // Label - print ''.$langs->trans("Label").''.$task->label.''; + print ''.$langs->trans("Label").''.$object->label.''; // Project if (empty($withproject)) { print ''.$langs->trans("Project").''; - print $project->getNomUrl(1); + print $projectstatic->getNomUrl(1); print ''; // Third party print ''.$langs->trans("Company").''; - if ($project->societe->id) print $project->societe->getNomUrl(1); + if ($projectstatic->societe->id) print $projectstatic->societe->getNomUrl(1); else print ' '; print ''; } // Date start print ''.$langs->trans("DateStart").''; - print dol_print_date($task->date_start,'day'); + print dol_print_date($object->date_start,'day'); print ''; // Date end print ''.$langs->trans("DateEnd").''; - print dol_print_date($task->date_end,'day'); + print dol_print_date($object->date_end,'day'); print ''; // Progress print ''.$langs->trans("Progress").''; - print $task->progress.' %'; + print $object->progress.' %'; print ''; // Description print ''.$langs->trans("Description").''; - print nl2br($task->description); + print nl2br($object->description); print ''; print ''; @@ -361,7 +372,7 @@ if ($taskid) // Modify if ($user->rights->projet->creer) { - print ''.$langs->trans('Modify').''; + print ''.$langs->trans('Modify').''; } else { @@ -369,9 +380,9 @@ if ($taskid) } // Delete - if ($user->rights->projet->supprimer && ! $task->hasChildren()) + if ($user->rights->projet->supprimer && ! $object->hasChildren()) { - print ''.$langs->trans('Delete').''; + print ''.$langs->trans('Delete').''; } else { @@ -385,6 +396,5 @@ if ($taskid) llxFooter(); - $db->close(); ?> diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php index 8f93368d6e4..2e0d8b66984 100644 --- a/htdocs/projet/tasks/time.php +++ b/htdocs/projet/tasks/time.php @@ -1,8 +1,8 @@ - * Copyright (C) 2006-2012 Laurent Destailleur - * Copyright (C) 2010 Regis Houssin - * Copyright (C) 2011 Juanjo Menent +/* Copyright (C) 2005 Rodolphe Quiedeville + * Copyright (C) 2006-2012 Laurent Destailleur + * Copyright (C) 2010-2012 Regis Houssin + * Copyright (C) 2011 Juanjo Menent * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -20,7 +20,7 @@ /** * \file htdocs/projet/tasks/time.php - * \ingroup projet + * \ingroup project * \brief Page to add new time spent on a task */ @@ -32,21 +32,26 @@ require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); $langs->load('projects'); -$taskid = isset($_GET["id"])?$_GET["id"]:''; -$id = GETPOST('id','int'); -$ref= GETPOST('ref'); -$action=GETPOST('action'); -$withproject=GETPOST('withproject'); +$id=GETPOST('id','int'); +$ref=GETPOST('ref','alpha'); +$action=GETPOST('action','alpha'); +$confirm=GETPOST('confirm','alpha'); +$withproject=GETPOST('withproject','int'); +$project_ref=GETPOST('project_ref','alpha'); // Security check $socid=0; if ($user->societe_id > 0) $socid = $user->societe_id; if (!$user->rights->projet->lire) accessforbidden(); +$object = new Task($db); +$projectstatic = new Project($db); + /* * Actions */ + if ($action == 'addtimespent' && $user->rights->projet->creer) { $error=0; @@ -64,28 +69,27 @@ if ($action == 'addtimespent' && $user->rights->projet->creer) if (! $error) { - $task = new Task($db); - $task->fetch($_POST["id"]); + $object->fetch($id); - $task->timespent_note = $_POST["timespent_note"]; - $task->timespent_duration = $_POST["timespent_durationhour"]*60*60; // We store duration in seconds - $task->timespent_duration+= $_POST["timespent_durationmin"]*60; // We store duration in seconds - $task->timespent_date = dol_mktime(12,0,0,$_POST["timemonth"],$_POST["timeday"],$_POST["timeyear"]); - $task->timespent_fk_user = $_POST["userid"]; + $object->timespent_note = $_POST["timespent_note"]; + $object->timespent_duration = $_POST["timespent_durationhour"]*60*60; // We store duration in seconds + $object->timespent_duration+= $_POST["timespent_durationmin"]*60; // We store duration in seconds + $object->timespent_date = dol_mktime(12,0,0,$_POST["timemonth"],$_POST["timeday"],$_POST["timeyear"]); + $object->timespent_fk_user = $_POST["userid"]; - $result=$task->addTimeSpent($user); + $result=$object->addTimeSpent($user); if ($result >= 0) { } else { - $mesg='
'.$langs->trans($task->error).'
'; + $mesg='
'.$langs->trans($object->error).'
'; } } else { - $_POST["action"]=''; + $action=''; } } @@ -101,44 +105,60 @@ if ($action == 'updateline' && ! $_POST["cancel"] && $user->rights->projet->cree if (! $error) { - $task = new Task($db); - $task->fetch($_POST["id"]); + $object->fetch($id); - $task->timespent_id = $_POST["lineid"]; - $task->timespent_note = $_POST["timespent_note_line"]; - $task->timespent_old_duration = $_POST["old_duration"]; - $task->timespent_duration = $_POST["new_durationhour"]*60*60; // We store duration in seconds - $task->timespent_duration+= $_POST["new_durationmin"]*60; // We store duration in seconds - $task->timespent_date = dol_mktime(12,0,0,$_POST["timelinemonth"],$_POST["timelineday"],$_POST["timelineyear"]); - $task->timespent_fk_user = $_POST["userid_line"]; + $object->timespent_id = $_POST["lineid"]; + $object->timespent_note = $_POST["timespent_note_line"]; + $object->timespent_old_duration = $_POST["old_duration"]; + $object->timespent_duration = $_POST["new_durationhour"]*60*60; // We store duration in seconds + $object->timespent_duration+= $_POST["new_durationmin"]*60; // We store duration in seconds + $object->timespent_date = dol_mktime(12,0,0,$_POST["timelinemonth"],$_POST["timelineday"],$_POST["timelineyear"]); + $object->timespent_fk_user = $_POST["userid_line"]; - $result=$task->updateTimeSpent($user); + $result=$object->updateTimeSpent($user); if ($result >= 0) { } else { - $mesg='
'.$langs->trans($task->error).'
'; + $mesg='
'.$langs->trans($object->error).'
'; } } else { - $_POST["action"]=''; + $action=''; } } -if ($action == 'confirm_delete' && $_REQUEST["confirm"] == "yes" && $user->rights->projet->creer) +if ($action == 'confirm_delete' && $confirm == "yes" && $user->rights->projet->creer) { - $task = new Task($db); - $task->fetchTimeSpent($_GET['lineid']); - $result = $task->delTimeSpent($user); + $object->fetchTimeSpent($_GET['lineid']); + $result = $object->delTimeSpent($user); if (!$result) { $langs->load("errors"); - $mesg='
'.$langs->trans($task->error).'
'; - $_POST["action"]=''; + $mesg='
'.$langs->trans($object->error).'
'; + $action=''; + } +} + +// Retreive First Task ID of Project if withprojet is on to allow project prev next to work +if (! empty($project_ref) && ! empty($withproject)) +{ + if ($projectstatic->fetch(0,$project_ref) > 0) + { + $tasksarray=$object->getTasksArray(0, 0, $projectstatic->id, $socid, 0); + if (count($tasksarray) > 0) + { + $id=$tasksarray[0]->id; + } + else + { + Header("Location: ".DOL_URL_ROOT.'/projet/tasks.php?id='.$projectstatic->id.($withproject?'&withproject=1':'').(empty($mode)?'':'&mode='.$mode)); + exit; + } } } @@ -147,10 +167,6 @@ if ($action == 'confirm_delete' && $_REQUEST["confirm"] == "yes" && $user->right * View */ -$form = new Form($db); -$project = new Project($db); -$task = new Task($db); - llxHeader("",$langs->trans("Task")); $form = new Form($db); @@ -160,19 +176,19 @@ if ($id > 0 || ! empty($ref)) /* * Fiche projet en mode visu */ - if ($task->fetch($id,$ref) >= 0) + if ($object->fetch($id) >= 0) { - $result=$project->fetch($task->fk_project); - if (! empty($project->socid)) $project->societe->fetch($project->socid); + $result=$projectstatic->fetch($object->fk_project); + if (! empty($projectstatic->socid)) $projectstatic->societe->fetch($projectstatic->socid); - $userWrite = $project->restrictedProjectArea($user,'write'); + $userWrite = $projectstatic->restrictedProjectArea($user,'write'); if ($withproject) { // Tabs for project $tab='tasks'; - $head=project_prepare_head($project); - dol_fiche_head($head, $tab, $langs->trans("Project"),0,($project->public?'projectpub':'project')); + $head=project_prepare_head($projectstatic); + dol_fiche_head($head, $tab, $langs->trans("Project"),0,($projectstatic->public?'projectpub':'project')); $param=($mode=='mine'?'&mode=mine':''); @@ -185,28 +201,28 @@ if ($id > 0 || ! empty($ref)) // Define a complementary filter for search of next/prev ref. if (! $user->rights->projet->all->lire) { - $projectsListId = $project->getProjectsAuthorizedForUser($user,$mine,0); - $project->next_prev_filter=" rowid in (".(count($projectsListId)?join(',',array_keys($projectsListId)):'0').")"; + $projectsListId = $projectstatic->getProjectsAuthorizedForUser($user,$mine,0); + $projectstatic->next_prev_filter=" rowid in (".(count($projectsListId)?join(',',array_keys($projectsListId)):'0').")"; } - print $form->showrefnav($project,'ref','',1,'ref','ref','',$param); + print $form->showrefnav($projectstatic,'project_ref','',1,'ref','ref','',$param.'&withproject=1'); print ''; - print ''.$langs->trans("Label").''.$project->title.''; + print ''.$langs->trans("Label").''.$projectstatic->title.''; print ''.$langs->trans("Company").''; - if (! empty($project->societe->id)) print $project->societe->getNomUrl(1); + if (! empty($projectstatic->societe->id)) print $projectstatic->societe->getNomUrl(1); else print ' '; print ''; print ''; // Visibility print ''.$langs->trans("Visibility").''; - if ($project->public) print $langs->trans('SharedProject'); + if ($projectstatic->public) print $langs->trans('SharedProject'); else print $langs->trans('PrivateProject'); print ''; // Statut - print ''.$langs->trans("Status").''.$project->getLibStatut(4).''; + print ''.$langs->trans("Status").''.$projectstatic->getLibStatut(4).''; print ''; @@ -215,48 +231,48 @@ if ($id > 0 || ! empty($ref)) print '
'; } - $head=task_prepare_head($task); + $head=task_prepare_head($object); dol_fiche_head($head, 'task_time', $langs->trans("Task"),0,'projecttask'); dol_htmloutput_mesg($mesg); if ($action == 'deleteline') { - $ret=$form->form_confirm($_SERVER["PHP_SELF"]."?id=".$_GET["id"].'&lineid='.$_GET["lineid"],$langs->trans("DeleteATimeSpent"),$langs->trans("ConfirmDeleteATimeSpent"),"confirm_delete",'','',1); + $ret=$form->form_confirm($_SERVER["PHP_SELF"]."?id=".$object->id.'&lineid='.$_GET["lineid"].($withproject?'&withproject=1':''),$langs->trans("DeleteATimeSpent"),$langs->trans("ConfirmDeleteATimeSpent"),"confirm_delete",'','',1); if ($ret == 'html') print '
'; } print ''; $param=($withproject?'&withproject=1':''); - $linkback=$withproject?''.$langs->trans("BackToList").'':''; + $linkback=$withproject?''.$langs->trans("BackToList").'':''; // Ref print ''; // Label - print ''; + print ''; // Project if (empty($withproject)) { print ''; // Third party print ''; } @@ -273,10 +289,11 @@ if ($id > 0 || ! empty($ref)) { print '
'; - print ''; + print ''; print ''; print ''; - print ''; + print ''; + print ''; print '
'; print $langs->trans("Ref"); print ''; - if (! GETPOST('withproject') || empty($project->id)) + if (! GETPOST('withproject') || empty($projectstatic->id)) { - $projectsListId = $project->getProjectsAuthorizedForUser($user,$mine,1); - $task->next_prev_filter=" fk_projet in (".$projectsListId.")"; + $projectsListId = $projectstatic->getProjectsAuthorizedForUser($user,$mine,1); + $object->next_prev_filter=" fk_projet in (".$projectsListId.")"; } - else $task->next_prev_filter=" fk_projet = ".$project->id; - print $form->showrefnav($task,'id',$linkback,1,'rowid','ref','',$param); + else $object->next_prev_filter=" fk_projet = ".$projectstatic->id; + print $form->showrefnav($object,'id',$linkback,1,'rowid','ref','',$param); print '
'.$langs->trans("Label").''.$task->label.'
'.$langs->trans("Label").''.$object->label.'
'.$langs->trans("Project").''; - print $project->getNomUrl(1); + print $projectstatic->getNomUrl(1); print '
'.$langs->trans("Company").''; - if ($project->societe->id) print $project->societe->getNomUrl(1); + if ($projectstatic->societe->id) print $projectstatic->societe->getNomUrl(1); else print ' '; print '
'; @@ -298,7 +315,7 @@ if ($id > 0 || ! empty($ref)) // Contributor print ''; @@ -329,7 +346,7 @@ if ($id > 0 || ! empty($ref)) $sql.= ", u.name, u.firstname"; $sql .= " FROM ".MAIN_DB_PREFIX."projet_task_time as t"; $sql .= " , ".MAIN_DB_PREFIX."user as u"; - $sql .= " WHERE t.fk_task =".$task->id; + $sql .= " WHERE t.fk_task =".$object->id; $sql .= " AND t.fk_user = u.rowid"; $sql .= " ORDER BY t.task_date DESC"; @@ -353,10 +370,10 @@ if ($id > 0 || ! empty($ref)) dol_print_error($db); } - print ''; + print ''; print ''; print ''; - print ''; + print ''; print '
'; - $contactoftask=$task->getListContactId('internal'); + $contactoftask=$object->getListContactId('internal'); print img_object('','user'); print $form->select_users($_POST["userid"]?$_POST["userid"]:$user->id,'userid',0,'',0,'',$contactoftask); print '
'; print ''; @@ -427,7 +444,7 @@ if ($id > 0 || ! empty($ref)) // Edit and delete icon print '
'; - if ($_GET['action'] == 'editline' && $_GET['lineid'] == $task_time->rowid) + if ($action == 'editline' && $_GET['lineid'] == $task_time->rowid) { print ''; print ''; @@ -437,12 +454,12 @@ if ($id > 0 || ! empty($ref)) else if ($user->rights->projet->creer) { print ' '; - print 'rowid.'">'; + print 'rowid.($withproject?'&withproject=1':'').'">'; print img_edit(); print ''; print ' '; - print 'rowid.'">'; + print 'rowid.($withproject?'&withproject=1':'').'">'; print img_delete(); print ''; } @@ -460,7 +477,7 @@ if ($id > 0 || ! empty($ref)) } } -$db->close(); llxFooter(); +$db->close(); ?> diff --git a/htdocs/theme/eldy/img/liste_titre.png b/htdocs/theme/eldy/img/liste_titre.png new file mode 100644 index 00000000000..7405550c080 Binary files /dev/null and b/htdocs/theme/eldy/img/liste_titre.png differ diff --git a/htdocs/theme/eldy/img/liste_titre2.png b/htdocs/theme/eldy/img/liste_titre2.png new file mode 100755 index 00000000000..038c8d3c5d5 Binary files /dev/null and b/htdocs/theme/eldy/img/liste_titre2.png differ diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index bcd6caec7f6..4519a2756e3 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -154,6 +154,10 @@ print 'colorbacklinepair1='.$colorbacklinepair1."\n"; print 'colorbacklinepair2='.$colorbacklinepair2."\n"; print '*/'."\n"; +$usecss3=true; +if ($conf->browser->name == 'ie' && round($conf->browser->version,2) < 10) $usecss3=false; +elseif ($conf->browser->name == 'iceweasel') $usecss3=false; +elseif ($conf->browser->name == 'epiphany') $usecss3=false; ?> /* ============================================================================== */ @@ -356,13 +360,17 @@ div.tmenu { font-weight: normal; height: px; -/* DYN */ -background-image: linear-gradient(bottom, rgb() 75%, rgb() 100%); -background-image: -o-linear-gradient(bottom, rgb() 75%, rgb() 100%); -background-image: -moz-linear-gradient(bottom, rgb() 75%, rgb() 100%); -background-image: -webkit-linear-gradient(bottom, rgb() 40%, rgb() 60%, rgb() 100%); -background-image: -ms-linear-gradient(bottom, rgb() 75%, rgb() 100%); - + + background-image: -o-linear-gradient(bottom, rgb() 75%, rgb() 100%); + background-image: -moz-linear-gradient(bottom, rgb() 75%, rgb() 100%); + background-image: -webkit-linear-gradient(bottom, rgb() 40%, rgb() 60%, rgb() 100%); + background-image: -ms-linear-gradient(bottom, rgb() 75%, rgb() 100%); + background-image: linear-gradient(bottom, rgb() 75%, rgb() 100%); + + background-image: url(); + background-position:top; + background-repeat:repeat-x; + color: #000000; text-decoration: none; @@ -704,13 +712,17 @@ div.blockvmenupair, div.blockvmenuimpair padding-bottom: 3px; margin: 1px 0px 8px 2px; -/* DYN */ -background-image: linear-gradient(bottom, rgb() 85%, rgb() 100%); -background-image: -o-linear-gradient(bottom, rgb() 85%, rgb() 100%); -background-image: -moz-linear-gradient(bottom, rgb() 85%, rgb() 100%); -background-image: -webkit-linear-gradient(bottom, rgb() 85%, rgb() 100%); -background-image: -ms-linear-gradient(bottom, rgb() 85%, rgb() 100%); - + + background-image: -o-linear-gradient(bottom, rgb() 85%, rgb() 100%); + background-image: -moz-linear-gradient(bottom, rgb() 85%, rgb() 100%); + background-image: -webkit-linear-gradient(bottom, rgb() 85%, rgb() 100%); + background-image: -ms-linear-gradient(bottom, rgb() 85%, rgb() 100%); + background-image: linear-gradient(bottom, rgb() 85%, rgb() 100%); + + background-image: url(); + background-position:top; + background-repeat:repeat-x; + border-left: 1px solid #CCCCCC; border-right: 1px solid #BBBBBB; border-bottom: 1px solid #BBBBBB; @@ -736,12 +748,13 @@ div.blockvmenusearch margin: 6px 0px 8px 2px; background: #E3E6E8; -/* DYN */ -background-image: linear-gradient(bottom, rgb() 85%, rgb() 100%); -background-image: -o-linear-gradient(bottom, rgb() 85%, rgb() 100%); -background-image: -moz-linear-gradient(bottom, rgb() 85%, rgb() 100%); -background-image: -webkit-linear-gradient(bottom, rgb() 85%, rgb() 100%); -background-image: -ms-linear-gradient(bottom, rgb() 85%, rgb() 100%); + + background-image: -o-linear-gradient(bottom, rgb() 85%, rgb() 100%); + background-image: -moz-linear-gradient(bottom, rgb() 85%, rgb() 100%); + background-image: -webkit-linear-gradient(bottom, rgb() 85%, rgb() 100%); + background-image: -ms-linear-gradient(bottom, rgb() 85%, rgb() 100%); + background-image: linear-gradient(bottom, rgb() 85%, rgb() 100%); + border-left: 1px solid #CCCCCC; border-right: 1px solid #BBBBBB; @@ -769,12 +782,13 @@ div.blockvmenubookmarks margin: 6px 0px 8px 2px; background: #E3E6E8; -/* DYN */ -background-image: linear-gradient(bottom, rgb() 85%, rgb() 100%); -background-image: -o-linear-gradient(bottom, rgb() 85%, rgb() 100%); -background-image: -moz-linear-gradient(bottom, rgb() 85%, rgb() 100%); -background-image: -webkit-linear-gradient(bottom, rgb() 85%, rgb() 100%); -background-image: -ms-linear-gradient(bottom, rgb() 85%, rgb() 100%); + + background-image: -o-linear-gradient(bottom, rgb() 85%, rgb() 100%); + background-image: -moz-linear-gradient(bottom, rgb() 85%, rgb() 100%); + background-image: -webkit-linear-gradient(bottom, rgb() 85%, rgb() 100%); + background-image: -ms-linear-gradient(bottom, rgb() 85%, rgb() 100%); + background-image: linear-gradient(bottom, rgb() 85%, rgb() 100%); + border-left: 1px solid #CCCCCC; border-right: 1px solid #BBBBBB; @@ -851,12 +865,16 @@ td.photo { /* ============================================================================== */ .toolbar { - background-image: linear-gradient(bottom, rgb() 15%, rgb() 100%) !important; + background-image: -o-linear-gradient(bottom, rgb() 15%, rgb() 100%) !important; background-image: -moz-linear-gradient(bottom, rgb() 15%, rgb() 100%) !important; background-image: -webkit-linear-gradient(bottom, rgb() 15%, rgb() 100%) !important; background-image: -ms-linear-gradient(bottom, rgb() 15%, rgb() 100%) !important; - + background-image: linear-gradient(bottom, rgb() 15%, rgb() 100%) !important; + + background-image: url(theme.'/img/tmenu2.jpg' ?>) !important; + background-repeat: repeat-x !important; + border: 1px solid #CCC !important; -moz-border-radius: 5px 5px 5px 5px !important; @@ -1100,13 +1118,15 @@ div.tabBar { border-left: 1px solid #D0D0D0; border-top: 1px solid #D8D8D8; - /* DYN */ - background-image: linear-gradient(bottom, rgb() 25%, rgb() 100%); + background-image: -o-linear-gradient(bottom, rgb() 25%, rgb() 100%); background-image: -moz-linear-gradient(bottom, rgb() 25%, rgb() 100%); background-image: -webkit-linear-gradient(bottom, rgb() 25%, rgb() 100%); background-image: -ms-linear-gradient(bottom, rgb() 25%, rgb() 100%); - + background-image: linear-gradient(bottom, rgb() 25%, rgb() 100%); + + background: #dee7ec url() repeat-x; + -moz-box-shadow: 4px 4px 4px #CCC; -webkit-box-shadow: 4px 4px 4px #CCC; box-shadow: 4px 4px 4px #CCC; @@ -1144,17 +1164,24 @@ a.tab:link, a.tab:visited, a.tab:hover, a.tab#active { border-: 1px solid #D8D8D8; border-top: 1px solid #D8D8D8; - /* DYN */ - background-image: linear-gradient(bottom, rgb() 35%, rgb() 100%); + background-image: -o-linear-gradient(bottom, rgb() 35%, rgb() 100%); background-image: -moz-linear-gradient(bottom, rgb() 35%, rgb() 100%); background-image: -webkit-linear-gradient(bottom, rgb() 35%, rgb() 100%); background-image: -ms-linear-gradient(bottom, rgb() 35%, rgb() 100%); + background-image: linear-gradient(bottom, rgb() 35%, rgb() 100%); + + background: #dee7ec; + } a.tab#active { + border-bottom: 1px solid rgb() !important; background-color: rgb() !important; + + background: #ffffff; + background-image: none !important; } a.tab:link, a.tab:visited, a.tab:hover, a.tab#active @@ -1412,13 +1439,16 @@ div.liste_titre, tr.liste_titre, tr.liste_titre_sel height: 20px !important; background-repeat: repeat-x; - /* DYN */ - background-image: linear-gradient(bottom, rgb() 15%, rgb() 100%); + background-image: -o-linear-gradient(bottom, rgb() 15%, rgb() 100%); background-image: -moz-linear-gradient(bottom, rgb() 15%, rgb() 100%); background-image: -webkit-linear-gradient(bottom, rgb() 15%, rgb() 100%); background-image: -ms-linear-gradient(bottom, rgb() 15%, rgb() 100%); - + background-image: linear-gradient(bottom, rgb() 15%, rgb() 100%); + + background: #7699A9; + background-image: url(); + color: #; font-family: ; font-weight: normal; @@ -1461,13 +1491,15 @@ tr.liste_total td { } .impair { - /* DYN */ + background: linear-gradient(bottom, rgb() 85%, rgb() 100%); background: -o-linear-gradient(bottom, rgb() 85%, rgb() 100%); background: -moz-linear-gradient(bottom, rgb() 85%, rgb() 100%); background: -webkit-linear-gradient(bottom, rgb() 85%, rgb() 100%); background: -ms-linear-gradient(bottom, rgb() 85%, rgb() 100%); - + + background: #eaeaea; + font-family: ; border: 0px; margin-bottom: 1px; @@ -1481,13 +1513,15 @@ tr.liste_total td { */ .pair { - /* DYN */ + background: linear-gradient(bottom, rgb() 85%, rgb() 100%); background: -o-linear-gradient(bottom, rgb() 85%, rgb() 100%); background: -moz-linear-gradient(bottom, rgb() 85%, rgb() 100%); background: -webkit-linear-gradient(bottom, rgb() 85%, rgb() 100%); background: -ms-linear-gradient(bottom, rgb() 85%, rgb() 100%); - + + background: #ffffff; + font-family: ; border: 0px; margin-bottom: 1px; @@ -1519,68 +1553,68 @@ div.tabBar .noborder { */ .boxtable { --moz-box-shadow: 4px 4px 4px #CCC; --webkit-box-shadow: 4px 4px 4px #CCC; -box-shadow: 4px 4px 4px #CCC; -margin-bottom: 8px !important; + -moz-box-shadow: 4px 4px 4px #CCC; + -webkit-box-shadow: 4px 4px 4px #CCC; + box-shadow: 4px 4px 4px #CCC; + margin-bottom: 8px !important; } .box { -padding-right: 0px; -padding-left: 0px; -padding-bottom: 4px; + padding-right: 0px; + padding-left: 0px; + padding-bottom: 4px; } tr.box_titre { -height: 20px; -background: #7699A9; + height: 20px; + background: #7699A9; -/* DYN */ -background-image: linear-gradient(bottom, rgb() 15%, rgb() 100%); -background-image: -o-linear-gradient(bottom, rgb() 15%, rgb() 100%); -background-image: -moz-linear-gradient(bottom, rgb() 15%, rgb() 100%); -background-image: -webkit-linear-gradient(bottom, rgb() 15%, rgb() 100%); -background-image: -ms-linear-gradient(bottom, rgb() 15%, rgb() 100%); - -background-repeat: repeat-x; -color: #; -font-family: , sans-serif; -font-weight: normal; -border-bottom: 1px solid #FDFFFF; -white-space: nowrap; + + background-image: -o-linear-gradient(bottom, rgb() 15%, rgb() 100%); + background-image: -moz-linear-gradient(bottom, rgb() 15%, rgb() 100%); + background-image: -webkit-linear-gradient(bottom, rgb() 15%, rgb() 100%); + background-image: -ms-linear-gradient(bottom, rgb() 15%, rgb() 100%); + background-image: linear-gradient(bottom, rgb() 15%, rgb() 100%); + + background-image: url(); + + background-repeat: repeat-x; + color: #; + font-family: , sans-serif; + font-weight: normal; + border-bottom: 1px solid #FDFFFF; + white-space: nowrap; } tr.box_impair { -/* background: #e6ebed; */ -/* background: #f6f6f6; */ - -/* DYN */ -background: linear-gradient(bottom, rgb() 85%, rgb() 100%); -background: -o-linear-gradient(bottom, rgb() 85%, rgb() 100%); -background: -moz-linear-gradient(bottom, rgb() 85%, rgb() 100%); -background: -webkit-linear-gradient(bottom, rgb() 85%, rgb() 100%); -background: -ms-linear-gradient(bottom, rgb() 85%, rgb() 100%); - -font-family: ; + + background: -o-linear-gradient(bottom, rgb() 85%, rgb() 100%); + background: -moz-linear-gradient(bottom, rgb() 85%, rgb() 100%); + background: -webkit-linear-gradient(bottom, rgb() 85%, rgb() 100%); + background: -ms-linear-gradient(bottom, rgb() 85%, rgb() 100%); + background: linear-gradient(bottom, rgb() 85%, rgb() 100%); + + background: #eaeaea; + + font-family: ; } tr.box_pair { -/* background: #d0d4d7; */ -/* background: #ffffff; */ - -/* DYN */ -background: linear-gradient(bottom, rgb() 85%, rgb() 100%); -background: -o-linear-gradient(bottom, rgb() 85%, rgb() 100%); -background: -moz-linear-gradient(bottom, rgb() 85%, rgb() 100%); -background: -webkit-linear-gradient(bottom, rgb() 85%, rgb() 100%); -background: -ms-linear-gradient(bottom, rgb() 85%, rgb() 100%); - -font-family: ; + + background: -o-linear-gradient(bottom, rgb() 85%, rgb() 100%); + background: -moz-linear-gradient(bottom, rgb() 85%, rgb() 100%); + background: -webkit-linear-gradient(bottom, rgb() 85%, rgb() 100%); + background: -ms-linear-gradient(bottom, rgb() 85%, rgb() 100%); + background: linear-gradient(bottom, rgb() 85%, rgb() 100%); + + background: #ffffff; + + font-family: ; } tr.fiche { -font-family: ; + font-family: ; }