From 637855485eb224ddef03155b6d0c6848f38a452e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
<marcosgdf@gmail.com>
Date: Sat, 12 Sep 2015 17:28:32 +0200
Subject: [PATCH] FIX #3423 Not possible update values of extrafields in
Facture
Close #3423
---
htdocs/compta/facture.php | 112 +++++++++++++++++---------------------
1 file changed, 50 insertions(+), 62 deletions(-)
diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index a4a3c8a1e83..21cfacbc139 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -1718,14 +1718,36 @@ if (empty($reshook))
else setEventMessage($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), 'errors');
$action = '';
}
+ } elseif ($action == 'update_extras') {
+ // Fill array 'array_options' with data from add form
+ $extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
+ $ret = $extrafields->setOptionalsFromPost($extralabels, $object, GETPOST('attribute'));
+ if ($ret < 0) $error++;
+
+ if (! $error) {
+ // Actions on extra fields (by external module or standard code)
+ // TODO le hook fait double emploi avec le trigger !!
+ $hookmanager->initHooks(array('invoicedao'));
+ $parameters = array('id' => $object->id);
+ $reshook = $hookmanager->executeHooks('insertExtraFields', $parameters, $object, $action); // Note that $action and $object may have been modified by
+ // some hooks
+ if (empty($reshook)) {
+ $result = $object->insertExtraFields();
+ if ($result < 0) {
+ $error ++;
+ }
+ } else if ($reshook < 0)
+ $error ++;
+ }
+
+ if ($error)
+ $action = 'edit_extras';
}
include DOL_DOCUMENT_ROOT.'/core/actions_printing.inc.php';
- if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB) && $user->rights->facture->creer)
- {
- if ($action == 'addcontact')
- {
+ if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB) && $user->rights->facture->creer) {
+ if ($action == 'addcontact') {
$result = $object->fetch($id);
if ($result > 0 && $id > 0) {
@@ -1733,69 +1755,35 @@ if (empty($reshook))
$result = $object->add_contact($contactid, $_POST["type"], $_POST["source"]);
}
- if ($result >= 0) {
- header("Location: " . $_SERVER['PHP_SELF'] . "?id=" . $object->id);
- exit();
- } else {
- if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
- $langs->load("errors");
- setEventMessage($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), 'errors');
+ if ($result >= 0) {
+ header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
+ exit();
} else {
- setEventMessage($object->error, 'errors');
+ if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
+ $langs->load("errors");
+ setEventMessage($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), 'errors');
+ } else {
+ setEventMessage($object->error, 'errors');
+ }
}
- }
- }
-
- // bascule du statut d'un contact
- else if ($action == 'swapstatut')
- {
- if ($object->fetch($id)) {
- $result = $object->swapContactStatus(GETPOST('ligne'));
- } else {
- dol_print_error($db);
+ } // bascule du statut d'un contact
+ elseif ($action == 'swapstatut') {
+ if ($object->fetch($id)) {
+ $result = $object->swapContactStatus(GETPOST('ligne'));
+ } else {
+ dol_print_error($db);
}
- }
-
- // Efface un contact
- else if ($action == 'deletecontact')
- {
- $object->fetch($id);
- $result = $object->delete_contact($lineid);
-
- if ($result >= 0) {
- header("Location: " . $_SERVER['PHP_SELF'] . "?id=" . $object->id);
- exit();
- } else {
- dol_print_error($db);
- }
- }
-
-
- if ($action == 'update_extras')
- {
- // Fill array 'array_options' with data from add form
- $extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
- $ret = $extrafields->setOptionalsFromPost($extralabels, $object, GETPOST('attribute'));
- if ($ret < 0) $error++;
+ } // Efface un contact
+ elseif ($action == 'deletecontact') {
+ $object->fetch($id);
+ $result = $object->delete_contact($lineid);
- if (! $error) {
- // Actions on extra fields (by external module or standard code)
- // TODO le hook fait double emploi avec le trigger !!
- $hookmanager->initHooks(array('invoicedao'));
- $parameters = array('id' => $object->id);
- $reshook = $hookmanager->executeHooks('insertExtraFields', $parameters, $object, $action); // Note that $action and $object may have been modified by
- // some hooks
- if (empty($reshook)) {
- $result = $object->insertExtraFields();
- if ($result < 0) {
- $error ++;
- }
- } else if ($reshook < 0)
- $error ++;
+ if ($result >= 0) {
+ header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
+ exit();
+ } else {
+ dol_print_error($db);
}
-
- if ($error)
- $action = 'edit_extras';
}
}
}
--
GitLab