From 3e1e508bf3b7d14ee5e72ea717dbc25371e0288c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a?= <marcosgdf@gmail.com>
Date: Tue, 14 Aug 2012 09:57:03 +0200
Subject: [PATCH 1/2] Fixed bug #485 Merged patch from J. Fernando Lagrange
 (lowmemory)
 https://doliforge.org/tracker/?func=detail&aid=485&atid=246&group_id=144

---
 htdocs/public/members/new.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/htdocs/public/members/new.php b/htdocs/public/members/new.php
index a20fb716f6e..561a06db79b 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;

From f54c92eefff942625bd2c1f7f8bb7fd8d3c0948c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a?= <marcosgdf@gmail.com>
Date: Tue, 14 Aug 2012 10:00:27 +0200
Subject: [PATCH 2/2] Modified changelog

---
 ChangeLog | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ChangeLog b/ChangeLog
index 7c180afdb68..302480c2f63 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.