';
// List of directories area
$texte .= '';
@@ -161,10 +160,25 @@ class doc_generic_contract_odt extends ModelePDFContract
$texte .= ''.count($listoffiles).' ';
+ $nbofiles = count($listoffiles);
+ if (!empty($conf->global->CONTRACT_ADDON_PDF_ODT_PATH)) {
+ $texte .= $langs->trans("NumberOfModelFilesFound").': ';
+ //$texte.=$nbofiles?'':'';
+ $texte .= count($listoffiles);
+ //$texte.=$nbofiles?' ':'';
+ $texte .= ' ';
}
+ if ($nbofiles) {
+ $texte .= '';
+ }
// Add input to upload a new template file.
$texte .= ''.$langs->trans("UploadNewTemplate");
$maxfilesizearray = getMaxFileSizeArray();
@@ -228,7 +242,7 @@ class doc_generic_contract_odt extends ModelePDFContract
$sav_charset_output = $outputlangs->charset_output;
$outputlangs->charset_output = 'UTF-8';
- // Load traductions files required by page
+ // Load translation files required by page
$outputlangs->loadLangs(array("main", "dict", "companies", "bills"));
if ($conf->contrat->multidir_output[$object->entity]) {
@@ -382,16 +396,21 @@ class doc_generic_contract_odt extends ModelePDFContract
dol_syslog($e->getMessage(), LOG_INFO);
}
+ // Call the ODTSubstitution hook
+ $parameters = array('odfHandler'=>&$odfHandler, 'file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs, 'substitutionarray'=>&$tmparray);
+ $reshook = $hookmanager->executeHooks('ODTSubstitution', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
+
foreach ($tmparray as $key => $value) {
try {
- if (preg_match('/logo$/', $key)) { // Image
+ if (preg_match('/logo$/', $key)) {
+ // Image
if (file_exists($value)) {
$odfHandler->setImage($key, $value);
} else {
$odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
}
- } else // Text
- {
+ } else {
+ // Text
$odfHandler->setVars($key, $value, true, 'UTF-8');
}
} catch (OdfException $e) {
@@ -448,7 +467,7 @@ class doc_generic_contract_odt extends ModelePDFContract
}
// Call the beforeODTSave hook
- $parameters = array('odfHandler'=>&$odfHandler, 'file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
+ $parameters = array('odfHandler'=>&$odfHandler, 'file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs, 'substitutionarray'=>&$tmparray);
$reshook = $hookmanager->executeHooks('beforeODTSave', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
// Write new file
@@ -457,6 +476,7 @@ class doc_generic_contract_odt extends ModelePDFContract
$odfHandler->exportAsAttachedPDF($file);
} catch (Exception $e) {
$this->error = $e->getMessage();
+ dol_syslog($e->getMessage(), LOG_INFO);
return -1;
}
} else {
@@ -464,10 +484,12 @@ class doc_generic_contract_odt extends ModelePDFContract
$odfHandler->saveToDisk($file);
} catch (Exception $e) {
$this->error = $e->getMessage();
+ dol_syslog($e->getMessage(), LOG_INFO);
return -1;
}
}
+ $parameters = array('odfHandler'=>&$odfHandler, 'file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs, 'substitutionarray'=>&$tmparray);
$reshook = $hookmanager->executeHooks('afterODTCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
if (!empty($conf->global->MAIN_UMASK)) {
diff --git a/htdocs/core/modules/dons/html_cerfafr.modules.php b/htdocs/core/modules/dons/html_cerfafr.modules.php
index 792c8434ba4..d859ae0ca56 100644
--- a/htdocs/core/modules/dons/html_cerfafr.modules.php
+++ b/htdocs/core/modules/dons/html_cerfafr.modules.php
@@ -120,18 +120,18 @@ class html_cerfafr extends ModeleDon
// This is not the proper way to do it but $formclass->form_modes_reglement
// prints the translation instead of returning it
- if ($don->modepaiementid) {
- $formclass->load_cache_types_paiements();
- $paymentmode = $formclass->cache_types_paiements[$don->modepaiementid]['label'];
+ $formclass->load_cache_types_paiements();
+ if ($don->modepaymentid) {
+ $paymentmode = $formclass->cache_types_paiements[$don->modepaymentid]['label'];
} else {
$paymentmode = '';
}
-
- if ($don->modepaymentcode == 'CHQ') {
+ $modepaymentcode = !empty($formclass->cache_types_paiements[$don->modepaymentid]['code']) ? $formclass->cache_types_paiements[$don->modepaymentid]['code'] : "";
+ if ($modepaymentcode == 'CHQ') {
$ModePaiement = '
';
- } elseif ($don->modepaymentcode == 'LIQ') {
+ } elseif ($modepaymentcode == 'LIQ') {
$ModePaiement = '
';
- } elseif ($don->modepaymentcode == 'VIR' || $don->modepaymentcode == 'PRE' || $don->modepaymentcode == 'CB') {
+ } elseif ($modepaymentcode == 'VIR' || $modepaymentcode == 'PRE' || $modepaymentcode == 'CB') {
$ModePaiement = '
';
} else {
$ModePaiement = '
';
diff --git a/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php b/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
index cfb23269ca9..73793c5a757 100644
--- a/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
+++ b/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
@@ -175,7 +175,9 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
$texte .= '
';
}
diff --git a/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php b/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
index 061f18e5442..0b8fa2d4621 100644
--- a/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
+++ b/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
@@ -174,7 +174,9 @@ class doc_generic_invoice_odt extends ModelePDFFactures
$texte .= '
';
}
diff --git a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
index 39d833de6cc..ee4cc9b5d0d 100644
--- a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
@@ -9,6 +9,7 @@
* Copyright (C) 2015 Marcos García
* Copyright (C) 2017-2018 Ferran Marcet
* Copyright (C) 2018-2020 Frédéric France
+ * Copyright (C) 2022 Anthony Berton
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -579,7 +580,8 @@ class pdf_crabe extends ModelePDFFactures
$pdf->useTemplate($tplidx);
}
if (!getDolGlobalInt('MAIN_PDF_DONOTREPEAT_HEAD')) {
- $this->_pagehead($pdf, $object, 0, $outputlangs);
+ $top_shift = $this->_pagehead($pdf, $object, 0, $outputlangs);
+ $tab_top_newpage = (!getDolGlobalInt('MAIN_PDF_DONOTREPEAT_HEAD') ? 42 + $top_shift : 10);
}
$pdf->setPage($pageposbefore + 1);
@@ -622,7 +624,8 @@ class pdf_crabe extends ModelePDFFactures
$pdf->useTemplate($tplidx);
}
if (!getDolGlobalInt('MAIN_PDF_DONOTREPEAT_HEAD')) {
- $this->_pagehead($pdf, $object, 0, $outputlangs);
+ $top_shift = $this->_pagehead($pdf, $object, 0, $outputlangs);
+ $tab_top_newpage = (!getDolGlobalInt('MAIN_PDF_DONOTREPEAT_HEAD') ? 42 + $top_shift : 10);
}
$pdf->setPage($pageposafter + 1);
}
@@ -749,10 +752,18 @@ class pdf_crabe extends ModelePDFFactures
// retrieve global local tax
if ($localtax1_type && $localtax1ligne != 0) {
- $this->localtax1[$localtax1_type][$localtax1_rate] += $localtax1ligne;
+ if (empty($this->localtax1[$localtax1_type][$localtax1_rate])) {
+ $this->localtax1[$localtax1_type][$localtax1_rate] = $localtax1ligne;
+ } else {
+ $this->localtax1[$localtax1_type][$localtax1_rate] += $localtax1ligne;
+ }
}
if ($localtax2_type && $localtax2ligne != 0) {
- $this->localtax2[$localtax2_type][$localtax2_rate] += $localtax2ligne;
+ if (empty($this->localtax2[$localtax2_type][$localtax2_rate])) {
+ $this->localtax2[$localtax2_type][$localtax2_rate] = $localtax2ligne;
+ } else {
+ $this->localtax2[$localtax2_type][$localtax2_rate] += $localtax2ligne;
+ }
}
if (($object->lines[$i]->info_bits & 0x01) == 0x01) {
@@ -798,7 +809,8 @@ class pdf_crabe extends ModelePDFFactures
$pdf->setPage($pagenb);
$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
if (!getDolGlobalInt('MAIN_PDF_DONOTREPEAT_HEAD')) {
- $this->_pagehead($pdf, $object, 0, $outputlangs);
+ $top_shift = $this->_pagehead($pdf, $object, 0, $outputlangs);
+ $tab_top_newpage = (!getDolGlobalInt('MAIN_PDF_DONOTREPEAT_HEAD') ? 42 + $top_shift : 10);
}
if (!empty($tplidx)) {
$pdf->useTemplate($tplidx);
@@ -818,7 +830,8 @@ class pdf_crabe extends ModelePDFFactures
}
$pagenb++;
if (!getDolGlobalInt('MAIN_PDF_DONOTREPEAT_HEAD')) {
- $this->_pagehead($pdf, $object, 0, $outputlangs);
+ $top_shift = $this->_pagehead($pdf, $object, 0, $outputlangs);
+ $tab_top_newpage = (!getDolGlobalInt('MAIN_PDF_DONOTREPEAT_HEAD') ? 42 + $top_shift : 10);
}
}
}
@@ -943,7 +956,8 @@ class pdf_crabe extends ModelePDFFactures
$pdf->useTemplate($tplidx);
}
if (!getDolGlobalInt('MAIN_PDF_DONOTREPEAT_HEAD')) {
- $this->_pagehead($pdf, $object, 0, $outputlangs);
+ $top_shift = $this->_pagehead($pdf, $object, 0, $outputlangs);
+ $tab_top_newpage = (!getDolGlobalInt('MAIN_PDF_DONOTREPEAT_HEAD') ? 42 + $top_shift : 10);
}
$pdf->setPage($current_page);
$this->_tableau_versements_header($pdf, $object, $outputlangs, $default_font_size, $tab3_posx, $tab3_top + $y - 3, $tab3_width, $tab3_height);
@@ -1005,7 +1019,8 @@ class pdf_crabe extends ModelePDFFactures
$pdf->useTemplate($tplidx);
}
if (!getDolGlobalInt('MAIN_PDF_DONOTREPEAT_HEAD')) {
- $this->_pagehead($pdf, $object, 0, $outputlangs);
+ $top_shift = $this->_pagehead($pdf, $object, 0, $outputlangs);
+ $tab_top_newpage = (!getDolGlobalInt('MAIN_PDF_DONOTREPEAT_HEAD') ? 42 + $top_shift : 10);
}
$pdf->setPage($current_page);
$this->_tableau_versements_header($pdf, $object, $outputlangs, $default_font_size, $tab3_posx, $tab3_top + $y - 3, $tab3_width, $tab3_height);
@@ -1180,7 +1195,7 @@ class pdf_crabe extends ModelePDFFactures
// Decret n°2099-1299 2022-10-07
// French mention : "Option pour le paiement de la taxe d'après les débits"
if ($this->emetteur->country_code == 'FR') {
- if ($conf->global->TAX_MODE == 1) {
+ if (isset($conf->global->TAX_MODE) && $conf->global->TAX_MODE == 1) {
$pdf->SetXY($this->marge_gauche, $posy);
$pdf->writeHTMLCell(80, 5, '', '', $outputlangs->transnoentities("MentionVATDebitOptionIsOn"), 0, 1);
@@ -2056,6 +2071,43 @@ class pdf_crabe extends ModelePDFFactures
$pdf->SetFont('', '', $default_font_size - 1);
$pdf->SetXY($posx + 2, $posy);
$pdf->MultiCell($widthrecbox - 2, 4, $carac_client, 0, $ltrdirection);
+
+ // Show shipping address
+ if (getDolGlobalInt('INVOICE_SHOW_SHIPPING_ADDRESS')) {
+ $idaddressshipping = $object->getIdContact('external', 'SHIPPING');
+
+ if (!empty($idaddressshipping)) {
+ $contactshipping = $object->fetch_Contact($idaddressshipping[0]);
+ $object->fetch_thirdparty($object->contact->fk_soc);
+ $carac_client_name_shipping=pdfBuildThirdpartyName($object->contact, $outputlangs);
+ $carac_client_shipping = pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty, $object->contact, $usecontact, 'target', $object);
+ } else {
+ $carac_client_name_shipping=pdfBuildThirdpartyName($object->thirdparty, $outputlangs);
+ $carac_client_shipping=pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty, '', 0, 'target', $object);;
+ }
+ if (!empty($carac_client_shipping) && (isset($object->contact->socid) && $object->contact->socid != $object->socid)) {
+ $posy += $hautcadre;
+
+ // Show shipping frame
+ $pdf->SetXY($posx + 2, $posy - 5);
+ $pdf->SetFont('', '', $default_font_size - 2);
+ $pdf->MultiCell($widthrecbox, '', $langs->trans('ShippingTo'), 0, 'L', 0);
+ $pdf->Rect($posx, $posy, $widthrecbox, $hautcadre);
+
+ // Show shipping name
+ $pdf->SetXY($posx + 2, $posy + 3);
+ $pdf->SetFont('', 'B', $default_font_size);
+ $pdf->MultiCell($widthrecbox - 2, 2, $carac_client_name_shipping, '', 'L');
+
+ $posy = $pdf->getY();
+
+ // Show shipping information
+ $pdf->SetXY($posx+2, $posy);
+ $pdf->SetFont('', '', $default_font_size - 1);
+ $pdf->MultiCell($widthrecbox - 2, 2, $carac_client_shipping, '', 'L');
+ $top_shift += $hautcadre;
+ }
+ }
}
$pdf->SetTextColor(0, 0, 0);
diff --git a/htdocs/core/modules/facture/doc/pdf_sponge.modules.php b/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
index e11cd90bc43..c3a4318a218 100644
--- a/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
@@ -9,6 +9,7 @@
* Copyright (C) 2015 Marcos García
* Copyright (C) 2017 Ferran Marcet
* Copyright (C) 2018 Frédéric France
+ * Copyright (C) 2022 Anthony Berton
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -448,7 +449,9 @@ class pdf_sponge extends ModelePDFFactures
$pagenb++;
// Output header (logo, ref and address blocks). This is first call for first page.
- $top_shift = $this->_pagehead($pdf, $object, 1, $outputlangs, $outputlangsbis);
+ $pagehead = $this->_pagehead($pdf, $object, 1, $outputlangs, $outputlangsbis);
+ $top_shift = $pagehead['top_shift'];
+ $shipp_shift = $pagehead['shipp_shift'];
$pdf->SetFont('', '', $default_font_size - 1);
$pdf->MultiCell(0, 3, ''); // Set interline to 3
$pdf->SetTextColor(0, 0, 0);
@@ -456,7 +459,7 @@ class pdf_sponge extends ModelePDFFactures
// $pdf->GetY() here can't be used. It is bottom of the second addresse box but first one may be higher
// $this->tab_top is y where we must continue content (90 = 42 + 48: 42 is height of logo and ref, 48 is address blocks)
- $this->tab_top = 90 + $top_shift; // top_shift is an addition for linked objects or addons (0 in most cases)
+ $this->tab_top = 90 + $top_shift + $shipp_shift; // top_shift is an addition for linked objects or addons (0 in most cases)
$this->tab_top_newpage = (!getDolGlobalInt('MAIN_PDF_DONOTREPEAT_HEAD') ? 42 + $top_shift : 10);
// You can add more thing under header here, if you increase $extra_under_address_shift too.
@@ -1290,7 +1293,7 @@ class pdf_sponge extends ModelePDFFactures
// Decret n°2099-1299 2022-10-07
// French mention : "Option pour le paiement de la taxe d'après les débits"
if ($this->emetteur->country_code == 'FR') {
- if ($conf->global->TAX_MODE == 1) {
+ if (isset($conf->global->TAX_MODE) && $conf->global->TAX_MODE == 1) {
$pdf->SetXY($this->marge_gauche, $posy);
$pdf->writeHTMLCell(80, 5, '', '', $outputlangs->transnoentities("MentionVATDebitOptionIsOn"), 0, 1);
@@ -2222,6 +2225,7 @@ class pdf_sponge extends ModelePDFFactures
$posy += 1;
$top_shift = 0;
+ $shipp_shift = 0;
// Show list of linked objects
$current_y = $pdf->getY();
$posy = pdf_writeLinkedObjects($pdf, $object, $outputlangs, $posx, $posy, $w, 3, 'R', $default_font_size);
@@ -2244,7 +2248,6 @@ class pdf_sponge extends ModelePDFFactures
$hautcadre = !empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 38 : 40;
$widthrecbox = !empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 92 : 82;
-
// Show sender frame
if (empty($conf->global->MAIN_PDF_NO_SENDER_FRAME)) {
$pdf->SetTextColor(0, 0, 0);
@@ -2322,10 +2325,49 @@ class pdf_sponge extends ModelePDFFactures
$pdf->SetFont('', '', $default_font_size - 1);
$pdf->SetXY($posx + 2, $posy);
$pdf->MultiCell($widthrecbox - 2, 4, $carac_client, 0, $ltrdirection);
+
+ // Show shipping address
+ if (getDolGlobalInt('INVOICE_SHOW_SHIPPING_ADDRESS')) {
+ $idaddressshipping = $object->getIdContact('external', 'SHIPPING');
+
+ if (!empty($idaddressshipping)) {
+ $contactshipping = $object->fetch_Contact($idaddressshipping[0]);
+ $object->fetch_thirdparty($object->contact->fk_soc);
+ $carac_client_name_shipping=pdfBuildThirdpartyName($object->contact, $outputlangs);
+ $carac_client_shipping = pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty, $object->contact, $usecontact, 'target', $object);
+ } else {
+ $carac_client_name_shipping=pdfBuildThirdpartyName($object->thirdparty, $outputlangs);
+ $carac_client_shipping=pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty, '', 0, 'target', $object);;
+ }
+ if (!empty($carac_client_shipping) && (isset($object->contact->socid) && $object->contact->socid != $object->socid)) {
+ $posy += $hautcadre;
+
+ // Show shipping frame
+ $pdf->SetXY($posx + 2, $posy - 5);
+ $pdf->SetFont('', '', $default_font_size - 2);
+ $pdf->MultiCell($widthrecbox, '', $langs->trans('ShippingTo'), 0, 'L', 0);
+ $pdf->Rect($posx, $posy, $widthrecbox, $hautcadre);
+
+ // Show shipping name
+ $pdf->SetXY($posx + 2, $posy + 3);
+ $pdf->SetFont('', 'B', $default_font_size);
+ $pdf->MultiCell($widthrecbox - 2, 2, $carac_client_name_shipping, '', 'L');
+
+ $posy = $pdf->getY();
+
+ // Show shipping information
+ $pdf->SetXY($posx+2, $posy);
+ $pdf->SetFont('', '', $default_font_size - 1);
+ $pdf->MultiCell($widthrecbox - 2, 2, $carac_client_shipping, '', 'L');
+ $shipp_shift += $hautcadre;
+ }
+ }
}
$pdf->SetTextColor(0, 0, 0);
- return $top_shift;
+
+ $pagehead = array('top_shift' => $top_shift, 'shipp_shift' => $shipp_shift);
+ return $pagehead;
}
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
diff --git a/htdocs/core/modules/facture/mod_facture_mercure.php b/htdocs/core/modules/facture/mod_facture_mercure.php
index 7a572615a21..321741ea8a0 100644
--- a/htdocs/core/modules/facture/mod_facture_mercure.php
+++ b/htdocs/core/modules/facture/mod_facture_mercure.php
@@ -1,9 +1,10 @@
- * Copyright (C) 2004-2011 Laurent Destailleur
- * Copyright (C) 2005-2007 Regis Houssin
- * Copyright (C) 2008 Raphael Bertrand (Resultic)
- * Copyright (C) 2013 Juanjo Menent
+/* Copyright (C) 2003-2007 Rodolphe Quiedeville
+ * Copyright (C) 2004-2011 Laurent Destailleur
+ * Copyright (C) 2005-2007 Regis Houssin
+ * Copyright (C) 2008 Raphael Bertrand (Resultic)
+ * Copyright (C) 2013 uanjo Menent
+ * Copyright (C) 2022 Anthony Berton
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -143,16 +144,28 @@ class mod_facture_mercure extends ModeleNumRefFactures
// Get Mask value
$mask = '';
if (is_object($invoice) && $invoice->type == 1) {
- $mask = $conf->global->FACTURE_MERCURE_MASK_REPLACEMENT;
+ if (isset($conf->global->FACTURE_MERCURE_MASK_REPLACEMENT)) {
+ $mask = $conf->global->FACTURE_MERCURE_MASK_REPLACEMENT;
+ }
if (!$mask) {
- $mask = $conf->global->FACTURE_MERCURE_MASK_INVOICE;
+ if (isset($conf->global->FACTURE_MERCURE_MASK_INVOICE)) {
+ $mask = $conf->global->FACTURE_MERCURE_MASK_INVOICE;
+ }
}
} elseif (is_object($invoice) && $invoice->type == 2) {
- $mask = $conf->global->FACTURE_MERCURE_MASK_CREDIT;
+ if (isset($conf->global->FACTURE_MERCURE_MASK_CREDIT)) {
+ $mask = $conf->global->FACTURE_MERCURE_MASK_CREDIT;
+ }
} elseif (is_object($invoice) && $invoice->type == 3) {
- $mask = $conf->global->FACTURE_MERCURE_MASK_DEPOSIT;
+ if (isset($conf->global->FACTURE_MERCURE_MASK_DEPOSIT)) {
+ $mask = $conf->global->FACTURE_MERCURE_MASK_DEPOSIT;
+ }
} else {
- $mask = $conf->global->FACTURE_MERCURE_MASK_INVOICE;
+ if (isset($conf->global->FACTURE_MERCURE_MASK_INVOICE)) {
+ $mask = $conf->global->FACTURE_MERCURE_MASK_INVOICE;
+ } else {
+ $mask = '';
+ }
}
if (!$mask) {
$this->error = 'NotConfigured';
diff --git a/htdocs/core/modules/import/import_csv.modules.php b/htdocs/core/modules/import/import_csv.modules.php
index 09f93a436ea..22c12024c2b 100644
--- a/htdocs/core/modules/import/import_csv.modules.php
+++ b/htdocs/core/modules/import/import_csv.modules.php
@@ -862,8 +862,8 @@ class ImportCsv extends ModeleImports
$stringtosearch = json_encode($socialnetwork).':'.json_encode($json->$socialnetwork);
//var_dump($stringtosearch);
//var_dump($this->db->escape($stringtosearch)); // This provide a value for sql string (but not for a like)
- $where[] = $key." LIKE '%".$this->db->escapeforlike($this->db->escape($stringtosearch))."%'";
- $filters[] = $col." LIKE '%".$this->db->escapeforlike($this->db->escape($stringtosearch))."%'";
+ $where[] = $key." LIKE '%".$this->db->escape($this->db->escapeforlike($stringtosearch))."%'";
+ $filters[] = $col." LIKE '%".$this->db->escape($this->db->escapeforlike($stringtosearch))."%'";
//var_dump($where[1]); // This provide a value for sql string inside a like
} else {
$where[] = $key.' = '.$data[$key];
diff --git a/htdocs/core/modules/import/import_xlsx.modules.php b/htdocs/core/modules/import/import_xlsx.modules.php
index ecf7d8b4a77..35adc4476a0 100644
--- a/htdocs/core/modules/import/import_xlsx.modules.php
+++ b/htdocs/core/modules/import/import_xlsx.modules.php
@@ -908,8 +908,8 @@ class ImportXlsx extends ModeleImports
$stringtosearch = json_encode($socialnetwork).':'.json_encode($json->$socialnetwork);
//var_dump($stringtosearch);
//var_dump($this->db->escape($stringtosearch)); // This provide a value for sql string (but not for a like)
- $where[] = $key." LIKE '%".$this->db->escapeforlike($this->db->escape($stringtosearch))."%'";
- $filters[] = $col." LIKE '%".$this->db->escapeforlike($this->db->escape($stringtosearch))."%'";
+ $where[] = $key." LIKE '%".$this->db->escape($this->db->escapeforlike($stringtosearch))."%'";
+ $filters[] = $col." LIKE '%".$this->db->escape($this->db->escapeforlike($stringtosearch))."%'";
//var_dump($where[1]); // This provide a value for sql string inside a like
} else {
$where[] = $key.' = '.$data[$key];
diff --git a/htdocs/core/modules/mailings/advthirdparties.modules.php b/htdocs/core/modules/mailings/advthirdparties.modules.php
index 688db8b8e7f..7649c255d04 100644
--- a/htdocs/core/modules/mailings/advthirdparties.modules.php
+++ b/htdocs/core/modules/mailings/advthirdparties.modules.php
@@ -42,7 +42,7 @@ class mailing_advthirdparties extends MailingTargets
*/
public $db;
- public $enabled = '$conf->societe->enabled';
+ public $enabled = 'isModEnabled("societe")';
/**
diff --git a/htdocs/core/modules/mailings/contacts1.modules.php b/htdocs/core/modules/mailings/contacts1.modules.php
index decbc81716b..64097078147 100644
--- a/htdocs/core/modules/mailings/contacts1.modules.php
+++ b/htdocs/core/modules/mailings/contacts1.modules.php
@@ -38,7 +38,7 @@ class mailing_contacts1 extends MailingTargets
public $require_module = array("societe"); // Module mailing actif si modules require_module actifs
public $require_admin = 0; // Module mailing actif pour user admin ou non
- public $enabled = '$conf->societe->enabled';
+ public $enabled = 'isModEnabled("societe")';
/**
* @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
@@ -388,6 +388,7 @@ class mailing_contacts1 extends MailingTargets
}
$sql .= " WHERE sp.entity IN (".getEntity('contact').")";
$sql .= " AND sp.email <> ''";
+
$sql .= " AND (SELECT count(*) FROM ".MAIN_DB_PREFIX."mailing_unsubscribe WHERE email = sp.email) = 0";
// Exclude unsubscribed email adresses
$sql .= " AND sp.statut = 1";
@@ -409,7 +410,7 @@ class mailing_contacts1 extends MailingTargets
// Filter on language
if ($filter_lang != '') {
- $sql .= " AND sp.default_lang = '".$this->db->escape($filter_lang)."'";
+ $sql .= " AND sp.default_lang LIKE '".$this->db->escape($filter_lang)."%'";
}
// Filter on nature
diff --git a/htdocs/core/modules/mailings/eventorganization.modules.php b/htdocs/core/modules/mailings/eventorganization.modules.php
new file mode 100644
index 00000000000..84c27c5f673
--- /dev/null
+++ b/htdocs/core/modules/mailings/eventorganization.modules.php
@@ -0,0 +1,212 @@
+
+ * Copyright (C) 2005-2010 Laurent Destailleur
+ * Copyright (C) 2005-2009 Regis Houssin
+ *
+ * This file is an example to follow to add your own email selector inside
+ * the Dolibarr email tool.
+ * Follow instructions given in README file to know what to change to build
+ * your own emailing list selector.
+ * Code that need to be changed in this file are marked by "CHANGE THIS" tag.
+ */
+
+/**
+ * \file htdocs/core/modules/mailings/eventorganization.modules.php
+ * \ingroup mailing
+ * \brief Example file to provide a list of recipients for mailing module
+ */
+
+
+// Load Dolibarr Environment
+include_once DOL_DOCUMENT_ROOT.'/core/modules/mailings/modules_mailings.php';
+
+
+/**
+ * Class to manage a list of personalised recipients for mailing feature
+ */
+class mailing_eventorganization extends MailingTargets
+{
+ // This label is used if no translation is found for key XXX neither MailingModuleDescXXX where XXX=name is found
+ public $name = 'AttendeesOfOrganizedEvent';
+ public $desc = "Attendees of an organized event";
+
+ public $require_admin = 0;
+
+ public $require_module = array(); // This module allows to select by categories must be also enabled if category module is not activated
+
+ /**
+ * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
+ */
+ public $picto = 'conferenceorbooth';
+
+ /**
+ * @var DoliDB Database handler.
+ */
+ public $db;
+
+ public $enabled = 'isModEnabled("eventorganization")';
+
+
+ /**
+ * Constructor
+ *
+ * @param DoliDB $db Database handler
+ */
+ public function __construct($db)
+ {
+ global $conf, $langs;
+ $langs->load('companies');
+
+ $this->db = $db;
+ }
+
+
+ // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+ /**
+ * This is the main function that returns the array of emails
+ *
+ * @param int $mailing_id Id of mailing. No need to use it.
+ * @return int <0 if error, number of emails added if ok
+ */
+ public function add_to_target($mailing_id)
+ {
+ // phpcs:enable
+ global $conf, $langs;
+
+ $cibles = array();
+ $addDescription = '';
+
+ $sql = "SELECT p.ref, p.entity, e.rowid as id, e.fk_project, e.email as email, e.email_company as company_name, e.firstname as firstname, e.lastname as lastname,";
+ $sql .= " 'eventorganizationattendee' as source";
+ $sql .= " FROM ".MAIN_DB_PREFIX."eventorganization_conferenceorboothattendee as e,";
+ $sql .= " ".MAIN_DB_PREFIX."projet as p";
+ $sql .= " WHERE e.email <> ''";
+ $sql .= " AND e.fk_project = p.rowid";
+ $sql .= " AND p.entity IN (".getEntity('project').")";
+ $sql .= " AND e.email NOT IN (SELECT email FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE fk_mailing=".((int) $mailing_id).")";
+ $sql .= " AND e.fk_project = ".((int) GETPOST('filter_eventorganization', 'int'));
+ $sql .= " ORDER BY e.email";
+
+ // Stock recipients emails into targets table
+ $result = $this->db->query($sql);
+ if ($result) {
+ $num = $this->db->num_rows($result);
+ $i = 0;
+ $j = 0;
+
+ dol_syslog(get_class($this)."::add_to_target mailing ".$num." targets found");
+
+ $old = '';
+ while ($i < $num) {
+ $obj = $this->db->fetch_object($result);
+ if ($old <> $obj->email) {
+ $otherTxt = ($obj->ref ? $langs->transnoentities("Project").'='.$obj->ref : '');
+ if (strlen($addDescription) > 0 && strlen($otherTxt) > 0) {
+ $otherTxt .= ";";
+ }
+ $otherTxt .= $addDescription;
+ $cibles[$j] = array(
+ 'email' => $obj->email,
+ 'fk_project' => $obj->fk_project,
+ 'lastname' => $obj->lastname,
+ 'firstname' => $obj->firstname,
+ 'other' => $otherTxt,
+ 'source_url' => $this->url($obj->id, $obj->source),
+ 'source_id' => $obj->id,
+ 'source_type' => $obj->source
+ );
+ $old = $obj->email;
+ $j++;
+ }
+
+ $i++;
+ }
+ } else {
+ dol_syslog($this->db->error());
+ $this->error = $this->db->error();
+ return -1;
+ }
+
+ return parent::addTargetsToDatabase($mailing_id, $cibles);
+ }
+
+
+ /**
+ * On the main mailing area, there is a box with statistics.
+ * If you want to add a line in this report you must provide an
+ * array of SQL request that returns two field:
+ * One called "label", One called "nb".
+ *
+ * @return array Array with SQL requests
+ */
+ public function getSqlArrayForStats()
+ {
+ // CHANGE THIS: Optionnal
+
+ //var $statssql=array();
+ //$this->statssql[0]="SELECT field1 as label, count(distinct(email)) as nb FROM mytable WHERE email IS NOT NULL";
+ return array();
+ }
+
+
+ /**
+ * Return here number of distinct emails returned by your selector.
+ * For example if this selector is used to extract 500 different
+ * emails from a text file, this function must return 500.
+ *
+ * @param string $sql Requete sql de comptage
+ * @return int|string Nb of recipient, or <0 if error, or '' if NA
+ */
+ public function getNbOfRecipients($sql = '')
+ {
+ global $conf;
+
+ $sql = "SELECT COUNT(DISTINCT(e.email)) as nb";
+ $sql .= " FROM ".MAIN_DB_PREFIX."eventorganization_conferenceorboothattendee as e, ";
+ $sql .= " ".MAIN_DB_PREFIX."projet as p";
+ $sql .= " WHERE e.email <> ''";
+ $sql .= " AND e.fk_project = p.rowid";
+ $sql .= " AND p.entity IN (".getEntity('project').")";
+
+ //print $sql;
+
+ // La requete doit retourner un champ "nb" pour etre comprise par parent::getNbOfRecipients
+ return parent::getNbOfRecipients($sql);
+ }
+
+ /**
+ * This is to add a form filter to provide variant of selector
+ * If used, the HTML select must be called "filter"
+ *
+ * @return string A html select zone
+ */
+ public function formFilter()
+ {
+ global $conf, $langs;
+
+ $langs->load("companies");
+
+ include_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
+ $formproject = new FormProjets($this->db);
+ $s .= $formproject->select_projects(-1, 0, "filter_eventorganization", 0, 0, 1, 1, 0, 0, 0, '', 1, 0, '', '', 'usage_organize_event=1');
+
+ return $s;
+ }
+
+
+ /**
+ * Can include an URL link on each record provided by selector shown on target page.
+ *
+ * @param int $id ID
+ * @param string $sourcetype Source type
+ * @return string Url link
+ */
+ public function url($id, $sourcetype = 'thirdparty')
+ {
+ if ($sourcetype == 'project') {
+ return ''.img_object('', "eventorganization").' ';
+ }
+
+ return '';
+ }
+}
diff --git a/htdocs/core/modules/mailings/example.modules.php b/htdocs/core/modules/mailings/example.modules.php
deleted file mode 100644
index 739ab773196..00000000000
--- a/htdocs/core/modules/mailings/example.modules.php
+++ /dev/null
@@ -1,154 +0,0 @@
-
- *
- * This file is an example to follow to add your own email selector inside
- * the Dolibarr email tool.
- * Follow instructions given in README file to know what to change to build
- * your own emailing list selector.
- * Code that need to be changed in this file are marked by "CHANGE THIS" tag.
- */
-
-/**
- * \file htdocs/core/modules/mailings/example.modules.php
- * \ingroup mailing
- * \brief Example file to provide a list of recipients for mailing module
- */
-
-include_once DOL_DOCUMENT_ROOT.'/core/modules/mailings/modules_mailings.php';
-
-
-// CHANGE THIS: Class name must be called mailing_xxx with xxx=name of your selector
-
-/**
- \class mailing_example
- \brief Class to manage a list of personalised recipients for mailing feature
-*/
-class mailing_example extends MailingTargets
-{
- // CHANGE THIS: Put here a name not already used
- public $name = 'example';
- // CHANGE THIS: Put here a description of your selector module.
- // This label is used if no translation is found for key MailingModuleDescXXX where XXX=name is found
- public $desc = 'Put here a description';
- // CHANGE THIS: Set to 1 if selector is available for admin users only
- public $require_admin = 0;
- // CHANGE THIS: Add a tooltip language key to add a tooltip help icon after the email target selector
- public $tooltip = 'MyTooltipLangKey';
-
- public $require_module = array();
-
- /**
- * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
- */
- public $picto = '';
-
- /**
- * @var DoliDB Database handler.
- */
- public $db;
-
-
- // CHANGE THIS: Constructor name must be called mailing_xxx with xxx=name of your selector
- /**
- * Constructor
- *
- * @param DoliDB $db Database handler
- */
- public function __construct($db)
- {
- $this->db = $db;
- }
-
-
- // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
- /**
- * This is the main function that returns the array of emails
- *
- * @param int $mailing_id Id of mailing. No need to use it.
- * @return int <0 if error, number of emails added if ok
- */
- public function add_to_target($mailing_id)
- {
- // phpcs:enable
- $target = array();
-
- // CHANGE THIS
- // ----- Your code start here -----
-
- // You must fill the $target array with record like this
- // $target[0]=array('email'=>'email_0','name'=>'name_0','firstname'=>'firstname_0', 'other'=>'other_0');
- // ...
- // $target[n]=array('email'=>'email_n','name'=>'name_n','firstname'=>'firstname_n', 'other'=>'other_n');
-
- // Example: $target[0]=array('email'=>'myemail@example.com', 'name'=>'Doe', 'firstname'=>'John', 'other'=>'Other information');
-
- // ----- Your code end here -----
-
- return parent::addTargetsToDatabase($mailing_id, $target);
- }
-
-
- /**
- * On the main mailing area, there is a box with statistics.
- * If you want to add a line in this report you must provide an
- * array of SQL request that returns two field:
- * One called "label", One called "nb".
- *
- * @return array Array with SQL requests
- */
- public function getSqlArrayForStats()
- {
- // CHANGE THIS: Optionnal
-
- //var $statssql=array();
- //$this->statssql[0]="SELECT field1 as label, count(distinct(email)) as nb FROM mytable WHERE email IS NOT NULL";
- return array();
- }
-
-
- /**
- * Return here number of distinct emails returned by your selector.
- * For example if this selector is used to extract 500 different
- * emails from a text file, this function must return 500.
- *
- * @param string $sql Requete sql de comptage
- * @return int|string Nb of recipient, or <0 if error, or '' if NA
- */
- public function getNbOfRecipients($sql = '')
- {
- // CHANGE THIS: Optionnal
-
- // Example: return parent::getNbOfRecipients("SELECT count(*) as nb from dolibarr_table");
- // Example: return 500;
- return '?';
- }
-
- /**
- * This is to add a form filter to provide variant of selector
- * If used, the HTML select must be called "filter"
- *
- * @return string A html select zone
- */
- public function formFilter()
- {
- // CHANGE THIS: Optionnal
-
- $s = '';
- return $s;
- }
-
-
- /**
- * Can include an URL link on each record provided by selector
- * shown on target page.
- *
- * @param int $id ID
- * @return string Url link
- */
- public function url($id)
- {
- // CHANGE THIS: Optionnal
-
- return '';
- }
-}
diff --git a/htdocs/core/modules/mailings/fraise.modules.php b/htdocs/core/modules/mailings/fraise.modules.php
index 992539cc303..9fe6a615f5d 100644
--- a/htdocs/core/modules/mailings/fraise.modules.php
+++ b/htdocs/core/modules/mailings/fraise.modules.php
@@ -41,7 +41,7 @@ class mailing_fraise extends MailingTargets
public $require_module = array('adherent');
- public $enabled = '$conf->adherent->enabled';
+ public $enabled = 'isModEnabled("adherent")';
/**
* @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
diff --git a/htdocs/core/modules/mailings/partnership.modules.php b/htdocs/core/modules/mailings/partnership.modules.php
index 8a1fe0f2c16..b4a8e9d8fd9 100644
--- a/htdocs/core/modules/mailings/partnership.modules.php
+++ b/htdocs/core/modules/mailings/partnership.modules.php
@@ -44,7 +44,7 @@ class mailing_partnership extends MailingTargets
*/
public $db;
- public $enabled = '$conf->partnership->enabled';
+ public $enabled = 'isModEnabled("partnership")';
/**
diff --git a/htdocs/core/modules/mailings/thirdparties.modules.php b/htdocs/core/modules/mailings/thirdparties.modules.php
index 71be0733fb2..2f8040d4b75 100644
--- a/htdocs/core/modules/mailings/thirdparties.modules.php
+++ b/htdocs/core/modules/mailings/thirdparties.modules.php
@@ -31,7 +31,7 @@ class mailing_thirdparties extends MailingTargets
public $require_module = array("societe"); // This module allows to select by categories must be also enabled if category module is not activated
- public $enabled = '$conf->societe->enabled';
+ public $enabled = 'isModEnabled("societe")';
/**
* @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
diff --git a/htdocs/core/modules/mailings/thirdparties_services_expired.modules.php b/htdocs/core/modules/mailings/thirdparties_services_expired.modules.php
index 9083b643900..9fc43e37388 100644
--- a/htdocs/core/modules/mailings/thirdparties_services_expired.modules.php
+++ b/htdocs/core/modules/mailings/thirdparties_services_expired.modules.php
@@ -29,7 +29,7 @@ class mailing_thirdparties_services_expired extends MailingTargets
public $require_module = array('contrat');
- public $enabled = '$conf->societe->enabled';
+ public $enabled = 'isModEnabled("societe")';
/**
* @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
@@ -219,6 +219,7 @@ class mailing_thirdparties_services_expired extends MailingTargets
$s = '';
if (count($this->arrayofproducts)) {
+ $langs->loadLangs(array("products"));
$s .= ''.$langs->trans("ProductOrService").' ';
} else {
$s .= ''.$langs->trans("ContactsAllShort").' ';
diff --git a/htdocs/core/modules/member/doc/doc_generic_member_odt.class.php b/htdocs/core/modules/member/doc/doc_generic_member_odt.class.php
index 2ab951147b9..ed48c93c4de 100644
--- a/htdocs/core/modules/member/doc/doc_generic_member_odt.class.php
+++ b/htdocs/core/modules/member/doc/doc_generic_member_odt.class.php
@@ -164,7 +164,9 @@ class doc_generic_member_odt extends ModelePDFMember
$texte .= '';
}
diff --git a/htdocs/core/modules/modAsset.class.php b/htdocs/core/modules/modAsset.class.php
index a0fb405887e..3a7caa1cb57 100644
--- a/htdocs/core/modules/modAsset.class.php
+++ b/htdocs/core/modules/modAsset.class.php
@@ -63,7 +63,7 @@ class modAsset extends DolibarrModules
$this->descriptionlong = "Asset module to manage assets module and depreciation charge on Dolibarr";
// Possible values for version are: 'development', 'experimental', 'dolibarr', 'dolibarr_deprecated' or a version string like 'x.y.z'
- $this->version = 'development';
+ $this->version = 'experimental';
// Key used in llx_const table to save module status enabled/disabled (where ASSETS is value of property name of module in uppercase)
$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
// Name of image file used for this module.
diff --git a/htdocs/core/modules/modBlockedLog.class.php b/htdocs/core/modules/modBlockedLog.class.php
index 0a07fff6aaf..830f9f0f8b1 100644
--- a/htdocs/core/modules/modBlockedLog.class.php
+++ b/htdocs/core/modules/modBlockedLog.class.php
@@ -183,7 +183,7 @@ class modBlockedLog extends DolibarrModules
$result = $b->setObjectData($object, 'MODULE_SET', 0);
if ($result < 0) {
$this->error = $b->error;
- $this->errors = $b->erros;
+ $this->errors = $b->errors;
return 0;
}
@@ -226,7 +226,7 @@ class modBlockedLog extends DolibarrModules
$result = $b->setObjectData($object, 'MODULE_RESET', 0);
if ($result < 0) {
$this->error = $b->error;
- $this->errors = $b->erros;
+ $this->errors = $b->errors;
return 0;
}
diff --git a/htdocs/core/modules/modCron.class.php b/htdocs/core/modules/modCron.class.php
index 992015fe75e..93b243625f4 100644
--- a/htdocs/core/modules/modCron.class.php
+++ b/htdocs/core/modules/modCron.class.php
@@ -99,7 +99,7 @@ class modCron extends DolibarrModules
// Cronjobs
$this->cronjobs = array(
0=>array('entity'=>0, 'label'=>'PurgeDeleteTemporaryFilesShort', 'jobtype'=>'method', 'class'=>'core/class/utils.class.php', 'objectname'=>'Utils', 'method'=>'purgeFiles', 'parameters'=>'tempfilesold+logfiles', 'comment'=>'PurgeDeleteTemporaryFiles', 'frequency'=>2, 'unitfrequency'=>3600 * 24 * 7, 'priority'=>50, 'status'=>1, 'test'=>true),
- 1=>array('entity'=>0, 'label'=>'MakeLocalDatabaseDumpShort', 'jobtype'=>'method', 'class'=>'core/class/utils.class.php', 'objectname'=>'Utils', 'method'=>'dumpDatabase', 'parameters'=>'none,auto,1,auto,10', 'comment'=>'MakeLocalDatabaseDump', 'frequency'=>1, 'unitfrequency'=>3600 * 24 * 7, 'priority'=>90, 'status'=>0, 'test'=>'in_array($conf->db->type, array(\'mysql\', \'mysqli\'))'),
+ 1=>array('entity'=>0, 'label'=>'MakeLocalDatabaseDumpShort', 'jobtype'=>'method', 'class'=>'core/class/utils.class.php', 'objectname'=>'Utils', 'method'=>'dumpDatabase', 'parameters'=>'none,auto,1,auto,10,0,0', 'comment'=>'MakeLocalDatabaseDump', 'frequency'=>1, 'unitfrequency'=>3600 * 24 * 7, 'priority'=>90, 'status'=>0, 'test'=>'in_array($conf->db->type, array(\'mysql\', \'mysqli\'))'),
2=>array('entity'=>0, 'label'=>'MakeSendLocalDatabaseDumpShort', 'jobtype'=>'method', 'class'=>'core/class/utils.class.php', 'objectname'=>'Utils', 'method'=>'sendBackup', 'parameters'=>',,,,,sql', 'comment'=>'MakeSendLocalDatabaseDump', 'frequency'=>1, 'unitfrequency'=>604800, 'priority'=>91, 'status'=>0, 'test'=>'!empty($conf->global->MAIN_ALLOW_BACKUP_BY_EMAIL) && in_array($conf->db->type, array(\'mysql\', \'mysqli\'))'),
3=>array('entity'=>0, 'label'=>'CleanUnfinishedCronjobShort', 'jobtype'=>'method', 'class'=>'core/class/utils.class.php', 'objectname'=>'Utils', 'method'=>'cleanUnfinishedCronjob', 'parameters'=>'', 'comment'=>'CleanUnfinishedCronjob', 'frequency'=>5, 'unitfrequency'=>60, 'priority'=>10, 'status'=>0, 'test'=>'getDolGlobalInt("MAIN_FEATURES_LEVEL") >= 2'),
// 1=>array('entity'=>0, 'label'=>'My label', 'jobtype'=>'command', 'command'=>'', 'parameters'=>'', 'comment'=>'Comment', 'frequency'=>1, 'unitfrequency'=>3600*24)
diff --git a/htdocs/core/modules/modEventOrganization.class.php b/htdocs/core/modules/modEventOrganization.class.php
index 437fa691713..f037f26176c 100644
--- a/htdocs/core/modules/modEventOrganization.class.php
+++ b/htdocs/core/modules/modEventOrganization.class.php
@@ -62,7 +62,7 @@ class modEventOrganization extends DolibarrModules
// Key used in llx_const table to save module status enabled/disabled (where EVENTORGANIZATION is value of property name of module in uppercase)
$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
- $this->picto = 'action';
+ $this->picto = 'conferenceorbooth';
// Define some features supported by module (triggers, login, substitutions, menus, css, etc...)
$this->module_parts = array(
diff --git a/htdocs/core/modules/modHRM.class.php b/htdocs/core/modules/modHRM.class.php
index 09ff03cae9b..3f3dd4b97a1 100644
--- a/htdocs/core/modules/modHRM.class.php
+++ b/htdocs/core/modules/modHRM.class.php
@@ -56,7 +56,7 @@ class modHRM extends DolibarrModules
// Module description, used if translation string 'ModuleXXXDesc' not found (where XXX is value of numeric property 'numero' of module)
$this->description = "HRM";
// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
- $this->version = 'experimental';
+ $this->version = 'dolibarr';
// Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)
$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
// Name of image file used for this module.
diff --git a/htdocs/core/modules/modProduct.class.php b/htdocs/core/modules/modProduct.class.php
index 940c4fb2f9a..5224f82a2f5 100644
--- a/htdocs/core/modules/modProduct.class.php
+++ b/htdocs/core/modules/modProduct.class.php
@@ -860,7 +860,7 @@ class modProduct extends DolibarrModules
));
}
- $this->import_updatekeys_array[$r] = array('sp.fk_product'=>'ProductOrService', 'sp.ref_fourn'=>'SupplierRef', 'sp.fk_soc'=>'Supplier');
+ $this->import_updatekeys_array[$r] = array('sp.fk_product'=>'ProductOrService', 'sp.ref_fourn'=>'SupplierRef', 'sp.fk_soc'=>'Supplier', 'sp.quantity'=>"QtyMin");
}
if (!empty($conf->global->PRODUIT_MULTIPRICES)) {
diff --git a/htdocs/core/modules/modProjet.class.php b/htdocs/core/modules/modProjet.class.php
index 89e57be51bb..8bc8e03adb2 100644
--- a/htdocs/core/modules/modProjet.class.php
+++ b/htdocs/core/modules/modProjet.class.php
@@ -214,7 +214,7 @@ class modProjet extends DolibarrModules
$this->menu = 1; // This module add menu entries. They are coded into menu manager.
- //Exports
+ // Exports
//--------
$r = 1;
@@ -291,6 +291,40 @@ class modProjet extends DolibarrModules
}
$this->export_sql_end[$r] .= " WHERE p.entity IN (".getEntity('project').")";
+ // Import project/opportunities
+ $r++;
+ $this->import_code[$r] = 'projects';
+ $this->import_label[$r] = 'ImportDatasetProjects';
+ $this->import_icon[$r] = 'project';
+ $this->import_entities_array[$r] = array(); // We define here only fields that use another icon that the one defined into import_icon
+ $this->import_tables_array[$r] = array('t'=>MAIN_DB_PREFIX.'projet', 'extra'=>MAIN_DB_PREFIX.'projet_extrafields'); // List of tables to insert into (insert done in same order)
+ $this->import_fields_array[$r] = array('t.ref'=>'ProjectRef*', 't.title'=>'Label*', 't.description'=>"Description", 't.fk_soc' => 'ThirdPartyName', 't.public'=>"Public", 't.fk_statut'=>"Status");
+ $this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array('t.fk_opp_status'=>"OpportunityStatus", 't.opp_percent'=>"OpportunityProbability", 't.opp_amount'=>"OpportunityAmount", 't.note_public'=>"NotePublic", 't.note_private'=>"NotePrivate", 't.budget_amount'=>"Budget", 't.dateo'=>"DateStart", 't.datee'=>"DateEnd"));
+ // Add extra fields
+ $sql = "SELECT name, label, fieldrequired FROM ".MAIN_DB_PREFIX."extrafields WHERE type <> 'separate' AND elementtype = 'projet' AND entity IN (0,".$conf->entity.")";
+ $resql = $this->db->query($sql);
+ if ($resql) { // This can fail when class is used on old database (during migration for example)
+ while ($obj = $this->db->fetch_object($resql)) {
+ $fieldname = 'extra.'.$obj->name;
+ $fieldlabel = ucfirst($obj->label);
+ $this->import_fields_array[$r][$fieldname] = $fieldlabel.($obj->fieldrequired ? '*' : '');
+ }
+ }
+ // End add extra fields
+ $this->import_fieldshidden_array[$r] = array('t.fk_user_creat'=>'user->id', 'extra.fk_object'=>'lastrowid-'.MAIN_DB_PREFIX.'projet'); // aliastable.field => ('user->id' or 'lastrowid-'.tableparent)
+ $this->import_convertvalue_array[$r] = array(
+ 't.ref'=>array('rule'=>'getrefifauto', 'class'=>(empty($conf->global->PROJECT_ADDON) ? 'mod_project_simple' : $conf->global->PROJECT_ADDON), 'path'=>"/core/modules/project/".(empty($conf->global->PROJECT_ADDON) ? 'mod_project_simple' : $conf->global->PROJECT_ADDON).'.php'),
+ 't.fk_soc' => array(
+ 'rule' => 'fetchidfromref',
+ 'file' => '/societe/class/societe.class.php',
+ 'class' => 'Societe',
+ 'method' => 'fetch',
+ 'element' => 'ThirdParty'
+ ),
+ );
+ //$this->import_convertvalue_array[$r]=array('s.fk_soc'=>array('rule'=>'lastrowid',table='t');
+ $this->import_regex_array[$r] = array('t.dateo'=>'^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]$', 't.datee'=>'^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]$', 't.datec'=>'^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]( [0-9][0-9]:[0-9][0-9]:[0-9][0-9])?$');
+ $this->import_examplevalues_array[$r] = array('t.fk_soc'=>'ThirdParty', 't.ref'=>"auto or PJ2010-1234", 't.title'=>"My project", 't.fk_statut'=>'0,1 or 2', 't.datec'=>'1972-10-10', 't.note_private'=>"My private note", 't.note_public'=>"My public note");
// Import list of tasks
if (empty($conf->global->PROJECT_HIDE_TASKS)) {
diff --git a/htdocs/core/modules/modStockTransfer.class.php b/htdocs/core/modules/modStockTransfer.class.php
index 6c8f068adf6..279add98bad 100644
--- a/htdocs/core/modules/modStockTransfer.class.php
+++ b/htdocs/core/modules/modStockTransfer.class.php
@@ -63,7 +63,7 @@ class modStockTransfer extends DolibarrModules
// Used only if file README.md and README-LL.md not found.
$this->descriptionlong = "StockTransfer description (Long)";
// Possible values for version are: 'development', 'experimental', 'dolibarr', 'dolibarr_deprecated' or a version string like 'x.y.z'
- $this->version = 'development';
+ $this->version = 'experimental';
// Url to the file with your last numberversion of this module
//$this->url_last_version = 'http://www.example.com/versionmodule.txt';
diff --git a/htdocs/core/modules/modTicket.class.php b/htdocs/core/modules/modTicket.class.php
index f34398abc4b..c8d2d8d5a4f 100644
--- a/htdocs/core/modules/modTicket.class.php
+++ b/htdocs/core/modules/modTicket.class.php
@@ -124,7 +124,6 @@ class modTicket extends DolibarrModules
$this->tabs = array(
'thirdparty:+ticket:Tickets:ticket:$user->rights->ticket->read:/ticket/list.php?socid=__ID__',
- 'project:+ticket:Tickets:ticket:$user->rights->ticket->read:/ticket/list.php?projectid=__ID__',
);
// Dictionaries
diff --git a/htdocs/core/modules/mrp/doc/doc_generic_mo_odt.modules.php b/htdocs/core/modules/mrp/doc/doc_generic_mo_odt.modules.php
index 42b3c529fe4..b89c4eab2cd 100644
--- a/htdocs/core/modules/mrp/doc/doc_generic_mo_odt.modules.php
+++ b/htdocs/core/modules/mrp/doc/doc_generic_mo_odt.modules.php
@@ -175,7 +175,9 @@ class doc_generic_mo_odt extends ModelePDFMo
$texte .= '';
}
diff --git a/htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php b/htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php
index 94d511367e2..821b6a24e10 100644
--- a/htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php
+++ b/htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php
@@ -334,7 +334,7 @@ class doc_generic_product_odt extends ModelePDFProduct
'__FROM_EMAIL__' => $this->emetteur->email,
'__TOTAL_TTC__' => $object->total_ttc,
'__TOTAL_HT__' => $object->total_ht,
- '__TOTAL_VAT__' => $object->total_vat
+ '__TOTAL_VAT__' => $object->total_tva
);
complete_substitutions_array($substitutionarray, $langs, $object);
// Call the ODTSubstitution hook
diff --git a/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php b/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
index 8b1261f35f0..2015da21f61 100644
--- a/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
+++ b/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
@@ -134,8 +134,8 @@ class doc_generic_project_odt extends ModelePDFProjects
// Get source company
$this->emetteur = $mysoc;
- if (!$this->emetteur->pays_code) {
- $this->emetteur->pays_code = substr($langs->defaultlang, -2); // Par defaut, si n'etait pas defini
+ if (!$this->emetteur->country_code) {
+ $this->emetteur->country_code = substr($langs->defaultlang, -2); // Par defaut, si n'etait pas defini
}
}
@@ -468,7 +468,9 @@ class doc_generic_project_odt extends ModelePDFProjects
$texte .= '';
}
diff --git a/htdocs/core/modules/project/mod_project_universal.php b/htdocs/core/modules/project/mod_project_universal.php
index 47fd83842ed..1020c42ebf6 100644
--- a/htdocs/core/modules/project/mod_project_universal.php
+++ b/htdocs/core/modules/project/mod_project_universal.php
@@ -30,6 +30,11 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/project/modules_project.php';
*/
class mod_project_universal extends ModeleNumRefProjects
{
+ /**
+ * @var DoliDB $db
+ */
+ public $db;
+
/**
* Dolibarr version of the loaded document
* @var string
diff --git a/htdocs/core/modules/project/modules_project.php b/htdocs/core/modules/project/modules_project.php
index dc3f19d72fd..894df4bf8f3 100644
--- a/htdocs/core/modules/project/modules_project.php
+++ b/htdocs/core/modules/project/modules_project.php
@@ -127,6 +127,11 @@ abstract class ModeleNumRefProjects
*/
public $error = '';
+ /**
+ * @var string $version
+ */
+ public $version;
+
/**
* Return if a module can be used or not
*
diff --git a/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php b/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
index ba386eedfe7..a7f3eab4a30 100644
--- a/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
+++ b/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
@@ -433,7 +433,9 @@ class doc_generic_task_odt extends ModelePDFTask
$texte .= '';
}
diff --git a/htdocs/core/modules/propale/doc/pdf_azur.modules.php b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
index 231d8c1ddff..facb364cd23 100644
--- a/htdocs/core/modules/propale/doc/pdf_azur.modules.php
+++ b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
@@ -961,8 +961,33 @@ class pdf_azur extends ModelePDFPropales
$posy = $pdf->GetY() + 1;
}
+ // Show delivery mode
+ if (empty($conf->global->PROPOSAL_PDF_HIDE_DELIVERYMODE) && $object->shipping_method_id > 0) {
+ $outputlangs->load("sendings");
+
+ $shipping_method_id = $object->shipping_method_id;
+ if (!empty($conf->global->SOCIETE_ASK_FOR_SHIPPING_METHOD) && !empty($this->emetteur->shipping_method_id)) {
+ $shipping_method_id = $this->emetteur->shipping_method_id;
+ }
+ $shipping_method_code = dol_getIdFromCode($this->db, $shipping_method_id, 'c_shipment_mode', 'rowid', 'code');
+ $shipping_method_label = dol_getIdFromCode($this->db, $shipping_method_id, 'c_shipment_mode', 'rowid', 'libelle');
+
+ $pdf->SetFont('', 'B', $default_font_size - 2);
+ $pdf->SetXY($this->marge_gauche, $posy);
+ $titre = $outputlangs->transnoentities("SendingMethod").':';
+ $pdf->MultiCell(43, 4, $titre, 0, 'L');
+
+ $pdf->SetFont('', '', $default_font_size - 2);
+ $pdf->SetXY($posxval, $posy);
+ $lib_condition_paiement = ($outputlangs->transnoentities("SendingMethod".strtoupper($shipping_method_code)) != "SendingMethod".strtoupper($shipping_method_code)) ? $outputlangs->trans("SendingMethod".strtoupper($shipping_method_code)) : $shipping_method_label;
+ $lib_condition_paiement = str_replace('\n', "\n", $lib_condition_paiement);
+ $pdf->MultiCell(67, 4, $lib_condition_paiement, 0, 'L');
+
+ $posy = $pdf->GetY() + 1;
+ }
+
// Show payments conditions
- if (empty($conf->global->PROPOSAL_PDF_HIDE_PAYMENTTERM) && ($object->cond_reglement_code || $object->cond_reglement)) {
+ if (empty($conf->global->PROPOSAL_PDF_HIDE_PAYMENTTERM) && $object->cond_reglement_code) {
$pdf->SetFont('', 'B', $default_font_size - 2);
$pdf->SetXY($this->marge_gauche, $posy);
$titre = $outputlangs->transnoentities("PaymentConditions").':';
@@ -981,22 +1006,6 @@ class pdf_azur extends ModelePDFPropales
}
if (empty($conf->global->PROPOSAL_PDF_HIDE_PAYMENTMODE)) {
- // Check a payment mode is defined
- /* Not required on a proposal
- if (empty($object->mode_reglement_code)
- && ! $conf->global->FACTURE_CHQ_NUMBER
- && ! $conf->global->FACTURE_RIB_NUMBER)
- {
- $pdf->SetXY($this->marge_gauche, $posy);
- $pdf->SetTextColor(200,0,0);
- $pdf->SetFont('','B', $default_font_size - 2);
- $pdf->MultiCell(90, 3, $outputlangs->transnoentities("ErrorNoPaiementModeConfigured"),0,'L',0);
- $pdf->SetTextColor(0,0,0);
-
- $posy=$pdf->GetY()+1;
- }
- */
-
// Show payment mode
if ($object->mode_reglement_code
&& $object->mode_reglement_code != 'CHQ'
diff --git a/htdocs/core/modules/propale/doc/pdf_cyan.modules.php b/htdocs/core/modules/propale/doc/pdf_cyan.modules.php
index 9bffe9009fb..f537ea2ef9d 100644
--- a/htdocs/core/modules/propale/doc/pdf_cyan.modules.php
+++ b/htdocs/core/modules/propale/doc/pdf_cyan.modules.php
@@ -1080,8 +1080,33 @@ class pdf_cyan extends ModelePDFPropales
$posy = $pdf->GetY() + 1;
}
+ // Show delivery mode
+ if (empty($conf->global->PROPOSAL_PDF_HIDE_DELIVERYMODE) && $object->shipping_method_id > 0) {
+ $outputlangs->load("sendings");
+
+ $shipping_method_id = $object->shipping_method_id;
+ if (!empty($conf->global->SOCIETE_ASK_FOR_SHIPPING_METHOD) && !empty($this->emetteur->shipping_method_id)) {
+ $shipping_method_id = $this->emetteur->shipping_method_id;
+ }
+ $shipping_method_code = dol_getIdFromCode($this->db, $shipping_method_id, 'c_shipment_mode', 'rowid', 'code');
+ $shipping_method_label = dol_getIdFromCode($this->db, $shipping_method_id, 'c_shipment_mode', 'rowid', 'libelle');
+
+ $pdf->SetFont('', 'B', $default_font_size - 2);
+ $pdf->SetXY($this->marge_gauche, $posy);
+ $titre = $outputlangs->transnoentities("SendingMethod").':';
+ $pdf->MultiCell(43, 4, $titre, 0, 'L');
+
+ $pdf->SetFont('', '', $default_font_size - 2);
+ $pdf->SetXY($posxval, $posy);
+ $lib_condition_paiement = ($outputlangs->transnoentities("SendingMethod".strtoupper($shipping_method_code)) != "SendingMethod".strtoupper($shipping_method_code)) ? $outputlangs->trans("SendingMethod".strtoupper($shipping_method_code)) : $shipping_method_label;
+ $lib_condition_paiement = str_replace('\n', "\n", $lib_condition_paiement);
+ $pdf->MultiCell(67, 4, $lib_condition_paiement, 0, 'L');
+
+ $posy = $pdf->GetY() + 1;
+ }
+
// Show payments conditions
- if (empty($conf->global->PROPOSAL_PDF_HIDE_PAYMENTTERM) && ($object->cond_reglement_code || $object->cond_reglement)) {
+ if (empty($conf->global->PROPOSAL_PDF_HIDE_PAYMENTTERM) && $object->cond_reglement_code) {
$pdf->SetFont('', 'B', $default_font_size - 2);
$pdf->SetXY($this->marge_gauche, $posy);
$titre = $outputlangs->transnoentities("PaymentConditions").':';
@@ -1100,22 +1125,6 @@ class pdf_cyan extends ModelePDFPropales
}
if (empty($conf->global->PROPOSAL_PDF_HIDE_PAYMENTMODE)) {
- // Check a payment mode is defined
- /* Not required on a proposal
- if (empty($object->mode_reglement_code)
- && ! $conf->global->FACTURE_CHQ_NUMBER
- && ! $conf->global->FACTURE_RIB_NUMBER)
- {
- $pdf->SetXY($this->marge_gauche, $posy);
- $pdf->SetTextColor(200,0,0);
- $pdf->SetFont('','B', $default_font_size - 2);
- $pdf->MultiCell(90, 3, $outputlangs->transnoentities("ErrorNoPaiementModeConfigured"),0,'L',0);
- $pdf->SetTextColor(0,0,0);
-
- $posy=$pdf->GetY()+1;
- }
- */
-
// Show payment mode
if ($object->mode_reglement_code
&& $object->mode_reglement_code != 'CHQ'
diff --git a/htdocs/core/modules/reception/doc/doc_generic_reception_odt.modules.php b/htdocs/core/modules/reception/doc/doc_generic_reception_odt.modules.php
index 4d8edca7f64..4ebc742b4bb 100644
--- a/htdocs/core/modules/reception/doc/doc_generic_reception_odt.modules.php
+++ b/htdocs/core/modules/reception/doc/doc_generic_reception_odt.modules.php
@@ -168,7 +168,9 @@ class doc_generic_reception_odt extends ModelePdfReception
$texte .= '';
}
diff --git a/htdocs/core/modules/stock/doc/doc_generic_stock_odt.modules.php b/htdocs/core/modules/stock/doc/doc_generic_stock_odt.modules.php
index 0f5adc3fc7d..eb6ba838d7a 100644
--- a/htdocs/core/modules/stock/doc/doc_generic_stock_odt.modules.php
+++ b/htdocs/core/modules/stock/doc/doc_generic_stock_odt.modules.php
@@ -172,7 +172,9 @@ class doc_generic_stock_odt extends ModelePDFStock
$texte .= '';
}
diff --git a/htdocs/core/modules/supplier_order/doc/doc_generic_supplier_order_odt.modules.php b/htdocs/core/modules/supplier_order/doc/doc_generic_supplier_order_odt.modules.php
index f3177233589..12bbcc12edc 100644
--- a/htdocs/core/modules/supplier_order/doc/doc_generic_supplier_order_odt.modules.php
+++ b/htdocs/core/modules/supplier_order/doc/doc_generic_supplier_order_odt.modules.php
@@ -163,7 +163,7 @@ class doc_generic_supplier_order_odt extends ModelePDFSuppliersOrders
// Scan directories
$nbofiles = count($listoffiles);
- if (!empty($conf->global->COMMANDE_ADDON_PDF_ODT_PATH)) {
+ if (!empty($conf->global->SUPPLIER_ORDER_ADDON_PDF_ODT_PATH)) {
$texte .= $langs->trans("NumberOfModelFilesFound").': ';
//$texte.=$nbofiles?'':'';
$texte .= count($listoffiles);
@@ -175,7 +175,9 @@ class doc_generic_supplier_order_odt extends ModelePDFSuppliersOrders
$texte .= '';
}
diff --git a/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php b/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
index 5e4b75a183e..7ff463df8b3 100644
--- a/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
+++ b/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
@@ -5,7 +5,7 @@
* Copyright (C) 2010-2014 Juanjo Menent
* Copyright (C) 2015 Marcos García
* Copyright (C) 2017 Ferran Marcet
- * Copyright (C) 2018 Frédéric France
+ * Copyright (C) 2018-2022 Frédéric France
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -1567,7 +1567,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
'border-left' => false, // remove left line separator
);
- if (!empty($conf->global->MAIN_GENERATE_ORDERS_WITH_PICTURE)) {
+ if (!empty($conf->global->MAIN_GENERATE_SUPPLIER_ORDER_WITH_PICTURE)) {
$this->cols['photo']['status'] = true;
}
diff --git a/htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php b/htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php
index fc75445123a..55a7710c5a4 100644
--- a/htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php
+++ b/htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php
@@ -179,7 +179,9 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
$texte .= '';
diff --git a/htdocs/core/modules/supplier_proposal/mod_supplier_proposal_saphir.php b/htdocs/core/modules/supplier_proposal/mod_supplier_proposal_saphir.php
index 57cba16c01b..c73a8a16db6 100644
--- a/htdocs/core/modules/supplier_proposal/mod_supplier_proposal_saphir.php
+++ b/htdocs/core/modules/supplier_proposal/mod_supplier_proposal_saphir.php
@@ -138,7 +138,7 @@ class mod_supplier_proposal_saphir extends ModeleNumRefSupplierProposal
return 0;
}
- $date = $supplier_proposal->datep;
+ $date = $supplier_proposal->date;
$customercode = $objsoc->code_client;
$numFinal = get_next_value($db, $mask, 'supplier_proposal', 'ref', '', $customercode, $date);
diff --git a/htdocs/core/modules/ticket/doc/doc_generic_ticket_odt.modules.php b/htdocs/core/modules/ticket/doc/doc_generic_ticket_odt.modules.php
index ff6359be5ce..1a2d1e537cc 100644
--- a/htdocs/core/modules/ticket/doc/doc_generic_ticket_odt.modules.php
+++ b/htdocs/core/modules/ticket/doc/doc_generic_ticket_odt.modules.php
@@ -161,7 +161,9 @@ class doc_generic_ticket_odt extends ModelePDFTicket
$texte .= '';
}
diff --git a/htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php b/htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php
index d129c80f126..1c3e346203b 100644
--- a/htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php
+++ b/htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php
@@ -192,7 +192,9 @@ class doc_generic_user_odt extends ModelePDFUser
$texte .= '';
}
diff --git a/htdocs/core/tpl/massactions_pre.tpl.php b/htdocs/core/tpl/massactions_pre.tpl.php
index 7657fe21e96..5124a1dce35 100644
--- a/htdocs/core/tpl/massactions_pre.tpl.php
+++ b/htdocs/core/tpl/massactions_pre.tpl.php
@@ -360,7 +360,8 @@ if ($massaction == 'preapproveleave') {
// Allow Pre-Mass-Action hook (eg for confirmation dialog)
$parameters = array(
'toselect' => isset($toselect) ? $toselect : array(),
- 'uploaddir' => isset($uploaddir) ? $uploaddir : null
+ 'uploaddir' => isset($uploaddir) ? $uploaddir : null,
+ 'massaction' => $massaction
);
$reshook = $hookmanager->executeHooks('doPreMassActions', $parameters, $object, $action);
diff --git a/htdocs/core/tpl/notes.tpl.php b/htdocs/core/tpl/notes.tpl.php
index 2a0f3d654d7..c8f1ccd7a34 100644
--- a/htdocs/core/tpl/notes.tpl.php
+++ b/htdocs/core/tpl/notes.tpl.php
@@ -91,7 +91,7 @@ if ($module == 'propal') {
} elseif ($module == 'shipping') {
$permission = $user->hasRight("expedition", "creer");
} elseif ($module == 'product') {
- $permission = $user->hasRight("produit", "creer");
+ $permission = $user->hasRight("product", "creer");
} elseif ($module == 'service') {
$permission = $user->hasRight("service", "creer");
} elseif ($module == 'ecmfiles') {
diff --git a/htdocs/core/tpl/objectline_create.tpl.php b/htdocs/core/tpl/objectline_create.tpl.php
index bd961b5bf17..c0382a39de4 100644
--- a/htdocs/core/tpl/objectline_create.tpl.php
+++ b/htdocs/core/tpl/objectline_create.tpl.php
@@ -385,7 +385,7 @@ if ($nolinesbefore) {
if ($object->element == 'supplier_proposal' || $object->element == 'order_supplier' || $object->element == 'invoice_supplier' || $object->element == 'invoice_supplier_rec') { // We must have same test in printObjectLines
$coldisplay++;
?>
-
';
print ''.$langs->trans('Supplier').' : '.$productfourn->getSocNomUrl(1, 'supplier').' - '.$langs->trans('Ref').' : ';
// Supplier ref
- if ($user->rights->produit->creer || $user->rights->service->creer) { // change required right here
+ if ($user->hasRight('produit', 'creer') || $user->hasRight('service', 'creer')) { // change required right here
print $productfourn->getNomUrl();
} else {
print $productfourn->ref_supplier;
@@ -353,19 +353,27 @@ if ($line->special_code == 3) { ?>
if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
$tooltiponprice = $langs->transcountry("TotalHT", $mysoc->country_code).'='.price($line->total_ht);
$tooltiponprice .= ''.$langs->trans("NotUsedForThisCustomer").' ';
+ $tooltiponprice .= ''.$langs->trans($senderissupplier ? "NotUsedForThisSupplier" : "NotUsedForThisCustomer").' ';
}
}
if ($mysoc->useLocalTax(2)) {
- if (($mysoc->country_code == $object->thirdparty->country_code) || $object->thirdparty->useLocalTax(2)) {
- $tooltiponprice .= ''.$langs->trans("NotUsedForThisCustomer").' ';
+ $tooltiponprice .= ''.$langs->trans($senderissupplier ? "NotUsedForThisSupplier" : "NotUsedForThisCustomer").' ';
}
}
}
@@ -418,7 +426,7 @@ if ($this->statut == 0 && !empty($object_rights->creer) && $action != 'selectlin
print 'Error SQL: ' . $this->db->lasterror();
} elseif ($obj = $this->db->fetch_object($resql_asset)) {
if (!empty($obj->found)) {
- print '';
+ print ' ';
print img_edit_add() . ' ';
}
}
@@ -430,7 +438,7 @@ if ($this->statut == 0 && !empty($object_rights->creer) && $action != 'selectlin
$coldisplay++;
if (($line->info_bits & 2) == 2 || !empty($disableedit)) {
} else { ?>
- id.'#line_'.$line->id; ?>">
+ id; ?>">
';
}
print ' ';
diff --git a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
index f31a4c2c93e..e3f798dec62 100644
--- a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
+++ b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
@@ -742,7 +742,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
if (!is_object($member)) { // This should not happen
include_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
$member = new Adherent($this->db);
- $member->fetch($this->fk_adherent);
+ $member->fetch($object->fk_adherent);
}
if (empty($object->actionmsg2)) {
diff --git a/htdocs/cron/class/cronjob.class.php b/htdocs/cron/class/cronjob.class.php
index 8f4b32ae502..d26c83f4772 100644
--- a/htdocs/cron/class/cronjob.class.php
+++ b/htdocs/cron/class/cronjob.class.php
@@ -1262,13 +1262,13 @@ class Cronjob extends CommonObject
dol_syslog(get_class($this)."::run_jobs END result=".$result." error=".$errmsg, LOG_ERR);
$this->error = $errmsg;
- $this->lastoutput = ($object->output ? $object->output."\n" : "").$errmsg;
+ $this->lastoutput = (!empty($object->output) ? $object->output."\n" : "").$errmsg;
$this->lastresult = is_numeric($result) ? $result : -1;
$retval = $this->lastresult;
$error++;
} else {
dol_syslog(get_class($this)."::run_jobs END");
- $this->lastoutput = $object->output;
+ $this->lastoutput = (!empty($object->output) ? $object->output : "");
$this->lastresult = var_export($result, true);
$retval = $this->lastresult;
}
diff --git a/htdocs/cron/list.php b/htdocs/cron/list.php
index ae53242d836..30f195b550b 100644
--- a/htdocs/cron/list.php
+++ b/htdocs/cron/list.php
@@ -448,7 +448,7 @@ print ' ';
print '';
-print $form->selectarray('search_status', array('0'=>$langs->trans("Disabled"), '1'=>$langs->trans("Scheduled")), $search_status, 1);
+print $form->selectarray('search_status', array('0'=>$langs->trans("Disabled"), '1'=>$langs->trans("Scheduled")), $search_status, 1, 0, 0, '', 0, 0, 0, '', 'onrightofpage');
print ' ';
$searchpicto = $form->showFilterButtons();
print $searchpicto;
diff --git a/htdocs/delivery/class/delivery.class.php b/htdocs/delivery/class/delivery.class.php
index ad1a3b9934a..73fc15e6911 100644
--- a/htdocs/delivery/class/delivery.class.php
+++ b/htdocs/delivery/class/delivery.class.php
@@ -638,7 +638,7 @@ class Delivery extends CommonObject
$sql .= " WHERE rowid = ".((int) $lineid);
if ($this->db->query($sql)) {
- $this->update_price();
+ $this->update_price(1);
return 1;
} else {
diff --git a/htdocs/don/card.php b/htdocs/don/card.php
index a0a795e9c8b..459c892a1d9 100644
--- a/htdocs/don/card.php
+++ b/htdocs/don/card.php
@@ -48,6 +48,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
$langs->loadLangs(array('bills', 'companies', 'donations', 'users'));
$id = GETPOST('rowid') ?GETPOST('rowid', 'int') : GETPOST('id', 'int');
+$ref = GETPOST('ref', 'alpha');
$action = GETPOST('action', 'aZ09');
$cancel = GETPOST('cancel', 'alpha');
$confirm = GETPOST('confirm', 'alpha');
@@ -58,10 +59,11 @@ $projectid = (GETPOST('projectid') ? GETPOST('projectid', 'int') : 0);
$public_donation = (int) GETPOST("public", 'int');
$object = new Don($db);
-$extrafields = new ExtraFields($db);
+if ($id > 0 || $ref) {
+ $object->fetch($id, $ref);
+}
-// Security check
-$result = restrictedArea($user, 'don', $id);
+$extrafields = new ExtraFields($db);
// fetch optionals attributes and labels
$extrafields->fetch_name_optionals_label($object->table_element);
@@ -71,6 +73,11 @@ $search_array_options = $extrafields->getOptionalsFromPost($object->table_elemen
$hookmanager->initHooks(array('doncard', 'globalcard'));
$upload_dir = $conf->don->dir_output;
+
+
+// Security check
+$result = restrictedArea($user, 'don', $object->id);
+
$permissiontoadd = $user->rights->don->creer;
@@ -487,7 +494,8 @@ if ($action == 'create') {
// Payment mode
print " ".$langs->trans("PaymentMode")." \n";
$selected = GETPOST('modepayment', 'int');
- $form->select_types_paiements($selected, 'modepayment', 'CRDT', 0, 1);
+ print img_picto('', 'payment', 'class="pictofixedwidth"');
+ print $form->select_types_paiements($selected, 'modepayment', 'CRDT', 0, 1, 0, 0, 1, 'maxwidth200 widthcentpercentminusx', 1);
print " ".$langs->trans("Project")." ";
- $formproject->select_projects(-1, $projectid, 'fk_project', 0, 0, 1, 1, 0, 0, 0, '', 0, 0, 'maxwidth500');
+ print img_picto('', 'project', 'class="pictofixedwidth"');
+ print $formproject->select_projects(-1, $projectid, 'fk_project', 0, 0, 1, 1, 0, 0, 0, '', 1, 0, 'maxwidth500');
print " ';
$searchpicto = $form->showFilterAndCheckAddButtons(0);
diff --git a/htdocs/don/note.php b/htdocs/don/note.php
index 4d84c4b1417..dd3f4e176ce 100644
--- a/htdocs/don/note.php
+++ b/htdocs/don/note.php
@@ -43,17 +43,19 @@ $ref = GETPOST('ref', 'alpha');
$action = GETPOST('action', 'aZ09');
$projectid = (GETPOST('projectid') ? GETPOST('projectid', 'int') : 0);
+$hookmanager->initHooks(array('donnote'));
+
+$object = new Don($db);
+if ($id > 0 || $ref) {
+ $object->fetch($id, $ref);
+}
+
// Security check
$socid = 0;
if ($user->socid) {
$socid = $user->socid;
}
-$hookmanager->initHooks(array('donnote'));
-
-$result = restrictedArea($user, 'don', $id, '');
-
-$object = new Don($db);
-$object->fetch($id);
+$result = restrictedArea($user, 'don', $object->id, '');
$permissionnote = $user->rights->don->creer; // Used by the include of actions_setnotes.inc.php
diff --git a/htdocs/don/payment/payment.php b/htdocs/don/payment/payment.php
index 6a2cc78f128..358c0b208e9 100644
--- a/htdocs/don/payment/payment.php
+++ b/htdocs/don/payment/payment.php
@@ -95,7 +95,7 @@ if ($action == 'add_payment') {
// Create a line of payments
$payment = new PaymentDonation($db);
$payment->chid = $chid;
- $payment->datepaid = $datepaid;
+ $payment->datep = $datepaid;
$payment->amounts = $amounts; // Tableau de montant
$payment->paymenttype = GETPOST("paymenttype", 'int');
$payment->num_payment = GETPOST("num_payment", 'alphanohtml');
@@ -192,14 +192,14 @@ if ($action == 'create') {
print '';
print ' '.$langs->trans("PaymentMode").' ';
- $form->select_types_paiements(GETPOSTISSET("paymenttype") ? GETPOST("paymenttype") : $object->paymenttype, "paymenttype");
+ $form->select_types_paiements(GETPOSTISSET("paymenttype") ? GETPOST("paymenttype") : $object->fk_typepayment, "paymenttype");
print " \n";
print '';
print ''.$langs->trans('AccountToCredit').' ';
print '';
- $form->select_comptes(GETPOSTISSET("accountid") ? GETPOST("accountid") : $object->accountid, "accountid", 0, '', 2); // Show open bank account list
+ $form->select_comptes(GETPOSTISSET("accountid") ? GETPOST("accountid") : "0", "accountid", 0, '', 2); // Show open bank account list
print ' ';
// Number
diff --git a/htdocs/emailcollector/class/emailcollectoraction.class.php b/htdocs/emailcollector/class/emailcollectoraction.class.php
index 46b787fc6fd..e43a86da515 100644
--- a/htdocs/emailcollector/class/emailcollectoraction.class.php
+++ b/htdocs/emailcollector/class/emailcollectoraction.class.php
@@ -85,7 +85,7 @@ class EmailCollectorAction extends CommonObject
'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>1, 'visible'=>-1, 'position'=>1, 'notnull'=>1, 'index'=>1, 'comment'=>"Id",),
'fk_emailcollector' => array('type'=>'integer', 'label'=>'Id of emailcollector', 'foreignkey'=>'emailcollector.rowid'),
'type' => array('type'=>'varchar(128)', 'label'=>'Type', 'enabled'=>1, 'visible'=>1, 'position'=>10, 'notnull'=>1, 'index'=>1),
- 'actionparam' => array('type'=>'varchar(255)', 'label'=>'ParamForAction', 'enabled'=>1, 'visible'=>1, 'position'=>40, 'notnull'=>-1),
+ 'actionparam' => array('type'=>'text', 'label'=>'ParamForAction', 'enabled'=>1, 'visible'=>1, 'position'=>40, 'notnull'=>-1),
'date_creation' => array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>1, 'visible'=>-2, 'position'=>500, 'notnull'=>1,),
'tms' => array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>1, 'visible'=>-2, 'position'=>501, 'notnull'=>1,),
'fk_user_creat' => array('type'=>'integer', 'label'=>'UserAuthor', 'enabled'=>1, 'visible'=>-2, 'position'=>510, 'notnull'=>1, 'foreignkey'=>'llx_user.rowid',),
diff --git a/htdocs/eventorganization/class/conferenceorboothattendee.class.php b/htdocs/eventorganization/class/conferenceorboothattendee.class.php
index 909758ca3f2..595eaf67eeb 100644
--- a/htdocs/eventorganization/class/conferenceorboothattendee.class.php
+++ b/htdocs/eventorganization/class/conferenceorboothattendee.class.php
@@ -123,6 +123,7 @@ class ConferenceOrBoothAttendee extends CommonObject
'import_key' => array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>'1', 'position'=>1000, 'notnull'=>-1, 'visible'=>-2,),
'model_pdf' => array('type'=>'varchar(255)', 'label'=>'Model pdf', 'enabled'=>'1', 'position'=>1010, 'notnull'=>-1, 'visible'=>0,),
'status' => array('type'=>'smallint', 'label'=>'Status', 'enabled'=>'1', 'position'=>1000, 'default'=>0, 'notnull'=>1, 'visible'=>1, 'index'=>1, 'arrayofkeyval'=>array('0'=>'Draft', '1'=>'Validated', '9'=>'Canceled'),),
+ 'ip' => array('type'=>'varchar(250)', 'label'=>'Ip', 'enabled'=>'1', 'position'=>1000, 'notnull'=>-1, 'visible'=>-2,),
);
public $rowid;
public $ref;
diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php
index d3981dcf264..0b8668a6c1a 100644
--- a/htdocs/expedition/class/expedition.class.php
+++ b/htdocs/expedition/class/expedition.class.php
@@ -84,6 +84,13 @@ class Expedition extends CommonObject
*/
public $picto = 'dolly';
+
+ /**
+ * @var array Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+ */
+ public $fields = array();
+
+
public $socid;
/**
@@ -733,7 +740,8 @@ class Expedition extends CommonObject
} else {
$qty = $obj->edbqty;
}
- if ($qty <= 0) {
+
+ if ($qty == 0 || ($qty < 0 && !getDolGlobalInt('SHIPMENT_ALLOW_NEGATIVE_QTY'))) {
continue;
}
dol_syslog(get_class($this)."::valid movement index ".$i." ed.rowid=".$obj->rowid." edb.rowid=".$obj->edbrowid);
diff --git a/htdocs/expedition/class/expeditionstats.class.php b/htdocs/expedition/class/expeditionstats.class.php
index 8eb31896f38..aa4e40fcb8f 100644
--- a/htdocs/expedition/class/expeditionstats.class.php
+++ b/htdocs/expedition/class/expeditionstats.class.php
@@ -131,6 +131,54 @@ class ExpeditionStats extends Stats
return $this->_getNbByYear($sql);
}
+ /**
+ * Return the orders amount by month for a year
+ *
+ * @param int $year Year to scan
+ * @param int $format 0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
+ * @return array Array with amount by month
+ */
+ public function getAmountByMonth($year, $format = 0)
+ {
+ global $user;
+
+ $sql = "SELECT date_format(c.date_valid,'%m') as dm, SUM(c.".$this->field.")";
+ $sql .= " FROM ".$this->from;
+ if (empty($user->rights->societe->client->voir) && !$this->socid) {
+ $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+ }
+ $sql .= $this->join;
+ $sql .= " WHERE ".$this->where;
+ $sql .= " GROUP BY dm";
+ $sql .= $this->db->order('dm', 'DESC');
+
+ $res = $this->_getAmountByMonth($year, $sql, $format);
+ return $res;
+ }
+
+ /**
+ * Return the orders amount average by month for a year
+ *
+ * @param int $year year for stats
+ * @return array array with number by month
+ */
+ public function getAverageByMonth($year)
+ {
+ global $user;
+
+ $sql = "SELECT date_format(c.date_valid,'%m') as dm, AVG(c.".$this->field.")";
+ $sql .= " FROM ".$this->from;
+ if (empty($user->rights->societe->client->voir) && !$this->socid) {
+ $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+ }
+ $sql .= $this->join;
+ $sql .= " WHERE ".$this->where;
+ $sql .= " GROUP BY dm";
+ $sql .= $this->db->order('dm', 'DESC');
+
+ return $this->_getAverageByMonth($year, $sql);
+ }
+
/**
* Return nb, total and average
*
diff --git a/htdocs/expedition/list.php b/htdocs/expedition/list.php
index 3b06f005787..14544087647 100644
--- a/htdocs/expedition/list.php
+++ b/htdocs/expedition/list.php
@@ -284,6 +284,9 @@ if (!empty($extrafields->attributes[$object->table_element]['label'])) {
$parameters = array();
$reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters); // Note that $action and $object may have been modified by hook
$sql .= $hookmanager->resPrint;
+
+$sqlfields = $sql; // $sql fields to remove for count total
+
$sql .= " FROM ".MAIN_DB_PREFIX."expedition as e";
if (!empty($extrafields->attributes[$object->table_element]['label']) && is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX.$object->table_element."_extrafields as ef on (e.rowid = ef.fk_object)";
@@ -446,19 +449,31 @@ $parameters = array();
$reshook = $hookmanager->executeHooks('printFieldListHaving', $parameters, $object); // Note that $action and $object may have been modified by hook
$sql .= empty($hookmanager->resPrint) ? "" : " HAVING 1=1 ".$hookmanager->resPrint;
-$sql .= $db->order($sortfield, $sortorder);
-
$nbtotalofrecords = '';
if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
- $result = $db->query($sql);
- $nbtotalofrecords = $db->num_rows($result);
+ /* The fast and low memory method to get and count full list converts the sql into a sql count */
+ $sqlforcount = preg_replace('/^'.preg_quote($sqlfields, '/').'/', 'SELECT COUNT(*) as nbtotalofrecords', $sql);
+ $sqlforcount = preg_replace('/GROUP BY .*$/', '', $sqlforcount);
+ $resql = $db->query($sqlforcount);
+ if ($resql) {
+ $objforcount = $db->fetch_object($resql);
+ $nbtotalofrecords = $objforcount->nbtotalofrecords;
+ } else {
+ dol_print_error($db);
+ }
+
if (($page * $limit) > $nbtotalofrecords) { // if total resultset is smaller then paging size (filtering), goto and load page 0
$page = 0;
$offset = 0;
}
+ $db->free($resql);
}
-$sql .= $db->plimit($limit + 1, $offset);
+// Complete request and execute it with limit
+$sql .= $db->order($sortfield, $sortorder);
+if ($limit) {
+ $sql .= $db->plimit($limit + 1, $offset);
+}
//print $sql;
$resql = $db->query($sql);
@@ -772,7 +787,7 @@ if (!empty($arrayfields['e.tms']['checked'])) {
// Status
if (!empty($arrayfields['e.fk_statut']['checked'])) {
print '';
- print $form->selectarray('search_status', array('0'=>$langs->trans('StatusSendingDraftShort'), '1'=>$langs->trans('StatusSendingValidatedShort'), '2'=>$langs->trans('StatusSendingProcessedShort')), $search_status, 1);
+ print $form->selectarray('search_status', array('0'=>$langs->trans('StatusSendingDraftShort'), '1'=>$langs->trans('StatusSendingValidatedShort'), '2'=>$langs->trans('StatusSendingProcessedShort')), $search_status, 1, 0, 0, '', 0, 0, 0, '', 'onrightofpage');
print ' ';
}
// Status billed
diff --git a/htdocs/expedition/stats/month.php b/htdocs/expedition/stats/month.php
index 34842efaaf3..398bc381715 100644
--- a/htdocs/expedition/stats/month.php
+++ b/htdocs/expedition/stats/month.php
@@ -47,11 +47,12 @@ $WIDTH = DolGraph::getDefaultGraphSizeForStats('width');
$HEIGHT = DolGraph::getDefaultGraphSizeForStats('height');
$mesg = '';
+$mode = '';
print load_fiche_titre($langs->trans("StatisticsOfSendings").' '.$year, $mesg);
-$stats = new ExpeditionStats($db);
-$data = $stats->getNbExpeditionByMonth($year);
+$stats = new ExpeditionStats($db, $socid, $mode);
+$data = $stats->getNbByMonth($year);
dol_mkdir($conf->expedition->dir_temp);
diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php
index 33ec1fede7b..f6aa14865ec 100644
--- a/htdocs/expensereport/card.php
+++ b/htdocs/expensereport/card.php
@@ -2297,7 +2297,7 @@ if ($action == 'create') {
}
}
- $tredited = 'tredited';
+ $tredited = 'tredited'; // Case the addfile and linkto file is used for edit (used by following tpl)
include DOL_DOCUMENT_ROOT.'/expensereport/tpl/expensereport_addfile.tpl.php';
include DOL_DOCUMENT_ROOT.'/expensereport/tpl/expensereport_linktofile.tpl.php';
@@ -2455,6 +2455,7 @@ if ($action == 'create') {
print ''."\n";
print '';
+ $tredited = ''; // Case the addfile and linkto file is used for edit (used by following tpl)
include DOL_DOCUMENT_ROOT.'/expensereport/tpl/expensereport_linktofile.tpl.php';
include DOL_DOCUMENT_ROOT.'/expensereport/tpl/expensereport_addfile.tpl.php';
@@ -2517,6 +2518,7 @@ if ($action == 'create') {
print '';
$defaultvat = -1;
if (!empty($conf->global->EXPENSEREPORT_NO_DEFAULT_VAT)) {
+ // If option to have no default VAT on expense report is on, we force MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS
$conf->global->MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS = 'none';
}
print $form->load_tva('vatrate', (!empty($vatrate) ? $vatrate : $defaultvat), $mysoc, '', 0, 0, '', false, 1);
diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php
index a1afcef74a2..ecb1cf3d65b 100644
--- a/htdocs/expensereport/class/expensereport.class.php
+++ b/htdocs/expensereport/class/expensereport.class.php
@@ -367,7 +367,7 @@ class ExpenseReport extends CommonObject
}
if (!$error) {
- $result = $this->update_price();
+ $result = $this->update_price(1);
if ($result > 0) {
if (!$notrigger) {
// Call trigger
@@ -1858,7 +1858,7 @@ class ExpenseReport extends CommonObject
$result = $this->line->insert(0, true);
if ($result > 0) {
- $result = $this->update_price(); // This method is designed to add line from user input so total calculation must be done using 'auto' mode.
+ $result = $this->update_price(1); // This method is designed to add line from user input so total calculation must be done using 'auto' mode.
if ($result > 0) {
$this->db->commit();
return $this->line->id;
@@ -2217,7 +2217,7 @@ class ExpenseReport extends CommonObject
return -1;
}
- $this->update_price();
+ $this->update_price(1);
$this->db->commit();
@@ -2896,7 +2896,7 @@ class ExpenseReportLine extends CommonObjectLine
if (!$fromaddline) {
$tmpparent = new ExpenseReport($this->db);
$tmpparent->fetch($this->fk_expensereport);
- $result = $tmpparent->update_price();
+ $result = $tmpparent->update_price(1);
if ($result < 0) {
$error++;
$this->error = $tmpparent->error;
@@ -3023,7 +3023,7 @@ class ExpenseReportLine extends CommonObjectLine
$tmpparent = new ExpenseReport($this->db);
$result = $tmpparent->fetch($this->fk_expensereport);
if ($result > 0) {
- $result = $tmpparent->update_price();
+ $result = $tmpparent->update_price(1);
if ($result < 0) {
$error++;
$this->error = $tmpparent->error;
diff --git a/htdocs/expensereport/list.php b/htdocs/expensereport/list.php
index 896bb29cf43..bded18fa597 100644
--- a/htdocs/expensereport/list.php
+++ b/htdocs/expensereport/list.php
@@ -285,6 +285,9 @@ if (!empty($extrafields->attributes[$object->table_element]['label'])) {
$parameters = array();
$reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters); // Note that $action and $object may have been modified by hook
$sql .= $hookmanager->resPrint;
+
+$sqlfields = $sql; // $sql fields to remove for count total
+
$sql .= " FROM ".MAIN_DB_PREFIX."expensereport as d";
if (isset($extrafields->attributes[$object->table_element]['label']) && is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX.$object->table_element."_extrafields as ef on (d.rowid = ef.fk_object)";
@@ -340,20 +343,32 @@ $parameters = array();
$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters); // Note that $action and $object may have been modified by hook
$sql .= $hookmanager->resPrint;
-$sql .= $db->order($sortfield, $sortorder);
-
// Count total nb of records
$nbtotalofrecords = '';
if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
- $result = $db->query($sql);
- $nbtotalofrecords = $db->num_rows($result);
+ /* The fast and low memory method to get and count full list converts the sql into a sql count */
+ $sqlforcount = preg_replace('/^'.preg_quote($sqlfields, '/').'/', 'SELECT COUNT(*) as nbtotalofrecords', $sql);
+ $sqlforcount = preg_replace('/GROUP BY .*$/', '', $sqlforcount);
+ $resql = $db->query($sqlforcount);
+ if ($resql) {
+ $objforcount = $db->fetch_object($resql);
+ $nbtotalofrecords = $objforcount->nbtotalofrecords;
+ } else {
+ dol_print_error($db);
+ }
+
if (($page * $limit) > $nbtotalofrecords) { // if total resultset is smaller then paging size (filtering), goto and load page 0
$page = 0;
$offset = 0;
}
+ $db->free($resql);
}
-$sql .= $db->plimit($limit + 1, $offset);
+// Complete request and execute it with limit
+$sql .= $db->order($sortfield, $sortorder);
+if ($limit) {
+ $sql .= $db->plimit($limit + 1, $offset);
+}
//print $sql;
$resql = $db->query($sql);
@@ -532,7 +547,7 @@ if ($resql) {
}
$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
- $selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
+ $selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields
$selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
print '';
@@ -540,6 +555,13 @@ if ($resql) {
// Filters
print '
';
+ // Action column
+ if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+ print '';
+ $searchpicto = $form->showFilterButtons('left');
+ print $searchpicto;
+ print ' ';
+ }
if (!empty($arrayfields['d.ref']['checked'])) {
print '';
print ' ';
}
// Action column
- print '';
- $searchpicto = $form->showFilterButtons();
- print $searchpicto;
- print ' ';
+ if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+ print '';
+ $searchpicto = $form->showFilterButtons();
+ print $searchpicto;
+ print ' ';
+ }
print " \n";
print '
';
+ if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+ print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ');
+ }
if (!empty($arrayfields['d.ref']['checked'])) {
print_liste_field_titre($arrayfields['d.ref']['label'], $_SERVER["PHP_SELF"], "d.ref", "", $param, '', $sortfield, $sortorder);
}
@@ -676,7 +703,9 @@ if ($resql) {
if (!empty($arrayfields['d.fk_statut']['checked'])) {
print_liste_field_titre($arrayfields['d.fk_statut']['label'], $_SERVER["PHP_SELF"], "d.fk_statut", "", $param, 'align="right"', $sortfield, $sortorder);
}
- print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ');
+ if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+ print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ');
+ }
print " \n";
$total_total_ht = 0;
@@ -712,6 +741,18 @@ if ($resql) {
print '
';
+ // Action column
+ if (getDolGlobalString('MAIN_CHECKBOX_LEFT_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 ' ';
+ }
// Ref
if (!empty($arrayfields['d.ref']['checked'])) {
print '';
@@ -856,15 +897,17 @@ if ($resql) {
}
}
// 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;
+ if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_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 '';
if (!$i) {
$totalarray['nbfield']++;
}
diff --git a/htdocs/expensereport/tpl/expensereport_linktofile.tpl.php b/htdocs/expensereport/tpl/expensereport_linktofile.tpl.php
index 3835740dd40..fd25a1fff4b 100644
--- a/htdocs/expensereport/tpl/expensereport_linktofile.tpl.php
+++ b/htdocs/expensereport/tpl/expensereport_linktofile.tpl.php
@@ -136,8 +136,18 @@ if (empty($conf->global->EXPENSEREPORT_DISABLE_ATTACHMENT_ON_LINES)) {
print ' ';
} else {
- print '
global->MAIN_OPTIMIZEFORTEXTBROWSER) ? ' style="display: none"' : '').'>';
- print '';
+ if (empty($tredited)) {
+ $css = 'oddeven nohover trattachnewfilenow';
+ $newcolspan = $colspan;
+ } else {
+ $css = 'trattachnewfilenow tredited';
+ $newcolspan = $colspan - 1;
+ }
+ print ' global->MAIN_OPTIMIZEFORTEXTBROWSER) ? ' style="display: none"' : '').'>';
+ if (!empty($tredited)) {
+ print '';
print ''.$langs->trans("NoFilesUploadedYet").' ';
print ' ';
}
diff --git a/htdocs/fichinter/list.php b/htdocs/fichinter/list.php
index 174196a23a5..a3b69d6e26c 100644
--- a/htdocs/fichinter/list.php
+++ b/htdocs/fichinter/list.php
@@ -251,6 +251,9 @@ if (!empty($extrafields->attributes[$object->table_element]['label'])) {
$parameters = array();
$reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters); // Note that $action and $object may have been modified by hook
$sql .= $hookmanager->resPrint;
+
+$sqlfields = $sql; // $sql fields to remove for count total
+
$sql .= " FROM ".MAIN_DB_PREFIX."fichinter as f";
if (isModEnabled('project')) {
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."projet as pr on f.fk_projet = pr.rowid";
@@ -324,20 +327,18 @@ $sql .= $hookmanager->resPrint;
// Count total nb of records
$nbtotalofrecords = '';
if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
- /* This old and fast method to get and count full list returns all record so use a high amount of memory. */
- $resql = $db->query($sql);
- $nbtotalofrecords = $db->num_rows($resql);
/* The fast and low memory method to get and count full list converts the sql into a sql count */
- /*$sqlforcount = preg_replace('/^SELECT[a-zA-Z0-9\._\s\(\),=<>\:\-\']+\sFROM/Ui', 'SELECT COUNT(*) as nbtotalofrecords FROM', $sql);
+ $sqlforcount = preg_replace('/^'.preg_quote($sqlfields, '/').'/', 'SELECT COUNT(*) as nbtotalofrecords', $sql);
+ $sqlforcount = preg_replace('/GROUP BY .*$/', '', $sqlforcount);
$resql = $db->query($sqlforcount);
if ($resql) {
$objforcount = $db->fetch_object($resql);
$nbtotalofrecords = $objforcount->nbtotalofrecords;
} else {
dol_print_error($db);
- }*/
+ }
- if (($page * $limit) > $nbtotalofrecords) { // if total of record found is smaller than page * limit, goto and load page 0
+ if (($page * $limit) > $nbtotalofrecords) { // if total resultset is smaller then paging size (filtering), goto and load page 0
$page = 0;
$offset = 0;
}
@@ -493,7 +494,7 @@ if (!empty($moreforfilter)) {
}
$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')); // This also change content of $arrayfields
+$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields
$selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
print '
';
@@ -503,7 +504,7 @@ print '
';
// Action column
-if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
print '';
$searchpicto = $form->showFilterButtons('left');
print $searchpicto;
@@ -574,7 +575,7 @@ if (!empty($arrayfields['f.fk_statut']['checked'])) {
if (empty($conf->global->FICHINTER_CLASSIFY_BILLED)) {
unset($liststatus[2]); // Option deprecated. In a future, billed must be managed with a dedicated field to 0 or 1
}
- print $form->selectarray('search_status', $liststatus, $search_status, 1, 0, 0, '', 1);
+ print $form->selectarray('search_status', $liststatus, $search_status, 1, 0, 0, '', 1, 0, 0, '', 'onrightofpage');
print ' ';
}
// Fields of detail line
@@ -588,7 +589,7 @@ if (!empty($arrayfields['fd.duree']['checked'])) {
print ' ';
}
// Action column
-if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
print '';
$searchpicto = $form->showFilterButtons();
print $searchpicto;
@@ -602,6 +603,10 @@ $totalarray['nbfield'] = 0;
// Fields title label
// --------------------------------------------------------------------
print ' ';
+// Action column
+if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+ print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
+}
if (!empty($arrayfields['f.ref']['checked'])) {
print_liste_field_titre($arrayfields['f.ref']['label'], $_SERVER["PHP_SELF"], "f.ref", "", $param, '', $sortfield, $sortorder);
}
@@ -650,7 +655,11 @@ if (!empty($arrayfields['fd.date']['checked'])) {
if (!empty($arrayfields['fd.duree']['checked'])) {
print_liste_field_titre($arrayfields['fd.duree']['label'], $_SERVER["PHP_SELF"], "fd.duree", "", $param, '', $sortfield, $sortorder, 'right ');
}
-print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
+
+// Action column
+if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+ print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
+}
print " \n";
@@ -687,7 +696,18 @@ while ($i < $imaxinloop) {
$companystatic->status = $obj->thirdpartystatus;
print '';
-
+ // Action column
+ if (getDolGlobalString('MAIN_CHECKBOX_LEFT_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 ' ';
+ }
if (!empty($arrayfields['f.ref']['checked'])) {
print "";
@@ -848,7 +868,7 @@ while ($i < $imaxinloop) {
$totalarray['val']['fd.duree'] += $obj->duree;
}
// Action column
- if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+ if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_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;
diff --git a/htdocs/fourn/card.php b/htdocs/fourn/card.php
index 2c929aa40ba..f3260d8ea48 100644
--- a/htdocs/fourn/card.php
+++ b/htdocs/fourn/card.php
@@ -106,7 +106,7 @@ if (empty($reshook)) {
setEventMessages($object->error, $object->errors, 'errors');
}
}
- // terms of the settlement
+ // Set payment terms of the settlement
if ($action == 'setconditions' && $user->rights->societe->creer) {
$object->fetch($id);
$result = $object->setPaymentTerms(GETPOST('cond_reglement_supplier_id', 'int'));
@@ -114,7 +114,7 @@ if (empty($reshook)) {
dol_print_error($db, $object->error);
}
}
- // mode de reglement
+ // Payment mode
if ($action == 'setmode' && $user->rights->societe->creer) {
$object->fetch($id);
$result = $object->setPaymentMethods(GETPOST('mode_reglement_supplier_id', 'int'));
@@ -123,6 +123,15 @@ if (empty($reshook)) {
}
}
+ // Bank account
+ if ($action == 'setbankaccount' && $user->rights->societe->creer) {
+ $object->fetch($id);
+ $result = $object->setBankAccount(GETPOST('fk_account', 'int'));
+ if ($result < 0) {
+ setEventMessages($object->error, $object->errors, 'errors');
+ }
+ }
+
// update supplier order min amount
if ($action == 'setsupplier_order_min_amount') {
$object->fetch($id);
@@ -276,7 +285,7 @@ if ($object->id > 0) {
print " ";
print ' ';
- // Mode de reglement par defaut
+ // Default payment mode
print '';
print '';
print $langs->trans('PaymentMode');
@@ -294,6 +303,26 @@ if ($object->id > 0) {
print " ";
print '';
+ print '';
+ print ' ';
+ if ($action == 'editbankaccount') {
+ $form->formSelectAccount($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->fk_account, 'fk_account', 1);
+ } else {
+ $form->formSelectAccount($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->fk_account, 'none');
+ }
+ print " ";
+ print '';
print '';
diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index 3e58ceddfce..aed73da97ba 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -2138,7 +2138,7 @@ class CommandeFournisseur extends CommonOrder
}
if ($line->delete($notrigger) > 0) {
- $this->update_price();
+ $this->update_price(1);
return 1;
} else {
$this->error = $line->error;
@@ -2641,7 +2641,7 @@ class CommandeFournisseur extends CommonOrder
$sql .= ", ".price2num($comclient->lines[$i]->qty, 'MS').", ".price2num($comclient->lines[$i]->tva_tx, 5).", ".price2num($comclient->lines[$i]->localtax1_tx, 5).", ".price2num($comclient->lines[$i]->localtax2_tx, 5).", ".price2num($comclient->lines[$i]->remise_percent, 3);
$sql .= ", '".price2num($comclient->lines[$i]->subprice, 'MT')."','0', '".$this->db->escape($ref)."');";
if ($this->db->query($sql)) {
- $this->update_price();
+ $this->update_price(1);
}
}
@@ -2894,7 +2894,7 @@ class CommandeFournisseur extends CommonOrder
// Mise a jour info denormalisees au niveau facture
if ($result >= 0) {
- $this->update_price('', 'auto');
+ $this->update_price('1', 'auto');
$this->db->commit();
return $result;
} else {
diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index 3f7013fec34..2f607ad75cf 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -809,7 +809,7 @@ class FactureFournisseur extends CommonInvoice
// Update total price
- $result = $this->update_price();
+ $result = $this->update_price(1);
if ($result > 0) {
// Actions on extra fields
if (!$error) {
@@ -2425,7 +2425,7 @@ class FactureFournisseur extends CommonInvoice
$this->errors[] = $line->error;
} else {
// Update total price into invoice record
- $res = $this->update_price('', 'auto', 0, $this->thirdparty);
+ $res = $this->update_price('1', 'auto', 0, $this->thirdparty);
}
return $res;
@@ -2472,7 +2472,7 @@ class FactureFournisseur extends CommonInvoice
$this->db->rollback();
return -3;
} else {
- $res = $this->update_price();
+ $res = $this->update_price(1);
if ($res > 0) {
$this->db->commit();
diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index 5dbe81ca4a4..f559c31a89f 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -413,13 +413,13 @@ if (empty($reshook)) {
// Add a product line
if ($action == 'addline' && GETPOST('submitforalllines', 'aZ09') && GETPOST('vatforalllines', 'alpha') && $usercancreate) {
- // Define vat_rate
+ // Define new vat_rate for all lines
$vat_rate = (GETPOST('vatforalllines') ? GETPOST('vatforalllines') : 0);
$vat_rate = str_replace('*', '', $vat_rate);
$localtax1_rate = get_localtax($vat_rate, 1, $object->thirdparty, $mysoc);
$localtax2_rate = get_localtax($vat_rate, 2, $object->thirdparty, $mysoc);
foreach ($object->lines as $line) {
- $result = $object->updateline($line->id, $line->desc, $line->subprice, $line->qty, $line->remise_percent, $vat_rate, $localtax1_rate, $localtax2_rate, 'HT', $line->info_bits, $line->product_type, 0, $line->date_start, $line->date_end, $line->array_options, $line->fk_unit, $line->multicurrency_subprice);
+ $result = $object->updateline($line->id, $line->desc, $line->subprice, $line->qty, $line->remise_percent, $vat_rate, $localtax1_rate, $localtax2_rate, 'HT', $line->info_bits, $line->product_type, 0, $line->date_start, $line->date_end, $line->array_options, $line->fk_unit, $line->multicurrency_subprice, $line->ref_supplier);
}
} elseif ($action == 'addline' && $usercancreate) {
$db->begin();
@@ -1698,7 +1698,7 @@ if ($action == 'create') {
print $societe->getNomUrl(1, 'supplier');
print 'About us
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Team Members
-
-
-
-
-
-
-
-
Sophia
-
-
CEO & Founder
-
-
-
-
-
-
-
-
-
Benjamin W.
-
-
Restaurant Manager
-
-
-
-
-
-
-
-
Muchen Jack
-
-
Senior Chef
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/htdocs/install/doctemplates/websites/website_template-restaurant/containers/page172.tpl.php b/htdocs/install/doctemplates/websites/website_template-restaurant/containers/page172.tpl.php
deleted file mode 100644
index cf759e644a8..00000000000
--- a/htdocs/install/doctemplates/websites/website_template-restaurant/containers/page172.tpl.php
+++ /dev/null
@@ -1,597 +0,0 @@
-
-
-
-Our menus
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/htdocs/install/doctemplates/websites/website_template-restaurant/containers/page248.tpl.php b/htdocs/install/doctemplates/websites/website_template-restaurant/containers/page248.tpl.php
new file mode 100644
index 00000000000..9acf79aaec9
--- /dev/null
+++ b/htdocs/install/doctemplates/websites/website_template-restaurant/containers/page248.tpl.php
@@ -0,0 +1,113 @@
+
+
+
+About us
+
+
+
+
+
+
+
+
+
+
+
Team Members
+
+
+
+
+
+
+
+
Sophia
+
+
CEO & Founder
+
+
+
+
+
+
+
+
+
Benjamin W.
+
+
Restaurant Manager
+
+
+
+
+
+
+
+
Muchen Jack
+
+
Senior Chef
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/htdocs/install/doctemplates/websites/website_template-restaurant/containers/page170.tpl.php b/htdocs/install/doctemplates/websites/website_template-restaurant/containers/page249.tpl.php
similarity index 70%
rename from htdocs/install/doctemplates/websites/website_template-restaurant/containers/page170.tpl.php
rename to htdocs/install/doctemplates/websites/website_template-restaurant/containers/page249.tpl.php
index c444ce1292d..8742e231c27 100644
--- a/htdocs/install/doctemplates/websites/website_template-restaurant/containers/page170.tpl.php
+++ b/htdocs/install/doctemplates/websites/website_template-restaurant/containers/page249.tpl.php
@@ -18,8 +18,8 @@ ob_start();
__N__ __N__
__N__ __N____N__
__N__ __N__
__N__ __N__ Full Name__N____N__
__N____N__ __N__ Email Address__N____N__
__N____N__ __N__ Phone Number__N____N__
__N____N__ __N__ Number of persons__N____N__
__N____N__ __N__ Date__N____N__
__N____N__ __N__ Time__N____N__ __N__ __N__ 5:00 PM__N__ __N__ 6:00 PM __N__ 7:00 PM __N__ 8:00 PM __N__ 9:00 PM __N__ __N__
__N____N__ __N__ Special Request__N____N__ __N__
__N____N__ __N__ __N__ Submit Request__N__ __N__
__N__ __N__ __N____N__ __N__
__N____N__ __N__
__N__ name; ?> __N____N__ __N____N__ __N____N__ __N__ __N____N__ __N__ __N__ __N__
__N__
__N__
__N__
__N__ Delicious Steaks__N__ __N____N__
__N__ __N__ __N__ 4.7/5__N__ __N____N__ __N__ __N__ __N__ __N__ __N__
__N__ __N____N__
__N__ From 1,206+ Customer__N__ Reviews__N__
__N__
__N__
__N__
__N__
__N__ __N__
__N__
__N____N__
__N__
__N__ Fine Dining Restaurant__N__ __N__ __N__
__N____N__
__N__
__N____N__
__N__
__N__ Steak __N____N__ 26.50€ __N__ __N____N__
__N__ __N__ 3.8/5__N__ __N____N__ __N__ __N__ __N__ __N__ __N__ __N__
__N__ __N__
__N__
__N____N__
__N__
__N__ __N__ Sausage Pasta__N__ __N____N__ 18.25€ __N__ __N____N__
__N__ __N__ 4.2/5__N__ __N____N__ __N__ __N__ __N__ __N__ __N__ __N__
__N__ __N__ __N__ Previous __N__ __N____N__ __N__ __N__ Next __N__ __N__ __N__ __N__ __N__ __N____N__ __N__ __N__
__N____N__
__N__ __N____N__ __N__ __N____N__ __N____N__ __N__', '', 0);
-UPDATE llx_website SET fk_default_home = 3__+MAX_llx_website_page__ WHERE rowid = __WEBSITE_ID__;
--- File generated by Dolibarr 17.0.0-alpha -- 2022-10-08 18:18:50 UTC --;
--- Page ID 172 -> 4__+MAX_llx_website_page__ - Aliases menu --;
-INSERT INTO llx_website_page(rowid, fk_page, fk_website, pageurl, aliasalt, title, description, lang, image, keywords, status, date_creation, tms, import_key, grabbed_from, type_container, htmlheader, content, author_alias, allowed_in_frames) VALUES(4__+MAX_llx_website_page__, null, __WEBSITE_ID__, 'menu', '', 'Our menus', '', '', '', '', '1', '2022-08-16 14:37:03', '2022-10-08 19:23:06', null, '', 'page', '', '__N____N__ __N__ __N__
__N__ name; ?> __N____N__ __N____N__ __N__
__N__ __N__ Home __N__ __N____N__ __N__ About __N__ __N____N__ __N__ Menu __N__ __N__ __N__ Contact __N__ __N__ __N__
__N____N__ __N__ __N____N__ __N____N__ __N____N__ __N__ __N____N__ __N____N__ __N__', '', 0);
+-- File generated by Dolibarr 17.0.0-beta -- 2022-11-20 14:10:56 UTC --;
+-- Page ID 248 -> 1__+MAX_llx_website_page__ - Aliases about --;
+INSERT INTO llx_website_page(rowid, fk_page, fk_website, pageurl, aliasalt, title, description, lang, image, keywords, status, date_creation, tms, import_key, grabbed_from, type_container, htmlheader, content, author_alias, allowed_in_frames) VALUES(1__+MAX_llx_website_page__, null, __WEBSITE_ID__, 'about', '', 'About us', '', '', '', '', '1', '2022-08-09 16:40:13', '2022-11-20 14:15:19', null, '', 'page', '', '__N____N____N____N__ __N____N__ __N____N__ __N__ __N__
__N____N__
__N__
Team Members __N__ __N____N__
__N__
__N__
__N__ __N__
__N__
Sophia __N____N__
CEO & Founder
__N__
__N__
__N__
__N____N__
__N__
__N__
__N____N__
Benjamin W. __N____N__
Restaurant Manager
__N__
__N__
__N____N__
__N__
__N__
__N__ __N__
Muchen Jack __N____N__
Senior Chef
__N__
__N__
__N____N__
__N__
__N__ __N__ __N____N__ __N____N____N____N____N__', '', 0);
+-- File generated by Dolibarr 17.0.0-beta -- 2022-11-20 14:10:56 UTC --;
+-- Page ID 249 -> 2__+MAX_llx_website_page__ - Aliases contact --;
+INSERT INTO llx_website_page(rowid, fk_page, fk_website, pageurl, aliasalt, title, description, lang, image, keywords, status, date_creation, tms, import_key, grabbed_from, type_container, htmlheader, content, author_alias, allowed_in_frames) VALUES(2__+MAX_llx_website_page__, null, __WEBSITE_ID__, 'contact', '', 'Contact us', '', '', '', '', '1', '2022-08-16 14:40:51', '2022-11-20 14:50:10', null, '', 'page', '', '__N__email;__N__ $message = GETPOST(\'message\', \'alpha\');__N__ $cmail = new CMailFile(\'Contact from website\', $to, $from, $message);__N__ if ($cmail->sendfile()) {__N__ ?>__N__ __N__ trans(\"ErrorFailedToSendMail\", $from, $to).\'. \'.$cmail->error;__N__ }__N__}__N__?>__N____N____N____N____N____N__ __N__ __N____N__ __N____N____N__ __N__ __N__ __N__ __N__
__N__ __N____N__
__N__ __N__
__N__ __N__ Full Name__N____N__
__N____N__ __N__ Email Address__N____N__
__N____N__ __N__ Phone Number__N____N__
__N____N__ __N__ Number of persons__N____N__
__N____N__ __N__ Date__N____N__
__N____N__ __N__ Time__N____N__ __N__ __N__ 5:00 PM__N__ __N__ 6:00 PM __N__ 7:00 PM __N__ 8:00 PM __N__ 9:00 PM __N__ __N__
__N____N__ __N__ Special Request__N____N__ __N__
__N____N__ __N__ __N__ Submit Request__N__ __N__
__N__ __N__ __N____N__ __N__
__N____N____N____N____N__', '', 0);
+-- File generated by Dolibarr 17.0.0-beta -- 2022-11-20 14:10:56 UTC --;
+-- Page ID 252 -> 3__+MAX_llx_website_page__ - Aliases footer --;
+INSERT INTO llx_website_page(rowid, fk_page, fk_website, pageurl, aliasalt, title, description, lang, image, keywords, status, date_creation, tms, import_key, grabbed_from, type_container, htmlheader, content, author_alias, allowed_in_frames) VALUES(3__+MAX_llx_website_page__, null, __WEBSITE_ID__, 'footer', '', 'Footer', '', '', '', '', '1', '2022-11-20 12:51:50', '2022-11-20 14:07:39', null, '', 'other', '', '__N____N__', '', 0);
+-- File generated by Dolibarr 17.0.0-beta -- 2022-11-20 14:10:56 UTC --;
+-- Page ID 253 -> 4__+MAX_llx_website_page__ - Aliases header --;
+INSERT INTO llx_website_page(rowid, fk_page, fk_website, pageurl, aliasalt, title, description, lang, image, keywords, status, date_creation, tms, import_key, grabbed_from, type_container, htmlheader, content, author_alias, allowed_in_frames) VALUES(4__+MAX_llx_website_page__, null, __WEBSITE_ID__, 'header', '', 'Header', '', '', '', '', '1', '2022-11-20 13:12:33', '2022-11-20 14:21:25', null, '', 'menu', '', '__N____N__', '', 0);
+-- File generated by Dolibarr 17.0.0-beta -- 2022-11-20 14:10:56 UTC --;
+-- Page ID 250 -> 5__+MAX_llx_website_page__ - Aliases index --;
+INSERT INTO llx_website_page(rowid, fk_page, fk_website, pageurl, aliasalt, title, description, lang, image, keywords, status, date_creation, tms, import_key, grabbed_from, type_container, htmlheader, content, author_alias, allowed_in_frames) VALUES(5__+MAX_llx_website_page__, null, __WEBSITE_ID__, 'index', '', 'index', '', '', '', '', '1', '2022-08-09 16:34:54', '2022-11-20 15:10:45', null, '', 'page', '', '__N____N____N____N____N____N__ __N__ __N__ __N__
__N__
__N__
__N__
__N__ Delicious Steaks__N__ __N____N__
__N__
__N__ __N__ __N__ __N__ __N__ __N__
__N__ __N__
__N__
__N__
__N____N__
__N__
__N__ __N__
__N__
__N____N__
__N__
__N__ Fine Dining Restaurant__N__ __N__ __N__
__N____N__
__N__
__N____N__
__N__
__N__ Steak __N____N__ 26.50€ __N__ __N__
__N__
__N__
__N____N__
__N__
__N__ __N__ Sausage Pasta__N__ __N____N__ 18.25€ __N__ __N__
__N__
__N__ __N__ Previous __N__ __N____N__ __N__ __N__ Next __N__ __N__ __N__ __N__ __N__ __N____N__
__N__ __N____N__ __N__ __N____N__ __N____N____N____N__', '', 0);
+UPDATE llx_website SET fk_default_home = 5__+MAX_llx_website_page__ WHERE rowid = __WEBSITE_ID__;
+-- File generated by Dolibarr 17.0.0-beta -- 2022-11-20 14:10:56 UTC --;
+-- Page ID 251 -> 6__+MAX_llx_website_page__ - Aliases menu --;
+INSERT INTO llx_website_page(rowid, fk_page, fk_website, pageurl, aliasalt, title, description, lang, image, keywords, status, date_creation, tms, import_key, grabbed_from, type_container, htmlheader, content, author_alias, allowed_in_frames) VALUES(6__+MAX_llx_website_page__, null, __WEBSITE_ID__, 'menu', '', 'Our menus', '', '', '', '', '1', '2022-08-16 14:37:03', '2022-11-20 14:30:03', null, '', 'page', '', '__N____N____N____N____N____N__ __N__ __N____N__ __N____N__ __N____N__ __N__ __N____N__ __N____N____N____N__', '', 0);
-- For Dolibarr v14+ --;
UPDATE llx_website SET lang = 'en' WHERE rowid = __WEBSITE_ID__;
diff --git a/htdocs/install/mysql/data/llx_c_action_trigger.sql b/htdocs/install/mysql/data/llx_c_action_trigger.sql
index 83d4bb6e775..9aa28c116c8 100644
--- a/htdocs/install/mysql/data/llx_c_action_trigger.sql
+++ b/htdocs/install/mysql/data/llx_c_action_trigger.sql
@@ -119,9 +119,6 @@ insert into llx_c_action_trigger (code,label,description,elementtype,rang) value
insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('EXPENSE_REPORT_APPROVE','Expense report approved','Executed when an expense report is approved','expensereport',203);
insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('EXPENSE_REPORT_PAID','Expense report billed','Executed when an expense report is set as billed','expensereport',204);
insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('EXPENSE_REPORT_DELETE','Expense report deleted','Executed when an expense report is deleted','expensereport',205);
-insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('HOLIDAY_VALIDATE','Expense report validated','Executed when an expense report is validated','expensereport',211);
-insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('HOLIDAY_MODIFY','Expense report modified','Executed when an expense report is modified','expensereport',212);
-insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('HOLIDAY_APPROVE','Expense report approved','Executed when an expense report is approved','expensereport',212);
insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PROJECT_CREATE','Project creation','Executed when a project is created','project',140);
insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PROJECT_VALIDATE','Project validation','Executed when a project is validated','project',141);
insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PROJECT_MODIFY','Project modified','Executed when a project is modified','project',142);
@@ -172,7 +169,7 @@ insert into llx_c_action_trigger (code,label,description,elementtype,rang) value
insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('HOLIDAY_CREATE','Holiday created','Executed when a holiday is created','holiday',800);
insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('HOLIDAY_MODIFY','Holiday modified','Executed when a holiday is modified','holiday',801);
insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('HOLIDAY_VALIDATE','Holiday validated','Executed when a holiday is validated','holiday',802);
-insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('HOLIDAY_APPROVE','Holiday aprouved','Executed when a holiday is aprouved','holiday',803);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('HOLIDAY_APPROVE','Holiday approved','Executed when a holiday is aprouved','holiday',803);
insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('HOLIDAY_CANCEL','Holiday canceled','Executed when a holiday is canceled','holiday',802);
insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('HOLIDAY_DELETE','Holiday deleted','Executed when a holiday is deleted','holiday',804);
diff --git a/htdocs/install/mysql/data/llx_c_actioncomm.sql b/htdocs/install/mysql/data/llx_c_actioncomm.sql
index 38f09ba23d0..c244bcae2bd 100644
--- a/htdocs/install/mysql/data/llx_c_actioncomm.sql
+++ b/htdocs/install/mysql/data/llx_c_actioncomm.sql
@@ -21,7 +21,6 @@
-- You should have received a copy of the GNU General Public License
-- along with this program. If not, see '.$nbExtrafields.' ';
+ }
$head[$h][2] = 'extra';
$h++;
- /*$head[$h][0] = DOL_URL_ROOT.'/knowledgemanagement/admin/about.php';
- $head[$h][1] = $langs->trans("About");
- $head[$h][2] = 'about';
- $h++;*/
-
// Show more tabs from modules
// Entries must be declared in modules descriptor with line
//$this->tabs = array(
diff --git a/htdocs/langs/de_AT/ecm.lang b/htdocs/langs/de_AT/ecm.lang
index bfb47abf032..29ad990c4ca 100644
--- a/htdocs/langs/de_AT/ecm.lang
+++ b/htdocs/langs/de_AT/ecm.lang
@@ -2,4 +2,3 @@
ECMSectionsManual=Manuelle Verzeichnisse
ECMSectionsAuto=Automatische Verzeichnisse
ECMNbOfFilesInSubDir=Anzahl der Dateien im Unterverzeichnis
-ECMAreaDesc2=* Automatische Verzeichnisse werden automatisch befüllt, wenn Sie Dokumente von der Karte eines Elements erstellen. %s wurde gelöscht.
ECMSearchByKeywords=Suche nach Stichwörter
ECMSearchByEntity=Suche nach Objekt
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 911bb6b0b93..538309a6342 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -1250,6 +1250,7 @@ AreaForAdminOnly=Setup parameters can be set by administrator users only.
SystemInfoDesc=System information is miscellaneous technical information you get in read only mode and visible for administrators only.
SystemAreaForAdminOnly=This area is available to administrator users only. Dolibarr user permissions cannot change this restriction.
CompanyFundationDesc=Edit the information of your company/organization. Click on "%s" button at the bottom of the page when done.
+MoreNetworksAvailableWithModule=More social networks may be available by enabling the module "Social networks".
AccountantDesc=If you have an external accountant/bookkeeper, you can edit here its information.
AccountantFileNumber=Accountant code
DisplayDesc=Parameters affecting the look and presentation of the application can be modified here.
@@ -1881,7 +1882,7 @@ SuppliersInvoiceNumberingModel=Vendor invoices numbering models
IfSetToYesDontForgetPermission=If set to a non null value, don't forget to provide permissions to groups or users allowed for the second approval
##### GeoIPMaxmind #####
GeoIPMaxmindSetup=GeoIP Maxmind module setup
-PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.free demo version of the Maxmind GeoIP country file at %s.
YouCanDownloadAdvancedDatFileTo=You can also download a more complete version, with updates, of the Maxmind GeoIP country file at %s.
@@ -1932,6 +1933,7 @@ BackupDumpWizard=Wizard to build the database dump file
BackupZipWizard=Wizard to build the archive of documents directory
SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
SomethingMakeInstallFromWebNotPossible2=For this reason, process to upgrade described here is a manual process only a privileged user may perform.
+InstallModuleFromWebHasBeenDisabledContactUs=Install or development of external modules or dynamic websites, from the application, is currently locked for security purpose. Please contact us if you need to enable this feature.
InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application has been disabled by your administrator. You must ask him to remove the file %s to allow this feature.
ConfFileMustContainCustom=Installing or building an external module from application need to save the module files into directory %s . To have this directory processed by Dolibarr, you must setup your conf/conf.php to add the 2 directive lines:$dolibarr_main_url_root_alt='/custom'; $dolibarr_main_document_root_alt='%s/custom';
HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
@@ -2298,6 +2300,8 @@ IconOnly=Icon only - Text on tooltip only
INVOICE_ADD_ZATCA_QR_CODE=Show the ZATCA QR code on invoices
INVOICE_ADD_ZATCA_QR_CODEMore=Some Arabic countries need this QR Code on their invoices
INVOICE_ADD_SWISS_QR_CODE=Show the swiss QR-Bill code on invoices
+INVOICE_SHOW_SHIPPING_ADDRESS=Show shipping address
+INVOICE_SHOW_SHIPPING_ADDRESSMore=Compulsory mention for France
UrlSocialNetworksDesc=Url link of social network. Use {socialid} for the variable part that contains the social network ID.
IfThisCategoryIsChildOfAnother=If this category is a child of another one
DarkThemeMode=Dark theme mode
@@ -2317,7 +2321,7 @@ UsePassword=Use a password
UseOauth=Use a OAUTH token
Images=Images
MaxNumberOfImagesInGetPost=Max number of images allowed in a HTML field submitted in a form
-MaxNumberOfPostOnPublicPagesByIP=Max number of posts on public pages with the same IP address
+MaxNumberOfPostOnPublicPagesByIP=Max number of posts on public pages with the same IP address in a month
CIDLookupURL=The module brings an URL that can be used by an external tool to get the name of a thirdparty or contact from its phone number. URL to use is:
ScriptIsEmpty=The script is empty
ShowHideTheNRequests=Show/hide the %s SQL request(s)
@@ -2340,3 +2344,4 @@ DesktopsAndSmartphones=Desktops et smartphones
AllowOnlineSign=Allow online signing
AllowExternalDownload=Allow external download (without login, using a shared link)
DeadlineDayVATSubmission=Deadline day for vat submission on the next month
+MaxNumberOfAttachementOnForms=Max number of joinded files in form
diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang
index 2551f92af53..d7c29a82399 100644
--- a/htdocs/langs/en_US/bills.lang
+++ b/htdocs/langs/en_US/bills.lang
@@ -162,6 +162,7 @@ ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=This part or ano
ErrorInvoiceIsNotLastOfSameType=Error: The date of invoice %s is %s. It must be posterior or equal to last date for same type invoices (%s). Please change the invoice date.
BillFrom=From
BillTo=To
+ShippingTo=Shipping to
ActionsOnBill=Actions on invoice
RecurringInvoiceTemplate=Template / Recurring invoice
NoQualifiedRecurringInvoiceTemplateFound=No recurring template invoice qualified for generation.
diff --git a/htdocs/langs/en_US/compta.lang b/htdocs/langs/en_US/compta.lang
index 82ef7f0be9a..4b623231511 100644
--- a/htdocs/langs/en_US/compta.lang
+++ b/htdocs/langs/en_US/compta.lang
@@ -29,6 +29,8 @@ BalanceBefore=Balance (before)
Balance=Balance
Debit=Debit
Credit=Credit
+AccountingDebit=Debit
+AccountingCredit=Credit
Piece=Accounting Doc.
AmountHTVATRealReceived=Net collected
AmountHTVATRealPaid=Net paid
diff --git a/htdocs/langs/en_US/errors.lang b/htdocs/langs/en_US/errors.lang
index 860ae75e604..b3eeae4606b 100644
--- a/htdocs/langs/en_US/errors.lang
+++ b/htdocs/langs/en_US/errors.lang
@@ -97,7 +97,7 @@ ErrorWrongValueForField=Field %s : '%s ' does not match regex rule <
ErrorHtmlInjectionForField=Field %s : The value '%s ' contains a malicious data not allowed
ErrorFieldValueNotIn=Field %s : '%s ' is not a value found in field %s of %s
ErrorFieldRefNotIn=Field %s : '%s ' is not a %s existing ref
-ErrorMultipleRecordFoundFromRef=Several record found when searching from ref %s . No way to know which ID to use.
+ErrorMultipleRecordFoundFromRef=Several record found when searching from ref %s . No way to know which ID to use.
ErrorsOnXLines=%s errors found
ErrorFileIsInfectedWithAVirus=The antivirus program was not able to validate the file (file might be infected by a virus)
ErrorNumRefModel=A reference exists into database (%s) and is not compatible with this numbering rule. Remove record or renamed reference to activate this module.
@@ -244,11 +244,12 @@ ErrorObjectMustHaveStatusActiveToBeDisabled=Objects must have status 'Active' to
ErrorObjectMustHaveStatusDraftOrDisabledToBeActivated=Objects must have status 'Draft' or 'Disabled' to be enabled
ErrorNoFieldWithAttributeShowoncombobox=No fields has property 'showoncombobox' into definition of object '%s'. No way to show the combolist.
ErrorFieldRequiredForProduct=Field '%s' is required for product %s
+AlreadyTooMuchPostOnThisIPAdress=You have already posted too much on this IP address.
ProblemIsInSetupOfTerminal=Problem is in setup of terminal %s.
ErrorAddAtLeastOneLineFirst=Add at least one line first
ErrorRecordAlreadyInAccountingDeletionNotPossible=Error, record is already transferred in accounting, deletion is not possible.
ErrorLanguageMandatoryIfPageSetAsTranslationOfAnother=Error, language is mandatory if you set the page as a translation of another one.
-ErrorLanguageOfTranslatedPageIsSameThanThisPage=Error, language of translated page is same than this one.
+ErrorLanguageOfTranslatedPageIsSameThanThisPage=Error, language of translated page is same than this one.
ErrorBatchNoFoundForProductInWarehouse=No lot/serial found for product "%s" in warehouse "%s".
ErrorBatchNoFoundEnoughQuantityForProductInWarehouse=No enough quantity for this lot/serial for product "%s" in warehouse "%s".
ErrorOnlyOneFieldForGroupByIsPossible=Only 1 field for the 'Group by' is possible (others are discarded)
@@ -279,13 +280,13 @@ 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
-ErrorRequestTooLarge=Error, request too large
-ErrorNotApproverForHoliday=You are not the approver for leave %s
+ErrorBadCharIntoLoginName=Unauthorized character in the field %s
+ErrorRequestTooLarge=Error, request too large or session expired
+ErrorNotApproverForHoliday=You are not the approver for leave %s
ErrorAttributeIsUsedIntoProduct=This attribute is used in one or more product variants
ErrorAttributeValueIsUsedIntoProduct=This attribute value is used in one or more product variants
ErrorPaymentInBothCurrency=Error, all amounts must be entered in the same column
-ErrorYouTryToPayInvoicesInACurrencyFromBankWithAnotherCurrency=You try to pay invoices in the currency %s from an account with the currency %s
+ErrorYouTryToPayInvoicesInACurrencyFromBankWithAnotherCurrency=You try to pay invoices in the currency %s from an account with the currency %s
ErrorInvoiceLoadThirdParty=Can't load third-party object for invoice "%s"
ErrorInvoiceLoadThirdPartyKey=Third-party key "%s" no set for invoice "%s"
ErrorDeleteLineNotAllowedByObjectStatus=Delete line is not allowed by current object status
@@ -294,13 +295,14 @@ ErrorThirpdartyOrMemberidIsMandatory=Third party or Member of partnership is man
ErrorFailedToWriteInTempDirectory=Failed to write in temp directory
ErrorQuantityIsLimitedTo=Quantity is limited to %s
ErrorFailedToLoadThirdParty=Failed to find/load thirdparty from id=%s, email=%s, name=%s
-ErrorThisPaymentModeIsNotSepa=This payment mode is not a bank account
+ErrorThisPaymentModeIsNotSepa=This payment mode is not a bank account
ErrorStripeCustomerNotFoundCreateFirst=Stripe customer is not set for this thirdparty (or set to a value deleted on Stripe side). Create (or re-attach) it first.
-ErrorCharPlusNotSupportedByImapForSearch=IMAP search is not able to search into sender or recipient for a string containing the character +
+ErrorCharPlusNotSupportedByImapForSearch=IMAP search is not able to search into sender or recipient for a string containing the character +
ErrorTableNotFound=Table %s not found
ErrorValueForTooLow=Value for %s is too low
ErrorValueCantBeNull=Value for %s can't be null
ErrorDateOfMovementLowerThanDateOfFileTransmission=The date of the bank transaction can't be lower than the date of the file transmission
+ErrorTooMuchFileInForm=Too much files in form, the maximum number is %s file(s)
# Warnings
WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
@@ -314,7 +316,7 @@ WarningConfFileMustBeReadOnly=Warning, your config file (htdocs/conf/conf.php
WarningsOnXLines=Warnings on %s source record(s)
WarningNoDocumentModelActivated=No model, for document generation, has been activated. A model will be chosen by default until you check your module setup.
WarningLockFileDoesNotExists=Warning, once setup is finished, you must disable the installation/migration tools by adding a file install.lock into directory %s . Omitting the creation of this file is a grave security risk.
-WarningUntilDirRemoved=All security warnings (visible by admin users only) will remain active as long as the vulnerability is present (or that constant MAIN_REMOVE_INSTALL_WARNING is added in Setup->Other Setup).
+WarningUntilDirRemoved=This security warning will remain active as long as the vulnerability is present.
WarningCloseAlways=Warning, closing is done even if amount differs between source and target elements. Enable this feature with caution.
WarningUsingThisBoxSlowDown=Warning, using this box slow down seriously all pages showing the box.
WarningClickToDialUserSetupNotComplete=Setup of ClickToDial information for your user are not complete (see tab ClickToDial onto your user card).
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index 2b86c2d3e65..87b4f8f3036 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -206,6 +206,7 @@ Valid=Valid
Approve=Approve
Disapprove=Disapprove
ReOpen=Re-Open
+OpenVerb=Open
Upload=Upload
ToLink=Link
Select=Select
@@ -488,6 +489,7 @@ ActionsOnContact=Events for this contact/address
ActionsOnContract=Events for this contract
ActionsOnMember=Events about this member
ActionsOnProduct=Events about this product
+ActionsOnAsset=Events for this fixed asset
NActionsLate=%s late
ToDo=To do
Completed=Completed
diff --git a/htdocs/langs/en_US/mrp.lang b/htdocs/langs/en_US/mrp.lang
index 82196b584bd..442c5c92b1c 100644
--- a/htdocs/langs/en_US/mrp.lang
+++ b/htdocs/langs/en_US/mrp.lang
@@ -27,6 +27,7 @@ ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of materials
ConfirmCloneMo=Are you sure you want to clone the Manufacturing Order %s ?
ManufacturingEfficiency=Manufacturing efficiency
ConsumptionEfficiency=Consumption efficiency
+Consumption=Consumption
ValueOfMeansLoss=Value of 0.95 means an average of 5%% of loss during the manufacturing or the disassembly
ValueOfMeansLossForProductProduced=Value of 0.95 means an average of 5%% of loss of produced product
DeleteBillOfMaterials=Delete Bill Of Materials
diff --git a/htdocs/langs/en_US/projects.lang b/htdocs/langs/en_US/projects.lang
index b6001b2b27b..2407d4b2d86 100644
--- a/htdocs/langs/en_US/projects.lang
+++ b/htdocs/langs/en_US/projects.lang
@@ -23,6 +23,7 @@ TasksPublicDesc=This view presents all projects and tasks you are allowed to rea
TasksDesc=This view presents all projects and tasks (your user permissions grant you permission to view everything).
AllTaskVisibleButEditIfYouAreAssigned=All tasks for qualified projects are visible, but you can enter time only for task assigned to selected user. Assign task if you need to enter time on it.
OnlyYourTaskAreVisible=Only tasks assigned to you are visible. If you need to enter time on a task and if the task is not visible here, then you need to assign the task to yourself.
+ImportDatasetProjects=Projects or opportunities
ImportDatasetTasks=Tasks of projects
ProjectCategories=Project tags/categories
NewProject=New project
@@ -240,7 +241,7 @@ OppStatusPENDING=Pending
OppStatusWON=Won
OppStatusLOST=Lost
Budget=Budget
-AllowToLinkFromOtherCompany=Allow to link project from other companySupported values: Supported values: %s .
diff --git a/htdocs/langs/en_US/receptions.lang b/htdocs/langs/en_US/receptions.lang
index 5b51f5ba071..7324f14f2e0 100644
--- a/htdocs/langs/en_US/receptions.lang
+++ b/htdocs/langs/en_US/receptions.lang
@@ -32,6 +32,7 @@ StatusReceptionDraftShort=Draft
StatusReceptionValidatedShort=Validated
StatusReceptionProcessedShort=Processed
ReceptionSheet=Reception sheet
+ValidateReception=Validate reception
ConfirmDeleteReception=Are you sure you want to delete this reception?
ConfirmValidateReception=Are you sure you want to validate this reception with reference %s ?
ConfirmCancelReception=Are you sure you want to cancel this reception?
diff --git a/htdocs/langs/en_US/users.lang b/htdocs/langs/en_US/users.lang
index 3f2c7f5f53a..757e9f1dedf 100644
--- a/htdocs/langs/en_US/users.lang
+++ b/htdocs/langs/en_US/users.lang
@@ -127,3 +127,5 @@ DateLastLogin=Date last login
DatePreviousLogin=Date previous login
IPLastLogin=IP last login
IPPreviousLogin=IP previous login
+ShowAllPerms=Show all permission rows
+HideAllPerms=Hide all permission rows
diff --git a/htdocs/langs/en_US/website.lang b/htdocs/langs/en_US/website.lang
index 874cdc76f28..742e3afff67 100644
--- a/htdocs/langs/en_US/website.lang
+++ b/htdocs/langs/en_US/website.lang
@@ -153,3 +153,5 @@ PreviousContainer=Previous page/container
WebsiteMustBeDisabled=The website must have the status "%s"
WebpageMustBeDisabled=The web page must have the status "%s"
SetWebsiteOnlineBefore=When website is offline, all pages are offline. Change status of website first.
+Booking=Booking
+Reservation=Reservation
diff --git a/htdocs/langs/es_AR/ecm.lang b/htdocs/langs/es_AR/ecm.lang
index a668d35a6b8..099dbdbaf6f 100644
--- a/htdocs/langs/es_AR/ecm.lang
+++ b/htdocs/langs/es_AR/ecm.lang
@@ -15,7 +15,6 @@ ECMNbOfSubDir=Cantidad de sub-carpetas
ECMNbOfFilesInSubDir=Cantidad de archivos en sub-carpetas
ECMArea=Area SAD/ACE
ECMAreaDesc=El área de SAD/ACE (Sistema de Administración de Documentos / Administración de Contenido Electrónico) te permite guardar, compartir y rápidamente buscar todo tipo de documentos en Dolibarr.
-ECMAreaDesc2=* Las carpetas automáticas son llenadas automáticamente al agregar documentos desde la ficha de un elemento. %s ha sido eliminada.
ECMSectionWasCreated=Carpeta %s ha sido creada.
ECMSearchByKeywords=Búsqueda por palabras clave
diff --git a/htdocs/langs/es_CL/ecm.lang b/htdocs/langs/es_CL/ecm.lang
index c8bda73008d..462663342bc 100644
--- a/htdocs/langs/es_CL/ecm.lang
+++ b/htdocs/langs/es_CL/ecm.lang
@@ -6,7 +6,6 @@ ECMNbOfSubDir=Cantidad de subdirectorios
ECMNbOfFilesInSubDir=Número de archivos en subdirectorios
ECMArea=Área de DMS / ECM
ECMAreaDesc=El área DMS / ECM (Sistema de gestión de documentos / gestión de contenido electrónico) le permite guardar, compartir y buscar rápidamente todo tipo de documentos en Dolibarr.
-ECMAreaDesc2=* Los directorios automáticos se rellenan automáticamente al agregar documentos desde la tarjeta de un elemento. %s ha sido borrado.
ECMSectionWasCreated=El directorio %s ha sido creado.
ECMNoDirectoryYet=Sin directorio creado
diff --git a/htdocs/langs/es_CL/ticket.lang b/htdocs/langs/es_CL/ticket.lang
index 5a4f2f39b72..3cec391874a 100644
--- a/htdocs/langs/es_CL/ticket.lang
+++ b/htdocs/langs/es_CL/ticket.lang
@@ -60,7 +60,6 @@ TicketAssigned=Ticket ahora está asignado
TicketChangeCategory=Cambiar código analítico
TicketChangeSeverity=Cambiar severidad
TicketAddMessage=Añade un mensaje
-AddMessage=Añade un mensaje
MessageSuccessfullyAdded=Ticket agregado
TicketMessageSuccessfullyAdded=Mensaje agregado con éxito
TicketMessagesList=Lista de mensajes
diff --git a/htdocs/langs/es_CO/admin.lang b/htdocs/langs/es_CO/admin.lang
index af4d57d1984..4ca8b5f0aa3 100644
--- a/htdocs/langs/es_CO/admin.lang
+++ b/htdocs/langs/es_CO/admin.lang
@@ -1307,7 +1307,6 @@ ActivateFCKeditor=Activar editor avanzado para:
FCKeditorForNotePublic=Creación / edición WYSIWIG del campo "notas públicas" de elementos
FCKeditorForNotePrivate=Creación / edición WYSIWIG del campo "notas privadas" de elementos
FCKeditorForCompany=Creación / edición WYSIWIG de la descripción de campo de elementos (excepto productos / servicios)
-FCKeditorForProduct=Creación / edición WYSIWIG de la descripción de campo de productos / servicios
FCKeditorForProductDetails=WYSIWIG creación / edición de líneas de detalle de productos para todas las entidades (propuestas, pedidos, facturas, etc ...). Advertencia: El uso de esta opción para este caso no se recomienda seriamente, ya que puede crear problemas con caracteres especiales y formato de página al crear archivos PDF.
FCKeditorForMailing=Creación / edición WYSIWIG para eMailings masivos (Herramientas-> eMailing)
FCKeditorForUserSignature=Creación / edición WYSIWIG de la firma del usuario.
diff --git a/htdocs/langs/es_CO/ecm.lang b/htdocs/langs/es_CO/ecm.lang
index 8e5fb615fc0..27f9ce5dd7b 100644
--- a/htdocs/langs/es_CO/ecm.lang
+++ b/htdocs/langs/es_CO/ecm.lang
@@ -6,7 +6,6 @@ ECMCreationDate=Fecha de creación
ECMNbOfFilesInSubDir=Número de archivos en subdirectorios
ECMArea=Área DMS / ECM
ECMAreaDesc=El área DMS / ECM (Document Management System / Electronic Content Management) permite guardar, compartir y buscar rápidamente todo tipo de documentos en Dolibarr.
-ECMAreaDesc2=* Los directorios automáticos se llenan automáticamente al agregar documentos desde la tarjeta de un elemento. %s ha sido eliminado.
ECMSectionWasCreated=Se ha creado el directorio %s .
ECMNoDirectoryYet=No se creó ningún directorio
diff --git a/htdocs/langs/es_CO/ticket.lang b/htdocs/langs/es_CO/ticket.lang
index 3f6313f135e..ea3d8b55ff9 100644
--- a/htdocs/langs/es_CO/ticket.lang
+++ b/htdocs/langs/es_CO/ticket.lang
@@ -77,7 +77,6 @@ TicketChangeType=Tipo de cambio
TicketChangeCategory=Cambiar el código analítico
TicketChangeSeverity=Cambiar la gravedad
TicketAddMessage=Añade un mensaje
-AddMessage=Añade un mensaje
MessageSuccessfullyAdded=Ticket agregado
TicketMessageSuccessfullyAdded=Mensaje agregado exitosamente
TicketMessagesList=Lista de mensajes
diff --git a/htdocs/langs/es_CO/workflow.lang b/htdocs/langs/es_CO/workflow.lang
index 326b17aadd9..aee62bbc20c 100644
--- a/htdocs/langs/es_CO/workflow.lang
+++ b/htdocs/langs/es_CO/workflow.lang
@@ -14,5 +14,4 @@ descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Clasifique el pedido de ventas de o
descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING_CLOSED=Clasifique el pedido de venta de origen vinculado como enviado cuando se cierra un envío (y si la cantidad enviada por todos los envíos es la misma que en el pedido para actualizar)
descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Clasifique la propuesta del proveedor de origen vinculado como facturada cuando se valida la factura del proveedor (y si el monto de la factura es el mismo que el monto total de la propuesta vinculada)
descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Clasifique el pedido de compra de origen vinculado como facturado cuando se valida la factura del proveedor (y si el monto de la factura es el mismo que el monto total del pedido vinculado)
-descWORKFLOW_BILL_ON_RECEPTION=Clasifique las recepciones como "facturadas" cuando un pedido de proveedor vinculado is validado
descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=Clasifique el envío de origen vinculado como cerrado cuando se valida la factura del cliente
diff --git a/htdocs/langs/es_EC/ecm.lang b/htdocs/langs/es_EC/ecm.lang
index 7f8d9157910..0fea60981c8 100644
--- a/htdocs/langs/es_EC/ecm.lang
+++ b/htdocs/langs/es_EC/ecm.lang
@@ -5,7 +5,6 @@ ECMCreationDate=Fecha de creación
ECMNbOfFilesInSubDir=Número de archivos en subdirectorios
ECMArea=Área de DMS/ECM
ECMAreaDesc=El área SGD/GCE (Sistema de Gestión de Documentos / Gestión de Contenido Electrónico) le permite guardar, compartir y buscar rápidamente todo tipo de documentos en Dolibarr.
-ECMAreaDesc2=* Los directorios automáticos se rellenan automáticamente al agregar documentos desde la tarjeta de un elemento. %s .
ECMSectionWasCreated=Directorio %s ha sido creado.
ECMSearchByKeywords=Búsqueda por palabras clave
diff --git a/htdocs/langs/es_EC/ticket.lang b/htdocs/langs/es_EC/ticket.lang
index 29b388752e1..1580632c9ad 100644
--- a/htdocs/langs/es_EC/ticket.lang
+++ b/htdocs/langs/es_EC/ticket.lang
@@ -53,7 +53,6 @@ TicketAssigned=Ticket ahora está asignado
TicketChangeCategory=Cambiar código analítico
TicketChangeSeverity=Cambiar severidad
TicketAddMessage=Añade un mensaje
-AddMessage=Añade un mensaje
MessageSuccessfullyAdded=Ticket agregado
TicketMessageSuccessfullyAdded=Mensaje agregado con éxito
TicketMessagesList=Lista de mensajes
diff --git a/htdocs/langs/es_US/admin.lang b/htdocs/langs/es_US/admin.lang
index f59ee2569c5..c5ab56cb8d8 100644
--- a/htdocs/langs/es_US/admin.lang
+++ b/htdocs/langs/es_US/admin.lang
@@ -3,4 +3,3 @@ OperationParamDesc=Define the rules to use to extract or set values.%s a été supprimé.
ECMSectionOfDocuments=Répertoires de documents
ShowECMSection=Afficher le répertoire
diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang
index 69f077d628f..79a266df816 100644
--- a/htdocs/langs/fr_FR/admin.lang
+++ b/htdocs/langs/fr_FR/admin.lang
@@ -2189,6 +2189,7 @@ ShowProjectLabel=Libellé du projet
PDF_INCLUDE_ALIAS_IN_THIRDPARTY_NAME=Inclure un alias dans le nom du tiers
THIRDPARTY_ALIAS=Nom du tiers - Alias du tiers
ALIAS_THIRDPARTY=Alias du tiers - Nom du tiers
+MAIN_USE_COMPANY_NAME_OF_CONTACT=Use company name of contact
PDF_USE_ALSO_LANGUAGE_CODE=Si vous souhaitez que certains textes de votre PDF soient dupliqués dans 2 langues différentes dans le même PDF généré, vous devez définir ici cette deuxième langue pour que le PDF généré contienne 2 langues différentes dans la même page, celle choisie lors de la génération du PDF et celle-ci (seuls quelques modèles PDF prennent en charge cette fonction). Gardez vide pour 1 langue par PDF.
PDF_USE_A=Générer document PDF avec le format PDF/A à la place du format PDF standard
FafaIconSocialNetworksDesc=Entrez ici le code d'une icône FontAwesome. Si vous ne savez pas ce qu'est FontAwesome, vous pouvez utiliser la valeur générique fa-address-book.
@@ -2314,7 +2315,7 @@ UseOauth=Utiliser un token OAUTH
Images=Images
Posts=publications
MaxNumberOfImagesInGetPost=Nombre maximum d'images autorisées dans un champ HTML soumis dans un formulaire
-MaxNumberOfPostOnPublicPagesByIP=Nombre maximum de publications sur des pages publiques avec une adresse IP
+MaxNumberOfPostOnPublicPagesByIP=Nombre maximum de publications par mois sur des pages publiques avec une adresse IP
CIDLookupURL=Le module apporte une URL qui peut être utilisée par un outil externe pour obtenir le nom d'un tiers ou d'un contact à partir de son numéro de téléphone. L'URL à utiliser est :
ScriptIsEmpty=Le script est manquant
ShowHideTheNRequests=Afficher/Cacher les %s requête(s) SQL.
diff --git a/htdocs/langs/fr_FR/main.lang b/htdocs/langs/fr_FR/main.lang
index eb787cb279d..211c841ee4e 100644
--- a/htdocs/langs/fr_FR/main.lang
+++ b/htdocs/langs/fr_FR/main.lang
@@ -45,6 +45,7 @@ NoError=Aucune erreur
Error=Erreur
Errors=Erreurs
ErrorFieldRequired=Le champ '%s' est obligatoire
+AlreadyTooMuchPostOnThisIPAdress=Vous avez déjà posté trop de messages depuis cette adresse IP.
ErrorFieldFormat=Le champ '%s' a une valeur incorrecte
ErrorFileDoesNotExists=Le fichier %s n'existe pas
ErrorFailedToOpenFile=Impossible d'ouvrir le fichier %s
@@ -1206,3 +1207,4 @@ CreatedByPublicPortal=Créé à partir du portail public
UserAgent=User Agent
InternalUser=Utilisateur interne
ExternalUser=Utilisateur externe
+WarningUserDifferentContactSocid=Contact non relié à un tiers. Le tiers ne sera pas enregistré.
diff --git a/htdocs/langs/nl_BE/ticket.lang b/htdocs/langs/nl_BE/ticket.lang
index 30a0241a7d4..3d1419278be 100644
--- a/htdocs/langs/nl_BE/ticket.lang
+++ b/htdocs/langs/nl_BE/ticket.lang
@@ -57,7 +57,6 @@ MarkAsRead=Markeer ticket als gelezen
TicketHistory=Ticket geschiedenis
TicketChangeType=Van type veranderen
TicketAddMessage=Voeg een bericht toe
-AddMessage=Voeg een bericht toe
TicketMessageSuccessfullyAdded=Bericht is succesvol toegevoegd
NoMsgForThisTicket=Geen bericht voor dit ticket
TicketSeverity=Strengheid
diff --git a/htdocs/langs/pt_BR/admin.lang b/htdocs/langs/pt_BR/admin.lang
index 80684c463d4..837113cb418 100644
--- a/htdocs/langs/pt_BR/admin.lang
+++ b/htdocs/langs/pt_BR/admin.lang
@@ -1333,7 +1333,6 @@ ActivateFCKeditor=Editor avançado ativo por:
FCKeditorForNotePublic=Usar editor WYSIWIG nos campos de "notas públicas" dos elementos
FCKeditorForNotePrivate=Usar editor WYSIWIG nos campos de "notas privadas" dos elementos
FCKeditorForCompany=Usar editor WYSIWIG nos campos de descrição dos elementos (exceto produtos/serviços)
-FCKeditorForProduct=Usar editor WYSIWIG nos campos de descrição de produtos/serviços
FCKeditorForProductDetails=Criação / edição WYSIWIG de linhas de detalhes de produtos para todas as entidades (propostas, encomendas, facturas, etc ...). Aviso: O uso desta opção neste caso não é recomendado, pois pode criar problemas com caracteres especiais e formatação de página ao construir arquivos PDF.
FCKeditorForMailing=Criação/edição do WYSIWIG nos E-Mails massivos (ferramentas->emailing)
FCKeditorForUserSignature=criação/edição do WYSIWIG nas assinaturas de usuários
diff --git a/htdocs/langs/pt_BR/ecm.lang b/htdocs/langs/pt_BR/ecm.lang
index 3c7bb7eddf3..1b5ed3fa5cb 100644
--- a/htdocs/langs/pt_BR/ecm.lang
+++ b/htdocs/langs/pt_BR/ecm.lang
@@ -12,7 +12,6 @@ ECMNbOfFilesInSubDir=Numero de arquivos nos subpastas
ECMCreationUser=Criado por
ECMArea=Área DMS / ECM
ECMAreaDesc=A área DMS / ECM (Gerenciamento de documentos / Gerenciamento de conteúdo eletrônico) permite salvar, compartilhar e pesquisar rapidamente todos os tipos de documentos no Dolibarr.
-ECMAreaDesc2=* As pastas automáticas são geradas automaticamente quando algum arquivo é adicionado a algum ficheiro do sistema.%s foi eliminada
ECMSearchByKeywords=Busca usando palavras chave
ECMSearchByEntity=Busca por objeto
diff --git a/htdocs/langs/pt_BR/ticket.lang b/htdocs/langs/pt_BR/ticket.lang
index df070b1eced..09f8001f5b1 100644
--- a/htdocs/langs/pt_BR/ticket.lang
+++ b/htdocs/langs/pt_BR/ticket.lang
@@ -76,7 +76,6 @@ TicketHistory=Histórico de bilhetes
TicketChangeCategory=Modifica o código analítico
TicketChangeSeverity=Alterar gravidade
TicketAddMessage=Adiciona uma mensagem
-AddMessage=Adiciona uma mensagem
MessageSuccessfullyAdded=Bilhete adicionado
NoMsgForThisTicket=Nenhuma mensagem para este bilhete
TicketProperties=Classificação
diff --git a/htdocs/langs/pt_MZ/admin.lang b/htdocs/langs/pt_MZ/admin.lang
index f499ad97ebf..961304d0627 100644
--- a/htdocs/langs/pt_MZ/admin.lang
+++ b/htdocs/langs/pt_MZ/admin.lang
@@ -1329,7 +1329,6 @@ ActivateFCKeditor=Editor avançado ativo por:
FCKeditorForNotePublic=Usar editor WYSIWIG nos campos de "notas públicas" dos elementos
FCKeditorForNotePrivate=Usar editor WYSIWIG nos campos de "notas privadas" dos elementos
FCKeditorForCompany=Usar editor WYSIWIG nos campos de descrição dos elementos (exceto produtos/serviços)
-FCKeditorForProduct=Usar editor WYSIWIG nos campos de descrição de produtos/serviços
FCKeditorForProductDetails=Criação / edição WYSIWIG de linhas de detalhes de produtos para todas as entidades (propostas, encomendas, facturas, etc ...). Aviso: O uso desta opção neste caso não é recomendado, pois pode criar problemas com caracteres especiais e formatação de página ao construir arquivos PDF.
FCKeditorForMailing=Criação/edição do WYSIWIG nos E-Mails massivos (ferramentas->emailing)
FCKeditorForUserSignature=criação/edição do WYSIWIG nas assinaturas de usuários
diff --git a/htdocs/langs/pt_MZ/ecm.lang b/htdocs/langs/pt_MZ/ecm.lang
index 3c7bb7eddf3..1b5ed3fa5cb 100644
--- a/htdocs/langs/pt_MZ/ecm.lang
+++ b/htdocs/langs/pt_MZ/ecm.lang
@@ -12,7 +12,6 @@ ECMNbOfFilesInSubDir=Numero de arquivos nos subpastas
ECMCreationUser=Criado por
ECMArea=Área DMS / ECM
ECMAreaDesc=A área DMS / ECM (Gerenciamento de documentos / Gerenciamento de conteúdo eletrônico) permite salvar, compartilhar e pesquisar rapidamente todos os tipos de documentos no Dolibarr.
-ECMAreaDesc2=* As pastas automáticas são geradas automaticamente quando algum arquivo é adicionado a algum ficheiro do sistema.%s foi eliminada
ECMSearchByKeywords=Busca usando palavras chave
ECMSearchByEntity=Busca por objeto
diff --git a/htdocs/loan/class/loan.class.php b/htdocs/loan/class/loan.class.php
index 81a00904794..1c6913035e8 100644
--- a/htdocs/loan/class/loan.class.php
+++ b/htdocs/loan/class/loan.class.php
@@ -104,6 +104,10 @@ class Loan extends CommonObject
*/
public $fk_project;
+ /**
+ * @var int totalpaid
+ */
+ public $totalpaid;
const STATUS_UNPAID = 0;
const STATUS_PAID = 1;
diff --git a/htdocs/loan/info.php b/htdocs/loan/info.php
index 49618d0f46c..188a61c61e6 100644
--- a/htdocs/loan/info.php
+++ b/htdocs/loan/info.php
@@ -102,8 +102,6 @@ $morehtmlref .= '';
$linkback = ''.$langs->trans("BackToList").' ';
-$object->totalpaid = $totalpaid; // To give a chance to dol_banner_tab to use already paid amount to show correct status
-
dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref, '', 0, '', $morehtmlright);
print '';
diff --git a/htdocs/loan/list.php b/htdocs/loan/list.php
index 146c0521a61..1324876a98c 100644
--- a/htdocs/loan/list.php
+++ b/htdocs/loan/list.php
@@ -107,8 +107,13 @@ $title = $langs->trans('Loans');
$sql = "SELECT l.rowid, l.label, l.capital, l.datestart, l.dateend, l.paid,";
$sql .= " SUM(pl.amount_capital) as alreadypaid";
-$sql .= " FROM ".MAIN_DB_PREFIX."loan as l LEFT JOIN ".MAIN_DB_PREFIX."payment_loan AS pl";
-$sql .= " ON l.rowid = pl.fk_loan";
+
+$sqlfields = $sql; // $sql fields to remove for count total
+
+$sql .= " FROM ".MAIN_DB_PREFIX."loan as l";
+$linktopl = " LEFT JOIN ".MAIN_DB_PREFIX."payment_loan AS pl ON l.rowid = pl.fk_loan";
+$sql .= $linktopl;
+
$sql .= " WHERE l.entity = ".$conf->entity;
if ($search_amount) {
$sql .= natural_search("l.capital", $search_amount, 1);
@@ -120,36 +125,43 @@ if ($search_label) {
$sql .= natural_search("l.label", $search_label);
}
$sql .= " GROUP BY l.rowid, l.label, l.capital, l.paid, l.datestart, l.dateend";
-$sql .= $db->order($sortfield, $sortorder);
// Count total nb of records
$nbtotalofrecords = '';
if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
- $resql = $db->query($sql);
- $nbtotalofrecords = $db->num_rows($resql);
- if (($page * $limit) > $nbtotalofrecords) { // if total of record found is smaller than page * limit, goto and load page 0
+ /* The fast and low memory method to get and count full list converts the sql into a sql count */
+ $sqlforcount = preg_replace('/^'.preg_quote($sqlfields, '/').'/', 'SELECT COUNT(*) as nbtotalofrecords', $sql);
+ $sqlforcount = preg_replace('/'.preg_quote($linktopl, '/').'/', '', $sqlforcount);
+ $sqlforcount = preg_replace('/GROUP BY .*$/', '', $sqlforcount);
+ $resql = $db->query($sqlforcount);
+ if ($resql) {
+ $objforcount = $db->fetch_object($resql);
+ $nbtotalofrecords = $objforcount->nbtotalofrecords;
+ } else {
+ dol_print_error($db);
+ }
+
+ if (($page * $limit) > $nbtotalofrecords) { // if total resultset is smaller then paging size (filtering), goto and load page 0
$page = 0;
$offset = 0;
}
+ $db->free($resql);
}
-// if total of record found is smaller than limit, no need to do paging and to restart another select with limits set.
-if (is_numeric($nbtotalofrecords) && ($limit > $nbtotalofrecords || empty($limit))) {
- $num = $nbtotalofrecords;
-} else {
- if ($limit) {
- $sql .= $db->plimit($limit + 1, $offset);
- }
-
- $resql = $db->query($sql);
- if (!$resql) {
- dol_print_error($db);
- exit;
- }
-
- $num = $db->num_rows($resql);
+// Complete request and execute it with limit
+$sql .= $db->order($sortfield, $sortorder);
+if ($limit) {
+ $sql .= $db->plimit($limit + 1, $offset);
}
+$resql = $db->query($sql);
+if (!$resql) {
+ dol_print_error($db);
+ exit;
+}
+
+$num = $db->num_rows($resql);
+
// Output page
// --------------------------------------------------------------------
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 32d442008eb..eed0450e49f 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -80,7 +80,7 @@ function realCharForNumericEntities($matches)
* Warning: Such a protection can't be enough. It is not reliable as it will always be possible to bypass this. Good protection can
* only be guaranted by escaping data during output.
*
- * @param string $val Brut value found into $_GET, $_POST or PHP_SELF
+ * @param string $val Brute value found into $_GET, $_POST or PHP_SELF
* @param string $type 0=POST, 1=GET, 2=PHP_SELF, 3=GET without sql reserved keywords (the less tolerant test)
* @return int >0 if there is an injection, 0 if none
*/
@@ -89,18 +89,22 @@ function testSqlAndScriptInject($val, $type)
// Decode string first because a lot of things are obfuscated by encoding or multiple encoding.
// So
error=alert(1)
$val = preg_replace('//', '', $val);
- $val = preg_replace('/[\r\n]/', '', $val);
+ $val = preg_replace('/[\r\n\t]/', '', $val);
} while ($oldval != $val);
//print "type = ".$type." after decoding: ".$val."\n";
@@ -123,11 +127,12 @@ function testSqlAndScriptInject($val, $type)
// For SQL Injection (only GET are used to scan for such injection strings)
if ($type == 1 || $type == 3) {
- $inj += preg_match('/delete\s+from/i', $val);
- $inj += preg_match('/create\s+table/i', $val);
- $inj += preg_match('/insert\s+into/i', $val);
- $inj += preg_match('/select\s+from/i', $val);
- $inj += preg_match('/into\s+(outfile|dumpfile)/i', $val);
+ // Note the \s+ is replaced into \s* because some spaces may have been modified in previous loop
+ $inj += preg_match('/delete\s*from/i', $val);
+ $inj += preg_match('/create\s*table/i', $val);
+ $inj += preg_match('/insert\s*into/i', $val);
+ $inj += preg_match('/select\s*from/i', $val);
+ $inj += preg_match('/into\s*(outfile|dumpfile)/i', $val);
$inj += preg_match('/user\s*\(/i', $val); // avoid to use function user() or mysql_user() that return current database login
$inj += preg_match('/information_schema/i', $val); // avoid to use request that read information_schema database
$inj += preg_match('/ (isModEnabled("fournisseur") && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) && $user->hasRight("fournisseur", "facture", "write")) || (isModEnabled("supplier_invoice") && $user->hasRight("supplier_invoice", "write")), // vs hooking
"position" => 90,
),
+ array(
+ "url" => "/ticket/card.php?action=create&mainmenu=ticket",
+ "title" => "NewTicket@ticket",
+ "name" => "Ticket@ticket",
+ "picto" => "ticket",
+ "activation" => isModEnabled('ticket') && $user->hasRight("ticket", "write"), // vs hooking
+ "position" => 100,
+ ),
+ array(
+ "url" => "/fichinter/card.php?action=create&mainmenu=commercial",
+ "title" => "NewIntervention@interventions",
+ "name" => "Intervention@interventions",
+ "picto" => "intervention",
+ "activation" => isModEnabled('ficheinter') && $user->hasRight("ficheinter", "creer"), // vs hooking
+ "position" => 110,
+ ),
array(
"url" => "/product/card.php?action=create&type=0&mainmenu=products",
"title" => "NewProduct@products",
"name" => "Product@products",
"picto" => "object_product",
"activation" => isModEnabled("product") && $user->hasRight("produit", "write"), // vs hooking
- "position" => 100,
+ "position" => 400,
),
array(
"url" => "/product/card.php?action=create&type=1&mainmenu=products",
@@ -2543,7 +2569,7 @@ function printDropdownQuickadd()
"name" => "Service@products",
"picto" => "object_service",
"activation" => isModEnabled("service") && $user->hasRight("service", "write"), // vs hooking
- "position" => 110,
+ "position" => 410,
),
array(
"url" => "/user/card.php?action=create&type=1&mainmenu=home",
diff --git a/htdocs/master.inc.php b/htdocs/master.inc.php
index 79f6f578e5f..03515c9a2e2 100644
--- a/htdocs/master.inc.php
+++ b/htdocs/master.inc.php
@@ -58,10 +58,10 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/conf.class.php';
$conf = new Conf();
// Set properties specific to database
-$conf->db->host = $dolibarr_main_db_host;
-$conf->db->port = $dolibarr_main_db_port;
-$conf->db->name = $dolibarr_main_db_name;
-$conf->db->user = $dolibarr_main_db_user;
+$conf->db->host = empty($dolibarr_main_db_host) ? '' : $dolibarr_main_db_host;
+$conf->db->port = empty($dolibarr_main_db_port) ? '' : $dolibarr_main_db_port;
+$conf->db->name = empty($dolibarr_main_db_name) ? '' : $dolibarr_main_db_name;
+$conf->db->user = empty($dolibarr_main_db_user) ? '' : $dolibarr_main_db_user;
$conf->db->pass = empty($dolibarr_main_db_pass) ? '' : $dolibarr_main_db_pass;
$conf->db->type = $dolibarr_main_db_type;
$conf->db->prefix = $dolibarr_main_db_prefix;
diff --git a/htdocs/modulebuilder/index.php b/htdocs/modulebuilder/index.php
index 29959822af1..8b87d84c10e 100644
--- a/htdocs/modulebuilder/index.php
+++ b/htdocs/modulebuilder/index.php
@@ -1643,6 +1643,34 @@ if ($dirins && $action == 'confirm_deletemodule') {
// Dir for module
$dir = $dirins.'/'.$modulelowercase;
+ $pathtofile = $listofmodules[strtolower($module)]['moduledescriptorrelpath'];
+
+ // Dir for module
+ $dir = dol_buildpath($modulelowercase, 0);
+
+ // Zip file to build
+ $FILENAMEZIP = '';
+
+ // Load module
+ dol_include_once($pathtofile);
+ $class = 'mod'.$module;
+
+ if (class_exists($class)) {
+ try {
+ $moduleobj = new $class($db);
+ } catch (Exception $e) {
+ $error++;
+ dol_print_error($db, $e->getMessage());
+ }
+ } else {
+ $error++;
+ $langs->load("errors");
+ dol_print_error($db, $langs->trans("ErrorFailedToLoadModuleDescriptorForXXX", $module));
+ exit;
+ }
+
+ $moduleobj->remove();
+
$result = dol_delete_dir_recursive($dir);
if ($result > 0) {
@@ -1974,6 +2002,28 @@ if ($message) {
$infomodulesfound = ''.$form->textwithpicto('', $langs->trans("ModuleBuilderDesc3", count($listofmodules)).'
';
+
+$dolibarrdataroot = preg_replace('/([\\/]+)$/i', '', DOL_DATA_ROOT);
+$allowonlineinstall = true;
+if (dol_is_file($dolibarrdataroot.'/installmodules.lock')) {
+ $allowonlineinstall = false;
+}
+if (empty($allowonlineinstall)) {
+ if (getDolGlobalString('MAIN_MESSAGE_INSTALL_MODULES_DISABLED_CONTACT_US')) {
+ // Show clean message
+ $message = info_admin($langs->trans('InstallModuleFromWebHasBeenDisabledContactUs'));
+ } else {
+ // Show technical message
+ $message = info_admin($langs->trans("InstallModuleFromWebHasBeenDisabledByFile", $dolibarrdataroot.'/installmodules.lock'), 0, 0, 1, 'warning');
+ }
+
+ print $message;
+
+ llxFooter();
+ exit(0);
+}
+
+
// Load module descriptor
$error = 0;
$moduleobj = null;
@@ -3062,7 +3112,7 @@ if ($module == 'initmodule') {
$proplabel = $propval['label'];
$proptype = $propval['type'];
$proparrayofkeyval = !empty($propval['arrayofkeyval'])?$propval['arrayofkeyval']:'';
- $propnotnull = $propval['notnull'];
+ $propnotnull = !empty($propval['notnull']) ? $propval['notnull'] : '0';
$propdefault = !empty($propval['default'])?$propval['default']:'';
$propindex = !empty($propval['index'])?$propval['index']:'';
$propforeignkey = !empty($propval['foreignkey'])?$propval['foreignkey']:'';
diff --git a/htdocs/modulebuilder/template/class/api_mymodule.class.php b/htdocs/modulebuilder/template/class/api_mymodule.class.php
index 736fd9ddc38..ce92ef5ea8e 100644
--- a/htdocs/modulebuilder/template/class/api_mymodule.class.php
+++ b/htdocs/modulebuilder/template/class/api_mymodule.class.php
@@ -293,7 +293,9 @@ class MyModuleApi extends DolibarrApi
throw new RestException(401, 'Access to instance id='.$this->myobject->id.' of object not allowed for login '.DolibarrApiAccess::$user->login);
}
- if (!$this->myobject->delete(DolibarrApiAccess::$user)) {
+ if ($this->myobject->delete(DolibarrApiAccess::$user) == 0) {
+ throw new RestException(409, 'Error when deleting MyObject : '.$this->myobject->error);
+ } elseif ($this->myobject->delete(DolibarrApiAccess::$user) < 0) {
throw new RestException(500, 'Error when deleting MyObject : '.$this->myobject->error);
}
diff --git a/htdocs/modulebuilder/template/class/myobject.class.php b/htdocs/modulebuilder/template/class/myobject.class.php
index 97c4e9ba646..2fe7d983513 100644
--- a/htdocs/modulebuilder/template/class/myobject.class.php
+++ b/htdocs/modulebuilder/template/class/myobject.class.php
@@ -110,7 +110,7 @@ class MyObject extends CommonObject
// BEGIN MODULEBUILDER PROPERTIES
/**
- * @var array Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+ * @var array Array with all fields into database and their property. Do not use it as a static var. It may be modified by constructor.
*/
public $fields = array(
'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>1, 'visible'=>-2, 'noteditable'=>1, 'notnull'=> 1, 'index'=>1, 'position'=>1, 'comment'=>'Id', 'css'=>'left'),
@@ -736,7 +736,7 @@ class MyObject extends CommonObject
public function reopen($user, $notrigger = 0)
{
// Protection
- if ($this->status != self::STATUS_CANCELED) {
+ if ($this->status == self::STATUS_VALIDATED) {
return 0;
}
@@ -865,6 +865,36 @@ class MyObject extends CommonObject
return $result;
}
+ /**
+ * Return a thumb for kanban views
+ *
+ * @param string $option Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
+ * @return string HTML Code for Kanban thumb.
+ */
+ /*
+ public function getKanbanView($option = '')
+ {
+ $return = '';
+ $return .= '
';
+ $return .= '
';
+ $return .= img_picto('', $this->picto);
+ $return .= ' ';
+ $return .= '
';
+ $return .= '
'.(method_exists($this, 'getNomUrl') ? $this->getNomUrl() : $this->ref).' ';
+ if (property_exists($this, 'label')) {
+ $return .= '
'.$this->label.' ';
+ }
+ if (method_exists($this, 'getLibStatut')) {
+ $return .= '
'.$this->getLibStatut(5).'
';
+ }
+ $return .= '
';
+ $return .= '
';
+ $return .= '
';
- $texte .= '
';
// Scan directories
@@ -172,18 +172,16 @@ class doc_generic_myobject_odt extends ModelePDFMyObject
}
if ($nbofiles) {
- $texte .= '';
+ $texte .= '
';
}
- $texte .= '
';
-
// Add input to upload a new template file.
$texte .= ''.$langs->trans("UploadNewTemplate");
$maxfilesizearray = getMaxFileSizeArray();
@@ -195,6 +193,7 @@ class doc_generic_myobject_odt extends ModelePDFMyObject
$texte .= '
';
+
$texte .= '';
$texte .= '';
@@ -282,8 +281,10 @@ class doc_generic_myobject_odt extends ModelePDFMyObject
$newfiletmp = preg_replace('/\.od(t|s)/i', '', $newfile);
$newfiletmp = preg_replace('/template_/i', '', $newfiletmp);
$newfiletmp = preg_replace('/modele_/i', '', $newfiletmp);
+
$newfiletmp = $objectref . '_' . $newfiletmp;
//$file=$dir.'/'.$newfiletmp.'.'.dol_print_date(dol_now(),'%Y%m%d%H%M%S').'.odt';
+
// Get extension (ods or odt)
$newfileformat = substr($newfile, strrpos($newfile, '.') + 1);
if (!empty($conf->global->MAIN_DOC_USE_TIMING)) {
@@ -308,7 +309,7 @@ class doc_generic_myobject_odt extends ModelePDFMyObject
return -1;
}
- // If CUSTOMER contact defined on order, we use it
+ // If CUSTOMER contact defined on object, we use it
$usecontact = false;
$arrayidcontact = $object->getIdContact('external', 'CUSTOMER');
if (count($arrayidcontact) > 0) {
@@ -348,7 +349,7 @@ class doc_generic_myobject_odt extends ModelePDFMyObject
// Line of free text
$newfreetext = '';
- $paramfreetext = 'ORDER_FREE_TEXT';
+ $paramfreetext = 'MYMODULE_MYOBJECT_FREE_TEXT';
if (!empty($conf->global->$paramfreetext)) {
$newfreetext = make_substitutions($conf->global->$paramfreetext, $substitutionarray);
}
diff --git a/htdocs/modulebuilder/template/myobject_agenda.php b/htdocs/modulebuilder/template/myobject_agenda.php
index 5b5860f6475..d7b84707b95 100644
--- a/htdocs/modulebuilder/template/myobject_agenda.php
+++ b/htdocs/modulebuilder/template/myobject_agenda.php
@@ -145,7 +145,7 @@ if ($enablepermissioncheck) {
//if ($user->socid > 0) accessforbidden();
//if ($user->socid > 0) $socid = $user->socid;
//$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
-//restrictedArea($user, $object->element, $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
+//restrictedArea($user, $object->module, $object->id, $object->table_element, $object->element, 'fk_soc', 'rowid', $isdraft);
if (!isModEnabled("mymodule")) {
accessforbidden();
}
diff --git a/htdocs/modulebuilder/template/myobject_card.php b/htdocs/modulebuilder/template/myobject_card.php
index 95f10b5b90c..4e80c81a4df 100644
--- a/htdocs/modulebuilder/template/myobject_card.php
+++ b/htdocs/modulebuilder/template/myobject_card.php
@@ -145,7 +145,7 @@ $upload_dir = $conf->mymodule->multidir_output[isset($object->entity) ? $object-
//if ($user->socid > 0) accessforbidden();
//if ($user->socid > 0) $socid = $user->socid;
//$isdraft = (isset($object->status) && ($object->status == $object::STATUS_DRAFT) ? 1 : 0);
-//restrictedArea($user, $object->element, $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
+//restrictedArea($user, $object->module, $object->id, $object->table_element, $object->element, 'fk_soc', 'rowid', $isdraft);
if (!isModEnabled("mymodule")) {
accessforbidden();
}
diff --git a/htdocs/modulebuilder/template/myobject_contact.php b/htdocs/modulebuilder/template/myobject_contact.php
index b0f7b5cfb30..9568201238c 100644
--- a/htdocs/modulebuilder/template/myobject_contact.php
+++ b/htdocs/modulebuilder/template/myobject_contact.php
@@ -93,7 +93,7 @@ if ($enablepermissioncheck) {
//if ($user->socid > 0) accessforbidden();
//if ($user->socid > 0) $socid = $user->socid;
//$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
-//restrictedArea($user, $object->element, $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
+//restrictedArea($user, $object->module, $object->id, $object->table_element, $object->element, 'fk_soc', 'rowid', $isdraft);
if (!isModEnabled("mymodule")) {
accessforbidden();
}
diff --git a/htdocs/modulebuilder/template/myobject_document.php b/htdocs/modulebuilder/template/myobject_document.php
index 6aed7382b7d..ff1756e2b15 100644
--- a/htdocs/modulebuilder/template/myobject_document.php
+++ b/htdocs/modulebuilder/template/myobject_document.php
@@ -137,7 +137,7 @@ if ($enablepermissioncheck) {
//if ($user->socid > 0) accessforbidden();
//if ($user->socid > 0) $socid = $user->socid;
//$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
-//restrictedArea($user, $object->element, $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
+//restrictedArea($user, $object->module, $object->id, $object->table_element, $object->element, 'fk_soc', 'rowid', $isdraft);
if (!isModEnabled("mymodule")) {
accessforbidden();
}
diff --git a/htdocs/modulebuilder/template/myobject_list.php b/htdocs/modulebuilder/template/myobject_list.php
index f26afd1a503..06ad9a298ec 100644
--- a/htdocs/modulebuilder/template/myobject_list.php
+++ b/htdocs/modulebuilder/template/myobject_list.php
@@ -196,7 +196,7 @@ if ($user->socid > 0) accessforbidden();
//if ($user->socid > 0) accessforbidden();
//$socid = 0; if ($user->socid > 0) $socid = $user->socid;
//$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
-//restrictedArea($user, $object->element, 0, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
+//restrictedArea($user, $object->module, 0, $object->table_element, $object->element, 'fk_soc', 'rowid', $isdraft);
if (!isModEnabled("mymodule")) {
accessforbidden('Module mymodule not enabled');
}
@@ -282,6 +282,9 @@ $reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters, $obje
$sql .= preg_replace('/^,/', '', $hookmanager->resPrint);
$sql = preg_replace('/,\s*$/', '', $sql);
//$sql .= ", COUNT(rc.rowid) as anotherfield";
+
+$sqlfields = $sql; // $sql fields to remove for count total
+
$sql .= " FROM ".MAIN_DB_PREFIX.$object->table_element." as t";
//$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."anothertable as rc ON rc.parent = t.rowid";
if (isset($extrafields->attributes[$object->table_element]['label']) && is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
@@ -364,21 +367,9 @@ $sql .= empty($hookmanager->resPrint) ? "" : " HAVING 1=1 ".$hookmanager->resPri
// Count total nb of records
$nbtotalofrecords = '';
if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
- /* This old and fast method to get and count full list returns all record so use a high amount of memory.
- $resql = $db->query($sql);
- $nbtotalofrecords = $db->num_rows($resql);
- */
- /* The slow method does not consume memory on mysql (not tested on pgsql) */
- /*$resql = $db->query($sql, 0, 'auto', 1);
- while ($db->fetch_object($resql)) {
- if (empty($nbtotalofrecords)) {
- $nbtotalofrecords = 1; // We can't make +1 because init value is ''
- } else {
- $nbtotalofrecords++;
- }
- }*/
/* The fast and low memory method to get and count full list converts the sql into a sql count */
- $sqlforcount = preg_replace('/^SELECT[a-zA-Z0-9\._\s\(\),=<>\:\-\']+\sFROM/Ui', 'SELECT COUNT(*) as nbtotalofrecords FROM', $sql);
+ $sqlforcount = preg_replace('/^'.preg_quote($sqlfields, '/').'/', 'SELECT COUNT(*) as nbtotalofrecords', $sql);
+ $sqlforcount = preg_replace('/GROUP BY .*$/', '', $sqlforcount);
$resql = $db->query($sqlforcount);
if ($resql) {
$objforcount = $db->fetch_object($resql);
@@ -387,7 +378,7 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
dol_print_error($db);
}
- if (($page * $limit) > $nbtotalofrecords) { // if total of record found is smaller than page * limit, goto and load page 0
+ if (($page * $limit) > $nbtotalofrecords) { // if total resultset is smaller then paging size (filtering), goto and load page 0
$page = 0;
$offset = 0;
}
diff --git a/htdocs/modulebuilder/template/myobject_note.php b/htdocs/modulebuilder/template/myobject_note.php
index f7859cfb217..89e5e0ba76e 100644
--- a/htdocs/modulebuilder/template/myobject_note.php
+++ b/htdocs/modulebuilder/template/myobject_note.php
@@ -117,7 +117,7 @@ if ($enablepermissioncheck) {
//if ($user->socid > 0) accessforbidden();
//if ($user->socid > 0) $socid = $user->socid;
//$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
-//restrictedArea($user, $object->element, $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
+//restrictedArea($user, $object->module, $object->id, $object->table_element, $object->element, 'fk_soc', 'rowid', $isdraft);
if (!isModEnabled("mymodule")) {
accessforbidden();
}
diff --git a/htdocs/mrp/mo_card.php b/htdocs/mrp/mo_card.php
index 32571252ebf..aa3381c1242 100644
--- a/htdocs/mrp/mo_card.php
+++ b/htdocs/mrp/mo_card.php
@@ -731,7 +731,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
// Show links to link elements
$linktoelem = $form->showLinkToObjectBlock($object, null, array('mo'));
- $somethingshown = $form->showLinkedObjectBlock($object, $linktoelem, false, 'MOChild');
+ $somethingshown = $form->showLinkedObjectBlock($object, $linktoelem, false);
print '';
diff --git a/htdocs/mrp/mo_list.php b/htdocs/mrp/mo_list.php
index f7a6ed88571..723e4a76853 100644
--- a/htdocs/mrp/mo_list.php
+++ b/htdocs/mrp/mo_list.php
@@ -174,6 +174,9 @@ if (empty($reshook)) {
if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { // All tests are required to be compatible with all browsers
foreach ($object->fields as $key => $val) {
$search[$key] = '';
+ if ($key == 'status') {
+ $search[$key] = -1;
+ }
if (preg_match('/^(date|timestamp|datetime)/', $val['type'])) {
$search[$key.'_dtstart'] = '';
$search[$key.'_dtend'] = '';
@@ -226,6 +229,9 @@ $parameters = array();
$reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters, $object); // Note that $action and $object may have been modified by hook
$sql .= preg_replace('/^,/', '', $hookmanager->resPrint);
$sql = preg_replace('/,\s*$/', '', $sql);
+
+$sqlfields = $sql; // $sql fields to remove for count total
+
$sql .= " FROM ".MAIN_DB_PREFIX.$object->table_element." as t";
if (isset($extrafields->attributes[$object->table_element]['label']) && is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX.$object->table_element."_extrafields as ef on (t.rowid = ef.fk_object)";
@@ -247,7 +253,7 @@ foreach ($search as $key => $val) {
if ($key == 'status' && $search[$key] == -1) {
continue;
}
- if ($key == 'fk_parent_line') {
+ if ($key == 'fk_parent_line' && $search[$key] != '') {
$sql .= natural_search('moparent.ref', $search[$key], 0);
continue;
}
@@ -311,35 +317,41 @@ $sql.=$hookmanager->resPrint;
$sql=preg_replace('/,\s*$/','', $sql);
*/
-$sql .= $db->order($sortfield, $sortorder);
-
// Count total nb of records
$nbtotalofrecords = '';
if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
- $resql = $db->query($sql);
- $nbtotalofrecords = $db->num_rows($resql);
- if (($page * $limit) > $nbtotalofrecords) { // if total of record found is smaller than page * limit, goto and load page 0
+ /* The fast and low memory method to get and count full list converts the sql into a sql count */
+ $sqlforcount = preg_replace('/^'.preg_quote($sqlfields, '/').'/', 'SELECT COUNT(*) as nbtotalofrecords', $sql);
+ $sqlforcount = preg_replace('/GROUP BY .*$/', '', $sqlforcount);
+ $resql = $db->query($sqlforcount);
+ if ($resql) {
+ $objforcount = $db->fetch_object($resql);
+ $nbtotalofrecords = $objforcount->nbtotalofrecords;
+ } else {
+ dol_print_error($db);
+ }
+
+ if (($page * $limit) > $nbtotalofrecords) { // if total resultset is smaller then paging size (filtering), goto and load page 0
$page = 0;
$offset = 0;
}
+ $db->free($resql);
}
-// if total of record found is smaller than limit, no need to do paging and to restart another select with limits set.
-if (is_numeric($nbtotalofrecords) && ($limit > $nbtotalofrecords || empty($limit))) {
- $num = $nbtotalofrecords;
-} else {
- if ($limit) {
- $sql .= $db->plimit($limit + 1, $offset);
- }
- $resql = $db->query($sql);
- if (!$resql) {
- dol_print_error($db);
- exit;
- }
-
- $num = $db->num_rows($resql);
+// Complete request and execute it with limit
+$sql .= $db->order($sortfield, $sortorder);
+if ($limit) {
+ $sql .= $db->plimit($limit + 1, $offset);
}
+$resql = $db->query($sql);
+if (!$resql) {
+ dol_print_error($db);
+ exit;
+}
+
+$num = $db->num_rows($resql);
+
// Direct jump if only one record found
if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $search_all && !$page) {
$obj = $db->fetch_object($resql);
@@ -450,7 +462,7 @@ if (!empty($moreforfilter)) {
}
$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
+$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')); // This also change content of $arrayfields
$selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
print '
'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
@@ -460,6 +472,13 @@ print '
';
+// Action column
+if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+ print '';
+ $searchpicto = $form->showFilterButtons('left');
+ print $searchpicto;
+ print ' ';
+}
foreach ($object->fields as $key => $val) {
$cssforfield = (empty($val['csslist']) ? (empty($val['css']) ? '' : $val['css']) : $val['csslist']);
if ($key == 'status') {
@@ -505,16 +524,22 @@ $parameters = array('arrayfields'=>$arrayfields);
$reshook = $hookmanager->executeHooks('printFieldListOption', $parameters, $object); // Note that $action and $object may have been modified by hook
print $hookmanager->resPrint;
// Action column
-print '';
-$searchpicto = $form->showFilterButtons();
-print $searchpicto;
-print ' ';
+if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+ print '';
+ $searchpicto = $form->showFilterButtons();
+ print $searchpicto;
+ print ' ';
+}
print ''."\n";
// Fields title label
// --------------------------------------------------------------------
print '';
+// Action column
+if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+ print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
+}
foreach ($object->fields as $key => $val) {
$cssforfield = (empty($val['csslist']) ? (empty($val['css']) ? '' : $val['css']) : $val['csslist']);
if ($key == 'status') {
@@ -539,7 +564,9 @@ $parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$
$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object); // Note that $action and $object may have been modified by hook
print $hookmanager->resPrint;
// Action column
-print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
+if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+ print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
+}
print ' '."\n";
@@ -570,6 +597,18 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
// Show here line of result
print '';
+ // Action column
+ if (getDolGlobalString('MAIN_CHECKBOX_LEFT_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($object->id, $arrayofselected)) {
+ $selected = 1;
+ }
+ print ' ';
+ }
foreach ($object->fields as $key => $val) {
$cssforfield = (empty($val['csslist']) ? (empty($val['css']) ? '' : $val['css']) : $val['csslist']);
if (in_array($val['type'], array('date', 'datetime', 'timestamp'))) {
@@ -627,15 +666,17 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object); // Note that $action and $object may have been modified by hook
print $hookmanager->resPrint;
// 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($object->id, $arrayofselected)) {
- $selected = 1;
+ if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_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($object->id, $arrayofselected)) {
+ $selected = 1;
+ }
+ print ' ';
}
- print '';
if (!$i) {
$totalarray['nbfield']++;
}
diff --git a/htdocs/mrp/mo_production.php b/htdocs/mrp/mo_production.php
index 64ae11909ef..7bff43bfc7b 100644
--- a/htdocs/mrp/mo_production.php
+++ b/htdocs/mrp/mo_production.php
@@ -220,7 +220,7 @@ if (empty($reshook)) {
if ($qtytoprocess >= 0) {
$idstockmove = $stockmove->livraison($user, $line->fk_product, GETPOST('idwarehouse-'.$line->id.'-'.$i), $qtytoprocess, 0, $labelmovement, dol_now(), '', '', GETPOST('batch-'.$line->id.'-'.$i), $id_product_batch, $codemovement);
} else {
- $idstockmove = $stockmove->reception($user, $line->fk_product, GETPOST('idwarehouse-'.$line->id.'-'.$i), $qtytoprocess, 0, $labelmovement, dol_now(), '', '', GETPOST('batch-'.$line->id.'-'.$i), $id_product_batch, $codemovement);
+ $idstockmove = $stockmove->reception($user, $line->fk_product, GETPOST('idwarehouse-'.$line->id.'-'.$i), $qtytoprocess * -1, 0, $labelmovement, dol_now(), '', '', GETPOST('batch-'.$line->id.'-'.$i), $id_product_batch, $codemovement);
}
if ($idstockmove < 0) {
$error++;
diff --git a/htdocs/mrp/tpl/linkedobjectblock.tpl.php b/htdocs/mrp/tpl/linkedobjectblock.tpl.php
index 3b8c3f2ecaa..84ca487b771 100644
--- a/htdocs/mrp/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/mrp/tpl/linkedobjectblock.tpl.php
@@ -39,48 +39,79 @@ $langs->load("bom");
$total = 0;
$ilink = 0;
-$mo_static = new Mo($db);
-$res = $mo_static->fetch($object->id);
-$TMoChilds = $mo_static->getMoChilds();
-$hookmanager->initHooks('LinesLinkedObjectBlock');
-$parameters = array('TMoChilds' => $TMoChilds);
-$reshook = $hookmanager->executeHooks('LinesLinkedObjectBlock', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-if (empty($reshook)) {
- foreach ($TMoChilds as $key => $objectlink) {
+if ($object->element == 'mo') {
+ $mo_static = new Mo($db);
+ $res = $mo_static->fetch($object->id);
+ $TMoChilds = $mo_static->getMoChilds();
+
+ $hookmanager->initHooks('LinesLinkedObjectBlock');
+ $parameters = array('TMoChilds' => $TMoChilds);
+ $reshook = $hookmanager->executeHooks('LinesLinkedObjectBlock', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+ if (empty($reshook)) {
+ foreach ($TMoChilds as $key => $objectlink) {
+ $ilink++;
+
+ $trclass = 'oddeven';
+
+ echo ' ';
+ echo '' . $langs->trans("ManufacturingOrder");
+ if (!empty($showImportButton) && $conf->global->MAIN_ENABLE_IMPORT_LINKED_OBJECT_LINES) {
+ print ' ' . $objectlink->getNomUrl(1) . ' ';
+
+ echo '';
+ // $result = $product_static->fetch($objectlink->fk_product);
+ print ' ';
+ echo '' . dol_print_date($objectlink->date_creation, 'day') . ' ';
+ echo '- ';
+ echo '' . $objectlink->getLibStatut(3) . ' ';
+ echo '';
+
+ // we want to make the link via element_element for delete action
+ $sql = " Select rowid from " . MAIN_DB_PREFIX . "element_element";
+ $sql .= " WHERE fk_source = " . (int) $object->id . " and fk_target = '" . dol_escape_htmltag($key) . "'";
+
+ $resql = $db->query($sql);
+ $k = 0;
+ if ($resql) {
+ $obj = $db->fetch_object($resql);
+ if ($obj->rowid && $obj->rowid > 0) $k = $obj->rowid;
+ }
+ echo '' . img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink') . ' ';
+ echo ' ';
+ echo " \n";
+ }
+ }
+} else {
+ $linkedObjectBlock = dol_sort_array($linkedObjectBlock, 'date', 'desc', 0, 0, 1);
+
+ $total = 0;
+ $ilink = 0;
+ foreach ($linkedObjectBlock as $key => $objectlink) {
$ilink++;
$trclass = 'oddeven';
-
- echo '';
- echo '' . $langs->trans("ManufacturingOrder");
+ if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) {
+ $trclass .= ' liste_sub_total';
+ }
+ print ' ';
+ print ''.$langs->trans("ManufacturingOrder");
if (!empty($showImportButton) && $conf->global->MAIN_ENABLE_IMPORT_LINKED_OBJECT_LINES) {
- print ' ';
}
- echo ' ';
- echo ''.$objectlink->getNomUrl(1).' ';
-
- echo '';
- // $result = $product_static->fetch($objectlink->fk_product);
print ' ';
- echo '' . dol_print_date($objectlink->date_creation, 'day') . ' ';
- echo '- ';
- echo '' . $objectlink->getLibStatut(3) . ' ';
- echo '';
- // we want to make the link via element_element for delete action
- $sql = " Select rowid from " . MAIN_DB_PREFIX . "element_element";
- $sql .= " WHERE fk_source = ". (int) $object->id . " and fk_target = '" . dol_escape_htmltag($key) ."'";
-
- $resql = $db->query($sql);
- $k = 0;
- if ($resql) {
- $obj = $db->fetch_object($resql);
- if ($obj->rowid && $obj->rowid > 0 ) $k = $obj->rowid;
- }
- echo '' . img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink') . ' ';
-
- echo ' ';
- echo " \n";
+ print ''.$objectlink->getNomUrl(1).' ';
+ print ''.$objectlink->ref_client.' ';
+ print ''.dol_print_date($objectlink->date_start_planned, 'day').' ';
+ print '- ';
+ print ''.$objectlink->getLibStatut(3).' ';
+ print ''.img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink').' ';
+// Action column
+if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+ print '';
+ $searchpicto = $form->showFilterButtons('left');
+ print $searchpicto;
+ print ' ';
+}
print ''.$form->selectarray('search_status', $arraystatus, $search_status).' ';
+print ''.$form->selectarray('search_status', $arraystatus, $search_status, 0, 0, 0, '', 0, 0, 0, '', 'onroghtofpage').' ';
// Extra fields
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
@@ -344,16 +352,22 @@ $parameters = array('arrayfields'=>$arrayfields);
$reshook = $hookmanager->executeHooks('printFieldListOption', $parameters, $object); // Note that $action and $object may have been modified by hook
print $hookmanager->resPrint;
// Action column
-print '';
-$searchpicto = $form->showFilterButtons();
-print $searchpicto;
-print ' ';
+if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+ print '';
+ $searchpicto = $form->showFilterButtons();
+ print $searchpicto;
+ print ' ';
+}
print ''."\n";
// Fields title label
// --------------------------------------------------------------------
print '';
+// Action column
+if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+ print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ')."\n";
+}
print_liste_field_titre("Ref", $_SERVER["PHP_SELF"], "p.id_sondage", $param, "", "", $sortfield, $sortorder);
print_liste_field_titre("Title", $_SERVER["PHP_SELF"], "p.titre", $param, "", "", $sortfield, $sortorder);
print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "p.format", $param, "", "", $sortfield, $sortorder);
@@ -369,7 +383,9 @@ $parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$
$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object); // Note that $action and $object may have been modified by hook
print $hookmanager->resPrint;
// Action column
-print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ')."\n";
+if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+ print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ')."\n";
+}
print ' '."\n";
@@ -402,7 +418,18 @@ while ($i < min($num, $limit)) {
// Show here line of result
print '';
-
+ // Action column
+ if (getDolGlobalString('MAIN_CHECKBOX_LEFT_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 ' ';
+ }
// Ref
print '';
print $opensurvey_static->getNomUrl(1);
@@ -478,15 +505,17 @@ while ($i < min($num, $limit)) {
$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object); // Note that $action and $object may have been modified by hook
print $hookmanager->resPrint;
// 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;
+ if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_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 '';
if (!$i) {
$totalarray['nbfield']++;
}
diff --git a/htdocs/opensurvey/results.php b/htdocs/opensurvey/results.php
index f8a2648a809..d8405c31027 100644
--- a/htdocs/opensurvey/results.php
+++ b/htdocs/opensurvey/results.php
@@ -435,7 +435,7 @@ $toutsujet = explode(",", $object->sujet);
$listofanswers = array();
foreach ($toutsujet as $value) {
$tmp = explode('@', $value);
- $listofanswers[] = array('label'=>$tmp[0], 'format'=>($tmp[1] ? $tmp[1] : 'checkbox'));
+ $listofanswers[] = array('label'=>$tmp[0], 'format'=>(!empty($tmp[1]) ? $tmp[1] : 'checkbox'));
}
$toutsujet = str_replace("@", "';
- if ($current) {
- print strftime("%Y", $current);
- }
- print ' '."\n";
+ print ''.date('Y', intval($toutsujet[$i])).' '."\n";
$colspan = 1;
}
}
diff --git a/htdocs/opensurvey/wizard/choix_date.php b/htdocs/opensurvey/wizard/choix_date.php
index 46983829c3b..d8f89b18e16 100644
--- a/htdocs/opensurvey/wizard/choix_date.php
+++ b/htdocs/opensurvey/wizard/choix_date.php
@@ -37,6 +37,7 @@ if (!$user->rights->opensurvey->write) {
$_SESSION["formatsondage"] = "D";
$erreur = false;
+$erreurNbchoice = 0;
/*
* Actions
@@ -49,114 +50,120 @@ if (GETPOST('confirmation')) {
$nbofchoice = count($_SESSION["totalchoixjour"]);
$errheure = array();
- for ($i = 0; $i < $nbofchoice; $i++) {
- // Show hours choices
- for ($j = 0; $j < $_SESSION["nbrecaseshoraires"]; $j++) {
- $horairesi = GETPOST("horaires".$i);
- $_SESSION["horaires$i"][$j] = $horairesi[$j];
-
- $tmphorairesi = GETPOST('horaires'.$i, 'array');
-
- if (!is_array($tmphorairesi)) {
- $errheure[$i][$j] = true;
- $erreur = true;
- continue;
- }
-
- // A range like 8:00-11:00
- $creneaux = array();
- $heures = array();
- if (preg_match("/(\d{1,2}:\d{2})-(\d{1,2}:\d{2})/", $tmphorairesi[$j], $creneaux)) {
- //on recupere les deux parties du preg_match qu'on redécoupe autour des ":"
- $debutcreneau = explode(":", $creneaux[1]);
- $fincreneau = explode(":", $creneaux[2]);
-
- //comparaison des heures de fin et de debut
- //si correctes, on entre les données dans la variables de session
- if ($debutcreneau[0] < 24 && $fincreneau[0] < 24 && $debutcreneau[1] < 60 && $fincreneau[1] < 60 && ($debutcreneau[0] < $fincreneau[0] || ($debutcreneau[0] == $fincreneau[0] && $debutcreneau[1] < $fincreneau[1]))) {
- $_SESSION["horaires$i"][$j] = $creneaux[1].'-'.$creneaux[2];
- } else { //sinon message d'erreur et nettoyage de la case
- $errheure[$i][$j] = true;
- $erreur = true;
- }
- } elseif (preg_match(";^(\d{1,2}h\d{0,2})-(\d{1,2}h\d{0,2})$;i", $tmphorairesi[$j], $creneaux)) { //si c'est un creneau type 8h00-11h00
- //on recupere les deux parties du preg_match qu'on redécoupe autour des "H"
- $debutcreneau = preg_split("/h/i", $creneaux[1]);
- $fincreneau = preg_split("/h/i", $creneaux[2]);
-
- //comparaison des heures de fin et de debut
- //si correctes, on entre les données dans la variables de session
- if ($debutcreneau[0] < 24 && $fincreneau[0] < 24 && $debutcreneau[1] < 60 && $fincreneau[1] < 60 && ($debutcreneau[0] < $fincreneau[0] || ($debutcreneau[0] == $fincreneau[0] && $debutcreneau[1] < $fincreneau[1]))) {
- $_SESSION["horaires$i"][$j] = $creneaux[1].'-'.$creneaux[2];
- } else { //sinon message d'erreur et nettoyage de la case
- $errheure[$i][$j] = true;
- $erreur = true;
- }
- } elseif (preg_match(";^(\d{1,2}):(\d{2})$;", $tmphorairesi[$j], $heures)) { //si c'est une heure simple type 8:00
- //si valeures correctes, on entre les données dans la variables de session
- if ($heures[1] < 24 && $heures[2] < 60) {
- $_SESSION["horaires$i"][$j] = $heures[0];
- } else { //sinon message d'erreur et nettoyage de la case
- $errheure[$i][$j] = true;
- $erreur = true;
- }
- } elseif (preg_match(";^(\d{1,2})h(\d{0,2})$;i", $tmphorairesi[$j], $heures)) { //si c'est une heure encore plus simple type 8h
- //si valeures correctes, on entre les données dans la variables de session
- if ($heures[1] < 24 && $heures[2] < 60) {
- $_SESSION["horaires$i"][$j] = $heures[0];
- } else { //sinon message d'erreur et nettoyage de la case
- $errheure[$i][$j] = true;
- $erreur = true;
- }
- } elseif (preg_match(";^(\d{1,2})-(\d{1,2})$;", $tmphorairesi[$j], $heures)) { //si c'est un creneau simple type 8-11
- //si valeures correctes, on entre les données dans la variables de session
- if ($heures[1] < $heures[2] && $heures[1] < 24 && $heures[2] < 24) {
- $_SESSION["horaires$i"][$j] = $heures[0];
- } else { //sinon message d'erreur et nettoyage de la case
- $errheure[$i][$j] = true;
- $erreur = true;
- }
- } elseif (preg_match(";^(\d{1,2})h-(\d{1,2})h$;", $tmphorairesi[$j], $heures)) { //si c'est un creneau H type 8h-11h
- //si valeures correctes, on entre les données dans la variables de session
- if ($heures[1] < $heures[2] && $heures[1] < 24 && $heures[2] < 24) {
- $_SESSION["horaires$i"][$j] = $heures[0];
- } else { //sinon message d'erreur et nettoyage de la case
- $errheure[$i][$j] = true;
- $erreur = true;
- }
- } elseif ($tmphorairesi[$j] == "") { //Si la case est vide
- unset($_SESSION["horaires$i"][$j]);
- } else { //pour tout autre format, message d'erreur
- $errheure[$i][$j] = true;
- $erreur = true;
- }
-
- if (issetAndNoEmpty('horaires'.$i, $_SESSION) === false || issetAndNoEmpty($j, $_SESSION['horaires'.$i]) === false) {
- if (issetAndNoEmpty('horaires'.$i, $_SESSION) === true) {
- $_SESSION["horaires$i"][$j] = '';
- } else {
- $_SESSION["horaires$i"] = array();
- $_SESSION["horaires$i"][$j] = '';
- }
- }
- }
-
- if ($_SESSION["horaires$i"][0] == "" && $_SESSION["horaires$i"][1] == "" && $_SESSION["horaires$i"][2] == "" && $_SESSION["horaires$i"][3] == "" && $_SESSION["horaires$i"][4] == "") {
- $choixdate .= ",";
- $choixdate .= $_SESSION["totalchoixjour"][$i];
- } else {
+ if ($nbofchoice * $_SESSION["nbrecaseshoraires"] > 200) {
+ setEventMessages($langs->trans("ErrorFieldTooLong"), null, 'errors');
+ $erreurNb++;
+ } else {
+ for ($i = 0; $i < $nbofchoice; $i++) {
+ // Show hours choices
for ($j = 0; $j < $_SESSION["nbrecaseshoraires"]; $j++) {
- if ($_SESSION["horaires$i"][$j] != "") {
- $choixdate .= ",";
- $choixdate .= $_SESSION["totalchoixjour"][$i];
- $choixdate .= "@";
- // On remplace la virgule et l'arobase pour ne pas avoir de problème par la suite
- $choixdate .= str_replace(array(',', '@'), array(',', '@'), $_SESSION["horaires$i"][$j]);
+ $horairesi = GETPOST("horaires".$i);
+ $_SESSION["horaires$i"][$j] = $horairesi[$j];
+
+ $tmphorairesi = GETPOST('horaires'.$i, 'array');
+
+ if (!is_array($tmphorairesi)) {
+ $errheure[$i][$j] = true;
+ $erreur = true;
+ continue;
+ }
+
+ // A range like 8:00-11:00
+ $creneaux = array();
+ $heures = array();
+ if (preg_match("/(\d{1,2}:\d{2})-(\d{1,2}:\d{2})/", $tmphorairesi[$j], $creneaux)) {
+ //on recupere les deux parties du preg_match qu'on redécoupe autour des ":"
+ $debutcreneau = explode(":", $creneaux[1]);
+ $fincreneau = explode(":", $creneaux[2]);
+
+ //comparaison des heures de fin et de debut
+ //si correctes, on entre les données dans la variables de session
+ if ($debutcreneau[0] < 24 && $fincreneau[0] < 24 && $debutcreneau[1] < 60 && $fincreneau[1] < 60 && ($debutcreneau[0] < $fincreneau[0] || ($debutcreneau[0] == $fincreneau[0] && $debutcreneau[1] < $fincreneau[1]))) {
+ $_SESSION["horaires$i"][$j] = $creneaux[1].'-'.$creneaux[2];
+ } else { //sinon message d'erreur et nettoyage de la case
+ $errheure[$i][$j] = true;
+ $erreur = true;
+ }
+ } elseif (preg_match(";^(\d{1,2}h\d{0,2})-(\d{1,2}h\d{0,2})$;i", $tmphorairesi[$j], $creneaux)) { //si c'est un creneau type 8h00-11h00
+ //on recupere les deux parties du preg_match qu'on redécoupe autour des "H"
+ $debutcreneau = preg_split("/h/i", $creneaux[1]);
+ $fincreneau = preg_split("/h/i", $creneaux[2]);
+
+ //comparaison des heures de fin et de debut
+ //si correctes, on entre les données dans la variables de session
+ if ($debutcreneau[0] < 24 && $fincreneau[0] < 24 && $debutcreneau[1] < 60 && $fincreneau[1] < 60 && ($debutcreneau[0] < $fincreneau[0] || ($debutcreneau[0] == $fincreneau[0] && $debutcreneau[1] < $fincreneau[1]))) {
+ $_SESSION["horaires$i"][$j] = $creneaux[1].'-'.$creneaux[2];
+ } else { //sinon message d'erreur et nettoyage de la case
+ $errheure[$i][$j] = true;
+ $erreur = true;
+ }
+ } elseif (preg_match(";^(\d{1,2}):(\d{2})$;", $tmphorairesi[$j], $heures)) { //si c'est une heure simple type 8:00
+ //si valeures correctes, on entre les données dans la variables de session
+ if ($heures[1] < 24 && $heures[2] < 60) {
+ $_SESSION["horaires$i"][$j] = $heures[0];
+ } else { //sinon message d'erreur et nettoyage de la case
+ $errheure[$i][$j] = true;
+ $erreur = true;
+ }
+ } elseif (preg_match(";^(\d{1,2})h(\d{0,2})$;i", $tmphorairesi[$j], $heures)) { //si c'est une heure encore plus simple type 8h
+ //si valeures correctes, on entre les données dans la variables de session
+ if ($heures[1] < 24 && $heures[2] < 60) {
+ $_SESSION["horaires$i"][$j] = $heures[0];
+ } else { //sinon message d'erreur et nettoyage de la case
+ $errheure[$i][$j] = true;
+ $erreur = true;
+ }
+ } elseif (preg_match(";^(\d{1,2})-(\d{1,2})$;", $tmphorairesi[$j], $heures)) { //si c'est un creneau simple type 8-11
+ //si valeures correctes, on entre les données dans la variables de session
+ if ($heures[1] < $heures[2] && $heures[1] < 24 && $heures[2] < 24) {
+ $_SESSION["horaires$i"][$j] = $heures[0];
+ } else { //sinon message d'erreur et nettoyage de la case
+ $errheure[$i][$j] = true;
+ $erreur = true;
+ }
+ } elseif (preg_match(";^(\d{1,2})h-(\d{1,2})h$;", $tmphorairesi[$j], $heures)) { //si c'est un creneau H type 8h-11h
+ //si valeures correctes, on entre les données dans la variables de session
+ if ($heures[1] < $heures[2] && $heures[1] < 24 && $heures[2] < 24) {
+ $_SESSION["horaires$i"][$j] = $heures[0];
+ } else { //sinon message d'erreur et nettoyage de la case
+ $errheure[$i][$j] = true;
+ $erreur = true;
+ }
+ } elseif ($tmphorairesi[$j] == "") { //Si la case est vide
+ unset($_SESSION["horaires$i"][$j]);
+ } else { //pour tout autre format, message d'erreur
+ $errheure[$i][$j] = true;
+ $erreur = true;
+ }
+
+ if (issetAndNoEmpty('horaires'.$i, $_SESSION) === false || issetAndNoEmpty($j, $_SESSION['horaires'.$i]) === false) {
+ if (issetAndNoEmpty('horaires'.$i, $_SESSION) === true) {
+ $_SESSION["horaires$i"][$j] = '';
+ } else {
+ $_SESSION["horaires$i"] = array();
+ $_SESSION["horaires$i"][$j] = '';
+ }
+ }
+ }
+
+ if ($_SESSION["horaires$i"][0] == "" && $_SESSION["horaires$i"][1] == "" && $_SESSION["horaires$i"][2] == "" && $_SESSION["horaires$i"][3] == "" && $_SESSION["horaires$i"][4] == "") {
+ $choixdate .= ",";
+ $choixdate .= $_SESSION["totalchoixjour"][$i];
+ } else {
+ for ($j = 0; $j < $_SESSION["nbrecaseshoraires"]; $j++) {
+ if ($_SESSION["horaires$i"][$j] != "") {
+ $choixdate .= ",";
+ $choixdate .= $_SESSION["totalchoixjour"][$i];
+ $choixdate .= "@";
+ // On remplace la virgule et l'arobase pour ne pas avoir de problème par la suite
+ $choixdate .= str_replace(array(',', '@'), array(',', '@'), $_SESSION["horaires$i"][$j]);
+ }
}
}
}
}
+
if (!empty($errheure)) {
setEventMessages($langs->trans("ErrorBadFormat"), null, 'errors');
}
@@ -170,7 +177,7 @@ if (GETPOST('confirmation')) {
}
// Add survey into database
- if (!$erreur) {
+ if (!$erreur && $erreurNb == 0) {
$_SESSION["toutchoix"] = substr("$choixdate", 1);
ajouter_sondage();
diff --git a/htdocs/partnership/class/partnership.class.php b/htdocs/partnership/class/partnership.class.php
index 4838c80f92d..5908b964f2c 100644
--- a/htdocs/partnership/class/partnership.class.php
+++ b/htdocs/partnership/class/partnership.class.php
@@ -17,16 +17,14 @@
*/
/**
- * \file class/partnership.class.php
+ * \file htdocs/partnership/class/partnership.class.php
* \ingroup partnership
* \brief This file is a CRUD class file for Partnership (Create/Read/Update/Delete)
*/
+
// Put here all includes required by your class file
require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
-//require_once DOL_DOCUMENT_ROOT . '/societe/class/societe.class.php';
-//require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php';
-
/**
* Class for Partnership
@@ -124,6 +122,7 @@ class Partnership extends CommonObject
'last_check_backlink' => array('type'=>'datetime', 'label'=>'LastCheckBacklink', 'enabled'=>'1', 'position'=>72, 'notnull'=>0, 'visible'=>-2,),
'reason_decline_or_cancel' => array('type'=>'text', 'label'=>'ReasonDeclineOrCancel', 'enabled'=>'1', 'position'=>73, 'notnull'=>0, 'visible'=>-2,),
'fk_soc' => array('type'=>'integer:Societe:societe/class/societe.class.php:1:status=1 AND entity IN (__SHARED_ENTITIES__)', 'label'=>'ThirdParty', 'picto'=>'company', 'enabled'=>'1', 'position'=>50, 'notnull'=>-1, 'visible'=>1, 'index'=>1, 'css'=>'maxwidth500', 'csslist'=>'tdoverflowmax150',),
+ 'ip' => array('type'=>'varchar(250)', 'label'=>'Ip', 'enabled'=>'1', 'position'=>74, 'notnull'=>0, 'visible'=>-2,),
);
public $rowid;
public $ref;
@@ -195,7 +194,7 @@ class Partnership extends CommonObject
$this->db = $db;
- if (!empty($conf->global->PARTNERSHIP_IS_MANAGED_FOR) && getDolGlobalString('PARTNERSHIP_IS_MANAGED_FOR') == 'member') {
+ if (getDolGlobalString('PARTNERSHIP_IS_MANAGED_FOR') == 'member') {
$this->fields['fk_member'] = array('type'=>'integer:Adherent:adherents/class/adherent.class.php:1', 'label'=>'Member', 'enabled'=>'1', 'position'=>50, 'notnull'=>-1, 'visible'=>1, 'index'=>1, 'picto'=>'member', 'csslist'=>'tdoverflowmax150');
} else {
$this->fields['fk_soc'] = array('type'=>'integer:Societe:societe/class/societe.class.php:1:status=1 AND entity IN (__SHARED_ENTITIES__)', 'label'=>'ThirdParty', 'enabled'=>'1', 'position'=>50, 'notnull'=>-1, 'visible'=>1, 'index'=>1, 'picto'=>'company', 'css'=>'maxwidth500', 'csslist'=>'tdoverflowmax150');
diff --git a/htdocs/partnership/lib/partnership.lib.php b/htdocs/partnership/lib/partnership.lib.php
index abf8dcca63b..5c30be6ffd1 100644
--- a/htdocs/partnership/lib/partnership.lib.php
+++ b/htdocs/partnership/lib/partnership.lib.php
@@ -28,10 +28,13 @@
*/
function partnershipAdminPrepareHead()
{
- global $langs, $conf;
+ global $langs, $conf, $db;
$langs->loadLangs(array("members", "partnership"));
+ $extrafields = new ExtraFields($db);
+ $extrafields->fetch_name_optionals_label('partnership');
+
$h = 0;
$head = array();
@@ -43,6 +46,10 @@ function partnershipAdminPrepareHead()
$head[$h][0] = dol_buildpath("/partnership/admin/partnership_extrafields.php", 1);
$head[$h][1] = $langs->trans("ExtraFields");
+ $nbExtrafields = $extrafields->attributes['partnership']['count'];
+ if ($nbExtrafields > 0) {
+ $head[$h][1] .= ''.$nbExtrafields.' ';
+ }
$head[$h][2] = 'partnership_extrafields';
$h++;
@@ -51,13 +58,6 @@ function partnershipAdminPrepareHead()
$head[$h][2] = 'website';
$h++;
- /*
- $head[$h][0] = dol_buildpath("/partnership/admin/about.php", 1);
- $head[$h][1] = $langs->trans("About");
- $head[$h][2] = 'about';
- $h++;
- */
-
// Show more tabs from modules
// Entries must be declared in modules descriptor with line
//$this->tabs = array(
diff --git a/htdocs/partnership/partnership_card.php b/htdocs/partnership/partnership_card.php
index 551794b5d4a..de5449b7e80 100644
--- a/htdocs/partnership/partnership_card.php
+++ b/htdocs/partnership/partnership_card.php
@@ -374,7 +374,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
// require_once DOL_DOCUMENT_ROOT.'/core/class/notify.class.php';
// $notify = new Notify($db);
// $formquestion = array_merge($formquestion, array(
- // array('type' => 'onecolumn', 'value' => $notify->confirmMessage('PROPAL_CLOSE_SIGNED', $object->socid, $object)),
+ // array('type' => 'onecolumn', 'value' => $notify->confirmMessage('PARTNERSHIP_CLOSE_DENY', $object->socid, $object)),
// ));
// }
diff --git a/htdocs/product/admin/product.php b/htdocs/product/admin/product.php
index a8106a9ae88..069029d074b 100644
--- a/htdocs/product/admin/product.php
+++ b/htdocs/product/admin/product.php
@@ -148,11 +148,15 @@ if ($action == 'other') {
$value = GETPOST('activate_FillProductDescAuto', 'alpha');
$res = dolibarr_set_const($db, "PRODUIT_AUTOFILL_DESC", $value, 'chaine', 0, '', $conf->entity);
- $value = GETPOST('PRODUIT_FOURN_TEXTS', 'alpha');
- $res = dolibarr_set_const($db, "PRODUIT_FOURN_TEXTS", $value, 'chaine', 0, '', $conf->entity);
+ if (GETPOSTISSET('PRODUIT_FOURN_TEXTS')) {
+ $value = GETPOST('PRODUIT_FOURN_TEXTS', 'alpha');
+ $res = dolibarr_set_const($db, "PRODUIT_FOURN_TEXTS", $value, 'chaine', 0, '', $conf->entity);
+ }
- $value = GETPOST('PRODUCT_USE_SUPPLIER_PACKAGING', 'alpha');
- $res = dolibarr_set_const($db, "PRODUCT_USE_SUPPLIER_PACKAGING", $value, 'chaine', 0, '', $conf->entity);
+ if (GETPOSTISSET('PRODUCT_USE_SUPPLIER_PACKAGING')) {
+ $value = GETPOST('PRODUCT_USE_SUPPLIER_PACKAGING', 'alpha');
+ $res = dolibarr_set_const($db, "PRODUCT_USE_SUPPLIER_PACKAGING", $value, 'chaine', 0, '', $conf->entity);
+ }
}
diff --git a/htdocs/product/ajax/products.php b/htdocs/product/ajax/products.php
index 24da89b7619..f61e92c56f3 100644
--- a/htdocs/product/ajax/products.php
+++ b/htdocs/product/ajax/products.php
@@ -93,6 +93,7 @@ if ($action == 'fetch' && !empty($id)) {
$outprice_ht = null;
$outprice_ttc = null;
$outpricebasetype = null;
+ $outtva_tx_formated = 0;
$outtva_tx = 0;
$outdefault_vat_code = '';
$outqty = 1;
@@ -140,7 +141,8 @@ if ($action == 'fetch' && !empty($id)) {
$outprice_ttc = price($objp->unitprice * (1 + ($object->tva_tx / 100)));
$outpricebasetype = $object->price_base_type;
- $outtva_tx = $object->tva_tx;
+ $outtva_tx_formated = price($object->tva_tx);
+ $outtva_tx = price2num($object->tva_tx);
$outdefault_vat_code = $object->default_vat_code;
$outqty = $objp->quantity;
@@ -165,15 +167,17 @@ if ($action == 'fetch' && !empty($id)) {
$objp = $db->fetch_object($result);
if ($objp) {
$found = true;
- $outprice_ht = price($objp->price);
- $outprice_ttc = price($objp->price_ttc);
+ $outprice_ht = price($objp->price); // formated for langage user because is inserted into input field
+ $outprice_ttc = price($objp->price_ttc); // formated for langage user because is inserted into input field
$outpricebasetype = $objp->price_base_type;
if (!empty($conf->global->PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL)) {
- $outtva_tx = $objp->tva_tx;
+ $outtva_tx_formated = price($objp->tva_tx); // formated for langage user because is inserted into input field
+ $outtva_tx = price2num($objp->tva_tx); // international numeric
$outdefault_vat_code = $objp->default_vat_code;
} else {
// The common and default behaviour.
- $outtva_tx = $object->tva_tx;
+ $outtva_tx_formated = price($object->tva_tx);
+ $outtva_tx = price2num($object->tva_tx);
$outdefault_vat_code = $object->default_vat_code;
}
}
@@ -195,7 +199,8 @@ if ($action == 'fetch' && !empty($id)) {
$outprice_ht = price($prodcustprice->lines[0]->price);
$outprice_ttc = price($prodcustprice->lines[0]->price_ttc);
$outpricebasetype = $prodcustprice->lines[0]->price_base_type;
- $outtva_tx = $prodcustprice->lines[0]->tva_tx;
+ $outtva_tx_formated = price($prodcustprice->lines[0]->tva_tx);
+ $outtva_tx = price2num($prodcustprice->lines[0]->tva_tx);
$outdefault_vat_code = $prodcustprice->lines[0]->default_vat_code;
}
}
@@ -205,7 +210,8 @@ if ($action == 'fetch' && !empty($id)) {
$outprice_ht = price($object->price);
$outprice_ttc = price($object->price_ttc);
$outpricebasetype = $object->price_base_type;
- $outtva_tx = $object->tva_tx;
+ $outtva_tx_formated = price($object->tva_tx);
+ $outtva_tx = price2num($object->tva_tx);
$outdefault_vat_code = $object->default_vat_code;
}
@@ -219,6 +225,7 @@ if ($action == 'fetch' && !empty($id)) {
'price_ht' => $outprice_ht,
'price_ttc' => $outprice_ttc,
'pricebasetype' => $outpricebasetype,
+ 'tva_tx_formated' => $outtva_tx_formated,
'tva_tx' => $outtva_tx,
'default_vat_code' => $outdefault_vat_code,
'qty' => $outqty,
diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index c1be61741bb..8f1f6061861 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -2528,7 +2528,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
print '';
}
- if ($object->isService() && $conf->workstation->enabled) {
+ if ($object->isService() && isModEnabled('workstation')) {
$workstation = new Workstation($db);
$res = $workstation->fetch($object->fk_default_workstation);
diff --git a/htdocs/product/class/api_products.class.php b/htdocs/product/class/api_products.class.php
index e234f4dba8e..76ee11f727e 100644
--- a/htdocs/product/class/api_products.class.php
+++ b/htdocs/product/class/api_products.class.php
@@ -454,7 +454,19 @@ class Products extends DolibarrApi
global $user;
$user = DolibarrApiAccess::$user;
- return $this->product->delete(DolibarrApiAccess::$user);
+ $res = $this->product->delete(DolibarrApiAccess::$user);
+ if ($res < 0) {
+ throw new RestException(500, "Can't delete, error occurs");
+ } elseif ($res == 0) {
+ throw new RestException(409, "Can't delete, that product is probably used");
+ }
+
+ return array(
+ 'success' => array(
+ 'code' => 200,
+ 'message' => 'Object deleted'
+ )
+ );
}
/**
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index ffb72bfca78..bebe5d5a98d 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -2159,7 +2159,7 @@ class Product extends CommonObject
}
} else {
$price = price2num($newprice, 'MU');
- $price_ttc = ($newnpr != 1) ? price2num($newprice) * (1 + ($newvat / 100)) : $price;
+ $price_ttc = ($newnpr != 1) ? (float) price2num($newprice) * (1 + ($newvat / 100)) : $price;
$price_ttc = price2num($price_ttc, 'MU');
if ($newminprice !== '' || $newminprice === 0) {
@@ -2179,12 +2179,34 @@ class Product extends CommonObject
$localtax1 = $localtaxes_array['1'];
$localtaxtype2 = $localtaxes_array['2'];
$localtax2 = $localtaxes_array['3'];
- } else // old method. deprecated because ot can't retrieve type
- {
- $localtaxtype1 = '0';
- $localtax1 = get_localtax($newvat, 1);
- $localtaxtype2 = '0';
- $localtax2 = get_localtax($newvat, 2);
+ } else {
+ // if array empty, we try to use the vat code
+ if (!empty($newdefaultvatcode)) {
+ global $mysoc;
+ // Get record from code
+ $sql = "SELECT t.rowid, t.code, t.recuperableonly, t.localtax1, t.localtax2, t.localtax1_type, t.localtax2_type";
+ $sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";
+ $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$this->db->escape($mysoc->country_code)."'";
+ $sql .= " AND t.taux = ".((float) $newdefaultvatcode)." AND t.active = 1";
+ $sql .= " AND t.code = '".$this->db->escape($newdefaultvatcode)."'";
+ $resql = $this->db->query($sql);
+ if ($resql) {
+ $obj = $this->db->fetch_object($resql);
+ if ($obj) {
+ $npr = $obj->recuperableonly;
+ $localtax1 = $obj->localtax1;
+ $localtax2 = $obj->localtax2;
+ $localtaxtype1 = $obj->localtax1_type;
+ $localtaxtype2 = $obj->localtax2_type;
+ }
+ }
+ } else {
+ // old method. deprecated because we can't retrieve type
+ $localtaxtype1 = '0';
+ $localtax1 = get_localtax($newvat, 1);
+ $localtaxtype2 = '0';
+ $localtax2 = get_localtax($newvat, 2);
+ }
}
if (empty($localtax1)) {
$localtax1 = 0; // If = '' then = 0
diff --git a/htdocs/product/fournisseurs.php b/htdocs/product/fournisseurs.php
index 5eae5c45dc9..95de1f53da8 100644
--- a/htdocs/product/fournisseurs.php
+++ b/htdocs/product/fournisseurs.php
@@ -270,10 +270,13 @@ if (empty($reshook)) {
if ($ret == -3) {
$error++;
- $object->fetch($object->product_id_already_linked);
- $productLink = $object->getNomUrl(1, 'supplier');
+ $tmpobject = new Product($db);
+ $tmpobject->fetch($object->product_id_already_linked);
+ $productLink = $tmpobject->getNomUrl(1, 'supplier');
- setEventMessages($langs->trans("ReferenceSupplierIsAlreadyAssociatedWithAProduct", $productLink), null, 'errors');
+ $texttoshow = $langs->trans("ReferenceSupplierIsAlreadyAssociatedWithAProduct", '{s1}');
+ $texttoshow = str_replace('{s1}', $productLink, $texttoshow);
+ setEventMessages($texttoshow, null, 'errors');
} elseif ($ret < 0) {
$error++;
setEventMessages($object->error, $object->errors, 'errors');
@@ -788,16 +791,11 @@ END;
// Barcode type
print ' ';
- print ''.$langs->trans('BarcodeType').' ';
+ print ''.$langs->trans('GencodBuyPrice').' ';
print '';
- print $formbarcode->selectBarcodeType(($rowid ? $object->supplier_fk_barcode_type : getDolGlobalint("PRODUIT_DEFAULT_BARCODE_TYPE")), 'fk_barcode_type', 1);
- print ' ';
- print ' ';
-
- // Barcode value
- print '';
- print ''.$langs->trans('BarcodeValue').' ';
- print ''.img_picto('', 'barcode', 'class="pictofixedwidth"').' ';
+ print img_picto('', 'barcode', 'class="pictofixedwidth"');
+ print $formbarcode->selectBarcodeType((GETPOSTISSET('fk_barcode_type') ? GETPOST('fk_barcode_type', 'int') : ($rowid ? $object->supplier_fk_barcode_type : getDolGlobalint("PRODUIT_DEFAULT_BARCODE_TYPE"))), 'fk_barcode_type', 1);
+ print ' ';
}
@@ -995,52 +993,72 @@ END;
$param = "&id=".$object->id;
+ $nbfields = 0;
+
print '';
if (!empty($arrayfields['pfp.datec']['checked'])) {
print_liste_field_titre("AppliedPricesFrom", $_SERVER["PHP_SELF"], "pfp.datec", "", $param, "", $sortfield, $sortorder, '', '', 1);
+ $nbfields++;
}
if (!empty($arrayfields['s.nom']['checked'])) {
print_liste_field_titre("Suppliers", $_SERVER["PHP_SELF"], "s.nom", "", $param, "", $sortfield, $sortorder, '', '', 1);
+ $nbfields++;
}
print_liste_field_titre("SupplierRef", $_SERVER["PHP_SELF"], "", "", $param, "", $sortfield, $sortorder, '', '', 1);
+ $nbfields++;
if (!empty($arrayfields['pfp.fk_availability']['checked'])) {
print_liste_field_titre("Availability", $_SERVER["PHP_SELF"], "pfp.fk_availability", "", $param, "", $sortfield, $sortorder);
+ $nbfields++;
}
if (!empty($arrayfields['pfp.quantity']['checked'])) {
print_liste_field_titre("QtyMin", $_SERVER["PHP_SELF"], "pfp.quantity", "", $param, '', $sortfield, $sortorder, 'right ');
+ $nbfields++;
}
print_liste_field_titre("VATRate", $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'right ');
+ $nbfields++;
print_liste_field_titre("PriceQtyMinHT", $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'right ');
+ $nbfields++;
if (isModEnabled("multicurrency")) {
print_liste_field_titre("PriceQtyMinHTCurrency", $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'right ');
+ $nbfields++;
}
if (!empty($arrayfields['pfp.unitprice']['checked'])) {
print_liste_field_titre("UnitPriceHT", $_SERVER["PHP_SELF"], "pfp.unitprice", "", $param, '', $sortfield, $sortorder, 'right ');
+ $nbfields++;
}
if (!empty($arrayfields['pfp.multicurrency_unitprice']['checked'])) {
print_liste_field_titre("UnitPriceHTCurrency", $_SERVER["PHP_SELF"], "pfp.multicurrency_unitprice", "", $param, '', $sortfield, $sortorder, 'right ');
+ $nbfields++;
}
if (isModEnabled("multicurrency")) {
print_liste_field_titre("Currency", $_SERVER["PHP_SELF"], "", "", $param, '', $sortfield, $sortorder, 'right ');
+ $nbfields++;
}
print_liste_field_titre("DiscountQtyMin", $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'right ');
+ $nbfields++;
if (!empty($arrayfields['pfp.delivery_time_days']['checked'])) {
print_liste_field_titre("NbDaysToDelivery", $_SERVER["PHP_SELF"], "pfp.delivery_time_days", "", $param, '', $sortfield, $sortorder, 'right ');
+ $nbfields++;
}
if (!empty($arrayfields['pfp.supplier_reputation']['checked'])) {
print_liste_field_titre("ReputationForThisProduct", $_SERVER["PHP_SELF"], "pfp.supplier_reputation", "", $param, '', $sortfield, $sortorder, 'center ');
+ $nbfields++;
}
if (!empty($arrayfields['pfp.fk_barcode_type']['checked'])) {
print_liste_field_titre("BarcodeType", $_SERVER["PHP_SELF"], "pfp.fk_barcode_type", "", $param, '', $sortfield, $sortorder, 'center ');
+ $nbfields++;
}
if (!empty($arrayfields['pfp.barcode']['checked'])) {
print_liste_field_titre("BarcodeValue", $_SERVER["PHP_SELF"], "pfp.barcode", "", $param, '', $sortfield, $sortorder, 'center ');
+ $nbfields++;
}
if (!empty($arrayfields['pfp.packaging']['checked'])) {
print_liste_field_titre("PackagingForThisProduct", $_SERVER["PHP_SELF"], "pfp.packaging", "", $param, 'align="center"', $sortfield, $sortorder);
+ $nbfields++;
}
if (!empty($arrayfields['pfp.tms']['checked'])) {
print_liste_field_titre("DateModification", $_SERVER["PHP_SELF"], "pfp.tms", "", $param, '', $sortfield, $sortorder, 'right ', '', 1);
+ $nbfields++;
}
// fetch optionals attributes and labels
@@ -1062,6 +1080,7 @@ END;
}
if (!empty($arrayfields['ef.' . $key]['checked'])) {
print_liste_field_titre($extratitle, $_SERVER["PHP_SELF"], 'ef.' . $key, '', $param, '', $sortfield, $sortorder, 'right ');
+ $nbfields++;
}
}
}
@@ -1069,10 +1088,11 @@ END;
}
if (is_object($hookmanager)) {
- $parameters = array('id_fourn'=>(!empty($id_fourn)?$id_fourn:''), 'prod_id'=>$object->id);
+ $parameters = array('id_fourn'=>(!empty($id_fourn)?$id_fourn:''), 'prod_id'=>$object->id, 'nbfields'=>$nbfields);
$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object, $action);
}
print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
+ $nbfields++;
print " \n";
if (is_array($product_fourn_list)) {
@@ -1254,6 +1274,10 @@ END;
print '';
}
+
+ if (empty($product_fourn_list)) {
+ print ''.$langs->trans("None").' '; // You can use div-table-responsive-no-min if you dont need reserved height for your table
@@ -484,6 +493,13 @@ print '
';
+// Action column
+if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+ print '';
+ $searchpicto = $form->showFilterButtons('left');
+ print $searchpicto;
+ print ' ';
+}
foreach ($object->fields as $key => $val) {
$cssforfield = (empty($val['csslist']) ? (empty($val['css']) ? '' : $val['css']) : $val['csslist']);
if ($key == 'status') {
@@ -522,16 +538,22 @@ $parameters = array('arrayfields'=>$arrayfields);
$reshook = $hookmanager->executeHooks('printFieldListOption', $parameters, $object); // Note that $action and $object may have been modified by hook
print $hookmanager->resPrint;
// Action column
-print '';
-$searchpicto = $form->showFilterButtons();
-print $searchpicto;
-print ' ';
+if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+ print '';
+ $searchpicto = $form->showFilterButtons();
+ print $searchpicto;
+ print ' ';
+}
print ''."\n";
// Fields title label
// --------------------------------------------------------------------
print '';
+// Action column
+if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+ print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
+}
foreach ($object->fields as $key => $val) {
$cssforfield = (empty($val['csslist']) ? (empty($val['css']) ? '' : $val['css']) : $val['csslist']);
if ($key == 'status') {
@@ -554,7 +576,9 @@ $parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$
$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object); // Note that $action and $object may have been modified by hook
print $hookmanager->resPrint;
// Action column
-print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
+if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+ print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
+}
print ' '."\n";
@@ -584,6 +608,18 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
// Show here line of result
print '';
+ // Action column
+ if (getDolGlobalString('MAIN_CHECKBOX_LEFT_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($object->id, $arrayofselected)) {
+ $selected = 1;
+ }
+ print ' ';
+ }
foreach ($object->fields as $key => $val) {
$cssforfield = (empty($val['csslist']) ? (empty($val['css']) ? '' : $val['css']) : $val['csslist']);
if (in_array($val['type'], array('date', 'datetime', 'timestamp'))) {
@@ -636,15 +672,17 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object); // Note that $action and $object may have been modified by hook
print $hookmanager->resPrint;
// 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($object->id, $arrayofselected)) {
- $selected = 1;
+ if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_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($object->id, $arrayofselected)) {
+ $selected = 1;
+ }
+ print ' ';
}
- print '';
if (!$i) {
$totalarray['nbfield']++;
}
diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index e637e478df4..da17d702820 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -176,7 +176,6 @@ if (!empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT)
// List of fields to search into when doing a "search in all"
$fieldstosearchall = array(
'p.ref'=>"Ref",
- 'pfp.ref_fourn'=>"RefSupplier",
'p.label'=>"ProductLabel",
'p.description'=>"Description",
"p.note"=>"Note",
@@ -190,7 +189,6 @@ if (getDolGlobalInt('MAIN_MULTILANGS')) {
}
if (isModEnabled('barcode')) {
$fieldstosearchall['p.barcode'] = 'Gencod';
- $fieldstosearchall['pfp.barcode'] = 'GencodBuyPrice';
}
// Personalized search criterias. Example: $conf->global->PRODUCT_QUICKSEARCH_ON_FIELDS = 'p.ref=ProductRef;p.label=ProductLabel;p.description=Description;p.note=Note;'
if (!empty($conf->global->PRODUCT_QUICKSEARCH_ON_FIELDS)) {
@@ -436,6 +434,9 @@ if (!empty($extrafields->attributes[$object->table_element]['label'])) {
$parameters = array();
$reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
$sql .= $hookmanager->resPrint;
+
+$sqlfields = $sql; // $sql fields to remove for count total
+
$sql .= ' FROM '.MAIN_DB_PREFIX.'product as p';
if (!empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED)) {
$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "product_perentity as ppe ON ppe.fk_product = p.rowid AND ppe.entity = " . ((int) $conf->entity);
@@ -459,7 +460,16 @@ if (!empty($conf->global->PRODUCT_USE_UNITS)) {
$sql .= ' WHERE p.entity IN ('.getEntity('product').')';
if ($sall) {
- $sql .= natural_search(array_keys($fieldstosearchall), $sall);
+ $sql .= ' AND (';
+ $sql .= natural_search(array_keys($fieldstosearchall), $sall, 0, 1);
+ // Search also into a supplier reference 'pfp.ref_fourn'="RefSupplier"
+ $sql .= ' OR EXISTS (SELECT rowid FROM '.MAIN_DB_PREFIX.'product_fournisseur_price as pfp WHERE pfp.fk_product = p.rowid';
+ $sql .= ' AND ('.natural_search('pfp.ref_fourn', $sall, 0, 1);
+ if (isModEnabled('barcode')) {
+ // Search also into a supplier barcode 'pfp.barcode'='GencodBuyPrice';
+ $sql .= ' OR '.natural_search('pfp.barcode', $sall, 0, 1);
+ }
+ $sql .= ')))';
}
// if the type is not 1, we show all products (type = 0,2,3)
if (dol_strlen($search_type) && $search_type != '-1') {
@@ -595,11 +605,8 @@ $sql .= $hookmanager->resPrint;
$nbtotalofrecords = '';
if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
- /* $result = $db->query($sql);
- $nbtotalofrecords = $db->num_rows($result);
- */
/* The fast and low memory method to get and count full list converts the sql into a sql count */
- $sqlforcount = preg_replace('/^SELECT[a-zA-Z0-9\._\s\(\),=<>\:\-\']+\sFROM/Ui', 'SELECT COUNT(*) as nbtotalofrecords FROM', $sql);
+ $sqlforcount = preg_replace('/^'.preg_quote($sqlfields, '/').'/', 'SELECT COUNT(*) as nbtotalofrecords', $sql);
$sqlforcount = preg_replace('/'.preg_quote($linktopfp, '/').'/', '', $sqlforcount);
$sqlforcount = preg_replace('/GROUP BY .*$/', '', $sqlforcount);
$resql = $db->query($sqlforcount);
@@ -614,6 +621,7 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
$page = 0;
$offset = 0;
}
+ $db->free($resql);
}
// Complete request and execute it with limit
@@ -1338,49 +1346,54 @@ while ($i < min($num, $limit)) {
}
}
}
+ $parameters = array('staticdata' => $obj);
+ // Note that $action and $object may have been modified by hook
+ // do product_static fetch in hook if wanted or anything else
+ $reshook = $hookmanager->executeHooks('loadStaticObject', $parameters, $product_static, $action);
+ if (empty($reshook)) {
+ $product_static->id = $obj->rowid;
+ $product_static->ref = $obj->ref;
+ $product_static->ref_fourn = empty($obj->ref_supplier) ? '' : $obj->ref_supplier; // deprecated
+ $product_static->ref_supplier = empty($obj->ref_supplier) ? '' : $obj->ref_supplier;
+ $product_static->label = $obj->label;
+ $product_static->finished = $obj->finished;
+ $product_static->type = $obj->fk_product_type;
+ $product_static->status_buy = $obj->tobuy;
+ $product_static->status = $obj->tosell;
+ $product_static->status_batch = $obj->tobatch;
+ $product_static->entity = $obj->entity;
+ $product_static->pmp = $obj->pmp;
+ $product_static->accountancy_code_sell = $obj->accountancy_code_sell;
+ $product_static->accountancy_code_sell_export = $obj->accountancy_code_sell_export;
+ $product_static->accountancy_code_sell_intra = $obj->accountancy_code_sell_intra;
+ $product_static->accountancy_code_buy = $obj->accountancy_code_buy;
+ $product_static->accountancy_code_buy_intra = $obj->accountancy_code_buy_intra;
+ $product_static->accountancy_code_buy_export = $obj->accountancy_code_buy_export;
+ $product_static->length = $obj->length;
+ $product_static->length_units = $obj->length_units;
+ $product_static->width = $obj->width;
+ $product_static->width_units = $obj->width_units;
+ $product_static->height = $obj->height;
+ $product_static->height_units = $obj->height_units;
+ $product_static->weight = $obj->weight;
+ $product_static->weight_units = $obj->weight_units;
+ $product_static->volume = $obj->volume;
+ $product_static->volume_units = $obj->volume_units;
+ $product_static->surface = $obj->surface;
+ $product_static->surface_units = $obj->surface_units;
+ if (!empty($conf->global->PRODUCT_USE_UNITS)) {
+ $product_static->fk_unit = $obj->fk_unit;
+ }
- $product_static->id = $obj->rowid;
- $product_static->ref = $obj->ref;
- $product_static->ref_fourn = empty($obj->ref_supplier) ? '' : $obj->ref_supplier; // deprecated
- $product_static->ref_supplier = empty($obj->ref_supplier) ? '' : $obj->ref_supplier;
- $product_static->label = $obj->label;
- $product_static->finished = $obj->finished;
- $product_static->type = $obj->fk_product_type;
- $product_static->status_buy = $obj->tobuy;
- $product_static->status = $obj->tosell;
- $product_static->status_batch = $obj->tobatch;
- $product_static->entity = $obj->entity;
- $product_static->pmp = $obj->pmp;
- $product_static->accountancy_code_sell = $obj->accountancy_code_sell;
- $product_static->accountancy_code_sell_export = $obj->accountancy_code_sell_export;
- $product_static->accountancy_code_sell_intra = $obj->accountancy_code_sell_intra;
- $product_static->accountancy_code_buy = $obj->accountancy_code_buy;
- $product_static->accountancy_code_buy_intra = $obj->accountancy_code_buy_intra;
- $product_static->accountancy_code_buy_export = $obj->accountancy_code_buy_export;
- $product_static->length = $obj->length;
- $product_static->length_units = $obj->length_units;
- $product_static->width = $obj->width;
- $product_static->width_units = $obj->width_units;
- $product_static->height = $obj->height;
- $product_static->height_units = $obj->height_units;
- $product_static->weight = $obj->weight;
- $product_static->weight_units = $obj->weight_units;
- $product_static->volume = $obj->volume;
- $product_static->volume_units = $obj->volume_units;
- $product_static->surface = $obj->surface;
- $product_static->surface_units = $obj->surface_units;
- if (!empty($conf->global->PRODUCT_USE_UNITS)) {
- $product_static->fk_unit = $obj->fk_unit;
- }
-
- // STOCK_DISABLE_OPTIM_LOAD can be set to force load_stock whatever is permissions on stock.
- if ((isModEnabled('stock') && $user->rights->stock->lire && $search_type != 1) || !empty($conf->global->STOCK_DISABLE_OPTIM_LOAD)) { // To optimize call of load_stock
- if ($obj->fk_product_type != 1 || !empty($conf->global->STOCK_SUPPORTS_SERVICES)) { // Not a service
- $option = 'nobatch';
- if (empty($arrayfields['stock_virtual']['checked'])) {
- $option .= ',novirtual';
+ // STOCK_DISABLE_OPTIM_LOAD can be set to force load_stock whatever is permissions on stock.
+ if ((isModEnabled('stock') && $user->rights->stock->lire && $search_type != 1) || !empty($conf->global->STOCK_DISABLE_OPTIM_LOAD)) { // To optimize call of load_stock
+ if ($product_static->type != 1 || !empty($conf->global->STOCK_SUPPORTS_SERVICES)) { // Not a service
+ $option = 'nobatch';
+ if (empty($arrayfields['stock_virtual']['checked'])) {
+ $option .= ',novirtual';
+ }
+ $product_static->load_stock($option); // Load stock_reel + stock_warehouse. This can also call load_virtual_stock()
}
- $product_static->load_stock($option); // Load stock_reel + stock_warehouse. This can also call load_virtual_stock()
}
}
@@ -1454,7 +1467,7 @@ while ($i < min($num, $limit)) {
// Label
if (!empty($arrayfields['p.label']['checked'])) {
- print ''.$obj->label.' ';
+ print ''.$product_static->label.' ';
if (!$i) {
$totalarray['nbfield']++;
}
@@ -1464,7 +1477,7 @@ while ($i < min($num, $limit)) {
if (!empty($arrayfields['p.fk_product_type']['checked'])) {
print '';
$s = '';
- if ($obj->fk_product_type == 0) {
+ if ($product_static->type == 0) {
$s .= img_picto($langs->trans("Product"), 'product', 'class="paddingleftonly paddingrightonly colorgrey"');
} else {
$s .= img_picto($langs->trans("Service"), 'service', 'class="paddingleftonly paddingrightonly colorgrey"');
@@ -1478,7 +1491,7 @@ while ($i < min($num, $limit)) {
// Barcode
if (!empty($arrayfields['p.barcode']['checked'])) {
- print ' '.$obj->barcode.' ';
+ print ''.$product_static->barcode.' ';
if (!$i) {
$totalarray['nbfield']++;
}
@@ -1522,7 +1535,7 @@ while ($i < min($num, $limit)) {
// Weight
if (!empty($arrayfields['p.weight']['checked'])) {
print '';
- print $obj->weight;
+ print $product_static->weight;
print ' ';
if (!$i) {
$totalarray['nbfield']++;
@@ -1542,7 +1555,7 @@ while ($i < min($num, $limit)) {
// Length
if (!empty($arrayfields['p.length']['checked'])) {
print '';
- print $obj->length;
+ print $product_static->length;
print ' ';
if (!$i) {
$totalarray['nbfield']++;
@@ -1562,7 +1575,7 @@ while ($i < min($num, $limit)) {
// Width
if (!empty($arrayfields['p.width']['checked'])) {
print '';
- print $obj->width;
+ print $product_static->width;
print ' ';
if (!$i) {
$totalarray['nbfield']++;
@@ -1582,7 +1595,7 @@ while ($i < min($num, $limit)) {
// Height
if (!empty($arrayfields['p.height']['checked'])) {
print '';
- print $obj->height;
+ print $product_static->height;
print ' ';
if (!$i) {
$totalarray['nbfield']++;
@@ -1602,7 +1615,7 @@ while ($i < min($num, $limit)) {
// Surface
if (!empty($arrayfields['p.surface']['checked'])) {
print '';
- print $obj->surface;
+ print $product_static->surface;
print ' ';
if (!$i) {
$totalarray['nbfield']++;
@@ -1622,7 +1635,7 @@ while ($i < min($num, $limit)) {
// Volume
if (!empty($arrayfields['p.volume']['checked'])) {
print '';
- print $obj->volume;
+ print $product_static->volume;
print ' ';
if (!$i) {
$totalarray['nbfield']++;
@@ -1654,7 +1667,7 @@ while ($i < min($num, $limit)) {
// Sell price
if (!empty($arrayfields['p.sellprice']['checked'])) {
print '';
- if ($obj->tosell && $usercancreadprice) {
+ if ($product_static->status && $usercancreadprice) {
if ($obj->price_base_type == 'TTC') {
print ''.price($obj->price_ttc).' '.$langs->trans("TTC").' ';
} else {
@@ -1677,7 +1690,7 @@ while ($i < min($num, $limit)) {
$productpricescache[$obj->rowid] = array();
}
- if ($obj->tosell && $usercancreadprice) {
+ if ($product_static->status && $usercancreadprice) {
// Make 1 request for all price levels (without filter on price_level) and saved result into an cache array
// then reuse the cache array if we need prices for other price levels
$sqlp = "SELECT p.rowid, p.fk_product, p.price, p.price_ttc, p.price_level, p.date_price, p.price_base_type";
@@ -1727,7 +1740,7 @@ while ($i < min($num, $limit)) {
// Better buy price
if (!empty($arrayfields['p.minbuyprice']['checked'])) {
print ' ';
- if ($obj->tobuy && $obj->bestpurchaseprice != '' && $usercancreadprice) {
+ if ($product_static->status_buy && $obj->bestpurchaseprice != '' && $usercancreadprice) {
if ($product_fourn->find_min_price_product_fournisseur($obj->rowid) > 0) {
if ($product_fourn->product_fourn_price_id > 0) {
if ((isModEnabled("fournisseur") && !empty($user->rights->fournisseur->lire) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || (isModEnabled("supplier_order") && !empty($user->rights->supplier_order->lire)) || (isModEnabled("supplier_invoice") && !empty($user->rights->supplier_invoice->lire))) {
@@ -1748,7 +1761,7 @@ while ($i < min($num, $limit)) {
// Number of buy prices
if (!empty($arrayfields['p.numbuyprice']['checked'])) {
print ' ';
- if ($obj->tobuy && $usercancreadprice) {
+ if ($product_static->status_buy && $usercancreadprice) {
if (count($productFournList = $product_fourn->list_product_fournisseur_price($obj->rowid)) > 0) {
$htmltext = $product_fourn->display_price_product_fournisseur(1, 1, 0, 1, $productFournList);
print $form->textwithpicto(count($productFournList), $htmltext);
@@ -1788,7 +1801,7 @@ while ($i < min($num, $limit)) {
// Limit alert
if (!empty($arrayfields['p.seuil_stock_alerte']['checked'])) {
print ' ';
- if ($obj->fk_product_type != 1) {
+ if ($product_static->type != 1) {
print $obj->seuil_stock_alerte;
}
print ' ';
@@ -1799,7 +1812,7 @@ while ($i < min($num, $limit)) {
// Desired stock
if (!empty($arrayfields['p.desiredstock']['checked'])) {
print '';
- if ($obj->fk_product_type != 1) {
+ if ($product_static->type != 1) {
print $obj->desiredstock;
}
print ' ';
@@ -1810,7 +1823,7 @@ while ($i < min($num, $limit)) {
// Stock real
if (!empty($arrayfields['p.stock']['checked'])) {
print '';
- if ($obj->fk_product_type != 1) {
+ if ($product_static->type != 1) {
if ($obj->seuil_stock_alerte != '' && $product_static->stock_reel < (float) $obj->seuil_stock_alerte) {
print img_warning($langs->trans("StockLowerThanLimit", $obj->seuil_stock_alerte)).' ';
}
@@ -1826,7 +1839,7 @@ while ($i < min($num, $limit)) {
// Stock virtual
if (!empty($arrayfields['stock_virtual']['checked'])) {
print ' ';
- if ($obj->fk_product_type != 1) {
+ if ($product_static->type != 1) {
if ($obj->seuil_stock_alerte != '' && $product_static->stock_theorique < (float) $obj->seuil_stock_alerte) {
print img_warning($langs->trans("StockLowerThanLimit", $obj->seuil_stock_alerte)).' ';
}
@@ -1868,38 +1881,38 @@ while ($i < min($num, $limit)) {
}
// Accountancy code sell
if (!empty($arrayfields[$alias_product_perentity . '.accountancy_code_sell']['checked'])) {
- print ' '.$obj->accountancy_code_sell.' ';
+ print ''.$product_static->accountancy_code_sell.' ';
if (!$i) {
$totalarray['nbfield']++;
}
}
if (!empty($arrayfields[$alias_product_perentity . '.accountancy_code_sell_intra']['checked'])) {
- print ''.$obj->accountancy_code_sell_intra.' ';
+ print ''.$product_static->accountancy_code_sell_intra.' ';
if (!$i) {
$totalarray['nbfield']++;
}
}
if (!empty($arrayfields[$alias_product_perentity . '.accountancy_code_sell_export']['checked'])) {
- print ''.$obj->accountancy_code_sell_export.' ';
+ print ''.$product_static->accountancy_code_sell_export.' ';
if (!$i) {
$totalarray['nbfield']++;
}
}
// Accountancy code buy
if (!empty($arrayfields[$alias_product_perentity . '.accountancy_code_buy']['checked'])) {
- print ''.$obj->accountancy_code_buy.' ';
+ print ''.$product_static->accountancy_code_buy.' ';
if (!$i) {
$totalarray['nbfield']++;
}
}
if (!empty($arrayfields[$alias_product_perentity . '.accountancy_code_buy_intra']['checked'])) {
- print ''.$obj->accountancy_code_buy_intra.' ';
+ print ''.$product_static->accountancy_code_buy_intra.' ';
if (!$i) {
$totalarray['nbfield']++;
}
}
if (!empty($arrayfields[$alias_product_perentity . '.accountancy_code_buy_export']['checked'])) {
- print ''.$obj->accountancy_code_buy_export.' ';
+ print ''.$product_static->accountancy_code_buy_export.' ';
if (!$i) {
$totalarray['nbfield']++;
}
@@ -1935,7 +1948,7 @@ while ($i < min($num, $limit)) {
if (!empty($conf->use_javascript_ajax) && $user->hasRight("produit", "creer") && !empty($conf->global->MAIN_DIRECT_STATUS_UPDATE)) {
print ajax_object_onoff($product_static, 'status', 'tosell', 'ProductStatusOnSell', 'ProductStatusNotOnSell');
} else {
- print $product_static->LibStatut($obj->tosell, 5, 0);
+ print $product_static->LibStatut($product_static->status, 5, 0);
}
print '';
if (!$i) {
@@ -1948,7 +1961,7 @@ while ($i < min($num, $limit)) {
if (!empty($conf->use_javascript_ajax) && $user->hasRight("produit", "creer") && !empty($conf->global->MAIN_DIRECT_STATUS_UPDATE)) {
print ajax_object_onoff($product_static, 'status_buy', 'tobuy', 'ProductStatusOnBuy', 'ProductStatusNotOnBuy');
} else {
- print $product_static->LibStatut($obj->tobuy, 5, 1);
+ print $product_static->LibStatut($product_static->status_buy, 5, 1);
}
print '';
if (!$i) {
diff --git a/htdocs/product/note.php b/htdocs/product/note.php
index 0d7ad91af5f..ba83e64c401 100644
--- a/htdocs/product/note.php
+++ b/htdocs/product/note.php
@@ -54,13 +54,13 @@ $permissionnote = $user->rights->produit->creer; // Used by the include of actio
if ($object->id > 0) {
if ($object->type == $object::TYPE_PRODUCT) {
- restrictedArea($user, 'produit', $object->id, 'product&product', '', '');
+ restrictedArea($user, 'product', $object->id, 'product&product', '', '');
}
if ($object->type == $object::TYPE_SERVICE) {
restrictedArea($user, 'service', $object->id, 'product&product', '', '');
}
} else {
- restrictedArea($user, 'produit|service', $fieldvalue, 'product&product', '', '', $fieldtype);
+ restrictedArea($user, 'product|service', $fieldvalue, 'product&product', '', '', $fieldtype);
}
diff --git a/htdocs/product/price.php b/htdocs/product/price.php
index d7005fa439a..cde676c9732 100644
--- a/htdocs/product/price.php
+++ b/htdocs/product/price.php
@@ -136,6 +136,7 @@ if (empty($reshook)) {
$npr = preg_match('/\*/', $tva_tx_txt) ? 1 : 0;
$localtax1 = 0; $localtax2 = 0; $localtax1_type = '0'; $localtax2_type = '0';
// If value contains the unique code of vat line (new recommanded method), we use it to find npr and local taxes
+
if (preg_match('/\((.*)\)/', $tva_tx_txt, $reg)) {
// We look into database using code (we can't use get_localtax() because it depends on buyer that is not known). Same in create product.
$vatratecode = $reg[1];
@@ -229,7 +230,7 @@ if (empty($reshook)) {
$oldnpr = $object->tva_npr;
//$localtaxarray=array('0'=>$localtax1_type,'1'=>$localtax1,'2'=>$localtax2_type,'3'=>$localtax2);
- $localtaxarray = array(); // We do not store localtaxes into product, we will use instead the "vat code" to retrieve them.
+ $localtaxarray = array(); // We do not store localtaxes into product, we will use instead the "vat code" to retrieve them when required.
$level = 0;
$ret = $object->updatePrice($oldprice, $oldpricebasetype, $user, $tva_tx, $oldminprice, $level, $oldnpr, 0, 0, $localtaxarray, $vatratecode);
@@ -877,7 +878,7 @@ dol_banner_tab($object, 'ref', $linkback, $shownav, 'ref');
print '';
print '
';
-print '
';
+print '';
// Price per customer segment/level
if (!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) {
@@ -1000,6 +1001,7 @@ if (!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_
print '';
print ''.$langs->trans("DefaultTaxRate").' ';
+ // TODO We show localtax from $object, but this properties may not be correct. Only value $object->default_vat_code is guaranted.
$positiverates = '';
if (price2num($object->tva_tx)) {
$positiverates .= ($positiverates ? '/ ' : '').price2num($object->tva_tx);
@@ -1013,6 +1015,7 @@ if (!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_
if (empty($positiverates)) {
$positiverates = '0';
}
+
print vatrate($positiverates.($object->default_vat_code ? ' ('.$object->default_vat_code.')' : ''), true, $object->tva_npr, 1);
/*
if ($object->default_vat_code)
@@ -1026,7 +1029,7 @@ if (!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_
print '';
+ print '';
print '';
print $langs->trans("PriceLevel");
if ($user->admin) {
@@ -1217,9 +1220,9 @@ if (!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_
if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) { // TODO Fix the form inside tr instead of td
print ' '.$langs->trans("PriceByQuantity");
if ($object->prices_by_qty[0] == 0) {
- print ' ('.$langs->trans("Activate").')';
+ print ' ('.$langs->trans("Activate").')';
} else {
- print ' ('.$langs->trans("DisablePriceByQty").')';
+ print ' ('.$langs->trans("DisablePriceByQty").')';
}
print ' ';
diff --git a/htdocs/product/reassort.php b/htdocs/product/reassort.php
index ed7b7e3e77f..c5b27a00c20 100644
--- a/htdocs/product/reassort.php
+++ b/htdocs/product/reassort.php
@@ -147,7 +147,7 @@ $reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters, $obje
$sql .= $hookmanager->resPrint;
$sql .= ' FROM '.MAIN_DB_PREFIX.'product as p';
$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product_stock as s ON p.rowid = s.fk_product';
-$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'entrepot as e ON s.fk_entrepot = e.rowid AND e.entity IN ('.getEntity('entrepot').')';
+$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'entrepot as e ON s.fk_entrepot = e.rowid AND e.entity IN ('.getEntity('stock').')';
if (!empty($conf->global->PRODUCT_USE_UNITS)) {
$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_units as u on p.fk_unit = u.rowid';
}
diff --git a/htdocs/product/reassortlot.php b/htdocs/product/reassortlot.php
index f3ad55d526d..40c8fcf4292 100644
--- a/htdocs/product/reassortlot.php
+++ b/htdocs/product/reassortlot.php
@@ -635,7 +635,7 @@ while ($i < $imaxinloop) {
$product_static->status_batch = $objp->tobatch;
$product_lot_static->batch = $objp->batch;
- $product_lot_static->product_id = $objp->rowid;
+ $product_lot_static->fk_product = $objp->rowid;
$product_lot_static->id = $objp->lotid;
$product_lot_static->eatby = $objp->eatby;
$product_lot_static->sellby = $objp->sellby;
@@ -659,6 +659,7 @@ while ($i < $imaxinloop) {
if (isModEnabled("service") && $type == 1) {
print ' ';
+ $regs = array();
if (preg_match('/([0-9]+)y/i', $objp->duration, $regs)) {
print $regs[1].' '.$langs->trans("DurationYear");
} elseif (preg_match('/([0-9]+)m/i', $objp->duration, $regs)) {
diff --git a/htdocs/product/stock/list.php b/htdocs/product/stock/list.php
index b0c33e61484..bd8b5a2932a 100644
--- a/htdocs/product/stock/list.php
+++ b/htdocs/product/stock/list.php
@@ -533,7 +533,7 @@ print $hookmanager->resPrint;
// Status
if (!empty($arrayfields['t.statut']['checked'])) {
print ' ';
- print $form->selectarray('search_status', $warehouse->statuts, $search_status, 1, 0, 0, '', 1);
+ print $form->selectarray('search_status', $warehouse->statuts, $search_status, 1, 0, 0, '', 1, 0, 0, '', 'onrightofpage');
print ' ';
}
diff --git a/htdocs/product/stock/movement_list.php b/htdocs/product/stock/movement_list.php
index 56030347d12..c6a3727557b 100644
--- a/htdocs/product/stock/movement_list.php
+++ b/htdocs/product/stock/movement_list.php
@@ -619,6 +619,9 @@ $parameters = array();
$reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters); // Note that $action and $object may have been modified by hook
$sql .= preg_replace('/^,/', '', $hookmanager->resPrint);
$sql = preg_replace('/,\s*$/', '', $sql);
+
+$sqlfields = $sql; // $sql fields to remove for count total
+
$sql .= " FROM ".MAIN_DB_PREFIX."entrepot as e,";
$sql .= " ".MAIN_DB_PREFIX."product as p,";
$sql .= " ".MAIN_DB_PREFIX."stock_mouvement as m";
@@ -690,24 +693,22 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
$parameters = array();
$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters); // Note that $action and $object may have been modified by hook
$sql .= $hookmanager->resPrint;
+
// Count total nb of records
$nbtotalofrecords = '';
if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
- /* This old and fast method to get and count full list returns all record so use a high amount of memory.
- $resql = $db->query($sql);
- $nbtotalofrecords = $db->num_rows($resql);
- */
- /* The slow method does not consume memory on mysql (not tested on pgsql) */
- /*$resql = $db->query($sql, 0, 'auto', 1);
- while ($db->fetch_object($resql)) {
- $nbtotalofrecords++;
- }*/
/* The fast and low memory method to get and count full list converts the sql into a sql count */
- $sqlforcount = preg_replace('/^SELECT[a-zA-Z0-9\._\s\(\),=<>\:\-\']+\sFROM/Ui', 'SELECT COUNT(*) as nbtotalofrecords FROM', $sql);
+ $sqlforcount = preg_replace('/^'.preg_quote($sqlfields, '/').'/', 'SELECT COUNT(*) as nbtotalofrecords', $sql);
+ $sqlforcount = preg_replace('/GROUP BY .*$/', '', $sqlforcount);
$resql = $db->query($sqlforcount);
- $objforcount = $db->fetch_object($resql);
- $nbtotalofrecords = $objforcount->nbtotalofrecords;
- if (($page * $limit) > $nbtotalofrecords) { // if total of record found is smaller than page * limit, goto and load page 0
+ if ($resql) {
+ $objforcount = $db->fetch_object($resql);
+ $nbtotalofrecords = $objforcount->nbtotalofrecords;
+ } else {
+ dol_print_error($db);
+ }
+
+ if (($page * $limit) > $nbtotalofrecords) { // if total resultset is smaller then paging size (filtering), goto and load page 0
$page = 0;
$offset = 0;
}
diff --git a/htdocs/product/stock/replenish.php b/htdocs/product/stock/replenish.php
index be7f006d5a0..d1644623ce1 100644
--- a/htdocs/product/stock/replenish.php
+++ b/htdocs/product/stock/replenish.php
@@ -465,7 +465,7 @@ if ($usevirtualstock) {
$sqlProductionToConsume .= " ".MAIN_DB_PREFIX."mrp_production as mp5";
$sqlProductionToConsume .= " WHERE mm5.rowid = mp5.fk_mo AND mm5.entity IN (".getEntity(!empty($conf->global->STOCK_CALCULATE_VIRTUAL_STOCK_TRANSVERSE_MODE) ? 'stock' : 'mo').")";
$sqlProductionToConsume .= " AND mp5.fk_product = p.rowid";
- $sqlProductionToConsume .= " AND mp5.role IN ('toconsume', 'consummed')";
+ $sqlProductionToConsume .= " AND mp5.role IN ('toconsume', 'consumed')";
$sqlProductionToConsume .= " AND mm5.status IN (1,2))";
$sqlProductionToProduce = "(SELECT GREATEST(0, ".$db->ifsql("SUM(".$db->ifsql("mp5.role = 'toproduce'", 'mp5.qty', '- mp5.qty').") IS NULL", "0", "SUM(".$db->ifsql("mp5.role = 'toproduce'", 'mp5.qty', '- mp5.qty').")").") as qty"; // We need the ifsql because if result is 0 for product p.rowid, we must return 0 and not NULL
diff --git a/htdocs/projet/activity/permonth.php b/htdocs/projet/activity/permonth.php
index 273affc3563..49849b362ba 100644
--- a/htdocs/projet/activity/permonth.php
+++ b/htdocs/projet/activity/permonth.php
@@ -419,7 +419,7 @@ if (!empty($conf->categorie->enabled))
// If the user can view user other than himself
$moreforfilter .= '';
$moreforfilter .= '
';
-$includeonly = 'hierachyme';
+$includeonly = 'hierarchyme';
if (empty($user->rights->user->user->lire)) {
$includeonly = array($user->id);
}
diff --git a/htdocs/projet/class/api_tasks.class.php b/htdocs/projet/class/api_tasks.class.php
index 0eaf8654421..cd232061bc4 100644
--- a/htdocs/projet/class/api_tasks.class.php
+++ b/htdocs/projet/class/api_tasks.class.php
@@ -544,7 +544,7 @@ class Tasks extends DolibarrApi
$this->task->timespent_datehour = $newdate;
$this->task->timespent_withhour = 1;
$this->task->timespent_duration = $duration;
- $this->task->timespent_fk_user = $user_id;
+ $this->task->timespent_fk_user = $uid;
$this->task->timespent_note = $note;
$result = $this->task->addTimeSpent(DolibarrApiAccess::$user, 0);
diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index e3865663bf7..9c8b4ebee26 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -306,9 +306,9 @@ class Project extends CommonObject
'tms' =>array('type'=>'timestamp', 'label'=>'DateModificationShort', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>405),
'fk_user_creat' =>array('type'=>'integer', 'label'=>'UserCreation', 'enabled'=>1, 'visible'=>0, 'notnull'=>1, 'position'=>410),
'fk_user_modif' =>array('type'=>'integer', 'label'=>'UserModification', 'enabled'=>1, 'visible'=>0, 'position'=>415),
- 'import_key' =>array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>1, 'visible'=>0, 'position'=>420),
+ 'import_key' =>array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>1, 'visible'=>-1, 'position'=>420),
'email_msgid'=>array('type'=>'varchar(255)', 'label'=>'EmailMsgID', 'enabled'=>1, 'visible'=>-1, 'position'=>450, 'help'=>'EmailMsgIDWhenSourceisEmail'),
- 'fk_statut' =>array('type'=>'smallint(6)', 'label'=>'Status', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'position'=>500)
+ 'fk_statut' =>array('type'=>'smallint(6)', 'label'=>'Status', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'position'=>500),
);
// END MODULEBUILDER PROPERTIES
@@ -435,6 +435,7 @@ class Project extends CommonObject
$sql .= ", note_private";
$sql .= ", note_public";
$sql .= ", entity";
+ $sql .= ", ip";
$sql .= ") VALUES (";
$sql .= "'".$this->db->escape($this->ref)."'";
$sql .= ", '".$this->db->escape($this->title)."'";
@@ -466,6 +467,7 @@ class Project extends CommonObject
$sql .= ", ".($this->note_private ? "'".$this->db->escape($this->note_private)."'" : 'null');
$sql .= ", ".($this->note_public ? "'".$this->db->escape($this->note_public)."'" : 'null');
$sql .= ", ".((int) $conf->entity);
+ $sql .= ", ".(!isset($this->ip) ? 'NULL' : "'".$this->db->escape($this->ip)."'");
$sql .= ")";
dol_syslog(get_class($this)."::create", LOG_DEBUG);
diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php
index b751d8d1e8e..ef04862eb71 100644
--- a/htdocs/projet/class/task.class.php
+++ b/htdocs/projet/class/task.class.php
@@ -2203,7 +2203,7 @@ class Task extends CommonObjectLine
$sql .= " t.rowid as taskid, t.progress as progress, t.fk_statut as status,";
$sql .= " t.dateo as date_start, t.datee as datee";
$sql .= " FROM ".MAIN_DB_PREFIX."projet as p";
- $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s on p.fk_soc = s.rowid";
+ //$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s on p.fk_soc = s.rowid";
//if (! $user->rights->societe->client->voir && ! $socid) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON sc.fk_soc = s.rowid";
$sql .= ", ".MAIN_DB_PREFIX."projet_task as t";
$sql .= " WHERE p.entity IN (".getEntity('project', 0).')';
diff --git a/htdocs/projet/class/taskstats.class.php b/htdocs/projet/class/taskstats.class.php
index a5b088f01e8..5794d585101 100644
--- a/htdocs/projet/class/taskstats.class.php
+++ b/htdocs/projet/class/taskstats.class.php
@@ -193,4 +193,35 @@ class TaskStats extends Stats
// var_dump($res);print '
';
return $res;
}
+
+
+ /**
+ * Return the Task amount by month for a year
+ *
+ * @param int $year Year to scan
+ * @param int $format 0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
+ * @return array Array with amount by month
+ */
+ public function getAmountByMonth($year, $format = 0)
+ {
+ // Return an empty array at the moment because task has no amount
+ return array();
+ }
+
+ /**
+ * Return average of entity by month
+ * @param int $year year number
+ * @return int value
+ */
+ protected function getAverageByMonth($year)
+ {
+ $sql = "SELECT date_format(datef,'%m') as dm, AVG(f.".$this->field.")";
+ $sql .= " FROM ".$this->from;
+ $sql .= " WHERE f.datef BETWEEN '".$this->db->idate(dol_get_first_day($year))."' AND '".$this->db->idate(dol_get_last_day($year))."'";
+ $sql .= " AND ".$this->where;
+ $sql .= " GROUP BY dm";
+ $sql .= $this->db->order('dm', 'DESC');
+
+ return $this->_getAverageByMonth($year, $sql);
+ }
}
diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php
index 1d1ad691505..b31666245d4 100644
--- a/htdocs/projet/list.php
+++ b/htdocs/projet/list.php
@@ -113,6 +113,13 @@ $search_accept_booth_suggestions = GETPOST('search_accept_booth_suggestions', 'i
$search_price_registration = GETPOST("search_price_registration", 'alpha');
$search_price_booth = GETPOST("search_price_booth", 'alpha');
$search_login = GETPOST('search_login', 'alpha');
+$searchCategoryCustomerOperator = 0;
+if (GETPOSTISSET('formfilteraction')) {
+ $searchCategoryCustomerOperator = GETPOST('search_category_customer_operator', 'int');
+} elseif (!empty($conf->global->MAIN_SEARCH_CAT_OR_BY_DEFAULT)) {
+ $searchCategoryCustomerOperator = $conf->global->MAIN_SEARCH_CAT_OR_BY_DEFAULT;
+}
+$searchCategoryCustomerList = GETPOST('search_category_customer_list', 'array');
$optioncss = GETPOST('optioncss', 'alpha');
$mine = ((GETPOST('mode') == 'mine') ? 1 : 0);
@@ -407,7 +414,7 @@ $distinct = 'DISTINCT'; // We add distinct until we are added a protection to be
$sql = "SELECT ".$distinct." p.rowid as id, p.ref, p.title, p.fk_statut as status, p.fk_opp_status, p.public, p.fk_user_creat,";
$sql .= " p.datec as date_creation, p.dateo as date_start, p.datee as date_end, p.opp_amount, p.opp_percent, (p.opp_amount*p.opp_percent/100) as opp_weighted_amount, p.tms as date_update, p.budget_amount,";
$sql .= " p.usage_opportunity, p.usage_task, p.usage_bill_time, p.usage_organize_event,";
-$sql .= " p.email_msgid,";
+$sql .= " p.email_msgid, p.import_key,";
$sql .= " p.accept_conference_suggestions, p.accept_booth_suggestions, p.price_registration, p.price_booth,";
$sql .= " s.rowid as socid, s.nom as name, s.name_alias as alias, s.email, s.email, s.phone, s.fax, s.address, s.town, s.zip, s.fk_pays, s.client, s.code_client,";
$sql .= " country.code as country_code,";
@@ -594,6 +601,50 @@ if (!empty($searchCategoryProjectList)) {
}
}
}
+$searchCategoryCustomerSqlList = array();
+if ($searchCategoryCustomerOperator == 1) {
+ $existsCategoryCustomerList = array();
+ foreach ($searchCategoryCustomerList as $searchCategoryCustomer) {
+ if (intval($searchCategoryCustomer) == -2) {
+ $sqlCategoryCustomerNotExists = " NOT EXISTS (";
+ $sqlCategoryCustomerNotExists .= " SELECT cat_cus.fk_soc";
+ $sqlCategoryCustomerNotExists .= " FROM ".$db->prefix()."categorie_societe AS cat_cus";
+ $sqlCategoryCustomerNotExists .= " WHERE cat_cus.fk_soc = p.fk_soc";
+ $sqlCategoryCustomerNotExists .= " )";
+ $searchCategoryCustomerSqlList[] = $sqlCategoryCustomerNotExists;
+ } elseif (intval($searchCategoryCustomer) > 0) {
+ $existsCategoryCustomerList[] = $db->escape($searchCategoryCustomer);
+ }
+ }
+ if (!empty($existsCategoryCustomerList)) {
+ $sqlCategoryCustomerExists = " EXISTS (";
+ $sqlCategoryCustomerExists .= " SELECT cat_cus.fk_soc";
+ $sqlCategoryCustomerExists .= " FROM ".$db->prefix()."categorie_societe AS cat_cus";
+ $sqlCategoryCustomerExists .= " WHERE cat_cus.fk_soc = p.fk_soc";
+ $sqlCategoryCustomerExists .= " AND cat_cus.fk_categorie IN (".$db->sanitize(implode(',', $existsCategoryCustomerList)).")";
+ $sqlCategoryCustomerExists .= " )";
+ $searchCategoryCustomerSqlList[] = $sqlCategoryCustomerExists;
+ }
+ if (!empty($searchCategoryCustomerSqlList)) {
+ $sql .= " AND (".implode(' OR ', $searchCategoryCustomerSqlList).")";
+ }
+} else {
+ foreach ($searchCategoryCustomerList as $searchCategoryCustomer) {
+ if (intval($searchCategoryCustomer) == -2) {
+ $sqlCategoryCustomerNotExists = " NOT EXISTS (";
+ $sqlCategoryCustomerNotExists .= " SELECT cat_cus.fk_soc";
+ $sqlCategoryCustomerNotExists .= " FROM ".$db->prefix()."categorie_societe AS cat_cus";
+ $sqlCategoryCustomerNotExists .= " WHERE cat_cus.fk_soc = p.fk_soc";
+ $sqlCategoryCustomerNotExists .= " )";
+ $searchCategoryCustomerSqlList[] = $sqlCategoryCustomerNotExists;
+ } elseif (intval($searchCategoryCustomer) > 0) {
+ $searchCategoryCustomerSqlList[] = "p.fk_soc IN (SELECT fk_soc FROM ".$db->prefix()."categorie_societe WHERE fk_categorie = ".((int) $searchCategoryCustomer).")";
+ }
+ }
+ if (!empty($searchCategoryCustomerSqlList)) {
+ $sql .= " AND (".implode(' AND ', $searchCategoryCustomerSqlList).")";
+ }
+}
// Add where from extra fields
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
// Add where from hooks
@@ -794,6 +845,9 @@ if ($search_login) {
if ($optioncss != '') {
$param .= '&optioncss='.urlencode($optioncss);
}
+foreach ($searchCategoryCustomerList as $searchCategoryCustomer) {
+ $param .= "&search_category_customer_list[]=".urlencode($searchCategoryCustomer);
+}
// Add $param from extra fields
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
@@ -900,6 +954,18 @@ if (isModEnabled('categorie') && $user->rights->categorie->lire) {
$formcategory = new FormCategory($db);
$moreforfilter .= $formcategory->getFilterBox(Categorie::TYPE_PROJECT, $search_category_array);
}
+// Filter on customer categories
+if (!empty($conf->global->MAIN_SEARCH_CATEGORY_CUSTOMER_ON_PROJECT_LIST) && !empty($conf->categorie->enabled) && $user->rights->categorie->lire) {
+ $moreforfilter .= '
';
+ $tmptitle = $langs->transnoentities('CustomersProspectsCategoriesShort');
+ $moreforfilter .= img_picto($tmptitle, 'category', 'class="pictofixedwidth"');
+ $categoriesArr = $form->select_all_categories(Categorie::TYPE_CUSTOMER, '', '', 64, 0, 1);
+ $categoriesArr[-2] = '- '.$langs->trans('NotCategorized').' -';
+ $moreforfilter .= Form::multiselectarray('search_category_customer_list', $categoriesArr, $searchCategoryCustomerList, 0, 0, 'minwidth300', 0, 0, '', 'category', $tmptitle);
+ $moreforfilter .= '
';
+}
if (!empty($moreforfilter)) {
print '
';
@@ -1104,6 +1170,11 @@ if (!empty($arrayfields['p.email_msgid']['checked'])) {
print '
';
print ' ';
}
+if (!empty($arrayfields['p.import_key']['checked'])) {
+ // Import key
+ print '';
+ print ' ';
+}
if (!empty($arrayfields['p.fk_statut']['checked'])) {
print '';
$arrayofstatus = array();
@@ -1111,7 +1182,7 @@ if (!empty($arrayfields['p.fk_statut']['checked'])) {
$arrayofstatus[$key] = $langs->trans($val);
}
$arrayofstatus['99'] = $langs->trans("NotClosed").' ('.$langs->trans('Draft').' + '.$langs->trans('Opened').')';
- print $form->selectarray('search_status', $arrayofstatus, $search_status, 1, 0, 0, '', 0, 0, 0, '', 'minwidth75imp maxwidth125 selectarrowonleft');
+ print $form->selectarray('search_status', $arrayofstatus, $search_status, 1, 0, 0, '', 0, 0, 0, '', 'minwidth75imp maxwidth125 selectarrowonleft onrightofpage');
print ajax_combobox('search_status');
print ' ';
}
@@ -1212,6 +1283,9 @@ if (!empty($arrayfields['p.tms']['checked'])) {
if (!empty($arrayfields['p.email_msgid']['checked'])) {
print_liste_field_titre($arrayfields['p.email_msgid']['label'], $_SERVER["PHP_SELF"], "p.email_msgid", "", $param, '', $sortfield, $sortorder, 'center ');
}
+if (!empty($arrayfields['p.import_key']['checked'])) {
+ print_liste_field_titre($arrayfields['p.import_key']['label'], $_SERVER["PHP_SELF"], "p.import_key", "", $param, '', $sortfield, $sortorder, '');
+}
if (!empty($arrayfields['p.fk_statut']['checked'])) {
print_liste_field_titre($arrayfields['p.fk_statut']['label'], $_SERVER["PHP_SELF"], "p.fk_statut", "", $param, '', $sortfield, $sortorder, 'right ');
}
@@ -1665,6 +1739,13 @@ while ($i < $imaxinloop) {
print '';
if (!$i) $totalarray['nbfield']++;
}
+ // Import key
+ if (!empty($arrayfields['p.import_key']['checked'])) {
+ print ''.dol_escape_htmltag($obj->import_key).' ';
+ if (!$i) {
+ $totalarray['nbfield']++;
+ }
+ }
// Status
if (!empty($arrayfields['p.fk_statut']['checked'])) {
print ''.$object->getLibStatut(5).' ';
diff --git a/htdocs/projet/tasks/list.php b/htdocs/projet/tasks/list.php
index fdec5c6a958..f7ba2cc89f4 100644
--- a/htdocs/projet/tasks/list.php
+++ b/htdocs/projet/tasks/list.php
@@ -70,6 +70,13 @@ $search_task_budget_amount = GETPOST('search_task_budget_amount');
$search_societe = GETPOST('search_societe');
$search_societe_alias = GETPOST('search_societe_alias');
$search_opp_status = GETPOST("search_opp_status", 'alpha');
+$searchCategoryCustomerOperator = 0;
+if (GETPOSTISSET('formfilteraction')) {
+ $searchCategoryCustomerOperator = GETPOST('search_category_customer_operator', 'int');
+} elseif (!empty($conf->global->MAIN_SEARCH_CAT_OR_BY_DEFAULT)) {
+ $searchCategoryCustomerOperator = $conf->global->MAIN_SEARCH_CAT_OR_BY_DEFAULT;
+}
+$searchCategoryCustomerList = GETPOST('search_category_customer_list', 'array');
$mine = GETPOST('mode', 'alpha') == 'mine' ? 1 : 0;
if ($mine) {
@@ -235,6 +242,7 @@ if (empty($reshook)) {
$search_datelimit_start = '';
$search_datelimit_end = '';
$toselect = array();
+ $searchCategoryCustomerList = array();
$search_array_options = array();
}
@@ -464,6 +472,50 @@ if (!empty($searchCategoryProjectList)) {
}
}
}
+$searchCategoryCustomerSqlList = array();
+if ($searchCategoryCustomerOperator == 1) {
+ $existsCategoryCustomerList = array();
+ foreach ($searchCategoryCustomerList as $searchCategoryCustomer) {
+ if (intval($searchCategoryCustomer) == -2) {
+ $sqlCategoryCustomerNotExists = " NOT EXISTS (";
+ $sqlCategoryCustomerNotExists .= " SELECT cat_cus.fk_soc";
+ $sqlCategoryCustomerNotExists .= " FROM ".$db->prefix()."categorie_societe AS cat_cus";
+ $sqlCategoryCustomerNotExists .= " WHERE cat_cus.fk_soc = p.fk_soc";
+ $sqlCategoryCustomerNotExists .= " )";
+ $searchCategoryCustomerSqlList[] = $sqlCategoryCustomerNotExists;
+ } elseif (intval($searchCategoryCustomer) > 0) {
+ $existsCategoryCustomerList[] = $db->escape($searchCategoryCustomer);
+ }
+ }
+ if (!empty($existsCategoryCustomerList)) {
+ $sqlCategoryCustomerExists = " EXISTS (";
+ $sqlCategoryCustomerExists .= " SELECT cat_cus.fk_soc";
+ $sqlCategoryCustomerExists .= " FROM ".$db->prefix()."categorie_societe AS cat_cus";
+ $sqlCategoryCustomerExists .= " WHERE cat_cus.fk_soc = p.fk_soc";
+ $sqlCategoryCustomerExists .= " AND cat_cus.fk_categorie IN (".$db->sanitize(implode(',', $existsCategoryCustomerList)).")";
+ $sqlCategoryCustomerExists .= " )";
+ $searchCategoryCustomerSqlList[] = $sqlCategoryCustomerExists;
+ }
+ if (!empty($searchCategoryCustomerSqlList)) {
+ $sql .= " AND (".implode(' OR ', $searchCategoryCustomerSqlList).")";
+ }
+} else {
+ foreach ($searchCategoryCustomerList as $searchCategoryCustomer) {
+ if (intval($searchCategoryCustomer) == -2) {
+ $sqlCategoryCustomerNotExists = " NOT EXISTS (";
+ $sqlCategoryCustomerNotExists .= " SELECT cat_cus.fk_soc";
+ $sqlCategoryCustomerNotExists .= " FROM ".$db->prefix()."categorie_societe AS cat_cus";
+ $sqlCategoryCustomerNotExists .= " WHERE cat_cus.fk_soc = p.fk_soc";
+ $sqlCategoryCustomerNotExists .= " )";
+ $searchCategoryCustomerSqlList[] = $sqlCategoryCustomerNotExists;
+ } elseif (intval($searchCategoryCustomer) > 0) {
+ $searchCategoryCustomerSqlList[] = "p.fk_soc IN (SELECT fk_soc FROM ".$db->prefix()."categorie_societe WHERE fk_categorie = ".((int) $searchCategoryCustomer).")";
+ }
+ }
+ if (!empty($searchCategoryCustomerSqlList)) {
+ $sql .= " AND (".implode(' AND ', $searchCategoryCustomerSqlList).")";
+ }
+}
// Add where from extra fields
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
// Add where from hooks
@@ -617,6 +669,9 @@ if ($search_task_user > 0) {
if ($optioncss != '') {
$param .= '&optioncss='.urlencode($optioncss);
}
+foreach ($searchCategoryCustomerList as $searchCategoryCustomer) {
+ $param .= "&search_category_customer_list[]=".urlencode($searchCategoryCustomer);
+}
// Add $param from extra fields
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
// Add $param from hooks
@@ -712,6 +767,19 @@ if (empty($user->rights->user->user->lire)) {
$moreforfilter .= img_picto($tmptitle, 'user', 'class="pictofixedwidth"').$form->select_dolusers($search_task_user, 'search_task_user', $tmptitle, '', 0, $includeonly, '', 0, 0, 0, '', 0, '', 'maxwidth250');
$moreforfilter .= '';
+// Filter on customer categories
+if (!empty($conf->global->MAIN_SEARCH_CATEGORY_CUSTOMER_ON_TASK_LIST) && !empty($conf->categorie->enabled) && $user->rights->categorie->lire) {
+ $moreforfilter .= '
';
+ $tmptitle = $langs->transnoentities('CustomersProspectsCategoriesShort');
+ $moreforfilter .= img_picto($tmptitle, 'category', 'class="pictofixedwidth"');
+ $categoriesArr = $form->select_all_categories(Categorie::TYPE_CUSTOMER, '', '', 64, 0, 1);
+ $categoriesArr[-2] = '- '.$langs->trans('NotCategorized').' -';
+ $moreforfilter .= Form::multiselectarray('search_category_customer_list', $categoriesArr, $searchCategoryCustomerList, 0, 0, 'minwidth300', 0, 0, '', 'category', $tmptitle);
+ $moreforfilter .= '
';
+}
+
if (!empty($moreforfilter)) {
print '
';
print $moreforfilter;
diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php
index 8e30664232b..fce9813987c 100644
--- a/htdocs/projet/tasks/time.php
+++ b/htdocs/projet/tasks/time.php
@@ -54,6 +54,7 @@ $toselect = GETPOST('toselect', 'array'); // Array of ids of elements selected i
$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'timespentlist'; // To manage different context of search
$backtopage = GETPOST('backtopage', 'alpha'); // Go back to a dedicated page
$optioncss = GETPOST('optioncss', 'alpha');
+$mode = GETPOST('mode', 'alpha');
$id = GETPOST('id', 'int');
$projectid = GETPOST('projectid', 'int');
@@ -67,6 +68,14 @@ $search_month = GETPOST('search_month', 'int');
$search_year = GETPOST('search_year', 'int');
$search_datehour = '';
$search_datewithhour = '';
+$search_date_startday = GETPOST('search_date_startday', 'int');
+$search_date_startmonth = GETPOST('search_date_startmonth', 'int');
+$search_date_startyear = GETPOST('search_date_startyear', 'int');
+$search_date_endday = GETPOST('search_date_endday', 'int');
+$search_date_endmonth = GETPOST('search_date_endmonth', 'int');
+$search_date_endyear = GETPOST('search_date_endyear', 'int');
+$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear); // Use tzserver
+$search_date_end = dol_mktime(23, 59, 59, $search_date_endmonth, $search_date_endday, $search_date_endyear);
$search_note = GETPOST('search_note', 'alpha');
$search_duration = GETPOST('search_duration', 'int');
$search_value = GETPOST('search_value', 'int');
@@ -76,6 +85,9 @@ $search_user = GETPOST('search_user', 'int');
$search_valuebilled = GETPOST('search_valuebilled', 'int');
$search_product_ref = GETPOST('search_product_ref', 'alpha');
$search_company = GETPOST('$search_company', 'alpha');
+$search_company_alias = GETPOST('$search_company_alias', 'alpha');
+$search_project_ref = GETPOST('$search_project_ref', 'alpha');
+$search_project_label = GETPOST('$search_project_label', 'alpha');
$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
$sortfield = GETPOST('sortfield', 'aZ09comma');
@@ -165,8 +177,19 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x'
$search_value = '';
$search_date_creation = '';
$search_date_update = '';
+ $search_date_startday = '';
+ $search_date_startmonth = '';
+ $search_date_startyear = '';
+ $search_date_endday = '';
+ $search_date_endmonth = '';
+ $search_date_endyear = '';
+ $search_date_start = '';
+ $search_date_end = '';
$search_task_ref = '';
$search_company = '';
+ $search_company_alias = '';
+ $search_project_ref = '';
+ $search_project_label = '';
$search_task_label = '';
$search_user = 0;
$search_valuebilled = '';
@@ -323,10 +346,10 @@ if (($action == 'updateline' || $action == 'updatesplitline') && !$cancel && $us
}
}
-if ($action == 'confirm_deleteline' && $confirm == "yes" && $user->rights->projet->supprimer) {
- $object->fetchTimeSpent(GETPOST('lineid', 'int')); // load properties like $object->timespent_id
+if ($action == 'confirm_deleteline' && $confirm == "yes" && ($user->hasRight('projet', 'time') || $user->hasRight('projet', 'all', 'creer'))) {
+ $object->fetchTimeSpent(GETPOST('lineid', 'int')); // load properties like $object->timespent_xxx
- if (in_array($object->timespent_fk_user, $childids) || $user->rights->projet->all->creer) {
+ if (in_array($object->timespent_fk_user, $childids) || $user->hasRight('projet', 'all', 'creer')) {
$result = $object->delTimeSpent($user); // delete line with $object->timespent_id
if ($result < 0) {
@@ -1219,7 +1242,12 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
$arrayfields = array();
$arrayfields['t.task_date'] = array('label'=>$langs->trans("Date"), 'checked'=>1);
$arrayfields['p.fk_soc'] = array('label'=>$langs->trans("ThirdParty"), 'type'=>'integer:Societe:/societe/class/societe.class.php:1','checked'=>1);
+ $arrayfields['s.name_alias'] = array('label'=>$langs->trans("AliasNameShort"), 'type'=>'integer:Societe:/societe/class/societe.class.php:1');
if ((empty($id) && empty($ref)) || !empty($projectidforalltimes)) { // Not a dedicated task
+ if (! empty($allprojectforuser)) {
+ $arrayfields['p.project_ref'] = ['label' => $langs->trans('RefProject'), 'checked' => 1];
+ $arrayfields['p.project_label'] = ['label' => $langs->trans('ProjectLabel'), 'checked' => 1];
+ }
$arrayfields['t.task_ref'] = array('label'=>$langs->trans("RefTask"), 'checked'=>1);
$arrayfields['t.task_label'] = array('label'=>$langs->trans("LabelTask"), 'checked'=>1);
}
@@ -1258,6 +1286,15 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
if ($search_company != '') {
$param .= '&$search_company='.urlencode($search_company);
}
+ if ($search_company_alias != '') {
+ $param .= '&$search_company_alias='.urlencode($search_company_alias);
+ }
+ if ($search_project_ref != '') {
+ $param .= '&$search_project_ref='.urlencode($search_project_ref);
+ }
+ if ($search_project_label != '') {
+ $param .= '&$search_project_label='.urlencode($search_project_label);
+ }
if ($search_task_label != '') {
$param .= '&search_task_label='.urlencode($search_task_label);
}
@@ -1270,6 +1307,25 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
if ($optioncss != '') {
$param .= '&optioncss='.urlencode($optioncss);
}
+ if ($search_date_startday) {
+ $param .= '&search_date_startday='.urlencode($search_date_startday);
+ }
+ if ($search_date_startmonth) {
+ $param .= '&search_date_startmonth='.urlencode($search_date_startmonth);
+ }
+ if ($search_date_startyear) {
+ $param .= '&search_date_startyear='.urlencode($search_date_startyear);
+ }
+ if ($search_date_endday) {
+ $param .= '&search_date_endday='.urlencode($search_date_endday);
+ }
+ if ($search_date_endmonth) {
+ $param .= '&search_date_endmonth='.urlencode($search_date_endmonth);
+ }
+ if ($search_date_endyear) {
+ $param .= '&search_date_endyear='.urlencode($search_date_endyear);
+ }
+
/*
// Add $param from extra fields
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
@@ -1300,9 +1356,9 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
print '
';
} elseif ($action == 'createtime' && $user->rights->projet->time) {
print '
';
- } elseif ($massaction == 'generateinvoice' && $user->rights->facture->lire) {
+ } elseif ($massaction == 'generateinvoice' && $user->rights->facture->creer) {
print '
';
- } elseif ($massaction == 'generateinter' && $user->rights->ficheinter->lire) {
+ } elseif ($massaction == 'generateinter' && $user->rights->ficheinter->creer) {
print '
';
} else {
print '
';
@@ -1459,7 +1515,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
$sql .= " pt.ref, pt.label, pt.fk_projet,";
$sql .= " u.lastname, u.firstname, u.login, u.photo, u.statut as user_status,";
$sql .= " il.fk_facture as invoice_id, inv.fk_statut,";
- $sql .= " p.fk_soc,";
+ $sql .= " p.fk_soc,s.name_alias,";
// Add fields from hooks
$parameters = array();
$reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters, $object); // Note that $action and $object may have been modified by hook
@@ -1502,6 +1558,15 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
if ($search_company) {
$sql .= natural_search('s.nom', $search_company);
}
+ if ($search_company_alias) {
+ $sql .= natural_search('s.name_alias', $search_company_alias);
+ }
+ if ($search_project_ref) {
+ $sql .= natural_search('p.ref', $search_project_ref);
+ }
+ if ($search_project_label) {
+ $sql .= natural_search('p.title', $search_project_label);
+ }
if ($search_task_label) {
$sql .= natural_search('pt.label', $search_task_label);
}
@@ -1518,6 +1583,13 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
$sql .= ' AND (t.invoice_id = 0 OR t.invoice_id IS NULL)';
}
+ if ($search_date_start) {
+ $sql .= " AND t.task_date >= '".$db->idate($search_date_start)."'";
+ }
+ if ($search_date_end) {
+ $sql .= " AND t.task_date <= '".$db->idate($search_date_end)."'";
+ }
+
$sql .= dolSqlDateFilter('t.task_datehour', $search_day, $search_month, $search_year);
// Add where from hooks
@@ -1740,12 +1812,13 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
print '
';
// Date
if (!empty($arrayfields['t.task_date']['checked'])) {
- print '';
- if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) {
- print ' ';
+ print '';
+ print $form->selectDate($search_date_start ? $search_date_start : -1, 'search_date_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
+ print '
';
+ print '';
+ print $form->selectDate($search_date_end ? $search_date_end : -1, 'search_date_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
+ print '
';
print ' ';
}
// Thirdparty
@@ -1753,8 +1826,18 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
print '';
- if (empty($conf->cache['thridparty'][$task_time->fk_soc])) {
- $tmpsociete = new Societe($db);
- $tmpsociete->fetch($task_time->fk_soc);
- $conf->cache['thridparty'][$task_time->fk_soc] = $tmpsociete;
- } else {
- $tmpsociete = $conf->cache['thridparty'][$task_time->fk_soc];
+ if ($task_time->fk_soc > 0) {
+ if (empty($conf->cache['thridparty'][$task_time->fk_soc])) {
+ $tmpsociete = new Societe($db);
+ $tmpsociete->fetch($task_time->fk_soc);
+ $conf->cache['thridparty'][$task_time->fk_soc] = $tmpsociete;
+ } else {
+ $tmpsociete = $conf->cache['thridparty'][$task_time->fk_soc];
+ }
+ print $tmpsociete->getNomUrl(1, '', 100, 0, 1, empty($arrayfields['s.name_alias']['checked']) ? 0 : 1);
}
- print $tmpsociete->getNomUrl(1);
print ' ';
if (!$i) {
$totalarray['nbfield']++;
}
}
- // Project ref
- if (!empty($allprojectforuser)) {
- print '';
- if (empty($conf->cache['project'][$task_time->fk_projet])) {
- $tmpproject = new Project($db);
- $tmpproject->fetch($task_time->fk_projet);
- $conf->cache['project'][$task_time->fk_projet] = $tmpproject;
- } else {
- $tmpproject = $conf->cache['project'][$task_time->fk_projet];
+ // Thirdparty alias
+ if (!empty($arrayfields['s.name_alias']['checked'])) {
+ print ' ';
+ if ($task_time->fk_soc > 0) {
+ if (empty($conf->cache['thridparty'][$task_time->fk_soc])) {
+ $tmpsociete = new Societe($db);
+ $tmpsociete->fetch($task_time->fk_soc);
+ $conf->cache['thridparty'][$task_time->fk_soc] = $tmpsociete;
+ } else {
+ $tmpsociete = $conf->cache['thridparty'][$task_time->fk_soc];
+ }
+ print $tmpsociete->name_alias;
}
- print $tmpproject->getNomUrl(1);
print ' ';
if (!$i) {
$totalarray['nbfield']++;
}
}
+ // Project ref & label
+ if (!empty($allprojectforuser)) {
+ if (!empty($arrayfields['p.project_ref']['checked'])) {
+ print '';
+ if (empty($conf->cache['project'][$task_time->fk_projet])) {
+ $tmpproject = new Project($db);
+ $tmpproject->fetch($task_time->fk_projet);
+ $conf->cache['project'][$task_time->fk_projet] = $tmpproject;
+ } else {
+ $tmpproject = $conf->cache['project'][$task_time->fk_projet];
+ }
+ print $tmpproject->getNomUrl(1);
+ print ' ';
+ if (! $i) {
+ $totalarray['nbfield']++;
+ }
+ }
+ if (!empty($arrayfields['p.project_label']['checked'])) {
+ print '';
+ if (empty($conf->cache['project'][$task_time->fk_projet])) {
+ $tmpproject = new Project($db);
+ $tmpproject->fetch($task_time->fk_projet);
+ $conf->cache['project'][$task_time->fk_projet] = $tmpproject;
+ } else {
+ $tmpproject = $conf->cache['project'][$task_time->fk_projet];
+ }
+ print $tmpproject->title;
+ print ' ';
+ if (! $i) {
+ $totalarray['nbfield']++;
+ }
+ }
+ }
+
// Task ref
if (!empty($arrayfields['t.task_ref']['checked'])) {
if ((empty($id) && empty($ref)) || !empty($projectidforalltimes)) { // Not a dedicated task
@@ -2107,7 +2237,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
print ' ';
print 'rowid.$param.((empty($id) || $tab == 'timespent') ? '&tab=timespent' : '').'">';
diff --git a/htdocs/public/cron/cron_run_jobs_by_url.php b/htdocs/public/cron/cron_run_jobs_by_url.php
index 497c68954db..2cbea50bb90 100644
--- a/htdocs/public/cron/cron_run_jobs_by_url.php
+++ b/htdocs/public/cron/cron_run_jobs_by_url.php
@@ -142,26 +142,18 @@ if ($result < 0) {
exit;
}
-$qualifiedjobs = array();
-foreach ($object->lines as $val) {
- if (!verifCond($val->test)) {
- continue;
- }
- $qualifiedjobs[] = $val;
-}
-
// TODO Duplicate code. This sequence of code must be shared with code into cron_run_jobs.php script.
// current date
-$nbofjobs = count($qualifiedjobs);
+$nbofjobs = count($object->lines);
$nbofjobslaunchedok = 0;
$nbofjobslaunchedko = 0;
-if (is_array($qualifiedjobs) && (count($qualifiedjobs) > 0)) {
+if (is_array($object->lines) && (count($object->lines) > 0)) {
$savconf = dol_clone($conf);
// Loop over job
- foreach ($qualifiedjobs as $line) {
+ foreach ($object->lines as $line) {
dol_syslog("cron_run_jobs.php cronjobid: ".$line->id." priority=".$line->priority." entity=".$line->entity." label=".$line->label, LOG_DEBUG);
echo "cron_run_jobs.php cronjobid: ".$line->id." priority=".$line->priority." entity=".$line->entity." label=".$line->label;
@@ -191,6 +183,10 @@ if (is_array($qualifiedjobs) && (count($qualifiedjobs) > 0)) {
}
}
+ if (!verifCond($line->test)) {
+ continue;
+ }
+
//If date_next_jobs is less of current date, execute the program, and store the execution time of the next execution in database
if (($line->datenextrun < $now) && (empty($line->datestart) || $line->datestart <= $now) && (empty($line->dateend) || $line->dateend >= $now)) {
echo " - qualified";
diff --git a/htdocs/public/eventorganization/attendee_new.php b/htdocs/public/eventorganization/attendee_new.php
index b4f6ee14217..cb4ba38e628 100644
--- a/htdocs/public/eventorganization/attendee_new.php
+++ b/htdocs/public/eventorganization/attendee_new.php
@@ -56,6 +56,7 @@ require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/paymentterm.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
global $dolibarr_main_url_root;
@@ -229,7 +230,7 @@ if ($reshook < 0) {
}
// Action called when page is submitted
-if (empty($reshook) && $action == 'add' && (!empty($conference->id) && $conference->status!=2 || !empty($project->id) && $project->status == Project::STATUS_VALIDATED)) {
+if (empty($reshook) && $action == 'add' && (!empty($conference->id) && $conference->status==2 || !empty($project->id) && $project->status == Project::STATUS_VALIDATED)) {
$error = 0;
$urlback = '';
@@ -259,10 +260,12 @@ if (empty($reshook) && $action == 'add' && (!empty($conference->id) && $conferen
// Check if attendee already exists (by email and for this event)
$confattendee = new ConferenceOrBoothAttendee($db);
+ $filter = array();
+
if ($type == 'global') {
$filter = array('t.fk_project'=>((int) $id), 'customsql'=>'t.email="'.$db->escape($email).'"');
}
- if ($action == 'conf') {
+ if ($type == 'conf') {
$filter = array('t.fk_actioncomm'=>((int) $id), 'customsql'=>'t.email="'.$db->escape($email).'"');
}
@@ -281,7 +284,39 @@ if (empty($reshook) && $action == 'add' && (!empty($conference->id) && $conferen
$confattendee->fk_actioncomm = $id;
$confattendee->note_public = $note_public;
- $resultconfattendee = $confattendee->create($user);
+ $confattendee->ip = getUserRemoteIP();
+ $nb_post_max = getDolGlobalInt("MAIN_SECURITY_MAX_POST_ON_PUBLIC_PAGES_BY_IP_ADDRESS", 200);
+ $now = dol_now();
+ $minmonthpost = dol_time_plus_duree($now, -1, "m");
+ // Calculate nb of post for IP
+ $nb_post_ip = 0;
+ if ($nb_post_max > 0) { // Calculate only if there is a limit to check
+ $sql = "SELECT COUNT(ref) as nb_attendee";
+ $sql .= " FROM ".MAIN_DB_PREFIX."eventorganization_conferenceorboothattendee";
+ $sql .= " WHERE ip = '".$db->escape($confattendee->ip)."'";
+ $sql .= " AND date_creation > '".$db->idate($minmonthpost)."'";
+ $resql = $db->query($sql);
+ if ($resql) {
+ $num = $db->num_rows($resql);
+ $i = 0;
+ while ($i < $num) {
+ $i++;
+ $obj = $db->fetch_object($resql);
+ $nb_post_ip = $obj->nb_attendee;
+ }
+ }
+ }
+
+ $resultconforbooth = -1;
+
+ if ($nb_post_max > 0 && $nb_post_ip >= $nb_post_max) {
+ $error++;
+ $errmsg .= $langs->trans("AlreadyTooMuchPostOnThisIPAdress");
+ array_push($confattendee->errors, $langs->trans("AlreadyTooMuchPostOnThisIPAdress"));
+ setEventMessage($errmsg, 'errors');
+ } else {
+ $resultconfattendee = $confattendee->create($user);
+ }
if ($resultconfattendee < 0) {
$error++;
$errmsg .= $confattendee->error;
@@ -787,7 +822,7 @@ if ((!empty($conference->id) && $conference->status == ConferenceOrBooth::STATUS
print ' ';
// Country
- print '
trans('Country') . ' ';
+ print ' '.$langs->trans('Country').' ';
print img_picto('', 'country', 'class="pictofixedwidth"');
$country_id = GETPOST('country_id');
if (!$country_id && !empty($conf->global->MEMBER_NEWFORM_FORCECOUNTRYCODE)) {
diff --git a/htdocs/public/members/new.php b/htdocs/public/members/new.php
index 051506d54ac..7b5acf5c99d 100644
--- a/htdocs/public/members/new.php
+++ b/htdocs/public/members/new.php
@@ -73,6 +73,7 @@ require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/cunits.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
// Init vars
$errmsg = '';
@@ -277,152 +278,192 @@ if (empty($reshook) && $action == 'add') {
$adh->pass = GETPOST('pass1');
}
$adh->photo = GETPOST('photo');
- $adh->country_id = $conf->global->MEMBER_NEWFORM_FORCECOUNTRYCODE ? $conf->global->MEMBER_NEWFORM_FORCECOUNTRYCODE : GETPOST('country_id', 'int');
+ $adh->country_id = getDolGlobalString("MEMBER_NEWFORM_FORCECOUNTRYCODE", GETPOST('country_id', 'int'));
$adh->state_id = GETPOST('state_id', 'int');
- $adh->typeid = $conf->global->MEMBER_NEWFORM_FORCETYPE ? $conf->global->MEMBER_NEWFORM_FORCETYPE : GETPOST('typeid', 'int');
+ $adh->typeid = getDolGlobalString("MEMBER_NEWFORM_FORCETYPE", GETPOST('typeid', 'int'));
$adh->note_private = GETPOST('note_private');
- $adh->morphy = $conf->global->MEMBER_NEWFORM_FORCEMORPHY ? $conf->global->MEMBER_NEWFORM_FORCEMORPHY : GETPOST('morphy');
+ $adh->morphy = getDolGlobalString("MEMBER_NEWFORM_FORCEMORPHY", GETPOST('morphy'));
$adh->birth = $birthday;
+ $adh->ip = getUserRemoteIP();
+
+ $nb_post_max = getDolGlobalInt("MAIN_SECURITY_MAX_POST_ON_PUBLIC_PAGES_BY_IP_ADDRESS", 200);
+ $now = dol_now();
+ $minmonthpost = dol_time_plus_duree($now, -1, "m");
+ // Calculate nb of post for IP
+ $nb_post_ip = 0;
+ if ($nb_post_max > 0) { // Calculate only if there is a limit to check
+ $sql = "SELECT COUNT(ref) as nb_adh";
+ $sql .= " FROM ".MAIN_DB_PREFIX."adherent";
+ $sql .= " WHERE ip = '".$db->escape($adh->ip)."'";
+ $sql .= " AND datec > '".$db->idate($minmonthpost)."'";
+ $resql = $db->query($sql);
+ if ($resql) {
+ $num = $db->num_rows($resql);
+ $i = 0;
+ while ($i < $num) {
+ $i++;
+ $obj = $db->fetch_object($resql);
+ $nb_post_ip = $obj->nb_adh;
+ }
+ }
+ }
+
// Fill array 'array_options' with data from add form
$extrafields->fetch_name_optionals_label($adh->table_element);
$ret = $extrafields->setOptionalsFromPost(null, $adh);
if ($ret < 0) {
$error++;
+ $errmsg .= $adh->error;
}
- $result = $adh->create($user);
- if ($result > 0) {
- require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
- $object = $adh;
+ if ($nb_post_max > 0 && $nb_post_ip >= $nb_post_max) {
+ $error++;
+ $errmsg .= $langs->trans("AlreadyTooMuchPostOnThisIPAdress");
+ array_push($adh->errors, $langs->trans("AlreadyTooMuchPostOnThisIPAdress"));
+ }
- $adht = new AdherentType($db);
- $adht->fetch($object->typeid);
+ if (!$error) {
+ $result = $adh->create($user);
+ if ($result > 0) {
+ require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
+ $object = $adh;
- if ($object->email) {
- $subject = '';
- $msg = '';
+ $adht = new AdherentType($db);
+ $adht->fetch($object->typeid);
- // Send subscription email
- include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
- $formmail = new FormMail($db);
- // Set output language
- $outputlangs = new Translate('', $conf);
- $outputlangs->setDefaultLang(empty($object->thirdparty->default_lang) ? $mysoc->default_lang : $object->thirdparty->default_lang);
- // Load traductions files required by page
- $outputlangs->loadLangs(array("main", "members"));
- // Get email content from template
- $arraydefaultmessage = null;
- $labeltouse = $conf->global->ADHERENT_EMAIL_TEMPLATE_AUTOREGISTER;
+ if ($object->email) {
+ $subject = '';
+ $msg = '';
- if (!empty($labeltouse)) {
- $arraydefaultmessage = $formmail->getEMailTemplate($db, 'member', $user, $outputlangs, 0, 1, $labeltouse);
+ // Send subscription email
+ include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
+ $formmail = new FormMail($db);
+ // Set output language
+ $outputlangs = new Translate('', $conf);
+ $outputlangs->setDefaultLang(empty($object->thirdparty->default_lang) ? $mysoc->default_lang : $object->thirdparty->default_lang);
+ // Load traductions files required by page
+ $outputlangs->loadLangs(array("main", "members"));
+ // Get email content from template
+ $arraydefaultmessage = null;
+ $labeltouse = $conf->global->ADHERENT_EMAIL_TEMPLATE_AUTOREGISTER;
+
+ if (!empty($labeltouse)) {
+ $arraydefaultmessage = $formmail->getEMailTemplate($db, 'member', $user, $outputlangs, 0, 1, $labeltouse);
+ }
+
+ if (!empty($labeltouse) && is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0) {
+ $subject = $arraydefaultmessage->topic;
+ $msg = $arraydefaultmessage->content;
+ }
+
+ $substitutionarray = getCommonSubstitutionArray($outputlangs, 0, null, $object);
+ complete_substitutions_array($substitutionarray, $outputlangs, $object);
+ $subjecttosend = make_substitutions($subject, $substitutionarray, $outputlangs);
+ $texttosend = make_substitutions(dol_concatdesc($msg, $adht->getMailOnValid()), $substitutionarray, $outputlangs);
+
+ if ($subjecttosend && $texttosend) {
+ $moreinheader = 'X-Dolibarr-Info: send_an_email by public/members/new.php'."\r\n";
+
+ $result = $object->send_an_email($texttosend, $subjecttosend, array(), array(), array(), "", "", 0, -1, '', $moreinheader);
+ }
+ /*if ($result < 0) {
+ $error++;
+ setEventMessages($object->error, $object->errors, 'errors');
+ }*/
}
- if (!empty($labeltouse) && is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0) {
- $subject = $arraydefaultmessage->topic;
- $msg = $arraydefaultmessage->content;
- }
-
- $substitutionarray = getCommonSubstitutionArray($outputlangs, 0, null, $object);
- complete_substitutions_array($substitutionarray, $outputlangs, $object);
- $subjecttosend = make_substitutions($subject, $substitutionarray, $outputlangs);
- $texttosend = make_substitutions(dol_concatdesc($msg, $adht->getMailOnValid()), $substitutionarray, $outputlangs);
-
- if ($subjecttosend && $texttosend) {
- $moreinheader = 'X-Dolibarr-Info: send_an_email by public/members/new.php'."\r\n";
-
- $result = $object->send_an_email($texttosend, $subjecttosend, array(), array(), array(), "", "", 0, -1, '', $moreinheader);
- }
- /*if ($result < 0) {
- $error++;
- setEventMessages($object->error, $object->errors, 'errors');
- }*/
- }
-
- // Send email to the foundation to say a new member subscribed with autosubscribe form
- if (!empty($conf->global->MAIN_INFO_SOCIETE_MAIL) && !empty($conf->global->ADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT) &&
- !empty($conf->global->ADHERENT_AUTOREGISTER_NOTIF_MAIL)) {
- // Define link to login card
- $appli = constant('DOL_APPLICATION_TITLE');
- if (!empty($conf->global->MAIN_APPLICATION_TITLE)) {
- $appli = $conf->global->MAIN_APPLICATION_TITLE;
- if (preg_match('/\d\.\d/', $appli)) {
- if (!preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) {
- $appli .= " (".DOL_VERSION.")"; // If new title contains a version that is different than core
+ // Send email to the foundation to say a new member subscribed with autosubscribe form
+ if (!empty($conf->global->MAIN_INFO_SOCIETE_MAIL) && !empty($conf->global->ADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT) &&
+ !empty($conf->global->ADHERENT_AUTOREGISTER_NOTIF_MAIL)) {
+ // Define link to login card
+ $appli = constant('DOL_APPLICATION_TITLE');
+ if (!empty($conf->global->MAIN_APPLICATION_TITLE)) {
+ $appli = $conf->global->MAIN_APPLICATION_TITLE;
+ if (preg_match('/\d\.\d/', $appli)) {
+ if (!preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) {
+ $appli .= " (".DOL_VERSION.")"; // If new title contains a version that is different than core
+ }
+ } else {
+ $appli .= " ".DOL_VERSION;
}
} else {
$appli .= " ".DOL_VERSION;
}
+
+ $to = $adh->makeSubstitution($conf->global->MAIN_INFO_SOCIETE_MAIL);
+ $from = $conf->global->ADHERENT_MAIL_FROM;
+ $mailfile = new CMailFile(
+ '['.$appli.'] '.$conf->global->ADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT,
+ $to,
+ $from,
+ $adh->makeSubstitution($conf->global->ADHERENT_AUTOREGISTER_NOTIF_MAIL),
+ array(),
+ array(),
+ array(),
+ "",
+ "",
+ 0,
+ -1
+ );
+
+ if (!$mailfile->sendfile()) {
+ dol_syslog($langs->trans("ErrorFailedToSendMail", $from, $to), LOG_ERR);
+ }
+ }
+
+ // Auto-create thirdparty on member creation
+ if (!empty($conf->global->ADHERENT_DEFAULT_CREATE_THIRDPARTY)) {
+ $company = new Societe($db);
+ $result = $company->create_from_member($adh);
+ if ($result < 0) {
+ $error++;
+ $errmsg .= join('