Merge pull request #304 from marcosgdf/fix-bug-485

Fixed bug #485

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.

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 @@ function initturnover() {
 {
     // $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;