From d848e9b91d318343270016a673de33c9267b2f1c Mon Sep 17 00:00:00 2001
From: ecdsa <ecdsa@github>
Date: Sat, 9 Mar 2013 09:28:46 +0100
Subject: [PATCH] fix

---
 plugins/pointofsale.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/plugins/pointofsale.py b/plugins/pointofsale.py
index 508395b..25dc04b 100644
--- a/plugins/pointofsale.py
+++ b/plugins/pointofsale.py
@@ -34,7 +34,6 @@ class QR_Window(QWidget):
         self.amount = 0
         self.setFocusPolicy(QtCore.Qt.NoFocus)
 
-        self.merchant_name = config.get('merchant_name', 'Invoice')
         main_box = QHBoxLayout()
         
         self.qrw = QRCodeWidget()
@@ -100,6 +99,7 @@ def get_info():
 
 def init(gui):
     gui.requested_amounts = gui.config.get('requested_amounts',{}) 
+    gui.merchant_name = gui.config.get('merchant_name', 'Invoice')
     gui.qr_window = None
 
 
-- 
1.7.1