Commit Graph

314 Commits

Author SHA1 Message Date
jekkos-t520
f2fd360d23 Minimal working OpenStreetMap autocomplete
Refactor jkey F-key bindings
2015-02-05 14:08:40 +01:00
jekkos-t520
bd763596b9 Bump version to 2.3.2 2015-02-01 14:48:25 +01:00
jekkos
dc12c7bdd2 Merge pull request #29 from marteserede/master
Two small edits (#27 and #28)
2015-01-30 08:01:22 +01:00
Martes Erede
4ddec66d7b #27 Using bc-style operations now. 2015-01-29 16:22:44 +01:00
Martes Erede
839849bf8d Merge branch 'master' of https://github.com/jekkos/opensourcepos 2015-01-29 16:16:55 +01:00
Martes Erede
b4ac74aa55 Bugfix #28 if invoice number is empty, set it to null, so no error occurs 2015-01-29 16:14:12 +01:00
jekkos-t520
8ac58a4612 Merge branch 'master' of https://github.com/jekkos/opensourcepos 2015-01-28 19:25:37 +01:00
jekkos-t520
08325c8cf7 Fix last stock_locations config quirks 2015-01-28 19:25:18 +01:00
jekkos
43f4e9e790 Update README.md
add bitcoin donation address to readme
2015-01-27 23:40:50 +01:00
jekkos-t520
f497ac54f1 Review stock location management in config screen (merged old refactor
branch)
Remove some obsolete labels from tranlations csv's
2015-01-27 23:27:43 +01:00
jekkos-t520
f323bec9ca Merge branch 'refactor/edit_stock_locations'
Conflicts:
	application/controllers/config.php
	application/models/stock_locations.php
2015-01-27 19:24:59 +01:00
jekkos-t520
24a6c9c34f Config location editing works now 2015-01-27 19:03:57 +01:00
jekkos-t520
4f456c75f7 Merge branch 'master' of https://github.com/jekkos/opensourcepos 2015-01-26 08:13:55 +01:00
jekkos-t520
8705b91bd3 Start refactoring the stock locations configuration screen 2015-01-26 08:11:21 +01:00
jekkos
16814f2d12 Update README.md 2015-01-25 16:39:31 +01:00
jekkos-t520
b9ee7b6b01 Invert quantity correction when deleting sales 2015-01-25 16:07:53 +01:00
jekkos-t520
344cb5c749 Add route for no_access controller with just one parameter
Remove permission dependency between sales, receivings and items module
Add explicit stock permission to sales and receiving modules
2015-01-25 15:46:42 +01:00
jekkos-t520
4556938154 Add cookie cleanup after search() and get_row() 2015-01-25 14:32:15 +01:00
jekkos-t520
a2b7ff688d Merge branch 'master' of https://github.com/jekkos/opensourcepos 2015-01-25 14:13:38 +01:00
jekkos
df71cb9cf8 Merge pull request #26 from marteserede/master
Fix for bug #39, error in excel_import
2015-01-25 00:22:26 +01:00
Martes Erede
927dbbabb6 Feature #27: Changing cost price while receiving items 2015-01-24 21:40:07 +01:00
Malte Srocke
7544aae394 Bug #25: Deleting a sale/receiving would not effect the stock/quantity. 2015-01-24 19:44:19 +01:00
jekkos-t520
868721c6f5 Adapt sql scripts for new barcode label options 2015-01-24 15:18:00 +01:00
jekkos-t520
1d9661d0b0 Add name, price and company name as possible barcode labels 2015-01-24 15:06:29 +01:00
jekkos-t520
e7fd57afdf Cleanup duplicate cookies when browsing items module 2015-01-23 00:18:43 +01:00
jekkos-t520
ad51278ba5 UPC config option now adds UPC content to barcodes as well 2015-01-22 23:36:56 +01:00
Malte Srocke
606eb01a67 - fixed excel import: if there was missing a location-id in the import-csv, then there would not have been created an entry into item_quantities for the item and location.
- fixed also the inventory info-part: before in the inventory-table there was no quantity inserted and data[10] as the location_id
2015-01-22 22:19:23 +01:00
jekkos-t520
94287ddec4 Make barcode text configurable 2015-01-21 13:14:16 +01:00
jekkos-t520
3d6d473145 Add item field autofocus in sales module
auto submit payment form when hitting enter in amount_tendered input
field
2015-01-19 12:35:09 +01:00
jekkos-t520
565a143c71 Merge branch 'master' of https://github.com/jekkos/opensourcepos 2.3.1 2015-01-19 12:07:40 +01:00
jekkos-t520
c959d97fd1 Fix for bug #39: item with 0 stock is not listed in item-list 2015-01-19 12:02:53 +01:00
jekkos
62c122e7ee Update WHATS_NEW.txt 2015-01-19 12:01:58 +01:00
jekkos
f3b3904b43 Merge pull request #23 from marteserede/master
Fixing session-table-name bug
2015-01-19 11:56:42 +01:00
jekkos-t520
883237a41c Regenerate language files (obsolete labels) 2015-01-16 18:43:39 +01:00
jekkos-t520
dd369118c5 Add check payment type to temp sales table again 2015-01-16 18:43:38 +01:00
jekkos-t520
b0aa62b044 Add turkish language (patch #24 Turkish Language) 2015-01-16 18:29:57 +01:00
jekkos-t520
84a141d9c5 Move translations into CSV files
Add generate_languages.php script (run using `php
generate_languages.php`)
Add generated language files
2015-01-16 17:40:41 +01:00
Malte Srocke
acb764a040 Changing config-sess_table_name value so no error occurs if dbprefix is changed to something else than "ospos_" 2015-01-14 23:34:43 +01:00
jekkos
37be5c9446 Merge pull request #17 from songwutk/patch-5
Update config_lang.php
2015-01-12 09:02:22 +01:00
jekkos
cd8d9a4a3d Merge pull request #16 from flodef/patch-4
Patch 4
2015-01-12 09:01:48 +01:00
jekkos
b1baa5609a Merge pull request #19 from songwutk/patch-7
Update items_lang.php
2015-01-12 09:00:53 +01:00
jekkos
614b4d48b6 Merge pull request #18 from songwutk/patch-6
Update module_lang.php (Thai)
2015-01-12 09:00:18 +01:00
songwutk
0b98050ea1 Update items_lang.php
Update Thai Translate
2015-01-12 12:36:24 +07:00
songwutk
3e0a6d9ba6 Update module_lang.php
Fix duplicate variable
2015-01-12 12:25:45 +07:00
songwutk
94c4a0c909 Update config_lang.php
Update more translate config from English.
2015-01-12 12:23:56 +07:00
Florian
ae454026dc Update upload_lang.php 2015-01-10 18:43:12 +01:00
Florian
e9e6290151 Update unit_test_lang.php 2015-01-10 18:42:41 +01:00
Florian
d7ed07f4f4 Update profiler_lang.php 2015-01-10 18:39:51 +01:00
Florian
ed3234ff30 Update number_lang.php 2015-01-10 18:39:22 +01:00
Florian
1ff7e271a5 Update migration_lang.php 2015-01-10 18:37:38 +01:00