';
print '';
print ''.$langs->trans("AmountTTC").' '.price($object->amount, 0, $langs, 1, -1, -1, $conf->currency).' '.$langs->trans("AmountTTC").' '.price($object->amount, 0, $langs, 1, -1, -1, $conf->currency).' '.$langs->trans("AlreadyPaid")." : ".price($totalpaye)." '.$langs->trans("AmountExpected")." : ".price($object->amount)." '.$langs->trans("AlreadyPaid").' : '.price($totalpaye)." '.$langs->trans("AmountExpected").' : '.price($object->amount)." ';
print_liste_field_titre("RefPayment", $_SERVER["PHP_SELF"], "pc.rowid", "", $param, '', $sortfield, $sortorder);
print_liste_field_titre("SocialContribution", $_SERVER["PHP_SELF"], "c.libelle", "", $param, '', $sortfield, $sortorder);
print_liste_field_titre("TypeContrib", $_SERVER["PHP_SELF"], "cs.fk_type", "", $param, '', $sortfield, $sortorder);
-print_liste_field_titre("PeriodEndDate", $_SERVER["PHP_SELF"], "cs.periode", "", $param, 'width="140px"', $sortfield, $sortorder);
-print_liste_field_titre("DatePayment", $_SERVER["PHP_SELF"], "pc.datep", "", $param, 'align="center"', $sortfield, $sortorder);
+print_liste_field_titre("PeriodEndDate", $_SERVER["PHP_SELF"], "cs.periode", "", $param, '', $sortfield, $sortorder, 'center ');
+print_liste_field_titre("DatePayment", $_SERVER["PHP_SELF"], "pc.datep", "", $param, '', $sortfield, $sortorder, 'center ');
print_liste_field_titre("Employee", $_SERVER["PHP_SELF"], "u.rowid", "", $param, "", $sortfield, $sortorder);
print_liste_field_titre("PaymentMode", $_SERVER["PHP_SELF"], "pct.code", "", $param, '', $sortfield, $sortorder);
print_liste_field_titre("Numero", $_SERVER["PHP_SELF"], "pc.num_paiement", "", $param, '', $sortfield, $sortorder, '', 'ChequeOrTransferNumber');
@@ -257,26 +257,34 @@ $totalpaye = 0;
while ($i < min($num, $limit)) {
$obj = $db->fetch_object($resql);
- print ' ';
- // Ref payment
+
$payment_sc_static->id = $obj->pid;
$payment_sc_static->ref = $obj->pid;
- print ''.$payment_sc_static->getNomUrl(1)." \n";
- // Label
- print '';
+ $payment_sc_static->date = $db->jdate($obj->datep);
+
$socialcontrib->id = $obj->rowid;
- $socialcontrib->ref = empty($obj->libelle) ? $obj->label : $obj->libelle;
- $socialcontrib->label = empty($obj->libelle) ? $obj->label : $obj->libelle;
- print $socialcontrib->getNomUrl(1, '20');
+ $socialcontrib->ref = empty($obj->label_sc) ? $obj->type_label : $obj->label_sc;
+ $socialcontrib->paye = $obj->paye;
+ // $obj->label_sc is label of social contribution (may be empty)
+ // $obj->type_label is label of type of social contribution
+ $socialcontrib->label = empty($obj->label_sc) ? $obj->type_label : $obj->label_sc;
+ $socialcontrib->type_label = $obj->type_label;
+
+ print ' ';
+ // Ref payment
+ print ''.$payment_sc_static->getNomUrl(1)." \n";
+ // Label
+ print '';
+ print $socialcontrib->getNomUrl(1, '');
print ' ';
// Type
- print ''.$obj->label.' ';
+ print ''.$obj->label.' ';
// Date
$date = $obj->periode;
if (empty($date)) {
$date = $obj->date_ech;
}
- print ''.dol_print_date($date, 'day').' ';
+ print ''.dol_print_date($date, 'day').' ';
// Date payment
print ''.dol_print_date($db->jdate($obj->datep), 'day').' ';
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 .= ''.dol_print_email($obj->email, $obj->rowid, $obj->socid, 'AC_EMAIL', 18, 0, 1).' ';
+ print ''.dol_print_email($obj->email, $obj->rowid, $obj->socid, 'AC_EMAIL', 18, 0, 1).' ';
if (!$i) {
$totalarray['nbfield']++;
}
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 .= '
';
@@ -284,17 +291,17 @@ if (!empty($withproject)) {
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/modulehelp.php b/htdocs/admin/modulehelp.php
index b085aff64d1..716dbc32ca7 100644
--- a/htdocs/admin/modulehelp.php
+++ b/htdocs/admin/modulehelp.php
@@ -330,7 +330,8 @@ if ($mode == 'desc') {
$textexternal = '';
if ($objMod->isCoreOrExternalModule() == 'external') {
- $textexternal .= ' '.$langs->trans("Origin").': '.$langs->trans("ExternalModule").' - '.$langs->trans("InstalledInto", $dirofmodule); + $tmpdirofmoduletoshow = preg_replace('/^'.preg_quote(DOL_DOCUMENT_ROOT, '/').'/', '', $dirofmodule); + $textexternal .= ' '.$langs->trans("Origin").': '.$langs->trans("ExternalModule").' - '.$langs->trans("InstalledInto", $tmpdirofmoduletoshow); global $dolibarr_allow_download_external_modules; if (!empty($dolibarr_allow_download_external_modules) && preg_match('/\/custom\//', $dirofmodule)) { diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php index 097d125708f..f720e411717 100644 --- a/htdocs/admin/modules.php +++ b/htdocs/admin/modules.php @@ -540,7 +540,7 @@ if ($mode == 'common' || $mode == 'commonkanban') { $moreforfilter .= img_picto($langs->trans("Filter"), 'filter', 'class="paddingright opacityhigh hideonsmartphone"').''; $moreforfilter .= ''; $moreforfilter .= ' ';
- $moreforfilter .= $form->selectarray('search_nature', $arrayofnatures, dol_escape_htmltag($search_nature), $langs->trans('Origin'), 0, 0, '', 0, 0, 0, '', 'maxwidth200', 1);
+ $moreforfilter .= $form->selectarray('search_nature', $arrayofnatures, dol_escape_htmltag($search_nature), $langs->trans('Origin'), 0, 0, '', 0, 0, 0, '', 'maxwidth250', 1);
$moreforfilter .= ' ';
if (getDolGlobalInt('MAIN_FEATURES_LEVEL')) {
$array_version = array('stable'=>$langs->transnoentitiesnoconv("Stable"));
@@ -563,7 +563,7 @@ if ($mode == 'common' || $mode == 'commonkanban') {
$moreforfilter .= ' ';
$moreforfilter .= '';
$moreforfilter .= '';
- if ($search_keyword || $search_status || $search_nature || $search_version) {
+ if ($search_keyword || ($search_nature && $search_nature != '-1') || ($search_version && $search_version != '-1') || ($search_status && $search_status != '-1')) {
$moreforfilter .= ' ';
$moreforfilter .= '';
}
diff --git a/htdocs/admin/system/filecheck.php b/htdocs/admin/system/filecheck.php
index 5ca87663c7a..1f183e1b730 100644
--- a/htdocs/admin/system/filecheck.php
+++ b/htdocs/admin/system/filecheck.php
@@ -119,9 +119,9 @@ if (dol_is_file($xmlfile)) {
print '';
print ' '; } else { - print ' '.$langs->trans("LocalSignature").' = '; + print ' '; print ' '; } print ''."\n"; @@ -129,7 +129,7 @@ if ($enableremotecheck) { print ' = '; print ' '; } else { - print ' '.$langs->trans("RemoteSignature").' = '.dol_escape_htmltag($xmlremote); + print ' '.$langs->trans("RemoteSignature").' = '.dol_escape_htmltag($xmlremote); if (!GETPOST('xmlremote')) { print ' ('.$langs->trans("FeatureAvailableOnlyOnStable").')'; } 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/categories/index.php b/htdocs/categories/index.php index c585217dfda..04f2288ae08 100644 --- a/htdocs/categories/index.php +++ b/htdocs/categories/index.php @@ -35,10 +35,6 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; // Load translation files required by the page $langs->load("categories"); -if (!$user->rights->categorie->lire) { - accessforbidden(); -} - $id = GETPOST('id', 'int'); $type = (GETPOST('type', 'aZ09') ? GETPOST('type', 'aZ09') : Categorie::TYPE_PRODUCT); $catname = GETPOST('catname', 'alpha'); @@ -52,6 +48,11 @@ if (is_numeric($type)) { // Initialize technical object to manage hooks. Note that conf->hooks_modules contains array array $hookmanager->initHooks(array('categoryindex')); +if (!$user->rights->categorie->lire) { + accessforbidden(); +} + + /* * View */ diff --git a/htdocs/comm/action/list.php b/htdocs/comm/action/list.php index 2ca127256a5..62308649834 100644 --- a/htdocs/comm/action/list.php +++ b/htdocs/comm/action/list.php @@ -881,6 +881,8 @@ while ($i < min($num, $limit)) { $actionstatic->label = $obj->label; $actionstatic->location = $obj->location; $actionstatic->note_private = dol_htmlentitiesbr($obj->note); + $actionstatic->datep = $db->jdate($obj->dp); + $actionstatic->percentage = $obj->percent; // Initialize $this->userassigned && this->socpeopleassigned array && this->userownerid // but only if we need it @@ -953,16 +955,7 @@ while ($i < min($num, $limit)) { print ' | '; print dol_print_date($db->jdate($obj->dp), $formatToUse, 'tzuser'); $late = 0; - if ($obj->percent == 0 && $obj->dp && $db->jdate($obj->dp) < ($now - $delay_warning)) { - $late = 1; - } - if ($obj->percent == 0 && !$obj->dp && $obj->dp2 && $db->jdate($obj->dp) < ($now - $delay_warning)) { - $late = 1; - } - if ($obj->percent > 0 && $obj->percent < 100 && $obj->dp2 && $db->jdate($obj->dp2) < ($now - $delay_warning)) { - $late = 1; - } - if ($obj->percent > 0 && $obj->percent < 100 && !$obj->dp2 && $obj->dp && $db->jdate($obj->dp) < ($now - $delay_warning)) { + if ($actionstatic->hasDelay() && $actionstatic->percentage >= 0 && $actionstatic->percentage < 100 ) { $late = 1; } if ($late) { diff --git a/htdocs/compta/bank/bankentries_list.php b/htdocs/compta/bank/bankentries_list.php index b0de5f5807f..3800edb42ae 100644 --- a/htdocs/compta/bank/bankentries_list.php +++ b/htdocs/compta/bank/bankentries_list.php @@ -65,6 +65,7 @@ $cancel = GETPOST('cancel', 'alpha'); $confirm = GETPOST('confirm', 'alpha'); $contextpage = 'banktransactionlist'.(empty($object->ref) ? '' : '-'.$object->id); $massaction = GETPOST('massaction', 'alpha'); +$optioncss = GETPOST('optioncss', 'aZ09'); // Security check $fieldvalue = (!empty($id) ? $id : (!empty($ref) ? $ref : '')); @@ -268,7 +269,7 @@ if ((GETPOST('confirm_savestatement', 'alpha') || GETPOST('confirm_reconcile', ' } if (!$error) { - $param = 'action=reconcile&contextpage=banktransactionlist&id='.$id.'&search_account='.$id; + $param = 'action=reconcile&contextpage=banktransactionlist&id='.((int) $id).'&search_account='.((int) $id); if ($page) { $param .= '&page='.urlencode($page); } @@ -452,7 +453,7 @@ if (!empty($search_debit)) { if (!empty($search_credit)) { $param .= '&search_credit='.urlencode($search_credit); } -if (!empty($search_account)) { +if ($search_account > 0) { $param .= '&search_account='.urlencode($search_account); } if (!empty($search_num_releve)) { @@ -767,7 +768,7 @@ if ($resql) { } print ''; print ''; - print ''; + print ''; if (!empty($view)) { print ''; } @@ -777,7 +778,7 @@ if ($resql) { print ''; print ''; if (GETPOST('bid')) { - print ''; + print ''; } // Form to reconcile @@ -1101,8 +1102,7 @@ if ($resql) { print $form->selectyesno('search_conciliated', $search_conciliated, 1, false, 1, 1); print ' | '; } - print ''; - print ' | '; + // Actions and select print ''; $searchpicto = $form->showFilterAndCheckAddButtons($massactionbutton ? 1 : 0, 'checkforselect', 1); print $searchpicto; @@ -1159,7 +1159,7 @@ if ($resql) { $parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder); $reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters); // Note that $action and $object may have been modified by hook print $hookmanager->resPrint; - print_liste_field_titre('', $_SERVER["PHP_SELF"], "", '', '', 'class="right"', $sortfield, $sortorder, 'maxwidthsearch '); + // Actions and select print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch '); print " | '; + print ' | '; print ' '; print ' | '; print ''; @@ -1663,20 +1663,20 @@ if ($resql) { } } - // Action edit/delete + // Action edit/delete and select print ''; // Transaction reconciliated or edit link if ($objp->conciliated && $bankaccount->canBeConciliated() > 0) { // If line not conciliated and account can be conciliated - print ''; + print ''; print img_edit(); print ''; } else { if ($user->rights->banque->modifier || $user->rights->banque->consolidate) { - print ''; + print ''; print img_edit(); print ''; } else { - print ''; + print ''; print img_view(); print ''; } @@ -1686,24 +1686,19 @@ if ($resql) { } } if ($user->rights->banque->modifier) { - print 'rowid.'&id='.$objp->bankid.'&page='.$page.'">'; + print 'rowid.'&page='.$page.$param.($sortfield ? '&sortfield='.$sortfield : '').($sortorder ? '&sortorder='.$sortorder : '').'">'; print img_delete('', 'class="marginleftonly"'); print ''; } } - print ' | '; - if (!$i) { - $totalarray['nbfield']++; - } // Action column - print ''; if ($massactionbutton || $massaction) { // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined $selected = 0; if (in_array($obj->rowid, $arrayofselected)) { $selected = 1; } - print ''; + print ''; } print ' | '; if (!$i) { diff --git a/htdocs/compta/bank/card.php b/htdocs/compta/bank/card.php index 9f000786b7f..5d2bb71109b 100644 --- a/htdocs/compta/bank/card.php +++ b/htdocs/compta/bank/card.php @@ -1060,19 +1060,19 @@ if ($action == 'create') { // IBAN print '||||||||
| '.$langs->trans($ibankey).' | '; - print ''; print ' | |||||||||||||||||||||
| '.$langs->trans($bickey).' | '; - print ''; if ($conf->prelevement->enabled) { print ' | |||||||||||||||||||||
| '.$langs->trans("ICS").' ('.$langs->trans("StandingOrder").') | '; - print ''; } if ($conf->paymentbybanktransfer->enabled) { print ' | |||||||||||||||||||||
| '.$langs->trans("ICS").' ('.$langs->trans("BankTransfer").') | '; - print ''; } print ' | |||||||||||||||||||||
| '.$langs->trans("BankAccountDomiciliation").' | '; diff --git a/htdocs/compta/bank/info.php b/htdocs/compta/bank/info.php index efce1a103b0..1bbab933e7b 100644 --- a/htdocs/compta/bank/info.php +++ b/htdocs/compta/bank/info.php @@ -30,6 +30,7 @@ require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; $langs->loadLangs(array('banks', 'categories', 'companies')); $id = GETPOST("rowid", 'int'); +$accountid = (GETPOST('id', 'int') ? GETPOST('id', 'int') : GETPOST('account', 'int')); $ref = GETPOST('ref', 'alpha'); // Security check @@ -40,8 +41,8 @@ if ($user->socid) { $socid = $user->socid; } -$result = restrictedArea($user, 'banque', $fieldvalue, 'bank_account', '', '', $fieldtype); -if (empty($user->rights->banque->lire) && !$user->rights->banque->consolidate) { +$result = restrictedArea($user, 'banque', $accountid, 'bank_account'); +if (empty($user->rights->banque->lire) && empty($user->rights->banque->consolidate)) { accessforbidden(); } diff --git a/htdocs/compta/bank/line.php b/htdocs/compta/bank/line.php index 4db87213d5d..bc70d27ba70 100644 --- a/htdocs/compta/bank/line.php +++ b/htdocs/compta/bank/line.php @@ -51,7 +51,8 @@ if (!empty($conf->salaries->enabled)) { } -$id = (GETPOST('rowid', 'int') ? GETPOST('rowid', 'int') : GETPOST('account', 'int')); +$id = GETPOST('rowid', 'int'); +$accountid = (GETPOST('id', 'int') ? GETPOST('id', 'int') : GETPOST('account', 'int')); $ref = GETPOST('ref', 'alpha'); $action = GETPOST('action', 'aZ09'); $confirm = GETPOST('confirm', 'alpha'); @@ -68,8 +69,8 @@ if ($user->socid) { $socid = $user->socid; } -$result = restrictedArea($user, 'banque', $fieldvalue, 'bank_account', '', '', $fieldtype); -if (empty($user->rights->banque->lire) && !$user->rights->banque->consolidate) { +$result = restrictedArea($user, 'banque', $accountid, 'bank_account'); +if (empty($user->rights->banque->lire) && empty($user->rights->banque->consolidate)) { accessforbidden(); } @@ -79,6 +80,7 @@ $hookmanager->initHooks(array('bankline')); /* * Actions */ + $parameters = array('socid' => $socid); $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks if ($reshook < 0) { @@ -270,7 +272,7 @@ if (is_array($cats)) { $head = bankline_prepare_head($rowid); -$sql = "SELECT b.rowid,b.dateo as do,b.datev as dv, b.amount, b.label, b.rappro,"; +$sql = "SELECT b.rowid, b.dateo as do, b.datev as dv, b.amount, b.label, b.rappro,"; $sql .= " b.num_releve, b.fk_user_author, b.num_chq, b.fk_type, b.fk_account, b.fk_bordereau as receiptid,"; $sql .= " b.emetteur,b.banque"; $sql .= " FROM ".MAIN_DB_PREFIX."bank as b"; @@ -304,6 +306,7 @@ if ($result) { print ''; print ''; print ''; + print ''; print ''; print dol_get_fiche_head($head, 'bankline', $langs->trans('LineRecord'), 0, 'accountline', 0); @@ -495,9 +498,9 @@ if ($result) { print $form->selectDate($db->jdate($objp->do), 'dateo', '', '', '', 'update', 1, 0, $objp->rappro); if (!$objp->rappro) { print ' '; - print ''; + print ''; print img_edit_remove()." "; - print ''; + print ''; print img_edit_add().""; } print ' | '; @@ -515,9 +518,9 @@ if ($result) { print $form->selectDate($db->jdate($objp->dv), 'datev', '', '', '', 'update', 1, 0, $objp->rappro); if (!$objp->rappro) { print ' '; - print ''; + print ''; print img_edit_remove()." "; - print ''; + print ''; print img_edit_add().""; } print ''; @@ -658,10 +661,10 @@ if ($result) { } print '|||||||||||||||||||||
| ".$langs->trans("BankLineConciliated")." | "; + print '||||||||||||||||||||||
| '; if ($user->rights->banque->consolidate) { print ' | '; - print 'rappro ? ' checked="checked"' : '')).'">'; + print 'rappro ? ' checked="checked"' : '')).'">'; print ' | '; } else { print ''.yn($objp->rappro).' | '; diff --git a/htdocs/compta/bank/releve.php b/htdocs/compta/bank/releve.php index 269282f6eb7..87fd36c498f 100644 --- a/htdocs/compta/bank/releve.php +++ b/htdocs/compta/bank/releve.php @@ -331,8 +331,8 @@ if (empty($numref)) { } else { print ''; print ''; - print ''; - print ''; + print ''; + print ''; } print ''; @@ -364,7 +364,7 @@ if (empty($numref)) { print ''; if ($user->rights->banque->consolidate && $action != 'editbankreceipt') { - print 'numr).'">'.img_edit().''; + print 'numr).'">'.img_edit().''; } print ' | '; @@ -669,6 +669,7 @@ if (empty($numref)) { var current = $(this); current.click(function() { + console.log("We click on ajaxforbankoperationchange"); var url = "'.$urlajax.'&"+current.attr("href").split("?")[1]; $.get(url, function(data) { diff --git a/htdocs/compta/bank/various_payment/card.php b/htdocs/compta/bank/various_payment/card.php index 72188cdbb4a..0003570fd02 100644 --- a/htdocs/compta/bank/various_payment/card.php +++ b/htdocs/compta/bank/various_payment/card.php @@ -334,11 +334,7 @@ foreach ($bankcateg->fetchAll() as $bankcategory) { $options[$bankcategory->id] = $bankcategory->label; } -/* ************************************************************************** */ -/* */ -/* Create mode */ -/* */ -/* ************************************************************************** */ +// Create mode if ($action == 'create') { // Update fields properties in realtime if (!empty($conf->use_javascript_ajax)) { @@ -350,6 +346,7 @@ if ($action == 'create') { }); function setPaymentType() { + console.log("setPaymentType"); var code = $("#selectpaymenttype option:selected").val(); if (code == \'CHQ\' || code == \'VIR\') { @@ -415,7 +412,8 @@ if ($action == 'create') { if (!empty($conf->banque->enabled)) { print '|||||||||||||||||||
| '; print $form->editfieldkey('BankAccount', 'selectaccountid', '', $object, 0, 'string', '', 1).' | '; - print img_picto('', 'bank_account', 'class="pictofixedwidth"').$form->select_comptes($accountid, "accountid", 0, '', 2, '', 0, '', 1); // Affiche liste des comptes courant + print img_picto('', 'bank_account', 'class="pictofixedwidth"'); + print $form->select_comptes($accountid, "accountid", 0, '', 2, '', 0, '', 1); // Show list of main accounts (comptes courants) print ' | '; if ($contextpage == 'poslist') { - print $obj->ref; + print dol_escape_htmltag($obj->ref); } else { print $facturestatic->getNomUrl(1, '', 200, 0, '', 0, 1); } @@ -1758,7 +1758,7 @@ if ($resql) { // Customer ref if (!empty($arrayfields['f.ref_client']['checked'])) { print ' | '; - print $obj->ref_client; + print dol_escape_htmltag($obj->ref_client); print ' | '; if (!$i) { $totalarray['nbfield']++; @@ -1823,7 +1823,7 @@ if ($resql) { if (!empty($arrayfields['p.title']['checked'])) { print ''; if ($obj->project_id > 0) { - print $projectstatic->title; + print dol_escape_htmltag($projectstatic->title); } print ' | '; if (!$i) { @@ -1835,9 +1835,9 @@ if ($resql) { if (!empty($arrayfields['s.nom']['checked'])) { print ''; if ($contextpage == 'poslist') { - print $companystatic->name; + print dol_escape_htmltag($companystatic->name); } else { - print $companystatic->getNomUrl(1, 'customer'); + print $companystatic->getNomUrl(1, 'customer', 0, 0, -1, empty($arrayfields['s.name_alias']['checked']) ? 0 : 1); } print ' | '; if (!$i) { @@ -1846,8 +1846,8 @@ if ($resql) { } // Alias if (!empty($arrayfields['s.name_alias']['checked'])) { - print ''; - print dol_escape_htmltag((!empty($obj->name_alias) ? $obj->name_alias : '')); + print ' | '; + print dol_escape_htmltag($companystatic->name_alias); print ' | '; if (!$i) { $totalarray['nbfield']++; @@ -1903,10 +1903,10 @@ if ($resql) { // Staff if (!empty($arrayfields['staff.code']['checked'])) { print ''; - if (!is_array($staffArray) || count($staffArray) == 0) { - $staffArray = $formcompany->effectif_array(1); + if (!is_array($conf->cache['staff']) || count($conf->cache['staff']) == 0) { + $conf->cache['staff'] = $formcompany->effectif_array(1); } - print $staffArray[$obj->staff_code]; + print $conf->cache['staff'][$obj->staff_code]; print ' | '; if (!$i) { $totalarray['nbfield']++; @@ -1955,7 +1955,7 @@ if ($resql) { // Amount HT if (!empty($arrayfields['f.total_ht']['checked'])) { - print ''.price($obj->total_ht)." | \n"; + print ''.price($obj->total_ht)." | \n"; if (!$i) { $totalarray['nbfield']++; } @@ -2085,11 +2085,11 @@ if ($resql) { } if (!empty($arrayfields['f.retained_warranty']['checked'])) { - print ''.(!empty($obj->retained_warranty) ?price($obj->retained_warranty).'%' : ' ').' | '; + print ''.(!empty($obj->retained_warranty) ? price($obj->retained_warranty).'%' : ' ').' | '; } if (!empty($arrayfields['dynamount_payed']['checked'])) { - print ''.(!empty($totalpay) ?price($totalpay, 0, $langs) : ' ').' | '; // TODO Use a denormalized field + print ''.(!empty($totalpay) ? price($totalpay, 0, $langs) : ' ').' | '; // TODO Use a denormalized field if (!$i) { $totalarray['nbfield']++; } @@ -2116,7 +2116,7 @@ if ($resql) { // Currency if (!empty($arrayfields['f.multicurrency_code']['checked'])) { - print ''.$obj->multicurrency_code.' - '.$langs->trans('Currency'.$obj->multicurrency_code)." | \n"; + print ''.dol_escape_htmltag($obj->multicurrency_code).' - '.$langs->trans('Currency'.$obj->multicurrency_code)." | \n"; if (!$i) { $totalarray['nbfield']++; } @@ -2210,7 +2210,7 @@ if ($resql) { print $hookmanager->resPrint; // Date creation if (!empty($arrayfields['f.datec']['checked'])) { - print ''; + print ' | '; print dol_print_date($db->jdate($obj->date_creation), 'dayhour', 'tzuser'); print ' | '; if (!$i) { @@ -2219,7 +2219,7 @@ if ($resql) { } // Date modification if (!empty($arrayfields['f.tms']['checked'])) { - print ''; + print ' | '; print dol_print_date($db->jdate($obj->date_update), 'dayhour', 'tzuser'); print ' | '; if (!$i) { @@ -2228,7 +2228,7 @@ if ($resql) { } // Date closing if (!empty($arrayfields['f.date_closing']['checked'])) { - print ''; + print ' | '; print dol_print_date($db->jdate($obj->date_closing), 'dayhour', 'tzuser'); print ' | '; if (!$i) { diff --git a/htdocs/compta/facture/prelevement.php b/htdocs/compta/facture/prelevement.php index d815fad4ba6..cd34a027651 100644 --- a/htdocs/compta/facture/prelevement.php +++ b/htdocs/compta/facture/prelevement.php @@ -52,8 +52,10 @@ if ($user->socid) { $socid = $user->socid; } +$moreparam = ''; if ($type == 'bank-transfer') { $object = new FactureFournisseur($db); + $moreparam = '&type='.$type; } else { $object = new Facture($db); } @@ -221,7 +223,7 @@ $form = new Form($db); $now = dol_now(); if ($type == 'bank-transfer') { - $title = $langs->trans('InvoiceSupplier')." - ".$langs->trans('CreditTransfer'); + $title = $langs->trans('SupplierInvoice')." - ".$langs->trans('CreditTransfer'); $helpurl = ""; } else { $title = $langs->trans('InvoiceCustomer')." - ".$langs->trans('StandingOrders'); @@ -384,7 +386,7 @@ if ($object->id > 0) { $object->totalpaye = $totalpaye; // To give a chance to dol_banner_tab to use already paid amount to show correct status - dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, '', 0, '', ''); + dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, $moreparam, 0, '', ''); print '
'.$langs->trans("ThisWillAlsoAddPaymentOnInvoice").'
';
- print '';
+ print '';
print '';
print ''; } - // Actions if ($action != 'settransmitted' && $action != 'setcredited') { print "\n".'
'."\n";
- if (empty($object->date_trans) && $user->rights->prelevement->bons->send) {
- print ''.$langs->trans("SetToStatusSent").'';
+ if (empty($object->date_trans)) {
+ if ($object->type == 'bank-transfer') print dolGetButtonAction($langs->trans("SetToStatusSent"), '', 'default', 'card.php?action=settransmitted&token='.newToken().'&id='.$object->id, '', $user->rights->paymentbybanktransfer->send);
+ else print dolGetButtonAction($langs->trans("SetToStatusSent"), '', 'default', 'card.php?action=settransmitted&token='.newToken().'&id='.$object->id, '', $user->rights->prelevement->bons->send);
}
if (!empty($object->date_trans) && $object->date_credit == 0) {
- print ''.$langs->trans("ClassCredited").'';
+ if ($object->type == 'bank-transfer') print dolGetButtonAction($langs->trans("ClassDebited"), '', 'default', 'card.php?action=setcredited&token='.newToken().'&id='.$object->id, '', $user->rights->paymentbybanktransfer->debit);
+ else print dolGetButtonAction($langs->trans("ClassCredited"), '', 'default', 'card.php?action=setcredited&token='.newToken().'&id='.$object->id, '', $user->rights->prelevement->bons->credit);
}
- print ''.$langs->trans("Delete").'';
+ if ($object->type == 'bank-transfer') print dolGetButtonAction($langs->trans("Delete"), '', 'delete', 'card.php?action=delete&token='.newToken().'&id='.$object->id, '', $user->rights->paymentbybanktransfer->create);
+ else print dolGetButtonAction($langs->trans("Delete"), '', 'delete', 'card.php?action=delete&token='.newToken().'&id='.$object->id, '', $user->rights->prelevement->bons->creer);
print '
';
}
diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php
index 68b924e2e4d..93279218218 100644
--- a/htdocs/compta/prelevement/class/bonprelevement.class.php
+++ b/htdocs/compta/prelevement/class/bonprelevement.class.php
@@ -332,74 +332,6 @@ class BonPrelevement extends CommonObject
}
}
- // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
- /**
- * Set credite and set status of linked invoices. Still used ??
- *
- * @return int <0 if KO, >=0 if OK
- */
- public function set_credite()
- {
- // phpcs:enable
- global $user, $conf;
-
- $error = 0;
-
- if ($this->db->begin()) {
- $sql = " UPDATE ".MAIN_DB_PREFIX."prelevement_bons";
- $sql .= " SET statut = ".self::STATUS_TRANSFERED;
- $sql .= " WHERE rowid = ".((int) $this->id);
- $sql .= " AND entity = ".((int) $conf->entity);
-
- $result = $this->db->query($sql);
- if (!$result) {
- dol_syslog(get_class($this)."::set_credite Erreur 1");
- $error++;
- }
-
- if (!$error) {
- $facs = array();
- $facs = $this->getListInvoices();
-
- $num = count($facs);
- for ($i = 0; $i < $num; $i++) {
- /* Tag invoice as paid */
- dol_syslog(get_class($this)."::set_credite set_paid fac ".$facs[$i]);
- $fac = new Facture($this->db);
- $fac->fetch($facs[$i]);
- $result = $fac->setPaid($user);
- }
- }
-
- if (!$error) {
- $sql = " UPDATE ".MAIN_DB_PREFIX."prelevement_lignes";
- $sql .= " SET statut = 2";
- $sql .= " WHERE fk_prelevement_bons = ".((int) $this->id);
-
- if (!$this->db->query($sql)) {
- dol_syslog(get_class($this)."::set_credite Erreur 1");
- $error++;
- }
- }
-
- /*
- * End of procedure
- */
- if (!$error) {
- $this->db->commit();
- return 0;
- } else {
- $this->db->rollback();
- dol_syslog(get_class($this)."::set_credite ROLLBACK ");
-
- return -1;
- }
- } else {
- dol_syslog(get_class($this)."::set_credite Ouverture transaction SQL impossible ");
- return -2;
- }
- }
-
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
/**
* Set direct debit or credit transfer order to "paid" status.
@@ -1551,7 +1483,7 @@ class BonPrelevement extends CommonObject
fputs($this->file, ' ';
- $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/contact/list.php b/htdocs/contact/list.php
index ec886ce1d4e..66561730829 100644
--- a/htdocs/contact/list.php
+++ b/htdocs/contact/list.php
@@ -1169,7 +1169,7 @@ while ($i < min($num, $limit)) {
}
// EMail
if (!empty($arrayfields['p.email']['checked'])) {
- print '';
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/dolreceiptprinter.class.php b/htdocs/core/class/dolreceiptprinter.class.php
index e259627fe22..9db069ab290 100644
--- a/htdocs/core/class/dolreceiptprinter.class.php
+++ b/htdocs/core/class/dolreceiptprinter.class.php
@@ -61,6 +61,7 @@
* Replaced by month number
* Replaced by day number
* Replaced by day number
+ * Replaced by current date
* Replaced by object id
* Replaced by object ref
* Replaced by customer firstname
@@ -186,6 +187,7 @@ class dolReceiptPrinter extends Printer
'dol_value_month' => 'DOL_VALUE_MONTH',
'dol_value_day' => 'DOL_VALUE_DAY',
'dol_value_day_letters' => 'DOL_VALUE_DAY',
+ 'dol_value_currentdate' => 'DOL_VALUE_CURRENTDATE',
'dol_print_payment' => 'DOL_PRINT_PAYMENT',
'dol_print_logo' => 'DOL_PRINT_LOGO',
'dol_print_logo_old' => 'DOL_PRINT_LOGO_OLD',
@@ -585,6 +587,7 @@ class dolReceiptPrinter extends Printer
$this->template = str_replace('{dol_value_month}', dol_print_date($object->date, '%m'), $this->template);
$this->template = str_replace('{dol_value_day}', dol_print_date($object->date, '%d'), $this->template);
$this->template = str_replace('{dol_value_day_letters}', $langs->trans("Day".dol_print_date($object->date, '%m')[1]), $this->template);
+ $this->template = str_replace('{dol_value_currentdate}', dol_print_date(dol_now(), 'dayhour'), $this->template);
$this->template = str_replace('{dol_value_customer_firstname}', $object->thirdparty->firstname, $this->template);
$this->template = str_replace('{dol_value_customer_lastname}', $object->thirdparty->lastname, $this->template);
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 89016f08b12..5ad1e8be723 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -2496,12 +2496,12 @@ class Form
$soc = new Societe($db);
$result = $soc->fetch($socid);
if ($result > 0 && !empty($soc->default_lang)) {
- $sql .= " AND pl.lang='" . $this->db->escape($soc->default_lang) . "'";
+ $sql .= " AND pl.lang = '".$this->db->escape($soc->default_lang)."'";
} else {
- $sql .= " AND pl.lang='".$this->db->escape($langs->getDefaultLang())."'";
+ $sql .= " AND pl.lang = '".$this->db->escape($langs->getDefaultLang())."'";
}
} else {
- $sql .= " AND pl.lang='".$this->db->escape($langs->getDefaultLang())."'";
+ $sql .= " AND pl.lang = '".$this->db->escape($langs->getDefaultLang())."'";
}
}
@@ -8461,7 +8461,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/class/ldap.class.php b/htdocs/core/class/ldap.class.php
index 120c2993801..9e2c45fd634 100644
--- a/htdocs/core/class/ldap.class.php
+++ b/htdocs/core/class/ldap.class.php
@@ -325,7 +325,8 @@ class Ldap
*/
public function close()
{
- if ($this->connection && !@ldap_close($this->connection)) {
+ $r_type = get_resource_type($this->connection);
+ if ($this->connection && ($r_type === "Unknown" || !@ldap_close($this->connection))) {
return false;
} else {
return true;
diff --git a/htdocs/core/class/utils.class.php b/htdocs/core/class/utils.class.php
index e081c59b14b..b408985a92d 100644
--- a/htdocs/core/class/utils.class.php
+++ b/htdocs/core/class/utils.class.php
@@ -399,21 +399,23 @@ class Utils
if ($execmethod == 2) { // With this method, there is no way to get the return code, only output
$handlein = popen($fullcommandclear, 'r');
$i = 0;
- while (!feof($handlein)) {
- $i++; // output line number
- $read = fgets($handlein);
- // Exclude warning line we don't want
- if ($i == 1 && preg_match('/Warning.*Using a password/i', $read)) {
- continue;
- }
- fwrite($handle, $read);
- if (preg_match('/'.preg_quote('-- Dump completed').'/i', $read)) {
- $ok = 1;
- } elseif (preg_match('/'.preg_quote('SET SQL_NOTES=@OLD_SQL_NOTES').'/i', $read)) {
- $ok = 1;
+ if ($handlein) {
+ while (!feof($handlein)) {
+ $i++; // output line number
+ $read = fgets($handlein);
+ // Exclude warning line we don't want
+ if ($i == 1 && preg_match('/Warning.*Using a password/i', $read)) {
+ continue;
+ }
+ fwrite($handle, $read);
+ if (preg_match('/'.preg_quote('-- Dump completed').'/i', $read)) {
+ $ok = 1;
+ } elseif (preg_match('/'.preg_quote('SET SQL_NOTES=@OLD_SQL_NOTES').'/i', $read)) {
+ $ok = 1;
+ }
}
+ pclose($handlein);
}
- pclose($handlein);
}
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index d5a963ed586..ed871204cae 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -1612,7 +1612,7 @@ function dol_fiche_head($links = array(), $active = '0', $title = '', $notab = 0
/**
* Show tabs of a record
*
- * @param array $links Array of tabs
+ * @param array $links Array of tabs. Note that label into $links[$i][1] must be already HTML escaped.
* @param string $active Active tab name
* @param string $title Title
* @param int $notab -1 or 0=Add tab header, 1=no tab header (if you set this to 1, using print dol_get_fiche_end() to close tab is not required), -2=Add tab header with no seaparation under tab (to start a tab just after)
@@ -1697,8 +1697,8 @@ function dol_get_fiche_head($links = array(), $active = '', $title = '', $notab
}
if ($i < $limittoshow || $isactive) {
- // Add a new entry
- $out .= '
';
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 '
';
print '';
- 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 " | ';
if ($objp->bid) {
- print ''.img_object($langs->trans("ShowAccount"), 'account').' '.dol_trunc($objp->label, 24).'';
+ $accountstatic->id = $objp->bid;
+ $accountstatic->ref = $objp->bref;
+ $accountstatic->label = $objp->blabel;
+ $accountstatic->number = $objp->number;
+ $accountstatic->iban = $objp->iban_prefix;
+ $accountstatic->bic = $objp->bic;
+ $accountstatic->currency_code = $objp->currency_code;
+ $accountstatic->account_number = $objp->account_number;
+
+ $accountingjournal = new AccountingJournal($db);
+ $accountingjournal->fetch($objp->accountancy_journal);
+ $accountstatic->accountancy_journal = $accountingjournal->code;
+
+ print $accountstatic->getNomUrl(1);
} else {
print ' ';
}
diff --git a/htdocs/install/mysql/data/llx_20_c_departements.sql b/htdocs/install/mysql/data/llx_20_c_departements.sql
index fecaf87befe..4fc9ec26366 100644
--- a/htdocs/install/mysql/data/llx_20_c_departements.sql
+++ b/htdocs/install/mysql/data/llx_20_c_departements.sql
@@ -226,10 +226,10 @@ insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc
insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (201, '05','',1,'FLANDRE-OCCIDENTALE','Flandre-Occidentale');
insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (201, '06','',1,'FLANDRE-ORIENTALE','Flandre-Orientale');
insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (202, '07','',2,'HAINAUT','Hainaut');
-insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (201, '08','',2,'LIEGE','Liège');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (202, '08','',2,'LIEGE','Liège');
insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (202, '09','',1,'LIMBOURG','Limbourg');
insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (202, '10','',2,'LUXEMBOURG','Luxembourg');
-insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (201, '11','',2,'NAMUR','Namur');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (202, '11','',2,'NAMUR','Namur');
-- Brazil Provinces (id country=56)
diff --git a/htdocs/install/mysql/migration/14.0.0-15.0.0.sql b/htdocs/install/mysql/migration/14.0.0-15.0.0.sql
index cd24a252a04..d33701c6ad6 100644
--- a/htdocs/install/mysql/migration/14.0.0-15.0.0.sql
+++ b/htdocs/install/mysql/migration/14.0.0-15.0.0.sql
@@ -480,3 +480,5 @@ ALTER TABLE llx_session MODIFY COLUMN user_agent VARCHAR(255) NULL;
ALTER TABLE llx_inventorydet ADD COLUMN fk_movement integer NULL;
ALTER TABLE llx_stock_mouvement MODIFY COLUMN origintype varchar(64);
+
+ALTER TABLE llx_intracommreport CHANGE COLUMN period periods varchar(32);
diff --git a/htdocs/intracommreport/list.php b/htdocs/intracommreport/list.php
index a4fed4def2d..6d1952b8786 100644
--- a/htdocs/intracommreport/list.php
+++ b/htdocs/intracommreport/list.php
@@ -251,7 +251,7 @@ $parameters = array();
$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters); // Note that $action and $object may have been modified by hook
$sql .= $hookmanager->resPrint;
-$sql .= " GROUP BY i.rowid";
+$sql .= " GROUP BY i.rowid, i.type_declaration, i.type_export, i.periods, i.mode, i.entity";
/*
// Add fields from extrafields
@@ -348,7 +348,7 @@ if ($resql) {
print '';
}
- print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_products.png', 0, $newcardbutton, '', $limit);
+ print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'intracommreport', 0, $newcardbutton, '', $limit);
$topicmail = "Information";
$modelmail = "product";
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 23cb14faae1..dbc5841e433 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -756,7 +756,7 @@ Permission106=Export sendings
Permission109=Delete sendings
Permission111=Read financial accounts
Permission112=Create/modify/delete and compare transactions
-Permission113=Setup financial accounts (create, manage categories)
+Permission113=Setup financial accounts (create, manage categories of bank transactions)
Permission114=Reconcile transactions
Permission115=Export transactions and account statements
Permission116=Transfers between accounts
@@ -2069,13 +2069,14 @@ EmailCollectorConfirmCollect=Do you want to run the collection for this collecto
NoNewEmailToProcess=No new email (matching filters) to process
NothingProcessed=Nothing done
XEmailsDoneYActionsDone=%s emails qualified, %s emails successfully processed (for %s record/actions done)
-RecordEvent=Record email event
-CreateLeadAndThirdParty=Create lead (and third party if necessary)
-CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
+RecordEvent=Record an event in agenda (with type Email sent or received)
+CreateLeadAndThirdParty=Create a lead (and a third party if necessary)
+CreateTicketAndThirdParty=Create a ticket (linked to a third party if the third party was loaded by a previous operation, with no third party otherwise)
CodeLastResult=Latest result code
NbOfEmailsInInbox=Number of emails in source directory
LoadThirdPartyFromName=Load third party searching on %s (load only)
LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
+AttachJoinedDocumentsToObject=Save attached files into object documents if a ref of an object is found into email topic.
WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
WithDolTrackingIDInMsgId=Message sent from Dolibarr
@@ -2084,7 +2085,7 @@ CreateCandidature=Create job application
FormatZip=Zip
MainMenuCode=Menu entry code (mainmenu)
ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example: objproperty1=SET:the value to set objproperty2=SET:a value with replacement of __objproperty1__ objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined objproperty4=EXTRACT:HEADER:X-Myheaderkey:\s*([^\s]*) options_myextrafield1=EXTRACT:SUBJECT:([^\n]*) object.objproperty5=EXTRACT:BODY:My company name is\s([^\s]*) Use a ; char as separator to extract or set several properties. +OperationParamDesc=Define the rules to use to extract or set values. Example for operations that need to extract a name from email subject: name=EXTRACT:SUBJECT:Message from company ([^\n]*) Example for operations that create objects: objproperty1=SET:the value to set objproperty2=SET:a value including value of __objproperty1__ objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined objproperty4=EXTRACT:HEADER:X-Myheaderkey:\s*([^\s]*) options_myextrafield1=EXTRACT:SUBJECT:([^\n]*) object.objproperty5=EXTRACT:BODY:My company name is\s([^\s]*) Use a ; char as separator to extract or set several properties. OpeningHours=Opening hours OpeningHoursDesc=Enter here the regular opening hours of your company. ResourceSetup=Configuration of Resource module @@ -2130,7 +2131,7 @@ LargerThan=Larger than IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object. WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/. EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set name of directory here to use this feature (Do NOT use special characters in name). Note that you must also use a read/write login account. -EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. For example, if you want to create a thirdparty with a name extracted a string 'Name: name to find' found into the body, use sender email as email, you can set the parameter field like this: 'email=HEADER:^From:(.*);name=EXTRACT:BODY:Name:\s([^\s]*);client=SET:2;' +EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. For example, if you want to create a thirdparty with a name extracted from a string 'Name: name to find' present into the body, use the sender email as email, you can set the parameter field like this: 'email=HEADER:^From:(.*);name=EXTRACT:BODY:Name:\s([^\s]*);client=SET:2;' EndPointFor=End point for %s : %s DeleteEmailCollector=Delete email collector ConfirmDeleteEmailCollector=Are you sure you want to delete this email collector? @@ -2218,4 +2219,5 @@ PDF_USE_1A=Generate PDF with PDF/A-1b format MissingTranslationForConfKey = Missing translation for %s NativeModules=Native modules NoDeployedModulesFoundWithThisSearchCriteria=No modules found for these search criteria -API_DISABLE_COMPRESSION=Disable compression of API responses \ No newline at end of file +API_DISABLE_COMPRESSION=Disable compression of API responses +EachTerminalHasItsOwnCounter=Each terminal use its own counter. \ No newline at end of file diff --git a/htdocs/langs/en_US/errors.lang b/htdocs/langs/en_US/errors.lang index cb0d4f1def0..7f4ca7b074f 100644 --- a/htdocs/langs/en_US/errors.lang +++ b/htdocs/langs/en_US/errors.lang @@ -273,6 +273,7 @@ ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it ErrorNotInDictionaryPaymentConditions=Not in Payment Terms Dictionary, please modify. ErrorIsNotADraft=%s is not a draft ErrorExecIdFailed=Can't execute command "id" +ErrorBadCharIntoLoginName=Unauthorized character in the login name # Warnings WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup. diff --git a/htdocs/langs/en_US/withdrawals.lang b/htdocs/langs/en_US/withdrawals.lang index d5816fb1687..eb25d563f62 100644 --- a/htdocs/langs/en_US/withdrawals.lang +++ b/htdocs/langs/en_US/withdrawals.lang @@ -15,6 +15,7 @@ BankTransferReceipt=Credit transfer order LatestBankTransferReceipts=Latest %s credit transfer orders LastWithdrawalReceipts=Latest %s direct debit files WithdrawalsLine=Direct debit order line +CreditTransfer=Credit transfer CreditTransferLine=Credit transfer line WithdrawalsLines=Direct debit order lines CreditTransferLines=Credit transfer lines @@ -47,6 +48,7 @@ ThirdPartyBankCode=Third-party bank code NoInvoiceCouldBeWithdrawed=No invoice debited successfully. Check that invoices are on companies with a valid IBAN and that IBAN has a UMR (Unique Mandate Reference) with mode %s. WithdrawalCantBeCreditedTwice=This withdrawal receipt is already marked as credited; this can't be done twice, as this would potentially create duplicate payments and bank entries. ClassCredited=Classify credited +ClassDebited=Classify debited ClassCreditedConfirm=Are you sure you want to classify this withdrawal receipt as credited on your bank account? TransData=Transmission date TransMetod=Transmission method diff --git a/htdocs/langs/ta_IN/main.lang b/htdocs/langs/ta_IN/main.lang index c533b180370..f703f005da6 100644 --- a/htdocs/langs/ta_IN/main.lang +++ b/htdocs/langs/ta_IN/main.lang @@ -1,10 +1,10 @@ # Dolibarr language file - Source file is en_US - main -DIRECTION=லெட்டர் +DIRECTION=ltr # Note for Chinese: # msungstdlight or cid0ct are for traditional Chinese (traditional does not render with Ubuntu pdf reader) # stsongstdlight or cid0cs are for simplified Chinese # To read Chinese pdf with Linux: sudo apt-get install poppler-data -FONTFORPDF=ஹெல்வெடிகா +FONTFORPDF=freemono FONTSIZEFORPDF=10 SeparatorDecimal=. SeparatorThousand=, @@ -12,8 +12,8 @@ FormatDateShort=%m/%d/%Y FormatDateShortInput=%m/%d/%Y FormatDateShortJava=MM/dd/yyyy FormatDateShortJavaInput=MM/dd/yyyy -FormatDateShortJQuery=மிமீ/டிடி/ஒய் -FormatDateShortJQueryInput=மிமீ/டிடி/ஒய் +FormatDateShortJQuery=mm/dd/yy +FormatDateShortJQueryInput=mm/dd/yy FormatHourShortJQuery=HH:MI FormatHourShort=%I:%M %p FormatHourShortDuration=%H:%M diff --git a/htdocs/mrp/mo_movements.php b/htdocs/mrp/mo_movements.php index f7c25a1ec83..f0fe25eddb6 100644 --- a/htdocs/mrp/mo_movements.php +++ b/htdocs/mrp/mo_movements.php @@ -1,5 +1,6 @@ + * Copyright (C) 2022 Ferran Marcet '.$objp->mid.' | ';
+ print ''.dol_escape_htmltag($objp->mid).' | ';
}
if (!empty($arrayfields['m.datem']['checked'])) {
// Date
@@ -858,7 +881,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
if ($productlot->id > 0) {
print $productlot->getNomUrl(1);
} else {
- print $productlot->batch; // the id may not be defined if movement was entered when lot was not saved or if lot was removed after movement.
+ print dol_escape_htmltag($productlot->batch); // the id may not be defined if movement was entered when lot was not saved or if lot was removed after movement.
}
print ' | ';
}
@@ -884,13 +907,13 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
// Inventory code
print ''; //print ''; - print $objp->inventorycode; + print dol_escape_htmltag($objp->inventorycode); //print ''; print ' | '; } if (!empty($arrayfields['m.label']['checked'])) { // Label of movement - print ''.$objp->label.' | '; + print ''.dol_escape_htmltag($objp->label).' | '; } if (!empty($arrayfields['m.type_mouvement']['checked'])) { // Type of movement @@ -911,7 +934,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea } if (!empty($arrayfields['origin']['checked'])) { // Origin of movement - print ''.$origin.' | '; + print ''.dol_escape_htmltag($origin).' | '; } if (!empty($arrayfields['m.fk_projet']['checked'])) { // fk_project diff --git a/htdocs/paybox/admin/paybox.php b/htdocs/paybox/admin/paybox.php index bcad50de457..60426e6a3b0 100644 --- a/htdocs/paybox/admin/paybox.php +++ b/htdocs/paybox/admin/paybox.php @@ -30,7 +30,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php'; $servicename = 'PayBox'; // Load translation files required by the page -$langs->loadLangs(array('admin', 'other', 'paybox', 'paypal')); +$langs->loadLangs(array('admin', 'other', 'paybox', 'paypal', 'stripe')); if (!$user->admin) { accessforbidden(); @@ -261,7 +261,7 @@ $doleditor->Create(); print ''; -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/ajax/products.php b/htdocs/product/ajax/products.php
index e230d148026..c6ce5fb5873 100644
--- a/htdocs/product/ajax/products.php
+++ b/htdocs/product/ajax/products.php
@@ -47,7 +47,7 @@ if (empty($_GET['keysearch']) && !defined('NOREQUIREHTML')) {
require '../../main.inc.php';
-$htmlname = GETPOST('htmlname', 'alpha');
+$htmlname = GETPOST('htmlname', 'aZ09');
$socid = GETPOST('socid', 'int');
$type = GETPOST('type', 'int');
$mode = GETPOST('mode', 'int');
@@ -242,7 +242,7 @@ if (!empty($action) && $action == 'fetch' && !empty($id)) {
// Filter on the product to search can be:
// Into an array with key $htmlname123 (we take first one found). Which page use this ?
// Into a var with name $htmlname can be 'prodid', 'productid', ...
- $match = preg_grep('/('.$htmlname.'[0-9]+)/', array_keys($_GET));
+ $match = preg_grep('/('.preg_quote($htmlname, '/').'[0-9]+)/', array_keys($_GET));
sort($match);
$idprod = (empty($match[0]) ? '' : $match[0]); // Take first key found into GET array with matching $htmlname123
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/index.php b/htdocs/product/index.php
index e4c81f9fd8c..e4a0bfc7421 100644
--- a/htdocs/product/index.php
+++ b/htdocs/product/index.php
@@ -342,8 +342,8 @@ if ((!empty($conf->product->enabled) || !empty($conf->service->enabled)) && ($us
if (!empty($conf->global->MAIN_MULTILANGS)) {
$sql = "SELECT label";
$sql .= " FROM ".MAIN_DB_PREFIX."product_lang";
- $sql .= " WHERE fk_product=".((int) $objp->rowid);
- $sql .= " AND lang='".$db->escape($langs->getDefaultLang())."'";
+ $sql .= " WHERE fk_product = ".((int) $objp->rowid);
+ $sql .= " AND lang = '".$db->escape($langs->getDefaultLang())."'";
$resultd = $db->query($sql);
if ($resultd) {
diff --git a/htdocs/product/popuprop.php b/htdocs/product/popuprop.php
index dbffe79d0c0..9028e81a757 100644
--- a/htdocs/product/popuprop.php
+++ b/htdocs/product/popuprop.php
@@ -212,7 +212,7 @@ if ($mode && $mode != '-1') {
$sql = "SELECT label";
$sql .= " FROM ".MAIN_DB_PREFIX."product_lang";
$sql .= " WHERE fk_product = ".((int) $prodid);
- $sql .= " AND lang='".$db->escape($langs->getDefaultLang())."'";
+ $sql .= " AND lang = '".$db->escape($langs->getDefaultLang())."'";
$sql .= " LIMIT 1";
$resultp = $db->query($sql);
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/movement_list.php b/htdocs/product/stock/movement_list.php index e1418bed4c4..ed5896ca6cc 100644 --- a/htdocs/product/stock/movement_list.php +++ b/htdocs/product/stock/movement_list.php @@ -3,7 +3,7 @@ * Copyright (C) 2004-2017 Laurent Destailleur|
| '.$langs->trans("Totalforthispage").' | '; +print ''.price(price2num($totalbuyingprice, 'MT')).' | ||||||
| '.$langs->trans("EnterADateCriteria").' | |||||||
| ';
+
if ($action == "dosign" && empty($cancel)) {
print ' ';
print '';
print '';
print ' ';
- print '';
+ // Do not use class="reposition" here: It breaks the submit and there is a message on top to say it's ok, so going back top is better.
+ print '';
print '';
// Add js code managed into the div #signature
@@ -380,9 +417,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 +447,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 ' | ||||||