';
if (!empty($conf->global->ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL) && $in_bookkeeping == 'notyet') {
print '
';
}
diff --git a/htdocs/accountancy/supplier/lines.php b/htdocs/accountancy/supplier/lines.php
index b7d0a0423f3..9f769ae13b4 100644
--- a/htdocs/accountancy/supplier/lines.php
+++ b/htdocs/accountancy/supplier/lines.php
@@ -521,7 +521,7 @@ if ($result) {
}
print '';
- print '
'.$langs->trans("CompanyAddress").' ';
diff --git a/htdocs/admin/agenda_xcal.php b/htdocs/admin/agenda_xcal.php
index 0166769660a..ce36d97d06a 100644
--- a/htdocs/admin/agenda_xcal.php
+++ b/htdocs/admin/agenda_xcal.php
@@ -164,6 +164,9 @@ $urlvcal .= $urlwithroot.'/public/agenda/agendaexport.php?format=vcal'.$getentit
$message .= img_picto('', 'globe').' '.str_replace('{url}', $urlvcal, ''.$langs->trans("WebCalUrlForVCalExport", 'vcal', '').' ');
$message .= '';
$message .= ajax_autoselect('onlinepaymenturl1');
$message .= ''.$langs->trans("WebCalUrlForVCalExport", 'ical/ics', '').' ');
$message .= '';
$message .= ajax_autoselect('onlinepaymenturl2');
$message .= ''.$langs->trans("WebCalUrlForVCalExport", 'rss', '').' ');
$message .= '';
$message .= ajax_autoselect('onlinepaymenturl3');
$message .= ' '.$langs->trans("SendingsAbility").' ';
print '';
print ' ';
print '';
-print $langs->trans("Required");
+print ''.img_picto($langs->trans("Required"), 'switch_on').' ';
/*if (empty($conf->global->MAIN_SUBMODULE_EXPEDITION))
{
print ''.img_picto($langs->trans("Disabled"),'switch_off').' ';
diff --git a/htdocs/admin/delais.php b/htdocs/admin/delais.php
index 229fb3e2291..2ae77b03d07 100644
--- a/htdocs/admin/delais.php
+++ b/htdocs/admin/delais.php
@@ -222,7 +222,8 @@ if ($action == 'edit') {
print '';
- print ''.$langs->trans("DelaysOfToleranceBeforeWarning").' '.$langs->trans("Value").' '.$langs->trans("DelaysOfToleranceBeforeWarning").' ';
+ print ''.$langs->trans("LateWarningAfter").' ';
print ''.img_object('', $delay['img']).' ';
- print ''.$langs->trans('Delays_'.$delay['code']).' ';
+ print ' '.$langs->trans('Delays_'.$delay['code']).' ';
print ' ';
}
}
@@ -242,10 +243,10 @@ if ($action == 'edit') {
// Show if meteo is enabled
print '';
- print ''.$langs->trans("Parameter").' '.$langs->trans("Value").' '.$langs->trans("Option").' '.$langs->trans("Value").' ';
- print ''.$langs->trans("MAIN_DISABLE_METEO").' ';
+ print ' '.$langs->trans("MAIN_DISABLE_METEO").' ';
print $form->selectarray('MAIN_DISABLE_METEO', $labelmeteo, (empty($conf->global->MAIN_DISABLE_METEO) ? 0 : $conf->global->MAIN_DISABLE_METEO));
print ' ';
@@ -256,7 +257,7 @@ if ($action == 'edit') {
*/
print '';
- print ''.$langs->trans("DelaysOfToleranceBeforeWarning").' '.$langs->trans("Value").' '.$langs->trans("DelaysOfToleranceBeforeWarning").' '.$langs->trans("Value").' ';
- print ''.$langs->trans("Parameter").' '.$langs->trans("Value").' '.$langs->trans("Option").' '.$langs->trans("Value").' ';
print ''.$langs->trans("MAIN_DISABLE_METEO").' ';
@@ -301,7 +302,7 @@ if (empty($conf->global->MAIN_DISABLE_METEO) || $conf->global->MAIN_DISABLE_METE
} else {
$str_mode_enabled = $str_mode_percentage;
}
- print ''.$str_mode_enabled.' ';
+ print ''.$str_mode_enabled.' ';
print ' ';
print $form->textwithpicto($langs->trans("Monday"), $langs->trans("OpeningHoursFormatDesc"));
print ' ';
- print ' ';
print $form->textwithpicto($langs->trans("Tuesday"), $langs->trans("OpeningHoursFormatDesc"));
diff --git a/htdocs/admin/pdf.php b/htdocs/admin/pdf.php
index f04bfd78abd..fd8377b0a27 100644
--- a/htdocs/admin/pdf.php
+++ b/htdocs/admin/pdf.php
@@ -249,7 +249,7 @@ print load_fiche_titre($langs->trans("PDF"), '', 'title_setup');
$head = pdf_admin_prepare_head();
-print dol_get_fiche_head($head, 'general', $langs->trans("PDF"), -1, 'pdf');
+print dol_get_fiche_head($head, 'general', '', -1, '');
print ''.$form->textwithpicto($langs->trans("PDFDesc"), $s)." '.$form->textwithpicto($langs->trans("PDFOtherDesc"), $tooltiptext)." '.$langs->trans("TicketsAutoReadTicket").' ';
+print '';
+if ($conf->use_javascript_ajax) {
+ print ajax_constantonoff('TICKET_AUTO_READ_WHEN_CREATED_FROM_BACKEND');
+} else {
+ $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
+ print $form->selectarray("TICKET_AUTO_READ_WHEN_CREATED_FROM_BACKEND", $arrval, $conf->global->TICKET_AUTO_READ_WHEN_CREATED_FROM_BACKEND);
+}
+print ' ';
+print '';
+print $form->textwithpicto('', $langs->trans("TicketsAutoReadTicketHelp"), 1, 'help');
+print ' ';
+print ''.$langs->trans("TicketsAutoAssignTicket").' ';
print '';
diff --git a/htdocs/admin/translation.php b/htdocs/admin/translation.php
index 93f62337746..bb42808ebd4 100644
--- a/htdocs/admin/translation.php
+++ b/htdocs/admin/translation.php
@@ -254,6 +254,60 @@ $head = translation_prepare_head();
print dol_get_fiche_head($head, $mode, '', -1, '');
+
+$langcode = GETPOSTISSET('langcode') ? GETPOST('langcode') : $langs->defaultlang;
+
+$newlang = new Translate('', $conf);
+$newlang->setDefaultLang($langcode);
+
+$langsenfileonly = new Translate('', $conf);
+$langsenfileonly->setDefaultLang('en_US');
+
+$newlangfileonly = new Translate('', $conf);
+$newlangfileonly->setDefaultLang($langcode);
+
+$recordtoshow = array();
+
+// Search modules dirs
+$modulesdir = dolGetModulesDirs();
+
+$nbtotaloffiles = 0;
+
+// Search into dir of modules (the $modulesdir is already a list that loop on $conf->file->dol_document_root)
+$i = 0;
+foreach ($modulesdir as $keydir => $tmpsearchdir) {
+ $searchdir = $tmpsearchdir; // $searchdir can be '.../htdocs/core/modules/' or '.../htdocs/custom/mymodule/core/modules/'
+
+ // Directory of translation files
+ $dir_lang = dirname(dirname($searchdir))."/langs/".$langcode; // The 2 dirname is to go up in dir for 2 levels
+ $dir_lang_osencoded = dol_osencode($dir_lang);
+
+ $filearray = dol_dir_list($dir_lang_osencoded, 'files', 0, '', '', $sortfield, (strtolower($sortorder) == 'asc' ?SORT_ASC:SORT_DESC), 1);
+ foreach ($filearray as $file) {
+ $tmpfile = preg_replace('/.lang/i', '', basename($file['name']));
+ $moduledirname = (basename(dirname(dirname($dir_lang))));
+
+ $langkey = $tmpfile;
+ if ($i > 0) {
+ $langkey .= '@'.$moduledirname;
+ }
+ //var_dump($i.' - '.$keydir.' - '.$dir_lang_osencoded.' -> '.$moduledirname . ' / ' . $tmpfile.' -> '.$langkey);
+
+ $result = $newlang->load($langkey, 0, 0, '', 0); // Load translation files + database overwrite
+ $result = $newlangfileonly->load($langkey, 0, 0, '', 1); // Load translation files only
+ if ($result < 0) {
+ print 'Failed to load language file '.$tmpfile.''.$langs->trans("None").' ');
+ /*if ($obj->lang != 'en_US') {
+ $titleforvalue .= '';
print dol_escape_htmltag($obj->transvalue);
+ print ' ';
}
print ' ';
@@ -376,20 +437,6 @@ if ($mode == 'overwrite') {
}
if ($mode == 'searchkey') {
- $langcode = GETPOSTISSET('langcode') ? GETPOST('langcode') : $langs->defaultlang;
-
- $newlang = new Translate('', $conf);
- $newlang->setDefaultLang($langcode);
-
- $newlangfileonly = new Translate('', $conf);
- $newlangfileonly->setDefaultLang($langcode);
-
- $recordtoshow = array();
-
- // Search modules dirs
- $modulesdir = dolGetModulesDirs();
-
- $nbtotaloffiles = 0;
$nbempty = 0;
/*var_dump($langcode);
var_dump($transkey);
@@ -403,41 +450,10 @@ if ($mode == 'searchkey') {
if (empty($transvalue)) {
$nbempty++;
}
+
if ($action == 'search' && ($nbempty > 999)) { // 999 to disable this
setEventMessages($langs->trans("WarningAtLeastKeyOrTranslationRequired"), null, 'warnings');
} else {
- // Search into dir of modules (the $modulesdir is already a list that loop on $conf->file->dol_document_root)
- $i = 0;
- foreach ($modulesdir as $keydir => $tmpsearchdir) {
- $searchdir = $tmpsearchdir; // $searchdir can be '.../htdocs/core/modules/' or '.../htdocs/custom/mymodule/core/modules/'
-
- // Directory of translation files
- $dir_lang = dirname(dirname($searchdir))."/langs/".$langcode; // The 2 dirname is to go up in dir for 2 levels
- $dir_lang_osencoded = dol_osencode($dir_lang);
-
- $filearray = dol_dir_list($dir_lang_osencoded, 'files', 0, '', '', $sortfield, (strtolower($sortorder) == 'asc' ?SORT_ASC:SORT_DESC), 1);
- foreach ($filearray as $file) {
- $tmpfile = preg_replace('/.lang/i', '', basename($file['name']));
- $moduledirname = (basename(dirname(dirname($dir_lang))));
-
- $langkey = $tmpfile;
- if ($i > 0) {
- $langkey .= '@'.$moduledirname;
- }
- //var_dump($i.' - '.$keydir.' - '.$dir_lang_osencoded.' -> '.$moduledirname . ' / ' . $tmpfile.' -> '.$langkey);
-
- $result = $newlang->load($langkey, 0, 0, '', 0); // Load translation files + database overwrite
- $result = $newlangfileonly->load($langkey, 0, 0, '', 1); // Load translation files only
- if ($result < 0) {
- print 'Failed to load language file '.$tmpfile.''.$langcode.' '.$key.' ';
+ $titleforvalue = $langs->trans("Translation").' en_US for key '.$key.':'.$langs->trans("None").' ');
+ print '';
print dol_escape_htmltag($val);
- print ' ';
+ print '';
+ print ' ';
+ print '';
if (!empty($newlangfileonly->tab_translate[$key])) {
if ($val != $newlangfileonly->tab_translate[$key]) {
// retrieve rowid
diff --git a/htdocs/api/class/api.class.php b/htdocs/api/class/api.class.php
index 2a6b5f33a27..fa21c37649f 100644
--- a/htdocs/api/class/api.class.php
+++ b/htdocs/api/class/api.class.php
@@ -173,6 +173,7 @@ class DolibarrApi
unset($object->stats_mrptoproduce);
unset($object->element);
+ unset($object->element_for_permission);
unset($object->fk_element);
unset($object->table_element);
unset($object->table_element_line);
diff --git a/htdocs/api/class/api_setup.class.php b/htdocs/api/class/api_setup.class.php
index 15a29c0e18b..50c909df1fe 100644
--- a/htdocs/api/class/api_setup.class.php
+++ b/htdocs/api/class/api_setup.class.php
@@ -209,7 +209,7 @@ class Setup extends DolibarrApi
if (!DolibarrApi::_checkFilters($sqlfilters, $errormessage)) {
throw new RestException(400, 'Error when validating parameter sqlfilters -> '.$errormessage);
}
- $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
+ $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
}
@@ -239,7 +239,6 @@ class Setup extends DolibarrApi
return $list;
}
-
/**
* Get the list of states/provinces.
*
@@ -252,27 +251,34 @@ class Setup extends DolibarrApi
* @param string $sortorder Sort order
* @param int $limit Number of items per page
* @param int $page Page number (starting from zero)
- * @param string $filter To filter the countries by name
+ * @param int $country To filter on country
+ * @param string $filter To filter the states by name
* @param string $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.code:like:'A%') and (t.active:>=:0)"
- * @return array List of countries
+ * @return array List of states
*
* @url GET dictionary/states
*
* @throws RestException
*/
- public function getListOfStates($sortfield = "code_departement", $sortorder = 'ASC', $limit = 100, $page = 0, $filter = '', $sqlfilters = '')
+ public function getListOfStates($sortfield = "code_departement", $sortorder = 'ASC', $limit = 100, $page = 0, $country = 0, $filter = '', $sqlfilters = '')
{
$list = array();
// Note: The filter is not applied in the SQL request because it must
// be applied to the translated names, not to the names in database.
- $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."c_departements as t";
+ $sql = "SELECT t.rowid FROM ".MAIN_DB_PREFIX."c_departements as t";
+ if ($country) {
+ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_regions as d ON t.fk_region = d.code_region";
+ }
$sql .= " WHERE 1 = 1";
+ if ($country) {
+ $sql .= " AND d.fk_pays = ".((int) $country);
+ }
// Add sql filters
if ($sqlfilters) {
$errormessage = '';
if (!DolibarrApi::_checkFilters($sqlfilters, $errormessage)) {
- throw new RestException(503, 'Error when validating parameter sqlfilters -> '.$errormessage);
+ throw new RestException(400, 'Error when validating parameter sqlfilters -> '.$errormessage);
}
$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
@@ -373,7 +379,7 @@ class Setup extends DolibarrApi
if ($sqlfilters) {
$errormessage = '';
if (!DolibarrApi::_checkFilters($sqlfilters, $errormessage)) {
- throw new RestException(503, 'Error when validating parameter sqlfilters -> '.$errormessage);
+ throw new RestException(400, 'Error when validating parameter sqlfilters -> '.$errormessage);
}
$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
@@ -665,7 +671,7 @@ class Setup extends DolibarrApi
if ($sqlfilters) {
$errormessage = '';
if (!DolibarrApi::_checkFilters($sqlfilters, $errormessage)) {
- throw new RestException(503, 'Error when validating parameter sqlfilters -> '.$errormessage);
+ throw new RestException(400, 'Error when validating parameter sqlfilters -> '.$errormessage);
}
$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
@@ -729,7 +735,7 @@ class Setup extends DolibarrApi
if ($sqlfilters) {
$errormessage = '';
if (!DolibarrApi::_checkFilters($sqlfilters, $errormessage)) {
- throw new RestException(503, 'Error when validating parameter sqlfilters -> '.$errormessage);
+ throw new RestException(400, 'Error when validating parameter sqlfilters -> '.$errormessage);
}
$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
@@ -797,7 +803,7 @@ class Setup extends DolibarrApi
if ($sqlfilters) {
$errormessage = '';
if (!DolibarrApi::_checkFilters($sqlfilters, $errormessage)) {
- throw new RestException(503, 'Error when validating parameter sqlfilters -> '.$errormessage);
+ throw new RestException(400, 'Error when validating parameter sqlfilters -> '.$errormessage);
}
$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
@@ -860,7 +866,7 @@ class Setup extends DolibarrApi
if ($sqlfilters) {
$errormessage = '';
if (!DolibarrApi::_checkFilters($sqlfilters, $errormessage)) {
- throw new RestException(503, 'Error when validating parameter sqlfilters -> '.$errormessage);
+ throw new RestException(400, 'Error when validating parameter sqlfilters -> '.$errormessage);
}
$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
@@ -933,7 +939,7 @@ class Setup extends DolibarrApi
if ($sqlfilters) {
$errormessage = '';
if (!DolibarrApi::_checkFilters($sqlfilters, $errormessage)) {
- throw new RestException(503, 'Error when validating parameter sqlfilters -> '.$errormessage);
+ throw new RestException(400, 'Error when validating parameter sqlfilters -> '.$errormessage);
}
$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
@@ -1004,7 +1010,7 @@ class Setup extends DolibarrApi
if ($sqlfilters) {
$errormessage = '';
if (!DolibarrApi::_checkFilters($sqlfilters, $errormessage)) {
- throw new RestException(503, 'Error when validating parameter sqlfilters -> '.$errormessage);
+ throw new RestException(400, 'Error when validating parameter sqlfilters -> '.$errormessage);
}
$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
@@ -1078,7 +1084,7 @@ class Setup extends DolibarrApi
if ($sqlfilters) {
$errormessage = '';
if (!DolibarrApi::_checkFilters($sqlfilters, $errormessage)) {
- throw new RestException(503, 'Error when validating parameter sqlfilters -> '.$errormessage);
+ throw new RestException(400, 'Error when validating parameter sqlfilters -> '.$errormessage);
}
$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
@@ -1143,9 +1149,9 @@ class Setup extends DolibarrApi
if ($sqlfilters) {
$errormessage = '';
if (!DolibarrApi::_checkFilters($sqlfilters, $errormessage)) {
- throw new RestException(400, 'error when validating parameter sqlfilters -> '.$errormessage);
+ throw new RestException(400, 'Error when validating parameter sqlfilters -> '.$errormessage);
}
- $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
+ $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
}
@@ -1202,9 +1208,9 @@ class Setup extends DolibarrApi
if ($sqlfilters) {
$errormessage = '';
if (!DolibarrApi::_checkFilters($sqlfilters, $errormessage)) {
- throw new RestException(400, 'error when validating parameter sqlfilters -> '.$errormessage);
+ throw new RestException(400, 'Error when validating parameter sqlfilters -> '.$errormessage);
}
- $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
+ $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
}
@@ -1261,7 +1267,7 @@ class Setup extends DolibarrApi
if ($sqlfilters) {
$errormessage = '';
if (!DolibarrApi::_checkFilters($sqlfilters, $errormessage)) {
- throw new RestException(503, 'Error when validating parameter sqlfilters -> '.$errormessage);
+ throw new RestException(400, 'Error when validating parameter sqlfilters -> '.$errormessage);
}
$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
@@ -1301,7 +1307,7 @@ class Setup extends DolibarrApi
* @param string $sortorder Sort order
* @param int $limit Number of items per page
* @param int $page Page number (starting from zero)
- * @param string $country To filter on country
+ * @param int $country To filter on country
* @param int $active Lega form is active or not {@min 0} {@max 1}
* @param string $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.code:like:'A%') and (t.active:>=:0)"
* @return array List of legal form
@@ -1310,7 +1316,7 @@ class Setup extends DolibarrApi
*
* @throws RestException
*/
- public function getListOfLegalForm($sortfield = "rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $country = '', $active = 1, $sqlfilters = '')
+ public function getListOfLegalForm($sortfield = "rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $country = 0, $active = 1, $sqlfilters = '')
{
$list = array();
@@ -1318,13 +1324,13 @@ class Setup extends DolibarrApi
$sql .= " FROM ".MAIN_DB_PREFIX."c_forme_juridique as t";
$sql .= " WHERE t.active = ".((int) $active);
if ($country) {
- $sql .= " AND t.fk_pays = '".$this->db->escape($country)."'";
+ $sql .= " AND t.fk_pays = ".((int) $country);
}
// Add sql filters
if ($sqlfilters) {
$errormessage = '';
if (!DolibarrApi::_checkFilters($sqlfilters, $errormessage)) {
- throw new RestException(503, 'Error when validating parameter sqlfilters -> '.$errormessage);
+ throw new RestException(400, 'Error when validating parameter sqlfilters -> '.$errormessage);
}
$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
@@ -1383,7 +1389,7 @@ class Setup extends DolibarrApi
if ($sqlfilters) {
$errormessage = '';
if (!DolibarrApi::_checkFilters($sqlfilters, $errormessage)) {
- throw new RestException(503, 'Error when validating parameter sqlfilters -> '.$errormessage);
+ throw new RestException(400, 'Error when validating parameter sqlfilters -> '.$errormessage);
}
$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
@@ -1449,7 +1455,7 @@ class Setup extends DolibarrApi
if ($sqlfilters) {
$errormessage = '';
if (!DolibarrApi::_checkFilters($sqlfilters, $errormessage)) {
- throw new RestException(503, 'Error when validating parameter sqlfilters -> '.$errormessage);
+ throw new RestException(400, 'Error when validating parameter sqlfilters -> '.$errormessage);
}
$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
@@ -1508,7 +1514,7 @@ class Setup extends DolibarrApi
if ($sqlfilters) {
$errormessage = '';
if (!DolibarrApi::_checkFilters($sqlfilters, $errormessage)) {
- throw new RestException(503, 'Error when validating parameter sqlfilters -> '.$errormessage);
+ throw new RestException(400, 'Error when validating parameter sqlfilters -> '.$errormessage);
}
$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
@@ -1567,7 +1573,7 @@ class Setup extends DolibarrApi
if ($sqlfilters) {
$errormessage = '';
if (!DolibarrApi::_checkFilters($sqlfilters, $errormessage)) {
- throw new RestException(503, 'Error when validating parameter sqlfilters -> '.$errormessage);
+ throw new RestException(400, 'Error when validating parameter sqlfilters -> '.$errormessage);
}
$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
@@ -1628,7 +1634,7 @@ class Setup extends DolibarrApi
if ($sqlfilters) {
$errormessage = '';
if (!DolibarrApi::_checkFilters($sqlfilters, $errormessage)) {
- throw new RestException(503, 'Error when validating parameter sqlfilters -> '.$errormessage);
+ throw new RestException(400, 'Error when validating parameter sqlfilters -> '.$errormessage);
}
$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
diff --git a/htdocs/api/index.php b/htdocs/api/index.php
index 70aeae96447..d5bc7e273e2 100644
--- a/htdocs/api/index.php
+++ b/htdocs/api/index.php
@@ -55,12 +55,27 @@ if (!empty($_SERVER['HTTP_DOLAPIENTITY'])) {
define("DOLENTITY", (int) $_SERVER['HTTP_DOLAPIENTITY']);
}
+// Response for preflight requests (used by browser when into a CORS context)
+if (!empty($_SERVER['REQUEST_METHOD']) && $_SERVER['REQUEST_METHOD'] == 'OPTIONS' && !empty($_SERVER['HTTP_ACCESS_CONTROL_REQUEST_HEADERS'])) {
+ header('Access-Control-Allow-Origin: *');
+ header('Access-Control-Allow-Methods: GET, POST, PUT, DELETE');
+ header('Access-Control-Allow-Headers: Content-Type, Authorization, api_key, DOLAPIKEY');
+ http_response_code(204);
+ exit;
+}
+
// When we request url to get the json file, we accept Cross site so we can include the descriptor into an external tool.
if (preg_match('/\/explorer\/swagger\.json/', $_SERVER["PHP_SELF"])) {
header('Access-Control-Allow-Origin: *');
header('Access-Control-Allow-Methods: GET, POST, PUT, DELETE');
header('Access-Control-Allow-Headers: Content-Type, Authorization, api_key, DOLAPIKEY');
}
+// When we request url to get an API, we accept Cross site so we can make js API call inside another website
+if (preg_match('/\/api\/index\.php/', $_SERVER["PHP_SELF"])) {
+ header('Access-Control-Allow-Origin: *');
+ header('Access-Control-Allow-Methods: GET, POST, PUT, DELETE');
+ header('Access-Control-Allow-Headers: Content-Type, Authorization, api_key, DOLAPIKEY');
+}
$res = 0;
if (!$res && file_exists("../main.inc.php")) {
@@ -304,7 +319,7 @@ if (!empty($reg[1]) && ($reg[1] != 'explorer' || ($reg[2] != '/swagger.json' &&
foreach ($listofendpoints as $endpointrule) {
$tmparray = explode(':', $endpointrule);
- if ($classfile == $tmparray[0] && $tmparray[1] == 1) {
+ if (($classfile == $tmparray[0] || $classfile.'api' == $tmparray[0]) && $tmparray[1] == 1) {
$endpointisallowed = true;
break;
}
diff --git a/htdocs/asset/class/asset.class.php b/htdocs/asset/class/asset.class.php
index e5ec21bfa6d..916fb376526 100644
--- a/htdocs/asset/class/asset.class.php
+++ b/htdocs/asset/class/asset.class.php
@@ -305,7 +305,7 @@ class Asset extends CommonObject
*/
public function getNomUrl($withpicto = 0, $option = '', $notooltip = 0, $morecss = '', $save_lastsearch_value = -1)
{
- global $db, $conf, $langs;
+ global $db, $conf, $langs, $hookmanager;
global $dolibarr_main_authentication, $dolibarr_main_demo;
global $menumanager;
@@ -360,7 +360,15 @@ class Asset extends CommonObject
}
$result .= $linkend;
//if ($withpicto != 2) $result.=(($addlabel && $this->label) ? $sep . dol_trunc($this->label, ($addlabel > 1 ? $addlabel : 0)) : '');
-
+ global $action;
+ $hookmanager->initHooks(array($this->element . 'dao'));
+ $parameters = array('id'=>$this->id, 'getnomurl' => &$result);
+ $reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
+ if ($reshook > 0) {
+ $result = $hookmanager->resPrint;
+ } else {
+ $result .= $hookmanager->resPrint;
+ }
return $result;
}
diff --git a/htdocs/barcode/printsheet.php b/htdocs/barcode/printsheet.php
index 5128cd56164..8663d50e66a 100644
--- a/htdocs/barcode/printsheet.php
+++ b/htdocs/barcode/printsheet.php
@@ -374,24 +374,24 @@ jQuery(document).ready(function() {
';
// Checkbox to select from free text
-print ' '.$langs->trans("FillBarCodeTypeAndValueManually").' ';
print ' '.$langs->trans("FillBarCodeTypeAndValueFromProduct").' ';
print '';
$form->select_produits(GETPOST('productid', 'int'), 'productid', '', '', 0, -1, 2, '', 0, array(), 0, '1', 0, 'minwidth400imp', 1);
- print '
';
}
if (!empty($user->rights->societe->lire)) {
- print ' '.$langs->trans("FillBarCodeTypeAndValueFromThirdParty").' ';
print '';
print $form->select_company(GETPOST('socid', 'int'), 'socid', '', 'SelectThirdParty', 0, 0, array(), 0, 'minwidth300');
- print '
';
}
diff --git a/htdocs/bom/bom_card.php b/htdocs/bom/bom_card.php
index cbd730e5d23..f6e40b511f1 100644
--- a/htdocs/bom/bom_card.php
+++ b/htdocs/bom/bom_card.php
@@ -518,7 +518,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
// Common attributes
$keyforbreak = 'duration';
include DOL_DOCUMENT_ROOT.'/core/tpl/commonfields_view.tpl.php';
-
+ $object->calculateCosts();
print ' '.$form->textwithpicto($langs->trans("TotalCost"), $langs->trans("BOMTotalCost")).' '.price($object->total_cost).' '.$langs->trans("UnitCost").' '.price($object->unit_cost).' '.$sub_bom_line->efficiency.' ';
- // Cost price if it's defined
- if ($sub_bom_product->cost_price > 0) {
- print ''.price($sub_bom_product->cost_price * $line->qty).' ';
- $total_cost+= $sub_bom_product->cost_price * $line->qty;
+ if (!empty($sub_bom->id)) {
+ $sub_bom->calculateCosts();
+ print ''.price($sub_bom->total_cost * $sub_bom_line->qty * $line->qty).' ';
+ $total_cost+= $sub_bom->total_cost * $sub_bom_line->qty * $line->qty;
+ } elseif ($sub_bom_product->cost_price > 0) {
+ print ''.price($sub_bom_product->cost_price * $sub_bom_line->qty * $line->qty).' ';
+ $total_cost+= $sub_bom_product->cost_price * $sub_bom_line->qty * $line->qty;
} elseif ($sub_bom_product->pmp > 0) { // PMP if cost price isn't defined
- print ''.price($sub_bom_product->pmp * $line->qty).' ';
- $total_cost.= $sub_bom_product->pmp * $line->qty;
+ print ''.price($sub_bom_product->pmp * $sub_bom_line->qty * $line->qty).' ';
+ $total_cost.= $sub_bom_product->pmp * $sub_bom_line->qty * $line->qty;
} else { // Minimum purchase price if cost price and PMP aren't defined
$sql_supplier_price = 'SELECT MIN(price) AS min_price, quantity AS qty FROM '.MAIN_DB_PREFIX.'product_fournisseur_price';
$sql_supplier_price.= ' WHERE fk_product = '. (int) $sub_bom_product->id;
$resql_supplier_price = $object->db->query($sql_supplier_price);
if ($resql_supplier_price) {
$obj = $object->db->fetch_object($resql_supplier_price);
- $line_cost = $obj->min_price/$obj->qty * $sub_bom_line->qty;
+ $line_cost = $obj->min_price/$obj->qty * $sub_bom_line->qty * $line->qty;
print ''.price($line_cost).' ';
$total_cost+= $line_cost;
diff --git a/htdocs/bookmarks/class/bookmark.class.php b/htdocs/bookmarks/class/bookmark.class.php
index 9a5b3a53c20..39bb06c2ada 100644
--- a/htdocs/bookmarks/class/bookmark.class.php
+++ b/htdocs/bookmarks/class/bookmark.class.php
@@ -344,7 +344,7 @@ class Bookmark extends CommonObject
global $action, $hookmanager;
$hookmanager->initHooks(array('mybookmarkdao'));
- $parameters = array('id'=>$this->id, 'getnomurl'=>$result);
+ $parameters = array('id'=>$this->id, 'getnomurl' => &$result);
$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
if ($reshook > 0) {
$result = $hookmanager->resPrint;
diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php
index 5ffed2e5e4b..a3d2dc3e57f 100644
--- a/htdocs/categories/class/categorie.class.php
+++ b/htdocs/categories/class/categorie.class.php
@@ -10,7 +10,7 @@
* Copyright (C) 2015 Marcos García
* Copyright (C) 2015 Raphaël Doursenaud
* Copyright (C) 2016 Charlie Benke
- * Copyright (C) 2018-2019 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
@@ -185,7 +185,8 @@ class Categorie extends CommonObject
'contact' => 'socpeople',
'account' => 'bank_account', // old for bank account
'project' => 'projet',
- 'warehouse'=> 'entrepot'
+ 'warehouse'=> 'entrepot',
+ 'knowledgemanagement' => 'knowledgemanagement_knowledgerecord'
);
/**
@@ -1612,7 +1613,7 @@ class Categorie extends CommonObject
*/
public function getNomUrl($withpicto = 0, $option = '', $maxlength = 0, $moreparam = '')
{
- global $langs;
+ global $langs, $hookmanager;
$result = '';
$label = $langs->trans("ShowCategory").': '.($this->ref ? $this->ref : $this->label);
@@ -1640,6 +1641,15 @@ class Categorie extends CommonObject
if ($withpicto != 2) {
$result .= $link.dol_trunc(($this->ref ? $this->ref : $this->label), $maxlength).$linkend;
}
+ global $action;
+ $hookmanager->initHooks(array($this->element . 'dao'));
+ $parameters = array('id'=>$this->id, 'getnomurl' => &$result);
+ $reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
+ if ($reshook > 0) {
+ $result = $hookmanager->resPrint;
+ } else {
+ $result .= $hookmanager->resPrint;
+ }
return $result;
}
diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php
index 627c2f0ce51..4a00894d26b 100644
--- a/htdocs/comm/action/card.php
+++ b/htdocs/comm/action/card.php
@@ -76,11 +76,14 @@ if ($complete == 'na' || $complete == -2) {
}
if ($fulldayevent) {
- $datep = dol_mktime('00', '00', 0, GETPOST("apmonth", 'int'), GETPOST("apday", 'int'), GETPOST("apyear", 'int'));
- $datef = dol_mktime('23', '59', '59', GETPOST("p2month", 'int'), GETPOST("p2day", 'int'), GETPOST("p2year", 'int'));
+ $tzforfullday = getDolGlobalString('MAIN_STORE_FULL_EVENT_IN_GMT');
+ // For "full day" events, we must store date in GMT (It must be viewed as same moment everywhere)
+ $datep = dol_mktime('00', '00', 0, GETPOST("apmonth", 'int'), GETPOST("apday", 'int'), GETPOST("apyear", 'int'), $tzforfullday ? $tzforfullday : 'tzuserrel');
+ $datef = dol_mktime('23', '59', '59', GETPOST("p2month", 'int'), GETPOST("p2day", 'int'), GETPOST("p2year", 'int'), $tzforfullday ? $tzforfullday : 'tzuserrel');
+ //print $db->idate($datep); exit;
} else {
- $datep = dol_mktime($aphour, $apmin, 0, GETPOST("apmonth", 'int'), GETPOST("apday", 'int'), GETPOST("apyear", 'int'));
- $datef = dol_mktime($p2hour, $p2min, '59', GETPOST("p2month", 'int'), GETPOST("p2day", 'int'), GETPOST("p2year", 'int'));
+ $datep = dol_mktime($aphour, $apmin, 0, GETPOST("apmonth", 'int'), GETPOST("apday", 'int'), GETPOST("apyear", 'int'), 'tzuserrel');
+ $datef = dol_mktime($p2hour, $p2min, '59', GETPOST("p2month", 'int'), GETPOST("p2day", 'int'), GETPOST("p2year", 'int'), 'tzuserrel');
}
// Security check
@@ -252,8 +255,15 @@ if (empty($reshook) && $action == 'add') {
$percentage = in_array(GETPOST('status'), array(-1, 100)) ? GETPOST('status') : (in_array($complete, array(-1, 100)) ? $complete : GETPOST("percentage", 'int')); // If status is -1 or 100, percentage is not defined and we must use status
// Clean parameters
- $datep = dol_mktime($fulldayevent ? '00' : GETPOST("aphour", 'int'), $fulldayevent ? '00' : GETPOST("apmin", 'int'), $fulldayevent ? '00' : GETPOST("apsec", 'int'), GETPOST("apmonth", 'int'), GETPOST("apday", 'int'), GETPOST("apyear", 'int'), 'tzuser');
- $datef = dol_mktime($fulldayevent ? '23' : GETPOST("p2hour", 'int'), $fulldayevent ? '59' : GETPOST("p2min", 'int'), $fulldayevent ? '59' : GETPOST("apsec", 'int'), GETPOST("p2month", 'int'), GETPOST("p2day", 'int'), GETPOST("p2year", 'int'), 'tzuser');
+ if ($fulldayevent) {
+ $tzforfullday = getDolGlobalString('MAIN_STORE_FULL_EVENT_IN_GMT');
+ // For "full day" events, we must store date in GMT (It must be viewed as same moment everywhere)
+ $datep = dol_mktime($fulldayevent ? '00' : GETPOST("aphour", 'int'), $fulldayevent ? '00' : GETPOST("apmin", 'int'), $fulldayevent ? '00' : GETPOST("apsec", 'int'), GETPOST("apmonth", 'int'), GETPOST("apday", 'int'), GETPOST("apyear", 'int'), $tzforfullday ? $tzforfullday : 'tzuser');
+ $datef = dol_mktime($fulldayevent ? '23' : GETPOST("p2hour", 'int'), $fulldayevent ? '59' : GETPOST("p2min", 'int'), $fulldayevent ? '59' : GETPOST("apsec", 'int'), GETPOST("p2month", 'int'), GETPOST("p2day", 'int'), GETPOST("p2year", 'int'), $tzforfullday ? $tzforfullday : 'tzuser');
+ } else {
+ $datep = dol_mktime($fulldayevent ? '00' : GETPOST("aphour", 'int'), $fulldayevent ? '00' : GETPOST("apmin", 'int'), $fulldayevent ? '00' : GETPOST("apsec", 'int'), GETPOST("apmonth", 'int'), GETPOST("apday", 'int'), GETPOST("apyear", 'int'), 'tzuser');
+ $datef = dol_mktime($fulldayevent ? '23' : GETPOST("p2hour", 'int'), $fulldayevent ? '59' : GETPOST("p2min", 'int'), $fulldayevent ? '59' : GETPOST("apsec", 'int'), GETPOST("p2month", 'int'), GETPOST("p2day", 'int'), GETPOST("p2year", 'int'), 'tzuser');
+ }
// Check parameters
if (!$datef && $percentage == 100) {
@@ -513,8 +523,16 @@ if (empty($reshook) && $action == 'update') {
$object->fetch_userassigned();
$object->oldcopy = clone $object;
- $datep = dol_mktime($fulldayevent ? '00' : $aphour, $fulldayevent ? '00' : $apmin, 0, GETPOST("apmonth", 'int'), GETPOST("apday", 'int'), GETPOST("apyear", 'int'), 'tzuser');
- $datef = dol_mktime($fulldayevent ? '23' : $p2hour, $fulldayevent ? '59' : $p2min, $fulldayevent ? '59' : '0', GETPOST("p2month", 'int'), GETPOST("p2day", 'int'), GETPOST("p2year", 'int'), 'tzuser');
+ // Clean parameters
+ if ($fulldayevent) {
+ $tzforfullday = getDolGlobalString('MAIN_STORE_FULL_EVENT_IN_GMT');
+ // For "full day" events, we must store date in GMT (It must be viewed as same moment everywhere)
+ $datep = dol_mktime($fulldayevent ? '00' : GETPOST("aphour", 'int'), $fulldayevent ? '00' : GETPOST("apmin", 'int'), $fulldayevent ? '00' : GETPOST("apsec", 'int'), GETPOST("apmonth", 'int'), GETPOST("apday", 'int'), GETPOST("apyear", 'int'), $tzforfullday ? $tzforfullday : 'tzuser');
+ $datef = dol_mktime($fulldayevent ? '23' : GETPOST("p2hour", 'int'), $fulldayevent ? '59' : GETPOST("p2min", 'int'), $fulldayevent ? '59' : GETPOST("apsec", 'int'), GETPOST("p2month", 'int'), GETPOST("p2day", 'int'), GETPOST("p2year", 'int'), $tzforfullday ? $tzforfullday : 'tzuser');
+ } else {
+ $datep = dol_mktime($fulldayevent ? '00' : GETPOST("aphour", 'int'), $fulldayevent ? '00' : GETPOST("apmin", 'int'), $fulldayevent ? '00' : GETPOST("apsec", 'int'), GETPOST("apmonth", 'int'), GETPOST("apday", 'int'), GETPOST("apyear", 'int'), 'tzuser');
+ $datef = dol_mktime($fulldayevent ? '23' : GETPOST("p2hour", 'int'), $fulldayevent ? '59' : GETPOST("p2min", 'int'), $fulldayevent ? '59' : GETPOST("apsec", 'int'), GETPOST("p2month", 'int'), GETPOST("p2day", 'int'), GETPOST("p2year", 'int'), 'tzuser');
+ }
$object->type_id = dol_getIdFromCode($db, GETPOST("actioncode", 'aZ09'), 'c_actioncomm');
$object->label = GETPOST("label", "alphanohtml");
@@ -1005,11 +1023,11 @@ if ($action == 'create') {
$datep = ($datep ? $datep : (is_null($object->datep) ? '' : $object->datep));
if (GETPOST('datep', 'int', 1)) {
- $datep = dol_stringtotime(GETPOST('datep', 'int', 1), 0);
+ $datep = dol_stringtotime(GETPOST('datep', 'int', 1), 'tzuser');
}
$datef = ($datef ? $datef : $object->datef);
if (GETPOST('datef', 'int', 1)) {
- $datef = dol_stringtotime(GETPOST('datef', 'int', 1), 0);
+ $datef = dol_stringtotime(GETPOST('datef', 'int', 1), 'tzuser');
}
if (empty($datef) && !empty($datep)) {
if (GETPOST("actioncode", 'aZ09') == 'AC_RDV' || empty($conf->global->AGENDA_USE_EVENT_TYPE_DEFAULT)) {
@@ -1024,16 +1042,16 @@ if ($action == 'create') {
print ''.$langs->trans("DateActionEnd").' ';
print '';
if (GETPOST("afaire") == 1) {
- print $form->selectDate($datep, 'ap', 1, 1, 0, "action", 1, 2, 0, 'fulldaystart'); // Empty value not allowed for start date and hours if "todo"
+ print $form->selectDate($datep, 'ap', 1, 1, 0, "action", 1, 2, 0, 'fulldaystart', '', '', '', 1, '', '', 'tzuserrel'); // Empty value not allowed for start date and hours if "todo"
} else {
- print $form->selectDate($datep, 'ap', 1, 1, 1, "action", 1, 2, 0, 'fulldaystart');
+ print $form->selectDate($datep, 'ap', 1, 1, 1, "action", 1, 2, 0, 'fulldaystart', '', '', '', 1, '', '', 'tzuserrel');
}
print ' - ';
//print ' - ';
if (GETPOST("afaire") == 1) {
- print $form->selectDate($datef, 'p2', 1, 1, 1, "action", 1, 0, 0, 'fulldayend');
+ print $form->selectDate($datef, 'p2', 1, 1, 1, "action", 1, 0, 0, 'fulldayend', '', '', '', 1, '', '', 'tzuserrel');
} else {
- print $form->selectDate($datef, 'p2', 1, 1, 1, "action", 1, 0, 0, 'fulldayend');
+ print $form->selectDate($datef, 'p2', 1, 1, 1, "action", 1, 0, 0, 'fulldayend', '', '', '', 1, '', '', 'tzuserrel');
}
print ' ';
@@ -1518,20 +1536,21 @@ if ($id > 0) {
// Date start - end
print ''.$langs->trans("DateActionStart").' - '.$langs->trans("DateActionEnd").' ';
+ $tzforfullday = getDolGlobalString('MAIN_STORE_FULL_EVENT_IN_GMT');
if (GETPOST("afaire") == 1) {
- print $form->selectDate($datep ? $datep : $object->datep, 'ap', 1, 1, 0, "action", 1, 1, 0, 'fulldaystart', '', '', '', 1, '', '', 'tzuser');
+ print $form->selectDate($datep ? $datep : $object->datep, 'ap', 1, 1, 0, "action", 1, 1, 0, 'fulldaystart', '', '', '', 1, '', '', $object->fulldayevent ? ($tzforfullday ? $tzforfullday : 'tzuser') : 'tzuser');
} elseif (GETPOST("afaire") == 2) {
- print $form->selectDate($datep ? $datep : $object->datep, 'ap', 1, 1, 1, "action", 1, 1, 0, 'fulldaystart', '', '', '', 1, '', '', 'tzuser');
+ print $form->selectDate($datep ? $datep : $object->datep, 'ap', 1, 1, 1, "action", 1, 1, 0, 'fulldaystart', '', '', '', 1, '', '', $object->fulldayevent ? ($tzforfullday ? $tzforfullday : 'tzuser') : 'tzuser');
} else {
- print $form->selectDate($datep ? $datep : $object->datep, 'ap', 1, 1, 1, "action", 1, 1, 0, 'fulldaystart', '', '', '', 1, '', '', 'tzuser');
+ print $form->selectDate($datep ? $datep : $object->datep, 'ap', 1, 1, 1, "action", 1, 1, 0, 'fulldaystart', '', '', '', 1, '', '', $object->fulldayevent ? ($tzforfullday ? $tzforfullday : 'tzuser') : 'tzuser');
}
print ' - ';
if (GETPOST("afaire") == 1) {
- print $form->selectDate($datef ? $datef : $object->datef, 'p2', 1, 1, 1, "action", 1, 1, 0, 'fulldayend', '', '', '', 1, '', '', 'tzuser');
+ print $form->selectDate($datef ? $datef : $object->datef, 'p2', 1, 1, 1, "action", 1, 1, 0, 'fulldayend', '', '', '', 1, '', '', $object->fulldayevent ? ($tzforfullday ? $tzforfullday : 'tzuser') : 'tzuser');
} elseif (GETPOST("afaire") == 2) {
- print $form->selectDate($datef ? $datef : $object->datef, 'p2', 1, 1, 1, "action", 1, 1, 0, 'fulldayend', '', '', '', 1, '', '', 'tzuser');
+ print $form->selectDate($datef ? $datef : $object->datef, 'p2', 1, 1, 1, "action", 1, 1, 0, 'fulldayend', '', '', '', 1, '', '', $object->fulldayevent ? ($tzforfullday ? $tzforfullday : 'tzuser') : 'tzuser');
} else {
- print $form->selectDate($datef ? $datef : $object->datef, 'p2', 1, 1, 1, "action", 1, 1, 0, 'fulldayend', '', '', '', 1, '', '', 'tzuser');
+ print $form->selectDate($datef ? $datef : $object->datef, 'p2', 1, 1, 1, "action", 1, 1, 0, 'fulldayend', '', '', '', 1, '', '', $object->fulldayevent ? ($tzforfullday ? $tzforfullday : 'tzuser') : 'tzuser');
}
print ' ';
- print dol_print_date($db->jdate($obj->dp), $formatToUse, 'tzuser');
+ if (empty($obj->fulldayevent)) {
+ print dol_print_date($db->jdate($obj->dp), $formatToUse, 'tzuser');
+ } else {
+ $tzforfullday = getDolGlobalString('MAIN_STORE_FULL_EVENT_IN_GMT');
+ print dol_print_date($db->jdate($obj->dp), $formatToUse, ($tzforfullday ? $tzforfullday : 'tzuser'));
+ }
$late = 0;
if ($actionstatic->hasDelay() && $actionstatic->percentage >= 0 && $actionstatic->percentage < 100 ) {
$late = 1;
@@ -967,7 +972,12 @@ while ($i < min($num, $limit)) {
// End date
if (!empty($arrayfields['a.datep2']['checked'])) {
print ' ';
- print dol_print_date($db->jdate($obj->dp2), $formatToUse, 'tzuser');
+ if (empty($obj->fulldayevent)) {
+ print dol_print_date($db->jdate($obj->dp2), $formatToUse, 'tzuser');
+ } else {
+ $tzforfullday = getDolGlobalString('MAIN_STORE_FULL_EVENT_IN_GMT');
+ print dol_print_date($db->jdate($obj->dp2), $formatToUse, ($tzforfullday ? $tzforfullday : 'tzuser'));
+ }
print ' ';
}
diff --git a/htdocs/comm/mailing/class/mailing.class.php b/htdocs/comm/mailing/class/mailing.class.php
index 8050b85f180..588faa392e3 100644
--- a/htdocs/comm/mailing/class/mailing.class.php
+++ b/htdocs/comm/mailing/class/mailing.class.php
@@ -740,7 +740,7 @@ class Mailing extends CommonObject
global $action;
$hookmanager->initHooks(array('emailingdao'));
- $parameters = array('id'=>$this->id, 'getnomurl'=>$result);
+ $parameters = array('id'=>$this->id, 'getnomurl' => &$result);
$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
if ($reshook > 0) {
$result = $hookmanager->resPrint;
diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index 746075ab51e..45a4d2fdb57 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -2543,7 +2543,7 @@ if ($action == 'create') {
if (($object->statut == Propal::STATUS_DRAFT && $object->total_ttc >= 0 && count($object->lines) > 0)
|| ($object->statut == Propal::STATUS_DRAFT && !empty($conf->global->PROPAL_ENABLE_NEGATIVE) && count($object->lines) > 0)) {
if ($usercanvalidate) {
- print ''.$langs->trans('Validate').' ';
+ print ''.$langs->trans('Validate').' ';
} else {
print ''.$langs->trans('Validate').' ';
}
@@ -2555,7 +2555,7 @@ if ($action == 'create') {
}*/
// Edit
if ($object->statut == Propal::STATUS_VALIDATED && $usercancreate) {
- print ''.$langs->trans('Modify').' ';
+ print ''.$langs->trans('Modify').' ';
}
// ReOpen
@@ -2578,7 +2578,7 @@ if ($action == 'create') {
// Create a sale order
if (!empty($conf->commande->enabled) && $object->statut == Propal::STATUS_SIGNED) {
if ($usercancreateorder) {
- print ''.$langs->trans("AddOrder").' ';
+ print ''.$langs->trans("AddOrder").' ';
}
}
@@ -2586,7 +2586,7 @@ if ($action == 'create') {
if (!empty($conf->global->WORKFLOW_CAN_CREATE_PURCHASE_ORDER_FROM_PROPOSAL)) {
if ($object->statut == Propal::STATUS_SIGNED && ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || !empty($conf->supplier_order->enabled))) {
if ($usercancreatepurchaseorder) {
- print ''.$langs->trans("AddPurchaseOrder").' ';
+ print ''.$langs->trans("AddPurchaseOrder").' ';
}
}
}
@@ -2595,7 +2595,7 @@ if ($action == 'create') {
if (!empty($conf->service->enabled) && !empty($conf->ficheinter->enabled) && $object->statut == Propal::STATUS_SIGNED) {
if ($usercancreateintervention) {
$langs->load("interventions");
- print ''.$langs->trans("AddIntervention").' ';
+ print ''.$langs->trans("AddIntervention").' ';
}
}
@@ -2604,14 +2604,14 @@ if ($action == 'create') {
$langs->load("contracts");
if ($usercancreatecontract) {
- print ''.$langs->trans('AddContract').' ';
+ print ''.$langs->trans('AddContract').' ';
}
}
// Create an invoice and classify billed
if ($object->statut == Propal::STATUS_SIGNED && empty($conf->global->PROPOSAL_ARE_NOT_BILLABLE)) {
if (!empty($conf->facture->enabled) && $usercancreateinvoice) {
- print ''.$langs->trans("CreateBill").' ';
+ print ''.$langs->trans("CreateBill").' ';
}
$arrayofinvoiceforpropal = $object->getInvoiceArrayList();
diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index 1c532e26147..029706dfb5d 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -1248,7 +1248,7 @@ class Propal extends CommonObject
break;
}
// Defined the new fk_parent_line
- if ($result > 0 && $line->product_type == 9) {
+ if ($result > 0) {
$fk_parent_line = $result;
}
}
@@ -3569,7 +3569,7 @@ class Propal extends CommonObject
*/
public function getNomUrl($withpicto = 0, $option = '', $get_params = '', $notooltip = 0, $save_lastsearch_value = -1, $addlinktonotes = -1)
{
- global $langs, $conf, $user;
+ global $langs, $conf, $user, $hookmanager;
if (!empty($conf->dol_no_mouse_hover)) {
$notooltip = 1; // Force disable tooltips
@@ -3690,6 +3690,15 @@ class Propal extends CommonObject
}
}
+ global $action;
+ $hookmanager->initHooks(array($this->element . 'dao'));
+ $parameters = array('id'=>$this->id, 'getnomurl' => &$result);
+ $reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
+ if ($reshook > 0) {
+ $result = $hookmanager->resPrint;
+ } else {
+ $result .= $hookmanager->resPrint;
+ }
return $result;
}
diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index e4cc6a37c1c..3e790bf6448 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -1486,8 +1486,11 @@ if ($resql) {
) {
$with_margin_info = true;
}
+ $total_ht = 0;
+ $total_margin = 0;
- while ($i < min($num, $limit)) {
+ $last_num = min($num, $limit);
+ while ($i < $last_num) {
$obj = $db->fetch_object($resql);
$objectstatic->id = $obj->rowid;
@@ -1541,6 +1544,8 @@ if ($resql) {
if ($with_margin_info === true) {
$objectstatic->fetch_lines();
$marginInfo = $formmargin->getMarginInfosArray($objectstatic);
+ $total_ht += $obj->total_ht;
+ $total_margin += $marginInfo['total_margin'];
}
print '';
@@ -1959,7 +1964,7 @@ if ($resql) {
if (!$i) {
$totalarray['pos'][$totalarray['nbfield']] = 'total_margin';
}
- $totalarray['val']['total_margin'] += $marginInfo['total_margin'];
+ $totalarray['val']['total_margin'] = $total_margin;
}
// Total margin rate
if (!empty($arrayfields['total_margin_rate']['checked'])) {
@@ -1974,6 +1979,16 @@ if ($resql) {
if (!$i) {
$totalarray['nbfield']++;
}
+ if (!$i) {
+ $totalarray['pos'][$totalarray['nbfield']] = 'total_mark_rate';
+ }
+ if ($i >= $last_num - 1) {
+ if (!empty($total_ht)) {
+ $totalarray['val']['total_mark_rate'] = price2num($total_margin * 100 / $total_ht, 'MT');
+ } else {
+ $totalarray['val']['total_mark_rate'] = '';
+ }
+ }
}
// Extra fields
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index 958ff542fed..72851c3943a 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -421,7 +421,7 @@ if (empty($reshook)) {
}
// Defined the new fk_parent_line
- if ($result > 0 && $lines[$i]->product_type == 9) {
+ if ($result > 0) {
$fk_parent_line = $result;
}
}
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index c315a4fcd61..a9ff2e09cf3 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -11,7 +11,7 @@
* Copyright (C) 2014-2015 Marcos García
* Copyright (C) 2018 Nicolas ZABOURI
* Copyright (C) 2016-2018 Ferran Marcet
- * Copyright (C) 2021 Frédéric France
+ * Copyright (C) 2021-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
@@ -1056,7 +1056,7 @@ class Commande extends CommonOrder
return -1;
}
// Defined the new fk_parent_line
- if ($result > 0 && $line->product_type == 9) {
+ if ($result > 0) {
$fk_parent_line = $result;
}
}
@@ -3663,7 +3663,7 @@ class Commande extends CommonOrder
*/
public function getNomUrl($withpicto = 0, $option = '', $max = 0, $short = 0, $notooltip = 0, $save_lastsearch_value = -1, $addlinktonotes = 0)
{
- global $conf, $langs, $user;
+ global $conf, $langs, $user, $hookmanager;
if (!empty($conf->dol_no_mouse_hover)) {
$notooltip = 1; // Force disable tooltips
@@ -3764,6 +3764,15 @@ class Commande extends CommonOrder
}
}
+ global $action;
+ $hookmanager->initHooks(array($this->element . 'dao'));
+ $parameters = array('id'=>$this->id, 'getnomurl' => &$result);
+ $reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
+ if ($reshook > 0) {
+ $result = $hookmanager->resPrint;
+ } else {
+ $result .= $hookmanager->resPrint;
+ }
return $result;
}
diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index 35abd34728a..27391d7a901 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -1463,8 +1463,11 @@ if ($resql) {
) {
$with_margin_info = true;
}
+ $total_ht = 0;
+ $total_margin = 0;
- while ($i < min($num, $limit)) {
+ $last_num = min($num, $limit);
+ while ($i < $last_num) {
$obj = $db->fetch_object($resql);
$notshippable = 0;
@@ -1510,6 +1513,8 @@ if ($resql) {
if ($with_margin_info === true) {
$generic_commande->fetch_lines();
$marginInfo = $formmargin->getMarginInfosArray($generic_commande);
+ $total_ht += $obj->total_ht;
+ $total_margin += $marginInfo['total_margin'];
}
print '';
@@ -1879,6 +1884,16 @@ if ($resql) {
if (!$i) {
$totalarray['nbfield']++;
}
+ if (!$i) {
+ $totalarray['pos'][$totalarray['nbfield']] = 'total_mark_rate';
+ }
+ if ($i >= $last_num - 1) {
+ if (!empty($total_ht)) {
+ $totalarray['val']['total_mark_rate'] = price2num($total_margin * 100 / $total_ht, 'MT');
+ } else {
+ $totalarray['val']['total_mark_rate'] = '';
+ }
+ }
}
// Extra fields
diff --git a/htdocs/compta/ajaxpayment.php b/htdocs/compta/ajaxpayment.php
index d22e1a0182a..bdeeb072e97 100644
--- a/htdocs/compta/ajaxpayment.php
+++ b/htdocs/compta/ajaxpayment.php
@@ -56,19 +56,23 @@ $currentInvId = $_POST['imgClicked']; // from DOM elements : imgId (equals invoi
$amountPayment = $amountPayment != '' ? (is_numeric(price2num($amountPayment)) ? price2num($amountPayment) : '') : ''; // keep void if not a valid entry
// Clean checkamounts
-foreach ($amounts as $key => $value) {
- $value = price2num($value);
- $amounts[$key] = $value;
- if (empty($value)) {
- unset($amounts[$key]);
+if (is_array($amounts)) {
+ foreach ($amounts as $key => $value) {
+ $value = price2num($value);
+ $amounts[$key] = $value;
+ if (empty($value)) {
+ unset($amounts[$key]);
+ }
}
}
// Clean remains
-foreach ($remains as $key => $value) {
- $value = price2num($value);
- $remains[$key] = (($invoice_type) == 2 ?-1 : 1) * $value;
- if (empty($value)) {
- unset($remains[$key]);
+if (is_array($remains)) {
+ foreach ($remains as $key => $value) {
+ $value = price2num($value);
+ $remains[$key] = (($invoice_type) == 2 ?-1 : 1) * $value;
+ if (empty($value)) {
+ unset($remains[$key]);
+ }
}
}
diff --git a/htdocs/compta/bank/bankentries_list.php b/htdocs/compta/bank/bankentries_list.php
index 3d8e6f8bd98..e991831a6dd 100644
--- a/htdocs/compta/bank/bankentries_list.php
+++ b/htdocs/compta/bank/bankentries_list.php
@@ -544,7 +544,7 @@ if ($id > 0 || !empty($ref)) {
if ($user->rights->banque->consolidate) {
$newparam = $param;
$newparam = preg_replace('/search_conciliated=\d+/i', '', $newparam);
- $buttonreconcile = ''.$titletoconciliatemanual.' ';
+ $buttonreconcile = ''.$titletoconciliatemanual.' ';
} else {
$buttonreconcile = ''.$titletoconciliatemanual.' ';
}
@@ -554,7 +554,7 @@ if ($id > 0 || !empty($ref)) {
if ($user->rights->banque->consolidate) {
$newparam = $param;
$newparam = preg_replace('/search_conciliated=\d+/i', '', $newparam);
- $buttonreconcile .= ' '.$titletoconciliateauto.' ';
+ $buttonreconcile .= ' '.$titletoconciliateauto.' ';
} else {
$buttonreconcile .= ' '.$titletoconciliateauto.' ';
}
diff --git a/htdocs/compta/bank/card.php b/htdocs/compta/bank/card.php
index 5d2bb71109b..78940872106 100644
--- a/htdocs/compta/bank/card.php
+++ b/htdocs/compta/bank/card.php
@@ -345,7 +345,7 @@ if ($action == 'create') {
if ($conf->use_javascript_ajax) {
print "\n".''."\n";
diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index abd2c7dd502..732be0937d0 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -608,10 +608,14 @@ class ExtraFields
if ($unique) {
$sql = "ALTER TABLE ".$this->db->prefix().$table." ADD UNIQUE INDEX uk_".$table."_".$attrname." (".$attrname.")";
} else {
- $sql = "ALTER TABLE ".$this->db->prefix().$table." DROP INDEX uk_".$table."_".$attrname;
+ $sql = "ALTER TABLE ".$this->db->prefix().$table." DROP INDEX IF EXISTS uk_".$table."_".$attrname;
}
dol_syslog(get_class($this).'::update', LOG_DEBUG);
$resql = $this->db->query($sql, 1, 'dml');
+ /*if ($resql < 0) {
+ $this->error = $this->db->lasterror();
+ return -1;
+ }*/
return 1;
} else {
$this->error = $this->db->lasterror();
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 3375e9f7cc4..8f112b9aa98 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -1106,13 +1106,13 @@ class Form
}
print ''.$langs->trans("Product");
print ' '.$langs->trans("Service");
@@ -2219,9 +2219,10 @@ class Form
* 'warehouseinternal' = count products from warehouses for internal correct/transfer only
* @param array $selected_combinations Selected combinations. Format: array([attrid] => attrval, [...])
* @param string $nooutput No print, return the output into a string
+ * @param int $status_purchase Purchase status -1=Return all products, 0=Products not on purchase, 1=Products on purchase
* @return void|string
*/
- public function select_produits($selected = '', $htmlname = 'productid', $filtertype = '', $limit = 0, $price_level = 0, $status = 1, $finished = 2, $selected_input_value = '', $hidelabel = 0, $ajaxoptions = array(), $socid = 0, $showempty = '1', $forcecombo = 0, $morecss = '', $hidepriceinlabel = 0, $warehouseStatus = '', $selected_combinations = null, $nooutput = 0)
+ public function select_produits($selected = '', $htmlname = 'productid', $filtertype = '', $limit = 0, $price_level = 0, $status = 1, $finished = 2, $selected_input_value = '', $hidelabel = 0, $ajaxoptions = array(), $socid = 0, $showempty = '1', $forcecombo = 0, $morecss = '', $hidepriceinlabel = 0, $warehouseStatus = '', $selected_combinations = null, $nooutput = 0, $status_purchase = -1)
{
// phpcs:enable
global $langs, $conf;
@@ -2261,7 +2262,7 @@ class Form
}
}
// mode=1 means customers products
- $urloption = 'htmlname='.$htmlname.'&outjson=1&price_level='.$price_level.'&type='.$filtertype.'&mode=1&status='.$status.'&finished='.$finished.'&hidepriceinlabel='.$hidepriceinlabel.'&warehousestatus='.$warehouseStatus;
+ $urloption = 'htmlname='.$htmlname.'&outjson=1&price_level='.$price_level.'&type='.$filtertype.'&mode=1&status='.$status.'&status_purchase='.$status_purchase.'&finished='.$finished.'&hidepriceinlabel='.$hidepriceinlabel.'&warehousestatus='.$warehouseStatus;
//Price by customer
if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES) && !empty($socid)) {
$urloption .= '&socid='.$socid;
@@ -2357,7 +2358,7 @@ class Form
$out .= img_picto($langs->trans("Search"), 'search');
}
} else {
- $out .= $this->select_produits_list($selected, $htmlname, $filtertype, $limit, $price_level, '', $status, $finished, 0, $socid, $showempty, $forcecombo, $morecss, $hidepriceinlabel, $warehouseStatus);
+ $out .= $this->select_produits_list($selected, $htmlname, $filtertype, $limit, $price_level, '', $status, $finished, 0, $socid, $showempty, $forcecombo, $morecss, $hidepriceinlabel, $warehouseStatus, $status_purchase);
}
if (empty($nooutput)) {
@@ -2453,9 +2454,10 @@ class Form
* 'warehouseopen' = count products from open warehouses,
* 'warehouseclosed' = count products from closed warehouses,
* 'warehouseinternal' = count products from warehouses for internal correct/transfer only
+ * @param int $status_purchase Purchase status -1=Return all products, 0=Products not on purchase, 1=Products on purchase
* @return array Array of keys for json
*/
- public function select_produits_list($selected = '', $htmlname = 'productid', $filtertype = '', $limit = 20, $price_level = 0, $filterkey = '', $status = 1, $finished = 2, $outputmode = 0, $socid = 0, $showempty = '1', $forcecombo = 0, $morecss = '', $hidepriceinlabel = 0, $warehouseStatus = '')
+ public function select_produits_list($selected = '', $htmlname = 'productid', $filtertype = '', $limit = 20, $price_level = 0, $filterkey = '', $status = 1, $finished = 2, $outputmode = 0, $socid = 0, $showempty = '1', $forcecombo = 0, $morecss = '', $hidepriceinlabel = 0, $warehouseStatus = '', $status_purchase = -1)
{
// phpcs:enable
global $langs, $conf;
@@ -2593,6 +2595,9 @@ class Form
} elseif ($status >= 0) {
$sql .= " AND p.tosell = ".((int) $status);
}
+ if ($status_purchase >= 0) {
+ $sql .= " AND p.tobuy = ".((int) $status_purchase);
+ }
// Filter by product type
if (strval($filtertype) != '') {
$sql .= " AND p.fk_product_type = ".((int) $filtertype);
@@ -7379,7 +7384,18 @@ class Form
$objecttmp = null;
- $InfoFieldList = explode(":", $objectdesc);
+ // Example of value for $objectdec:
+ // Bom:bom/class/bom.class.php:0:t.status=1
+ // Bom:bom/class/bom.class.php:0:t.status=1:ref
+ // Bom:bom/class/bom.class.php:0:(t.status:=:1):ref
+ $InfoFieldList = explode(":", $objectdesc, 4);
+ $vartmp = $InfoFieldList[3];
+ $reg = array();
+ if (preg_match('/^.*:(\w*)$/', $vartmp, $reg)) {
+ $InfoFieldList[4] = $reg[1]; // take the sort field
+ }
+ $InfoFieldList[3] = preg_replace('/:\w*$/', '', $vartmp); // take the filter field
+
$classname = $InfoFieldList[0];
$classpath = $InfoFieldList[1];
$addcreatebuttonornot = empty($InfoFieldList[2]) ? 0 : $InfoFieldList[2];
@@ -8122,8 +8138,15 @@ class Form
}
$out .= '};'."\n";
$out .= '$(document).ready(function () {
- $(\'#'.$htmlname.'\').'.$tmpplugin.'({
- dir: \'ltr\',
+ $(\'#'.$htmlname.'\').'.$tmpplugin.'({';
+ if ($placeholder) {
+ $out .= '
+ placeholder: {
+ id: \'-1\',
+ text: \''.dol_escape_js($placeholder).'\'
+ },';
+ }
+ $out .= ' dir: \'ltr\',
// Specify format function for dropdown item
formatResult: formatResult,
templateResult: formatResult, /* For 4.0 */
@@ -9740,24 +9763,45 @@ class Form
$ret = '';
- $ret .= '';
+ $ret .= '
';
return $ret;
}
diff --git a/htdocs/core/class/html.formother.class.php b/htdocs/core/class/html.formother.class.php
index c47646419aa..ad0c74ab9a8 100644
--- a/htdocs/core/class/html.formother.class.php
+++ b/htdocs/core/class/html.formother.class.php
@@ -460,7 +460,7 @@ class FormOther
* @param string $htmlname Name of combo list (example: 'search_sale')
* @param User $user Object user
* @param int $showstatus 0=show user status only if status is disabled, 1=always show user status into label, -1=never show user status
- * @param int|string $showempty 1=show also an empty value
+ * @param int|string $showempty 1=show also an empty value or text to show for empty
* @param string $morecss More CSS
* @param int $norepresentative Show also an entry "Not categorized"
* @return string Html combo list code
@@ -489,12 +489,12 @@ class FormOther
$out .= '
';
if ($showempty) {
$textforempty = ' ';
- if (!empty($conf->use_javascript_ajax)) {
- $textforempty = ' '; // If we use ajaxcombo, we need here to avoid to have an empty element that is too small.
- }
if (!is_numeric($showempty)) {
$textforempty = $showempty;
}
+ if (!empty($conf->use_javascript_ajax) && $textforempty == ' ') {
+ $textforempty = ' '; // If we use ajaxcombo, we need here to avoid to have an empty element that is too small.
+ }
$out .= ''.$textforempty.' '."\n";
}
@@ -1479,9 +1479,10 @@ class FormOther
* @param array $search_groupby Array of preselected fields
* @param array $arrayofgroupby Array of groupby to fill
* @param string $morecss More CSS
+ * @param string $showempty '1' or 'text'
* @return string HTML string component
*/
- public function selectGroupByField($object, $search_groupby, &$arrayofgroupby, $morecss = 'minwidth200 maxwidth250')
+ public function selectGroupByField($object, $search_groupby, &$arrayofgroupby, $morecss = 'minwidth200 maxwidth250', $showempty = '1')
{
global $langs, $extrafields, $form;
@@ -1493,7 +1494,7 @@ class FormOther
$SS = substr($langs->trans("Second"), 0, 1).substr($langs->trans("Second"), 0, 1);
foreach ($object->fields as $key => $val) {
- if (!$val['measure']) {
+ if (!$val['isameasure']) {
if (in_array($key, array(
'id', 'ref_int', 'ref_ext', 'rowid', 'entity', 'last_main_doc', 'logo', 'logo_squarred', 'extraparams',
'parent', 'photo', 'socialnetworks', 'webservices_url', 'webservices_key'))) {
@@ -1541,7 +1542,7 @@ class FormOther
foreach ($arrayofgroupby as $key => $val) {
$arrayofgroupbylabel[$key] = $val['label'];
}
- $result = $form->selectarray('search_groupby', $arrayofgroupbylabel, $search_groupby, 1, 0, 0, '', 0, 0, 0, '', $morecss, 1);
+ $result = $form->selectarray('search_groupby', $arrayofgroupbylabel, $search_groupby, $showempty, 0, 0, '', 0, 0, 0, '', $morecss, 1);
return $result;
}
@@ -1552,9 +1553,10 @@ class FormOther
* @param mixed $object Object analyzed
* @param array $search_xaxis Array of preselected fields
* @param array $arrayofxaxis Array of groupby to fill
- * @return string HTML string component
+ * @param string $showempty '1' or 'text'
+ * @return string HTML string component
*/
- public function selectXAxisField($object, $search_xaxis, &$arrayofxaxis)
+ public function selectXAxisField($object, $search_xaxis, &$arrayofxaxis, $showempty = '1')
{
global $langs, $extrafields, $form;
@@ -1589,9 +1591,9 @@ class FormOther
continue;
}
if (in_array($val['type'], array('timestamp', 'date', 'datetime'))) {
- $arrayofxaxis['t.'.$key.'-year'] = array('label' => $langs->trans($val['label']).' ('.$YYYY.')', 'position' => $val['position'].'-y');
- $arrayofxaxis['t.'.$key.'-month'] = array('label' => $langs->trans($val['label']).' ('.$YYYY.'-'.$MM.')', 'position' => $val['position'].'-m');
- $arrayofxaxis['t.'.$key.'-day'] = array('label' => $langs->trans($val['label']).' ('.$YYYY.'-'.$MM.'-'.$DD.')', 'position' => $val['position'].'-d');
+ $arrayofxaxis['t.'.$key.'-year'] = array('label' => $langs->trans($val['label']).' ('.$YYYY.') ', 'position' => $val['position'].'-y');
+ $arrayofxaxis['t.'.$key.'-month'] = array('label' => $langs->trans($val['label']).' ('.$YYYY.'-'.$MM.') ', 'position' => $val['position'].'-m');
+ $arrayofxaxis['t.'.$key.'-day'] = array('label' => $langs->trans($val['label']).' ('.$YYYY.'-'.$MM.'-'.$DD.') ', 'position' => $val['position'].'-d');
} else {
$arrayofxaxis['t.'.$key] = array('label' => $langs->trans($val['label']), 'position' => (int) $val['position']);
}
@@ -1617,7 +1619,7 @@ class FormOther
foreach ($arrayofxaxis as $key => $val) {
$arrayofxaxislabel[$key] = $val['label'];
}
- $result = $form->selectarray('search_xaxis', $arrayofxaxislabel, $search_xaxis, 1, 0, 0, '', 0, 0, 0, '', 'minwidth250', 1);
+ $result = $form->selectarray('search_xaxis', $arrayofxaxislabel, $search_xaxis, $showempty, 0, 0, '', 0, 0, 0, '', 'minwidth250', 1);
return $result;
}
diff --git a/htdocs/core/customreports.php b/htdocs/core/customreports.php
index fafd1c015e8..f1616feb21b 100644
--- a/htdocs/core/customreports.php
+++ b/htdocs/core/customreports.php
@@ -99,7 +99,8 @@ $arrayoftype = array(
'order' => array('label' => 'Orders', 'ObjectClassName' => 'Commande', 'enabled' => $conf->commande->enabled, 'ClassPath' => "/commande/class/commande.class.php"),
'invoice' => array('label' => 'Invoices', 'ObjectClassName' => 'Facture', 'enabled' => $conf->facture->enabled, 'ClassPath' => "/compta/facture/class/facture.class.php"),
'invoice_template'=>array('label' => 'PredefinedInvoices', 'ObjectClassName' => 'FactureRec', 'enabled' => $conf->facture->enabled, 'ClassPath' => "/compta/class/facturerec.class.php", 'langs'=>'bills'),
- 'contract' => array('label' => 'Contracts', 'ObjectClassName' => 'Contrat', 'enabled' => $conf->contrat->enabled, 'ClassPath' => "/contrat/class/contrat.class.php", 'langs'=>'contract'),
+ 'contract' => array('label' => 'Contracts', 'ObjectClassName' => 'Contrat', 'enabled' => $conf->contrat->enabled, 'ClassPath' => "/contrat/class/contrat.class.php", 'langs'=>'contracts'),
+ 'contractdet' => array('label' => 'ContractLines', 'ObjectClassName' => 'ContratLigne', 'enabled' => $conf->contrat->enabled, 'ClassPath' => "/contrat/class/contrat.class.php", 'langs'=>'contracts'),
'bom' => array('label' => 'BOM', 'ObjectClassName' => 'Bom', 'enabled' => $conf->bom->enabled),
'mo' => array('label' => 'MO', 'ObjectClassName' => 'Mo', 'enabled' => $conf->mrp->enabled, 'ClassPath' => "/mrp/class/mo.class.php"),
'ticket' => array('label' => 'Ticket', 'ObjectClassName' => 'Ticket', 'enabled' => $conf->ticket->enabled),
@@ -159,6 +160,11 @@ $search_array_options = $extrafields->getOptionalsFromPost($object->table_elemen
$search_component_params = array('');
$search_component_params_hidden = GETPOST('search_component_params_hidden', 'alphanohtml');
+// For the case we enter a criteria manually, the search_component_params_input will be defined and must be used in priority
+if (GETPOST('search_component_params_input', 'alphanohtml')) {
+ $search_component_params_hidden = GETPOST('search_component_params_input', 'alphanohtml');
+}
+
$MAXUNIQUEVALFORGROUP = 20;
$MAXMEASURESINBARGRAPH = 20;
@@ -175,7 +181,12 @@ $arrayofgroupby = array();
$arrayofyaxis = array();
$arrayofvaluesforgroupby = array();
-restrictedArea($user, $object->element, 0, '');
+$features = $object->element;
+if (!empty($object->element_for_permission)) {
+ $features = $object->element_for_permission;
+}
+
+restrictedArea($user, $features, 0, '');
$error = 0;
@@ -420,22 +431,22 @@ if ($object->isextrafieldmanaged) {
}
}
}
-print '
';
-print $form->multiselectarray('search_measures', $arrayofmesures, $search_measures, 0, 0, 'minwidth400', 1);
+print '
';
+print $form->multiselectarray('search_measures', $arrayofmesures, $search_measures, 0, 0, 'minwidth400', 1, 0, '', '', $langs->trans("Measures")); // Fill the array $arrayofmeasures with possible fields
print ' ';
-print '
';
-print $formother->selectXAxisField($object, $search_xaxis, $arrayofxaxis);
+print '
';
+print $formother->selectXAxisField($object, $search_xaxis, $arrayofxaxis, $langs->trans("XAxis")); // Fill the array $arrayofxaxis with possible fields
print '
';
-print '
';
-print $formother->selectGroupByField($object, $search_groupby, $arrayofgroupby);
+print '
';
+print $formother->selectGroupByField($object, $search_groupby, $arrayofgroupby, 'minwidth200 maxwidth250', $langs->trans("GroupBy")); // Fill the array $arrayofgroupby with possible fields
print '
trans('AddNewLine'); ?>
element == 'supplier_proposal' || $object->element == 'order_supplier' || $object->element == 'invoice_supplier') { // We must have same test in printObjectLines
+ 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
?>
trans('SupplierRef'); ?> ';
echo $langs->trans('AutoFillDateFrom').' ';
echo $form->selectyesno('date_start_fill', $line->date_start_fill, 1);
@@ -362,7 +364,7 @@ if ($nolinesbefore) {
}
}
echo '';
- if ($object->element == 'supplier_proposal' || $object->element == 'order_supplier' || $object->element == 'invoice_supplier') { // We must have same test in printObjectLines
+ 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++;
?>
diff --git a/htdocs/core/tpl/objectline_edit.tpl.php b/htdocs/core/tpl/objectline_edit.tpl.php
index ea7b039b550..0f0043eadd6 100644
--- a/htdocs/core/tpl/objectline_edit.tpl.php
+++ b/htdocs/core/tpl/objectline_edit.tpl.php
@@ -66,7 +66,7 @@ $colspan = 3; // Col total ht + col edit + col delete
if (!empty($inputalsopricewithtax)) {
$colspan++; // We add 1 if col total ttc
}
-if (in_array($object->element, array('propal', 'supplier_proposal', 'facture', 'facturerec', 'invoice', 'commande', 'order', 'order_supplier', 'invoice_supplier'))) {
+if (in_array($object->element, array('propal', 'supplier_proposal', 'facture', 'facturerec', 'invoice', 'commande', 'order', 'order_supplier', 'invoice_supplier', 'invoice_supplier_rec'))) {
$colspan++; // With this, there is a column move button
}
if (!empty($conf->multicurrency->enabled) && $this->multicurrency_code != $conf->currency) {
@@ -170,7 +170,11 @@ $coldisplay++;
}
// Show autofill date for recuring invoices
- if (!empty($conf->service->enabled) && $line->product_type == 1 && $line->element == 'facturedetrec') {
+ if (!empty($conf->service->enabled) && $line->product_type == 1 && ($line->element == 'facturedetrec' || $line->element == 'invoice_supplier_det_rec')) {
+ if ($line->element == 'invoice_supplier_det_rec') {
+ $line->date_start_fill = $line->date_start;
+ $line->date_end_fill = $line->date_end;
+ }
echo '
';
echo $langs->trans('AutoFillDateFrom').' ';
echo $form->selectyesno('date_start_fill', GETPOSTISSET('date_start_fill') ? GETPOST('date_start_fill', 'int') : $line->date_start_fill, 1);
@@ -183,7 +187,7 @@ $coldisplay++;
element == 'supplier_proposal' || $object->element == 'order_supplier' || $object->element == 'invoice_supplier') { // We must have same test in printObjectLines
+ 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++;
?>
diff --git a/htdocs/core/tpl/objectline_title.tpl.php b/htdocs/core/tpl/objectline_title.tpl.php
index e1f89b18937..0f86289dfe1 100644
--- a/htdocs/core/tpl/objectline_title.tpl.php
+++ b/htdocs/core/tpl/objectline_title.tpl.php
@@ -55,7 +55,7 @@ if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER)) {
print '
'.$langs->trans('Description').' ';
// Supplier ref
-if ($this->element == 'supplier_proposal' || $this->element == 'order_supplier' || $this->element == 'invoice_supplier') {
+if ($this->element == 'supplier_proposal' || $this->element == 'order_supplier' || $this->element == 'invoice_supplier' || $this->element == 'invoice_supplier_rec') {
print '
'.$langs->trans("SupplierRef").' ';
}
diff --git a/htdocs/core/tpl/objectline_view.tpl.php b/htdocs/core/tpl/objectline_view.tpl.php
index c4ddc7d0c4c..36eceb87341 100644
--- a/htdocs/core/tpl/objectline_view.tpl.php
+++ b/htdocs/core/tpl/objectline_view.tpl.php
@@ -162,7 +162,11 @@ if (($line->info_bits & 2) == 2) {
}
// Show date range
- if ($line->element == 'facturedetrec') {
+ if ($line->element == 'facturedetrec' || $line->element == 'invoice_supplier_det_rec') {
+ if ($line->element == 'invoice_supplier_det_rec' && $line->product_type != Product::TYPE_PRODUCT) {
+ $line->date_start_fill = $line->date_start;
+ $line->date_end_fill = $line->date_end;
+ }
if ($line->date_start_fill || $line->date_end_fill) {
print '
';
}
@@ -202,6 +206,8 @@ if (($line->info_bits & 2) == 2) {
if ($line->fk_product > 0 && !empty($conf->global->PRODUIT_DESC_IN_FORM)) {
if ($line->element == 'facturedetrec') {
print (!empty($line->description) && $line->description != $line->product_label) ? (($line->date_start_fill || $line->date_end_fill) ? '' : '
').'
'.dol_htmlentitiesbr($line->description) : '';
+ } elseif ($line->element == 'invoice_supplier_det_rec') {
+ print (!empty($line->description) && $line->description != $line->label) ? (($line->date_start || $line->date_end) ? '' : '
').'
'.dol_htmlentitiesbr($line->description) : '';
} else {
print (!empty($line->description) && $line->description != $line->product_label) ? (($line->date_start || $line->date_end) ? '' : '
').'
'.dol_htmlentitiesbr($line->description) : '';
}
@@ -239,7 +245,7 @@ if (!empty($conf->accounting->enabled) && $line->fk_accounting_account > 0) {
}
print '';
-if ($object->element == 'supplier_proposal' || $object->element == 'order_supplier' || $object->element == 'invoice_supplier') { // We must have same test in printObjectLines
+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
print '
';
print ($line->ref_fourn ? $line->ref_fourn : $line->ref_supplier);
print ' ';
diff --git a/htdocs/delivery/class/delivery.class.php b/htdocs/delivery/class/delivery.class.php
index 6bfe3a33dd7..3241461ace1 100644
--- a/htdocs/delivery/class/delivery.class.php
+++ b/htdocs/delivery/class/delivery.class.php
@@ -725,7 +725,7 @@ class Delivery extends CommonObject
*/
public function getNomUrl($withpicto = 0, $save_lastsearch_value = -1)
{
- global $langs;
+ global $langs, $hookmanager;
$result = '';
@@ -757,6 +757,16 @@ class Delivery extends CommonObject
$result .= ' ';
}
$result .= $linkstart.$this->ref.$linkend;
+
+ global $action;
+ $hookmanager->initHooks(array($this->element . 'dao'));
+ $parameters = array('id'=>$this->id, 'getnomurl' => &$result);
+ $reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
+ if ($reshook > 0) {
+ $result = $hookmanager->resPrint;
+ } else {
+ $result .= $hookmanager->resPrint;
+ }
return $result;
}
diff --git a/htdocs/don/class/don.class.php b/htdocs/don/class/don.class.php
index cbd5a386354..0ce92f44e1b 100644
--- a/htdocs/don/class/don.class.php
+++ b/htdocs/don/class/don.class.php
@@ -913,7 +913,7 @@ class Don extends CommonObject
*/
public function getNomUrl($withpicto = 0, $notooltip = 0, $moretitle = '', $save_lastsearch_value = -1)
{
- global $conf, $langs;
+ global $conf, $langs, $hookmanager;
if (!empty($conf->dol_no_mouse_hover)) {
$notooltip = 1; // Force disable tooltips
@@ -953,7 +953,15 @@ class Don extends CommonObject
$result .= $this->ref;
}
$result .= $linkend;
-
+ global $action;
+ $hookmanager->initHooks(array($this->element . 'dao'));
+ $parameters = array('id'=>$this->id, 'getnomurl' => &$result);
+ $reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
+ if ($reshook > 0) {
+ $result = $hookmanager->resPrint;
+ } else {
+ $result .= $hookmanager->resPrint;
+ }
return $result;
}
diff --git a/htdocs/don/class/paymentdonation.class.php b/htdocs/don/class/paymentdonation.class.php
index b5775ce18ac..0f8db03597d 100644
--- a/htdocs/don/class/paymentdonation.class.php
+++ b/htdocs/don/class/paymentdonation.class.php
@@ -661,7 +661,7 @@ class PaymentDonation extends CommonObject
*/
public function getNomUrl($withpicto = 0, $maxlen = 0)
{
- global $langs;
+ global $langs, $hookmanager;
$result = '';
@@ -684,6 +684,15 @@ class PaymentDonation extends CommonObject
}
}
+ global $action;
+ $hookmanager->initHooks(array($this->element . 'dao'));
+ $parameters = array('id'=>$this->id, 'getnomurl' => &$result);
+ $reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
+ if ($reshook > 0) {
+ $result = $hookmanager->resPrint;
+ } else {
+ $result .= $hookmanager->resPrint;
+ }
return $result;
}
}
diff --git a/htdocs/ecm/class/ecmdirectory.class.php b/htdocs/ecm/class/ecmdirectory.class.php
index 03413a56eb1..f99a567a314 100644
--- a/htdocs/ecm/class/ecmdirectory.class.php
+++ b/htdocs/ecm/class/ecmdirectory.class.php
@@ -474,7 +474,7 @@ class EcmDirectory extends CommonObject
*/
public function getNomUrl($withpicto = 0, $option = '', $max = 0, $more = '', $notooltip = 0)
{
- global $langs;
+ global $langs, $hookmanager;
$result = '';
//$newref=str_replace('_',' ',$this->ref);
@@ -506,6 +506,15 @@ class EcmDirectory extends CommonObject
}
$result .= $linkend;
+ global $action;
+ $hookmanager->initHooks(array($this->element . 'dao'));
+ $parameters = array('id'=>$this->id, 'getnomurl' => &$result);
+ $reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
+ if ($reshook > 0) {
+ $result = $hookmanager->resPrint;
+ } else {
+ $result .= $hookmanager->resPrint;
+ }
return $result;
}
diff --git a/htdocs/ecm/class/ecmfiles.class.php b/htdocs/ecm/class/ecmfiles.class.php
index 6c2b8fc4023..2f9bf4c41e5 100644
--- a/htdocs/ecm/class/ecmfiles.class.php
+++ b/htdocs/ecm/class/ecmfiles.class.php
@@ -831,7 +831,7 @@ class EcmFiles extends CommonObject
{
global $db, $conf, $langs;
global $dolibarr_main_authentication, $dolibarr_main_demo;
- global $menumanager;
+ global $menumanager, $hookmanager;
if (!empty($conf->dol_no_mouse_hover)) {
$notooltip = 1; // Force disable tooltips
@@ -868,6 +868,16 @@ class EcmFiles extends CommonObject
}
}
$result .= $linkstart.$this->ref.$linkend;
+
+ global $action;
+ $hookmanager->initHooks(array($this->element . 'dao'));
+ $parameters = array('id'=>$this->id, 'getnomurl' => &$result);
+ $reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
+ if ($reshook > 0) {
+ $result = $hookmanager->resPrint;
+ } else {
+ $result .= $hookmanager->resPrint;
+ }
return $result;
}
diff --git a/htdocs/emailcollector/class/emailcollector.class.php b/htdocs/emailcollector/class/emailcollector.class.php
index 17fe55d0583..032ee4b534b 100644
--- a/htdocs/emailcollector/class/emailcollector.class.php
+++ b/htdocs/emailcollector/class/emailcollector.class.php
@@ -563,7 +563,7 @@ class EmailCollector extends CommonObject
global $action, $hookmanager;
$hookmanager->initHooks(array('emailcollectordao'));
- $parameters = array('id'=>$this->id, 'getnomurl'=>$result);
+ $parameters = array('id'=>$this->id, 'getnomurl' => &$result);
$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
if ($reshook > 0) {
$result = $hookmanager->resPrint;
diff --git a/htdocs/emailcollector/class/emailcollectoraction.class.php b/htdocs/emailcollector/class/emailcollectoraction.class.php
index bd044f37d0f..eaa4b0737b9 100644
--- a/htdocs/emailcollector/class/emailcollectoraction.class.php
+++ b/htdocs/emailcollector/class/emailcollectoraction.class.php
@@ -389,7 +389,7 @@ class EmailCollectorAction extends CommonObject
global $action, $hookmanager;
$hookmanager->initHooks(array('emailcollectoractiondao'));
- $parameters = array('id'=>$this->id, 'getnomurl'=>$result);
+ $parameters = array('id'=>$this->id, 'getnomurl' => &$result);
$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
if ($reshook > 0) {
$result = $hookmanager->resPrint;
diff --git a/htdocs/emailcollector/class/emailcollectorfilter.class.php b/htdocs/emailcollector/class/emailcollectorfilter.class.php
index d926a8bf14f..a99c5198d72 100644
--- a/htdocs/emailcollector/class/emailcollectorfilter.class.php
+++ b/htdocs/emailcollector/class/emailcollectorfilter.class.php
@@ -363,7 +363,7 @@ class EmailCollectorFilter extends CommonObject
global $action, $hookmanager;
$hookmanager->initHooks(array('emailcollectorfilterdao'));
- $parameters = array('id'=>$this->id, 'getnomurl'=>$result);
+ $parameters = array('id'=>$this->id, 'getnomurl' => &$result);
$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
if ($reshook > 0) {
$result = $hookmanager->resPrint;
diff --git a/htdocs/eventorganization/class/conferenceorbooth.class.php b/htdocs/eventorganization/class/conferenceorbooth.class.php
index 1d462ddae30..15493425231 100644
--- a/htdocs/eventorganization/class/conferenceorbooth.class.php
+++ b/htdocs/eventorganization/class/conferenceorbooth.class.php
@@ -602,7 +602,7 @@ class ConferenceOrBooth extends ActionComm
global $action, $hookmanager;
$hookmanager->initHooks(array('conferenceorboothdao'));
- $parameters = array('id'=>$this->id, 'getnomurl'=>$result);
+ $parameters = array('id'=>$this->id, 'getnomurl' => &$result);
$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
if ($reshook > 0) {
$result = $hookmanager->resPrint;
diff --git a/htdocs/eventorganization/class/conferenceorboothattendee.class.php b/htdocs/eventorganization/class/conferenceorboothattendee.class.php
index 96131aa5946..bdd81660a12 100644
--- a/htdocs/eventorganization/class/conferenceorboothattendee.class.php
+++ b/htdocs/eventorganization/class/conferenceorboothattendee.class.php
@@ -855,7 +855,7 @@ class ConferenceOrBoothAttendee extends CommonObject
global $action, $hookmanager;
$hookmanager->initHooks(array('conferenceorboothattendeedao'));
- $parameters = array('id'=>$this->id, 'getnomurl'=>$result);
+ $parameters = array('id'=>$this->id, 'getnomurl' => &$result);
$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
if ($reshook > 0) {
$result = $hookmanager->resPrint;
diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php
index 837c82be361..8490fa67753 100644
--- a/htdocs/expedition/class/expedition.class.php
+++ b/htdocs/expedition/class/expedition.class.php
@@ -11,7 +11,7 @@
* Copyright (C) 2015 Claudio Aschieri
* Copyright (C) 2016-2021 Ferran Marcet
* Copyright (C) 2018 Nicolas ZABOURI
- * Copyright (C) 2018-2020 Frédéric France
+ * Copyright (C) 2018-2022 Frédéric France
* Copyright (C) 2020 Lenin Rivas
*
* This program is free software; you can redistribute it and/or modify
@@ -1778,7 +1778,7 @@ class Expedition extends CommonObject
*/
public function getNomUrl($withpicto = 0, $option = '', $max = 0, $short = 0, $notooltip = 0, $save_lastsearch_value = -1)
{
- global $langs, $conf;
+ global $langs, $conf, $hookmanager;
$result = '';
$label = ''.$langs->trans("Shipment").' ';
@@ -1824,7 +1824,15 @@ class Expedition extends CommonObject
$result .= $this->ref;
}
$result .= $linkend;
-
+ global $action;
+ $hookmanager->initHooks(array($this->element . 'dao'));
+ $parameters = array('id'=>$this->id, 'getnomurl' => &$result);
+ $reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
+ if ($reshook > 0) {
+ $result = $hookmanager->resPrint;
+ } else {
+ $result .= $hookmanager->resPrint;
+ }
return $result;
}
diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php
index 70dad3ff48f..be49b0a8c0c 100644
--- a/htdocs/expensereport/class/expensereport.class.php
+++ b/htdocs/expensereport/class/expensereport.class.php
@@ -1640,7 +1640,7 @@ class ExpenseReport extends CommonObject
*/
public function getNomUrl($withpicto = 0, $option = '', $max = 0, $short = 0, $moretitle = '', $notooltip = 0, $save_lastsearch_value = -1)
{
- global $langs, $conf;
+ global $langs, $conf, $hookmanager;
$result = '';
@@ -1709,6 +1709,15 @@ class ExpenseReport extends CommonObject
}
$result .= $linkend;
+ global $action;
+ $hookmanager->initHooks(array($this->element . 'dao'));
+ $parameters = array('id'=>$this->id, 'getnomurl' => &$result);
+ $reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
+ if ($reshook > 0) {
+ $result = $hookmanager->resPrint;
+ } else {
+ $result .= $hookmanager->resPrint;
+ }
return $result;
}
diff --git a/htdocs/expensereport/class/paymentexpensereport.class.php b/htdocs/expensereport/class/paymentexpensereport.class.php
index 3aac0cee2b8..5f9e9f17e6f 100644
--- a/htdocs/expensereport/class/paymentexpensereport.class.php
+++ b/htdocs/expensereport/class/paymentexpensereport.class.php
@@ -628,7 +628,7 @@ class PaymentExpenseReport extends CommonObject
*/
public function getNomUrl($withpicto = 0, $maxlen = 0)
{
- global $langs;
+ global $langs, $hookmanager;
$result = '';
@@ -660,7 +660,15 @@ class PaymentExpenseReport extends CommonObject
$result .= $link.($maxlen ?dol_trunc($this->ref, $maxlen) : $this->ref).$linkend;
}
}
-
+ global $action;
+ $hookmanager->initHooks(array($this->element . 'dao'));
+ $parameters = array('id'=>$this->id, 'getnomurl' => &$result);
+ $reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
+ if ($reshook > 0) {
+ $result = $hookmanager->resPrint;
+ } else {
+ $result .= $hookmanager->resPrint;
+ }
return $result;
}
diff --git a/htdocs/fichinter/class/fichinter.class.php b/htdocs/fichinter/class/fichinter.class.php
index 7a532998b1f..b6505aa1ecf 100644
--- a/htdocs/fichinter/class/fichinter.class.php
+++ b/htdocs/fichinter/class/fichinter.class.php
@@ -816,7 +816,7 @@ class Fichinter extends CommonObject
global $action;
$hookmanager->initHooks(array('interventiondao'));
- $parameters = array('id'=>$this->id, 'getnomurl'=>$result);
+ $parameters = array('id'=>$this->id, 'getnomurl' => &$result);
$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
if ($reshook > 0) {
$result = $hookmanager->resPrint;
diff --git a/htdocs/fichinter/class/fichinterrec.class.php b/htdocs/fichinter/class/fichinterrec.class.php
index ee385cbc7a4..fa97cf3e8a5 100644
--- a/htdocs/fichinter/class/fichinterrec.class.php
+++ b/htdocs/fichinter/class/fichinterrec.class.php
@@ -628,7 +628,7 @@ class FichinterRec extends Fichinter
*/
public function getNomUrl($withpicto = 0, $option = '', $max = 0, $short = 0, $moretitle = '')
{
- global $langs;
+ global $langs, $hookmanager;
$result = '';
$label = $langs->trans("ShowInterventionModel").': '.$this->ref;
@@ -653,6 +653,15 @@ class FichinterRec extends Fichinter
if ($withpicto != 2) {
$result .= $link.$this->ref.$linkend;
}
+ global $action;
+ $hookmanager->initHooks(array($this->element . 'dao'));
+ $parameters = array('id'=>$this->id, 'getnomurl' => &$result);
+ $reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
+ if ($reshook > 0) {
+ $result = $hookmanager->resPrint;
+ } else {
+ $result .= $hookmanager->resPrint;
+ }
return $result;
}
diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index aefb8741668..8a0e0de299e 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -9,7 +9,7 @@
* Copyright (C) 2013 Florian Henry
* Copyright (C) 2013 Cédric Salvador
* Copyright (C) 2018 Nicolas ZABOURI
- * Copyright (C) 2018-2020 Frédéric France
+ * Copyright (C) 2018-2022 Frédéric France
* Copyright (C) 2018-2021 Ferran Marcet
* Copyright (C) 2021 Josep Lluís Amador
*
@@ -472,17 +472,21 @@ class CommandeFournisseur extends CommonOrder
$sql .= " l.date_start, l.date_end,";
$sql .= ' l.fk_multicurrency, l.multicurrency_code, l.multicurrency_subprice, l.multicurrency_total_ht, l.multicurrency_total_tva, l.multicurrency_total_ttc';
if (!empty($conf->global->PRODUCT_USE_SUPPLIER_PACKAGING)) {
- $sql .= ", pfp.rowid as fk_pfp, pfp.packaging";
+ $sql .= ", pfp.rowid as fk_pfp, pfp.packaging, MAX(pfp.quantity) as max_qty";
}
$sql .= " FROM ".MAIN_DB_PREFIX."commande_fournisseurdet as l";
$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON l.fk_product = p.rowid';
if (!empty($conf->global->PRODUCT_USE_SUPPLIER_PACKAGING)) {
- $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_fournisseur_price as pfp ON l.fk_product = pfp.fk_product and l.ref = pfp.ref_fourn AND pfp.fk_soc = ".((int) $this->socid);
+ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_fournisseur_price as pfp ON pfp.entity IN (".getEntity('product_fournisseur_price').") AND l.fk_product = pfp.fk_product and l.ref = pfp.ref_fourn AND pfp.fk_soc = ".((int) $this->socid);
}
$sql .= " WHERE l.fk_commande = ".((int) $this->id);
if ($only_product) {
$sql .= ' AND p.fk_product_type = 0';
}
+ if (!empty($conf->global->PRODUCT_USE_SUPPLIER_PACKAGING)) {
+ $sql.= " AND l.qty >= pfp.quantity ";
+ $sql.= " GROUP BY l.rowid HAVING max_qty = MAX(pfp.quantity) ";
+ }
$sql .= " ORDER BY l.rang, l.rowid";
//print $sql;
@@ -787,7 +791,7 @@ class CommandeFournisseur extends CommonOrder
*/
public function getNomUrl($withpicto = 0, $option = '', $notooltip = 0, $save_lastsearch_value = -1, $addlinktonotes = 0)
{
- global $langs, $conf, $user;
+ global $langs, $conf, $user, $hookmanager;
$result = '';
@@ -869,6 +873,15 @@ class CommandeFournisseur extends CommonOrder
}
}
+ global $action;
+ $hookmanager->initHooks(array($this->element . 'dao'));
+ $parameters = array('id'=>$this->id, 'getnomurl' => &$result);
+ $reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
+ if ($reshook > 0) {
+ $result = $hookmanager->resPrint;
+ } else {
+ $result .= $hookmanager->resPrint;
+ }
return $result;
}
@@ -3014,16 +3027,12 @@ class CommandeFournisseur extends CommonOrder
// phpcs:enable
global $conf, $langs;
- $clause = " WHERE";
-
$sql = "SELECT c.rowid, c.date_creation as datec, c.date_commande, c.fk_statut, c.date_livraison as delivery_date, c.total_ht";
$sql .= " FROM ".MAIN_DB_PREFIX."commande_fournisseur as c";
if (empty($user->rights->societe->client->voir) && !$user->socid) {
- $sql .= " JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON c.fk_soc = sc.fk_soc";
- $sql .= " WHERE sc.fk_user = ".((int) $user->id);
- $clause = " AND";
+ $sql .= " JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON c.fk_soc = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
}
- $sql .= $clause." c.entity = ".$conf->entity;
+ $sql .= " WHERE c.entity = ".$conf->entity;
if ($mode === 'awaiting') {
$sql .= " AND c.fk_statut IN (".self::STATUS_ORDERSENT.", ".self::STATUS_RECEIVED_PARTIALLY.")";
} else {
@@ -3123,18 +3132,19 @@ class CommandeFournisseur extends CommonOrder
$outputlangs->load("products");
if (!dol_strlen($modele)) {
- $modele = 'muscadet';
-
+ $modele = '';
if ($this->model_pdf) {
$modele = $this->model_pdf;
} elseif (!empty($conf->global->COMMANDE_SUPPLIER_ADDON_PDF)) {
$modele = $conf->global->COMMANDE_SUPPLIER_ADDON_PDF;
}
}
-
- $modelpath = "core/modules/supplier_order/doc/";
-
- return $this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams);
+ if (empty($modele)) {
+ return 0;
+ } else {
+ $modelpath = "core/modules/supplier_order/doc/";
+ return $this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams);
+ }
}
/**
@@ -3537,14 +3547,17 @@ class CommandeFournisseurLigne extends CommonOrderLine
$sql .= ' cd.date_start, cd.date_end, cd.fk_unit,';
$sql .= ' cd.multicurrency_subprice, cd.multicurrency_total_ht, cd.multicurrency_total_tva, cd.multicurrency_total_ttc';
if (!empty($conf->global->PRODUCT_USE_SUPPLIER_PACKAGING)) {
- $sql .= ", pfp.rowid as fk_pfp, pfp.packaging";
+ $sql .= ", pfp.rowid as fk_pfp, pfp.packaging, MAX(pfp.quantity) as max_qty";
}
$sql .= ' FROM '.MAIN_DB_PREFIX.'commande_fournisseurdet as cd';
$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON cd.fk_product = p.rowid';
if (!empty($conf->global->PRODUCT_USE_SUPPLIER_PACKAGING)) {
- $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_fournisseur_price as pfp ON cd.fk_product = pfp.fk_product and cd.ref = pfp.ref_fourn";
+ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_fournisseur_price as pfp ON pfp.entity IN (".getEntity('product_fournisseur_price').") AND cd.fk_product = pfp.fk_product and cd.ref = pfp.ref_fourn";
}
$sql .= ' WHERE cd.rowid = '.((int) $rowid);
+ if (!empty($conf->global->PRODUCT_USE_SUPPLIER_PACKAGING)) {
+ $sql .= " AND cd.qty >= pfp.quantity GROUP BY cd.rowid HAVING max_qty = MAX(pfp.quantity)";
+ }
$result = $this->db->query($sql);
if ($result) {
$objp = $this->db->fetch_object($result);
diff --git a/htdocs/fourn/class/fournisseur.facture-rec.class.php b/htdocs/fourn/class/fournisseur.facture-rec.class.php
new file mode 100644
index 00000000000..c8f0ad75536
--- /dev/null
+++ b/htdocs/fourn/class/fournisseur.facture-rec.class.php
@@ -0,0 +1,2200 @@
+
+ * Copyright (C) 2004-2019 Laurent Destailleur
+ * Copyright (C) 2009-2012 Regis Houssin
+ * Copyright (C) 2010-2011 Juanjo Menent
+ * Copyright (C) 2012 Cedric Salvador
+ * Copyright (C) 2013 Florian Henry
+ * Copyright (C) 2015 Marcos García
+ * Copyright (C) 2017-2020 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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see ' : '').$ret.($this->isMaxNbGenReached() ? ' ' : '');
+ }
+
+ /**
+ * Create all recurrents supplier invoices (for all entities if multicompany is used).
+ * A result may also be provided into this->output.
+ *
+ * WARNING: This method change temporarly context $conf->entity to be in correct context for each recurring invoice found.
+ *
+ * @param int $restrictioninvoiceid 0=All qualified template invoices found. > 0 = restrict action on invoice ID
+ * @param int $forcevalidation 1=Force validation of invoice whatever is template auto_validate flag.
+ * @return int 0 if OK, < 0 if KO (this function is used also by cron so only 0 is OK)
+ */
+ public function createRecurringInvoices($restrictioninvoiceid = 0, $forcevalidation = 0)
+ {
+ global $conf, $langs, $db, $user, $hookmanager;
+
+ $error = 0;
+ $nb_create = 0;
+
+ // Load translation files required by the page
+ $langs->loadLangs(array('main', 'bills'));
+
+ $now = dol_now();
+ $tmparray = dol_getdate($now);
+ $today = dol_mktime(23, 59, 59, $tmparray['mon'], $tmparray['mday'], $tmparray['year']); // Today is last second of current day
+
+ dol_syslog('createRecurringInvoices restrictioninvoiceid=' .$restrictioninvoiceid. ' forcevalidation=' .$forcevalidation);
+
+ $sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.'facture_fourn_rec';
+ $sql .= ' WHERE frequency > 0'; // A recurring supplier invoice is an invoice with a frequency
+ $sql .= " AND (date_when IS NULL OR date_when <= '".$this->db->idate($today)."')";
+ $sql .= ' AND (nb_gen_done < nb_gen_max OR nb_gen_max = 0)';
+ $sql .= ' AND suspended = 0';
+ $sql .= ' AND entity = '. (int) $conf->entity; // MUST STAY = $conf->entity here
+ if ($restrictioninvoiceid > 0) {
+ $sql .= ' AND rowid = '. (int) $restrictioninvoiceid;
+ }
+ $sql .= $this->db->order('entity', 'ASC');
+ //print $sql;exit;
+ $parameters = array(
+ 'restrictioninvoiceid' => $restrictioninvoiceid,
+ 'forcevalidation' => $forcevalidation,
+ );
+ $reshook = $hookmanager->executeHooks('beforeCreationOfRecurringInvoices', $parameters, $sql); // note that $sql might be modified by hooks
+
+ $resql = $this->db->query($sql);
+ if ($resql) {
+ $i = 0;
+ $num = $this->db->num_rows($resql);
+
+ if ($num) {
+ $this->output .= $langs->trans('FoundXQualifiedRecurringInvoiceTemplate', $num)."\n";
+ } else {
+ $this->output .= $langs->trans('NoQualifiedRecurringInvoiceTemplateFound');
+ }
+
+ $saventity = $conf->entity;
+
+ while ($i < $num) { // Loop on each template invoice. If $num = 0, test is false at first pass.
+ $line = $this->db->fetch_object($resql);
+
+ $this->db->begin();
+
+ $invoiceidgenerated = 0;
+
+ $new_fac_fourn = null;
+ $facturerec = new FactureFournisseurRec($this->db);
+ $facturerec->fetch($line->rowid);
+
+ if ($facturerec->id > 0) {
+ // Set entity context
+ $conf->entity = $facturerec->entity;
+
+ dol_syslog('createRecurringInvoices Process invoice template id=' .$facturerec->id. ', ref=' .$facturerec->ref. ', entity=' .$facturerec->entity);
+
+ $new_fac_fourn = new FactureFournisseur($this->db);
+ $new_fac_fourn->fac_rec = $facturerec->id; // We will create $facture from this recurring invoice
+ $new_fac_fourn->fk_fac_rec_source = $facturerec->id; // We will create $facture from this recurring invoice
+
+ $new_fac_fourn->type = self::TYPE_STANDARD;
+ $new_fac_fourn->brouillon = 1;
+ $new_fac_fourn->statut = self::STATUS_DRAFT;
+ $new_fac_fourn->status = self::STATUS_DRAFT;
+ $new_fac_fourn->date = empty($facturerec->date_when) ? $now : $facturerec->date_when; // We could also use dol_now here but we prefer date_when so invoice has real date when we would like even if we generate later.
+ $new_fac_fourn->socid = $facturerec->socid;
+ $new_fac_fourn->lines = $facturerec->lines;
+ $new_fac_fourn->ref_supplier = $facturerec->ref_supplier;
+ $new_fac_fourn->model_pdf = $facturerec->model_pdf;
+ $new_fac_fourn->fk_project = $facturerec->fk_project;
+ $new_fac_fourn->libelle = $facturerec->libelle;
+
+ $invoiceidgenerated = $new_fac_fourn->create($user);
+ if ($invoiceidgenerated <= 0) {
+ $this->errors = $new_fac_fourn->errors;
+ $this->error = $new_fac_fourn->error;
+ $error++;
+ }
+ if (!$error && ($facturerec->auto_validate || $forcevalidation)) {
+ $result = $new_fac_fourn->validate($user);
+ if ($result <= 0) {
+ $this->errors = $new_fac_fourn->errors;
+ $this->error = $new_fac_fourn->error;
+ $error++;
+ }
+ }
+
+ if (!$error && $facturerec->generate_pdf) {
+ // We refresh the object in order to have all necessary data (like date_lim_reglement)
+ $new_fac_fourn->fetch($new_fac_fourn->id);
+ $result = $new_fac_fourn->generateDocument($facturerec->model_pdf, $langs);
+ if ($result <= 0) {
+ $this->errors = $new_fac_fourn->errors;
+ $this->error = $new_fac_fourn->error;
+ $error++;
+ }
+ }
+ } else {
+ $error++;
+ $this->error = 'Failed to load invoice template with id=' .$line->rowid. ', entity=' .$conf->entity."\n";
+ $this->errors[] = 'Failed to load invoice template with id=' .$line->rowid. ', entity=' .$conf->entity;
+ dol_syslog('createRecurringInvoices Failed to load invoice template with id=' .$line->rowid. ', entity=' .$conf->entity);
+ }
+
+ if (!$error && $invoiceidgenerated >= 0) {
+ $facturerec->nb_gen_done++;
+ $facturerec->date_last_gen = dol_now();
+ $facturerec->date_when= $facturerec->getNextDate();
+ $facturerec->update($user);
+ $this->db->commit('createRecurringInvoices Process invoice template id=' .$facturerec->id. ', title=' .$facturerec->titre);
+ dol_syslog('createRecurringInvoices Process invoice template ' .$facturerec->titre. ' is finished with a success generation');
+ $nb_create++;
+ $this->output .= $langs->trans('InvoiceGeneratedFromTemplate', $new_fac_fourn->ref, $facturerec->titre)."\n";
+ } else {
+ $this->db->rollback('createRecurringInvoices Process invoice template id=' .$facturerec->id. ', title=' .$facturerec->titre);
+ }
+
+ $parameters = array(
+ 'cpt' => $i,
+ 'total' => $num,
+ 'errorCount' => $error,
+ 'invoiceidgenerated' => $invoiceidgenerated,
+ 'facturerec' => $facturerec, // it's an object which PHP passes by "reference", so modifiable by hooks.
+ 'this' => $this, // it's an object which PHP passes by "reference", so modifiable by hooks.
+ );
+ $reshook = $hookmanager->executeHooks('afterCreationOfRecurringInvoice', $parameters, $new_fac_fourn); // note: $facture can be modified by hooks (warning: $facture can be null)
+
+ $i++;
+ }
+
+ $conf->entity = $saventity; // Restore entity context
+ } else {
+ dol_print_error($this->db);
+ }
+
+ $this->output = trim($this->output);
+
+ return $error ? $error : 0;
+ }
+
+ /**
+ * Return clicable name (with picto eventually)
+ *
+ * @param int $withpicto Add picto into link
+ * @param string $option Where point the link
+ * @param int $max Maxlength of ref
+ * @param int $short 1=Return just URL
+ * @param string $moretitle Add more text to title tooltip
+ * @param int $notooltip 1=Disable tooltip
+ * @param int $save_lastsearch_value -1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
+ * @return string String with URL
+ */
+ public function getNomUrl($withpicto = 0, $option = '', $max = 0, $short = 0, $moretitle = '', $notooltip = '', $save_lastsearch_value = -1)
+ {
+ global $langs, $hookmanager;
+
+ $result = '';
+
+ $label = ''.$langs->trans('RepeatableInvoice').' ';
+ if (!empty($this->ref)) {
+ $label .= ''.$langs->trans('Ref').': '.$this->ref;
+ }
+ if ($this->frequency > 0) {
+ $label .= ''.$langs->trans('Frequency').': '.$langs->trans('FrequencyPer_'.$this->unit_frequency, $this->frequency);
+ }
+ if (!empty($this->date_last_gen)) {
+ $label .= ''.$langs->trans('DateLastGeneration').': '.dol_print_date($this->date_last_gen, 'dayhour');
+ }
+ if ($this->frequency > 0) {
+ if (!empty($this->date_when)) {
+ $label .= ''.$langs->trans('NextDateToExecution').': ';
+ $label .= (empty($this->suspended) ? '' : '').dol_print_date($this->date_when, 'day').(empty($this->suspended) ? '' : ' '); // No hour for this property
+ if (!empty($this->suspended)) {
+ $label .= ' ('.$langs->trans('Disabled').')';
+ }
+ }
+ }
+
+ $url = DOL_URL_ROOT.'/fourn/facture/card-rec.php?facid='.$this->id;
+
+ if ($short) {
+ return $url;
+ }
+
+ if ($option != 'nolink') {
+ // Add param to save lastsearch_values or not
+ $add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
+ if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER['PHP_SELF'])) {
+ $add_save_lastsearch_values = 1;
+ }
+ if ($add_save_lastsearch_values) {
+ $url .= '&save_lastsearch_values=1';
+ }
+ }
+
+ $linkstart = '';
+ $linkend = ' ';
+
+ $result .= $linkstart;
+ if ($withpicto) {
+ $result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+ }
+ if ($withpicto != 2) {
+ $result .= $this->ref;
+ }
+ $result .= $linkend;
+ global $action;
+ $hookmanager->initHooks(array($this->element . 'dao'));
+ $parameters = array('id'=>$this->id, 'getnomurl' => &$result);
+ $reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
+ if ($reshook > 0) {
+ $result = $hookmanager->resPrint;
+ } else {
+ $result .= $hookmanager->resPrint;
+ }
+ return $result;
+ }
+
+ /**
+ * Return label of object status
+ *
+ * @param int $mode 0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=short label + picto, 6=Long label + picto
+ * @param integer $alreadypaid Not used on recurring invoices
+ * @return string Label of status
+ */
+ public function getLibStatut($mode = 0, $alreadypaid = -1)
+ {
+ return $this->LibStatut($this->frequency ? 1 : 0, $this->suspended, $mode, $alreadypaid, empty($this->type) ? 0 : $this->type);
+ }
+
+ // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+ /**
+ * Return label of a status
+ *
+ * @param int $recur Is it a recurring invoice ?
+ * @param int $status Id status (suspended or not)
+ * @param int $mode 0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=short label + picto, 6=long label + picto
+ * @param integer $alreadypaid Not used for recurring invoices
+ * @param int $type Type invoice
+ * @return string Label of status
+ */
+ public function LibStatut($recur, $status, $mode = 0, $alreadypaid = -1, $type = 0)
+ {
+ // phpcs:enable
+ global $langs;
+ $langs->load('bills');
+
+ $labelStatus = $langs->transnoentitiesnoconv('Active');
+ $statusType = 'status0';
+
+ //print "$recur,$status,$mode,$alreadypaid,$type";
+ if ($mode == 0) {
+ if ($recur) {
+ if ($status == self::STATUS_SUSPENDED) {
+ $labelStatus = $langs->transnoentitiesnoconv('Disabled');
+ } else {
+ $labelStatus = $langs->transnoentitiesnoconv('Active');
+ }
+ } else {
+ if ($status == self::STATUS_SUSPENDED) {
+ $labelStatus = $langs->transnoentitiesnoconv('Disabled');
+ } else {
+ $labelStatus = $langs->transnoentitiesnoconv('Draft');
+ }
+ }
+ } elseif ($mode == 1) {
+ $prefix = 'Short';
+ if ($recur) {
+ if ($status == self::STATUS_SUSPENDED) {
+ $labelStatus = $langs->transnoentitiesnoconv('Disabled');
+ } else {
+ $labelStatus = $langs->transnoentitiesnoconv('Active');
+ }
+ } else {
+ if ($status == self::STATUS_SUSPENDED) {
+ $labelStatus = $langs->transnoentitiesnoconv('Disabled');
+ } else {
+ $labelStatus = $langs->transnoentitiesnoconv('Draft');
+ }
+ }
+ } elseif ($mode == 2) {
+ if ($recur) {
+ if ($status == self::STATUS_SUSPENDED) {
+ $statusType = 'status6';
+ $labelStatus = $langs->transnoentitiesnoconv('Disabled');
+ } else {
+ $statusType = 'status4';
+ $labelStatus = $langs->transnoentitiesnoconv('Active');
+ }
+ } else {
+ if ($status == self::STATUS_SUSPENDED) {
+ $statusType = 'status6';
+ $labelStatus = $langs->transnoentitiesnoconv('Disabled');
+ } else {
+ $statusType = 'status0';
+ $labelStatus = $langs->transnoentitiesnoconv('Draft');
+ }
+ }
+ } elseif ($mode == 3) {
+ if ($recur) {
+ $prefix = 'Short';
+ if ($status == self::STATUS_SUSPENDED) {
+ $statusType = 'status6';
+ $labelStatus = $langs->transnoentitiesnoconv('Disabled');
+ } else {
+ $statusType = 'status4';
+ $labelStatus = $langs->transnoentitiesnoconv('Active');
+ }
+ } else {
+ if ($status == self::STATUS_SUSPENDED) {
+ $statusType = 'status6';
+ $labelStatus = $langs->transnoentitiesnoconv('Disabled');
+ } else {
+ $statusType = 'status0';
+ $labelStatus = $langs->transnoentitiesnoconv('Draft');
+ }
+ }
+ } elseif ($mode == 4) {
+ $prefix = '';
+ if ($recur) {
+ if ($status == self::STATUS_SUSPENDED) {
+ $statusType = 'status6';
+ $labelStatus = $langs->transnoentitiesnoconv('Disabled');
+ } else {
+ $statusType = 'status4';
+ $labelStatus = $langs->transnoentitiesnoconv('Active');
+ }
+ } else {
+ if ($status == self::STATUS_SUSPENDED) {
+ $statusType = 'status6';
+ $labelStatus = $langs->transnoentitiesnoconv('Disabled');
+ } else {
+ $statusType = 'status0';
+ $labelStatus = $langs->transnoentitiesnoconv('Draft');
+ }
+ }
+ } elseif ($mode == 5 || $mode == 6) {
+ $prefix = '';
+ if ($mode == 5) {
+ $prefix = 'Short';
+ }
+ if ($recur) {
+ if ($status == self::STATUS_SUSPENDED) {
+ $statusType = 'status6';
+ $labelStatus = $langs->transnoentitiesnoconv('Disabled');
+ } else {
+ $statusType = 'status4';
+ $labelStatus = $langs->transnoentitiesnoconv('Active');
+ }
+ } else {
+ if ($status == self::STATUS_SUSPENDED) {
+ $statusType = 'status6';
+ $labelStatus = $langs->transnoentitiesnoconv('Disabled');
+ } else {
+ $statusType = 'status0';
+ $labelStatus = $langs->transnoentitiesnoconv('Draft');
+ }
+ }
+ }
+
+ $labelStatusShort = $labelStatus;
+
+ return dolGetStatus($labelStatus, $labelStatusShort, '', $statusType, $mode);
+ }
+
+ /**
+ * Initialise an instance with random values.
+ * Used to build previews or test instances.
+ * id must be 0 if object instance is a specimen.
+ *
+ * @param string $option ''=Create a specimen invoice with lines, 'nolines'=No lines
+ * @return void
+ */
+ public function initAsSpecimen($option = '')
+ {
+ global $user, $langs, $conf;
+
+ $now = dol_now();
+ $arraynow = dol_getdate($now);
+ $nownotime = dol_mktime(0, 0, 0, $arraynow['mon'], $arraynow['mday'], $arraynow['year']);
+
+ // Load array of products prodids
+ $num_prods = 0;
+ $prodids = array();
+
+ $sql = 'SELECT rowid';
+ $sql .= ' FROM ' .MAIN_DB_PREFIX. 'product';
+ $sql .= ' WHERE entity IN (' .getEntity('product'). ')';
+ $sql .= $this->db->plimit(100);
+
+ $resql = $this->db->query($sql);
+ if ($resql) {
+ $num_prods = $this->db->num_rows($resql);
+ $i = 0;
+ while ($i < $num_prods) {
+ $i++;
+ $row = $this->db->fetch_row($resql);
+ $prodids[$i] = $row[0];
+ }
+ }
+
+ // Initialize parameters
+ $this->id = 0;
+ $this->ref = 'SPECIMEN';
+ $this->title = 'SPECIMEN';
+ $this->specimen = 1;
+ $this->socid = 1;
+ $this->date = $nownotime;
+ $this->date_lim_reglement = $nownotime + 3600 * 24 * 30;
+ $this->cond_reglement_id = 1;
+ $this->cond_reglement_code = 'RECEP';
+ $this->date_lim_reglement = $this->calculate_date_lim_reglement();
+ $this->mode_reglement_id = 0; // Not forced to show payment mode CHQ + VIR
+ $this->mode_reglement_code = ''; // Not forced to show payment mode CHQ + VIR
+ $this->note_public = 'This is a comment (public)';
+ $this->note_private = 'This is a comment (private)';
+ $this->note = 'This is a comment (private)';
+ $this->fk_incoterms = 0;
+ $this->location_incoterms = '';
+
+ if (empty($option) || $option != 'nolines') {
+ // Lines
+ $nbp = 5;
+ $xnbp = 0;
+ while ($xnbp < $nbp) {
+ $line = new FactureLigne($this->db);
+ $line->desc = $langs->trans('Description'). ' ' .$xnbp;
+ $line->qty = 1;
+ $line->subprice = 100;
+ $line->tva_tx = 19.6;
+ $line->localtax1_tx = 0;
+ $line->localtax2_tx = 0;
+ $line->remise_percent = 0;
+ if ($xnbp == 1) { // Qty is negative (product line)
+ $prodid = mt_rand(1, $num_prods);
+ $line->fk_product = $prodids[$prodid];
+ $line->qty = -1;
+ $line->total_ht = -100;
+ $line->total_ttc = -119.6;
+ $line->total_tva = -19.6;
+ } elseif ($xnbp == 2) { // UP is negative (free line)
+ $line->subprice = -100;
+ $line->total_ht = -100;
+ $line->total_ttc = -119.6;
+ $line->total_tva = -19.6;
+ $line->remise_percent = 0;
+ } elseif ($xnbp == 3) { // Discount is 50% (product line)
+ $prodid = mt_rand(1, $num_prods);
+ $line->fk_product = $prodids[$prodid];
+ $line->total_ht = 50;
+ $line->total_ttc = 59.8;
+ $line->total_tva = 9.8;
+ $line->remise_percent = 50;
+ } else // (product line)
+ {
+ $prodid = mt_rand(1, $num_prods);
+ $line->fk_product = $prodids[$prodid];
+ $line->total_ht = 100;
+ $line->total_ttc = 119.6;
+ $line->total_tva = 19.6;
+ $line->remise_percent = 00;
+ }
+
+ $this->lines[$xnbp] = $line;
+ $xnbp++;
+
+ $this->total_ht += $line->total_ht;
+ $this->total_tva += $line->total_tva;
+ $this->total_ttc += $line->total_ttc;
+ }
+ $this->revenuestamp = 0;
+
+ // Add a line "offered"
+ $line = new FactureLigne($this->db);
+ $line->desc = $langs->trans('Description'). ' (offered line)';
+ $line->qty = 1;
+ $line->subprice = 100;
+ $line->tva_tx = 19.6;
+ $line->localtax1_tx = 0;
+ $line->localtax2_tx = 0;
+ $line->remise_percent = 100;
+ $line->total_ht = 0;
+ $line->total_ttc = 0; // 90 * 1.196
+ $line->total_tva = 0;
+ $prodid = mt_rand(1, $num_prods);
+ $line->fk_product = $prodids[$prodid];
+
+ $this->lines[$xnbp] = $line;
+ $xnbp++;
+ }
+
+ $this->usenewprice = 0;
+ }
+
+ /**
+ * Function used to replace a thirdparty id with another one.
+ *
+ * @param DoliDB $db Database handler
+ * @param int $origin_id Old thirdparty id
+ * @param int $dest_id New thirdparty id
+ * @return bool
+ */
+ public static function replaceThirdparty(DoliDB $db, $origin_id, $dest_id)
+ {
+ $tables = array(
+ 'facture_rec'
+ );
+
+ return CommonObject::commonReplaceThirdparty($db, $origin_id, $dest_id, $tables);
+ }
+
+ /**
+ * Update frequency and unit
+ *
+ * @param int $frequency value of frequency
+ * @param string $unit unit of frequency (d, m, y)
+ * @return int <0 if KO, >0 if OK
+ */
+ public function setFrequencyAndUnit($frequency, $unit)
+ {
+ if (!$this->table_element) {
+ dol_syslog(get_class($this). '::setFrequencyAndUnit was called on objet with property table_element not defined', LOG_ERR);
+ return -1;
+ }
+
+ if (!empty($frequency) && empty($unit)) {
+ dol_syslog(get_class($this). '::setFrequencyAndUnit was called on objet with params frequency defined but unit not defined', LOG_ERR);
+ return -2;
+ }
+
+ $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
+ $sql .= ' SET frequency = '.($frequency ? $this->db->escape($frequency) : 'null');
+ if (!empty($unit)) {
+ $sql .= ', unit_frequency = '.$this->db->escape($unit);
+ }
+ $sql .= ' WHERE rowid = ' . (int) $this->id;
+
+ dol_syslog(get_class($this). '::setFrequencyAndUnit', LOG_DEBUG);
+ if ($this->db->query($sql)) {
+ $this->frequency = $frequency;
+ if (!empty($unit)) {
+ $this->unit_frequency = $unit;
+ }
+ return 1;
+ } else {
+ dol_print_error($this->db);
+ return -1;
+ }
+ }
+
+ /**
+ * Update the next date of execution
+ *
+ * @param datetime $date date of execution
+ * @param int $increment_nb_gen_done 0 do nothing more, >0 increment nb_gen_done
+ * @return int <0 if KO, >0 if OK
+ */
+ public function setNextDate($date, $increment_nb_gen_done = 0)
+ {
+ if (!$this->table_element) {
+ dol_syslog(get_class($this). '::setNextDate was called on objet with property table_element not defined', LOG_ERR);
+ return -1;
+ }
+ $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
+ $sql .= ' SET date_when = ' .($date ? "'".$this->db->idate($date)."'" : 'null');
+ if ($increment_nb_gen_done > 0) {
+ $sql .= ', nb_gen_done = nb_gen_done + 1';
+ }
+ $sql .= ' WHERE rowid = ' . (int) $this->id;
+
+ dol_syslog(get_class($this). '::setNextDate', LOG_DEBUG);
+ if ($this->db->query($sql)) {
+ $this->date_when = $date;
+ if ($increment_nb_gen_done > 0) {
+ $this->nb_gen_done++;
+ }
+ return 1;
+ } else {
+ dol_print_error($this->db);
+ return -1;
+ }
+ }
+
+ /**
+ * Update the maximum period
+ *
+ * @param int $nb number of maximum period
+ * @return int <0 if KO, >0 if OK
+ */
+ public function setMaxPeriod($nb)
+ {
+ if (!$this->table_element) {
+ dol_syslog(get_class($this). '::setMaxPeriod was called on objet with property table_element not defined', LOG_ERR);
+ return -1;
+ }
+
+ if (empty($nb)) {
+ $nb = 0;
+ }
+
+ $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
+ $sql .= ' SET nb_gen_max = '. (int) $nb;
+ $sql .= ' WHERE rowid = ' . (int) $this->id;
+
+ dol_syslog(get_class($this). '::setMaxPeriod', LOG_DEBUG);
+ if ($this->db->query($sql)) {
+ $this->nb_gen_max = $nb;
+ return 1;
+ } else {
+ dol_print_error($this->db);
+ return -1;
+ }
+ }
+
+ /**
+ * Update the auto validate flag of invoice
+ *
+ * @param int $validate 0 to create in draft, 1 to create and validate invoice
+ * @return int <0 if KO, >0 if OK
+ */
+ public function setAutoValidate($validate)
+ {
+ if (!$this->table_element) {
+ dol_syslog(get_class($this). '::setAutoValidate was called on objet with property table_element not defined', LOG_ERR);
+ return -1;
+ }
+
+ $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
+ $sql .= ' SET auto_validate = '.((int) $validate);
+ $sql .= ' WHERE rowid = ' . (int) $this->id;
+
+ dol_syslog(get_class($this). '::setAutoValidate', LOG_DEBUG);
+ if ($this->db->query($sql)) {
+ $this->auto_validate = $validate;
+ return 1;
+ } else {
+ dol_print_error($this->db);
+ return -1;
+ }
+ }
+
+ /**
+ * Update the auto generate documents
+ *
+ * @param int $validate 0 no document, 1 to generate document
+ * @return int <0 if KO, >0 if OK
+ */
+ public function setGeneratePdf($validate)
+ {
+ if (!$this->table_element) {
+ dol_syslog(get_class($this). '::setGeneratePdf was called on objet with property table_element not defined', LOG_ERR);
+ return -1;
+ }
+
+ $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
+ $sql .= ' SET generate_pdf = '. (int) $validate;
+ $sql .= ' WHERE rowid = ' . (int) $this->id;
+
+ dol_syslog(get_class($this). '::setGeneratePdf', LOG_DEBUG);
+ if ($this->db->query($sql)) {
+ $this->generate_pdf = $validate;
+ return 1;
+ } else {
+ dol_print_error($this->db);
+ return -1;
+ }
+ }
+
+ /**
+ * Update the model for documents
+ *
+ * @param string $model model of document generator
+ * @return int <0 if KO, >0 if OK
+ */
+ public function setModelPdf($model)
+ {
+ if (!$this->table_element) {
+ dol_syslog(get_class($this). '::setModelPdf was called on objet with property table_element not defined', LOG_ERR);
+ return -1;
+ }
+
+ $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
+ $sql .= " SET modelpdf = '".$this->db->escape($model)."'";
+ $sql .= ' WHERE rowid = ' . (int) $this->id;
+
+ dol_syslog(get_class($this). '::setModelPdf', LOG_DEBUG);
+ if ($this->db->query($sql)) {
+ $this->model_pdf = $model;
+ return 1;
+ } else {
+ dol_print_error($this->db);
+ return -1;
+ }
+ }
+}
+
+
+
+/**
+ * Class to manage supplier invoice lines of templates.
+ * Saved into database table llx_facture_fourn_det_rec
+ */
+class FactureFournisseurLigneRec extends CommonObjectLine
+{
+ /**
+ * @var string ID to identify managed object
+ */
+ public $element = 'invoice_supplier_det_rec';
+
+ /**
+ * @var string Name of table without prefix where object is stored
+ */
+ public $table_element = 'facture_fourn_det_rec';
+
+ public $fk_facture_fourn;
+ public $fk_parent;
+ public $fk_product;
+ public $ref_supplier;
+ public $label;
+ public $description;
+ public $pu_ht;
+ public $pu_ttc;
+ public $qty;
+ public $remise_percent;
+ public $fk_remise_except;
+ public $vat_src_code;
+ public $tva_tx;
+ public $localtax1_tx;
+ public $localtax1_type;
+ public $localtax2_tx;
+ public $localtax2_type;
+
+ public $product_type;
+ public $date_start;
+ public $date_end;
+ public $info_bits;
+ public $special_code;
+ public $rang;
+
+ public $fk_user_author;
+ public $fk_user_modif;
+ public $fk_multicurrency;
+ public $multicurrency_subprice;
+
+
+ /* Overrides fields in CommonObject
+ public $total_ht;
+ public $total_tva;
+ public $total_localtax1;
+ public $total_localtax2;
+ public $total_ttc;
+
+ public $fk_unit;
+ public $import_key;
+ public $multicurrency_code;
+ public $multicurrency_total_ht;
+ public $multicurrency_total_tva;
+ public $multicurrency_total_ttc;
+ */
+
+
+ /**
+ * Delete supplier order template line in database
+ *
+ * @param User $user Object user
+ * @param int $notrigger Disable triggers
+ * @return int <0 if KO, >0 if OK
+ */
+ public function delete(User $user, $notrigger = false)
+ {
+ $error = 0;
+ $this->db->begin();
+
+ if (! $error) {
+ if (! $notrigger) {
+ // Call triggers
+ $result = $this->call_trigger('LINEBILLREC_DELETE', $user);
+ if ($result < 0) {
+ $error++;
+ } // Do also here what you must do to rollback action if trigger fail
+ // End call triggers
+ }
+ }
+
+ if (! $error) {
+ $result = $this->deleteExtraFields();
+ if ($result < 0) {
+ $error++;
+ }
+ }
+
+ if (! $error) {
+ $sql = 'DELETE FROM ' . MAIN_DB_PREFIX . $this->table_element . ' WHERE rowid=' . (int) $this->id;
+
+ $res = $this->db->query($sql);
+ if ($res === false) {
+ $error++;
+ $this->errors[] = $this->db->lasterror();
+ }
+ }
+
+ // Commit or rollback
+ if ($error) {
+ $this->db->rollback();
+ return -1;
+ } else {
+ $this->db->commit();
+ return 1;
+ }
+ }
+
+
+ /**
+ * Get line of template invoice
+ *
+ * @param int $rowid Id of invoice
+ * @return int 1 if OK, < 0 if KO
+ */
+ public function fetch($rowid)
+ {
+ $sql = 'SELECT l.rowid,';
+ $sql .= ' l.fk_facture_fourn, l.fk_parent_line, l.fk_product,';
+ $sql .= ' l.ref as ref_supplier, l.label, l.description, l.pu_ht, l.pu_ttc, l.qty, l.remise_percent, l.fk_remise_except,';
+ $sql .= ' l.vat_src_code, l.tva_tx, l.localtax1_tx, l.localtax1_type, l.localtax2_tx, l.localtax2_type,';
+ $sql .= ' l.total_ht, l.total_tva, l.total_localtax1, l.total_localtax2, l.total_ttc,';
+ $sql .= ' l.product_type, l.date_start, l.date_end,';
+ $sql .= ' l.info_bits, l.special_code, l.rang, l.fk_unit, l.import_key,';
+ $sql .= ' l.fk_user_author, l.fk_user_modif, l.fk_multicurrency,';
+ $sql .= ' l.multicurrency_code, l.multicurrency_subprice, l.multicurrency_total_ht, l.multicurrency_total_tva, l.multicurrency_total_ttc,';
+ $sql .= ' p.ref as product_ref, p.fk_product_type as fk_product_type, p.label as product_label, p.description as product_desc';
+ $sql .= ' FROM '.MAIN_DB_PREFIX.'facture_fourn_det_rec as l';
+ $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON l.fk_product = p.rowid';
+ $sql .= ' WHERE l.rowid = '. (int) $rowid;
+ $sql .= ' ORDER BY l.rang';
+
+ dol_syslog('FactureRec::fetch', LOG_DEBUG);
+ $result = $this->db->query($sql);
+ if ($result) {
+ $objp = $this->db->fetch_object($result);
+
+ $this->id = $objp->rowid;
+ $this->fk_facture_fourn = $objp->fk_facture_fourn;
+ $this->fk_parent = $objp->fk_parent_line;
+ $this->fk_product = $objp->fk_product;
+ $this->ref_supplier = $objp->ref_supplier;
+ $this->label = $objp->label;
+ $this->description = $objp->description;
+ $this->pu_ht = $objp->pu_ht;
+ $this->pu_ttc = $objp->pu_ttc;
+ $this->qty = $objp->qty;
+ $this->remise_percent = $objp->remise_percent;
+ $this->fk_remise_except = $objp->fk_remise_except;
+ $this->vat_src_code = $objp->vat_src_code;
+ $this->tva_tx = $objp->tva_tx;
+ $this->localtax1_tx = $objp->localtax1_tx;
+ $this->localtax1_type = $objp->localtax1_type;
+ $this->localtax2_tx = $objp->localtax2_tx;
+ $this->localtax2_type = $objp->localtax2_type;
+ $this->total_ht = $objp->total_ht;
+ $this->total_tva = $objp->total_tva;
+ $this->total_localtax1 = $objp->total_localtax1;
+ $this->total_localtax2 = $objp->total_localtax2;
+ $this->total_ttc = $objp->total_ttc;
+ $this->product_type = $objp->product_type;
+ $this->date_start = $objp->date_start;
+ $this->date_end = $objp->date_end;
+ $this->info_bits = $objp->info_bits ;
+ $this->special_code = $objp->special_code;
+ $this->rang = $objp->rang;
+ $this->fk_unit = $objp->fk_unit;
+ $this->import_key = $objp->import_key;
+ $this->fk_user_author = $objp->fk_user_author;
+ $this->fk_user_modif = $objp->fk_user_modif;
+ $this->fk_multicurrency = $objp->fk_multicurrency;
+ $this->multicurrency_code = $objp->multicurrency_code;
+ $this->multicurrency_subprice = $objp->multicurrency_subprice;
+ $this->multicurrency_total_ht = $objp->multicurrency_total_ht;
+ $this->multicurrency_total_tva = $objp->multicurrency_total_tva;
+ $this->multicurrency_total_ttc = $objp->multicurrency_total_ttc;
+
+ $this->db->free($result);
+ return 1;
+ } else {
+ $this->error = $this->db->lasterror();
+ return -3;
+ }
+ }
+
+
+ /**
+ * Update a line to supplier invoice template .
+ *
+ * @param User $user User
+ * @param int $notrigger No trigger
+ * @return int <0 if KO, Id of line if OK
+ */
+ public function update(User $user, $notrigger = 0)
+ {
+ global $conf;
+
+ $error = 0;
+
+ include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
+
+ $sql = 'UPDATE ' . MAIN_DB_PREFIX . 'facture_fourn_det_rec SET';
+ $sql .= ' fk_facture_fourn = ' . (int) $this->fk_facture_fourn;
+ $sql .= ', fk_parent_line = ' . (int) $this->fk_parent;
+ $sql .= ', fk_product = ' . (int) $this->fk_product;
+ $sql .= ', ref = ' . (! empty($this->ref) ? "'" . $this->db->escape($this->ref) . "'" : 'null');
+ $sql .= ", label = " . (! empty($this->label) ? "'" . $this->db->escape($this->label) . "'" : 'null');
+ $sql .= ", description = '" . $this->db->escape($this->description) . "'";
+ $sql .= ', pu_ht = ' . price2num($this->pu_ht);
+ $sql .= ', pu_ttc = ' . price2num($this->pu_ttc);
+ $sql .= ', qty = ' . price2num($this->qty);
+ $sql .= ", remise_percent = '" . price2num($this->remise_percent) . "'";
+ $sql .= ', fk_remise_except = ' . (int) $this->fk_remise_except;
+ $sql .= ", vat_src_code = '" . $this->db->escape($this->vat_src_code) . "'";
+ $sql .= ', tva_tx =' . price2num($this->tva_tx);
+ $sql .= ', localtax1_tx = ' . price2num($this->localtax1_tx);
+ $sql .= ", localtax1_type = '" . $this->db->escape($this->localtax1_type) . "'";
+ $sql .= ', localtax2_tx = ' . price2num($this->localtax2_tx);
+ $sql .= ", localtax2_type = '" . $this->db->escape($this->localtax2_type) . "'";
+ if (empty($this->skip_update_total)) {
+ $sql .= ', total_ht =' . price2num($this->total_ht);
+ $sql .= ', total_tva =' . price2num($this->total_tva);
+ $sql .= ', total_localtax1 =' . price2num($this->total_localtax1);
+ $sql .= ', total_localtax2 =' . price2num($this->total_localtax2);
+ $sql .= ', total_ttc =' . price2num($this->total_ttc);
+ }
+ $sql .= ', product_type =' . (int) $this->product_type;
+ $sql .= ', date_start =' . (int) $this->date_start;
+ $sql .= ', date_end =' . (int) $this->date_end;
+ $sql .= ", info_bits ='" . price2num($this->info_bits) . "'";
+ $sql .= ', special_code =' . (int) $this->special_code;
+ $sql .= ', rang =' . (int) $this->rang;
+ $sql .= ', fk_unit =' .($this->fk_unit ? "'".$this->db->escape($this->fk_unit)."'" : 'null');
+ $sql .= ', fk_user_modif =' . (int) $user;
+
+ $sql .= ' WHERE rowid = ' . (int) $this->id;
+
+ $this->db->begin();
+
+ dol_syslog(get_class($this). '::updateline', LOG_DEBUG);
+ $resql = $this->db->query($sql);
+ if ($resql) {
+ if (!$error) {
+ $result = $this->insertExtraFields();
+ if ($result < 0) {
+ $error++;
+ }
+ }
+
+ if (!$error && !$notrigger) {
+ // Call trigger
+ $result = $this->call_trigger('LINESUPPLIERBILLREC_UPDATE', $user);
+ if ($result < 0) {
+ $error++;
+ }
+ // End call triggers
+ }
+
+ if ($error) {
+ $this->db->rollback();
+ return -2;
+ } else {
+ $this->db->commit();
+ return 1;
+ }
+ } else {
+ $this->error = $this->db->lasterror();
+ $this->db->rollback();
+ return -2;
+ }
+ }
+}
diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index e9db81e298f..922d9f25e29 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -251,6 +251,8 @@ class FactureFournisseur extends CommonInvoice
*/
public $fk_facture_source;
+ public $fac_rec;
+
public $fields = array(
'rowid' =>array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>10),
@@ -410,6 +412,128 @@ class FactureFournisseur extends CommonInvoice
$this->db->begin();
+ // Create invoice from a template recurring invoice
+ if ($this->fac_rec > 0) {
+ $this->fk_fac_rec_source = $this->fac_rec;
+
+ require_once DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.facture-rec.class.php';
+ $_facrec = new FactureFournisseurRec($this->db);
+ $result = $_facrec->fetch($this->fac_rec);
+ $result = $_facrec->fetchObjectLinked(null, '', null, '', 'OR', 1, 'sourcetype', 0); // This load $_facrec->linkedObjectsIds
+
+ // Define some dates
+ if (! empty($_facrec->frequency)) {
+ $originaldatewhen = $_facrec->date_when;
+ $nextdatewhen = dol_time_plus_duree($originaldatewhen, $_facrec->frequency, $_facrec->unit_frequency);
+ $previousdaynextdatewhen = dol_time_plus_duree($nextdatewhen, -1, 'd');
+ $this->socid = $_facrec->socid;
+ }
+
+ $this->entity = $_facrec->entity; // Invoice created in same entity than template
+
+ // Fields coming from GUI (priority on template). TODO Value of template should be used as default value on GUI so we can use here always value from GUI
+ $this->fk_projet = GETPOST('projectid', 'int') > 0 ? ((int) GETPOST('projectid', 'int')) : $_facrec->fk_projet;
+ $this->note_public = GETPOST('note_public', 'restricthtml') ? GETPOST('note_public', 'restricthtml') : $_facrec->note_public;
+ $this->note_private = GETPOST('note_private', 'restricthtml') ? GETPOST('note_private', 'restricthtml') : $_facrec->note_private;
+ $this->model_pdf = GETPOST('model', 'alpha') ? GETPOST('model', 'alpha') : $_facrec->model_pdf;
+ $this->cond_reglement_id = GETPOST('cond_reglement_id', 'int') > 0 ? ((int) GETPOST('cond_reglement_id', 'int')) : $_facrec->cond_reglement_id;
+ $this->mode_reglement_id = GETPOST('mode_reglement_id', 'int') > 0 ? ((int) GETPOST('mode_reglement_id', 'int')) : $_facrec->mode_reglement_id;
+ $this->fk_account = GETPOST('fk_account') > 0 ? ((int) GETPOST('fk_account')) : $_facrec->fk_account;
+
+ // Set here to have this defined for substitution into notes, should be recalculated after adding lines to get same result
+ $this->total_ht = $_facrec->total_ht;
+ $this->total_ttc = $_facrec->total_ttc;
+
+ // Fields always coming from template
+ $this->remise = $_facrec->remise;
+ $this->fk_incoterms = $_facrec->fk_incoterms;
+ $this->location_incoterms = $_facrec->location_incoterms;
+
+ // Clean parameters
+ if (! $this->type) {
+ $this->type = self::TYPE_STANDARD;
+ }
+ if (! empty(GETPOST('ref_supplier'))) {
+ $this->ref_supplier = trim($this->ref_supplier);
+ } else {
+ $this->ref_supplier = trim($this->ref_supplier . '_' . ($_facrec->nb_gen_done + 1));
+ }
+ $this->note_public = trim($this->note_public);
+ $this->note_private = trim($this->note_private);
+ $this->note_private = dol_concatdesc($this->note_private, $langs->trans("GeneratedFromRecurringInvoice", $_facrec->titre));
+
+ $this->array_options = $_facrec->array_options;
+
+ //if (! $this->remise) $this->remise = 0;
+ if (! $this->mode_reglement_id) {
+ $this->mode_reglement_id = 0;
+ }
+ $this->brouillon = 1;
+ $this->status = self::STATUS_DRAFT;
+ $this->statut = self::STATUS_DRAFT;
+
+ $this->linked_objects = $_facrec->linkedObjectsIds;
+ // We do not add link to template invoice or next invoice will be linked to all generated invoices
+ //$this->linked_objects['facturerec'][0] = $this->fac_rec;
+
+ $forceduedate = $this->calculate_date_lim_reglement();
+
+ // For recurring invoices, update date and number of last generation of recurring template invoice, before inserting new invoice
+ if ($_facrec->frequency > 0) {
+ dol_syslog("This is a recurring invoice so we set date_last_gen and next date_when");
+ if (empty($_facrec->date_when)) {
+ $_facrec->date_when = $now;
+ }
+ $next_date = $_facrec->getNextDate(); // Calculate next date
+ $result = $_facrec->setValueFrom('date_last_gen', $now, '', null, 'date', '', $user, '');
+ //$_facrec->setValueFrom('nb_gen_done', $_facrec->nb_gen_done + 1); // Not required, +1 already included into setNextDate when second param is 1.
+ $result = $_facrec->setNextDate($next_date, 1);
+ }
+
+ // Define lang of customer
+ $outputlangs = $langs;
+ $newlang = '';
+
+ if ($conf->global->MAIN_MULTILANGS && empty($newlang) && isset($this->thirdparty->default_lang)) {
+ $newlang = $this->thirdparty->default_lang; // for proposal, order, invoice, ...
+ }
+ if ($conf->global->MAIN_MULTILANGS && empty($newlang) && isset($this->default_lang)) {
+ $newlang = $this->default_lang; // for thirdparty
+ }
+ if (! empty($newlang)) {
+ $outputlangs = new Translate("", $conf);
+ $outputlangs->setDefaultLang($newlang);
+ }
+
+ // Array of possible substitutions (See also file mailing-send.php that should manage same substitutions)
+ $substitutionarray = getCommonSubstitutionArray($outputlangs, 0, null, $this);
+ $substitutionarray['__INVOICE_PREVIOUS_MONTH__'] = dol_print_date(dol_time_plus_duree($this->date, -1, 'm'), '%m');
+ $substitutionarray['__INVOICE_MONTH__'] = dol_print_date($this->date, '%m');
+ $substitutionarray['__INVOICE_NEXT_MONTH__'] = dol_print_date(dol_time_plus_duree($this->date, 1, 'm'), '%m');
+ $substitutionarray['__INVOICE_PREVIOUS_MONTH_TEXT__'] = dol_print_date(dol_time_plus_duree($this->date, -1, 'm'), '%B');
+ $substitutionarray['__INVOICE_MONTH_TEXT__'] = dol_print_date($this->date, '%B');
+ $substitutionarray['__INVOICE_NEXT_MONTH_TEXT__'] = dol_print_date(dol_time_plus_duree($this->date, 1, 'm'), '%B');
+ $substitutionarray['__INVOICE_PREVIOUS_YEAR__'] = dol_print_date(dol_time_plus_duree($this->date, -1, 'y'), '%Y');
+ $substitutionarray['__INVOICE_YEAR__'] = dol_print_date($this->date, '%Y');
+ $substitutionarray['__INVOICE_NEXT_YEAR__'] = dol_print_date(dol_time_plus_duree($this->date, 1, 'y'), '%Y');
+ // Only for template invoice
+ $substitutionarray['__INVOICE_DATE_NEXT_INVOICE_BEFORE_GEN__'] = dol_print_date($originaldatewhen, 'dayhour');
+ $substitutionarray['__INVOICE_DATE_NEXT_INVOICE_AFTER_GEN__'] = dol_print_date($nextdatewhen, 'dayhour');
+ $substitutionarray['__INVOICE_PREVIOUS_DATE_NEXT_INVOICE_AFTER_GEN__'] = dol_print_date($previousdaynextdatewhen, 'dayhour');
+ $substitutionarray['__INVOICE_COUNTER_CURRENT__'] = $_facrec->nb_gen_done;
+ $substitutionarray['__INVOICE_COUNTER_MAX__'] = $_facrec->nb_gen_max;
+
+ complete_substitutions_array($substitutionarray, $outputlangs);
+
+ $this->note_public = make_substitutions($this->note_public, $substitutionarray);
+ $this->note_private = make_substitutions($this->note_private, $substitutionarray);
+ }
+
+ // Define due date if not already defined
+ if (! empty($forceduedate)) {
+ $this->date_echeance = $forceduedate;
+ }
+
if (!$remise) {
$remise = 0;
}
@@ -437,6 +561,7 @@ class FactureFournisseur extends CommonInvoice
$sql .= ", multicurrency_code";
$sql .= ", multicurrency_tx";
$sql .= ", fk_facture_source";
+ $sql .= ", fk_fac_rec_source";
$sql .= ")";
$sql .= " VALUES (";
$sql .= "'(PROV)'";
@@ -462,6 +587,7 @@ class FactureFournisseur extends CommonInvoice
$sql .= ", '".$this->db->escape($this->multicurrency_code)."'";
$sql .= ", ".(double) $this->multicurrency_tx;
$sql .= ", ".(isset($this->fk_facture_source) ? $this->fk_facture_source : "NULL");
+ $sql .= ", ".(isset($this->fk_fac_rec_source) ? $this->fk_fac_rec_source : "NULL");
$sql .= ")";
dol_syslog(get_class($this)."::create", LOG_DEBUG);
@@ -506,7 +632,7 @@ class FactureFournisseur extends CommonInvoice
}
}
- if (count($this->lines) && is_object($this->lines[0])) { // If this->lines is array of InvoiceLines (preferred mode)
+ if (!$error && empty($this->fac_rec) && count($this->lines) && is_object($this->lines[0])) { // If this->lines is array of InvoiceLines (preferred mode)
dol_syslog("There is ".count($this->lines)." lines that are invoice lines objects");
foreach ($this->lines as $i => $val) {
$sql = 'INSERT INTO '.MAIN_DB_PREFIX.'facture_fourn_det (fk_facture_fourn, special_code, fk_remise_except)';
@@ -516,7 +642,7 @@ class FactureFournisseur extends CommonInvoice
if ($resql_insert) {
$idligne = $this->db->last_insert_id(MAIN_DB_PREFIX.'facture_fourn_det');
- $this->updateline(
+ $res = $this->updateline(
$idligne,
$this->lines[$i]->description,
$this->lines[$i]->pu_ht,
@@ -543,8 +669,7 @@ class FactureFournisseur extends CommonInvoice
return -5;
}
}
- } else // If this->lines is an array of invoice line arrays
- {
+ } elseif (!$error && empty($this->fac_rec)) { // If this->lines is an array of invoice line arrays
dol_syslog("There is ".count($this->lines)." lines that are array lines");
foreach ($this->lines as $i => $val) {
$line = $this->lines[$i];
@@ -591,6 +716,92 @@ class FactureFournisseur extends CommonInvoice
}
}
+ /*
+ * Insert lines of template invoices
+ */
+ if (! $error && $this->fac_rec > 0) {
+ foreach ($_facrec->lines as $i => $val) {
+ if ($_facrec->lines[$i]->fk_product) {
+ $prod = new Product($this->db);
+ $res = $prod->fetch($_facrec->lines[$i]->fk_product);
+ }
+
+ // For line from template invoice, we use data from template invoice
+ /*
+ $tva_tx = get_default_tva($mysoc,$soc,$prod->id);
+ $tva_npr = get_default_npr($mysoc,$soc,$prod->id);
+ if (empty($tva_tx)) $tva_npr=0;
+ $localtax1_tx=get_localtax($tva_tx,1,$soc,$mysoc,$tva_npr);
+ $localtax2_tx=get_localtax($tva_tx,2,$soc,$mysoc,$tva_npr);
+ */
+ $tva_tx = $_facrec->lines[$i]->tva_tx . ($_facrec->lines[$i]->vat_src_code ? '(' . $_facrec->lines[$i]->vat_src_code . ')' : '');
+ $tva_npr = $_facrec->lines[$i]->info_bits;
+ if (empty($tva_tx)) {
+ $tva_npr = 0;
+ }
+ $localtax1_tx = $_facrec->lines[$i]->localtax1_tx;
+ $localtax2_tx = $_facrec->lines[$i]->localtax2_tx;
+
+ $fk_product_fournisseur_price = empty($_facrec->lines[$i]->fk_product_fournisseur_price) ? null : $_facrec->lines[$i]->fk_product_fournisseur_price;
+ $buyprice = empty($_facrec->lines[$i]->buyprice) ? 0 : $_facrec->lines[$i]->buyprice;
+
+ // If buyprice not defined from template invoice, we try to guess the best value
+ if (! $buyprice && $_facrec->lines[$i]->fk_product > 0) {
+ require_once DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.product.class.php';
+ $producttmp = new ProductFournisseur($this->db);
+ $producttmp->fetch($_facrec->lines[$i]->fk_product);
+
+ // If margin module defined on costprice, we try the costprice
+ // If not defined or if module margin defined and pmp and stock module enabled, we try pmp price
+ // else we get the best supplier price
+ if ($conf->global->MARGIN_TYPE == 'costprice' && ! empty($producttmp->cost_price)) {
+ $buyprice = $producttmp->cost_price;
+ } elseif (! empty($conf->stock->enabled) && ($conf->global->MARGIN_TYPE == 'costprice' || $conf->global->MARGIN_TYPE == 'pmp') && ! empty($producttmp->pmp)) {
+ $buyprice = $producttmp->pmp;
+ } else {
+ if ($producttmp->find_min_price_product_fournisseur($_facrec->lines[$i]->fk_product) > 0) {
+ if ($producttmp->product_fourn_price_id > 0) {
+ $buyprice = price2num($producttmp->fourn_unitprice * (1 - $producttmp->fourn_remise_percent / 100) + $producttmp->fourn_remise, 'MU');
+ }
+ }
+ }
+ }
+
+ $result_insert = $this->addline(
+ $_facrec->lines[$i]->description,
+ $_facrec->lines[$i]->pu_ht,
+ $tva_tx,
+ $localtax1_tx,
+ $localtax2_tx,
+ $_facrec->lines[$i]->qty,
+ $_facrec->lines[$i]->fk_product,
+ $_facrec->lines[$i]->remise_percent,
+ ($_facrec->lines[$i]->date_start == 1 && $this->date) ? $this->date : '',
+ ($_facrec->lines[$i]->date_end == 1 && $previousdaynextdatewhen) ? $previousdaynextdatewhen : '',
+ 0,
+ $_facrec->lines[$i]->info_bits,
+ 'HT',
+ 0,
+ $_facrec->lines[$i]->rang,
+ false,
+ $_facrec->lines[$i]->array_options,
+ $_facrec->lines[$i]->fk_unit,
+ 0,
+ 0,
+ $_facrec->lines[$i]->ref_supplier,
+ $_facrec->lines[$i]->special_code,
+ 0,
+ 0
+ );
+ if ($result_insert < 0) {
+ $error++;
+ $this->error = $this->db->error();
+ break;
+ }
+ }
+ }
+
+
// Update total price
$result = $this->update_price();
if ($result > 0) {
@@ -674,6 +885,7 @@ class FactureFournisseur extends CommonInvoice
$sql .= " t.fk_user_author,";
$sql .= " t.fk_user_valid,";
$sql .= " t.fk_facture_source,";
+ $sql .= " t.fk_fac_rec_source,";
$sql .= " t.fk_projet as fk_project,";
$sql .= " t.fk_cond_reglement,";
$sql .= " t.fk_account,";
@@ -741,6 +953,7 @@ class FactureFournisseur extends CommonInvoice
$this->author = $obj->fk_user_author;
$this->fk_user_valid = $obj->fk_user_valid;
$this->fk_facture_source = $obj->fk_facture_source;
+ $this->fk_fac_rec_source = $obj->fk_fac_rec_source;
$this->fk_project = $obj->fk_project;
$this->cond_reglement_id = $obj->fk_cond_reglement;
$this->cond_reglement_code = $obj->cond_reglement_code;
@@ -2418,17 +2631,13 @@ class FactureFournisseur extends CommonInvoice
// phpcs:enable
global $conf, $langs;
- $clause = " WHERE";
-
- $sql = 'SELECT ff.rowid, ff.date_lim_reglement as datefin, ff.fk_statut, ff.total_ht';
+ $sql = 'SELECT ff.rowid, ff.date_lim_reglement as datefin, ff.fk_statut';
$sql .= ' FROM '.MAIN_DB_PREFIX.'facture_fourn as ff';
if (empty($user->rights->societe->client->voir) && !$user->socid) {
- $sql .= " JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON ff.fk_soc = sc.fk_soc";
- $sql .= " WHERE sc.fk_user = ".((int) $user->id);
- $clause = " AND";
+ $sql .= " JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON ff.fk_soc = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
}
- $sql .= $clause.' ff.paye=0';
- $sql .= ' AND ff.fk_statut = '.self::STATUS_VALIDATED;
+ $sql .= ' WHERE ff.paye = 0';
+ $sql .= ' AND ff.fk_statut > 0';
$sql .= " AND ff.entity = ".$conf->entity;
if ($user->socid) {
$sql .= ' AND ff.fk_soc = '.((int) $user->socid);
@@ -2487,7 +2696,7 @@ class FactureFournisseur extends CommonInvoice
*/
public function getNomUrl($withpicto = 0, $option = '', $max = 0, $short = 0, $moretitle = '', $notooltip = 0, $save_lastsearch_value = -1, $addlinktonotes = 0)
{
- global $langs, $conf, $user;
+ global $langs, $conf, $user, $hookmanager;
$result = '';
@@ -2605,7 +2814,15 @@ class FactureFournisseur extends CommonInvoice
$result .= '';
}
}
-
+ global $action;
+ $hookmanager->initHooks(array($this->element . 'dao'));
+ $parameters = array('id'=>$this->id, 'getnomurl' => &$result);
+ $reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
+ if ($reshook > 0) {
+ $result = $hookmanager->resPrint;
+ } else {
+ $result .= $hookmanager->resPrint;
+ }
return $result;
}
@@ -3412,8 +3629,8 @@ class SupplierInvoiceLine extends CommonObjectLine
$this->db->begin();
$sql = "UPDATE ".MAIN_DB_PREFIX."facture_fourn_det SET";
- $sql .= " description ='".$this->db->escape($this->description)."'";
- $sql .= ", ref ='".$this->db->escape($this->ref_supplier ? $this->ref_supplier : $this->ref)."'";
+ $sql .= " description = '".$this->db->escape($this->description)."'";
+ $sql .= ", ref = '".$this->db->escape($this->ref_supplier ? $this->ref_supplier : $this->ref)."'";
$sql .= ", date_start = ".($this->date_start != '' ? "'".$this->db->idate($this->date_start)."'" : "null");
$sql .= ", date_end = ".($this->date_end != '' ? "'".$this->db->idate($this->date_end)."'" : "null");
$sql .= ", pu_ht = ".price2num($this->pu_ht);
diff --git a/htdocs/fourn/class/fournisseur.product.class.php b/htdocs/fourn/class/fournisseur.product.class.php
index e20add0bb9d..cb9416e3da2 100644
--- a/htdocs/fourn/class/fournisseur.product.class.php
+++ b/htdocs/fourn/class/fournisseur.product.class.php
@@ -1092,7 +1092,7 @@ class ProductFournisseur extends Product
*/
public function getNomUrl($withpicto = 0, $option = '', $notooltip = 0, $morecss = '', $save_lastsearch_value = -1)
{
- global $db, $conf, $langs;
+ global $db, $conf, $langs, $hookmanager;
if (!empty($conf->dol_no_mouse_hover)) {
$notooltip = 1; // Force disable tooltips
@@ -1227,6 +1227,15 @@ class ProductFournisseur extends Product
$result .= $linkend;
//if ($withpicto != 2) $result.=(($addlabel && $this->label) ? $sep . dol_trunc($this->label, ($addlabel > 1 ? $addlabel : 0)) : '');
+ global $action;
+ $hookmanager->initHooks(array($this->element . 'dao'));
+ $parameters = array('id'=>$this->id, 'getnomurl' => &$result);
+ $reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
+ if ($reshook > 0) {
+ $result = $hookmanager->resPrint;
+ } else {
+ $result .= $hookmanager->resPrint;
+ }
return $result;
}
diff --git a/htdocs/fourn/class/paiementfourn.class.php b/htdocs/fourn/class/paiementfourn.class.php
index de9aa4eade9..75984c94f99 100644
--- a/htdocs/fourn/class/paiementfourn.class.php
+++ b/htdocs/fourn/class/paiementfourn.class.php
@@ -594,7 +594,7 @@ class PaiementFourn extends Paiement
*/
public function getNomUrl($withpicto = 0, $option = '', $mode = 'withlistofinvoices', $notooltip = 0, $morecss = '')
{
- global $langs;
+ global $langs, $conf, $hookmanager;
$result = '';
@@ -639,6 +639,15 @@ class PaiementFourn extends Paiement
}
$result .= $linkend;
+ global $action;
+ $hookmanager->initHooks(array($this->element . 'dao'));
+ $parameters = array('id'=>$this->id, 'getnomurl' => &$result);
+ $reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
+ if ($reshook > 0) {
+ $result = $hookmanager->resPrint;
+ } else {
+ $result .= $hookmanager->resPrint;
+ }
return $result;
}
diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index ec4ea692f78..35e5257fce0 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -88,7 +88,7 @@ $datelivraison = dol_mktime(GETPOST('liv_hour', 'int'), GETPOST('liv_min', 'int'
// Security check
-if ($user->socid) {
+if (!empty($user->socid)) {
$socid = $user->socid;
}
@@ -162,6 +162,8 @@ if (!empty($conf->projet->enabled)) {
$caneditproject = empty($conf->global->SUPPLIER_ORDER_FORBID_EDIT_PROJECT) || ($object->statut == CommandeFournisseur::STATUS_DRAFT && preg_match('/^[\(]?PROV/i', $object->ref));
}
+$error = 0;
+
/*
* Actions
@@ -181,7 +183,7 @@ if (empty($reshook)) {
if (empty($id) && (($action != 'add' && $action != 'create') || $cancel)) {
$backtopage = $backurlforlist;
} else {
- $backtopage = DOL_URL_ROOT.'/fourn/commande/card.php?id='.($id > 0 ? $id : '__ID__');
+ $backtopage = DOL_URL_ROOT.'/fourn/commande/card.php?id='.((!empty($id) && $id > 0) ? $id : '__ID__');
}
}
}
@@ -410,22 +412,27 @@ if (empty($reshook)) {
// Set if we used free entry or predefined product
$predef = '';
$product_desc = (GETPOSTISSET('dp_desc') ? GETPOST('dp_desc', 'restricthtml') : '');
+ $price_ht = price2num(GETPOST('price_ht'), 'MU', 2);
+ $price_ht_devise = price2num(GETPOST('multicurrency_price_ht'), 'CU', 2);
$date_start = dol_mktime(GETPOST('date_start'.$predef.'hour'), GETPOST('date_start'.$predef.'min'), GETPOST('date_start'.$predef.'sec'), GETPOST('date_start'.$predef.'month'), GETPOST('date_start'.$predef.'day'), GETPOST('date_start'.$predef.'year'));
$date_end = dol_mktime(GETPOST('date_end'.$predef.'hour'), GETPOST('date_end'.$predef.'min'), GETPOST('date_end'.$predef.'sec'), GETPOST('date_end'.$predef.'month'), GETPOST('date_end'.$predef.'day'), GETPOST('date_end'.$predef.'year'));
$prod_entry_mode = GETPOST('prod_entry_mode');
if ($prod_entry_mode == 'free') {
$idprod = 0;
- $price_ht = price2num(GETPOST('price_ht'), 'MU', 2);
- $tva_tx = (GETPOST('tva_tx') ? GETPOST('tva_tx') : 0);
} else {
$idprod = GETPOST('idprod', 'int');
- $price_ht = price2num(GETPOST('price_ht'), 'MU', 2);
- $tva_tx = '';
}
+ $tva_tx = (GETPOST('tva_tx') ? GETPOST('tva_tx') : 0); // Can be '1.2' or '1.2 (CODE)'
+
+ $price_ttc = price2num(GETPOST('price_ttc'), 'MU', 2);
+ $price_ttc_devise = price2num(GETPOST('multicurrency_price_ttc'), 'CU', 2);
$qty = price2num(GETPOST('qty'.$predef, 'alpha'), 'MS');
- $remise_percent = price2num(GETPOST('remise_percent'.$predef), 2);
- $price_ht_devise = price2num(GETPOST('multicurrency_price_ht'), 'CU', 2);
+
+ $remise_percent = (GETPOSTISSET('remise_percent'.$predef) ? price2num(GETPOST('remise_percent'.$predef, 'alpha'), '', 2) : 0);
+ if (empty($remise_percent)) {
+ $remise_percent = 0;
+ }
// Extrafields
$extralabelsline = $extrafields->fetch_name_optionals_label($object->table_element_line);
@@ -530,7 +537,7 @@ if (empty($reshook)) {
}
//If text set in desc is the same as product descpription (as now it's preloaded) whe add it only one time
- if ($product_desc==$desc && !empty($conf->global->PRODUIT_AUTOFILL_DESC)) {
+ if (trim($product_desc) == trim($desc) && !empty($conf->global->PRODUIT_AUTOFILL_DESC)) {
$product_desc='';
}
@@ -541,11 +548,17 @@ if (empty($reshook)) {
$desc = dol_concatdesc($desc, $product_desc, '', !empty($conf->global->MAIN_CHANGE_ORDER_CONCAT_DESCRIPTION));
}
+ $ref_supplier = $productsupplier->ref_supplier;
+
$type = $productsupplier->type;
- if ($price_ht != '' || $price_ht_devise != '') {
+ if (GETPOST('price_ht') != '' || GETPOST('price_ht_devise') != '') {
$price_base_type = 'HT';
$pu = price2num($price_ht, 'MU');
- $pu_ht_devise = price2num($price_ht_devise, 'MU');
+ $pu_ht_devise = price2num($price_ht_devise, 'CU');
+ } elseif (GETPOST('price_ttc') != '' || GETPOST('price_ttc_devise') != '') {
+ $price_base_type = 'TTC';
+ $pu = price2num($price_ttc, 'MU');
+ $pu_ht_devise = price2num($price_ttc_devise, 'CU');
} else {
$price_base_type = ($productsupplier->fourn_price_base_type ? $productsupplier->fourn_price_base_type : 'HT');
if (empty($object->multicurrency_code) || ($productsupplier->fourn_multicurrency_code != $object->multicurrency_code)) { // If object is in a different currency and price not in this currency
@@ -554,13 +567,9 @@ if (empty($reshook)) {
} else {
$pu = $productsupplier->fourn_pu;
$pu_ht_devise = $productsupplier->fourn_multicurrency_unitprice;
- /*var_dump($pu);
- var_dump($pu_ht_devise);exit;*/
}
}
- $ref_supplier = $productsupplier->ref_supplier;
-
$tva_tx = get_default_tva($object->thirdparty, $mysoc, $productsupplier->id, GETPOST('idprodfournprice', 'alpha'));
$tva_npr = get_default_npr($object->thirdparty, $mysoc, $productsupplier->id, GETPOST('idprodfournprice', 'alpha'));
if (empty($tva_tx)) {
@@ -621,22 +630,22 @@ if (empty($reshook)) {
$fk_unit = GETPOST('units', 'alpha');
if (!preg_match('/\((.*)\)/', $tva_tx)) {
- $tva_tx = price2num($tva_tx); // When vat is text input field
+ $tva_tx = price2num($tva_tx); // $txtva can have format '5,1' or '5.1' or '5.1(XXX)', we must clean only if '5,1'
}
// Local Taxes
$localtax1_tx = get_localtax($tva_tx, 1, $mysoc, $object->thirdparty);
$localtax2_tx = get_localtax($tva_tx, 2, $mysoc, $object->thirdparty);
- if ($price_ht !== '') {
+ if (GETPOST('price_ht') != '' || GETPOST('price_ht_devise') != '') {
$pu_ht = price2num($price_ht, 'MU'); // $pu_ht must be rounded according to settings
} else {
$pu_ttc = price2num(GETPOST('price_ttc'), 'MU');
$pu_ht = price2num($pu_ttc / (1 + ($tva_tx / 100)), 'MU'); // $pu_ht must be rounded according to settings
}
$price_base_type = 'HT';
- $pu_ht_devise = price2num($price_ht_devise, 'MU');
-
+ $pu_ht_devise = price2num($price_ht_devise, 'CU');
+ // var_dump($pu_ht.' '.$tva_tx.' '.$pu_ttc.' '.$price_base_type.' '.$pu_ht_devise); exit;
$result = $object->addline($desc, $pu_ht, $qty, $tva_tx, $localtax1_tx, $localtax2_tx, 0, 0, $ref_supplier, $remise_percent, $price_base_type, $pu_ttc, $type, '', '', $date_start, $date_end, $array_options, $fk_unit, $pu_ht_devise);
}
@@ -687,6 +696,7 @@ if (empty($reshook)) {
unset($_POST['np_markRate']);
unset($_POST['dp_desc']);
unset($_POST['idprodfournprice']);
+ unset($_POST['units']);
unset($_POST['date_starthour']);
unset($_POST['date_startmin']);
diff --git a/htdocs/fourn/facture/card-rec.php b/htdocs/fourn/facture/card-rec.php
new file mode 100644
index 00000000000..502d0d124ce
--- /dev/null
+++ b/htdocs/fourn/facture/card-rec.php
@@ -0,0 +1,1644 @@
+
+ * Copyright (C) 2004-2016 Laurent Destailleur
+ * Copyright (C) 2005-2012 Regis Houssin
+ * Copyright (C) 2013 Florian Henry
+ * Copyright (C) 2013 Juanjo Menent
+ * Copyright (C) 2015 Jean-François Ferry
+ * Copyright (C) 2012 Cedric Salvador
+ * Copyright (C) 2015 Alexandre Spangaro
+ * Copyright (C) 2016 Meziane Sof
+ * Copyright (C) 2017-2018 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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see ';
+ print "
\n";
+
+ print $form->buttonsSaveCancel("Create");
+
+ print "\n";
+ } else {
+ dol_print_error('', "Error, no invoice " . $object->id);
+ }
+} else {
+ /*
+ * View mode
+ */
+ if ($object->id > 0) {
+ $object->fetch($object->id);
+ $object->fetch_thirdparty();
+
+ // Confirmation de la suppression d'une ligne produit
+ if ($action == 'ask_deleteline') {
+ $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id . '&lineid=' . $lineid, $langs->trans('DeleteProductLine'), $langs->trans('ConfirmDeleteProductLine'), 'confirm_deleteline', '', 'no', 1);
+ }
+
+ // Confirm delete of repeatable invoice
+ if ($action == 'ask_deleteinvoice') {
+ $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id, $langs->trans('DeleteRepeatableInvoice'), $langs->trans('ConfirmDeleteRepeatableInvoice'), 'confirm_deleteinvoice', '', 'no', 1);
+ }
+
+ print $formconfirm;
+
+ $author = new User($db);
+ $author->fetch($object->user_author);
+
+ $head = supplier_invoice_rec_prepare_head($object);
+
+ print dol_get_fiche_head($head, 'card', $langs->trans('RepeatableInvoice'), -1, 'bill'); // Add a div
+
+ // Recurring invoice content
+
+ $linkback = '' . $langs->trans('BackToList') . ' ';
+
+ $morehtmlref = '';
+ if ($action != 'edittitle') {
+ $morehtmlref .= $form->editfieldkey($object->titre, 'title', $object->titre, $object, $usercancreate, '', '', 0, 2);
+ } else {
+ $morehtmlref .= $form->editfieldval('', 'title', $object->titre, $object, $usercancreate, 'string');
+ }
+ $morehtmlref .= '';
+ //Ref supplier
+ $morehtmlref .= $form->editfieldkey("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, $usercancreate, 'string', '', 0, 1);
+ $morehtmlref .= $form->editfieldval("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, $usercancreate, 'string', '', null, null, '', 1);
+ // Thirdparty
+ $morehtmlref .= '
' . $langs->trans('ThirdParty') . ' : ' . $object->thirdparty->getNomUrl(1);
+
+ // Project
+ if (! empty($conf->projet->enabled)) {
+ $langs->load('projects');
+ $morehtmlref .= '
' . $langs->trans('Project') . ' ';
+ if ($usercancreate) {
+ if ($action != 'classify') {
+ $morehtmlref .= '
' . img_edit($langs->transnoentitiesnoconv('SetProject')) . ' : ';
+ }
+ if ($action == 'classify') {
+ $morehtmlref .= '
';
+ } else {
+ $morehtmlref .= $form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+ }
+ } else {
+ if (! empty($object->fk_project)) {
+ $project = new Project($db);
+ $project->fetch($object->fk_project);
+ $morehtmlref .= ' : ' . $project->getNomUrl(1);
+ if ($project->title) {
+ $morehtmlref .= ' - ' . $project->title;
+ }
+ } else {
+ $morehtmlref .= '';
+ }
+ }
+ }
+ $morehtmlref .= '
';
+ print '
';
+ print '
';
+
+ print '
';
+
+ print '' . $langs->trans('Author') . ' ';
+ print $author->getNomUrl(-1);
+ print " ';
+ print '' . $form->editfieldkey("Label", 'libelle', $object->libelle, $object, $usercancreate) . ' ';
+ print '' . $form->editfieldval("Label", 'libelle', $object->libelle, $object, $usercancreate) . ' ';
+ print ' ';
+
+ print '' . $langs->trans('AmountHT') . ' ';
+ print '' . price($object->total_ht, '', $langs, 1, -1, -1, $conf->currency) . ' ';
+ print '' . $langs->trans("AmountVAT") . ' ' . price($object->total_tva, '', $langs, 1, -1, -1, $conf->currency) . ' ';
+ print '' . $langs->transcountry("AmountLT1", $mysoc->country_code) . ' ';
+ print '' . price($object->total_localtax1, 1, '', 1, -1, -1, $conf->currency) . ' ' . $langs->transcountry("AmountLT2", $mysoc->country_code) . ' ';
+ print '' . price($object->total_localtax2, 1, '', 1, -1, -1, $conf->currency) . ' ' . $langs->trans("AmountTTC") . ' ' . price($object->total_ttc, '', $langs, 1, -1, -1, $conf->currency) . ' ';
+ print '';
+ print '';
+ print ' ';
+ if ($action == 'editconditions') {
+ $form->form_conditions_reglement($_SERVER['PHP_SELF'] . '?facid=' . $object->id, $object->cond_reglement_id, 'cond_reglement_id');
+ } else {
+ $form->form_conditions_reglement($_SERVER['PHP_SELF'] . '?facid=' . $object->id, $object->cond_reglement_id, 'none');
+ }
+
+ print ' ';
+ print '';
+ print ' ';
+ if ($action == 'editmode') {
+ $form->form_modes_reglement($_SERVER['PHP_SELF'] . '?facid=' . $object->id, $object->mode_reglement_id, 'mode_reglement_id', 'CRDT', 1, 1);
+ } else {
+ $form->form_modes_reglement($_SERVER['PHP_SELF'] . '?facid=' . $object->id, $object->mode_reglement_id, 'none');
+ }
+ print ' ';
+ print '';
+ print '';
+ print ' ';
+ $htmlname = (($usercancreate && $action == 'editmulticurrencycode') ? 'multicurrency_code' : 'none');
+ $form->form_multicurrency_code($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->multicurrency_code, $htmlname);
+ print ' ';
+
+ // Multicurrency rate
+ if ($object->multicurrency_code != $conf->currency || $object->multicurrency_tx != 1) {
+ print '';
+ print '';
+ print '';
+ print ' ';
+ if ($action == 'editmulticurrencyrate' || $action == 'actualizemulticurrencyrate') {
+ if ($action == 'actualizemulticurrencyrate') {
+ list($object->fk_multicurrency, $object->multicurrency_tx) = MultiCurrency::getIdAndTxFromCode($object->db, $object->multicurrency_code);
+ }
+ $form->form_multicurrency_rate($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->multicurrency_tx, ($usercancreate ? 'multicurrency_tx' : 'none'), $object->multicurrency_code);
+ } else {
+ $form->form_multicurrency_rate($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->multicurrency_tx, 'none', $object->multicurrency_code);
+ if ($object->statut == $object::STATUS_DRAFT && $object->multicurrency_code && $object->multicurrency_code != $conf->currency) {
+ print '';
+ }
+ }
+ print ' ';
+ }
+ }
+
+ // Help of substitution key
+ $dateexample = dol_now();
+ if (! empty($object->frequency) && ! empty($object->date_when)) {
+ $dateexample = $object->date_when;
+ }
+
+ $substitutionarray = getCommonSubstitutionArray($langs, 2, null, $object);
+
+ $substitutionarray['__INVOICE_PREVIOUS_MONTH__'] = $langs->trans("PreviousMonthOfInvoice") . ' (' . $langs->trans("Example") . ': ' . dol_print_date(dol_time_plus_duree($dateexample, -1, 'm'), '%m') . ')';
+ $substitutionarray['__INVOICE_MONTH__'] = $langs->trans("MonthOfInvoice") . ' (' . $langs->trans("Example") . ': ' . dol_print_date($dateexample, '%m') . ')';
+ $substitutionarray['__INVOICE_NEXT_MONTH__'] = $langs->trans("NextMonthOfInvoice") . ' (' . $langs->trans("Example") . ': ' . dol_print_date(dol_time_plus_duree($dateexample, 1, 'm'), '%m') . ')';
+ $substitutionarray['__INVOICE_PREVIOUS_MONTH_TEXT__'] = $langs->trans("TextPreviousMonthOfInvoice") . ' (' . $langs->trans("Example") . ': ' . dol_print_date(dol_time_plus_duree($dateexample, -1, 'm'), '%B') . ')';
+ $substitutionarray['__INVOICE_MONTH_TEXT__'] = $langs->trans("TextMonthOfInvoice") . ' (' . $langs->trans("Example") . ': ' . dol_print_date($dateexample, '%B') . ')';
+ $substitutionarray['__INVOICE_NEXT_MONTH_TEXT__'] = $langs->trans("TextNextMonthOfInvoice") . ' (' . $langs->trans("Example") . ': ' . dol_print_date(dol_time_plus_duree($dateexample, 1, 'm'), '%B') . ')';
+ $substitutionarray['__INVOICE_PREVIOUS_YEAR__'] = $langs->trans("PreviousYearOfInvoice") . ' (' . $langs->trans("Example") . ': ' . dol_print_date(dol_time_plus_duree($dateexample, -1, 'y'), '%Y') . ')';
+ $substitutionarray['__INVOICE_YEAR__'] = $langs->trans("YearOfInvoice") . ' (' . $langs->trans("Example") . ': ' . dol_print_date($dateexample, '%Y') . ')';
+ $substitutionarray['__INVOICE_NEXT_YEAR__'] = $langs->trans("NextYearOfInvoice") . ' (' . $langs->trans("Example") . ': ' . dol_print_date(dol_time_plus_duree($dateexample, 1, 'y'), '%Y') . ')';
+ // Only on template invoices
+ $substitutionarray['__INVOICE_DATE_NEXT_INVOICE_BEFORE_GEN__'] = $langs->trans("DateNextInvoiceBeforeGen") . ' (' . $langs->trans("Example") . ': ' . dol_print_date(($object->date_when ? $object->date_when : dol_now()), 'dayhour') . ')';
+ $substitutionarray['__INVOICE_DATE_NEXT_INVOICE_AFTER_GEN__'] = $langs->trans("DateNextInvoiceAfterGen") . ' (' . $langs->trans("Example") . ': ' . dol_print_date(dol_time_plus_duree(($object->date_when ? $object->date_when : dol_now()), $object->frequency, $object->unit_frequency), 'dayhour') . ')';
+ $substitutionarray['__INVOICE_COUNTER_CURRENT__'] = $object->nb_gen_done;
+ $substitutionarray['__INVOICE_COUNTER_MAX__'] = $object->nb_gen_max;
+
+ $htmltext = '' . $langs->trans("FollowingConstantsWillBeSubstituted") . ': ';
+
+ // Note public
+ print '';
+ print $form->editfieldkey($form->textwithpicto($langs->trans('NotePublic'), $htmltext, 1, 'help', '', 0, 2, 'notepublic'), 'note_public', $object->note_public, $object, $usercancreate);
+ print ' ';
+ print $form->editfieldval($langs->trans("NotePublic"), 'note_public', $object->note_public, $object, $usercancreate, 'textarea:' . ROWS_4 . ':90%', '', null, null, '', 1);
+ print ' ';
+ print '';
+ print $form->editfieldkey($form->textwithpicto($langs->trans("NotePrivate"), $htmltext, 1, 'help', '', 0, 2, 'noteprivate'), 'note_private', $object->note_private, $object, $usercancreate);
+ print ' ';
+ print $form->editfieldval($langs->trans("NotePrivate"), 'note_private', $object->note_private, $object, $usercancreate, 'textarea:' . ROWS_4 . ':90%', '', null, null, '', 1);
+ print ' ';
+ print '';
+ print '';
+ print ' ';
+ if ($action == 'editbankaccount') {
+ $form->formSelectAccount($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->fk_account, 'fk_account', 1);
+ } else {
+ $form->formSelectAccount($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->fk_account, 'none');
+ }
+ print " ";
+ print '';
+ print '';
+ print $langs->trans('Model');
+ print ' ';
+ if ($action != 'editmodelpdf' && $usercancreate && $object->statut == FactureFournisseurRec::STATUS_NOTSUSPENDED) {
+ print ' ' . img_edit($langs->trans('SetModel'), 1) . '
';
+ print ' ';
+ if ($action == 'editmodelpdf') {
+ include_once DOL_DOCUMENT_ROOT . '/core/modules/supplier_invoice/modules_facturefournisseur.php';
+ $list = array();
+ $models = ModelePDFSuppliersInvoices::liste_modeles($db);
+ foreach ($models as $k => $model) {
+ $list[] = str_replace(':', '|', $k) . ':' . $model;
+ }
+ $select = 'select;' . implode(',', $list);
+ //TODO : Droits
+ print $form->editfieldval($langs->trans('Model'), 'modelpdf', $object->model_pdf, $object, $usercancreate, $select);
+ } else {
+ print $object->model_pdf;
+ }
+ print " ";
+ print '
';
+
+ print '
';
+ print '
';
+ print '
';
+
+ /*
+ * Recurrence
+ */
+ $title = $langs->trans("Recurrence");
+ //print load_fiche_titre($title, '', 'calendar');
+
+ print '
';
+
+ print '' . img_picto('', 'recurring', 'class="pictofixedwidth"') . $title . ' ';
+ print '';
+ print ' ';
+ if ($action == 'editfrequency') {
+ print '';
+ } else {
+ if ($object->frequency > 0) {
+ print $langs->trans('FrequencyPer_' . $object->unit_frequency, $object->frequency);
+ } else {
+ print $langs->trans("NotARecurringInvoiceTemplate");
+ }
+ }
+ print ' ';
+ if ($action == 'date_when' || $object->frequency > 0) {
+ print $form->editfieldkey($langs->trans("NextDateToExecution"), 'date_when', $object->date_when, $object, $usercancreate, 'day');
+ } else {
+ print $langs->trans("NextDateToExecution");
+ }
+ print ' ';
+ if ($action == 'date_when' || $object->frequency > 0) {
+ print $form->editfieldval($langs->trans("NextDateToExecution"), 'date_when', $object->date_when, $object, $usercancreate, 'day', $object->date_when, null, '', '', 0, 'strikeIfMaxNbGenReached');
+ }
+ //var_dump(dol_print_date($object->date_when+60, 'dayhour').' - '.dol_print_date($now, 'dayhour'));
+ if (! $object->isMaxNbGenReached()) {
+ if (! $object->suspended && $action != 'editdate_when' && $object->frequency > 0 && $object->date_when && $object->date_when < $now) {
+ print img_warning($langs->trans("Late"));
+ }
+ } else {
+ print img_info($langs->trans("MaxNumberOfGenerationReached"));
+ }
+ print ' ';
+ print '';
+ if ($action == 'nb_gen_max' || $object->frequency > 0) {
+ print $form->editfieldkey($langs->trans("MaxPeriodNumber"), 'nb_gen_max', $object->nb_gen_max, $object, $usercancreate);
+ } else {
+ print $langs->trans("MaxPeriodNumber");
+ }
+ print ' ';
+ if ($action == 'nb_gen_max' || $object->frequency > 0) {
+ print $form->editfieldval($langs->trans("MaxPeriodNumber"), 'nb_gen_max', $object->nb_gen_max ? $object->nb_gen_max : '', $object, $usercancreate);
+ } else {
+ print '';
+ }
+ print ' ';
+ print '';
+ if ($action == 'auto_validate' || $object->frequency > 0) {
+ print $form->editfieldkey($langs->trans("StatusOfGeneratedInvoices"), 'auto_validate', $object->auto_validate, $object, $usercancreate);
+ } else {
+ print $langs->trans("StatusOfGeneratedInvoices");
+ }
+ print ' ';
+ $select = 'select;0:' . $langs->trans('BillStatusDraft') . ',1:' . $langs->trans('BillStatusValidated');
+ if ($action == 'auto_validate' || $object->frequency > 0) {
+ print $form->editfieldval($langs->trans("StatusOfGeneratedInvoices"), 'auto_validate', $object->auto_validate, $object, $usercancreate, $select);
+ }
+ print ' ';
+ // Auto generate documents
+ if (! empty($conf->global->INVOICE_REC_CAN_DISABLE_DOCUMENT_FILE_GENERATION)) {
+ print '';
+ print '';
+ if ($action == 'generate_pdf' || $object->frequency > 0) {
+ print $form->editfieldkey($langs->trans("StatusOfGeneratedDocuments"), 'generate_pdf', $object->generate_pdf, $object, $usercancreate);
+ } else {
+ print $langs->trans("StatusOfGeneratedDocuments");
+ }
+ print ' ';
+ print '';
+ $select = 'select;0:' . $langs->trans('DoNotGenerateDoc') . ',1:' . $langs->trans('AutogenerateDoc');
+ if ($action == 'generate_pdf' || $object->frequency > 0) {
+ print $form->editfieldval($langs->trans("StatusOfGeneratedDocuments"), 'generate_pdf', $object->generate_pdf, $object, $usercancreate, $select);
+ }
+ print ' ';
+ print ' ';
+ } else {
+ print '
';
+
+ // Frequencry/Recurring section
+ if ($object->frequency > 0) {
+ print '
';
+
+ if (empty($conf->cron->enabled)) {
+ print info_admin($langs->trans("EnableAndSetupModuleCron", $langs->transnoentitiesnoconv("Module2300Name")));
+ }
+
+ print '
';
+ print '
';
+
+ // Nb of generation already done
+ print '' . $langs->trans("NbOfGenerationDone") . ' ';
+ print '';
+ print $object->nb_gen_done ? $object->nb_gen_done : '0';
+ print ' ';
+ print '';
+ print $langs->trans("DateLastGeneration");
+ print ' ';
+ print dol_print_date($object->date_last_gen, 'dayhour');
+ print ' ';
+ print '
';
+
+ print '
';
+ }
+
+ print '
';
+ print '
';
+
+ if (empty($object->suspended)) {
+ if ($usercancreate) {
+ if (! empty($object->frequency) && $object->nb_gen_max > 0 && ($object->nb_gen_done >= $object->nb_gen_max)) {
+ print '
';
+ } else {
+ if (empty($object->frequency) || $object->date_when <= $nowlasthour) {
+ print '
';
+ } else {
+ print '
';
+ }
+ }
+ } else {
+ print '
';
+ }
+ }
+
+ if ($usercancreate) {
+ if (empty($object->suspended)) {
+ print '
';
+ } else {
+ print '
';
+ }
+ }
+
+ //if ($object->statut == Facture::STATUS_DRAFT && ($user->rights->fournisseur->facture->supprimer || $user->rights->supplier_invoice->supprimer))
+ if (($user->rights->fournisseur->facture->supprimer || $user->rights->supplier_invoice->supprimer)) {
+ print '
';
+ }
+
+ print '
';
+ print '
'; // ancre
+
+ // Show links to link elements
+ $linktoelem = $form->showLinkToObjectBlock($object, null, array('invoice'));
+
+ $somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
+
+ print '
'.$langs->trans('Ref').' '.$langs->trans('Draft').' '.$langs->trans('Supplier').' ';
print '';
- if ($societe->id > 0) {
+ if ($societe->id > 0 && (!GETPOST('fac_rec', 'int') || !empty($invoice_predefined->frequency))) {
$absolute_discount = $societe->getAvailableDiscounts('', '', 0, 1);
print $societe->getNomUrl(1, 'supplier');
print ' '.$langs->trans('CreateFromRepeatableInvoice').' ';
+ //print ''; // We may want to change the template to use
+ print 'rowid) {
+ print ' selected';
+ $exampletemplateinvoice->fetch(GETPOST('fac_rec', 'int'));
+ }
+ print '>'.$objp->title.' ('.price($objp->total_ttc).' '.$langs->trans("TTC").') ';
+ $i++;
+ }
+ print ' ';
+ // Option to reload page to retrieve customer informations. Note, this clear other input
+ if (empty($conf->global->RELOAD_PAGE_ON_TEMPLATE_CHANGE_DISABLED)) {
+ print '';
+ }
+ print ' '.$langs->trans('RefSupplier').' '.$langs->trans("FollowingConstantsWillBeSubstituted").': ';
+ }
+
// Intracomm report
if (!empty($conf->intracommreport->enabled)) {
$langs->loadLangs(array("intracommreport"));
@@ -2776,6 +2930,19 @@ if ($action == 'create') {
print '';
+ $link = ''.dol_escape_htmltag($tmptemplate->titre).' ';
+ $s = $langs->transnoentities("GeneratedFromSupplierTemplate", $link);
+
+ print $s;
+ print ' ';
+ }
+ }
print '';
@@ -3559,6 +3726,13 @@ if ($action == 'create') {
print 'socid.'">'.$langs->trans('ToClone').' ';
}
+ // Clone as predefined / Create template
+ if (($object->type == FactureFournisseur::TYPE_STANDARD || $object->type == FactureFournisseur::TYPE_DEPOSIT) && $object->statut == 0 && $usercancreate) {
+ if (!$objectidnext && count($object->lines) > 0) {
+ print ''.$langs->trans("ChangeIntoRepeatableInvoice").' ';
+ }
+ }
+
// Delete
$isErasable = $object->is_erasable();
if ($action != 'confirm_edit' && ($user->rights->fournisseur->facture->supprimer || ($usercancreate && $isErasable == 1))) { // isErasable = 1 means draft with temporary ref (draft can always be deleted with no need of permissions)
diff --git a/htdocs/fourn/facture/list-rec.php b/htdocs/fourn/facture/list-rec.php
new file mode 100644
index 00000000000..7da3a224d4f
--- /dev/null
+++ b/htdocs/fourn/facture/list-rec.php
@@ -0,0 +1,922 @@
+
+ * Copyright (C) 2004-2016 Laurent Destailleur
+ * Copyright (C) 2005-2012 Regis Houssin
+ * Copyright (C) 2013 Florian Henry
+ * Copyright (C) 2013 Juanjo Menent
+ * Copyright (C) 2015 Jean-François Ferry
+ * Copyright (C) 2012 Cedric Salvador
+ * Copyright (C) 2015-2021 Alexandre Spangaro
+ * Copyright (C) 2016 Meziane Sof
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see ';
+ print ''.$langs->trans("ClosePaidInvoicesAutomatically").'
';
}
// Form to confirm payment
diff --git a/htdocs/holiday/class/holiday.class.php b/htdocs/holiday/class/holiday.class.php
index 29e7c41bb5f..d0bed943429 100644
--- a/htdocs/holiday/class/holiday.class.php
+++ b/htdocs/holiday/class/holiday.class.php
@@ -1270,7 +1270,7 @@ class Holiday extends CommonObject
*/
public function getNomUrl($withpicto = 0, $save_lastsearch_value = -1, $notooltip = 0)
{
- global $langs;
+ global $langs, $hookmanager;
$result = '';
@@ -1305,7 +1305,15 @@ class Holiday extends CommonObject
$result .= $this->ref;
}
$result .= $linkend;
-
+ global $action;
+ $hookmanager->initHooks(array($this->element . 'dao'));
+ $parameters = array('id'=>$this->id, 'getnomurl' => &$result);
+ $reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
+ if ($reshook > 0) {
+ $result = $hookmanager->resPrint;
+ } else {
+ $result .= $hookmanager->resPrint;
+ }
return $result;
}
diff --git a/htdocs/hrm/class/establishment.class.php b/htdocs/hrm/class/establishment.class.php
index 88e93f1398f..2a2c4e4b3dd 100644
--- a/htdocs/hrm/class/establishment.class.php
+++ b/htdocs/hrm/class/establishment.class.php
@@ -506,7 +506,7 @@ class Establishment extends CommonObject
global $action, $hookmanager;
$hookmanager->initHooks(array('establishmentdao'));
- $parameters = array('id'=>$this->id, 'getnomurl'=>$result);
+ $parameters = array('id'=>$this->id, 'getnomurl' => &$result);
$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
if ($reshook > 0) {
$result = $hookmanager->resPrint;
diff --git a/htdocs/hrm/class/evaluation.class.php b/htdocs/hrm/class/evaluation.class.php
index 58ac7fe3324..5e8124fe09a 100644
--- a/htdocs/hrm/class/evaluation.class.php
+++ b/htdocs/hrm/class/evaluation.class.php
@@ -808,7 +808,7 @@ class Evaluation extends CommonObject
global $action, $hookmanager;
$hookmanager->initHooks(array('evaluationdao'));
- $parameters = array('id'=>$this->id, 'getnomurl'=>$result);
+ $parameters = array('id'=>$this->id, 'getnomurl' => &$result);
$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
if ($reshook > 0) {
$result = $hookmanager->resPrint;
diff --git a/htdocs/hrm/class/evaluationdet.class.php b/htdocs/hrm/class/evaluationdet.class.php
index 115571bb6ba..0ca56d84e60 100644
--- a/htdocs/hrm/class/evaluationdet.class.php
+++ b/htdocs/hrm/class/evaluationdet.class.php
@@ -780,7 +780,7 @@ class Evaluationline extends CommonObject
global $action, $hookmanager;
$hookmanager->initHooks(array('evaluationlinedao'));
- $parameters = array('id'=>$this->id, 'getnomurl'=>$result);
+ $parameters = array('id'=>$this->id, 'getnomurl' => &$result);
$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
if ($reshook > 0) {
$result = $hookmanager->resPrint;
diff --git a/htdocs/hrm/class/job.class.php b/htdocs/hrm/class/job.class.php
index fc94f4ba6ae..c7f2e1a5f6b 100644
--- a/htdocs/hrm/class/job.class.php
+++ b/htdocs/hrm/class/job.class.php
@@ -814,7 +814,7 @@ class Job extends CommonObject
global $action, $hookmanager;
$hookmanager->initHooks(array('jobdao'));
- $parameters = array('id'=>$this->id, 'getnomurl'=>$result);
+ $parameters = array('id'=>$this->id, 'getnomurl' => &$result);
$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
if ($reshook > 0) {
$result = $hookmanager->resPrint;
diff --git a/htdocs/hrm/class/position.class.php b/htdocs/hrm/class/position.class.php
index 2401791bb5f..8c51d667f9e 100644
--- a/htdocs/hrm/class/position.class.php
+++ b/htdocs/hrm/class/position.class.php
@@ -788,7 +788,7 @@ class Position extends CommonObject
global $action, $hookmanager;
$hookmanager->initHooks(array('positiondao'));
- $parameters = array('id' => $this->id, 'getnomurl' => $result);
+ $parameters = array('id' => $this->id, 'getnomurl' => &$result);
$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
if ($reshook > 0) {
$result = $hookmanager->resPrint;
diff --git a/htdocs/hrm/class/skill.class.php b/htdocs/hrm/class/skill.class.php
index d20d34cfd5e..448538c39a8 100644
--- a/htdocs/hrm/class/skill.class.php
+++ b/htdocs/hrm/class/skill.class.php
@@ -854,7 +854,7 @@ class Skill extends CommonObject
global $action, $hookmanager;
$hookmanager->initHooks(array('jobdao'));
- $parameters = array('id'=>$this->id, 'getnomurl'=>$result);
+ $parameters = array('id'=>$this->id, 'getnomurl' => &$result);
$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
if ($reshook > 0) {
$result = $hookmanager->resPrint;
diff --git a/htdocs/hrm/class/skilldet.class.php b/htdocs/hrm/class/skilldet.class.php
index 0e0ce87382f..5e2da1ba7aa 100644
--- a/htdocs/hrm/class/skilldet.class.php
+++ b/htdocs/hrm/class/skilldet.class.php
@@ -768,7 +768,7 @@ class Skilldet extends CommonObject
global $action, $hookmanager;
$hookmanager->initHooks(array('skilldetdao'));
- $parameters = array('id'=>$this->id, 'getnomurl'=>$result);
+ $parameters = array('id'=>$this->id, 'getnomurl' => &$result);
$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
if ($reshook > 0) {
$result = $hookmanager->resPrint;
diff --git a/htdocs/hrm/class/skillrank.class.php b/htdocs/hrm/class/skillrank.class.php
index 587fc889e0f..eb93208040b 100644
--- a/htdocs/hrm/class/skillrank.class.php
+++ b/htdocs/hrm/class/skillrank.class.php
@@ -807,7 +807,7 @@ class SkillRank extends CommonObject
global $action, $hookmanager;
$hookmanager->initHooks(array('skillrankdao'));
- $parameters = array('id'=>$this->id, 'getnomurl'=>$result);
+ $parameters = array('id'=>$this->id, 'getnomurl' => &$result);
$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
if ($reshook > 0) {
$result = $hookmanager->resPrint;
diff --git a/htdocs/hrm/job_agenda.php b/htdocs/hrm/job_agenda.php
index 6bfafcc1269..0d966e67416 100644
--- a/htdocs/hrm/job_agenda.php
+++ b/htdocs/hrm/job_agenda.php
@@ -189,18 +189,13 @@ if ($object->id > 0) {
}
- print '';
-
if (!empty($conf->agenda->enabled)) {
if (!empty($user->rights->agenda->myactions->create) || !empty($user->rights->agenda->allactions->create)) {
- print '
'.$langs->trans("AddAction").' ';
- } else {
- print '
'.$langs->trans("AddAction").' ';
+ $newcardbutton = '';
+ $newcardbutton .= dolGetButtonTitle($langs->trans('AddAction'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/comm/action/card.php?action=create'.$out);
}
}
- print '
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see
--- Copyright (C) 2005-2012 Regis Houssin
--- Copyright (C) 2010 Juanjo Menent
--- Copyright (C) 2012 Cédric Salvador
+-- Copyright (C) 2002-2003 Rodolphe Quiedeville
+-- Copyright (C) 2005-2012 Regis Houssin
+-- Copyright (C) 2010 Juanjo Menent
+-- Copyright (C) 2012 Cédric Salvador
+-- Copyright (C) 2022 OpenDSI
--
-- 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
@@ -21,53 +22,55 @@
create table llx_propaldet
(
- rowid integer AUTO_INCREMENT PRIMARY KEY,
- fk_propal integer NOT NULL,
- fk_parent_line integer NULL,
- fk_product integer NULL,
- label varchar(255) DEFAULT NULL,
- description text,
- fk_remise_except integer NULL, -- Lien vers table des remises fixes
- vat_src_code varchar(10) DEFAULT '', -- Vat code used as source of vat fields. Not strict foreign key here.
- tva_tx double(7,4) DEFAULT 0, -- Vat rate
- localtax1_tx double(7,4) DEFAULT 0, -- localtax1 rate
- localtax1_type varchar(10) NULL, -- localtax1 type
- localtax2_tx double(7,4) DEFAULT 0, -- localtax2 rate
- localtax2_type varchar(10) NULL, -- localtax2 type
- qty real, -- quantity
- remise_percent real DEFAULT 0, -- pourcentage de remise
- remise real DEFAULT 0, -- montant de la remise (obsolete)
- price real, -- prix final (obsolete)
- subprice double(24,8) DEFAULT 0, -- prix unitaire article
- total_ht double(24,8) DEFAULT 0, -- Total HT de la ligne toute quantite et incluant remise ligne et globale
- total_tva double(24,8) DEFAULT 0, -- Total TVA de la ligne toute quantite et incluant remise ligne et globale
- total_localtax1 double(24,8) DEFAULT 0, -- Total localtax1
- total_localtax2 double(24,8) DEFAULT 0, -- Total localtax2
- total_ttc double(24,8) DEFAULT 0, -- Total TTC de la ligne toute quantite et incluant remise ligne et globale
- product_type integer DEFAULT 0, -- 0 or 1. Value 9 may be used by some modules (amount of line may not be included into generated discount if value is 9).
- date_start datetime DEFAULT NULL, -- date debut si service
- date_end datetime DEFAULT NULL, -- date fin si service
- info_bits integer DEFAULT 0, -- TVA NPR ou non
-
- buy_price_ht double(24,8) DEFAULT 0, -- buying price
- fk_product_fournisseur_price integer DEFAULT NULL, -- reference of supplier price when line was added (may be used to update buy_price_ht current price when future invoice will be created)
-
- special_code integer DEFAULT 0, -- code for special lines (may be 1=transport, 2=ecotax, 3=option, moduleid=...)
- rang integer DEFAULT 0, -- ordre affichage sur la propal
- fk_unit integer DEFAULT NULL, -- lien vers table des unités
-
- fk_multicurrency integer,
- multicurrency_code varchar(3),
- multicurrency_subprice double(24,8) DEFAULT 0,
- multicurrency_total_ht double(24,8) DEFAULT 0,
- multicurrency_total_tva double(24,8) DEFAULT 0,
- multicurrency_total_ttc double(24,8) DEFAULT 0
+ rowid integer AUTO_INCREMENT PRIMARY KEY,
+ fk_propal integer NOT NULL,
+ fk_parent_line integer NULL,
+ fk_product integer NULL,
+ label varchar(255) DEFAULT NULL,
+ description text,
+ fk_remise_except integer NULL, -- Link to table of fixed discounts
+ vat_src_code varchar(10) DEFAULT '', -- Vat code used as source of vat fields. Not strict foreign key here.
+ tva_tx double(7,4) DEFAULT 0, -- Vat rate
+ localtax1_tx double(7,4) DEFAULT 0, -- localtax1 rate
+ localtax1_type varchar(10) NULL, -- localtax1 type
+ localtax2_tx double(7,4) DEFAULT 0, -- localtax2 rate
+ localtax2_type varchar(10) NULL, -- localtax2 type
+ qty real, -- quantity
+ remise_percent real DEFAULT 0, -- discount percentage
+ remise real DEFAULT 0, -- discount amount (obsolete)
+ price real, -- final price (obsolete)
+ subprice double(24,8) DEFAULT 0, -- unit price article
+ total_ht double(24,8) DEFAULT 0, -- Total excluding VAT of the line all quantities and including line and global discount
+ total_tva double(24,8) DEFAULT 0, -- Total VAT of the line any quantity and including discount line and global
+ total_localtax1 double(24,8) DEFAULT 0, -- Total localtax1
+ total_localtax2 double(24,8) DEFAULT 0, -- Total localtax2
+ total_ttc double(24,8) DEFAULT 0, -- Total TTC of the line all quantity and including line and global discount
+ product_type integer DEFAULT 0, -- 0 or 1. Value 9 may be used by some modules (amount of line may not be included into generated discount if value is 9).
+ date_start datetime DEFAULT NULL, -- start date if service
+ date_end datetime DEFAULT NULL, -- end date if service
+ info_bits integer DEFAULT 0, -- VAT NPR or not
+
+ buy_price_ht double(24,8) DEFAULT 0, -- buying price
+ fk_product_fournisseur_price integer DEFAULT NULL, -- reference of supplier price when line was added (may be used to update buy_price_ht current price when future invoice will be created)
+
+ special_code integer DEFAULT 0, -- code for special lines (may be 1=transport, 2=ecotax, 3=option, moduleid=...)
+ rang integer DEFAULT 0, -- order display on the propal
+ fk_unit integer DEFAULT NULL, -- link to table of units
+
+ fk_multicurrency integer,
+ multicurrency_code varchar(3),
+ multicurrency_subprice double(24,8) DEFAULT 0,
+ multicurrency_total_ht double(24,8) DEFAULT 0,
+ multicurrency_total_tva double(24,8) DEFAULT 0,
+ multicurrency_total_ttc double(24,8) DEFAULT 0,
+
+ import_key varchar(14)
)ENGINE=innodb;
--
--- Liste des codes pour special_code
+-- List of codes for special_code
--
--- 1 : frais de port
--- 2 : ecotaxe
--- 3 : produit/service propose en option
+-- 1 : shipping costs
+-- 2 : ecotax
+-- 3 : optional product/service
--
diff --git a/htdocs/install/mysql/tables/llx_stock_mouvement_extrafields.key.sql b/htdocs/install/mysql/tables/llx_stock_mouvement_extrafields.key.sql
new file mode 100644
index 00000000000..61909435b00
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_stock_mouvement_extrafields.key.sql
@@ -0,0 +1,21 @@
+-- ============================================================================
+-- Copyright (C) 2002-2004 Rodolphe Quiedeville
+-- Copyright (C) 2004-2005 Laurent Destailleur
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see