diff --git a/account/application/controllers/accounts/Reports.php b/account/application/controllers/accounts/Reports.php
index 2011cb4..f6003ca 100644
--- a/account/application/controllers/accounts/Reports.php
+++ b/account/application/controllers/accounts/Reports.php
@@ -65,6 +65,8 @@ class Reports extends CI_Controller
loadView("accounts/trialbalance", $data);
break;
case 'trialbalance':
+ $data['fiscalStart'] = NepaliDate($this->session->userdata['FiscalYear']->fiscalyear_from);
+ $data['fiscalEnd'] = NepaliDate($this->session->userdata['FiscalYear']->fiscalyear_to);
$data['pageTitle'] = "Trial Balance";
loadView("accounts/trialbalance_new", $data);
break;
@@ -130,6 +132,8 @@ class Reports extends CI_Controller
loadView("accounts/pl", $data);
break;
case 'pl':
+ $data['fiscalStart'] = NepaliDate($this->session->userdata['FiscalYear']->fiscalyear_from);
+ $data['fiscalEnd'] = NepaliDate($this->session->userdata['FiscalYear']->fiscalyear_to);
$data['pageTitle'] = "Profit & Loss Statement";
loadView("accounts/pl_new", $data);
break;
@@ -143,6 +147,8 @@ class Reports extends CI_Controller
loadView("accounts/balancesheet", $data);
break;
case 'balance_sheet':
+ $data['fiscalStart'] = NepaliDate($this->session->userdata['FiscalYear']->fiscalyear_from);
+ $data['fiscalEnd'] = NepaliDate($this->session->userdata['FiscalYear']->fiscalyear_to);
$data['pageTitle'] = "Balance Sheet";
loadView("accounts/balancesheet_new", $data);
break;
@@ -151,6 +157,8 @@ class Reports extends CI_Controller
loadView("accounts/balance_sheet_vertical", $data);
break;
case 'cash_flow':
+ $data['fiscalStart'] = NepaliDate($this->session->userdata['FiscalYear']->fiscalyear_from);
+ $data['fiscalEnd'] = NepaliDate($this->session->userdata['FiscalYear']->fiscalyear_to);
$data['pageTitle'] = "Cash Flow";
loadView("accounts/cash_flow", $data);
break;
@@ -163,6 +171,8 @@ class Reports extends CI_Controller
loadView("accounts/incomes_expenses", $data);
break;
case 'receipt_and_payment':
+ $data['fiscalStart'] = NepaliDate($this->session->userdata['FiscalYear']->fiscalyear_from);
+ $data['fiscalEnd'] = NepaliDate($this->session->userdata['FiscalYear']->fiscalyear_to);
$data['pageTitle'] = "Cash Flow";
loadView("accounts/receipt_and_payment", $data);
break;
diff --git a/account/application/libraries/Myaccounts.php b/account/application/libraries/Myaccounts.php
index ee725fb..a72f92f 100644
--- a/account/application/libraries/Myaccounts.php
+++ b/account/application/libraries/Myaccounts.php
@@ -205,7 +205,7 @@ class myaccounts
$balance = getBalance($Account->account_id);
$BalanceTotal += $balance;
// pre($Account);
- $html .= "
" . $Account->account_name . " " . $Account->Category->accategory_name . " " . (($balance >= 0) ? myCurrency($balance) : "") . " " . (($balance < 0) ? myCurrency(abs($balance)) : "") . " ";
+ $html .= "" . $Account->account_name . " " . $Account->Category->accategory_name . " " . (($balance >= 0) ? myCurrency($balance) : "") . " " . (($balance < 0) ? myCurrency(abs($balance)) : "") . " ";
endforeach;
$html .= "";
if ($full==""){
diff --git a/account/application/views/accounts/balancesheet_new.php b/account/application/views/accounts/balancesheet_new.php
index a96f5c1..b0ef6c2 100644
--- a/account/application/views/accounts/balancesheet_new.php
+++ b/account/application/views/accounts/balancesheet_new.php
@@ -110,13 +110,13 @@ $BIBAccounts = new BIBAccounts();
@@ -521,6 +521,22 @@ function footerfunctions()
link.click();
}
+
+
-
+
-
+
@@ -396,4 +396,24 @@ $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 2e653dd..6a6903d 100644
--- a/account/application/views/accounts/ledger_bankbook.php
+++ b/account/application/views/accounts/ledger_bankbook.php
@@ -43,7 +43,7 @@
$balance = getBalance($Account->account_id);
$BalanceTotal += $balance;
// pre($Account);
- $html .= "" . $sn . " " . $Account->account_name . " " . $Account->Category->accategory_name . " " . (($balance >= 0) ? myCurrency($balance) : "") . " " . (($balance < 0) ? myCurrency(abs($balance)) : "") . " ";
+ $html .= "" . $sn . " " . $Account->account_name . " " . $Account->Category->accategory_name . " " . (($balance >= 0) ? myCurrency($balance) : "") . " " . (($balance < 0) ? myCurrency(abs($balance)) : "") . " ";
endforeach;
$html .= "";
$html .= "Total " . myCurrency($BalanceTotal) . " ";
diff --git a/account/application/views/accounts/ledger_cashbook.php b/account/application/views/accounts/ledger_cashbook.php
index 9941cce..36e581f 100644
--- a/account/application/views/accounts/ledger_cashbook.php
+++ b/account/application/views/accounts/ledger_cashbook.php
@@ -44,7 +44,7 @@
$balance = getBalance($Account->account_id);
$BalanceTotal += $balance;
// pre($Account);
- $html .= "" . $sn . " " . $Account->account_name . " " . $Account->Category->accategory_name . " " . (($balance >= 0) ? myCurrency($balance) : "") . " " . (($balance < 0) ? myCurrency(abs($balance)) : "") . " ";
+ $html .= "" . $sn . " " . $Account->account_name . " " . $Account->Category->accategory_name . " " . (($balance >= 0) ? myCurrency($balance) : "") . " " . (($balance < 0) ? myCurrency(abs($balance)) : "") . " ";
endforeach;
$html .= "";
$html .= "Total " . myCurrency($BalanceTotal) . " ";
diff --git a/account/application/views/accounts/pl_new.php b/account/application/views/accounts/pl_new.php
index 426d1fd..8fff70d 100644
--- a/account/application/views/accounts/pl_new.php
+++ b/account/application/views/accounts/pl_new.php
@@ -116,13 +116,13 @@ $BIBAccounts = new BIBAccounts();
@@ -449,6 +449,23 @@ function footerfunctions()
link.click();
}
+
+
\ No newline at end of file
diff --git a/account/application/views/accounts/receipt_and_payment.php b/account/application/views/accounts/receipt_and_payment.php
index 4f1a00e..19e758e 100644
--- a/account/application/views/accounts/receipt_and_payment.php
+++ b/account/application/views/accounts/receipt_and_payment.php
@@ -122,13 +122,13 @@ $PL = $IncomesTotal - $ExpensesTotal;
@@ -379,4 +379,24 @@ $PL = $IncomesTotal - $ExpensesTotal;
-
\ 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 38ac939..17cc5d9 100644
--- a/account/application/views/accounts/trialbalance_new.php
+++ b/account/application/views/accounts/trialbalance_new.php
@@ -111,13 +111,13 @@ $BIBAccounts = new BIBAccounts();
@@ -357,6 +357,23 @@ function footerfunctions()
document.body.appendChild(link);
link.click();
}
-
+
+
+
\ No newline at end of file
diff --git a/account/application/views/inventory/reports/purchase_vs_sales.php b/account/application/views/inventory/reports/purchase_vs_sales.php
index 53b129a..cd51d07 100644
--- a/account/application/views/inventory/reports/purchase_vs_sales.php
+++ b/account/application/views/inventory/reports/purchase_vs_sales.php
@@ -126,17 +126,19 @@
-
+
+
+
@@ -177,6 +179,7 @@
$sumoamount = 0;
$sumclamount = 0;
$sumcogs = 0;
+ $sumgp = 0;
?>
@@ -185,6 +188,7 @@
Item->title; ?>
Summary->Unit->title; ?>
Summary->Opening->qty; ?>
+ Summary->Opening->rate); ?>
Summary->Opening->amount); ?>
Summary->Purchase->qty; ?>
Summary->Purchase->rate); ?>
@@ -200,8 +204,10 @@
Summary->Closing->amount); ?>
Summary->Sales->qty) * ($Stock->Summary->Purchase->rate); ?>
- Summary->Sales->qty) - $cogs; ?>
- Summary->Sales->amount > 0) ? (($Stock->Summary->Sales->amount - $cogs) / $Stock->Summary->Sales->amount) * 100 : 0; ?>
+ Summary->Sales->amount) - $cogs; ?>
+
+
+ Summary->Sales->amount > 0) ? ($gp/ $Stock->Summary->Sales->amount) * 100 : 0; ?>
@@ -223,6 +230,7 @@
Grand Total
+
@@ -235,6 +243,7 @@
+
diff --git a/account/pdf/ledgers/ledger_1.wpdf b/account/pdf/ledgers/ledger_1.wpdf
index eeabd0c..12f26a6 100644
Binary files a/account/pdf/ledgers/ledger_1.wpdf and b/account/pdf/ledgers/ledger_1.wpdf differ