Commit Graph

  • 9bf24fee5f Translated using Weblate (French) Luc Gagnier 2017-02-08 23:01:42 +00:00
  • 2c53f0e585 Fixed typo in README and added more info FrancescoUK 2017-02-14 09:09:12 +00:00
  • 5aeb1234a2 Fixed POS or pos issue in sale register (#1081) FrancescoUK 2017-02-13 22:14:00 +00:00
  • 6e62a3fe15 Update README with latest System Requirement FrancescoUK 2017-02-13 18:55:36 +00:00
  • 67594190fc Merge pull request #1140 from RuleDomain/item-kit-git-info-fix jekkos 2017-02-13 08:16:24 +01:00
  • c6597ba6ce This fixes an error with Item_kit.get_info that occurs in developer test mode. Steve Ireland 2017-02-12 21:16:53 -05:00
  • 2187898b04 Add CI language support FrancescoUK 2017-02-12 13:39:37 +00:00
  • a6b5220047 Updated to CI version 3.1.3 FrancescoUK 2017-02-11 22:08:00 +00:00
  • 78cb4822c2 Updated js plugins and composer FrancescoUK 2017-02-11 20:51:32 +00:00
  • ae4ff80974 Fix encryption key generation issue (#1110) FrancescoUK 2017-02-07 20:49:19 +00:00
  • df2d616566 Merge pull request #1128 from RuleDomain/fixes-item-kit-discount-not-working jekkos 2017-02-07 20:27:08 +01:00
  • 353fa8e95c Fix for discount assignment bug Steve Ireland 2017-02-06 18:37:34 -05:00
  • 699236bca0 Merge pull request #1122 from i92guboj/pic_filename FrancescoUK 2017-02-05 21:34:48 +00:00
  • 4ca862ba9f Refactor code (#1110) FrancescoUK 2017-02-05 21:24:29 +00:00
  • 7222df3551 Remove unnecessary/redundant check i92guboj 2017-02-05 21:30:17 +01:00
  • 72e1158847 Cleanup and tabs i92guboj 2017-02-05 21:25:00 +01:00
  • 145d97737f Preliminary fix for dot corruption in pic_filename i92guboj 2017-02-05 17:10:34 +01:00
  • 8140d1aee4 Update language files (#932) FrancescoUK 2017-02-04 12:15:40 +00:00
  • 5f5394b18f Fix correct database upgrade script (#632) FrancescoUK 2017-02-03 22:24:38 +00:00
  • ceb9687e5e Merge pull request #1115 from jlctmaster/date_or_time_format FrancescoUK 2017-02-03 22:04:30 +00:00
  • 7a4525319a Fixed bug sales data preview of day when date or time field is checked into config location tab Jorge Colmenarez 2017-02-03 15:39:11 -04:00
  • a175111b59 Merge pull request #1114 from RuleDomain/this-fixes-add-item-kit jekkos 2017-02-03 10:54:22 +01:00
  • 4cda5343aa This will fix the issue with the PHP error when adding a new item kit. It also initializes the line_sequence config option. Steve Ireland 2017-02-02 23:25:04 -05:00
  • e7cbacaae6 Merge pull request #1111 from RuleDomain/fix-kit-item-selection FrancescoUK 2017-02-01 20:07:48 +00:00
  • faadbe554a Change kit item selection from the Item Kit maintenance to only select kit items. Steve Ireland 2017-02-01 14:43:16 -05:00
  • 999e12279a Extract pic_filename update into method (clean code #1026) jekkos 2017-02-01 08:08:51 +01:00
  • 37bb9b50f9 Bump Mysql version in docker dev container (#630, #591) jekkos 2017-01-31 21:53:41 +01:00
  • 5e02f31866 Fix bugs (#1026) FrancescoUK 2017-01-31 23:16:38 +00:00
  • bf0d24a96f Fix bugs (#1026) FrancescoUK 2017-01-31 23:08:56 +00:00
  • be66258bfc Fix bugs (#1026) FrancescoUK 2017-01-31 23:03:53 +00:00
  • 87247333cc Fix bugs (#1026) FrancescoUK 2017-01-31 22:52:37 +00:00
  • 5e75613fec Update LICENSE file FrancescoUK 2017-01-31 21:14:20 +00:00
  • 5b4d12cac8 Improve Items picture storing (#1026) FrancescoUK 2017-01-31 20:23:59 +00:00
  • 0e013220ad Use PHP7 + newest MariaDB in docker compose + cloud (#630, #591) jekkos 2017-01-31 19:24:40 +01:00
  • ae92231903 Generate low inventory message if at least one of the item kit items added to a sale are below the reorder level. Steve Ireland 2017-01-31 09:03:36 -05:00
  • 9a1cf6752c Change the inventory reports to exclude non-stock items. Steve Ireland 2017-01-31 08:29:14 -05:00
  • 9db439a8fe Merge pull request #1107 from RuleDomain/low-inventory-check-for-kits FrancescoUK 2017-01-31 20:02:34 +00:00
  • e458b23b7e Merge pull request #1106 from RuleDomain/fix-inventory-low-missing-reorder_level-check FrancescoUK 2017-01-31 20:00:21 +00:00
  • 4ca0e74d42 Use PHP7 + newest MariaDB in docker compose + cloud (#630, #591) jekkos 2017-01-31 19:24:40 +01:00
  • 47357aaafc Merge branch 'master' into pic_filename i92guboj 2017-01-31 16:04:33 +01:00
  • a99f326bb8 Generate low inventory message if at least one of the item kit items added to a sale are below the reorder level. Steve Ireland 2017-01-31 09:03:36 -05:00
  • cc584ca063 Change the inventory reports to exclude non-stock items. Steve Ireland 2017-01-31 08:29:14 -05:00
  • d85aeaeaf8 Merge pull request #1103 from RuleDomain/restrict-inventory-reports-to-stock-items FrancescoUK 2017-01-31 08:05:54 +00:00
  • cc2fd1876d Merge pull request #1102 from RuleDomain/fix-out-of-stock-warning FrancescoUK 2017-01-31 08:04:52 +00:00
  • f4a52dab8b Merge pull request #1101 from RuleDomain/fix-for-line_sequence FrancescoUK 2017-01-31 08:03:52 +00:00
  • d75a936472 Change the inventory reports to exclude non-stock items. Steve Ireland 2017-01-30 21:34:32 -05:00
  • 2719c43e3d Fix for issue where the warning messages for out of stock or below reorder level were not being sent to the user. Steve Ireland 2017-01-30 20:38:24 -05:00
  • 85983cd17a Fix merge issues related to line_sequence for receipts and invoices Steve Ireland 2017-01-30 19:03:57 -05:00
  • df9b776d56 Add support for MySQL 5.7 (#630) and PHP7 (#591), better Item Kits (#625) FrancescoUK 2017-01-30 20:10:17 +00:00
  • b373b1e07e Merge branch 'master' into pic_filename i92guboj 2017-01-30 17:45:47 +01:00
  • 68cf3bf68b Merge remote-tracking branch 'jekkos/item-kit' into item-kit Steve Ireland 2017-01-29 23:10:37 -05:00
  • f9c1dde054 Changes to support Item Kits, support for MySQL 5.7, and a tweak for PHP 7 Steve Ireland 2017-01-19 22:03:32 -05:00
  • 1393af1676 Fix Summary payments and taxes issue (#932) FrancescoUK 2017-01-29 19:44:45 +00:00
  • f359c475d3 Fix Takings issue (#932) FrancescoUK 2017-01-29 19:31:02 +00:00
  • 9bc9b5c984 Add date/time summary payment report (#932) FrancescoUK 2017-01-29 18:10:14 +00:00
  • 4922f5bb66 Add date/time config translation (#932) FrancescoUK 2017-01-29 17:57:21 +00:00
  • e36b2a1a03 Add Support for filter reports with format date/time (#932) FrancescoUK 2017-01-29 17:43:38 +00:00
  • bb5d39cd0d Fix partial/header.php change FrancescoUK 2017-01-29 17:09:00 +00:00
  • afe564e152 Fix LICENSE file FrancescoUK 2017-01-29 16:57:47 +00:00
  • 17ff097406 Third commit RamkrishnaMondal 2017-01-29 21:32:16 +05:30
  • 3b37f6c61a Fix Detailed Receiving Report not showing Supplier (#1093) FrancescoUK 2017-01-29 15:51:26 +00:00
  • 96cefd97b4 Second commit RamkrishnaMondal 2017-01-29 17:44:35 +05:30
  • 03af00e26e First commit RamkrishnaMondal 2017-01-29 17:34:55 +05:30
  • 92bd7c2d43 Amend license file with copyright dates jekkos 2017-01-28 11:41:09 +01:00
  • 4d6cc381ae Bump version to 3.1.0 FrancescoUK 2017-01-27 18:37:09 +00:00
  • 3f36a8b15e Bump version to 3.1.0 FrancescoUK 2017-01-27 18:36:34 +00:00
  • 5a9b6bd98b Add ERD for sales diagram (for wiki page) jekkos 2017-01-22 11:18:19 +01:00
  • b9e160eaa3 Improve PHP7 compatibility (#591) jekkos 2017-01-21 00:01:59 +01:00
  • ba95853884 Remove quirk in master (#1076) jekkos 2017-01-20 23:22:50 +01:00
  • f157d4d43d Translated using Weblate (Turkish) Emin Tufan Çetin 2017-01-14 06:54:48 +00:00
  • a2c3130720 Translated using Weblate (Dutch (Belgium)) mitchel 2016-12-28 20:16:52 +00:00
  • 258622ec87 Enable jsPrint for custom receipt templates (#1070) jekkos 2017-01-19 23:54:30 +01:00
  • b4023a051c Update WHATS_NEW.txt with 3.0.2 improvements FrancescoUK 2016-12-31 20:59:38 +00:00
  • 1cdbee1a42 Fix Summary Reports Payments (#1045) FrancescoUK 2016-12-30 18:26:43 +00:00
  • feff5ff3f3 Set folder upload folder permissions to 755 (#1014) Don't load item avatar if item_pic is empty jekkos 2016-12-28 20:19:09 +01:00
  • 0507db6a6f Set apache as owner of uploads folder (#1014) jekkos 2016-12-28 18:36:16 +01:00
  • 9b473e415d Hook standard jquery submit function and update csrf (#1019) jekkos 2016-12-28 18:12:54 +01:00
  • 47974074ee Stop running compose as travis seems to fail after startup? jekkos 2016-12-28 01:38:06 +01:00
  • bc56ee54a3 Fix date, location and sale type filtering for summary payments (#1045) jekkos 2016-12-28 01:30:21 +01:00
  • 046a02d83c Refresh csrf tokens before submit (#1019) jekkos 2016-12-28 01:24:47 +01:00
  • 57e559e67b Translated using Weblate (Dutch (Belgium)) mitchel 2016-12-25 12:55:46 +00:00
  • 10e3ce9a9f Fix csrf refresh issue in register (#1019) jekkos 2016-12-27 23:59:22 +01:00
  • 953fa534f4 Print just first letter of Employee family name to protect privacy (#1027) FrancescoUK 2016-12-04 21:15:56 +00:00
  • c7982b9552 Bump OSPOS version to 3.0.2 FrancescoUK 2016-12-04 21:10:28 +00:00
  • 6e0011b165 Fix Invoice Template editing issues (#1088), centre company name on top navbar FrancescoUK 2017-01-29 17:15:46 +00:00
  • a3c172624a Fix partial/header.php change FrancescoUK 2017-01-29 17:09:00 +00:00
  • 3a81a712ff Fix LICENSE file FrancescoUK 2017-01-29 16:57:47 +00:00
  • 775f40cb75 Merge pull request #8 from jekkos/master RamkrishnaMondal 2017-01-29 21:51:12 +05:30
  • 5814bfc7e8 Third commit RamkrishnaMondal 2017-01-29 21:32:16 +05:30
  • 3f309298d8 Fix Detailed Receiving Report not showing Supplier (#1093) FrancescoUK 2017-01-29 15:51:26 +00:00
  • 4ef8fc8df3 Second commit RamkrishnaMondal 2017-01-29 17:44:35 +05:30
  • a627276265 First commit RamkrishnaMondal 2017-01-29 17:34:55 +05:30
  • 6e4155ccbb Merge pull request #7 from jekkos/master RamkrishnaMondal 2017-01-29 16:23:07 +05:30
  • 84ef147835 Bump PHP version to 7.0 jekkos 2017-01-28 18:50:01 +01:00
  • 925bee2b0a Amend license file with copyright dates jekkos 2017-01-28 11:41:09 +01:00
  • 680f2bb555 Bump version to 3.1.0 FrancescoUK 2017-01-27 18:37:09 +00:00
  • 29920c5456 Bump version to 3.1.0 FrancescoUK 2017-01-27 18:36:34 +00:00
  • ace3bedbbc Correct typo Steve Ireland 2017-01-22 20:53:43 -05:00
  • 476db84e86 Change SUM to MAX and a couple of indent issues. Steve Ireland 2017-01-22 16:40:20 -05:00
  • dc638c74b5 Resolves Item view and Takings view issues that odiea spotted. Steve Ireland 2017-01-22 10:57:59 -05:00