mirror/opensourcepos
1
0 Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-09-28 21:55:18 -04:00
Code Issues Packages Projects Releases Wiki Activity
2,488 Commits 56 Branches 40 Tags
11ff84e71d37afeb3e7c0cefbf6cf68ef0fbbc19
Commit Graph
42 Commits
Author SHA1 Message Date
jekkos 0e4fcadd9f Resync language files (#1242) 2017-08-13 18:40:12 +02:00
jekkos 77145d29a8 Regnerate language files (#1330) 2017-06-02 19:47:13 +02:00
jekkos 4db76371fd Regenerate langauge files (#1242) 2017-04-18 19:12:41 +02:00
jekkos 5cb8141641 Regenerate langauge files 2017-03-18 16:12:57 +01:00
Songwut Kanchanakosai b0b8c0e936 Translated using Weblate (Thai) 
Currently translated at 100.0% (178 of 178 strings)

Translated using Weblate (Thai)

Currently translated at 100.0% (61 of 61 strings)

Translated using Weblate (Thai)

Currently translated at 100.0% (178 of 178 strings)

Translated using Weblate (Thai)

Currently translated at 100.0% (50 of 50 strings)

Translated using Weblate (Thai)

Currently translated at 100.0% (117 of 117 strings)
 2016-11-08 11:04:21 +01:00
Piyaporn T e7815a1251 Translated using Weblate (Thai) 
Currently translated at 100.0% (66 of 66 strings)

Translated using Weblate (Thai)

Currently translated at 100.0% (89 of 89 strings)

Translated using Weblate (Thai)

Currently translated at 100.0% (117 of 117 strings)
 2016-09-27 12:42:29 +02:00
Piyaporn T dea8683fd4 Translated using Weblate (Thai) 
Currently translated at 78.7% (52 of 66 strings)

Translated using Weblate (Thai)

Currently translated at 100.0% (176 of 176 strings)

Translated using Weblate (Thai)

Currently translated at 100.0% (176 of 176 strings)

Translated using Weblate (Thai)

Currently translated at 100.0% (19 of 19 strings)

Translated using Weblate (Thai)

Currently translated at 100.0% (50 of 50 strings)

Translated using Weblate (Thai)

Currently translated at 100.0% (84 of 84 strings)

Translated using Weblate (Thai)

Currently translated at 100.0% (117 of 117 strings)

Translated using Weblate (Thai)

Currently translated at 100.0% (117 of 117 strings)
 2016-09-21 09:34:59 +02:00
FrancescoUK b96ebeed22 XSS clean Sales (#39), refactored Sales Controller (#639), added Send Email in Receipt & Invoice (#475) 2016-06-12 18:15:43 +01:00
FrancescoUK 1ac0182867 Added discount % to customer (#375) and added Total spent by customer (#369), both added in register and form 2016-04-16 22:26:50 +01:00
FrancescoUK 972f0e81f4 change edit in sales/register and receiving to be a glyphicon with update label (#405 #116) 2016-03-26 10:55:07 +00:00
FrancescoUK 1a41c6a360 remove unused legend strings (removed from forms) (#116) 2016-03-13 13:43:09 +00:00
FrancescoUK f32bba31b5 fix sales/register return, make complete replacing add payment button on 0 amount due, remove pop up on complete and suspend (#116) 2016-03-11 21:55:31 +00:00
FrancescoUK 05a1dd561c sales/register alignments, added customer info (#116, #369) 2016-03-10 19:21:54 +00:00
jekkos a201d18938 Add specific warning when stock goes below reorder level in sales (#365, #336) 2016-03-02 08:28:50 +01:00
jekkos 0ddd80dc2c Regenerate thai language (#205) 2015-10-20 22:00:18 +02:00
jekkos 9281995029 Fix payment summary update on search 
Merge branch 'master' of https://github.com/daN4cat/opensourcepos into daN4cat-master
 2015-09-04 23:14:06 +02:00
jekkos f36c700129 Add date filtering in sales overview 
Add jquery-ui datepicker
Format dates in sale and receiving forms according to configured
dateformat and timeformat settings
Add missing translations in sale (click delete when not selecting
anything)
Add search box back to search for customer sales and ticket numbers
 2015-09-04 22:09:24 +02:00
FrancescoUK d35ef071bb - Added cash only filter 
- Set to 'all' the sale_type so even returns are shown (we might want to add a drop down filter for this too)
 2015-09-04 19:30:43 +01:00
FrancescoUK 852f83a8f6 Rename Overview to be Takings (normally used word in retail world) 2015-09-04 10:31:02 +01:00
songwutk 9ae6e3242b Update Thai translate (Pull requests #98, #99, #100, #101, #102) 2015-08-11 18:49:28 +02:00
jekkos de3d7ce726 Add new language line for check_remainder 2015-04-07 19:10:46 +02:00
jekkos 8ff742085a Multiple total disconuts are shown correctly now 2015-03-31 21:56:44 +02:00
jekkos-t520 b29ec8ef31 Fix show discounts functionality 
Review tax price calculations
Remove tax exclusive price in invoice.php template
 2015-03-07 19:35:13 +01:00
jekkos-t520 b2f76f3fe6 Improve thai translation (Merge Pull Request #20) 
Improve login screen
 2015-02-26 21:55:55 +01:00
jekkos-t520 9351a263ee Review sales overview pagination (use generic intialisation in 
secure_area.php)
 2015-02-25 13:30:03 +01:00
jekkos-t520 c389e6030c Fix pagination for all modules (links updated for index+search through 
AJAX)
 2015-02-20 17:36:03 +01:00
jekkos-t520 0f77300131 Sales overview added to register screen 
Add pagination to default search routine
Remove payment_type column from sales table (was redundant)
Fix search spinner location (just toggle ac_loading class)
Complete sale labels
 2015-02-20 15:54:13 +01:00
jekkos-t520 babddd524c Refactor variable substitution for receiving invoice numbers 
Use localStorage to store selected printer
Add printer selection for invoice template
Print after sale checkbox is now present in receivings and sales screen
Remove print after sale options from receipt_config
Add default translations to receivings_lang.csv
Fix some bugs preventing to print and email at the same time
 2015-02-19 18:10:31 +01:00
jekkos-t520 42c30bf30b Invoice PDF generation working properly 
PDF's can be sent as mail attachment
 2015-02-19 15:32:16 +01:00
jekkos-t520 50006aeb6a Email pdf generation 
Added invoice template
Add latest dompdf release
 2015-02-18 18:18:09 +01:00
jekkos-t520 a809807288 jsPrintSetup plugin integration 
All receipt print configuration options present now
 2015-02-17 16:46: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 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 fe786b5888 Fix enable invoice labels (sales and receivings) 2015-02-06 17:06:31 +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 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
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