From afe71305fadaaaa71d8f13606847d06848ca0d6c Mon Sep 17 00:00:00 2001 From: VESSILLER Date: Wed, 27 Sep 2023 12:15:44 +0200 Subject: [PATCH 1/2] FIX thirdparty object in proposal card is not loaded --- htdocs/comm/propal/card.php | 1 + 1 file changed, 1 insertion(+) diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php index e575195799c..10ada40f820 100644 --- a/htdocs/comm/propal/card.php +++ b/htdocs/comm/propal/card.php @@ -1895,6 +1895,7 @@ if ($action == 'create') { $soc = new Societe($db); $soc->fetch($object->socid); + $object->fetch_thirdparty(); $head = propal_prepare_head($object); print dol_get_fiche_head($head, 'comm', $langs->trans('Proposal'), -1, 'propal'); From 2980d90bdda26281945f78fe762ce1bf4e7a5ae6 Mon Sep 17 00:00:00 2001 From: VESSILLER Date: Thu, 28 Sep 2023 08:49:13 +0200 Subject: [PATCH 2/2] Fix load thirdparty object once time --- htdocs/comm/propal/card.php | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php index 10ada40f820..3a2424f55e3 100644 --- a/htdocs/comm/propal/card.php +++ b/htdocs/comm/propal/card.php @@ -1892,10 +1892,8 @@ if ($action == 'create') { /* * Show object in view mode */ - - $soc = new Societe($db); - $soc->fetch($object->socid); $object->fetch_thirdparty(); + $soc = $object->thirdparty; $head = propal_prepare_head($object); print dol_get_fiche_head($head, 'comm', $langs->trans('Proposal'), -1, 'propal'); @@ -1994,9 +1992,9 @@ if ($action == 'create') { $morehtmlref .= $form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, $usercancreate, 'string', '', 0, 1); $morehtmlref .= $form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, $usercancreate, 'string', '', null, null, '', 1); // Thirdparty - $morehtmlref .= '
'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1, 'customer'); - if (empty($conf->global->MAIN_DISABLE_OTHER_LINK) && $object->thirdparty->id > 0) { - $morehtmlref .= ' ('.$langs->trans("OtherProposals").')'; + $morehtmlref .= '
'.$langs->trans('ThirdParty').' : '.$soc->getNomUrl(1, 'customer'); + if (empty($conf->global->MAIN_DISABLE_OTHER_LINK) && $soc->id > 0) { + $morehtmlref .= ' ('.$langs->trans("OtherProposals").')'; } // Project if (!empty($conf->projet->enabled)) {