merge

sepiroth28 · May 19, 2012 · 72442ea · 72442ea
1 parent 669e4cc
commit 72442ea
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 9 deletions.
diff --git a/STG_Milling/Project1.vbw b/STG_Milling/Project1.vbw
@@ -7,7 +7,7 @@ Helper_items = 136, 5, 991, 522, C
 ItemCollection = 0, 0, 0, 0, C
 manufacturers = 0, 0, 0, 0, C
 Helper_manufacturers = 0, 0, 0, 0, C
-frmCustomer = 125, 125, 936, 550, C, 127, 93, 938, 518, C
+frmCustomer = 80, 63, 891, 490, C, 127, 93, 938, 518, I
 Customers = 150, 150, 961, 575, C
 ListviewColumnConfig = 50, 50, 861, 475, C
 Validation = 0, 0, 0, 0, C
@@ -21,7 +21,7 @@ frmMenu = 50, 50, 1001, 370, C, 75, 75, 886, 500, C
 frmViewList = 0, 0, 0, 0, C, 100, 100, 911, 525, C
 Helper_Common = 0, 0, 0, 0, C
 frmManageItem = 200, 200, 1055, 717, I, 125, 125, 936, 550, C
-frmItemForm = 75, 75, 851, 592, C, 150, 150, 961, 575, C
+frmItemForm = 75, 75, 851, 592, , 150, 150, 961, 575, C
 Helper_UnitOfMeasure = 0, 0, 0, 0, C
 frmStockIn = 0, 0, 0, 0, C, 175, 175, 986, 600, C
 StockIn = 0, 0, 0, 0, C
@@ -30,11 +30,11 @@ frmManufacturersForm = 0, 0, 0, 0, C, 200, 200, 1011, 625, C
 frmManageManufacturers = 0, 0, 0, 0, C, 0, 0, 811, 425, C
 frmStockInPreview = 0, 0, 0, 0, C, 25, 25, 836, 450, C
 dtaStockIn = 0, 0, 0, 0, C, 25, 25, 1391, 793, CZ
-frmManageCustomer = 25, 25, 836, 450, CI, 202, 64, 1013, 489, C
+frmManageCustomer = 25, 25, 836, 450, I, 202, 64, 1013, 489, C
 frmManageAgent = 0, 0, 0, 0, C, 100, 100, 911, 525, C
 frmAgentForm = 150, 150, 961, 575, C, 125, 125, 936, 550, C
 Agent = 150, 150, 961, 575, C
-Helper_Agent = 0, 0, 0, 0, C
+Helper_Agent = 24, 114, 992, 425, C
 AgentCollections = 0, 0, 0, 0, C
 Helper_Municipal = 150, 150, 961, 575, C
 frmInventory = 150, 150, 1005, 667, C, 150, 150, 961, 575, C
@@ -73,7 +73,7 @@ account_receivable = 0, 0, 0, 0, C
 frmPaymentReceivedDetails = 115, 24, 926, 577, CI, 125, 125, 936, 550, C
 Helper_Payment = 125, 125, 936, 550, C
 frmAdjustSaleTransaction = 0, 0, 0, 0, C, 75, 75, 886, 500, C
-mdi_Inventory = 100, 100, 911, 525, C, 75, 75, 886, 500, C
+mdi_Inventory = 107, 61, 918, 486, I, 75, 75, 886, 500, C
 frmReprint = 0, 0, 0, 0, C, 125, 125, 936, 550, C
 frmCalendar = 0, 0, 0, 0, C, 150, 150, 961, 575, C
 frmLogIn = 0, 0, 0, 0, C, 175, 175, 986, 600, C
@@ -95,10 +95,13 @@ frmPaymentHistoryDetails = 175, 175, 986, 600, C, 50, 50, 861, 475, C
 frmAgingAccounts = 125, 125, 936, 550, C, 100, 100, 911, 525, C
 Helper_AgingAccounts = 175, 175, 986, 600, C
 frmManageItemRebates = 10, 24, 865, 541, CI, 100, 100, 955, 617, C
-frmViewRebates = 100, 100, 955, 617, Z, 150, 150, 1005, 667, C
+frmViewRebates = 100, 100, 955, 617, CI, 150, 150, 1005, 667, C
 Helper_Rebates = 50, 50, 905, 567, C
 frmRebatesPriceTable = 0, 0, 776, 517, C, 202, 205, 978, 722, C
 RebatePriceTable = 50, 50, 826, 567, C
-Helper_RebatePriceTable = 75, 75, 851, 592, I
+Helper_RebatePriceTable = 75, 75, 851, 592, CI
 frmMunicipalities = 125, 125, 936, 550, C, 200, 200, 1011, 625, C
 Helper_TrackingPrice = 200, 200, 1011, 625, C
+frmCustomerAgentIndex = 50, 50, 826, 567, C, 25, 25, 938, 542, C
+frmChangeAgent = 0, 0, 776, 517, C, 225, 225, 1001, 742, C
+Entities = 25, 25, 801, 542, Z
diff --git a/STG_Milling/class/items.cls b/STG_Milling/class/items.cls
@@ -268,12 +268,14 @@ Public Sub insert()
             "'" & Me.unit_of_measure & "')"
 
     db.execute tbl_item_insert
+    Dim last_id As Integer
+    last_id = Val(db.execute("select last_insert_id()").Fields(0).Value)
+
     db.execute tbl_item_desc
 
     'item_id, item_code, beginning_balance, ending_balance, date
     Dim insert_to_last_inventory As String
-    Dim last_id As Integer
-    last_id = Val(db.execute("select last_insert_id()").Fields(0).Value)
+
     insert_to_last_inventory = "INSERT INTO last_inventory VALUES(" & last_id & ",'" & Me.item_code & "'," & Me.item_qty & "," & Me.item_qty & ",CURDATE())"