Commit Graph

  • c88f37f8e7 Change Sale Overview to become a daily takings view with totals. FrancescoUK 2015-09-01 23:36:29 +01:00
  • 3e24b9caff Remove non working datepicker icon Remove in_array check for duplicated company_name jekkos 2015-08-24 21:52:41 +02:00
  • 517363b485 Fix deleted checkbox in items form Clear suggestion cache when toggling deleted filter jekkos 2015-08-18 18:01:24 +02:00
  • 011caf375f Apply is_deleted in item suggestion search jekkos 2015-08-18 08:35:21 +02:00
  • 9f1485cfe5 Added Cost & Count to reports, improved Items suggest, added copyrights and some fixes FrancescoUK 2015-08-17 11:13:04 +01:00
  • 0336fe6298 Stop showing duplicate suggestions for company_name jekkos 2015-08-16 15:52:25 +02:00
  • 4ab2ec1b5b Add supplier attribute search for items (pull request #106) Add company name to supplier column in summary report jekkos 2015-08-16 15:36:33 +02:00
  • eb3657e76f Fix upgrade script (2) jekkos 2015-08-13 22:53:52 +02:00
  • 61206547cb FIll in empty location_ids for existing data jekkos 2015-08-12 15:10:08 +02:00
  • 9ae6e3242b Update Thai translate (Pull requests #98, #99, #100, #101, #102) songwutk 2015-08-07 15:45:17 +07:00
  • 7f5fe9efde Upgrade grunt-mocha-webdriver jekkos 2015-08-10 15:32:00 +02:00
  • 9e189a503e Merge pull request #105 from gabrielperezs/master jekkos 2015-08-10 11:03:58 +02:00
  • da41aec0d1 Spanish traslation Gabriel Pérez S 2015-08-10 10:26:11 +02:00
  • 03b9924d57 Create table if not exists Gabriel Pérez S 2015-08-10 10:14:03 +02:00
  • 87222611e6 Remove duplicated last name for suppliers jekkos 2015-08-10 09:30:01 +02:00
  • cc06d93d30 Remove LICENSE file (use COPYING now instead) Update agency_name constraint in update script Show supplier_id in suppliers for use with item excel import FrancescoUK 2015-08-03 22:48:32 +01:00
  • 7926a05948 Regenerate language files Remove committed merge conflict in giftcard_numbering.js Add sql upgrade script for 2.3.3 jekkos 2015-08-07 15:04:33 +02:00
  • d7ff4a371c Fix to the License naming clash issue FrancescoUK 2015-08-07 13:01:24 +01:00
  • aa144b43eb Fixed invoice date bug FrancescoUK 2015-08-04 09:12:45 +01:00
  • f806ea84b3 Update to Suppliers feature FrancescoUK 2015-08-03 22:48:32 +01:00
  • 17ac5b1837 Bump version number to 2.3.3 jekkos 2015-07-25 11:59:38 +02:00
  • 8bcd2a69dc Add better locale config support (pull request #93) FrancescoUK 2015-07-14 16:59:00 +01:00
  • e0f80528f4 Fix report generation regression 2.3.2 jekkos 2015-07-15 18:14:58 +02:00
  • 491d8d0b72 Increase testcase delays Keep keys order when reversing array for stock location options jekkos 2015-07-14 18:17:54 +02:00
  • 80dcc2f63f Increase waiting timeout for phantomjs test Revert old database script Add styling rules for number typed input fields jekkos 2015-07-14 12:35:30 +02:00
  • 92da2749ad Adapt report summary to chosen stock location Update release notes jekkos 2015-07-13 17:58:43 +02:00
  • 83a297cf15 Add stock location as filter to detailed sales + receivings reports jekkos 2015-07-10 19:04:52 +02:00
  • 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 jekkos 2015-07-08 21:38:02 +02:00
  • b1f1feda48 Show alternative description on invoice only if not empty jekkos 2015-07-01 08:29:53 +02:00
  • 48fe4aa4cf Show item alternative description if available Show sale instead of customer comments on invoice jekkos 2015-06-30 23:08:56 +02:00
  • 0788f4eef9 Set precision to 5 decimals (constants.php) Show item description if serialized (invoice.php) jekkos 2015-06-28 14:20:39 +02:00
  • fc5f097820 Add proper validation for module grants (issue #87) jekkos 2015-06-23 23:32:56 +02:00
  • df7907fb8f Don't lose date precision when editing sale or receiving jekkos 2015-06-20 17:03:36 +02:00
  • 46b5c18aca Add receiving_quantity field to ospos_receivings (issue #78) Detailed receiving now correctly shows purchased quantity jekkos 2015-06-20 14:59:37 +02:00
  • 5c1ecf4618 Update .gitattributes with merge strategy for specific files jekkos 2015-05-25 13:28:03 +02:00
  • ccc2af2a26 Show tax exclusive subtotal in case of tax inclusive pricing jekkos 2015-05-22 18:22:27 +02:00
  • 872d6857cd Add decent delay for waitForElement in wd test jekkos 2015-05-22 23:28:59 +02:00
  • 658792c1fc Fix invoice return jekkos 2015-05-22 19:26:10 +02:00
  • 4a324fbf4c Fix inventory update on deleting sale (issue #80) jekkos 2015-05-22 18:11:57 +02:00
  • 97d268e323 Tax summary report calculation fixes jekkos 2015-05-22 07:54:07 +02:00
  • ca05583ec3 Merge branch 'master' of https://github.com/jekkos/opensourcepos jekkos 2015-05-21 22:12:50 +02:00
  • 7d0a6dc7ae Merge branch 'feature/travis-ci' jekkos 2015-05-21 22:12:30 +02:00
  • 3ba3a3dea0 Merge branch 'travis-ci-setup' jekkos 2015-05-21 22:10:28 +02:00
  • 1ad08c014f Fix giftcard numbering issue #65 jekkos 2015-05-21 22:00:14 +02:00
  • 3936f2dcf3 Add giftcard numbering test jekkos 2015-05-20 18:35:10 +02:00
  • fcc71a5f74 Sale reporting now takes tax inclusive pricing into account jekkos 2015-05-19 22:44:03 +02:00
  • 46f6824199 Fix rounding issues with tax inclusive pricing Add autocomplete in return mode jekkos 2015-05-19 20:46:42 +02:00
  • 7c0f884872 Remove trailing space (issue #76) jekkos 2015-05-19 09:40:30 +02:00
  • 15493ae58e Set correct url jekkos 2015-05-17 22:36:00 +02:00
  • ac7c0241e5 Merge pull request #79 from nalamapu/patch-1 jekkos 2015-05-17 21:44:32 +02:00
  • fd933e3ed6 Update general_config.php A.K.M. Nurul Alam 2015-05-16 12:14:21 +06:00
  • 6a2a5278b8 Fix general test setup (finally) Add basic selenium test for application login Adapt default database template file Add correct db settings for travis-ci jekkos 2015-05-15 00:47:25 +02:00
  • 687d4c06c6 Fix general test setup (finally) Add basic selenium test for application login Adapt default database template file Add correct db settings for travis-ci jekkos 2015-05-15 00:45:55 +02:00
  • 19f7c6aa57 Initialize mysql on travis jekkos 2015-05-13 00:14:11 +02:00
  • ccf1a6209f Set travis.yml language to php (node should be default) jekkos 2015-05-12 23:44:43 +02:00
  • 4db6f28c76 Try to fix php-fpm absence (3) jekkos 2015-05-12 22:26:37 +02:00
  • 3e08ec99a5 Try to fix php-fpm absence (2) jekkos 2015-05-12 13:59:08 +02:00
  • 4142f0fc71 Try to fix php-fpm absence jekkos 2015-05-12 13:53:16 +02:00
  • 1d9a0bc8b6 Add travis-ci-apache jekkos 2015-05-12 13:52:32 +02:00
  • a58510c541 Add apache2 + mysql setup for travis jekkos 2015-05-12 13:46:34 +02:00
  • b2a37b7ded Add category column again jekkos 2015-05-01 12:11:49 +02:00
  • 69528baa21 Merge pull request #60 jekkos 2015-04-27 18:14:30 +02:00
  • c5defaab35 Empty person_id field in giftcard edit if id is null jekkos 2015-04-27 13:41:50 +02:00
  • af7910a6a8 Show giftcard number instead of id in edit form jekkos 2015-04-27 13:38:38 +02:00
  • 86eb397866 Enable sorting on giftcard number Add default stock permissions for sales and receivings in upgrade script jekkos 2015-04-24 17:06:07 +02:00
  • 9b1785df01 Correct obvious punctuation error in item form.php jekkos 2015-04-24 12:42:22 +02:00
  • 8f09a32ef5 Correct latest alter table statements for jekkos 2015-04-24 09:12:05 +02:00
  • c6d9a8a994 Show correct quantity in item form jekkos 2015-04-24 08:41:37 +02:00
  • 54855849b3 Show item number in order report jekkos 2015-04-16 08:31:41 +02:00
  • 7a9590359e Fix currency symbol when no dollars are chosen jekkos 2015-04-14 09:00:10 +02:00
  • 11eed40718 Update receivings.php jekkos 2015-04-10 15:03:06 +02:00
  • bc7eeb5d30 Do not clear session state when switching sale or receiving modes Set receiving quantity and discount validation to numeric instead of integer jekkos 2015-04-08 23:28:20 +02:00
  • 4916f98bcb Fix currency symbol when no dollars are chosen jekkos 2015-04-14 13:04:46 +02:00
  • c85dd1660e Add .idea folder to .gitignore jekkos 2015-04-13 18:21:15 +02:00
  • 08c0c2c63f Giftcard remaining balance is always shown in cash register Giftcard person_id is optional now Add some extra translations for giftcard warnings jekkos 2015-04-08 12:20:14 +02:00
  • 81c24d7151 Do not clear sale and receiving libs when switching modes jekkos 2015-04-07 22:54:23 +02:00
  • 3d62a73c8c Report subpermission labels are shown properly in employee form now Fix logic to show correct report subpermissions jekkos 2015-04-09 18:09:23 +02:00
  • b8fba91244 Show tax names and amounts in invoice and invoice_email views Fix invoice numbering for $YCO after update jekkos 2015-04-09 17:53:17 +02:00
  • 80dbe6efa7 Company name can be DEFAULT NULL in database jekkos 2015-04-09 07:18:50 +02:00
  • 3f46f1aca9 Merge branch 'master' of https://github.com/jekkos/opensourcepos jekkos 2015-04-08 21:56:18 +02:00
  • 26fddcf8d4 Add custom repository for grunt-script-link-tags jekkos 2015-04-08 13:47:16 +02:00
  • 7a4df2a050 Fixup db script jekkos 2015-04-07 19:13:45 +02:00
  • de3d7ce726 Add new language line for check_remainder jekkos 2015-04-07 19:09:01 +02:00
  • 4ffc5351af Add customer as a required field for giftcard Show giftcard remainder if at least one payment is done using giftcard jekkos 2015-04-07 17:28:44 +02:00
  • 3f14c51c97 Update travis.yml jekkos 2015-04-06 16:55:46 +02:00
  • e9b4e57c06 Add company_name column to ospos_customers jekkos 2015-04-06 15:47:38 +02:00
  • 70bb02c753 Change button order (default is submit now) jekkos 2015-04-06 15:45:49 +02:00
  • 6f7090d7ba Upgrade jquery.color jekkos 2015-04-04 22:52:30 +02:00
  • 43ecda44e0 Receipt totals layout improvement (show top border when no discount or tax section present) Remove unexistant script include from invoice_email template jekkos 2015-04-06 15:38:52 +02:00
  • 04abb716fa Merge branch 'master' of https://github.com/jekkos/opensourcepos jekkos 2015-04-06 15:16:43 +02:00
  • 95ae2766cd Giftcard get_all parameters were in opposite order Invoice layout improvements jekkos 2015-04-06 14:46:10 +02:00
  • f45f75e458 Add functionality to keep item edit form open for easier working (in sales, receivings and items module) Refactor duplicated custom field code in item form jekkos 2015-04-06 14:41:50 +02:00
  • b85b9d37a1 Add company_name field to customers for invoicing purposes Total discount is now shown as one amount in receipt jekkos 2015-04-06 15:15:34 +02:00
  • ebd473ea11 Update README.md jekkos 2015-04-01 00:01:19 +02:00
  • 7d7ee83ef4 Add test folder + basic unit test setup Add grunt mochaWebdriver plugin for phantomJs test jekkos 2015-04-06 15:15:14 +02:00
  • 27c6f275d1 Set focus to scan field when refreshing receivings module jekkos 2015-04-02 19:22:17 +02:00
  • 39edf5ccdb Add basic unit tests jekkos 2015-04-01 17:53:07 +02:00
  • 90c4df7f2a Update README.md jekkos 2015-04-01 00:01:19 +02:00
  • ae99555fec Add test folder + basic unit test setup Add grunt mochaWebdriver plugin for phantomJs test jekkos 2015-03-31 23:54:47 +02:00
  • 8ff742085a Multiple total disconuts are shown correctly now jekkos 2015-03-31 21:56:44 +02:00