diff --git a/account/application/controllers/Welcome.php b/account/application/controllers/Welcome.php index 9824f58..6e2f7e6 100644 --- a/account/application/controllers/Welcome.php +++ b/account/application/controllers/Welcome.php @@ -241,5 +241,8 @@ class Welcome extends CI_Controller if ($query->num_rows() == 0) { $this->db->query("ALTER TABLE tbl_accounts ADD COLUMN account_bank VARCHAR(50)"); } + + $this->db->query("ALTER TABLE tbl_translations MODIFY COLUMN nepali VARCHAR(255) COLLATE utf8_unicode_ci"); + } } diff --git a/account/application/controllers/accounts/Ledger.php b/account/application/controllers/accounts/Ledger.php index 2f8005e..f68d59c 100644 --- a/account/application/controllers/accounts/Ledger.php +++ b/account/application/controllers/accounts/Ledger.php @@ -75,10 +75,14 @@ class Ledger extends CI_Controller loadView("accounts/daybook", $data); break; case 'bank_book': + $data['fiscalStart'] = NepaliDate($this->session->userdata['FiscalYear']->fiscalyear_from); + $data['fiscalEnd'] = NepaliDate($this->session->userdata['FiscalYear']->fiscalyear_to); $data['pageTitle'] = "Bank Book"; loadView("accounts/ledger_bankbook", $data); break; case 'cash_book': + $data['fiscalStart'] = NepaliDate($this->session->userdata['FiscalYear']->fiscalyear_from); + $data['fiscalEnd'] = NepaliDate($this->session->userdata['FiscalYear']->fiscalyear_to); $data['pageTitle'] = "Cash Book"; loadView("accounts/ledger_cashbook", $data); break; diff --git a/account/application/controllers/inventory/Stocks.php b/account/application/controllers/inventory/Stocks.php index 0df951c..2bbf4fc 100644 --- a/account/application/controllers/inventory/Stocks.php +++ b/account/application/controllers/inventory/Stocks.php @@ -57,6 +57,8 @@ class Stocks extends CI_Controller loadView("inventory/stocks/add", $data); break; case 'summary': + $data['fiscalStart'] = NepaliDate($this->session->userdata['FiscalYear']->fiscalyear_from); + $data['fiscalEnd'] = NepaliDate($this->session->userdata['FiscalYear']->fiscalyear_to); $data['StockRecords'] = $this->MStocks->getStockSummary(); // pre($data['StockRecords']); loadView("inventory/stocks/summary", $data); diff --git a/account/application/views/accounts/accountheads/edit.php b/account/application/views/accounts/accountheads/edit.php index 4273530..ecc0d59 100644 --- a/account/application/views/accounts/accountheads/edit.php +++ b/account/application/views/accounts/accountheads/edit.php @@ -34,7 +34,7 @@
- accategory_id, "", false, "status=1"); ?> + accategory_id, "", false, "status=1", $required=true); ?>
diff --git a/account/application/views/accounts/balances/bycategory.php b/account/application/views/accounts/balances/bycategory.php index be1f1b8..d72619f 100644 --- a/account/application/views/accounts/balances/bycategory.php +++ b/account/application/views/accounts/balances/bycategory.php @@ -29,7 +29,14 @@ function displayCategoryTree($tree) // print_r($category);die; echo ''; echo '' . $category['accategory_id'] . ''; - echo ''. ($category['parent_category_id'] == 0 ? "" : "") .'' . $category['accategory_name'] . '' .( $category['parent_category_id'] == 0? "" : "") . ''; + echo '' + . ($category['parent_category_id'] == 0 + ? "" + : "") + . $category['accategory_name'] + . "" + . ($category['parent_category_id'] == 0 ? "" : "") + . ''; echo '' . myCurrency($category['dr']) . ''; echo '' . myCurrency($category['cr']) . ''; echo ''; diff --git a/account/application/views/accounts/balancesheet_new.php b/account/application/views/accounts/balancesheet_new.php index 6b4c782..f3005c4 100644 --- a/account/application/views/accounts/balancesheet_new.php +++ b/account/application/views/accounts/balancesheet_new.php @@ -103,40 +103,40 @@ $BIBAccounts = new BIBAccounts();
- +
- +
-
+
- + > - +
> - +
> - +
-
- - +
+ +
@@ -153,7 +153,7 @@ $BIBAccounts = new BIBAccounts(); View calendar --> - + - + +

Cash Flow

+ ?>
@@ -97,40 +110,40 @@ $PL = $IncomesTotal - $ExpensesTotal;
- +
- +
-
+
- + > - +
> - +
> - +
-
- - +
+ +
@@ -216,7 +229,7 @@ $PL = $IncomesTotal - $ExpensesTotal;
--> - +
- - - - \ No newline at end of file + + + \ No newline at end of file diff --git a/account/application/views/accounts/ledger_bankbook.php b/account/application/views/accounts/ledger_bankbook.php index 4cb5606..39fd4d5 100644 --- a/account/application/views/accounts/ledger_bankbook.php +++ b/account/application/views/accounts/ledger_bankbook.php @@ -3,82 +3,82 @@
-
+

- - -
- - -
- - +
+ + + +
- - - - -
@@ -89,11 +89,11 @@ db->where("status", 1)->where("accategory_id = 2"); $CI->db->order_by("account_name ASC"); $Accounts = $CI->db->get("tbl_accounts")->result(); - + foreach ($Accounts as $Account) { $Account->Group = $CI->db->query("select * from tbl_acgroups where acgroup_id=(select acgroup_id from tbl_accategories where accategory_id = $Account->accategory_id)")->row(); $Account->Category = $CI->db->query("select * from tbl_accategories where accategory_id = $Account->accategory_id")->row(); @@ -119,7 +119,7 @@ $html .= "" . $sn . "" . $Account->account_name . "" . $Account->Category->accategory_name . "" . (($balance >= 0) ? myCurrency($balance) : "") . "" . (($balance < 0) ? myCurrency(abs($balance)) : "") . "" . (myCurrency($balance)) . ""; endforeach; $html .= ""; - $html .= "Total" . (($BalanceTotal > 0) ? myCurrency(abs($BalanceTotal )) : "") . "" . (($BalanceTotal < 0) ? myCurrency(abs($BalanceTotal )) : "") . "" . myCurrency($BalanceTotal) . ""; + $html .= "Total" . (($BalanceTotal > 0) ? myCurrency(abs($BalanceTotal)) : "") . "" . (($BalanceTotal < 0) ? myCurrency(abs($BalanceTotal)) : "") . "" . myCurrency($BalanceTotal) . ""; $html .= "\n"; $html .= "
@@ -158,6 +158,79 @@ + + + + \ No newline at end of file diff --git a/account/application/views/accounts/ledger_cashbook.php b/account/application/views/accounts/ledger_cashbook.php index 94a8fdf..bfd6648 100644 --- a/account/application/views/accounts/ledger_cashbook.php +++ b/account/application/views/accounts/ledger_cashbook.php @@ -18,40 +18,40 @@
- +
- +
+
- - -
-
- + > - +
> - +
> - +
-
- - +
+ +
@@ -120,7 +120,7 @@ $html .= "" . $sn . "" . $Account->account_name . "" . $Account->Category->accategory_name . "" . (($balance >= 0) ? myCurrency($balance) : "") . "" . (($balance < 0) ? myCurrency(abs($balance)) : "") . "" . (myCurrency($balance)) . ""; endforeach; $html .= ""; - $html .= "Total" . (($BalanceTotal > 0) ? myCurrency(abs($BalanceTotal )) : "") . "" . (($BalanceTotal < 0) ? myCurrency(abs($BalanceTotal )) : "") . "" . myCurrency($BalanceTotal) . ""; + $html .= "Total" . (($BalanceTotal > 0) ? myCurrency(abs($BalanceTotal)) : "") . "" . (($BalanceTotal < 0) ? myCurrency(abs($BalanceTotal)) : "") . "" . myCurrency($BalanceTotal) . ""; $html .= "\n"; $html .= "
@@ -159,6 +159,79 @@ + + + + \ No newline at end of file diff --git a/account/application/views/accounts/pl_new.php b/account/application/views/accounts/pl_new.php index a48c83e..34d78e2 100644 --- a/account/application/views/accounts/pl_new.php +++ b/account/application/views/accounts/pl_new.php @@ -88,7 +88,6 @@ $BIBAccounts = new BIBAccounts(); box-shadow: inset 0 0 0 transparent; transition: border-color .15s ease-in-out, box-shadow .15s ease-in-out; } -
@@ -96,7 +95,7 @@ $BIBAccounts = new BIBAccounts();

+ ?>
@@ -109,40 +108,40 @@ $BIBAccounts = new BIBAccounts();
- +
- +
-
+
- + > - +
> - +
> - +
-
- - +
+ +
@@ -157,7 +156,7 @@ $BIBAccounts = new BIBAccounts(); View calendar
-->
- + - - - \ No newline at end of file + + + + \ No newline at end of file diff --git a/account/application/views/accounts/trialbalance_new.php b/account/application/views/accounts/trialbalance_new.php index 508a434..a4b2fce 100644 --- a/account/application/views/accounts/trialbalance_new.php +++ b/account/application/views/accounts/trialbalance_new.php @@ -94,7 +94,8 @@ $BIBAccounts = new BIBAccounts();
-

+

@@ -105,49 +106,44 @@ $BIBAccounts = new BIBAccounts(); Filters