Commit Graph

  • 4cc3eadb97 Apply changes from #226 (#116) FrancescoUK 2016-01-07 19:17:54 +00:00
  • 4b9d5113d3 Change header template (#116) FrancescoUK 2016-01-07 19:17:28 +00:00
  • 206751de0e Overriding view files (#116) FrancescoUK 2016-01-07 19:17:04 +00:00
  • 4dd3c64e9d Code reformatting FrancescoUK 2016-01-22 22:16:50 +00:00
  • b400393a90 Code reformatting FrancescoUK 2016-01-22 22:14:42 +00:00
  • 1f9cb92697 Add favicon FrancescoUK 2016-01-22 19:14:57 +00:00
  • 59fe366479 Add favicon FrancescoUK 2016-01-22 19:05:07 +00:00
  • 8eba67ceb8 Merge branch 'master' into ci3 (#284) FrancescoUK 2016-01-22 14:57:25 +00:00
  • 1148ef1595 Install grunt-cli in docker container (#284) jekkos 2016-01-22 14:43:53 +01:00
  • bcbdee3a50 Fix test execution for travis-ci (grunt invocation) jekkos 2016-01-22 13:37:30 +01:00
  • cfbb700f0c Add symlink for node in Dockerfile jekkos 2016-01-22 13:10:23 +01:00
  • 95f6738d5b Fix package.json version to be 2.4 (#284) FrancescoUK 2016-01-22 11:31:13 +00:00
  • 0cde54e985 Merge branch 'master' into ci3 (#284) FrancescoUK 2016-01-22 08:37:31 +00:00
  • a3d3cfad61 Use Dockerfile in travis-ci setup (#284) Set version in package.json jekkos 2016-01-22 08:17:48 +01:00
  • b89e9c56cc Merge branch 'master' into ci3 (#284) FrancescoUK 2016-01-21 18:38:48 +00:00
  • 192955b33d Fix receipt barcode generation for docker (add php5-gd lib to Dockerfile) (#284) Make setup scripts with CI3 jekkos 2016-01-21 18:22:04 +01:00
  • 195c8a0601 Make docker work with 2.4 branch jekkos 2016-01-21 16:23:54 +01:00
  • 9048d68baf Make docker work wig jekkos 2016-01-21 16:23:17 +01:00
  • 2b70762b7a Use ubuntu trusty for Docker container + add startup scripts (#284) Add Grunt concatenate for sql scripts (migrate + db init) (#289) jekkos 2016-01-20 18:47:44 +01:00
  • de2d034377 Update database/tables.sql script with new sessions table (#120) FrancescoUK 2016-01-19 12:00:51 +00:00
  • f941a45d13 Update Copyright notice (#120) FrancescoUK 2016-01-19 11:21:08 +00:00
  • 4280e05679 Make the data blob NOT NULL in the SQL upgrade script (#120) FrancescoUK 2016-01-19 08:24:58 +00:00
  • 830f714a44 Change sessions to be stored in database and add SQL upgrade script 2.3.4 to 2.4 (#120) FrancescoUK 2016-01-18 23:01:42 +00:00
  • f8c9acd88f Fix to custom fields that cannot be null on Items save (#120) FrancescoUK 2016-01-18 20:15:24 +00:00
  • d67f08d842 Add (temp) fix for cur_page conuter in CI pagination libary (#120) Fix .htaccess file jekkos 2016-01-06 19:29:33 +01:00
  • 72fc36c8f5 Add (temp) fix for cur_page conuter in CI pagination libary (#284) Fix .htaccess file jekkos 2016-01-06 19:29:33 +01:00
  • 3c22f9069b Restore padding in pagination links, now it uses css (#120) FrancescoUK 2016-01-17 19:02:08 +00:00
  • c2eaf88d74 Upgrade to CI 3.0.4 (#120) FrancescoUK 2016-01-17 18:33:26 +00:00
  • b72d620b15 Added comments to some controller functions and improved spacing to improve readibility of code (#120) FrancescoUK 2016-01-17 17:56:54 +00:00
  • dce413631c Make NULL to be null all over the code for consistency purposes (#120) FrancescoUK 2016-01-16 22:08:43 +00:00
  • 5468127e2f Further review and fixes to input->post(...) (#120) FrancescoUK 2016-01-16 22:04:12 +00:00
  • d66e6ab6ef Fix to items search not working due to input->post returning null (#120) FrancescoUK 2016-01-15 22:53:09 +00:00
  • a3929d2c6f Merge remote-tracking branch 'jekkos/master' into ci3 FrancescoUK 2016-01-15 18:57:11 +00:00
  • b5cc1542b6 Merge branch 'master' of https://github.com/jekkos/opensourcepos jekkos 2016-01-13 18:58:40 +01:00
  • 1a77960daa Update README.md with instructions for Docker setup jekkos 2016-01-13 18:57:44 +01:00
  • 301fbf4427 Merge pull request #283 from ais-one/ais-one-php7-fix jekkos 2016-01-13 17:59:01 +01:00
  • 2f0666325f PHP7 Fix Aaron Gong 2016-01-13 15:59:37 +08:00
  • d0c765ce20 PHP7 fix Aaron Gong 2016-01-13 15:58:20 +08:00
  • a1ad99cc0d Add Dockerfile. Ospos is now containerized. Pull image from jekkos 2016-01-12 16:45:18 +01:00
  • 2d0b20499e Set correct locale for Dutch (Belgium) jekkos 2016-01-11 18:53:57 +01:00
  • 5b01e60ed2 Merge branch 'master' #274 change into ci3 FrancescoUK 2016-01-10 13:13:55 +00:00
  • 26ff81ab71 Generate languages for German (Swiss) #274 jekkos 2016-01-09 17:26:01 +01:00
  • da3349765a Add de_CH language (by nano-riff #274) Thorsten 2016-01-06 19:48:44 +01:00
  • b470fbfb3d Fix merge miss in constants.php (#120) FrancescoUK 2016-01-07 20:53:40 +00:00
  • 1f86842757 Complete CI 3.0.3 upgrade since it wasn't done in full (#120) FrancescoUK 2016-01-07 20:11:19 +00:00
  • de47b11880 Remove application/errors, upgrade Step 8 (#120) FrancescoUK 2016-01-03 18:31:51 +00:00
  • 6b2b3969ec EXT constant deprecated, upgrade Step 20 (#120) FrancescoUK 2016-01-03 17:53:01 +00:00
  • 14c5a0823b Follow upgrade guideline Step 9 (#120) FrancescoUK 2016-01-03 13:46:16 +00:00
  • 98b5c8da28 Fix reports error due to report.php now being Report.php (#120) FrancescoUK 2016-01-03 13:43:46 +00:00
  • cd7060afed Change config language to be 'en' consistent with the OSPOS language identifiers (#120) FrancescoUK 2015-12-30 22:03:23 +00:00
  • 0787264f71 Improve .htaccess with some security rules (#120) FrancescoUK 2015-12-30 22:02:50 +00:00
  • 347609d20c Upgrade config.php and database.php.tmpl to CI 3.0.3 versions (#120) FrancescoUK 2015-12-30 22:02:21 +00:00
  • 0340dc7ffc Remove application/config.php and database.php (#120) FrancescoUK 2015-12-30 22:00:25 +00:00
  • d8057830c6 Upgrade to Code Igniter 3.0.3 (#120) Toni Haryanto 2015-11-02 13:09:10 +07:00
  • 4ddde65b41 Bump version to 2.3.4 Update dutch translation for company_name Fix timeformat for date filtering in items module jekkos 2016-01-07 19:53:52 +01:00
  • c408afad67 Cleanup migration script, mostly working now (#262) 2.3.3 jekkos 2016-01-05 17:41:43 +01:00
  • b1ba7d0afe Split up database.sql in scripts for tables and contraints. Use both new scripts in phppos_migrate.sql jekkos 2016-01-05 07:16:05 +01:00
  • 31a223cece Merge pull request #272 from daN4cat/master FrancescoUK 2016-01-04 22:13:29 +00:00
  • 3bd778737f #271 fix to error witn xampp due to a spurious "git" FrancescoUK 2016-01-04 22:09:38 +00:00
  • 648251978e Merge pull request #270 from daN4cat/master jekkos 2016-01-04 22:13:25 +01:00
  • 240c96a185 #267 remove warning due to junk dirs being inside a language/xx one FrancescoUK 2016-01-04 19:44:15 +00:00
  • 810000e37c #265 do not override 404 handler in routes.php FrancescoUK 2016-01-04 18:23:16 +00:00
  • 6aa5126bf0 #269 fix https error issue FrancescoUK 2016-01-04 17:55:00 +00:00
  • 90591382ce Further cleanup phppos migration script (#262) jekkos 2016-01-04 17:26:42 +01:00
  • 9e2d89c528 Show discounted price instead of discount itself on receipt jekkos 2016-01-04 17:18:13 +01:00
  • 1601d679fd Takings not using proper permission (#262) jekkos 2016-01-04 17:04:33 +01:00
  • aa0409af48 Add phppos migration script (untested) #258 jekkos 2016-01-01 17:08:55 +01:00
  • ad194bd4c0 Fix typo in english translation (#260) jekkos 2016-01-01 16:46:58 +01:00
  • 1779685d31 Encode text before storing it as session variable (#254) jekkos 2015-12-30 08:09:03 +01:00
  • 51df82f35e Update WHATS_NEW jekkos 2015-12-30 07:42:27 +01:00
  • bf0622d7fa Show discounted price per item line jekkos 2015-12-26 15:21:54 +01:00
  • da25281df9 Show discounted price per item line jekkos 2015-12-26 15:21:54 +01:00
  • 2f52d083e8 Update changelog for 2.3.3 jekkos 2015-12-26 13:13:47 +01:00
  • 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 jekkos 2015-12-24 12:40:02 +01:00
  • c007513fc8 Fix barcode generation error for empty item numbers jekkos 2015-12-13 15:57:03 +01:00
  • 9f5782e0ba Add validation for barcode types (#111, #246) Fallback to code128 if invalid EAN8 or EAN13 is detected jekkos 2015-12-13 15:45:45 +01:00
  • 2f14a0f868 Fix typo in store language line (#247) jekkos 2015-12-13 14:15:43 +01:00
  • fb924daa81 Show reoder level in items form when editing (#241) jekkos 2015-12-04 18:13:05 +01:00
  • 1bb9acdc37 Fix for adding/deleting stock locations (#242) jekkos 2015-12-04 08:33:39 +01:00
  • 16d5dfce77 Merge pull request #244 from kamaroly/master jekkos 2015-12-03 23:06:22 +01:00
  • be6b7ff03d Create gh-pages branch via GitHub jekkos 2015-12-01 10:27:27 +01:00
  • afa203e73c Fixed error Only variable references should be returned by reference Kamaro Lambert 2015-11-30 23:30:56 +02:00
  • bc85391734 Submit form when hitting enter in search field for items module (#187) jekkos 2015-11-09 11:15:42 +01:00
  • 7c2cc9646d Don't override custom invoice numbers (#223) jekkos 2015-11-09 10:46:35 +01:00
  • c0303cc873 Merge branch 'master' of https://github.com/asakpke/RoshanTech.com-POS jekkos 2015-10-20 22:01:37 +02:00
  • 0ddd80dc2c Regenerate thai language (#205) jekkos 2015-10-20 21:59:57 +02:00
  • af582056d7 update sales_lang.csv : Thai songwutk 2015-10-19 02:22:02 +07:00
  • 56859a77ab Fix path for jquery-ui icons (#207) jekkos 2015-10-20 13:23:20 +02:00
  • ec5846e1eb Make receivings datetimepicker consistent with sales form (#169) jekkos 2015-10-18 21:37:49 +02:00
  • 6d5c192447 Add jquery-ui slider for datepicker #169 jekkos 2015-10-17 00:22:57 +02:00
  • 1b90ac14d2 #169 regenerate dist/ js scripts adding datetimepicker jQuery plugin FrancescoUK 2015-10-15 19:12:50 +01:00
  • 9c775ca44b #169 Add date and time picker to receivings/form FrancescoUK 2015-10-15 18:03:46 +01:00
  • 0d87fc51d9 #169 Add a date time picker to sales/form such user can edit transaction date not in a manual manner FrancescoUK 2015-10-14 11:40:59 +01:00
  • c4c7d9d792 Merge pull request #169 from marteserede/master jekkos 2015-10-12 09:36:37 +02:00
  • 455a5f59d1 Merge pull request #199 from souparno/bug-condition-statement jekkos 2015-10-10 15:09:10 +02:00
  • 9cf5d5734f if condition statement missing, may result in server error souparno 2015-10-10 13:11:32 +05:30
  • 43b8d32efc Don't use empty on php expression (#196) Signed-off-by: jekkos <jeroen.peelaerts@gmail.com> jekkos 2015-10-09 17:11:24 +02:00
  • 0c25b01666 Add default line endings jekkos 2015-10-09 11:43:19 +02:00
  • 1fd7fda645 Fix totals calculation when adding item multiple times (issue #165) Fix typo in script comments jekkos 2015-10-08 18:50:39 +02:00
  • 3eb798917d Clear out empty sales and receivings comments on database upgrade (#192) jekkos 2015-10-08 18:43:52 +02:00