From b1469ba7617f60f76d7ed96f455b30470d850e27 Mon Sep 17 00:00:00 2001 From: atm-greg Date: Mon, 9 Apr 2018 07:06:20 +0200 Subject: [PATCH 1/7] add doActions hook on projettaskcard --- htdocs/projet/tasks.php | 4 +++- htdocs/projet/tasks/task.php | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php index c00e93e239f..9121f0d5776 100644 --- a/htdocs/projet/tasks.php +++ b/htdocs/projet/tasks.php @@ -77,7 +77,9 @@ $planned_workload=$planned_workloadhour*3600+$planned_workloadmin*60; $userAccess=0; - +$parameters=array('id'=>$id); +$reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action); // Note that $action and $object may have been modified by some hooks +if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); /* * Actions */ diff --git a/htdocs/projet/tasks/task.php b/htdocs/projet/tasks/task.php index db56534f851..24799c18354 100644 --- a/htdocs/projet/tasks/task.php +++ b/htdocs/projet/tasks/task.php @@ -60,6 +60,9 @@ $projectstatic = new Project($db); // fetch optionals attributes and labels $extralabels=$extrafields->fetch_name_optionals_label($object->table_element); +$parameters=array('id'=>$id); +$reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action); // Note that $action and $object may have been modified by some hooks +if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); /* * Actions From 809b2a91ed4bfacb8797f45306312241bd7076bd Mon Sep 17 00:00:00 2001 From: atm-quentin Date: Tue, 10 Apr 2018 16:27:18 +0200 Subject: [PATCH 2/7] FIX issue #8037 --- htdocs/product/traduction.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/product/traduction.php b/htdocs/product/traduction.php index 791da80c05d..b8cdb1fbe39 100644 --- a/htdocs/product/traduction.php +++ b/htdocs/product/traduction.php @@ -251,7 +251,7 @@ if ($action == 'edit') print '
'; print ''; - print ''; + print ''; print '
'.$langs->trans('Label').'
'.$langs->trans('Label').'
'.$langs->trans('Description').''; $doleditor = new DolEditor("desc-$key", $object->multilangs[$key]["description"], '', 160, 'dolibarr_notes', '', false, true, $conf->global->FCKEDITOR_ENABLE_PRODUCTDESC, ROWS_3, '90%'); $doleditor->Create(); From 7cdc1c8befef03b8e8fe34e88574e2f8455947d9 Mon Sep 17 00:00:00 2001 From: atm-greg Date: Wed, 11 Apr 2018 07:08:40 +0200 Subject: [PATCH 3/7] Fix #8259 can't update contact birthday with REST API --- htdocs/contact/class/contact.class.php | 1 + 1 file changed, 1 insertion(+) diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php index 21c7527dae2..63bc433535b 100644 --- a/htdocs/contact/class/contact.class.php +++ b/htdocs/contact/class/contact.class.php @@ -311,6 +311,7 @@ class Contact extends CommonObject $sql .= ", email='".$this->db->escape($this->email)."'"; $sql .= ", skype='".$this->db->escape($this->skype)."'"; $sql .= ", photo='".$this->db->escape($this->photo)."'"; + $sql .= ", birthday='".$this->db->idate($this->birthday)."'"; $sql .= ", note_private = ".(isset($this->note_private)?"'".$this->db->escape($this->note_private)."'":"null"); $sql .= ", note_public = ".(isset($this->note_public)?"'".$this->db->escape($this->note_public)."'":"null"); $sql .= ", phone = ".(isset($this->phone_pro)?"'".$this->db->escape($this->phone_pro)."'":"null"); From 2c76a6cd807f3dcf89d3892dda4e9d1e909a2672 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Wed, 11 Apr 2018 11:44:22 +0200 Subject: [PATCH 4/7] Update combinations.php --- htdocs/variants/combinations.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/variants/combinations.php b/htdocs/variants/combinations.php index 0ec1bf07b68..8b3335a37d6 100644 --- a/htdocs/variants/combinations.php +++ b/htdocs/variants/combinations.php @@ -383,7 +383,7 @@ if (! empty($id) || ! empty($ref)) select.empty().append(''); - jQuery.getJSON("", { + jQuery.getJSON("ajax/get_attribute_values.php", { id: jQuery(this).val() }, function(data) { if (data.error) { From bc7623d3832e0922244e9ca8b4a14bc52fb543e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Wed, 11 Apr 2018 12:05:23 +0200 Subject: [PATCH 5/7] Update getCombinations.php --- htdocs/variants/ajax/getCombinations.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/variants/ajax/getCombinations.php b/htdocs/variants/ajax/getCombinations.php index 8b7baaee27e..5c57191c3eb 100644 --- a/htdocs/variants/ajax/getCombinations.php +++ b/htdocs/variants/ajax/getCombinations.php @@ -28,7 +28,7 @@ require_once DOL_DOCUMENT_ROOT.'/variants/class/ProductCombination.class.php'; header('Content-Type: application/json'); -$id = GETPOST('id'); +$id = GETPOST('id', 'int'); if (!$id) { print json_encode(array( From a95bc76afb1bd614f6d2f645493c24810f9fc879 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Wed, 11 Apr 2018 12:10:58 +0200 Subject: [PATCH 6/7] Update combinations.php --- htdocs/variants/combinations.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/htdocs/variants/combinations.php b/htdocs/variants/combinations.php index 8b3335a37d6..ef7dffd9ed0 100644 --- a/htdocs/variants/combinations.php +++ b/htdocs/variants/combinations.php @@ -699,8 +699,12 @@ if (! empty($id) || ! empty($ref)) print ''; print ''; } +} else { + llxHeader(); + // not found } + llxFooter(); $db->close(); From 7d7c0624d2e7c3e81f153f1f18308f73915b788d Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 11 Apr 2018 12:59:24 +0200 Subject: [PATCH 7/7] Update traduction.php --- htdocs/product/traduction.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/product/traduction.php b/htdocs/product/traduction.php index b8cdb1fbe39..20e0bd4c8ad 100644 --- a/htdocs/product/traduction.php +++ b/htdocs/product/traduction.php @@ -251,7 +251,7 @@ if ($action == 'edit') print '
'; print ''; - print ''; + print ''; print '
'.$langs->trans('Label').'
'.$langs->trans('Label').'
'.$langs->trans('Description').''; $doleditor = new DolEditor("desc-$key", $object->multilangs[$key]["description"], '', 160, 'dolibarr_notes', '', false, true, $conf->global->FCKEDITOR_ENABLE_PRODUCTDESC, ROWS_3, '90%'); $doleditor->Create();