[Pykafe-commits] SF.net SVN: pykafe: [114] trunk/pykafe/server

[<jn...@us...>]

Revision: 114
          http://pykafe.svn.sourceforge.net/pykafe/?rev=114&view=rev
Author:   jnmbk
Date:     2007-06-10 13:25:32 -0700 (Sun, 10 Jun 2007)

Log Message:
-----------
fix rounding

Modified Paths:
--------------
    trunk/pykafe/server/settings.py
    trunk/pykafe/server/settingswindow.py

Modified: trunk/pykafe/server/settings.py
===================================================================
--- trunk/pykafe/server/settings.py	2007-06-10 19:45:52 UTC (rev 113)
+++ trunk/pykafe/server/settings.py	2007-06-10 20:25:32 UTC (rev 114)
@@ -232,18 +232,11 @@
         self.ui.cashiers_username.setText(currentCashier.userName)
         self.ui.cashiers_password.clear()
         self.ui.cashiers_realName.setText(currentCashier.realName)
-    def checkPricingRoundingValue(self):
-        if self.ui.pricing_rounding.value() > self.ui.pricing_fixed.value():
-            QtGui.QMessageBox.warning(self.parent, _("Warning"), _("Price rounding must be smaller than or equal to fixed price. Correct value will be set."))
-            self.ui.pricing_rounding.setValue(self.ui.pricing_fixed.value())
     def checkPricingOnehourValue(self):
         if self.ui.pricing_fixed.value() > self.ui.pricing_onehour.value():
             QtGui.QMessageBox.warning(self.parent, _("Warning"), _("One hour price must be bigger than or equal to fixed price.  Correct value will be set."))
             self.ui.pricing_onehour.setValue(self.ui.pricing_fixed.value())
     def checkPricingFixedValue(self):
-        if self.ui.pricing_rounding.value() > self.ui.pricing_fixed.value():
-            QtGui.QMessageBox.warning(self.parent, _("Warning"), _("Fixed price must be bigger than or equal to price rounding. Correct value will be set."))
-            self.ui.pricing_fixed.setValue(self.ui.pricing_rounding.value())
-        elif self.ui.pricing_fixed.value() > self.ui.pricing_onehour.value():
+        if self.ui.pricing_fixed.value() > self.ui.pricing_onehour.value():
             QtGui.QMessageBox.warning(self.parent, _("Warning"), _("Fixed price must be smaller than or equal to one hour price. Correct value will be set."))
             self.ui.pricing_fixed.setValue(self.ui.pricing_onehour.value())

Modified: trunk/pykafe/server/settingswindow.py
===================================================================
--- trunk/pykafe/server/settingswindow.py	2007-06-10 19:45:52 UTC (rev 113)
+++ trunk/pykafe/server/settingswindow.py	2007-06-10 20:25:32 UTC (rev 114)
@@ -337,7 +337,6 @@
         QtCore.QObject.connect(self.cashiers_reportsButton,QtCore.SIGNAL("clicked()"),self.manager.cashierReports)
         QtCore.QObject.connect(self.pricing_fixed,QtCore.SIGNAL("valueChanged(double)"),self.manager.checkPricingFixedValue)
         QtCore.QObject.connect(self.pricing_onehour,QtCore.SIGNAL("valueChanged(double)"),self.manager.checkPricingOnehourValue)
-        QtCore.QObject.connect(self.pricing_rounding,QtCore.SIGNAL("valueChanged(double)"),self.manager.checkPricingRoundingValue)
         QtCore.QMetaObject.connectSlotsByName(SettingsWindow)
         SettingsWindow.setTabOrder(self.tabWidget,self.checkBox_2)
         SettingsWindow.setTabOrder(self.checkBox_2,self.pricing_minutes)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.