Commit Graph

129 Commits

Author SHA1 Message Date
jekkos-t520
9b61e0ad67 Add proper location id for 0 quantities 2015-02-17 11:14:28 +01:00
jekkos-t520
40eef74aa0 Adapt load_config hook to fallback to english if no valid language is
present
Move CI system language files back to their correct location
(form_validation_lang)
Add upload_lang.php and email_lang.php to system files (default english
version for the time being)
Add account_number check when importing customer data from excel
Avoid unnecessary calls to check_item_number when importing items from
excel
2015-02-17 11:06:28 +01:00
jekkos-t520
c7c4ac15d6 Set update_row response datatype to html
Remove MY_Validation override (not needed anymore)
Add jquery validation check for account_number
2015-02-17 09:03:47 +01:00
jekkos-t520
9d0fb43fb1 add file extension to company logo filename 2015-02-15 12:53:56 +01:00
jekkos-t520
99c37ad9a7 Show real giftcard remainder on receipt (fix) 2015-02-12 15:51:46 +01:00
jekkos-t520
a8e15f7db0 Add company logo upload feature in config (will show on receipts) 2015-02-12 15:47:31 +01:00
jekkos-t520
b5c33b4fcb Add $YCO parameter (invoice numbering per year) 2015-02-12 15:19:57 +01:00
jekkos-t520
fe081779c5 Fix number_format bug when entering an empty payment amount
Add giftcard balance to final receipt (if giftcard payment present)
2015-02-12 14:34:08 +01:00
jekkos-t520
1267e92117 Fix sale and receiving return (incorrect receipt numbers were generated)
Fix item form width in receivings
2015-02-12 10:47:09 +01:00
jekkos-t520
ade913f0e4 Merge github pull request #30 2015-02-11 16:31:31 +01:00
jekkos-t520
4e6a6d6434 Add gender to people + employees form 2015-02-11 14:29:46 +01:00
jekkos-t520
57cbbdab56 Remove content-length header for download
Clean headers (if already output) before force_download
2015-02-11 14:00:27 +01:00
jekkos-t520
4b99252a83 Change font-family globally to fixed order Arial-sans-serif-...
Remove second submit button on general_config page
2015-02-11 13:47:20 +01:00
jekkos-t520
8b1186c4f9 Fix barcode generation for item kits 2015-02-11 13:31:08 +01:00
jekkos-t520
2e36b7e03b Fix undefined offset error when using company_name with trailing
whitespace
2015-02-11 13:14:33 +01:00
jekkos-t520
f021215cbb Show proper error message on upload misconfiguration
Use jquery-validation to do item_number check
Fix invoice_number validation in sale edit form
2015-02-11 11:32:58 +01:00
jekkos-t520
9191eb4535 Show error messages in item form when upload fails
Remove check for validation flag in handle_server_validation
2015-02-11 08:53:16 +01:00
jekkos-t520
0fdb760d6f Add specific mime type for backup download 2015-02-10 21:20:10 +01:00
jekkos-t520
a46221ad04 Change compression method to zip again (retry) 2015-02-10 18:32:17 +01:00
jekkos-t520
3594c348ee Fix stock location permissions for github issue #34 2015-02-10 16:04:52 +01:00
jekkos-t520
c40ad31ed0 Review item import (check item_number and throw proper error) 2015-02-10 15:43:10 +01:00
jekkos-t520
49a0a4e127 download backpus as plain sql file 2015-02-10 11:00:09 +01:00
jekkos-t520
d208e6dccb set menubar font sizes to px instead of pt
add item_number duplication check when adding new items
fix barcode on receivings receipt (after completion)
change backup db download format to gz
2015-02-10 10:56:37 +01:00
jekkos-t520
8b2a2f8074 Fix sale_id generation for sale receipt 2015-02-10 00:31:53 +01:00
jekkos-t520
39301e7091 Fix receipts after sale and receiving completion 2015-02-09 23:37:19 +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
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
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
aebed9347b Merge branch 'feature/address_completion'
Conflicts:
	application/controllers/items.php
2015-02-06 15:01:54 +01:00
jekkos-t520
c04fa362b1 Add database backup feature in config 2015-02-06 11:22:03 +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
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
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
1bf839601a Barcode patch applied (using barcodegen) 2015-02-02 12:44:58 +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
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
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-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