';
// Definie date debut et fin par defaut
$dateactstart = $objp->date_debut_reelle;
diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index 190de79aa17..02868eb369c 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -261,9 +261,11 @@ class Contrat extends CommonObject
*
* @param User $user Object User making action
* @param int|string $date_start Date start (now if empty)
+ * @param int $notrigger 1=Does not execute triggers, 0=Execute triggers
+ * @param string $comment Comment
* @return int <0 if KO, >0 if OK
*/
- function activateAll($user, $date_start='')
+ function activateAll($user, $date_start='', $notrigger=0, $comment='')
{
if (empty($date_start)) $date_start = dol_now();
@@ -279,7 +281,9 @@ class Contrat extends CommonObject
// Open lines not already open
if ($contratline->statut != 4)
{
- $result = $contratline->active_line($user, $date_start, -1);
+ $contratline->context = $this->context;
+
+ $result = $contratline->active_line($user, $date_start, -1, $comment);
if ($result < 0)
{
$error++;
@@ -292,7 +296,7 @@ class Contrat extends CommonObject
if (! $error && $this->statut == 0)
{
- $result=$this->validate($user);
+ $result=$this->validate($user, '', $notrigger);
if ($result < 0) $error++;
}
@@ -313,9 +317,10 @@ class Contrat extends CommonObject
*
* @param User $user Object User making action
* @param int $notrigger 1=Does not execute triggers, 0=Execute triggers
+ * @param string $comment Comment
* @return int <0 if KO, >0 if OK
*/
- function closeAll(User $user, $notrigger=0)
+ function closeAll(User $user, $notrigger=0, $comment='')
{
$this->db->begin();
@@ -334,7 +339,7 @@ class Contrat extends CommonObject
$contratline->date_cloture=$now;
$contratline->fk_user_cloture=$user->id;
$contratline->statut='5';
- $result=$contratline->close_line($user, $now);
+ $result=$contratline->close_line($user, $now, $comment, $notrigger);
if ($result < 0)
{
$error++;
@@ -607,7 +612,7 @@ class Contrat extends CommonObject
$this->mise_en_service = $this->db->jdate($result["datemise"]);
$this->date_contrat = $this->db->jdate($result["datecontrat"]);
- $this->date_creation = $this->db->jdate($result["datecontrat"]);
+ $this->date_creation = $this->db->jdate($result["datecontrat"]);
$this->fin_validite = $this->db->jdate($result["fin_validite"]);
$this->date_cloture = $this->db->jdate($result["date_cloture"]);
@@ -632,16 +637,15 @@ class Contrat extends CommonObject
$this->db->free($resql);
- // Retreive all extrafield for thirdparty
+
+ // Retreive all extrafield
// fetch optionals attributes and labels
- require_once(DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php');
- $extrafields=new ExtraFields($this->db);
- $extralabels=$extrafields->fetch_name_optionals_label($this->table_element,true);
- $this->fetch_optionals($this->id,$extralabels);
+ $this->fetch_optionals();
+
/*
* Lines
- */
+ */
$this->lines = array();
@@ -793,7 +797,7 @@ class Contrat extends CommonObject
// Retreive all extrafield for contract
// fetch optionals attributes and labels
- $line->fetch_optionals($line->id,$extralabelsline);
+ $line->fetch_optionals();
$this->lines[$pos] = $line;
$this->lines_id_index_mapper[$line->id] = $pos;
@@ -1338,7 +1342,7 @@ class Contrat extends CommonObject
// Check parameters
if ($fk_product <= 0 && empty($desc))
{
- $this->error="DescRequiredForFreeProductLines";
+ $this->error="ErrorDescRequiredForFreeProductLines";
return -1;
}
@@ -1465,49 +1469,39 @@ class Contrat extends CommonObject
{
$contractlineid = $this->db->last_insert_id(MAIN_DB_PREFIX."contratdet");
- $result=$this->update_statut($user);
- if ($result > 0)
+ if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($array_options) && count($array_options)>0) // For avoid conflicts if trigger used
{
-
- if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($array_options) && count($array_options)>0) // For avoid conflicts if trigger used
+ $contractline = new ContratLigne($this->db);
+ $contractline->array_options=$array_options;
+ $contractline->id=$contractlineid;
+ $result=$contractline->insertExtraFields();
+ if ($result < 0)
{
- $contractline = new ContratLigne($this->db);
- $contractline->array_options=$array_options;
- $contractline->id=$contractlineid;
- $result=$contractline->insertExtraFields();
- if ($result < 0)
- {
- $this->error[]=$contractline->error;
- $error++;
- }
- }
-
- if (empty($error)) {
- // Call trigger
- $result=$this->call_trigger('LINECONTRACT_INSERT',$user);
- if ($result < 0)
- {
- $error++;
- }
- // End call triggers
- }
-
- if ($error)
- {
- $this->db->rollback();
- return -1;
- }
- else
- {
- $this->db->commit();
- return $contractlineid;
+ $this->error[]=$contractline->error;
+ $error++;
}
}
- else
+
+ if (empty($error)) {
+ // Call trigger
+ $result=$this->call_trigger('LINECONTRACT_INSERT',$user);
+ if ($result < 0)
+ {
+ $error++;
+ }
+ // End call triggers
+ }
+
+ if ($error)
{
$this->db->rollback();
return -1;
}
+ else
+ {
+ $this->db->commit();
+ return $contractlineid;
+ }
}
else
{
@@ -2428,17 +2422,6 @@ class Contrat extends CommonObject
}
- if (! $notrigger && empty($error))
- {
- // Call trigger
- $clonedObj->old_copy=$this;
- $result = $clonedObj->call_trigger('CONTRACT_CLONE', $user);
- if ($result < 0) {
- $error ++;
- }
- // End call triggers
- }
-
unset($this->context['createfromclone']);
// End
@@ -3103,13 +3086,6 @@ class ContratLigne extends CommonObjectLine
{
global $langs, $conf;
- // Update object
- $this->date_ouverture = $date;
- $this->date_fin_validite = $date_end;
- $this->fk_user_ouverture = $user->id;
- $this->date_cloture = null;
- $this->commentaire = $comment;
-
$error = 0;
$this->db->begin();
@@ -3127,15 +3103,26 @@ class ContratLigne extends CommonObjectLine
if ($resql) {
// Call trigger
$result = $this->call_trigger('LINECONTRACT_ACTIVATE', $user);
- if ($result < 0) {
- $error++;
+ if ($result < 0) $error++;
+ // End call triggers
+
+ if (! $error)
+ {
+ $this->statut = 4;
+ $this->date_ouverture = $date;
+ $this->date_fin_validite = $date_end;
+ $this->fk_user_ouverture = $user->id;
+ $this->date_cloture = null;
+ $this->commentaire = $comment;
+
+ $this->db->commit();
+ return 1;
+ }
+ else
+ {
$this->db->rollback();
return -1;
}
- // End call triggers
-
- $this->db->commit();
- return 1;
} else {
$this->error = $this->db->lasterror();
$this->db->rollback();
@@ -3149,9 +3136,10 @@ class ContratLigne extends CommonObjectLine
* @param User $user Objet User who close contract
* @param int $date_end Date end
* @param string $comment A comment typed by user
+ * @param int $notrigger 1=Does not execute triggers, 0=Execute triggers
* @return int <0 if KO, >0 if OK
*/
- function close_line($user, $date_end, $comment = '')
+ function close_line($user, $date_end, $comment = '', $notrigger=0)
{
global $langs, $conf;
@@ -3173,15 +3161,19 @@ class ContratLigne extends CommonObjectLine
$sql .= " WHERE rowid = " . $this->id . " AND statut = 4";
$resql = $this->db->query($sql);
- if ($resql) {
- // Call trigger
- $result = $this->call_trigger('LINECONTRACT_CLOSE', $user);
- if ($result < 0) {
- $error++;
- $this->db->rollback();
- return -1;
+ if ($resql)
+ {
+ if (! $notrigger)
+ {
+ // Call trigger
+ $result = $this->call_trigger('LINECONTRACT_CLOSE', $user);
+ if ($result < 0) {
+ $error++;
+ $this->db->rollback();
+ return -1;
+ }
+ // End call triggers
}
- // End call triggers
$this->db->commit();
return 1;
diff --git a/htdocs/contrat/list.php b/htdocs/contrat/list.php
index cdafbd6c2fd..babc31f7702 100644
--- a/htdocs/contrat/list.php
+++ b/htdocs/contrat/list.php
@@ -775,24 +775,18 @@ if ($resql)
print '';
- if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files)
- {
- /*
- * Show list of available documents
- */
- $urlsource=$_SERVER['PHP_SELF'].'?sortfield='.$sortfield.'&sortorder='.$sortorder;
- $urlsource.=str_replace('&','&',$param);
+ $hidegeneratedfilelistifempty=1;
+ if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files) $hidegeneratedfilelistifempty=0;
- $filedir=$diroutputmassaction;
- $genallowed=$user->rights->contrat->lire;
- $delallowed=$user->rights->contrat->lire;
+ // Show list of available documents
+ $urlsource=$_SERVER['PHP_SELF'].'?sortfield='.$sortfield.'&sortorder='.$sortorder;
+ $urlsource.=str_replace('&','&',$param);
- print $formfile->showdocuments('massfilesarea_contract','',$filedir,$urlsource,0,$delallowed,'',1,1,0,48,1,$param,$title,'');
- }
- else
- {
- print ' '.$langs->trans("ShowTempMassFilesArea").'';
- }
+ $filedir=$diroutputmassaction;
+ $genallowed=$user->rights->contrat->lire;
+ $delallowed=$user->rights->contrat->lire;
+
+ print $formfile->showdocuments('massfilesarea_contract','',$filedir,$urlsource,0,$delallowed,'',1,1,0,48,1,$param,$title,'','','',null,$hidegeneratedfilelistifempty);
}
else
{
diff --git a/htdocs/core/actions_massactions.inc.php b/htdocs/core/actions_massactions.inc.php
index b08993acf8a..fae976dec80 100644
--- a/htdocs/core/actions_massactions.inc.php
+++ b/htdocs/core/actions_massactions.inc.php
@@ -46,7 +46,7 @@ if (! empty($massaction) && count($toselect) < 1)
$error++;
setEventMessages($langs->trans("NoRecordSelected"), null, "warnings");
}
-if (! $error && count($toselect) > $maxformassaction)
+if (! $error && is_array($toselect) && count($toselect) > $maxformassaction)
{
setEventMessages($langs->trans('TooManyRecordForMassAction',$maxformassaction), null, 'errors');
$error++;
diff --git a/htdocs/core/boxes/box_members.php b/htdocs/core/boxes/box_members.php
index 25fa257d098..e5819f0f14c 100644
--- a/htdocs/core/boxes/box_members.php
+++ b/htdocs/core/boxes/box_members.php
@@ -88,7 +88,7 @@ class box_members extends ModeleBoxes
$sql.= " a.datec, a.tms, a.statut as status, a.datefin as date_end_subscription,";
$sql.= " t.subscription";
$sql.= " FROM ".MAIN_DB_PREFIX."adherent as a, ".MAIN_DB_PREFIX."adherent_type as t";
- $sql.= " WHERE a.entity = ".$conf->entity;
+ $sql.= " WHERE a.entity IN (".getEntity('member').")";
$sql.= " AND a.fk_adherent_type = t.rowid";
$sql.= " ORDER BY a.tms DESC";
$sql.= $db->plimit($max, 0);
diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php
index aeca3d5a102..f5a16aa540b 100644
--- a/htdocs/core/class/commondocgenerator.class.php
+++ b/htdocs/core/class/commondocgenerator.class.php
@@ -203,7 +203,7 @@ abstract class CommonDocGenerator
require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
$extrafields = new ExtraFields($this->db);
$extralabels = $extrafields->fetch_name_optionals_label('societe',true);
- $object->fetch_optionals($object->id,$extralabels);
+ $object->fetch_optionals();
foreach($extrafields->attribute_label as $key=>$label)
{
@@ -274,7 +274,7 @@ abstract class CommonDocGenerator
require_once DOL_DOCUMENT_ROOT . '/core/class/extrafields.class.php';
$extrafields = new ExtraFields($this->db);
$extralabels = $extrafields->fetch_name_optionals_label('socpeople', true);
- $object->fetch_optionals($object->id, $extralabels);
+ $object->fetch_optionals();
foreach($extrafields->attribute_label as $key => $label)
{
@@ -316,6 +316,14 @@ abstract class CommonDocGenerator
'current_server_datehour_locale'=>dol_print_date($now,'dayhour','tzserver',$outputlangs),
);
+
+ foreach($conf->global as $key => $val)
+ {
+ if (preg_match('/(_pass|password|secret|_key|key$)/i', $keyfound)) $newval = '*****forbidden*****';
+ else $newval = $val;
+ $array_other['__['.$key.']__'] = $newval;
+ }
+
return $array_other;
}
@@ -345,17 +353,19 @@ abstract class CommonDocGenerator
$sumcreditnote = $object->getSumCreditNotesUsed();
}
+ $date = ($object->element == 'contrat' ? $object->date_contrat : $object->date);
+
$resarray=array(
$array_key.'_id'=>$object->id,
$array_key.'_ref'=>$object->ref,
$array_key.'_ref_ext'=>$object->ref_ext,
- $array_key.'_ref_customer'=>$object->ref_client,
- $array_key.'_ref_supplier'=>(! empty($object->ref_fournisseur)?$object->ref_fournisseur:''),
+ $array_key.'_ref_customer'=>(! empty($object->ref_client) ? $object->ref_client : (empty($object->ref_customer) ? '' : $object->ref_customer)),
+ $array_key.'_ref_supplier'=>(! empty($object->ref_fournisseur) ? $object->ref_fournisseur : (empty($object->ref_supplier) ? '' : $object->ref_supplier)),
$array_key.'_source_invoice_ref'=>$invoice_source->ref,
// Dates
- $array_key.'_hour'=>dol_print_date($object->date,'hour'),
- $array_key.'_date'=>dol_print_date($object->date,'day'),
- $array_key.'_date_rfc'=>dol_print_date($object->date,'dayrfc'),
+ $array_key.'_hour'=>dol_print_date($date,'hour'),
+ $array_key.'_date'=>dol_print_date($date,'day'),
+ $array_key.'_date_rfc'=>dol_print_date($date,'dayrfc'),
$array_key.'_date_limit'=>(! empty($object->date_lim_reglement)?dol_print_date($object->date_lim_reglement,'day'):''),
$array_key.'_date_end'=>(! empty($object->fin_validite)?dol_print_date($object->fin_validite,'day'):''),
$array_key.'_date_creation'=>dol_print_date($object->date_creation,'day'),
@@ -457,7 +467,7 @@ abstract class CommonDocGenerator
require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
$extrafields = new ExtraFields($this->db);
$extralabels = $extrafields->fetch_name_optionals_label($extrafieldkey,true);
- $object->fetch_optionals($object->id,$extralabels);
+ $object->fetch_optionals();
$resarray = $this->fill_substitutionarray_with_extrafields($object,$resarray,$extrafields,$array_key,$outputlangs);
}
@@ -524,7 +534,7 @@ abstract class CommonDocGenerator
require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
$extrafields = new ExtraFields($this->db);
$extralabels = $extrafields->fetch_name_optionals_label($extrafieldkey,true);
- $line->fetch_optionals($line->rowid,$extralabels);
+ $line->fetch_optionals();
$resarray = $this->fill_substitutionarray_with_extrafields($line,$resarray,$extrafields,$array_key=$array_key,$outputlangs);
@@ -592,7 +602,7 @@ abstract class CommonDocGenerator
require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
$extrafields = new ExtraFields($this->db);
$extralabels = $extrafields->fetch_name_optionals_label('shipment',true);
- $object->fetch_optionals($object->id,$extralabels);
+ $object->fetch_optionals();
$array_shipment = $this->fill_substitutionarray_with_extrafields($object,$array_shipment,$extrafields,$array_key,$outputlangs);
}*/
diff --git a/htdocs/core/class/commoninvoice.class.php b/htdocs/core/class/commoninvoice.class.php
index c629c6021b4..5b032eb94a3 100644
--- a/htdocs/core/class/commoninvoice.class.php
+++ b/htdocs/core/class/commoninvoice.class.php
@@ -451,7 +451,7 @@ abstract class CommonInvoice extends CommonObject
{
if ($status == 0) return img_picto($langs->trans('BillStatusDraft'),'statut0').' '.$langs->trans('Bill'.$prefix.'StatusDraft');
if (($status == 3 || $status == 2) && $alreadypaid <= 0) return img_picto($langs->trans('StatusCanceled'),'statut5').' '.$langs->trans('Bill'.$prefix.'StatusCanceled');
- if (($status == 3 || $status == 2) && $alreadypaid > 0) return img_picto($langs->trans('BillStatusClosedPaidPartially'),'statut7').' '.$langs->trans('Bill'.$prefix.'StatusClosedPaidPartially');
+ if (($status == 3 || $status == 2) && $alreadypaid > 0) return img_picto($langs->trans('BillStatusClosedPaidPartially'),'statut9').' '.$langs->trans('Bill'.$prefix.'StatusClosedPaidPartially');
if ($alreadypaid <= 0) return img_picto($langs->trans('BillStatusNotPaid'),'statut1').' '.$langs->trans('Bill'.$prefix.'StatusNotPaid');
return img_picto($langs->trans('BillStatusStarted'),'statut3').' '.$langs->trans('Bill'.$prefix.'StatusStarted');
}
@@ -469,7 +469,7 @@ abstract class CommonInvoice extends CommonObject
{
if ($status == 0) return img_picto($langs->trans('BillStatusDraft'),'statut0');
if (($status == 3 || $status == 2) && $alreadypaid <= 0) return img_picto($langs->trans('BillStatusCanceled'),'statut5');
- if (($status == 3 || $status == 2) && $alreadypaid > 0) return img_picto($langs->trans('BillStatusClosedPaidPartially'),'statut7');
+ if (($status == 3 || $status == 2) && $alreadypaid > 0) return img_picto($langs->trans('BillStatusClosedPaidPartially'),'statut9');
if ($alreadypaid <= 0) return img_picto($langs->trans('BillStatusNotPaid'),'statut1');
return img_picto($langs->trans('BillStatusStarted'),'statut3');
}
@@ -487,7 +487,7 @@ abstract class CommonInvoice extends CommonObject
{
if ($status == 0) return img_picto($langs->trans('BillStatusDraft'),'statut0').' '.$langs->trans('BillStatusDraft');
if (($status == 3 || $status == 2) && $alreadypaid <= 0) return img_picto($langs->trans('BillStatusCanceled'),'statut5').' '.$langs->trans('Bill'.$prefix.'StatusCanceled');
- if (($status == 3 || $status == 2) && $alreadypaid > 0) return img_picto($langs->trans('BillStatusClosedPaidPartially'),'statut7').' '.$langs->trans('Bill'.$prefix.'StatusClosedPaidPartially');
+ if (($status == 3 || $status == 2) && $alreadypaid > 0) return img_picto($langs->trans('BillStatusClosedPaidPartially'),'statut9').' '.$langs->trans('Bill'.$prefix.'StatusClosedPaidPartially');
if ($alreadypaid <= 0) return img_picto($langs->trans('BillStatusNotPaid'),'statut1').' '.$langs->trans('BillStatusNotPaid');
return img_picto($langs->trans('BillStatusStarted'),'statut3').' '.$langs->trans('BillStatusStarted');
}
@@ -506,7 +506,7 @@ abstract class CommonInvoice extends CommonObject
{
if ($status == 0) return ''.$langs->trans('Bill'.$prefix.'StatusDraft').' '.img_picto($langs->trans('BillStatusDraft'),'statut0');
if (($status == 3 || $status == 2) && $alreadypaid <= 0) return ''.$langs->trans('Bill'.$prefix.'StatusCanceled').' '.img_picto($langs->trans('BillStatusCanceled'),'statut5');
- if (($status == 3 || $status == 2) && $alreadypaid > 0) return ''.$langs->trans('Bill'.$prefix.'StatusClosedPaidPartially').' '.img_picto($langs->trans('BillStatusClosedPaidPartially'),'statut7');
+ if (($status == 3 || $status == 2) && $alreadypaid > 0) return ''.$langs->trans('Bill'.$prefix.'StatusClosedPaidPartially').' '.img_picto($langs->trans('BillStatusClosedPaidPartially'),'statut9');
if ($alreadypaid <= 0)
{
if ($type == self::TYPE_CREDIT_NOTE) return ''.$langs->trans('Bill'.$prefix.'StatusNotRefunded').' '.img_picto($langs->trans('StatusNotRefunded'),'statut1');
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 5abf5e3a0e1..d08d5df3f78 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -1231,7 +1231,7 @@ abstract class CommonObject
}
/**
- * Charge le projet d'id $this->fk_project dans this->projet
+ * Load the project with id $this->fk_project into this->project
*
* @return int <0 if KO, >=0 if OK
*/
@@ -1251,7 +1251,25 @@ abstract class CommonObject
}
/**
- * Charge le user d'id userid dans this->user
+ * Load the product with id $this->fk_product into this->product
+ *
+ * @return int <0 if KO, >=0 if OK
+ */
+ function fetch_product()
+ {
+ include_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+
+ if (empty($this->fk_product)) return 0;
+
+ $product = new Product($this->db);
+ $result = $product->fetch($this->fk_product);
+
+ $this->product = $product;
+ return $result;
+ }
+
+ /**
+ * Load the user with id $userid into this->user
*
* @param int $userid Id du contact
* @return int <0 if KO, >0 if OK
@@ -3670,8 +3688,7 @@ abstract class CommonObject
foreach ($this->lines as $line)
{
//Line extrafield
- $line->fetch_optionals($line->id,$extralabelslines);
-
+ $line->fetch_optionals();
//if (is_object($hookmanager) && (($line->product_type == 9 && ! empty($line->special_code)) || ! empty($line->fk_parent_line)))
@@ -4123,6 +4140,7 @@ abstract class CommonObject
* @param int $hideref 1 to hide product reference. 0 by default
* @param null|array $moreparams Array to provide more information
* @return int >0 if OK, <0 if KO
+ * @see addFileIntoDatabaseIndex
*/
protected function commonGenerateDocument($modelspath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams=null)
{
@@ -4361,6 +4379,7 @@ abstract class CommonObject
/**
* Build thumb
+ * @TODO Move this into files.lib.php
*
* @param string $file Path file in UTF8 to original file to create thumbs from.
* @return void
@@ -4487,7 +4506,7 @@ abstract class CommonObject
if (! is_array($optionsArray))
{
// If $extrafields is not a known object, we initialize it. Best practice is to have $extrafields defined into card.php or list.php page.
- // TODO Use of existing extrafield is not yet ready (must mutualize code that use extrafields in form first)
+ // TODO Use of existing $extrafield is not yet ready (must mutualize code that use extrafields in form first)
// global $extrafields;
//if (! is_object($extrafields))
//{
@@ -4502,6 +4521,10 @@ abstract class CommonObject
}
$optionsArray = $extrafields->attributes[$this->table_element]['label'];
}
+ else
+ {
+ dol_syslog("Warning: fetch_optionals was called with param optionsArray defined when you should pass null now", LOG_WARNING);
+ }
$table_element = $this->table_element;
if ($table_element == 'categorie') $table_element = 'categories'; // For compatibility
@@ -4535,7 +4558,17 @@ abstract class CommonObject
if ($key != 'rowid' && $key != 'tms' && $key != 'fk_member' && ! is_int($key))
{
// we can add this attribute to object
- $this->array_options["options_".$key]=$value;
+ if (! empty($extrafields) && in_array($extrafields->attributes[$this->table_element]['type'][$key], array('date','datetime')))
+ {
+ //var_dump($extrafields->attributes[$this->table_element]['type'][$key]);
+ $this->array_options["options_".$key]=$this->db->jdate($value);
+ }
+ else
+ {
+ $this->array_options["options_".$key]=$value;
+ }
+
+ //var_dump('key '.$key.' '.$value.' type='.$extrafields->attributes[$this->table_element]['type'][$key].' '.$this->array_options["options_".$key]);
}
}
}
@@ -4622,10 +4655,10 @@ abstract class CommonObject
foreach($new_array_options as $key => $value)
{
$attributeKey = substr($key,8); // Remove 'options_' prefix
- $attributeType = $extrafields->attribute_type[$attributeKey];
- $attributeLabel = $extrafields->attribute_label[$attributeKey];
- $attributeParam = $extrafields->attribute_param[$attributeKey];
- $attributeRequired = $extrafields->attribute_required[$attributeKey];
+ $attributeType = $extrafields->attributes[$this->table_element]['type'][$attributeKey];
+ $attributeLabel = $extrafields->attributes[$this->table_element]['label'][$attributeKey];
+ $attributeParam = $extrafields->attributes[$this->table_element]['param'][$attributeKey];
+ $attributeRequired = $extrafields->attributes[$this->table_element]['required'][$attributeKey];
if ($attributeRequired)
{
@@ -4658,7 +4691,43 @@ abstract class CommonObject
$this->array_options[$key] = null;
}
break;*/
- case 'price':
+ case 'password':
+ $algo='';
+ if ($this->array_options[$key] != '' && is_array($extrafields->attributes[$this->table_element]['param'][$attributeKey]['options']))
+ {
+ // If there is an encryption choice, we use it to crypt data before insert
+ $algo=reset(array_keys($extrafields->attributes[$this->table_element]['param'][$attributeKey]['options']));
+ if ($algo != '')
+ {
+ //global $action; // $action may be 'create', 'update', 'update_extras'...
+ //var_dump($action);
+ //var_dump($this->oldcopy);exit;
+ if (is_object($this->oldcopy)) // If this->oldcopy is not defined, we can't know if we change attribute or not, so we must keep value
+ {
+ //var_dump($this->oldcopy->array_options[$key]); var_dump($this->array_options[$key]);
+ if ($this->array_options[$key] == $this->oldcopy->array_options[$key]) // If old value crypted in database is same than submited new value, it means we don't change it, so we don't update.
+ {
+ $new_array_options[$key] = $this->array_options[$key]; // Value is kept
+ }
+ else
+ {
+ // var_dump($algo);
+ $newvalue = dol_hash($this->array_options[$key], $algo);
+ $new_array_options[$key] = $newvalue;
+ }
+ }
+ else
+ {
+ $new_array_options[$key] = $this->array_options[$key]; // Value is kept
+ }
+ }
+ }
+ else // Common usage
+ {
+ $new_array_options[$key] = $this->array_options[$key];
+ }
+ break;
+ case 'price':
$new_array_options[$key] = price2num($this->array_options[$key]);
break;
case 'date':
@@ -4716,7 +4785,7 @@ abstract class CommonObject
{
$attributeKey = substr($key,8); // Remove 'options_' prefix
// Add field of attribut
- if ($extrafields->attribute_type[$attributeKey] != 'separate') // Only for other type of separate
+ if ($extrafields->attributes[$this->table_element]['type'][$attributeKey] != 'separate') // Only for other type than separator
$sql.=",".$attributeKey;
}
$sql .= ") VALUES (".$this->id;
@@ -4724,8 +4793,8 @@ abstract class CommonObject
foreach($new_array_options as $key => $value)
{
$attributeKey = substr($key,8); // Remove 'options_' prefix
- // Add field o fattribut
- if($extrafields->attribute_type[$attributeKey] != 'separate') // Only for other type of separate)
+ // Add field of attribute
+ if ($extrafields->attributes[$this->table_element]['type'][$attributeKey] != 'separate') // Only for other type than separator)
{
if ($new_array_options[$key] != '')
{
@@ -4774,7 +4843,7 @@ abstract class CommonObject
* Update an exta field value for the current object.
* Data to describe values to update are stored into $this->array_options=array('options_codeforfield1'=>'valueforfield1', 'options_codeforfield2'=>'valueforfield2', ...)
*
- * @param string $key Key of the extrafield
+ * @param string $key Key of the extrafield (without starting 'options_')
* @param string $trigger If defined, call also the trigger (for example COMPANY_MODIFY)
* @param User $userused Object user
* @return int -1=error, O=did nothing, 1=OK
@@ -4799,9 +4868,12 @@ abstract class CommonObject
$target_extrafields=$extrafields->fetch_name_optionals_label($this->table_element);
$value=$this->array_options["options_".$key];
- $attributeType = $extrafields->attribute_type[$key];
- $attributeLabel = $extrafields->attribute_label[$key];
- $attributeParam = $extrafields->attribute_param[$key];
+
+ $attributeType = $extrafields->attributes[$this->table_element]['type'][$key];
+ $attributeLabel = $extrafields->attributes[$this->table_element]['label'][$key];
+ $attributeParam = $extrafields->attributes[$this->table_element]['param'][$key];
+ $attributeRequired = $extrafields->attributes[$this->table_element]['required'][$key];
+
switch ($attributeType)
{
case 'int':
@@ -4831,7 +4903,7 @@ abstract class CommonObject
$this->array_options["options_".$key]=$this->db->idate($this->array_options["options_".$key]);
break;
case 'link':
- $param_list=array_keys($attributeParam ['options']);
+ $param_list=array_keys($attributeParam['options']);
// 0 : ObjectName
// 1 : classPath
$InfoFieldList = explode(":", $param_list[0]);
diff --git a/htdocs/core/class/ctyperesource.class.php b/htdocs/core/class/ctyperesource.class.php
index 1de616210e4..a5a6ea879ce 100644
--- a/htdocs/core/class/ctyperesource.class.php
+++ b/htdocs/core/class/ctyperesource.class.php
@@ -48,14 +48,14 @@ class Ctyperesource
/**
*/
-
+
public $code;
public $label;
public $active;
/**
*/
-
+
/**
* Constructor
@@ -82,7 +82,7 @@ class Ctyperesource
$error = 0;
// Clean parameters
-
+
if (isset($this->code)) {
$this->code = trim($this->code);
}
@@ -93,26 +93,26 @@ class Ctyperesource
$this->active = trim($this->active);
}
-
+
// Check parameters
// Put here code to add control on parameters values
// Insert request
$sql = 'INSERT INTO ' . MAIN_DB_PREFIX . $this->table_element . '(';
-
+
$sql.= 'code,';
$sql.= 'label';
$sql.= 'active';
-
+
$sql .= ') VALUES (';
-
+
$sql .= ' '.(! isset($this->code)?'NULL':"'".$this->db->escape($this->code)."'").',';
$sql .= ' '.(! isset($this->label)?'NULL':"'".$this->db->escape($this->label)."'").',';
$sql .= ' '.(! isset($this->active)?'NULL':$this->active);
-
+
$sql .= ')';
$this->db->begin();
@@ -165,18 +165,18 @@ class Ctyperesource
$sql = 'SELECT';
$sql .= ' t.rowid,';
-
+
$sql .= " t.code,";
$sql .= " t.label,";
$sql .= " t.active";
-
+
$sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element . ' as t';
if ($id) $sql.= " WHERE t.id = ".$id;
elseif ($code) $sql.= " WHERE t.code = '".$this->db->escape($code)."'";
elseif ($label) $sql.= " WHERE t.label = '".$this->db->escape($label)."'";
-
-
+
+
$resql = $this->db->query($sql);
if ($resql) {
$numrows = $this->db->num_rows($resql);
@@ -184,25 +184,20 @@ class Ctyperesource
$obj = $this->db->fetch_object($resql);
$this->id = $obj->rowid;
-
+
$this->code = $obj->code;
$this->label = $obj->label;
$this->active = $obj->active;
-
+
}
-
+
// Retrieve all extrafields for invoice
// fetch optionals attributes and labels
- /*
- require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
- $extrafields=new ExtraFields($this->db);
- $extralabels=$extrafields->fetch_name_optionals_label($this->table_element,true);
- $this->fetch_optionals($this->id,$extralabels);
- */
-
+ // $this->fetch_optionals();
+
// $this->fetch_lines();
-
+
$this->db->free($resql);
if ($numrows) {
@@ -236,12 +231,12 @@ class Ctyperesource
$sql = 'SELECT';
$sql .= ' t.rowid,';
-
+
$sql .= " t.code,";
$sql .= " t.label,";
$sql .= " t.active";
-
+
$sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element. ' as t';
// Manage filter
@@ -251,7 +246,7 @@ class Ctyperesource
$sqlwhere [] = $key . ' LIKE \'%' . $this->db->escape($value) . '%\'';
}
}
-
+
if (count($sqlwhere) > 0) {
$sql .= ' WHERE ' . implode(' '.$filtermode.' ', $sqlwhere);
}
@@ -270,12 +265,12 @@ class Ctyperesource
$line = new self($this->db);
$line->id = $obj->rowid;
-
+
$line->code = $obj->code;
$line->label = $obj->label;
$line->active = $obj->active;
-
+
}
$this->db->free($resql);
@@ -303,7 +298,7 @@ class Ctyperesource
dol_syslog(__METHOD__, LOG_DEBUG);
// Clean parameters
-
+
if (isset($this->code)) {
$this->code = trim($this->code);
}
@@ -319,12 +314,12 @@ class Ctyperesource
// Update request
$sql = 'UPDATE ' . MAIN_DB_PREFIX . $this->table_element . ' SET';
-
+
$sql .= ' code = '.(isset($this->code)?"'".$this->db->escape($this->code)."'":"null").',';
$sql .= ' label = '.(isset($this->label)?"'".$this->db->escape($this->label)."'":"null").',';
$sql .= ' active = '.(isset($this->active)?$this->active:"null");
-
+
$sql .= ' WHERE rowid=' . $this->id;
$this->db->begin();
@@ -387,7 +382,7 @@ class Ctyperesource
}
// If you need to delete child tables to, you can insert them here
-
+
if (!$error) {
$sql = 'DELETE FROM ' . MAIN_DB_PREFIX . $this->table_element;
$sql .= ' WHERE rowid=' . $this->id;
@@ -468,7 +463,7 @@ class Ctyperesource
public function initAsSpecimen()
{
$this->id = 0;
-
+
$this->code = '';
$this->label = '';
$this->active = '';
@@ -488,7 +483,7 @@ class CtyperesourceLine
/**
* @var mixed Sample line property 1
*/
-
+
public $code;
public $label;
public $active;
@@ -496,5 +491,5 @@ class CtyperesourceLine
/**
* @var mixed Sample line property 2
*/
-
+
}
diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index a127ce706e9..db0e7f4284a 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -234,7 +234,7 @@ class ExtraFields
$lengthdb='11';
} elseif($type=='password') {
$typedb='varchar';
- $lengthdb='50';
+ $lengthdb='128';
} else {
$typedb=$type;
$lengthdb=$length;
@@ -1404,12 +1404,12 @@ class ExtraFields
if ($type == 'date')
{
$showsize=10;
- $value=dol_print_date($value, 'day', 'tzuser');
+ $value=dol_print_date($value, 'day');
}
elseif ($type == 'datetime')
{
$showsize=19;
- $value=dol_print_date($value, 'dayhour', 'tzuser');
+ $value=dol_print_date($value, 'dayhour');
}
elseif ($type == 'int')
{
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index aafe9b81cc1..806446cfdc1 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -3653,7 +3653,7 @@ class Form
$more.='
';
$more.='
'.$input['label'].'
';
$more.='
* Copyright (C) 2010-2012 Regis Houssin
- * Copyright (C) 2010 Juanjo Menent
+ * Copyright (C) 2010-2018 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
@@ -194,9 +194,12 @@ class FormActions
$projectid = $object->fk_project;
if ($typeelement == 'project') $projectid = $object->id;
- $buttontoaddnewevent = '';
- $buttontoaddnewevent.= $langs->trans("AddEvent");
- $buttontoaddnewevent.= '';
+ if (! empty($conf->agenda->enabled))
+ {
+ $buttontoaddnewevent = '';
+ $buttontoaddnewevent.= $langs->trans("AddEvent");
+ $buttontoaddnewevent.= '';
+ }
print ''."\n";
print load_fiche_titre($title, $buttontoaddnewevent, '', 0, 0, '', $morehtmlright);
diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index eded41be053..b139483b610 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -277,17 +277,18 @@ class FormFile
* @param string $codelang Default language code to use on lang combo box if multilang is enabled
* @param string $morepicto Add more HTML content into cell with picto
* @param Object $object Object when method is called from an object card.
+ * @param int $hideifempty Hide section of generated files if there is no file
* @return string Output string with HTML array of documents (might be empty string)
*/
- function showdocuments($modulepart,$modulesubdir,$filedir,$urlsource,$genallowed,$delallowed=0,$modelselected='',$allowgenifempty=1,$forcenomultilang=0,$iconPDF=0,$notused=0,$noform=0,$param='',$title='',$buttonlabel='',$codelang='',$morepicto='',$object=null)
+ function showdocuments($modulepart,$modulesubdir,$filedir,$urlsource,$genallowed,$delallowed=0,$modelselected='',$allowgenifempty=1,$forcenomultilang=0,$iconPDF=0,$notused=0,$noform=0,$param='',$title='',$buttonlabel='',$codelang='',$morepicto='',$object=null,$hideifempty=0)
{
// Deprecation warning
- if (0 !== $iconPDF) {
+ if (! empty($iconPDF)) {
dol_syslog(__METHOD__ . ": passing iconPDF parameter is deprecated", LOG_WARNING);
}
global $langs, $conf, $user, $hookmanager;
- global $form, $bc;
+ global $form;
if (! is_object($form)) $form=new Form($this->db);
@@ -305,9 +306,17 @@ class FormFile
}
$hookmanager->initHooks(array('formfile'));
- $forname='builddoc';
- $out='';
+ // Get list of files
+ $file_list=null;
+ if (! empty($filedir))
+ {
+ $file_list=dol_dir_list($filedir,'files',0,'','(\.meta|_preview.*.*\.png)$','date',SORT_DESC);
+ }
+ if ($hideifempty && empty($file_list)) return '';
+
+ $out='';
+ $forname='builddoc';
$headershown=0;
$showempty=0;
$i=0;
@@ -678,8 +687,6 @@ class FormFile
// Get list of files
if (! empty($filedir))
{
- $file_list=dol_dir_list($filedir,'files',0,'','(\.meta|_preview.*.*\.png)$','date',SORT_DESC);
-
$link_list = array();
if (is_object($object))
{
@@ -949,7 +956,6 @@ class FormFile
function list_of_documents($filearray,$object,$modulepart,$param='',$forcedownload=0,$relativepath='',$permonobject=1,$useinecm=0,$textifempty='',$maxlength=0,$title='',$url='', $showrelpart=0, $permtoeditline=-1,$upload_dir='',$sortfield='',$sortorder='ASC', $disablemove=1, $addfilterfields=0)
{
global $user, $conf, $langs, $hookmanager;
- global $bc,$bcdd;
global $sortfield, $sortorder, $maxheightmini;
global $dolibarr_main_url_root;
@@ -1322,7 +1328,6 @@ class FormFile
function list_of_autoecmfiles($upload_dir, $filearray, $modulepart, $param, $forcedownload=0, $relativepath='', $permtodelete=1, $useinecm=0, $textifempty='', $maxlength=0, $url='', $addfilterfields=0)
{
global $user, $conf, $langs, $form;
- global $bc;
global $sortfield, $sortorder;
global $search_doc_ref;
@@ -1543,7 +1548,7 @@ class FormFile
if (count($filearray) == 0)
{
- print '
';
+ print '
';
if (empty($textifempty)) print $langs->trans("NoFileFound");
else print $textifempty;
print '
';
@@ -1600,7 +1605,6 @@ class FormFile
public function listOfLinks($object, $permtodelete=1, $action=null, $selected=null, $param='')
{
global $user, $conf, $langs, $user;
- global $bc;
global $sortfield, $sortorder;
$langs->load("link");
@@ -1712,7 +1716,7 @@ class FormFile
}
if ($nboflinks == 0)
{
- print '
Example to reload object (($reloadedobj = new Societe($db)) && ($reloadedobj->fetch($obj->id ? $obj->id : ($obj->rowid ? $obj->rowid : $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5 : '-1'
Other example of formula to force load of object and its parent object: (($reloadedobj = new Task($db)) && ($reloadedobj->fetch($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetch($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref : 'Parent project not found'
+ExtrafieldParamHelpPassword=Keep this field empty means value will be stored without encryption (field must be only hidden with star on screen). Set here value 'auto' to use the default encryption rule to save password into database (then value read will be the hash only, no way to retreive original value)
ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')
for example : 1,value1 2,value2 code3,value3 ...
In order to have the list depending on another complementary attribute list : 1,value1|options_parent_list_code:parent_key 2,value2|options_parent_list_code:parent_key
In order to have the list depending on another list : 1,value1|parent_list_code:parent_key 2,value2|parent_list_code:parent_key
ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')
for example : 1,value1 2,value2 3,value3 ...
ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')
for example : 1,value1 2,value2 3,value3 ...
@@ -885,6 +886,7 @@ DictionaryRevenueStamp=Amount of revenue stamps
DictionaryPaymentConditions=Payment terms
DictionaryPaymentModes=Payment modes
DictionaryTypeContact=Contact/Address types
+DictionaryTypeOfContainer=Type of website pages/containers
DictionaryEcotaxe=Ecotax (WEEE)
DictionaryPaperFormat=Paper formats
DictionaryFormatCards=Cards formats
@@ -1765,6 +1767,8 @@ MAIN_PDF_MARGIN_LEFT=Left margin on PDF
MAIN_PDF_MARGIN_RIGHT=Right margin on PDF
MAIN_PDF_MARGIN_TOP=Top margin on PDF
MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
+SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
+EnterCalculationRuleIfPreviousFieldIsYes=Enter calculcation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
##### Resource ####
ResourceSetup=Configuration du module Resource
UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
diff --git a/htdocs/langs/en_US/cron.lang b/htdocs/langs/en_US/cron.lang
index 7f3385bef12..8947fcc47ac 100644
--- a/htdocs/langs/en_US/cron.lang
+++ b/htdocs/langs/en_US/cron.lang
@@ -74,7 +74,8 @@ CronFrom=From
CronType=Job type
CronType_method=Call method of a PHP Class
CronType_command=Shell command
-CronCannotLoadClass=Cannot load class %s or object %s
+CronCannotLoadClass=Cannot load class file %s (to use class %s)
+CronCannotLoadObject=Class file %s was loaded, but object %s was not found into it
UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled jobs" to see and edit scheduled jobs.
JobDisabled=Job disabled
MakeLocalDatabaseDumpShort=Local database backup
diff --git a/htdocs/langs/en_US/ecm.lang b/htdocs/langs/en_US/ecm.lang
index fe5600004ed..588044f18df 100644
--- a/htdocs/langs/en_US/ecm.lang
+++ b/htdocs/langs/en_US/ecm.lang
@@ -39,6 +39,7 @@ ShowECMSection=Show directory
DeleteSection=Remove directory
ConfirmDeleteSection=Can you confirm you want to delete the directory %s?
ECMDirectoryForFiles=Relative directory for files
+CannotRemoveDirectoryContainsFilesOrDirs=Removed not possible because it contains some files or sub-directories
CannotRemoveDirectoryContainsFiles=Removed not possible because it contains some files
ECMFileManager=File manager
ECMSelectASection=Select a directory in the tree...
diff --git a/htdocs/langs/en_US/errors.lang b/htdocs/langs/en_US/errors.lang
index f87a30ecfb2..86460452286 100644
--- a/htdocs/langs/en_US/errors.lang
+++ b/htdocs/langs/en_US/errors.lang
@@ -207,6 +207,7 @@ ErrorDiscountLargerThanRemainToPaySplitItBefore=The discount you try to apply is
ErrorFileNotFoundWithSharedLink=File was not found. May be the share key was modified or file was removed recently.
ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference.
ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
+ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
# Warnings
WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index cde8a485e59..0fd9fe52b3e 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -334,6 +334,7 @@ PriceUHTCurrency=U.P (currency)
PriceUTTC=U.P. (inc. tax)
Amount=Amount
AmountInvoice=Invoice amount
+AmountInvoiced=Amount invoiced
AmountPayment=Payment amount
AmountHTShort=Amount (net)
AmountTTCShort=Amount (inc. tax)
@@ -854,6 +855,7 @@ FileNotShared=File not shared to exernal public
Project=Project
Projects=Projects
Rights=Permissions
+LineNb=Line nb
# Week day
Monday=Monday
Tuesday=Tuesday
diff --git a/htdocs/langs/en_US/other.lang b/htdocs/langs/en_US/other.lang
index 1585504479e..c4cb693716d 100644
--- a/htdocs/langs/en_US/other.lang
+++ b/htdocs/langs/en_US/other.lang
@@ -22,6 +22,8 @@ JumpToLogin=Disconnected. Go to login page...
MessageForm=Message on online payment form
MessageOK=Message on validated payment return page
MessageKO=Message on canceled payment return page
+ContentOfDirectoryIsNotEmpty=Content of this directory is not empty.
+DeleteAlsoContentRecursively=Check to delete all content recursiveley
YearOfInvoice=Year of invoice date
PreviousYearOfInvoice=Previous year of invoice date
diff --git a/htdocs/langs/en_US/projects.lang b/htdocs/langs/en_US/projects.lang
index ab044618556..5f71b230537 100644
--- a/htdocs/langs/en_US/projects.lang
+++ b/htdocs/langs/en_US/projects.lang
@@ -55,6 +55,7 @@ TasksOnOpenedProject=Tasks on open projects
WorkloadNotDefined=Workload not defined
NewTimeSpent=Time spent
MyTimeSpent=My time spent
+BillTime=Bill the time spent
Tasks=Tasks
Task=Task
TaskDateStart=Task start date
@@ -91,6 +92,7 @@ ListDonationsAssociatedProject=List of donations associated with the project
ListVariousPaymentsAssociatedProject=List of miscellaneous payments associated with the project
ListActionsAssociatedProject=List of events associated with the project
ListTaskTimeUserProject=List of time consumed on tasks of project
+ListTaskTimeForTask=List of time consumed on task
ActivityOnProjectToday=Activity on project today
ActivityOnProjectYesterday=Activity on project yesterday
ActivityOnProjectThisWeek=Activity on project this week
diff --git a/htdocs/langs/en_US/website.lang b/htdocs/langs/en_US/website.lang
index df799470b6d..a4c7d9e0211 100644
--- a/htdocs/langs/en_US/website.lang
+++ b/htdocs/langs/en_US/website.lang
@@ -4,6 +4,7 @@ WebsiteSetupDesc=Create here as much entry as number of different websites you n
DeleteWebsite=Delete website
ConfirmDeleteWebsite=Are you sure you want to delete this web site. All its pages and content will also be removed.
WEBSITE_TYPE_CONTAINER=Type of page/container
+WEBSITE_PAGE_EXAMPLE=Web page to use as example
WEBSITE_PAGENAME=Page name/alias
WEBSITE_CSS_URL=URL of external CSS file
WEBSITE_CSS_INLINE=CSS file content (common to all pages)
@@ -34,9 +35,12 @@ ViewPageInNewTab=View page in new tab
SetAsHomePage=Set as Home page
RealURL=Real URL
ViewWebsiteInProduction=View web site using home URLs
-SetHereVirtualHost=If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on %s then enter here the virtual hostname you have created, so the preview can be done also using this direct web server access, and not only using Dolibarr server.
-PreviewSiteServedByWebServer=Preview %s in a new tab.
The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory: %s URL served by external server: %s
-PreviewSiteServedByDolibarr=Preview %s in a new tab.
The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed. The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr. URL served by Dolibarr: %s
To use your own external web server to serve this web site, create a virtual host on your web server that point on directory %s then enter the name of this virtual server and click on the other preview button.
+SetHereVirtualHost=If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on %s then enter here the virtual hostname you have created, so the preview can be done also using this dedicated web server access instead of only using Dolibarr server.
+CheckVirtualHostPerms=Check also that virtual host has %s on files into %s
+ReadPerm=Read permission
+WritePerm=Write permission
+PreviewSiteServedByWebServer=Preview %s in a new tab.
The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory: %s URL served by external server: %s
+PreviewSiteServedByDolibarr=Preview %s in a new tab.
The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed. The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr. URL served by Dolibarr: %s
To use your own external web server to serve this web site, create a virtual host on your web server that point on directory %s then enter the name of this virtual server and click on the other preview button.
VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
NoPageYet=No pages yet
SyntaxHelp=Help on specific syntax tips
@@ -73,4 +77,6 @@ GrabImagesInto=Grab also images found into css and page.
ImagesShouldBeSavedInto=Images should be saved into directory
WebsiteRootOfImages=Root directory for website images
SubdirOfPage=Sub-directory dedicated to page
-AliasPageAlreadyExists=Alias page %s already exists
\ No newline at end of file
+AliasPageAlreadyExists=Alias page %s already exists
+CorporateHomePage=Corporate Home page
+EmptyPage=Empty page
\ No newline at end of file
diff --git a/htdocs/livraison/card.php b/htdocs/livraison/card.php
index b0de98ae2eb..0e61adcb279 100644
--- a/htdocs/livraison/card.php
+++ b/htdocs/livraison/card.php
@@ -165,7 +165,7 @@ if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->expeditio
{
$db->commit();
if (! empty($backtopage)) header("Location: ".$backtopage);
- else header("Location: ".DOL_URL_ROOT.'/expedition/index.php');
+ else header("Location: ".DOL_URL_ROOT.'/expedition/list.php?restore_lastsearch_values=1');
exit;
}
else
@@ -193,9 +193,11 @@ elseif ($action == 'set_incoterms' && !empty($conf->incoterm->enabled))
// Update extrafields
if ($action == 'update_extras')
{
+ $object->oldcopy = dol_clone($object);
+
// Fill array 'array_options' with data from update form
$extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
- $ret = $extrafields->setOptionalsFromPost($extralabels, $object, GETPOST('attribute'));
+ $ret = $extrafields->setOptionalsFromPost($extralabels, $object, GETPOST('attribute', 'none'));
if ($ret < 0) $error++;
if (! $error)
@@ -206,7 +208,7 @@ if ($action == 'update_extras')
$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();
+ $result = $object->insertExtraFields('DELIVERY_MODIFY');
if ($result < 0)
{
setEventMessages($object->error, $object->errors, 'errors');
@@ -571,7 +573,7 @@ else
// copy from expedition
$expeditionExtrafields = new Extrafields($db);
$expeditionExtrafieldLabels = $expeditionExtrafields->fetch_name_optionals_label($expedition->table_element);
- if ($expedition->fetch_optionals($object->origin_id, $expeditionExtrafieldLabels) > 0) {
+ if ($expedition->fetch_optionals($object->origin_id) > 0) {
$object->array_options = array_merge($object->array_options, $expedition->array_options);
}
}
@@ -674,12 +676,12 @@ else
$colspan=2;
$mode = ($object->statut == 0) ? 'edit' : 'view';
$line = new LivraisonLigne($db);
- $line->fetch_optionals($object->lines[$i]->id,$extralabelslines);
+ $line->fetch_optionals($object->lines[$i]->id);
if ($action = 'create_delivery') {
$srcLine = new ExpeditionLigne($db);
$expeditionLineExtrafields = new Extrafields($db);
$expeditionLineExtrafieldLabels = $expeditionLineExtrafields->fetch_name_optionals_label($srcLine->table_element);
- $srcLine->fetch_optionals($expedition->lines[$i]->id,$expeditionLineExtrafieldLabels);
+ $srcLine->fetch_optionals($expedition->lines[$i]->id);
$line->array_options = array_merge($line->array_options, $srcLine->array_options);
}
print '
';
diff --git a/htdocs/livraison/class/livraison.class.php b/htdocs/livraison/class/livraison.class.php
index 837b0af77f5..d0d24d39144 100644
--- a/htdocs/livraison/class/livraison.class.php
+++ b/htdocs/livraison/class/livraison.class.php
@@ -301,13 +301,9 @@ class Livraison extends CommonObject
if ($this->statut == 0) $this->brouillon = 1;
-
- // Retrieve all extrafields for delivery
+ // Retreive all extrafield
// fetch optionals attributes and labels
- require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
- $extrafields=new ExtraFields($this->db);
- $extralabels=$extrafields->fetch_name_optionals_label($this->table_element,true);
- $this->fetch_optionals($this->id,$extralabels);
+ $this->fetch_optionals();
/*
* Lignes
diff --git a/htdocs/modulebuilder/template/admin/about.php b/htdocs/modulebuilder/template/admin/about.php
index b6584f8d909..c34574791c1 100644
--- a/htdocs/modulebuilder/template/admin/about.php
+++ b/htdocs/modulebuilder/template/admin/about.php
@@ -42,14 +42,10 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
require_once '../lib/mymodule.lib.php';
// Translations
-$langs->load("errors");
-$langs->load("admin");
-$langs->load("mymodule@mymodule");
+$langs->loadLangs(array("errors","admin","mymodule@mymodule"));
// Access control
-if (! $user->admin) {
- accessforbidden();
-}
+if (! $user->admin) accessforbidden();
// Parameters
$action = GETPOST('action', 'alpha');
@@ -73,7 +69,7 @@ $page_name = "MyModuleAbout";
llxHeader('', $langs->trans($page_name));
// Subheader
-$linkback = ''.$langs->trans("BackToModuleList").'';
+$linkback = ''.$langs->trans("BackToModuleList").'';
print load_fiche_titre($langs->trans($page_name), $linkback, 'object_mymodule@mymodule');
diff --git a/htdocs/modulebuilder/template/admin/setup.php b/htdocs/modulebuilder/template/admin/setup.php
index 19908d33546..58a572a42ac 100644
--- a/htdocs/modulebuilder/template/admin/setup.php
+++ b/htdocs/modulebuilder/template/admin/setup.php
@@ -71,7 +71,7 @@ $page_name = "MyModuleSetup";
llxHeader('', $langs->trans($page_name));
// Subheader
-$linkback = ''.$langs->trans("BackToModuleList").'';
+$linkback = ''.$langs->trans("BackToModuleList").'';
print load_fiche_titre($langs->trans($page_name), $linkback, 'object_mymodule@mymodule');
diff --git a/htdocs/modulebuilder/template/class/actions_mymodule.class.php b/htdocs/modulebuilder/template/class/actions_mymodule.class.php
index b0265a28e3f..e11925f075f 100644
--- a/htdocs/modulebuilder/template/class/actions_mymodule.class.php
+++ b/htdocs/modulebuilder/template/class/actions_mymodule.class.php
@@ -175,7 +175,7 @@ class ActionsMyModule
*/
function beforePDFCreation($parameters, &$object, &$action)
{
- global $langs,$conf;
+ global $conf, $user, $langs;
global $hookmanager;
$outputlangs=$langs;
@@ -204,7 +204,7 @@ class ActionsMyModule
*/
function afterPDFCreation($parameters, &$pdfhandler, &$action)
{
- global $langs,$conf;
+ global $conf, $user, $langs;
global $hookmanager;
$outputlangs=$langs;
diff --git a/htdocs/modulebuilder/template/core/modules/modMyModule.class.php b/htdocs/modulebuilder/template/core/modules/modMyModule.class.php
index 1d8ba3dace6..eea2a85e656 100644
--- a/htdocs/modulebuilder/template/core/modules/modMyModule.class.php
+++ b/htdocs/modulebuilder/template/core/modules/modMyModule.class.php
@@ -53,7 +53,7 @@ class modMyModule extends DolibarrModules
// Key text used to identify module (for permissions, menus, etc...)
$this->rights_class = 'mymodule';
- // Family can be 'crm','financial','hr','projects','products','ecm','technic','interface','other'
+ // Family can be 'base' (core modules),'crm','financial','hr','projects','products','ecm','technic' (transverse modules),'interface' (link with external tools),'other','...'
// It is used to group modules by family in module setup page
$this->family = "other";
// Module position in the family on 2 digits ('01', '10', '20', ...)
diff --git a/htdocs/modulebuilder/template/core/triggers/interface_99_modMyModule_MyModuleTriggers.class.php b/htdocs/modulebuilder/template/core/triggers/interface_99_modMyModule_MyModuleTriggers.class.php
index e413c969119..f9984e8fb40 100644
--- a/htdocs/modulebuilder/template/core/triggers/interface_99_modMyModule_MyModuleTriggers.class.php
+++ b/htdocs/modulebuilder/template/core/triggers/interface_99_modMyModule_MyModuleTriggers.class.php
@@ -151,13 +151,13 @@ class InterfaceMyModuleTriggers extends DolibarrTriggers
case 'STOCK_MOVEMENT':
//MYECMDIR
- case 'MYECMDIR_DELETE':
case 'MYECMDIR_CREATE':
case 'MYECMDIR_MODIFY':
+ case 'MYECMDIR_DELETE':
// Customer orders
case 'ORDER_CREATE':
- case 'ORDER_CLONE':
+ case 'ORDER_MODIFY':
case 'ORDER_VALIDATE':
case 'ORDER_DELETE':
case 'ORDER_CANCEL':
@@ -170,7 +170,7 @@ class InterfaceMyModuleTriggers extends DolibarrTriggers
// Supplier orders
case 'ORDER_SUPPLIER_CREATE':
- case 'ORDER_SUPPLIER_CLONE':
+ case 'ORDER_SUPPLIER_MODIFY':
case 'ORDER_SUPPLIER_VALIDATE':
case 'ORDER_SUPPLIER_DELETE':
case 'ORDER_SUPPLIER_APPROVE':
@@ -184,7 +184,6 @@ class InterfaceMyModuleTriggers extends DolibarrTriggers
// Proposals
case 'PROPAL_CREATE':
- case 'PROPAL_CLONE':
case 'PROPAL_MODIFY':
case 'PROPAL_VALIDATE':
case 'PROPAL_SENTBYMAIL':
@@ -197,7 +196,6 @@ class InterfaceMyModuleTriggers extends DolibarrTriggers
// SupplierProposal
case 'SUPPLIER_PROPOSAL_CREATE':
- case 'SUPPLIER_PROPOSAL_CLONE':
case 'SUPPLIER_PROPOSAL_MODIFY':
case 'SUPPLIER_PROPOSAL_VALIDATE':
case 'SUPPLIER_PROPOSAL_SENTBYMAIL':
@@ -210,8 +208,8 @@ class InterfaceMyModuleTriggers extends DolibarrTriggers
// Contracts
case 'CONTRACT_CREATE':
- case 'CONTRACT_ACTIVATE':
case 'CONTRACT_MODIFY':
+ case 'CONTRACT_ACTIVATE':
case 'CONTRACT_CANCEL':
case 'CONTRACT_CLOSE':
case 'CONTRACT_DELETE':
@@ -221,7 +219,6 @@ class InterfaceMyModuleTriggers extends DolibarrTriggers
// Bills
case 'BILL_CREATE':
- case 'BILL_CLONE':
case 'BILL_MODIFY':
case 'BILL_VALIDATE':
case 'BILL_UNVALIDATE':
diff --git a/htdocs/modulebuilder/template/myobject_card.php b/htdocs/modulebuilder/template/myobject_card.php
index bc1e9fc7d51..a82ec237006 100644
--- a/htdocs/modulebuilder/template/myobject_card.php
+++ b/htdocs/modulebuilder/template/myobject_card.php
@@ -228,7 +228,7 @@ if (($id || $ref) && $action == 'edit')
// Part to show record
if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'create')))
{
- $res = $object->fetch_optionals($object->id, $extralabels);
+ $res = $object->fetch_optionals();
$head = myobjectPrepareHead($object);
dol_fiche_head($head, 'card', $langs->trans("MyObject"), -1, 'myobject@mymodule');
diff --git a/htdocs/modulebuilder/template/myobject_list.php b/htdocs/modulebuilder/template/myobject_list.php
index 23a748a12dc..2ef8fa97030 100644
--- a/htdocs/modulebuilder/template/myobject_list.php
+++ b/htdocs/modulebuilder/template/myobject_list.php
@@ -422,7 +422,7 @@ foreach($object->fields as $key => $val)
// Extra fields
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
// Hook fields
-$parameters=array('arrayfields'=>$arrayfields);
+$parameters=array('arrayfields'=>$arrayfields,'param'=>$param,'sortfield'=>$sortfield,'sortorder'=>$sortorder);
$reshook=$hookmanager->executeHooks('printFieldListTitle', $parameters, $object); // Note that $action and $object may have been modified by hook
print $hookmanager->resPrint;
print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"],'','','','align="center"',$sortfield,$sortorder,'maxwidthsearch ')."\n";
@@ -542,25 +542,21 @@ print ''."\n";
if (in_array('builddoc',$arrayofmassactions) && ($nbtotalofrecords === '' || $nbtotalofrecords))
{
- if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files)
- {
- require_once(DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php');
- $formfile = new FormFile($db);
+ $hidegeneratedfilelistifempty=1;
+ if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files) $hidegeneratedfilelistifempty=0;
- // Show list of available documents
- $urlsource=$_SERVER['PHP_SELF'].'?sortfield='.$sortfield.'&sortorder='.$sortorder;
- $urlsource.=str_replace('&','&',$param);
+ require_once(DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php');
+ $formfile = new FormFile($db);
- $filedir=$diroutputmassaction;
- $genallowed=$user->rights->mymodule->read;
- $delallowed=$user->rights->mymodule->create;
+ // Show list of available documents
+ $urlsource=$_SERVER['PHP_SELF'].'?sortfield='.$sortfield.'&sortorder='.$sortorder;
+ $urlsource.=str_replace('&','&',$param);
- print $formfile->showdocuments('massfilesarea_mymodule','',$filedir,$urlsource,0,$delallowed,'',1,1,0,48,1,$param,$title,'');
- }
- else
- {
- print ' '.$langs->trans("ShowTempMassFilesArea").'';
- }
+ $filedir=$diroutputmassaction;
+ $genallowed=$user->rights->mymodule->read;
+ $delallowed=$user->rights->mymodule->create;
+
+ print $formfile->showdocuments('massfilesarea_mymodule','',$filedir,$urlsource,0,$delallowed,'',1,1,0,48,1,$param,$title,'','','',null,$hidegeneratedfilelistifempty);
}
// End of page
diff --git a/htdocs/product/admin/product.php b/htdocs/product/admin/product.php
index 06cfc0e0eac..a51d19f5b97 100644
--- a/htdocs/product/admin/product.php
+++ b/htdocs/product/admin/product.php
@@ -129,7 +129,7 @@ if ($action == 'other')
}
- $value = GETPOST('activate_sousproduits','alpha');
+ $value = GETPOST('PRODUIT_SOUSPRODUITS','alpha');
$res = dolibarr_set_const($db, "PRODUIT_SOUSPRODUITS", $value,'chaine',0,'',$conf->entity);
$value = GETPOST('activate_viewProdDescInForm','alpha');
@@ -580,7 +580,7 @@ if (! empty($conf->global->PRODUIT_MULTIPRICES))
print '