mirror/opensourcepos
1
0
Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-05-06 14:54:32 -04:00
Code Issues Packages Projects Releases Wiki Activity
1,899 Commits 92 Branches 39 Tags
422e2ddbab422fbec72fc1776f1e65fa9ec6fc80
Commit Graph

62 Commits

Author SHA1 Message Date
jekkos
422e2ddbab Add currency sorting for summary reports (#1003) 2016-11-26 14:49:41 +01:00
jekkos
2727e91c96 Fix currency sorting in tabular_details (#1003) 2016-11-26 12:17:13 +01:00
jekkos
4304f5ceea Revert tabular_details changes (#1003) 2016-11-26 00:12:33 +01:00
jekkos
1666a3e689 Fix detailed sale + receiving report row update + currency sorting (#1003) 2016-11-25 22:24:46 +01:00
FrancescoUK
b66827b0ff Fix Detailed sale tax rounding, reorder reports to subtotal, tax, total, cost, profit (#976) 2016-11-20 12:15:50 +00:00
FrancescoUK
5267eadc56 Make Summary reports more OOD (#976) 2016-11-18 16:34:41 +00:00
FrancescoUK
577e5b2db4 Fix wrong tax and subtotal calculation in Summary reports (#976) 2016-11-17 23:13:56 +00:00
FrancescoUK
e22e081865 Refactoring and performance improvement of Summary reports (#964) 2016-11-11 19:24:23 +00:00
FrancescoUK
e1035ff54b Optimise Reports usage of temp database tables (#964) 2016-11-10 17:42:17 +00:00
FrancescoUK
6f444b1a33 Temporary tables optimisation: use only the one required (#951) 2016-10-30 17:03:16 +00:00
FrancescoUK
1723347359 Fix Receivings report date issue (#853) 2016-10-12 19:41:42 +01:00
jekkos
d8e4bf48d8 Check if payments cover sale with exact precision (#733) 
Set bc-operation style scale globally
Add location filtering in graphical and summary reports (#742)
 2016-07-20 20:43:31 +02:00
FrancescoUK
0924a0f433 Revert "Move create_temp_table to Reports Controller constructor out of Model one" (#729) 
This reverts commit dc06119586.
 2016-07-09 12:50:17 +01:00
FrancescoUK
dc06119586 Move create_temp_table to Reports Controller constructor out of Model one 2016-07-06 19:37:23 +01:00
FrancescoUK
0cbd19353c Rename temp table creation functions to simply be create_temp_table 2016-07-06 19:22:32 +01:00
FrancescoUK
3c969858cf Performance improvement for Inventory reports after XSS clean addition (#39) 2016-07-06 19:11:54 +01:00
FrancescoUK
c136832db1 Fixed issue with negative tendered amount in sales (#707), improved sales_items_temp table and usage in various parts 2016-07-03 14:07:46 +01:00
FrancescoUK
b76d4526de Renamed prefix recvs_ to be the extended version receivings_ matching the Controller name (#439) 2016-06-25 09:39:04 +01:00
FrancescoUK
de9a4dac08 Fixed failures in updated rows in Suppliers and Report Detailed Receivings (#683) 2016-06-21 20:33:54 +01:00
FrancescoUK
bb85a172a2 Change invoice_number in Receiving to be Reference, tidy up code (#635) 2016-06-21 08:50:11 +01:00
FrancescoUK
15fd832705 XSS clean Receiving (#39) code refactoring and various issues fixing 2016-06-20 22:22:46 +01:00
jekkos
4b0badfb30 Fix customer search in takings (#654) 
Replace payment type label with amount tendered (#513)
 2016-06-15 17:18:31 +02:00
FrancescoUK
9248ffd044 XSS clean Reports (#39) 2016-06-06 22:36:07 +01:00
FrancescoUK
6ad547049e Further model checks, improved success result, made code style consistent (#598) 2016-05-29 15:04:21 +01:00
FrancescoUK
6fe1e2a55a Added escaping of inputs in all Report models (#598) 2016-05-27 19:38:28 +01:00
jekkos
349000bd8a Fix sale and receiving edit and delete in detailed report (#507, #293) 2016-05-11 17:57:37 +02:00
jekkos
eca4b4ffb8 Use bootstrap tables for detailed and summary reports (#293, #507) 2016-05-06 00:37:46 +02:00
FrancescoUK
34d09bc575 Made invoice optional from store config checkbox, updated and regen database script, few config fixes (#410) 2016-04-24 17:11:37 +01:00
FrancescoUK
1ac0182867 Added discount % to customer (#375) and added Total spent by customer (#369), both added in register and form 2016-04-16 22:26:50 +01:00
FrancescoUK
ffd0f25e13 Fix to "count shown instead of quantity" on certain Reports (#453) 2016-04-08 12:03:45 +01:00
FrancescoUK
afcb1641b7 Added decimals to taxes (#327), added totals rounding matching decimals (#327 #307, #429) 2016-04-02 13:59:01 +01:00
FrancescoUK
98b5c8da28 Fix reports error due to report.php now being Report.php (#120) 2016-01-07 19:09:53 +00:00
Toni Haryanto
d8057830c6 Upgrade to Code Igniter 3.0.3 (#120) 2016-01-07 19:06:35 +00:00
FrancescoUK
dc45b77573 Fix to Gift card totals issue #159 
Various indentation adjustments
 2015-09-19 09:22:24 +01:00
Martes Erede
308be8079f [#32] improving the inventory summary report, including total inventory value 2015-09-11 15:58:57 +08:00
FrancescoUK
b226a40efc Make Gift Card one payment item and not multiple ones in Sale/Overview and in Summary Payment report. 
Fixed also the colspan and set to 10.
 2015-09-03 19:18:15 +01:00
FrancescoUK
9f1485cfe5 Added Cost & Count to reports, improved Items suggest, added copyrights and some fixes 
Added cost and count to reports

- Added cost in temp table, reports at bottom of page and in each
summary and detailed report
- Added count in all the reports
- Renamed some report fields name to make it generic and consistent
across views
- Fixed few issues here and there
- Adjusted some code indentation

NOTE: Proper translation of word Cost is required in all the languages
but English

Improved Items suggestion

- Added select to restrict results fields
- Added distinct in suppliers instead of the array match
- Added $is_deleted in model part but is not still effective

Add copyright statements in COPYING license file

- Added jekkos and FrancescoUK / daN4cat

Other people that contributed should add their statements.
 2015-08-17 11:13:04 +01:00
jekkos
4ab2ec1b5b Add supplier attribute search for items (pull request #106) 
Add company name to supplier column in summary report
 2015-08-16 15:41:39 +02:00
jekkos
80dcc2f63f Increase waiting timeout for phantomjs test 
Revert old database script
Add styling rules for number typed input fields
 2015-07-14 12:36:43 +02:00
jekkos
92da2749ad Adapt report summary to chosen stock location 
Update release notes
 2015-07-13 18:39:50 +02:00
jekkos
83a297cf15 Add stock location as filter to detailed sales + receivings reports 2015-07-10 19:04:52 +02:00
jekkos
70b7a03c63 Show item location next to quantity purchased in detailed receiving and 
sale report
Remove duplicate suggestions in sale and receiving module
Show item location on receipt if multiple are configured
Check if item location is allowed when adding items in sale or receiving
 2015-07-08 21:41:41 +02:00
jekkos
46b5c18aca Add receiving_quantity field to ospos_receivings (issue #78) 
Detailed receiving now correctly shows purchased quantity
 2015-06-20 14:59:37 +02:00
jekkos
ccc2af2a26 Show tax exclusive subtotal in case of tax inclusive pricing 2015-05-23 16:51:42 +02:00
jekkos
97d268e323 Tax summary report calculation fixes 2015-05-22 07:54:07 +02:00
jekkos
54855849b3 Show item number in order report 
Conflicts:

	application/controllers/reports.php
	database/database.sql
 2015-04-27 19:07:28 +02:00
jekkos-t520
cb1075e6c0 Remove sale_type parameter from get_detailed_sales and 
get_detailed_receivings methods
 2015-02-24 10:22:19 +01:00
jekkos-t520
1c1b89db21 Fix detailed sales report for sale_type = sale 2014-12-04 08:49:36 +01:00
jekkos-t520
fe6820920b Add edit form in detailed receivings report 
Add language lines for detailed sale & receiving validation
Add permission for getting updated sale & receiving detail row
 2014-10-21 21:39:22 +02:00
jekkos-t520
868de15fcb Invoice number is now substituted correctly after complete 
Fix payments summary report
Update upgrade script (not tested yet)
 2014-10-13 12:30:37 +02:00