cvsimport
This commit is contained in:
Juanjo Menent
commit
e654e01bc1
@ -2,7 +2,7 @@
|
||||
/* Copyright (C) 2003-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
|
||||
* Copyright (C) 2004-2009 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||
* Copyright (C) 2005 Marc Barilley / Ocebo <marc@ocebo.com>
|
||||
* Copyright (C) 2005 Regis Houssin <regis@dolibarr.fr>
|
||||
* Copyright (C) 2005-2011 Regis Houssin <regis@dolibarr.fr>
|
||||
*
|
||||
* 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
|
||||
@ -23,7 +23,7 @@
|
||||
* \file htdocs/comm/propal/document.php
|
||||
* \ingroup propale
|
||||
* \brief Page de gestion des documents attaches a une proposition commerciale
|
||||
* \version $Id: document.php,v 1.66 2011/07/06 20:56:49 eldy Exp $
|
||||
* \version $Id: document.php,v 1.67 2011/07/14 05:21:53 hregis Exp $
|
||||
*/
|
||||
|
||||
require("../../main.inc.php");
|
||||
@ -110,7 +110,7 @@ if ($action == 'confirm_deletefile' && $confirm == 'yes')
|
||||
|
||||
$upload_dir = $conf->propale->dir_output . "/" . dol_sanitizeFileName($object->ref);
|
||||
$file = $upload_dir . '/' . $_GET['urlfile']; // Do not use urldecode here ($_GET and $_REQUEST are already decoded by PHP).
|
||||
dol_delete_file($file);
|
||||
dol_delete_file($file,0,0,0,'FILE_DELETE',$object);
|
||||
$mesg = '<div class="ok">'.$langs->trans("FileWasRemoved").'</div>';
|
||||
}
|
||||
}
|
||||
@ -209,5 +209,5 @@ else
|
||||
|
||||
$db->close();
|
||||
|
||||
llxFooter('$Date: 2011/07/06 20:56:49 $ - $Revision: 1.66 $');
|
||||
llxFooter('$Date: 2011/07/14 05:21:53 $ - $Revision: 1.67 $');
|
||||
?>
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
* \file htdocs/commande/document.php
|
||||
* \ingroup order
|
||||
* \brief Page de gestion des documents attachees a une commande
|
||||
* \version $Id: document.php,v 1.34 2011/07/06 20:56:49 eldy Exp $
|
||||
* \version $Id: document.php,v 1.35 2011/07/14 05:21:53 hregis Exp $
|
||||
*/
|
||||
|
||||
require("../main.inc.php");
|
||||
@ -113,7 +113,7 @@ if ($action == 'confirm_deletefile' && $confirm == 'yes')
|
||||
|
||||
$upload_dir = $conf->commande->dir_output . "/" . dol_sanitizeFileName($object->ref);
|
||||
$file = $upload_dir . '/' . $_GET['urlfile']; // Do not use urldecode here ($_GET and $_REQUEST are already decoded by PHP).
|
||||
dol_delete_file($file);
|
||||
dol_delete_file($file,0,0,0,'FILE_DELETE',$object);
|
||||
$mesg = '<div class="ok">'.$langs->trans("FileWasRemoved").'</div>';
|
||||
}
|
||||
}
|
||||
@ -193,5 +193,5 @@ else
|
||||
|
||||
$db->close();
|
||||
|
||||
llxFooter('$Date: 2011/07/06 20:56:49 $ - $Revision: 1.34 $');
|
||||
llxFooter('$Date: 2011/07/14 05:21:53 $ - $Revision: 1.35 $');
|
||||
?>
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
* \file htdocs/compta/facture/document.php
|
||||
* \ingroup facture
|
||||
* \brief Page for attached files on invoices
|
||||
* \version $Id: document.php,v 1.44 2011/07/06 20:56:49 eldy Exp $
|
||||
* \version $Id: document.php,v 1.45 2011/07/14 05:21:53 hregis Exp $
|
||||
*/
|
||||
|
||||
require("../../main.inc.php");
|
||||
@ -115,7 +115,7 @@ if ($action == 'confirm_deletefile' && $confirm == 'yes')
|
||||
|
||||
$upload_dir = $conf->facture->dir_output . "/" . dol_sanitizeFileName($object->ref);
|
||||
$file = $upload_dir . '/' . $_GET['urlfile']; // Do not use urldecode here ($_GET and $_REQUEST are already decoded by PHP).
|
||||
dol_delete_file($file);
|
||||
dol_delete_file($file,0,0,0,'FILE_DELETE',$object);
|
||||
$mesg = '<div class="ok">'.$langs->trans("FileWasRemoved").'</div>';
|
||||
}
|
||||
}
|
||||
@ -213,5 +213,5 @@ else
|
||||
|
||||
$db->close();
|
||||
|
||||
llxFooter('$Date: 2011/07/06 20:56:49 $ - $Revision: 1.44 $');
|
||||
llxFooter('$Date: 2011/07/14 05:21:53 $ - $Revision: 1.45 $');
|
||||
?>
|
||||
|
||||
@ -75,9 +75,12 @@ NewCotisation=Nova afiliació
|
||||
PaymentSubscription=Pagament de quotes
|
||||
EditMember=Edició membre
|
||||
SubscriptionEndDate=Data fi afiliació
|
||||
NewAttribute=Nou atribut
|
||||
AttributeCode=Codi de l'atribut
|
||||
OptionalFieldsSetup=Configuració dels camps opcionals
|
||||
MembersTypeSetup=Configuració dels tipus de membres
|
||||
NewSubscription=Nova afiliació
|
||||
NewSubscriptionDesc=Utilitzi aquest formulari per registrar-se com un nou membre de l'associació. Per a una renovació, si ja és membre, poseu-vos en contacte amb l'associació.
|
||||
NewSubscriptionDesc=Utilitzi aquest formulari per registrar-se com un nou membre de l'associació. Per a una renovació, si ja és membre, poseu-vos en contacte amb l'associació mitjançant l'e-mail %s.
|
||||
Subscription=Afiliació
|
||||
Subscriptions=Afiliacions
|
||||
SubscriptionLate=En retard
|
||||
@ -192,4 +195,5 @@ MEMBER_NEWFORM_PAYONLINE=Anar a la pàgina integrada de pagament en línia
|
||||
Associations=Asssociacions
|
||||
Collectivités=Col.lectivitats
|
||||
Particuliers=Particulars
|
||||
Entreprises=Empreses
|
||||
Entreprises=Empreses
|
||||
DOLIBARRFOUNDATION_PAYMENT_FORM=Per realitzar el pagament de la seva cotització per transferència bancària, visiteu la pàgina <a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribirse#Para_una_adhesi.C3.B3n_por_transferencia">http://wiki.dolibarr.org/index.php/Subscribirse</a>.<br>Per pagar amb targeta de crèdit o PayPal, feu clic al botó a la part inferior d'aquesta pàgina.<br><br>
|
||||
@ -75,9 +75,12 @@ NewCotisation=Nueva afiliación
|
||||
PaymentSubscription=Pago de cuotas
|
||||
EditMember=Edición miembro
|
||||
SubscriptionEndDate=Fecha fin afiliación
|
||||
NewAttribute=Nuevo atributo
|
||||
AttributeCode=Código del atributo
|
||||
OptionalFieldsSetup=Configuración de los campos opcionales
|
||||
MembersTypeSetup=Configuración de los tipos de miembros
|
||||
NewSubscription=Nueva afiliación
|
||||
NewSubscriptionDesc=Utilice este formulario para registrarse como un nuevo miembro de la asociación. Para una renovación, si ya es miembro, póngase en contacto con la asociación.
|
||||
NewSubscriptionDesc=Utilice este formulario para registrarse como un nuevo miembro de la asociación. Para una renovación, si ya es miembro, póngase en contacto con la asociación a través del e-mail %s.
|
||||
Subscription=Afiliación
|
||||
Subscriptions=Afiliaciones
|
||||
SubscriptionLate=En retraso
|
||||
@ -192,4 +195,5 @@ MEMBER_NEWFORM_PAYONLINE=Ir a la página integrada de pago en línea
|
||||
Associations=Asociaciones
|
||||
Collectivités=Colectividades
|
||||
Particuliers=Particulares
|
||||
Entreprises=Empresas
|
||||
Entreprises=Empresas
|
||||
DOLIBARRFOUNDATION_PAYMENT_FORM=Para realizar el pago de su cotización por transferencia bancaria, visite la página <a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribirse#Para_una_adhesi.C3.B3n_por_transferencia">http://wiki.dolibarr.org/index.php/Subscribirse</a>.<br>Para pagar con tarjeta de crédito o PayPal, haga clic en el botón en la parte inferior de esta página.<br><br>
|
||||
@ -20,7 +20,7 @@
|
||||
/**
|
||||
* \file htdocs/lib/files.lib.php
|
||||
* \brief Library for file managing functions
|
||||
* \version $Id: files.lib.php,v 1.69 2011/07/13 21:33:38 eldy Exp $
|
||||
* \version $Id: files.lib.php,v 1.70 2011/07/14 05:21:53 hregis Exp $
|
||||
*/
|
||||
|
||||
/**
|
||||
@ -590,7 +590,7 @@ function dol_move_uploaded_file($src_file, $dest_file, $allowoverwrite, $disable
|
||||
* @param disableglob Disable usage of glob like *
|
||||
* @param nophperrors Disable all PHP output errors
|
||||
* @param notrigger Disable all triggers
|
||||
* @param triggercode Code of trigger
|
||||
* @param triggercode Code of trigger TODO ???? why ?
|
||||
* @param object Object for trigger
|
||||
* @return boolean True if file is deleted, False if error
|
||||
*/
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
<?php
|
||||
/* Copyright (C) 2006-2011 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||
* Copyright (C) 2010 Regis Houssin <regis@dolibarr.fr>
|
||||
* Copyright (C) 2011 Juanjo Menent <jmenent@2byte.es>
|
||||
*
|
||||
* 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
|
||||
@ -22,7 +23,7 @@
|
||||
* \file htdocs/lib/project.lib.php
|
||||
* \brief Functions used by project module
|
||||
* \ingroup project
|
||||
* \version $Id: project.lib.php,v 1.68 2011/07/04 09:01:38 eldy Exp $
|
||||
* \version $Id: project.lib.php,v 1.69 2011/07/14 15:37:37 simnandez Exp $
|
||||
*/
|
||||
require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php");
|
||||
|
||||
@ -98,7 +99,7 @@ function project_prepare_head($object)
|
||||
* \file htdocs/lib/project.lib.php
|
||||
* \brief Ensemble de fonctions de base pour le module projet
|
||||
* \ingroup societe
|
||||
* \version $Id: project.lib.php,v 1.68 2011/07/04 09:01:38 eldy Exp $
|
||||
* \version $Id: project.lib.php,v 1.69 2011/07/14 15:37:37 simnandez Exp $
|
||||
*/
|
||||
function task_prepare_head($object)
|
||||
{
|
||||
@ -375,6 +376,9 @@ function PLines(&$inc, $parent, &$lines, &$level, $var, $showproject, &$taskrole
|
||||
$projectsArrayId=explode(',',$projectsListId);
|
||||
|
||||
$numlines=sizeof($lines);
|
||||
|
||||
$total=0;
|
||||
|
||||
for ($i = 0 ; $i < $numlines ; $i++)
|
||||
{
|
||||
if ($parent == 0) $level = 0;
|
||||
@ -485,6 +489,7 @@ function PLines(&$inc, $parent, &$lines, &$level, $var, $showproject, &$taskrole
|
||||
$level++;
|
||||
if ($lines[$i]->id) PLines($inc, $lines[$i]->id, $lines, $level, $var, $showproject, $taskrole, $projectsListId);
|
||||
$level--;
|
||||
$total += $lines[$i]->duration;
|
||||
}
|
||||
}
|
||||
else
|
||||
@ -493,6 +498,14 @@ function PLines(&$inc, $parent, &$lines, &$level, $var, $showproject, &$taskrole
|
||||
}
|
||||
}
|
||||
|
||||
if ($total>0)
|
||||
{
|
||||
print '<tr class="liste_total"><td class="liste_total">'.$langs->trans("Total").'</td>';
|
||||
print '<td></td>';
|
||||
print '<td></td>';
|
||||
print '<td align="right" nowrap="nowrap" class="liste_total">'.ConvertSecondToTime($total).'</td></tr>';
|
||||
}
|
||||
|
||||
return $inc;
|
||||
}
|
||||
|
||||
|
||||
@ -2,6 +2,7 @@
|
||||
/* Copyright (C) 2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
|
||||
* Copyright (C) 2006-2010 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||
* Copyright (C) 2010 Regis Houssin <regis@dolibarr.fr>
|
||||
* Copyright (C) 2011 Juanjo Menent <jmenent@2byte.es>
|
||||
*
|
||||
* 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
|
||||
@ -22,7 +23,7 @@
|
||||
* \file htdocs/projet/tasks/time.php
|
||||
* \ingroup projet
|
||||
* \brief Page to add new time spent on a task
|
||||
* \version $Id$
|
||||
* \version $Id: time.php,v 1.32 2011/07/14 15:37:37 simnandez Exp $
|
||||
*/
|
||||
|
||||
require("../../main.inc.php");
|
||||
@ -307,7 +308,8 @@ if ($_GET["id"] > 0)
|
||||
print '<td align="right">'.$langs->trans("Duration").'</td>';
|
||||
print '<td> </td>';
|
||||
print "</tr>\n";
|
||||
|
||||
|
||||
$total = 0;
|
||||
foreach ($tasks as $task_time)
|
||||
{
|
||||
$var=!$var;
|
||||
@ -389,8 +391,12 @@ if ($_GET["id"] > 0)
|
||||
print '</td>';
|
||||
|
||||
print "</tr>\n";
|
||||
$total += $task_time->task_duration;
|
||||
}
|
||||
|
||||
print '<tr class="liste_total"><td colspan="3" class="liste_total">'.$langs->trans("Total").'</td>';
|
||||
print '<td align="right" nowrap="nowrap" class="liste_total">'.ConvertSecondToTime($total).'</td><td> </td>';
|
||||
print '</tr>';
|
||||
|
||||
print "</table>";
|
||||
print "</form>";
|
||||
}
|
||||
@ -398,5 +404,5 @@ if ($_GET["id"] > 0)
|
||||
|
||||
$db->close();
|
||||
|
||||
llxFooter('$Date$ - $Revision$');
|
||||
llxFooter('$Date: 2011/07/14 15:37:37 $ - $Revision: 1.32 $');
|
||||
?>
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
* \file htdocs/societe/document.php
|
||||
* \brief Tab for documents linked to third party
|
||||
* \ingroup societe
|
||||
* \version $Id: document.php,v 1.37 2011/07/06 20:56:49 eldy Exp $
|
||||
* \version $Id: document.php,v 1.38 2011/07/14 05:21:52 hregis Exp $
|
||||
*/
|
||||
|
||||
require("../main.inc.php");
|
||||
@ -118,7 +118,7 @@ if ($action == 'confirm_deletefile' && $confirm == 'yes')
|
||||
if ($object->fetch($socid))
|
||||
{
|
||||
$file = $upload_dir . "/" . $_GET['urlfile']; // Do not use urldecode here ($_GET and $_REQUEST are already decoded by PHP).
|
||||
dol_delete_file($file);
|
||||
dol_delete_file($file,0,0,0,'FILE_DELETE',$object);
|
||||
$mesg = '<div class="ok">'.$langs->trans("FileWasRemoved").'</div>';
|
||||
}
|
||||
}
|
||||
@ -241,6 +241,6 @@ else
|
||||
$db->close();
|
||||
|
||||
|
||||
llxFooter('$Date: 2011/07/06 20:56:49 $ - $Revision: 1.37 $');
|
||||
llxFooter('$Date: 2011/07/14 05:21:52 $ - $Revision: 1.38 $');
|
||||
|
||||
?>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user