Commit Graph
350 Commits
Author SHA1 Message Date
jekkos-t520 39301e7091 Fix receipts after sale and receiving completion 2015-02-09 23:37:19 +01:00
jekkos-t520 0a29809f7a Add item code as barcode label 2015-02-09 19:56:16 +01:00
jekkos-t520 4332bce401 Replace old code39 generator for receipts with new barcode_lib
functionality
2015-02-09 18:08:46 +01:00
jekkos-t520 42f4eb9c7b Add code128 as barcode_type 2015-02-09 17:32:45 +01:00
jekkos-t520 bd5e5b0b94 Remove item code as barcode parameter
Always show barcode itself as a second row
2015-02-09 17:03:52 +01:00
jekkos-t520 c763e8831f Increase width config tab
Increase width item kits form
Add ob_clean call to before force_download
2015-02-09 16:57:44 +01:00
jekkos-t520 0616560e3e Change barcode width/height constraints (set to minimum 10 for height
and 60 for width)
2015-02-09 09:47:01 +01:00
jekkos-t520 c7a898a89d Location autocomplete zipcode/city will fallback on different fields
when defaults are empty
Try to fix default text removal in register's customer/item selection fields
2015-02-09 08:51:00 +01:00
jekkos-t520 377284f491 Add company name to barcode layout options 2015-02-08 18:05:29 +01:00
jekkos-t520 93968814db Add sales and receivings format in general config 2015-02-08 17:51:03 +01:00
jekkos-t520 941ff4cd4a Upgrade jquery form to 3.51
Make item_number field non required
Save item_number properly
2015-02-07 20:22:21 +01:00
jekkos-t520 4d2de519a1 Set explicit version number for jquery-validation (1.13.1) 2015-02-06 17:34:37 +01:00
jekkos-t520 8fd315e389 Fix error message styling + add UPC required error message in items_lang 2015-02-06 17:28:49 +01:00
jekkos-t520 fe786b5888 Fix enable invoice labels (sales and receivings) 2015-02-06 17:06:31 +01:00
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 080ae5df3a Upgrade jQuery to 1.8.3
Upgrade jQuery Validation to 1.3.2
Add jQuery migrate (for developmet purpose)
2015-02-06 14:58:22 +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 374f9556d1 Don't try to preview images when there are none 2015-02-05 17:25:35 +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 46cfe0b18a Add databse upgrade script for 2.3.2 2015-02-03 17:33:43 +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
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