[gnue-contrib] r200 - in gnue-invoice: . forms

[kilo]

Author: kilo
Date: 2005-01-12 02:31:55 -0600 (Wed, 12 Jan 2005)
New Revision: 200

Modified:
   gnue-invoice/forms/INV_Head-hu.gfd
   gnue-invoice/forms/INV_Head.gfd
   gnue-invoice/forms/INV_grid-hu.gfd
   gnue-invoice/forms/INV_grid.gfd
   gnue-invoice/news
   gnue-invoice/todo
Log:
GNUe Invoice.
Use form.commit() instead of block.commit().

Modified: gnue-invoice/forms/INV_Head-hu.gfd
===================================================================
--- gnue-invoice/forms/INV_Head-hu.gfd  2005-01-11 10:02:25 UTC (rev 199)
+++ gnue-invoice/forms/INV_Head-hu.gfd  2005-01-12 08:31:55 UTC (rev 200)
@@ -29,7 +29,7 @@
     form.setFeature('GUI:TOOLBAR:SUPPRESS', True)
     form.setFeature('GUI:STATUSBAR:SUPPRESS', True)
     
-    #blkFree.img.set("goatcomp2.png")
+    blkFree.img.set("goatcomp2.png")
   </trigger>
 
   <options/>
@@ -125,9 +125,9 @@
     <!--***************************************************
             Block used for displaying wee luvly goat
     ****************************************************-->
-    <!--<block name="blkFree">
+    <block name="blkFree">
       <field name="img" field="fldImg"/>
-    </block>-->
+    </block>
     
   </logic>
 
@@ -137,8 +137,8 @@
   ******************************************************-->
   <layout c:height="18" c:width="70">
     <page>
-      <!--<image name="imgURL" c:height="4" c:width="12" c:x="58" c:y="0"
-          block="blkFree" field="img" fit="both"/>-->
+      <image name="imgURL" c:height="4" c:width="12" c:x="58" c:y="0"
+          block="blkFree" field="img" fit="both"/>
       <label name="lblNumber" c:height="1" c:width="10" c:x="1" c:y="1"
           text="Szla.sz�m:"/>
       <entry name="entNumber" c:height="1" c:width="20" c:x="16" c:y="1"
@@ -249,19 +249,19 @@
   <trigger name="saveAll" type="NAMED">
     if not blkItem.isSaved():
       print "Cikk nincs mentve, ment�s..."
-      blkItem.commit()
+      commit()
     if not blkHead.isSaved():
       print "Sz�mlafej nincs mentve, ment�s..."
-      blkHead.commit()
+      commit()
     
     blkHead.update ()   #HACK
     invNumber = blkHead.fldNumber.get()
-    for i in range(blkSeller.fldNumPrint.get()):
-      print "Printing invoice #%i" % (i + 1)
+    toPrint = blkSeller.fldNumPrint.get()
+    for i in range(toPrint):
+      print "%i. sz�mlap�ld�ny nyomtat�sa" % (i + 1)
       blkHead.fldPrinted.set(i + 1)
-      blkHead.commit()  #HACK
+      commit()  #HACK
       runReport('../reports/invoice-hu.grd', {'INV_number': invNumber})
-    blkHead.commit()
     close()
   </trigger>
 

Modified: gnue-invoice/forms/INV_Head.gfd
===================================================================
--- gnue-invoice/forms/INV_Head.gfd     2005-01-11 10:02:25 UTC (rev 199)
+++ gnue-invoice/forms/INV_Head.gfd     2005-01-12 08:31:55 UTC (rev 200)
@@ -248,17 +248,18 @@
   <trigger name="saveAll" type="NAMED">
     if not blkItem.isSaved():
       print "Item not saved, saving..."
-      blkItem.commit()
+      commit()
     if not blkHead.isSaved():
       print "Head not saved, saving..."
-      blkHead.commit()
+      commit()
     
     blkHead.update ()   #HACK
     invNumber = blkHead.fldNumber.get()
-    for i in range(blkSeller.fldNumPrint.get()):
+    toPrint = blkSeller.fldNumPrint.get()
+    for i in range(toPrint):
       print "Printing invoice #%i" % (i + 1)
       blkHead.fldPrinted.set(i + 1)
-      blkHead.commit()  #HACK
+      commit()  #HACK
       runReport('../reports/invoice.grd', {'INV_number': invNumber})
     blkHead.commit()
     close()

Modified: gnue-invoice/forms/INV_grid-hu.gfd
===================================================================
--- gnue-invoice/forms/INV_grid-hu.gfd  2005-01-11 10:02:25 UTC (rev 199)
+++ gnue-invoice/forms/INV_grid-hu.gfd  2005-01-12 08:31:55 UTC (rev 200)
@@ -112,16 +112,13 @@
       <button name="btnRevert"       c:height="1" c:width="7"  c:x="13" 
c:y="10"
           label="Storn�">
         <trigger type="ON-ACTION" name="btnRevertTrigger">
-          toPrint = blkSeller.fldNumPrint.get()
-          print toPrint
           ret = blk.call('INV_revert', {'invId': blk.fldGnueid.get()})
           if ret is not None:
-            print "Storn� sz�mla ment�se..."
-            #blk.commit()
-            a = blk.fldNumber.get()
+            toPrint = blkSeller.fldNumPrint.get()
             for i in range(toPrint):
+              print "%i. storn� sz�mlap�ld�ny nyomtat�sa" % (i + 1)
               blk.fldPrinted.set(i + 1)
-              blk.commit()
+              commit()
               runReport('../reports/invoice-hu.grd', {'INV_number':ret})
           else:
             print "Storn� sz�ml�t nem lehet storn�zni!"
@@ -133,10 +130,11 @@
       <button name="btnPrint"       c:height="1" c:width="8"  c:x="23" c:y="10"
           label="Nyomtat">
         <trigger type="ON-ACTION" name="btnPrintTrigger">
-          prevPrint = blk.fldPrinted.get()
-          blk.fldPrinted.set(prevPrint + 1)
-          blk.commit()
-          runReport('../reports/invoice-hu.grd', 
{'INV_number':blk.fldNumber.get()})
+          invNumber = blk.fldNumber.get()
+          prevPrinted = blk.fldPrinted.get()
+          blk.fldPrinted.set(prevPrinted + 1)
+          commit()
+          runReport('../reports/invoice-hu.grd', {'INV_number' : invNumber})
           dts.createResultSet()
         </trigger>
       </button>

Modified: gnue-invoice/forms/INV_grid.gfd
===================================================================
--- gnue-invoice/forms/INV_grid.gfd     2005-01-11 10:02:25 UTC (rev 199)
+++ gnue-invoice/forms/INV_grid.gfd     2005-01-12 08:31:55 UTC (rev 200)
@@ -112,16 +112,13 @@
       <button name="btnRevert"       c:height="1" c:width="10" c:x="14" 
c:y="10"
           label="Revert">
         <trigger type="ON-ACTION" name="btnRevertTrigger">
-          toPrint = blkSeller.fldNumPrint.get()
-          print toPrint
           ret = blk.call('INV_revert', {'invId': blk.fldGnueid.get()})
           if ret is not None:
-            print "Saving reverted invoice..."
-            #blk.commit()
-            a = blk.fldNumber.get()
+            toPrint = blkSeller.fldNumPrint.get()
             for i in range(toPrint):
+              print "Printing reverted invoice #%i" % (i + 1)
               blk.fldPrinted.set(i + 1)
-              blk.commit()
+              commit()
               runReport('../reports/invoice.grd', {'INV_number':ret})
           else:
             print "Cannot revert reverted invoice!"
@@ -133,10 +130,11 @@
       <button name="btnPrint"       c:height="1" c:width="10" c:x="25" c:y="10"
           label="Print">
         <trigger type="ON-ACTION" name="btnPrintTrigger">
-          prevPrint = blk.fldPrinted.get()
-          blk.fldPrinted.set(prevPrint + 1)
-          blk.commit()
-          runReport('../reports/invoice.grd', 
{'INV_number':blk.fldNumber.get()})
+          invNumber = blk.fldNumber.get()
+          prevPrinted = blk.fldPrinted.get()
+          blk.fldPrinted.set(prevPrinted + 1)
+          commit()
+          runReport('../reports/invoice.grd', {'INV_number' : invNumber})
           dts.createResultSet()
         </trigger>
       </button>

Modified: gnue-invoice/news
===================================================================
--- gnue-invoice/news   2005-01-11 10:02:25 UTC (rev 199)
+++ gnue-invoice/news   2005-01-12 08:31:55 UTC (rev 200)
@@ -2,6 +2,10 @@
 *************************
 GNUe Invoice - Project CV
 *************************
+New features / changes by 2005.01.12
+* Changed block commits to form commits due to change in underlying
+    GNUe Form's code.
+
 New features / changes by 2005.01.04
 * Fully customized Hungarian version.
 

Modified: gnue-invoice/todo
===================================================================
--- gnue-invoice/todo   2005-01-11 10:02:25 UTC (rev 199)
+++ gnue-invoice/todo   2005-01-12 08:31:55 UTC (rev 200)
@@ -4,6 +4,14 @@
 *************************************
 
 
+BUGS
+====
+    When reverting an invoice, it's #counter is not increasing during
+        printing report.
+    When printing an invoice after it's usual number of prints, the #counter
+        is not increased.
+    
+
 MULTIPLE SELLERS
 ================
     Store seller as a special kind of PARTY_Party. By storing the seller
@@ -13,13 +21,6 @@
     Status: storing is OK. Choosing it at startup - not started.
 
 
-GENERATE REPORT
-===============
-    Ie generate and print the invoice.
-
-    Status: report OK, should call it whenever appropriate
-
-
 PROPERLY INITIALIZE DATE DUE ENTRY
 ==================================
     When producing several invoices continously, it is not cleared after