';
- //print '';
- //print '
";
$out .= '';
@@ -662,12 +663,13 @@ class FormFile
* @param int $permtodelete Permission to delete
* @param int $useinecm Change output for use in ecm module
* @param string $textifempty Text to show if filearray is empty ('NoFileFound' if not defined)
- * @param int $maxlength Maximum length of file name shown
+ * @param int $maxlength Maximum length of file name shown
* @param string $title Title before list
* @param string $url Full url to use for click links ('' = autodetect)
+ * @param int $showrelpart 0=Show only filename (default), 1=Show first level 1 dir
* @return int <0 if KO, nb of files shown if OK
*/
- function list_of_documents($filearray,$object,$modulepart,$param='',$forcedownload=0,$relativepath='',$permtodelete=1,$useinecm=0,$textifempty='',$maxlength=0,$title='',$url='')
+ function list_of_documents($filearray,$object,$modulepart,$param='',$forcedownload=0,$relativepath='',$permtodelete=1,$useinecm=0,$textifempty='',$maxlength=0,$title='',$url='', $showrelpart=0)
{
global $user, $conf, $langs, $hookmanager;
global $bc;
@@ -732,8 +734,15 @@ class FormFile
print '';
+ //print '&file='.urlencode($relativepath.$file['name']).'">';
+ if ($file['level1name'] <> $object->id)
+ $filepath=urlencode($object->id.'/'.$file['level1name'].'/'.$file['name']);
+ else
+ $filepath=urlencode($object->id.'/'.$file['name']);
+ print '&file='.$filepath.'">';
+
print img_mime($file['name'],$file['name'].' ('.dol_print_size($file['size'],0,0).')').' ';
+ if ($showrelpart == 1) print $file['level1name'].'/';
print dol_trunc($file['name'],$maxlength,'middle');
print '';
print "\n";
@@ -753,7 +762,14 @@ class FormFile
// ($param must start with &)
print '';
if ($useinecm) print ''.img_view().' ';
- if ($permtodelete) print ''.img_delete().'';
+ if ($permtodelete)
+ {
+ if ($file['level1name'] <> $object->id)
+ $filepath=urlencode($file['level1name'].'/'.$file['name']);
+ else
+ $filepath=urlencode($file['name']);
+ print ''.img_delete().'';
+ }
else print ' ';
print " ";
print "\n";
diff --git a/htdocs/core/class/ldap.class.php b/htdocs/core/class/ldap.class.php
index 9f18a477bed..2a3eb3647ae 100644
--- a/htdocs/core/class/ldap.class.php
+++ b/htdocs/core/class/ldap.class.php
@@ -78,7 +78,8 @@ class Ldap
var $name;
var $firstname;
var $login;
- var $phone;
+ var $phone;
+ var $skype;
var $fax;
var $mail;
var $mobile;
@@ -127,6 +128,7 @@ class Ldap
$this->attr_firstname = $conf->global->LDAP_FIELD_FIRSTNAME;
$this->attr_mail = $conf->global->LDAP_FIELD_MAIL;
$this->attr_phone = $conf->global->LDAP_FIELD_PHONE;
+ $this->attr_skype = $conf->global->LDAP_FIELD_SKYPE;
$this->attr_fax = $conf->global->LDAP_FIELD_FAX;
$this->attr_mobile = $conf->global->LDAP_FIELD_MOBILE;
}
@@ -1172,6 +1174,7 @@ class Ldap
$this->firstname = $this->convToOutputCharset($result[0][$this->attr_firstname][0],$this->ldapcharset);
$this->login = $this->convToOutputCharset($result[0][$this->attr_login][0],$this->ldapcharset);
$this->phone = $this->convToOutputCharset($result[0][$this->attr_phone][0],$this->ldapcharset);
+ $this->skype = $this->convToOutputCharset($result[0][$this->attr_skype][0],$this->ldapcharset);
$this->fax = $this->convToOutputCharset($result[0][$this->attr_fax][0],$this->ldapcharset);
$this->mail = $this->convToOutputCharset($result[0][$this->attr_mail][0],$this->ldapcharset);
$this->mobile = $this->convToOutputCharset($result[0][$this->attr_mobile][0],$this->ldapcharset);
diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
index 53dafec66dd..582922cd60e 100644
--- a/htdocs/core/lib/company.lib.php
+++ b/htdocs/core/lib/company.lib.php
@@ -555,6 +555,11 @@ function show_contacts($conf,$langs,$db,$object,$backtopage='')
print ''.$langs->trans("PhoneMobile").' ';
print ''.$langs->trans("Fax").' ';
print ''.$langs->trans("EMail").' ';
+ if (! empty($conf->skype->enabled))
+ {
+ $colspan++;
+ print ''.$langs->trans("Skype").' ';
+ }
print ''.$langs->trans("Status").' ';
print " ";
if (! empty($conf->agenda->enabled) && $user->rights->agenda->myactions->create)
@@ -570,7 +575,7 @@ function show_contacts($conf,$langs,$db,$object,$backtopage='')
print "";
- $sql = "SELECT p.rowid, p.lastname, p.firstname, p.fk_pays, p.poste, p.phone, p.phone_mobile, p.fax, p.email, p.statut ";
+ $sql = "SELECT p.rowid, p.lastname, p.firstname, p.fk_pays, p.poste, p.phone, p.phone_mobile, p.fax, p.email, p.skype, p.statut ";
$sql .= ", p.civilite, p.address, p.zip, p.town";
$sql .= " FROM ".MAIN_DB_PREFIX."socpeople as p";
$sql .= " WHERE p.fk_soc = ".$object->id;
@@ -614,6 +619,12 @@ function show_contacts($conf,$langs,$db,$object,$backtopage='')
print '';
print dol_print_email($obj->email,$obj->rowid,$object->id,'AC_EMAIL');
print ' ';
+ if (! empty($conf->skype->enabled))
+ {
+ print '';
+ print dol_print_skype($obj->skype,$obj->rowid,$object->id,'AC_SKYPE');
+ print ' ';
+ }
if ($obj->statut==0) print ''.$langs->trans('Disabled').' '.img_picto($langs->trans('StatusContactDraftShort'),'statut0').' ';
elseif ($obj->statut==1) print ''.$langs->trans('Enabled').' '.img_picto($langs->trans('StatusContactValidatedShort'),'statut1').' ';
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index de2e9e39692..9e67318d693 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -9,6 +9,7 @@
* Copyright (C) 2008 Raphael Bertrand (Resultic)
* Copyright (C) 2010-2011 Juanjo Menent
* Copyright (C) 2013 Cédric Salvador
+ * Copyright (C) 2013 Alexandre Spangaro
*
* 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
@@ -1185,6 +1186,48 @@ function dol_print_email($email,$cid=0,$socid=0,$addlink=0,$max=64,$showinvalid=
return $newemail;
}
+/**
+ * Show Skype link
+ *
+ * @param string $skype Skype to show (only skype, without 'Name of recipient' before)
+ * @param int $cid Id of contact if known
+ * @param int $socid Id of third party if known
+ * @param int $addlink 0=no link to create action
+ * @param int $max Max number of characters to show
+ * @return string HTML Link
+ */
+function dol_print_skype($skype,$cid=0,$socid=0,$addlink=0,$max=64)
+{
+ global $conf,$user,$langs;
+
+ $newskype=$skype;
+
+ if (empty($skype)) return ' ';
+
+ if (! empty($addlink))
+ {
+ $newskype='';
+ $newskype.='
';
+ $newskype.=dol_trunc($skype,$max);
+ $newskype.='';
+
+ if (($cid || $socid) && ! empty($conf->agenda->enabled) && $user->rights->agenda->myactions->create)
+ {
+ $type='AC_SKYPE'; $link='';
+ if (! empty($conf->global->AGENDA_ADDACTIONFORSKYPE)) $link=''.img_object($langs->trans("AddAction"),"calendar").'';
+ $newskype='
';
+ }
+ }
+ else
+ {
+ $langs->load("errors");
+ $newskype.=img_warning($langs->trans("ErrorBadSkype",$skype));
+ }
+ return $newskype;
+}
+
/**
* Format phone numbers according to country
*
diff --git a/htdocs/core/lib/functions2.lib.php b/htdocs/core/lib/functions2.lib.php
index dfe83f28fa2..6f55b8d130b 100644
--- a/htdocs/core/lib/functions2.lib.php
+++ b/htdocs/core/lib/functions2.lib.php
@@ -205,13 +205,15 @@ function dol_print_object_info($object)
print $langs->trans("CreatedBy").': ';
if (is_object($object->user_creation))
{
- print $object->user_creation->getNomUrl(1);
+ if ($object->user_creation->id) print $object->user_creation->getNomUrl(1);
+ else print $langs->trans("Unknown");
}
else
{
$userstatic=new User($db);
$userstatic->fetch($object->user_creation);
- print $userstatic->getNomUrl(1);
+ if ($userstatic->id) print $userstatic->getNomUrl(1);
+ else print $langs->trans("Unknown");
}
print '
'; } @@ -230,13 +232,15 @@ function dol_print_object_info($object) print $langs->trans("ModifiedBy").': '; if (is_object($object->user_modification)) { - print $object->user_modification->getNomUrl(1); + if ($object->user_modification->id) print $object->user_modification->getNomUrl(1); + else print $langs->trans("Unknown"); } else { $userstatic=new User($db); $userstatic->fetch($object->user_modification); - print $userstatic->getNomUrl(1); + if ($userstatic->id) print $userstatic->getNomUrl(1); + else print $langs->trans("Unknown"); } print '
'; } @@ -255,13 +259,15 @@ function dol_print_object_info($object) print $langs->trans("ValidatedBy").': '; if (is_object($object->user_validation)) { - print $object->user_validation->getNomUrl(1); + if ($object->user_validation->id) print $object->user_validation->getNomUrl(1); + else print $langs->trans("Unknown"); } else { $userstatic=new User($db); $userstatic->fetch($object->user_validation); - print $userstatic->getNomUrl(1); + if ($userstatic->id) print $userstatic->getNomUrl(1); + else print $langs->trans("Unknown"); } print '
'; } @@ -280,13 +286,15 @@ function dol_print_object_info($object) print $langs->trans("ApprovedBy").': '; if (is_object($object->user_approve)) { - print $object->user_approve->getNomUrl(1); + if ($object->user_approve->id) print $object->user_approve->getNomUrl(1); + else print $langs->trans("Unknown"); } else { $userstatic=new User($db); $userstatic->fetch($object->user_approve); - print $userstatic->getNomUrl(1); + if ($userstatic->id) print $userstatic->getNomUrl(1); + else print $langs->trans("Unknown"); } print '
'; } @@ -305,13 +313,15 @@ function dol_print_object_info($object) print $langs->trans("ClosedBy").': '; if (is_object($object->user_cloture)) { - print $object->user_cloture->getNomUrl(1); + if ($object->user_cloture->id) print $object->user_cloture->getNomUrl(1); + else print $langs->trans("Unknown"); } else { $userstatic=new User($db); $userstatic->fetch($object->user_cloture); - print $userstatic->getNomUrl(1); + if ($userstatic->id) print $userstatic->getNomUrl(1); + else print $langs->trans("Unknown"); } print '
'; } @@ -330,13 +340,15 @@ function dol_print_object_info($object) print $langs->trans("ConciliatedBy").': '; if (is_object($object->user_rappro)) { - print $object->user_rappro->getNomUrl(1); + if ($object->user_rappro->id) print $object->user_rappro->getNomUrl(1); + else print $langs->trans("Unknown"); } else { $userstatic=new User($db); $userstatic->fetch($object->user_rappro); - print $userstatic->getNomUrl(1); + if ($userstatic->id) print $userstatic->getNomUrl(1); + else print $langs->trans("Unknown"); } print '
'; } diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php index 1f8f380e494..5e096760fce 100644 --- a/htdocs/core/lib/project.lib.php +++ b/htdocs/core/lib/project.lib.php @@ -1,28 +1,28 @@ +/* Copyright (C) 2006-2013 Laurent Destailleur
* Copyright (C) 2010 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
-* the Free Software Foundation; either version 3 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program. If not, see
+ *
+ * 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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see ';
- if ($lines[$i]->planned_workload) print convertSecondToTime($lines[$i]->planned_workload,'all');
+ print ' ';
+ if ($lines[$i]->planned_workload) print convertSecondToTime($lines[$i]->planned_workload,'allhourmin');
else print '--:--';
print ' ';
- // Progress
+ // Progress declared %
print '';
print $lines[$i]->progress.' %';
print ' ';
// Time spent
print '';
- if ($lines[$i]->duration) print convertSecondToTime($lines[$i]->duration,'all');
+ if ($lines[$i]->duration)
+ {
+ print '';
+ print convertSecondToTime($lines[$i]->duration,'allhourmin');
+ print '';
+ }
else print '--:--';
print " \n";
diff --git a/htdocs/core/lib/security.lib.php b/htdocs/core/lib/security.lib.php
index 58bd4371b4c..150a3bd3feb 100644
--- a/htdocs/core/lib/security.lib.php
+++ b/htdocs/core/lib/security.lib.php
@@ -77,6 +77,11 @@ function dol_decode($chain)
*/
function dol_hash($chain,$type=0)
{
+ global $conf;
+
+ // Salt value
+ if (! empty($conf->global->MAIN_SECURITY_SALT)) $chain=$conf->global->MAIN_SECURITY_SALT.$chain;
+
if ($type == 1) return sha1($chain);
else if ($type == 2) return sha1(md5($chain));
else return md5($chain);
diff --git a/htdocs/core/lib/xcal.lib.php b/htdocs/core/lib/xcal.lib.php
index f8f8524743a..9badeae5290 100644
--- a/htdocs/core/lib/xcal.lib.php
+++ b/htdocs/core/lib/xcal.lib.php
@@ -116,7 +116,7 @@ function build_calfile($format,$title,$desc,$events_array,$outputfile)
LOCATION:
SEQUENCE:0
STATUS:CONFIRMED
- SUMMARY:Tache 1 heure
+ SUMMARY:Tâche 1 heure
TRANSP:OPAQUE
END:VEVENT
@@ -132,7 +132,7 @@ function build_calfile($format,$title,$desc,$events_array,$outputfile)
LOCATION:
SEQUENCE:0
STATUS:CONFIRMED
- SUMMARY:Tache 1 jour
+ SUMMARY:Tâche 1 jour
TRANSP:TRANSPARENT
END:VEVENT
*/
diff --git a/htdocs/core/modules/modProjet.class.php b/htdocs/core/modules/modProjet.class.php
index 584a8e3494f..a384a1a9739 100644
--- a/htdocs/core/modules/modProjet.class.php
+++ b/htdocs/core/modules/modProjet.class.php
@@ -125,28 +125,28 @@ class modProjet extends DolibarrModules
$r++;
$this->rights[$r][0] = 41; // id de la permission
- $this->rights[$r][1] = "Lire les projets et taches (partagés ou dont je suis contact)"; // libelle de la permission
+ $this->rights[$r][1] = "Lire les projets et tâches (partagés ou dont je suis contact)"; // libelle de la permission
$this->rights[$r][2] = 'r'; // type de la permission (deprecie a ce jour)
$this->rights[$r][3] = 1; // La permission est-elle une permission par defaut
$this->rights[$r][4] = 'lire';
$r++;
$this->rights[$r][0] = 42; // id de la permission
- $this->rights[$r][1] = "Creer/modifier les projets et taches (partagés ou dont je suis contact)"; // libelle de la permission
+ $this->rights[$r][1] = "Creer/modifier les projets et tâches (partagés ou dont je suis contact)"; // libelle de la permission
$this->rights[$r][2] = 'w'; // type de la permission (deprecie a ce jour)
$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
$this->rights[$r][4] = 'creer';
$r++;
$this->rights[$r][0] = 44; // id de la permission
- $this->rights[$r][1] = "Supprimer les projets et taches (partagés ou dont je suis contact)"; // libelle de la permission
+ $this->rights[$r][1] = "Supprimer les projets et tâches (partagés ou dont je suis contact)"; // libelle de la permission
$this->rights[$r][2] = 'd'; // type de la permission (deprecie a ce jour)
$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
$this->rights[$r][4] = 'supprimer';
$r++;
$this->rights[$r][0] = 141; // id de la permission
- $this->rights[$r][1] = "Lire tous les projets et taches (y compris prives qui ne me sont pas affectes)"; // libelle de la permission
+ $this->rights[$r][1] = "Lire tous les projets et tâches (y compris prives qui ne me sont pas affectes)"; // libelle de la permission
$this->rights[$r][2] = 'r'; // type de la permission (deprecie a ce jour)
$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
$this->rights[$r][4] = 'all';
@@ -154,7 +154,7 @@ class modProjet extends DolibarrModules
$r++;
$this->rights[$r][0] = 142; // id de la permission
- $this->rights[$r][1] = "Creer/modifier tous les projets et taches (y compris prives qui ne me sont pas affectes)"; // libelle de la permission
+ $this->rights[$r][1] = "Creer/modifier tous les projets et tâches (y compris prives qui ne me sont pas affectes)"; // libelle de la permission
$this->rights[$r][2] = 'w'; // type de la permission (deprecie a ce jour)
$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
$this->rights[$r][4] = 'all';
@@ -162,7 +162,7 @@ class modProjet extends DolibarrModules
$r++;
$this->rights[$r][0] = 144; // id de la permission
- $this->rights[$r][1] = "Supprimer tous les projets et taches (y compris prives qui ne me sont pas affectes)"; // libelle de la permission
+ $this->rights[$r][1] = "Supprimer tous les projets et tâches (y compris prives qui ne me sont pas affectes)"; // libelle de la permission
$this->rights[$r][2] = 'd'; // type de la permission (deprecie a ce jour)
$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
$this->rights[$r][4] = 'all';
diff --git a/htdocs/core/modules/modSkype.class.php b/htdocs/core/modules/modSkype.class.php
new file mode 100644
index 00000000000..3102ba97777
--- /dev/null
+++ b/htdocs/core/modules/modSkype.class.php
@@ -0,0 +1,136 @@
+
+ *
+ * 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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see
- * Copyright (C) 2012 Christophe Battarel
+ * Copyright (C) 2012-2013 Christophe Battarel
* Copyright (C) 2013 Florian Henry
*
* This program is free software; you can redistribute it and/or modify
@@ -121,14 +121,15 @@
margin->enabled) && empty($user->societe_id)) {
+ $rounding = min($conf->global->MAIN_MAX_DECIMALS_UNIT,$conf->global->MAIN_MAX_DECIMALS_TOT);
?>
pa_ht); ?>
global->DISPLAY_MARGIN_RATES) && $user->rights->margins->liretous) {?>
- pa_ht == 0)?'n/a':price($line->marge_tx).'%'); ?>
+ pa_ht == 0)?'n/a':price($line->marge_tx, null, null, null, null, $rounding).'%'); ?>
global->DISPLAY_MARK_RATES) && $user->rights->margins->liretous) {?>
- marque_tx).'%'; ?>
+ marque_tx, null, null, null, null, $rounding).'%'; ?>
special_code == 3) { ?>
diff --git a/htdocs/cron/card.php b/htdocs/cron/card.php
index 81e0ba99f26..c7110654781 100644
--- a/htdocs/cron/card.php
+++ b/htdocs/cron/card.php
@@ -120,7 +120,7 @@ if ($action=='add')
$object->unitfrequency=GETPOST('unitfrequency','int');
$object->frequency=$object->unitfrequency * GETPOST('nbfrequency','int');
- //Ajout de la tache cron
+ //Add cron task
$result = $object->create($user);
// test du Resultat de la requete
@@ -154,7 +154,7 @@ if ($action=='update')
$object->unitfrequency=GETPOST('unitfrequency','int');
$object->frequency=$object->unitfrequency * GETPOST('nbfrequency','int');
- //Ajout de la tache cron
+ //Add cron task
$result = $object->update($user);
// test du Resultat de la requete
@@ -172,7 +172,7 @@ if ($action=='activate')
{
$object->status=1;
- //Ajout de la tache cron
+ //Add cron task
$result = $object->update($user);
// test du Resultat de la requete
@@ -189,7 +189,7 @@ if ($action=='activate')
if ($action=='inactive')
{
$object->status=0;
- //Ajout de la tache cron
+ //Add cron task
$result = $object->update($user);
// test du Resultat de la requete
diff --git a/htdocs/cron/list.php b/htdocs/cron/list.php
index 7c391558cb9..8d27450eaf8 100644
--- a/htdocs/cron/list.php
+++ b/htdocs/cron/list.php
@@ -79,7 +79,7 @@ if (!empty($search_label))
// Delete jobs
if ($action == 'confirm_delete' && $confirm == "yes" && $user->rights->cron->delete){
- //Delete de la tache cron
+ //Delete cron task
$object = new Cronjob($db);
$object->id=$id;
$result = $object->delete($user);
diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php
index 20425b07310..136063d4552 100644
--- a/htdocs/expedition/class/expedition.class.php
+++ b/htdocs/expedition/class/expedition.class.php
@@ -569,7 +569,7 @@ class Expedition extends CommonObject
if (preg_match('/^[\(]?PROV/i', $this->ref))
{
// On renomme repertoire ($this->ref = ancienne ref, $numfa = nouvelle ref)
- // afin de ne pas perdre les fichiers attaches
+ // in order not to lose the attached files
$oldref = dol_sanitizeFileName($this->ref);
$newref = dol_sanitizeFileName($numref);
$dirsource = $conf->expedition->dir_output.'/sending/'.$oldref;
diff --git a/htdocs/fichinter/admin/fichinter_extrafields.php b/htdocs/fichinter/admin/fichinter_extrafields.php
index f503e9a184e..06fefb32fbe 100644
--- a/htdocs/fichinter/admin/fichinter_extrafields.php
+++ b/htdocs/fichinter/admin/fichinter_extrafields.php
@@ -71,7 +71,7 @@ print_fiche_titre($langs->trans("InterventionsSetup"),$linkback,'setup');
$head=fichinter_admin_prepare_head();
-dol_fiche_head($head, 'attributes', $langs->trans("Ficheinter"), 0, 'fichinter');
+dol_fiche_head($head, 'attributes', $langs->trans("Interventions"), 0, 'intervention');
print $langs->trans("DefineHereComplementaryAttributes",$textobject).'
'."\n"; diff --git a/htdocs/fichinter/class/fichinter.class.php b/htdocs/fichinter/class/fichinter.class.php index 2683bea68b8..13a26e857d2 100644 --- a/htdocs/fichinter/class/fichinter.class.php +++ b/htdocs/fichinter/class/fichinter.class.php @@ -607,9 +607,9 @@ class Fichinter extends CommonObject } /** - * Information sur l'objet fiche intervention + * Load information on object * - * @param int $id Id de la fiche d'intervention + * @param int $id Id of object * @return void */ function info($id) @@ -625,13 +625,12 @@ class Fichinter extends CommonObject $sql.= " WHERE f.rowid = ".$id; $sql.= " AND f.entity = ".$conf->entity; - $result = $this->db->query($sql); - - if ($result) + $resql = $this->db->query($sql); + if ($resql) { - if ($this->db->num_rows($result)) + if ($this->db->num_rows($resql)) { - $obj = $this->db->fetch_object($result); + $obj = $this->db->fetch_object($resql); $this->id = $obj->rowid; @@ -649,7 +648,7 @@ class Fichinter extends CommonObject $this->user_validation = $vuser; } } - $this->db->free($result); + $this->db->free($resql); } else { diff --git a/htdocs/fichinter/fiche.php b/htdocs/fichinter/fiche.php index 902db499004..f0f68e093fc 100644 --- a/htdocs/fichinter/fiche.php +++ b/htdocs/fichinter/fiche.php @@ -1,29 +1,29 @@ - * Copyright (C) 2004-2012 Laurent Destailleur
-* Copyright (C) 2005-2012 Regis Houssin
-* Copyright (C) 2011-2013 Juanjo Menent
-* Copyright (C) 2013 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
-* the Free Software Foundation; either version 3 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program. If not, see
+ * Copyright (C) 2005-2012 Regis Houssin
+ * Copyright (C) 2011-2013 Juanjo Menent
+ * Copyright (C) 2013 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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see '.$langs->trans("Status").' '.$object->getLibStatut(4).' ';
- print '';
- print '';
- print ' '.img_picto('','edit').' '.$langs->trans('Modify').'
"; diff --git a/htdocs/fichinter/info.php b/htdocs/fichinter/info.php index 957f4b315ce..b3bc8295d2c 100644 --- a/htdocs/fichinter/info.php +++ b/htdocs/fichinter/info.php @@ -1,6 +1,6 @@ - * Copyright (C) 2009-2010 Laurent Destailleur
+ * Copyright (C) 2009-2013 Laurent Destailleur
* Copyright (C) 2011 Juanjo Menent
*
* This program is free software; you can redistribute it and/or modify
@@ -31,32 +31,36 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/fichinter.lib.php';
$langs->load('companies');
$langs->load("interventions");
-$fichinterid = GETPOST('id','int');
+$id = GETPOST('id','int');
// Security check
if ($user->societe_id) $socid=$user->societe_id;
$result = restrictedArea($user, 'ficheinter', $fichinterid, 'fichinter');
+$object = new Fichinter($db);
+
+if ($id > 0)
+{
+ $object->fetch($id);
+}
+
/*
-* View
-*/
+ * View
+ */
llxHeader();
-$fichinter = new Fichinter($db);
-$fichinter->fetch($fichinterid);
-
$societe = new Societe($db);
-$societe->fetch($fichinter->socid);
+$societe->fetch($object->socid);
-$head = fichinter_prepare_head($fichinter);
+$head = fichinter_prepare_head($object);
dol_fiche_head($head, 'info', $langs->trans('InterventionCard'), 0, 'intervention');
-$fichinter->info($fichinter->id);
+$object->info($object->id);
print '
';
print '
';
diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index 6f6f9e91867..467a59adba1 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -355,7 +355,7 @@ class CommandeFournisseur extends CommonOrder
if (preg_match('/^[\(]?PROV/i', $this->ref))
{
// On renomme repertoire ($this->ref = ancienne ref, $num = nouvelle ref)
- // afin de ne pas perdre les fichiers attaches
+ // in order not to lose the attached files
$oldref = dol_sanitizeFileName($this->ref);
$newref = dol_sanitizeFileName($num);
$dirsource = $conf->fournisseur->dir_output.'/commande/'.$oldref;
diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index 2e8269055ea..a237ef49a5f 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -897,7 +897,7 @@ class FactureFournisseur extends CommonInvoice
if (preg_match('/^[\(]?PROV/i', $this->ref))
{
// On renomme repertoire facture ($this->ref = ancienne ref, $num = nouvelle ref)
- // afin de ne pas perdre les fichiers attaches
+ // in order not to lose the attached files
$facref = dol_sanitizeFileName($this->ref);
$snumfa = dol_sanitizeFileName($num);
diff --git a/htdocs/fourn/commande/document.php b/htdocs/fourn/commande/document.php
index da72a325574..63c5a43f912 100644
--- a/htdocs/fourn/commande/document.php
+++ b/htdocs/fourn/commande/document.php
@@ -22,7 +22,7 @@
/**
* \file htdocs/fourn/commande/document.php
* \ingroup supplier
- * \brief Page de gestion des documents attachees a une commande fournisseur
+ * \brief Page de gestion des documents attaches a une commande fournisseur
*/
require '../../main.inc.php';
diff --git a/htdocs/fourn/facture/document.php b/htdocs/fourn/facture/document.php
index 12daf37060c..d75b81f402a 100644
--- a/htdocs/fourn/facture/document.php
+++ b/htdocs/fourn/facture/document.php
@@ -21,7 +21,7 @@
/**
* \file htdocs/fourn/facture/document.php
* \ingroup facture, fournisseur
- * \brief Page de gestion des documents attachees a une facture fournisseur
+ * \brief Page de gestion des documents attaches a une facture fournisseur
*/
require '../../main.inc.php';
diff --git a/htdocs/fourn/fiche.php b/htdocs/fourn/fiche.php
index 27beceeb979..9f3b32166dc 100644
--- a/htdocs/fourn/fiche.php
+++ b/htdocs/fourn/fiche.php
@@ -99,8 +99,6 @@ if ($object->fetch($id))
print '';
+
print '
| ';
}
print '|||||||||||||||
';
print '
| '; if ($user->rights->propal->creer && $action == 'refclient') @@ -1639,6 +1630,7 @@ else } print ' | '; print '||||||||||||||
| '.$langs->trans('Company').' | '.$soc->getNomUrl(1).' | '; print '||||||||||||||
| '; - print ''; - print ''; - print ' | |||||||||||||||
| '.img_picto('','edit').' '.$langs->trans('Modify').' | |||||||||||||||
';
+ $newskype.=dol_trunc($skype,$max);
+ $newskype.='';
+
+ if (($cid || $socid) && ! empty($conf->agenda->enabled) && $user->rights->agenda->myactions->create)
+ {
+ $type='AC_SKYPE'; $link='';
+ if (! empty($conf->global->AGENDA_ADDACTIONFORSKYPE)) $link=''.img_object($langs->trans("AddAction"),"calendar").'';
+ $newskype='| '.$newskype.' | '.$link.' |
'; } @@ -230,13 +232,15 @@ function dol_print_object_info($object) print $langs->trans("ModifiedBy").': '; if (is_object($object->user_modification)) { - print $object->user_modification->getNomUrl(1); + if ($object->user_modification->id) print $object->user_modification->getNomUrl(1); + else print $langs->trans("Unknown"); } else { $userstatic=new User($db); $userstatic->fetch($object->user_modification); - print $userstatic->getNomUrl(1); + if ($userstatic->id) print $userstatic->getNomUrl(1); + else print $langs->trans("Unknown"); } print '
'; } @@ -255,13 +259,15 @@ function dol_print_object_info($object) print $langs->trans("ValidatedBy").': '; if (is_object($object->user_validation)) { - print $object->user_validation->getNomUrl(1); + if ($object->user_validation->id) print $object->user_validation->getNomUrl(1); + else print $langs->trans("Unknown"); } else { $userstatic=new User($db); $userstatic->fetch($object->user_validation); - print $userstatic->getNomUrl(1); + if ($userstatic->id) print $userstatic->getNomUrl(1); + else print $langs->trans("Unknown"); } print '
'; } @@ -280,13 +286,15 @@ function dol_print_object_info($object) print $langs->trans("ApprovedBy").': '; if (is_object($object->user_approve)) { - print $object->user_approve->getNomUrl(1); + if ($object->user_approve->id) print $object->user_approve->getNomUrl(1); + else print $langs->trans("Unknown"); } else { $userstatic=new User($db); $userstatic->fetch($object->user_approve); - print $userstatic->getNomUrl(1); + if ($userstatic->id) print $userstatic->getNomUrl(1); + else print $langs->trans("Unknown"); } print '
'; } @@ -305,13 +313,15 @@ function dol_print_object_info($object) print $langs->trans("ClosedBy").': '; if (is_object($object->user_cloture)) { - print $object->user_cloture->getNomUrl(1); + if ($object->user_cloture->id) print $object->user_cloture->getNomUrl(1); + else print $langs->trans("Unknown"); } else { $userstatic=new User($db); $userstatic->fetch($object->user_cloture); - print $userstatic->getNomUrl(1); + if ($userstatic->id) print $userstatic->getNomUrl(1); + else print $langs->trans("Unknown"); } print '
'; } @@ -330,13 +340,15 @@ function dol_print_object_info($object) print $langs->trans("ConciliatedBy").': '; if (is_object($object->user_rappro)) { - print $object->user_rappro->getNomUrl(1); + if ($object->user_rappro->id) print $object->user_rappro->getNomUrl(1); + else print $langs->trans("Unknown"); } else { $userstatic=new User($db); $userstatic->fetch($object->user_rappro); - print $userstatic->getNomUrl(1); + if ($userstatic->id) print $userstatic->getNomUrl(1); + else print $langs->trans("Unknown"); } print '
'; } diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php index 1f8f380e494..5e096760fce 100644 --- a/htdocs/core/lib/project.lib.php +++ b/htdocs/core/lib/project.lib.php @@ -1,28 +1,28 @@ +/* Copyright (C) 2006-2013 Laurent Destailleur
'."\n"; diff --git a/htdocs/fichinter/class/fichinter.class.php b/htdocs/fichinter/class/fichinter.class.php index 2683bea68b8..13a26e857d2 100644 --- a/htdocs/fichinter/class/fichinter.class.php +++ b/htdocs/fichinter/class/fichinter.class.php @@ -607,9 +607,9 @@ class Fichinter extends CommonObject } /** - * Information sur l'objet fiche intervention + * Load information on object * - * @param int $id Id de la fiche d'intervention + * @param int $id Id of object * @return void */ function info($id) @@ -625,13 +625,12 @@ class Fichinter extends CommonObject $sql.= " WHERE f.rowid = ".$id; $sql.= " AND f.entity = ".$conf->entity; - $result = $this->db->query($sql); - - if ($result) + $resql = $this->db->query($sql); + if ($resql) { - if ($this->db->num_rows($result)) + if ($this->db->num_rows($resql)) { - $obj = $this->db->fetch_object($result); + $obj = $this->db->fetch_object($resql); $this->id = $obj->rowid; @@ -649,7 +648,7 @@ class Fichinter extends CommonObject $this->user_validation = $vuser; } } - $this->db->free($result); + $this->db->free($resql); } else { diff --git a/htdocs/fichinter/fiche.php b/htdocs/fichinter/fiche.php index 902db499004..f0f68e093fc 100644 --- a/htdocs/fichinter/fiche.php +++ b/htdocs/fichinter/fiche.php @@ -1,29 +1,29 @@ - * Copyright (C) 2004-2012 Laurent Destailleur
'.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Duration")).'
';
$error++;
}
+ if (GETPOST('durationhour','int') >= 24 && GETPOST('durationmin','int') > 0)
+ {
+ $mesg=''.$langs->trans("ErrorValueTooHigh").'
';
+ $error++;
+ }
if (! $error)
{
$db->begin();
- $ret=$object->fetch($id);
- $object->fetch_thirdparty();
-
$desc=GETPOST('np_desc');
$date_intervention = dol_mktime(GETPOST('dihour','int'), GETPOST('dimin','int'), 0, GETPOST('dimonth','int'), GETPOST('diday','int'), GETPOST('diyear','int'));
$duration = convertTime2Seconds(GETPOST('durationhour','int'), GETPOST('durationmin','int'));
@@ -482,7 +473,6 @@ else if ($action == "addline" && $user->rights->ficheinter->creer)
// Classify Billed
else if ($action == 'classifybilled' && $user->rights->ficheinter->creer)
{
- $object->fetch($id);
$result=$object->setBilled();
if ($result > 0)
{
@@ -582,8 +572,6 @@ else if ($action == 'confirm_deleteline' && $confirm == 'yes' && $user->rights->
else if ($action == 'up' && $user->rights->ficheinter->creer)
{
- $object->fetch($id);
- $object->fetch_thirdparty();
$object->line_up(GETPOST('line_id','int'));
// Define output language
@@ -603,8 +591,6 @@ else if ($action == 'up' && $user->rights->ficheinter->creer)
else if ($action == 'down' && $user->rights->ficheinter->creer)
{
- $object->fetch($id);
- $object->fetch_thirdparty();
$object->line_down(GETPOST('line_id','int'));
// Define output language
@@ -661,159 +647,148 @@ if ($action == 'send' && ! GETPOST('cancel','alpha') && (empty($conf->global->MA
{
$langs->load('mails');
- if ($object->fetch($id) > 0)
+ if (GETPOST('sendto','alpha'))
{
- $object->fetch_thirdparty();
-
- if (GETPOST('sendto','alpha'))
+ // Le destinataire a ete fourni via le champ libre
+ $sendto = GETPOST('sendto','alpha');
+ $sendtoid = 0;
+ }
+ elseif (GETPOST('receiver','alpha') != '-1')
+ {
+ // Recipient was provided from combo list
+ if (GETPOST('receiver','alpha') == 'thirdparty') // Id of third party
{
- // Le destinataire a ete fourni via le champ libre
- $sendto = GETPOST('sendto','alpha');
+ $sendto = $object->client->email;
$sendtoid = 0;
}
- elseif (GETPOST('receiver','alpha') != '-1')
+ else // Id du contact
{
- // Recipient was provided from combo list
- if (GETPOST('receiver','alpha') == 'thirdparty') // Id of third party
+ $sendto = $object->client->contact_get_property(GETPOST('receiver'),'email');
+ $sendtoid = GETPOST('receiver','alpha');
+ }
+ }
+
+ if (dol_strlen($sendto))
+ {
+ $langs->load("commercial");
+
+ $from = GETPOST('fromname','alpha') . ' <' . GETPOST('frommail','alpha') .'>';
+ $replyto = GETPOST('replytoname','alpha'). ' <' . GETPOST('replytomail','alpha').'>';
+ $message = GETPOST('message');
+ $sendtocc = GETPOST('sendtocc','alpha');
+ $deliveryreceipt = GETPOST('deliveryreceipt','alpha');
+
+ if ($action == 'send')
+ {
+ if (strlen(GETPOST('subject','alphs'))) $subject = GETPOST('subject','alpha');
+ else $subject = $langs->transnoentities('Intervention').' '.$object->ref;
+ $actiontypecode='AC_OTH_AUTO';
+ $actionmsg = $langs->transnoentities('MailSentBy').' '.$from.' '.$langs->transnoentities('To').' '.$sendto.".\n";
+ if ($message)
{
- $sendto = $object->client->email;
- $sendtoid = 0;
- }
- else // Id du contact
- {
- $sendto = $object->client->contact_get_property(GETPOST('receiver'),'email');
- $sendtoid = GETPOST('receiver','alpha');
+ $actionmsg.=$langs->transnoentities('MailTopic').": ".$subject."\n";
+ $actionmsg.=$langs->transnoentities('TextUsedInTheMessageBody').":\n";
+ $actionmsg.=$message;
}
+ $actionmsg2=$langs->transnoentities('Action'.$actiontypecode);
}
- if (dol_strlen($sendto))
+ // Create form object
+ include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
+ $formmail = new FormMail($db);
+
+ $attachedfiles=$formmail->get_attached_files();
+ $filepath = $attachedfiles['paths'];
+ $filename = $attachedfiles['names'];
+ $mimetype = $attachedfiles['mimes'];
+
+ // Envoi de la propal
+ require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
+ $mailfile = new CMailFile($subject,$sendto,$from,$message,$filepath,$mimetype,$filename,$sendtocc,'',$deliveryreceipt,-1);
+ if ($mailfile->error)
{
- $langs->load("commercial");
-
- $from = GETPOST('fromname','alpha') . ' <' . GETPOST('frommail','alpha') .'>';
- $replyto = GETPOST('replytoname','alpha'). ' <' . GETPOST('replytomail','alpha').'>';
- $message = GETPOST('message');
- $sendtocc = GETPOST('sendtocc','alpha');
- $deliveryreceipt = GETPOST('deliveryreceipt','alpha');
-
- if ($action == 'send')
+ $mesg=''.$mailfile->error.'
';
+ }
+ else
+ {
+ $result=$mailfile->sendfile();
+ if ($result)
{
- if (strlen(GETPOST('subject','alphs'))) $subject = GETPOST('subject','alpha');
- else $subject = $langs->transnoentities('Intervention').' '.$object->ref;
- $actiontypecode='AC_OTH_AUTO';
- $actionmsg = $langs->transnoentities('MailSentBy').' '.$from.' '.$langs->transnoentities('To').' '.$sendto.".\n";
- if ($message)
- {
- $actionmsg.=$langs->transnoentities('MailTopic').": ".$subject."\n";
- $actionmsg.=$langs->transnoentities('TextUsedInTheMessageBody').":\n";
- $actionmsg.=$message;
+ $mesg=$langs->trans('MailSuccessfulySent',$mailfile->getValidAddress($from,2),$mailfile->getValidAddress($sendto,2));
+ setEventMessage($mesg);
+ $error=0;
+
+ // Initialisation donnees
+ $object->sendtoid = $sendtoid;
+ $object->actiontypecode = $actiontypecode;
+ $object->actionmsg = $actionmsg;
+ $object->actionmsg2 = $actionmsg2;
+ $object->fk_element = $object->id;
+ $object->elementtype = $object->element;
+
+ // Appel des triggers
+ include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
+ $interface=new Interfaces($db);
+ $result=$interface->run_triggers('FICHINTER_SENTBYMAIL',$object,$user,$langs,$conf);
+ if ($result < 0) {
+ $error++; $this->errors=$interface->errors;
}
- $actionmsg2=$langs->transnoentities('Action'.$actiontypecode);
- }
+ // Fin appel triggers
- // Create form object
- include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
- $formmail = new FormMail($db);
-
- $attachedfiles=$formmail->get_attached_files();
- $filepath = $attachedfiles['paths'];
- $filename = $attachedfiles['names'];
- $mimetype = $attachedfiles['mimes'];
-
- // Envoi de la propal
- require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
- $mailfile = new CMailFile($subject,$sendto,$from,$message,$filepath,$mimetype,$filename,$sendtocc,'',$deliveryreceipt,-1);
- if ($mailfile->error)
- {
- $mesg=''.$mailfile->error.'
';
+ if ($error)
+ {
+ dol_print_error($db);
+ }
+ else
+ {
+ // Redirect here
+ // This avoid sending mail twice if going out and then back to page
+ header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
+ exit;
+ }
}
else
{
- $result=$mailfile->sendfile();
- if ($result)
+ $langs->load("other");
+ $mesg='';
+ if ($mailfile->error)
{
- $mesg=$langs->trans('MailSuccessfulySent',$mailfile->getValidAddress($from,2),$mailfile->getValidAddress($sendto,2));
- setEventMessage($mesg);
- $error=0;
-
- // Initialisation donnees
- $object->sendtoid = $sendtoid;
- $object->actiontypecode = $actiontypecode;
- $object->actionmsg = $actionmsg;
- $object->actionmsg2 = $actionmsg2;
- $object->fk_element = $object->id;
- $object->elementtype = $object->element;
-
- // Appel des triggers
- include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
- $interface=new Interfaces($db);
- $result=$interface->run_triggers('FICHINTER_SENTBYMAIL',$object,$user,$langs,$conf);
- if ($result < 0) {
- $error++; $this->errors=$interface->errors;
- }
- // Fin appel triggers
-
- if ($error)
- {
- dol_print_error($db);
- }
- else
- {
- // Redirect here
- // This avoid sending mail twice if going out and then back to page
- header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
- exit;
- }
- }
- else
- {
- $langs->load("other");
- $mesg='
'.$mailfile->error; + } + else + { + $mesg.='No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS'; + } + $mesg.='
';
+ }
+ }
+ }
+ else
+ {
+ $langs->load("other");
+ $mesg='';
- if ($mailfile->error)
- {
- $mesg.=$langs->trans('ErrorFailedToSendMail',$from,$sendto);
- $mesg.='
'.$mailfile->error; - } - else - { - $mesg.='No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS'; - } - $mesg.='
';
- }
- }
- }
- else
- {
- $langs->load("other");
- $mesg=''.$mailfile->error; - } - else - { - $mesg.='No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS'; - } - $mesg.='
'.$langs->trans('ErrorMailRecipientIsEmpty').' !
';
- dol_syslog('Recipient email is empty');
- }
- }
- else
- {
- $langs->load("other");
- $mesg=''.$langs->trans('ErrorFailedToReadEntity',$langs->trans("Intervention")).'
';
- dol_syslog('Impossible de lire les donnees de l\'intervention. Le fichier intervention n\'a peut-etre pas ete genere.');
- }
+ $mesg.=$langs->trans('ErrorFailedToSendMail',$from,$sendto);
+ $mesg.=''.$mailfile->error; + } + else + { + $mesg.='No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS'; + } + $mesg.='
'.$langs->trans('ErrorMailRecipientIsEmpty').' !
';
+ dol_syslog('Recipient email is empty');
+ }
$action='presend';
}
else if ($action == 'update_extras')
{
- $object->fetch($id);
// Fill array 'array_options' with data from update form
$extralabels=$extrafields->fetch_name_optionals_label($object->table_element);
- $ret = $extrafields->setOptionalsFromPost($extralabels,$object);
-
- // Actions on extra fields (by external module or standard code)
- // FIXME le hook fait double emploi avec le trigger !!
- $hookmanager->initHooks(array('interventiondao'));
- $parameters=array('id'=>$object->id);
- $reshook=$hookmanager->executeHooks('insertExtraFields',$parameters,$object,$action); // Note that $action and $object may have been modified by some hooks
- if (empty($reshook))
+ $ret = $extrafields->setOptionalsFromPost($extralabels,$object,GETPOST('attribute'));
+ if ($ret < 0) $error++;
+
+ if (! $error)
{
- if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
+ // Actions on extra fields (by external module or standard code)
+ // FIXME le hook fait double emploi avec le trigger !!
+ $hookmanager->initHooks(array('interventiondao'));
+ $parameters=array('id'=>$object->id);
+ $reshook=$hookmanager->executeHooks('insertExtraFields',$parameters,$object,$action); // Note that $action and $object may have been modified by some hooks
+ if (empty($reshook))
{
$result=$object->insertExtraFields();
if ($result < 0)
@@ -821,16 +796,16 @@ else if ($action == 'update_extras')
$error++;
}
}
+ else if ($reshook < 0) $error++;
}
- else if ($reshook < 0) $error++;
+
+ if ($error) $action = 'edit_extras';
}
if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB) && $user->rights->ficheinter->creer)
{
if ($action == 'addcontact')
{
- $result = $object->fetch($id);
-
if ($result > 0 && $id > 0)
{
$contactid = (GETPOST('userid','int') ? GETPOST('userid','int') : GETPOST('contactid','int'));
@@ -859,20 +834,12 @@ if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB) && $user->rights->ficheint
// bascule du statut d'un contact
else if ($action == 'swapstatut')
{
- if ($object->fetch($id))
- {
- $result=$object->swapContactStatus(GETPOST('ligne','int'));
- }
- else
- {
- dol_print_error($db);
- }
+ $result=$object->swapContactStatus(GETPOST('ligne','int'));
}
// Efface un contact
else if ($action == 'deletecontact')
{
- $object->fetch($id);
$result = $object->delete_contact(GETPOST('lineid','int'));
if ($result >= 0)
@@ -901,8 +868,8 @@ if ($action == 'create')
{
/*
* Mode creation
- * Creation d'une nouvelle fiche d'intervention
- */
+ * Creation d'une nouvelle fiche d'intervention
+ */
$soc=new Societe($db);
@@ -1285,19 +1252,11 @@ else if ($id > 0 || ! empty($ref))
// Statut
print '"; diff --git a/htdocs/fichinter/info.php b/htdocs/fichinter/info.php index 957f4b315ce..b3bc8295d2c 100644 --- a/htdocs/fichinter/info.php +++ b/htdocs/fichinter/info.php @@ -1,6 +1,6 @@ - * Copyright (C) 2009-2010 Laurent Destailleur
| '; -dol_print_object_info($fichinter); +dol_print_object_info($object); print ' |
';
- //print '';
- //print '
";
diff --git a/htdocs/margin/customerMargins.php b/htdocs/margin/customerMargins.php
index d2e1879e51b..2f1ca0f953c 100644
--- a/htdocs/margin/customerMargins.php
+++ b/htdocs/margin/customerMargins.php
@@ -210,7 +210,7 @@ if ($result)
$cumul_achat = 0;
$cumul_vente = 0;
- $cumul_qty = 0;
+
$rounding = min($conf->global->MAIN_MAX_DECIMALS_UNIT,$conf->global->MAIN_MAX_DECIMALS_TOT);
if ($num > 0)
@@ -227,13 +227,13 @@ if ($result)
if ($marge < 0)
{
- $marginRate = ($pa != 0)?-1*(100 * round($marge / $pa, 5)):'' ;
- $markRate = ($pv != 0)?-1*(100 * round($marge / $pv, 5)):'' ;
+ $marginRate = ($pa != 0)?-1*(100 * $marge / $pa):'' ;
+ $markRate = ($pv != 0)?-1*(100 * $marge / $pv):'' ;
}
else
{
- $marginRate = ($pa != 0)?(100 * round($marge / $pa, 5)):'' ;
- $markRate = ($pv != 0)?(100 * round($marge / $pv, 5)):'' ;
+ $marginRate = ($pa != 0)?(100 * $marge / $pa):'' ;
+ $markRate = ($pv != 0)?(100 * $marge / $pv):'' ;
}
$var=!$var;
@@ -255,18 +255,18 @@ if ($result)
print "".$companystatic->getNomUrl(1,'customer')." \n";
}
- print "".price($pv)." \n";
- print "".price($pa)." \n";
- print "".price($marge)." \n";
+ print "".price($pv, null, null, null, null, $rounding)." \n";
+ print "".price($pa, null, null, null, null, $rounding)." \n";
+ print "".price($marge, null, null, null, null, $rounding)." \n";
if (! empty($conf->global->DISPLAY_MARGIN_RATES))
- print "".(($marginRate === '')?'n/a':price($marginRate)."%")." \n";
+ print "".(($marginRate === '')?'n/a':price($marginRate, null, null, null, null, $rounding)."%")." \n";
if (! empty($conf->global->DISPLAY_MARK_RATES))
- print "".(($markRate === '')?'n/a':price($markRate)."%")." \n";
+ print "".(($markRate === '')?'n/a':price($markRate, null, null, null, null, $rounding)."%")." \n";
print "\n";
$i++;
- $cumul_achat += round($objp->buying_price, $rounding);
- $cumul_vente += round($objp->selling_price, $rounding);
+ $cumul_achat += $objp->buying_price;
+ $cumul_vente += $objp->selling_price;
}
}
@@ -275,13 +275,13 @@ if ($result)
$totalMargin = $cumul_vente - $cumul_achat;
if ($totalMargin < 0)
{
- $marginRate = ($cumul_achat != 0)?-1*(100 * round($totalMargin / $cumul_achat, 5)):'';
- $markRate = ($cumul_vente != 0)?-1*(100 * round($totalMargin / $cumul_vente, 5)):'';
+ $marginRate = ($cumul_achat != 0)?-1*(100 * $totalMargin / $cumul_achat):'';
+ $markRate = ($cumul_vente != 0)?-1*(100 * $totalMargin / $cumul_vente):'';
}
else
{
- $marginRate = ($cumul_achat != 0)?(100 * round($totalMargin / $cumul_achat, 5)):'';
- $markRate = ($cumul_vente != 0)?(100 * round($totalMargin / $cumul_vente, 5)):'';
+ $marginRate = ($cumul_achat != 0)?(100 * $totalMargin / $cumul_achat):'';
+ $markRate = ($cumul_vente != 0)?(100 * $totalMargin / $cumul_vente):'';
}
print '';
@@ -290,13 +290,13 @@ if ($result)
else
print '';
print $langs->trans('TotalMargin')." ";
- print "".price($cumul_vente)." \n";
- print "".price($cumul_achat)." \n";
- print "".price($totalMargin)." \n";
+ print "".price($cumul_vente, null, null, null, null, $rounding)." \n";
+ print "".price($cumul_achat, null, null, null, null, $rounding)." \n";
+ print "".price($totalMargin, null, null, null, null, $rounding)." \n";
if (! empty($conf->global->DISPLAY_MARGIN_RATES))
- print "".(($marginRate === '')?'n/a':price($marginRate)."%")." \n";
+ print "".(($marginRate === '')?'n/a':price($marginRate, null, null, null, null, $rounding)."%")." \n";
if (! empty($conf->global->DISPLAY_MARK_RATES))
- print "".(($markRate === '')?'n/a':price($markRate)."%")." \n";
+ print "".(($markRate === '')?'n/a':price($markRate, null, null, null, null, $rounding)."%")." \n";
print " \n";
print "";
@@ -322,9 +322,9 @@ $(document).ready(function() {
$("div.fiche form").submit();
});
- $("#totalMargin").html("");
- $("#marginRate").html("");
- $("#markRate").html("");
+ $("#totalMargin").html("");
+ $("#marginRate").html("");
+ $("#markRate").html("");
});
diff --git a/htdocs/margin/lib/margins.lib.php b/htdocs/margin/lib/margins.lib.php
index bfa5d530e29..6d1ded03419 100644
--- a/htdocs/margin/lib/margins.lib.php
+++ b/htdocs/margin/lib/margins.lib.php
@@ -125,10 +125,10 @@ function getMarginInfos($pvht, $remise_percent, $tva_tx, $localtax1_tx, $localta
// calcul taux marge
if ($paht_ret != 0)
- $marge_tx_ret = round((100 * $marge) / $paht_ret, 3);
+ $marge_tx_ret = (100 * $marge) / $paht_ret;
// calcul taux marque
if ($pu_ht_remise != 0)
- $marque_tx_ret = round((100 * $marge) / $pu_ht_remise, 3);
+ $marque_tx_ret = (100 * $marge) / $pu_ht_remise;
return array($paht_ret, $marge_tx_ret, $marque_tx_ret);
}
diff --git a/htdocs/margin/productMargins.php b/htdocs/margin/productMargins.php
index 7998db35efd..50d30a217f0 100644
--- a/htdocs/margin/productMargins.php
+++ b/htdocs/margin/productMargins.php
@@ -215,7 +215,6 @@ if ($result)
$cumul_achat = 0;
$cumul_vente = 0;
- $cumul_qty = 0;
$rounding = min($conf->global->MAIN_MAX_DECIMALS_UNIT,$conf->global->MAIN_MAX_DECIMALS_TOT);
if ($num > 0)
@@ -231,13 +230,13 @@ if ($result)
if ($marge < 0)
{
- $marginRate = ($pa != 0)?-1*(100 * round($marge / $pa, 5)):'' ;
- $markRate = ($pv != 0)?-1*(100 * round($marge / $pv, 5)):'' ;
+ $marginRate = ($pa != 0)?-1*(100 * $marge / $pa):'' ;
+ $markRate = ($pv != 0)?-1*(100 * $marge / $pv):'' ;
}
else
{
- $marginRate = ($pa != 0)?(100 * round($marge / $pa, 5)):'' ;
- $markRate = ($pv != 0)?(100 * round($marge / $pv, 5)):'' ;
+ $marginRate = ($pa != 0)?(100 * $marge / $pa):'' ;
+ $markRate = ($pv != 0)?(100 * $marge / $pv):'' ;
}
$var=!$var;
@@ -261,18 +260,18 @@ if ($result)
$text.= ' - '.$objp->label;
print "".$product_static->getNomUrl(1)." \n";
}
- print "".price($pv)." \n";
- print "".price($pa)." \n";
- print "".price($marge)." \n";
+ print "".price($pv, null, null, null, null, $rounding)." \n";
+ print "".price($pa, null, null, null, null, $rounding)." \n";
+ print "".price($marge, null, null, null, null, $rounding)." \n";
if (! empty($conf->global->DISPLAY_MARGIN_RATES))
- print "".(($marginRate === '')?'n/a':price($marginRate)."%")." \n";
+ print "".(($marginRate === '')?'n/a':price($marginRate, null, null, null, null, $rounding)."%")." \n";
if (! empty($conf->global->DISPLAY_MARK_RATES))
- print "".(($markRate === '')?'n/a':price($markRate)."%")." \n";
+ print "".(($markRate === '')?'n/a':price($markRate, null, null, null, null, $rounding)."%")." \n";
print "\n";
$i++;
- $cumul_achat += round($objp->buying_price, $rounding);
- $cumul_vente += round($objp->selling_price, $rounding);
+ $cumul_achat += $objp->buying_price;
+ $cumul_vente += $objp->selling_price;
}
}
@@ -282,13 +281,13 @@ if ($result)
$totalMargin = $cumul_vente - $cumul_achat;
if ($totalMargin < 0)
{
- $marginRate = ($cumul_achat != 0)?-1*(100 * round($totalMargin / $cumul_achat, 5)):'';
- $markRate = ($cumul_vente != 0)?-1*(100 * round($totalMargin / $cumul_vente, 5)):'';
+ $marginRate = ($cumul_achat != 0)?-1*(100 * $totalMargin / $cumul_achat):'';
+ $markRate = ($cumul_vente != 0)?-1*(100 * $totalMargin / $cumul_vente):'';
}
else
{
- $marginRate = ($cumul_achat != 0)?(100 * round($totalMargin / $cumul_achat, 5)):'';
- $markRate = ($cumul_vente != 0)?(100 * round($totalMargin / $cumul_vente, 5)):'';
+ $marginRate = ($cumul_achat != 0)?(100 * $totalMargin / $cumul_achat):'';
+ $markRate = ($cumul_vente != 0)?(100 * $totalMargin / $cumul_vente):'';
}
print '';
if ($id > 0)
@@ -296,13 +295,13 @@ if ($result)
else
print '';
print $langs->trans('TotalMargin')." ";
- print "".price($cumul_vente)." \n";
- print "".price($cumul_achat)." \n";
- print "".price($totalMargin)." \n";
+ print "".price($cumul_vente, null, null, null, null, $rounding)." \n";
+ print "".price($cumul_achat, null, null, null, null, $rounding)." \n";
+ print "".price($totalMargin, null, null, null, null, $rounding)." \n";
if (! empty($conf->global->DISPLAY_MARGIN_RATES))
- print "".(($marginRate === '')?'n/a':price($marginRate)."%")." \n";
+ print "".(($marginRate === '')?'n/a':price($marginRate, null, null, null, null, $rounding)."%")." \n";
if (! empty($conf->global->DISPLAY_MARK_RATES))
- print "".(($markRate === '')?'n/a':price($markRate)."%")." \n";
+ print "".(($markRate === '')?'n/a':price($markRate, null, null, null, null, $rounding)."%")." \n";
print " \n";
print "";
@@ -330,9 +329,9 @@ $(document).ready(function() {
$("div.fiche form").submit();
});
- $("#totalMargin").html("");
- $("#marginRate").html("");
- $("#markRate").html("");
+ $("#totalMargin").html("");
+ $("#marginRate").html("");
+ $("#markRate").html("");
});
diff --git a/htdocs/margin/tabs/productMargins.php b/htdocs/margin/tabs/productMargins.php
index 9b31514c7c9..214cf72b86a 100644
--- a/htdocs/margin/tabs/productMargins.php
+++ b/htdocs/margin/tabs/productMargins.php
@@ -196,13 +196,13 @@ if ($id > 0 || ! empty($ref))
if ($objp->marge < 0)
{
- $marginRate = ($objp->buying_price != 0)?-1*(100 * round($objp->marge / $objp->buying_price, 5)):'' ;
- $markRate = ($objp->selling_price != 0)?-1*(100 * round($objp->marge / $objp->selling_price, 5)):'' ;
+ $marginRate = ($objp->buying_price != 0)?-1*(100 * $objp->marge / $objp->buying_price):'' ;
+ $markRate = ($objp->selling_price != 0)?-1*(100 * $objp->marge / $objp->selling_price):'' ;
}
else
{
- $marginRate = ($objp->buying_price != 0)?(100 * round($objp->marge / $objp->buying_price, 5)):'' ;
- $markRate = ($objp->selling_price != 0)?(100 * round($objp->marge / $objp->selling_price, 5)):'' ;
+ $marginRate = ($objp->buying_price != 0)?(100 * $objp->marge / $objp->buying_price):'' ;
+ $markRate = ($objp->selling_price != 0)?(100 * $objp->marge / $objp->selling_price):'' ;
}
print "";
@@ -215,19 +215,19 @@ if ($id > 0 || ! empty($ref))
print "".$objp->code_client." \n";
print "";
print dol_print_date($db->jdate($objp->datef),'day')." ";
- print "".price($objp->selling_price)." \n";
- print "".price($objp->buying_price)." \n";
- print "".price($objp->qty)." \n";
- print "".price($objp->marge)." \n";
+ print "".price($objp->selling_price, null, null, null, null, $rounding)." \n";
+ print "".price($objp->buying_price, null, null, null, null, $rounding)." \n";
+ print "".price($objp->qty, null, null, null, null, $rounding)." \n";
+ print "".price($objp->marge, null, null, null, null, $rounding)." \n";
if (! empty($conf->global->DISPLAY_MARGIN_RATES))
- print "".(($marginRate === '')?'n/a':price($marginRate)."%")." \n";
+ print "".(($marginRate === '')?'n/a':price($marginRate, null, null, null, null, $rounding)."%")." \n";
if (! empty($conf->global->DISPLAY_MARK_RATES))
- print "".(($markRate === '')?'n/a':price($markRate)."%")." \n";
+ print "".(($markRate === '')?'n/a':price($markRate, null, null, null, null, $rounding)."%")." \n";
print ''.$invoicestatic->LibStatut($objp->paye,$objp->statut,5).' ';
print " \n";
$i++;
- $cumul_achat += round($objp->buying_price, $rounding);
- $cumul_vente += round($objp->selling_price, $rounding);
+ $cumul_achat += $objp->buying_price;
+ $cumul_vente += $objp->selling_price;
$cumul_qty += $objp->qty;
}
}
@@ -237,24 +237,24 @@ if ($id > 0 || ! empty($ref))
$totalMargin = $cumul_vente - $cumul_achat;
if ($totalMargin < 0)
{
- $marginRate = ($cumul_achat != 0)?-1*(100 * round($totalMargin / $cumul_achat, 5)):'';
- $markRate = ($cumul_vente != 0)?-1*(100 * round($totalMargin / $cumul_vente, 5)):'';
+ $marginRate = ($cumul_achat != 0)?-1*(100 * $totalMargin / $cumul_achat):'';
+ $markRate = ($cumul_vente != 0)?-1*(100 * $totalMargin / $cumul_vente):'';
}
else
{
- $marginRate = ($cumul_achat != 0)?(100 * round($totalMargin / $cumul_achat, 5)):'';
- $markRate = ($cumul_vente != 0)?(100 * round($totalMargin / $cumul_vente, 5)):'';
+ $marginRate = ($cumul_achat != 0)?(100 * $totalMargin / $cumul_achat):'';
+ $markRate = ($cumul_vente != 0)?(100 * $totalMargin / $cumul_vente):'';
}
print '';
print ''.$langs->trans('TotalMargin')." ";
- print "".price($cumul_vente)." \n";
- print "".price($cumul_achat)." \n";
- print "".price($cumul_qty)." \n";
- print "".price($totalMargin)." \n";
+ print "".price($cumul_vente, null, null, null, null, $rounding)." \n";
+ print "".price($cumul_achat, null, null, null, null, $rounding)." \n";
+ print "".price($cumul_qty, null, null, null, null, $rounding)." \n";
+ print "".price($totalMargin, null, null, null, null, $rounding)." \n";
if (! empty($conf->global->DISPLAY_MARGIN_RATES))
- print "".(($marginRate === '')?'n/a':price($marginRate)."%")." \n";
+ print "".(($marginRate === '')?'n/a':price($marginRate, null, null, null, null, $rounding)."%")." \n";
if (! empty($conf->global->DISPLAY_MARK_RATES))
- print "".(($markRate === '')?'n/a':price($markRate)."%")." \n";
+ print "".(($markRate === '')?'n/a':price($markRate, null, null, null, null, $rounding)."%")." \n";
print ' ';
print " \n";
}
@@ -278,8 +278,8 @@ $db->close();
?>
diff --git a/htdocs/margin/tabs/thirdpartyMargins.php b/htdocs/margin/tabs/thirdpartyMargins.php
index 832f145bfae..d33911f56e5 100644
--- a/htdocs/margin/tabs/thirdpartyMargins.php
+++ b/htdocs/margin/tabs/thirdpartyMargins.php
@@ -175,7 +175,7 @@ if ($socid > 0)
$cumul_achat = 0;
$cumul_vente = 0;
- $cumul_qty = 0;
+
$rounding = min($conf->global->MAIN_MAX_DECIMALS_UNIT,$conf->global->MAIN_MAX_DECIMALS_TOT);
if ($num > 0)
@@ -187,13 +187,13 @@ if ($socid > 0)
if ($objp->marge < 0)
{
- $marginRate = ($objp->buying_price != 0)?-1*(100 * round($objp->marge / $objp->buying_price, 5)):'' ;
- $markRate = ($objp->selling_price != 0)?-1*(100 * round($objp->marge / $objp->selling_price, 5)):'' ;
+ $marginRate = ($objp->buying_price != 0)?-1*(100 * $objp->marge / $objp->buying_price):'' ;
+ $markRate = ($objp->selling_price != 0)?-1*(100 * $objp->marge / $objp->selling_price):'' ;
}
else
{
- $marginRate = ($objp->buying_price != 0)?(100 * round($objp->marge / $objp->buying_price, 5)):'' ;
- $markRate = ($objp->selling_price != 0)?(100 * round($objp->marge / $objp->selling_price, 5)):'' ;
+ $marginRate = ($objp->buying_price != 0)?(100 * $objp->marge / $objp->buying_price):'' ;
+ $markRate = ($objp->selling_price != 0)?(100 * $objp->marge / $objp->selling_price):'' ;
}
$var=!$var;
@@ -206,18 +206,18 @@ if ($socid > 0)
print "\n";
print "";
print dol_print_date($db->jdate($objp->datef),'day')." ";
- print "".price($objp->selling_price)." \n";
- print "".price($objp->buying_price)." \n";
- print "".price($objp->marge)." \n";
+ print "".price($objp->selling_price, null, null, null, null, $rounding)." \n";
+ print "".price($objp->buying_price, null, null, null, null, $rounding)." \n";
+ print "".price($objp->marge, null, null, null, null, $rounding)." \n";
if (! empty($conf->global->DISPLAY_MARGIN_RATES))
- print "".(($marginRate === '')?'n/a':price($marginRate)."%")." \n";
+ print "".(($marginRate === '')?'n/a':price($marginRate, null, null, null, null, $rounding)."%")." \n";
if (! empty($conf->global->DISPLAY_MARK_RATES))
- print "".(($markRate === '')?'n/a':price($markRate)."%")." \n";
+ print "".(($markRate === '')?'n/a':price($markRate, null, null, null, null, $rounding)."%")." \n";
print ''.$invoicestatic->LibStatut($objp->paye,$objp->statut,5).' ';
print "\n";
$i++;
- $cumul_achat += round($objp->buying_price, $rounding);
- $cumul_vente += round($objp->selling_price, $rounding);
+ $cumul_achat += $objp->buying_price;
+ $cumul_vente += $objp->selling_price;
}
}
@@ -226,23 +226,23 @@ if ($socid > 0)
$totalMargin = $cumul_vente - $cumul_achat;
if ($totalMargin < 0)
{
- $marginRate = ($cumul_achat != 0)?-1*(100 * round($totalMargin / $cumul_achat, 5)):'';
- $markRate = ($cumul_vente != 0)?-1*(100 * round($totalMargin / $cumul_vente, 5)):'';
+ $marginRate = ($cumul_achat != 0)?-1*(100 * $totalMargin / $cumul_achat):'';
+ $markRate = ($cumul_vente != 0)?-1*(100 * $totalMargin / $cumul_vente):'';
}
else
{
- $marginRate = ($cumul_achat != 0)?(100 * round($totalMargin / $cumul_achat, 5)):'';
- $markRate = ($cumul_vente != 0)?(100 * round($totalMargin / $cumul_vente, 5)):'';
+ $marginRate = ($cumul_achat != 0)?(100 * $totalMargin / $cumul_achat):'';
+ $markRate = ($cumul_vente != 0)?(100 * $totalMargin / $cumul_vente):'';
}
print '';
print ''.$langs->trans('TotalMargin')." ";
- print "".price($cumul_vente)." \n";
- print "".price($cumul_achat)." \n";
- print "".price($totalMargin)." \n";
+ print "".price($cumul_vente, null, null, null, null, $rounding)." \n";
+ print "".price($cumul_achat, null, null, null, null, $rounding)." \n";
+ print "".price($totalMargin, null, null, null, null, $rounding)." \n";
if (! empty($conf->global->DISPLAY_MARGIN_RATES))
- print "".(($marginRate === '')?'n/a':price($marginRate)."%")." \n";
+ print "".(($marginRate === '')?'n/a':price($marginRate, null, null, null, null, $rounding)."%")." \n";
if (! empty($conf->global->DISPLAY_MARK_RATES))
- print "".(($markRate === '')?'n/a':price($markRate)."%")." \n";
+ print "".(($markRate === '')?'n/a':price($markRate, null, null, null, null, $rounding)."%")." \n";
print ' ';
print " \n";
}
diff --git a/htdocs/product/document.php b/htdocs/product/document.php
index 0adff43ac47..22de2273820 100644
--- a/htdocs/product/document.php
+++ b/htdocs/product/document.php
@@ -4,6 +4,7 @@
* Copyright (C) 2005 Marc Barilley / Ocebo
* Copyright (C) 2005-2012 Regis Houssin
* Copyright (C) 2005 Simon TOSSER
+ * Copyright (C) 2013 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
@@ -46,6 +47,9 @@ $fieldtype = (! empty($ref) ? 'ref' : 'rowid');
if ($user->societe_id) $socid=$user->societe_id;
$result=restrictedArea($user,'produit|service',$fieldvalue,'product&product','','',$fieldtype);
+// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+$hookmanager->initHooks(array('productdocuments'));
+
// Get parameters
$sortfield = GETPOST("sortfield",'alpha');
$sortorder = GETPOST("sortorder",'alpha');
@@ -68,6 +72,10 @@ if ($id > 0 || ! empty($ref))
}
$modulepart='produit';
+$parameters=array('id'=>$id);
+$reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action); // Note that $action and $object may have been modified by some hooks
+
+
/*
* Action envoie fichier
*/
@@ -106,6 +114,8 @@ if ($object->id)
$picto=($object->type==1?'service':'product');
dol_fiche_head($head, 'documents', $titre, 0, $picto);
+ $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook
+
// Construit liste des fichiers
$filearray=dol_dir_list($upload_dir,"files",0,'','\.meta$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
diff --git a/htdocs/projet/activity/list.php b/htdocs/projet/activity/list.php
index 5d5eacfcbda..e9cb8568b65 100644
--- a/htdocs/projet/activity/list.php
+++ b/htdocs/projet/activity/list.php
@@ -1,6 +1,6 @@
- * Copyright (C) 2004-2012 Laurent Destailleur
+ * Copyright (C) 2004-2013 Laurent Destailleur
* Copyright (C) 2005-2010 Regis Houssin
* Copyright (C) 2010 François Legastelois
*
@@ -56,35 +56,42 @@ if ($action == 'addtime' && $user->rights->projet->creer)
{
$task = new Task($db);
- $timespent_duration=0;
+ $timespent_duration=array();
foreach($_POST as $key => $time)
{
- if(intval($time)>0)
+ if (intval($time) > 0)
{
// Hours or minutes
- if(preg_match("/([0-9]+)(hour|min)/",$key,$matches))
+ if (preg_match("/([0-9]+)(hour|min)/",$key,$matches))
{
$id = $matches[1];
-
- // We store HOURS in seconds
- if($matches[2]=='hour') $timespent_duration += $time*60*60;
-
- // We store MINUTES in seconds
- if($matches[2]=='min') $timespent_duration += $time*60;
+ if ($id > 0)
+ {
+ // We store HOURS in seconds
+ if($matches[2]=='hour') $timespent_duration[$id] += $time*60*60;
+
+ // We store MINUTES in seconds
+ if($matches[2]=='min') $timespent_duration[$id] += $time*60;
+ }
}
}
}
- if ($timespent_duration > 0)
+ if (count($timespent_duration) > 0)
{
- $task->fetch($id);
- $task->timespent_duration = $timespent_duration;
- $task->timespent_fk_user = $user->id;
- $task->timespent_date = dol_mktime(12,0,0,$_POST["{$id}month"],$_POST["{$id}day"],$_POST["{$id}year"]);
- $task->addTimeSpent($user);
-
- // header to avoid submit twice on back
+ foreach($timespent_duration as $key => $val)
+ {
+ $task->fetch($key);
+ $task->timespent_duration = $val;
+ $task->timespent_fk_user = $user->id;
+ $task->timespent_date = dol_mktime(12,0,0,$_POST["{$key}month"],$_POST["{$key}day"],$_POST["{$key}year"]);
+ $task->addTimeSpent($user);
+ }
+
+ setEventMessage($langs->trans("RecordSaved"));
+
+ // Redirect to avoid submit twice on back
header('Location: '.$_SERVER["PHP_SELF"].'?id='.$projectid.($mode?'&mode='.$mode:''));
exit;
}
@@ -144,6 +151,7 @@ print ''.$langs->trans("RefTask").' ';
print ''.$langs->trans("LabelTask").' ';
print ''.$langs->trans("DateStart").' ';
print ''.$langs->trans("DateEnd").' ';
+print ''.$langs->trans("PlannedWorkload").' ';
print ''.$langs->trans("Progress").' ';
print ''.$langs->trans("TimeSpent").' ';
print ''.$langs->trans("AddDuration").' ';
diff --git a/htdocs/societe/ajaxcompanies.php b/htdocs/societe/ajaxcompanies.php
index 981a9c7d40f..32fbe2e2c00 100644
--- a/htdocs/societe/ajaxcompanies.php
+++ b/htdocs/societe/ajaxcompanies.php
@@ -66,7 +66,7 @@ if (GETPOST('newcompany') || GETPOST('socid','int') || GETPOST('id_fourn'))
{
$sql.=" AND (";
// Add criteria on name/code
- if (! empty($conf->global->SOCIETE_DONOTSEARCH_ANYWHERE)) // Can use index
+ if (! empty($conf->global->COMPANY_DONOTSEARCH_ANYWHERE)) // Can use index
{
$sql.="nom LIKE '" . $db->escape($socid) . "%'";
$sql.=" OR code_client LIKE '" . $db->escape($socid) . "%'";
diff --git a/htdocs/societe/canvas/actions_card_common.class.php b/htdocs/societe/canvas/actions_card_common.class.php
index 89776835e2a..7bc1ac8fef1 100644
--- a/htdocs/societe/canvas/actions_card_common.class.php
+++ b/htdocs/societe/canvas/actions_card_common.class.php
@@ -618,7 +618,7 @@ abstract class ActionsCardCommon
}
else
{
- $this->tpl['linked_member'] = $langs->trans("UserNotLinkedToMember");
+ $this->tpl['linked_member'] = $langs->trans("ThirdpartyNotLinkedToMember");
}
}
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 162550a162b..a7d4ce2e850 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -8,6 +8,7 @@
* Copyright (C) 2008 Patrick Raguin
* Copyright (C) 2010-2011 Juanjo Menent
* Copyright (C) 2013 Florian Henry
+ * Copyright (C) 2013 Alexandre Spangaro
*
* 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
@@ -68,6 +69,7 @@ class Societe extends CommonObject
var $phone;
var $fax;
var $email;
+ var $skype;
var $url;
//! barcode
@@ -410,6 +412,7 @@ class Societe extends CommonObject
$this->fax = preg_replace("/\s/","",$this->fax);
$this->fax = preg_replace("/\./","",$this->fax);
$this->email = trim($this->email);
+ $this->skype = trim($this->skype);
$this->url = $this->url?clean_url($this->url,0):'';
$this->idprof1 = trim($this->idprof1);
$this->idprof2 = trim($this->idprof2);
@@ -508,6 +511,7 @@ class Societe extends CommonObject
$sql .= ",phone = ".(! empty($this->phone)?"'".$this->db->escape($this->phone)."'":"null");
$sql .= ",fax = ".(! empty($this->fax)?"'".$this->db->escape($this->fax)."'":"null");
$sql .= ",email = ".(! empty($this->email)?"'".$this->db->escape($this->email)."'":"null");
+ $sql .= ",skype = ".(! empty($this->skype)?"'".$this->db->escape($this->skype)."'":"null");
$sql .= ",url = ".(! empty($this->url)?"'".$this->db->escape($this->url)."'":"null");
$sql .= ",siren = '". $this->db->escape($this->idprof1) ."'";
@@ -590,6 +594,7 @@ class Societe extends CommonObject
//$lmember->lastname=$this->lastname?$this->lastname:$lmember->lastname; // We keep firstname and lastname of member unchanged
$lmember->address=$this->address;
$lmember->email=$this->email;
+ $lmember->skype=$this->skype;
$lmember->phone=$this->phone;
$result=$lmember->update($user,0,1,1,1); // Use nosync to 1 to avoid cyclic updates
@@ -699,7 +704,7 @@ class Societe extends CommonObject
$sql .= ', s.status';
$sql .= ', s.price_level';
$sql .= ', s.tms as date_update';
- $sql .= ', s.phone, s.fax, s.email, s.url, s.zip, s.town, s.note_private, s.note_public, s.client, s.fournisseur';
+ $sql .= ', s.phone, s.fax, s.email, s.skype, s.url, s.zip, s.town, s.note_private, s.note_public, s.client, s.fournisseur';
$sql .= ', s.siren as idprof1, s.siret as idprof2, s.ape as idprof3, s.idprof4, s.idprof5, s.idprof6';
$sql .= ', s.capital, s.tva_intra';
$sql .= ', s.fk_typent as typent_id';
@@ -777,6 +782,7 @@ class Societe extends CommonObject
$this->statut_commercial = $libelle; // libelle statut commercial
$this->email = $obj->email;
+ $this->skype = $obj->skype;
$this->url = $obj->url;
$this->phone = $obj->phone;
$this->fax = $obj->fax;
@@ -1518,22 +1524,22 @@ class Societe extends CommonObject
}
if ($mode == 2)
{
- if ($statut==0) return img_picto($langs->trans("ActivityCeased"),'statut6').' '.$langs->trans("ActivityCeased");
+ if ($statut==0) return img_picto($langs->trans("ActivityCeased"),'statut5').' '.$langs->trans("ActivityCeased");
if ($statut==1) return img_picto($langs->trans("InActivity"),'statut4').' '.$langs->trans("InActivity");
}
if ($mode == 3)
{
- if ($statut==0) return img_picto($langs->trans("ActivityCeased"),'statut6');
+ if ($statut==0) return img_picto($langs->trans("ActivityCeased"),'statut5');
if ($statut==1) return img_picto($langs->trans("InActivity"),'statut4');
}
if ($mode == 4)
{
- if ($statut==0) return img_picto($langs->trans("ActivityCeased"),'statut6').' '.$langs->trans("ActivityCeased");
+ if ($statut==0) return img_picto($langs->trans("ActivityCeased"),'statut5').' '.$langs->trans("ActivityCeased");
if ($statut==1) return img_picto($langs->trans("InActivity"),'statut4').' '.$langs->trans("InActivity");
}
if ($mode == 5)
{
- if ($statut==0) return $langs->trans("ActivityCeased").' '.img_picto($langs->trans("ActivityCeased"),'statut6');
+ if ($statut==0) return $langs->trans("ActivityCeased").' '.img_picto($langs->trans("ActivityCeased"),'statut5');
if ($statut==1) return $langs->trans("InActivity").' '.img_picto($langs->trans("InActivity"),'statut4');
}
}
@@ -2409,6 +2415,7 @@ class Societe extends CommonObject
$this->country_id=$member->country_id;
$this->phone=$member->phone; // Prof phone
$this->email=$member->email;
+ $this->skype=$member->skype;
$this->client = 1; // A member is a customer by default
$this->code_client = -1;
@@ -2548,6 +2555,7 @@ class Societe extends CommonObject
$this->country_id=1;
$this->country_code='FR';
$this->email='specimen@specimen.com';
+ $this->skype='tom.hanson';
$this->url='http://www.specimen.com';
$this->phone='0909090901';
diff --git a/htdocs/societe/commerciaux.php b/htdocs/societe/commerciaux.php
index 4e970dffc17..b099da89afe 100644
--- a/htdocs/societe/commerciaux.php
+++ b/htdocs/societe/commerciaux.php
@@ -168,7 +168,7 @@ if ($_GET["socid"])
$sql .= " WHERE sc.fk_soc =".$soc->id;
$sql .= " AND sc.fk_user = u.rowid";
$sql .= " ORDER BY u.lastname ASC ";
-
+ dol_syslog('societe/commerciaux.php::list salesman sql = '.$sql,LOG_DEBUG);
$resql = $db->query($sql);
if ($resql)
{
@@ -227,6 +227,7 @@ if ($_GET["socid"])
$sql = "SELECT u.rowid, u.lastname, u.firstname, u.login";
$sql.= " FROM ".MAIN_DB_PREFIX."user as u";
$sql.= " WHERE u.entity IN (0,".$conf->entity.")";
+ if (! empty($conf->global->USER_HIDE_INACTIVE_IN_COMBOBOX)) $sql.= " AND u.statut<>0 ";
$sql.= " ORDER BY u.lastname ASC ";
$resql = $db->query($sql);
diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php
index fb273b79ab3..9001894c149 100644
--- a/htdocs/societe/soc.php
+++ b/htdocs/societe/soc.php
@@ -4,8 +4,10 @@
* Copyright (C) 2004-2013 Laurent Destailleur
* Copyright (C) 2005 Eric Seigne
* Copyright (C) 2005-2012 Regis Houssin
- * Copyright (C) 2008 Patrick Raguin
+ * Copyright (C) 2008 Patrick Raguin
* Copyright (C) 2010-2013 Juanjo Menent
+ * Copyright (C) 2011-2013 Alexandre Spangaro
+ *
*
* 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
@@ -130,6 +132,7 @@ if (empty($reshook))
$object->town = GETPOST('town');
$object->country_id = GETPOST('country_id');
$object->state_id = GETPOST('state_id');
+ $object->skype = GETPOST('skype');
$object->phone = GETPOST('phone');
$object->fax = GETPOST('fax');
$object->email = GETPOST('email');
@@ -254,7 +257,7 @@ if (empty($reshook))
dol_syslog("This thirdparty is a personal people",LOG_DEBUG);
$contact=new Contact($db);
- $contact->civilite_id = $object->civilite_id;
+ $contact->civilite_id = $object->civilite_id;
$contact->name = $object->name_bis;
$contact->firstname = $object->firstname;
$contact->address = $object->address;
@@ -265,8 +268,9 @@ if (empty($reshook))
$contact->socid = $object->id; // fk_soc
$contact->status = 1;
$contact->email = $object->email;
- $contact->phone_pro = $object->phone;
- $contact->fax = $object->fax;
+ $contact->skype = $object->skype;
+ $contact->phone_pro = $object->phone;
+ $contact->fax = $object->fax;
$contact->priv = 0;
$result=$contact->create($user);
@@ -598,6 +602,7 @@ else
$object->zip = GETPOST('zipcode');
$object->town = GETPOST('town');
$object->state_id = GETPOST('state_id');
+ $object->skype = GETPOST('skype');
$object->phone = GETPOST('phone');
$object->fax = GETPOST('fax');
$object->email = GETPOST('email');
@@ -845,6 +850,12 @@ else
print ''.$langs->trans('EMail').(! empty($conf->global->SOCIETE_MAIL_REQUIRED)?'*':'').' '.$langs->trans('Web').' '.$langs->trans('Skype').' '.$langs->trans('Phone').' '.$langs->trans('Fax').' '.$langs->trans('EMail').(! empty($conf->global->SOCIETE_MAIL_REQUIRED)?'*':'').' '.$langs->trans('Web').' '.$langs->trans('Skype').' '.$langs->trans('Phone').' '.$langs->trans('Fax').' '.$langs->trans('Web').' ';
print dol_print_url($object->url);
print ' '.$langs->trans('Skype').' ';
+ print dol_print_skype($object->skype,0,$object->id,'AC_SKYPE');
+ print ' '.$langs->trans('Phone').' '.dol_print_phone($object->phone,$object->country_code,0,$object->id,'AC_TEL').' ';
@@ -1767,7 +1793,7 @@ else
}
else
{
- print $langs->trans("UserNotLinkedToMember");
+ print $langs->trans("ThirdpartyNotLinkedToMember");
}
print '';
print "
';
print '
Също така, ако имате голям брой трети страни (> 100 000), можете да увеличите скоростта чрез създаване на постоянна SOCIETE_DONOTSEARCH_ANYWHERE 1 в Setup->. Търсене след това ще бъдат ограничени до началото на низ. +UseSearchToSelectCompany=Използвайте Автоматично завършване на полета, за да изберете трети страни (вместо да използвате списъчно поле). Също така, ако имате голям брой трети страни (> 100 000), можете да увеличите скоростта чрез създаване на постоянна COMPANY_DONOTSEARCH_ANYWHERE 1 в Setup->. Търсене след това ще бъдат ограничени до началото на низ. ActivityStateToSelectCompany= Добавяне на филтър опция за показване / скриване на thirdparties, които в момента са в дейност или е престанала # UseSearchToSelectContact=Use autocompletion fields to choose contact (instead of using a list box). Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string. SearchFilter=Филтрите за търсене опции diff --git a/htdocs/langs/ca_ES/admin.lang b/htdocs/langs/ca_ES/admin.lang index 856995336a3..afe3157eb13 100644 --- a/htdocs/langs/ca_ES/admin.lang +++ b/htdocs/langs/ca_ES/admin.lang @@ -49,7 +49,7 @@ ErrorReservedTypeSystemSystemAuto=L'ús del tipus 'system' i 'systemauto' està ErrorCodeCantContainZero=El codi no pot contenir el valor 0 DisableJavascript=Desactivar les funcions Javascript ConfirmAjax=Utilitzar els popups de confirmació Ajax -UseSearchToSelectCompany=Utilitzar un formulari de cerca per buscar tercers (en comptes de llista desplegable) Tingueu en compte que si té un gran nombre de productes o serveis (> 100 000), pot millorar el rendiment mitjançant la constant SOCIETE_DONOTSEARCH_ANYWHERE a 1 a Configuració-> Varis. La recerca es limitarà llavors a l'inici de la cadena. +UseSearchToSelectCompany=Utilitzar un formulari de cerca per buscar tercers (en comptes de llista desplegable) Tingueu en compte que si té un gran nombre de productes o serveis (> 100 000), pot millorar el rendiment mitjançant la constant COMPANY_DONOTSEARCH_ANYWHERE a 1 a Configuració-> Varis. La recerca es limitarà llavors a l'inici de la cadena. ActivityStateToSelectCompany= Afegir un filtre en la recerca per mostrar/ocultar els tercers en actiu o que hagin deixat d'exercir UseSearchToSelectContact=Utilitzar un formulari de cerca (en lloc d'una llista desplegable). Tingueu en compte que si té un gran nombre de contactes (> 100 000), pot millorar el rendiment mitjançant la constant CONTACT_DONOTSEARCH_ANYWHERE a 1 a Configuració-> Diversos. La recerca es limitarà llavors a l'inici de la cadena. SearchFilter=Opcions filtres de cerca diff --git a/htdocs/langs/cs_CZ/admin.lang b/htdocs/langs/cs_CZ/admin.lang index df6858d353b..70ec831c7dd 100644 --- a/htdocs/langs/cs_CZ/admin.lang +++ b/htdocs/langs/cs_CZ/admin.lang @@ -49,7 +49,7 @@ ErrorReservedTypeSystemSystemAuto=Hodnota "systém" a "systemauto ErrorCodeCantContainZero=Kód může obsahovat hodnotu 0 DisableJavascript=Zakázat JavaScript a Ajax funkce ConfirmAjax=Použití Ajax potvrzení vyskakovací okna -UseSearchToSelectCompany=Používejte automatické doplňování polí vybrat třetí strany (namísto použití pole se seznamem). Také, pokud máte velký počet třetích stran (> 100 000), můžete zvýšit rychlost nastavením konstantní SOCIETE_DONOTSEARCH_ANYWHERE na 1 v Nastavení-> Ostatní. Vyhledávání pak bude omezen na začátek řetězce. +UseSearchToSelectCompany=Používejte automatické doplňování polí vybrat třetí strany (namísto použití pole se seznamem). Také, pokud máte velký počet třetích stran (> 100 000), můžete zvýšit rychlost nastavením konstantní COMPANY_DONOTSEARCH_ANYWHERE na 1 v Nastavení-> Ostatní. Vyhledávání pak bude omezen na začátek řetězce. ActivityStateToSelectCompany= Přidat možnost filtru pro zobrazení / skrytí thirdparties, které jsou v současné době v činnosti nebo přestal ji UseSearchToSelectContact=Používejte automatické doplňování polí vyberte kontakt (namísto použití pole se seznamem). Také, pokud máte velký počet třetích stran (> 100 000), můžete zvýšit rychlost nastavením konstantní CONTACT_DONOTSEARCH_ANYWHERE na 1 v Nastavení-> Ostatní. Vyhledávání pak bude omezen na začátek řetězce. SearchFilter=Hledat filtry možnosti diff --git a/htdocs/langs/el_GR/admin.lang b/htdocs/langs/el_GR/admin.lang index 654047ac05a..7efb26f9beb 100644 --- a/htdocs/langs/el_GR/admin.lang +++ b/htdocs/langs/el_GR/admin.lang @@ -49,7 +49,7 @@ ErrorReservedTypeSystemSystemAuto=Αξία «system» και «systemauto» γι ErrorCodeCantContainZero=Κώδικας δεν μπορεί να περιέχει την τιμή 0 DisableJavascript=Απενεργοποίηση συναρτήσεων JavaScript και Ajax ConfirmAjax=Χρήση διαλόγων επιβεβαίωσης Ajax -UseSearchToSelectCompany=Χρήση φόρμας αναζήτησης για επιλογή εταιρίας (αντί χρήσης πλαισίων λίστας). Αν έχετε μεγάλο αριθμό στοιχείων (>100000) μπορείτε να αυξήσετε την ταχύτητα θέτοντας την μεταβλητή SOCIETE_DONOTSEARCH_ANYWHERE σε 1 στο μενού Ρυθμίσεις -> Άλλες Ρυθμίσεις +UseSearchToSelectCompany=Χρήση φόρμας αναζήτησης για επιλογή εταιρίας (αντί χρήσης πλαισίων λίστας). Αν έχετε μεγάλο αριθμό στοιχείων (>100000) μπορείτε να αυξήσετε την ταχύτητα θέτοντας την μεταβλητή COMPANY_DONOTSEARCH_ANYWHERE σε 1 στο μενού Ρυθμίσεις -> Άλλες Ρυθμίσεις ActivityStateToSelectCompany= Προσθέστε μια επιλογή φίλτρου για εμφάνιση / απόκρυψη τρίτα μέρη τα οποία βρίσκονται σε λειτουργία ή έχει παύσει UseSearchToSelectContact=Χρησιμοποιήστε τα πεδία αυτόματης συμπλήρωσης για να επιλέξετε επαφή (αντί να χρησιμοποιήσετε ένα πλαίσιο λίστας). Επίσης, αν έχετε ένα μεγάλο αριθμό τρίτων (> 100 000), μπορείτε να αυξήσετε την ταχύτητα με τη σταθερή CONTACT_DONOTSEARCH_ANYWHERE στο 1 στην Εγκατάσταση->Άλλα. Η αναζήτηση μετά θα περιορίζεται απο την έναρξη της συμβολοσειράς. SearchFilter=Αναζήτηση επιλογές φίλτρων diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index e7235011263..8fe0d7aabe2 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -49,7 +49,7 @@ ErrorReservedTypeSystemSystemAuto=Value 'system' and 'systemauto' for type is re ErrorCodeCantContainZero=Code can't contain value 0 DisableJavascript=Disable JavaScript and Ajax functions ConfirmAjax=Use Ajax confirmation popups -UseSearchToSelectCompany=Use autocompletion fields to choose third parties (instead of using a list box). Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant SOCIETE_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string. +UseSearchToSelectCompany=Use autocompletion fields to choose third parties (instead of using a list box). Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant COMPANY_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string. ActivityStateToSelectCompany= Add a filter option to show/hide thirdparties which are currently in activity or has ceased it UseSearchToSelectContact=Use autocompletion fields to choose contact (instead of using a list box). Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string. SearchFilter=Search filters options @@ -368,7 +368,7 @@ ExtrafieldRadio=Radio button ExtrafieldParamHelpselect=Parameters list have to be like key,value for exemple : 1,value1 2,value2 3,value3 ... In order to have the list depending on another : 1,value1|parent_list_code:parent_key 2,value2|parent_list_code:parent_key ExtrafieldParamHelpcheckbox=Parameters list have to be like key,value for exemple : 1,value1 2,value2 3,value3 ... ExtrafieldParamHelpradio=Parameters list have to be like key,value for exemple : 1,value1 2,value2 3,value3 ... -ExtrafieldParamHelpsellist=Parameters list have come from table for exemple : c_typent:libelle:id In order to have the list depending on another : c_typent:libelle:id:parent_list_code|parent_column +ExtrafieldParamHelpsellist=Parameters list have come from table for exemple : c_typent:libelle:id::filter In order to have the list depending on another : c_typent:libelle:id:parent_list_code|parent_column:filter filter can be a simple test (eg active=1) to display only active value if you want to filter on extrafields use syntaxt extra.fieldcode=... (where field code is the code of extrafield) LibraryToBuildPDF=Library used to build PDF WarningUsingFPDF=Warning: Your conf.php contains directive dolibarr_pdf_force_fpdf=1. This means you use the FPDF library to generate PDF files. This library is old and does not support a lot of features (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), so you may experience errors during PDF generation. To solve this and have a full support of PDF generation, please download TCPDF library, then comment or remove the line $dolibarr_pdf_force_fpdf=1, and add instead $dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir' LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are: 1 : local tax apply on products and services without vat (vat is not applied on local tax) 2 : local tax apply on products and services before vat (vat is calculated on amount + localtax) 3 : local tax apply on products without vat (vat is not applied on local tax) 4 : local tax apply on products before vat (vat is calculated on amount + localtax) 5 : local tax apply on services without vat (vat is not applied on local tax) 6 : local tax apply on services before vat (vat is calculated on amount + localtax) @@ -487,6 +487,8 @@ Module2700Desc= Use online Gravatar service (www.gravatar.com) to show photo of Module2800Desc=FTP Client Module2900Name= GeoIPMaxmind Module2900Desc= GeoIP Maxmind conversions capabilities +Module3100Name= Skype +Module3100Desc= Add a Skype button into card of adherents / third parties / contacts Module5000Name=Multi-company Module5000Desc=Allows you to manage multiple companies Module6000Name=Workflow @@ -972,6 +974,8 @@ ExtraFieldsThirdParties=Complementary attributes (thirdparty) ExtraFieldsContacts=Complementary attributes (contact/address) ExtraFieldsMember=Complementary attributes (member) ExtraFieldsMemberType=Complementary attributes (member type) +ExtraFieldsCustomerOrders=Complementary attributes (orders) +ExtraFieldsCustomerInvoices=Complementary attributes (invoices) ExtraFieldsSupplierOrders=Complementary attributes (orders) ExtraFieldsSupplierInvoices=Complementary attributes (invoices) ExtraFieldsProject=Complementary attributes (projects) @@ -1003,6 +1007,7 @@ BrowserIsKO=You are using the web browser %s. This browser is known to be a bad XDebugInstalled=XDebug est chargé. XCacheInstalled=XCache is loaded. AddRefInList=Display customer/supplier ref into list (select list or combobox) and most of hyperlink +FieldEdition=Edition of field %s ##### Module password generation PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: 8 characters containing shared numbers and characters in lowercase. PasswordGenerationNone=Do not suggest any generated password. Password must be type in manually. diff --git a/htdocs/langs/en_US/companies.lang b/htdocs/langs/en_US/companies.lang index 2f9e4ed285d..94e6cb840c5 100644 --- a/htdocs/langs/en_US/companies.lang +++ b/htdocs/langs/en_US/companies.lang @@ -66,6 +66,8 @@ Country=Country CountryCode=Country code CountryId=Country id Phone=Phone +Skype=Skype +Call=Call PhonePro=Prof. phone PhonePerso=Pers. phone PhoneMobile=Mobile diff --git a/htdocs/langs/en_US/members.lang b/htdocs/langs/en_US/members.lang index ec925209b2c..5c12d9c3aa3 100644 --- a/htdocs/langs/en_US/members.lang +++ b/htdocs/langs/en_US/members.lang @@ -8,6 +8,7 @@ Members=Members MemberAccount=Member login ShowMember=Show member card UserNotLinkedToMember=User not linked to a member +ThirdpartyNotLinkedToMember=Third-party not linked to a member MembersTickets=Members Tickets FundationMembers=Foundation members Attributs=Attributes @@ -118,7 +119,6 @@ LastMembers=Last %s members LastMembersModified=Last %s modified members LastSubscriptionsModified=Last %s modified subscriptions AttributeName=Attribute name -FieldEdition=Edition of field %s String=String Text=Text Int=Int diff --git a/htdocs/langs/es_ES/admin.lang b/htdocs/langs/es_ES/admin.lang index 086ee40962c..6ad5e2f2005 100644 --- a/htdocs/langs/es_ES/admin.lang +++ b/htdocs/langs/es_ES/admin.lang @@ -49,7 +49,7 @@ ErrorReservedTypeSystemSystemAuto=El uso del tipo 'system' y 'systemauto' está ErrorCodeCantContainZero=El código no puede contener el valor 0 DisableJavascript=Desactivar las funciones Javascript ConfirmAjax=Utilizar los popups de confirmación Ajax -UseSearchToSelectCompany=Utilizar un formulario de búsqueda para buscar terceros (en vez de lista desplegable) Tenga en cuenta que si tiene un gran número de productos o servicios (>100 000), puede mejorar el rendimiento mediante la constante SOCIETE_DONOTSEARCH_ANYWHERE a 1 en Configuración->Varios. La búsqueda se limitará entonces al inicio de la cadena. +UseSearchToSelectCompany=Utilizar un formulario de búsqueda para buscar terceros (en vez de lista desplegable) Tenga en cuenta que si tiene un gran número de productos o servicios (>100 000), puede mejorar el rendimiento mediante la constante COMPANY_DONOTSEARCH_ANYWHERE a 1 en Configuración->Varios. La búsqueda se limitará entonces al inicio de la cadena. ActivityStateToSelectCompany= Agregar un filtro en la búsqueda para mostrar/ocultar los terceros en activo o que hayan dejado de ejercer UseSearchToSelectContact=Utilizar un formulario de búsqueda (en vez de una lista desplegable). Tenga en cuenta que si tiene un gran número de contactos (>100 000), puede mejorar el rendimiento mediante la constante CONTACT_DONOTSEARCH_ANYWHERE a 1 en Configuración->Varios. La búsqueda se limitará entonces al inicio de la cadena. SearchFilter=Opciones filtros de búsqueda diff --git a/htdocs/langs/et_EE/admin.lang b/htdocs/langs/et_EE/admin.lang index 167f89b8dd3..f2da96455e8 100644 --- a/htdocs/langs/et_EE/admin.lang +++ b/htdocs/langs/et_EE/admin.lang @@ -49,7 +49,7 @@ DictionnarySetup=Dictionary setup # ErrorCodeCantContainZero=Code can't contain value 0 DisableJavascript=Keela JavaScript ja Ajax funktsioonid ConfirmAjax=Kasuta Ajax kinnituse hüpikaknad -UseSearchToSelectCompany=Kasuta sõnalõpetusteks väljad valida kolmandate isikute (selle asemel loendiboksis). Samuti kui teil on suur hulk kolmandaid isikuid (> 100 000), saate suurendada kiirust, millega pidev SOCIETE_DONOTSEARCH_ANYWHERE kuni 1 aasta Setup-> Teised. Otsi siis piirdub algus string. +UseSearchToSelectCompany=Kasuta sõnalõpetusteks väljad valida kolmandate isikute (selle asemel loendiboksis). Samuti kui teil on suur hulk kolmandaid isikuid (> 100 000), saate suurendada kiirust, millega pidev COMPANY_DONOTSEARCH_ANYWHERE kuni 1 aasta Setup-> Teised. Otsi siis piirdub algus string. ActivityStateToSelectCompany= Lisa filter võimalus näidata / peita thirdparties mis on praegu tegevust või lõpetas ta # UseSearchToSelectContact=Use autocompletion fields to choose contact (instead of using a list box). Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string. SearchFilter=Otsi filtrite valikud diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang index 9984beaf503..8d73250d652 100644 --- a/htdocs/langs/fr_FR/admin.lang +++ b/htdocs/langs/fr_FR/admin.lang @@ -49,7 +49,7 @@ ErrorReservedTypeSystemSystemAuto=Erreur, les valeurs 'system' et 'systemauto' s ErrorCodeCantContainZero=Erreur, le code ne peut contenir la valeur 0 DisableJavascript=Désactiver les fonctions Javascript et Ajax ConfirmAjax=Utiliser les fenêtres de confirmation Ajax -UseSearchToSelectCompany=Utiliser un champ avec autocomplétion pour choisir un tiers (plutôt qu'une liste déroulante). Notez que si vous avez un nombre important de tiers (> 100 000), vous pouvez améliorer les performances en définissant la constante SOCIETE_DONOTSEARCH_ANYWHERE à 1 dans Configuration->Divers. La recherche sera alors limitée au début de la chaîne. +UseSearchToSelectCompany=Utiliser un champ avec autocomplétion pour choisir un tiers (plutôt qu'une liste déroulante). Notez que si vous avez un nombre important de tiers (> 100 000), vous pouvez améliorer les performances en définissant la constante COMPANY_DONOTSEARCH_ANYWHERE à 1 dans Configuration->Divers. La recherche sera alors limitée au début de la chaîne. ActivityStateToSelectCompany= Ajouter une option de filtrage lors des recherches pour afficher/masquer les tiers en exercice ou ayant cessé d'exercer UseSearchToSelectContact=Utiliser un champ avec autocomplétion pour choisir un contact (plutôt qu'une liste déroulante). Notez que si vous avez un nombre important de contacts (> 100 000), vous pouvez améliorer les performances en définissant la constante CONTACT_DONOTSEARCH_ANYWHERE à 1 dans Configuration->Divers. La recherche sera alors limitée au début de la chaîne. SearchFilter=Options des filtres de recherche @@ -368,7 +368,7 @@ ExtrafieldRadio=Bouton radio ExtrafieldParamHelpselect=La liste doit être de la forme clef,valeur par exemple : 1,valeur1 2,valeur2 3,valeur3 ... Pour que la liste soit dépendante d'une autre : 1,valeur1|code_liste_parent:clef_parent 2,valeur2|code_liste_parent:clef_parent ExtrafieldParamHelpcheckbox=La liste doit être de la forme clef,valeur par exemple : 1,valeur1 2,valeur2 3,valeur3 ... ExtrafieldParamHelpradio=La liste doit être de la forme clef,valeur par exemple : 1,valeur1 2,valeur2 3,valeur3 ... -ExtrafieldParamHelpsellist=La liste vient d'une table par exemple : c_typent:libelle:id Pour que la liste soit dépendante d'une autre : c_typent:libelle:id:code_liste_parent|colonne_parent +ExtrafieldParamHelpsellist=La liste vient d'une table par exemple : c_typent:libelle:id::filter Pour que la liste soit dépendante d'une autre : c_typent:libelle:id:code_liste_parent|colonne_parent:filter filter peux être un test simple active=1 pour ne proposer que les valeur active si vous voulez faire un filtre sur des attributs supplémentaires utiliser la syntax extra.champ=...(où champ est la code de l'attribut supplémentaire) LibraryToBuildPDF=Bibliothèque utilisée pour la génération des PDF WarningUsingFPDF=Attention : votre fichier conf.php contient la directive dolibarr_pdf_force_fpdf=1. Cela signifie que vous utilisez la librairie FPDF pour générer vos fichiers PDF. Cette librairie est ancienne et ne couvre pas de nombreuses fonctionnalités (Unicode, transparence des images, langues cyrilliques, arabes ou asiatiques...), aussi vous pouvez rencontrer des problèmes durant la génération des PDF. Pour résoudre cela et avoir une prise en charge complète de PDF, vous pouvez télécharger la bibliothèque TCPDF puis commenter ou supprimer la ligne $dolibarr_pdf_force_fpdf=1, et ajouter à la place $dolibarr_lib_TCPDF_PATH='chemin_vers_TCPDF' LocalTaxDesc=Certains pays appliquent 2 voire 3 taux sur chaque ligne de facture. Si c'est le cas, choisissez le type du deuxième et troisième taux et sa valeur. Les types possibles sont: 1 : taxe locale sur les produits et services hors tva (la tva n'est pas appliquée sur la taxe locale) 2 : taxe locale sur les produits et services avant tva (la tva est appliquée sur le montant + la taxe locale) 3 : taxe locale uniquement sur les produits hors tva (la tva n'est pas appliquée sur la taxe locale) 4 : taxe locale uniquement sur les produits avant tva (la tva est appliquée sur le montant + la taxe locale) 5 : taxe locale uniquement sur les services hors tva (la tva n'est pas appliquée sur la taxe locale) 6 : taxe locale uniquement sur les service avant tva (la tva est appliquée sur le montant + la taxe locale) @@ -972,7 +972,10 @@ ExtraFieldsThirdParties=Attributs supplémentaires (tiers) ExtraFieldsContacts=Attributs supplémentaires (contacts/adresses) ExtraFieldsMember=Attributs supplémentaires (adhérents) ExtraFieldsMemberType=Attributs supplémentaires (type d'adhérents) +ExtraFieldsCustomerOrders=Attributs supplémentaires (commandes) +ExtraFieldsCustomerInvoices=Attributs supplémentaires (factures) ExtraFieldsSupplierOrders=Attributs supplémentaires (commandes) +ExtraFieldsCustomerInvoices=Attributs supplémentaires (factures clients) ExtraFieldsSupplierInvoices=Attributs supplémentaires (factures) ExtraFieldsProject=Attributs supplémentaires (projets) ExtraFieldsProjectTask=Attributs supplémentaires (tâches) @@ -1015,6 +1018,7 @@ EncryptedPasswordInDatabase=Permettre le chiffrement des mots de passe dans la b DisableForgetPasswordLinkOnLogonPage=Ne pas afficher le lien "Mot de passe oublié" sur la page de connexion UsersSetup=Configuration du module utilisateurs UserMailRequired=Email requis pour créer un nouvel utilisateur +FieldEdition=Édition du champ %s ##### Company setup ##### CompanySetup=Configuration du module Tiers CompanyCodeChecker=Modèle de génération et contrôle des codes tiers (clients/fournisseurs) @@ -1467,8 +1471,8 @@ TestGeoIPResult=Test de conversion IP -> Pays ProjectsNumberingModules=Modèles de numérotation des références projets ProjectsSetup=Configuration du module Projets ProjectsModelModule=Modèles de document de rapport projets -TasksNumberingModules=Modèles de numérotation des références taches -TaskModelModule=Modèles de document de rapport taches +TasksNumberingModules=Modèles de numérotation des références tâches +TaskModelModule=Modèles de document de rapport tâches ##### ECM (GED) ##### ECMSetup = Configuration du module GED ECMAutoTree = L'arborescence automatique est disponible diff --git a/htdocs/langs/fr_FR/cron.lang b/htdocs/langs/fr_FR/cron.lang index 32546eac28c..d4e10c80fca 100644 --- a/htdocs/langs/fr_FR/cron.lang +++ b/htdocs/langs/fr_FR/cron.lang @@ -68,7 +68,7 @@ CronPriority=Priorité CronLabel=Description CronNbRun=Nb. exec. CronEach=Tous les -JobFinished=Tache lancée et terminée +JobFinished=Tâche lancée et terminée # #Page card diff --git a/htdocs/langs/fr_FR/members.lang b/htdocs/langs/fr_FR/members.lang index 4b1c8b8d28b..92a06886712 100644 --- a/htdocs/langs/fr_FR/members.lang +++ b/htdocs/langs/fr_FR/members.lang @@ -8,6 +8,7 @@ Members=Adhérents MemberAccount=Login adhérent ShowMember=Afficher fiche adhérent UserNotLinkedToMember=Utilisateur non lié à un adhérent +ThirdpartyNotLinkedToMember=Tiers non lié à un adhérent MembersTickets=Étiquettes d'adhérents FundationMembers=Membres de l'association Attributs=Attributs @@ -118,7 +119,6 @@ LastMembers=Les %s derniers adhérents LastMembersModified=Les %s derniers adhérents modifiés LastSubscriptionsModified=Les %s dernières adhésions modifiées AttributeName=Nom de l'attribut -FieldEdition=Édition du champ %s String=Chaîne Text=Texte long Int=Numérique diff --git a/htdocs/langs/he_IL/admin.lang b/htdocs/langs/he_IL/admin.lang index 061a1f23e44..bdb2ef07c6a 100644 --- a/htdocs/langs/he_IL/admin.lang +++ b/htdocs/langs/he_IL/admin.lang @@ -49,7 +49,7 @@ DictionnarySetup=הגדרת מילון # ErrorCodeCantContainZero=Code can't contain value 0 DisableJavascript=בטל פונקציונליות של JavaScript ו Ajax ConfirmAjax=השתמש קופצים אייאקס אישור -UseSearchToSelectCompany=להשתמש בשדות השלמה אוטומטית לבחור צדדים שלישיים (ולא באמצעות תיבת רשימה). גם אם יש לך מספר רב של צדדים שלישיים (> 100 000), תוכל להגדיל את המהירות על ידי הגדרת SOCIETE_DONOTSEARCH_ANYWHERE מתמיד 1 בהתקנת-> אחר. חיפוש לאחר מכן ניתן יהיה להתחיל מוגבל של מחרוזת. +UseSearchToSelectCompany=להשתמש בשדות השלמה אוטומטית לבחור צדדים שלישיים (ולא באמצעות תיבת רשימה). גם אם יש לך מספר רב של צדדים שלישיים (> 100 000), תוכל להגדיל את המהירות על ידי הגדרת COMPANY_DONOTSEARCH_ANYWHERE מתמיד 1 בהתקנת-> אחר. חיפוש לאחר מכן ניתן יהיה להתחיל מוגבל של מחרוזת. ActivityStateToSelectCompany= הוספת אפשרות סינון להראות / להסתיר thirdparties שהם כיום בפעילות או חדל זה # UseSearchToSelectContact=Use autocompletion fields to choose contact (instead of using a list box). Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string. SearchFilter=מסננים אפשרויות חיפוש diff --git a/htdocs/langs/hu_HU/admin.lang b/htdocs/langs/hu_HU/admin.lang index 72e0eb88bc7..4bae391a48d 100644 --- a/htdocs/langs/hu_HU/admin.lang +++ b/htdocs/langs/hu_HU/admin.lang @@ -49,7 +49,7 @@ DictionnarySetup=Szótár beállítási # ErrorCodeCantContainZero=Code can't contain value 0 DisableJavascript=Disable JavaScript és Ajax funkciókkal ConfirmAjax=Használja Ajax visszaigazolást popup -UseSearchToSelectCompany=Használja az automata kiegészítés mezőket választani harmadik fél (helyett egy lista). Akkor is, ha van egy nagy számú harmadik felek (> 100 000), akkor a sebesség növelése azáltal, hogy állandó SOCIETE_DONOTSEARCH_ANYWHERE 1. Beállítás-> Egyéb. Keresés csak ezután kezdeni a húr. +UseSearchToSelectCompany=Használja az automata kiegészítés mezőket választani harmadik fél (helyett egy lista). Akkor is, ha van egy nagy számú harmadik felek (> 100 000), akkor a sebesség növelése azáltal, hogy állandó COMPANY_DONOTSEARCH_ANYWHERE 1. Beállítás-> Egyéb. Keresés csak ezután kezdeni a húr. ActivityStateToSelectCompany= Hozzáadása lehetőséget, hogy a szűrő / elrejtése thirdparties, amelyek jelenleg a tevékenység megszűnt, vagy azt # UseSearchToSelectContact=Use autocompletion fields to choose contact (instead of using a list box). Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string. SearchFilter=Keresés szűrők lehetőségek diff --git a/htdocs/langs/ja_JP/admin.lang b/htdocs/langs/ja_JP/admin.lang index ee77b07cac3..9f1414bbd1b 100644 --- a/htdocs/langs/ja_JP/admin.lang +++ b/htdocs/langs/ja_JP/admin.lang @@ -49,7 +49,7 @@ DictionnarySetup=辞書のセットアップ # ErrorCodeCantContainZero=Code can't contain value 0 DisableJavascript=JavaScriptとAjaxの機能を無効にする ConfirmAjax=Ajaxの確認のポップアップを使用して、 -UseSearchToSelectCompany=第三者が（代わりにリストボックスを使用）を選択するオートコンプリートフィールドを使用します。 あなたがサードパーティの多数（> 100,000）を持っている場合にも、セットアップ - >その他1に定数SOCIETE_DONOTSEARCH_ANYWHEREを設定することにより、速度を上げることができます。検索は、文字列の先頭に制限されます。 +UseSearchToSelectCompany=第三者が（代わりにリストボックスを使用）を選択するオートコンプリートフィールドを使用します。 あなたがサードパーティの多数（> 100,000）を持っている場合にも、セットアップ - >その他1に定数COMPANY_DONOTSEARCH_ANYWHEREを設定することにより、速度を上げることができます。検索は、文字列の先頭に制限されます。 ActivityStateToSelectCompany= 活動に現在thirdparties表示/非表示切り替えフィルタオプションを追加したり、それを停止している # UseSearchToSelectContact=Use autocompletion fields to choose contact (instead of using a list box). Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string. SearchFilter=検索フィルタのオプション diff --git a/htdocs/langs/ko_KR/admin.lang b/htdocs/langs/ko_KR/admin.lang index 3b94e9608a8..31f1adbd856 100644 --- a/htdocs/langs/ko_KR/admin.lang +++ b/htdocs/langs/ko_KR/admin.lang @@ -49,7 +49,7 @@ VersionLastUpgrade=최종 버전 업그레이드 # ErrorCodeCantContainZero=Code can't contain value 0 # DisableJavascript=Disable JavaScript and Ajax functions # ConfirmAjax=Use Ajax confirmation popups -# UseSearchToSelectCompany=Use autocompletion fields to choose third parties (instead of using a list box). Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant SOCIETE_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string. +# UseSearchToSelectCompany=Use autocompletion fields to choose third parties (instead of using a list box). Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant COMPANY_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string. # ActivityStateToSelectCompany= Add a filter option to show/hide thirdparties which are currently in activity or has ceased it # UseSearchToSelectContact=Use autocompletion fields to choose contact (instead of using a list box). Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string. # SearchFilter=Search filters options diff --git a/htdocs/langs/nl_BE/admin.lang b/htdocs/langs/nl_BE/admin.lang index 8e8404a45fa..72575d0a8ad 100644 --- a/htdocs/langs/nl_BE/admin.lang +++ b/htdocs/langs/nl_BE/admin.lang @@ -46,7 +46,7 @@ ErrorDecimalLargerThanAreForbidden = Fout, een nauwkeurigheid van meer dan %s DictionnarySetup = Woordenlijsten DisableJavascript = Schakel JavaScript en Ajax-functies uit ConfirmAjax = Gebruik Ajax bevestiging popups -UseSearchToSelectCompany = Gebruik velden die automatisch aanvullen om een bedrijf te kiezen (in plaats van een drop-down lijst). In geval van een zeer groot aantal derde partijen (> 100 000), kan de snelheid verhoogt worden door de waarde SOCIETE_DONOTSEARCH_ANYWHERE op 1 te zetten in Home->Configuratie->Andere Instellingen. +UseSearchToSelectCompany = Gebruik velden die automatisch aanvullen om een bedrijf te kiezen (in plaats van een drop-down lijst). In geval van een zeer groot aantal derde partijen (> 100 000), kan de snelheid verhoogt worden door de waarde COMPANY_DONOTSEARCH_ANYWHERE op 1 te zetten in Home->Configuratie->Andere Instellingen. ActivityStateToSelectCompany = Voeg een filter optie toe om derde partijen te tonen/verbergen die momenteel actief zijn of gestopt zijn SearchFilter = Opties voor de zoekfilters NumberOfKeyToSearch = Aantal karakters om de zoekactie te starten: %s diff --git a/htdocs/langs/nl_NL/admin.lang b/htdocs/langs/nl_NL/admin.lang index 20be7888384..217f4ec0095 100644 --- a/htdocs/langs/nl_NL/admin.lang +++ b/htdocs/langs/nl_NL/admin.lang @@ -49,7 +49,7 @@ DictionnarySetup=Constanten # ErrorCodeCantContainZero=Code can't contain value 0 DisableJavascript=Schakel JavaScript en AJAX-functionaliteit uit ConfirmAjax=Gebruik AJAX bevestigingspopups -UseSearchToSelectCompany=Gebruik 'autocompletion' velden om derde partijen te kiezen (In plaats van een selectielijst). Wanneer u een groot aantal derde partijen (meer dan 100.000) heeft, kunt u de snelheid verhogen door de constante SOCIETE_DONOTSEARCH_ANYWHERE op 1 in te stellen in Home->Instellingen->Overige instellingen. Het zoeken wordt dan beperkt tot het begin van een regel. +UseSearchToSelectCompany=Gebruik 'autocompletion' velden om derde partijen te kiezen (In plaats van een selectielijst). Wanneer u een groot aantal derde partijen (meer dan 100.000) heeft, kunt u de snelheid verhogen door de constante COMPANY_DONOTSEARCH_ANYWHERE op 1 in te stellen in Home->Instellingen->Overige instellingen. Het zoeken wordt dan beperkt tot het begin van een regel. ActivityStateToSelectCompany= Voeg een filter optie voor het tonen / verbergen thirdparties die momenteel in de activiteiten of niet langer het # UseSearchToSelectContact=Use autocompletion fields to choose contact (instead of using a list box). Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string. SearchFilter=Zoekfilters opties diff --git a/htdocs/langs/nl_NL/categories.lang b/htdocs/langs/nl_NL/categories.lang index 915dc750fc6..77a031c79b2 100644 --- a/htdocs/langs/nl_NL/categories.lang +++ b/htdocs/langs/nl_NL/categories.lang @@ -50,12 +50,12 @@ SupplierIsInCategories=Klant is eigenaar van de volgende leverancierscategorieë CompanyIsInCustomersCategories=Deze Klant is eigenaar van de volgende afnemers- / prospectencategorieën CompanyIsInSuppliersCategories=Deze Klant is eigenaar van de volgende leverancierscategorieën MemberIsInCategories=Dit lid is eigenaar van de volgende ledencategorieën -# ContactIsInCategories=This contact owns to following contacts categories +ContactIsInCategories=Dit contact kent de volgende contacts Categorieën ProductHasNoCategory=Dit product / dienst behoort tot geen enkele categorie SupplierHasNoCategory=Deze leverancier behoort tot geen enkele categorie CompanyHasNoCategory=Dit bedrijf behoort tot geen enkele categorie MemberHasNoCategory=Dit lid behoort tot geen enkele categorie -# ContactHasNoCategory=This contact is not in any categories +ContactHasNoCategory=Dit contact is niet in een Categorieën onderverdeeld ClassifyInCategory=Classificeren naar categorie NoneCategory=Geen # NotCategorized=Without category @@ -81,7 +81,7 @@ CustomersCategoriesShort=Afnemerscategorie CustomersProspectsCategoriesShort=Afnemers- / Prospectencategorie ProductsCategoriesShort=Productencategorie MembersCategoriesShort=Ledencategorie -# ContactCategoriesShort=Contacts categories +ContactCategoriesShort=Contact Categorieën ThisCategoryHasNoProduct=Deze categorie bevat geen producten. ThisCategoryHasNoSupplier=Deze categorie bevat geen enkele leverancier. ThisCategoryHasNoCustomer=Deze categorie bevat geen enkele afnemer. @@ -96,7 +96,7 @@ CatSupList=Leverancierscategorieënlijst CatCusList=afnemers- / prospectencategorieënlijst CatProdList=productencategorieënlijst CatMemberList=Ledencategorieënlijst -# CatContactList=List of contact categories and contact +CatContactList=Lijst van Categorieën van Contacten # CatSupLinks=Links between suppliers and categories # CatCusLinks=Links between customers/prospects and categories # CatProdLinks=Links between products/services and categories diff --git a/htdocs/langs/nl_NL/mails.lang b/htdocs/langs/nl_NL/mails.lang index 70e208c255e..aabc90b5f12 100644 --- a/htdocs/langs/nl_NL/mails.lang +++ b/htdocs/langs/nl_NL/mails.lang @@ -89,7 +89,7 @@ MailingModuleDescEmailsFromFile=E-mails van een tekstbestand (e-mail;achternaam; MailingModuleDescContactsCategories=Contacten van alle derde partijen (Door categorie) MailingModuleDescDolibarrContractsLinesExpired=Derde partijen met verlopen contractregels MailingModuleDescContactsByCompanyCategory=Contacten van derden (door derden categorie) -# MailingModuleDescContactsByCategory=Contacts/addresses of third parties by category +MailingModuleDescContactsByCategory=Voeg een contact toe per Categorieën MailingModuleDescMembersCategories=Stichting leden (per categorie) MailingModuleDescContactsByFunction=Contacten van derden (door de positie / functie) diff --git a/htdocs/langs/nl_NL/margins.lang b/htdocs/langs/nl_NL/margins.lang index 876f9f1c410..6d74fe0b7db 100644 --- a/htdocs/langs/nl_NL/margins.lang +++ b/htdocs/langs/nl_NL/margins.lang @@ -1,51 +1,52 @@ # Dolibarr language file - Source file is en_US - marges +CHARSET=UTF-8 -# Margin=Margin -# Margins=Margins -# TotalMargin=Total Margin -# MarginOnProducts=Margin / Products -# MarginOnServices=Margin / Services -# MarginRate=Margin rate -# MarkRate=Mark rate -# DisplayMarginRates=Display margin rates -# DisplayMarkRates=Display mark rates -# InputPrice=Input price +Margin=Marge +Margins=Marges +TotalMargin=Marge Totaal +MarginOnProducts=Marge / Training +MarginOnServices=Marge / Dienst +MarginRate=Marge verhouding +MarkRate=Markerings verhouding +DisplayMarginRates=Toon Marge Verhouding +DisplayMarkRates=Toon Markeringsverhouding +InputPrice=Voer Prijs in -# margin=Profit margins management -# margesSetup=Profit margins management setup +margin=Winst marge management +margesSetup=Winst marge management setup -# MarginDetails=Margin details +MarginDetails=Marge details -# ProductMargins=Product margins -# CustomerMargins=Customer margins -# AgentMargins=Agent margins +ProductMargins=Product marge +CustomerMargins=Klant marges +AgentMargins=Acc. Manager marges -ProductService=Product of Dienst -# AllProducts=All products and services -# ChooseProduct/Service=Choose product or service -# CommercialAgent=Commercial agent +ProductService=Trainning of Dienst +AllProducts=Alle Trainingen en Diensten +ChooseProduct/Service=Kies Training of Dienst +CommercialAgent=Commerciel Agent -StartDate=Begindatum -EndDate=Einddatum +StartDate=Start datum +EndDate=Eind datum Launch=Start -# ForceBuyingPriceIfNull=Force buying price if null -# ForceBuyingPriceIfNullDetails=if "ON", margin will be zero on line (buying price = selling price), otherwise ("OFF"), marge will be equal to selling price (buying price = 0) -# MARGIN_METHODE_FOR_DISCOUNT=Margin method for global discounts -# UseDiscountAsProduct=As a product -# UseDiscountAsService=As a service -# UseDiscountOnTotal=On subtotal -# MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Defines if a global discount is treated as a product, a service, or only on subtotal for margin calculation. +ForceBuyingPriceIfNull=Forceer een inkoopprijs indien null +ForceBuyingPriceIfNullDetails=indien "ON", marge wodt nul (inkoopprijs = verkoopprijs), anders("OFF"), marge is gelijk verkoopprijs (inkoopprijs = 0) +MARGIN_METHODE_FOR_DISCOUNT=Marge methode voor globale discounts +UseDiscountAsProduct=Als een training +UseDiscountAsService=Als een dienst +UseDiscountOnTotal=Op subtotaal +MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Definieert als een globale discount wordt behandelt als een training, een dienst, of alleen een subtotaal voor marge berekening. -# MARGIN_TYPE=Margin type -# MargeBrute=Raw margin -# MargeNette=Net margin -# MARGIN_TYPE_DETAILS=Raw margin : Selling price - Buying price Net margin : Selling price - Cost price +MARGIN_TYPE=Marge type +MargeBrute=Groffe marge +MargeNette=Netto marge +MARGIN_TYPE_DETAILS=Groffe marge : Verkoopprijs - Inkoopprijs Netto marge : Verkoopprijs - Kostprijs -# CostPrice=Cost price -# BuyingCost=Cost price -# UnitCharges=Unit charges -# Charges=Charges +CostPrice=Kostprijs +BuyingCost=Kostprijs +UnitCharges=Unit toeslag +Charges=Toeslag -# AgentContactType=Contact type used for commissioning -# AgentContactTypeDetails=Défine what contact type (linked on invoices) will be associated with commercial agents +AgentContactType=Contact type used voor commissie +AgentContactTypeDetails=Definieer het contact type (gelinked op facturen) wordt geassocieerd met commercieel agent diff --git a/htdocs/langs/sl_SI/admin.lang b/htdocs/langs/sl_SI/admin.lang index 38b1275b060..e40d5ff4692 100644 --- a/htdocs/langs/sl_SI/admin.lang +++ b/htdocs/langs/sl_SI/admin.lang @@ -49,7 +49,7 @@ DictionnarySetup=Nastavitve slovarja # ErrorCodeCantContainZero=Code can't contain value 0 DisableJavascript=Onemogoči JavaScript in Ajax funkcije ConfirmAjax=Za potrditev uporabi Ajax pojavni meni -UseSearchToSelectCompany=Za izbiro podjetja uporabi obrazec za iskanje(namesto polja s seznamom). Če je partnerjev zelo veliko (> 100 000), lahko hitrost povišate z nastavitvijo konstante SOCIETE_DONOTSEARCH_ANYWHERE na 1 v Nastavitve->Ostale nastavitve. Iskanje bo s tem omejeno na začetek niza. +UseSearchToSelectCompany=Za izbiro podjetja uporabi obrazec za iskanje(namesto polja s seznamom). Če je partnerjev zelo veliko (> 100 000), lahko hitrost povišate z nastavitvijo konstante COMPANY_DONOTSEARCH_ANYWHERE na 1 v Nastavitve->Ostale nastavitve. Iskanje bo s tem omejeno na začetek niza. ActivityStateToSelectCompany= Dodaj opcijo filtra za prikaz/skritje partnerjev, ki so trenutno neaktivni ali so prekinili aktivnosti # UseSearchToSelectContact=Use autocompletion fields to choose contact (instead of using a list box). Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string. SearchFilter=Opcije iskalnega filtra diff --git a/htdocs/langs/tr_TR/admin.lang b/htdocs/langs/tr_TR/admin.lang index 1a3ad14dd02..f7c90228a3c 100644 --- a/htdocs/langs/tr_TR/admin.lang +++ b/htdocs/langs/tr_TR/admin.lang @@ -49,7 +49,7 @@ ErrorReservedTypeSystemSystemAuto='system' ve 'systemauto' değerleri tip için ErrorCodeCantContainZero=Kod 0 değeri içeremez DisableJavascript=Javascript ve Ajax fonksiyonlarını engelle ConfirmAjax=Açılır Ajax onay pencereleri kullanın -UseSearchToSelectCompany=Üçüncü partileri seçmek için (liste kutusu yerine) oto tamamlamalı alanları kullanın. Çok sayıda üçüncü parti (>100 000) olsa da Ayarlar->Diğer (Setup->Other) de SOCIETE_DONOTSEARCH_ANYWHERE değişmezini 1 yaparak hızı arttırabilirsiniz. Bundan sonra arama yalnızca dizenin başlangıcı ile sınırlıdır. +UseSearchToSelectCompany=Üçüncü partileri seçmek için (liste kutusu yerine) oto tamamlamalı alanları kullanın. Çok sayıda üçüncü parti (>100 000) olsa da Ayarlar->Diğer (Setup->Other) de COMPANY_DONOTSEARCH_ANYWHERE değişmezini 1 yaparak hızı arttırabilirsiniz. Bundan sonra arama yalnızca dizenin başlangıcı ile sınırlıdır. ActivityStateToSelectCompany= Halen etkin olan ya da durdmuş olan üçüncü partilerin görünmesi/gizlenmesi bir süzgeç seçeneği ekleyin UseSearchToSelectContact=Kişi seçmek için (liste kutusu yerine) oto tamamlamalı alanları kullanın. Çok sayıda üçüncü parti (>100 000) olsa da Ayarlar->Diğer den CONTACT_DONOTSEARCH_ANYWHERE değişmezini 1 yaparak hızı arttırabilirsiniz. Bundan sonra arama yalnızca dizenin başlangıcı ile sınırlı olacaktır. SearchFilter=Arama süzgeçi seçenekleri diff --git a/htdocs/langs/vi_VN/admin.lang b/htdocs/langs/vi_VN/admin.lang index e41b368d345..77eb58b5558 100644 --- a/htdocs/langs/vi_VN/admin.lang +++ b/htdocs/langs/vi_VN/admin.lang @@ -49,7 +49,7 @@ ErrorReservedTypeSystemSystemAuto=Giá trị 'hệ thống' và 'hệ thống t ErrorCodeCantContainZero=Mã lệnh không thể chứa giá trị 0 DisableJavascript=Vô hiệu hóa JavaScript và tính năng Ajax ConfirmAjax=Sử dụng popups xác định từ Ajax -UseSearchToSelectCompany=Sử dụng các trường tự động bổ sung để chọn các liên kết với các nhà phát triển thứ ba (thay vì danh sách chọn). Đồng thời nếu bạn có một số lượng lớn các nhà phát triển thứ ba (>100 000), bạn có thể tăng tốc độ bằng việc thiết lập hằng số SOCIETE_DONOTSEARCH_ANYWHERE thành 1 trong Thiết lập->Khác. Việc tìm kiếm sẽ được giới hạn với những chuỗi bắt đầu. +UseSearchToSelectCompany=Sử dụng các trường tự động bổ sung để chọn các liên kết với các nhà phát triển thứ ba (thay vì danh sách chọn). Đồng thời nếu bạn có một số lượng lớn các nhà phát triển thứ ba (>100 000), bạn có thể tăng tốc độ bằng việc thiết lập hằng số COMPANY_DONOTSEARCH_ANYWHERE thành 1 trong Thiết lập->Khác. Việc tìm kiếm sẽ được giới hạn với những chuỗi bắt đầu. ActivityStateToSelectCompany= Thêm tùy chọn bộ lọc để ẩn/hiện các nhà phát triển thứ ba hiện đang hoạt động hoặc đã bị xóa UseSearchToSelectContact=Sử dụng trường tự hoàn tất để chọn liên lạc (thay vì sử dụng danh sách chọn). Đồng thời nếu bạn có nhiều các phần tiện ích từ bên thứ ba (> 100 000), bạn có thể tắng tốc độ bằng cách thiết lập hằng số CONTACT_DONOTSEARCH_ANYWHERE lên 1 trong Cài đặt->Khác. Tìm kiếm sau đó sẽ giới hạn phần bắt đầu của chuỗi. SearchFilter=Tùy chọn bộ lọc tìm kiếm diff --git a/htdocs/langs/zh_CN/admin.lang b/htdocs/langs/zh_CN/admin.lang index da251bbfa8d..3f6a2687cc2 100644 --- a/htdocs/langs/zh_CN/admin.lang +++ b/htdocs/langs/zh_CN/admin.lang @@ -49,9 +49,9 @@ ErrorReservedTypeSystemSystemAuto=类型值 'system' 与 'systemauto' 是系统 ErrorCodeCantContainZero=编码不能包含 0 DisableJavascript=禁用 JavaScript 和 Ajax 功能 ConfirmAjax=使用 Ajax 弹出式确认窗口 -UseSearchToSelectCompany=使用自动完成栏的方式，来选择第三方(不使用下拉选择框) 如果你有大于 100000 笔第三方资讯，则可以通过修改SOCIETE_DONOTSEARCH_ANYWHERE 常数为 1 来加快速度。此常数可以在设定->其他设置中设定。这样自动完成功能会被限制为从字首开始依次匹配。 +UseSearchToSelectCompany=使用自动完成栏的方式，来选择第三方(不使用下拉选择框) 如果你有大于 100000 笔第三方资讯，则可以通过修改COMPANY_DONOTSEARCH_ANYWHERE 常数为 1 来加快速度。此常数可以在设定->其他设置中设定。这样自动完成功能会被限制为从字首开始依次匹配。 ActivityStateToSelectCompany= 添加一个筛选器选项来显示/隐藏当前有往来或已停止往来的客户/供应商。 -UseSearchToSelectContact=使用自动完成栏的方式，来选择第三方(取代下拉菜单) 如果你有大于 100000 个第三方，则可以通过修改SOCIETE_DONOTSEARCH_ANYWHERE 常数为 1 来加快速度。此常数可以在设定->其他设置中设定。这样自动完成功能会被限制为从字首开始依次匹配。 +UseSearchToSelectContact=使用自动完成栏的方式，来选择第三方(取代下拉菜单) 如果你有大于 100000 个第三方，则可以通过修改COMPANY_DONOTSEARCH_ANYWHERE 常数为 1 来加快速度。此常数可以在设定->其他设置中设定。这样自动完成功能会被限制为从字首开始依次匹配。 SearchFilter=搜索过滤选项 NumberOfKeyToSearch=触发搜索的字符数量：%s ViewFullDateActions=在第三表中显示全天事件 diff --git a/htdocs/langs/zh_TW/admin.lang b/htdocs/langs/zh_TW/admin.lang index 52a1bf25b0a..a311430d632 100644 --- a/htdocs/langs/zh_TW/admin.lang +++ b/htdocs/langs/zh_TW/admin.lang @@ -49,7 +49,7 @@ DictionnarySetup=設定選項清單 # ErrorCodeCantContainZero=Code can't contain value 0 DisableJavascript=禁用JavaScript和Ajax功能 ConfirmAjax=使用Ajax確認彈出式窗口 -UseSearchToSelectCompany=使用自動完成欄位資訊的方式，來選擇客戶/供應商(而不是使用清單方式) 如果你有大於100000筆的客戶/供應商資訊，則可以藉由修改SOCIETE_DONOTSEARCH_ANYWHERE常數為 1 來加快速度。此常數可以在設定->其他設置中設定。 這樣在搜尋的時候會被限制為字串開始輸入時。 +UseSearchToSelectCompany=使用自動完成欄位資訊的方式，來選擇客戶/供應商(而不是使用清單方式) 如果你有大於100000筆的客戶/供應商資訊，則可以藉由修改COMPANY_DONOTSEARCH_ANYWHERE常數為 1 來加快速度。此常數可以在設定->其他設置中設定。 這樣在搜尋的時候會被限制為字串開始輸入時。 ActivityStateToSelectCompany= 添加一個篩選器的選項，以顯示/隱藏thirdparties，這是在目前的活動或已停止 # UseSearchToSelectContact=Use autocompletion fields to choose contact (instead of using a list box). Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string. SearchFilter=搜尋過濾選項 diff --git a/htdocs/margin/agentMargins.php b/htdocs/margin/agentMargins.php index 7125c5da976..811052f7a93 100644 --- a/htdocs/margin/agentMargins.php +++ b/htdocs/margin/agentMargins.php @@ -168,9 +168,6 @@ if ($result) print_liste_field_titre($langs->trans("MarkRate"),$_SERVER["PHP_SELF"],"","","&agentid=".$agentid,'align="right"',$sortfield,$sortorder); print " | ".$userstatic->getFullName($langs,0,0,0)." | \n"; } - print "".price($pv)." | \n"; - print "".price($pa)." | \n"; - print "".price($marge)." | \n"; + print "".price($pv, null, null, null, null, $rounding)." | \n"; + print "".price($pa, null, null, null, null, $rounding)." | \n"; + print "".price($marge, null, null, null, null, $rounding)." | \n"; if (! empty($conf->global->DISPLAY_MARGIN_RATES)) - print "".(($marginRate === '')?'n/a':price($marginRate)."%")." | \n"; + print "".(($marginRate === '')?'n/a':price($marginRate, null, null, null, null, $rounding)."%")." | \n"; if (! empty($conf->global->DISPLAY_MARK_RATES)) - print "".(($markRate === '')?'n/a':price($markRate)."%")." | \n"; + print "".(($markRate === '')?'n/a':price($markRate, null, null, null, null, $rounding)."%")." | \n"; print "\n"; $i++; - $cumul_achat += round($objp->buying_price, $rounding); - $cumul_vente += round($objp->selling_price, $rounding); } } print "