diff --git a/htdocs/admin/supplier_proposal.php b/htdocs/admin/supplier_proposal.php index a9923191f41..eba52757561 100644 --- a/htdocs/admin/supplier_proposal.php +++ b/htdocs/admin/supplier_proposal.php @@ -169,6 +169,7 @@ if ($action == 'set_BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL') { } // Activate a model +$reg = array(); if ($action == 'set') { $ret = addDocumentModel($value, $type, $label, $scandir); } elseif ($action == 'del') { @@ -179,9 +180,7 @@ if ($action == 'set') { } } } elseif ($action == 'setdoc') { - if (dolibarr_set_const($db, "SUPPLIER_PROPOSAL_ADDON_PDF", $value, 'chaine', 0, '', $conf->entity)) { - $conf->global->SUPPLIER_PROPOSAL_ADDON_PDF = $value; - } + dolibarr_set_const($db, "SUPPLIER_PROPOSAL_ADDON_PDF", empty($value) ? '' : $value, 'chaine', 0, '', $conf->entity); // On active le modele $ret = delDocumentModel($value, $type); @@ -449,9 +448,9 @@ foreach ($dirmodels as $reldir) { // Default print ''; if (getDolGlobalString('SUPPLIER_PROPOSAL_ADDON_PDF') == "$name") { - print img_picto($langs->trans("Default"), 'on'); + print 'scandir).'&label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Default"), 'on').''; } else { - print 'scandir).'&label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').''; + print 'scandir).'&label='.urlencode($module->name).'" alt="'.$langs->trans("Disabled").'">'.img_picto($langs->trans("Disabled"), 'off').''; } print ''; diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php index 1ab7ee7e8b8..30d1d5a42e2 100644 --- a/htdocs/contrat/class/contrat.class.php +++ b/htdocs/contrat/class/contrat.class.php @@ -2333,7 +2333,7 @@ class Contrat extends CommonObject $labelShort = $langs->trans("BoardExpiredServicesShort"); } else { $warning_delay = $conf->contract->services->expires->warning_delay; - $url = DOL_URL_ROOT.'/contrat/services_list.php?mainmenu=commercial&leftmenu=contracts&sortfield=cd.date_fin_validite&sortorder=asc'; + $url = DOL_URL_ROOT.'/contrat/services_list.php?mainmenu=commercial&leftmenu=contracts&search_status=4&sortfield=cd.date_fin_validite&sortorder=asc'; $url_late = DOL_URL_ROOT.'/contrat/services_list.php?mainmenu=commercial&leftmenu=contracts&search_option=late'; $label = $langs->trans("BoardRunningServices"); $labelShort = $langs->trans("BoardRunningServicesShort"); diff --git a/htdocs/core/lib/functions2.lib.php b/htdocs/core/lib/functions2.lib.php index fda09974054..0d53b193c87 100644 --- a/htdocs/core/lib/functions2.lib.php +++ b/htdocs/core/lib/functions2.lib.php @@ -1611,6 +1611,7 @@ function numero_semaine($time) { $stime = dol_print_date($time, '%Y-%m-%d'); + $reg = array(); if (preg_match('/^([0-9]+)\-([0-9]+)\-([0-9]+)\s?([0-9]+)?:?([0-9]+)?/i', $stime, $reg)) { // Date est au format 'YYYY-MM-DD' ou 'YYYY-MM-DD HH:MM:SS' $annee = (int) $reg[1]; @@ -1876,9 +1877,10 @@ function version_webserver() * @param DoliDB $db Database handler * @param string $type Type of models (company, invoice, ...) * @param int $maxfilenamelength Max length of value to show + * @param int $showempty Add an empty record if 1 * @return string[]|int<-1,0> 0 if no module is activated, or array(key=>label). For modules that need directory scan, key is completed with ":filename", -1 if error */ -function getListOfModels($db, $type, $maxfilenamelength = 0) +function getListOfModels($db, $type, $maxfilenamelength = 0, $showempty = 0) { global $conf, $hookmanager, $langs; @@ -1889,19 +1891,30 @@ function getListOfModels($db, $type, $maxfilenamelength = 0) $sql = "SELECT nom as id, nom as doc_template_name, libelle as label, description as description"; $sql .= " FROM ".MAIN_DB_PREFIX."document_model"; $sql .= " WHERE type = '".$db->escape($type)."'"; - $sql .= " AND entity IN (0,".$conf->entity.")"; + $sql .= " AND entity IN (0,".((int) $conf->entity).")"; $sql .= " ORDER BY description DESC"; dol_syslog('/core/lib/function2.lib.php::getListOfModels', LOG_DEBUG); + $resql_models = $db->query($sql); if ($resql_models) { $num = $db->num_rows($resql_models); + + if ($showempty) { + $docmodels[0] = ' '; + } + $i = 0; while ($i < $num) { $found = 1; $obj = $db->fetch_object($resql_models); + if ($obj->id == '0') { // We discard bad record (should not happen) + $i++; + continue; + } + // If this generation module needs to scan a directory, then description field is filled // with the constant that contains list of directories to scan (COMPANY_ADDON_PDF_ODT_PATH, ...). if (!empty($obj->description)) { // A list of directories to scan is defined @@ -1950,6 +1963,7 @@ function getListOfModels($db, $type, $maxfilenamelength = 0) $docmodels[$obj->id] = $obj->label ? $obj->label : $obj->doc_template_name; } } + $i++; } } else { diff --git a/htdocs/core/modules/supplier_proposal/modules_supplier_proposal.php b/htdocs/core/modules/supplier_proposal/modules_supplier_proposal.php index 3740f6bca4f..870ec7a68b0 100644 --- a/htdocs/core/modules/supplier_proposal/modules_supplier_proposal.php +++ b/htdocs/core/modules/supplier_proposal/modules_supplier_proposal.php @@ -53,7 +53,7 @@ abstract class ModelePDFSupplierProposal extends CommonDocGenerator $list = array(); include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; - $list = getListOfModels($db, $type, $maxfilenamelength); + $list = getListOfModels($db, $type, $maxfilenamelength, 1); return $list; } diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php index 872a528e665..3c3dabb25b4 100644 --- a/htdocs/societe/card.php +++ b/htdocs/societe/card.php @@ -2700,7 +2700,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio // Juridical type print ''.$form->editfieldkey('JuridicalStatus', 'forme_juridique_code', '', $object, 0).''; print ''; - print $formcompany->select_juridicalstatus($object->forme_juridique_code, $object->country_id, '', 'forme_juridique_code'); + print $formcompany->select_juridicalstatus($object->forme_juridique_code, $object->country_code, '', 'forme_juridique_code'); print ''; // Date birth diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php index 47d6d0c6c51..aaefb040828 100644 --- a/htdocs/societe/class/societe.class.php +++ b/htdocs/societe/class/societe.class.php @@ -2342,7 +2342,7 @@ class Societe extends CommonObject } // Then search ref, ref_ext or alias with a OR (+ restriction on is_client and is_supplier) - dol_syslog("Thirdparty not found with profids search so we try ref, ref_ext or ref_alias search", LOG_DEBUG); + dol_syslog("Thirdparty not found with email search so we try ref, ref_ext or ref_alias search", LOG_DEBUG); $sqlref = ""; if ($ref) { $sqlref .= " s.nom = '".$this->db->escape($ref)."'"; diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php index 2f77a724154..a164b271eea 100644 --- a/htdocs/supplier_proposal/card.php +++ b/htdocs/supplier_proposal/card.php @@ -295,6 +295,8 @@ if (empty($reshook)) { if (!$error) { $db->begin(); + $model_pdf = (GETPOST('model') != '0' && GETPOST('model') != '-1') ? GETPOST('model') : ''; + // When a copy request was made, make the copy if (GETPOST('createmode') == 'copy' && GETPOSTINT('copie_supplier_proposal') > 0) { if ($object->fetch(GETPOSTINT('copie_supplier_proposal')) > 0) { @@ -306,7 +308,7 @@ if (empty($reshook)) { $object->fk_account = GETPOSTINT('fk_account'); $object->socid = GETPOSTINT('socid'); $object->fk_project = GETPOSTINT('projectid'); - $object->model_pdf = GETPOST('model'); + $object->model_pdf = $model_pdf; $object->author = $user->id; // deprecated $object->user_creation_id = $user->id; $object->note = GETPOST('note', 'restricthtml'); @@ -325,7 +327,7 @@ if (empty($reshook)) { $object->mode_reglement_id = GETPOSTINT('mode_reglement_id'); $object->fk_account = GETPOSTINT('fk_account'); $object->fk_project = GETPOSTINT('projectid'); - $object->model_pdf = GETPOST('model'); + $object->model_pdf = $model_pdf; $object->author = $user->id; // deprecated $object->user_creation_id = $user->id; $object->note = GETPOST('note', 'restricthtml'); @@ -351,6 +353,7 @@ if (empty($reshook)) { if ($origin && $originid) { // Parse element/subelement (ex: project_task) $element = $subelement = $origin; + $regs = array(); if (preg_match('/^([^_]+)_([^_]+)/i', $origin, $regs)) { $element = $regs[1]; $subelement = $regs[2]; @@ -375,10 +378,11 @@ if (empty($reshook)) { } $object->origin = $origin; + $object->origin_type = $origin; $object->origin_id = $originid; // Possibility to add external linked objects with hooks - $object->linked_objects [$object->origin] = $object->origin_id; + $object->linked_objects [$object->origin_type] = $object->origin_id; if (GETPOSTISARRAY('other_linked_objects')) { $object->linked_objects = array_merge($object->linked_objects, GETPOST('other_linked_objects', 'array:int')); } @@ -391,7 +395,7 @@ if (empty($reshook)) { $srcobject = new $classname($db); '@phan-var-force Commande|Propal|Contrat|Fichinter|Expedition $srcobject'; // Maybe other class but CommonObject is too generic - dol_syslog("Try to find source object origin=".$object->origin." originid=".$object->origin_id." to add lines"); + dol_syslog("Try to find source object origin=".$object->origin_type." originid=".$object->origin_id." to add lines"); $result = $srcobject->fetch($object->origin_id); if ($result > 0) { @@ -502,10 +506,12 @@ if (empty($reshook)) { } $model = $object->model_pdf; - $ret = $object->fetch($id); // Reload to get new records - $result = $object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref); - if ($result < 0) { - dol_print_error($db, $object->error, $object->errors); + if (!empty($model)) { + $ret = $object->fetch($id); // Reload to get new records + $result = $object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref); + if ($result < 0) { + dol_print_error($db, $object->error, $object->errors); + } } } @@ -1390,7 +1396,7 @@ if ($action == 'create') { print ''; print img_picto('', 'pdf', 'class="pictofixedwidth"'); $list = ModelePDFSupplierProposal::liste_modeles($db); - $preselected = (getDolGlobalString('SUPPLIER_PROPOSAL_ADDON_PDF_ODT_DEFAULT') ? $conf->global->SUPPLIER_PROPOSAL_ADDON_PDF_ODT_DEFAULT : $conf->global->SUPPLIER_PROPOSAL_ADDON_PDF); + $preselected = getDolGlobalString('SUPPLIER_PROPOSAL_ADDON_PDF_ODT_DEFAULT', getDolGlobalString('SUPPLIER_PROPOSAL_ADDON_PDF')); print $form->selectarray('model', $list, $preselected, 0, 0, 0, '', 0, 0, 0, '', '', 1); print ""; diff --git a/htdocs/supplier_proposal/list.php b/htdocs/supplier_proposal/list.php index e4154ec61e1..a59241ce8c3 100644 --- a/htdocs/supplier_proposal/list.php +++ b/htdocs/supplier_proposal/list.php @@ -125,7 +125,7 @@ $offset = $limit * $page; $pageprev = $page - 1; $pagenext = $page + 1; if (!$sortfield) { - $sortfield = 'sp.date_livraison'; + $sortfield = 'sp.ref'; } if (!$sortorder) { $sortorder = 'DESC';