diff --git a/application/controllers/batchcard.php b/application/controllers/batchcard.php index ffb71b85..b04af021 100755 --- a/application/controllers/batchcard.php +++ b/application/controllers/batchcard.php @@ -639,44 +639,44 @@ class batchcard extends BaseController { case 1: - $sn = '(ed_receipt - ed_issues) as lastmonthclosinged'; + $sn = '(sum(ed_receipt) - sum(ed_issues)) as lastmonthclosinged'; $sd1 = 'ed_receipt'; $sd2 = 'ed_issues'; break; case 2: - $sn = '(rotary_input - rotary_output) as lastmonthclosingrotary'; + $sn = '(sum(rotary_input) - sum(rotary_output)) as lastmonthclosingrotary'; $sd1 = 'rotary_input as ed_receipt'; $sd2 = 'rotary_output as ed_issues'; break; case 3: - $sn = '(diesel_dryer_receipt - diesel_dryer_consumption) as lastmonthclosingdryerdiesel'; + $sn = '(sum(diesel_dryer_receipt) - sum(diesel_dryer_consumption)) as lastmonthclosingdryerdiesel'; $sd1 = 'diesel_dryer_receipt as ed_receipt'; $sd2 = 'diesel_dryer_consumption as ed_issues'; break; case 4: - $sn = '(diesel_receipt - diesel_consumption) as lastmonthclosingbull'; + $sn = '(sum(diesel_receipt) - sum(diesel_consumption)) as lastmonthclosingbull'; $sd1 = 'diesel_receipt as ed_receipt'; $sd2 = 'diesel_consumption as ed_issues'; break; case 5: - $sn = '(trp_roughsand_receipt - trp_roughsand_issues) as lastmonthclosingrough'; + $sn = '(sum(trp_roughsand_receipt) - sum(trp_roughsand_issues)) as lastmonthclosingrough'; $sd1 = 'trp_roughsand_receipt as ed_receipt'; $sd2 = 'trp_roughsand_issues as ed_issues'; break; case 6: - $sn = '(trp_finesand_receipt - trp_finesand_issues) as lastmonthclosingfine'; + $sn = '(sum(trp_finesand_receipt) - sum(trp_finesand_issues)) as lastmonthclosingfine'; $sd1 = 'trp_finesand_receipt as ed_receipt'; $sd2 = 'trp_finesand_issues as ed_issues'; break; case 7: - $sn = '(gas_for_trip_receipt - gas_for_trip_consumption) as lastmonthclosinggas'; + $sn = '(sum(gas_for_trip_receipt) - sum(gas_for_trip_consumption)) as lastmonthclosinggas'; $sd1 = 'gas_for_trip_receipt as ed_receipt'; $sd2 = 'gas_for_trip_consumption as ed_issues'; break; case 8: - $sn = '(water_receipt - water_consumption) as lastmonthclosingewater'; + $sn = '(sum(water_receipt) - sum(water_consumption)) as lastmonthclosingewater'; $sd1 = 'water_receipt as ed_receipt'; $sd2 = 'water_consumption as ed_issues'; break; diff --git a/application/views/bankamountpaid.php b/application/views/bankamountpaid.php index b0536759..6b04963b 100644 --- a/application/views/bankamountpaid.php +++ b/application/views/bankamountpaid.php @@ -60,8 +60,8 @@ if(!empty($amountpaid))
-
- +
+
@@ -191,9 +191,8 @@ if(!empty($amountpaid))
-
- -
+ + diff --git a/application/views/bankdebit.php b/application/views/bankdebit.php index 0596469e..820b17a8 100644 --- a/application/views/bankdebit.php +++ b/application/views/bankdebit.php @@ -263,10 +263,10 @@ + - - +
diff --git a/application/views/bankinvoicesettlement.php b/application/views/bankinvoicesettlement.php index fe0dd1a6..fcb44f42 100644 --- a/application/views/bankinvoicesettlement.php +++ b/application/views/bankinvoicesettlement.php @@ -62,7 +62,7 @@ if(!empty($debitmapping))
- +
@@ -115,61 +115,17 @@ if(!empty($debitmapping))

-
-
-
-

Payment ID:  bankid?>

-

Payment Mode:  Bank

-

Payment Amount:  

-
-
-
- +
+
+
+

Payment ID:  bankid?>

+

Payment Mode:  Bank

+

Payment Amount:  

+
+
+
+
+ @@ -326,6 +282,7 @@ if(!empty($debitmapping)) + diff --git a/application/views/bankposettlement.php b/application/views/bankposettlement.php index df0d497d..5982fd0f 100644 --- a/application/views/bankposettlement.php +++ b/application/views/bankposettlement.php @@ -59,7 +59,8 @@ if(!empty($debitmapping)) --> - +
+
@@ -76,52 +77,7 @@ if(!empty($debitmapping))

Bank PO settlement

- +

@@ -219,9 +175,10 @@ if(!empty($debitmapping))
- +
+
- + diff --git a/application/views/banksettlement.php b/application/views/banksettlement.php index 2d44e049..0c3d1d28 100644 --- a/application/views/banksettlement.php +++ b/application/views/banksettlement.php @@ -63,6 +63,7 @@ if(!empty($mapping))
+
@@ -120,7 +121,7 @@ if(!empty($mapping))

Bank Debit Amount Paid Report



-
+
@@ -130,7 +131,7 @@ if(!empty($mapping))
- +
+
+ +
- + diff --git a/application/views/bankstatement.php b/application/views/bankstatement.php index 589b076f..e56409ca 100644 --- a/application/views/bankstatement.php +++ b/application/views/bankstatement.php @@ -55,6 +55,7 @@ -->
+
@@ -219,16 +220,7 @@ ID?> - + - +
+ + + + + diff --git a/application/views/cashbookyearlyexpenses.php b/application/views/cashbookyearlyexpenses.php index 3142e061..81eef182 100755 --- a/application/views/cashbookyearlyexpenses.php +++ b/application/views/cashbookyearlyexpenses.php @@ -151,7 +151,7 @@ foreach($financialyear as $item) -   + diff --git a/application/views/editInprocessReport.php b/application/views/editInprocessReport.php index fcbf1ce7..b60265a4 100755 --- a/application/views/editInprocessReport.php +++ b/application/views/editInprocessReport.php @@ -51,11 +51,7 @@ th{
-
-

-
Edit In Process Inspection Report Screen
-

-
+
@@ -63,6 +59,11 @@ th{
+
+

+
Edit In Process Inspection Report Screen
+

+
@@ -492,13 +493,13 @@ $(document).ready(function(){ show_hide_column(13,false,'testreport'); show_hide_column(16,false,'testreport2'); - firstTimeValidateMastertable(); + firstTimeValidateMastertable(); + firstTimeValidateAFStable(); firstTimeValidateMastertable2(); }); // End of document on ready funciton - function keyValidate(e) { @@ -1290,16 +1291,20 @@ function readURL(input) { //Funciton for validate all values while data first time loading + function firstTimeValidateMastertable() { - + alert('MASTER'); // VALIDATE testreport Values var ROWCOUNT = $('#testreport tr').length; - //alert(ROWCOUNT); - for (x=1;x<14;x++){ + + alert(ROWCOUNT); + for (x=1;xAssDep;?> - + AssDep; + + ?> + +
  • @@ -871,7 +876,7 @@ display: none; - + diff --git a/application/views/newresinbatchcard.php b/application/views/newresinbatchcard.php index 51a3831b..e9b751c7 100644 --- a/application/views/newresinbatchcard.php +++ b/application/views/newresinbatchcard.php @@ -119,7 +119,7 @@ th{
    • - +