mirror/opensourcepos
1
0
Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-02-01 21:21:08 -05:00
Code Issues Packages Projects Releases Wiki Activity
601 Commits 37 Branches 39 Tags
eee7f137ef6bed6a7c9bec47cc73fdff6e49f721
Commit Graph

132 Commits

Author SHA1 Message Date
FrancescoUK
d5cf608bac Fix to #152 remove name of people from code comment and add them to COPYING license file 2015-09-18 18:33:22 +02:00
FrancescoUK
96973da280 Item kits issue #155 fix 
Added Kit Id column to table view
 2015-09-18 18:33:22 +02:00
FrancescoUK
c48106f2f5 Fix items view search issue having a ' in the string. Bug #149 2015-09-17 21:59:34 +02:00
jekkos
e1ddcbbb5b Rename Item_quantities model to Item_quantity 
Rename Stock_locations model to Stock_location
Fix barcode generation in receipts (sales + receivings)
 2015-09-17 21:59:33 +02:00
FrancescoUK
10ea821b2a Leave item_number empty if Code39/128 is selected 
Added Empty UPC checkbox in Items view to easily select empty items that need barcode code generation and in case of EAN8/13 fill in item_number
Added language for Empty UPC string
Indentation/spacing adjustment
 2015-09-15 17:49:51 +01:00
FrancescoUK
cf0276c772 If item_number (UPC/EAN/ISBN) is empty and a new barcode is generated save it in the item_number field and update the item entry 
Refactoring of barcode_lib
Some code alignment adjustment here and there
 2015-09-15 11:13:58 +01:00
FrancescoUK
8f2740d349 Centred barcode image 
Moved $data to base class and added getData
Fixed indentation
 2015-09-14 23:20:20 +01:00
FrancescoUK
393ac9bb97 Fixed some minor issues 2015-09-14 23:20:15 +01:00
jekkos
a78ef2fb08 Merge branch 'master' of https://github.com/marteserede/opensourcepos 2015-09-12 20:16:46 +02:00
Martes Erede
308be8079f [#32] improving the inventory summary report, including total inventory value 2015-09-11 15:58:57 +08:00
jekkos
335ced948e Remove unneeded fields from sales_temp table 2015-09-09 23:20:31 +02:00
jekkos
b41a006a79 Fix duplicated payment amounts (#136) 2015-09-09 23:09:28 +02:00
jekkos
506aced23e amount_due and change_due were incorrect if multiple items in sale 
(#136)
 2015-09-09 19:25:44 +02:00
jekkos
2c5f3ee759 Add grunt-cache-breaker plugin (#137) 
Fix tax inclusive pricing for daily sales overview (#136)
Fix table sorting when using search in daily sales overview (#131)
 2015-09-07 22:15:41 +02:00
jekkos
ac3aab51fa Fix payment summary update on search 2015-09-04 23:35:23 +02:00
jekkos
9281995029 Fix payment summary update on search 
Merge branch 'master' of https://github.com/daN4cat/opensourcepos into daN4cat-master
 2015-09-04 23:14:06 +02:00
jekkos
f36c700129 Add date filtering in sales overview 
Add jquery-ui datepicker
Format dates in sale and receiving forms according to configured
dateformat and timeformat settings
Add missing translations in sale (click delete when not selecting
anything)
Add search box back to search for customer sales and ticket numbers
 2015-09-04 22:09:24 +02:00
FrancescoUK
d35ef071bb - Added cash only filter 
- Set to 'all' the sale_type so even returns are shown (we might want to add a drop down filter for this too)
 2015-09-04 19:30:43 +01:00
jekkos
a624d21fcd Fix sale detail edit 
Make last row in sale table bold (css)
Add default date range between yesterday and today
Temporarily comment out payment type listing in table itself (tbd)
 2015-09-04 08:44:20 +02:00
jekkos
9a2cafc1b1 Review payment type overview 
Add some padding to bottom of content area
Fix invoice only searching
Make start and end dates optional
 2015-09-03 23:35:57 +02: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
75fa706299 Sale Overview change 
- Refactor and optimise payments part (added now amount to detail sale report too)
- fix some </tr> that should have been </td>
- minor indentation fixes

NOTE: The only_invoices checkbox is not responsive
 2015-09-02 23:16:26 +01:00
FrancescoUK
c88f37f8e7 Change Sale Overview to become a daily takings view with totals. 2015-09-01 23:37:26 +01:00
jekkos
3e24b9caff Remove non working datepicker icon 
Remove in_array check for duplicated company_name
 2015-08-24 21:52:41 +02:00
jekkos
517363b485 Fix deleted checkbox in items form 
Clear suggestion cache when toggling deleted filter
 2015-08-18 18:10:00 +02: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
0336fe6298 Stop showing duplicate suggestions for company_name 2015-08-16 15:52:25 +02: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
Gabriel Pérez S
03b9924d57 Create table if not exists 2015-08-10 10:14:03 +02:00
FrancescoUK
f806ea84b3 Update to Suppliers feature 
- added Agency name to identify agent or distributor behind a brand
- updated view to show supplier ID useful for item imports via excel
sheet
- update database table
- updated language although missing translations
- various bit an pieces missing due to failed rebase
 2015-08-07 15:02:15 +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
4a324fbf4c Fix inventory update on deleting sale (issue #80) 2015-05-22 19:26:56 +02:00
jekkos
97d268e323 Tax summary report calculation fixes 2015-05-22 07:54:07 +02:00
jekkos
fcc71a5f74 Sale reporting now takes tax inclusive pricing into account 2015-05-19 22:44:03 +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
08c0c2c63f Giftcard remaining balance is always shown in cash register 
Giftcard person_id is optional now
Add some extra translations for giftcard warnings

Conflicts:

	database/2.3.1_to_2.3.2.sql
 2015-04-09 18:28:57 +02:00
jekkos
b8fba91244 Show tax names and amounts in invoice and invoice_email views 
Fix invoice numbering for $YCO after update
 2015-04-09 18:28:23 +02:00
jekkos
4ffc5351af Add customer as a required field for giftcard 
Show giftcard remainder if at least one payment is done using giftcard
 2015-04-07 17:28:44 +02:00
jekkos
95ae2766cd Giftcard get_all parameters were in opposite order 
Invoice layout improvements
 2015-04-06 15:15:40 +02:00
jekkos
9b98f15f69 Receiving cancel delete should work now (confirm result was ignored) 
receivings_items will now store the correct quantity_purchased when
using a value > 1 for receiving_quantity
Receiving delete message corrected
 2015-03-30 16:37:26 +02:00
jekkos-t520
6faaec53d6 Fix duplicate item suggestion issue #38 
Fix return ticket suggestion issue #38
Fix discounted_total after hitting edit in sales register
 2015-03-07 21:55:15 +01:00
jekkos-t520
0e357f14f6 Add option to show total discounts on receipt 2015-03-05 08:28:58 +01:00
jekkos-t520
e0fd35220e Add custom search back into items 
Fix proper pagintaion for filtered item views w/o search
 2015-03-04 20:53:38 +01:00
jekkos-t520
ffb8501276 Fix custom search 2015-02-27 16:03:52 +01:00
jekkos-t520
9351a263ee Review sales overview pagination (use generic intialisation in 
secure_area.php)
 2015-02-25 13:30:03 +01:00