jekkos-t520
28711df45a
Merge branch 'feature/item_pics'
...
Conflicts:
application/helpers/table_helper.php
2015-02-06 16:55:09 +01:00
jekkos-t520
f77f2e6e29
item pics are now resized and cached server side
2015-02-06 16:53:37 +01:00
jekkos-t520
707114805d
Fix autocomplete problem with new item in sales module
2015-02-06 15:48:57 +01:00
jekkos-t520
aebed9347b
Merge branch 'feature/address_completion'
...
Conflicts:
application/controllers/items.php
2015-02-06 15:01:54 +01:00
jekkos-t520
aa1c46738b
Country code is now resolved using ipinfo.io api call
...
Address autocompletion mostly works now
2015-02-06 14:59:11 +01:00
jekkos-t520
c04fa362b1
Add database backup feature in config
2015-02-06 11:22:03 +01:00
jekkos-t520
c7280e6018
Minor code review
2015-02-05 17:26:27 +01:00
jekkos-t520
ec6455647f
Merge branch 'feature/item_pics'
...
Conflicts:
database/2.3_to_2.3.1.sql
database/database.sql
translations/items_lang.csv
2015-02-05 17:05:51 +01:00
jekkos-t520
7081fe0338
Remove non free barcodegen library
...
Add width and height parameters for code39 barcode generation
2015-02-05 17:00:41 +01:00
jekkos-t520
8b6182dded
Further fine tuning address autocompletion
2015-02-05 15:26:37 +01:00
jekkos-t520
f2fd360d23
Minimal working OpenStreetMap autocomplete
...
Refactor jkey F-key bindings
2015-02-05 14:08:40 +01:00
jekkos-t520
8ccba57d98
Images are not removed from items when no file is chosen
...
Image thumbnails are resized proportionally and updated after update_row
refresh
Add some padding to the thumbnails
Move select specific styles to ospos.css stylesheet
2015-02-04 15:29:34 +01:00
jekkos-t520
7efb1428f5
Basic image upload working now
2015-02-04 13:27:09 +01:00
jekkos-t520
2f74c400bd
Fix receipt barcodes (revert to the old script)
2015-02-03 15:08:21 +01:00
jekkos-t520
7c24682584
Fix stock location removal
2015-02-02 16:55:26 +01:00
jekkos-t520
215a2104a1
Add item_id/upc barcode content option
...
Fix tabcontent width
Improve location config screen
2015-02-02 15:48:41 +01:00
jekkos-t520
aae02b7420
Move location config to separate tab
...
Fix javascript error message display in barcode and location config
2015-02-02 14:46:05 +01:00
jekkos-t520
48867d44be
Remove barcode.png
...
Set correct permissions on Arial.ttf
2015-02-02 13:24:26 +01:00
jekkos-t520
d3b9bc08c9
Merge branch 'master' into feature/barcode_patch
2015-02-02 12:54:04 +01:00
jekkos-t520
1bf839601a
Barcode patch applied (using barcodegen)
2015-02-02 12:44:58 +01:00
jekkos-t520
bd763596b9
Bump version to 2.3.2
2015-02-01 14:48:25 +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
08325c8cf7
Fix last stock_locations config quirks
2015-01-28 19:25:18 +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
8705b91bd3
Start refactoring the stock locations configuration screen
2015-01-26 08:11:21 +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
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
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
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
