Commit Graph

  • 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
  • 86bf8866f0 Do duplicated cookie check before echo'ing output in items (fix for #49) jekkos 2015-03-31 16:33:29 +02:00
  • a8f353de9c Add constraint for trans_location foreign key Use Code128 for receipt barcodes in sales and receivings jekkos 2015-03-31 14:45:53 +02:00
  • 9b98f15f69 Receiving cancel delete should work now (confirm result was ignored) receivings_items will now store the correct quantity_purchased when using a value > 1 for receiving_quantity Receiving delete message corrected jekkos 2015-03-30 16:37:26 +02:00
  • 138d1cbeef Remove duplicated click handlers on add/remove location jekkos 2015-03-26 13:00:08 +01:00
  • 9ead6fcca9 Add mochaSelenium config in Gruntfile (tests not running yet) jekkos 2015-03-20 13:50:14 +01:00
  • ced5ca4e2e Make invoice numbers more consistent jekkos 2015-03-17 18:05:43 +01:00
  • ca2c9a6ae4 Item refresh fix for issue #42 Invoice number in email message are denoted with $INV Sale id's in email message are denoted with POS $sale_id jekkos 2015-03-17 17:41:12 +01:00
  • cae9d3b67e Remove tags:css task in Grunfile (css files are imported the old way again) Fix sale delete confirmation in edit dialog Add bower.json (still unused) Fix autogenerated javascript load order jekkos 2015-03-17 16:47:49 +01:00
  • aa65593ce3 Add Gruntfile.js for concat+uglification of javascript Enable debug=true cookie for full source inclusion in header.php Add template in header.php to inject generated javascript files jekkos-t520 2015-03-15 16:56:37 +01:00
  • c10860a005 Intercept pagination link click when search field is empty and filtering checkboxes are set jekkos-t520 2015-03-11 08:36:20 +01:00
  • a39e12e76d Externalize nominatim autcomplete functionality Add chosen language to nominatim request jekkos-t520 2015-03-10 14:37:36 +01:00
  • b29cb85b9b Add ticket suggestions for #40 jekkos-t520 2015-03-07 22:41:03 +01:00
  • 6faaec53d6 Fix duplicate item suggestion issue #38 Fix return ticket suggestion issue #38 Fix discounted_total after hitting edit in sales register jekkos-t520 2015-03-07 21:55:15 +01:00
  • b29ec8ef31 Fix show discounts functionality Review tax price calculations Remove tax exclusive price in invoice.php template jekkos-t520 2015-03-07 19:35:13 +01:00
  • 4ac1a943eb Update totals calculation Update tax inclusive calculation jekkos-t520 2015-03-06 00:58:44 +01:00
  • 0e357f14f6 Add option to show total discounts on receipt jekkos-t520 2015-03-05 08:28:58 +01:00
  • e0fd35220e Add custom search back into items Fix proper pagintaion for filtered item views w/o search jekkos-t520 2015-03-03 23:40:31 +01:00
  • ffb8501276 Fix custom search jekkos-t520 2015-02-27 16:03:52 +01:00
  • 8981efbd2a Fix error in database script Add script to reset database easily (with root user) Remove old git-svn script jekkos-t520 2015-02-26 22:06:33 +01:00
  • b2f76f3fe6 Improve thai translation (Merge Pull Request #20) Improve login screen jekkos-t520 2015-02-26 21:55:55 +01:00
  • 98cae8928b Cleanup table encoding + auto_increment jekkos-t520 2015-02-26 14:20:52 +01:00
  • b02b16b63e Only show company name in supplier's dropdown jekkos-t520 2015-02-25 13:18:04 +01:00
  • 81cb46bb8b Add router for sales overview jekkos-t520 2015-02-25 12:31:21 +01:00
  • b11bf919af Automatically resize report columns Remove text-transform for invoice header jekkos-t520 2015-02-24 17:08:46 +01:00
  • 9ee63294a4 Make report table headers resizable Add suffix to pagination url (so extra filters can be maintained) jekkos-t520 2015-02-24 16:15:04 +01:00
  • dbddb34ed4 Receipt total is recalculatd after edit now Some css improvements for receipt printing Adaptation of one or more labels jekkos-t520 2015-02-24 16:13:44 +01:00
  • 71c9294978 Giftcard customer selection cleanup jekkos-t520 2015-02-24 16:07:17 +01:00
  • 1226d217a6 Pagination search limit_from fixes (add limit_from hidden fields) jekkos-t520 2015-02-24 15:06:44 +01:00
  • 3204391521 Always show name instead of description (twice) jekkos-t520 2015-02-24 13:09:27 +01:00
  • 40ebba4252 Improve table layout a bit (change header sizes) jekkos-t520 2015-02-24 12:53:52 +01:00
  • 9351a263ee Review sales overview pagination (use generic intialisation in secure_area.php) jekkos-t520 2015-02-24 12:20:25 +01:00
  • cb1075e6c0 Remove sale_type parameter from get_detailed_sales and get_detailed_receivings methods jekkos-t520 2015-02-24 10:22:19 +01:00
  • 33cf0422a7 Make javascript selector more specific jekkos-t520 2015-02-24 09:21:03 +01:00
  • bd54a180d5 Remove location field from bulk edit jekkos-t520 2015-02-24 08:55:44 +01:00
  • b752ec9952 Fix item bulk update jekkos-t520 2015-02-24 08:51:09 +01:00
  • e688a24326 Fix sale suspend (redundant payment_type field was removed) Gender is now properly saved in suppliers module jekkos-t520 2015-02-24 08:10:53 +01:00
  • 468b3e3580 Fix item_number barcode generation for item kits Fix supplier pagination jekkos-t520 2015-02-22 00:04:47 +01:00
  • e96dd7883e remove count_all fix pagination row counts for modules jekkos-t520 2015-02-21 23:58:31 +01:00
  • 8e221033bf Add label for products on low inventory (items filtering) Add stock location to method call for items pagination Move item pagination links jekkos-t520 2015-02-21 22:35:28 +01:00
  • 17594f95f1 Add lines per page option Add default sales discount option Fix supplier pagination jekkos-t520 2015-02-21 21:57:41 +01:00
  • 9e427485f3 Fix items module filtering Fix double to_currency wrapper for amount_change in receipt Fix tablesorter js error with empty tables Upgrade tablesorter.js to latest version Adapt some labels for dutch jekkos-t520 2015-02-21 18:05:12 +01:00
  • c389e6030c Fix pagination for all modules (links updated for index+search through AJAX) jekkos-t520 2015-02-20 17:36:03 +01:00
  • 0f77300131 Sales overview added to register screen Add pagination to default search routine Remove payment_type column from sales table (was redundant) Fix search spinner location (just toggle ac_loading class) Complete sale labels jekkos-t520 2015-02-20 15:54:13 +01:00
  • 9856f0bc65 Add invoice dom sanity check before print jekkos-t520 2015-02-20 09:25:31 +01:00
  • 378d45691b invoice printer field greyed out if jsPrint addon is not installed jekkos-t520 2015-02-20 09:22:21 +01:00
  • e7f9f29cd3 Create invoice checkbox was inverted jekkos-t520 2015-02-19 18:15:35 +01:00
  • babddd524c Refactor variable substitution for receiving invoice numbers Use localStorage to store selected printer Add printer selection for invoice template Print after sale checkbox is now present in receivings and sales screen Remove print after sale options from receipt_config Add default translations to receivings_lang.csv Fix some bugs preventing to print and email at the same time jekkos-t520 2015-02-19 18:10:31 +01:00
  • 6ff19cb3f3 Merge branch 'feature/invoice_template' jekkos-t520 2015-02-19 16:11:57 +01:00
  • 42c30bf30b Invoice PDF generation working properly PDF's can be sent as mail attachment jekkos-t520 2015-02-19 15:32:16 +01:00
  • 50006aeb6a Email pdf generation Added invoice template Add latest dompdf release jekkos-t520 2015-02-18 18:17:24 +01:00
  • 8edff136d0 Show company name on receipt when no logo is set jekkos-t520 2015-02-18 08:53:18 +01:00
  • f6fb275dff Fix stock permission names (no more empty labels) jekkos-t520 2015-02-18 07:42:20 +01:00