mirror/opensourcepos
1
0
Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-01-26 10:17:59 -05:00
Code Issues Packages Projects Releases Wiki Activity
1,314 Commits 37 Branches 39 Tags
8fcc24db71ebdfd4f4e4319f2c2d4aff59996f4c
Commit Graph

114 Commits

Author SHA1 Message Date
FrancescoUK
5fb73ce2cb fixed error reporting, fixed table_helper, added translations, fixed bootstrap grid, various fixes (#472) 2016-04-30 21:34:23 +01:00
FrancescoUK
2b9c9ce203 enable errors, refactor code, various issues fixing, upgrade database script (#472) 2016-04-30 21:33:48 +01:00
RamkrishnaMondal
ee237c3c2e Fourth commit 2016-04-28 13:22:01 +05:30
RamkrishnaMondal
638e9ff535 First commit 2016-04-26 16:04:17 +05:30
FrancescoUK
83d93464bc Added ability to update payment type when editing a sale (#314) 2016-04-17 21:51:52 +01:00
FrancescoUK
984f6c5cac MY_Session workaround is not required anymore with CI3.0 
See for fix: https://github.com/bcit-ci/CodeIgniter/issues/3073
 2016-04-08 08:51:42 +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
f6be7cdf23 Merge branch 'master' into bootstrapUI 2016-03-13 16:19:44 +00:00
FrancescoUK
0bd5bbec77 remove encode/decode base64 causing issues with web hosting providers (#374) 2016-03-13 10:52:32 +00:00
FrancescoUK
d2565009d8 fix wrong behaviour with due amount and Complete button on "sale" <=0 and "return" >=0 (#116) 2016-03-12 09:23:54 +00:00
FrancescoUK
2df8645c5f code comments, various bits and bobs (#116) 2016-03-11 17:20:07 +00:00
FrancescoUK
9a71bbc620 Complete CI 3.0.3 upgrade since it wasn't done in full (#120) 2016-03-08 17:44:59 +00:00
Toni Haryanto
75fa1a8167 Upgrade to Code Igniter 3.0.3 (#120) 2016-03-08 17:41:16 +00:00
jekkos
a201d18938 Add specific warning when stock goes below reorder level in sales (#365, #336) 2016-03-02 08:28:50 +01:00
jekkos
9e2d89c528 Show discounted price instead of discount itself on receipt 2016-01-04 17:19:50 +01:00
jekkos
1779685d31 Encode text before storing it as session variable (#254) 2015-12-30 08:10:14 +01:00
jekkos
bf0622d7fa Show discounted price per item line 2015-12-26 15:26:32 +01:00
jekkos
da25281df9 Show discounted price per item line 2015-12-26 15:21:54 +01:00
jekkos
eb63f49db7 Add barcode generation for EAN8 and EAN13 (#111, #246) 
Add config option to use generation when generating barcodes for an
Generate propery barcode with configured format if item_number empty
 2015-12-26 11:42:58 +01:00
jekkos
9f5782e0ba Add validation for barcode types (#111, #246) 
Fallback to code128 if invalid EAN8 or EAN13 is detected
 2015-12-13 15:51:25 +01:00
jekkos
7c2cc9646d Don't override custom invoice numbers (#223) 2015-11-09 10:46:35 +01:00
jekkos
43b8d32efc Don't use empty on php expression (#196) 
Signed-off-by: jekkos <jeroen.peelaerts@gmail.com>
 2015-10-09 17:11:24 +02:00
jekkos
1fd7fda645 Fix totals calculation when adding item multiple times (issue #165) 
Fix typo in script comments
 2015-10-09 10:24:38 +02:00
jekkos
64023f6eec Avoid comments coercion to 0 when suspending sales (#192) 
Invoice number in suspended sales should not be unique
 2015-10-08 18:29:55 +02:00
FrancescoUK
763a9e73fa #192 Remove 0 from comments 
Checked in library get_comment if the string is null and return a '' if that's the case. That removes the 0 from sale comments
 2015-10-07 09:37:27 +01:00
FrancescoUK
893345d334 #111 Change barcode types from numbers to strings for better code readability 2015-09-19 17:44:43 +01:00
FrancescoUK
80fcede1ca #152 Remove Alain name and add it to the COPYING under the Copyright section 2015-09-19 17:40:00 +01:00
FrancescoUK
dc45b77573 Fix to Gift card totals issue #159 
Various indentation adjustments
 2015-09-19 09:22:24 +01:00
FrancescoUK
ad948ac81e Fix to rebase/merge mistake with Barcode_lib 2015-09-18 18:05:43 +01:00
FrancescoUK
eee7f137ef Fix to rebase/merge mistake with Barcode_lib 2015-09-18 18:33:32 +02:00
jekkos
2237c332b9 Derive barcode id from item array 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
bca4386aed Fix to sale and receiving receipt barcode 2015-09-18 18:33:22 +02:00
FrancescoUK
0984cdbfc4 Fix to sale and receiving receipt barcode 2015-09-17 22:00:06 +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
eb71dbc300 Fix EAN 13 typos + set pix per bar 
Add EAN 8 support
 2015-09-14 23:20:19 +01:00
FrancescoUK
93d8775ac5 Remove extra comma from end of array 2015-09-14 23:20:18 +01:00
FrancescoUK
807d48ac7b Add EAN13 in Barcode lib 
Sketched EAN13 class code
Fix typo
 2015-09-14 23:20:17 +01:00
FrancescoUK
c88f37f8e7 Change Sale Overview to become a daily takings view with totals. 2015-09-01 23:37:26 +01: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
658792c1fc Fix invoice return 2015-05-22 19:26:56 +02:00
jekkos
46f6824199 Fix rounding issues with tax inclusive pricing 
Add autocomplete in return mode
 2015-05-19 20:46:42 +02:00
jekkos
b85b9d37a1 Add company_name field to customers for invoicing purposes 
Total discount is now shown as one amount in receipt

Conflicts:

	application/controllers/sales.php

Conflicts:

	database/migrate_phppos.sql
 2015-04-06 15:15:34 +02:00
jekkos
8ff742085a Multiple total disconuts are shown correctly now 2015-03-31 21:56:44 +02:00
jekkos-t520
b29cb85b9b Add ticket suggestions for #40 2015-03-07 22:41:03 +01: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
b29ec8ef31 Fix show discounts functionality 
Review tax price calculations
Remove tax exclusive price in invoice.php template
 2015-03-07 19:35:13 +01:00