Index: /main/waeup.uniben/trunk/src/waeup/uniben/remita/browser.py
===================================================================
--- /main/waeup.uniben/trunk/src/waeup/uniben/remita/browser.py	(revision 14777)
+++ /main/waeup.uniben/trunk/src/waeup/uniben/remita/browser.py	(revision 14778)
@@ -53,5 +53,5 @@
 
     @property
-    def demo_lineitems(self):
+    def lineitems(self):
         ba1 = self.context.amount_auth / 2
         ba2 = self.context.amount_auth / 2
@@ -72,5 +72,5 @@
 
     @property
-    def lineitems(self):
+    def live_lineitems(self):
         provider_amt = 0.0
         if self.context.p_category == 'schoolfee' and \
@@ -100,4 +100,6 @@
         if not module_activated(self.context.student.current_session):
             return
+        self.orderId = self.context.p_id
+        self.amount = str(self.context.amount_auth)
         error = self.init_update()
         if error:
@@ -105,6 +107,4 @@
             self.redirect(self.url(self.context, '@@index'))
             return
-        self.orderId = self.context.p_id
-        self.amount = str(self.context.amount_auth)
         return
 
@@ -137,5 +137,5 @@
 
     @property
-    def demo_lineitems(self):
+    def lineitems(self):
         lineitems = (
                       {"lineItemsId":"itemid1","beneficiaryName":"Klaus Mueller",
@@ -149,5 +149,5 @@
 
     @property
-    def lineitems(self):
+    def live_lineitems(self):
         provider_amt = 400.0
         if self.context.__parent__.applicant_id.startswith('cbt'):
@@ -167,4 +167,6 @@
         if not module_activated(self.context.__parent__.__parent__.year):
             return
+        self.orderId = self.context.p_id
+        self.amount = str(self.context.amount_auth)
         error = self.init_update()
         if error:
@@ -172,5 +174,3 @@
             self.redirect(self.url(self.context, '@@index'))
             return
-        self.orderId = self.context.p_id
-        self.amount = str(self.context.amount_auth)
         return
