Commit Graph

  • 27f89a63be remove the - from language/id/common_lang.php FrancescoUK 2015-09-17 14:11:21 +01:00
  • 3f5d0b781b Fix to $lang["common_last_page"] issue #156 FrancescoUK 2015-09-16 22:26:51 +01:00
  • 0984cdbfc4 Fix to sale and receiving receipt barcode FrancescoUK 2015-09-16 21:56:57 +01:00
  • c48106f2f5 Fix items view search issue having a ' in the string. Bug #149 FrancescoUK 2015-09-16 20:00:58 +01:00
  • e1ddcbbb5b Rename Item_quantities model to Item_quantity Rename Stock_locations model to Stock_location Fix barcode generation in receipts (sales + receivings) jekkos 2015-09-16 19:31:26 +02:00
  • 2b7ceb4228 Move Print button in sale/manage (Takings) to top right FrancescoUK 2015-09-15 19:52:40 +01:00
  • 3c89416b83 Update languages jekkos 2015-09-15 23:21:59 +02:00
  • 290aee4671 Merge branch 'patch-13' of https://github.com/songwutk/opensourcepos jekkos 2015-09-15 23:01:10 +02:00
  • 10ea821b2a Leave item_number empty if Code39/128 is selected FrancescoUK 2015-09-15 17:49:51 +01:00
  • cf0276c772 If item_number (UPC/EAN/ISBN) is empty and a new barcode is generated save it in the item_number field and update the item entry FrancescoUK 2015-09-15 11:13:58 +01:00
  • 8f2740d349 Centred barcode image FrancescoUK 2015-09-14 23:19:33 +01:00
  • eb71dbc300 Fix EAN 13 typos + set pix per bar FrancescoUK 2015-09-13 21:50:07 +01:00
  • 68915dd28c Ean13 code generation implementation FrancescoUK 2015-09-13 13:27:08 +01:00
  • 93d8775ac5 Remove extra comma from end of array FrancescoUK 2015-09-07 22:04:44 +01:00
  • 807d48ac7b Add EAN13 in Barcode lib FrancescoUK 2015-09-07 22:03:38 +01:00
  • 79fd666bff Add Ean13 file and class FrancescoUK 2015-09-07 18:15:28 +01:00
  • 393ac9bb97 Fixed some minor issues FrancescoUK 2015-09-07 18:08:58 +01:00
  • ac95e1f7d8 Update common_lang.csv songwutk 2015-09-14 16:30:40 +07:00
  • c843c174ed Initialize table sorting if this didn't happen when the page was loaded initially (#139) jekkos 2015-09-14 08:26:41 +02:00
  • d6f052f082 Add default translation in other languages as well (#142) jekkos 2015-09-12 20:55:54 +02:00
  • a78ef2fb08 Merge branch 'master' of https://github.com/marteserede/opensourcepos jekkos 2015-09-12 20:16:46 +02:00
  • 4cbbd3a6f7 [#32] using to_currency for currency values in table-data Martes Erede 2015-09-11 16:16:34 +08:00
  • 4a8c3a83b3 [#32] adding new language-strings and running generate_languages.php Martes Erede 2015-09-11 15:59:27 +08:00
  • 308be8079f [#32] improving the inventory summary report, including total inventory value Martes Erede 2015-09-11 15:58:57 +08:00
  • 335ced948e Remove unneeded fields from sales_temp table jekkos 2015-09-09 23:20:31 +02:00
  • b41a006a79 Fix duplicated payment amounts (#136) jekkos 2015-09-09 23:09:28 +02:00
  • 506aced23e amount_due and change_due were incorrect if multiple items in sale (#136) jekkos 2015-09-09 19:25:44 +02:00
  • e9ea2ba792 Create temp table when necessary jekkos 2015-09-07 22:53:19 +02:00
  • 2c5f3ee759 Add grunt-cache-breaker plugin (#137) Fix tax inclusive pricing for daily sales overview (#136) Fix table sorting when using search in daily sales overview (#131) jekkos 2015-09-07 22:15:41 +02:00
  • b680cdff36 Fix table sorting after loading search results jekkos 2015-09-07 08:35:59 +02:00
  • 80f7966d1c Add default dateformat and timeformat in data scripts jekkos 2015-09-06 15:53:11 +02:00
  • e62df579f1 Keep last row in position even after filtering jekkos 2015-09-06 13:33:12 +02:00
  • 2b6b3914a7 Mark totals row as static (keep it at bottom of the table issue #131) jekkos 2015-09-06 13:19:32 +02:00
  • 756b675e2b use configured dateformat for jquery ui date parser disable sorting on columns 0 and 9 (no data there) default sorting enabled on column 1 jekkos 2015-09-05 15:05:20 +02:00
  • 1d65ceaccf Merge branch 'master' of https://github.com/daN4cat/opensourcepos jekkos 2015-09-05 09:52:48 +02:00
  • 0c92cc661f Remove date field type for filters jekkos 2015-09-05 09:52:30 +02:00
  • c87a936e22 Fix language issue FrancescoUK 2015-09-04 23:24:53 +01:00
  • c041a18624 Added Print button to print the current view FrancescoUK 2015-09-04 22:36:01 +01:00
  • ac3aab51fa Fix payment summary update on search jekkos 2015-09-04 23:35:23 +02:00
  • 9281995029 Fix payment summary update on search Merge branch 'master' of https://github.com/daN4cat/opensourcepos into daN4cat-master jekkos 2015-09-04 23:14:06 +02:00
  • f36c700129 Add date filtering in sales overview Add jquery-ui datepicker Format dates in sale and receiving forms according to configured dateformat and timeformat settings Add missing translations in sale (click delete when not selecting anything) Add search box back to search for customer sales and ticket numbers jekkos 2015-09-04 21:48:30 +02:00
  • d35ef071bb - Added cash only filter FrancescoUK 2015-09-04 19:30:43 +01:00
  • 852f83a8f6 Rename Overview to be Takings (normally used word in retail world) FrancescoUK 2015-09-04 10:31:02 +01:00
  • 7bbd651779 Remove commented out lines FrancescoUK 2015-09-03 23:31:20 +01:00
  • a624d21fcd Fix sale detail edit Make last row in sale table bold (css) Add default date range between yesterday and today Temporarily comment out payment type listing in table itself (tbd) jekkos 2015-09-04 08:44:20 +02:00
  • 9a2cafc1b1 Review payment type overview Add some padding to bottom of content area Fix invoice only searching Make start and end dates optional jekkos 2015-09-03 23:35:57 +02:00
  • b226a40efc Make Gift Card one payment item and not multiple ones in Sale/Overview and in Summary Payment report. FrancescoUK 2015-09-03 19:18:15 +01:00
  • 0b8a263443 Sale Overview change: FrancescoUK 2015-09-02 23:22:44 +01:00
  • 75fa706299 Sale Overview change FrancescoUK 2015-09-02 23:16:26 +01:00
  • 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