diff --git a/ChangeLog b/ChangeLog index 7c180afdb683f8866887564d489726b20dacf5a5..302480c2f63f9786ed685133a5f7c41fc263d342 100644 --- a/ChangeLog +++ b/ChangeLog @@ -39,6 +39,7 @@ For users: - Fix: No images into product description lines as PDF generation does not work with this. - New: [ task #326 ]: Add a numbering module to suggest automatically a product ref +- Fix: [ bug #485 ]: Configurated amount for public auto-subscription form is not taken into account For developers: - New: Add webservice for thirdparty creation and list. diff --git a/htdocs/public/members/new.php b/htdocs/public/members/new.php index a20fb716f6eb9c2b51fad4e5e74f4e1117a24ad2..561a06db79bf0248768dc7ab213bddf09f91808c 100644 --- a/htdocs/public/members/new.php +++ b/htdocs/public/members/new.php @@ -3,6 +3,7 @@ * Copyright (C) 2001-2002 Jean-Louis Bergamo <jlb@j1b.org> * Copyright (C) 2006-2011 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2012 Regis Houssin <regis@dolibarr.fr> + * Copyright (C) 2012 J. Fernando Lagrange <fernando@demo-tic.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -537,6 +538,10 @@ if (! empty($conf->global->MEMBER_NEWFORM_AMOUNT) { // $conf->global->MEMBER_NEWFORM_SHOWAMOUNT is an amount $amount=0; + if (! empty($conf->global->MEMBER_NEWFORM_AMOUNT)) { + $amount=$conf->global->MEMBER_NEWFORM_AMOUNT; + } + if (! empty($conf->global->MEMBER_NEWFORM_PAYONLINE)) { $amount=GETPOST('amount')?GETPOST('amount'):$conf->global->MEMBER_NEWFORM_AMOUNT;