';
print '';
print '
| '.$form->textwithpicto($langs->trans("Filters"), $langs->trans("EmailCollectorFilterDesc")).' | '; + print ' | '.img_picto('', 'filter', 'class="pictofixedwidth"').$form->textwithpicto($langs->trans("Filters"), $langs->trans("EmailCollectorFilterDesc")).' | '; print ' | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| '.$form->textwithpicto($langs->trans("EmailcollectorOperations"), $langs->trans("EmailcollectorOperationsDesc")).' | '; + print ' | '.img_picto('', 'technic', 'class="pictofixedwidth"').$form->textwithpicto($langs->trans("EmailcollectorOperations"), $langs->trans("EmailcollectorOperationsDesc")).' | '; print ' | |||||||||||||||||||
';
print '';
- print $langs->trans($arrayoftypes[$ruleaction['type']]);
+ if (array_key_exists($ruleaction['type'], $arrayoftypes)) {
+ print $langs->trans($arrayoftypes[$ruleaction['type']]);
+ } else {
+ if (array_key_exists($ruleaction['type'], $arrayoftypesnocondition)) {
+ print ''.$langs->trans($arrayoftypesnocondition[$ruleaction['type']]).' - '.$langs->trans("Disabled").'';
+ }
+ }
+
if (in_array($ruleaction['type'], array('recordevent'))) {
print $form->textwithpicto('', $langs->transnoentitiesnoconv('IfTrackingIDFoundEventWillBeLinked'));
} elseif (in_array($ruleaction['type'], array('loadthirdparty', 'loadandcreatethirdparty'))) {
diff --git a/htdocs/admin/system/index.php b/htdocs/admin/system/index.php
deleted file mode 100644
index cfb73b0c24e..00000000000
--- a/htdocs/admin/system/index.php
+++ /dev/null
@@ -1,119 +0,0 @@
-
- * Copyright (C) 2004-2011 Laurent Destailleur
\n"; - -print '
\n"; - -// Serveur web -print '
\n"; - -// Php -print '
\n"; - -// Database -print '
'; - -// Browser -print '
'; - - -//print " \n"; -print info_admin($langs->trans("SystemInfoDesc")).' '; - -// End of page -llxFooter(); -$db->close(); diff --git a/htdocs/admin/triggers.php b/htdocs/admin/triggers.php index 5ea74205c9c..a1f8496ad6d 100644 --- a/htdocs/admin/triggers.php +++ b/htdocs/admin/triggers.php @@ -70,10 +70,10 @@ print ' | ||||||||||||||||||||||
| '.$trigger['picto'].' | '; - print ''.$trigger['file'].' | '; - print ''.$trigger['status'].' | '; - print ''; + print ' | '.$trigger['picto'].' | '; + print ''.$trigger['file'].' | '; + print ''.$trigger['status'].' | '; + print '';
$text = $trigger['info'];
$text .= " \n".$langs->trans("File").": \n".$trigger['relpath']; //$text.="\n".$langs->trans("ExternalModule",$trigger['isocreorexternal']); diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php index fa1dfb93c7a..bc3441a6dc2 100644 --- a/htdocs/contact/class/contact.class.php +++ b/htdocs/contact/class/contact.class.php @@ -1404,9 +1404,10 @@ class Contact extends CommonObject $result = ''; $label = ''; if (!empty($this->photo) && class_exists('Form')) { - $label .= ' ';
- $label .= Form::showphoto('contact', $this, 0, 40, 0, '', 'mini', 0); // Important, we must force height so image will have height tags and if image is inside a tooltip, the tooltip manager can calculate height and position correctly the tooltip.
- $label .= ' ';
+ $label .= '';
+ $label .= Form::showphoto('contact', $this, 0, 40, 0, 'photoref', 'mini', 0); // Important, we must force height so image will have height tags and if image is inside a tooltip, the tooltip manager can calculate height and position correctly the tooltip.
+ $label .= ' ';
+ //$label .= '';
}
$label .= img_picto('', $this->picto).' '.$langs->trans("Contact").'';
diff --git a/htdocs/core/ajax/onlineSign.php b/htdocs/core/ajax/onlineSign.php
index bf484dc1c45..5110918541f 100644
--- a/htdocs/core/ajax/onlineSign.php
+++ b/htdocs/core/ajax/onlineSign.php
@@ -60,12 +60,15 @@ $SECUREKEY = GETPOST("securekey"); // Secure key
$error = 0;
$response = "";
-// Check securitykey
-$securekeyseed = $conf->global->PROPOSAL_ONLINE_SIGNATURE_SECURITY_TOKEN;
$type = $mode;
-$calculatedsecuritykey = dol_hash($securekeyseed.$type.$ref, '0');
-if ($calculatedsecuritykey != $SECUREKEY) {
+// Check securitykey
+$securekeyseed = '';
+if ($type == 'proposal') {
+ $securekeyseed = $conf->global->PROPOSAL_ONLINE_SIGNATURE_SECURITY_TOKEN;
+}
+
+if (!dol_verifyHash($securekeyseed.$type.$ref, $SECUREKEY, '0')) {
http_response_code(403);
print 'Bad value for securitykey. Value provided '.dol_escape_htmltag($SECUREKEY).' does not match expected value for ref='.dol_escape_htmltag($ref);
exit(-1);
@@ -110,24 +113,39 @@ if ($action == "importSignature") {
$return = file_put_contents($upload_dir.$filename, $data);
if ($return == false) {
$error++;
- $response = 'error file_put_content';
+ $response = 'Error file_put_content: failed to create signature file.';
}
}
if (!$error) {
+ $newpdffilename = $upload_dir.$ref."_signed-".$date.".pdf";
+
$pdf = pdf_getInstance();
$pdf->Open();
$pdf->AddPage();
- $pagecount = $pdf->setSourceFile($upload_dir.$ref.".pdf");
+ $pagecount = $pdf->setSourceFile($upload_dir.$ref.".pdf"); // original PDF
$tppl = $pdf->importPage(1);
$pdf->useTemplate($tppl);
- $pdf->Image($upload_dir.$filename, 129, 239.6, 60, 15);
+ $pdf->Image($upload_dir.$filename, 129, 239.6, 60, 15); // FIXME Position will be wrong with non A4 format. Use a value from width and height of page minus relative offset.
$pdf->Close();
- $pdf->Output($upload_dir.$ref."_signed-".$date.".pdf", "F");
+ $pdf->Output($newpdffilename, "F");
+
+ $db->begin();
+
+ // Index the new file and update the last_main_doc property of object.
+ $object->indexFile($newpdffilename, 1);
+
+ $online_sign_ip = getUserRemoteIP();
+ $online_sign_name = ''; // TODO Ask name on form to sign
$sql = "UPDATE ".MAIN_DB_PREFIX."propal";
- $sql .= " SET fk_statut = ".((int) $object::STATUS_SIGNED).", note_private = '".$object->note_private."', date_signature='".$db->idate(dol_now())."'";
+ $sql .= " SET fk_statut = ".((int) $object::STATUS_SIGNED).", note_private = '".$db->escape($object->note_private)."',";
+ $sql .= " date_signature = '".$db->idate(dol_now())."',";
+ $sql .= " online_sign_ip = '".$db->escape($online_sign_ip)."'";
+ if ($online_sign_name) {
+ $sql .= ", online_sign_name = '".$db->escape($online_sign_name)."'";
+ }
$sql .= " WHERE rowid = ".((int) $object->id);
dol_syslog(__METHOD__, LOG_DEBUG);
diff --git a/htdocs/core/class/commoninvoice.class.php b/htdocs/core/class/commoninvoice.class.php
index 8ce7fb24aeb..74ff2141820 100644
--- a/htdocs/core/class/commoninvoice.class.php
+++ b/htdocs/core/class/commoninvoice.class.php
@@ -811,6 +811,64 @@ abstract class CommonInvoice extends CommonObject
return -1;
}
}
+
+
+ /**
+ * Build string for ZATCA QR Code (Arabi Saudia)
+ *
+ * @return string String for ZATCA QR Code
+ */
+ public function buildZATCAQRString()
+ {
+ global $conf;
+
+ $tmplang = new Translate('', $conf);
+ $tmplang->setDefaultLang('en_US');
+ $tmplang->load("main");
+
+ $datestring = dol_print_date($this->date, 'dayhourrfc');
+ $pricewithtaxstring = price($this->total_ttc, 0, $tmplang, 0, -1, 2);
+ $pricetaxstring = price($this->total_tva, 0, $tmplang, 0, -1, 2);
+
+ /*
+ $name = implode(unpack("H*", $this->thirdparty->name));
+ $vatnumber = implode(unpack("H*", $this->thirdparty->tva_intra));
+ $date = implode(unpack("H*", $datestring));
+ $pricewithtax = implode(unpack("H*", price2num($pricewithtaxstring, 2)));
+ $pricetax = implode(unpack("H*", $pricetaxstring));
+
+ var_dump(strlen($this->thirdparty->name));
+ var_dump(str_pad(dechex('9'), 2, '0', STR_PAD_LEFT));
+ var_dump($this->thirdparty->name);
+ var_dump(implode(unpack("H*", $this->thirdparty->name)));
+ var_dump(price($this->total_tva, 0, $tmplang, 0, -1, 2));
+
+ $s = '01'.str_pad(dechex(strlen($this->thirdparty->name)), 2, '0', STR_PAD_LEFT).$name;
+ $s .= '02'.str_pad(dechex(strlen($this->thirdparty->tva_intra)), 2, '0', STR_PAD_LEFT).$vatnumber;
+ $s .= '03'.str_pad(dechex(strlen($datestring)), 2, '0', STR_PAD_LEFT).$date;
+ $s .= '04'.str_pad(dechex(strlen($pricewithtaxstring)), 2, '0', STR_PAD_LEFT).$pricewithtax;
+ $s .= '05'.str_pad(dechex(strlen($pricetaxstring)), 2, '0', STR_PAD_LEFT).$pricetax;
+ $s .= ''; // Hash of xml invoice
+ $s .= ''; // ecda signature
+ $s .= ''; // ecda public key
+ $s .= ''; // ecda signature of public key stamp
+ */
+
+ // Using TLV format
+ $s = pack('C1', 1).pack('C1', strlen($this->thirdparty->name)).$this->thirdparty->name;
+ $s .= pack('C1', 2).pack('C1', strlen($this->thirdparty->tva_intra)).$this->thirdparty->tva_intra;
+ $s .= pack('C1', 3).pack('C1', strlen($datestring)).$date;
+ $s .= pack('C1', 4).pack('C1', strlen($pricewithtaxstring)).$pricewithtaxstring;
+ $s .= pack('C1', 5).pack('C1', strlen($pricetaxstring)).$pricetaxstring;
+ $s .= ''; // Hash of xml invoice
+ $s .= ''; // ecda signature
+ $s .= ''; // ecda public key
+ $s .= ''; // ecda signature of public key stamp
+
+ $s = base64_encode($s);
+
+ return $s;
+ }
}
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index a7e1693472b..7de04ab0d14 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -5292,103 +5292,14 @@ abstract class CommonObject
// Index file in database
if (!empty($obj->result['fullpath'])) {
$destfull = $obj->result['fullpath'];
- $upload_dir = dirname($destfull);
- $destfile = basename($destfull);
- $rel_dir = preg_replace('/^'.preg_quote(DOL_DATA_ROOT, '/').'/', '', $upload_dir);
- if (!preg_match('/[\\/]temp[\\/]|[\\/]thumbs|\.meta$/', $rel_dir)) { // If not a tmp dir
- $filename = basename($destfile);
- $rel_dir = preg_replace('/[\\/]$/', '', $rel_dir);
- $rel_dir = preg_replace('/^[\\/]/', '', $rel_dir);
-
- include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
- $ecmfile = new EcmFiles($this->db);
- $result = $ecmfile->fetch(0, '', ($rel_dir ? $rel_dir.'/' : '').$filename);
-
- // Set the public "share" key
- $setsharekey = false;
- if ($this->element == 'propal') {
- $useonlinesignature = 1; // Replace this with 1 when feature to make online signature is ok
- if ($useonlinesignature) {
- $setsharekey = true;
- }
- if (!empty($conf->global->PROPOSAL_ALLOW_EXTERNAL_DOWNLOAD)) {
- $setsharekey = true;
- }
- }
- if ($this->element == 'commande' && !empty($conf->global->ORDER_ALLOW_EXTERNAL_DOWNLOAD)) {
- $setsharekey = true;
- }
- if ($this->element == 'facture' && !empty($conf->global->INVOICE_ALLOW_EXTERNAL_DOWNLOAD)) {
- $setsharekey = true;
- }
- if ($this->element == 'bank_account' && !empty($conf->global->BANK_ACCOUNT_ALLOW_EXTERNAL_DOWNLOAD)) {
- $setsharekey = true;
- }
- if ($this->element == 'contrat' && !empty($conf->global->CONTRACT_ALLOW_EXTERNAL_DOWNLOAD)) {
- $setsharekey = true;
- }
- if ($this->element == 'supplier_proposal' && !empty($conf->global->SUPPLIER_PROPOSAL_ALLOW_EXTERNAL_DOWNLOAD)) {
- $setsharekey = true;
- }
-
- if ($setsharekey) {
- if (empty($ecmfile->share)) { // Because object not found or share not set yet
- require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
- $ecmfile->share = getRandomPassword(true);
- }
- }
-
- if ($result > 0) {
- $ecmfile->label = md5_file(dol_osencode($destfull)); // hash of file content
- $ecmfile->fullpath_orig = '';
- $ecmfile->gen_or_uploaded = 'generated';
- $ecmfile->description = ''; // indexed content
- $ecmfile->keywords = ''; // keyword content
- $result = $ecmfile->update($user);
- if ($result < 0) {
- setEventMessages($ecmfile->error, $ecmfile->errors, 'warnings');
- }
- } else {
- $ecmfile->entity = $conf->entity;
- $ecmfile->filepath = $rel_dir;
- $ecmfile->filename = $filename;
- $ecmfile->label = md5_file(dol_osencode($destfull)); // hash of file content
- $ecmfile->fullpath_orig = '';
- $ecmfile->gen_or_uploaded = 'generated';
- $ecmfile->description = ''; // indexed content
- $ecmfile->keywords = ''; // keyword content
- $ecmfile->src_object_type = $this->table_element; // $this->table_name is 'myobject' or 'mymodule_myobject'.
- $ecmfile->src_object_id = $this->id;
-
- $result = $ecmfile->create($user);
- if ($result < 0) {
- setEventMessages($ecmfile->error, $ecmfile->errors, 'warnings');
- }
- }
-
- /*$this->result['fullname']=$destfull;
- $this->result['filepath']=$ecmfile->filepath;
- $this->result['filename']=$ecmfile->filename;*/
- //var_dump($obj->update_main_doc_field);exit;
-
- // Update the last_main_doc field into main object (if document generator has property ->update_main_doc_field set)
- $update_main_doc_field = 0;
- if (!empty($obj->update_main_doc_field)) {
- $update_main_doc_field = 1;
- }
- if ($update_main_doc_field && !empty($this->table_element)) {
- $sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET last_main_doc = '".$this->db->escape($ecmfile->filepath."/".$ecmfile->filename)."'";
- $sql .= " WHERE rowid = ".((int) $this->id);
-
- $resql = $this->db->query($sql);
- if (!$resql) {
- dol_print_error($this->db);
- } else {
- $this->last_main_doc = $ecmfile->filepath.'/'.$ecmfile->filename;
- }
- }
+ // Update the last_main_doc field into main object (if document generator has property ->update_main_doc_field set)
+ $update_main_doc_field = 0;
+ if (!empty($obj->update_main_doc_field)) {
+ $update_main_doc_field = 1;
}
+
+ $this->indexFile($destfull, $update_main_doc_field);
} else {
dol_syslog('Method ->write_file was called on object '.get_class($obj).' and return a success but the return array ->result["fullpath"] was not set.', LOG_WARNING);
}
@@ -5417,6 +5328,115 @@ abstract class CommonObject
}
}
+ /**
+ * Index a file into the ECM database
+ *
+ * @param string $destfull Full path of file to index
+ * @param int $update_main_doc_field Update field main_doc file into table of object
+ * @return int <0 if KO, >0 if OK
+ */
+ public function indexFile($destfull, $update_main_doc_field)
+ {
+ global $conf, $user;
+
+ $upload_dir = dirname($destfull);
+ $destfile = basename($destfull);
+ $rel_dir = preg_replace('/^'.preg_quote(DOL_DATA_ROOT, '/').'/', '', $upload_dir);
+
+ if (!preg_match('/[\\/]temp[\\/]|[\\/]thumbs|\.meta$/', $rel_dir)) { // If not a tmp dir
+ $filename = basename($destfile);
+ $rel_dir = preg_replace('/[\\/]$/', '', $rel_dir);
+ $rel_dir = preg_replace('/^[\\/]/', '', $rel_dir);
+
+ include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
+ $ecmfile = new EcmFiles($this->db);
+ $result = $ecmfile->fetch(0, '', ($rel_dir ? $rel_dir.'/' : '').$filename);
+
+ // Set the public "share" key
+ $setsharekey = false;
+ if ($this->element == 'propal' || $this->element == 'proposal') {
+ if (!isset($conf->global->PROPOSAL_ALLOW_ONLINESIGN) || !empty($conf->global->PROPOSAL_ALLOW_ONLINESIGN)) {
+ $setsharekey = true; // feature to make online signature is not set or set to on (default)
+ }
+ if (!empty($conf->global->PROPOSAL_ALLOW_EXTERNAL_DOWNLOAD)) {
+ $setsharekey = true;
+ }
+ }
+ if ($this->element == 'commande' && !empty($conf->global->ORDER_ALLOW_EXTERNAL_DOWNLOAD)) {
+ $setsharekey = true;
+ }
+ if ($this->element == 'facture' && !empty($conf->global->INVOICE_ALLOW_EXTERNAL_DOWNLOAD)) {
+ $setsharekey = true;
+ }
+ if ($this->element == 'bank_account' && !empty($conf->global->BANK_ACCOUNT_ALLOW_EXTERNAL_DOWNLOAD)) {
+ $setsharekey = true;
+ }
+ if ($this->element == 'contrat' && !empty($conf->global->CONTRACT_ALLOW_EXTERNAL_DOWNLOAD)) {
+ $setsharekey = true;
+ }
+ if ($this->element == 'supplier_proposal' && !empty($conf->global->SUPPLIER_PROPOSAL_ALLOW_EXTERNAL_DOWNLOAD)) {
+ $setsharekey = true;
+ }
+
+ if ($setsharekey) {
+ if (empty($ecmfile->share)) { // Because object not found or share not set yet
+ require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
+ $ecmfile->share = getRandomPassword(true);
+ }
+ }
+
+ if ($result > 0) {
+ $ecmfile->label = md5_file(dol_osencode($destfull)); // hash of file content
+ $ecmfile->fullpath_orig = '';
+ $ecmfile->gen_or_uploaded = 'generated';
+ $ecmfile->description = ''; // indexed content
+ $ecmfile->keywords = ''; // keyword content
+ $result = $ecmfile->update($user);
+ if ($result < 0) {
+ setEventMessages($ecmfile->error, $ecmfile->errors, 'warnings');
+ return -1;
+ }
+ } else {
+ $ecmfile->entity = $conf->entity;
+ $ecmfile->filepath = $rel_dir;
+ $ecmfile->filename = $filename;
+ $ecmfile->label = md5_file(dol_osencode($destfull)); // hash of file content
+ $ecmfile->fullpath_orig = '';
+ $ecmfile->gen_or_uploaded = 'generated';
+ $ecmfile->description = ''; // indexed content
+ $ecmfile->keywords = ''; // keyword content
+ $ecmfile->src_object_type = $this->table_element; // $this->table_name is 'myobject' or 'mymodule_myobject'.
+ $ecmfile->src_object_id = $this->id;
+
+ $result = $ecmfile->create($user);
+ if ($result < 0) {
+ setEventMessages($ecmfile->error, $ecmfile->errors, 'warnings');
+ return -1;
+ }
+ }
+
+ /*$this->result['fullname']=$destfull;
+ $this->result['filepath']=$ecmfile->filepath;
+ $this->result['filename']=$ecmfile->filename;*/
+ //var_dump($obj->update_main_doc_field);exit;
+
+ if ($update_main_doc_field && !empty($this->table_element)) {
+ $sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET last_main_doc = '".$this->db->escape($ecmfile->filepath."/".$ecmfile->filename)."'";
+ $sql .= " WHERE rowid = ".((int) $this->id);
+
+ $resql = $this->db->query($sql);
+ if (!$resql) {
+ dol_print_error($this->db);
+ return -1;
+ } else {
+ $this->last_main_doc = $ecmfile->filepath.'/'.$ecmfile->filename;
+ }
+ }
+ }
+
+ return 1;
+ }
+
/**
* Build thumb
* @todo Move this into files.lib.php
@@ -7766,7 +7786,8 @@ abstract class CommonObject
}
}
- $out .= $extrafields->showSeparator($key, $this, ($colspan + 1), $display_type);
+ // if colspan=0 or 1, the second column is not extended, so the separator must be on 2 columns
+ $out .= $extrafields->showSeparator($key, $this, ($colspan ? $colspan + 1 : 2), $display_type);
} else {
$class = (!empty($extrafields->attributes[$this->table_element]['hidden'][$key]) ? 'hideobject ' : '');
$csstyle = '';
@@ -7865,6 +7886,7 @@ abstract class CommonObject
$html_id = !empty($this->id) ? $this->element.'_extras_'.$key.'_'.$this->id : '';
if ($display_type == 'card') {
+ // a first td column was already output (and may be another on before if MAIN_VIEW_LINE_NUMBER set), so this td is the next one
$out .= ' | ';
} elseif ($display_type == 'line') {
$out .= ' ';
diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php
index 581de47178c..2b19e0db134 100644
--- a/htdocs/core/class/conf.class.php
+++ b/htdocs/core/class/conf.class.php
@@ -889,10 +889,6 @@ class Conf
$this->global->MAIN_SIZE_SHORTLIST_LIMIT = 3;
}
- if (!isset($this->global->THEME_HIDE_BORDER_ON_INPUT)) {
- $this->global->THEME_HIDE_BORDER_ON_INPUT = 0;
- }
-
// Save inconsistent option
if (empty($this->global->AGENDA_USE_EVENT_TYPE) && (!isset($this->global->AGENDA_DEFAULT_FILTER_TYPE) || $this->global->AGENDA_DEFAULT_FILTER_TYPE == 'AC_NON_AUTO')) {
$this->global->AGENDA_DEFAULT_FILTER_TYPE = '0'; // 'AC_NON_AUTO' does not exists when AGENDA_DEFAULT_FILTER_TYPE is not on.
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 89c45d4236b..d8a8bb8cb74 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -8440,7 +8440,7 @@ class Form
'order_supplier'=>array('enabled'=>$conf->supplier_order->enabled, 'perms'=>1, 'label'=>'LinkToSupplierOrder', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_supplier, t.total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."commande_fournisseur as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$this->db->sanitize($listofidcompanytoscan).') AND t.entity IN ('.getEntity('commande_fournisseur').')'),
'invoice_supplier'=>array('enabled'=>$conf->supplier_invoice->enabled, 'perms'=>1, 'label'=>'LinkToSupplierInvoice', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_supplier, t.total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."facture_fourn as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$this->db->sanitize($listofidcompanytoscan).') AND t.entity IN ('.getEntity('facture_fourn').')'),
'ticket'=>array('enabled'=>$conf->ticket->enabled, 'perms'=>1, 'label'=>'LinkToTicket', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.track_id, '0' as total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."ticket as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$this->db->sanitize($listofidcompanytoscan).') AND t.entity IN ('.getEntity('ticket').')'),
- 'mo'=>array('enabled'=>$conf->mrp->enabled, 'perms'=>1, 'label'=>'LinkToMO', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.rowid, '0' as total_ht FROM ".MAIN_DB_PREFIX."societe as s INNER JOIN ".MAIN_DB_PREFIX."mrp_mo as t ON t.fk_soc = s.rowid WHERE t.fk_soc IN (".$this->db->sanitize($listofidcompanytoscan).') AND t.entity IN ('.getEntity('mo').')')
+ 'mo'=>array('enabled'=>$conf->mrp->enabled, 'perms'=>1, 'label'=>'LinkToMo', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.rowid, '0' as total_ht FROM ".MAIN_DB_PREFIX."societe as s INNER JOIN ".MAIN_DB_PREFIX."mrp_mo as t ON t.fk_soc = s.rowid WHERE t.fk_soc IN (".$this->db->sanitize($listofidcompanytoscan).') AND t.entity IN ('.getEntity('mo').')')
);
}
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index d5a963ed586..df85c95d9f9 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -5020,7 +5020,6 @@ function print_barre_liste($titre, $page, $file, $options = '', $sortfield = '',
if ($cpt == $page) {
$pagelist .= '';
$pagelist .= '/';
- //if (($cpt + 1) < $nbpages) $pagelist .= '/';
}
} else {
if ($cpt == $page) {
@@ -5043,9 +5042,7 @@ function print_barre_liste($titre, $page, $file, $options = '', $sortfield = '',
}
} else {
//var_dump($page.' '.$cpt.' '.$nbpages);
- //if (($page + 1) < $nbpages) {
- $pagelist .= ' ';
// Define a complementary filter for search of next/prev ref.
- if (empty($user->rights->projet->all->lire)) {
+ if (empty($user->rights->project->all->lire)) {
$objectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 0);
$projectstatic->next_prev_filter = " rowid IN (".$db->sanitize(count($objectsListId) ?join(',', array_keys($objectsListId)) : '0').")";
}
@@ -275,7 +279,10 @@ if (!empty($withproject)) {
// Other attributes
$cols = 2;
- //include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
+ $objectconf = $object;
+ $object = $projectstatic;
+ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
+ $object = $objectconf;
print ''.$langs->trans('ThirdParty').' : '.$projectstatic->thirdparty->getNomUrl(1, 'project'); } $morehtmlref .= ' |
';
print '';
- print '';
+ print '';
// Description
- print '
';
print '';
@@ -473,7 +514,6 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
// Object card
// ------------------------------------------------------------
- http://dolibarr.local/eventorganization/conferenceorbooth_list.php?projectid=7
$linkback = ''.$langs->trans("BackToList").'';
$morehtmlref = '
'.$langs->trans('ThirdParty').' : '.$projectstatic->thirdparty->getNomUrl(1, 'project'); } $morehtmlref .= ''; // Define a complementary filter for search of next/prev ref. - if (empty($user->rights->projet->all->lire)) { + if (empty($user->rights->project->all->lire)) { $objectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 0); $projectstatic->next_prev_filter = " rowid IN (".$db->sanitize(count($objectsListId) ?join(',', array_keys($objectsListId)) : '0').")"; } @@ -256,7 +262,10 @@ if (!empty($withproject)) { // Other attributes $cols = 2; - //include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php'; + $objectconf = $object; + $object = $projectstatic; + include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php'; + $object = $objectconf; print '
';
@@ -265,17 +274,17 @@ if (!empty($withproject)) {
print '
| '.$langs->trans("Description").' | '; + print ' | '.$langs->trans("Description").' | '; print nl2br($projectstatic->description); print ' | '; // Categories if ($conf->categorie->enabled) { print '
| '.$langs->trans("Categories").' | '; - print $form->showCategories($projectstatic->id, 'project', 1); + print $form->showCategories($projectstatic->id, Categorie::TYPE_PROJECT, 1); print " |
| '; - print $form->editfieldkey('PriceOfRegistration', 'price_registration', '', $projectstatic, 0, 'amount', '', 0, 0, 'projectid'); + print $form->editfieldkey($form->textwithpicto($langs->trans('PriceOfBooth'), $langs->trans("PriceOfBoothHelp")), 'price_booth', '', $projectstatic, 0, 'amount', '', 0, 0, 'projectid'); print ' | '; - print $form->editfieldval('PriceOfRegistration', 'price_registration', $projectstatic->price_registration, $projectstatic, 0, 'amount', '', 0, 0, '', 0, '', 'projectid'); + print $form->editfieldval($form->textwithpicto($langs->trans('PriceOfBooth'), $langs->trans("PriceOfBoothHelp")), 'price_booth', $projectstatic->price_booth, $projectstatic, 0, 'amount', '', 0, 0, '', 0, '', 'projectid'); print " |
| '; - print $form->editfieldkey('PriceOfBooth', 'price_booth', '', $projectstatic, 0, 'amount', '', 0, 0, 'projectid'); + print $form->editfieldkey($form->textwithpicto($langs->trans('PriceOfRegistration'), $langs->trans("PriceOfRegistrationHelp")), 'price_registration', '', $projectstatic, 0, 'amount', '', 0, 0, 'projectid'); print ' | '; - print $form->editfieldval('PriceOfBooth', 'price_booth', $projectstatic->price_booth, $projectstatic, 0, 'amount', '', 0, 0, '', 0, '', 'projectid'); + print $form->editfieldval($form->textwithpicto($langs->trans('PriceOfRegistration'), $langs->trans("PriceOfRegistrationHelp")), 'price_registration', $projectstatic->price_registration, $projectstatic, 0, 'amount', '', 0, 0, '', 0, '', 'projectid'); print " |
| '.$langs->trans("EventOrganizationICSLink").' | '; @@ -332,12 +339,46 @@ if (!empty($withproject)) { $urlwithroot = $urlwithouturlroot.DOL_URL_ROOT; // Show message - $message = 'global->MAIN_AGENDA_XCAL_EXPORTKEY ?urlencode($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY) : '...'); - $message .= "&project=".$projectstatic->id.'&module='.urlencode('@eventorganization').'&status='.ConferenceOrBooth::STATUS_CONFIRMED.'">'.$langs->trans('DownloadICSLink').''; + $message = 'id.'&module='.urlencode('@eventorganization').'&status='.ConferenceOrBooth::STATUS_CONFIRMED.'">'.$langs->trans('DownloadICSLink').img_picto('', 'download', 'class="paddingleft"').''; print $message; print " |
| '; + //print ''; + print $form->textwithpicto($langs->trans("SuggestOrVoteForConfOrBooth"), $langs->trans("EvntOrgRegistrationHelpMessage")); + //print ''; + print ' | ';
+ $linksuggest = $dolibarr_main_url_root.'/public/project/index.php?id='.((int) $projectstatic->id);
+ $encodedsecurekey = dol_hash(getDolGlobalString('EVENTORGANIZATION_SECUREKEY').'conferenceorbooth'.((int) $projectstatic->id), 'md5');
+ $linksuggest .= '&securekey='.urlencode($encodedsecurekey);
+ //print ' ';
+ //print '';
+ print '';
+ print ''.img_picto('', 'globe').'';
+ //print ' ';
+ //print ajax_autoselect("linkregister");
+ print ' |
| '; + //print ''; + print $langs->trans("PublicAttendeeSubscriptionGlobalPage"); + //print ''; + print ' | ';
+ $link_subscription = $dolibarr_main_url_root.'/public/eventorganization/attendee_new.php?id='.((int) $projectstatic->id).'&type=global';
+ $encodedsecurekey = dol_hash(getDolGlobalString('EVENTORGANIZATION_SECUREKEY').'conferenceorbooth'.((int) $projectstatic->id), 'md5');
+ $link_subscription .= '&securekey='.urlencode($encodedsecurekey);
+ //print ' ';
+ //print '';
+ print '';
+ print ''.img_picto('', 'globe').'';
+ //print ' ';
+ //print ajax_autoselect("linkregister");
+ print ' |
';
@@ -491,44 +531,10 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
//$keyforbreak='fieldkeytoswitchonsecondcolumn'; // We change column just before this field
//unset($object->fields['fk_project']); // Hide field already shown in banner
//unset($object->fields['fk_soc']); // Hide field already shown in banner
- $keyforbreak='pubregister';
+ $keyforbreak='num_vote';
include DOL_DOCUMENT_ROOT.'/core/tpl/commonfields_view.tpl.php';
- $object->fetchObjectLinked();
-
- if (is_array($object->linkedObjects) && count($object->linkedObjects)>0 && array_key_exists("facture", $object->linkedObjects)) {
- foreach ($object->linkedObjects["facture"] as $fac) {
- /**
- * @var $fac Facture
- */
- if (empty($fac->paye)) {
- $key = 'paymentlink_'.$fac->id;
- print '';
- print img_picto('', 'globe').' '.$langs->trans("ToOfferALinkForOnlinePayment", $langs->transnoentitiesnoconv('Online')) . ' '. $fac->ref.'
'; - print ''; - - print '';
- $sourcetouse = 'boothlocation';
- $reftouse = $fac->id;
- $redirection = $dolibarr_main_url_root.'/public/payment/newpayment.php?source='.$sourcetouse.'&ref='.$reftouse.'&booth='.$object->id;
- if (!empty($conf->global->PAYMENT_SECURITY_TOKEN)) {
- if (!empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) {
- $redirection .= '&securekey='.dol_hash($conf->global->PAYMENT_SECURITY_TOKEN . $sourcetouse . $reftouse, 2); // Use the source in the hash to avoid duplicates if the references are identical
- } else {
- $redirection .= '&securekey='.$conf->global->PAYMENT_SECURITY_TOKEN;
- }
- }
- print '';
- print ' ';
- print '
'; + + $sourcetouse = 'boothlocation'; + $reftouse = $fac->id; + + $url = getOnlinePaymentUrl(0, $sourcetouse, $reftouse); + $url .= '&booth='.$object->id; + + print ''; + } + } + } print '
'; - print ''; - - print '
'; + + $sourcetouse = 'boothlocation'; + $reftouse = $fac->id; + + $url = getOnlinePaymentUrl(0, $sourcetouse, $reftouse); + $url .= '&booth='.$object->id; + + print ''; + } + } + } print '
';
print '
';
diff --git a/htdocs/eventorganization/conferenceorbooth_contact.php b/htdocs/eventorganization/conferenceorbooth_contact.php
index 6f921848881..67cb2c659ee 100644
--- a/htdocs/eventorganization/conferenceorbooth_contact.php
+++ b/htdocs/eventorganization/conferenceorbooth_contact.php
@@ -17,41 +17,12 @@
*/
/**
- * \file conferenceorbooth_contact.php
+ * \file htdocs/eventorganization/conferenceorbooth_contact.php
* \ingroup eventorganization
* \brief Tab for contacts linked to ConferenceOrBooth
*/
-// Load Dolibarr environment
-$res = 0;
-// Try main.inc.php into web root known defined into CONTEXT_DOCUMENT_ROOT (not always defined)
-if (!$res && !empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) {
- $res = @include $_SERVER["CONTEXT_DOCUMENT_ROOT"]."/main.inc.php";
-}
-// Try main.inc.php into web root detected using web root calculated from SCRIPT_FILENAME
-$tmp = empty($_SERVER['SCRIPT_FILENAME']) ? '' : $_SERVER['SCRIPT_FILENAME']; $tmp2 = realpath(__FILE__); $i = strlen($tmp) - 1; $j = strlen($tmp2) - 1;
-while ($i > 0 && $j > 0 && isset($tmp[$i]) && isset($tmp2[$j]) && $tmp[$i] == $tmp2[$j]) {
- $i--; $j--;
-}
-if (!$res && $i > 0 && file_exists(substr($tmp, 0, ($i + 1))."/main.inc.php")) {
- $res = @include substr($tmp, 0, ($i + 1))."/main.inc.php";
-}
-if (!$res && $i > 0 && file_exists(dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php")) {
- $res = @include dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php";
-}
-// Try main.inc.php using relative path
-if (!$res && file_exists("../main.inc.php")) {
- $res = @include "../main.inc.php";
-}
-if (!$res && file_exists("../../main.inc.php")) {
- $res = @include "../../main.inc.php";
-}
-if (!$res && file_exists("../../../main.inc.php")) {
- $res = @include "../../../main.inc.php";
-}
-if (!$res) {
- die("Include of main fails");
-}
+require '../main.inc.php';
require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
@@ -59,14 +30,25 @@ require_once DOL_DOCUMENT_ROOT.'/eventorganization/class/conferenceorbooth.class
require_once DOL_DOCUMENT_ROOT.'/eventorganization/lib/eventorganization_conferenceorbooth.lib.php';
require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php';
-// Load translation files required by the page
-$langs->loadLangs(array("eventorganization@eventorganization", "companies", "other", "mails"));
+require_once DOL_DOCUMENT_ROOT.'/eventorganization/class/conferenceorbooth.class.php';
+require_once DOL_DOCUMENT_ROOT.'/eventorganization/lib/eventorganization_conferenceorbooth.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
-$id = (GETPOST('id') ?GETPOST('id', 'int') : GETPOST('facid', 'int')); // For backward compatibility
+// Load translation files required by the page
+$langs->loadLangs(array("eventorganization", "projects", "companies", "other", "mails"));
+
+$id = GETPOST('id', 'int');
$ref = GETPOST('ref', 'alpha');
$lineid = GETPOST('lineid', 'int');
$socid = GETPOST('socid', 'int');
+
$action = GETPOST('action', 'aZ09');
+$confirm = GETPOST('confirm', 'alpha');
+$cancel = GETPOST('cancel', 'aZ09');
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'conferenceorboothcard'; // To manage different context of search
+$backtopage = GETPOST('backtopage', 'alpha');
+$backtopageforcancel = GETPOST('backtopageforcancel', 'alpha');
+
$withproject = GETPOST('withproject', 'int');
// Initialize technical objects
@@ -78,8 +60,10 @@ $hookmanager->initHooks(array('conferenceorboothcontact', 'globalcard')); // Not
// Fetch optionals attributes and labels
$extrafields->fetch_name_optionals_label($object->table_element);
+$search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
+
// Load object
-include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
+include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once.
// Security check
if ($user->socid > 0) {
@@ -88,13 +72,35 @@ if ($user->socid > 0) {
$isdraft = (($object->status== $object::STATUS_DRAFT) ? 1 : 0);
$result = restrictedArea($user, 'eventorganization', $object->id, '', '', 'fk_soc', 'rowid', $isdraft);
-$permission = $user->rights->eventorganization->write;
+$permissiontoread = $user->rights->eventorganization->read;
+$permissiontoadd = $user->rights->eventorganization->write; // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
+$permissiontodelete = $user->rights->eventorganization->delete || ($permissiontoadd && isset($object->status) && $object->status == $object::STATUS_DRAFT);
+$permissionnote = $user->rights->eventorganization->write; // Used by the include of actions_setnotes.inc.php
+$permissiondellink = $user->rights->eventorganization->write; // Used by the include of actions_dellink.inc.php
+$upload_dir = $conf->eventorganization->multidir_output[isset($object->entity) ? $object->entity : 1];
+
+// Security check
+if ($user->socid > 0) {
+ accessforbidden();
+}
+$isdraft = (($object->status== $object::STATUS_DRAFT) ? 1 : 0);
+$result = restrictedArea($user, 'eventorganization', $object->id, '', '', 'fk_soc', 'rowid', $isdraft);
+
+if (!$permissiontoread) {
+ accessforbidden();
+}
/*
* Actions
*/
+$parameters = array();
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) {
+ setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
+
if ($action == 'addcontact' && $permission) { // Add a new contact
$contactid = (GETPOST('userid') ? GETPOST('userid', 'int') : GETPOST('contactid', 'int'));
$typeid = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type'));
@@ -131,16 +137,16 @@ if ($action == 'addcontact' && $permission) { // Add a new contact
* View
*/
-$title = $langs->trans('ConferenceOrBooth')." - ".$langs->trans('ContactsAddresses');
-$help_url = '';
-//$help_url='EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
-llxHeader('', $title, $help_url);
-
$form = new Form($db);
$formcompany = new FormCompany($db);
$contactstatic = new Contact($db);
$userstatic = new User($db);
+$title = $langs->trans('ConferenceOrBooth')." - ".$langs->trans('ContactsAddresses');
+$help_url = '';
+//$help_url='EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
+llxHeader('', $title, $help_url);
+
/* *************************************************************************** */
/* */
@@ -175,13 +181,13 @@ if (!empty($withproject)) {
// Title
$morehtmlref .= $projectstatic->title;
// Thirdparty
- if ($projectstatic->thirdparty->id > 0) {
+ if (isset($projectstatic->thirdparty->id) && $projectstatic->thirdparty->id > 0) {
$morehtmlref .= ''.$langs->trans('ThirdParty').' : '.$projectstatic->thirdparty->getNomUrl(1, 'project'); } $morehtmlref .= ''; // Define a complementary filter for search of next/prev ref. - if (empty($user->rights->projet->all->lire)) { + if (empty($user->rights->project->all->lire)) { $objectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 0); $projectstatic->next_prev_filter = " rowid IN (".$db->sanitize(count($objectsListId) ?join(',', array_keys($objectsListId)) : '0').")"; } @@ -256,7 +262,10 @@ if (!empty($withproject)) { // Other attributes $cols = 2; - //include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php'; + $objectconf = $object; + $object = $projectstatic; + include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php'; + $object = $objectconf; print '
';
print '';
- print '';
+ print '';
// Description
- print '
';
print '';
diff --git a/htdocs/eventorganization/conferenceorbooth_document.php b/htdocs/eventorganization/conferenceorbooth_document.php
index 537005761d2..2b791ea0e6f 100644
--- a/htdocs/eventorganization/conferenceorbooth_document.php
+++ b/htdocs/eventorganization/conferenceorbooth_document.php
@@ -32,13 +32,19 @@ require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php';
require_once DOL_DOCUMENT_ROOT.'/eventorganization/class/conferenceorbooth.class.php';
require_once DOL_DOCUMENT_ROOT.'/eventorganization/lib/eventorganization_conferenceorbooth.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
// Load translation files required by the page
-$langs->loadLangs(array("eventorganization", "companies", "other", "mails"));
+$langs->loadLangs(array("eventorganization", "projects", "companies", "other", "mails"));
$action = GETPOST('action', 'aZ09');
$confirm = GETPOST('confirm');
-$id = (GETPOST('socid', 'int') ? GETPOST('socid', 'int') : GETPOST('id', 'int'));
+$cancel = GETPOST('cancel', 'aZ09');
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'conferenceorboothcard'; // To manage different context of search
+$backtopage = GETPOST('backtopage', 'alpha');
+$backtopageforcancel = GETPOST('backtopageforcancel', 'alpha');
+
+$id = GETPOST('id', 'int');
$ref = GETPOST('ref', 'alpha');
$withproject = GETPOST('withproject', 'int');
$project_ref = GETPOST('project_ref', 'alpha');
@@ -69,17 +75,25 @@ $extrafields = new ExtraFields($db);
$projectstatic = new Project($db);
$diroutputmassaction = $conf->eventorganization->dir_output.'/temp/massgeneration/'.$user->id;
$hookmanager->initHooks(array('conferenceorboothdocument', 'globalcard')); // Note that conf->hooks_modules contains array
+
// Fetch optionals attributes and labels
$extrafields->fetch_name_optionals_label($object->table_element);
+$search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
+
// Load object
-include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
+include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once.
if ($id > 0 || !empty($ref)) {
$upload_dir = $conf->eventorganization->multidir_output[$object->entity ? $object->entity : $conf->entity]."/conferenceorbooth/".get_exdir(0, 0, 0, 1, $object);
}
-$permissiontoadd = $user->rights->eventorganization->conferenceorbooth->write; // Used by the include of actions_addupdatedelete.inc.php
+$permissiontoread = $user->rights->eventorganization->read;
+$permissiontoadd = $user->rights->eventorganization->write; // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
+$permissiontodelete = $user->rights->eventorganization->delete || ($permissiontoadd && isset($object->status) && $object->status == $object::STATUS_DRAFT);
+$permissionnote = $user->rights->eventorganization->write; // Used by the include of actions_setnotes.inc.php
+$permissiondellink = $user->rights->eventorganization->write; // Used by the include of actions_dellink.inc.php
+$upload_dir = $conf->eventorganization->multidir_output[isset($object->entity) ? $object->entity : 1];
// Security check
if ($user->socid > 0) {
@@ -88,11 +102,21 @@ if ($user->socid > 0) {
$isdraft = (($object->status== $object::STATUS_DRAFT) ? 1 : 0);
$result = restrictedArea($user, 'eventorganization', $object->id, '', '', 'fk_soc', 'rowid', $isdraft);
+if (!$permissiontoread) {
+ accessforbidden();
+}
+
/*
* Actions
*/
+$parameters = array();
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) {
+ setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
+
include_once DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php';
@@ -104,7 +128,6 @@ $form = new Form($db);
$title = $langs->trans("ConferenceOrBooth").' - '.$langs->trans("Files");
$help_url = '';
-//$help_url='EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
llxHeader('', $title, $help_url);
$result = $projectstatic->fetch($object->fk_project);
@@ -121,6 +144,7 @@ $object->project = clone $projectstatic;
if (!empty($withproject)) {
// Tabs for project
$tab = 'eventorganisation';
+ $withProjectUrl = "&withproject=1";
$head = project_prepare_head($projectstatic);
print dol_get_fiche_head($head, $tab, $langs->trans("Project"), -1, ($projectstatic->public ? 'projectpub' : 'project'), 0, '', '');
@@ -132,13 +156,13 @@ if (!empty($withproject)) {
// Title
$morehtmlref .= $projectstatic->title;
// Thirdparty
- if ($projectstatic->thirdparty->id > 0) {
+ if (isset($projectstatic->thirdparty->id) && $projectstatic->thirdparty->id > 0) {
$morehtmlref .= '
'.$langs->trans('ThirdParty').' : '.$projectstatic->thirdparty->getNomUrl(1, 'project'); } $morehtmlref .= ''; // Define a complementary filter for search of next/prev ref. - if (empty($user->rights->projet->all->lire)) { + if (empty($user->rights->project->all->lire)) { $objectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 0); $projectstatic->next_prev_filter = " rowid IN (".$db->sanitize(count($objectsListId) ?join(',', array_keys($objectsListId)) : '0').")"; } @@ -213,7 +237,10 @@ if (!empty($withproject)) { // Other attributes $cols = 2; - //include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php'; + $objectconf = $object; + $object = $projectstatic; + include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php'; + $object = $objectconf; print '
';
@@ -222,17 +249,17 @@ if (!empty($withproject)) {
print '
| '.$langs->trans("Description").' | '; + print ' | '.$langs->trans("Description").' | '; print nl2br($projectstatic->description); print ' | '; // Categories if ($conf->categorie->enabled) { print '
| '.$langs->trans("Categories").' | '; - print $form->showCategories($projectstatic->id, 'project', 1); + print $form->showCategories($projectstatic->id, Categorie::TYPE_PROJECT, 1); print " |
| '; - print $form->editfieldkey('PriceOfRegistration', 'price_registration', '', $projectstatic, 0, 'amount', '', 0, 0, 'projectid'); + print $form->editfieldkey($form->textwithpicto($langs->trans('PriceOfBooth'), $langs->trans("PriceOfBoothHelp")), 'price_booth', '', $projectstatic, 0, 'amount', '', 0, 0, 'projectid'); print ' | '; - print $form->editfieldval('PriceOfRegistration', 'price_registration', $projectstatic->price_registration, $projectstatic, 0, 'amount', '', 0, 0, '', 0, '', 'projectid'); + print $form->editfieldval($form->textwithpicto($langs->trans('PriceOfBooth'), $langs->trans("PriceOfBoothHelp")), 'price_booth', $projectstatic->price_booth, $projectstatic, 0, 'amount', '', 0, 0, '', 0, '', 'projectid'); print " |
| '; - print $form->editfieldkey('PriceOfBooth', 'price_booth', '', $projectstatic, 0, 'amount', '', 0, 0, 'projectid'); + print $form->editfieldkey($form->textwithpicto($langs->trans('PriceOfRegistration'), $langs->trans("PriceOfRegistrationHelp")), 'price_registration', '', $projectstatic, 0, 'amount', '', 0, 0, 'projectid'); print ' | '; - print $form->editfieldval('PriceOfBooth', 'price_booth', $projectstatic->price_booth, $projectstatic, 0, 'amount', '', 0, 0, '', 0, '', 'projectid'); + print $form->editfieldval($form->textwithpicto($langs->trans('PriceOfRegistration'), $langs->trans("PriceOfRegistrationHelp")), 'price_registration', $projectstatic->price_registration, $projectstatic, 0, 'amount', '', 0, 0, '', 0, '', 'projectid'); print " |
| '.$langs->trans("EventOrganizationICSLink").' | '; @@ -313,12 +322,46 @@ if (!empty($withproject)) { $urlwithroot = $urlwithouturlroot.DOL_URL_ROOT; // Show message - $message = 'global->MAIN_AGENDA_XCAL_EXPORTKEY ?urlencode($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY) : '...'); - $message .= "&project=".$projectstatic->id.'&module='.urlencode('@eventorganization').'&status='.ConferenceOrBooth::STATUS_CONFIRMED.'">'.$langs->trans('DownloadICSLink').''; + $message = 'id.'&module='.urlencode('@eventorganization').'&status='.ConferenceOrBooth::STATUS_CONFIRMED.'">'.$langs->trans('DownloadICSLink').img_picto('', 'download', 'class="paddingleft"').''; print $message; print " |
| '; + //print ''; + print $form->textwithpicto($langs->trans("SuggestOrVoteForConfOrBooth"), $langs->trans("EvntOrgRegistrationHelpMessage")); + //print ''; + print ' | ';
+ $linksuggest = $dolibarr_main_url_root.'/public/project/index.php?id='.((int) $projectstatic->id);
+ $encodedsecurekey = dol_hash(getDolGlobalString('EVENTORGANIZATION_SECUREKEY').'conferenceorbooth'.((int) $projectstatic->id), 'md5');
+ $linksuggest .= '&securekey='.urlencode($encodedsecurekey);
+ //print ' ';
+ //print '';
+ print '';
+ print ''.img_picto('', 'globe').'';
+ //print ' ';
+ //print ajax_autoselect("linkregister");
+ print ' |
| '; + //print ''; + print $langs->trans("PublicAttendeeSubscriptionGlobalPage"); + //print ''; + print ' | ';
+ $link_subscription = $dolibarr_main_url_root.'/public/eventorganization/attendee_new.php?id='.((int) $projectstatic->id).'&type=global';
+ $encodedsecurekey = dol_hash(getDolGlobalString('EVENTORGANIZATION_SECUREKEY').'conferenceorbooth'.((int) $projectstatic->id), 'md5');
+ $link_subscription .= '&securekey='.urlencode($encodedsecurekey);
+ //print ' ';
+ //print '';
+ print '';
+ print ''.img_picto('', 'globe').'';
+ //print ' ';
+ //print ajax_autoselect("linkregister");
+ print ' |
'.$langs->trans('ThirdParty').' : '.$projectstatic->thirdparty->getNomUrl(1, 'project'); } $morehtmlref .= ''; // Define a complementary filter for search of next/prev ref. - if (empty($user->rights->projet->all->lire)) { + if (empty($user->rights->project->all->lire)) { $objectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 0); $projectstatic->next_prev_filter = " rowid IN (".$db->sanitize(count($objectsListId) ?join(',', array_keys($objectsListId)) : '0').")"; } @@ -213,7 +237,10 @@ if (!empty($withproject)) { // Other attributes $cols = 2; - //include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php'; + $objectconf = $object; + $object = $projectstatic; + include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php'; + $object = $objectconf; print '
';
print '';
- print '';
+ print '';
// Description
- print '
';
print '';
@@ -305,7 +366,6 @@ if ($object->id) {
}
// Object card
- // -------------
//-----------------------------------------------
$linkback = ''.$langs->trans("BackToList").'';
diff --git a/htdocs/eventorganization/conferenceorbooth_list.php b/htdocs/eventorganization/conferenceorbooth_list.php
index e67a742bdfd..5980bfa6132 100644
--- a/htdocs/eventorganization/conferenceorbooth_list.php
+++ b/htdocs/eventorganization/conferenceorbooth_list.php
@@ -31,9 +31,7 @@ require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
require_once DOL_DOCUMENT_ROOT.'/eventorganization/class/conferenceorbooth.class.php';
require_once DOL_DOCUMENT_ROOT.'/eventorganization/lib/eventorganization_conferenceorbooth.lib.php';
require_once DOL_DOCUMENT_ROOT.'/eventorganization/class/conferenceorboothattendee.class.php';
-if ($conf->categorie->enabled) {
- require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
-}
+require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
global $dolibarr_main_url_root;
@@ -231,9 +229,9 @@ if (empty($reshook)) {
$form = new Form($db);
$now = dol_now();
+$title = $langs->trans('ListOfConferencesOrBooths');
//$help_url="EN:Module_ConferenceOrBooth|FR:Module_ConferenceOrBooth_FR|ES:Módulo_ConferenceOrBooth";
$help_url = '';
-$title = $langs->trans('ListOfConferencesOrBooths');
if ($projectid > 0 || $projectref) {
$project = new Project($db);
@@ -302,34 +300,36 @@ if ($projectid > 0) {
print '';
// Usage
- print '
| '.$langs->trans("Description").' | '; + print ' | '.$langs->trans("Description").' | '; print nl2br($projectstatic->description); print ' | '; // Categories if ($conf->categorie->enabled) { print '
| '.$langs->trans("Categories").' | '; - print $form->showCategories($projectstatic->id, 'project', 1); + print $form->showCategories($projectstatic->id, Categorie::TYPE_PROJECT, 1); print " |
| '; - print $form->editfieldkey('PriceOfRegistration', 'price_registration', '', $projectstatic, 0, 'amount', '', 0, 0, 'projectid'); + print $form->editfieldkey($form->textwithpicto($langs->trans('PriceOfBooth'), $langs->trans("PriceOfBoothHelp")), 'price_booth', '', $projectstatic, 0, 'amount', '', 0, 0, 'projectid'); print ' | '; - print $form->editfieldval('PriceOfRegistration', 'price_registration', $projectstatic->price_registration, $projectstatic, 0, 'amount', '', 0, 0, '', 0, '', 'projectid'); + print $form->editfieldval($form->textwithpicto($langs->trans('PriceOfBooth'), $langs->trans("PriceOfBoothHelp")), 'price_booth', $projectstatic->price_booth, $projectstatic, 0, 'amount', '', 0, 0, '', 0, '', 'projectid'); print " |
| '; - print $form->editfieldkey('PriceOfBooth', 'price_booth', '', $projectstatic, 0, 'amount', '', 0, 0, 'projectid'); + print $form->editfieldkey($form->textwithpicto($langs->trans('PriceOfRegistration'), $langs->trans("PriceOfRegistrationHelp")), 'price_registration', '', $projectstatic, 0, 'amount', '', 0, 0, 'projectid'); print ' | '; - print $form->editfieldval('PriceOfBooth', 'price_booth', $projectstatic->price_booth, $projectstatic, 0, 'amount', '', 0, 0, '', 0, '', 'projectid'); + print $form->editfieldval($form->textwithpicto($langs->trans('PriceOfRegistration'), $langs->trans("PriceOfRegistrationHelp")), 'price_registration', $projectstatic->price_registration, $projectstatic, 0, 'amount', '', 0, 0, '', 0, '', 'projectid'); print " |
| '.$langs->trans("EventOrganizationICSLink").' | '; @@ -270,12 +297,46 @@ if (!empty($withproject)) { $urlwithroot = $urlwithouturlroot.DOL_URL_ROOT; // Show message - $message = 'global->MAIN_AGENDA_XCAL_EXPORTKEY ?urlencode($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY) : '...'); - $message .= "&project=".$projectstatic->id.'&module='.urlencode('@eventorganization').'&status='.ConferenceOrBooth::STATUS_CONFIRMED.'">'.$langs->trans('DownloadICSLink').''; + $message = 'id.'&module='.urlencode('@eventorganization').'&status='.ConferenceOrBooth::STATUS_CONFIRMED.'">'.$langs->trans('DownloadICSLink').img_picto('', 'download', 'class="paddingleft"').''; print $message; print " |
| '; + //print ''; + print $form->textwithpicto($langs->trans("SuggestOrVoteForConfOrBooth"), $langs->trans("EvntOrgRegistrationHelpMessage")); + //print ''; + print ' | ';
+ $linksuggest = $dolibarr_main_url_root.'/public/project/index.php?id='.((int) $projectstatic->id);
+ $encodedsecurekey = dol_hash(getDolGlobalString('EVENTORGANIZATION_SECUREKEY').'conferenceorbooth'.((int) $projectstatic->id), 'md5');
+ $linksuggest .= '&securekey='.urlencode($encodedsecurekey);
+ //print ' ';
+ //print '';
+ print '';
+ print ''.img_picto('', 'globe').'';
+ //print ' ';
+ //print ajax_autoselect("linkregister");
+ print ' |
| '; + //print ''; + print $langs->trans("PublicAttendeeSubscriptionGlobalPage"); + //print ''; + print ' | ';
+ $link_subscription = $dolibarr_main_url_root.'/public/eventorganization/attendee_new.php?id='.((int) $projectstatic->id).'&type=global';
+ $encodedsecurekey = dol_hash(getDolGlobalString('EVENTORGANIZATION_SECUREKEY').'conferenceorbooth'.((int) $projectstatic->id), 'md5');
+ $link_subscription .= '&securekey='.urlencode($encodedsecurekey);
+ //print ' ';
+ //print '';
+ print '';
+ print ''.img_picto('', 'globe').'';
+ //print ' ';
+ //print ajax_autoselect("linkregister");
+ print ' |
| '; - print $langs->trans("Usage"); - print ' | '; - print '';
- if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES)) {
- print 'usage_opportunity ? ' checked="checked"' : '').'"> ';
- $htmltext = $langs->trans("ProjectFollowOpportunity");
- print $form->textwithpicto($langs->trans("ProjectFollowOpportunity"), $htmltext);
- print ' '; + if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES) || empty($conf->global->PROJECT_HIDE_TASKS) || !empty($conf->eventorganization->enabled)) { + print ' | ||||||
| '; + print $langs->trans("Usage"); + print ' | '; + print '';
+ if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES)) {
+ print 'usage_opportunity ? ' checked="checked"' : '').'"> ';
+ $htmltext = $langs->trans("ProjectFollowOpportunity");
+ print $form->textwithpicto($langs->trans("ProjectFollowOpportunity"), $htmltext);
+ print ' '; + } + if (empty($conf->global->PROJECT_HIDE_TASKS)) { + print 'usage_task ? ' checked="checked"' : '').'"> '; + $htmltext = $langs->trans("ProjectFollowTasks"); + print $form->textwithpicto($langs->trans("ProjectFollowTasks"), $htmltext); + print ' '; + } + if (empty($conf->global->PROJECT_HIDE_TASKS) && !empty($conf->global->PROJECT_BILL_TIME_SPENT)) { + print 'usage_bill_time ? ' checked="checked"' : '').'"> '; + $htmltext = $langs->trans("ProjectBillTimeDescription"); + print $form->textwithpicto($langs->trans("BillTime"), $htmltext); + print ' '; + } + if (!empty($conf->eventorganization->enabled)) { + print 'usage_organize_event ? ' checked="checked"' : '').'"> '; + $htmltext = $langs->trans("EventOrganizationDescriptionLong"); + print $form->textwithpicto($langs->trans("ManageOrganizeEvent"), $htmltext); + } + print ' | ||||||
| '.$langs->trans("Visibility").' | '; @@ -381,7 +381,7 @@ if ($projectid > 0) { // Categories if ($conf->categorie->enabled) { - print ' | ||||||
| '.$langs->trans("Categories").' | '; + print ' | ||||||
| '.$langs->trans("Categories").' | '; print $form->showCategories($project->id, Categorie::TYPE_PROJECT, 1); print " | ||||||
| '; +print ' | |||||||
| '; print $langs->trans("ONLINE_PAYMENT_SENDEMAIL").' | ';
print '';
print ' '.$langs->trans("Example").': myemail@myserver.com, Payment service <myemail2@myserver2.com>';
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index a7865474014..27b2bdaff2c 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -4800,9 +4800,10 @@ class Product extends CommonObject
if (!empty($this->entity)) {
$tmpphoto = $this->show_photos('product', $conf->product->multidir_output[$this->entity], 1, 1, 0, 0, 0, 80);
if ($this->nbphoto > 0) {
- $label .= ' ';
+ $label .= ' ';
+ //$label .= '';
}
}
diff --git a/htdocs/product/price.php b/htdocs/product/price.php
index e3eea85cec7..309853a7bb6 100644
--- a/htdocs/product/price.php
+++ b/htdocs/product/price.php
@@ -735,9 +735,9 @@ if (!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_
print '';
$label .= $tmpphoto;
- $label .= ' ';
+ $label .= ' | ';
print ''; if ($object->multiprices_base_type[$soc->price_level] == 'TTC') { - print price($object->multiprices_ttc[$soc->price_level]); + print ''.price($object->multiprices_ttc[$soc->price_level]).''; } else { - print price($object->multiprices[$soc->price_level]); + print ''.price($object->multiprices[$soc->price_level]).''; } if ($object->multiprices_base_type[$soc->price_level]) { print ' '.$langs->trans($object->multiprices_base_type[$soc->price_level]); @@ -892,15 +892,15 @@ if (!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_ print ' | '; if ($object->multiprices_base_type [$i] == 'TTC') { - print ''.price($object->multiprices_ttc[$i]); + print ' | '.price($object->multiprices_ttc[$i]); } else { - print ' | '.price($object->multiprices[$i]); + print ' | '.price($object->multiprices[$i]); } if ($object->multiprices_base_type[$i]) { - print ' '.$langs->trans($object->multiprices_base_type [$i]).' | '; + print ' '.$langs->trans($object->multiprices_base_type [$i]).''; } else { - print ' '.$langs->trans($object->price_base_type).''; + print ' '.$langs->trans($object->price_base_type).''; } // Prix min diff --git a/htdocs/product/stock/stockatdate.php b/htdocs/product/stock/stockatdate.php index d5de51c7311..ffcf5dd2f00 100644 --- a/htdocs/product/stock/stockatdate.php +++ b/htdocs/product/stock/stockatdate.php @@ -475,6 +475,8 @@ print $hookmanager->resPrint; print "|
| '.$langs->trans("Totalforthispage").' | '; +print ''.price(price2num($totalbuyingprice, 'MT')).' | ||||||
| '.$langs->trans("EnterADateCriteria").' | |||||||
| ';
+
if ($action == "dosign" && empty($cancel)) {
print ' ';
print '';
print '';
print ' ';
- print '';
+ print '';
print '';
// Add js code managed into the div #signature
@@ -380,9 +403,9 @@ if ($action == "dosign" && empty($cancel)) {
$("#signature").on("change",function(){
$("#clearsignature").css("display","");
- $("#signpropal").attr("disabled",false);
- if(!$._data($("#signpropal")[0], "events")){
- $("#signpropal").on("click",function(){
+ $("#signbutton").attr("disabled",false);
+ if(!$._data($("#signbutton")[0], "events")){
+ $("#signbutton").on("click",function(){
var signature = $("#signature").jSignature("getData", "image");
$.ajax({
type: "POST",
@@ -410,32 +433,34 @@ if ($action == "dosign" && empty($cancel)) {
$("#clearsignature").on("click",function(){
$("#signature").jSignature("clear");
- $("#signpropal").attr("disabled",true);
+ $("#signbutton").attr("disabled",true);
/* $("#clearsignature").css("display","none"); */
});
/* $("#clearsignature").css("display","none"); */
- $("#signpropal").attr("disabled",true);
+ $("#signbutton").attr("disabled",true);
});
';
} else {
- if ($object->status == $object::STATUS_SIGNED) {
- print ''; - if ($message == 'signed') { - print ''.$langs->trans("PropalSigned").''; + if ($source == 'proposal') { + if ($object->status == $object::STATUS_SIGNED) { + print ' '; + if ($message == 'signed') { + print ''.$langs->trans("PropalSigned").''; + } else { + print ''.$langs->trans("PropalAlreadySigned").''; + } + } elseif ($object->status == $object::STATUS_NOTSIGNED) { + print ' '; + if ($message == 'refused') { + print ''.$langs->trans("PropalRefused").''; + } else { + print ''.$langs->trans("PropalAlreadyRefused").''; + } } else { - print ''.$langs->trans("PropalAlreadySigned").''; + print ''; + print ''; } - } elseif ($object->status == $object::STATUS_NOTSIGNED) { - print ' '; - if ($message == 'refused') { - print ''.$langs->trans("PropalRefused").''; - } else { - print ''.$langs->trans("PropalAlreadyRefused").''; - } - } else { - print ''; - print ''; } } print ' | |||||||
| '.$langs->trans("Amount"); print ' | '; $valtoshow = $amount; - print ''.price($valtoshow).''; + print ''.price($valtoshow, 1, $langs, 1, -1, -1, $currency).''; // Price with currency print ''; print ''; - - // Currency - print ' '.$langs->trans("Currency".$currency).''; print ''; print ' | ||||||
| '.$langs->trans("Amount"); print ' | '; $valtoshow = $amount; - print ''.price($valtoshow).''; + print ''.price($valtoshow, 1, $langs, 1, -1, -1, $currency).''; // Price with currency print ''; print ''; - - // Currency - print ' '.$langs->trans("Currency".$currency).''; print ''; print ' | ||||||