mirror/opensourcepos
1
0 Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-09-16 23:38:21 -04:00
Code Issues Packages Projects Releases Wiki Activity
4,375 Commits 49 Branches 39 Tags
8a8f708ff984edb03e76161e094df80f04ebedbd
Commit Graph
4375 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
jekkos 8a8f708ff9 Travis: Try to find correct container name 2019-09-29 12:54:45 +02:00
jekkos 14dab2515f Travis: Tag container with correct name 2019-09-29 12:35:36 +02:00
jekkos 2d8bdae77a Remove docker tag after build 2019-09-29 11:09:02 +02:00
jekkos 79ca1ce58c Minor update Install + Readme 2019-09-29 01:35:37 +02:00
WShells 40036e6050 Added Fixed Sales Discount 2019-09-29 02:25:04 +03:00
WShells 6c1ccc6bac System Info 
System Info For Issue Reporting
 2019-09-28 23:33:10 +03:00
WShells e8960c7398 System Info 
Added system info for issue reporting for version 3.3.0 or higher.
 2019-09-28 23:30:43 +03:00
FrancescoUK 27dd669579 Fix PHP version in INSTALL.md 2019-09-28 21:22:37 +01:00
FrancescoUK 8b8472b836 New logo and updated files to prepare for Release 3.3.0 2019-09-28 20:47:37 +01:00
FrancescoUK b4ed7c925f Upgrade CodeIgniter to 3.1.11, LICENSE files and npm 2019-09-28 19:08:36 +01:00
FrancescoUK 8d699cc9ad Upgrade CodeIgniter to 3.1.11, LICENSE file and npm 2019-09-28 19:06:52 +01:00
FrancescoUK d63eb47e63 Merge pull request #2550 from opensourcepos/3_3_0_validate_after_bulk 
Trigger validation when creating items in bulk (#2521)
 2019-09-25 21:08:17 +01:00
jekkos 0ca766e9c9 Trigger validation when creating items in bulk (#2521) 2019-09-25 00:17:55 +02:00
FrancescoUK ad14936cf3 Merge pull request #2546 from opensourcepos/3.3.0_fix_barcode_import 
Fix barcode import (#2515)
 2019-09-23 08:43:56 +01:00
jekkos 55c86afcde Fix warning in development mode (#2476) 2019-09-23 07:55:44 +02:00
jekkos e0cd10c8ec Fix barcode import (#2515) 2019-09-22 19:43:58 +02:00
FrancescoUK 4274321a3f Fix empty report issue (#2522) 2019-09-11 21:46:06 +01:00
Weblate 9bdebc6bdd Fix escape sequence in spanish 2019-09-11 09:36:36 +02:00
FrancescoUK b4d860282b Merge pull request #2534 from WebShells/LB 
EG to LB
 2019-09-10 21:28:01 +01:00
WebShells 4f089aa68d Re-added EG 
Re-added EG, need to be double checked to make sure it fits Egyptian Language. ( most probably 70% no differences in language ).
 2019-09-10 20:08:03 +03:00
WebShells 59884e7f81 EG to LB 
Although it fits for all arabic language countries, yet it's the most accurate locale to be used.
Most of AR Translation were made for LB language.
 2019-09-10 16:51:46 +03:00
dimon daemon d29d2e8bc4 Translated using Weblate (Russian) 
Currently translated at 100.0% (29 of 29 strings)

Translation: ospos/attributes
Translate-URL: http://weblate.jpeelaer.net/projects/ospos/attributes/ru/
 2019-09-10 12:57:29 +02:00
FrancescoUK 64eb7abf2f Fix empty reports issue (#2522) 2019-09-09 22:11:38 +01:00
WShells 05dd216ad9 Update LICENSE 2019-09-09 01:06:25 +03:00
FrancescoUK 2c4c29e31d Merge pull request #2531 from opensourcepos/fix-cart-reseq 
Remove the redundancy of cart resequencing for POS receipts.
 2019-09-08 20:17:07 +01:00
SteveIreland 6ad3db7ef9 Remove the redundancy of cart resequencing for POS receipts. 2019-09-07 20:57:28 -04:00
FrancescoUK 4c80a97202 Merge pull request #2528 from mckaygerhard/feat-sumrep-inventorycatcolum1 
added category column to the inventory summary report due huge produc… (#2526)
 2019-09-07 19:00:47 +01:00
PICCORO Lenz McKAY 37189ba1f3 added category column to the inventory summary report due huge product data 
closes https://github.com/opensourcepos/opensourcepos/issues/2526
 2019-09-02 22:34:30 -04:30
jekkos 7ebae8ad8a Fix warning when opening attribute edit form 2019-08-11 17:22:47 +02:00
jekkos 8bca8fab53 Fix warning in dev mode (#2485) 2019-08-07 00:19:12 +02:00
jekkos 0d3a33f1ba Fix attribute visibility view if none selected (#2485) 2019-08-07 00:14:22 +02:00
jekkos 0a2894c582 Left join on attribute_values to show items with no value (#2485) 2019-08-04 22:29:44 +02:00
FrancescoUK ac6d5eef46 Merge pull request #2496 from opensourcepos/dinner_table_fix 
Improves the behavior of dinner table selection.
 2019-07-22 18:17:23 +01:00
SteveIreland f95d777dc2 Improves the behavior of dinner table selection. 2019-07-21 11:53:01 -04:00
FrancescoUK fa71bc6ed6 Merge pull request #2490 from opensourcepos/3.3.0_patch_empty_reports 
fix empty reports
 2019-07-14 13:40:50 +01:00
objecttothis f235cede08 Update date_input.php 
Corrected this from 1 to 2.  'All' is counted in the array which means that if there is only one stock location, this dropdown will still appear.  Setting this to 2 means that the dropdown only shows when there is more than 1 stock location.
 2019-07-12 15:16:21 +04:00
objecttothis 991830817e Create 20190712150200_fix_empty_reports.php 
This corrects an error in a previous migration (2.3_to_2.3.1.sql) that assigned a null value to receivings_stock and sales_stock for the location_id when it should have been the location_id of that particular stock_location.
 2019-07-12 15:05:14 +04:00
Weblate 929dc7fbb8 Merge branch 'origin/master' into Weblate 2019-07-10 12:20:26 +02:00
Francisco xyko 764b3d2a84 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (173 of 173 strings)

Translation: ospos/sales
Translate-URL: http://weblate.jpeelaer.net/projects/ospos/sales/pt_BR/
 2019-07-10 12:20:25 +02:00
Francisco xyko a89cc74ba5 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (109 of 109 strings)

Translation: ospos/items
Translate-URL: http://weblate.jpeelaer.net/projects/ospos/items/pt_BR/
 2019-07-10 12:20:12 +02:00
FrancescoUK 7daa69db43 Merge pull request #2488 from opensourcepos/3.3.0_patch_datetime_to_date 
3.3.0 patch datetime to date
 2019-07-10 07:54:22 +01:00
objecttothis 8c173540e6 Update Attribute.php 
changed DATETIME to DATE since constant name was changed but it wasn't changed here.
 2019-07-09 18:05:23 +04:00
objecttothis 9297e73b69 Update locale_helper.php 
Adding back in deleted method.
 2019-07-09 18:03:28 +04:00
FrancescoUK 79e1ccc9a0 Add new languages to config selection list 2019-07-07 11:19:26 +01:00
Weblate e275486efe Add th config 2019-07-06 14:10:09 +02:00
jekkos 7da7c0e16f Send back to bintray (#2464) 2019-07-04 19:30:50 +02:00
jekkos abcf12c3d7 Change newlines into html breaks (invoice template) 2019-07-03 19:44:55 +02:00
jekkos a45b8e2689 Keep history for downloads branch 2019-07-01 09:19:55 +02:00
Weblate 4269884008 Merge branch 'master' of https://github.com/opensourcepos/opensourcepos 2019-06-30 23:16:03 +02:00
jekkos efd92fb94f Push to downloads branch instead 2019-06-30 23:00:41 +02:00