AS1024/itflow
1
0
Fork 0
mirror of https://github.com/itflow-org/itflow synced 2026-02-28 02:44:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removed default currency and default country under settings added a company currency to the company table. Now currency default and country default uses company country and currency, updated the currency symbol to use companies currency under dashboard, expenses, profit loss reports

Browse Source
This commit is contained in:
johnnyq
2021-11-19 20:45:57 -05:00
parent cdae4ecfb6
commit 0976a08730
14 changed files with 53 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
report_profit_loss.php
View File

@@ -87,7 +87,7 @@ $sql_categories_expense = mysqli_query($mysqli,"SELECT * FROM categories WHERE c
?>
<td class="text-right">$<?php echo number_format($payment_amount_for_quarter_one,2); ?></td>
<td class="text-right"><?php echo get_currency_symbol($session_company_currency); ?><?php echo number_format($payment_amount_for_quarter_one,2); ?></td>
<?php
@@ -109,7 +109,7 @@ $sql_categories_expense = mysqli_query($mysqli,"SELECT * FROM categories WHERE c
?>
<td class="text-right">$<?php echo number_format($payment_amount_for_quarter_two,2); ?></td>
<td class="text-right"><?php echo get_currency_symbol($session_company_currency); ?><?php echo number_format($payment_amount_for_quarter_two,2); ?></td>
<?php
@@ -130,7 +130,7 @@ $sql_categories_expense = mysqli_query($mysqli,"SELECT * FROM categories WHERE c
?>
<td class="text-right">$<?php echo number_format($payment_amount_for_quarter_three,2); ?></td>
<td class="text-right"><?php echo get_currency_symbol($session_company_currency); ?><?php echo number_format($payment_amount_for_quarter_three,2); ?></td>
<?php
@@ -153,9 +153,9 @@ $sql_categories_expense = mysqli_query($mysqli,"SELECT * FROM categories WHERE c
?>
<td class="text-right">$<?php echo number_format($payment_amount_for_quarter_four,2); ?></td>
<td class="text-right"><?php echo get_currency_symbol($session_company_currency); ?><?php echo number_format($payment_amount_for_quarter_four,2); ?></td>
<td class="text-right">$<?php echo number_format($total_payments_for_all_four_quarters,2); ?></td>
<td class="text-right"><?php echo get_currency_symbol($session_company_currency); ?><?php echo number_format($total_payments_for_all_four_quarters,2); ?></td>
</tr>
<?php
@@ -188,7 +188,7 @@ $sql_categories_expense = mysqli_query($mysqli,"SELECT * FROM categories WHERE c
?>
<th class="text-right">$<?php echo number_format($payment_total_amount_for_quarter_one,2); ?></th>
<th class="text-right"><?php echo get_currency_symbol($session_company_currency); ?><?php echo number_format($payment_total_amount_for_quarter_one,2); ?></th>
<?php
@@ -210,7 +210,7 @@ $sql_categories_expense = mysqli_query($mysqli,"SELECT * FROM categories WHERE c
?>
<th class="text-right">$<?php echo number_format($payment_total_amount_for_quarter_two,2); ?></th>
<th class="text-right"><?php echo get_currency_symbol($session_company_currency); ?><?php echo number_format($payment_total_amount_for_quarter_two,2); ?></th>
<?php
@@ -232,7 +232,7 @@ $sql_categories_expense = mysqli_query($mysqli,"SELECT * FROM categories WHERE c
?>
<th class="text-right">$<?php echo number_format($payment_total_amount_for_quarter_three,2); ?></th>
<th class="text-right"><?php echo get_currency_symbol($session_company_currency); ?><?php echo number_format($payment_total_amount_for_quarter_three,2); ?></th>
<?php
@@ -256,9 +256,9 @@ $sql_categories_expense = mysqli_query($mysqli,"SELECT * FROM categories WHERE c
?>
<th class="text-right">$<?php echo number_format($payment_total_amount_for_quarter_four,2); ?></th>
<th class="text-right"><?php echo get_currency_symbol($session_company_currency); ?><?php echo number_format($payment_total_amount_for_quarter_four,2); ?></th>
<th class="text-right">$<?php echo number_format($total_payments_for_all_four_quarters,2); ?></th>
<th class="text-right"><?php echo get_currency_symbol($session_company_currency); ?><?php echo number_format($total_payments_for_all_four_quarters,2); ?></th>
</tr>
<tr>
@@ -286,7 +286,7 @@ $sql_categories_expense = mysqli_query($mysqli,"SELECT * FROM categories WHERE c
?>
<td class="text-right">$<?php echo number_format($expense_amount_for_quarter_one,2); ?></td>
<td class="text-right"><?php echo get_currency_symbol($session_company_currency); ?><?php echo number_format($expense_amount_for_quarter_one,2); ?></td>
<?php
@@ -300,7 +300,7 @@ $sql_categories_expense = mysqli_query($mysqli,"SELECT * FROM categories WHERE c
?>
<td class="text-right">$<?php echo number_format($expense_amount_for_quarter_two,2); ?></td>
<td class="text-right"><?php echo get_currency_symbol($session_company_currency); ?><?php echo number_format($expense_amount_for_quarter_two,2); ?></td>
<?php
@@ -314,7 +314,7 @@ $sql_categories_expense = mysqli_query($mysqli,"SELECT * FROM categories WHERE c
?>
<td class="text-right">$<?php echo number_format($expense_amount_for_quarter_three,2); ?></td>
<td class="text-right"><?php echo get_currency_symbol($session_company_currency); ?><?php echo number_format($expense_amount_for_quarter_three,2); ?></td>
<?php
@@ -330,9 +330,9 @@ $sql_categories_expense = mysqli_query($mysqli,"SELECT * FROM categories WHERE c
?>
<td class="text-right">$<?php echo number_format($expense_amount_for_quarter_four,2); ?></td>
<td class="text-right"><?php echo get_currency_symbol($session_company_currency); ?><?php echo number_format($expense_amount_for_quarter_four,2); ?></td>
<td class="text-right">$<?php echo number_format($total_expenses_for_all_four_quarters,2); ?></td>
<td class="text-right"><?php echo get_currency_symbol($session_company_currency); ?><?php echo number_format($total_expenses_for_all_four_quarters,2); ?></td>
</tr>
<?php
@@ -357,7 +357,7 @@ $sql_categories_expense = mysqli_query($mysqli,"SELECT * FROM categories WHERE c
?>
<th class="text-right">$<?php echo number_format($expense_total_amount_for_quarter_one,2); ?></th>
<th class="text-right"><?php echo get_currency_symbol($session_company_currency); ?><?php echo number_format($expense_total_amount_for_quarter_one,2); ?></th>
<?php
@@ -371,7 +371,7 @@ $sql_categories_expense = mysqli_query($mysqli,"SELECT * FROM categories WHERE c
?>
<th class="text-right">$<?php echo number_format($expense_total_amount_for_quarter_two,2); ?></th>
<th class="text-right"><?php echo get_currency_symbol($session_company_currency); ?><?php echo number_format($expense_total_amount_for_quarter_two,2); ?></th>
<?php
@@ -385,7 +385,7 @@ $sql_categories_expense = mysqli_query($mysqli,"SELECT * FROM categories WHERE c
?>
<th class="text-right">$<?php echo number_format($expense_total_amount_for_quarter_three,2); ?></th>
<th class="text-right"><?php echo get_currency_symbol($session_company_currency); ?><?php echo number_format($expense_total_amount_for_quarter_three,2); ?></th>
<?php
@@ -401,9 +401,9 @@ $sql_categories_expense = mysqli_query($mysqli,"SELECT * FROM categories WHERE c
?>
<th class="text-right">$<?php echo number_format($expense_total_amount_for_quarter_four,2); ?></th>
<th class="text-right"><?php echo get_currency_symbol($session_company_currency); ?><?php echo number_format($expense_total_amount_for_quarter_four,2); ?></th>
<th class="text-right">$<?php echo number_format($total_expenses_for_all_four_quarters,2); ?></th>
<th class="text-right"><?php echo get_currency_symbol($session_company_currency); ?><?php echo number_format($total_expenses_for_all_four_quarters,2); ?></th>
</tr>
<tr>
<?php
@@ -415,11 +415,11 @@ $sql_categories_expense = mysqli_query($mysqli,"SELECT * FROM categories WHERE c
?>
<th>Net Profit</th>
<th class="text-right">$<?php echo number_format($net_profit_quarter_one,2); ?></th>
<th class="text-right">$<?php echo number_format($net_profit_quarter_two,2); ?></th>
<th class="text-right">$<?php echo number_format($net_profit_quarter_three,2); ?></th>
<th class="text-right">$<?php echo number_format($net_profit_quarter_four,2); ?></th>
<th class="text-right">$<?php echo number_format($net_profit_year,2); ?></th>
<th class="text-right"><?php echo get_currency_symbol($session_company_currency); ?><?php echo number_format($net_profit_quarter_one,2); ?></th>
<th class="text-right"><?php echo get_currency_symbol($session_company_currency); ?><?php echo number_format($net_profit_quarter_two,2); ?></th>
<th class="text-right"><?php echo get_currency_symbol($session_company_currency); ?><?php echo number_format($net_profit_quarter_three,2); ?></th>
<th class="text-right"><?php echo get_currency_symbol($session_company_currency); ?><?php echo number_format($net_profit_quarter_four,2); ?></th>
<th class="text-right"><?php echo get_currency_symbol($session_company_currency); ?><?php echo number_format($net_profit_year,2); ?></th>
</tr>
</tbody>
</table>