From 5f6c5ccf926c38dce51a2a4fe3154530ba9ced9a Mon Sep 17 00:00:00 2001 From: Alexandre SPANGARO Date: Mon, 4 Apr 2022 16:25:31 +0200 Subject: [PATCH 1/3] NEW Supplier order - Show ref supplier of reception in linked object block --- htdocs/reception/tpl/linkedobjectblock.tpl.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/reception/tpl/linkedobjectblock.tpl.php b/htdocs/reception/tpl/linkedobjectblock.tpl.php index 1bfecac3f1d..3d61a7da815 100644 --- a/htdocs/reception/tpl/linkedobjectblock.tpl.php +++ b/htdocs/reception/tpl/linkedobjectblock.tpl.php @@ -56,7 +56,7 @@ foreach ($linkedObjectBlock as $key => $objectlink) { } ?> getNomUrl(1); ?> - + ref_supplier; ?> date_delivery, 'day'); ?> rights->reception->lire) { From b03d7c60ff30bc6cecfdce1ded14a5ab9faf962c Mon Sep 17 00:00:00 2001 From: bomuux Date: Mon, 4 Apr 2022 18:06:11 +0200 Subject: [PATCH 2/3] Bug: Cannot set thirdparty customer accountancy code to empty string When thirdparty customer accountancy code is set to a non empty string, one cannot set it back to empty string due to thirdparty property deprecation : code_compta to code_compta_client --- htdocs/comm/card.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php index de387ce60f3..4aca208681b 100644 --- a/htdocs/comm/card.php +++ b/htdocs/comm/card.php @@ -162,7 +162,8 @@ if (empty($reshook)) { // set accountancy code if ($action == 'setcustomeraccountancycode') { $result = $object->fetch($id); - $object->code_compta = GETPOST("customeraccountancycode"); + $object->code_compta_client = GETPOST("customeraccountancycode"); + $object->code_compta = $object->code_compta_client; // For Backward compatibility $result = $object->update($object->id, $user, 1, 1, 0); if ($result < 0) { setEventMessages($object->error, $object->errors, 'errors'); @@ -360,9 +361,9 @@ if ($object->id > 0) { print ''; print ''; - print $form->editfieldkey("CustomerAccountancyCode", 'customeraccountancycode', $object->code_compta, $object, $user->rights->societe->creer); + print $form->editfieldkey("CustomerAccountancyCode", 'customeraccountancycode', $object->code_compta_client, $object, $user->rights->societe->creer); print ''; - print $form->editfieldval("CustomerAccountancyCode", 'customeraccountancycode', $object->code_compta, $object, $user->rights->societe->creer); + print $form->editfieldval("CustomerAccountancyCode", 'customeraccountancycode', $object->code_compta_client, $object, $user->rights->societe->creer); print ''; print ''; } From 26f7a50838db4fee72c34800d366ea318ab96a8d Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 5 Apr 2022 14:15:27 +0200 Subject: [PATCH 3/3] Update linkedobjectblock.tpl.php --- htdocs/reception/tpl/linkedobjectblock.tpl.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/reception/tpl/linkedobjectblock.tpl.php b/htdocs/reception/tpl/linkedobjectblock.tpl.php index 3d61a7da815..009534b91b5 100644 --- a/htdocs/reception/tpl/linkedobjectblock.tpl.php +++ b/htdocs/reception/tpl/linkedobjectblock.tpl.php @@ -56,7 +56,7 @@ foreach ($linkedObjectBlock as $key => $objectlink) { } ?> getNomUrl(1); ?> - ref_supplier; ?> + ref_supplier); ?> date_delivery, 'day'); ?> rights->reception->lire) {