Commit Graph

38 Commits

Author SHA1 Message Date
jekkos-t520
a8e15f7db0 Add company logo upload feature in config (will show on receipts) 2015-02-12 15:47:31 +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
d6f27141af Add back create invoice label 2015-02-11 17:25:45 +01:00
jekkos-t520
4b48a97166 Remove duplicated labels after merge
Add accidentally removed language lines
2015-02-11 16:42:28 +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
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
da5c65e42e Fix location config bug (add check for disallowed characters)
Add labels for different languages (just default to english for now)
2015-02-10 16:34:16 +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
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
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
7efb1428f5 Basic image upload working now 2015-02-04 13:27:09 +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
1bf839601a Barcode patch applied (using barcodegen) 2015-02-02 12:44:58 +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
1d9661d0b0 Add name, price and company name as possible barcode labels 2015-01-24 15:06:29 +01:00
jekkos-t520
ad51278ba5 UPC config option now adds UPC content to barcodes as well 2015-01-22 23:36:56 +01:00
jekkos-t520
94287ddec4 Make barcode text configurable 2015-01-21 13:14:16 +01:00
jekkos-t520
883237a41c Regenerate language files (obsolete labels) 2015-01-16 18:43:39 +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
jekkos
37be5c9446 Merge pull request #17 from songwutk/patch-5
Update config_lang.php
2015-01-12 09:02:22 +01:00
jekkos
b1baa5609a Merge pull request #19 from songwutk/patch-7
Update items_lang.php
2015-01-12 09:00:53 +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
jekkos
f88baad4b7 Merge pull request #3 from songwutk/patch-2
fix bug duplicate config
2014-11-25 00:11:26 +01:00
jekkos
1dd9a7ea2c Merge pull request #4 from songwutk/patch-3
Update Thai translate
2014-11-06 08:52:27 +01:00
songwutk
e5e74f3ffb Update Thai translate
Update Thai translate
2014-10-26 06:37:53 +07:00
songwutk
851333b72c fix bug duplicate config
fix bug duplicate config & update thai translate
2014-10-26 06:29:07 +07:00
songwutk
00045c3f97 Rename Thai menu (Gift Card) 2014-10-26 06:14:28 +07:00
jekkos-t520
4b16b68f24 Added more granular permissions for report module
Extend permission system to allow 'submodule' permissions
Add permissions for stock locations (multistore support)
2014-09-22 20:41:53 +02:00
Padungsak
25fa78eedb Add multi-stock feature
Finished task
1. User can add stock location in config page. Adding format is StockA,StockB,StockC for example
2. Item page, there is no more quantity column show in cert table. The quantity tracking is integrated in inventory detail
3. Receiving page, There is a stock location for user to select before receiving or returning stuff
4. Sale page, There is a stock location which is for user to select a stock location they sell from

Remain task
1. Requisition work flow
2. Language editing
3. Remove unuse code

PS
2014-07-02 11:58:08 +07:00
jekkos-t520
e1bfac5eae requisition receipt fixed
database.sql script merged with current ospos one
remaining problems in reporting (sale_type to add in sales_temp query?)
data model should be refactored to allow more genericity for custom item locations (2+)
inventory tracking should be adapted to use multiple locations (instead of duplicating items for different locations)
2014-06-15 15:30:32 +02:00