FrancescoUK
f1cf3d3c87
Release 3.2.3
2018-06-13 21:37:15 +01:00
FrancescoUK
8138db1a80
Fix Item form issue ( #2021 )
2018-06-13 21:19:55 +01:00
FrancescoUK
c5632a2f5a
Release 3.2.2
2018-06-06 21:35:52 +01:00
FrancescoUK
2e7e9cecd8
Revert CSRF change ( #2009 )
2018-06-06 21:28:52 +01:00
FrancescoUK
5ce7fcf5ed
Bump version to 3.3.0 for next phase
2018-06-04 22:01:10 +01:00
FrancescoUK
d3c215f744
Release 3.2.1
2018-06-04 21:41:10 +01:00
Aril Apria Susanto
73e2d01c91
Translated using Weblate (Indonesian)
...
Currently translated at 93.8% (152 of 162 strings)
2018-06-04 19:13:46 +02:00
Aril Apria Susanto
0a299d8858
Translated using Weblate (Indonesian)
...
Currently translated at 74.1% (201 of 271 strings)
2018-06-04 19:13:46 +02:00
Aril Apria Susanto
5adc3b18c2
Translated using Weblate (Indonesian)
...
Currently translated at 100.0% (65 of 65 strings)
2018-06-04 19:13:46 +02:00
FrancescoUK
0c2c999746
Minor improvement
2018-06-03 16:39:40 +01:00
Rostislav Hučka
9d072da872
Translated using Weblate (Czech)
...
Currently translated at 85.1% (138 of 162 strings)
2018-05-31 17:59:36 +02:00
WebShells
a610346576
Translated using Weblate (French)
...
Currently translated at 100.0% (110 of 110 strings)
2018-05-31 17:59:34 +02:00
WebShells
e3e4c8b3a4
Translated using Weblate (French)
...
Currently translated at 100.0% (18 of 18 strings)
Translation: opensourcepos/expenses_categories
Translate-URL: http://weblate.jpeelaer.net/projects/ospos/expenses_categories/fr/
2018-05-31 17:59:22 +02:00
WebShells
af8cb4243b
Translated using Weblate (French)
...
Currently translated at 100.0% (43 of 43 strings)
Translation: opensourcepos/expenses
Translate-URL: http://weblate.jpeelaer.net/projects/ospos/expenses/fr/
2018-05-31 14:35:14 +02:00
WebShells
3c87bdec57
Translated using Weblate (French)
...
Currently translated at 100.0% (7 of 7 strings)
Translation: opensourcepos/enum
Translate-URL: http://weblate.jpeelaer.net/projects/ospos/enum/fr/
2018-05-31 14:25:52 +02:00
WebShells
4062b9890b
Translated using Weblate (French)
...
Currently translated at 100.0% (30 of 30 strings)
Translation: opensourcepos/taxes
Translate-URL: http://weblate.jpeelaer.net/projects/ospos/taxes/fr/
2018-05-31 14:24:38 +02:00
WebShells
0ccfe72a26
Translated using Weblate (French)
...
Currently translated at 80.0% (88 of 110 strings)
2018-05-31 13:58:39 +02:00
WebShells
79ca657a6e
Translated using Weblate (French)
...
Currently translated at 100.0% (35 of 35 strings)
Translation: opensourcepos/module
Translate-URL: http://weblate.jpeelaer.net/projects/ospos/module/fr/
2018-05-31 13:58:21 +02:00
Rostislav Hučka
36bf371f38
Translated using Weblate (Czech)
...
Currently translated at 58.8% (30 of 51 strings)
2018-05-31 13:29:14 +02:00
Rostislav Hučka
efc689530e
Translated using Weblate (Czech)
...
Currently translated at 92.2% (95 of 103 strings)
2018-05-31 13:29:14 +02:00
WebShells
6bc5842402
Translated using Weblate (French)
...
Currently translated at 100.0% (35 of 35 strings)
Translation: opensourcepos/module
Translate-URL: http://weblate.jpeelaer.net/projects/ospos/module/fr/
2018-05-31 13:29:14 +02:00
Rostislav Hučka
d4761ad095
Translated using Weblate (Czech)
...
Currently translated at 92.2% (95 of 103 strings)
2018-05-31 13:29:14 +02:00
Rostislav Hučka
cdf0c819ac
Added translation using Weblate (Czech)
2018-05-31 13:29:14 +02:00
FrancescoUK
fe2ae55e94
Minor tidy up
2018-05-30 11:49:26 +02:00
FrancescoUK
fea0462407
Remove additional csrf_form_base calls, general tidy up
2018-05-30 11:49:26 +02:00
jekkos
c9a50cdeaf
Check first if type parameter exists ( #1990 )
2018-05-30 11:49:26 +02:00
jekkos
04cbd95c13
Add as query string in case we use url encoded form ( #1990 )
2018-05-30 11:49:26 +02:00
jekkos
07d4b852e0
Hook $.ajax instead of $.post
2018-05-30 11:49:26 +02:00
jekkos
5d00a4354c
Update .gitignore, add generated database scripts
2018-05-30 11:49:26 +02:00
Rostislav Hučka
6e33838fb7
Translated using Weblate (Czech)
...
Currently translated at 94.2% (33 of 35 strings)
Translation: opensourcepos/module
Translate-URL: http://weblate.jpeelaer.net/projects/ospos/module/cs/
2018-05-30 10:15:36 +02:00
Rostislav Hučka
e96b54509a
Translated using Weblate (Czech)
...
Currently translated at 89.3% (92 of 103 strings)
2018-05-30 10:02:44 +02:00
Rostislav Hučka
530c75df4d
Added translation using Weblate (Czech)
2018-05-30 10:02:44 +02:00
Rostislav Hučka
a8bb790ebe
Translated using Weblate (Czech)
...
Currently translated at 89.3% (92 of 103 strings)
2018-05-30 10:02:44 +02:00
Rostislav Hučka
f82701adae
Translated using Weblate (Czech)
...
Currently translated at 100.0% (20 of 20 strings)
2018-05-30 10:02:44 +02:00
Rostislav Hučka
36ea11f96f
Added translation using Weblate (Czech)
2018-05-30 10:02:44 +02:00
FrancescoUK
4fe4c8eb57
Merge pull request #2006 from RuleDomain/fix-receivings-receiving-quantity
...
Insure that the receiving_quantity is not zero
2018-05-30 05:38:00 +01:00
Steve Ireland
4d41ad5735
Insure that the receiving_quantity is not zero
2018-05-29 19:45:14 -04:00
WebShells
fae7702719
Translated using Weblate (French)
...
Currently translated at 97.1% (34 of 35 strings)
Translation: opensourcepos/module
Translate-URL: http://weblate.jpeelaer.net/projects/ospos/module/fr/
2018-05-28 13:22:28 +02:00
FrancescoUK
ed888be463
Update README.md
2018-05-27 21:24:06 +01:00
FrancescoUK
c423bc4222
Fix Mailchimp config issue due to missing json payload format
2018-05-27 19:20:12 +01:00
WebShells
aa624f3680
Translated using Weblate (French)
...
Currently translated at 100.0% (17 of 17 strings)
2018-05-25 10:36:21 +02:00
WebShells
121cc000b3
Translated using Weblate (French)
...
Currently translated at 100.0% (30 of 30 strings)
2018-05-25 10:36:08 +02:00
WebShells
458118469a
Translated using Weblate (French)
...
Currently translated at 100.0% (17 of 17 strings)
2018-05-23 18:44:13 +02:00
Weblate
07d1a5fb9b
Translated using Weblate (French)
...
Currently translated at 100.0% (17 of 17 strings)
2018-05-23 18:44:13 +02:00
WebShells
78436ee39d
Translated using Weblate (French)
...
Currently translated at 100.0% (17 of 17 strings)
2018-05-22 23:56:25 +02:00
WebShells
3f1f4c8e05
Translated using Weblate (French)
...
Currently translated at 100.0% (103 of 103 strings)
2018-05-22 23:56:21 +02:00
WebShells
2704bd7e83
Translated using Weblate (French)
...
Currently translated at 100.0% (30 of 30 strings)
2018-05-22 23:56:16 +02:00
Aril Apria Susanto
5d3643a8d0
Translated using Weblate (Indonesian)
...
Currently translated at 89.5% (145 of 162 strings)
2018-05-21 16:28:21 +02:00
Aril Apria Susanto
454155f8de
Translated using Weblate (Indonesian)
...
Currently translated at 97.1% (34 of 35 strings)
Translation: opensourcepos/module
Translate-URL: http://weblate.jpeelaer.net/projects/ospos/module/id/
2018-05-21 16:27:53 +02:00
WebShells
e03f7a7af6
Translated using Weblate (French)
...
Currently translated at 100.0% (103 of 103 strings)
2018-05-21 14:16:50 +02:00
WebShells
7cce40af25
Translated using Weblate (French)
...
Currently translated at 100.0% (48 of 48 strings)
2018-05-20 13:10:07 +02:00
WebShells
8d7fb2cd25
Translated using Weblate (French)
...
Currently translated at 100.0% (271 of 271 strings)
2018-05-20 13:09:53 +02:00
WebShells
dcd78d8266
Translated using Weblate (French)
...
Currently translated at 100.0% (48 of 48 strings)
2018-05-19 22:18:58 +02:00
WebShells
3dc950d930
Translated using Weblate (French)
...
Currently translated at 100.0% (162 of 162 strings)
2018-05-19 22:02:56 +02:00
WebShells
7ba8ddb0c0
Translated using Weblate (French)
...
Currently translated at 100.0% (271 of 271 strings)
2018-05-19 21:47:37 +02:00
WebShells
c3d232016e
Translated using Weblate (Arabic)
...
Currently translated at 100.0% (110 of 110 strings)
2018-05-19 20:57:13 +02:00
WebShells
9b6bfd6e2c
Translated using Weblate (Arabic)
...
Currently translated at 100.0% (162 of 162 strings)
2018-05-19 20:56:31 +02:00
WebShells
0e2dc1d6da
Translated using Weblate (Arabic)
...
Currently translated at 100.0% (48 of 48 strings)
2018-05-19 20:55:23 +02:00
WebShells
5f072aecfa
Translated using Weblate (Arabic)
...
Currently translated at 100.0% (271 of 271 strings)
2018-05-19 20:44:49 +02:00
FrancescoUK
c803f01774
Translated using Weblate (Italian)
...
Currently translated at 100.0% (30 of 30 strings)
Translation: opensourcepos/taxes
Translate-URL: http://weblate.jpeelaer.net/projects/ospos/taxes/it/
2018-05-13 18:44:39 +02:00
Rostislav Hučka
8b006f5386
Translated using Weblate (Czech)
...
Currently translated at 87.5% (7 of 8 strings)
2018-05-13 18:42:59 +02:00
Rostislav Hučka
f05136f203
Translated using Weblate (Czech)
...
Currently translated at 85.1% (138 of 162 strings)
2018-05-13 18:42:59 +02:00
Rostislav Hučka
ced7a7c641
Translated using Weblate (Czech)
...
Currently translated at 96.9% (63 of 65 strings)
2018-05-13 18:42:59 +02:00
Rostislav Hučka
6ab0e52a7c
Translated using Weblate (Czech)
...
Currently translated at 84.5% (137 of 162 strings)
2018-05-13 18:42:59 +02:00
Rostislav Hučka
b65ad2ae74
Translated using Weblate (Czech)
...
Currently translated at 83.3% (135 of 162 strings)
2018-05-13 18:42:59 +02:00
Rostislav Hučka
fe20fb24ca
Translated using Weblate (Czech)
...
Currently translated at 100.0% (8 of 8 strings)
2018-05-13 18:42:59 +02:00
Rostislav Hučka
d1f74b60c7
Added translation using Weblate (Czech)
2018-05-13 18:42:59 +02:00
Rostislav Hučka
69c222f686
Translated using Weblate (Czech)
...
Currently translated at 96.9% (63 of 65 strings)
2018-05-13 18:42:59 +02:00
Rostislav Hučka
d861b12abe
Added translation using Weblate (Czech)
2018-05-13 18:42:59 +02:00
Rostislav Hučka
bf8d4d5f2b
Translated using Weblate (Czech)
...
Currently translated at 100.0% (12 of 12 strings)
2018-05-13 18:42:59 +02:00
Rostislav Hučka
7b30bd6048
Added translation using Weblate (Czech)
2018-05-13 18:42:59 +02:00
Rostislav Hučka
ac92e7cf7f
Translated using Weblate (Czech)
...
Currently translated at 82.7% (134 of 162 strings)
2018-05-13 18:42:59 +02:00
Rostislav Hučka
15c161b6d1
Translated using Weblate (Czech)
...
Currently translated at 15.5% (16 of 103 strings)
2018-05-13 18:42:59 +02:00
Rostislav Hučka
7c3a6344b7
Translated using Weblate (Czech)
...
Currently translated at 0.3% (1 of 271 strings)
2018-05-13 18:42:59 +02:00
Rostislav Hučka
c0115d51df
Added translation using Weblate (Czech)
2018-05-13 18:42:59 +02:00
Rostislav Hučka
2cfcd4d8a7
Added translation using Weblate (Czech)
2018-05-13 18:42:59 +02:00
Rostislav Hučka
08c48bc9a7
Translated using Weblate (Czech)
...
Currently translated at 100.0% (8 of 8 strings)
2018-05-13 18:42:59 +02:00
Rostislav Hučka
1d8a79b2a9
Added translation using Weblate (Czech)
2018-05-13 18:42:59 +02:00
Rostislav Hučka
4bb3e2774b
Added translation using Weblate (Czech)
2018-05-13 18:42:59 +02:00
truchosky
fe7ba26ab8
Translated using Weblate (Spanish)
...
Currently translated at 100.0% (103 of 103 strings)
2018-05-13 18:42:59 +02:00
Rostislav Hučka
ea1a51c9f8
Added translation using Weblate (Czech)
2018-05-13 18:42:59 +02:00
FrancescoUK
b13ac8d4f0
Fix Summary report table header ( #1972 )
2018-05-12 20:34:27 +01:00
FrancescoUK
37390ae9dd
Fix issue with barcode scanner and customer field ( #871 )
2018-05-12 18:56:25 +01:00
FrancescoUK
5f0d8b2312
Add extra payment combinations ( #1982 )
2018-05-12 17:21:18 +01:00
FrancescoUK
b35ea35654
Fix Italian translation errors ( #1978 )
2018-05-12 14:02:44 +01:00
FrancescoUK
6071f9ab97
"fix" to wrong summary_payment report ( #1972 )
2018-05-12 13:47:16 +01:00
FrancescoUK
4558cf0e50
Add spaces to SQL statement
2018-05-12 13:42:47 +01:00
truchosky
507294a4a6
temporary "fix" to wrong summary_payment report
...
I still cant find a solution to this, summary payment in cash is wrong, like you know it considers payment ammount and it doesnt discount change, so the cash payment will be always a higher value, and if you try to discount change directly on query then it only discounts sales with 1 item, and not discounts sales with multiple items, the condition sales_items.line = 1 cause that.
This change considers item price * item qty, so at lest summary payment in cash will be acurated no matter tendered ammount but leaves out "due sales"
2018-05-11 21:48:52 -03:00
Weblate
f8f4644987
Translated using Weblate (Flemish)
...
Currently translated at 100.0% (65 of 65 strings)
2018-05-07 00:11:14 +02:00
Weblate
510fe8b14e
Translated using Weblate (Flemish)
...
Currently translated at 95.5% (259 of 271 strings)
2018-05-07 00:11:14 +02:00
FrancescoUK
a3408c31ce
Missing Payment Count ( #1972 )
2018-05-06 08:50:09 +01:00
truchosky
1acac824a1
Missing Payment Count
2018-05-06 00:26:19 -03:00
PICCORO Lenz McKAY
fa4e7cefac
Translated using Weblate (Spanish)
...
Currently translated at 100.0% (162 of 162 strings)
2018-05-05 15:53:03 +02:00
PICCORO Lenz McKAY
a77a2be2ce
Translated using Weblate (Russian)
...
Currently translated at 96.6% (262 of 271 strings)
2018-05-05 15:53:03 +02:00
PICCORO Lenz McKAY
b93c3b2177
Translated using Weblate (Spanish)
...
Currently translated at 100.0% (110 of 110 strings)
2018-05-05 15:53:03 +02:00
PICCORO Lenz McKAY
ec673dc596
Translated using Weblate (Spanish)
...
Currently translated at 100.0% (271 of 271 strings)
2018-05-05 15:53:03 +02:00
PICCORO Lenz McKAY
dff043534d
Translated using Weblate (Spanish)
...
Currently translated at 100.0% (162 of 162 strings)
2018-05-05 15:53:03 +02:00
PICCORO Lenz McKAY
7a3ac75e53
Translated using Weblate (Spanish)
...
Currently translated at 100.0% (48 of 48 strings)
2018-05-05 15:53:03 +02:00
FrancescoUK
7234f2af53
Fix Docker run command
2018-05-05 09:02:39 +01:00
h00pl4
7ee6221952
Fix Docker run command
...
I believe that the quotation mark is in the wrong place currently.
2018-05-05 14:00:57 +10:00
FrancescoUK
0ba225cafd
Fix CSRF error at login time ( #1535 )
2018-05-02 22:04:50 +01:00
FrancescoUK
e4690eb670
Translated using Weblate (Italian)
...
Currently translated at 100.0% (35 of 35 strings)
Translation: opensourcepos/module
Translate-URL: http://weblate.jpeelaer.net/projects/ospos/module/it/
2018-05-02 23:00:11 +02:00
FrancescoUK
be6e3480c2
Translated using Weblate (Italian)
...
Currently translated at 100.0% (43 of 43 strings)
Translation: opensourcepos/expenses
Translate-URL: http://weblate.jpeelaer.net/projects/ospos/expenses/it/
2018-05-02 23:00:05 +02:00
FrancescoUK
18f65dbb89
Translated using Weblate (Italian)
...
Currently translated at 100.0% (110 of 110 strings)
2018-05-02 22:57:22 +02:00
FrancescoUK
2b7688d962
Translated using Weblate (Italian)
...
Currently translated at 100.0% (162 of 162 strings)
2018-05-02 22:57:06 +02:00
FrancescoUK
c7cebfa3a3
Translated using Weblate (Italian)
...
Currently translated at 100.0% (48 of 48 strings)
2018-05-02 22:56:11 +02:00
FrancescoUK
be3b50e36d
Translated using Weblate (Italian)
...
Currently translated at 100.0% (271 of 271 strings)
2018-05-02 22:55:02 +02:00
Weblate
ee82f3e804
Translated using Weblate (Flemish)
...
Currently translated at 100.0% (65 of 65 strings)
2018-05-02 08:50:30 +02:00
Trần Ngọc Quân
180d40f00d
Translated using Weblate (Vietnamese)
...
Currently translated at 100.0% (271 of 271 strings)
2018-05-02 03:27:59 +02:00
Trần Ngọc Quân
f43df16d10
Translated using Weblate (Vietnamese)
...
Currently translated at 100.0% (110 of 110 strings)
2018-05-02 03:19:20 +02:00
Trần Ngọc Quân
c54b8dccd3
Translated using Weblate (Vietnamese)
...
Currently translated at 100.0% (48 of 48 strings)
2018-05-02 03:18:54 +02:00
Trần Ngọc Quân
d65ee713ca
Translated using Weblate (Vietnamese)
...
Currently translated at 100.0% (162 of 162 strings)
2018-05-02 03:16:44 +02:00
Weblate
59a4f55cb5
Translated using Weblate (Flemish)
...
Currently translated at 100.0% (48 of 48 strings)
2018-05-01 23:18:12 +02:00
jekkos
34da40ce0b
Sync language strings
2018-05-01 23:12:39 +02:00
FrancescoUK
9d149ad4f3
Autoreturn to Sale page after receipt printing ( #1966 )
2018-05-01 20:46:18 +01:00
FrancescoUK
455e39260d
Translated using Weblate (Italian)
...
Currently translated at 100.0% (268 of 268 strings)
2018-05-01 19:13:00 +02:00
FrancescoUK
0015bdffcf
Remove example entries from expenses tables
2018-04-30 21:33:54 +01:00
FrancescoUK
bcd1b05961
Fix customer import issue and complete anonymisation ( #1949 )
2018-04-30 21:28:32 +01:00
jekkos
c62dc5fe2a
Add demo url to README.md ( #1956 )
2018-04-30 11:47:11 +02:00
jekkos
2426fad52e
Add FORCE_HTTPS environment variable ( #1956 )
2018-04-30 11:09:20 +02:00
FrancescoUK
fdbdf55e71
Better Customer data privacy protection ( #1949 )
2018-04-29 14:13:00 +01:00
FrancescoUK
3e9e144075
Fix subtle error with Stock location SQL query
2018-04-29 10:38:38 +01:00
FrancescoUK
1fe94c3626
Fix rendering of discounted unit price on invoice ( #1924 #1958 )
2018-04-28 12:38:33 +01:00
Steve Ireland
b4f8667047
Fix rendering of discounted unit price on invoice and quotes.
2018-04-27 08:55:22 -04:00
jekkos
fe2c639f8a
Remove duplicated .travis.yml ( #1954 )
2018-04-24 23:26:35 +02:00
FrancescoUK
c8d1bfee35
Fix Expense amount and tax amount update issue ( #1955 )
2018-04-24 20:39:41 +01:00
FrancescoUK
72825acfaf
Fix Item Kit Items receipt issues ( #1950 )
2018-04-22 09:13:01 +01:00
FrancescoUK
0e14d5390f
Minor fixes
2018-04-22 09:12:01 +01:00
Steve Ireland
cdd966878d
Various fixes for the item kit feature.
2018-04-21 17:46:39 -04:00
FrancescoUK
9384b53a22
Bump version to 3.2.1 for next phase
2018-04-14 15:24:47 +01:00
FrancescoUK
4bab3fc4e3
Code style adjustments
2018-04-14 14:40:02 +01:00
FrancescoUK
5c1baf20b0
Improve get_found_rows query performance ( #1940 )
2018-04-13 19:54:22 +01:00
FrancescoUK
075d4e1aeb
Improve get_found_rows query performance ( #1940 )
2018-04-12 22:42:56 +01:00
Aril Apria Susanto
8dc7855e56
Translated using Weblate (Indonesian)
...
Currently translated at 65.9% (29 of 44 strings)
2018-04-12 17:34:40 -04:00
WebShells
d992c434d8
Translated using Weblate (French)
...
Currently translated at 100.0% (162 of 162 strings)
2018-04-11 16:38:10 -04:00
anonymous
1c07ba1945
Translated using Weblate (Arabic)
...
Currently translated at 100.0% (162 of 162 strings)
2018-04-11 16:38:06 -04:00
WebShells
6357491874
Translated using Weblate (Arabic)
...
Currently translated at 100.0% (110 of 110 strings)
2018-04-11 16:38:05 -04:00
WebShells
8880061e0e
Translated using Weblate (French)
...
Currently translated at 100.0% (51 of 51 strings)
2018-04-11 16:38:05 -04:00
WebShells
c397a81b48
Translated using Weblate (French)
...
Currently translated at 100.0% (68 of 68 strings)
2018-04-11 16:38:00 -04:00
WebShells
76e1516147
Translated using Weblate (French)
...
Currently translated at 100.0% (35 of 35 strings)
2018-04-11 16:37:53 -04:00
Leonardo Salazar
c495cf29a0
Translated using Weblate (Spanish)
...
Currently translated at 100.0% (44 of 44 strings)
2018-04-11 16:37:50 -04:00
WebShells
c64ac468a3
Translated using Weblate (Arabic)
...
Currently translated at 100.0% (44 of 44 strings)
2018-04-11 16:37:50 -04:00
Leonardo Salazar
0892944aaa
Translated using Weblate (Spanish)
...
Currently translated at 100.0% (65 of 65 strings)
2018-04-11 16:37:47 -04:00
WebShells
abafd59683
Translated using Weblate (French)
...
Currently translated at 100.0% (65 of 65 strings)
2018-04-11 16:37:46 -04:00
WebShells
dab4a8f90d
Translated using Weblate (French)
...
Currently translated at 100.0% (51 of 51 strings)
2018-04-11 16:31:31 -04:00
WebShells
ca7c3e9d76
Translated using Weblate (French)
...
Currently translated at 100.0% (68 of 68 strings)
2018-04-11 16:25:50 -04:00
WebShells
61eeed0b75
Translated using Weblate (French)
...
Currently translated at 100.0% (162 of 162 strings)
2018-04-11 16:20:21 -04:00
WebShells
3852bd5c3e
Translated using Weblate (Arabic)
...
Currently translated at 100.0% (7 of 7 strings)
Translation: opensourcepos/enum
Translate-URL: http://weblate.jpeelaer.net/projects/ospos/enum/ar_EG/
2018-04-11 16:02:44 -04:00
WebShells
cf8890efdc
Translated using Weblate (Arabic)
...
Currently translated at 100.0% (110 of 110 strings)
2018-04-11 15:51:07 -04:00
Leonardo Salazar
e4fe32b85c
Translated using Weblate (Russian)
...
Currently translated at 100.0% (266 of 266 strings)
2018-04-11 15:10:04 -04:00
Leonardo Salazar
6bed03a2e7
Translated using Weblate (Russian)
...
Currently translated at 100.0% (30 of 30 strings)
Translation: opensourcepos/taxes
Translate-URL: http://weblate.jpeelaer.net/projects/ospos/taxes/ru/
2018-04-11 14:22:46 -04:00
Leonardo Salazar
390fefa803
Translated using Weblate (Russian)
...
Currently translated at 100.0% (17 of 17 strings)
2018-04-11 14:22:45 -04:00
Aril Apria Susanto
3c069ad226
Translated using Weblate (Indonesian)
...
Currently translated at 72.8% (118 of 162 strings)
2018-04-11 14:22:43 -04:00
Leonardo Salazar
2e07818a2c
Translated using Weblate (Russian)
...
Currently translated at 100.0% (110 of 110 strings)
2018-04-11 14:22:24 -04:00
Leonardo Salazar
5ce8c9694d
Translated using Weblate (Russian)
...
Currently translated at 100.0% (103 of 103 strings)
2018-04-11 14:22:20 -04:00
Leonardo Salazar
0415cb53e9
Translated using Weblate (Russian)
...
Currently translated at 100.0% (30 of 30 strings)
2018-04-11 14:22:15 -04:00
Leonardo Salazar
a254f78750
Translated using Weblate (Russian)
...
Currently translated at 100.0% (68 of 68 strings)
2018-04-11 14:22:13 -04:00
Leonardo Salazar
adde140660
Translated using Weblate (Russian)
...
Currently translated at 100.0% (35 of 35 strings)
2018-04-11 14:22:07 -04:00
Leonardo Salazar
0a3414f4f3
Translated using Weblate (Russian)
...
Currently translated at 100.0% (44 of 44 strings)
2018-04-11 14:22:03 -04:00
Aril Apria Susanto
4c3ab04e3d
Translated using Weblate (Indonesian)
...
Currently translated at 65.9% (29 of 44 strings)
2018-04-11 14:22:02 -04:00
Leonardo Salazar
9e442e6c61
Translated using Weblate (Russian)
...
Currently translated at 73.6% (196 of 266 strings)
2018-04-11 14:21:57 -04:00
Chiraq Bookstore
64dd3afa54
Translated using Weblate (Russian)
...
Currently translated at 52.2% (139 of 266 strings)
2018-04-11 13:50:18 -04:00
Leonardo Salazar
bd17e73b36
Translated using Weblate (Russian)
...
Currently translated at 51.8% (138 of 266 strings)
2018-04-11 13:50:08 -04:00
Chiraq Bookstore
3e7faf1ea1
Translated using Weblate (Russian)
...
Currently translated at 50.3% (134 of 266 strings)
2018-04-11 13:46:27 -04:00
Leonardo Salazar
34048c2ba5
Translated using Weblate (Russian)
...
Currently translated at 50.3% (134 of 266 strings)
2018-04-11 13:46:02 -04:00
Leonardo Salazar
3848b72bbe
Translated using Weblate (Russian)
...
Currently translated at 100.0% (35 of 35 strings)
Translation: opensourcepos/module
Translate-URL: http://weblate.jpeelaer.net/projects/ospos/module/ru/
2018-04-11 13:40:45 -04:00
Leonardo Salazar
154db58f34
Translated using Weblate (Russian)
...
Currently translated at 100.0% (51 of 51 strings)
2018-04-11 13:36:06 -04:00
Leonardo Salazar
2e5cfbc1e7
Translated using Weblate (Russian)
...
Currently translated at 100.0% (162 of 162 strings)
2018-04-11 13:01:24 -04:00
Chiraq Bookstore
174338f9bf
Translated using Weblate (Russian)
...
Currently translated at 100.0% (30 of 30 strings)
Translation: opensourcepos/taxes
Translate-URL: http://weblate.jpeelaer.net/projects/ospos/taxes/ru/
2018-04-11 12:50:22 -04:00
Leonardo Salazar
4d9840f9ad
Translated using Weblate (Russian)
...
Currently translated at 100.0% (44 of 44 strings)
2018-04-11 12:41:59 -04:00
Leonardo Salazar
821aaa4e63
Translated using Weblate (Russian)
...
Currently translated at 100.0% (30 of 30 strings)
2018-04-11 12:34:43 -04:00
Leonardo Salazar
425f0fd21b
Translated using Weblate (Russian)
...
Currently translated at 100.0% (35 of 35 strings)
2018-04-11 12:31:07 -04:00
Leonardo Salazar
41117b7007
Translated using Weblate (Russian)
...
Currently translated at 100.0% (110 of 110 strings)
2018-04-11 12:23:07 -04:00
Leonardo Salazar
6cc4196af8
Translated using Weblate (Russian)
...
Currently translated at 100.0% (17 of 17 strings)
2018-04-11 12:00:19 -04:00
Leonardo Salazar
4329f519f8
Translated using Weblate (Russian)
...
Currently translated at 100.0% (68 of 68 strings)
2018-04-11 11:36:55 -04:00
Leonardo Salazar
c29937ac68
Translated using Weblate (Russian)
...
Currently translated at 100.0% (43 of 43 strings)
Translation: opensourcepos/expenses
Translate-URL: http://weblate.jpeelaer.net/projects/ospos/expenses/ru/
2018-04-11 11:32:10 -04:00
Chiraq Bookstore
9d7c07c1dd
Translated using Weblate (Russian)
...
Currently translated at 90.0% (27 of 30 strings)
Translation: opensourcepos/taxes
Translate-URL: http://weblate.jpeelaer.net/projects/ospos/taxes/ru/
2018-04-11 11:29:49 -04:00
Leonardo Salazar
f24f62c0c6
Translated using Weblate (Russian)
...
Currently translated at 86.6% (26 of 30 strings)
Translation: opensourcepos/taxes
Translate-URL: http://weblate.jpeelaer.net/projects/ospos/taxes/ru/
2018-04-11 11:29:28 -04:00
Leonardo Salazar
9370d3434a
Translated using Weblate (Russian)
...
Currently translated at 100.0% (18 of 18 strings)
Translation: opensourcepos/expenses_categories
Translate-URL: http://weblate.jpeelaer.net/projects/ospos/expenses_categories/ru/
2018-04-11 11:12:38 -04:00
Weblate
a60a58337e
Translated using Weblate (Flemish)
...
Currently translated at 80.2% (130 of 162 strings)
2018-04-11 08:00:53 -04:00
Weblate
6e8d9bb85c
Translated using Weblate (Flemish)
...
Currently translated at 99.0% (102 of 103 strings)
2018-04-11 08:00:47 -04:00
Weblate
7642e45850
Translated using Weblate (Flemish)
...
Currently translated at 100.0% (30 of 30 strings)
2018-04-11 08:00:46 -04:00
Weblate
4d37b29304
Translated using Weblate (Flemish)
...
Currently translated at 97.0% (100 of 103 strings)
2018-04-11 05:08:48 -04:00
Weblate
ac5dbe0b0f
Translated using Weblate (Flemish)
...
Currently translated at 100.0% (30 of 30 strings)
2018-04-11 05:08:48 -04:00
jekkos
cd19babd6e
Update Cloud install procedure ( #1939 )
2018-04-11 01:31:13 +02:00
Leonardo Salazar
bbb77a00ad
Translated using Weblate (Russian)
...
Currently translated at 5.5% (1 of 18 strings)
Translation: opensourcepos/expenses_categories
Translate-URL: http://weblate.jpeelaer.net/projects/ospos/expenses_categories/ru/
2018-04-10 14:54:17 -04:00
Leonardo Salazar
c48563b703
Translated using Weblate (Russian)
...
Currently translated at 20.9% (9 of 43 strings)
Translation: opensourcepos/expenses
Translate-URL: http://weblate.jpeelaer.net/projects/ospos/expenses/ru/
2018-04-10 14:54:16 -04:00
Leonardo Salazar
740d12e137
Translated using Weblate (Russian)
...
Currently translated at 96.2% (156 of 162 strings)
2018-04-09 16:34:23 -04:00
Leonardo Salazar
e4369db19c
Translated using Weblate (Russian)
...
Currently translated at 2.3% (1 of 43 strings)
Translation: opensourcepos/expenses
Translate-URL: http://weblate.jpeelaer.net/projects/ospos/expenses/ru/
2018-04-09 16:34:14 -04:00
Leonardo Salazar
d5086ba42f
Translated using Weblate (Russian)
...
Currently translated at 100.0% (7 of 7 strings)
Translation: opensourcepos/enum
Translate-URL: http://weblate.jpeelaer.net/projects/ospos/enum/ru/
2018-04-09 16:27:52 -04:00
Leonardo Salazar
1c95ed432f
Translated using Weblate (Russian)
...
Currently translated at 100.0% (103 of 103 strings)
2018-04-09 16:09:50 -04:00
Chiraq Bookstore
9f50a6ab92
Translated using Weblate (Russian)
...
Currently translated at 49.6% (132 of 266 strings)
2018-04-07 12:26:09 -04:00
Weblate
ee319189ed
Translated using Weblate (Flemish)
...
Currently translated at 100.0% (68 of 68 strings)
2018-04-06 11:22:08 -04:00
Weblate
0053398037
Translated using Weblate (Flemish)
...
Currently translated at 100.0% (68 of 68 strings)
2018-04-06 11:22:08 -04:00
Weblate
f106097e2d
Translated using Weblate (Flemish)
...
Currently translated at 97.6% (42 of 43 strings)
Translation: opensourcepos/expenses
Translate-URL: http://weblate.jpeelaer.net/projects/ospos/expenses/nl_BE/
2018-04-06 11:22:08 -04:00
FrancescoUK
cc1497baad
Update README.md
2018-04-06 14:02:55 +01:00
FrancescoUK
87317b00bd
Update ISSUE_TEMPLATE.md
2018-04-06 14:01:14 +01:00
jekkos
e949f776ac
Correct link to install file
2018-04-06 14:17:27 +02:00
jekkos
27ca6cf6f8
Add more guidance towards posting issues about misconfigured installations
2018-04-06 14:03:15 +02:00
jekkos
6d35fae28e
Add more guidance towards posting issues about misconfigured installations
2018-04-06 13:58:46 +02:00
jekkos
27c8f2614d
Add system folder missing to first point in FAQ ( #1930 )
2018-04-06 13:49:58 +02:00
jekkos
fbce16acd1
Update INSTALL with commonly reported 'system folder missing' 'bug'
2018-04-06 13:48:33 +02:00
Weblate
a700d4ffff
Translated using Weblate (Flemish)
...
Currently translated at 58.1% (25 of 43 strings)
Translation: opensourcepos/expenses
Translate-URL: http://weblate.jpeelaer.net/projects/ospos/expenses/nl_BE/
2018-04-06 07:44:53 -04:00
Weblate
738e1de6b4
Translated using Weblate (Flemish)
...
Currently translated at 100.0% (35 of 35 strings)
2018-04-06 07:39:26 -04:00
Weblate
5da3dc3928
Translated using Weblate (Flemish)
...
Currently translated at 91.4% (32 of 35 strings)
2018-04-06 07:38:49 -04:00
Weblate
129eb78552
Translated using Weblate (Flemish)
...
Currently translated at 88.5% (31 of 35 strings)
2018-04-06 07:38:49 -04:00
Weblate
97ab38436f
Translated using Weblate (Flemish)
...
Currently translated at 85.7% (30 of 35 strings)
2018-04-06 07:38:49 -04:00
jekkos
0820a0d7ff
Don't show company_name if it's empty (non null) ( #1929 )
2018-04-06 13:36:45 +02:00
FrancescoUK
a597fa86eb
Fix composer.lock after CI 3.1.8 update
2018-04-06 10:23:22 +01:00
FrancescoUK
c05b814009
Minor helpers fixes
2018-04-06 09:58:11 +01:00
FrancescoUK
82c6954d1c
Remove unused and add missing language files
2018-04-06 09:51:25 +01:00
Trần Ngọc Quân
b43ec350ae
Translated using Weblate (Vietnamese)
...
Currently translated at 100.0% (2 of 2 strings)
2018-04-06 04:41:35 -04:00
FrancescoUK
c6bc1680fa
Amend 3.2.0 release documentation
2018-04-06 08:56:06 +01:00
Trần Ngọc Quân
7d64b483ca
Translated using Weblate (Vietnamese)
...
Currently translated at 100.0% (7 of 7 strings)
Translation: opensourcepos/enum
Translate-URL: http://weblate.jpeelaer.net/projects/ospos/enum/vi/
2018-04-05 20:59:25 -04:00
jekkos
cfa7891b06
Catch warnings if config file rewrite fails
2018-04-06 01:00:12 +02:00
jekkos
3663c7e344
Update Dockerfile + CI 3.1.8
2018-04-06 00:54:08 +02:00
jekkos
3ca871aea9
Update LICENSE and INSTALL file links ( #1921 )
2018-04-05 23:35:13 +02:00
Weblate
6b935ca169
Translated using Weblate (Flemish)
...
Currently translated at 100.0% (35 of 35 strings)
Translation: opensourcepos/module
Translate-URL: http://weblate.jpeelaer.net/projects/ospos/module/nl_BE/
2018-04-05 17:32:38 -04:00
Weblate
41a9b03761
Translated using Weblate (Flemish)
...
Currently translated at 100.0% (44 of 44 strings)
2018-04-05 17:32:27 -04:00
Weblate
6a3da0f5dc
Translated using Weblate (Flemish)
...
Currently translated at 99.6% (265 of 266 strings)
2018-04-05 17:32:25 -04:00
Weblate
a00c38bee8
Translated using Weblate (Flemish)
...
Currently translated at 100.0% (44 of 44 strings)
2018-04-05 17:31:09 -04:00
PICCORO Lenz McKAY
593b5cebaa
Translated using Weblate (Spanish)
...
Currently translated at 100.0% (110 of 110 strings)
2018-04-05 17:13:09 -04:00
Weblate
4b57b6144b
Translated using Weblate (Flemish)
...
Currently translated at 89.0% (237 of 266 strings)
2018-04-05 16:45:19 -04:00
Weblate
d2fbceeb22
Translated using Weblate (Flemish)
...
Currently translated at 100.0% (35 of 35 strings)
Translation: opensourcepos/module
Translate-URL: http://weblate.jpeelaer.net/projects/ospos/module/nl_BE/
2018-04-05 16:37:00 -04:00
Weblate
3113945f0f
Translated using Weblate (Flemish)
...
Currently translated at 100.0% (7 of 7 strings)
Translation: opensourcepos/enum
Translate-URL: http://weblate.jpeelaer.net/projects/ospos/enum/nl_BE/
2018-04-05 16:24:40 -04:00
FrancescoUK
8a9e0f352a
Translated using Weblate (Italian)
...
Currently translated at 100.0% (2 of 2 strings)
2018-04-05 14:46:44 -04:00
FrancescoUK
c844f2c1e7
Remove unused language files ( #1918 )
2018-04-05 19:42:55 +01:00
Chiraq Bookstore
9b0dc5a9c3
Translated using Weblate (az_AZ (generated))
...
Currently translated at 100.0% (266 of 266 strings)
2018-04-05 14:19:35 -04:00
Chiraq Bookstore
11ba752010
Translated using Weblate (az_AZ (generated))
...
Currently translated at 100.0% (266 of 266 strings)
2018-04-05 14:19:35 -04:00
FrancescoUK
b26dbc7022
Minor fixes to README.md
2018-04-05 18:30:38 +01:00
FrancescoUK
22f1ed10be
Fix migration helper $this issue ( #1927 )
2018-04-05 18:23:32 +01:00
jekkos
0a289f9ed4
Upade README.md, add INSTALL.md
2018-04-05 18:35:24 +02:00
jekkos
1b0eb0d936
Add migration_helper to config.php ( #1927 )
2018-04-05 18:10:19 +02:00
jekkos
d146a05991
Prettify docker build instructions ( #1921 )
2018-04-05 09:24:06 +02:00
jekkos
8c43345a20
Add instructions to run using docker from source ( #1921 )
2018-04-05 09:21:26 +02:00
jekkos
50c4b30df2
Hide discount / item if no discount for that item ( #1924 )
2018-04-05 08:57:36 +02:00
jekkos
9f2e39711f
Migration refactor: move out common code ( #1440 )
2018-04-05 08:57:02 +02:00
jekkos
43b4cee636
Remove sockets from Dockerfile
2018-04-05 00:07:51 +02:00
Trần Ngọc Quân
ba8c0b7b15
Translated using Weblate (Vietnamese)
...
Currently translated at 100.0% (162 of 162 strings)
2018-04-04 18:07:04 -04:00
Trần Ngọc Quân
86622615fd
Translated using Weblate (Vietnamese)
...
Currently translated at 100.0% (110 of 110 strings)
2018-04-04 18:07:04 -04:00
Trần Ngọc Quân
3dfa877365
Translated using Weblate (Vietnamese)
...
Currently translated at 100.0% (51 of 51 strings)
2018-04-04 18:07:04 -04:00
Ethan Horseshoe
b22252be4e
Translated using Weblate (German)
...
Currently translated at 100.0% (51 of 51 strings)
2018-04-04 18:07:04 -04:00
Ethan Horseshoe
83697eaf8b
Translated using Weblate (German)
...
Currently translated at 100.0% (43 of 43 strings)
Translation: opensourcepos/expenses
Translate-URL: http://weblate.jpeelaer.net/projects/ospos/expenses/de/
2018-04-04 18:07:04 -04:00
Ethan Horseshoe
fe627eb943
Translated using Weblate (German)
...
Currently translated at 89.4% (238 of 266 strings)
2018-04-04 18:07:04 -04:00
Trần Ngọc Quân
4dea268e51
Translated using Weblate (Vietnamese)
...
Currently translated at 100.0% (110 of 110 strings)
2018-04-04 18:07:04 -04:00
Trần Ngọc Quân
2f7d738a20
Translated using Weblate (Vietnamese)
...
Currently translated at 100.0% (266 of 266 strings)
2018-04-04 18:07:04 -04:00
Ethan Horseshoe
b99ec9117b
Translated using Weblate (German)
...
Currently translated at 100.0% (103 of 103 strings)
2018-04-04 18:07:04 -04:00
Ethan Horseshoe
3c56ae6cb6
Translated using Weblate (German)
...
Currently translated at 100.0% (44 of 44 strings)
2018-04-04 18:07:04 -04:00
FrancescoUK
b1fdd45372
Translated using Weblate (Italian)
...
Currently translated at 100.0% (110 of 110 strings)
2018-04-04 18:07:04 -04:00
FrancescoUK
4d46da7974
Preparing release 3.2.0
2018-03-28 19:09:29 +01:00
FrancescoUK
84a5f654b1
Remove php sockets from the dependency list
2018-03-28 19:01:34 +01:00
ratana chhun
01afdc5979
Translated using Weblate (Central Khmer)
...
Currently translated at 66.6% (34 of 51 strings)
2018-03-28 13:50:49 -04:00
Ethan Horseshoe
3c379a6458
Translated using Weblate (German)
...
Currently translated at 98.5% (67 of 68 strings)
2018-03-28 13:50:44 -04:00
Ethan Horseshoe
bb203efe21
Translated using Weblate (German)
...
Currently translated at 100.0% (43 of 43 strings)
Translation: opensourcepos/expenses
Translate-URL: http://weblate.jpeelaer.net/projects/ospos/expenses/de/
2018-03-27 01:32:35 -04:00
FrancescoUK
9e2a757b16
Fix over counting of totals ( #1896 )
2018-03-25 21:44:11 +01:00
FrancescoUK
4079e44572
Allow password change with no restrictions + code reorg ( #1894 )
2018-03-25 19:18:03 +01:00
FrancescoUK
4595ab5c35
Allow editing of Customer from sales register ( #1884 )
2018-03-25 18:02:08 +01:00
FrancescoUK
35150f14ed
Fix Submit button translation ( #1894 )
2018-03-25 15:53:57 +01:00
FrancescoUK
a7ecec4bd3
Small code refactoring ( #1896 )
2018-03-25 14:39:52 +01:00
FrancescoUK
ae472d0176
Print reports date in different formats, remove sorting ( #1896 )
2018-03-25 13:57:20 +01:00
PICCORO Lenz McKAY
b18ae57cf6
Translated using Weblate (Spanish)
...
Currently translated at 100.0% (162 of 162 strings)
2018-03-25 06:58:58 -04:00
Riccardo Pieri
2f064d9a94
Translated using Weblate (Italian)
...
Currently translated at 99.0% (109 of 110 strings)
2018-03-25 06:58:57 -04:00
FrancescoUK
4f2b6badd9
Allow password change with no restriction ( #1894 )
2018-03-24 21:47:10 +00:00
FrancescoUK
bf76450ca5
Fix Summary_payments report location ( #1896 )
2018-03-24 18:32:02 +00:00
Xyko Arteiro
7c88bdb21f
Translated using Weblate (Portuguese (Brazil))
...
Currently translated at 100.0% (30 of 30 strings)
Translation: opensourcepos/taxes
Translate-URL: http://weblate.jpeelaer.net/projects/ospos/taxes/pt_BR/
2018-03-22 16:29:11 -04:00
Xyko Arteiro
544d8a496e
Translated using Weblate (Portuguese (Brazil))
...
Currently translated at 100.0% (17 of 17 strings)
2018-03-22 16:29:11 -04:00
Xyko Arteiro
88625ad83c
Translated using Weblate (Portuguese (Brazil))
...
Currently translated at 100.0% (162 of 162 strings)
2018-03-22 16:29:11 -04:00
Weblate
e89f698dff
Translated using Weblate (Flemish)
...
Currently translated at 72.8% (118 of 162 strings)
2018-03-22 16:29:11 -04:00
Xyko Arteiro
a1e0e7946c
Translated using Weblate (Portuguese (Brazil))
...
Currently translated at 100.0% (110 of 110 strings)
2018-03-22 16:29:11 -04:00
Xyko Arteiro
68ce90ad8e
Translated using Weblate (Portuguese (Brazil))
...
Currently translated at 100.0% (51 of 51 strings)
2018-03-22 16:29:11 -04:00
Hangman
06e36ac4f4
Translated using Weblate (German)
...
Currently translated at 100.0% (51 of 51 strings)
2018-03-22 16:29:11 -04:00
ratana chhun
ccd52e1ded
Translated using Weblate (Central Khmer)
...
Currently translated at 62.7% (32 of 51 strings)
2018-03-22 16:29:11 -04:00
Xyko Arteiro
ed0fd469e6
Translated using Weblate (Portuguese (Brazil))
...
Currently translated at 100.0% (35 of 35 strings)
Translation: opensourcepos/module
Translate-URL: http://weblate.jpeelaer.net/projects/ospos/module/pt_BR/
2018-03-22 16:29:11 -04:00
Xyko Arteiro
7884bab2ed
Translated using Weblate (Portuguese (Brazil))
...
Currently translated at 100.0% (5 of 5 strings)
Translation: opensourcepos/migrate
Translate-URL: http://weblate.jpeelaer.net/projects/ospos/migrate/pt_BR/
2018-03-22 16:29:11 -04:00
Xyko Arteiro
213bba8312
Translated using Weblate (Portuguese (Brazil))
...
Currently translated at 100.0% (103 of 103 strings)
2018-03-22 16:29:11 -04:00
Xyko Arteiro
17982988f7
Translated using Weblate (Portuguese (Brazil))
...
Currently translated at 100.0% (30 of 30 strings)
2018-03-22 16:29:11 -04:00
Xyko Arteiro
a7d4e4c163
Translated using Weblate (Portuguese (Brazil))
...
Currently translated at 100.0% (68 of 68 strings)
2018-03-22 16:29:11 -04:00
Xyko Arteiro
2411fe1e3f
Translated using Weblate (Portuguese (Brazil))
...
Currently translated at 100.0% (18 of 18 strings)
Translation: opensourcepos/expenses_categories
Translate-URL: http://weblate.jpeelaer.net/projects/ospos/expenses_categories/pt_BR/
2018-03-22 16:29:11 -04:00
Weblate
b2a2ee9613
Translated using Weblate (Flemish)
...
Currently translated at 27.7% (5 of 18 strings)
Translation: opensourcepos/expenses_categories
Translate-URL: http://weblate.jpeelaer.net/projects/ospos/expenses_categories/nl_BE/
2018-03-22 16:29:11 -04:00
Xyko Arteiro
dc78162486
Translated using Weblate (Portuguese (Brazil))
...
Currently translated at 100.0% (43 of 43 strings)
Translation: opensourcepos/expenses
Translate-URL: http://weblate.jpeelaer.net/projects/ospos/expenses/pt_BR/
2018-03-22 16:29:11 -04:00
Xyko Arteiro
ffbb96fdee
Translated using Weblate (Portuguese (Brazil))
...
Currently translated at 100.0% (35 of 35 strings)
2018-03-22 16:29:11 -04:00
Ethan Horseshoe
fd1cad99ed
Translated using Weblate (German)
...
Currently translated at 100.0% (35 of 35 strings)
2018-03-22 16:29:11 -04:00
Xyko Arteiro
e7808b35cd
Translated using Weblate (Portuguese (Brazil))
...
Currently translated at 100.0% (44 of 44 strings)
2018-03-22 16:29:11 -04:00
Weblate
16b9bd1305
Translated using Weblate (Flemish)
...
Currently translated at 54.5% (24 of 44 strings)
2018-03-22 16:29:11 -04:00
Xyko Arteiro
3a3ddb99d2
Translated using Weblate (Portuguese (Brazil))
...
Currently translated at 98.8% (263 of 266 strings)
2018-03-22 16:29:11 -04:00
Xyko Arteiro
49c6ec282f
Translated using Weblate (Portuguese (Brazil))
...
Currently translated at 100.0% (65 of 65 strings)
2018-03-22 16:29:11 -04:00
FrancescoUK
2557945713
Merge pull request #1899 from odiea/master
...
Update Specific_customer.php
2018-03-20 20:28:17 +00:00
odiea
3368c62690
Update Specific_customer.php
2018-03-20 12:07:45 -06:00
jekkos
3b411bbefc
Skip cleanup after deploy
2018-03-17 17:55:34 +01:00
jekkos
4d8006da2e
Use bleeding edge (dpl) for deploys
2018-03-17 17:42:51 +01:00
jekkos
a5c797b617
Add API key as travis environment variable
2018-03-17 13:59:54 +01:00
jekkos
b9bc7583b2
Change bintray API ke
2018-03-17 13:37:34 +01:00
FrancescoUK
b84d9d894f
Fix Summary Takings including not completed transactions ( #1886 )
2018-03-16 19:56:56 +00:00
FrancescoUK
63d9fd219c
Revert Giftcard broken fix ( #1694 )
2018-03-16 19:18:37 +00:00
jekkos
ddb0e7560c
Update encrypted travis API key
2018-03-16 19:09:59 +01:00
jekkos
a24a55f812
Update bstables to 1.12.1 ( #1884 )
2018-03-15 13:12:10 +01:00
FrancescoUK
a353068ca5
Fix locale support to Giftcard with decimals ( #1694 )
2018-03-12 21:37:07 +00:00
FrancescoUK
442b64d1d1
Add locale support to Giftcard with decimals ( #1694 )
2018-03-10 11:29:04 +00:00
jekkos
8547c3b071
Fix employee form grants regression ( #1870 )
2018-03-09 18:26:42 +01:00
FrancescoUK
bf30652a3d
Fix config view tabs errors
2018-03-04 20:54:38 +00:00
FrancescoUK
7525c650ab
Total Inv. Retail Price & Quantity
2018-03-04 17:02:21 +00:00
FrancescoUK
f2ccebc84d
Enable https for proxy offloading
2018-03-04 16:49:40 +00:00
FrancescoUK
5edfed5bfc
Enable https for proxy offloading
2018-03-04 16:48:36 +00:00
FrancescoUK
8c60d6cdc6
Select full input line on click ( #1863 )
2018-03-04 16:35:14 +00:00
FrancescoUK
33cc7e3f9c
Remove the "crap" ( #1875 )
2018-03-04 14:47:29 +00:00
WebShells
395ac217b8
Translated using Weblate (Arabic)
...
Currently translated at 100.0% (17 of 17 strings)
2018-03-04 12:46:26 +00:00
WebShells
1189c3dadf
Translated using Weblate (Arabic)
...
Currently translated at 100.0% (162 of 162 strings)
2018-03-04 12:46:24 +00:00
ratana chhun
4c92e26e37
Translated using Weblate (Central Khmer)
...
Currently translated at 9.8% (5 of 51 strings)
2018-03-04 12:46:14 +00:00
WebShells
ee1f23289a
Translated using Weblate (Arabic)
...
Currently translated at 100.0% (51 of 51 strings)
2018-03-04 12:46:13 +00:00
WebShells
84f6adb532
Translated using Weblate (Arabic)
...
Currently translated at 100.0% (35 of 35 strings)
Translation: opensourcepos/module
Translate-URL: http://*/projects/ospos/module/ar_EG/
2018-03-04 12:46:11 +00:00
WebShells
da5b6e2592
Translated using Weblate (Arabic)
...
Currently translated at 100.0% (103 of 103 strings)
2018-03-04 12:46:06 +00:00
WebShells
38b26a3e68
Translated using Weblate (Arabic)
...
Currently translated at 100.0% (30 of 30 strings)
2018-03-04 12:46:02 +00:00
WebShells
9d70b23b31
Translated using Weblate (Arabic)
...
Currently translated at 100.0% (68 of 68 strings)
2018-03-04 12:46:02 +00:00
WebShells
2466469a9c
Translated using Weblate (Arabic)
...
Currently translated at 100.0% (44 of 44 strings)
2018-03-04 12:45:57 +00:00
WebShells
ad47e64dfd
Translated using Weblate (Arabic)
...
Currently translated at 100.0% (65 of 65 strings)
2018-03-04 12:45:55 +00:00
WebShells
520ae0d2a9
Translated using Weblate (Arabic)
...
Currently translated at 100.0% (35 of 35 strings)
Translation: opensourcepos/module
Translate-URL: http://*/projects/ospos/module/ar_EG/
2018-03-02 20:31:56 +00:00
WebShells
8fccee51a7
Translated using Weblate (Arabic)
...
Currently translated at 100.0% (35 of 35 strings)
2018-03-02 20:27:51 +00:00
WebShells
32074771ac
Translated using Weblate (Arabic)
...
Currently translated at 100.0% (43 of 43 strings)
Translation: opensourcepos/expenses
Translate-URL: http://*/projects/ospos/expenses/ar_EG/
2018-03-01 19:22:43 +00:00
WebShells
44a1c89292
Translated using Weblate (Arabic)
...
Currently translated at 100.0% (30 of 30 strings)
2018-03-01 19:21:55 +00:00
WebShells
55d4c004eb
Translated using Weblate (Arabic)
...
Currently translated at 100.0% (108 of 108 strings)
2018-03-01 18:11:48 +00:00
WebShells
1fbc42c079
Translated using Weblate (Arabic)
...
Currently translated at 100.0% (266 of 266 strings)
2018-03-01 15:32:33 +00:00
WebShells
2b7a25d8a3
Translated using Weblate (Arabic)
...
Currently translated at 100.0% (44 of 44 strings)
2018-03-01 12:25:45 +00:00
WebShells
1f3074232c
Translated using Weblate (Arabic)
...
Currently translated at 100.0% (103 of 103 strings)
2018-03-01 11:54:22 +00:00
ratana chhun
d3a77118ba
Translated using Weblate (Central Khmer)
...
Currently translated at 100.0% (12 of 12 strings)
2018-03-01 04:53:11 +00:00
ratana chhun
83732383a7
Translated using Weblate (Central Khmer)
...
Currently translated at 100.0% (30 of 30 strings)
2018-03-01 04:27:08 +00:00
WebShells
b495a97483
Translated using Weblate (Arabic)
...
Currently translated at 100.0% (17 of 17 strings)
2018-02-28 21:51:14 +00:00
Mats Pålsson
a0672d04ce
Translated using Weblate (Swedish)
...
Currently translated at 99.3% (161 of 162 strings)
2018-02-28 21:51:14 +00:00
WebShells
e9ac0adb81
Translated using Weblate (Arabic)
...
Currently translated at 74.6% (121 of 162 strings)
2018-02-28 21:51:14 +00:00
WebShells
6febdc4e9d
Translated using Weblate (Arabic)
...
Currently translated at 100.0% (51 of 51 strings)
2018-02-28 21:51:14 +00:00
WebShells
8ca18edfbd
Translated using Weblate (Arabic)
...
Currently translated at 100.0% (5 of 5 strings)
Translation: opensourcepos/migrate
Translate-URL: http://*/projects/ospos/migrate/ar_EG/
2018-02-28 21:51:14 +00:00
ratana chhun
6f4cd9d5eb
Translated using Weblate (Central Khmer)
...
Currently translated at 26.6% (8 of 30 strings)
2018-02-28 21:51:14 +00:00
WebShells
63866bf0d3
Translated using Weblate (Arabic)
...
Currently translated at 100.0% (68 of 68 strings)
2018-02-28 21:51:14 +00:00
WebShells
4e8b63c002
Translated using Weblate (Arabic)
...
Currently translated at 97.6% (42 of 43 strings)
Translation: opensourcepos/expenses
Translate-URL: http://*/projects/ospos/expenses/ar_EG/
2018-02-28 21:51:14 +00:00
Zhivko Vanev
1500aa8b51
Translated using Weblate (Bulgarian)
...
Currently translated at 100.0% (35 of 35 strings)
2018-02-28 21:51:14 +00:00
WebShells
9af064f003
Translated using Weblate (Arabic)
...
Currently translated at 77.2% (34 of 44 strings)
2018-02-28 21:51:14 +00:00
WebShells
0e4f894b2a
Translated using Weblate (Arabic)
...
Currently translated at 88.7% (236 of 266 strings)
2018-02-28 21:51:14 +00:00
Mats Pålsson
91a677f018
Translated using Weblate (Swedish)
...
Currently translated at 100.0% (65 of 65 strings)
2018-02-28 21:51:14 +00:00
Zhivko Vanev
556ab3c229
Translated using Weblate (Bulgarian)
...
Currently translated at 100.0% (65 of 65 strings)
2018-02-28 21:51:14 +00:00
Weblate
d7da611a76
Translated using Weblate (Dutch (Belgium))
...
Currently translated at 74.4% (198 of 266 strings)
2018-02-28 21:51:14 +00:00
WebShells
fa8f42629b
Translated using Weblate (Arabic)
...
Currently translated at 100.0% (65 of 65 strings)
2018-02-28 21:51:14 +00:00
Zhivko Vanev
f8e1d57f71
Translated using Weblate (Bulgarian)
...
Currently translated at 100.0% (35 of 35 strings)
2018-02-28 21:51:14 +00:00
Henk Valk
380953d8b7
Added translation using Weblate (Dutch)
2018-02-28 21:51:14 +00:00
Henk Valk
aea080052a
Added translation using Weblate (Dutch)
2018-02-28 21:51:14 +00:00
Henk Valk
3568debbe6
Added translation using Weblate (Dutch)
2018-02-28 21:51:14 +00:00
Mats Pålsson
d2e8a156ab
Translated using Weblate (Swedish)
...
Currently translated at 100.0% (68 of 68 strings)
2018-02-28 21:51:14 +00:00
Mats Pålsson
d6f6e2f234
Translated using Weblate (Swedish)
...
Currently translated at 100.0% (30 of 30 strings)
2018-02-28 21:51:14 +00:00
FrancescoUK
22c6d5401c
Fix wrong language translations ( #1842 )
2018-02-25 19:02:10 +00:00
FrancescoUK
e44733599e
Fix Quote, Invoice and Work Order comments ( #1819 )
2018-02-25 15:05:00 +00:00
FrancescoUK
acb12dd517
Bump migrate file name with newer date
2018-02-25 15:03:05 +00:00
Steve Ireland
3dbc124f62
Various fixes for comments for quotes, work orders, and invoices
2018-02-25 14:56:38 +00:00
FrancescoUK
563fcf2385
Rollback JQuery validator to vs 1.14.0 ( #1858 )
2018-02-25 14:23:56 +00:00
Ahmed Mahmoud Saad
accd11b74f
Translated using Weblate (Arabic)
...
Currently translated at 100.0% (18 of 18 strings)
Translation: opensourcepos/expenses_categories
Translate-URL: http://*/projects/ospos/expenses_categories/ar_EG/
2018-02-25 11:04:27 +00:00
Ahmed Mahmoud Saad
c7b21362cb
Translated using Weblate (Arabic)
...
Currently translated at 22.2% (4 of 18 strings)
Translation: opensourcepos/expenses_categories
Translate-URL: http://*/projects/ospos/expenses_categories/ar_EG/
2018-02-25 10:59:31 +00:00
Chiraq Bookstore
78b9daac39
Translated using Weblate (az_AZ (generated))
...
Currently translated at 100.0% (17 of 17 strings)
2018-02-25 10:24:27 +00:00
Chiraq Bookstore
00f90857a0
Translated using Weblate (az_AZ (generated))
...
Currently translated at 99.3% (161 of 162 strings)
2018-02-25 10:24:25 +00:00
Chiraq Bookstore
3bb8d7ad32
Translated using Weblate (az_AZ (generated))
...
Currently translated at 98.1% (106 of 108 strings)
2018-02-25 10:24:20 +00:00
Chiraq Bookstore
83ed48c7db
Translated using Weblate (az_AZ (generated))
...
Currently translated at 100.0% (35 of 35 strings)
Translation: opensourcepos/module
Translate-URL: http://*/projects/ospos/module/az_AZ/
2018-02-25 10:24:14 +00:00
Chiraq Bookstore
7e0f099479
Translated using Weblate (az_AZ (generated))
...
Currently translated at 100.0% (68 of 68 strings)
2018-02-25 10:24:13 +00:00
Chiraq Bookstore
96af1b64ff
Translated using Weblate (Russian)
...
Currently translated at 49.0% (130 of 265 strings)
2018-02-25 10:24:11 +00:00
Ahmed Mahmoud Saad
a005ed6862
Translated using Weblate (Arabic)
...
Currently translated at 100.0% (30 of 30 strings)
Translation: opensourcepos/taxes
Translate-URL: http://*/projects/ospos/taxes/ar_EG/
2018-02-24 15:29:10 +00:00
Chiraq Bookstore
cf6df1e99c
Translated using Weblate (az_AZ (generated))
...
Currently translated at 100.0% (17 of 17 strings)
2018-02-24 13:24:36 +00:00
Chiraq Bookstore
c1509a9dd1
Translated using Weblate (az_AZ (generated))
...
Currently translated at 100.0% (44 of 44 strings)
2018-02-24 13:17:53 +00:00
Chiraq Bookstore
d78b547b98
Translated using Weblate (az_AZ (generated))
...
Currently translated at 100.0% (65 of 65 strings)
2018-02-24 12:47:48 +00:00
Chiraq Bookstore
17136a011a
Translated using Weblate (az_AZ (generated))
...
Currently translated at 100.0% (30 of 30 strings)
Translation: opensourcepos/taxes
Translate-URL: http://*/projects/ospos/taxes/az_AZ/
2018-02-22 15:15:29 +00:00
Chiraq Bookstore
171870f512
Translated using Weblate (az_AZ (generated))
...
Currently translated at 66.6% (72 of 108 strings)
2018-02-22 15:15:28 +00:00
Mats Pålsson
04a3a0631f
Translated using Weblate (Swedish)
...
Currently translated at 100.0% (108 of 108 strings)
2018-02-22 15:15:18 +00:00
Chiraq Bookstore
2dd81f4e77
Translated using Weblate (az_AZ (generated))
...
Currently translated at 100.0% (103 of 103 strings)
2018-02-22 15:15:00 +00:00
Mats Pålsson
39a7665930
Translated using Weblate (Swedish)
...
Currently translated at 100.0% (103 of 103 strings)
2018-02-22 15:14:59 +00:00
Mats Pålsson
1223dccd8c
Translated using Weblate (Swedish)
...
Currently translated at 100.0% (43 of 43 strings)
Translation: opensourcepos/expenses
Translate-URL: http://*/projects/ospos/expenses/sv/
2018-02-22 15:14:45 +00:00
Mats Pålsson
d078523528
Translated using Weblate (Swedish)
...
Currently translated at 100.0% (265 of 265 strings)
2018-02-22 15:14:38 +00:00
Chiraq Bookstore
574bcbac09
Translated using Weblate (az_AZ (generated))
...
Currently translated at 100.0% (103 of 103 strings)
2018-02-22 11:12:36 +00:00
Chiraq Bookstore
8dad6d5249
Translated using Weblate (az_AZ (generated))
...
Currently translated at 72.8% (75 of 103 strings)
2018-02-21 14:15:08 +00:00
Chiraq Bookstore
75b9fdb698
Translated using Weblate (az_AZ (generated))
...
Currently translated at 100.0% (30 of 30 strings)
2018-02-21 14:14:57 +00:00
Henk Valk
6131e3db34
Translated using Weblate (Dutch (Belgium))
...
Currently translated at 11.6% (5 of 43 strings)
Translation: opensourcepos/expenses
Translate-URL: http://*/projects/ospos/expenses/nl_BE/
2018-02-21 14:14:56 +00:00
Chiraq Bookstore
30f6e315e3
Translated using Weblate (az_AZ (generated))
...
Currently translated at 100.0% (30 of 30 strings)
2018-02-21 12:03:28 +00:00
Chiraq Bookstore
01dfed1793
Translated using Weblate (az_AZ (generated))
...
Currently translated at 100.0% (68 of 68 strings)
2018-02-21 11:18:37 +00:00
Alexis Michaux
f82990a304
Translated using Weblate (French)
...
Currently translated at 96.9% (157 of 162 strings)
2018-02-21 11:15:45 +00:00
Chiraq Bookstore
6131c5eb53
Translated using Weblate (az_AZ (generated))
...
Currently translated at 97.0% (66 of 68 strings)
2018-02-21 11:15:41 +00:00
Chiraq Bookstore
a1b25d193c
Translated using Weblate (Russian)
...
Currently translated at 41.5% (110 of 265 strings)
2018-02-21 11:15:28 +00:00
FrancescoUK
67eab51e4f
Translated using Weblate (Italian)
...
Currently translated at 100.0% (17 of 17 strings)
2018-02-20 19:10:08 +00:00
FrancescoUK
97591e77fc
Translated using Weblate (Italian)
...
Currently translated at 100.0% (162 of 162 strings)
2018-02-20 19:10:07 +00:00
Alexis Michaux
146d0ce6c8
Translated using Weblate (French)
...
Currently translated at 88.2% (143 of 162 strings)
2018-02-20 19:10:06 +00:00
FrancescoUK
9733ca9171
Translated using Weblate (Italian)
...
Currently translated at 100.0% (51 of 51 strings)
2018-02-20 19:09:45 +00:00
FrancescoUK
b2fcd59841
Translated using Weblate (Italian)
...
Currently translated at 100.0% (35 of 35 strings)
Translation: opensourcepos/module
Translate-URL: http://*/projects/ospos/module/it/
2018-02-20 19:09:44 +00:00
FrancescoUK
f769561a3c
Translated using Weblate (Italian)
...
Currently translated at 100.0% (103 of 103 strings)
2018-02-20 19:09:37 +00:00
FrancescoUK
2a617f7c5c
Translated using Weblate (Italian)
...
Currently translated at 100.0% (68 of 68 strings)
2018-02-20 19:09:37 +00:00
FrancescoUK
544c142ef0
Translated using Weblate (Italian)
...
Currently translated at 100.0% (18 of 18 strings)
Translation: opensourcepos/expenses_categories
Translate-URL: http://*/projects/ospos/expenses_categories/it/
2018-02-20 19:09:36 +00:00
Alexis Michaux
8991407b16
Translated using Weblate (French)
...
Currently translated at 100.0% (35 of 35 strings)
2018-02-20 19:09:35 +00:00
FrancescoUK
caedd4cfc0
Translated using Weblate (Italian)
...
Currently translated at 100.0% (44 of 44 strings)
2018-02-20 19:09:29 +00:00
Alexis Michaux
9323f3803b
Translated using Weblate (French)
...
Currently translated at 52.2% (23 of 44 strings)
2018-02-20 19:09:29 +00:00
FrancescoUK
a031fd924b
Translated using Weblate (Italian)
...
Currently translated at 100.0% (265 of 265 strings)
2018-02-20 19:09:25 +00:00
FrancescoUK
afadb1e171
Translated using Weblate (Italian)
...
Currently translated at 100.0% (65 of 65 strings)
2018-02-20 19:09:20 +00:00
lucailvec
8f7f22726a
Translated using Weblate (Italian)
...
Currently translated at 100.0% (68 of 68 strings)
2018-02-20 18:45:59 +00:00
lucailvec
5cbebec92f
Translated using Weblate (Italian)
...
Currently translated at 100.0% (43 of 43 strings)
Translation: opensourcepos/expenses
Translate-URL: http://*/projects/ospos/expenses/it/
2018-02-20 18:45:26 +00:00
lucailvec
2b8e8bb13e
Translated using Weblate (Italian)
...
Currently translated at 100.0% (35 of 35 strings)
2018-02-20 18:44:58 +00:00
lucailvec
cae200e06a
Translated using Weblate (Italian)
...
Currently translated at 100.0% (17 of 17 strings)
2018-02-20 18:42:44 +00:00
FrancescoUK
49cbdb53ee
Translated using Weblate (Italian)
...
Currently translated at 100.0% (30 of 30 strings)
Translation: opensourcepos/taxes
Translate-URL: http://*/projects/ospos/taxes/it/
2018-02-20 18:41:09 +00:00
lucailvec
e96e00d902
Translated using Weblate (Italian)
...
Currently translated at 100.0% (30 of 30 strings)
2018-02-20 18:40:38 +00:00
lucailvec
6ae6fa7c32
Translated using Weblate (Italian)
...
Currently translated at 100.0% (44 of 44 strings)
2018-02-20 18:39:49 +00:00
FrancescoUK
4653cde725
Translated using Weblate (Italian)
...
Currently translated at 100.0% (108 of 108 strings)
2018-02-20 18:38:24 +00:00
Alexis Michaux
97f2ee521f
Translated using Weblate (French)
...
Currently translated at 100.0% (65 of 65 strings)
2018-02-20 18:37:58 +00:00
FrancescoUK
ee55be347d
Update JQuery plugins ( #1694 )
2018-02-20 18:24:36 +00:00
Chiraq Bookstore
cee7956788
Translated using Weblate (az_AZ (generated))
...
Currently translated at 77.1% (125 of 162 strings)
2018-02-20 17:49:15 +00:00
Chiraq Bookstore
ffa77cfb71
Translated using Weblate (az_AZ (generated))
...
Currently translated at 100.0% (5 of 5 strings)
Translation: opensourcepos/migrate
Translate-URL: http://*/projects/ospos/migrate/az_AZ/
2018-02-20 17:49:07 +00:00
Chiraq Bookstore
a956a009f9
Translated using Weblate (az_AZ (generated))
...
Currently translated at 100.0% (265 of 265 strings)
2018-02-20 12:32:59 +00:00
Chiraq Bookstore
9f7ca1a747
Translated using Weblate (az_AZ (generated))
...
Currently translated at 100.0% (35 of 35 strings)
2018-02-20 12:21:00 +00:00
Chiraq Bookstore
66d319f082
Translated using Weblate (az_AZ (generated))
...
Currently translated at 93.2% (247 of 265 strings)
2018-02-20 12:20:55 +00:00
PICCORO Lenz McKAY
010a3c7126
Translated using Weblate (Spanish)
...
Currently translated at 100.0% (265 of 265 strings)
2018-02-20 12:20:27 +00:00
Chiraq Bookstore
c1b3382795
Translated using Weblate (Russian)
...
Currently translated at 41.1% (109 of 265 strings)
2018-02-20 12:20:24 +00:00
Chiraq Bookstore
2a8078aac9
Translated using Weblate (az_AZ (generated))
...
Currently translated at 100.0% (51 of 51 strings)
2018-02-20 11:22:38 +00:00
ratana chhun
409f0f0084
Translated using Weblate (Central Khmer)
...
Currently translated at 100.0% (68 of 68 strings)
2018-02-20 09:00:27 +00:00
ratana chhun
df2a76b4cf
Translated using Weblate (Central Khmer)
...
Currently translated at 100.0% (18 of 18 strings)
Translation: opensourcepos/expenses_categories
Translate-URL: http://*/projects/ospos/expenses_categories/km/
2018-02-20 07:03:48 +00:00
ratana chhun
ec97cd5cdf
Translated using Weblate (Central Khmer)
...
Currently translated at 100.0% (43 of 43 strings)
Translation: opensourcepos/expenses
Translate-URL: http://*/projects/ospos/expenses/km/
2018-02-20 06:33:53 +00:00
Trần Ngọc Quân
46da8bab1d
Translated using Weblate (Vietnamese)
...
Currently translated at 100.0% (162 of 162 strings)
2018-02-19 07:19:07 +00:00
ratana chhun
ae6e082983
Translated using Weblate (Central Khmer)
...
Currently translated at 100.0% (8 of 8 strings)
2018-02-19 03:17:31 +00:00
PICCORO Lenz McKAY
028f38784e
Translated using Weblate (Spanish)
...
Currently translated at 100.0% (162 of 162 strings)
2018-02-19 00:36:07 +00:00
FrancescoUK
136093b8ab
Translated using Weblate (Italian)
...
Currently translated at 100.0% (162 of 162 strings)
2018-02-18 22:51:17 +00:00
FrancescoUK
17f3635574
Revert work_order_email changes ( #1824 )
2018-02-18 17:43:16 +00:00
Trần Ngọc Quân
c33a3b3720
Translated using Weblate (Vietnamese)
...
Currently translated at 100.0% (30 of 30 strings)
Translation: opensourcepos/taxes
Translate-URL: http://*/projects/ospos/taxes/vi/
2018-02-18 17:16:54 +00:00
Mats Pålsson
63b728b118
Translated using Weblate (Swedish)
...
Currently translated at 100.0% (30 of 30 strings)
Translation: opensourcepos/taxes
Translate-URL: http://*/projects/ospos/taxes/sv/
2018-02-18 17:16:54 +00:00
Trần Ngọc Quân
1cfdee4114
Translated using Weblate (Vietnamese)
...
Currently translated at 100.0% (159 of 159 strings)
2018-02-18 17:16:54 +00:00
Mats Pålsson
98ccea3419
Translated using Weblate (Swedish)
...
Currently translated at 100.0% (159 of 159 strings)
2018-02-18 17:16:54 +00:00
Trần Ngọc Quân
5306b6d26f
Translated using Weblate (Vietnamese)
...
Currently translated at 100.0% (108 of 108 strings)
2018-02-18 17:16:54 +00:00
Trần Ngọc Quân
63bc9d70a7
Translated using Weblate (Vietnamese)
...
Currently translated at 100.0% (51 of 51 strings)
2018-02-18 17:16:54 +00:00
Mats Pålsson
2590feee6c
Translated using Weblate (Swedish)
...
Currently translated at 100.0% (51 of 51 strings)
2018-02-18 17:16:54 +00:00
Mats Pålsson
1dd375311c
Translated using Weblate (Swedish)
...
Currently translated at 100.0% (35 of 35 strings)
Translation: opensourcepos/module
Translate-URL: http://*/projects/ospos/module/sv/
2018-02-18 17:16:54 +00:00
Trần Ngọc Quân
f121a31bb9
Translated using Weblate (Vietnamese)
...
Currently translated at 100.0% (103 of 103 strings)
2018-02-18 17:16:54 +00:00
Mats Pålsson
75d54f4f62
Translated using Weblate (Swedish)
...
Currently translated at 4.8% (5 of 103 strings)
2018-02-18 17:16:54 +00:00
Trần Ngọc Quân
8d16b28160
Translated using Weblate (Vietnamese)
...
Currently translated at 100.0% (68 of 68 strings)
2018-02-18 17:16:54 +00:00
Mats Pålsson
97d07d96c8
Translated using Weblate (Swedish)
...
Currently translated at 100.0% (18 of 18 strings)
Translation: opensourcepos/expenses_categories
Translate-URL: http://*/projects/ospos/expenses_categories/sv/
2018-02-18 17:16:54 +00:00
Trần Ngọc Quân
78f9560e6d
Translated using Weblate (Vietnamese)
...
Currently translated at 100.0% (43 of 43 strings)
Translation: opensourcepos/expenses
Translate-URL: http://*/projects/ospos/expenses/vi/
2018-02-18 17:16:54 +00:00
Mats Pålsson
fd625afeb6
Translated using Weblate (Swedish)
...
Currently translated at 100.0% (44 of 44 strings)
2018-02-18 17:16:54 +00:00
Trần Ngọc Quân
91374a54b4
Translated using Weblate (Vietnamese)
...
Currently translated at 100.0% (265 of 265 strings)
2018-02-18 17:16:54 +00:00
Mats Pålsson
9c4591ea31
Translated using Weblate (Swedish)
...
Currently translated at 30.1% (80 of 265 strings)
2018-02-18 17:16:54 +00:00
Mats Pålsson
5ade46bc35
Translated using Weblate (Swedish)
...
Currently translated at 100.0% (65 of 65 strings)
2018-02-18 17:16:54 +00:00
Mats Pålsson
b1bee3196a
Translated using Weblate (Swedish)
...
Currently translated at 100.0% (17 of 17 strings)
2018-02-18 17:16:54 +00:00
FrancescoUK
16dd8fb0a1
Fix work_order_email similar to quote_email ( #1824 )
2018-02-18 17:12:43 +00:00
FrancescoUK
b69d57a4b9
Fix missing sales_receipt_no_email translation ( #1824 )
2018-02-18 16:27:20 +00:00
FrancescoUK
1ba0f3c839
Fix quote email issue ( #1824 )
2018-02-18 09:23:44 +00:00
FrancescoUK
a258a27d9b
Merge pull request #1842 from RuleDomain/quote-comments
...
Expand comments for quotes and invoices add notice when customer is required
2018-02-18 09:15:17 +00:00
Mats Pålsson
082bfeca88
Translated using Weblate (Swedish)
...
Currently translated at 100.0% (5 of 5 strings)
Translation: opensourcepos/migrate
Translate-URL: http://*/projects/ospos/migrate/sv/
2018-02-17 23:46:18 +00:00
Mats Pålsson
32075b96dd
Translated using Weblate (Swedish)
...
Currently translated at 100.0% (35 of 35 strings)
2018-02-17 22:10:02 +00:00
Mats Pålsson
3844d6b5f5
Translated using Weblate (Swedish)
...
Currently translated at 72.5% (37 of 51 strings)
2018-02-17 21:43:01 +00:00
Mats Pålsson
aa6eed2947
Translated using Weblate (Swedish)
...
Currently translated at 29.0% (77 of 265 strings)
2018-02-17 21:42:54 +00:00
Mats Pålsson
4a74c645ad
Translated using Weblate (Swedish)
...
Currently translated at 8.3% (22 of 265 strings)
2018-02-17 21:18:33 +00:00
Mats Pålsson
dc2c77752b
Translated using Weblate (Swedish)
...
Currently translated at 8.3% (22 of 265 strings)
2018-02-17 21:18:09 +00:00
Mats Pålsson
85fdc661d1
Translated using Weblate (Swedish)
...
Currently translated at 7.9% (21 of 265 strings)
2018-02-17 21:17:46 +00:00
Chiraq Bookstore
64163e8e6e
Translated using Weblate (az_AZ (generated))
...
Currently translated at 100.0% (30 of 30 strings)
Translation: opensourcepos/taxes
Translate-URL: http://*/projects/ospos/taxes/az_AZ/
2018-02-17 21:07:50 +00:00
Chiraq Bookstore
810ba78776
Translated using Weblate (Russian)
...
Currently translated at 76.6% (23 of 30 strings)
Translation: opensourcepos/taxes
Translate-URL: http://*/projects/ospos/taxes/ru/
2018-02-17 21:07:50 +00:00
Chiraq Bookstore
82a17eb6ce
Translated using Weblate (Russian)
...
Currently translated at 88.2% (15 of 17 strings)
2018-02-17 21:07:50 +00:00
Chiraq Bookstore
b726596ec1
Translated using Weblate (az_AZ (generated))
...
Currently translated at 45.0% (23 of 51 strings)
2018-02-17 21:07:50 +00:00
FrancescoUK
5aac69ad6d
Add discount per item to quote and invoice ( #1824 )
2018-02-17 21:03:29 +00:00
FrancescoUK
c24c7ed721
Merge pull request #1836 from crmeye/master
...
Italian Translation (Fix)
2018-02-17 20:23:12 +00:00
FrancescoUK
f4519251af
Print and Email checkbox default behaviour ( #1784 )
2018-02-17 17:36:15 +00:00
FrancescoUK
ba6e38f755
Fix Discount Report pop up notification ( #1823 )
2018-02-17 12:15:35 +00:00
Chiraq Bookstore
f838dae4b5
Translated using Weblate (az_AZ (generated))
...
Currently translated at 100.0% (30 of 30 strings)
Translation: opensourcepos/taxes
Translate-URL: http://*/projects/ospos/taxes/az_AZ/
2018-02-17 09:19:39 +00:00
Chiraq Bookstore
380d3a1355
Translated using Weblate (az_AZ (generated))
...
Currently translated at 100.0% (18 of 18 strings)
Translation: opensourcepos/expenses_categories
Translate-URL: http://*/projects/ospos/expenses_categories/az_AZ/
2018-02-17 09:13:34 +00:00
PICCORO Lenz McKAY
ceb5b85640
Translated using Weblate (Spanish)
...
Currently translated at 100.0% (30 of 30 strings)
Translation: opensourcepos/taxes
Translate-URL: http://*/projects/ospos/taxes/es/
2018-02-17 08:51:31 +00:00
Chiraq Bookstore
fc6f8e4d92
Translated using Weblate (Russian)
...
Currently translated at 70.0% (21 of 30 strings)
Translation: opensourcepos/taxes
Translate-URL: http://*/projects/ospos/taxes/ru/
2018-02-17 08:51:31 +00:00
PICCORO Lenz McKAY
37dcba63bb
Translated using Weblate (Spanish)
...
Currently translated at 100.0% (17 of 17 strings)
2018-02-17 08:51:31 +00:00
PICCORO Lenz McKAY
edf5c1ec90
Translated using Weblate (Spanish)
...
Currently translated at 100.0% (108 of 108 strings)
2018-02-17 08:51:31 +00:00
PICCORO Lenz McKAY
426bdfbadd
Translated using Weblate (Spanish)
...
Currently translated at 100.0% (35 of 35 strings)
Translation: opensourcepos/module
Translate-URL: http://*/projects/ospos/module/es/
2018-02-17 08:51:31 +00:00
PICCORO Lenz McKAY
40114601df
Translated using Weblate (Spanish)
...
Currently translated at 100.0% (68 of 68 strings)
2018-02-17 08:51:31 +00:00
PICCORO Lenz McKAY
e2d9b2e141
Translated using Weblate (Spanish)
...
Currently translated at 100.0% (44 of 44 strings)
2018-02-17 08:51:31 +00:00
Chiraq Bookstore
427a2c3777
Translated using Weblate (az_AZ (generated))
...
Currently translated at 25.6% (66 of 257 strings)
2018-02-17 08:51:31 +00:00
Chiraq Bookstore
98864c0446
Translated using Weblate (Russian)
...
Currently translated at 100.0% (65 of 65 strings)
2018-02-17 08:51:31 +00:00
Chiraq Bookstore
0995c71630
Translated using Weblate (az_AZ (generated))
...
Currently translated at 100.0% (43 of 43 strings)
Translation: opensourcepos/expenses
Translate-URL: http://*/projects/ospos/expenses/az_AZ/
2018-02-17 08:51:31 +00:00
Chiraq Bookstore
407e8723d8
Translated using Weblate (Russian)
...
Currently translated at 100.0% (65 of 65 strings)
2018-02-17 08:51:31 +00:00
PICCORO Lenz McKAY
022435d0db
Translated using Weblate (Spanish)
...
Currently translated at 100.0% (30 of 30 strings)
2018-02-17 08:51:31 +00:00
PICCORO Lenz McKAY
7f7943d538
Translated using Weblate (Spanish)
...
Currently translated at 100.0% (17 of 17 strings)
2018-02-17 08:51:31 +00:00
PICCORO Lenz McKAY
780a4c37a7
Translated using Weblate (Spanish)
...
Currently translated at 100.0% (35 of 35 strings)
2018-02-17 08:51:31 +00:00
crmeye
b24879c9ef
Merge branch 'master' into master
2018-02-17 00:18:20 +01:00
FrancescoUK
d6000c79f7
Revert "Removed edit from Discount Report" ( #1823 )
...
This reverts commit 60d77e1f61 .
2018-02-16 22:46:19 +00:00
FrancescoUK
9ed0984c21
Fix indentation issue
2018-02-16 22:13:56 +00:00
FrancescoUK
21415ccb3c
Fix indentation issue
2018-02-16 22:10:02 +00:00
PICCORO Lenz McKAY
cadae3eabc
Translated using Weblate (Spanish)
...
Currently translated at 100.0% (18 of 18 strings)
Translation: opensourcepos/expenses_categories
Translate-URL: http://*/projects/ospos/expenses_categories/es/
2018-02-16 04:24:29 +00:00
PICCORO Lenz McKAY
54150940ee
Translated using Weblate (Spanish)
...
Currently translated at 100.0% (44 of 44 strings)
2018-02-16 04:18:41 +00:00
Steve Ireland
81d76b0c03
Expand comments for quotes and invoices add notice when customer is required.
2018-02-15 22:45:45 -05:00
PICCORO Lenz McKAY
469d3d500e
Translated using Weblate (Spanish)
...
Currently translated at 100.0% (257 of 257 strings)
2018-02-16 02:23:07 +00:00
PICCORO Lenz McKAY
36fe5ded7e
Translated using Weblate (Spanish)
...
Currently translated at 100.0% (103 of 103 strings)
2018-02-16 02:22:24 +00:00
PICCORO Lenz McKAY
fec096915a
Translated using Weblate (Spanish)
...
Currently translated at 100.0% (51 of 51 strings)
2018-02-16 02:20:13 +00:00
PICCORO Lenz McKAY
abdcd31b9e
Translated using Weblate (Spanish)
...
Currently translated at 100.0% (108 of 108 strings)
2018-02-16 02:12:51 +00:00
PICCORO Lenz McKAY
efd58f2281
Translated using Weblate (Spanish)
...
Currently translated at 100.0% (159 of 159 strings)
2018-02-16 01:21:10 +00:00
PICCORO Lenz McKAY
211c18a99e
Translated using Weblate (Spanish)
...
Currently translated at 91.8% (146 of 159 strings)
2018-02-16 01:17:54 +00:00
PICCORO Lenz McKAY
166c2558e6
Translated using Weblate (Spanish)
...
Currently translated at 98.0% (50 of 51 strings)
2018-02-16 01:17:54 +00:00
PICCORO Lenz McKAY
54237a1fed
Translated using Weblate (Spanish)
...
Currently translated at 91.4% (32 of 35 strings)
Translation: opensourcepos/module
Translate-URL: http://*/projects/ospos/module/es/
2018-02-16 01:17:54 +00:00
PICCORO Lenz McKAY
1d9548870b
Translated using Weblate (Spanish)
...
Currently translated at 98.8% (254 of 257 strings)
2018-02-16 01:17:54 +00:00
PICCORO Lenz McKAY
032276de87
Translated using Weblate (Spanish)
...
Currently translated at 100.0% (43 of 43 strings)
Translation: opensourcepos/expenses
Translate-URL: http://*/projects/ospos/expenses/es/
2018-02-16 01:17:54 +00:00
PICCORO Lenz McKAY
61e16d2d33
Translated using Weblate (Spanish)
...
Currently translated at 100.0% (65 of 65 strings)
2018-02-16 01:17:54 +00:00
PICCORO Lenz McKAY
463dfcd1a4
Translated using Weblate (Spanish)
...
Currently translated at 100.0% (65 of 65 strings)
2018-02-16 01:17:54 +00:00
odiea
022dfea51a
Update Specific_customer.php
2018-02-15 23:46:12 +01:00
odiea
ef23596b6e
Update Reports.php
2018-02-15 23:46:12 +01:00
odiea
58e8469dde
Added filters to customer
2018-02-15 23:46:12 +01:00
odiea
60d77e1f61
Removed edit from Discount Report
2018-02-15 23:46:12 +01:00
odiea
49d60313f6
Update Detailed Reports. Add payment type to Specific Customer.
2018-02-15 23:46:12 +01:00
jekkos
ed54adb70c
Merge branch 'master' of weblate.jpeelaer.net:/root/docker/ospos/common
2018-02-15 23:19:12 +01:00
Chiraq Bookstore
a353e73549
Translated using Weblate (az_AZ (generated))
...
Currently translated at 100.0% (30 of 30 strings)
Translation: opensourcepos/taxes
Translate-URL: http://*/projects/ospos/taxes/az_AZ/
2018-02-15 21:29:53 +00:00
Chiraq Bookstore
e1508e610b
Translated using Weblate (az_AZ (generated))
...
Currently translated at 58.8% (30 of 51 strings)
2018-02-15 21:29:48 +00:00
Chiraq Bookstore
463cf9266d
Translated using Weblate (az_AZ (generated))
...
Currently translated at 100.0% (35 of 35 strings)
Translation: opensourcepos/module
Translate-URL: http://*/projects/ospos/module/az_AZ/
2018-02-15 21:29:44 +00:00
Alexis Michaux
23a6ae791b
Translated using Weblate (French)
...
Currently translated at 74.7% (192 of 257 strings)
2018-02-15 21:29:41 +00:00
jekkos
48d58b822a
Sync translations ( #1841 )
2018-02-15 22:27:44 +01:00
Alexis Michaux
08de3e1167
Translated using Weblate (French)
...
Currently translated at 100.0% (65 of 65 strings)
2018-02-15 15:52:05 +00:00
Chiraq Bookstore
20c30a2c15
Translated using Weblate (az_AZ (generated))
...
Currently translated at 100.0% (35 of 35 strings)
2018-02-15 07:51:12 +00:00
Diego Campiglia
b51ea94eb5
Italian Translation (Fix)
2018-02-14 16:45:15 +01:00
Chiraq Bookstore
2c613bdc86
Translated using Weblate (Russian)
...
Currently translated at 66.6% (20 of 30 strings)
Translation: opensourcepos/taxes
Translate-URL: http://*/projects/ospos/taxes/ru/
2018-02-13 23:12:28 +00:00
Chiraq Bookstore
f784aa3956
Translated using Weblate (az_AZ (generated))
...
Currently translated at 74.2% (118 of 159 strings)
2018-02-13 23:12:28 +00:00
Chiraq Bookstore
73b97de3e5
Translated using Weblate (az_AZ (generated))
...
Currently translated at 100.0% (35 of 35 strings)
Translation: opensourcepos/module
Translate-URL: http://*/projects/ospos/module/az_AZ/
2018-02-13 23:12:28 +00:00
Chiraq Bookstore
5cc2898a4b
Translated using Weblate (az_AZ (generated))
...
Currently translated at 93.1% (41 of 44 strings)
2018-02-13 23:12:28 +00:00
HanseGucker
820cae2d3d
Translated using Weblate (German)
...
Currently translated at 98.0% (252 of 257 strings)
2018-02-13 23:12:28 +00:00
Zhivko Vanev
3569165097
Translated using Weblate (Bulgarian)
...
Currently translated at 99.2% (255 of 257 strings)
2018-02-13 23:12:28 +00:00
ratana chhun
2c1f2823f2
Added translation using Weblate (Central Khmer)
2018-02-13 23:12:28 +00:00
ratana chhun
ce45769163
Added translation using Weblate (Central Khmer)
2018-02-13 23:12:28 +00:00
ratana chhun
12b62119bf
Added translation using Weblate (Central Khmer)
2018-02-13 23:12:28 +00:00
FrancescoUK
9caf22aea4
Merge pull request #1827 from RuleDomain/fix-missing-comment
...
This adds the comment back to quote and corrects a couple of bad DEFINE references
2018-02-12 07:40:08 +00:00
Steve Ireland
2258938604
More missing language elements and one bad reference to a config value.
2018-02-11 20:09:24 -05:00
FrancescoUK
3f2a9e8c52
Merge pull request #1820 from opensourcepos/Readme-patch
...
Minor URL change
2018-02-09 11:14:51 +00:00
objecttothis
385de892fe
Minor URL change
...
Changed translation website URL from http://weblate.jpeelaer.net to http://translate.opensourcepos.org to reflect the updated alias.
2018-02-09 11:31:56 +04:00
Chiraq Bookstore
a5787ecb4e
Translated using Weblate (az_AZ (generated))
...
Currently translated at 100.0% (30 of 30 strings)
Translation: opensourcepos/taxes
Translate-URL: http://*/projects/ospos/taxes/az_AZ/
2018-02-08 22:35:09 +00:00
PICCORO Lenz McKAY
bfecf15ee2
Translated using Weblate (Russian)
...
Currently translated at 100.0% (159 of 159 strings)
2018-02-08 22:35:08 +00:00
Trần Ngọc Quân
5ffb6b4c18
Translated using Weblate (Vietnamese)
...
Currently translated at 100.0% (107 of 107 strings)
2018-02-08 22:34:53 +00:00
abderrahim nabih
a6d70b6fcd
Translated using Weblate (French)
...
Currently translated at 100.0% (51 of 51 strings)
2018-02-08 22:34:52 +00:00
PICCORO Lenz McKAY
bee9c7af5d
Translated using Weblate (Spanish)
...
Currently translated at 100.0% (35 of 35 strings)
Translation: opensourcepos/module
Translate-URL: http://*/projects/ospos/module/es/
2018-02-08 22:34:46 +00:00
Chiraq Bookstore
f0bdb84422
Translated using Weblate (az_AZ (generated))
...
Currently translated at 100.0% (5 of 5 strings)
Translation: opensourcepos/migrate
Translate-URL: http://*/projects/ospos/migrate/az_AZ/
2018-02-08 22:34:46 +00:00
Chiraq Bookstore
12e7c5d440
Translated using Weblate (az_AZ (generated))
...
Currently translated at 26.0% (67 of 257 strings)
2018-02-08 22:34:41 +00:00
Chiraq Bookstore
623ff4fee9
Translated using Weblate (Russian)
...
Currently translated at 39.2% (101 of 257 strings)
2018-02-08 22:34:41 +00:00
Chiraq Bookstore
579a85a9fc
Translated using Weblate (az_AZ (generated))
...
Currently translated at 100.0% (30 of 30 strings)
Translation: opensourcepos/taxes
Translate-URL: http://*/projects/ospos/taxes/az_AZ/
2018-02-08 11:16:40 +00:00
Trần Ngọc Quân
22e3bba649
Translated using Weblate (Vietnamese)
...
Currently translated at 100.0% (68 of 68 strings)
2018-02-08 08:11:44 +00:00
ratana chhun
9075bfcf37
Added translation using Weblate (Central Khmer)
2018-02-08 03:54:07 +00:00
Trần Ngọc Quân
478b2c0ea5
Translated using Weblate (Vietnamese)
...
Currently translated at 100.0% (257 of 257 strings)
2018-02-08 01:18:47 +00:00
Trần Ngọc Quân
91918fc937
Translated using Weblate (Vietnamese)
...
Currently translated at 100.0% (35 of 35 strings)
Translation: opensourcepos/module
Translate-URL: http://*/projects/ospos/module/vi/
2018-02-08 00:28:24 +00:00
PICCORO Lenz McKAY
017df21f17
Translated using Weblate (Russian)
...
Currently translated at 100.0% (35 of 35 strings)
Translation: opensourcepos/module
Translate-URL: http://*/projects/ospos/module/ru/
2018-02-07 13:07:36 +00:00
PICCORO Lenz McKAY
e7d420f44f
Translated using Weblate (Spanish)
...
Currently translated at 100.0% (68 of 68 strings)
2018-02-07 12:45:54 +00:00
Trần Ngọc Quân
04f2e916bb
Translated using Weblate (Vietnamese)
...
Currently translated at 100.0% (30 of 30 strings)
2018-02-07 07:22:30 +00:00
Trần Ngọc Quân
7770c6817f
Translated using Weblate (Vietnamese)
...
Currently translated at 100.0% (30 of 30 strings)
Translation: opensourcepos/taxes
Translate-URL: http://*/projects/ospos/taxes/vi/
2018-02-07 01:26:12 +00:00
Trần Ngọc Quân
6caf2ea672
Translated using Weblate (Vietnamese)
...
Currently translated at 100.0% (159 of 159 strings)
2018-02-06 10:39:52 +00:00
Zhivko Vanev
317d0adb78
Translated using Weblate (Bulgarian)
...
Currently translated at 100.0% (159 of 159 strings)
try again
2018-02-06 10:39:52 +00:00
Trần Ngọc Quân
a7659d7b76
Translated using Weblate (Vietnamese)
...
Currently translated at 100.0% (103 of 103 strings)
2018-02-06 10:39:52 +00:00
Zhivko Vanev
4353f5a12b
Translated using Weblate (Bulgarian)
...
Currently translated at 100.0% (2 of 2 strings)
2018-02-06 10:39:52 +00:00
Zhivko Vanev
160b7ca189
Translated using Weblate (Bulgarian)
...
Currently translated at 100.0% (44 of 44 strings)
2018-02-06 10:39:52 +00:00
Chiraq Bookstore
c9b15c7eeb
Translated using Weblate (az_AZ (generated))
...
Currently translated at 26.0% (67 of 257 strings)
2018-02-06 10:39:52 +00:00
Zhivko Vanev
a1f6dbccc5
Translated using Weblate (Bulgarian)
...
Currently translated at 100.0% (8 of 8 strings)
2018-02-06 10:39:52 +00:00
Trần Ngọc Quân
d399637c18
Translated using Weblate (Vietnamese)
...
Currently translated at 100.0% (65 of 65 strings)
2018-02-06 10:39:52 +00:00
Zhivko Vanev
54740f734f
Translated using Weblate (Bulgarian)
...
Currently translated at 100.0% (65 of 65 strings)
2018-02-06 10:39:52 +00:00
Trần Ngọc Quân
7e8ac7c100
Translated using Weblate (Vietnamese)
...
Currently translated at 100.0% (159 of 159 strings)
2018-02-06 10:39:52 +00:00
FrancescoUK
4cff8d7dd2
Fix wrong label for tag in sale register ( #1814 )
2018-02-04 21:15:45 +00:00
FrancescoUK
a7ada7e85a
Fix broken chartist plugin dependency
2018-02-04 20:58:58 +00:00
Trần Ngọc Quân
a3bf1d7eeb
Translated using Weblate (Vietnamese)
...
Currently translated at 100.0% (18 of 18 strings)
Translation: opensourcepos/expenses_categories
Translate-URL: http://*/projects/ospos/expenses_categories/vi/
2018-02-03 00:45:37 +00:00
Trần Ngọc Quân
ecce5d39bb
Translated using Weblate (Vietnamese)
...
Currently translated at 100.0% (12 of 12 strings)
2018-02-03 00:38:16 +00:00
Zhivko Vanev
9d113c3327
Translated using Weblate (Bulgarian)
...
Currently translated at 100.0% (44 of 44 strings)
2018-02-02 16:42:54 +00:00
Zhivko Vanev
1f3b05a37b
Translated using Weblate (Bulgarian)
...
Currently translated at 100.0% (159 of 159 strings)
2018-02-02 16:14:27 +00:00
Trần Ngọc Quân
8e60437db0
Translated using Weblate (Vietnamese)
...
Currently translated at 100.0% (107 of 107 strings)
2018-02-02 09:42:09 +00:00
Chiraq Bookstore
6cb6e2fb24
Translated using Weblate (Russian)
...
Currently translated at 60.0% (3 of 5 strings)
Translation: opensourcepos/migrate
Translate-URL: http://*/projects/ospos/migrate/ru/
2018-02-02 09:42:09 +00:00
Trần Ngọc Quân
71a95d7b31
Translated using Weblate (Vietnamese)
...
Currently translated at 100.0% (103 of 103 strings)
2018-02-02 09:42:08 +00:00
Trần Ngọc Quân
8be987f564
Translated using Weblate (Vietnamese)
...
Currently translated at 100.0% (8 of 8 strings)
2018-02-02 07:47:01 +00:00
Trần Ngọc Quân
8bf147f025
Translated using Weblate (Vietnamese)
...
Currently translated at 100.0% (51 of 51 strings)
2018-02-02 07:38:27 +00:00
Weblate
b3c42d4d06
Translated using Weblate (Vietnamese)
...
Currently translated at 100.0% (51 of 51 strings)
2018-02-02 07:38:14 +00:00
Trần Ngọc Quân
043493ba0a
Translated using Weblate (Vietnamese)
...
Currently translated at 100.0% (20 of 20 strings)
2018-02-02 07:20:01 +00:00
Trần Ngọc Quân
88d5b3336a
Translated using Weblate (Vietnamese)
...
Currently translated at 100.0% (107 of 107 strings)
2018-02-02 07:12:00 +00:00
Weblate
3a1b16c070
Translated using Weblate (Vietnamese)
...
Currently translated at 100.0% (107 of 107 strings)
2018-02-02 07:11:36 +00:00
Trần Ngọc Quân
44e57c59e4
Translated using Weblate (Vietnamese)
...
Currently translated at 100.0% (103 of 103 strings)
2018-02-02 06:49:11 +00:00
Trần Ngọc Quân
204499e5d0
Translated using Weblate (Vietnamese)
...
Currently translated at 100.0% (35 of 35 strings)
2018-02-02 01:13:09 +00:00
Trần Ngọc Quân
31f736e2e0
Translated using Weblate (Vietnamese)
...
Currently translated at 100.0% (44 of 44 strings)
2018-02-02 01:00:15 +00:00
Trần Ngọc Quân
5a4d7a40ec
Translated using Weblate (Vietnamese)
...
Currently translated at 100.0% (17 of 17 strings)
2018-02-01 14:05:43 +00:00
Weblate
8c5706bc1f
Translated using Weblate (Vietnamese)
...
Currently translated at 100.0% (107 of 107 strings)
2018-02-01 14:05:43 +00:00
Trần Ngọc Quân
04af352fad
Translated using Weblate (Vietnamese)
...
Currently translated at 100.0% (5 of 5 strings)
Translation: opensourcepos/migrate
Translate-URL: http://*/projects/ospos/migrate/vi/
2018-02-01 14:05:41 +00:00
Chiraq Bookstore
677b296721
Translated using Weblate (az_AZ (generated))
...
Currently translated at 98.4% (64 of 65 strings)
2018-02-01 14:05:38 +00:00
Trần Ngọc Quân
a4c8db7592
Translated using Weblate (Vietnamese)
...
Currently translated at 100.0% (65 of 65 strings)
2018-02-01 07:34:28 +00:00
Trần Ngọc Quân
241f05a000
Translated using Weblate (Vietnamese)
...
Currently translated at 100.0% (8 of 8 strings)
2018-02-01 07:18:23 +00:00
Trần Ngọc Quân
1f5ffb04a1
Translated using Weblate (Vietnamese)
...
Currently translated at 100.0% (2 of 2 strings)
2018-02-01 07:13:27 +00:00
Trần Ngọc Quân
5f12d8ade3
Translated using Weblate (Vietnamese)
...
Currently translated at 100.0% (5 of 5 strings)
Translation: opensourcepos/migrate
Translate-URL: http://*/projects/ospos/migrate/vi/
2018-02-01 07:08:49 +00:00
Trần Ngọc Quân
da64b67e26
Translated using Weblate (Vietnamese)
...
Currently translated at 100.0% (17 of 17 strings)
2018-02-01 07:03:16 +00:00
Trần Ngọc Quân
beedb7e2f6
Translated using Weblate (Vietnamese)
...
Currently translated at 100.0% (43 of 43 strings)
Translation: opensourcepos/expenses
Translate-URL: http://*/projects/ospos/expenses/vi/
2018-02-01 06:53:46 +00:00
Trần Ngọc Quân
fa63933f69
Translated using Weblate (Vietnamese)
...
Currently translated at 100.0% (43 of 43 strings)
Translation: opensourcepos/expenses
Translate-URL: http://*/projects/ospos/expenses/vi/
2018-02-01 06:46:00 +00:00
Weblate
b32b767260
Translated using Weblate (Vietnamese)
...
Currently translated at 100.0% (51 of 51 strings)
2018-01-31 08:01:47 +00:00
Weblate
4457cf7055
Add Vietnamese language
2018-01-31 07:57:49 +00:00
Weblate
458e9a2db5
Added translation using Weblate (Vietnamese)
2018-01-31 07:56:08 +00:00
Trần Ngọc Quân
3245ddb22d
Added translation using Weblate (Vietnamese)
2018-01-31 07:56:08 +00:00
Weblate
5c833e48fb
Added translation using Weblate (Vietnamese)
2018-01-31 07:56:08 +00:00
Trần Ngọc Quân
49c3ad57fc
Added translation using Weblate (Vietnamese)
2018-01-31 07:56:08 +00:00
Trần Ngọc Quân
67402b6cd5
Added translation using Weblate (Vietnamese)
2018-01-31 07:56:08 +00:00
Trần Ngọc Quân
cd2f2c35a4
Added translation using Weblate (Vietnamese)
2018-01-31 07:56:08 +00:00
Weblate
4efbfe2581
Added translation using Weblate (Vietnamese)
2018-01-31 07:56:08 +00:00
Weblate
2fd350d924
Added translation using Weblate (Vietnamese)
2018-01-31 07:56:08 +00:00
Weblate
e1c6a7c98a
Added translation using Weblate (Vietnamese)
2018-01-31 07:56:08 +00:00
Weblate
873bbfd2b8
Added translation using Weblate (Vietnamese)
2018-01-31 07:56:08 +00:00
Weblate
523cbd40e3
Added translation using Weblate (Vietnamese)
2018-01-31 07:56:08 +00:00
Weblate
c97393f53b
Added translation using Weblate (Vietnamese)
2018-01-31 07:56:08 +00:00
PICCORO Lenz McKAY
d175b97596
Translated using Weblate (Russian)
...
Currently translated at 100.0% (65 of 65 strings)
2018-01-31 07:56:08 +00:00
PICCORO Lenz McKAY
aff5dd146e
Translated using Weblate (Russian)
...
Currently translated at 100.0% (65 of 65 strings)
2018-01-31 07:56:08 +00:00
FrancescoUK
768f73770f
Merge pull request #1810 from vnwildman/master
...
Add Vietnamese language (#1809 )
2018-01-31 06:19:04 +00:00
Trần Ngọc Quân
b8f4da9314
Add Vietnamese language
...
Signed-off-by: Trần Ngọc Quân <vnwildman@gmail.com >
2018-01-31 08:13:51 +07:00
FrancescoUK
9c29e066ff
Upgrade to CodeIgniter 3.1.7
2018-01-30 21:43:14 +00:00
PICCORO Lenz McKAY
7b0abf5982
Translated using Weblate (Spanish)
...
Currently translated at 100.0% (30 of 30 strings)
Translation: opensourcepos/taxes
Translate-URL: http://*/projects/ospos/taxes/es/
2018-01-28 13:35:08 +00:00
PICCORO Lenz McKAY
9fe8cffa16
Translated using Weblate (Spanish)
...
Currently translated at 100.0% (159 of 159 strings)
2018-01-28 13:35:04 +00:00
PICCORO Lenz McKAY
024990dac8
Translated using Weblate (Spanish)
...
Currently translated at 100.0% (103 of 103 strings)
2018-01-28 13:35:00 +00:00
PICCORO Lenz McKAY
d479ed2512
Translated using Weblate (Spanish)
...
Currently translated at 100.0% (30 of 30 strings)
2018-01-28 13:34:57 +00:00
PICCORO Lenz McKAY
f799d4f296
Translated using Weblate (Spanish)
...
Currently translated at 100.0% (35 of 35 strings)
2018-01-28 13:34:56 +00:00
PICCORO Lenz McKAY
c389a2c8a5
Translated using Weblate (Spanish)
...
Currently translated at 100.0% (44 of 44 strings)
2018-01-28 13:34:54 +00:00
PICCORO Lenz McKAY
0c8b4de6ac
Translated using Weblate (Spanish)
...
Currently translated at 100.0% (257 of 257 strings)
2018-01-28 13:34:54 +00:00
lucailvec
0d5cad8f27
Translated using Weblate (Italian)
...
Currently translated at 100.0% (257 of 257 strings)
2018-01-28 13:34:48 +00:00
lucailvec
abf163c6fa
Translated using Weblate (Italian)
...
Currently translated at 100.0% (65 of 65 strings)
2018-01-27 09:45:22 +00:00
lucailvec
e1011b2662
Translated using Weblate (Italian)
...
Currently translated at 100.0% (30 of 30 strings)
Translation: opensourcepos/taxes
Translate-URL: http://*/projects/ospos/taxes/it/
2018-01-23 20:39:40 +00:00
PICCORO Lenz McKAY
cea2a2e051
Translated using Weblate (Russian)
...
Currently translated at 88.6% (141 of 159 strings)
2018-01-23 20:39:39 +00:00
lucailvec
376c8cd3b2
Translated using Weblate (Italian)
...
Currently translated at 100.0% (107 of 107 strings)
2018-01-23 20:39:23 +00:00
lucailvec
bea420032a
Translated using Weblate (Italian)
...
Currently translated at 100.0% (51 of 51 strings)
2018-01-23 20:39:12 +00:00
lucailvec
0e8594b92b
Translated using Weblate (Italian)
...
Currently translated at 100.0% (103 of 103 strings)
2018-01-23 20:39:11 +00:00
PICCORO Lenz McKAY
fff072d302
Translated using Weblate (Russian)
...
Currently translated at 47.7% (21 of 44 strings)
2018-01-23 20:39:10 +00:00
PICCORO Lenz McKAY
803e2391ff
Translated using Weblate (Spanish)
...
Currently translated at 98.8% (254 of 257 strings)
2018-01-23 20:39:10 +00:00
lucailvec
a6cc775d17
Translated using Weblate (Italian)
...
Currently translated at 100.0% (257 of 257 strings)
2018-01-23 20:39:06 +00:00
lucailvec
c02f93bdf9
Translated using Weblate (Italian)
...
Currently translated at 100.0% (51 of 51 strings)
2018-01-21 10:29:59 +00:00
lucailvec
c3bbf75d0e
Translated using Weblate (Italian)
...
Currently translated at 100.0% (159 of 159 strings)
2018-01-20 17:43:15 +00:00
PICCORO Lenz McKAY
f533e7629b
Translated using Weblate (Spanish)
...
Currently translated at 98.1% (105 of 107 strings)
2018-01-20 17:42:59 +00:00
Hangman
54099bf43a
Translated using Weblate (German)
...
Currently translated at 79.4% (85 of 107 strings)
2018-01-20 17:42:47 +00:00
Hangman
60ce1970e7
Translated using Weblate (German)
...
Currently translated at 20.0% (1 of 5 strings)
Translation: opensourcepos/migrate
Translate-URL: http://*/projects/ospos/migrate/de/
2018-01-20 17:42:39 +00:00
lucailvec
9abb83f98b
Translated using Weblate (Italian)
...
Currently translated at 100.0% (12 of 12 strings)
2018-01-20 17:42:38 +00:00
lucailvec
7302b0c5d8
Translated using Weblate (Italian)
...
Currently translated at 100.0% (8 of 8 strings)
2018-01-20 17:42:36 +00:00
PICCORO Lenz McKAY
b7a03e1a85
Translated using Weblate (Spanish)
...
Currently translated at 99.0% (102 of 103 strings)
2018-01-20 17:42:35 +00:00
lucailvec
91e08639b0
Translated using Weblate (Italian)
...
Currently translated at 100.0% (103 of 103 strings)
2018-01-20 17:42:34 +00:00
Hangman
c5874e71bb
Translated using Weblate (German)
...
Currently translated at 100.0% (103 of 103 strings)
2018-01-20 17:42:24 +00:00
lucailvec
1315c52d41
Translated using Weblate (Italian)
...
Currently translated at 100.0% (30 of 30 strings)
2018-01-20 17:42:22 +00:00
Hangman
e9c56184e0
Translated using Weblate (German)
...
Currently translated at 76.6% (23 of 30 strings)
2018-01-20 17:42:19 +00:00
lucailvec
99fbbb94a8
Translated using Weblate (Italian)
...
Currently translated at 100.0% (68 of 68 strings)
2018-01-20 17:42:18 +00:00
lucailvec
3b3d019a5d
Translated using Weblate (Italian)
...
Currently translated at 100.0% (43 of 43 strings)
Translation: opensourcepos/expenses
Translate-URL: http://*/projects/ospos/expenses/it/
2018-01-20 17:42:11 +00:00
Hangman
ee20237021
Translated using Weblate (German)
...
Currently translated at 100.0% (44 of 44 strings)
2018-01-20 17:42:08 +00:00
lucailvec
4341501307
Translated using Weblate (Italian)
...
Currently translated at 100.0% (257 of 257 strings)
2018-01-20 17:42:05 +00:00
Hangman
fc657f1776
Translated using Weblate (German)
...
Currently translated at 94.5% (243 of 257 strings)
2018-01-20 17:41:45 +00:00
lucailvec
6f55bb8626
Translated using Weblate (Italian)
...
Currently translated at 100.0% (30 of 30 strings)
2018-01-20 15:20:25 +00:00
lucailvec
62d34178b0
Translated using Weblate (Italian)
...
Currently translated at 100.0% (68 of 68 strings)
2018-01-20 14:49:03 +00:00
Hangman
9d1152c392
Translated using Weblate (German)
...
Currently translated at 100.0% (35 of 35 strings)
2018-01-19 18:49:00 +00:00
Hangman
84cbef62f8
Translated using Weblate (German)
...
Currently translated at 100.0% (17 of 17 strings)
2018-01-19 18:19:38 +00:00
Hangman
8e2f5b6a5e
Translated using Weblate (German)
...
Currently translated at 100.0% (65 of 65 strings)
2018-01-19 17:51:58 +00:00
PICCORO Lenz McKAY
58764ac632
Translated using Weblate (Spanish)
...
Currently translated at 100.0% (159 of 159 strings)
2018-01-19 12:24:33 +00:00
PICCORO Lenz McKAY
49ed5ac10a
Translated using Weblate (Spanish)
...
Currently translated at 100.0% (65 of 65 strings)
2018-01-19 12:10:04 +00:00
lucailvec
02f873aa64
Translated using Weblate (Italian)
...
Currently translated at 100.0% (43 of 43 strings)
Translation: opensourcepos/expenses
Translate-URL: http://*/projects/ospos/expenses/it/
2018-01-19 11:49:46 +00:00
lucailvec
1e431582b5
Translated using Weblate (Italian)
...
Currently translated at 100.0% (30 of 30 strings)
Translation: opensourcepos/taxes
Translate-URL: http://*/projects/ospos/taxes/it/
2018-01-19 07:49:53 +00:00
Hangman
0d49fa72e1
Translated using Weblate (German)
...
Currently translated at 3.3% (1 of 30 strings)
Translation: opensourcepos/taxes
Translate-URL: http://*/projects/ospos/taxes/de/
2018-01-19 07:49:53 +00:00
lucailvec
364886e395
Translated using Weblate (Italian)
...
Currently translated at 100.0% (17 of 17 strings)
2018-01-19 07:49:53 +00:00
lucailvec
9d3b215fc2
Translated using Weblate (Italian)
...
Currently translated at 100.0% (159 of 159 strings)
2018-01-19 07:49:53 +00:00
Hangman
4cd0f13485
Translated using Weblate (German)
...
Currently translated at 100.0% (159 of 159 strings)
2018-01-19 07:49:53 +00:00
lucailvec
937896d436
Translated using Weblate (Italian)
...
Currently translated at 100.0% (51 of 51 strings)
2018-01-19 07:49:53 +00:00
lucailvec
d5c3d8056a
Translated using Weblate (Italian)
...
Currently translated at 100.0% (5 of 5 strings)
Translation: opensourcepos/migrate
Translate-URL: http://*/projects/ospos/migrate/it/
2018-01-19 07:49:53 +00:00
lucailvec
69fc834118
Translated using Weblate (Italian)
...
Currently translated at 100.0% (18 of 18 strings)
Translation: opensourcepos/expenses_categories
Translate-URL: http://*/projects/ospos/expenses_categories/it/
2018-01-19 07:49:53 +00:00
lucailvec
bac9897bed
Translated using Weblate (Italian)
...
Currently translated at 100.0% (2 of 2 strings)
2018-01-19 07:49:53 +00:00
Zhivko Vanev
424e4f0f87
Translated using Weblate (Bulgarian)
...
Currently translated at 100.0% (2 of 2 strings)
2018-01-19 07:49:53 +00:00
lucailvec
8e069c4e10
Translated using Weblate (Italian)
...
Currently translated at 100.0% (35 of 35 strings)
2018-01-19 07:49:53 +00:00
lucailvec
3fff00c1f5
Translated using Weblate (Italian)
...
Currently translated at 100.0% (20 of 20 strings)
2018-01-19 07:49:53 +00:00
lucailvec
57a6a8b1a5
Translated using Weblate (Italian)
...
Currently translated at 100.0% (44 of 44 strings)
2018-01-19 07:49:53 +00:00
Hangman
e0f7e48d5a
Translated using Weblate (German)
...
Currently translated at 52.2% (23 of 44 strings)
2018-01-19 07:49:53 +00:00
lucailvec
a7733bd244
Translated using Weblate (Italian)
...
Currently translated at 100.0% (257 of 257 strings)
2018-01-19 07:49:53 +00:00
lucailvec
eb39c0ba56
Translated using Weblate (Italian)
...
Currently translated at 100.0% (8 of 8 strings)
2018-01-19 07:49:53 +00:00
lucailvec
69a2f6b7f3
Translated using Weblate (Italian)
...
Currently translated at 96.9% (63 of 65 strings)
2018-01-19 07:49:53 +00:00
lucailvec
e241b1eb89
Translated using Weblate (Italian)
...
Currently translated at 100.0% (35 of 35 strings)
2018-01-19 07:49:53 +00:00
FrancescoUK
f1edb38be8
Remove duplicated language entry ( #1773 )
2018-01-12 21:51:55 +00:00
FrancescoUK
6d74f80306
Add Italian to the language list, resort languages ( #1779 )
2018-01-12 21:51:50 +00:00
FrancescoUK
0456465383
Add missing en_GB translations ( #1773 )
2018-01-12 21:50:09 +00:00
jekkos
f4fedef0fb
Another attempt at stabilizing the build ( #1759 )
2018-01-11 19:15:07 +01:00
Weblate
713f6106c1
Translated using Weblate (Italian)
...
Currently translated at 3.0% (2 of 65 strings)
2018-01-11 17:34:54 +00:00
Weblate
e44683e6b6
Added translation using Weblate (Italian)
2018-01-11 17:34:54 +00:00
jekkos
9d594854b3
Move to travis edge environment ( #1759 )
2018-01-11 00:17:38 +01:00
Steve Ireland
7a55c2311e
More missing language elements and one bad reference to a config value.
2018-01-11 00:07:22 +01:00
FrancescoUK
ba5fa39151
Fix missing language lines ( #1773 )
2018-01-06 16:40:43 +00:00
FrancescoUK
75b401b068
Add a couple of missing reports language elements
2018-01-06 16:39:02 +00:00
Steve Ireland
7029858f58
Add a couple of missing reports language elements
2018-01-05 19:46:13 -05:00
FrancescoUK
fad12b9de2
Fix PHP7.2 and MCrypt issue, use OpenSSL instead ( #1770 )
2018-01-03 22:01:12 +00:00
FrancescoUK
8b96af3d19
Use define instead of hard number ( #1647 )
2018-01-02 22:24:56 +00:00
FrancescoUK
447571090f
Provide a way to enter a line total and have the quantity sold automatically calculated ( #1647 )
2018-01-02 22:07:20 +00:00
Steve Ireland
a6e08b5d7d
Provide a way to enter a line total and have the quantity sold automatically calculated.
2018-01-02 13:42:25 -05:00
FrancescoUK
b3835ec6a3
Fix register regression ( #1647 )
2018-01-01 14:03:39 +00:00
FrancescoUK
080d3c0e3b
Fix GB translation typo ( #1647 )
2018-01-01 12:20:06 +00:00
FrancescoUK
86019e002d
Provide a way to enter a line total and have the quantity sold automatically calculated ( #1647 )
2018-01-01 12:01:43 +00:00
FrancescoUK
e0329472ef
Various fixes
2018-01-01 11:59:25 +00:00
Steve Ireland
62f34663ae
Provide a way to enter a line total and have the quantity sold automatically calculated.
2017-12-31 16:22:04 -05:00
FrancescoUK
9bf1d66b74
Set a larger receipt Barcode size
2017-12-31 21:18:42 +00:00
FrancescoUK
74449f6570
Remove unused Barcode quality ( #1753 )
2017-12-31 15:05:19 +00:00
FrancescoUK
2a306b888f
Fix discount detail report ( #1736 )
2017-12-31 14:29:51 +00:00
FrancescoUK
161fa4f5d3
Fix to Languages and LICENSE
2017-12-31 13:35:26 +00:00
Thin Siphachanh
20791d7c12
Translated using Weblate (Lao)
...
Currently translated at 100.0% (42 of 42 strings)
Translation: opensourcepos/expenses
Translate-URL: http://*/projects/ospos/expenses/lo/
2017-12-31 00:55:44 +00:00
Weblate
1a8a19d568
Add lao language
2017-12-29 16:01:33 +00:00
FrancescoUK
61062e1278
Add Lao language, small locale refactoring
2017-12-25 21:14:14 +00:00
Thin Siphachanh
1e87fe0a24
Translated using Weblate (Lao)
...
Currently translated at 100.0% (16 of 16 strings)
2017-12-25 10:04:47 +00:00
Thin Siphachanh
5f3a42592e
Translated using Weblate (Lao)
...
Currently translated at 100.0% (12 of 12 strings)
2017-12-25 10:04:47 +00:00
Thin Siphachanh
8e27a88d3a
Translated using Weblate (Lao)
...
Currently translated at 100.0% (8 of 8 strings)
2017-12-25 10:04:47 +00:00
Chonh Ssp
b98b842ebe
Translated using Weblate (Lao)
...
Currently translated at 100.0% (101 of 101 strings)
2017-12-25 10:04:47 +00:00
Thin Siphachanh
8f634d7cff
Translated using Weblate (Lao)
...
Currently translated at 100.0% (29 of 29 strings)
2017-12-25 10:04:47 +00:00
Thin Siphachanh
7ab2272abc
Translated using Weblate (Lao)
...
Currently translated at 100.0% (18 of 18 strings)
Translation: opensourcepos/expenses_categories
Translate-URL: http://*/projects/ospos/expenses_categories/lo/
2017-12-25 10:04:47 +00:00
Thin Siphachanh
c0e63cbdfd
Translated using Weblate (Lao)
...
Currently translated at 100.0% (42 of 42 strings)
Translation: opensourcepos/expenses
Translate-URL: http://*/projects/ospos/expenses/lo/
2017-12-25 10:04:47 +00:00
Thin Siphachanh
173574ffaf
Translated using Weblate (Lao)
...
Currently translated at 100.0% (2 of 2 strings)
2017-12-25 10:04:47 +00:00
Thin Siphachanh
8f0af3b450
Translated using Weblate (Lao)
...
Currently translated at 100.0% (34 of 34 strings)
2017-12-25 10:04:47 +00:00
Thin Siphachanh
2d71d3bd02
Translated using Weblate (Lao)
...
Currently translated at 100.0% (20 of 20 strings)
2017-12-25 10:04:47 +00:00
Thin Siphachanh
7be5816fa1
Translated using Weblate (Lao)
...
Currently translated at 100.0% (254 of 254 strings)
2017-12-25 10:04:47 +00:00
Thin Siphachanh
56864e6919
Translated using Weblate (Lao)
...
Currently translated at 100.0% (8 of 8 strings)
2017-12-25 10:04:47 +00:00
Weblate
846d99d037
Translated using Weblate (Lao)
...
Currently translated at 100.0% (65 of 65 strings)
2017-12-25 10:04:47 +00:00
Weblate
6c563a210e
Added translation using Weblate (Lao)
2017-12-25 10:04:47 +00:00
jekkos
b49dbd39ed
Run in travis trusty environment
2017-12-25 02:19:26 +01:00
jekkos
25282381f4
Update project badges
2017-12-24 22:44:48 +01:00
FrancescoUK
13b3a3b98f
Add Swedish, Khmer and Bulgarian languages support
2017-12-24 19:08:14 +00:00
FrancescoUK
455b462d25
Preparing 3.2.0 release
2017-12-24 19:08:14 +00:00
Weblate
058cf639db
Added translation using Weblate (Arabic)
2017-12-24 19:00:38 +00:00
Weblate
2c97c79737
Translated using Weblate (Dutch (Belgium))
...
Currently translated at 13.7% (4 of 29 strings)
Translation: opensourcepos/taxes
Translate-URL: http://*/projects/ospos/taxes/nl_BE/
2017-12-24 18:33:00 +00:00
Weblate
11135e9e4f
Translated using Weblate (Dutch (Belgium))
...
Currently translated at 20.0% (1 of 5 strings)
Translation: opensourcepos/migrate
Translate-URL: http://*/projects/ospos/migrate/nl_BE/
2017-12-24 18:29:28 +00:00
Weblate
ce321877ff
Translated using Weblate (Bulgarian)
...
Currently translated at 100.0% (20 of 20 strings)
2017-12-24 18:29:27 +00:00
Weblate
630017aea1
Translated using Weblate (Bulgarian)
...
Currently translated at 100.0% (65 of 65 strings)
2017-12-24 18:15:04 +00:00
Weblate
e7c7af36ac
Added translation using Weblate (Bulgarian)
2017-12-24 18:01:55 +00:00
Weblate
9632e8b508
Added translation using Weblate (Bulgarian)
2017-12-24 18:01:18 +00:00
Weblate
546167ac01
Added translation using Weblate (Bulgarian)
2017-12-24 18:00:35 +00:00
Weblate
7bcc3d0f56
Added translation using Weblate (Bulgarian)
2017-12-24 18:00:10 +00:00
Weblate
751e70fc15
Added translation using Weblate (Bulgarian)
2017-12-24 17:59:24 +00:00
Weblate
8b1b5fc1d7
Added translation using Weblate (Bulgarian)
2017-12-24 17:56:10 +00:00
FrancescoUK
f49bf8d4d4
Translated using Weblate (Swedish)
...
Currently translated at 24.6% (16 of 65 strings)
2017-12-24 17:55:20 +00:00
FrancescoUK
af4e93f483
Translated using Weblate (Swedish)
...
Currently translated at 16.9% (11 of 65 strings)
2017-12-24 17:52:01 +00:00
FrancescoUK
4e9236b2e3
Translated using Weblate (Swedish)
...
Currently translated at 13.8% (9 of 65 strings)
2017-12-24 17:51:27 +00:00
FrancescoUK
195a24feb0
Translated using Weblate (Swedish)
...
Currently translated at 12.3% (8 of 65 strings)
2017-12-24 17:50:46 +00:00
FrancescoUK
6c5ab60f59
Translated using Weblate (Swedish)
...
Currently translated at 10.7% (7 of 65 strings)
2017-12-24 17:50:22 +00:00
FrancescoUK
0458fcc99c
Translated using Weblate (Swedish)
...
Currently translated at 9.2% (6 of 65 strings)
2017-12-24 17:49:39 +00:00
Weblate
a11e1dc585
Translated using Weblate (Swedish)
...
Currently translated at 1.2% (2 of 159 strings)
2017-12-23 22:57:48 +00:00
Weblate
072396f951
Translated using Weblate (Swedish)
...
Currently translated at 0.6% (1 of 159 strings)
2017-12-23 22:56:37 +00:00
Weblate
b3a2ca4db4
Translated using Weblate (Swedish)
...
Currently translated at 1.5% (1 of 65 strings)
2017-12-23 22:47:58 +00:00
Salvador Hurtado
66278805c6
Translated using Weblate (Spanish)
...
Currently translated at 86.7% (138 of 159 strings)
2017-12-23 22:22:12 +00:00
Weblate
b91d383acf
Translated using Weblate (Dutch (Belgium))
...
Currently translated at 100.0% (65 of 65 strings)
2017-12-23 22:22:12 +00:00
FrancescoUK
a7d7cbe43c
Fix clash of item_id and item_number (Barcode) ( #1747 )
2017-12-23 21:20:48 +00:00
FrancescoUK
ab2685ef62
Fix circular lib dependency ( #1668 ) upgrade to CI 3.1.6
2017-12-22 20:58:18 +00:00
FrancescoUK
c96c2a69a6
Fix Reports and few other minor things
2017-12-12 20:58:36 +00:00
FrancescoUK
323738210b
Merge pull request #1748 from i92guboj/master
...
Incorrect header in spanish invoice template
2017-12-11 21:48:29 +00:00
i92guboj
d61d3b46f3
fix spanish invoice header
2017-12-11 22:41:11 +01:00
FrancescoUK
a08826e909
Add extra Expense fields ( #1235 )
2017-12-11 17:28:42 +00:00
FrancescoUK
ad1e63fa3a
Fix rounding issue with GST and discounts ( #1437 )
2017-12-09 17:08:05 +00:00
FrancescoUK
a25a87ec60
Update README.md
2017-12-03 12:15:08 +00:00
FrancescoUK
8c6ff0ceb1
ISSUE_TEMPLATE.md minor amendment
2017-12-03 12:06:22 +00:00
FrancescoUK
0f352abcaa
Simplified ISSUE_TEMPLATE.md
2017-12-03 12:03:25 +00:00
FrancescoUK
4910441099
Add table sticky header ( #1610 )
2017-12-02 18:57:39 +00:00
FrancescoUK
c248086566
Add table export to pdf ( #1681 )
2017-12-02 18:19:10 +00:00
FrancescoUK
c784a537dd
Fix export all records #868
2017-12-02 17:42:57 +00:00
FrancescoUK
00958608e0
Merge pull request #1739 from odiea/master
...
Add Company search to Customer and Sales
2017-12-02 16:10:08 +00:00
odiea
d3cb3b7f87
Added Company search to Customer and Sales
2017-11-30 16:07:01 -07:00
FrancescoUK
983830ef70
Allow receipt item name to be wrapped.
2017-11-30 19:29:18 +00:00
FrancescoUK
35b6609327
Hide Deleted in Expense form when new expense ( #1235 )
2017-11-27 21:14:01 +00:00
FrancescoUK
b058e91a99
Fix code indentation issues
2017-11-27 20:52:46 +00:00
FrancescoUK
2cde603949
Add Expenses support ( #1235 )
2017-11-26 20:45:57 +00:00
FrancescoUK
b5b2d4f62f
Restore cancelled sales ( #682 )
2017-11-25 21:45:59 +00:00
FrancescoUK
473676fb08
Add British English translations
2017-11-25 21:43:13 +00:00
Steve Ireland
64c2996c74
Improve the ability to restore canceled sales.
2017-11-25 21:38:00 +00:00
FrancescoUK
15ad253c3a
Merge pull request #1723 from RuleDomain/fix-gift-card-vat-amount
...
Fix gift card amount due in a VAT tax environment.
2017-11-22 20:09:10 +00:00
Steve Ireland
fcab8e1fc9
Fix gift card amount due in a VAT tax environment.
2017-11-21 23:29:28 -05:00
FrancescoUK
8b92d19732
Merge pull request #1701 from RuleDomain/rename-location-fix
...
Fix issue with renaming stock locations (#1691 )
2017-10-29 07:58:08 +00:00
Steve Ireland
2f221004fb
Correct issues with renaming stock locations
2017-10-28 19:57:36 -04:00
FrancescoUK
2b2396521c
Update bootstrap-table js version to latest master
2017-10-21 14:07:10 +01:00
FrancescoUK
f26c703626
Merge pull request #1686 from ertanyildiz/master
...
Updated Giftcards 81 line
2017-10-21 12:15:08 +01:00
FrancescoUK
eef9dc82ca
Ensure php-mbstring extension is installed ( #1673 )
2017-10-21 11:57:20 +01:00
Ertan YILDIZ
5a21ac7c89
Updated Giftcards 81 line
...
it throws error if there is no gift cart in database.
*check if row is set. if not, set $max_giftnumber to zero
2017-10-20 15:33:59 +03:00
FrancescoUK
269bb900b5
Export all reports records ( #868 )
2017-10-14 11:01:58 +01:00
FrancescoUK
37ed01ed3e
Move Office Icons to the right ( #1624 )
2017-10-13 20:17:38 +01:00
FrancescoUK
fe4961be8e
Insert Try->Catch clause ( #1616 )
2017-10-13 19:16:09 +01:00
FrancescoUK
058414e78c
Fix invoice pdf name bug ( #1163 )
2017-10-07 17:01:47 +01:00
FrancescoUK
49dba3035c
Various fixes to language files
2017-10-07 13:58:33 +01:00
Chiraq Bookstore
e73c33279a
Translated using Weblate (az_AZ (generated))
...
Currently translated at 42.0% (21 of 50 strings)
2017-10-06 07:05:54 +00:00
Chiraq Bookstore
cc2916b65b
Translated using Weblate (az_AZ (generated))
...
Currently translated at 0.0% (0 of 12 strings)
2017-10-06 07:05:54 +00:00
Chiraq Bookstore
a64c4db252
Translated using Weblate (az_AZ (generated))
...
Currently translated at 79.1% (53 of 67 strings)
2017-10-06 07:05:54 +00:00
Chiraq Bookstore
57172e17fc
Translated using Weblate (az_AZ (generated))
...
Currently translated at 5.0% (1 of 20 strings)
2017-10-06 07:05:53 +00:00
Chiraq Bookstore
cc61365f4d
Translated using Weblate (az_AZ (generated))
...
Currently translated at 30.2% (13 of 43 strings)
2017-10-06 07:05:53 +00:00
Chiraq Bookstore
59c27f275c
Translated using Weblate (Russian)
...
Currently translated at 98.4% (62 of 63 strings)
2017-10-06 07:05:52 +00:00
Chiraq Bookstore
95453620b7
Translated using Weblate (az_AZ (generated))
...
Currently translated at 13.2% (33 of 249 strings)
2017-10-04 08:04:10 +00:00
Chiraq Bookstore
daa99997d8
Translated using Weblate (az_AZ (generated))
...
Currently translated at 65.5% (19 of 29 strings)
2017-10-04 07:29:16 +00:00
Chiraq Bookstore
c3e5291e06
Translated using Weblate (az_AZ (generated))
...
Currently translated at 50.5% (48 of 95 strings)
2017-10-04 07:29:16 +00:00
Chiraq Bookstore
e2e84eccaa
Translated using Weblate (az_AZ (generated))
...
Currently translated at 62.1% (59 of 95 strings)
2017-09-29 15:18:43 +00:00
Weblate
9d67268693
Translated using Weblate (az_AZ (generated))
...
Currently translated at 12.0% (30 of 249 strings)
2017-09-29 15:18:42 +00:00
Chiraq Bookstore
f9490ba571
Translated using Weblate (az_AZ (generated))
...
Currently translated at 0.0% (0 of 8 strings)
2017-09-29 15:18:41 +00:00
Weblate
767c818e8e
Translated using Weblate (az_AZ (generated))
...
Currently translated at 55.5% (35 of 63 strings)
2017-09-29 06:45:52 +00:00
Chiraq Bookstore
6c3fcc29f3
Translated using Weblate (Russian)
...
Currently translated at 50.3% (77 of 153 strings)
2017-09-29 06:45:52 +00:00
Chiraq Bookstore
b2c2749c99
Translated using Weblate (Russian)
...
Currently translated at 73.6% (70 of 95 strings)
2017-09-29 06:45:52 +00:00
Chiraq Bookstore
c28061f006
Translated using Weblate (Russian)
...
Currently translated at 52.0% (26 of 50 strings)
2017-09-29 06:45:52 +00:00
Chiraq Bookstore
bfd7e95db4
Translated using Weblate (Russian)
...
Currently translated at 0.0% (0 of 12 strings)
2017-09-29 06:45:52 +00:00
Chiraq Bookstore
358104d6db
Translated using Weblate (Russian)
...
Currently translated at 69.3% (70 of 101 strings)
2017-09-29 06:45:52 +00:00
Chiraq Bookstore
0f3b0a0095
Translated using Weblate (Russian)
...
Currently translated at 50.0% (10 of 20 strings)
2017-09-29 06:45:52 +00:00
Chiraq Bookstore
54efec81d3
Translated using Weblate (Russian)
...
Currently translated at 30.2% (13 of 43 strings)
2017-09-29 06:45:52 +00:00
Chiraq Bookstore
0910e86724
Translated using Weblate (Russian)
...
Currently translated at 13.2% (33 of 249 strings)
2017-09-29 06:45:52 +00:00
Chiraq Bookstore
504d69f9cc
Translated using Weblate (Russian)
...
Currently translated at 63.4% (40 of 63 strings)
2017-09-29 06:45:52 +00:00
FrancescoUK
b1b6301b93
Allow return to Giftcard with 0 balance ( #1620 )
2017-09-24 20:23:53 +01:00
FrancescoUK
7aca0a57c5
Fix typo in migration classes
2017-09-24 18:52:56 +01:00
FrancescoUK
9ff7f9f212
Rename Sales to be Transactions ( #1599 )
2017-09-24 18:14:14 +01:00
FrancescoUK
c5a78613ba
Newer migration support ( #1576 )
2017-09-24 16:49:36 +01:00
FrancescoUK
826837e902
Merge pull request #1641 from RuleDomain/fix-invoice-override ( #1638 )
...
Add support for providing a manual invoice number
2017-09-24 16:23:58 +01:00
Steve Ireland
1b9fc76757
Add support for providing a manual invoice number
2017-09-24 10:50:08 -04:00
FrancescoUK
e7ea24bcda
Merge pull request #1639 from RuleDomain/item-maint-fix
...
Fix item maintenance issue related to item kit permissions #1629
2017-09-24 07:56:55 +01:00
Steve Ireland
3d38b2322e
Fix item maintenance issue where item cannot be saved if employee is not authorized to work with Item Kits.
2017-09-23 20:46:16 -04:00
jekkos
66b1e538ad
Install language files using docker ( #1458 )
2017-09-22 19:37:48 +02:00
FrancescoUK
77714b97c4
Fix duplicate barcode warning icon being on the wrong row
2017-09-20 21:03:35 +01:00
FrancescoUK
f5e2f1ac0a
Add duplicate barcode warning en_GB translation
2017-09-20 19:52:53 +01:00
FrancescoUK
fe79af8efd
Revert "Added translation using Weblate (Azerbaijani)"
...
This reverts commit dc5ebd2e85 .
2017-09-20 19:50:05 +01:00
objecttothis
1802a16c02
Removing link
2017-09-20 19:38:42 +02:00
objecttothis
86470a68f5
Add warning tooltip for duplicate barcodes
2017-09-20 19:38:42 +02:00
objecttothis
dd538e07cb
Add warning about duplicate barcodes
2017-09-20 19:38:42 +02:00
FrancescoUK
0f09ae6657
Merge pull request #1618 from objecttothis/patch-4
...
Remove unneeded app_config entry (#1614 )
2017-09-19 18:35:47 +01:00
objecttothis
b2d21dd8a5
Remove unneeded app_config entry
...
this entry is automatically created on first save, so is not needed to manually be entered.
2017-09-19 16:53:15 +04:00
FrancescoUK
89a1224ec3
Merge pull request #1617 from objecttothis/patch-3
...
Correcting Round-up and Round-down bug (#1590 )
2017-09-19 13:44:14 +01:00
objecttothis
79d5bc9156
Correcting Round-up and Round-down bug
...
Former code ignored precision and just rounded up or down to the nearest integer. This code rounds up or down to the precision in cash decimals.
2017-09-19 16:28:40 +04:00
Chiraq Bookstore
a98bf2d69c
Translated using Weblate (Russian)
...
Currently translated at 93.7% (15 of 16 strings)
2017-09-18 18:53:19 +00:00
Chiraq Bookstore
852aa48463
Translated using Weblate (Russian)
...
Currently translated at 81.1% (82 of 101 strings)
2017-09-18 18:53:18 +00:00
Chiraq Bookstore
398edf40a1
Translated using Weblate (Russian)
...
Currently translated at 60.2% (144 of 239 strings)
2017-09-18 18:53:16 +00:00
FrancescoUK
dc5ebd2e85
Added translation using Weblate (Azerbaijani)
2017-09-17 16:41:46 +00:00
FrancescoUK
5c375636a2
Fix 3.1.1 to 3.2.0 SQL upgrade script error
2017-09-17 16:10:40 +01:00
FrancescoUK
39dbd9af52
Small code refactoring
2017-09-17 15:17:48 +01:00
FrancescoUK
5514676dee
Merge pull request #1606 from RuleDomain/suspend-anytype
...
Suspending Work Order lost work order number
2017-09-17 15:17:08 +01:00
Steve Ireland
d63446cdb8
Suspending Work Order lost work order number
2017-09-17 09:24:52 -04:00
FrancescoUK
7789675a55
Merge branch 'RuleDomain-fix-item-kit-cost' ( #1580 #1595 )
...
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2017-09-16 20:46:12 +01:00
Steve Ireland
729283af37
Add support for item kit costing
2017-09-16 11:39:03 -04:00
FrancescoUK
01f4ea3890
Merge pull request #1597 from objecttothis/patch-2
...
Azerbaijani and Russian Translation
2017-09-15 12:08:42 +01:00
objecttothis
92575844e3
Submit Translation
2017-09-15 13:15:52 +04:00
objecttothis
883d42d529
Submit Translation
2017-09-15 13:15:15 +04:00
objecttothis
efc9b36fdd
Submit Translation
2017-09-15 13:10:22 +04:00
objecttothis
775721a059
Submit Translation
2017-09-15 13:09:50 +04:00
objecttothis
15d0e0b1f9
Submit Translation
2017-09-15 13:09:10 +04:00
objecttothis
8b6e83e05c
Submit Translation
2017-09-15 13:08:33 +04:00
objecttothis
25e5751d8d
Submit Translation
2017-09-15 13:07:58 +04:00
objecttothis
09179be68b
Submit Translation
2017-09-15 13:07:27 +04:00
objecttothis
2a3c4bf655
Submit Translation
2017-09-15 13:06:43 +04:00
objecttothis
76e37dedfe
Submit Translation
2017-09-15 13:06:12 +04:00
objecttothis
616f65306a
Submit Translation
2017-09-15 13:05:31 +04:00
objecttothis
e8f5102f99
Submit Translation
2017-09-15 13:04:53 +04:00
objecttothis
1b93713028
Submit Translation
2017-09-15 13:04:20 +04:00
objecttothis
e772f8d150
Submit Translation
2017-09-15 13:03:50 +04:00
objecttothis
9020a67338
Corrected misspelling
2017-09-15 13:01:58 +04:00
FrancescoUK
6144902cc1
Fix PHP 5.6 incompatibility ( #1580 )
2017-09-15 09:36:25 +01:00
FrancescoUK
ad913c79fc
Merge pull request #1591 from RuleDomain/fix-sale-return
...
Change invalid SALE_SALE reference to SALE_RETURN.
2017-09-14 07:05:26 +01:00
Steve Ireland
62c5f2ad16
Change invalid SALE_SALE reference to SALE_RETURN.
2017-09-13 20:53:39 -04:00
FrancescoUK
ac32a06689
Merge pull request #1588 from objecttothis/patch-1
...
Forgot to commit this one
2017-09-13 21:05:11 +01:00
objecttothis
be15e98182
Forgot to commit this one
...
oops
2017-09-13 18:55:36 +04:00
FrancescoUK
bd18549613
Merge Allow Duplicate Barcodes
2017-09-13 09:16:57 +01:00
objecttothis
18e6a3f78b
Support for custom search suggestion format
2017-09-13 09:12:41 +01:00
objecttothis
35b17b120b
Modify database creation to allow duplicate barcodes
2017-09-13 09:12:41 +01:00
objecttothis
dbaf7e8481
Modify items to allow duplicate barcodes
2017-09-13 09:12:41 +01:00
objecttothis
372c3ab6bf
Disables unique check and fixes return
...
- If allow duplicate barcodes is enabled then this function automatically returns FALSE allowing item imports and new items to no longer balk.
- Modified the code to return TRUE not only when there is 1 row but when there are one or more rows. This will fix problems with users that allow duplicate barcodes and who upgraded from older versions before unique barcode was required.
2017-09-13 09:11:32 +01:00
objecttothis
27e9f3ff1a
move save to save_barcode
2017-09-13 09:11:32 +01:00
objecttothis
783b7f0205
checkbox to allow duplicate barcodes
2017-09-13 09:11:32 +01:00
objecttothis
02159d5045
move to barcode_config
2017-09-13 09:11:32 +01:00
objecttothis
6b00091332
correct default value
2017-09-13 09:11:32 +01:00
objecttothis
59297f6954
correct default value
2017-09-13 09:10:52 +01:00
objecttothis
8d7e8d6b9b
Save value of allow_duplicate_barcodes
2017-09-13 09:10:22 +01:00
objecttothis
c11973f78b
misspelling
2017-09-13 09:10:22 +01:00
objecttothis
6f1da83723
misspelling
2017-09-13 09:09:31 +01:00
objecttothis
d1af54ff21
Checkbox to enable/disable allow duplicate barcode
2017-09-13 09:08:43 +01:00
objecttothis
2c8fe60035
Add language line for duplicate barcodes
2017-09-13 09:08:43 +01:00
objecttothis
8e6b8f4da0
Add allow_duplicate_barcode to master table
2017-09-13 09:08:43 +01:00
objecttothis
e687e505f8
Database entry to allow duplicate barcodes
2017-09-13 09:07:59 +01:00
FrancescoUK
ce6e9d6ba4
Merge Search suggestions formatting
2017-09-13 09:02:14 +01:00
objecttothis
67cace93c7
allow custom format in receivings as well
2017-09-13 08:55:54 +01:00
objecttothis
6e82602a47
Allow custom suggestions format
...
This changes the display of the search suggestions to match the format set by the user in app_config. It does not change the logic of how the search suggestions are gathered.
2017-09-13 08:55:54 +01:00
objecttothis
178ba9f702
Add option to select custom columns for search suggestions
2017-09-13 08:55:54 +01:00
objecttothis
cac02eaf96
Add language strings
2017-09-13 08:55:54 +01:00
objecttothis
aa346cbb3f
Add support for custom search suggestion format
2017-09-13 08:55:54 +01:00
objecttothis
07dd8158e5
Support for custom search suggestion format
2017-09-13 08:55:54 +01:00
FrancescoUK
f01537247b
Merge pull request #1582 from RuleDomain/sales-update-fix
...
Restore code that was mistakenly "cleaned up"
2017-09-12 07:04:20 +01:00
Steve Ireland
8408901e5a
Restore code that was mistakenly "cleaned up"
2017-09-11 19:50:13 -04:00
FrancescoUK
4c7abd7728
Update links to replace jekkos with opensourcepos
2017-09-11 22:30:15 +01:00
FrancescoUK
1fd6f5fb70
Individual languages
2017-09-11 21:02:41 +01:00
FrancescoUK
3a8b28fcb6
Fix en-GB translation Canceled -> Cancelled ( #1539 )
2017-09-10 18:05:44 +01:00
FrancescoUK
3de96b03a0
Fix missing cancel option ( #1549 )
2017-09-10 18:01:20 +01:00
Steve Ireland
3e91eb33de
Final touch on Work Orders
2017-09-10 12:43:00 -04:00
FrancescoUK
4dc05063b8
Merge pull request #1574 from RuleDomain/backoffice-2
...
Backoffice Permissions Fix (#1543 )
2017-09-10 16:56:13 +01:00
Steve Ireland
4f93bc7430
Final touch on Work Orders
2017-09-10 11:12:34 -04:00
FrancescoUK
8816c37236
Merge branch 'RuleDomain-work-order-6'
...
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2017-09-10 09:08:17 +01:00
FrancescoUK
b93d6a851d
Add en_GB translations
2017-09-10 08:45:09 +01:00
Steve Ireland
e85e2e5e55
Final touch on Work Orders
2017-09-09 17:39:23 -04:00
FrancescoUK
c01663f901
Fix stylesheet for Office view ( #1543 )
2017-09-09 16:21:31 +01:00
FrancescoUK
700e695b4b
Consistency in database upgrade script
2017-09-09 15:59:38 +01:00
FrancescoUK
07541bf933
Do not show migration module if no migration is required ( #1440 )
2017-09-09 15:26:17 +01:00
FrancescoUK
ec76d85350
Merge pull request #1567 from objecttothis/patch-2
...
Adding Azerbaijani language
2017-09-09 10:34:31 +01:00
FrancescoUK
717bda9f31
Merge branch 'feature/backoffice' ( #1543 #1539 )
2017-09-09 10:30:12 +01:00
FrancescoUK
76a0026bdb
Prepare Release 3.1.1 notes ( #1546 )
2017-09-09 09:49:54 +01:00
FrancescoUK
f2c4024734
Added link to Weblate into README ( #1569 )
2017-09-09 09:24:10 +01:00
FrancescoUK
4de3cbeab6
More support for Work Orders ( #1539 )
2017-09-08 22:18:12 +01:00
FrancescoUK
da1d435114
Add CSRF issue with suhosin to FAQ with link to #1492
2017-09-08 22:05:34 +01:00
FrancescoUK
4036caf829
Add en_GB translations to backoffice feature ( #1543 #1539 )
2017-09-08 22:04:45 +01:00
Steve Ireland
36d549cb9b
Add support for Work Orders
2017-09-08 22:04:45 +01:00
Steve Ireland
af84a617de
Fix database and table script.
2017-09-08 22:04:45 +01:00
FrancescoUK
e42e01a07f
Bump version to 3.2.0
2017-09-08 22:04:45 +01:00
Steve Ireland
de91510beb
Add Office Menu
2017-09-08 22:04:45 +01:00
objecttothis
7a3aab92b9
Adding Azerbaijani language for 3.2.0
2017-09-08 22:26:07 +04:00
Steve Ireland
771c1b9d1e
Enance reporting to accomodate work orders and canceled transactions.
2017-09-08 08:54:25 -04:00
FrancescoUK
5a9aa96b7e
Add CSRF issue with suhosin to FAQ with link to #1492
2017-09-07 22:06:15 +01:00
FrancescoUK
cfa051cee8
Add en_GB translations to backoffice feature ( #1543 #1539 )
2017-09-07 21:40:18 +01:00
Steve Ireland
981aceda53
Add support for Work Orders
2017-09-07 21:37:50 +01:00
Steve Ireland
23b4dacb9a
Fix database and table script.
2017-09-07 21:35:42 +01:00
FrancescoUK
d5c390706b
Bump version to 3.2.0
2017-09-07 21:35:42 +01:00
Steve Ireland
893aad3502
Add Office Menu
2017-09-07 21:35:42 +01:00
FrancescoUK
d98e788775
Removed en_US wrong folder
2017-09-07 20:43:58 +01:00
FrancescoUK
8a59470872
More updates to en-GB translations
2017-09-07 20:42:30 +01:00
FrancescoUK
de38e26856
Merge pull request #1560 from objecttothis/patch-1
...
en-US Translation Corrections (#1546 )
2017-09-07 20:41:30 +01:00
objecttothis
b98d56f126
#1546 Updates
2017-09-07 17:51:20 +04:00
objecttothis
2adbc403ad
#1546 Updates
2017-09-07 17:38:16 +04:00
objecttothis
e1ffda5d27
#1546 Updates
2017-09-07 17:36:04 +04:00
objecttothis
5a6e17f9b0
#1546 Updates
2017-09-07 17:15:05 +04:00
objecttothis
18e6b12541
#1546 Updates
2017-09-07 17:12:42 +04:00
objecttothis
2754d8413c
#1546 Updates
2017-09-07 17:02:44 +04:00
objecttothis
df442b734c
#1546 Updates
2017-09-07 17:00:18 +04:00
objecttothis
283279955f
#1546 Updates
2017-09-07 16:58:44 +04:00
objecttothis
2e208a7a2c
#1546 Updates
2017-09-07 16:57:34 +04:00
objecttothis
685dde7ceb
#1546 Updates
2017-09-07 16:53:13 +04:00
objecttothis
75eec14689
#1546 Updates
2017-09-07 16:43:22 +04:00
objecttothis
941e968fda
#1546 Updates
2017-09-07 16:41:01 +04:00
objecttothis
cf24aebebc
#1546 Updates
2017-09-07 15:57:46 +04:00
objecttothis
75e0b2898e
#1546 Updates
2017-09-07 15:56:10 +04:00
objecttothis
4936f1b302
#1546 Updates
2017-09-07 15:55:13 +04:00
objecttothis
e4215df835
#1546 Updates
2017-09-07 15:53:23 +04:00
objecttothis
c6a519e4ad
#1546 Updates
2017-09-07 15:48:56 +04:00
objecttothis
2b7e9cf631
#1546 Updates
2017-09-07 15:45:46 +04:00
FrancescoUK
a496b971db
Fix more en-GB translations
2017-09-06 18:51:11 +01:00
FrancescoUK
4d7397647f
Fix db backup failure ( #1557 )
2017-09-06 18:26:42 +01:00
Weblate
0b28e0c668
Add again last weblate version of en_US
2017-09-06 11:46:30 +00:00
objecttothis
ba2e274cb0
#1546 Updates
2017-09-06 10:07:02 +04:00
objecttothis
9aee57da2f
#1546 Updates
2017-09-06 09:48:34 +04:00
objecttothis
2499bc5015
#1546 Updates
2017-09-06 09:46:49 +04:00
objecttothis
6f9a15f464
#1546 Updates
2017-09-06 09:37:39 +04:00
objecttothis
51db8d5b91
#1546 Updates
2017-09-06 09:35:31 +04:00
objecttothis
040f4711d1
#1546 Updates
2017-09-06 09:11:22 +04:00
objecttothis
60fc671a9d
#1546 Updates
2017-09-06 09:10:09 +04:00
objecttothis
48aa05f858
#1546 Updates
2017-09-06 09:02:04 +04:00
objecttothis
71de1d1247
#1546 Updates
2017-09-06 08:37:58 +04:00
FrancescoUK
12fcfcb24a
Merge pull request #1552 from objecttothis/patch-1
...
Update to #1491
2017-09-05 19:51:14 +01:00
objecttothis
a77fd438c5
Update to #1491
...
Two changes for #1491
Check for mod rewrite to be enabled
Correct the code which before was not redirecting on Apache 2.4 and nginx.
Please test.
2017-09-05 22:37:44 +04:00
jekkos
887c8374b6
Fix jquery brokenness after upgrade to 2.0 ( #1546 )
2017-09-05 19:02:27 +02:00
FrancescoUK
2bc702acc8
Fix old database upgrade scripts ( #1546 )
2017-09-04 19:37:38 +01:00
FrancescoUK
e1743f4d9f
Fix database upgrade script issue and rename it to 3.0.2 to 3.1.1 ( #1546 )
2017-09-04 18:32:58 +01:00
FrancescoUK
ec96bd8c89
Fix VAT (tax included) migration issue ( #1546 )
2017-09-04 18:12:48 +01:00
Steve Ireland
bd38c1dc67
This resolves the migration issue that was reported plus a couple of other issues that were spotted but not yet reported.
2017-09-04 11:35:42 -04:00
FrancescoUK
9e7b0db950
Bump vs to 3.1.1, fix Giftcard bug, fix en_GB translations ( #1546 )
2017-09-03 18:22:46 +01:00
FrancescoUK
52ab4ce035
Fix db upgrade script and prepare 3.1.0 release ( #1242 )
2017-09-02 12:43:21 +01:00
FrancescoUK
8dbd5e55dd
Switch from en to en_US & en_GB ( #1485 )
2017-09-01 22:19:32 +01:00
FrancescoUK
1eb7ab2406
Translated using Weblate (English (United Kingdom))
...
Currently translated at 100.0% (16 of 16 strings)
2017-09-01 06:32:21 +00:00
FrancescoUK
97fbfb32b9
Translated using Weblate (French)
...
Currently translated at 100.0% (117 of 117 strings)
2017-09-01 06:32:20 +00:00
FrancescoUK
c5f73e0f38
Translated using Weblate (English (United Kingdom))
...
Currently translated at 100.0% (137 of 137 strings)
2017-09-01 06:32:20 +00:00
FrancescoUK
62030d50d8
Translated using Weblate (English (United Kingdom))
...
Currently translated at 100.0% (87 of 87 strings)
2017-09-01 06:32:20 +00:00
FrancescoUK
d20dcce5b4
Translated using Weblate (French)
...
Currently translated at 100.0% (50 of 50 strings)
2017-09-01 06:32:20 +00:00
FrancescoUK
00d15765f3
Translated using Weblate (English (United Kingdom))
...
Currently translated at 100.0% (50 of 50 strings)
2017-09-01 06:32:20 +00:00
FrancescoUK
11ff84e71d
Translated using Weblate (English (United Kingdom))
...
Currently translated at 100.0% (101 of 101 strings)
2017-09-01 06:32:19 +00:00
FrancescoUK
3806b9350b
Translated using Weblate (English (United Kingdom))
...
Currently translated at 100.0% (29 of 29 strings)
2017-09-01 06:32:18 +00:00
FrancescoUK
7429637dbf
Translated using Weblate (French)
...
Currently translated at 100.0% (67 of 67 strings)
2017-09-01 06:32:18 +00:00
FrancescoUK
26fa619127
Translated using Weblate (English (United Kingdom))
...
Currently translated at 100.0% (67 of 67 strings)
2017-09-01 06:32:18 +00:00
FrancescoUK
a6a3f83378
Translated using Weblate (English (United Kingdom))
...
Currently translated at 100.0% (2 of 2 strings)
2017-09-01 06:32:17 +00:00
FrancescoUK
5ad39fe230
Translated using Weblate (English (United Kingdom))
...
Currently translated at 100.0% (32 of 32 strings)
2017-09-01 06:32:17 +00:00
FrancescoUK
91ef1af0c5
Translated using Weblate (English (United Kingdom))
...
Currently translated at 100.0% (43 of 43 strings)
2017-09-01 06:32:16 +00:00
FrancescoUK
54f1ca2d1f
Translated using Weblate (French)
...
Currently translated at 100.0% (227 of 227 strings)
2017-09-01 06:32:16 +00:00
FrancescoUK
28953a0def
Translated using Weblate (English (United Kingdom))
...
Currently translated at 100.0% (239 of 239 strings)
2017-09-01 06:32:16 +00:00
FrancescoUK
688ce015fe
Translated using Weblate (English (United Kingdom))
...
Currently translated at 100.0% (63 of 63 strings)
2017-09-01 06:32:15 +00:00
FrancescoUK
b3189a01bf
Translated using Weblate (Portuguese (Brazil))
...
Currently translated at 95.3% (82 of 86 strings)
2017-08-30 20:46:18 +00:00
Rogério Almeida Rodrigues
eee3132cce
Translated using Weblate (Portuguese (Brazil))
...
Currently translated at 91.0% (92 of 101 strings)
2017-08-30 20:41:43 +00:00
FrancescoUK
3730cb0803
Translated using Weblate (Portuguese (Brazil))
...
Currently translated at 91.0% (92 of 101 strings)
2017-08-30 20:41:33 +00:00
Rogério Almeida Rodrigues
a39c15c71d
Translated using Weblate (Portuguese (Brazil))
...
Currently translated at 65.5% (19 of 29 strings)
2017-08-30 20:38:45 +00:00
Emin Tufan Çetin
fea5b064a9
Translated using Weblate (Turkish)
...
Currently translated at 98.3% (60 of 61 strings)
2017-08-29 10:15:47 +00:00
FrancescoUK
8169a08ff1
Minor fix
2017-08-27 18:21:29 +01:00
FrancescoUK
e26290469f
Regen database script files
2017-08-27 18:12:59 +01:00
jekkos
5dfed09167
Only push zip files to bintray ( #1485 )
2017-08-27 14:04:01 +02:00
jekkos
a3a48d3ea6
Use sudo to copy files? ( #1485 )
2017-08-27 13:50:20 +02:00
jekkos
07441d2144
Copy language files to vendor/ ( #1485 )
2017-08-27 13:45:51 +02:00
objecttothis
3612ecf577
Addition and changes
...
This app_config key/value exists in the 3.0.2_to_3.1.0 upgrade script but not in tables.sql
Custom values changed to varchar 255 and allowing null to match change in update scripts.
2017-08-27 13:15:25 +02:00
FrancescoUK
f9edc63385
Merge branch 'objecttothis-patch-14'
...
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2017-08-26 20:54:35 +01:00
FrancescoUK
31367d8943
Regen db script files
2017-08-26 20:54:16 +01:00
FrancescoUK
4c763ea9c0
Drop location column after migration
2017-08-26 20:47:31 +01:00
objecttothis
7b8a7033a1
Update receivings and sales tables
...
changing comment to default to null which allows comment fields to not be filled
2017-08-25 22:06:20 +04:00
FrancescoUK
8478a7797c
Merge pull request #1523 from objecttothis/patch-4
...
Removed duplicate lines that exist elsewhere
2017-08-25 15:13:57 +01:00
FrancescoUK
44a571ad4f
Remove duplicates from database.sql script
2017-08-25 15:12:37 +01:00
FrancescoUK
0dcfc650a4
Merge pull request #1524 from objecttothis/patch-12
...
This line needs to go into 2.3_migrate_locations.sql
2017-08-25 14:40:49 +01:00
objecttothis
e4e106d6bc
This line needs to go into 2.3_migrate_locations.sql
...
-- ALTER TABLE ospos_items DROP COLUMN location;
2017-08-25 16:59:21 +04:00
objecttothis
00bc200643
Removed duplicate lines that exist elsewhere
...
('currency_decimals', '2'), exists in 2.4_to_3.0.sql
('cash_decimals', '2'), already exists above
('cash_rounding_code', '0'), already exists above
2017-08-25 16:40:05 +04:00
FrancescoUK
a40ccfd232
Merge pull request #1508 from objecttothis/patch-2
...
Increase acceptable length of custom fields and allow null values
2017-08-25 13:15:25 +01:00
Weblate
19cc328c65
Added files since 3.1 (en_US) ( #1485 )
2017-08-25 11:59:15 +00:00
Emin Tufan Çetin
f26963ed3b
Translated using Weblate (Turkish)
...
Currently translated at 100.0% (16 of 16 strings)
2017-08-25 11:59:15 +00:00
Chiraq Bookstore
a175879fe2
Translated using Weblate (English (United States))
...
Currently translated at 100.0% (16 of 16 strings)
2017-08-25 11:59:15 +00:00
Emin Tufan Çetin
46e515db1e
Translated using Weblate (Turkish)
...
Currently translated at 89.0% (122 of 137 strings)
2017-08-25 11:59:15 +00:00
Chiraq Bookstore
3368003a53
Translated using Weblate (English (United States))
...
Currently translated at 100.0% (137 of 137 strings)
2017-08-25 11:59:14 +00:00
Chiraq Bookstore
0112fea0a6
Translated using Weblate (English (United States))
...
Currently translated at 100.0% (87 of 87 strings)
2017-08-25 11:59:14 +00:00
Chiraq Bookstore
2a5e8fe98c
Translated using Weblate (English (United States))
...
Currently translated at 100.0% (50 of 50 strings)
2017-08-25 11:59:14 +00:00
Chiraq Bookstore
b07d99ea38
Translated using Weblate (English (United States))
...
Currently translated at 100.0% (12 of 12 strings)
2017-08-25 11:59:14 +00:00
Chiraq Bookstore
ea328d6543
Translated using Weblate (English (United States))
...
Currently translated at 100.0% (8 of 8 strings)
2017-08-25 11:59:14 +00:00
Chiraq Bookstore
b2b0cb34b5
Translated using Weblate (English (United States))
...
Currently translated at 100.0% (101 of 101 strings)
2017-08-25 11:59:14 +00:00
Emin Tufan Çetin
a91aa3792b
Translated using Weblate (Turkish)
...
Currently translated at 96.5% (28 of 29 strings)
2017-08-25 11:59:14 +00:00
Chiraq Bookstore
de49a50187
Translated using Weblate (English (United States))
...
Currently translated at 100.0% (29 of 29 strings)
2017-08-25 11:59:14 +00:00
Emin Tufan Çetin
675404ce89
Translated using Weblate (Turkish)
...
Currently translated at 96.9% (64 of 66 strings)
2017-08-25 11:59:14 +00:00
Chiraq Bookstore
1ea015c734
Translated using Weblate (English (United States))
...
Currently translated at 100.0% (67 of 67 strings)
2017-08-25 11:59:14 +00:00
Chiraq Bookstore
56f4dee411
Translated using Weblate (English (United States))
...
Currently translated at 100.0% (2 of 2 strings)
2017-08-25 11:59:14 +00:00
Chiraq Bookstore
f393cb4c04
Translated using Weblate (English (United States))
...
Currently translated at 100.0% (32 of 32 strings)
2017-08-25 11:59:14 +00:00
Chiraq Bookstore
4a4172bd0f
Translated using Weblate (English (United States))
...
Currently translated at 100.0% (20 of 20 strings)
2017-08-25 11:59:14 +00:00
Chiraq Bookstore
0aee736fd1
Translated using Weblate (English (United States))
...
Currently translated at 100.0% (43 of 43 strings)
2017-08-25 11:59:14 +00:00
Chiraq Bookstore
86fc8209a2
Translated using Weblate (English (United States))
...
Currently translated at 100.0% (239 of 239 strings)
2017-08-25 11:59:14 +00:00
Chiraq Bookstore
db49939d6e
Translated using Weblate (English (United States))
...
Currently translated at 100.0% (8 of 8 strings)
2017-08-25 11:59:14 +00:00
Emin Tufan Çetin
8f2052b43e
Translated using Weblate (Turkish)
...
Currently translated at 100.0% (61 of 61 strings)
2017-08-25 11:59:14 +00:00
Chiraq Bookstore
b7aeb7f36d
Translated using Weblate (English (United States))
...
Currently translated at 100.0% (63 of 63 strings)
2017-08-25 11:59:14 +00:00
Weblate
2fe9c1f58b
Added translation using Weblate (Central Khmer)
2017-08-25 11:59:14 +00:00
FrancescoUK
63f859d392
Merge pull request #1520 from objecttothis/patch-10
...
add missing keys delete dropped key
2017-08-25 08:56:53 +01:00
FrancescoUK
26a5f4688b
Merge pull request #1521 from objecttothis/patch-11
...
add distinct designation to prevent sql error
2017-08-25 08:56:29 +01:00
objecttothis
93d00f06b3
removed the addition of client_id to app_config
...
this field is added automatically and not needed to be added by the update script.
2017-08-25 11:52:27 +04:00
objecttothis
b5f6cd56d6
add distinct designation to prevent sql error
...
without distinct it migrates multiple copies of the same stock location name which later cause issues in 2.3_to_2.3.1.sql when trying to insert into ospos_permissions.
2017-08-25 00:12:48 +04:00
FrancescoUK
e451618114
Merge pull request #1519 from objecttothis/patch-9
...
Corrections to dB modifications
2017-08-24 21:01:06 +01:00
objecttothis
8e8713d1b0
add missing keys delete dropped key
...
added several missing keys to app_config
deleted one key that was removed from the app at some point
2017-08-24 23:33:25 +04:00
objecttothis
90523b79e2
Corrections to dB modifications
...
removed comment lines as those appear in 2.3.2_to_2.3.3.sql
2017-08-24 23:25:08 +04:00
FrancescoUK
c715bca5cd
Merge pull request #1516 from objecttothis/patch-4
...
Ignore inserted to prevent SQL errors on duplicate values and comment to default null
2017-08-24 19:23:13 +01:00
FrancescoUK
c88bbe3852
Merge pull request #1515 from objecttothis/patch-8
...
Ignore pre-existing rows
2017-08-24 19:22:29 +01:00
FrancescoUK
1ee11ea61c
Merge pull request #1514 from objecttothis/patch-3
...
Duplicate inserts into ospos_grants cause error
2017-08-24 19:21:59 +01:00
FrancescoUK
5a19031271
Merge pull request #1512 from objecttothis/patch-7
...
This insert actually needed to be done in 2.3_to_2.3.1
2017-08-24 19:21:06 +01:00
FrancescoUK
8817005401
Merge pull request #1511 from objecttothis/patch-6
...
#1509 add missing key,value pairs to permissions
2017-08-24 19:20:30 +01:00
FrancescoUK
6df1c7818e
Merge pull request #1513 from objecttothis/patch-5
...
migrations table won't exist for everyone
2017-08-24 19:19:56 +01:00
objecttothis
3af4bf0187
Ignore pre-existing rows
...
sales_stock and receivings_stock already exist at the point this insert gets run causing the sql to fail. Adding the IGNORE directive causes duplicate entries to be skipped in the insert.
2017-08-24 17:55:35 +04:00
objecttothis
1d4692a44a
This insert actually needed to be done in 2.3_to_2.3.1
...
I've already submitted the change in 2.3_to_2.3.1.sql
2017-08-24 17:44:19 +04:00
objecttothis
258debc94a
#1509 add missing key,value pairs to permissions
...
sales_stock and receivings_stock are missing from permissions and it's causing a constraint failure.
2017-08-24 16:51:28 +04:00
objecttothis
34c01ed179
migrations table wont exist for everyone
...
and the people it does exist for should already have the correct collation
2017-08-24 14:37:30 +04:00
objecttothis
477dcb78db
comment should be default null
2017-08-24 14:28:23 +04:00
objecttothis
d4ddb4c8ee
IGNORE statement prevents mysql error if already exists
2017-08-24 14:08:23 +04:00
objecttothis
9864b126a8
SQL Fails if key already exists
...
Using the IGNORE keyword bypasses the insert of that key if it already exists and moves onto the next one.
2017-08-24 14:02:20 +04:00
objecttothis
d29ed9441e
Duplicate inserts into ospos_grants cause error
...
INSERT INTO `ospos_grants` (`permission_id`, `person_id`) VALUES
('sales_stock', 1),
('receivings_stock', 1);
sales_stock and receivings_stock are inserted into the database in 2.3_to_2.3.1.sql, so when this is run it returns an SQL error.
2017-08-24 13:52:57 +04:00
objecttothis
e940c1e99d
Increase acceptable length of custom fields and allow null values
...
Currently the maximum length of these custom fields is 25 characters. It's not too difficult to imagine a case in which this is far too little. Also, currently none of the fields are allowed to remain null, which for most uses doesn't make sense as every item wont necessarily have all the fields populated.
2017-08-24 12:31:21 +04:00
FrancescoUK
bdc63c5c02
Missing additions to database update scripts ( #1488 )
2017-08-23 22:28:11 +01:00
FrancescoUK
120b932219
Include mod_rewrite to redirect to ./public/ ( #1491 )
2017-08-23 21:40:52 +01:00
FrancescoUK
745b9efed1
Small payment summary report query optimisation
2017-08-22 22:31:00 +01:00
jekkos
582311a461
Try to fix php file copy ( #1458 )
2017-08-22 20:40:18 +02:00
jekkos
69b687989d
Fix travis build ( #1458 )
2017-08-22 09:00:26 +02:00
jekkos
1055ebc5ff
Explicitly set folder permissions ( #1458 )
2017-08-22 08:44:24 +02:00
jekkos
d49cb4fc0f
Copy default english to en_US, en_GB and az_AZ ( #1485 )
2017-08-22 08:38:14 +02:00
Travis Garrison
31bcad32a6
Translated using Weblate (Russian)
...
Currently translated at 85.0% (114 of 134 strings)
2017-08-21 21:51:54 +00:00
Emin Tufan Çetin
6956c6362e
Translated using Weblate (Turkish)
...
Currently translated at 100.0% (12 of 12 strings)
2017-08-21 21:51:53 +00:00
Emin Tufan Çetin
4821a8851e
Translated using Weblate (Turkish)
...
Currently translated at 100.0% (26 of 26 strings)
2017-08-21 21:51:53 +00:00
Emin Tufan Çetin
8f133b804f
Translated using Weblate (Turkish)
...
Currently translated at 100.0% (20 of 20 strings)
2017-08-21 21:51:53 +00:00
Emin Tufan Çetin
7894c0c0fc
Translated using Weblate (Turkish)
...
Currently translated at 78.5% (168 of 214 strings)
2017-08-21 21:51:53 +00:00
Travis Garrison
2254ce1fbb
Translated using Weblate (Russian)
...
Currently translated at 100.0% (8 of 8 strings)
2017-08-21 21:51:53 +00:00
Emin Tufan Çetin
7eb8284f2e
Translated using Weblate (Turkish)
...
Currently translated at 100.0% (61 of 61 strings)
2017-08-21 21:51:53 +00:00
Emin Tufan Çetin
75f5e0f1fc
Translated using Weblate (Turkish)
...
Currently translated at 100.0% (20 of 20 strings)
Added translation using Weblate (English (United Kingdom))
Added translation using Weblate (English (United States))
2017-08-21 21:51:32 +00:00
Weblate
0cf8543991
Added translation using Weblate (English (United States))
2017-08-21 21:50:04 +00:00
Weblate
ec11d3f3e4
Added translation using Weblate (English (United Kingdom))
2017-08-21 21:50:04 +00:00
Weblate
33ff6c9a44
Added translation using Weblate (Azerbaijani)
2017-08-21 21:50:04 +00:00
FrancescoUK
5dd7a5fde1
Fix sql upgrade scripts and UPGRADE.txt description ( #1488 )
2017-08-20 17:11:26 +01:00
Guenther Lomas
6f261132a3
Translated using Weblate (Chinese)
...
Currently translated at 86.8% (119 of 137 strings)
2017-08-18 19:55:09 +00:00
Guenther Lomas
665edee213
Translated using Weblate (Chinese)
...
Currently translated at 82.0% (41 of 50 strings)
2017-08-18 19:55:09 +00:00
Guenther Lomas
a2af047899
Translated using Weblate (Chinese)
...
Currently translated at 90.0% (18 of 20 strings)
2017-08-18 19:55:09 +00:00
Guenther Lomas
bbec55e77b
Translated using Weblate (Chinese)
...
Currently translated at 92.0% (23 of 25 strings)
2017-08-18 19:55:09 +00:00
Guenther Lomas
896cc96119
Translated using Weblate (Chinese)
...
Currently translated at 83.1% (178 of 214 strings)
2017-08-18 19:55:09 +00:00
Guenther Lomas
ec1ff216ad
Translated using Weblate (Chinese)
...
Currently translated at 100.0% (61 of 61 strings)
2017-08-18 19:55:09 +00:00
FrancescoUK
c57679cac1
Fix Enhancement typo in ISSUE_TEMPLATE.md
2017-08-18 19:52:39 +01:00
FrancescoUK
ddaa1e88e9
Fix comment cannot be null issue ( #1483 )
2017-08-18 19:49:01 +01:00
jekkos
6a65618e82
Set branch name to travis_branch + create folders on the fly ( #1480 )
2017-08-18 18:10:04 +02:00
jekkos
833490c9a3
Copy translations files with superuser powers ( #1480 )
2017-08-18 17:58:31 +02:00
jekkos
92f62621d5
Fix Baku timezone offset ( #1487 )
2017-08-18 16:07:59 +02:00
jekkos
97334b2e42
Add languages before packaging ( #1480 )
2017-08-18 10:20:34 +02:00
jekkos
767b0d293b
Fix error in upgrade script ( #1477 )
2017-08-16 22:55:09 +02:00
jekkos
ffc7b10b3c
Fix nominatim autocomplete (jQuery 2.0) ( #1471 )
2017-08-16 00:00:00 +02:00
jekkos
5a41626ffd
Fix .travis.yml ( #1448 )
2017-08-15 23:28:06 +02:00
jekkos
e12de53fd8
Publish zip's for all branches + extend filename ( #1448 )
2017-08-15 23:22:04 +02:00
jekkos
768bbf8b18
Add check for testfile presence ( #1455 )
2017-08-13 18:45:07 +02:00
jekkos
0e4fcadd9f
Resync language files ( #1242 )
2017-08-13 18:40:12 +02:00
jekkos
dd6c8fdd25
Add CSV files to dist zip ( #1469 )
2017-08-13 18:31:41 +02:00
FrancescoUK
c579fcf2fa
Merge pull request #1468 from RuleDomain/fix-receipt-short
...
Drop price from short receipt per #1466
2017-08-13 08:33:04 +01:00
FrancescoUK
1ac7994758
Replace spaces with tabs
2017-08-13 08:31:42 +01:00
FrancescoUK
c9fd560b00
Merge pull request #1467 from RuleDomain/fix-cash-rounding-error
...
Fix cash rounding issue (#1430 )
2017-08-13 07:03:45 +01:00
Steve Ireland
a9afce8e14
Drop price from short receipt.
2017-08-12 22:04:43 -04:00
Steve Ireland
2177e71f47
Fix cash rounding issue
2017-08-12 21:17:52 -04:00
FrancescoUK
2a4668a80f
Merge pull request #1465 from Altoubi/patch-1
...
Update config_lang.php
2017-08-12 22:55:50 +01:00
Mohammed Altoubi
86d152a668
Update config_lang.php
2017-08-13 01:50:55 +04:00
FrancescoUK
f23f583ced
Add Customer get_row function in order to refresh the table row correctly ( #1369 )
2017-08-12 22:41:10 +01:00
FrancescoUK
712414c56e
Added "due payment" to manage credit ( #1427 )
2017-08-12 20:46:07 +01:00
FrancescoUK
6fefe3e016
Merge branch 'RuleDomain-fix-receiving-issue'
...
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2017-08-12 19:23:14 +01:00
FrancescoUK
abd3e8ac34
Fix receiving issue ( #1457 )
2017-08-12 19:22:27 +01:00
FrancescoUK
c364d296cd
Fix PRICE_KIT_ITEMS mistake ( #1450 )
2017-08-07 20:21:30 +01:00
FrancescoUK
8e86fbdc2a
Fix comparisons in constant substitution of magic numbers ( #1450 )
2017-08-07 20:11:21 +01:00
FrancescoUK
0f8c7f52cd
Fix 3.0.2_to_3.1.0.sql script mistake
2017-08-07 16:37:42 +01:00
FrancescoUK
bbe766165a
Fix sql script error due to foreign key constraints
2017-08-06 19:55:22 +01:00
FrancescoUK
48fe421bf0
Merge pull request #1441 from jekkos/feature/cleanup
...
Cleanup Sales controller
2017-08-06 19:40:30 +01:00
jekkos
6c714b2dc4
Add constants for magic numbers
2017-08-06 14:33:26 +01:00
FrancescoUK
9d08e9e5be
Restore barcode formats
2017-08-06 14:33:26 +01:00
jekkos
4a05f00307
Some indentation
2017-08-06 14:33:26 +01:00
jekkos
6b0a2576a3
Remove unused methods
2017-08-06 14:33:26 +01:00
jekkos
86d3c6bf04
Cleanup Sales controller
2017-08-06 14:33:26 +01:00
FrancescoUK
3ef1abdcc5
Check at login time all the PHP extensions are available if not error_log
2017-08-06 14:32:17 +01:00
FrancescoUK
627bbb9b07
Update README.md
2017-08-06 10:07:29 +01:00
jekkos
283ec86c3f
Only deploy from master
2017-08-06 10:28:00 +02:00
FrancescoUK
b15b302624
Merge pull request #1445 from RuleDomain/fix-long-alt-description
...
Fix to print 255 character alt item description
2017-08-06 06:43:42 +01:00
jekkos
1f508d0b89
Update README instructions
2017-08-06 02:10:18 +02:00
FrancescoUK
e218453ab3
Add robots.txt directive file to avoid scanning of web bots
2017-08-06 02:10:18 +02:00
jekkos
0476265e7a
Add translations to output zip
2017-08-06 02:10:18 +02:00
jekkos
1589b8ecee
Try to fix filename generation
2017-08-06 02:10:18 +02:00
jekkos
32e1babefd
Fix filename
2017-08-06 02:10:18 +02:00
jekkos
ec2fe4a5de
Fix find replace
2017-08-06 02:10:18 +02:00
jekkos
91b03ab78b
Add deployment files
2017-08-06 02:10:18 +02:00
FrancescoUK
1f6e689151
Development installation script
2017-08-06 02:10:18 +02:00
jekkos
560d25a281
Fix .travis.yml
2017-08-06 02:10:18 +02:00
jekkos
0ab72d8719
Add git revision to bintray zip
2017-08-06 02:10:18 +02:00
FrancescoUK
991042a0f6
Clean bower license file
2017-08-06 02:10:18 +02:00
FrancescoUK
6c043e8c5f
Clean public/dist folder
2017-08-06 02:10:18 +02:00
FrancescoUK
0530abc5f8
Install better random support for 5.x as suggested by CodeIgniter
2017-08-06 02:10:18 +02:00
FrancescoUK
32004f28d4
Clean completely vendor folder
2017-08-06 02:10:18 +02:00
FrancescoUK
2a05d91d44
Update composer.LICENSES
2017-08-06 02:10:18 +02:00
FrancescoUK
a99d3536ce
FIx Gruntfile.js double entry
2017-08-06 02:10:18 +02:00
FrancescoUK
c6378ba4d2
Minor fix
2017-08-06 02:10:18 +02:00
FrancescoUK
aa0e250250
Fixed styling issues and inventory missing translation
2017-08-06 02:10:18 +02:00
FrancescoUK
6dc1f81cbf
Update js plugins and regen dist files
2017-08-06 02:10:18 +02:00
jekkos
c3d9173442
Add back name capitalization library
2017-08-06 02:10:18 +02:00
jekkos
3d238ee78c
Add .htaccess to zipfile ( #1305 )
2017-08-06 02:10:18 +02:00
jekkos
f0fd8a305b
Cleanup source repository, create dist zip ( #1305 )
2017-08-06 02:10:18 +02:00
Steve Ireland
a6045d9e7b
Restore the ability to print the entire 255 character alt item
...
description on quote and invoice.
2017-08-05 19:09:06 -04:00
FrancescoUK
02813c8374
Merge pull request #1431 from RuleDomain/sales-tax-correction
...
Display tax decimals or currency decimals for tax amounts.
2017-08-05 16:27:47 +01:00
FrancescoUK
4835507e1e
Merge pull request #1438 from jekkos/feature/barcode_format
...
Add function to parse barcode fields (#1243 )
2017-08-05 16:25:31 +01:00
FrancescoUK
3b0df85f69
Various fixes
2017-08-05 16:17:06 +01:00
jekkos
36177d1431
Fix jQuery get and make it future proof
2017-08-05 15:18:49 +01:00
jekkos
bc04884190
Add function to parse barcode fields
2017-08-05 15:18:49 +01:00
FrancescoUK
8a3ba5692a
Minor fixes ( #1443 )
2017-08-05 15:10:04 +01:00
FrancescoUK
e89bd73bb5
Add reCaptcha to login page ( #1443 )
2017-08-05 11:46:48 +01:00
FrancescoUK
f1936dbb4d
Fixed rewards foreign key constraint issue ( #1436 )
2017-08-03 21:39:40 +01:00
Steve Ireland
629f180b8d
Dispay tax decimals or currency decimals for tax amounts depending on if sales tax is enabled.
2017-07-29 22:54:49 -04:00
FrancescoUK
6485cf050d
Add database foreign keys related to rewards
2017-07-29 22:21:20 +01:00
FrancescoUK
cd792eb56a
Add receipt font size configuration ( #1401 #1416 )
2017-07-28 21:48:34 +01:00
FrancescoUK
256c926e3d
Fix French translation mistakes causing errors ( #1418 )
2017-07-28 20:50:32 +01:00
FrancescoUK
c18c703237
Fix double counting of payments in summary report ( #1415 )
2017-07-28 20:39:19 +01:00
FrancescoUK
6e64f8ef00
Add customer phone number if available in the register suggestions ( #744 )
2017-07-28 20:22:00 +01:00
FrancescoUK
591d432d4f
Lookup customer in sales register by phone number and email ( #1087 )
2017-07-28 20:08:00 +01:00
FrancescoUK
4a61119c3d
Regen ApiGen code documentation
2017-07-28 18:15:35 +01:00
FrancescoUK
d7237261f7
Update js plugins
2017-07-28 18:11:28 +01:00
FrancescoUK
81512aa76e
Update bower.json
2017-07-28 16:57:26 +01:00
FrancescoUK
0dec6819ad
Fix git exclusion ( #1408 )
2017-07-27 20:03:09 +01:00
FrancescoUK
afca2882f8
Regen dist and database files
2017-07-27 19:47:14 +01:00
jekkos
eb610fccb5
Add missing bootswatch themes ( #1408 )
2017-07-25 22:20:02 +02:00
Steve Ireland
641e2f414c
Add missing language element for rounding code "Unknown" and eliminate duplicate statements in upgrade statement, and fix issue with 0 tax_category_id
2017-07-25 00:56:59 +02:00
jekkos
5d49728c74
Don't add csrf token if cookie expired ( #1392 )
2017-07-18 08:51:36 +02:00
FrancescoUK
858845f4f5
Merge pull request #1397 from RuleDomain/tax-category-cleanup
...
Improve tax category maintenance.
2017-07-15 22:08:09 +01:00
Steve Ireland
eccf08cf8f
Improve tax category maintenance.
2017-07-15 16:42:27 -04:00
FrancescoUK
623572b0f5
Update js plugin and regen dist files
2017-07-14 16:29:47 +01:00
FrancescoUK
dc0d580d05
Fix exceptions in invoice and receipt emails ( #1325 )
2017-07-14 11:28:08 +01:00
FrancescoUK
fe05845bd4
Fix invoice code indentation
2017-07-14 09:57:55 +01:00
Weblate
1798b4553b
Update weblate translations
2017-07-14 07:02:39 +00:00
AELHOFY
e59a3372a9
Translated using Weblate (Arabic)
...
Currently translated at 100.0% (214 of 214 strings)
2017-07-14 07:00:06 +00:00
jekkos
8a7b93f1b9
Sync language files ( #1242 )
2017-07-14 08:34:30 +02:00
jekkos
61a3fee4a6
Fix sales / token substitution
2017-07-14 08:30:35 +02:00
jekkos
a92d60d99f
Minor refactoring tax story
2017-07-14 00:07:13 +02:00
FrancescoUK
47486b980f
Fix Store Config Tax category, Reward, Locations and Tables add and remove of entries
2017-07-13 22:43:49 +01:00
FrancescoUK
dc14cbd7ab
Merge pull request #1395 from RuleDomain/fix-quotes-in-takings-2
...
Remove redundant where clause in Sale.php
2017-07-13 18:54:57 +01:00
Steve Ireland
d7b7f5510c
Remove redundant where clause in Sales.php
2017-07-13 13:15:54 -04:00
FrancescoUK
323b7900e9
Merge pull request #1393 from RuleDomain/fix-quotes-in-takings
...
Remove quotes from the list of takings.
2017-07-13 15:02:17 +01:00
Steve Ireland
eb4d0c8c88
Remove quotes from the list of takings.
2017-07-12 23:15:34 -04:00
FrancescoUK
b0e3600ea6
Fix stock location update ( #1389 )
2017-07-12 22:22:05 +01:00
FrancescoUK
41ae935223
Merge branch 'RuleDomain-long-alt-description'
...
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2017-07-11 22:53:37 +01:00
FrancescoUK
60db2cc4b0
Fixes
2017-07-11 22:43:08 +01:00
Steve Ireland
b7951ea5b2
Consolidate tax configuration.
2017-07-11 22:36:32 +01:00
Steve Ireland
cb31ebb06e
Extend alternate item description to 255 characters.
2017-07-11 22:32:51 +01:00
FrancescoUK
3f0a53933c
Merge branch 'RuleDomain-tax-configuration'
...
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2017-07-11 22:23:42 +01:00
FrancescoUK
f92b06cff2
Fixes
2017-07-11 22:23:14 +01:00
Steve Ireland
bab4791b5e
Consolidate tax configuration.
2017-07-09 18:48:47 -04:00
FrancescoUK
421468f6d8
Update README.md
2017-07-07 21:25:55 +01:00
FrancescoUK
f3a08eab3b
Update ISSUE_TEMPLATE.md
2017-07-07 21:23:10 +01:00
FrancescoUK
863988d2ab
Regen ApiGen documentation
2017-07-06 22:13:18 +01:00
FrancescoUK
e524593a15
Minor fixes
2017-07-06 20:38:41 +01:00
FrancescoUK
181d904360
Visualise the taxes according to the selected number of decimals ( #1133 )
2017-07-06 20:31:35 +01:00
Steve Ireland
4448348f7c
Improve sale status reporting
2017-07-04 22:02:27 -04:00
FrancescoUK
bb762efac7
Merge pull request #1376 from odiea/master
...
Update Items.php . Changed receiving_quantity to 1
2017-07-04 08:55:48 +01:00
FrancescoUK
c5697edf76
Fix payment summary report missing return and location ( #1133 )
2017-07-03 22:07:58 +01:00
FrancescoUK
3f73e449f0
Fix summary report and detailed sale report different tax issue ( #1133 )
2017-07-03 20:13:37 +01:00
odiea
a18745b3af
Update Items.php
2017-07-03 06:23:05 -06:00
FrancescoUK
0057c77721
Replace UPC/EAN/ISBN with Barcode label ( #1370 )
2017-07-02 21:52:07 +01:00
FrancescoUK
fd3fecbd76
Update README
2017-07-02 21:31:56 +01:00
FrancescoUK
ad690c9ca6
Add odiea to the hall of fame :-)
2017-07-02 21:27:09 +01:00
FrancescoUK
ab29527619
Fix (yet again) registry "complete" issue with rounding
2017-07-02 21:07:55 +01:00
FrancescoUK
12b5ed43c6
Regen ApiGen documentation
2017-07-02 20:26:45 +01:00
FrancescoUK
a78f053c80
Fix config Table and Reward errors
2017-07-02 19:48:58 +01:00
FrancescoUK
5ea0324bc0
Fix rounding issues in reports ( #1336 )
2017-07-02 15:32:06 +01:00
FrancescoUK
005193e3e0
Update CodeIgniter to vs 3.1.5
2017-07-02 13:05:12 +01:00
FrancescoUK
95733ea476
Regen Apigen documentation
2017-07-02 11:23:09 +01:00
FrancescoUK
c8499599ab
General code tidy up, added documentation
2017-07-02 11:15:57 +01:00
FrancescoUK
2f44a9d5c2
Update ISSUE_TEMPLATE.md
2017-07-02 09:00:34 +01:00
FrancescoUK
d28e95208b
Update TEMPLATE_ISSUES.md to reflect the latest
2017-07-01 10:06:05 +01:00
FrancescoUK
c4bda0e1fe
Merge branch 'RuleDomain-vat-discount-amount-issues'
...
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2017-06-30 19:11:41 +01:00
FrancescoUK
15e0da4515
Minor fixes
2017-06-30 19:10:43 +01:00
Steve Ireland
c71ce1e8ae
Fix discount issue on checkout in VAT tax scenario
2017-06-30 19:05:03 +01:00
FrancescoUK
d5e2b6cb0d
Regen files
2017-06-30 19:03:15 +01:00
FrancescoUK
d25b1408c9
Merge pull request #1362 from RuleDomain/discard-quote-fix
...
Fix #1340 - failure to discard quotes
2017-06-27 06:22:09 +01:00
Steve Ireland
c3f83202a8
Fix failure to discard quotes
2017-06-26 23:32:35 -04:00
FrancescoUK
643c5d91a6
Merge pull request #1360 from RuleDomain/suspended-sale-inventory-fix
...
Fix for #1354 , inventory update issue for suspended sales
2017-06-26 05:55:38 +01:00
Steve Ireland
69e56d06ae
Correction to update inventory only if item type is standard and sale type is standard.
2017-06-25 22:11:06 -04:00
FrancescoUK
ee2f66aa61
Merge pull request #1359 from odiea/master
...
Fix Detailed Reports to show table content.
2017-06-25 20:35:31 +01:00
odiea
16502065fa
Fix Detailed Reports to show table content.
2017-06-25 09:53:57 -06:00
FrancescoUK
1a7ed8a69b
Fix line duplication mistake ( #1358 )
2017-06-24 17:44:58 +01:00
FrancescoUK
d2eaaab92c
Merge pull request #1358 from odiea/master
...
Update Receiving.php
2017-06-24 16:37:17 +01:00
odiea
55666caac5
Update Receiving.php
2017-06-24 09:29:01 -06:00
FrancescoUK
841c8166a2
Fixed missing English translation ( #1355 )
2017-06-24 13:39:35 +01:00
FrancescoUK
4e5ac5c521
Merge branch 'odiea-receivingquantity'
...
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2017-06-24 13:03:54 +01:00
FrancescoUK
d59e713f1f
move receiving database update to common database update script
2017-06-24 13:03:00 +01:00
odiea
78877094fb
Update receipt.php
2017-06-24 13:03:00 +01:00
odiea
e2e0ade259
Update for Items receiving_quantity
2017-06-24 13:03:00 +01:00
FrancescoUK
e61e409bfe
Fix name Title Case issue ( #1301 ) using a composer lib
2017-06-24 12:25:46 +01:00
jekkos
5d22e41fe2
Fix refresh on focusout ( #1351 , #1328 )
2017-06-20 22:39:32 +02:00
jekkos
0d82db42da
Show string placeholders if translations are missing ( #1349 )
2017-06-19 22:14:01 +02:00
jekkos
ff7848dcff
Fix escape error in french ( #1344 )
2017-06-19 22:06:57 +02:00
FrancescoUK
4866457164
Merge pull request #1342 from RuleDomain/fix-undefined-table-status
...
Fix undefined table_status error in Sale.php
2017-06-18 09:51:35 +01:00
Steve Ireland
acd003a44c
Fix undeifined table_status error in Sale.php
2017-06-13 20:43:47 -04:00
jekkos
f407702dbe
Add database.php to docker image ( #1297 )
2017-06-13 19:17:34 +02:00
FrancescoUK
d129610b24
Merge pull request #1335 from Frontuari/master
...
Fixed Dinner Tables feature
2017-06-07 19:44:18 +01:00
Jorge Colmenarez
55bf5eddda
Fixed Dinner Tables feature
2017-06-07 11:15:46 -04:00
FrancescoUK
94ea15bc18
Fixed notification pop up issues in Config with tables & rewards
2017-06-04 14:31:50 +01:00
FrancescoUK
91fd435cca
Fixes to reports tax summary and rewards regressions
2017-06-04 10:46:24 +01:00
FrancescoUK
8f019b4631
Merge branch 'RuleDomain-sales-tax-reporting'
...
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2017-06-03 23:09:15 +01:00
FrancescoUK
51e160982e
Upgrades sales tax reporting
2017-06-03 23:08:09 +01:00
Steve Ireland
1f2218bbc9
Upgrades sales tax reporting
2017-06-03 21:51:02 +01:00
jekkos
77145d29a8
Regnerate language files ( #1330 )
2017-06-02 19:47:13 +02:00
jekkos
3a447561eb
Merge pull request #1330 from rotrico/master
...
Improve spanish translation
2017-06-02 19:43:21 +02:00
rotrico
6ee545d6eb
Improve spanish translation to master version
2017-06-01 13:56:48 +02:00
FrancescoUK
afbf714bd2
Revert "Translated using Weblate (English)" mistakes
2017-05-30 21:04:22 +01:00
FrancescoUK
1a2bc1cc42
Merge pull request #1327 from joshua1234511/hotfix/giftcard-stuck-at-10-issue
...
fix for Giftcard issue both display and count (#1315 )
2017-05-30 07:07:05 +01:00
Joshua Fernandes
4268a70388
fix for that issue both display and count
2017-05-30 07:36:57 +05:30
Almubaraq Ratomi
189b189e08
Translated using Weblate (Indonesian)
...
Currently translated at 100.0% (16 of 16 strings)
2017-05-29 22:22:30 +00:00
Almubaraq Ratomi
403c875edf
Translated using Weblate (Indonesian)
...
Currently translated at 100.0% (133 of 133 strings)
2017-05-29 22:22:29 +00:00
Almubaraq Ratomi
4f6cf8b917
Translated using Weblate (Indonesian)
...
Currently translated at 100.0% (86 of 86 strings)
2017-05-29 22:22:29 +00:00
Almubaraq Ratomi
fd6335081d
Translated using Weblate (English)
...
Currently translated at 100.0% (29 of 29 strings)
2017-05-29 22:22:29 +00:00
Almubaraq Ratomi
234cedff15
Translated using Weblate (Indonesian)
...
Currently translated at 100.0% (67 of 67 strings)
2017-05-29 22:22:29 +00:00
Almubaraq Ratomi
8348628dc6
Translated using Weblate (English)
...
Currently translated at 100.0% (66 of 66 strings)
2017-05-29 22:22:29 +00:00
Almubaraq Ratomi
ade9a57fe0
Translated using Weblate (Indonesian)
...
Currently translated at 100.0% (214 of 214 strings)
2017-05-29 22:22:29 +00:00
Almubaraq Ratomi
6559f9c561
Translated using Weblate (Indonesian)
...
Currently translated at 100.0% (62 of 62 strings)
2017-05-29 22:22:29 +00:00
Almubaraq Ratomi
a7a559fc72
Translated using Weblate (Indonesian)
...
Currently translated at 92.7% (89 of 96 strings)
2017-05-29 22:22:29 +00:00
Marcos
e25d1483ae
Translated using Weblate (Portuguese (Brazil))
...
Currently translated at 83.6% (179 of 214 strings)
2017-05-29 22:22:29 +00:00
Almubaraq Ratomi
41a5218583
Translated using Weblate (Indonesian)
...
Currently translated at 100.0% (96 of 96 strings)
2017-05-29 22:22:29 +00:00
Almubaraq Ratomi
cc7fcaf264
Translated using Weblate (Indonesian)
...
Currently translated at 100.0% (96 of 96 strings)
2017-05-29 22:22:29 +00:00
Almubaraq Ratomi
e776f31ec5
Translated using Weblate (Indonesian)
...
Currently translated at 100.0% (62 of 62 strings)
2017-05-29 22:22:29 +00:00
jekkos
d60e1283bd
Fix double submit issue ( #1309 )
2017-05-30 00:14:33 +02:00
FrancescoUK
b2d80acafc
Regenerate db files
2017-05-28 09:06:04 +01:00
jekkos
37097babcf
Fix double submit after focusing OK button ( #1309 )
2017-05-24 09:21:58 +02:00
jekkos
15bb3ad6a3
Reset stock inventory when deleting items ( #1288 )
2017-05-22 19:33:13 +02:00
Adrian Wahyudi
5c0c74b037
Translated using Weblate (Indonesian)
...
Currently translated at 98.9% (94 of 95 strings)
2017-05-16 14:13:37 +00:00
Adrian Wahyudi
7093874366
Translated using Weblate (Indonesian)
...
Currently translated at 100.0% (214 of 214 strings)
2017-05-16 14:13:37 +00:00
Adrian Wahyudi
34ae6486dc
Translated using Weblate (Indonesian)
...
Currently translated at 100.0% (214 of 214 strings)
2017-05-16 14:13:36 +00:00
FrancescoUK
2d3d385cbc
Add migration support and upgrade db to new tax tables ( #1133 )
2017-05-14 18:40:46 +01:00
Steve Ireland
c0a9349b60
Add support for database migration
2017-05-09 20:45:25 -04:00
FrancescoUK
c4a76ad01c
Fixed Takings filters bug ( #1286 )
2017-05-01 13:12:25 +01:00
FrancescoUK
8d1bc4cf17
Removed npm package dependencies section
2017-05-01 12:28:09 +01:00
FrancescoUK
daa1614615
Revert "Merge pull request #1281 from RuleDomain/migrate-sales-tax-history"
...
This reverts commit 11e1cc51aa , reversing
changes made to b32c23ce10 .
# Conflicts:
# application/models/Sale.php
2017-05-01 11:50:13 +01:00
FrancescoUK
34afb9d496
Merge pull request #1283 from RuleDomain/remove-debug-code
...
Remove debug code
2017-05-01 08:08:00 +01:00
Steve Ireland
27d5fd882b
Remove debug code
2017-04-30 23:31:31 -04:00
FrancescoUK
d25c6dc8c1
Added ApiGen documentation to model/person class as an example
2017-04-30 23:27:15 +01:00
FrancescoUK
11e1cc51aa
Merge pull request #1281 from RuleDomain/migrate-sales-tax-history
...
Sales tax history migration (#1163 )
2017-04-30 23:14:41 +01:00
FrancescoUK
b32c23ce10
Merge pull request #1282 from Frontuari/fix-change-password-issue
...
Fix issue for change password support (#227 )
2017-04-30 19:25:03 +01:00
Jorge Colmenarez
00a792213c
Fix issue for change password support
2017-04-30 13:16:12 -04:00
Steve Ireland
c710ec938f
Sales tax history migration
2017-04-30 11:30:39 -04:00
FrancescoUK
d0ada1e42f
Created bin/gendocs.sh script to invoke ApiGen removing all vendor/ dependencies ( #1278 )
2017-04-30 13:53:49 +01:00
FrancescoUK
e89fc6afb2
Move Gruntfile.js composer task and apigen task to separate tasks ( #1278 )
2017-04-30 13:40:22 +01:00
FrancescoUK
f9fb9e44b3
Added apigen to generate OSPOS code documentation (see docs)
...
Added grunt-composer and grunt-apigen and scripted all the steps in Grunt
2017-04-29 23:43:15 +01:00
FrancescoUK
4c2d63bbd3
Added Total Spent to Customer tabular view
2017-04-29 19:55:03 +01:00
FrancescoUK
ac92c16c0a
Always reformat first and last name, and lower case emails
2017-04-29 15:55:03 +01:00
FrancescoUK
edd1f047bd
Merge branch 'joshua1234511-feature/auto-complete-giftcard'
...
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2017-04-27 19:49:49 +01:00
FrancescoUK
c8ac6a65dc
Fixed css and indentation
2017-04-27 19:49:11 +01:00
Joshua Fernandes
6acfc60988
auto suggest gift card
2017-04-27 12:41:27 +05:30
FrancescoUK
6682b77164
Merge branch 'joshua1234511-hotfix/giftcard-customer-restrict-fix'
...
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2017-04-26 20:06:39 +01:00
FrancescoUK
eb4f3b425b
fixes for giftcard
2017-04-26 20:06:08 +01:00
Joshua Fernandes
93b0844121
fixes for giftcard
2017-04-26 20:03:59 +01:00
FrancescoUK
40d32e1b8a
Use consistent name for forms ( #227 )
2017-04-24 20:30:56 +01:00
FrancescoUK
af1aee0015
Fix change password bugs ( #227 )
2017-04-24 20:26:48 +01:00
FrancescoUK
1e64b3e610
Merge pull request #1257 from Frontuari/changepassword
...
Support for change user password (#227 )
2017-04-24 19:21:54 +01:00
Jorge Colmenarez
8f728500d4
Verify current password before change password
2017-04-24 13:51:25 -04:00
FrancescoUK
c68fa19584
Made print company name in receipts optional ( #925 )
2017-04-22 17:09:22 +01:00
FrancescoUK
5bdf6d396b
Add Mailchimp connector ( #113 ) avoid email duplicates ( #112 )
2017-04-22 16:07:33 +01:00
FrancescoUK
0114223e99
Giftcard random number/alpha numeric
2017-04-22 13:38:56 +01:00
FrancescoUK
b819442e98
Fix indentation and regen db scripts
2017-04-22 13:33:45 +01:00
Joshua Fernandes
15681edf43
fixed query
2017-04-22 13:33:45 +01:00
Joshua Fernandes
0cd19ca43f
uncommenr var dumb
2017-04-22 13:33:45 +01:00
Joshua Fernandes
621a74653d
requested changes
2017-04-22 13:33:45 +01:00
Joshua Fernandes
6dc49ca00e
sales fixes
2017-04-22 13:33:45 +01:00
Joshua Fernandes
7a91388d8d
giftcard random number
2017-04-22 13:33:45 +01:00
FrancescoUK
1680f2b602
Fix wrong code issue ( #1247 )
2017-04-22 10:28:05 +01:00
FrancescoUK
80c58cf27d
Add search custom items string ( #1256 )
2017-04-22 10:01:27 +01:00
FrancescoUK
dd21f205b7
Fix wrong code issue ( #1247 )
2017-04-22 09:30:53 +01:00
Jorge Colmenarez
8261cc1f72
Support for change password
2017-04-21 16:13:25 -04:00
FrancescoUK
08a7bd9606
Fix review comment ( #1253 )
2017-04-21 19:02:11 +01:00
FrancescoUK
56ae0f265a
Merge pull request #1253 from RuleDomain/fix-customer-change-issue
...
Fix the customer change issue (#1250 )
2017-04-21 06:43:44 +01:00
Steve Ireland
c95c56ade7
Fix the customer change issue.
2017-04-20 23:34:56 -04:00
jekkos
b057d1c3c0
Overload existing env vars with .env contents ( #974 )
...
Add error handling if .env is not present
2017-04-20 08:27:04 +02:00
Deep Shah
248cd29e01
change database variable names in example file
2017-04-20 08:27:04 +02:00
Deep Shah
bacc07ce35
revert change on db_log_enabled
2017-04-20 08:27:04 +02:00
Deep Shah
aef542d096
dotenv used for configurations
2017-04-20 08:27:04 +02:00
Deep Shah
28141185a4
change database settings as per Dockerfile, remove the correspoding scripts from Dockerfile
2017-04-20 08:27:04 +02:00
Deep Shah
deb235a971
change ['<key>'] to getenv('<key>')
2017-04-20 08:27:04 +02:00
Deep Shah
878d93aee9
revert change on db_log_enabled
2017-04-20 08:27:04 +02:00
Deep Shah
9db7eddc68
dotenv used for configurations
2017-04-20 08:27:04 +02:00
Jorge Colmenarez
e2232ba9cc
Translated using Weblate (Spanish)
...
Currently translated at 100.0% (201 of 201 strings)
2017-04-18 17:14:30 +00:00
jekkos
4db76371fd
Regenerate langauge files ( #1242 )
2017-04-18 19:12:41 +02:00
FrancescoUK
9d01398a4b
Minor code style adjustments
2017-04-17 21:47:22 +01:00
FrancescoUK
66a4507525
Added more financial year start dates ( #1141 )
2017-04-17 20:31:10 +01:00
FrancescoUK
938907fe20
Added financial year start date ( #1141 ), various fixes on date & time
2017-04-17 20:20:53 +01:00
FrancescoUK
1738f76402
Regen dist files ( #1234 )
2017-04-17 12:31:14 +01:00
jekkos
b7251dd693
Fix button enabled state after search and page change ( #1234 )
2017-04-17 13:17:00 +02:00
jekkos
8f7a425333
Set folder owner for application to www-data in docker ( #1189 )
2017-04-17 13:17:00 +02:00
FrancescoUK
7e7c068c90
Add only_check filter to takings ( #1244 )
2017-04-17 12:00:56 +01:00
FrancescoUK
73ae7b8fd2
Minor fixes to database scripts
2017-04-17 12:00:56 +01:00
Aril Apria Susanto
56b228c698
Translated using Weblate (Indonesian)
...
Currently translated at 99.2% (132 of 133 strings)
2017-04-16 21:31:22 +00:00
Aril Apria Susanto
b5a44a8308
Translated using Weblate (Indonesian)
...
Currently translated at 97.6% (84 of 86 strings)
2017-04-16 21:31:22 +00:00
Aril Apria Susanto
1788941b5f
Translated using Weblate (Indonesian)
...
Currently translated at 100.0% (50 of 50 strings)
2017-04-16 21:31:22 +00:00
Aril Apria Susanto
27f093cf73
Translated using Weblate (Indonesian)
...
Currently translated at 100.0% (12 of 12 strings)
2017-04-16 21:31:22 +00:00
Aril Apria Susanto
efe9ed22b3
Translated using Weblate (Indonesian)
...
Currently translated at 98.9% (94 of 95 strings)
2017-04-16 21:31:22 +00:00
Aril Apria Susanto
e6a51d8c28
Translated using Weblate (Indonesian)
...
Currently translated at 89.6% (26 of 29 strings)
2017-04-16 21:31:22 +00:00
Aril Apria Susanto
27f5dd7efc
Translated using Weblate (Indonesian)
...
Currently translated at 100.0% (66 of 66 strings)
2017-04-16 21:31:22 +00:00
Aril Apria Susanto
07642bd953
Translated using Weblate (Indonesian)
...
Currently translated at 100.0% (24 of 24 strings)
2017-04-16 21:31:22 +00:00
Aril Apria Susanto
99afc02c9d
Translated using Weblate (Indonesian)
...
Currently translated at 100.0% (196 of 196 strings)
2017-04-16 21:31:22 +00:00
FrancescoUK
74972712a6
Fix drop down box size
2017-04-16 22:27:25 +01:00
FrancescoUK
826ffd79c9
Merge pull request #1241 from RuleDomain/fix-same-item-receivings-line-total
...
Fix the line total extension error when receiving received item (#1233 )
2017-04-16 18:41:51 +01:00
Steve Ireland
7f8ac815ef
Fix the line total extension error when receiving the same item multiple times.
2017-04-16 10:06:24 -04:00
FrancescoUK
04f27c328d
Merge pull request #1240 from RuleDomain/fix-tax-category-item-update
...
Fix item update of tax category (#1133 )
2017-04-16 08:53:23 +01:00
FrancescoUK
793dd73248
Merge pull request #1239 from RuleDomain/make-sales-tax-code-uppercase
...
Make Sales Tax Code uppercase
2017-04-16 08:52:05 +01:00
FrancescoUK
28d89c685b
Merge branch 'RuleDomain-fix-database-creation-dup-config-val' ( #1192 )
...
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2017-04-16 08:48:55 +01:00
FrancescoUK
d59b79e4b6
Fix database creation duplicate config value error
2017-04-16 08:37:03 +01:00
Steve Ireland
422ca99ab3
Fix item update of tax category.
2017-04-15 19:38:32 -04:00
Steve Ireland
0ff095e889
Make Sales Tax Code uppercase
2017-04-15 17:45:54 -04:00
Steve Ireland
e0bc9bb8f7
Fix database creation duplicate config value error
2017-04-15 16:22:20 -04:00
FrancescoUK
86afbf0d30
Merge branch 'RuleDomain-customer-sales-tax-feature' ( #1133 #1192 )
...
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2017-04-15 10:29:48 +01:00
FrancescoUK
26d5605de5
Regen db, js, css files
2017-04-15 10:21:52 +01:00
FrancescoUK
6c0124cd17
Minor fixes
2017-04-15 10:04:48 +01:00
Steve Ireland
effba9d102
Add support for customer sales tax and cash rounding
2017-04-14 21:21:44 -04:00
FrancescoUK
15b13e1a3d
Merge pull request #1225 from RuleDomain/fix-item-import
...
Fix for item excel import
2017-04-10 06:24:32 +01:00
Steve Ireland
1a0a3fbeba
Fix for item excel import
2017-04-09 21:40:56 -04:00
Aril Apria Susanto
b7e0c0eba6
Translated using Weblate (Indonesian)
...
Currently translated at 87.2% (116 of 133 strings)
2017-04-05 20:58:17 +00:00
Aril Apria Susanto
354076f8c3
Translated using Weblate (Indonesian)
...
Currently translated at 95.7% (91 of 95 strings)
2017-04-05 20:58:15 +00:00
Aril Apria Susanto
6e9e7abcff
Translated using Weblate (Indonesian)
...
Currently translated at 100.0% (66 of 66 strings)
2017-04-05 20:58:15 +00:00
Aril Apria Susanto
cf314f98a6
Translated using Weblate (Indonesian)
...
Currently translated at 100.0% (26 of 26 strings)
2017-04-05 20:58:14 +00:00
Aril Apria Susanto
a316e250de
Translated using Weblate (Indonesian)
...
Currently translated at 100.0% (196 of 196 strings)
2017-04-05 20:58:13 +00:00
Aril Apria Susanto
33b9f97bce
Translated using Weblate (Indonesian)
...
Currently translated at 100.0% (61 of 61 strings)
2017-04-05 20:58:13 +00:00
Weblate
3677b61dd9
Merge with master
2017-04-02 21:25:26 +00:00
Aril Apria Susanto
e592040962
Translated using Weblate (Indonesian)
...
Currently translated at 87.2% (116 of 133 strings)
2017-04-02 19:51:27 +00:00
Aril Apria Susanto
e51c79c423
Translated using Weblate (Indonesian)
...
Currently translated at 100.0% (8 of 8 strings)
2017-04-02 19:51:24 +00:00
Aril Apria Susanto
f556361ade
Update Indonesian Translation
2017-04-02 21:49:03 +02:00
FrancescoUK
a317c32d1e
Removed php-enum composer package ( #1198 )
2017-04-01 13:04:45 +01:00
FrancescoUK
0e60d5e6e1
Updated js plugins
2017-03-25 19:17:43 +00:00
FrancescoUK
6fda5d63fe
Updated CodeIgniter to 3.1.4
2017-03-25 19:15:18 +00:00
FrancescoUK
7c9a2dee37
Added php-enum composer package ( #1198 )
2017-03-25 19:14:11 +00:00
FrancescoUK
06f404ddc4
Fixed wrong id reference in js script ( #1194 )
2017-03-25 11:42:47 +00:00
langlais
562a43a942
Translated using Weblate (French)
...
Currently translated at 96.0% (48 of 50 strings)
2017-03-22 20:55:31 +00:00
langlais
cbda2dae13
Translated using Weblate (French)
...
Currently translated at 100.0% (29 of 29 strings)
2017-03-22 20:55:31 +00:00
langlais
1abdd765de
Translated using Weblate (French)
...
Currently translated at 100.0% (66 of 66 strings)
2017-03-22 20:55:31 +00:00
Xyko Arteiro
2f4d0986d9
Translated using Weblate (Portuguese (Brazil))
...
Currently translated at 100.0% (196 of 196 strings)
2017-03-22 20:55:31 +00:00
langlais
bbac0f16bf
Translated using Weblate (French)
...
Currently translated at 98.4% (193 of 196 strings)
2017-03-22 20:55:31 +00:00
FrancescoUK
b986ad437a
Fix composer.lock
2017-03-19 11:04:40 +00:00
jekkos
68883230e8
Make encryption key configurable in docker ( #1189 )
2017-03-19 11:04:07 +01:00
jekkos
5cb8141641
Regenerate langauge files
2017-03-18 16:12:57 +01:00
Emin Tufan Çetin
e6d6bf0392
Translated using Weblate (Turkish)
...
Currently translated at 87.9% (117 of 133 strings)
2017-03-16 07:04:38 +00:00
Jorge Colmenarez
85d2cf9e68
Translated using Weblate (English)
...
Currently translated at 100.0% (95 of 95 strings)
2017-03-16 07:04:38 +00:00
FrancescoUK
91f33d14b7
Merge pull request #1188 from Langlais115/Langlais115-Item-by-Article
...
French translations
2017-03-15 20:41:00 +00:00
Langlais115
5e004309f0
Minor change
2017-03-15 17:11:25 +01:00
Langlais115
aa8351c147
Improve translation
2017-03-15 15:51:02 +01:00
Langlais115
adacc2ab5f
Improve translation
2017-03-15 15:42:26 +01:00
Langlais115
8bb4171265
Improve translation
2017-03-15 15:33:58 +01:00
Langlais115
87bd59a6bf
Improve translation
2017-03-15 15:15:53 +01:00
Langlais115
488fc58a03
Translate the file
2017-03-15 15:12:00 +01:00
Langlais115
8cd521c6d1
Improve translation
2017-03-15 15:05:55 +01:00
Langlais115
faaac45653
Change Item by Article
2017-03-15 14:47:20 +01:00
Langlais115
d8e19ceeca
Change Item by Article
2017-03-15 14:42:39 +01:00
FrancescoUK
00f99c524a
Updated LICENSE, upgraded js plugin and regen dist files
2017-03-13 14:38:27 +00:00
FrancescoUK
91d5157765
Fixed Dinner Table support in suspended ( #886 )
2017-03-13 14:17:03 +00:00
FrancescoUK
b8414cc969
Merge branch 'joshua1234511-hotfix/enable-reward-points-issue'
...
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2017-03-13 12:29:45 +00:00
FrancescoUK
387b0004a8
Fix typo in !empty
2017-03-13 12:26:53 +00:00
Joshua Fernandes
cdc401dd7e
review change empty check
2017-03-13 15:40:00 +05:30
Joshua Fernandes
74681e78e3
fixed issues with enable reward points
2017-03-13 10:58:34 +05:30
FrancescoUK
3f489d6f53
Fix payment issue ( #1182 ) regen sql script files
2017-03-12 22:12:42 +00:00
FrancescoUK
55350b8bf8
Merge pull request #1178 from joshua1234511/feature/reward-points-customer
...
Feature/reward points customer (#1179 )
2017-03-12 18:58:21 +00:00
Joshua Fernandes
f52b61ae36
removed the sepearte sql after adding to migrate and table
2017-03-12 19:20:30 +05:30
Joshua Fernandes
e131cda843
sql queires added
2017-03-12 19:18:02 +05:30
Joshua Fernandes
991854f0f2
Removed my key
2017-03-04 22:58:39 +05:30
Joshua Fernandes
af7d2f27aa
fix for display reports
2017-03-04 17:38:03 +05:30
Joshua Fernandes
3650b47d8b
reports display added for detailed sale and customer
2017-03-04 17:17:03 +05:30
Joshua Fernandes
deea43ce67
customer reward points first phase work
2017-03-04 16:13:56 +05:30
FrancescoUK
3d9665c0a9
Merge pull request #1169 from jlctmaster/dinner-tables
...
Support for Configurable Dinner Tables Feature
2017-03-01 22:17:16 +00:00
FrancescoUK
ae90dfa333
Fixed receipt total mistake with double taxation ( #1163 )
2017-02-27 23:25:49 +00:00
Valentin Seipt
02dcb4dc90
Translated using Weblate (German)
...
Currently translated at 100.0% (178 of 178 strings)
2017-02-27 19:54:18 +00:00
jekkos
4dc3c49d9d
Merge pull request #1171 from RuleDomain/fix-undefined-property
...
Fix for undefined property in Sale_lib.php #1166
2017-02-27 12:15:19 +01:00
Steve Ireland
a77d63fad8
Fix for undefined property in Sale_lib.php #1166
2017-02-26 21:42:12 -05:00
FrancescoUK
b487573b05
Fix line removal mistake ( #1166 )
2017-02-26 23:59:09 +00:00
FrancescoUK
4528436fd5
Fixed tax calculation issues ( #1094 , #1163 )
2017-02-26 23:56:12 +00:00
jekkos
5876efbbee
Merge pull request #1170 from RuleDomain/fix-undefined-property
...
Fix for undefined property in Sale_lib.php #1166
2017-02-26 22:24:11 +01:00
Steve Ireland
1e1b0cd06b
Fix for undefined property in Sale_lib.php #1166
2017-02-26 15:35:13 -05:00
Jorge Colmenarez
6826115b2d
Support for Configurable Dinner Tables Feature
2017-02-26 15:35:21 -04:00
jekkos
032bb34131
Merge pull request #1149 from RuleDomain/tokens-quotes
...
Tokens quotes
2017-02-26 12:05:47 +01:00
jekkos
e9aa0068fe
Enable auto refresh for serialnumber and description ( #1154 )
2017-02-23 08:03:37 +01:00
jekkos
e55b5a743a
Add realtime cart update in sale and receiving ( #1154 )
2017-02-21 23:28:22 +01:00
Steve Ireland
e4955027d1
Hide stock_type and item_type if the employee isn't authorized to item kits. On register if item type is non-stock don't display the zero stock balance message, and correct the default quote format when initializing the field.
2017-02-19 13:41:04 -05:00
Steve Ireland
9bf8989960
This will add support for preparing quotes and generating invoices prior
...
to payments
2017-02-19 13:37:32 -05:00
FrancescoUK
53dcdc02cf
Fixed payment issue in return mode ( #1081 )
2017-02-18 21:48:21 +00:00
FrancescoUK
69391eb434
Added to composer.json PHP7.0 support
2017-02-18 17:27:18 +00:00
FrancescoUK
aff7e6df3b
Fixed composer.json name format (required by Packagist)
2017-02-18 16:50:18 +00:00
Luc Gagnier
9bf24fee5f
Translated using Weblate (French)
...
Currently translated at 100.0% (178 of 178 strings)
Translated using Weblate (French)
Currently translated at 100.0% (22 of 22 strings)
Translated using Weblate (French)
Currently translated at 98.8% (88 of 89 strings)
Translated using Weblate (French)
Currently translated at 86.0% (43 of 50 strings)
Translated using Weblate (French)
Currently translated at 99.1% (116 of 117 strings)
2017-02-15 23:54:00 +01:00
FrancescoUK
2c53f0e585
Fixed typo in README and added more info
2017-02-14 09:09:12 +00:00
FrancescoUK
5aeb1234a2
Fixed POS or pos issue in sale register ( #1081 )
2017-02-13 22:14:00 +00:00
FrancescoUK
6e62a3fe15
Update README with latest System Requirement
2017-02-13 18:55:36 +00:00
jekkos
67594190fc
Merge pull request #1140 from RuleDomain/item-kit-git-info-fix
...
This fixes an error with Item_kit.get_info
2017-02-13 08:16:24 +01:00
Steve Ireland
c6597ba6ce
This fixes an error with Item_kit.get_info that occurs in developer test mode.
2017-02-12 21:16:53 -05:00
FrancescoUK
2187898b04
Add CI language support
2017-02-12 13:39:37 +00:00
FrancescoUK
a6b5220047
Updated to CI version 3.1.3
2017-02-11 22:08:00 +00:00
FrancescoUK
78cb4822c2
Updated js plugins and composer
2017-02-11 20:51:32 +00:00
FrancescoUK
ae4ff80974
Fix encryption key generation issue ( #1110 )
2017-02-07 20:49:19 +00:00
jekkos
df2d616566
Merge pull request #1128 from RuleDomain/fixes-item-kit-discount-not-working
...
Fix for discount assignment not working
2017-02-07 20:27:08 +01:00
Steve Ireland
353fa8e95c
Fix for discount assignment bug
2017-02-06 18:37:34 -05:00
FrancescoUK
699236bca0
Merge pull request #1122 from i92guboj/pic_filename
...
Preliminary fix for dot corruption in pic_filename (#1026 )
2017-02-05 21:34:48 +00:00
FrancescoUK
4ca862ba9f
Refactor code ( #1110 )
2017-02-05 21:24:29 +00:00
i92guboj
7222df3551
Remove unnecessary/redundant check
2017-02-05 21:30:17 +01:00
i92guboj
72e1158847
Cleanup and tabs
2017-02-05 21:25:00 +01:00
i92guboj
145d97737f
Preliminary fix for dot corruption in pic_filename
2017-02-05 17:10:34 +01:00
FrancescoUK
8140d1aee4
Update language files ( #932 )
2017-02-04 12:15:40 +00:00
FrancescoUK
5f5394b18f
Fix correct database upgrade script ( #632 )
2017-02-03 22:24:38 +00:00
FrancescoUK
ceb9687e5e
Merge pull request #1115 from jlctmaster/date_or_time_format
...
Fixed bug sales data preview of day (#932 )
2017-02-03 22:04:30 +00:00
Jorge Colmenarez
7a4525319a
Fixed bug sales data preview of day when date or time field is checked into config location tab
2017-02-03 15:39:11 -04:00
jekkos
a175111b59
Merge pull request #1114 from RuleDomain/this-fixes-add-item-kit
...
This will fix the issue with the PHP error when adding a new item kit…
2017-02-03 10:54:22 +01:00
Steve Ireland
4cda5343aa
This will fix the issue with the PHP error when adding a new item kit. It also initializes the line_sequence config option.
2017-02-02 23:25:04 -05:00
FrancescoUK
e7cbacaae6
Merge pull request #1111 from RuleDomain/fix-kit-item-selection
...
Change kit item selection from the Item Kit maintenance to only selec…
2017-02-01 20:07:48 +00:00
Steve Ireland
faadbe554a
Change kit item selection from the Item Kit maintenance to only select kit items.
2017-02-01 14:43:16 -05:00
jekkos
999e12279a
Extract pic_filename update into method (clean code #1026 )
2017-02-01 08:08:51 +01:00
jekkos
37bb9b50f9
Bump Mysql version in docker dev container ( #630 , #591 )
2017-02-01 08:06:56 +01:00
FrancescoUK
5e02f31866
Fix bugs ( #1026 )
2017-01-31 23:16:38 +00:00
FrancescoUK
bf0d24a96f
Fix bugs ( #1026 )
2017-01-31 23:08:56 +00:00
FrancescoUK
be66258bfc
Fix bugs ( #1026 )
2017-01-31 23:03:53 +00:00
FrancescoUK
87247333cc
Fix bugs ( #1026 )
2017-01-31 22:52:37 +00:00
FrancescoUK
5e75613fec
Update LICENSE file
2017-01-31 21:14:20 +00:00
FrancescoUK
5b4d12cac8
Improve Items picture storing ( #1026 )
2017-01-31 20:23:59 +00:00
jekkos
0e013220ad
Use PHP7 + newest MariaDB in docker compose + cloud ( #630 , #591 )
2017-01-31 20:09:12 +00:00
Steve Ireland
ae92231903
Generate low inventory message if at least one of the item kit items added to a sale are below the reorder level.
2017-01-31 20:09:12 +00:00
Steve Ireland
9a1cf6752c
Change the inventory reports to exclude non-stock items.
2017-01-31 20:09:12 +00:00
FrancescoUK
9db439a8fe
Merge pull request #1107 from RuleDomain/low-inventory-check-for-kits
...
Low inventory check for kits
2017-01-31 20:02:34 +00:00
FrancescoUK
e458b23b7e
Merge pull request #1106 from RuleDomain/fix-inventory-low-missing-reorder_level-check
...
Restore reorder level check for low inventory report
2017-01-31 20:00:21 +00:00
jekkos
4ca0e74d42
Use PHP7 + newest MariaDB in docker compose + cloud ( #630 , #591 )
2017-01-31 19:24:40 +01:00
i92guboj
47357aaafc
Merge branch 'master' into pic_filename
2017-01-31 16:04:33 +01:00
Steve Ireland
a99f326bb8
Generate low inventory message if at least one of the item kit items added to a sale are below the reorder level.
2017-01-31 09:03:36 -05:00
Steve Ireland
cc584ca063
Change the inventory reports to exclude non-stock items.
2017-01-31 08:29:14 -05:00
FrancescoUK
d85aeaeaf8
Merge pull request #1103 from RuleDomain/restrict-inventory-reports-to-stock-items
...
Restrict inventory reports to stock items
2017-01-31 08:05:54 +00:00
FrancescoUK
cc2fd1876d
Merge pull request #1102 from RuleDomain/fix-out-of-stock-warning
...
Fix out of stock warning
2017-01-31 08:04:52 +00:00
FrancescoUK
f4a52dab8b
Merge pull request #1101 from RuleDomain/fix-for-line_sequence
...
Fix merge issues related to line_sequence for receipts and invoices
2017-01-31 08:03:52 +00:00
Steve Ireland
d75a936472
Change the inventory reports to exclude non-stock items.
2017-01-30 21:34:32 -05:00
Steve Ireland
2719c43e3d
Fix for issue where the warning messages for out of stock or below reorder level were not being sent to the user.
2017-01-30 20:38:24 -05:00
Steve Ireland
85983cd17a
Fix merge issues related to line_sequence for receipts and invoices
2017-01-30 19:03:57 -05:00
FrancescoUK
df9b776d56
Add support for MySQL 5.7 ( #630 ) and PHP7 ( #591 ), better Item Kits ( #625 )
2017-01-30 20:10:17 +00:00
i92guboj
b373b1e07e
Merge branch 'master' into pic_filename
2017-01-30 17:45:47 +01:00
Steve Ireland
68cf3bf68b
Merge remote-tracking branch 'jekkos/item-kit' into item-kit
2017-01-29 23:10:37 -05:00
Steve Ireland
f9c1dde054
Changes to support Item Kits, support for MySQL 5.7, and a tweak for PHP 7
2017-01-29 22:23:46 -05:00
FrancescoUK
1393af1676
Fix Summary payments and taxes issue ( #932 )
2017-01-29 19:44:45 +00:00
FrancescoUK
f359c475d3
Fix Takings issue ( #932 )
2017-01-29 19:31:02 +00:00
FrancescoUK
9bc9b5c984
Add date/time summary payment report ( #932 )
2017-01-29 18:10:14 +00:00
FrancescoUK
4922f5bb66
Add date/time config translation ( #932 )
2017-01-29 17:57:21 +00:00
FrancescoUK
e36b2a1a03
Add Support for filter reports with format date/time ( #932 )
2017-01-29 17:43:38 +00:00
FrancescoUK
bb5d39cd0d
Fix partial/header.php change
2017-01-29 17:35:11 +00:00
FrancescoUK
afe564e152
Fix LICENSE file
2017-01-29 17:35:11 +00:00
RamkrishnaMondal
17ff097406
Third commit
2017-01-29 17:35:11 +00:00
FrancescoUK
3b37f6c61a
Fix Detailed Receiving Report not showing Supplier ( #1093 )
2017-01-29 17:35:11 +00:00
RamkrishnaMondal
96cefd97b4
Second commit
2017-01-29 17:35:11 +00:00
RamkrishnaMondal
03af00e26e
First commit
2017-01-29 17:35:11 +00:00
jekkos
92bd7c2d43
Amend license file with copyright dates
2017-01-29 17:35:11 +00:00
FrancescoUK
4d6cc381ae
Bump version to 3.1.0
2017-01-29 17:35:11 +00:00
FrancescoUK
3f36a8b15e
Bump version to 3.1.0
2017-01-29 17:35:11 +00:00
jekkos
5a9b6bd98b
Add ERD for sales diagram (for wiki page)
2017-01-29 17:35:11 +00:00
jekkos
b9e160eaa3
Improve PHP7 compatibility ( #591 )
2017-01-29 17:35:11 +00:00
jekkos
ba95853884
Remove quirk in master ( #1076 )
2017-01-29 17:35:11 +00:00
Emin Tufan Çetin
f157d4d43d
Translated using Weblate (Turkish)
...
Currently translated at 100.0% (84 of 84 strings)
Translated using Weblate (Turkish)
Currently translated at 100.0% (61 of 61 strings)
2017-01-29 17:35:11 +00:00
mitchel
a2c3130720
Translated using Weblate (Dutch (Belgium))
...
Currently translated at 100.0% (61 of 61 strings)
2017-01-29 17:35:11 +00:00
jekkos
258622ec87
Enable jsPrint for custom receipt templates ( #1070 )
2017-01-29 17:35:11 +00:00
FrancescoUK
b4023a051c
Update WHATS_NEW.txt with 3.0.2 improvements
2017-01-29 17:35:11 +00:00
FrancescoUK
1cdbee1a42
Fix Summary Reports Payments ( #1045 )
2017-01-29 17:35:11 +00:00
jekkos
feff5ff3f3
Set folder upload folder permissions to 755 ( #1014 )
...
Don't load item avatar if item_pic is empty
2017-01-29 17:19:00 +00:00
jekkos
0507db6a6f
Set apache as owner of uploads folder ( #1014 )
2017-01-29 17:19:00 +00:00
jekkos
9b473e415d
Hook standard jquery submit function and update csrf ( #1019 )
2017-01-29 17:19:00 +00:00
jekkos
47974074ee
Stop running compose as travis seems to fail after startup?
2017-01-29 17:19:00 +00:00
jekkos
bc56ee54a3
Fix date, location and sale type filtering for summary payments ( #1045 )
2017-01-29 17:19:00 +00:00
jekkos
046a02d83c
Refresh csrf tokens before submit ( #1019 )
2017-01-29 17:19:00 +00:00
mitchel
57e559e67b
Translated using Weblate (Dutch (Belgium))
...
Currently translated at 100.0% (22 of 22 strings)
Translated using Weblate (Dutch (Belgium))
Currently translated at 100.0% (26 of 26 strings)
Translated using Weblate (Dutch (Belgium))
Currently translated at 100.0% (66 of 66 strings)
Translated using Weblate (Dutch (Belgium))
Currently translated at 100.0% (89 of 89 strings)
Translated using Weblate (Dutch (Belgium))
Currently translated at 100.0% (12 of 12 strings)
Translated using Weblate (Dutch (Belgium))
Currently translated at 100.0% (84 of 84 strings)
Translated using Weblate (Dutch (Belgium))
Currently translated at 100.0% (117 of 117 strings)
2017-01-29 17:19:00 +00:00
jekkos
10e3ce9a9f
Fix csrf refresh issue in register ( #1019 )
2017-01-29 17:19:00 +00:00
FrancescoUK
953fa534f4
Print just first letter of Employee family name to protect privacy ( #1027 )
2017-01-29 17:19:00 +00:00
FrancescoUK
c7982b9552
Bump OSPOS version to 3.0.2
2017-01-29 17:19:00 +00:00
FrancescoUK
6e0011b165
Fix Invoice Template editing issues ( #1088 ), centre company name on top navbar
2017-01-29 17:15:46 +00:00
FrancescoUK
a3c172624a
Fix partial/header.php change
2017-01-29 17:09:00 +00:00
FrancescoUK
3a81a712ff
Fix LICENSE file
2017-01-29 16:57:47 +00:00
RamkrishnaMondal
775f40cb75
Merge pull request #8 from jekkos/master
...
Fix Detailed Receiving Report not showing Supplier (#1093 )
2017-01-29 21:51:12 +05:30
RamkrishnaMondal
5814bfc7e8
Third commit
2017-01-29 21:32:16 +05:30
FrancescoUK
3f309298d8
Fix Detailed Receiving Report not showing Supplier ( #1093 )
2017-01-29 15:51:26 +00:00
RamkrishnaMondal
4ef8fc8df3
Second commit
2017-01-29 17:44:35 +05:30
RamkrishnaMondal
a627276265
First commit
2017-01-29 17:34:55 +05:30
RamkrishnaMondal
6e4155ccbb
Merge pull request #7 from jekkos/master
...
update from upstream
2017-01-29 16:23:07 +05:30
jekkos
84ef147835
Bump PHP version to 7.0
2017-01-28 21:40:00 +01:00
jekkos
925bee2b0a
Amend license file with copyright dates
2017-01-28 11:41:09 +01:00
FrancescoUK
680f2bb555
Bump version to 3.1.0
2017-01-27 18:37:09 +00:00
FrancescoUK
29920c5456
Bump version to 3.1.0
2017-01-27 18:36:34 +00:00
Steve Ireland
ace3bedbbc
Correct typo
2017-01-22 20:53:43 -05:00
Steve Ireland
476db84e86
Change SUM to MAX and a couple of indent issues.
2017-01-22 16:40:20 -05:00
Steve Ireland
dc638c74b5
Resolves Item view and Takings view issues that odiea spotted.
2017-01-22 10:57:59 -05:00
jekkos
f04a2db4a5
Add ERD for sales diagram (for wiki page)
2017-01-22 11:18:19 +01:00
Steve Ireland
dd6bd1cf11
Changes to support Item Kits, support for MySQL 5.7, and a tweak for PHP 7
2017-01-21 23:26:01 -05:00
jekkos
4b1d5456cc
Improve PHP7 compatibility ( #591 )
2017-01-21 00:01:59 +01:00
jekkos
4b85c14f00
Remove quirk in master ( #1076 )
2017-01-20 23:24:31 +01:00
Emin Tufan Çetin
9b33f39086
Translated using Weblate (Turkish)
...
Currently translated at 100.0% (84 of 84 strings)
Translated using Weblate (Turkish)
Currently translated at 100.0% (61 of 61 strings)
2017-01-20 00:16:36 +01:00
mitchel
bebb9ca34b
Translated using Weblate (Dutch (Belgium))
...
Currently translated at 100.0% (61 of 61 strings)
2017-01-20 00:10:41 +01:00
jekkos
1dba07049c
Enable jsPrint for custom receipt templates ( #1070 )
2017-01-19 23:54:30 +01:00
FrancescoUK
aae2d8ffc8
Update WHATS_NEW.txt with 3.0.2 improvements
2016-12-31 20:59:38 +00:00
FrancescoUK
a387a52578
Fix Summary Reports Payments ( #1045 )
2016-12-30 18:26:43 +00:00
jekkos
399b997fd0
Set folder upload folder permissions to 755 ( #1014 )
...
Don't load item avatar if item_pic is empty
2016-12-28 20:19:09 +01:00
jekkos
cb907ea303
Set apache as owner of uploads folder ( #1014 )
2016-12-28 18:36:16 +01:00
jekkos
744d166f58
Hook standard jquery submit function and update csrf ( #1019 )
2016-12-28 18:12:54 +01:00
jekkos
f3dd11e2c5
Stop running compose as travis seems to fail after startup?
2016-12-28 01:38:06 +01:00
jekkos
7f1c374e3d
Fix date, location and sale type filtering for summary payments ( #1045 )
2016-12-28 01:30:21 +01:00
jekkos
80aba48240
Refresh csrf tokens before submit ( #1019 )
2016-12-28 01:24:47 +01:00
mitchel
a8bca7681d
Translated using Weblate (Dutch (Belgium))
...
Currently translated at 100.0% (22 of 22 strings)
Translated using Weblate (Dutch (Belgium))
Currently translated at 100.0% (26 of 26 strings)
Translated using Weblate (Dutch (Belgium))
Currently translated at 100.0% (66 of 66 strings)
Translated using Weblate (Dutch (Belgium))
Currently translated at 100.0% (89 of 89 strings)
Translated using Weblate (Dutch (Belgium))
Currently translated at 100.0% (12 of 12 strings)
Translated using Weblate (Dutch (Belgium))
Currently translated at 100.0% (84 of 84 strings)
Translated using Weblate (Dutch (Belgium))
Currently translated at 100.0% (117 of 117 strings)
2016-12-28 00:09:58 +01:00
jekkos
01e918e776
Fix csrf refresh issue in register ( #1019 )
2016-12-27 23:59:22 +01:00
i92guboj
6095577f47
ran grunt
2016-12-20 22:03:16 +01:00
i92guboj
06db967ee6
simplify code cause pic_thumb() always receives filename.ext
2016-12-20 20:46:00 +01:00
i92guboj
467ed586b1
indentation and revert func parameter experiment
2016-12-19 20:46:30 +01:00
i92guboj
74660bcaa1
migration script for already existing DBs
2016-12-19 20:19:05 +01:00
i92guboj
d9a4f93cfa
pic_filename behavior and silent migration from pic_id
2016-12-19 20:18:05 +01:00
i92guboj
c6e4584f71
Convert pic_id to pic_filename - db and csv files
2016-12-19 18:37:52 +01:00
FrancescoUK
3a2dd7134f
Print just first letter of Employee family name to protect privacy ( #1027 )
2016-12-05 19:22:38 +00:00
FrancescoUK
d9649edc3e
Bump OSPOS version to 3.0.2
2016-12-04 21:10:28 +00:00
root
31335deeea
Add Line into LICENSE
2016-11-30 14:43:34 -04:00
root
ae26d9a007
Fixed Subtitle reports
2016-11-30 14:40:17 -04:00
root
305d9dd55e
Support for Date or Time Format
2016-11-30 14:32:25 -04:00
Jorge Colmenarez
9a9dc9bf1e
Merge branch 'master' of https://github.com/jlctmaster/opensourcepos
2016-11-30 10:52:09 -04:00
Joe Salty
311225a126
Translated using Weblate (Hungarian)
...
Currently translated at 100.0% (12 of 12 strings)
Translated using Weblate (Hungarian)
Currently translated at 100.0% (178 of 178 strings)
2016-11-29 17:13:06 +01:00
jekkos-t520
cabccf0858
Add mcrypt to Dockerfile
2016-11-29 17:13:04 +01:00
jekkos
9e8cc93082
Fix upload path in docker cloud setup
2016-11-27 17:17:18 +01:00
FrancescoUK
57de863f79
Update WHATS_NEW
2016-11-26 16:03:16 +00:00
FrancescoUK
00565ddc8f
Fix (again) Summary_taxes percent column sorting ( #1003 )
2016-11-26 15:50:35 +00:00
jekkos
7d4dff0a37
Remove percentage sign from number_sorter regex ( #1003 )
2016-11-26 15:54:04 +01:00
jekkos
1ed76fa091
Properly parse negative numbers + rename currency_sorter ( #1003 )
2016-11-26 15:46:27 +01:00
FrancescoUK
114c215407
Fix Summary_discounts percent column sorting ( #1003 )
2016-11-26 14:39:12 +00:00
FrancescoUK
9bef65b9cb
Fix Summary_taxes percent column ( #1003 )
2016-11-26 14:34:11 +00:00
FrancescoUK
dc4d582898
Fix LICENSE files
2016-11-26 14:12:35 +00:00
jekkos
8b32a26e80
Fix cost label in item summary report ( #1003 )
2016-11-26 14:52:31 +01:00
jekkos
422e2ddbab
Add currency sorting for summary reports ( #1003 )
2016-11-26 14:49:41 +01:00
FrancescoUK
c5988adbbb
Fix read_only flag issue ( #1003 )
2016-11-26 12:03:22 +00:00
jekkos
2727e91c96
Fix currency sorting in tabular_details ( #1003 )
2016-11-26 12:17:13 +01:00
jekkos
4304f5ceea
Revert tabular_details changes ( #1003 )
2016-11-26 00:12:33 +01:00
jekkos
1666a3e689
Fix detailed sale + receiving report row update + currency sorting ( #1003 )
2016-11-25 22:24:46 +01:00
FrancescoUK
2f8d66664b
Merge pull request #1006 from rnld26/patch-1
...
Update LICENSE
2016-11-24 08:57:04 +00:00
Rinaldy@dbarber
7c5276b014
Update LICENSE
2016-11-24 12:13:18 +07:00
FrancescoUK
5231c027af
Revert "Support MySQL5.7 in backward compatible mode ( #630 )"
...
This reverts commit 7ef68fbc76 .
2016-11-21 22:02:44 +00:00
FrancescoUK
3974279607
Fix timezone drop down option typo
2016-11-21 08:27:48 +00:00
FrancescoUK
7ef68fbc76
Support MySQL5.7 in backward compatible mode ( #630 )
2016-11-20 21:20:52 +00:00
FrancescoUK
1440e6bce9
Upgrade WHATS_NEW to latest 3.0.1 improvements
2016-11-20 13:53:26 +00:00
FrancescoUK
b66827b0ff
Fix Detailed sale tax rounding, reorder reports to subtotal, tax, total, cost, profit ( #976 )
2016-11-20 12:15:50 +00:00
FrancescoUK
540c4f3ec0
Make Sale get_info consistent with the other queries ( #976 )
2016-11-19 19:30:38 +00:00
FrancescoUK
9e1064979a
Solve detailed sale rounding issue ( #976 )
2016-11-19 16:27:55 +00:00
FrancescoUK
5047ca0f41
Fix Sales Takings multiple taxes issue and swap table columns ( #976 )
2016-11-19 15:15:43 +00:00
FrancescoUK
5267eadc56
Make Summary reports more OOD ( #976 )
2016-11-18 16:34:41 +00:00
Jorge Colmenarez
04246d35ad
Merge pull request #4 from jekkos/master
...
Merge with source proyect
2016-11-18 12:22:13 -04:00
Jorge Colmenarez
20c0ffb9b0
Merge pull request #3 from jlctmaster/revert-2-feature/datetime_reports
...
Revert "Feature/datetime reports"
2016-11-18 12:20:23 -04:00
Jorge Colmenarez
88db2af11b
Revert "Feature/datetime reports"
2016-11-18 12:19:42 -04:00
FrancescoUK
577e5b2db4
Fix wrong tax and subtotal calculation in Summary reports ( #976 )
2016-11-17 23:13:56 +00:00
FrancescoUK
35e76bdd4d
Add value label on bars in bar/hbar charts
2016-11-15 18:41:17 +00:00
FrancescoUK
9766dcfad3
Update LICENSE files to contain latest contributor ( #967 )
2016-11-15 17:44:26 +00:00
FrancescoUK
0e2f84c91d
Update js plugins and regen dist files
2016-11-13 18:52:57 +00:00
FrancescoUK
77806412fa
Fix line chart axis labels overlap issue
2016-11-13 17:43:59 +00:00
FrancescoUK
737980c041
Fix wrong items import model dialog title ( #969 )
2016-11-13 16:57:22 +00:00
FrancescoUK
e86ea272ca
Updated WHATS_NEW to the latest for 3.0.1 release
2016-11-13 11:54:25 +00:00
FrancescoUK
284a73f41d
Add missing Receivings default item_location value in phppos_migrate.sql script
2016-11-13 11:25:31 +00:00
FrancescoUK
5a4c27cf87
Set correct Employee in Sales receipt and invoice ( #967 )
2016-11-13 11:21:09 +00:00
FrancescoUK
e22e081865
Refactoring and performance improvement of Summary reports ( #964 )
2016-11-11 19:24:23 +00:00
FrancescoUK
123cb25bf5
Set the code to production not development (suppresses PHP errors) ( #965 )
2016-11-11 13:11:44 +00:00
Jorge Colmenarez
00eb59f083
Merge pull request #2 from jlctmaster/feature/datetime_reports
...
Feature/datetime reports
2016-11-10 18:30:26 -04:00
FrancescoUK
19165133ae
Revert receipt being open in a new window ( #966 )
2016-11-10 17:43:24 +00:00
FrancescoUK
e1035ff54b
Optimise Reports usage of temp database tables ( #964 )
2016-11-10 17:42:17 +00:00
FrancescoUK
ed80627ddd
Takings, sale edit, receipt database performance improvement - no temp table - ( #964 )
2016-11-09 18:06:23 +00:00
FrancescoUK
d380524f9d
Sales and Receivings code refactoring
2016-11-09 10:06:09 +00:00
FrancescoUK
ca39fb38ad
Prepare 3.0.1 release, updated README
2016-11-08 21:55:22 +00:00
FrancescoUK
be1be80a0e
Restore fixed .gitignore
2016-11-08 20:14:29 +00:00
FrancescoUK
868868163c
Replace Appconfig->get with config->item to reduce database calls
2016-11-08 20:09:40 +00:00
William Chanrico
a831f09fca
Translated using Weblate (Indonesian)
...
Currently translated at 100.0% (61 of 61 strings)
2016-11-08 11:04:21 +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
AELHOFY
047fd7b7ad
Translated using Weblate (Arabic)
...
Currently translated at 100.0% (176 of 176 strings)
2016-11-08 11:04:21 +01:00
Weblate
e6a61941df
Translated using Weblate (Dutch (Belgium))
...
Currently translated at 100.0% (178 of 178 strings)
2016-11-08 11:04:21 +01:00
jekkos
f4237e3f68
Add translations for project
2016-11-08 11:04:21 +01:00
FrancescoUK
1f2e87ec09
Encrypt email and sms passwords before saving to MySQL ( #963 )
...
It also automatically generates an encryption key if not existing storing it in config/config.php in order to enable encryption.
2016-11-07 19:20:44 +00:00
FrancescoUK
519b19ae64
Remove phpinfo.php because it's a security risk
2016-11-07 09:22:21 +00:00
FrancescoUK
001cd411f2
Update .htaccess to support Apache 2.2. and 2.4 ( #957 )
2016-11-07 09:16:10 +00:00
Jorge Colmenarez
eefd9a88bd
Merge pull request #1 from jekkos/master
...
Update with base proyect
2016-11-06 21:39:30 -04:00
Jorge Colmenarez
88219b6aa0
Add Support for filter datetime records into Models Items and modify width of input daterangepicker
2016-11-06 21:18:26 -04:00
FrancescoUK
4b5b985315
Fix .gitignore
2016-11-06 17:11:32 +00:00
FrancescoUK
ef45c96ce8
Add hook for database query logging - enable in config.php - ( #924 )
2016-11-06 15:44:18 +00:00
jekkos
6dfb24e6f1
Fix query performance for Item->exists (receivings) ( #924 )
2016-11-05 21:03:32 +01:00
jekkos
49c89d1cec
Improve item search performance by casting to correct datatype ( #924 )
2016-11-05 20:49:08 +01:00
FrancescoUK
872aa7b829
Improve sales register scan item performance ( #924 ) + Fix statistics
2016-11-05 15:07:25 +00:00
FrancescoUK
4dbb8655ee
Update README.md
2016-11-04 15:39:10 +00:00
Jorge Colmenarez
e326c1dfd4
Remove copyright comments and apply suggestions
2016-11-04 09:32:41 -04:00
FrancescoUK
ab3acf1605
Tidyup .htaccess file
2016-11-04 11:20:56 +00:00
jekkos
7668991d6c
Update design for #68
2016-11-03 23:14:02 +01:00
Jorge Colmenarez
0f95c6c9b5
Add Support for filter reports with format date/time
2016-11-01 22:08:47 -04:00
FrancescoUK
768ffdfb4b
Amend path addition ( #952 )
2016-11-01 17:24:41 +00:00
William Chanrico
9a9637bfb7
fixed import_customers.csv template download path
2016-11-01 05:40:31 +07:00
William Chanrico
2cbff93ab5
fixed import_items.csv template download path
2016-11-01 05:39:23 +07:00
FrancescoUK
e42aaed0b1
Fix typo in README and update UPGRADE file with extra step
2016-10-31 17:22:36 +00:00
FrancescoUK
4678764a03
Improved FAQ and issue reporting template. Bumped OSPOS version in few more files
2016-10-31 17:16:30 +00:00
jekkos
4120015d78
Update to CI 3.1.2
2016-10-31 11:39:37 +01:00
FrancescoUK
5ecc6ead7d
Temporary tables optimisation: add indexes ( #951 )
2016-10-30 17:05:41 +00:00
FrancescoUK
816fcd9203
Temporary tables optimisation: improve sales_items_temp ( #951 )
2016-10-30 17:04:59 +00:00
FrancescoUK
6f444b1a33
Temporary tables optimisation: use only the one required ( #951 )
2016-10-30 17:03:16 +00:00
FrancescoUK
94141e21db
Upgraded phppos to ospos migration script to support vs 3.0.0
2016-10-29 21:02:07 +01:00
FrancescoUK
17c23ad417
Added change from item_pic to pic_id in Items table in 2.3.2_to_2.3.3.sql script ( #945 )
2016-10-29 20:31:23 +01:00
FrancescoUK
ef5c513f1b
Bump up OSPOS version to 3.0.1
2016-10-27 16:52:32 +01:00
jekkos
60f78c8eeb
Add database layout schema from mysql
...
Add diagram for adding generic categories
2016-10-22 22:34:09 +02:00
FrancescoUK
dd66496ccc
Remove deleted stock locations from low inventory report ( #916 )
2016-10-21 16:28:09 +01:00
FrancescoUK
d2e21e18a1
Update README
2016-10-20 17:59:15 +01:00
FrancescoUK
d21bedd8c1
Update README
2016-10-20 17:53:19 +01:00
FrancescoUK
0a71cb3d4d
Update WHATS_NEW.txt
2016-10-20 10:48:13 +01:00
jekkos
7758d96e34
Use master docker image for dev environment
...
Update whats_new.txt
2016-10-19 23:02:48 +02:00
FrancescoUK
71ab84e30f
Update README.md
2016-10-19 20:36:56 +01:00
FrancescoUK
b1c36b790f
Fix to item pic ID 0 issue ( #921 )
...
Some code clean up too.
2016-10-19 18:47:57 +01:00
AELHOFY
0723bd2922
Translated using Weblate (Arabic)
...
Currently translated at 100.0% (176 of 176 strings)
2016-10-18 16:47:49 +02:00
jekkos-t520
f5716ab5a3
Fix path to upload folder ( #917 )
2016-10-18 11:54:47 +02:00
FrancescoUK
3208b83169
Update README.md with installation FAQ
2016-10-18 10:28:04 +01:00
jekkos-t520
a2515cf922
Make uploads folder writable ( #917 )
2016-10-18 11:21:27 +02:00
FrancescoUK
1df3ed8b46
Update README.md
...
Added few steps on installation procedure and more issues in the FAQ.
2016-10-18 09:22:22 +01:00
FrancescoUK
d6985853d4
Remove old translations files and rely on Weblate ( #848 #888 )
2016-10-17 16:45:06 +01:00
jekkos-t520
dac61c498e
Don't build weblate orphan branch in travis
2016-10-17 17:16:03 +02:00
jekkos
badc108b2e
Translated using Weblate (Dutch (Belgium))
...
Currently translated at 100.0% (178 of 178 strings)
2016-10-17 17:10:59 +02:00
jekkos-t520
b3efd5301d
Add sendmail to docker container ( #772 )
2016-10-17 13:25:57 +02:00
FrancescoUK
e21f25c15b
Fix typo causing an error in Sales register ( #904 )
2016-10-17 08:39:35 +01:00
FrancescoUK
2d8bd2d307
Show deleted items in Receiving receipt ( #904 )
2016-10-17 08:32:03 +01:00
FrancescoUK
20a6c6ec0a
Show deleted items in receipts and invoices ( #904 )
2016-10-16 23:14:01 +01:00
FrancescoUK
0cb68d47cb
Apply Customer discount to item kit items too ( #910 )
2016-10-16 09:24:42 +01:00
FrancescoUK
04a77dff7d
Apply customer default discount even if customer added later ( #910 )
2016-10-14 21:19:52 +01:00
Koncept Technologies
8732b0e69a
Translated using Weblate (French)
...
Currently translated at 100.0% (22 of 22 strings)
Translated using Weblate (French)
Currently translated at 100.0% (61 of 61 strings)
Translated using Weblate (French)
Currently translated at 100.0% (61 of 61 strings)
Can't figure out the context
Translated using Weblate (French)
Currently translated at 100.0% (176 of 176 strings)
Translated using Weblate (French)
Currently translated at 100.0% (19 of 19 strings)
Translated using Weblate (French)
Currently translated at 100.0% (89 of 89 strings)
Translated using Weblate (French)
Currently translated at 86.0% (43 of 50 strings)
Translated using Weblate (French)
Currently translated at 98.2% (115 of 117 strings)
2016-10-13 23:18:51 +02:00
Valentin Seipt
fe193053f1
Translated using Weblate (German)
...
Currently translated at 100.0% (66 of 66 strings)
Translated using Weblate (German)
Currently translated at 100.0% (61 of 61 strings)
Translated using Weblate (German)
Currently translated at 100.0% (176 of 176 strings)
Translated using Weblate (German)
Currently translated at 100.0% (50 of 50 strings)
2016-10-13 23:18:40 +02:00
jekkos
20279c3bc0
Add correct time to new receivings ( #853 )
2016-10-13 23:14:10 +02:00
jekkos-t520
20e4a3b057
Remove docker volume for custom mysql config
2016-10-13 09:44:06 +02:00
FrancescoUK
1723347359
Fix Receivings report date issue ( #853 )
2016-10-12 19:41:42 +01:00
jekkos
3b578d41bc
Fix price locale parsing if user has no grant for items module ( #834 )
2016-10-11 16:45:03 +02:00
FrancescoUK
573367eddc
Fix Arab language issue missing Open Source Point Of Sale ( #900 )
2016-10-10 11:19:40 +01:00
FrancescoUK
c5986ea943
Revert "Remove old translations files and rely on Weblate ( #848 )"
2016-10-09 09:55:36 +01:00
FrancescoUK
90efaf03ee
Remove old translations files and rely on Weblate ( #848 )
2016-10-06 22:11:14 +01:00
jekkos
8217b70984
Fix debug mode + simplify Gruntfile
2016-10-06 22:12:33 +02:00
FrancescoUK
fd50f6079e
Update README.md
2016-10-06 19:51:40 +01:00
FrancescoUK
a9086cac49
Update README.md
2016-10-06 18:57:28 +01:00
FrancescoUK
3fbc53e9b8
Merge branch 'jekkos/master' into composer
...
# Conflicts:
# database/docker_mysql.cnf
2016-10-06 18:21:53 +01:00
FrancescoUK
2dddd1b7ee
Change dummy emails to be @example.com as it's a reserved domain ( #624 )
2016-10-03 18:40:40 +01:00
FrancescoUK
978cdee7be
Remove pappastech default email once forever ( #624 )
2016-10-02 21:07:08 +01:00
FrancescoUK
e9e2c877d4
Add explicit path to header.php and login.php in Gruntfile.js cachebreaker rule ( #624 )
2016-10-02 16:47:46 +01:00
FrancescoUK
3543321309
Rename LICENSES to be bower.LICENSES ( #624 )
2016-10-02 16:25:51 +01:00
FrancescoUK
b1409f432b
Refactor COPYING/LICENSE file in composer setup ( #624 )
2016-10-02 16:14:33 +01:00
FrancescoUK
676948729b
Amend bower and composer json dscription files ( #624 )
2016-10-02 13:25:53 +01:00
jekkos
10ab3911dc
Update to latest 3.1.0 translations
2016-10-02 13:13:47 +02:00
jekkos
24dcc3f680
Add timezone variabler in dev container
2016-10-02 13:05:51 +02:00
FrancescoUK
64ba842730
Fix license clean in Gruntfile.js to reflect new composer path ( #624 )
2016-10-02 11:47:33 +01:00
FrancescoUK
83992cbf0d
Add grunt-composer package - not used yet - ( #624 )
2016-10-02 09:43:53 +01:00
FrancescoUK
5a2bd9a569
Fix css and js broken URL issue ( #624 )
2016-10-02 09:41:23 +01:00
FrancescoUK
2fcc473830
Restore CI system language translations ( #624 )
2016-10-02 09:21:29 +01:00
jekkos
86de36d731
Fix include paths for debug js + css
2016-10-02 00:19:46 +02:00
jekkos
592f378d2a
Include fixes for GA Client, CI Email bug and bstables fix
2016-10-01 23:52:03 +02:00
FrancescoUK
a87629000e
Fix invoice email pdf attachment being 0 size ( #624 )
2016-10-01 17:10:32 +01:00
FrancescoUK
15e84f9b37
Fix config.php file scrambling
2016-10-01 15:59:07 +01:00
FrancescoUK
a9963dcfd0
Small refactoring of pdf invoice
2016-10-01 15:17:12 +01:00
FrancescoUK
974744858f
Upgrade js plugins and regen dist files
2016-10-01 11:14:08 +01:00
FrancescoUK
a1a6ede046
Extend Return Policy length to 500, reduce app_config key length to 50 ( #879 )
2016-10-01 10:26:51 +01:00
jekkos
7bba5f9dd0
Add php-mbstring dependency for DOMPDF 0.7 ( #624 )
2016-09-30 21:26:53 +02:00
jekkos
39dd29b3c8
Add mysql configuration for 1G ram setup + MySQL 5.7 workaround ( #860 )
2016-09-30 21:19:38 +02:00
FrancescoUK
10cac5496b
Merge branch 'jekkos/master' into composer
2016-09-28 17:41:28 +01:00
FrancescoUK
d88aee1676
Adjusted statistics typos
2016-09-28 17:33:15 +01:00
Piyaporn T
f2e2b5c91b
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)
Translated using Weblate (Thai)
Currently translated at 100.0% (2 of 2 strings)
2016-09-27 21:39:01 +02:00
jekkos
b07631798e
Add link to wiki for docker cloud install
2016-09-27 21:19:37 +02: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
Xyko Arteiro
9dfc186fe4
Translated using Weblate (Portuguese (Brazil))
...
Currently translated at 100.0% (176 of 176 strings)
Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (5 of 5 strings)
Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (84 of 84 strings)
Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (117 of 117 strings)
2016-09-27 12:42:27 +02:00
FrancescoUK
9c025c6feb
Made send statistics configurable
2016-09-24 21:13:13 +01:00
FrancescoUK
fdbb158c1d
Security fix
2016-09-24 20:49:30 +01:00
jekkos-t520
c695505605
Make timezone configurable through env variable ( #853 )
2016-09-23 10:38:34 +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
Salvador Hurtado
efc5996282
Translated using Weblate (Spanish)
...
Currently translated at 100.0% (50 of 50 strings)
Translated using Weblate (Spanish)
Currently translated at 100.0% (61 of 61 strings)
Translated using Weblate (Spanish)
Currently translated at 100.0% (84 of 84 strings)
Translated using Weblate (Spanish)
Currently translated at 100.0% (117 of 117 strings)
Translated using Weblate (Spanish)
Currently translated at 100.0% (176 of 176 strings)
Translated using Weblate (Spanish)
Currently translated at 100.0% (19 of 19 strings)
2016-09-21 09:34:59 +02:00
Weblate
ec2aa52d85
Translated using Weblate (Chinese)
...
Currently translated at 100.0% (176 of 176 strings)
Translated using Weblate (Chinese)
Currently translated at 100.0% (89 of 89 strings)
Translated using Weblate (Chinese)
Currently translated at 78.0% (39 of 50 strings)
2016-09-21 09:34:59 +02:00
Suat Donangil
7d7afd4904
Translated using Weblate (Turkish)
...
Currently translated at 98.2% (115 of 117 strings)
Translated using Weblate (Turkish)
Currently translated at 100.0% (66 of 66 strings)
Translated using Weblate (Turkish)
Currently translated at 100.0% (8 of 8 strings)
2016-09-21 09:34:59 +02:00
FrancescoUK
8a3fa821d9
Fixed Turkish language issue ( #863 )
2016-09-17 14:00:36 +01:00
Suat Donangil
16958d3b99
Translated using Weblate (Turkish)
...
Currently translated at 100.0% (12 of 12 strings)
2016-09-16 13:10:32 +00:00
Suat Donangil
5829dd8ba5
Translated using Weblate (Turkish)
...
Currently translated at 100.0% (22 of 22 strings)
2016-09-16 13:09:38 +00:00
Valentin Seipt
d0c86b8dc4
Translated using Weblate (German)
...
Currently translated at 100.0% (22 of 22 strings)
2016-09-16 13:09:38 +00:00
Suat Donangil
0d0ec68e60
Translated using Weblate (Turkish)
...
Currently translated at 100.0% (89 of 89 strings)
2016-09-16 13:08:31 +00:00
Suat Donangil
cc4edaa468
Translated using Weblate (Turkish)
...
Currently translated at 100.0% (89 of 89 strings)
2016-09-16 13:08:31 +00:00
Suat Donangil
ffbba16a08
Translated using Weblate (Turkish)
...
Currently translated at 100.0% (61 of 61 strings)
2016-09-16 13:07:06 +00:00
Suat Donangil
f235b33959
Translated using Weblate (Turkish)
...
Currently translated at 100.0% (61 of 61 strings)
2016-09-16 13:07:06 +00:00
Valentin Seipt
fd9118887c
Translated using Weblate (German)
...
Currently translated at 100.0% (61 of 61 strings)
2016-09-16 13:07:06 +00:00
Suat Donangil
5fddfe20d6
Translated using Weblate (Turkish)
...
Currently translated at 100.0% (8 of 8 strings)
2016-09-16 12:42:51 +00:00
FrancescoUK
e42a4e843b
Merge branch 'master' into composer
2016-09-15 22:35:52 +01:00
FrancescoUK
3b00c5bf9e
Updated js plugins and regen dist files
2016-09-15 22:28:49 +01:00
FrancescoUK
7f1b8a146b
Fixed login issue ( #859 #862 )
2016-09-15 22:11:01 +01:00
Joe Salty
e05b2697d4
Translated using Weblate (Hungarian)
...
Currently translated at 100.0% (12 of 12 strings)
2016-09-15 22:09:32 +01:00
Joe Salty
da0678f079
Translated using Weblate (Hungarian)
...
Currently translated at 100.0% (22 of 22 strings)
2016-09-15 22:07:56 +01:00
Weblate
2ba7b000c2
Translated using Weblate (Dutch (Belgium))
...
Currently translated at 100.0% (176 of 176 strings)
2016-09-15 22:06:15 +01:00
Weblate
548df573bb
Translated using Weblate (Dutch (Belgium))
...
Currently translated at 100.0% (89 of 89 strings)
2016-09-15 22:04:58 +01:00
Joe Salty
f1d8378bcb
Translated using Weblate (Hungarian)
...
Currently translated at 100.0% (89 of 89 strings)
2016-09-15 22:03:32 +01:00
Joe Salty
42121017b5
Translated using Weblate (Hungarian)
...
Currently translated at 100.0% (8 of 8 strings)
2016-09-15 22:02:09 +01:00
Joe Salty
6fade459ad
Translated using Weblate (Hungarian)
...
Currently translated at 100.0% (61 of 61 strings)
2016-09-15 22:00:52 +01:00
Marcus Gustafsson
b2e85aa0d8
Translated using Weblate (Swedish)
...
Currently translated at 100% (0 of 0 strings)
Created new translation.
2016-09-15 21:59:31 +01:00
FrancescoUK
9f3ecb0866
Log error if email sending fails ( #772 )
2016-09-15 21:57:12 +01:00
Marcus Gustafsson
6a29ebeff8
Translated using Weblate (Swedish)
...
Currently translated at 100% (0 of 0 strings)
Created new translation.
2016-09-15 21:55:04 +01:00
Marcus Gustafsson
221a575e5c
Translated using Weblate (Swedish)
...
Currently translated at 100% (0 of 0 strings)
Created new translation.
2016-09-15 21:53:40 +01:00
Valentin Seipt
2afac17848
Translated using Weblate (German)
...
Currently translated at 100.0% (61 of 61 strings)
2016-09-15 21:52:16 +01:00
Valentin Seipt
e381b3fea5
Translated using Weblate (German)
...
Currently translated at 100.0% (8 of 8 strings)
2016-09-15 21:50:55 +01:00
FrancescoUK
49ed750045
Updated js plugin and regen dist files
2016-09-15 21:32:39 +01:00
FrancescoUK
1e1cfec94e
Fixed misspelling of portuguese-brazilian in language selection causing an error ( #624 )
2016-09-15 18:06:21 +01:00
Weblate
713b88bbc4
Merge remote-tracking branch 'origin/master'
2016-09-15 14:13:13 +00:00
Weblate
811fdf9bc0
Merge remote-tracking branch 'origin/master'
2016-09-15 14:12:54 +00:00
Weblate
d40a43e1ca
Translated using Weblate (Dutch (Belgium))
...
Currently translated at 100.0% (89 of 89 strings)
2016-09-15 14:12:26 +00:00
Weblate
386057d544
Translated using Weblate (Dutch (Belgium))
...
Currently translated at 100.0% (176 of 176 strings)
2016-09-15 14:05:02 +00:00
FrancescoUK
c60fcb171c
Fixed login issue ( #859 #862 )
2016-09-14 03:35:30 +01:00
Weblate
11b1072151
Merge remote-tracking branch 'origin/master'
2016-09-13 22:08:09 +00:00
Weblate
036a711c53
Merge remote-tracking branch 'origin/master'
2016-09-13 22:07:21 +00:00
Joe Salty
ceaa378978
Translated using Weblate (Hungarian)
...
Currently translated at 100.0% (12 of 12 strings)
2016-09-13 22:06:24 +00:00
Joe Salty
83b4f9f8a8
Translated using Weblate (Hungarian)
...
Currently translated at 100.0% (89 of 89 strings)
2016-09-13 22:06:21 +00:00
Joe Salty
838df08eae
Translated using Weblate (Hungarian)
...
Currently translated at 100.0% (22 of 22 strings)
2016-09-13 22:06:10 +00:00
Weblate
7dd1c9791d
Merge remote-tracking branch 'origin/master'
2016-09-13 18:18:44 +00:00
Joe Salty
fc2094a9c3
Translated using Weblate (Hungarian)
...
Currently translated at 100.0% (8 of 8 strings)
2016-09-13 18:17:58 +00:00
Joe Salty
505ab59903
Translated using Weblate (Hungarian)
...
Currently translated at 100.0% (61 of 61 strings)
2016-09-13 18:17:46 +00:00
Weblate
1f169d8fab
Merge remote-tracking branch 'origin/master'
2016-09-12 22:28:11 +00:00
Weblate
ebc1237ddc
Merge remote-tracking branch 'origin/master'
2016-09-12 22:23:50 +00:00
Marcus Gustafsson
b1aa16f7a9
Translated using Weblate (Swedish)
...
Currently translated at 100% (0 of 0 strings)
Created new translation.
2016-09-12 22:21:49 +00:00
Marcus Gustafsson
3206bbb41d
Translated using Weblate (Swedish)
...
Currently translated at 100% (0 of 0 strings)
Created new translation.
2016-09-12 19:48:10 +00:00
Marcus Gustafsson
3b559b056d
Translated using Weblate (Swedish)
...
Currently translated at 100% (0 of 0 strings)
Created new translation.
2016-09-12 18:29:11 +00:00
FrancescoUK
cd0ef34f75
Log error if email sending fails ( #772 )
2016-09-12 19:18:05 +01:00
FrancescoUK
f89315a298
Log error if email sending fails ( #772 )
2016-09-12 19:16:48 +01:00
Valentin Seipt
4a4a7921d7
Translated using Weblate (German)
...
Currently translated at 100.0% (61 of 61 strings)
2016-09-12 14:04:41 +00:00
Weblate
691fa674c4
Merge remote-tracking branch 'origin/master'
2016-09-12 14:02:59 +00:00
Valentin Seipt
fe55841187
Translated using Weblate (German)
...
Currently translated at 100.0% (8 of 8 strings)
2016-09-12 14:01:07 +00:00
FrancescoUK
18d3f7db52
Merge branch 'jekkos/master' into composer
2016-09-11 23:12:06 +01:00
FrancescoUK
e3c538dbaf
Statistics adjustment
2016-09-11 23:05:15 +01:00
FrancescoUK
d08b0b7ef4
Statistics adjustment
2016-09-11 23:02:36 +01:00
FrancescoUK
003d4de6be
Statistics adjustment
2016-09-11 23:01:12 +01:00
FrancescoUK
b6bda3c3ed
Print Composer Libraries License in Store Config ( #624 )
2016-09-11 20:53:51 +01:00
jekkos
71e1cb8fd0
Add badge with translation status
2016-09-09 14:48:34 +02:00
Jeroen Peelaerts
4139d53938
Translated using Weblate (Dutch (Belgium))
...
Currently translated at 100.0% (61 of 61 strings)
2016-09-09 07:53:30 +00:00
FrancescoUK
ffa5b4ddb7
Update .htaccess to cover subdomain cases and protect dir content ( #624 )
2016-09-08 18:14:43 +01:00
FrancescoUK
068f426c9e
Merge branch 'jekkos/master' into composer
2016-09-08 12:56:01 +01:00
FrancescoUK
6f62085ba6
Update README.md
2016-09-08 12:19:19 +01:00
FrancescoUK
08e8209446
Add language key change to database upgrade script ( #624 )
2016-09-08 08:05:19 +01:00
FrancescoUK
ea7cc16cc9
Regen dist files
2016-09-07 20:28:26 +01:00
FrancescoUK
e3c9cddacb
Merge branch 'master' into composer
2016-09-07 19:31:52 +01:00
FrancescoUK
aae1ce5329
Fixed deleted spaces when searching items ( #838 )
2016-09-07 17:12:50 +01:00
FrancescoUK
7350f4dc76
Fixed currency symbol encoding issue in invoice PDF ( #839 )
2016-09-07 17:06:47 +01:00
jekkos
da307fdfbd
Fix currency symbol encoding in invoice PDF ( #839 )
2016-09-07 17:10:16 +02:00
FrancescoUK
9012006e84
Updated invoice pdf support Dompdf to 0.7.0 ( #839 )
2016-09-07 08:58:05 +01:00
jekkos
91b18d032f
Replace DOMPDF, GaTracking with composer managed dependencies ( #624 )
...
Fix trim on search bug (#838 )
2016-09-07 09:11:11 +02:00
FrancescoUK
b5f6fb124c
Add DOMPDF version and license in the license dir
2016-09-06 08:48:39 +01:00
FrancescoUK
a5f16abbd5
Updated ISSUE_TEMPLATE.md and README.md
2016-09-06 08:31:54 +01:00
FrancescoUK
d319c5a73d
Alternative fix to #833
2016-09-04 17:27:53 +01:00
FrancescoUK
f3270a545e
Fixed no internet connection causing blank page ( #833 )
2016-09-03 10:23:58 +01:00
jekkos
9e01ca2e43
Merge branch 'master' into feature/composer
2016-09-02 17:58:03 +02:00
jekkos
c3316040bb
Increase delay for autocomplete on item add form ( #739 )
2016-09-02 09:20:03 +02:00
jekkos
17084d8a8f
Fix employee creation + use new hashing in dbscript init ( #855 )
2016-09-01 20:26:25 +02:00
jekkos
71e54d90bf
Fix database init script + employee creation ( #822 )
2016-09-01 20:00:49 +02:00
jekkos
eb59079fe5
Regenerate sql scripts for hashing upgrade ( #822 )
2016-09-01 19:20:50 +02:00
jekkos
35f9904dbe
Upgrade old MD5 password hashing ( #822 )
2016-09-01 19:12:08 +02:00
jekkos
ce2c83b3f9
Set minimum precision for low number of tax / price decimals ( #766 )
2016-09-01 18:15:55 +02:00
jekkos
c88de60a9f
Make new config hook for loading stats
2016-09-01 08:53:06 +02:00
jekkos
2bf82e6472
Some additional statistics tweaks
2016-08-31 19:52:48 +02:00
FrancescoUK
3ce939ad20
Minor fixes
2016-08-30 18:01:05 +01:00
jekkos
96004f5699
Remove nominatim duplicates ( #805 )
...
Set default notification popup position to center bottom
2016-08-30 08:42:49 +02:00
jekkos
a2d2965785
Fix nominatim search suggestions + type in login ( #805 )
2016-08-29 23:30:41 +02:00
jekkos
3d15148b80
Fix broken js + css (regen with correct tags plugin version) ( #809 )
2016-08-29 23:00:15 +02:00
jekkos
31166c814e
Stop submitting cancel form when hitting enter in invoice number field ( #809 )
2016-08-29 18:10:55 +02:00
jekkos
0ec94f1044
Regenerate dist files
2016-08-29 17:54:49 +02:00
jekkos
6e7b32cb1b
Remove duplicate suggestions
...
Remove duplicate result suggestions in nominatim (#805 )
2016-08-29 17:50:43 +02:00
jekkos
775c0cebf2
Some login (statistics) tweaks
2016-08-29 08:57:28 +02:00
jekkos
d67b33d996
Reorder inlined javascript
...
Regenerate licenses
2016-08-28 23:07:31 +02:00
FrancescoUK
375408a7a7
Amend COPYING license file
2016-08-28 12:39:00 +01:00
jekkos
7677c33ce1
Fix path to login.css ( #624 )
2016-08-25 17:38:56 +02:00
jekkos
a5b2c82395
Set grunt script link tags to master version for composer branch
2016-08-24 19:57:09 +02:00
jekkos
13587908f5
Merge branch 'feature/composer' of https://github.com/jekkos/opensourcepos into feature/composer
2016-08-24 19:48:37 +02:00
jekkos
9c3c283912
Adapt path Gruntfile
2016-08-24 19:48:28 +02:00
FrancescoUK
d290134a48
Merge branch 'master' into composer
2016-08-24 16:38:47 +01:00
FrancescoUK
057fdaea5d
Remove unused old table icons
2016-08-24 16:06:35 +01:00
FrancescoUK
f440ff5e89
Fix Gruntfile.js and paths ( #624 )
2016-08-24 15:45:14 +01:00
jekkos
7f65b9cf2b
Add COPYING to public/license directory
2016-08-24 16:28:29 +02:00
jekkos
e8a96054ee
Merge branch 'master' into feature/composer
...
Conflicts:
dist/opensourcepos.min.js
public/license/LICENSES
2016-08-24 16:25:55 +02:00
jekkos
ad19dbc5ed
Move COPYING to public/license in Gruntfile.js ( #624 )
2016-08-24 16:20:45 +02:00
jekkos
dc0245c4fb
Merge branch 'feature/composer' of https://github.com/jekkos/opensourcepos into feature/composer
2016-08-23 18:28:50 +02:00
jekkos
e25c330dff
Move COPYING to license/ folder
...
Add bower_components to .gitignore
Regenerate licenses
2016-08-22 13:37:09 +02:00
FrancescoUK
9a6bd6e000
Revert back bootstrap-select to version 1.10.0 ( #813 )
2016-08-19 18:54:41 +01:00
jekkos
e302086b13
Merge branch 'master' into feature/composer
...
Conflicts:
.travis.yml
application/controllers/Login.php
application/views/partial/header.php
public/dist/opensourcepos.min.js
2016-08-19 12:09:38 +02:00
FrancescoUK
45675b8f29
Copy COPYING file to license dir, update js plugin, regen dist files
2016-08-18 20:17:54 +01:00
jekkos
64d0483300
Fix environment variable in .travis.yml
2016-08-18 16:06:03 +02:00
jekkos
798246e589
Strip feature name branch from docker image tag
2016-08-18 14:01:47 +02:00
jekkos
2c1231ca61
Install CI langauges in system/language as before ( #624 )
...
Map CI language folder with ospos language code
2016-08-18 13:33:02 +02:00
jekkos
d6b009fba8
Fix build after rebase with master
...
Enable php socket extension in Dockerfile
2016-08-18 13:33:01 +02:00
jekkos
ad8d0821ad
Correct license output directory in Gruntfile ( #624 )
2016-08-18 13:33:01 +02:00
jekkos
a6ba67e2fc
Change project layout for composer ( #624 )
2016-08-18 13:33:01 +02:00
jekkos
9e1afd3f2b
Push branch to new docker image tag
2016-08-18 13:32:59 +02:00
jekkos
43e7e353e7
Push branch to new docker image tag
2016-08-18 13:19:44 +02:00
jekkos
e4fc2ac06b
Fix script-tag plugin version to use absolutePath option ( #612 )
2016-08-18 10:28:47 +02:00
jekkos
59bbe55215
Install CI langauges in system/language as before ( #624 )
...
Map CI language folder with ospos language code
2016-08-18 08:27:54 +02:00
FrancescoUK
6b63e381f9
Security fix: set OSPOS to be production code by default if CI_ENV is not set ( #808 )
2016-08-15 18:31:22 +01:00
jekkos
af6b323013
Fix build after rebase with master
...
Enable php socket extension in Dockerfile
2016-08-14 11:58:15 +02:00
jekkos
919e478184
Correct license output directory in Gruntfile ( #624 )
2016-08-14 11:58:15 +02:00
jekkos
3f34775000
Change project layout for composer ( #624 )
2016-08-14 11:58:15 +02:00
FrancescoUK
6e7da88f94
Further tweaking of README.md
2016-08-14 10:00:25 +01:00
FrancescoUK
cf1eec761b
Further adjustments to README.md
2016-08-14 09:44:49 +01:00
FrancescoUK
b51022e93f
Updated to README.md
2016-08-14 09:38:28 +01:00
FrancescoUK
2bda02dd74
Further bug fixes
2016-08-13 18:17:17 +01:00
FrancescoUK
01aeca579a
Code refactoring and bug fixes
2016-08-13 14:07:27 +01:00
FrancescoUK
2555203a54
Arab translation amendments ( #794 )
2016-08-12 21:51:35 +01:00
FrancescoUK
4f5f875f1e
Amend license files
2016-08-12 21:30:41 +01:00
FrancescoUK
b77d368885
Refactoring and statistics support
2016-08-12 21:23:26 +01:00
FrancescoUK
4b569d093b
Made the password input glyphicons consistent across OSPOS ( #731 )
2016-08-12 10:13:43 +01:00
FrancescoUK
51bdfc050e
Update Spanish translation ( #750 )
2016-08-11 22:26:18 +01:00
FrancescoUK
1b19fed206
Updated login page ( #731 )
2016-08-11 18:36:59 +01:00
FrancescoUK
3336d42245
Solved .bowerrc command line issue causing bower update to fail ( #359 )
2016-08-11 15:56:33 +01:00
FrancescoUK
6fdecbe619
Refactor Gruntfile.js bowercopy section ( #409 )
2016-08-11 14:38:08 +01:00
FrancescoUK
55764d7625
Updated Theme translation ( #794 )
2016-08-11 13:26:39 +01:00
FrancescoUK
dd8d848544
Updated Arabic (EG) and Portuguese (BR) translations ( #794 #795 )
2016-08-11 09:41:45 +01:00
jekkos
6203504976
Remove bootstrap 3.3.6 js from minified file ( #489 )
...
Cleanup dist/ folder (remove duplicated bootswatch themes)
2016-08-11 08:28:37 +02:00
jekkos
059ec54c72
Make theme configurable from config module ( #409 )
...
Add symlink to bower_components in Docker dev environment (#616 )
Move header_debug content back into header view
2016-08-10 18:58:17 +02:00
jekkos
75567b9620
Fix bootstrap.min.css load in login and header ( #409 )
2016-08-10 17:16:00 +02:00
jekkos
1b859a8726
Manually install docker-compose in build environment ( #616 )
2016-08-10 16:00:44 +02:00
jekkos
1c02508759
Use docker environment from travis-ci ( #616 )
2016-08-10 15:49:20 +02:00
jekkos
4c337aa5c6
Try to fix travis docker setup + remove jquery validator override ( #788 , #616 )
2016-08-10 15:26:18 +02:00
jekkos
523714c26a
Run license generation only after bower install or uninstall ( #359 )
2016-08-10 14:47:01 +02:00
FrancescoUK
28e776248b
Store all used stylesheets in dist dir, don't rely on css dir ( #409 )
2016-08-10 10:53:27 +01:00
FrancescoUK
333067955c
Improved theme config option comment ( #409 )
2016-08-10 10:53:27 +01:00
FrancescoUK
a0886caf2f
Added all bootswatch themes and made theming configurable from config.php ( #409 )
2016-08-10 10:53:27 +01:00
jekkos
31cc67ea52
Regenerate LICENSES with .bower.json first ( #359 )
2016-08-10 09:04:59 +02:00
jekkos
8b08bf5daa
Add frontside support for locale dependent number validation ( #788 )
2016-08-09 18:20:52 +02:00
FrancescoUK
597a5caee5
XSS clean the license text ( #359 )
2016-08-08 16:09:40 +01:00
FrancescoUK
19403adde2
Read plugin LICENSES json and display in Store Config ( #359 )
2016-08-08 15:54:29 +01:00
FrancescoUK
119476ca74
Reorder license steps in Gruntfile.js ( #359 )
2016-08-08 10:04:43 +01:00
FrancescoUK
dd07b9fcb8
Add grunt license checker ( #359 )
2016-08-08 09:32:45 +01:00
jekkos
4a54dc7dc7
Add license plugin for grunt ( #359 )
2016-08-08 10:19:02 +02:00
FrancescoUK
e1f796cf99
Further refinement of ISSUE_TEMPLATE.md ( #779 )
2016-08-07 19:10:31 +01:00
FrancescoUK
266610399d
Fixed Arabic (Egypt) translations ( #756 )
2016-08-07 17:07:17 +01:00
FrancescoUK
7602e77071
Refined ISSUE_TEMPLATE.md ( #779 )
2016-08-06 12:31:54 +01:00
FrancescoUK
bd7dd4741d
Added a issue report template ( #779 )
2016-08-06 12:25:30 +01:00
FrancescoUK
3ed454d1b3
Fixed missing location_id error in Graphical Summary Tax report ( #785 )
2016-08-06 11:59:17 +01:00
FrancescoUK
2402da6e30
Added Arabic (Egypt) translations ( #756 )
2016-08-06 10:39:46 +01:00
FrancescoUK
c76109ab0a
Update to Code Igniter 3.1.0 ( #782 )
2016-08-04 22:25:17 +01:00
FrancescoUK
fe5e99978c
Upgrade always to the latest bootswatch flatly theme (provided is available on bootswatch-dist)
2016-08-04 21:45:25 +01:00
FrancescoUK
63a6706770
Fixed comment sentence that was unclear
2016-08-03 07:36:02 +01:00
FrancescoUK
4ea056e3f7
Fixed Item exists where issue ( #666 )
2016-08-02 17:25:49 +01:00
FrancescoUK
5f1d9e7f45
Fixed cart enter issue in receiving ( #775 )
2016-08-02 17:22:08 +01:00
jekkos
9fa2676352
Fix exists by doing string comparison using like clause ( #666 )
2016-08-01 13:58:07 +02:00
jekkos
76630365e7
Fix submit on enter for secondary sale lines ( #771 )
2016-08-01 13:27:45 +02:00
FrancescoUK
cbc42f7868
Upgraded to Bootstrap 3.3.7, dist file regen
2016-08-01 08:31:06 +01:00
FrancescoUK
fba0915c42
Fixed DB backup error due to & ( #629 )
2016-08-01 08:24:16 +01:00
jekkos
ab075fd94f
Amount due can be negative as well ( #733 ))
2016-07-30 15:52:06 +02:00
jekkos
956f18e55c
Round amount due before comparing with zero ( #759 )
...
Bump version chartist tooltip
2016-07-30 10:23:30 +02:00
jekkos
05628ddaff
Add common error message to README FAQ ( #764 )
2016-07-26 11:23:08 +02:00
jekkos
2519d0fb20
Don't send totals row to server for delete ( #686 )
...
Replace mysql with mariadb in docker images (#616 )
2016-07-26 08:40:54 +02:00
jekkos
28129ef075
Set calculation precision to currency + tax decimals ( #759 )
2016-07-25 21:28:56 +02:00
jekkos
0727ae06af
Regenerate language files ( #750 )
2016-07-25 18:05:06 +02:00
sonnysk76
0efc49f713
es lang update
2016-07-25 18:05:06 +02:00
jekkos
352586531f
Fix graphical items summary report ( #742 )
2016-07-25 17:37:54 +02:00
jekkos
745874f0b3
Fix graphical items summary report ( #742 )
2016-07-21 01:41:22 +02:00
jekkos
d8e4bf48d8
Check if payments cover sale with exact precision ( #733 )
...
Set bc-operation style scale globally
Add location filtering in graphical and summary reports (#742 )
2016-07-20 20:43:31 +02:00
jekkos
4be3c8f433
Revert "Check if payments cover total using currency decimals configuration"
...
This reverts commit 9a7061e9c5 .
2016-07-17 14:51:55 +02:00
jekkos
9a7061e9c5
Check if payments cover total using currency decimals configuration
...
(#733 )
2016-07-17 14:11:06 +02:00
jekkos
2743e1353a
Escape dollar sign when using varargs version of lang::line ( #732 )
...
Properly handle decimals when saving giftcards (#458 )
2016-07-17 13:16:57 +02:00
jekkos
75db191baf
Fix notification popup for fresh installs
...
Fix docker setup by compiling php5-intl (#616 )
2016-07-17 12:52:38 +02:00
FrancescoUK
a66868651b
Update js plugins and regen dist files
2016-07-15 20:47:09 +01:00
FrancescoUK
68deca1537
German (Germany) translation added ( #743 )
2016-07-15 14:56:14 +01:00
jekkos
1af612d18e
Add thousands separator option ( #458 )
...
Fix adding payment with comma as decimal separator (#740 )
2016-07-15 11:22:31 +02:00
jekkos
cfdbd01dac
Update FAQ in README.md ( #741 )
2016-07-14 09:51:43 +02:00
jekkos
d88b51794e
Fix employee module in french ( #735 )
2016-07-14 09:43:39 +02:00
FrancescoUK
c9d806bd26
Fixed mistake with Giftcard ( #732 )
2016-07-12 16:59:23 +01:00
FrancescoUK
39d678b977
Fixed Register issue with Giftcard ( #732 )
2016-07-11 19:05:06 +01:00
FrancescoUK
a0e894895e
Fix typos ( #359 )
2016-07-10 17:38:53 +01:00
FrancescoUK
09a3499069
Added license statement displaying, updated COPYING and other license files ( #359 )
2016-07-10 15:50:25 +01:00
FrancescoUK
86b32240d3
Adjusted login and header title line, updated spacelab footer.php
2016-07-10 10:30:44 +01:00
FrancescoUK
0924a0f433
Revert "Move create_temp_table to Reports Controller constructor out of Model one" ( #729 )
...
This reverts commit dc06119586 .
2016-07-09 12:50:17 +01:00
FrancescoUK
55f7bef253
Added go to Sales Register button in Takings
2016-07-09 10:15:13 +01:00
FrancescoUK
38d234fa5f
Fixed receipt, change due and total cash issues with no payment cases ( #707 )
2016-07-09 10:04:04 +01:00
FrancescoUK
120b2bbc6e
Remove unnecessary tabs from config.php
2016-07-08 17:12:41 +01:00
FrancescoUK
a3704f9b12
Make inventory to support decimal quantity on transactions logging ( #726 )
2016-07-08 17:12:41 +01:00
jekkos
c82e9e4929
Correct container names in travis.yml
2016-07-08 15:45:14 +02:00
FrancescoUK
7f169222d0
Little locale_helper improvement and regen database scripts ( #458 )
2016-07-08 09:49:22 +01:00
jekkos
21f5e46488
Fix tax percentage parsing ( #458 , #727 )
...
Add tabindexes to price, discount field in register
2016-07-08 08:47:03 +02:00
jekkos
ef2cd9d001
Update Readme and travis config ( #616 )
2016-07-07 21:39:41 +02:00
jekkos
72efafdc50
Add back quantity_decimals() function for inventory / stock forms ( #458 )
2016-07-07 21:34:23 +02:00
jekkos
0f88d6462d
Add fixes for register + receiving validation ( #458 )
2016-07-07 21:11:33 +02:00
jekkos
3af19daa0e
Fix decimal parsing, add php5-intl locale support ( #458 )
2016-07-07 20:56:51 +02:00
jekkos
f11c2d7a4d
Move init sql to data only container ( #616 )
...
Update travis config to build new setup
Add git sha-1 to ospos version string
2016-07-07 14:05:56 +02:00
jekkos
be2bac84f1
Fix export in inventory reports ( #503 )
2016-07-07 09:27:05 +02:00
FrancescoUK
dc06119586
Move create_temp_table to Reports Controller constructor out of Model one
2016-07-06 19:37:23 +01:00
FrancescoUK
0cbd19353c
Rename temp table creation functions to simply be create_temp_table
2016-07-06 19:22:32 +01:00
FrancescoUK
3c969858cf
Performance improvement for Inventory reports after XSS clean addition ( #39 )
2016-07-06 19:11:54 +01:00
FrancescoUK
fbba5ea2c5
Reduced font size to 13px from 14px, regen dist files ( #722 )
2016-07-06 13:53:45 +01:00
FrancescoUK
6d8c3b94e0
Protect .txt files access in .htaccess
2016-07-06 10:12:49 +01:00
FrancescoUK
b3a1259861
Protect .csv file access in .htaccess, made spacelab header.php consistent with default one
2016-07-06 09:30:26 +01:00
FrancescoUK
a74e7565bf
Change " to ' in sale model queries
2016-07-05 22:21:12 +01:00
FrancescoUK
df6f118a79
Fixed search customer bug in sales Takings ( #654 )
2016-07-05 21:51:39 +01:00
jekkos
f04cbc9674
Fix delete for most controllers ( #721 )
2016-07-05 22:19:32 +02:00
FrancescoUK
3cff918f81
Inverted Sales register New Items New and Submit buttons
2016-07-05 20:28:32 +01:00
FrancescoUK
5be0feafe9
Inverted Sale edit form Delete and Submit buttons
2016-07-05 20:24:52 +01:00
FrancescoUK
4618af352c
Fixed New button in items form: visible in New Item not Edit/Update Item
2016-07-05 20:20:33 +01:00
FrancescoUK
81d1aa7873
Added partial/header_debug, upgraded grunt script, regen dist with updated js plugins
2016-07-05 19:13:27 +01:00
jekkos
8002694c96
Make csrf token generation more generic using dataFilter in ajaxSetup ( #597 , #599 )
2016-07-05 17:53:11 +02:00
jekkos
5de3f17af8
Show error message if avatar dimensions exceed allowed maximum ( #696 )
2016-07-05 08:22:09 +02:00
jekkos
1b5105f3af
Remove unnecessary hook with csrf setup ( #599 , #597 )
2016-07-04 23:36:08 +02:00
jekkos
7b674b2e3f
Fix submit in items, customers and sales ( #716 )
...
Add again new button functionality in items (#712 )
Bugfixes for csrf tokens (#599 )
2016-07-04 23:20:14 +02:00
FrancescoUK
01486fd41e
Fixed translation strings typos in datepicker_locale
2016-07-04 18:59:56 +01:00
FrancescoUK
a69194745e
Fixed template header issues ( #714 ), and email_config tab js issue
2016-07-04 18:12:20 +01:00
jekkos
90660fd9e9
Fix close button in stock details ( #14 )
2016-07-04 18:03:25 +02:00
jekkos
bb1a1ccd62
Fix table_helper after bad merge
2016-07-04 17:45:08 +02:00
jekkos
806c1b9986
Add csrf token in forms ( #599 , #597 )
2016-07-04 17:38:58 +02:00
FrancescoUK
0ba5cadbb7
More models/Sale refactoring, fix button order in sales/form, make inventory count button a close one
2016-07-03 20:23:06 +01:00
FrancescoUK
5b81ee1b1d
Added config_email_configuration translation ( #713 )
2016-07-03 18:29:25 +01:00
FrancescoUK
c136832db1
Fixed issue with negative tendered amount in sales ( #707 ), improved sales_items_temp table and usage in various parts
2016-07-03 14:07:46 +01:00
FrancescoUK
d8beedf1f7
Small code optimisation: review for loops ( #709 )
2016-07-01 19:12:48 +01:00
FrancescoUK
4d6a665e04
Small code optimisation: use strtr instead of str_replace ( #709 )
2016-07-01 18:58:40 +01:00
FrancescoUK
201e26e521
Small code optimisation: pre increment is faster than post increment ( #709 )
2016-07-01 18:58:04 +01:00
FrancescoUK
b7cb5c5873
make consistent use of elseif in place of else if
2016-07-01 17:08:01 +01:00
FrancescoUK
5cb755b0e3
Added common_close translation ( #705 ) fixed datepicker_lang translation
2016-07-01 09:11:36 +01:00
FrancescoUK
43da232557
Tidy up time conversion utility functions
2016-06-30 15:32:43 +01:00
FrancescoUK
06c74045be
Make full use of moment.js for wall clock functionality. Update templates/spacelab header.php
2016-06-30 11:11:19 +01:00
jekkos
ad54e759f0
Add badge for bower dependency status
2016-06-28 22:42:12 +02:00
jekkos
163726abae
Fix docker cloud deploy button ( #616 )
2016-06-28 20:08:05 +02:00
jekkos
6a108866f5
Remove volume from docker-compose test file ( #616 )
...
Update docker-cloud to mount init script directly
2016-06-28 19:25:50 +02:00
jekkos
608b2ec075
Add version + dependency badges
2016-06-28 13:47:36 +02:00
FrancescoUK
7682f02222
Removed language="javascript" as deprecated
2016-06-27 21:04:27 +01:00
FrancescoUK
7c65484ada
Fixed daterangepicker translation
2016-06-27 16:33:52 +01:00
FrancescoUK
163732b87f
Drop and recreate completely session table with new structure
2016-06-27 16:15:14 +01:00
FrancescoUK
dd2dc7312c
Drop session table's primary key, change introduced with CI3.0.6 to prevents conflicts if sess_match_ip is set to TRUE
2016-06-27 15:57:20 +01:00
FrancescoUK
586c8f8db9
Added support for receipt templates, added default and short version ( #678 )
2016-06-26 20:06:37 +01:00
FrancescoUK
0293b6dbd8
Brazilian Portuguese translations updated ( #650 )
2016-06-26 18:33:18 +01:00
FrancescoUK
d62af2a007
Limit string length of barcode strings ( #692 )
2016-06-26 18:21:05 +01:00
FrancescoUK
6466a71c0a
Removed all the character_limiter affecting tabular views ( #692 )
2016-06-26 12:20:35 +01:00
FrancescoUK
d2d9aae9ce
Regen dist files
2016-06-26 12:06:09 +01:00
FrancescoUK
362b32357f
Complete translation support with dropdowns and Store Config pages ( #439 )
2016-06-25 19:43:53 +01:00
FrancescoUK
4b64269905
Fixed regression introduced with button translation support change ( #699 )
2016-06-25 16:06:59 +01:00
jekkos
e25ce12e55
Only mount uploads folder as docker volume ( #616 )
...
Remove base64 jQuery plugin (#684 )
2016-06-25 12:36:36 +02:00
FrancescoUK
b76d4526de
Renamed prefix recvs_ to be the extended version receivings_ matching the Controller name ( #439 )
2016-06-25 09:39:04 +01:00
FrancescoUK
1affe3c093
Strip html tags from image upload error message ( #696 )
2016-06-25 09:32:01 +01:00
jekkos
57759d2775
Make bootstrap dialog buttons translatable ( #439 )
...
Update deploy instructions in Readme (#616 )
Add partial views to load CI translations in javascript (#439 )
2016-06-25 01:54:54 +02:00
FrancescoUK
6744ad1891
Brazilian Portuguese translation updates ( #650 )
2016-06-24 18:42:28 +01:00
FrancescoUK
d378cfdb5f
New look for the Reports listing page, code tidy up, dist regen ( #695 )
2016-06-24 17:55:10 +01:00
FrancescoUK
6d012144db
Removed unreferenced code in Sales Controller ( #475 )
2016-06-23 23:34:25 +01:00
FrancescoUK
d911447b43
Fixed wrong recvs_invoice_number usage in sales receipt ( #694 )
2016-06-23 23:08:43 +01:00
jekkos
0bd74b9df5
Update README.md for deployment ( #616 )
2016-06-23 23:41:47 +02:00
jekkos
725d447ab3
Add instructions to deploy to docker cloud ( #616 )
...
Use environment variables in database.php to read settings for contianer
2016-06-23 23:37:30 +02:00
FrancescoUK
413fef4c6f
Don't lose disabled setting on email config submit ( #441 )
2016-06-23 20:45:07 +01:00
FrancescoUK
6c9c28bd28
Brazilian translation of Receiving Reference addition ( #635 )
2016-06-23 19:41:46 +01:00
FrancescoUK
331d97b48f
Added email config to Store Config, added Email_lib, refactored email code ( #441 , #519 )
2016-06-23 19:26:51 +01:00
FrancescoUK
cf860be1fc
Small refactoring of library classes
2016-06-23 18:12:18 +01:00
FrancescoUK
2ca3911d56
No autoload and refactoring of SMS lib and Message Controller to be consistent with the rest of libraries ( #693 )
2016-06-23 09:05:30 +01:00
FrancescoUK
67a2912537
Allow Giftcard to do not have customer assigned ( #689 )
2016-06-22 22:47:25 +01:00
jekkos
9119c16c49
Correctly link container files in docroot ( #616 )
2016-06-22 08:49:34 +02:00
jekkos
7e56617044
Add volumes directly in Dockerfile and symlink to docbase ( #616 )
2016-06-22 08:38:50 +02:00
jekkos
d72bddbd9d
Export data with controller filename ( #684 )
...
Upgrade table export plugin to newer fork
Fix variable substitution in .travis.yml (#616 )
2016-06-21 23:19:05 +02:00
FrancescoUK
de9a4dac08
Fixed failures in updated rows in Suppliers and Report Detailed Receivings ( #683 )
2016-06-21 20:33:54 +01:00
jekkos
9bada9e18e
Push to docker hub if username is defined ( #616 )
2016-06-21 21:33:25 +02:00
jekkos
b87f50aedf
Fix malformed .travis.yml ( #616 )
2016-06-21 21:22:08 +02:00
FrancescoUK
04fdbfb187
Made ospos XSS clean optional and configurable from application/config/config.php ( #39 )
...
Performance improves if set to FALSE but should be only for pure stand alone and isolated from Internet cases.
2016-06-21 18:34:24 +01:00
FrancescoUK
9a1def21cc
Code tidy up ( #635 )
2016-06-21 18:34:24 +01:00
jekkos
0b423f5828
Add utf-8 compatible base64 dependency ( #649 )
...
Don't push to docker hub if no login information set (#616 )
2016-06-21 16:29:56 +02:00
FrancescoUK
e4988d806f
Made sale invoice email send consistent with receipt ( #475 )
2016-06-21 09:10:05 +01:00
FrancescoUK
e9fe27a59e
Further fix of email receipt regression ( #475 )
2016-06-21 09:07:12 +01:00
FrancescoUK
e56f418696
Fixed email receipt regressions ( #475 )
2016-06-21 08:56:29 +01:00
FrancescoUK
bb85a172a2
Change invoice_number in Receiving to be Reference, tidy up code ( #635 )
2016-06-21 08:50:11 +01:00
jekkos
4cf1c31d4f
Remove padding for comments field in register ( #680 )
...
Properly align checkboxes in right lower corner (#680 )
Add fix for bootstrap-tables delete and regen dist (#627 )
Tidy up receipt email send code (use empty instead of isset)
2016-06-21 08:40:56 +02:00
FrancescoUK
15fd832705
XSS clean Receiving ( #39 ) code refactoring and various issues fixing
2016-06-20 22:22:46 +01:00
jekkos
17dcd3fdb2
Tag docker image with branch name after build ( #616 )
...
Add docker cloud stack config file
2016-06-20 22:54:01 +02:00
jekkos
8aa46126c5
Use bootstrap grid for payment options in sale register ( #116 )
...
Short review of receipt/invoice email send (#475 )
2016-06-20 21:30:58 +02:00
FrancescoUK
6c791afffc
Fixed Item Kits comment typos and small refactoring ( #665 )
2016-06-19 21:07:10 +01:00
jekkos
6c6e41495c
Fix item kit barcode generation ( #665 )
2016-06-19 19:15:09 +02:00
FrancescoUK
a4488ec090
Further regression fix with item edit and deleted flag ( #672 )
2016-06-19 12:58:47 +01:00
FrancescoUK
c75675129b
Fixed typo in Barcode 39 exception message
2016-06-19 12:47:20 +01:00
FrancescoUK
ac968e21e6
Additional tidy up ( #667 )
2016-06-19 12:35:52 +01:00
FrancescoUK
ad1b3aeaac
Allowed search box and filters to be contextual to selected date range ( #667 )
2016-06-19 11:57:53 +01:00
FrancescoUK
8c5decee34
Fix regression introduced with #664 around deleted items ( #672 )
2016-06-19 11:11:16 +01:00
FrancescoUK
bbbf24c2a5
Don't allow adding deleted Items by item_id in Sales register and Receiving ( #664 )
2016-06-18 12:52:58 +01:00
FrancescoUK
936c74211f
Small refactoring of Sales form ( #639 )
2016-06-18 11:46:45 +01:00
jekkos
fdb5e3406e
Fix syntax erorr in is_valid_receipt ( #655 )
2016-06-17 18:09:03 +02:00
jekkos
359184934e
Fix refresh after deleting all items on last page ( #627 )
2016-06-16 23:11:40 +02:00
jekkos
776c819509
Tag docker image and push to docker hub ( #616 )
2016-06-16 23:11:40 +02:00
FrancescoUK
1c4f6f4fb3
Update daterangepicker in bower no dist regen
2016-06-16 19:13:35 +01:00
FrancescoUK
28d3a3dce3
Fixed error with barcode auto generate ( #640 )
2016-06-16 19:13:35 +01:00
jekkos
fb4dc5af84
Remove curl call to wait for container ( #616 )
2016-06-16 20:04:29 +02:00
FrancescoUK
26358620eb
Fixed bug with barcode auto generation ( #640 )
2016-06-16 17:54:12 +01:00
jekkos
105eca20b2
Update portugese (brazilian) translations ( #650 )
2016-06-16 17:49:45 +02:00
jekkos
9e675e81ec
Perform regex check in is_valid_receipt ( #655 )
2016-06-16 17:40:26 +02:00
jekkos
86b22e7987
Make travis build regular dockerFile directly ( #616 )
2016-06-15 20:42:29 +02:00
jekkos
c39e0a2ed4
Copy curl into test container ( #616 )
2016-06-15 18:42:49 +02:00
jekkos
1cadd2b06b
Run docker-compose up in background ( #616 )
2016-06-15 17:57:04 +02:00
jekkos
6b5d61414c
Enable item kit return ( #655 )
...
Don't install curl in test container (#616 )
2016-06-15 17:34:39 +02:00
jekkos
3890eaf162
Show general config error messages in the correct place ( #655 )
2016-06-15 17:18:32 +02:00
jekkos
4b0badfb30
Fix customer search in takings ( #654 )
...
Replace payment type label with amount tendered (#513 )
2016-06-15 17:18:31 +02:00
jekkos
1861f4f71f
Don't take totals row in takings into account for pagination ( #620 )
...
Reset payment summary css position underneath table
2016-06-15 17:18:31 +02:00
jekkos
3129319efe
Try to start test container as travis-ci test ( #616 )
2016-06-15 14:24:01 +02:00
jekkos
1392055d44
Adapt default test container command ( #616 )
2016-06-15 14:22:24 +02:00
jekkos
4119d8d5a8
Build image using docker-compose ( #616 )
2016-06-14 12:50:34 +02:00
jekkos
5d494fa08e
Fix bstables pagination when deleting all items in last page ( #627 )
2016-06-14 08:35:14 +02:00
FrancescoUK
3a5b88d51c
Added configuration order of payment options available in Sales Register ( #456 #646 )
2016-06-13 19:39:02 +01:00
FrancescoUK
11ad1c2476
Regen dist files
2016-06-13 18:58:17 +01:00
FrancescoUK
17443a3d4f
Fixed ugly invoice issue ( #442 ) and added company name in invoices always
2016-06-13 18:33:40 +01:00
FrancescoUK
9dc7405eaa
How to remove index.php from URL ( #645 ) + set a config rule to be strict with sessions matching IP
2016-06-13 17:54:31 +01:00
FrancescoUK
cd6277c1a8
Removed use_invoice_template as it's not used anymore ( #639 )
2016-06-13 09:15:43 +01:00
FrancescoUK
73dc5a9f70
Merge branch 'sonnysk76-master'
2016-06-12 18:55:31 +01:00
FrancescoUK
4da7285f38
Update Spanish Translations #569
2016-06-12 18:54:42 +01: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
jekkos
edfd0319a8
Update docker on travis using sudo ( #616 )
2016-06-11 20:39:58 +02:00
jekkos
facc25eb74
Set travis docker version to 1.10.3 ( #616 )
...
Fix typo in README.md
2016-06-11 20:29:24 +02:00
jekkos
b7f54c0366
Fix .travis.yml file structure
2016-06-11 18:51:58 +02:00
sonnysk76
9f7ea6f1cb
merging
2016-06-10 16:58:26 -05:00
jekkos
aae02dc060
Disable invoice creation after sale / receiving completion ( #619 )
2016-06-09 22:29:41 +02:00
jekkos
e6c173dcdc
Merge branch 'master' of https://github.com/jekkos/opensourcepos
2016-06-09 20:40:30 +02:00
jekkos
0923ed0f80
Enable receiving invoice number override ( #626 )
2016-06-09 20:39:38 +02:00
FrancescoUK
1ad844fe74
Fixed Customer Account # issue ( #633 )
2016-06-09 19:31:41 +01:00
jekkos
9fb4d5ccd4
Fix email button enabled state ( #628 )
2016-06-09 17:55:35 +02:00
jekkos
463938bc88
Upgrade travis docker-compose to 1.7.1 ( #616 )
2016-06-09 17:21:20 +02:00
jekkos
9d25520dbf
Add docker service to travis.yml ( #616 )
2016-06-09 16:52:57 +02:00
jekkos
03bfa43378
Push docker build to travis-ci if container start is ok ( #616 )
2016-06-09 10:51:06 +02:00
FrancescoUK
b72d1059c0
Do not restrict Message Store Config access by user grants ( #472 )
2016-06-09 08:53:07 +01:00
FrancescoUK
fc81e842c2
Made Items and Customers excel import strings translatable ( #439 )
2016-06-09 08:49:14 +01:00
FrancescoUK
53b220b10b
Fixed excel import notifications ( #478 )
2016-06-08 22:31:25 +01:00
FrancescoUK
5129ebec0c
XSS clean Items ( #39 )
2016-06-08 21:58:18 +01:00
jekkos
a41a39aa0b
Try to bump docker version in travis config ( #616 )
2016-06-08 22:56:23 +02:00
jekkos
0aa17d6374
Update docker installation instructions ( #616 )
2016-06-08 22:46:18 +02:00
jekkos
bced04ca88
Split up exsiting docker image in mulitple containers (mysql, php-apache, npm) ( #616 )
...
Add company_name to searchable fields in Takings overview (#594 )
Change tests to use elementBy instead of wait functions
2016-06-08 22:36:33 +02:00
FrancescoUK
6d0ed7cc99
Removed redundant code in Controllers ( #39 )
2016-06-08 19:57:50 +01:00
FrancescoUK
336e10d445
Controller class hierarchy refactoring, made xss_clean part of base Secure_Controller class ( #39 )
2016-06-08 18:13:34 +01:00
FrancescoUK
5cf23f2bd3
Disabled bootstrap_tables XSS escaping support since we leverage CI one ( #39 )
2016-06-08 11:25:53 +01:00
FrancescoUK
fe845692bf
Added SQL upgrade script since 2.0 based on forum history ( #621 )
2016-06-07 17:07:24 +01:00
FrancescoUK
7980b12239
Disable bootstrap tables escaping, tidy up of Reports unused code ( #39 )
2016-06-07 17:00:46 +01:00
FrancescoUK
9248ffd044
XSS clean Reports ( #39 )
2016-06-06 22:36:07 +01:00
FrancescoUK
da96edf304
XSS clean Messages, tidied up Home, Login, No_access and Secure_area, removed unused Controllers ( #39 )
2016-06-04 16:42:54 +01:00
FrancescoUK
b11377041d
XSS clean Customers, Employees, Suppliers, Person, Item_kits. Minor fix Giftcards and Config ( #39 )
2016-06-04 15:05:02 +01:00
sonnysk76
fa01e18e41
Spanish lang review
2016-06-03 13:43:46 -05:00
FrancescoUK
1453b5e21d
Fixed return of only invoice receipt if the searched number matches an invoice, disable the invoice search if not set in config ( #606 )
2016-06-03 19:23:43 +01:00
FrancescoUK
7e6908b7bf
Fixed SMS message view notifications ( #478 )
2016-06-02 19:07:07 +01:00
FrancescoUK
eb9c04c774
Item image hover width size set to 200 and image displaying on the left of the mouse ( #596 )
2016-06-02 18:37:33 +01:00
FrancescoUK
fdb7cd9ac4
Updated bootstrap-daterangepicker js plugin and regen dist files
2016-06-02 12:33:33 +01:00
FrancescoUK
5e42684f27
Added default values to tables.sql and regen dist files ( #478 )
2016-06-02 12:22:37 +01:00
FrancescoUK
f8ef4bb570
Tidied up spacelab template footer.php after notification change ( #478 )
2016-06-02 12:04:46 +01:00
jekkos
b6822b040c
Add configuration options for notification alignment ( #478 )
...
Fix country code edit bug (#497 )
Review xss filtering in load_config hook (#39 )
2016-06-02 08:50:45 +02:00
jekkos
7c05b62cf0
Immprove Dockerfile (use proper layer caching)
2016-06-01 23:28:49 +02:00
jekkos
d2f3497d1e
Fix item avatar rollover when hovering ( #596 )
...
Fix invoice right border (add colspan) (#529 )
Fix form erorr handling (inherit in right order)
2016-06-01 08:39:03 +02:00
jekkos
998e9bbb8e
Fix notify alert type for config screens + fix message notification ( #478 )
2016-05-31 08:33:34 +02:00
jekkos
8c6bba62c9
Fix row table update in takings, customers, .. ( #575 , #604 )
...
Update spacelab header (#226 )
2016-05-31 08:22:59 +02:00
FrancescoUK
0a6b3d5785
XSS clean Giftcard ( #39 )
2016-05-30 20:46:59 +01:00
FrancescoUK
9f7457e1de
XSS clean Config and configuration data loading ( #39 )
2016-05-30 20:46:59 +01:00
FrancescoUK
6e9830705f
Removed any XSS filtering from input->post and input->get ( #39 )
2016-05-30 20:46:59 +01:00
jekkos
b904540aed
Replace notifications with bootstrap-notify ( #478 )
...
Add bstables responsive addon (#558 )
Improve bulk update refresh (#432 , #604 )
Fix bulk tax update if default tax is configured in general_config
Reuse commons js parts in form validation code
2016-05-30 21:43:11 +02:00
jekkos
fc5aa33d16
Do full refresh if item update count is > 15 & fix bulk update modal when clicking on glyphicon ( #432 )
2016-05-30 21:41:07 +02:00
FrancescoUK
1968b598a4
Fixed pie slices colour range limited to 15, now random ( #603 )
2016-05-29 21:52:01 +01:00
FrancescoUK
6ad547049e
Further model checks, improved success result, made code style consistent ( #598 )
2016-05-29 15:04:21 +01:00
FrancescoUK
5d66b9fbfd
Do not show 'Send SMS' glyphicon, if phone number is not available ( #602 )
2016-05-28 23:05:03 +01:00
FrancescoUK
404fc5b548
Sanity checked SQL escaping in all the models, improved code under different aspects ( #598 )
2016-05-28 22:41:27 +01:00
FrancescoUK
6fe1e2a55a
Added escaping of inputs in all Report models ( #598 )
2016-05-27 19:38:28 +01:00
FrancescoUK
6e14dfb6d5
Sanity checked SQL insert and update, minor fixes ( #598 )
2016-05-27 18:40:16 +01:00
FrancescoUK
ce3e96ef5b
Updated bootstrap-daterangepicker to vs 2.1.20, regen dist files
2016-05-26 19:24:31 +01:00
FrancescoUK
1e7e73f482
Fixed issue with summary section introduced by sharing common id with chart one ( #342 )
2016-05-26 19:16:19 +01:00
FrancescoUK
a5f63d1cc0
Do proper XSS sanity check with excel files ( #39 )
2016-05-26 18:41:59 +01:00
FrancescoUK
e4cb04fd3e
XSS sanity check of uploaded images or excel files ( #39 )
2016-05-26 18:29:33 +01:00
jekkos
472ce16528
Fix item kit save
2016-05-26 18:10:58 +02:00
jekkos
1b7bf0ed4f
Fix bulk update refresh ( #432 )
2016-05-26 18:10:58 +02:00
jekkos
9f380bc083
Push to docker registry if build successful
2016-05-26 17:30:00 +02:00
jekkos
8671a59b4b
Add git working tree directly to container root
2016-05-26 17:02:55 +02:00
FrancescoUK
e9e5a3e475
Fixed charts responsiveness and Summary placement ( #342 )
2016-05-26 10:36:25 +01:00
FrancescoUK
9ae5957473
Made currency showing configurable from the controller ( #342 )
2016-05-25 23:10:43 +01:00
FrancescoUK
3c25a9ba8d
Fixed currency support in pie chart ( #342 )
2016-05-25 22:59:39 +01:00
FrancescoUK
ec5fbc16b5
Added currency to hbar ( #342 )
2016-05-25 22:46:40 +01:00
FrancescoUK
5531f7fa9e
Added tooltip support to charts, regen dist files ( #342 )
2016-05-25 22:31:58 +01:00
FrancescoUK
9137c89fb7
Made message string URL encoded ( #472 )
2016-05-25 18:07:43 +01:00
jekkos
5c42604fa7
Set correct casing for pt-BR in customers_lang.csv + delete duplicate folder ( #576 )
2016-05-24 22:29:01 +02:00
jekkos
fecb2163ea
Update config_lang.csv with correct number of translations ( #497 )
...
Update country_code tooltip css
Remove tables.css
2016-05-24 17:46:40 +02:00
FrancescoUK
3e44c7caf5
Fixed line chart (was broken), fixed dimensions of charts, regen dist files ( #342 )
2016-05-24 12:14:01 +01:00
FrancescoUK
719a0e6107
Fixed nominatim.autocomplete.js typo ( #497 )
2016-05-24 12:02:20 +01:00
FrancescoUK
cd1ec7a5d6
Fix typo in comment ( #342 )
2016-05-24 08:38:09 +01:00
jekkos
0aadbc0467
Add link to nominatim wiki for countrycodes tooltip ( #497 )
...
Increase waitForCssElement timeout
2016-05-24 08:25:17 +02:00
jekkos
63d6ac59df
Fix suppliers + employees graphical summary report ( #587 )
2016-05-23 22:43:45 +02:00
jekkos
2475bfa609
Fix taxes graphical summary report ( #587 )
2016-05-23 22:41:20 +02:00
jekkos
609aef0a87
Make nominatim countrycodes configurable ( #497 )
2016-05-23 22:40:46 +02:00
jekkos
0a16ffcd39
Set height for charts to 80% ( #342 )
...
Fix encoding issues for chartist data
2016-05-23 18:33:53 +02:00
jekkos
457a1df478
Correct test url context root
2016-05-23 11:50:16 +02:00
jekkos
3c0dcb20ac
Use standard php functionality for json encoding ( #342 )
2016-05-23 08:46:17 +02:00
jekkos
07fbffab08
Fix receiving quantity testcase
2016-05-23 08:45:10 +02:00
FrancescoUK
bd208c6d0d
Moved chart styles to reports.css ( #342 )
2016-05-22 21:07:11 +01:00
FrancescoUK
41e4285d65
Removed flash library and dependencies, regen dist file (updagraded js plugins) ( #342 )
2016-05-22 19:59:26 +01:00
FrancescoUK
cfacf52a42
Changed graphical reports to use Chartist ( #342 )
2016-05-22 19:01:16 +01:00
FrancescoUK
17bc62d94b
Added Chartist js extra plugins and regen dist ( #342 )
2016-05-21 15:01:15 +01:00
FrancescoUK
fa84adc536
Added Chartist js plugin and regen dist ( #342 )
2016-05-21 12:07:50 +01:00
jekkos
35b12df144
Remove empty column from columns dropdown in detailed sales/receivings reports ( #571 )
2016-05-20 17:35:07 +02:00
jekkos
ec20eb96df
Add refresh after enter in sales and receivings register ( #572 )
2016-05-20 17:28:56 +02:00
jekkos
41b3d00fb2
Add modal init in postBody bstables callback ( #563 )
2016-05-20 17:17:12 +02:00
FrancescoUK
671f6d9e16
Delete wrong pt-Br files ( #576 )
2016-05-20 14:03:44 +01:00
jekkos
f2293297ce
Enable modals after sort detailed table ( #571 )
2016-05-20 07:41:50 +02:00
FrancescoUK
0d0ecd90d3
Updated Portuguese (Brazil) translations ( #567 )
2016-05-19 18:56:52 +01:00
FrancescoUK
9b55205f0f
fixed detailed customer report error ( #571 )
2016-05-19 17:27:41 +01:00
jekkos
5122dad996
Fix table sorting in detailed (specific) reports ( #571 )
2016-05-19 17:41:04 +02:00
jekkos
7178f8b02b
Fix table details association after sort in detailed sales + receivings reports ( #571 )
2016-05-19 12:46:18 +02:00
jekkos
9762193ce0
Fixup register css (block and alert widths)
2016-05-19 08:57:54 +02:00
jekkos
2746a0ef03
Uppdate testcase and make them ospos 3.0 compliant
2016-05-18 23:02:02 +02:00
jekkos
ea77980bff
Persist column visbility per user and per module ( #563 )
2016-05-18 08:49:28 +02:00
sonnysk76
bde97b3ec8
Update languaje ES on csv
2016-05-17 13:48:01 -05:00
sonnysk76
becab02bce
lang1 esp
2016-05-17 12:19:13 -05:00
jekkos
fc2d5e89f0
Remove empty column switches in dropdown (switchable on column header) ( #563 )
2016-05-17 08:59:51 +02:00
FrancescoUK
31dd09e09b
Removed unused excel header & footer, removed obsolete style classes ( #528 )
2016-05-16 19:03:20 +01:00
jekkos
c83a46c726
Add change due to sale totals row + remove checkbox after load ( #559 )
2016-05-16 11:23:06 +02:00
jekkos
20baece7c5
Fix detailed reports for employee, customer and discount ( #564 )
2016-05-16 11:23:06 +02:00
FrancescoUK
92b88bed20
Merge branch 'master' into bootstrap-tables
2016-05-14 12:22:00 +01:00
FrancescoUK
45b498924c
fix gitter chat badge in README
2016-05-14 12:18:41 +01:00
FrancescoUK
fc7735ab03
Merge pull request #549 from gitter-badger/gitter-badge-1
...
Add a Gitter chat badge to README.md
2016-05-14 12:00:33 +01:00
jekkos
e07ee6a505
Refresh after delete only if animations are finished ( #554 )
2016-05-13 17:07:14 +02:00
jekkos
e0fdb7ed80
Uncheck all checked inputs after table refresh ( #554 )
2016-05-13 08:52:45 +02:00
jekkos
cbb562add2
Fix table row update in employees and other ( #556 )
2016-05-13 08:26:09 +02:00
jekkos
7e8f0e1dc1
Enable sorting for employees, giftcards and suppliers ( #555 )
2016-05-12 21:29:27 +02:00
jekkos
139100db35
Merge branch 'master' into feature/bootstrap-tables
...
Conflicts:
application/models/Item.php
application/views/reports/date_input_excel_export.php
application/views/reports/excel_export.php
application/views/reports/inventory_summary_input.php
application/views/reports/specific_input.php
2016-05-12 20:34:24 +02:00
jekkos
19629cb05c
Full delete refresh issue fix (table will fully refresh in the end)
...
(#554 )
2016-05-12 20:23:21 +02:00
FrancescoUK
87c55582b6
Removed table_sorter, regen dist
2016-05-12 19:12:50 +01:00
jekkos
4c60b0f624
Fix customer delete (use same uniqueId for these tables) ( #552 )
2016-05-12 19:40:12 +02:00
FrancescoUK
a56984a1a0
Restore the dropdown border size to original and regen dist files
2016-05-12 18:34:48 +01:00
jekkos
2a858b3f23
Collapse rows in detailed report after delete ( #507 , #293 )
...
Hide columns without title in takings print view (#507 )
Execute grunt after running bower uninstall
Try to fix integration tests
2016-05-12 18:02:26 +02:00
jekkos
5312dba499
Do not show checkbox and empty columns on takings print ( #293 , #507 )
2016-05-12 08:47:35 +02:00
jekkos
f7664616ec
Search for item number if enter is hit in register and receiving ( #507 )
2016-05-12 08:36:23 +02:00
jekkos
fdb826a8c4
Only show item suggestions with associated id in register and receiving ( #540 )
...
Use correct tabindex numbering in sale register
2016-05-12 08:19:15 +02:00
jekkos
53060397e5
Fix inventory summary report ( #540 )
2016-05-11 21:51:54 +02:00
jekkos
349000bd8a
Fix sale and receiving edit and delete in detailed report ( #507 , #293 )
2016-05-11 17:57:37 +02:00
The Gitter Badger
358a9fc867
Add Gitter badge
2016-05-11 06:19:18 +00:00
jekkos
4b5d883c69
Remove specific input view for excel export ( #535 )
2016-05-10 19:04:24 +02:00
jekkos
498f8a06b8
Rework url generation for excel export ( #539 , #540 )
2016-05-10 18:42:18 +02:00
jekkos
2171efcb7a
Enable dialogs after pagination + export in summary reports ( #539 )
2016-05-10 18:31:08 +02:00
jekkos
ffd212da14
Enable bstables export for tabular reports ( #293 , #539 )
2016-05-10 09:09:58 +02:00
jekkos
b210888dac
Add table export option for bootstrap tables ( #293 )
...
Fix pagination css (remove custom style)
2016-05-10 09:08:07 +02:00
jekkos
3b4fbce6f6
Get selected state for export using jQuery ( #539 )
2016-05-10 08:06:15 +02:00
jekkos
c80b3e1c61
Fix excel export in reports section ( #539 )
...
Conflicts:
application/views/reports/date_input_excel_export.php
2016-05-09 20:20:39 +02:00
jekkos
8fcc24db71
Fix excel export in reports section ( #539 )
2016-05-09 20:15:23 +02:00
jekkos
d78c871855
Show empty column if no tax_percent found for item ( #507 )
2016-05-09 20:15:00 +02:00
jekkos
3cf018ac47
Regenerate js files ( #537 , #538 )
...
Remove static row tablesorter hack
Remove tablesorter plugin
2016-05-09 20:07:04 +02:00
jekkos
c3f2f41888
Fix barcode generation in items and item_kits ( #537 , #538 )
...
Enable sorting in takings (with static row below the table) (#293 , #507 )
2016-05-09 18:40:13 +02:00
jekkos
d94b1d921e
Enable sorting for items, customers, suppliers, employees and item_kits module ( #293 , #507 )
2016-05-09 08:59:03 +02:00
FrancescoUK
4e17bb7a8c
Fixed broken customer suggest in sales/register ( #507 )
2016-05-07 20:35:32 +01:00
FrancescoUK
601fd10f4e
Upgraded js plugins and regen dist files ( #507 )
2016-05-07 14:04:32 +01:00
FrancescoUK
ac765e4667
sale_id not receiving_id in detailed sale report ( #507 )
2016-05-07 11:55:52 +01:00
J Sivakumaran
3451a70fe4
Update UPGRADE.txt
2016-05-07 11:14:39 +01:00
FrancescoUK
57fcd87ad4
Updated COPYING ( #472 )
2016-05-07 11:14:39 +01:00
FrancescoUK
f7ea83091c
Fixed mistype var causing a delete confirm box to be empty in item kits ( #507 )
2016-05-06 19:49:09 +01:00
FrancescoUK
d9498964a0
Fixed missing bulk edit dialog box title ( #507 )
2016-05-06 19:04:25 +01:00
FrancescoUK
16e6042c9c
Fixed missing currency symbol in Item Kits view ( #507 )
2016-05-06 18:58:10 +01:00
FrancescoUK
c11a9e000d
Merge pull request #534 from jsivakumaran/patch-1
...
Update UPGRADE.txt
2016-05-06 18:10:46 +01:00
J Sivakumaran
a02a0c2a0b
Update UPGRADE.txt
2016-05-06 09:35:34 -07:00
jekkos
eca4b4ffb8
Use bootstrap tables for detailed and summary reports ( #293 , #507 )
2016-05-06 00:37:46 +02:00
FrancescoUK
18764d5caf
Hide delete button from Takings print, fix null value for margins, add a missing / ( #507 )
2016-05-05 22:31:24 +01:00
FrancescoUK
76560ca458
Set Takings default to show today's transactions ( #507 )
2016-05-05 19:50:55 +01:00
FrancescoUK
f207213474
Updated COPYING ( #472 )
2016-05-05 19:41:06 +01:00
FrancescoUK
9eb21137f6
Fixed glyphicon button space and completed sales & register glyphicons ( #507 )
2016-05-05 16:44:09 +01:00
jekkos
488af06663
Fix delete in Item model ( #507 )
2016-05-03 22:41:44 +02:00
jekkos
de711b82dd
Fix item delete ( #525 )
2016-05-03 21:35:46 +02:00
jekkos
408774b14c
Apply ospos lines per page setting to bootstrap-table pagination ( #507 )
2016-05-03 18:16:50 +02:00
jekkos
e2f6bf283c
Show invoice icon if invoices enabled in config ( #507 )
...
Fix limit query for customers table (#507 )
Add reference to translation when no persons found (#507 )
2016-05-03 18:09:58 +02:00
jekkos
c2f895c1d4
Rebase with latest master ( #293 , #472 )
...
Enable email button in customers, suppliers only if selected row has
email filled in
Disable sale/receiving edit in reports (TBC)
2016-05-03 08:58:11 +02:00
jekkos
2adc096eeb
Add invoice number and payment type in takings overview ( #507 )
2016-05-03 08:10:38 +02:00
jekkos
b37f984eb6
Fixes for item kits (new, update) ( #507 )
...
Fixes for takings overview (pagination, sorting) (#293 )
Fixes for item tax bulk update (#507 )
Table rows are highlighted again before delete (#507 )
2016-05-03 08:10:38 +02:00
jekkos
130f749a48
Fix item delete ( #507 )
2016-05-03 08:10:38 +02:00
jekkos
e7a22e4e41
Enable bootstrap tables localisation and integrate with ospos scripts
...
(#293 )
Fix item bulk update (all items are updated now) (#507 )
Stop click event propagation when opening modal dialog on a table row
(caused row to be selected/deselected)
2016-05-03 08:10:37 +02:00
jekkos
c568c08595
Fix bulk update with bootstrap-tables ( #507 )
2016-05-03 08:10:37 +02:00
jekkos
9caed90aee
Fix bootstrap tables toolbar icon size ( #507 )
2016-05-03 08:10:37 +02:00
jekkos
d5d96fa777
Add receipt button in takings ( #507 )
...
Fix add stock location in store config
Fix stock location filtering in items module
Fix item kits barcode generation
Fix broken form after first submit in all modules
Remove temp js from dist/ (#293 )
2016-05-03 08:10:37 +02:00
jekkos
7e088348e0
Regenerate language file + js after rebase, fix various merge bugs
...
(#293 )
2016-05-03 08:10:37 +02:00
jekkos
c9142ca69b
Fix payment summary in sales ( #293 )
...
Add glyphicons to buttons in register + receiving views
Refactor table_support init function
Various bugfixes
2016-05-03 08:10:36 +02:00
jekkos
2dab5e0fe7
Bootstrap-tables integration for sales module (WIP) ( #293 )
...
Refactor manage_tables, remove public function identifiers
2016-05-03 08:10:36 +02:00
jekkos
e7439c1616
Start bootstrap tables migration for sales module ( #293 )
2016-05-03 08:10:36 +02:00
jekkos
4624665726
Replace submit with close button in count details view ( #293 )
2016-05-03 08:10:36 +02:00
jekkos
8cf32f4470
Fix item kits view + search, item bulk edit ( #293 )
...
Refactored table_helper to add first and last column automatically
2016-05-03 08:10:36 +02:00
jekkos
4c55da7229
Enbable inventory, count_details in items ( #293 )
2016-05-03 08:10:36 +02:00
jekkos
48c49ddb74
Fix item kits glyphicons + new button tooltip ( #293 )
2016-05-03 08:10:36 +02:00
jekkos
9dfb2196e5
Use form-inline to style items toolbar ( #293 )
2016-05-03 08:10:36 +02:00
jekkos
e09ebcaff9
Filters in items module working and on one line ( #293 )
2016-05-03 08:10:36 +02:00
jekkos
bb95a120b1
Enable bootstrap-tables for items modules - wip ( #293 )
2016-05-03 08:10:35 +02:00
jekkos
46ad34548f
Enable bootstrap-tables for item kits module ( #293 )
2016-05-03 08:10:35 +02:00
jekkos
3b9ae1d807
Enable bootstrap-tables for giftcards module ( #293 )
2016-05-03 08:10:35 +02:00
jekkos
0cd45e275e
Enable bootstrap-tables for suppliers module ( #293 )
...
Reuse generic manage view for suppliers and remove original one
2016-05-03 08:10:35 +02:00
jekkos
873d14aac6
Enable bootstrap tables in employees module ( #293 )
2016-05-03 08:08:13 +02:00
jekkos
6f011da3ae
Fix customer import ( #293 )
2016-05-03 08:07:48 +02:00
jekkos
2b03d3bfd7
Continue bootstrap-tables integration ( #293 )
...
Refactor manage_tables code and use proper js namespacing
Add glyphicons for most buttons in customers sections
Tidy up HTML in customers table page
Remove jquery-color plugin (not needed anymore)
Fix some minor css issues (feedback bar bottom margin)
2016-05-03 08:07:48 +02:00
jekkos
af7b64a398
Migrate to bootstrap-tables in customers modules ( #293 )
2016-05-03 08:07:47 +02:00
FrancescoUK
6e82c4904f
Fix missing translation ( #472 ), add glyphicons
2016-05-01 22:11:38 +01:00
FrancescoUK
a090ecb1a5
Merge branch 'RamkrishnaMondal-master'
2016-04-30 22:22:16 +01:00
FrancescoUK
a745c52bd5
Merge branch 'master' of https://github.com/RamkrishnaMondal/opensourcepos into RamkrishnaMondal-master
2016-04-30 22:21:14 +01:00
FrancescoUK
c9f8ca6771
disable the feature completely in case the permission is not granted ( #472 )
2016-04-30 22:14:05 +01:00
FrancescoUK
10e2aa873c
fixed missing Croatian translation ( #472 )
2016-04-30 21:38:37 +01:00
FrancescoUK
0eecaf4268
fixed required fields in sms_form ( #472 )
2016-04-30 21:38:21 +01:00
FrancescoUK
1f9c31da41
regen database scripts ( #472 )
2016-04-30 21:37:57 +01:00
FrancescoUK
5fb73ce2cb
fixed error reporting, fixed table_helper, added translations, fixed bootstrap grid, various fixes ( #472 )
2016-04-30 21:34:23 +01:00
FrancescoUK
2b9c9ce203
enable errors, refactor code, various issues fixing, upgrade database script ( #472 )
2016-04-30 21:33:48 +01:00
FrancescoUK
225a42be8a
Regenerate translations after Portuguese (Brazil) amendment
2016-04-29 19:07:37 +01:00
arteiro
8042b6aa53
Pequenas modificações
2016-04-28 12:40:55 -03:00
RamkrishnaMondal
d01e9ffcfe
Sixth commit
2016-04-28 19:40:14 +05:30
RamkrishnaMondal
cde401a078
Fifth commit
2016-04-28 13:27:20 +05:30
RamkrishnaMondal
ee237c3c2e
Fourth commit
2016-04-28 13:22:01 +05:30
FrancescoUK
0dca4b8906
small tidy up ( #391 )
2016-04-26 19:55:09 +01:00
FrancescoUK
e81bf14d91
fix code comment typo ( #410 )
2016-04-26 18:50:01 +01:00
RamkrishnaMondal
d330472158
Third commit
2016-04-26 19:27:44 +05:30
RamkrishnaMondal
0d759ddd4e
Second commit
2016-04-26 16:38:13 +05:30
RamkrishnaMondal
638e9ff535
First commit
2016-04-26 16:04:17 +05:30
RamkrishnaMondal
3785cdb675
Merge pull request #1 from jekkos/master
...
new
2016-04-26 03:22:37 +05:30
FrancescoUK
4ed63cc362
Changed some to be short OSPOS, corrected some that were still PHP Point of Sale or had typos, fixed other translation issues ( #391 )
2016-04-25 17:26:14 +01:00
FrancescoUK
01d68ce3d5
Changed logo and favicon ( #391 )
2016-04-25 16:38:42 +01:00
FrancescoUK
8139d525cb
remove commented out codeline ( #410 )
2016-04-24 17:13:55 +01:00
FrancescoUK
34d09bc575
Made invoice optional from store config checkbox, updated and regen database script, few config fixes ( #410 )
2016-04-24 17:11:37 +01:00
FrancescoUK
b88575b2a5
restructure store config tabs, add invoice config checkbox, add translations ( #410 )
2016-04-23 22:57:34 +01:00
FrancescoUK
1cf3157089
Regen database.sql ( #499 )
2016-04-22 21:53:54 +01:00
FrancescoUK
ce2142add4
Made description and serialnumber optional in receipts ( #499 )
2016-04-22 21:42:17 +01:00
FrancescoUK
d1de7b67b9
Remove stock location from sale receipts ( #498 )
2016-04-22 19:37:00 +01:00
FrancescoUK
9aa673448a
Reset quantities when an Item is deleted ( #496 )
2016-04-22 19:22:04 +01:00
FrancescoUK
9cfddaf2ab
undelete an item in case it's returned ( #184 )
2016-04-21 22:59:34 +01:00
FrancescoUK
ae5d23f77d
Make the payment type change a unique transaction in the model ( #314 )
2016-04-21 19:25:06 +01:00
FrancescoUK
9f808dafde
Show delete button in form when editing sale from Detailed Sales Report
2016-04-18 18:37:27 +01:00
FrancescoUK
bb0989f6bd
Adjust form fields size to give more space and fit better dialog form, fixed few details
2016-04-18 18:31:40 +01:00
FrancescoUK
b177fe1dcf
Update README.md to include more info about 3.0.0 and set a policy for bug reporting
2016-04-18 13:22:09 +01:00
FrancescoUK
2948bb8a6b
Fixed typo in tables.sql , instead of ; ( #375 )
2016-04-18 09:42:31 +01:00
FrancescoUK
19d3a34bcc
Fixed customer name not pre-loaded in form ( #314 )
2016-04-18 09:29:57 +01:00
FrancescoUK
83d93464bc
Added ability to update payment type when editing a sale ( #314 )
2016-04-17 21:51:52 +01:00
FrancescoUK
3b5be5cf97
Fixed mistake in database upgrade script ( #375 )
2016-04-16 23:10:40 +01:00
FrancescoUK
7a3e09adb0
Fixed "Calc avg. Price (Receiving)" config bug ( #482 )
2016-04-16 22:53:20 +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
fa084ec8d2
revert a change affecting order or js when running grunt
2016-04-13 18:34:06 +01:00
FrancescoUK
61a50577fa
remove extra , in Gruntfile.js
2016-04-12 22:36:38 +01:00
FrancescoUK
11e3cd63e0
Move temp file in a tmp dir when generating dist files, tidy up Gruntfile.js
2016-04-12 22:26:57 +01:00
FrancescoUK
0c47ec477d
Added Croatian translations to application and system ( #460 )
2016-04-10 22:48:29 +01:00
FrancescoUK
d9b007c1af
Improve emailed receipt layout and make it look like the printed one (now added logo + company name) ( #442 )
2016-04-10 18:15:59 +01:00
FrancescoUK
c77fa6e5c4
Fixed various issues preventing all languages to work fine in all views ( #470 )
2016-04-09 23:37:34 +01:00
FrancescoUK
fb16c4b65a
Add Spanish System translations ( #470 )
2016-04-09 23:07:54 +01:00
FrancescoUK
e2ddb9388a
better support of templates in Gruntfile.js and fix glyphicon issue ( #409 #448 )
2016-04-09 22:57:03 +01:00
FrancescoUK
a1311dca4c
Fixed Items page not displaying with German and Chinese ( #470 )
2016-04-09 17:23:40 +01:00
FrancescoUK
cf4fd0601f
Fixed issue with missing opensourcepos_bower.css in header.php ( #469 )
2016-04-09 17:14:46 +01:00
FrancescoUK
935e9f0bc8
replace plus and minus in stock_locations with glyphicons, remove old png
2016-04-09 16:43:39 +01:00
FrancescoUK
031994f9b5
Remove inconsistency between .csv and lang.php Portuguese (Brazil) translations ( #462 )
2016-04-09 15:49:59 +01:00
FrancescoUK
96701fad8e
Fix bower invalid-meta warning related to description being too long
2016-04-09 15:27:26 +01:00
FrancescoUK
94e566bb89
Fix typo in README
2016-04-08 23:27:11 +01:00
FrancescoUK
1d3bcfc2ef
Update jQuery to 1.12.3 and smalot-bootstrap-datetimepicker to 2.3.10
2016-04-08 23:24:41 +01:00
FrancescoUK
c9b1e34035
Update README
2016-04-08 22:56:54 +01:00
FrancescoUK
910d846c21
Standard CI3 Portuguese (Brazil) translations ( #462 )
2016-04-08 22:45:44 +01:00
FrancescoUK
62bcce369f
More Portuguese (Brazil) translations ( #462 )
2016-04-08 22:38:05 +01:00
FrancescoUK
ee319badc8
Merge branch 'arteiro-master'
2016-04-08 19:37:16 +01:00
FrancescoUK
714c0ddead
Merge branch 'master' of git://github.com/arteiro/opensourcepos into arteiro-master
2016-04-08 19:36:53 +01:00
FrancescoUK
d27671ac3d
Fix PHP5.4 support error in Items.php ( #452 )
2016-04-08 19:07:20 +01:00
FrancescoUK
4264ee763f
Upgrade to CI3.0.6
2016-04-08 18:26:18 +01:00
FrancescoUK
2439055f01
More Portuguese (Brazil) translations ( #462 )
2016-04-08 12:26:57 +01:00
FrancescoUK
ffd0f25e13
Fix to "count shown instead of quantity" on certain Reports ( #453 )
2016-04-08 12:03:45 +01:00
FrancescoUK
45bd6ece05
Fix quantity decimals in Inventory Reports ( #429 )
2016-04-08 09:12:09 +01:00
FrancescoUK
984f6c5cac
MY_Session workaround is not required anymore with CI3.0
...
See for fix: https://github.com/bcit-ci/CodeIgniter/issues/3073
2016-04-08 08:51:42 +01:00
arteiro
cd102b7c2e
Ultima
...
Desta versao
2016-04-07 22:18:13 -03:00
FrancescoUK
d83c8051f6
Rename forms to have form_ prefix, move form styles to popupbox.css
2016-04-07 20:30:42 +01:00
FrancescoUK
2ffc7e2d2b
Merge branch 'arteiro-master'
2016-04-06 23:03:18 +01:00
FrancescoUK
4a3acd10e7
Portugues (Brazil) translations ( #462 )
2016-04-06 23:00:18 +01:00
FrancescoUK
ea2a18c647
complete change of calendar language in datepicker
2016-04-06 20:26:21 +01:00
jekkos
3b035aa204
Remove debugger statement + unneeded tab ( #455 )
2016-04-06 20:48:26 +02:00
jekkos
3b1250afa7
Adapt locale_helper to show currency symbol on correct side ( #451 )
2016-04-06 20:26:40 +02:00
jekkos
2f07036940
Fix customer selection in sale form ( #455 )
...
Fix invoice layout (restore header width)
2016-04-06 20:22:19 +02:00
jekkos
db3f19770b
Set currcency symbol on correct site in bulk edit + giftcard forms ( #451 )
2016-04-06 20:09:47 +02:00
arteiro
570ca69c2f
Correções básicas
...
Espaços retirados
2016-04-06 13:28:44 -03:00
jekkos
4ba4e38c1f
show currency symbol on right if configured so ( #451 )
2016-04-06 18:25:11 +02:00
arteiro
16496d4a9c
Tradução pt-BR
...
Tradução para Português do Brasil
2016-04-06 13:22:36 -03:00
jekkos
f88f19da71
Update datepicker with date and calendar translations from system
2016-04-06 08:51:04 +02:00
arteiro
8237825b4b
dunplicado linhas- corrigido
...
# Conflicts:
# application/language/pt-BR/common_lang.php
2016-04-05 16:04:27 -03:00
arteiro
7a05f13539
Retirada de espaços
...
Retirada de espaços antes das palavras
2016-04-05 15:53:51 -03:00
arteiro
05ba84db37
correção
...
alterado uma palavra
2016-04-05 15:36:17 -03:00
arteiro
95c4fe170b
Tradução pt-BR
...
Criando tradução para Português do Brasil
2016-04-05 14:49:24 -03:00
jekkos
a7ad0cbecd
Update CI3 system language files
2016-04-04 23:43:13 +02:00
FrancescoUK
3b1efdb9ad
Remove 3 decimals rule on currency due to 3 dec in taxes. Keep decimals separate. Add default tax dec in tables ( #327 )
2016-04-04 20:57:33 +01:00
FrancescoUK
923f0e05fc
update bower file to contain correct tablesorter version
2016-04-03 19:35:19 +01:00
FrancescoUK
c981bc7daa
update tablesorter to 2.25.7, regenerate dist files even to fix database.sql
2016-04-03 19:33:09 +01:00
FrancescoUK
fc6c9f6d57
set correct git path in Dockerfile
2016-04-03 18:18:13 +01:00
FrancescoUK
bca943bf34
Fix README.md
2016-04-02 19:21:20 +01:00
FrancescoUK
49366ea5ab
Merge branch 'bootstrapUI' into master (now vs 3.0.0)
2016-04-02 19:17:32 +01:00
FrancescoUK
44dfb86230
Merge branch 'master' vs 2.4 into bootstrapUI
2016-04-02 18:58:42 +01:00
FrancescoUK
f36e5ecef4
Release files update (due to 2.4 being released)
2016-04-02 14:22:36 +01:00
FrancescoUK
afcb1641b7
Added decimals to taxes ( #327 ), added totals rounding matching decimals ( #327 #307 , #429 )
2016-04-02 13:59:01 +01:00
FrancescoUK
54455213a8
Release files update
2016-04-02 09:33:37 +01:00
FrancescoUK
dda468291a
Update codeigniter_version.txt to contain 3.0.5 ( #292 )
...
change the order of access prevent in .htaccess
2016-04-01 22:17:13 +01:00
FrancescoUK
3d7756f177
Update codeigniter_version.txt to contain 3.0.5 ( #292 )
2016-04-01 22:00:28 +01:00
FrancescoUK
c5037c5725
add currency decimals configuration, fix quantity decimals in forms, merged helpers in locale one ( #307 #429 )
2016-04-01 21:07:29 +01:00
jekkos
bef7a2da25
Add release notes for 2.4
2016-04-01 18:43:05 +02:00
jekkos
12f4209055
Add hungarian (hu-HU) language ( #438 )
2016-04-01 16:52:07 +02:00
FrancescoUK
76ff5da718
fix error on new item ( #429 )
2016-04-01 08:45:57 +01:00
FrancescoUK
19bdcad78e
fix database conversion script missing ; at the end ( #429 )
2016-04-01 08:10:47 +01:00
FrancescoUK
6efdccfef0
add configurable quantity decimals ( #429 )
2016-04-01 00:07:05 +01:00
FrancescoUK
97676f01a2
change quantity fields to be decimal(15,3) in database ( #429 )
2016-03-31 20:54:37 +01:00
FrancescoUK
affefb44b4
Resize Item_kits and Items forms quantity fields to space for 3 decimals ( #429 )
2016-03-31 20:12:56 +01:00
FrancescoUK
62dea44922
add currency symbol in front of gift card value ( #116 )
2016-03-31 18:52:42 +01:00
FrancescoUK
da5c821de3
tidy up of old styles, make login to use standard bootstrap, regen dist ( #116 )
2016-03-31 18:25:17 +01:00
FrancescoUK
b2597df44c
replaced float_left with pull-left and float_right with pull-right ( #116 #293 )
2016-03-31 17:35:42 +01:00
FrancescoUK
c8f6f6adf0
remove code submitted accidentally ( #116 #293 )
2016-03-31 17:08:34 +01:00
FrancescoUK
83edcaf955
set the filters in Items and Sales/Takings on the right side ( #116 #293 )
2016-03-31 16:33:30 +01:00
FrancescoUK
2359af5fbb
tune dropdowns style and font size ( #116 #293 )
2016-03-31 15:20:30 +01:00
jekkos
e3ddea07b9
Remove F-key shortcuts for modules ( #425 )
...
Conflicts:
application/views/partial/header.php
dist/opensourcepos.min.js
2016-03-31 08:13:13 +02:00
jekkos
953307cbc7
Remove F-key shortcuts for modules ( #425 )
2016-03-31 08:08:12 +02:00
FrancescoUK
f303066039
fix missing refresh of payment totals on filter selection ( #116 #293 )
2016-03-30 22:28:29 +01:00
FrancescoUK
22e38b6f2a
bootstrapified and completed rework of the filters section in Sales/Takings ( #116 #293 )
2016-03-30 22:13:17 +01:00
FrancescoUK
68f5e73bff
tidy up js leftovers ( #116 #293 )
2016-03-30 18:31:47 +01:00
FrancescoUK
086d5b39f3
bootstrapified and complete rework of the filters section in Items ( #116 #293 )
2016-03-30 18:10:42 +01:00
FrancescoUK
97d17da8c0
Fix error message when searching for non existing supplier in receivings ( #430 )
2016-03-29 17:31:59 +01:00
jekkos
4d04cdd65f
Fix error message when searching for nonexistant supplier in receivings
...
(#430 )
2016-03-29 17:41:16 +02:00
FrancescoUK
7d9013cb2d
Fix error message when searching for non existing customer in sales ( #430 )
2016-03-29 09:24:58 +01:00
FrancescoUK
d996ff29cb
Regenerate invoice number on sale unsuspend if no custom format is used ( #423 )
2016-03-29 09:21:43 +01:00
jekkos
51b776354a
Fix error message when searching for nonexistant customer in sales
...
(#430 )
2016-03-29 08:43:58 +02:00
jekkos
d51d1b458a
Regenerate invoice number on sale unsuspend if no custom format is used
...
(#423 )
2016-03-29 08:29:43 +02:00
FrancescoUK
7f44d379f5
removed redundant page titles, moved pagination up, adjusted styles, regen dist ( #116 )
2016-03-26 22:56:51 +00:00
FrancescoUK
69b3e9db52
fix receiving form and detailed report ( #116 )
2016-03-26 22:55:06 +00:00
FrancescoUK
faac1d6a10
fix bulk_edit: don't remove category, supplier and taxes if left empty; save when a value is set ( #393 #381 )
2016-03-26 15:12:51 +00:00
FrancescoUK
2f5fd8e3d0
Set tax rate name & % in bulk edit to be the config one, save only if not empty ( #381 )
2016-03-26 14:03:08 +00: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
1e85edfef4
change sales/register and receiving button edit item to be update
2016-03-25 22:17:27 +00:00
FrancescoUK
50e6739bad
add print and items receiving button in receiving receipt ( #426 )
2016-03-25 22:09:58 +00:00
FrancescoUK
2322682014
update bootstrap-dialog, remove jqmigrate, regen dist files ( #328 )
2016-03-25 21:40:09 +00:00
FrancescoUK
16f438dea2
fix "$ is undefined" in login page ( #328 #329 )
2016-03-25 20:53:30 +00:00
jekkos
6ffec444d6
show serialnumber and description on invoice underneath name and qty
...
resp. (#405 )
2016-03-23 18:44:15 +01:00
jekkos
4e9731c59b
Prevent user to update employee without selecting at least one grant
...
(#420 )
2016-03-23 08:44:18 +01:00
jekkos
4f3a845702
Prevent user to update employee without selecting at least one grant
...
(#420 )
2016-03-23 08:38:13 +01:00
jekkos
a3af051d43
Minor improvements for sales tax bulk edit ( #381 )
2016-03-23 08:14:15 +01:00
jekkos
f9f127e227
Disable second tax field if first is not filled ( #381 )
...
Add extra warning if first tax is modified
Conflicts:
application/views/items/form_bulk.php
2016-03-23 08:10:08 +01:00
jekkos
79a4414a13
Disable second tax field if first is not filled ( #381 )
...
Add extra warning if first tax is modified
2016-03-22 08:55:43 +01:00
FrancescoUK
96c4b57b18
Properly fix item search bug (remove duplicated rows due to left outer join)
2016-03-21 21:08:56 +00:00
jekkos
98ad6f3db0
Ignore giftcard numbering test as it makes the build unstable ( #114 )
2016-03-21 21:51:59 +01:00
jekkos
9cbbe111a7
Set correct branchname for Dockerfile ( #284 , #114 )
2016-03-21 21:47:32 +01:00
jekkos
258c95f02e
Remove sync ajax calls in validation callback for forms ( #413 )
...
Remove jquery-bgiframe (not used anynmore) (#328 )
Fix bug in receiving form save if supplier was empty
Conflicts:
application/controllers/Items.php
application/views/customers/form.php
application/views/items/form.php
application/views/partial/header.php
application/views/receivings/form.php
application/views/sales/form.php
bower.json
dist/opensourcepos.js
dist/opensourcepos.min.js
templates/spacelab/views/partial/header.php
2016-03-21 21:43:52 +01:00
jekkos
fbd7465b03
Remove sync ajax calls in validation callback for forms ( #413 )
...
Remove jquery-bgiframe (not used anynmore) (#328 )
2016-03-21 21:27:46 +01:00
FrancescoUK
e6472d525d
add rule to .htaccess to protect generate_language.php ( #311 )
2016-03-21 19:26:31 +00:00
FrancescoUK
fda45dd363
fix bulk_edit: don't remove supplier if none is selected, save category, removed confirm dialog ( #393 )
2016-03-21 19:02:53 +00:00
jekkos
07e372a787
Properly fix for item search bug (remove duplicated rows due to left
...
outer join)
2016-03-21 17:43:59 +01:00
FrancescoUK
b9c088314b
fix is_deleted issue on some installation ( #406 )
2016-03-21 16:36:10 +00:00
FrancescoUK
b72432a39e
Add in README.md that vs 3.0.0 requires PHP 5.5 or greater ( #416 )
2016-03-21 13:48:38 +00:00
Aaron Gong
cb26c8cf33
Fix for #393 - issue with bulk edit (PR #415 )
2016-03-21 08:44:59 +01:00
jekkos
611237ec86
Fix search resultset when no filters applied
2016-03-21 08:39:24 +01:00
FrancescoUK
3a4e9d9107
remove JQmigrate, update plugins, regen dist files, manual fix of template header ( #328 )
2016-03-20 22:21:48 +00:00
FrancescoUK
06420fa4b0
fix width % in table_helper to be 100% max ( #116 )
2016-03-20 22:14:06 +00:00
FrancescoUK
b57fc1f34d
add rule to .htaccess to protect generate_language.php ( #311 )
2016-03-20 19:10:36 +00:00
jekkos
b5e07c9245
Move print_hide to outer div ( #394 )
2016-03-18 19:02:10 +01:00
jekkos
c6c6a1b4cf
Fix print button for receipt and invoice ( #394 )
2016-03-18 19:00:08 +01:00
jekkos
8cdb30fd25
Show item name on invoice if serialized and description empty ( #405 )
2016-03-18 18:43:23 +01:00
FrancescoUK
91041bd7a9
Add navigation buttons to invoice, receipt and takings + enable jsPrint ( #394 )
2016-03-18 18:43:07 +01:00
FrancescoUK
f813780e15
Replace custom csv parse function with PHP builtin (>=5.3) ( #311 )
2016-03-18 17:25:09 +00:00
jekkos
bc53f544f4
Replace custom csv parse function with PHP builtin (>=5.3) ( #311 )
2016-03-18 14:12:46 +01:00
jekkos
d29176158b
Strip eol characters at end of last column ( #311 )
2016-03-18 08:16:52 +01:00
FrancescoUK
20fc9138e2
sanity check of post & get on item suggestion and search ( #402 )
2016-03-17 20:16:56 +00:00
FrancescoUK
18857aca46
fix file language issues: remove \ from French, retranslate everything but manually fix id issues with \" ( #311 )
2016-03-17 18:36:12 +00:00
jekkos
8fc24219fb
Strip eol characters from imported csv line ( #311 )
2016-03-17 12:20:28 +01:00
jekkos
38a2fb4ca1
Remove call to flushCache (gone after tablesorter upgrade) ( #328 )
2016-03-17 08:14:10 +01:00
jekkos
a04b1d5803
Fix jQuery deprecation warning in invoice load ( #328 )
...
Ignore giftcard test as it makes build unstable
2016-03-16 08:13:08 +01:00
FrancescoUK
06e7dcd471
fix header of pagination.php ( #116 )
2016-03-15 19:10:24 +00:00
FrancescoUK
d4dae9fd32
bootstrapify pagination links, remove old styling, don't print links in takings, change <?= to be <?php ( #116 , #394 )
2016-03-15 19:08:14 +00:00
FrancescoUK
e3a10067f5
fix the missing jsPrint takings_printer in config ( #394 )
2016-03-15 18:09:37 +00:00
jekkos
09dd7eca58
Make invoice header responsive, remove fixed height and make font size
...
relative. (#116 )
2016-03-15 17:52:43 +01:00
jekkos
126f2254f6
Make invoice header responsive, remove fixed height and make font size
...
relative. (#116 )
2016-03-15 17:49:10 +01:00
jekkos
64c7eb28b3
Put back form submit buttons ( #328 )
...
Add custom style for jquery autocomplete widgets (#116 )
2016-03-14 23:11:25 +01:00
FrancescoUK
5e97358e90
enable jsPrint in receipt, invoice and Takings (sales/manage) ( #394 )
2016-03-14 19:54:46 +00:00
FrancescoUK
eb838cdb9f
Change table links to be glyphicons, fix tooltips sentence in sales/manage, fix sortable columns ( #116 )
2016-03-14 18:40:07 +00:00
FrancescoUK
983dad87af
regenerate dist file ( #394 )
2016-03-14 17:21:50 +00:00
FrancescoUK
87853f0da4
add navigation buttons in sales receipt and invoice, fix invoice styling ( #394 )
2016-03-14 17:21:28 +00:00
jekkos
e8e89f1c7e
Add workaround for jQuery load deprecation ( #328 )
2016-03-14 08:49:52 +01:00
FrancescoUK
f6be7cdf23
Merge branch 'master' into bootstrapUI
2016-03-13 16:19:44 +00:00
FrancescoUK
7937e880c0
Merge branch 'ais-one-master'
2016-03-13 15:30:40 +00:00
FrancescoUK
c52b5b5118
hide links, change print button id and add it to stylesheet, hide the print div ( #160 )
2016-03-13 15:29:39 +00:00
FrancescoUK
e47e80c69c
Merge branch 'master' of git://github.com/ais-one/opensourcepos into ais-one-master
2016-03-13 14:39:37 +00:00
Aaron Gong
6208569c7e
Fix for issue 160
...
https://github.com/jekkos/opensourcepos/issues/160
I try to interfere as little as possible
2016-03-13 22:04:39 +08:00
FrancescoUK
1a41c6a360
remove unused legend strings (removed from forms) ( #116 )
2016-03-13 13:43:09 +00:00
FrancescoUK
38d52e4df0
remove unnecessary and redundant messages from report listing view ( #116 )
2016-03-13 12:42:17 +00:00
FrancescoUK
1f56a8da8c
fix feature/bootstrapUI Reports issue with today date selection ( #395 )
2016-03-13 12:38:52 +00:00
FrancescoUK
4ad0d62f42
Upgrade to CI3.0.5 ( #292 )
2016-03-13 11:26:51 +00:00
FrancescoUK
0bd5bbec77
remove encode/decode base64 causing issues with web hosting providers ( #374 )
2016-03-13 10:52:32 +00:00
FrancescoUK
340792cfc2
change "E-mail" to be "email" ( #116 )
2016-03-13 10:07:59 +00:00
FrancescoUK
a817c8ae0a
simplify checkbox logic in sales/register and receiving ( #116 )
2016-03-12 11:25:23 +00:00
FrancescoUK
c124c08f89
readded bootstrap-select and adjusted styling of dropboxes ( #116 )
2016-03-12 10:57:24 +00:00
FrancescoUK
d2565009d8
fix wrong behaviour with due amount and Complete button on "sale" <=0 and "return" >=0 ( #116 )
2016-03-12 09:23:54 +00:00
FrancescoUK
b38a5ca47a
bootstrapisation of receivings ( #116 )
2016-03-12 00:03:54 +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
4b8f505625
reenable pop dialogs for confirmation, disable add payment button when amount due is 0 ( #116 )
2016-03-11 18:04:44 +00:00
FrancescoUK
4433edc552
regenerate dist files ( #116 )
2016-03-11 17:49:05 +00:00
FrancescoUK
019f93d98b
create style class for table width and first_li, regenerate dist files ( #116 )
2016-03-11 17:26:11 +00:00
FrancescoUK
98ebe1ff96
update daterangepicker to 2.1.19 and regen dist files ( #116 )
2016-03-11 17:24:51 +00:00
FrancescoUK
69c1af586e
relayout of sales/register right panel to follow a more logical flow ( #116 )
2016-03-11 17:23:32 +00:00
FrancescoUK
2df8645c5f
code comments, various bits and bobs ( #116 )
2016-03-11 17:20:07 +00:00
jekkos
f6b9ef16d0
Add default jquery ui theme instead of smoothness theme ( #328 )
...
Remove obsolete ajax queue plugin (#328 )
Add image preview widget for avatar upload in items form (#372 )
2016-03-11 18:07:41 +01:00
jekkos
399cc38eb9
Merge branch 'feature/bootstrapUI' of https://github.com/jekkos/opensourcepos into feature/bootstrapUI
2016-03-10 21:29:04 +01:00
jekkos
652702f582
Fix delete button + image upload widget refresh for company logo ( #372 )
2016-03-10 21:28:37 +01:00
FrancescoUK
4913ffe114
regenerate dist files (but issue with search dropdown style) ( #116 )
2016-03-10 20:16:05 +00:00
FrancescoUK
668cd8d0f9
make sales/register dropdowns the standard style ( #116 )
2016-03-10 19:21:54 +00:00
FrancescoUK
05a1dd561c
sales/register alignments, added customer info ( #116 , #369 )
2016-03-10 19:21:54 +00:00
FrancescoUK
5f0c9c282c
remove inline styling from page titles (if needed can be done from a .css file against #page_title) ( #116 )
2016-03-10 19:21:54 +00:00
FrancescoUK
de825f54e7
remove ':' from sales/register labels ( #116 )
2016-03-10 19:21:54 +00:00
FrancescoUK
940a899231
more adjustments to sales/register bootstrapisation ( #116 )
2016-03-10 19:21:54 +00:00
FrancescoUK
70938f7b41
sales/register bootstrapisation ( #116 )
2016-03-10 19:20:42 +00:00
jekkos
d510ab031d
Update README.md with FAQ and answer to common setup problem ( #387 , #97 ,
2016-03-10 08:43:07 +01:00
jekkos
9c39f62b1e
Fix sale search form submission on enter ( #386 )
...
Add php5-apcu to Dockerfile (#320 , 284)
Fix countrycode parameter for nominatim address lookup
2016-03-10 08:25:32 +01:00
jekkos
e175a96acb
Fix nominatim address lookup with jquery ui autcomplete ( #328 )
...
Add dblclick event handler to item + customer autocomplete in register
2016-03-09 20:03:05 +01:00
FrancescoUK
71a8dce949
regenerate dist files (but issue with search dropdown style) ( #328 )
2016-03-09 17:10:47 +00:00
FrancescoUK
747706e032
fix barcode font size default in database.sql ( #116 )
2016-03-09 17:09:19 +00:00
FrancescoUK
2a679ca2eb
set the correct default barcode font size ( #116 )
2016-03-09 16:53:17 +00:00
FrancescoUK
1f1b9c47ec
remove extra barcode font styling, set directly the correct size as of barcode_config ( #116 )
2016-03-09 14:24:16 +00:00
FrancescoUK
ceac184c30
add comment about barcodes ( #116 )
2016-03-09 14:00:27 +00:00
FrancescoUK
f9803cb4f5
move barcode_sheet.php to views/barcode dir ( #116 )
2016-03-09 13:41:30 +00:00
FrancescoUK
626667b3fd
Merge branch 'master' into bootstrapUI
2016-03-08 22:42:03 +00:00
FrancescoUK
bf2c6bfa1f
fix issue with sale edit
2016-03-08 21:53:29 +00:00
FrancescoUK
5588c1e22e
set a ospos_session cookie name
2016-03-08 21:30:25 +00:00
FrancescoUK
525fb7dcf9
fix issue blocking searching suggestion
2016-03-08 21:28:41 +00:00
FrancescoUK
e182c9d9f6
regenerate dist files
2016-03-08 21:23:05 +00:00
jekkos
af69e83bda
Add jquery-ui.css in dist file + update .gitignore
2016-03-08 21:43:47 +01:00
FrancescoUK
76639f6da1
remove misleading comment from code
2016-03-08 19:50:46 +00:00
jekkos
01f59cc247
Fix jQuery migrate warnings in manage_tables ( #328 )
2016-03-08 20:46:30 +01:00
jekkos
6f6f4354fd
Remove jQuery calls for attr (deprecated in newer versions) ( #328 )
2016-03-08 20:18:51 +01:00
FrancescoUK
d7df291b9a
Merge branch develop/2.4 into master
2016-03-08 19:14:36 +00:00
FrancescoUK
1a1266a20c
touched version to be 2.4.0, updated README.md, enabled Cross Site Request Forgery in config.php
2016-03-08 18:19:28 +00:00
jekkos
f366757476
Add group operator to giftcard query
2016-03-08 18:18:27 +00:00
jekkos
741843586d
Remove duplicated cookie cleanup hack (CI 2.x issue)
2016-03-08 18:18:27 +00:00
FrancescoUK
fafdfd9afd
fix php error on suggestion typing when in sale register return mode ( #331 )
2016-03-08 18:18:27 +00:00
FrancescoUK
a156ad8087
Fix issue in Sales/Takings and apply same fix to other controller to avoid similar issues in the future ( #337 )
2016-03-08 18:16:31 +00:00
FrancescoUK
b36a03c4bc
Fix to sales edit server error when customer is '' ( #337 )
2016-03-08 18:16:31 +00:00
jekkos
028bdb074b
Add caching hints for mod_expires ( #340 )
2016-03-08 18:16:31 +00:00
jekkos
643ceb25b5
Fix spacing in autocomplete suggestion
2016-03-08 18:16:31 +00:00
jekkos
5f8eface28
Properly save company_name in customer form
2016-03-08 18:16:31 +00:00
jekkos
8a5177f14c
Fix base url for testcases ( #305 )
...
Fix legacy ubuntu repository urls (#284 )
2016-03-08 18:16:31 +00:00
jekkos
02c8a89bbe
Use curl to wait for apache start ( #305 )
2016-03-08 18:13:24 +00:00
jekkos
c67acaa6ec
Make 2.4 version string npm compatible
2016-03-08 18:04:15 +00:00
FrancescoUK
4bbacf6923
Code reformatting
2016-03-08 18:04:15 +00:00
FrancescoUK
38ea682c88
Add favicon
2016-03-08 18:00:33 +00:00
FrancescoUK
0f1208d4d9
Fix package.json version to be 2.4 ( #284 )
2016-03-08 17:51:16 +00:00
jekkos
69942283e5
Make docker work with 2.4 branch
2016-03-08 17:50:17 +00:00
FrancescoUK
d13e034940
Update database/tables.sql script with new sessions table ( #120 )
2016-03-08 17:44:59 +00:00
FrancescoUK
72059184df
Update Copyright notice ( #120 )
2016-03-08 17:44:59 +00:00
FrancescoUK
4d9dc0111e
Make the data blob NOT NULL in the SQL upgrade script ( #120 )
2016-03-08 17:44:59 +00:00
FrancescoUK
b9262230d1
Change sessions to be stored in database and add SQL upgrade script 2.3.4 to 2.4 ( #120 )
2016-03-08 17:44:59 +00:00
FrancescoUK
df4cea3228
Fix to custom fields that cannot be null on Items save ( #120 )
2016-03-08 17:44:59 +00:00
jekkos
0f27348924
Add (temp) fix for cur_page conuter in CI pagination libary ( #284 )
...
Fix .htaccess file
2016-03-08 17:44:59 +00:00
FrancescoUK
dd5aa1e241
Restore padding in pagination links, now it uses css ( #120 )
2016-03-08 17:44:59 +00:00
FrancescoUK
5df62610d2
Upgrade to CI 3.0.4 ( #120 )
2016-03-08 17:44:59 +00:00
FrancescoUK
9dcbef988a
Added comments to some controller functions and improved spacing to improve readibility of code ( #120 )
2016-03-08 17:44:59 +00:00
FrancescoUK
d1a973564f
Make NULL to be null all over the code for consistency purposes ( #120 )
2016-03-08 17:44:59 +00:00
FrancescoUK
da52ff99c1
Further review and fixes to input->post(...) ( #120 )
2016-03-08 17:44:59 +00:00
FrancescoUK
ee07676193
Fix to items search not working due to input->post returning null ( #120 )
2016-03-08 17:44:59 +00:00
FrancescoUK
007598df6a
Fix merge miss in constants.php ( #120 )
2016-03-08 17:44:59 +00:00
FrancescoUK
9a71bbc620
Complete CI 3.0.3 upgrade since it wasn't done in full ( #120 )
2016-03-08 17:44:59 +00:00
FrancescoUK
a5041a3a41
Remove application/errors, upgrade Step 8 ( #120 )
2016-03-08 17:44:59 +00:00
FrancescoUK
36d3717bd6
EXT constant deprecated, upgrade Step 20 ( #120 )
2016-03-08 17:44:59 +00:00
FrancescoUK
abd63731be
Follow upgrade guideline Step 9 ( #120 )
2016-03-08 17:44:59 +00:00
FrancescoUK
b7c0e32cd0
Fix reports error due to report.php now being Report.php ( #120 )
2016-03-08 17:44:59 +00:00
FrancescoUK
c512d7167d
Change config language to be 'en' consistent with the OSPOS language identifiers ( #120 )
...
However language support doesn't work properly at the moment.
2016-03-08 17:44:59 +00:00
FrancescoUK
6ccfc8ba7d
Improve .htaccess with some security rules ( #120 )
2016-03-08 17:44:59 +00:00
FrancescoUK
b27d3c04c9
Upgrade config.php and database.php.tmpl to CI 3.0.3 versions ( #120 )
...
Apparently the upgrade wasn't complete.
2016-03-08 17:44:59 +00:00
FrancescoUK
aa3948b9a2
Remove application/config.php and database.php ( #120 )
2016-03-08 17:41:16 +00:00
Toni Haryanto
75fa1a8167
Upgrade to Code Igniter 3.0.3 ( #120 )
2016-03-08 17:41:16 +00:00
FrancescoUK
c414922167
touched README.md file ( #116 )
2016-03-08 17:18:29 +00:00
FrancescoUK
38ecacc62f
mark OSPOS with Bootstrap3 vs 3.0.0 ( #116 )
2016-03-08 17:17:13 +00:00
FrancescoUK
cc05f9b2df
regenerate dist files ( #116 #328 #329 )
2016-03-08 12:44:42 +00:00
FrancescoUK
d7d2c8cb35
get the latest swfobject 2.3.0 using an alternative bower package repo ( #116 #328 #329 )
2016-03-08 12:43:58 +00:00
FrancescoUK
ea394a00b5
remove spinner, unused images, unused code ( #116 #328 )
2016-03-08 12:42:38 +00:00
FrancescoUK
49b1eb3150
fix table action & search header geometry/positioning ( #116 )
2016-03-08 12:40:41 +00:00
FrancescoUK
4a216f0a7c
used proper form and group-form for table action search and header ( #116 )
2016-03-08 12:28:18 +00:00
jekkos
674dd90221
Merge branch 'feature/bootstrapUI' of https://github.com/jekkos/opensourcepos into feature/bootstrapUI
2016-03-08 08:40:23 +01:00
jekkos
2436cf5da5
Fix suggestions for item kits (by name and KIT id) ( #328 )
2016-03-08 08:39:21 +01:00
jekkos
9cd42e0614
Add group operator to giftcard query
2016-03-08 08:12:23 +01:00
jekkos
a6fa6c9cd6
Add group operator to giftcard query
2016-03-08 08:11:10 +01:00
FrancescoUK
4403a6775a
Fix wrong form name in location dropdown due to copy&paste action ( #116 )
2016-03-07 22:47:40 +00:00
jekkos
dfbab194de
Add item search for category + suppliers ( #328 )
2016-03-07 23:21:57 +01:00
jekkos
fe2787217f
Fix item suggestion in item kits, fix category suggestion in item form
...
(#328 )
2016-03-07 22:42:42 +01:00
jekkos
554f2b32db
Merge branch 'feature/jquery_cleanup' into feature/bootstrapUI
...
Conflicts:
application/views/items/manage.php
application/views/partial/header.php
dist/opensourcepos.min.css
dist/opensourcepos.min.js
templates/spacelab/views/partial/header.php
2016-03-07 21:33:26 +01:00
jekkos
36f825d0fe
Replace legeacy autocomplete with jquery-ui version ( #328 )
...
Cleanup PHP search suggestion functionality
Add jquery-ui css explicitly (wasn't included in bower main attribute)
2016-03-07 21:23:29 +01:00
FrancescoUK
04b6ba21f7
bootstrapisation of #table_action_header in all views, tidy up css styles changed px to em ( #116 )
2016-03-07 19:09:57 +00:00
Aaron Gong
ff63adecdc
Fix For #339
...
https://github.com/jekkos/opensourcepos/issues/339
We should also rollout the fixes to develop/2.4 if necessary. This fix
was adapted from BootstrapUI which fixed the PHP 7 error regarding
classes.
2016-03-07 22:26:07 +08:00
jekkos
6c29faeba1
Remove old jquery autocomplete
...
Remove id|name format in giftcards customer selection
Cleanup duplicated custom field suggestion in Items
Migrate table search suggestion to jQuery UI
Add jquery UI bootstrap theme
2016-03-07 07:56:41 +01:00
FrancescoUK
517f67a3a9
remove double entry in daterangepicker translations, open calendar always ( #116 )
2016-03-06 21:51:46 +00:00
FrancescoUK
7f37ebf87e
proper support of date range in reports input leveraging all the features, translations and fixed some bugs ( #116 )
2016-03-06 21:34:12 +00:00
jekkos
f0af6f8927
Correct spanish translations for reorder level warning ( #365 )
2016-03-06 13:39:11 +01:00
jekkos
d78c4dec67
Add default english for other langauge labels
2016-03-06 13:34:21 +01:00
FrancescoUK
0831089790
fix stock_config error message ( #116 )
2016-03-05 21:08:20 +00:00
FrancescoUK
8faf1285da
fix general_config tax 1 rate and name error message ( #116 )
2016-03-05 11:54:10 +00:00
FrancescoUK
d5b278217b
fix first name error message in Suppliers/form ( #116 )
2016-03-05 11:41:57 +00:00
FrancescoUK
a04101d756
fix an issue with error messages on required fields in Items/form ( #116 )
2016-03-05 11:33:25 +00:00
FrancescoUK
3cb41c9fe3
fix picture loading widget in Items/form, works but pic extension is not handled so still commented out ( #116 )
2016-03-05 10:27:45 +00:00
FrancescoUK
2ab9404229
render in red the fields in config that are empty at submit time ( #116 )
2016-03-05 10:23:43 +00:00
FrancescoUK
6cef7a124e
fix a wrong counting with custom fields for-loop ( #116 )
2016-03-05 10:23:43 +00:00
FrancescoUK
f226c774df
Merge pull request #376 from ais-one/patch-1
...
Item Avatar Not Uploading (#373 )
2016-03-05 09:34:52 +00:00
FrancescoUK
06a1f1a869
Merge pull request #378 from ais-one/patch-2
...
Don't make suppliers mandatory in Items/form (#377 )
2016-03-05 08:26:38 +00:00
Aaron Gong
44dc300c63
Update form.php
...
removed required in class of the label
2016-03-05 14:50:53 +08:00
Aaron Gong
edaa936766
Fix for issue 377
...
Fix bug where item cannot be edited or created due to not recognizing none as a supplier.
2016-03-05 09:46:42 +08:00
Aaron Gong
6d9a53edba
Fix for issue 373
...
https://github.com/jekkos/opensourcepos/issues/373
2016-03-05 09:25:34 +08:00
FrancescoUK
1d9a7eced3
set correct order new & submit buttons in receiving ( #116 )
2016-03-04 22:42:28 +00:00
FrancescoUK
f9971aabb6
remove unnecessary .':' from form labels ( #116 )
2016-03-04 21:57:58 +00:00
FrancescoUK
1fe26afe4f
fix missing required fields in Items form, changed file input to be bootstrap one ( #116 )
...
There is the image upload option commented out, pending the solution on remove file.
However none of them seems to be effective in loading the image. It's probably a Controller issue.
2016-03-04 21:56:08 +00:00
FrancescoUK
6d547048c4
set two methods private in Items and Config controllers ( #116 )
2016-03-04 21:44:00 +00:00
FrancescoUK
687b68f13e
set correct tax_2 and not tax_1 label in general_config ( #116 )
2016-03-04 21:42:40 +00:00
FrancescoUK
c49728e2fc
fix New Employee button wrong indentation in Employees view ( #116 )
2016-03-04 21:41:22 +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
d433866e39
Only accept .csv for import excel functionality ( #116 )
...
Enable enter key to submit form by default (as before)
2016-03-01 18:01:53 +01:00
jekkos
45da78bbde
Trigger employee form validation for all tabs ( #116 )
2016-03-01 17:48:33 +01:00
jekkos
c9238877fa
Bootstrapify report input forms, add datepicker range widget ( #116 )
...
Move datepicker translations to datepicker_lang.csv
2016-03-01 08:46:17 +01:00
jekkos
d4f456d868
Bump version strings to 2.3.5
2016-02-29 22:36:25 +01:00
jekkos
2833b7598e
Bootstrapify date_input for reports ( #116 ). Form alignment to be
...
improved, basic version working
Move common jquery validation settings to base object
2016-02-29 22:21:36 +01:00
jekkos
68c4c1cc56
Use bootstrap style to highlight fields in error state after failed validation ( #116 )
2016-02-29 08:14:00 +01:00
jekkos
bc8673d883
Remove debugger statement + fix glyph in item kits form ( #116 )
2016-02-28 23:52:04 +01:00
FrancescoUK
6b76e28ebb
fix tables in item_kit/form items/inventory details and sales/suspended ( #116 )
2016-02-28 21:24:55 +00:00
FrancescoUK
f2e02e4e06
fixed wrong titles in excel import forms (coming from manage views) ( #116 )
2016-02-28 19:35:38 +00:00
FrancescoUK
2b257d21fb
add icons to inventory detail and inventory change forms ( #116 )
2016-02-28 19:23:40 +00:00
FrancescoUK
92bfd903dc
bootstrapify inventory details form, fixed multilocation support that was broken ( #116 )
2016-02-28 19:08:05 +00:00
FrancescoUK
69fedb3712
bootstrapify inventory form ( #116 )
2016-02-28 17:08:30 +00:00
FrancescoUK
c4df1f3671
make items/form_bulk consistent with the rest of the forms ( #116 )
2016-02-28 16:41:55 +00:00
FrancescoUK
0cd7af7c4f
change file load widget in excel_import forms ( #116 )
...
used jasny-bootstrap
2016-02-28 16:26:58 +00:00
FrancescoUK
c675a73fc6
make sale and receiving forms consistent with the other forms ( #116 )
2016-02-28 15:55:45 +00:00
FrancescoUK
7b09961075
fix employee tab width issue, now working fine ( #116 )
2016-02-28 15:02:25 +00:00
FrancescoUK
d96fafa92f
remove redundant title strings from all the forms ( #116 )
...
The dialog box has already a title and there is no need to double the subject.
2016-02-28 14:21:05 +00:00
FrancescoUK
20daecf4b1
make employees form using tabs ( #116 )
...
There is an issue with fieldset being too short
2016-02-28 14:03:09 +00:00
FrancescoUK
c0a048251e
fix silly 1px drop with glyphicons in front of input, various beautifications: more icons and better tables in suspended and item_kits ( #116 )
2016-02-28 11:55:11 +00:00
jekkos
99c92e68a6
Add glyphicon to form fields in customer and item ( #116 )
2016-02-28 01:18:40 +01:00
jekkos
af5d39a394
Set delete button color in sales / receivings edit form ( #116 )
...
Fix password field layout in employee edit mode
2016-02-28 01:02:27 +01:00
FrancescoUK
fc74708bf5
fix a mistake with the table entry in sales/suspended list ( #116 )
2016-02-27 22:21:04 +00:00
FrancescoUK
0dce125f67
fix controls sizes in all the forms, fix datetimepicker in sales/form and receiving/form, fix item_kits/form ( #116 )
2016-02-27 21:55:52 +00:00
jekkos
d3b87189e3
Fix form submission in sales and receivings forms ( #116 )
2016-02-27 21:31:44 +01:00
jekkos
4a68ab13e1
Bootstrapify sales and receivings forms ( #116 )
2016-02-27 20:01:00 +01:00
jekkos
0c1f67f391
Readd create item and suspended sales buttons
2016-02-27 18:58:51 +01:00
jekkos
fd87c59492
Merge branch 'feature/bootstrapUI' of https://github.com/jekkos/opensourcepos into feature/bootstrapUI
...
Conflicts:
application/views/partial/header.php
application/views/receivings/receiving.php
application/views/sales/register.php
dist/opensourcepos.min.js
templates/spacelab/views/partial/header.php
2016-02-27 18:55:44 +01:00
FrancescoUK
af2736e462
Reverse PHP7 fix causing issues with DB functionality ( #351 )
2016-02-27 10:15:58 +00:00
FrancescoUK
d7ff9bed1a
Merge branch 'ci3' into bootstrapUI
2016-02-27 09:44:41 +00:00
FrancescoUK
e5e3b89c6d
fix config page tabs sizes and alignment ( #116 )
2016-02-27 09:42:23 +00:00
FrancescoUK
67bfe560c4
change input boxes size in general_config, more to come ( #116 )
2016-02-26 23:53:11 +00:00
FrancescoUK
d04fec09d5
Sales register and Receiving with new dropdown and relayout ( #116 )
2016-02-26 23:33:05 +00:00
FrancescoUK
e814f8835a
fix issue related to double bootstrap.js in min.js preventing bootstrap-select from functioning properly ( #116 )
2016-02-26 22:20:11 +00:00
jekkos
7769334372
Add close button by default ( #116 , #361 )
2016-02-26 19:08:49 +01:00
jekkos
959f7da876
Fix item form submission + remove invalid char before value attribute
2016-02-26 11:05:55 +01:00
jekkos
a9902219ae
Continue bootstrapification (item bulk edit, bootstrap modals)
...
(#116 , #361 )
Remove get_form_width() from controllers, add new class to define modal width
Add bootstrap validation markup to edit forms
2016-02-25 23:31:43 +01:00
jekkos
3cb9aaa055
Remove duplicated cookie cleanup hack (CI 2.x issue)
2016-02-25 23:28:19 +01:00
FrancescoUK
831dc7a0b8
fix php error on suggestion typing when in sale register return mode ( #331 )
2016-02-25 15:44:13 +00:00
FrancescoUK
75cf2997b8
Complete company logo config support ( #116 )
...
Show image when available, support button translation
Widget based on jasny-bootstrap
2016-02-25 10:59:14 +00:00
FrancescoUK
abdf2a23d0
add bootstrap-table but not used yet ( #116 #293 )
2016-02-23 15:50:04 +00:00
jekkos
deb4a501d6
Finish config module restyle ( #116 )
2016-02-22 23:44:52 +01:00
jekkos
80d7079953
run grunt on bower postinstall hook ( #329 )
2016-02-22 23:38:46 +01:00
jekkos
fcf303b2b3
Finish form bootstrapification for config module
2016-02-22 23:38:46 +01:00
FrancescoUK
932ead0d3c
Merge branch 'ci3' into bootstrapUI
2016-02-22 18:05:15 +00:00
FrancescoUK
03146d9e3b
Fix issue in Sales/Takings and apply same fix to other controller to avoid similar issues in the future ( #337 )
2016-02-22 17:52:29 +00:00
FrancescoUK
45c0163a9d
Fix to sales edit server error when customer is '' ( #337 )
2016-02-22 08:51:18 +00:00
FrancescoUK
56826ab3c1
fix spacelab template to work with new setup ( #116 , #329 )
2016-02-21 20:29:14 +00:00
FrancescoUK
55d6237f93
Add caching hints for mod_expires ( #340 )
2016-02-21 19:28:58 +00:00
FrancescoUK
349da7e7ad
fix font issue, split bootstrap.min.css out of opensourcepos.min.css, grunt upgrades header.php and login.php ( #329 , #116 )
...
requires npm install to install bowercopy
2016-02-21 19:14:04 +00:00
jekkos
5f0028a983
Add caching hints for mod_expires ( #340 )
2016-02-20 21:40:06 +01:00
jekkos
1aa5c72db3
Tune css inclusion (use negation for unwanted files in header.php)
2016-02-20 15:08:29 +01:00
FrancescoUK
fc20b74b57
fix wrong css file sequence generation with grunt, add bootstrap-select (not used yet) ( #329 )
2016-02-19 23:31:18 +00:00
FrancescoUK
7236902143
restore correct style for the main page module list ( #329 )
2016-02-19 23:30:42 +00:00
FrancescoUK
cf92544600
manage better meridiem cases with datetimepicker (use strpos) ( #116 )
2016-02-19 19:07:39 +00:00
jekkos
ab87b30423
Update .gitignore to exclude intermediate minified files
2016-02-19 19:04:14 +01:00
jekkos
0ad30370ae
Do not include login.css in minified result ( #329 )
2016-02-19 19:04:06 +01:00
jekkos
30223c38e1
Fix css minification ( #329 )
...
Fix suspended sales dialog (set class to modal-dlg)
2016-02-19 19:03:56 +01:00
jekkos
967ba99c12
Merge branch 'feature/bootstrapUI' of https://github.com/jekkos/opensourcepos into feature/bootstrapUI
...
Conflicts:
application/views/configs/locale_config.php
application/views/receivings/receiving.php
application/views/sales/register.php
2016-02-18 23:38:39 +01:00
jekkos
d2a11cdb91
Bootstrappify config forms - WIP ( #116 )
2016-02-18 23:30:21 +01:00
FrancescoUK
bb966feb8a
small indentation adjustment ( #116 )
2016-02-18 22:06:47 +00:00
FrancescoUK
ebaec8de26
remove white gap in sales/register items table ( #116 )
2016-02-18 21:30:33 +00:00
FrancescoUK
ee4297e22c
fix sales/register and receiving button, styles, alignment and code tidy up ( #116 )
2016-02-18 21:16:07 +00:00
jekkos
aae36bce00
Merge branch 'feature/bower+grunt' into feature/bootstrapUI
2016-02-18 17:42:38 +01:00
jekkos
4a7e0af9a2
Merge branch 'feature/bootstrapUI' of https://github.com/jekkos/opensourcepos into feature/bootstrapUI
2016-02-18 17:42:20 +01:00
jekkos
808943f250
Add bootstrap form style to item kits, suppliers, giftcards, and excel import in
...
items and customers (#118 )
Fix dialog submission in all pages (#328 )
2016-02-18 08:57:17 +01:00
FrancescoUK
f19e7142cd
complete datetimepicker change with proper date and time formats support ( #116 )
2016-02-17 22:47:59 +00:00
jekkos
82a3f9a3e2
Add new dialogs to all pages (use modal-dlg class) #116
...
Bootstrapify customer edit form (almost done)
Bootstrapify item excel impor
2016-02-17 23:34:53 +01:00
FrancescoUK
66a5a159d8
add language support to datetimepicker using ospos translation support ( #116 )
...
Translated languages: en, es, fr, de-CH, nl-BE
2016-02-16 23:16:03 +00:00
jekkos
a5107445f0
Merge branch 'feature/bootstrapUI' of https://github.com/jekkos/opensourcepos into feature/bootstrapUI
...
Conflicts:
application/views/configs/barcode_config.php
2016-02-16 23:59:49 +01:00
jekkos
c99ef3f315
Bootstrapify item edit form ( #116 )
...
Use bootstrap-dialog in items inventory and inventory details (#328 )
2016-02-16 23:42:20 +01:00
FrancescoUK
cd5094d389
fix barcode_config barcode_lib->listfonts "font" to be "fonts" ( #116 )
2016-02-16 21:32:58 +00:00
FrancescoUK
d1a596b0be
fix php error on suggestion typing when in sale register return mode ( #331 )
2016-02-16 21:28:10 +00:00
jekkos
a97929f239
Remove thickbox from bower.json ( #328 )
...
Items edit working now (items module only) (#116 )
2016-02-16 21:41:02 +01:00
jekkos
444ba37eb1
Import bower compatible dependencies using bower+grunt ( #329 )
...
Cleanup obsolete js + css files (jquery-ui)
2016-02-15 22:52:58 +01:00
FrancescoUK
52487a4a78
Remove datetimepicker locales as the translation will use I18N but leveraging OSPOS translations ( #116 )
2016-02-15 21:51:53 +00:00
FrancescoUK
b6adf916c4
fixed arrow icons issue, bootcssVer autodetect doesn't work and needs explicit declaration ( #116 )
2016-02-15 09:31:44 +00:00
FrancescoUK
f92082270d
add locale js for bootstrap-datetimepicker and regenerated min.js ( #116 )
...
locale not tested, js script seems unaffected
2016-02-14 23:32:50 +00:00
FrancescoUK
4667282966
add FontAwesome font ( #116 )
2016-02-14 23:30:57 +00:00
FrancescoUK
5546700fee
upgrade templates/spacelab bootstrap.css to latest ( #116 )
2016-02-14 23:30:10 +00:00
FrancescoUK
644a159d0a
remove completely flatly dir from templates ( #116 )
2016-02-14 23:29:06 +00:00
FrancescoUK
3156ce217b
upgrade to latest flatly bootstrap.css ( #116 )
2016-02-14 23:24:42 +00:00
FrancescoUK
7c10a9a63a
rename font directory to fonts so we are inline with bootstrap ( #116 )
2016-02-14 23:03:32 +00:00
FrancescoUK
fc3aac58b5
select transaction in Takings inclusive of time, fix Sale edit form to use bootstrap-datetimepicker ( #116 )
2016-02-14 22:41:10 +00:00
FrancescoUK
d788320a9d
Tidy up js in Sales/manage and Items/manage, commented out invoice js part as not used ( #116 )
2016-02-14 19:42:08 +00:00
FrancescoUK
0f4d5e8f1b
Fix issue in Sales/Takings and apply same fix to other controller to avoid similar issues in the future ( #116 )
2016-02-14 19:40:18 +00:00
FrancescoUK
c5ab15ca64
Revert post TRUE change for XSS filtering ( #116 )
2016-02-14 13:05:42 +00:00
FrancescoUK
42312bcc20
Complete tidy up of unneeded table filter id, add TRUE for XSS filtering ( #116 )
2016-02-13 21:49:08 +00:00
FrancescoUK
d69a3c6130
Fix tables (detailed sale report) colour for inner table ( #116 )
2016-02-13 21:47:10 +00:00
jekkos
d003239525
Items form bootstrapified (working in Chrome) ( #116 , #328 )
2016-02-13 14:42:01 +01:00
jekkos
45cb6bc4f7
Merge branch 'feature/bootstrapUI' of https://github.com/jekkos/opensourcepos into feature/bootstrapUI
2016-02-13 14:14:40 +01:00
jekkos
b361d78051
Merge branch 'feature/bootstrapUI' of https://github.com/jekkos/opensourcepos into feature/bootstrapUI
...
Conflicts:
templates/flatly/css/style.css
2016-02-13 14:14:30 +01:00
FrancescoUK
8438942b10
use bootstrap-datetimepicker instead of jquery-ui-timepicker-addon in Items and Takings ( #116 )
...
There is an issue with Takings filtering that needs fixing and also arrows are not showing in the datetimepicker.
2016-02-13 12:29:15 +00:00
jekkos
2be22d8e48
Migrate thickbox in items to bootstrap modal dialog ( #328 )
2016-02-13 13:17:29 +01:00
FrancescoUK
1be861cd8d
change empty table to be alert-info instead of alert-warning ( #116 )
2016-02-13 11:28:12 +00:00
FrancescoUK
e0745b5109
make flatly OSPOS default, tidied up stylesheets, added bootstrap-datetimepicker js no support yet ( #116 )
2016-02-13 09:54:49 +00:00
FrancescoUK
792f6c4154
Remove zip file committed by mistake ( #116 )
2016-02-12 10:36:33 +00:00
FrancescoUK
23b086fbc2
added jasny-bootstrap-3.1.3, removed bootstrap.file-input and changed image upload in general config ( #116 )
...
For jasny-bootstrap-3.1.3 see: http://www.jasny.net/bootstrap/
2016-02-12 09:32:21 +00:00
FrancescoUK
e35bd81c8b
Fix File Choose boostrap jQuery plugin not working with latest submission ( #116 )
2016-02-11 08:13:06 +00:00
jekkos
3f12930223
Merge branch 'feature/bootstrapUI' of https://github.com/jekkos/opensourcepos into feature/bootstrapUI
...
Conflicts:
application/views/partial/header.php
dist/opensourcepos.js
dist/opensourcepos.min.js
templates/spacelab/views/partial/header.php
2016-02-11 08:00:47 +01:00
jekkos
5fad0e13e8
Upgrade to jQuery 1.12.0 + regen minified js
2016-02-11 07:03:43 +01:00
jekkos
715eac28c8
Add jquery-migrate-1.3.0 (solves js issues)
2016-02-11 07:00:02 +01:00
FrancescoUK
d31e1cef8f
Remove double jQuery line for file input ( #116 )
2016-02-10 23:35:38 +00:00
FrancescoUK
9cd31c761a
Tidy up of legacy stuff ( #116 )
2016-02-10 23:28:18 +00:00
FrancescoUK
e99b9cbe41
Make choose file in General Configuration bootstrap ( #116 )
...
Used following jQuery plugin: http://gregpike.net/demos/bootstrap-file-input/demo.html
2016-02-10 23:27:28 +00:00
FrancescoUK
2f1d0fd4f7
Make edit item button in register bootstrap one ( #116 )
2016-02-10 20:37:05 +00:00
jekkos
2aae378808
Merge branch 'feature/bootstrapUI' of https://github.com/jekkos/opensourcepos into feature/bootstrapUI
2016-02-10 21:36:55 +01:00
FrancescoUK
29cdb8103f
Fix to sales edit server error when customer is '' ( #116 )
2016-02-10 20:16:20 +00:00
FrancescoUK
2da08769b2
New icons + library for future additions ( #116 )
...
Source: http://www.elegantthemes.com/blog/freebie-of-the-week/beautiful-flat-icons-for-free
2016-02-10 18:24:45 +00:00
FrancescoUK
7a85d70139
Restore config.php comment line that somehow was cut out ( #116 )
2016-02-10 17:25:55 +00:00
FrancescoUK
e78d5ba461
Make empty table alert info not warning ( #116 )
2016-02-10 17:25:44 +00:00
FrancescoUK
5aefa2a116
Make add payment button the same style as complete sale ( #116 )
2016-02-10 17:25:34 +00:00
jekkos
32cbf109a4
Fix javascript minification in Grunt build
...
Fix config tab navigation in bootstrap (#116 )
2016-02-10 17:25:19 +00:00
jekkos
d15f341f90
Trigger cachebreaker in all header.php files
...
Apply center-align style for barcode only on receipt
Remove obsolete tabcontent.js
Update js scritps in spacelab header (#116 )
2016-02-10 17:24:49 +00:00
jekkos
b6d57a8f0e
Add bootstrap 3.3.6 js file (needs jquery 1.9 minimum!)
...
Upgrade jquery to 1.12.0, remove older version + rebuild using grunt
Remove obsolete css for tabcontent
Remove 'custom' javascript for tabs in config module (#116 )
2016-02-10 17:24:16 +00:00
jekkos
c48252790e
Bootstrapify config module ( #116 )
2016-02-10 17:23:47 +00:00
jekkos
5c95e02eac
Fix javascript minification in Grunt build
...
Fix config tab navigation in bootstrap
2016-02-10 08:43:01 +01:00
jekkos
b1b125d2a4
Trigger cachebreaker in all header.php files
...
Apply center-align style for barcode only on receipt
Remove obsolete tabcontent.js
Update js scritps in spacelab header
2016-02-09 20:02:16 +01:00
jekkos
634e626717
Add bootstrap 3.3.6 js file (needs jquery 1.9 minimum!)
...
Upgrade jquery to 1.12.0, remove older version + rebuild using grunt
Remove obsolete css for tabcontent
Remove 'custom' javascript for tabs in config module
2016-02-09 19:41:38 +01:00
jekkos
eee87c7bc2
Bootstrapify config module
2016-02-09 17:59:35 +01:00
FrancescoUK
c6855712d0
Change no items in cart to be info instead of warning ( #116 )
2016-02-08 21:38:05 +00:00
FrancescoUK
b27d94e316
Merge branch 'ci3' into bootstrapUI
2016-02-08 20:19:15 +00:00
FrancescoUK
ca8b5a75ea
Merge branch 'master' into ci3
2016-02-08 20:18:25 +00:00
FrancescoUK
cb5a4c774c
Add company name to top bar, change db backup style in config ( #116 )
2016-02-08 19:53:59 +00:00
FrancescoUK
7e269f1256
Change to bootstrap notification bars, cleanup old css files, moved styles to ospos.css, fixed ospos_print.css ( #116 )
2016-02-08 19:30:26 +00:00
jekkos
f9c882bf24
Fix spacing in autocomplete suggestion
2016-02-08 17:01:37 +01:00
FrancescoUK
f6356dd9e6
Fix more buttons to be bootstrap ones, fixed sales register, removed old style assets ( #116 )
2016-02-08 12:12:05 +00:00
FrancescoUK
d5e0230b19
Change button styles to use bootstrap standard, other fixes in style.css ( #116 )
2016-02-08 10:25:06 +00:00
FrancescoUK
1b0bcf4e0b
Make bootstrap flatly the default ospos theme ( #116 )
...
Needs customisation on templates/<theme>/css/.. path to allow other templates to load just fecthing new css
2016-02-08 10:23:52 +00:00
jekkos
7180e7e9ed
Update changelog for 2.3.4
2016-02-08 07:42:04 +01:00
FrancescoUK
09831faaf4
Fix reports listing font size ( #116 )
2016-02-07 23:16:54 +00:00
FrancescoUK
a5e66eabed
Fix reports listing missing </div> issue ( #116 )
2016-02-07 23:11:27 +00:00
FrancescoUK
25f8a34b23
Change buttons in all the forms to use bootstrap button class ( #116 )
2016-02-07 23:04:59 +00:00
FrancescoUK
eb0cf07f4a
Adjust flatly style.css ( #116 )
2016-02-07 23:04:44 +00:00
FrancescoUK
375f6860aa
Small fix on class tags order ( #116 )
2016-02-07 23:04:19 +00:00
FrancescoUK
79f0961e09
Add jumbotron container to the footer ( #116 )
2016-02-07 23:04:01 +00:00
FrancescoUK
9ddccc6592
Fix footer overlapping last lines of the page (e.g. totals) ( #116 )
2016-02-07 23:03:44 +00:00
FrancescoUK
6606535fa9
remove dbbackup on logout from the two bootstrap themes ( #116 )
2016-02-07 23:03:18 +00:00
FrancescoUK
2ea14273b8
Merge branch 'ci3' into bootstrapUI
2016-02-07 18:07:54 +00:00
FrancescoUK
445222bcdd
Merge branch 'master' into ci3
2016-02-07 18:03:44 +00:00
jekkos
40ddfdc2ab
Merge pull request #319 from daN4cat/master
...
Remove dbbackup on logout #318
2016-02-07 15:09:02 +01:00
FrancescoUK
345d2d95d8
Remove dbbackup on logout ( #318 )
2016-02-05 18:42:04 +00:00
FrancescoUK
8a22f1c889
Merge branch 'ci3' into bootstrapUI
2016-02-05 17:03:57 +00:00
FrancescoUK
8d47faadd7
Merge branch 'master' into ci3
...
# Conflicts:
# package.json
2016-02-05 17:01:07 +00:00
FrancescoUK
d07ed0c09f
Merge remote-tracking branch 'jekkos/develop/2.4' into ci3
2016-02-05 16:57:27 +00:00
jekkos
24b4c98d94
Merge pull request #317 from daN4cat/master
...
Fixes to phppos to ospos 2.3.4 migration script #258
2016-02-05 17:36:16 +01:00
FrancescoUK
ea6fffc525
Add version liner so we remember which version the script works with ( #258 )
2016-02-05 09:06:54 +00:00
FrancescoUK
a0b422be34
Fix source script phppos_migrate.sql too ( #258 )
2016-02-05 09:05:57 +00:00
FrancescoUK
6599ea6678
Fix and add data copy rules. Tested script ( #258 )
2016-02-04 23:04:13 +00:00
jekkos
36cf19b1b9
Properly save company_name in customer form
2016-02-04 23:09:03 +01:00
FrancescoUK
9d056b2765
Remove invoice_number from phppos SQL migration script ( #258 )
2016-02-03 18:14:00 +00:00
jekkos
5c16c2a21a
Use grep and wait for mysql to come up properly ( #305 )
2016-02-03 17:42:44 +01:00
jekkos
acd9beae73
Set npm package version number
2016-02-03 17:29:01 +01:00
jekkos
e598817287
Set correct version for npm package
2016-02-03 17:18:28 +01:00
jekkos
35d53e2fae
Fix base url for testcases ( #305 )
...
Fix legacy ubuntu repository urls (#284 )
2016-02-03 11:09:45 +01:00
jekkos
fa3d77299e
Use curl to wait for apache start ( #305 )
2016-02-03 11:04:09 +01:00
jekkos
48a16d65e1
Fix base url for testcases ( #305 )
...
Fix legacy ubuntu repository urls (#284 )
2016-02-03 10:49:20 +01:00
jekkos
89f126ab04
Use curl to wait for apache start ( #305 )
2016-01-31 16:03:19 +01:00
jekkos
67d9ca1e41
Merge branch 'master' into develop/2.4
...
Conflicts:
Dockerfile
2016-01-29 17:34:53 +01:00
jekkos
8f9d80a809
Wait for container before running integration tests ( #305 )
...
Add integratoin test for quantity units (#305 )
2016-01-29 17:24:28 +01:00
FrancescoUK
8698026e86
Fix indentation
2016-01-28 09:32:46 +00:00
FrancescoUK
ec5d0ab4f7
Merge branch 'ci3' into bootstrapUI
2016-01-28 09:31:19 +00:00
FrancescoUK
3425920cb6
Merge branch 'master' into ci3
2016-01-28 09:05:35 +00:00
jekkos
85c6da4346
Add integration test for making receiving ( #305 )
...
Update docker scripts to work with data volumes (#284 )
2016-01-27 20:11:21 +01:00
jekkos
93460daadf
Make 2.4 version string npm compatible
2016-01-27 11:00:18 +01:00
jekkos
574548f360
Merge branch 'master' of https://github.com/jekkos/opensourcepos
2016-01-26 20:27:58 +01:00
jekkos
847c4a67c9
Add integration test for making sale ( #305 )
2016-01-26 20:27:07 +01:00
jekkos
8aab154a9f
Disable sudo for travis tests, omit nodejs version
2016-01-26 16:27:06 +01:00
jekkos
a3119d1993
Add integration test for creating new item
2016-01-26 08:44:48 +01:00
jekkos
0a159c803f
Add testcase for creating new item
...
Optimise CI setup
2016-01-25 21:14:48 +01:00
jekkos
22a7231d8f
Run docker container in background + launch tests once ready
2016-01-25 19:16:13 +01:00
jekkos
c36f6b603d
Run docker interactively in travis script step
2016-01-25 17:53:47 +01:00
FrancescoUK
05ff49616d
Retouch opensourcepos.min.js hash changed due to merge from master -> develop/2.4
2016-01-25 09:47:41 +00:00
FrancescoUK
342b889371
Merge branch 'ci3' into bootstrapUI
2016-01-25 09:44:08 +00:00
FrancescoUK
8e5b8712c0
Merge branch 'master' into ci3
2016-01-25 09:20:04 +00:00
jekkos
f063aa16a8
Launch webdriver test in docker container
2016-01-25 09:34:10 +01:00
jekkos
2520970698
Fix comment for autogenerated sql files ( #301 , #258 )
2016-01-25 08:42:15 +01:00
jekkos
a21a825aac
Merge pull request #299 from daN4cat/master
...
Add a live clock functionality (#298 ) and fix Gruntfile.js (#297 )
2016-01-25 08:36:43 +01:00
FrancescoUK
d66829d62d
Merge branch 'ci3' into bootstrapUI
2016-01-24 23:01:41 +00:00
FrancescoUK
f52c5b0843
Add a live clock functionality to flatly and spacelab templates ( #298 ) ( #116 )
2016-01-24 22:57:13 +00:00
FrancescoUK
d48dc8b87b
Merge branch 'master' into ci3
2016-01-24 22:44:45 +00:00
FrancescoUK
8f72756737
Add a live clock functionality ( #298 ) fix Gruntfile.js ( #297 )
2016-01-24 22:34:05 +00:00
FrancescoUK
4fd7948987
Made flatly as default, various header adjustments, added login with bootstrap ( #116 )
2016-01-24 20:05:36 +00:00
FrancescoUK
e76833d364
Merge 'cpl2015/boostrapUI' into bootstrapUI ( #116 )
2016-01-24 11:36:06 +00:00
FrancescoUK
3cb0094dde
Merge branch 'bootstrapUI' of git://github.com/cpl2015/opensourcepos into cpl2015-boostrapUI
...
# Conflicts:
# application/config/theme.php
2016-01-24 11:30:05 +00:00
FrancescoUK
946c50b222
flatly header.php code reformatting ( #116 ) ( #296 )
2016-01-24 10:43:56 +00:00
FrancescoUK
1dccee389d
Add favicon to flatly header.php ( #116 ) ( #296 )
2016-01-24 10:43:26 +00:00
FrancescoUK
875c0b31b7
Apply changes from #226 ( #116 )
2016-01-24 10:39:58 +00:00
FrancescoUK
8bf77e27dc
Change header template ( #116 )
2016-01-24 10:39:58 +00:00
FrancescoUK
a51352017a
Overriding view files ( #116 )
2016-01-24 10:39:58 +00:00
FrancescoUK
68b28a17e4
Merge branch 'master' into ci3
2016-01-24 10:38:26 +00:00
jekkos
463af45e73
Remove test run in pre_install (travis-ci)
2016-01-24 10:28:00 +00:00
FrancescoUK
4ccab6b8b5
Code reformatting ( #296 )
2016-01-24 10:27:41 +00:00
FrancescoUK
1849ee807c
Add favicon ( #296 )
2016-01-24 10:27:15 +00:00
cpl2015
bd7b4a1c14
Create style.css
2016-01-24 03:04:24 +05:30
cpl2015
c20520c877
Delete style.css
2016-01-24 03:00:29 +05:30
cpl2015
35aec3c34f
Update header.php
2016-01-24 02:59:08 +05:30
cpl2015
d9e18551b5
Update receiving.php
2016-01-24 02:52:22 +05:30
cpl2015
144da1ed6b
Update theme.php
2016-01-24 02:34:36 +05:30
cpl2015
125ffe9f73
Create home.php
2016-01-24 02:33:51 +05:30
cpl2015
a94f32dc50
Delete home.css
2016-01-24 02:33:08 +05:30
cpl2015
8c338fc223
Create footer.php
2016-01-24 02:32:36 +05:30
cpl2015
ca764a3165
Create header.php
2016-01-24 02:31:54 +05:30
cpl2015
b58547f988
Create home.css
2016-01-24 02:30:23 +05:30
cpl2015
05fbe8b218
Create style.css
2016-01-24 02:26:20 +05:30
cpl2015
823f8f0be3
Create bootstrap.css
2016-01-24 02:24:53 +05:30
cpl2015
b40b06a18e
Delete spacelab
2016-01-24 02:16:38 +05:30
cpl2015
513250cadf
Create spacelab
2016-01-24 02:11:23 +05:30
cpl2015
216432f4b6
Update manage.php
2016-01-24 01:38:02 +05:30
cpl2015
2b5825f841
Update form.php
2016-01-24 01:34:59 +05:30
cpl2015
46987845b3
Update form.php
2016-01-24 01:34:12 +05:30
cpl2015
e1cead8241
Update form.php
2016-01-24 01:30:49 +05:30
cpl2015
63f72b046d
Update receiving.php
2016-01-24 01:24:14 +05:30
cpl2015
3fe39bbf73
Update register.php
2016-01-24 01:19:50 +05:30
FrancescoUK
81646a00ff
flatly header.php code reformatting ( #116 )
2016-01-23 10:08:37 +00:00
FrancescoUK
8edd6a2e49
Add favicon to flatly header.php ( #116 )
2016-01-23 10:05:57 +00:00
FrancescoUK
4cc3eadb97
Apply changes from #226 ( #116 )
2016-01-22 22:17:29 +00:00
FrancescoUK
4b9d5113d3
Change header template ( #116 )
2016-01-22 22:17:29 +00:00
FrancescoUK
206751de0e
Overriding view files ( #116 )
2016-01-22 22:17:29 +00:00
FrancescoUK
4dd3c64e9d
Code reformatting
2016-01-22 22:16:50 +00:00
FrancescoUK
b400393a90
Code reformatting
2016-01-22 22:14:42 +00:00
FrancescoUK
1f9cb92697
Add favicon
2016-01-22 19:14:57 +00:00
FrancescoUK
59fe366479
Add favicon
2016-01-22 19:05:07 +00:00
FrancescoUK
8eba67ceb8
Merge branch 'master' into ci3 ( #284 )
2016-01-22 14:57:25 +00:00
jekkos
1148ef1595
Install grunt-cli in docker container ( #284 )
2016-01-22 14:43:53 +01:00
jekkos
bcbdee3a50
Fix test execution for travis-ci (grunt invocation)
2016-01-22 13:37:30 +01:00
jekkos
cfbb700f0c
Add symlink for node in Dockerfile
2016-01-22 13:10:23 +01:00
FrancescoUK
95f6738d5b
Fix package.json version to be 2.4 ( #284 )
2016-01-22 11:31:13 +00:00
FrancescoUK
0cde54e985
Merge branch 'master' into ci3 ( #284 )
2016-01-22 08:39:24 +00:00
jekkos
a3d3cfad61
Use Dockerfile in travis-ci setup ( #284 )
...
Set version in package.json
2016-01-22 08:18:40 +01:00
FrancescoUK
b89e9c56cc
Merge branch 'master' into ci3 ( #284 )
2016-01-21 18:38:48 +00:00
jekkos
192955b33d
Fix receipt barcode generation for docker (add php5-gd lib to Dockerfile) ( #284 )
...
Make setup scripts with CI3
2016-01-21 18:30:06 +01:00
jekkos
195c8a0601
Make docker work with 2.4 branch
2016-01-21 16:23:54 +01:00
jekkos
9048d68baf
Make docker work wig
2016-01-21 16:23:17 +01:00
jekkos
2b70762b7a
Use ubuntu trusty for Docker container + add startup scripts ( #284 )
...
Add Grunt concatenate for sql scripts (migrate + db init) (#289 )
2016-01-20 18:47:44 +01:00
FrancescoUK
de2d034377
Update database/tables.sql script with new sessions table ( #120 )
2016-01-19 12:00:51 +00:00
FrancescoUK
f941a45d13
Update Copyright notice ( #120 )
2016-01-19 11:21:08 +00:00
FrancescoUK
4280e05679
Make the data blob NOT NULL in the SQL upgrade script ( #120 )
2016-01-19 08:24:58 +00:00
FrancescoUK
830f714a44
Change sessions to be stored in database and add SQL upgrade script 2.3.4 to 2.4 ( #120 )
2016-01-18 23:01:42 +00:00
FrancescoUK
f8c9acd88f
Fix to custom fields that cannot be null on Items save ( #120 )
2016-01-18 20:15:24 +00:00
jekkos
d67f08d842
Add (temp) fix for cur_page conuter in CI pagination libary ( #120 )
...
Fix .htaccess file
2016-01-18 19:23:44 +00:00
jekkos
72fc36c8f5
Add (temp) fix for cur_page conuter in CI pagination libary ( #284 )
...
Fix .htaccess file
2016-01-18 20:13:07 +01:00
FrancescoUK
3c22f9069b
Restore padding in pagination links, now it uses css ( #120 )
2016-01-17 19:02:08 +00:00
FrancescoUK
c2eaf88d74
Upgrade to CI 3.0.4 ( #120 )
2016-01-17 18:33:26 +00:00
FrancescoUK
b72d620b15
Added comments to some controller functions and improved spacing to improve readibility of code ( #120 )
2016-01-17 17:56:54 +00:00
FrancescoUK
dce413631c
Make NULL to be null all over the code for consistency purposes ( #120 )
2016-01-16 22:08:43 +00:00
FrancescoUK
5468127e2f
Further review and fixes to input->post(...) ( #120 )
2016-01-16 22:04:12 +00:00
FrancescoUK
d66e6ab6ef
Fix to items search not working due to input->post returning null ( #120 )
2016-01-15 22:53:09 +00:00
FrancescoUK
a3929d2c6f
Merge remote-tracking branch 'jekkos/master' into ci3
...
# Conflicts:
# application/config/database.php.tmpl
2016-01-15 18:57:11 +00:00
jekkos
b5cc1542b6
Merge branch 'master' of https://github.com/jekkos/opensourcepos
2016-01-13 18:58:40 +01:00
jekkos
1a77960daa
Update README.md with instructions for Docker setup
2016-01-13 18:57:44 +01:00
jekkos
301fbf4427
Merge pull request #283 from ais-one/ais-one-php7-fix
...
php7 fixes
2016-01-13 17:59:01 +01:00
Aaron Gong
2f0666325f
PHP7 Fix
...
Use __construct as constructor instead of Class name
2016-01-13 15:59:37 +08:00
Aaron Gong
d0c765ce20
PHP7 fix
...
Change driver from mysql to mysqli
2016-01-13 15:58:20 +08:00
jekkos
a1ad99cc0d
Add Dockerfile. Ospos is now containerized. Pull image from
...
docker build -t me/ospos git://github.com/jekkos/opensourcepos.git
then run
docker run -it me/opensourcepos
And head to port 80 to login to a new ospos install.
2016-01-13 08:45:10 +01:00
jekkos
2d0b20499e
Set correct locale for Dutch (Belgium)
2016-01-11 18:53:57 +01:00
FrancescoUK
5b01e60ed2
Merge branch 'master' #274 change into ci3
2016-01-10 13:13:55 +00:00
jekkos
26ff81ab71
Generate languages for German (Swiss) #274
2016-01-09 17:29:57 +01:00
Thorsten
da3349765a
Add de_CH language (by nano-riff #274 )
2016-01-09 16:46:00 +01:00
FrancescoUK
b470fbfb3d
Fix merge miss in constants.php ( #120 )
2016-01-07 20:57:57 +00:00
FrancescoUK
1f86842757
Complete CI 3.0.3 upgrade since it wasn't done in full ( #120 )
2016-01-07 20:16:59 +00:00
FrancescoUK
de47b11880
Remove application/errors, upgrade Step 8 ( #120 )
2016-01-07 19:09:53 +00:00
FrancescoUK
6b2b3969ec
EXT constant deprecated, upgrade Step 20 ( #120 )
2016-01-07 19:09:53 +00:00
FrancescoUK
14c5a0823b
Follow upgrade guideline Step 9 ( #120 )
2016-01-07 19:09:53 +00:00
FrancescoUK
98b5c8da28
Fix reports error due to report.php now being Report.php ( #120 )
2016-01-07 19:09:53 +00:00
FrancescoUK
cd7060afed
Change config language to be 'en' consistent with the OSPOS language identifiers ( #120 )
...
However language support doesn't work properly at the moment.
2016-01-07 19:09:53 +00:00
FrancescoUK
0787264f71
Improve .htaccess with some security rules ( #120 )
2016-01-07 19:09:53 +00:00
FrancescoUK
347609d20c
Upgrade config.php and database.php.tmpl to CI 3.0.3 versions ( #120 )
...
Apparently the upgrade wasn't complete.
2016-01-07 19:09:53 +00:00
FrancescoUK
0340dc7ffc
Remove application/config.php and database.php ( #120 )
2016-01-07 19:06:35 +00:00
Toni Haryanto
d8057830c6
Upgrade to Code Igniter 3.0.3 ( #120 )
2016-01-07 19:06:35 +00:00
jekkos
4ddde65b41
Bump version to 2.3.4
...
Update dutch translation for company_name
Fix timeformat for date filtering in items module
2016-01-07 19:53:52 +01:00
jekkos
c408afad67
Cleanup migration script, mostly working now ( #262 )
2016-01-05 17:41:43 +01:00
jekkos
b1ba7d0afe
Split up database.sql in scripts for tables and contraints.
...
Use both new scripts in phppos_migrate.sql
2016-01-05 07:41:49 +01:00
FrancescoUK
31a223cece
Merge pull request #272 from daN4cat/master
...
#271 fix to error witn xampp due to a spurious "git"
2016-01-04 22:13:29 +00:00
FrancescoUK
3bd778737f
#271 fix to error witn xampp due to a spurious "git"
2016-01-04 22:09:38 +00:00
jekkos
648251978e
Merge pull request #270 from daN4cat/master
...
Fixes to #265 , #267 and #269
2016-01-04 22:13:25 +01:00
FrancescoUK
240c96a185
#267 remove warning due to junk dirs being inside a language/xx one
2016-01-04 19:44:15 +00:00
FrancescoUK
810000e37c
#265 do not override 404 handler in routes.php
2016-01-04 18:23:16 +00:00
FrancescoUK
6aa5126bf0
#269 fix https error issue
2016-01-04 17:55:00 +00:00
jekkos
90591382ce
Further cleanup phppos migration script ( #262 )
2016-01-04 17:26:42 +01:00
jekkos
9e2d89c528
Show discounted price instead of discount itself on receipt
2016-01-04 17:19:50 +01:00
jekkos
1601d679fd
Takings not using proper permission ( #262 )
2016-01-04 17:04:33 +01:00
jekkos
aa0409af48
Add phppos migration script (untested) #258
2016-01-01 17:10:43 +01:00
jekkos
ad194bd4c0
Fix typo in english translation ( #260 )
2016-01-01 16:46:58 +01:00
jekkos
1779685d31
Encode text before storing it as session variable ( #254 )
2015-12-30 08:10:14 +01:00
jekkos
51df82f35e
Update WHATS_NEW
2015-12-30 07:42:27 +01:00
jekkos
bf0622d7fa
Show discounted price per item line
2015-12-26 15:26:32 +01:00
jekkos
da25281df9
Show discounted price per item line
2015-12-26 15:21:54 +01:00
jekkos
2f52d083e8
Update changelog for 2.3.3
2015-12-26 13:13:47 +01:00
jekkos
eb63f49db7
Add barcode generation for EAN8 and EAN13 ( #111 , #246 )
...
Add config option to use generation when generating barcodes for an
Generate propery barcode with configured format if item_number empty
2015-12-26 11:42:58 +01:00
jekkos
c007513fc8
Fix barcode generation error for empty item numbers
2015-12-13 15:57:03 +01:00
jekkos
9f5782e0ba
Add validation for barcode types ( #111 , #246 )
...
Fallback to code128 if invalid EAN8 or EAN13 is detected
2015-12-13 15:51:25 +01:00
jekkos
2f14a0f868
Fix typo in store language line ( #247 )
2015-12-13 14:15:43 +01:00
jekkos
fb924daa81
Show reoder level in items form when editing ( #241 )
2015-12-04 18:13:05 +01:00
jekkos
1bb9acdc37
Fix for adding/deleting stock locations ( #242 )
2015-12-04 18:09:51 +01:00
jekkos
16d5dfce77
Merge pull request #244 from kamaroly/master
...
Fixed Severity: Notice Message: Only variable references should be returned by reference Filename: core/Common.php Line Number: 257
2015-12-03 23:06:22 +01:00
Kamaro Lambert
afa203e73c
Fixed error Only variable references should be returned by reference
...
Severity: Notice Message: Only variable references should be returned by reference Filename: core/Common.php Line Number: 257
2015-11-30 23:30:56 +02:00
jekkos
bc85391734
Submit form when hitting enter in search field for items module ( #187 )
2015-11-09 11:15:42 +01:00
jekkos
7c2cc9646d
Don't override custom invoice numbers ( #223 )
2015-11-09 10:46:35 +01:00
jekkos
c0303cc873
Merge branch 'master' of https://github.com/asakpke/RoshanTech.com-POS
2015-10-20 22:01:37 +02:00
jekkos
0ddd80dc2c
Regenerate thai language ( #205 )
2015-10-20 22:00:18 +02:00
songwutk
af582056d7
update sales_lang.csv : Thai
...
"sales_suspend_sale" too long in button, so change word fit.
2015-10-20 22:00:18 +02:00
jekkos
56859a77ab
Fix path for jquery-ui icons ( #207 )
2015-10-20 13:23:20 +02:00
jekkos
ec5846e1eb
Make receivings datetimepicker consistent with sales form ( #169 )
2015-10-18 21:37:49 +02:00
jekkos
6d5c192447
Add jquery-ui slider for datepicker #169
2015-10-17 00:22:57 +02:00
FrancescoUK
1b90ac14d2
#169 regenerate dist/ js scripts adding datetimepicker jQuery plugin
2015-10-15 19:12:50 +01:00
FrancescoUK
9c775ca44b
#169 Add date and time picker to receivings/form
...
Some code indentation for better readibility.
2015-10-15 18:03:46 +01:00
FrancescoUK
0d87fc51d9
#169 Add a date time picker to sales/form such user can edit transaction date not in a manual manner
...
Needs more testing with different date & time formats and sorting out of min.js
2015-10-14 11:40:59 +01:00
jekkos
c4c7d9d792
Merge pull request #169 from marteserede/master
...
Fix dateformat value in SQL-Query app_config
2015-10-12 09:36:37 +02:00
jekkos
455a5f59d1
Merge pull request #199 from souparno/bug-condition-statement
...
if condition statement missing, may result in server error
2015-10-10 15:09:10 +02:00
souparno
9cf5d5734f
if condition statement missing, may result in server error
2015-10-10 13:11:32 +05:30
jekkos
43b8d32efc
Don't use empty on php expression ( #196 )
...
Signed-off-by: jekkos <jeroen.peelaerts@gmail.com >
2015-10-09 17:11:24 +02:00
jekkos
0c25b01666
Add default line endings
2015-10-09 11:43:19 +02:00
jekkos
1fd7fda645
Fix totals calculation when adding item multiple times (issue #165 )
...
Fix typo in script comments
2015-10-09 10:24:38 +02:00
jekkos
3eb798917d
Clear out empty sales and receivings comments on database upgrade
...
(#192 )
2015-10-08 18:43:52 +02:00
jekkos
64023f6eec
Avoid comments coercion to 0 when suspending sales ( #192 )
...
Invoice number in suspended sales should not be unique
2015-10-08 18:29:55 +02:00
jekkos
d8a369f39d
Remove unique constriant from invoice_number column in suspended_sales
2015-10-08 18:29:55 +02:00
jekkos
98b0df9e80
Merge pull request #194 from daN4cat/master
...
#192 Remove 0 from comments
2015-10-07 13:11:18 +02:00
FrancescoUK
763a9e73fa
#192 Remove 0 from comments
...
Checked in library get_comment if the string is null and return a '' if that's the case. That removes the 0 from sale comments
2015-10-07 09:37:27 +01:00
jekkos
df5a0448aa
Merge pull request #193 from daN4cat/master
...
#192 Fix to comment not saved when suspending a Sale
2015-10-07 10:07:31 +02:00
Aamir Shahzad
76365afbd2
Added my name, ID and website in COPING
2015-10-06 22:58:37 +05:00
Aamir Shahzad
6e27b4c9ec
Extra comments removed
2015-10-06 22:52:00 +05:00
FrancescoUK
a7e2ea5fa7
#192 Fix to comment not saved when suspending a Sale
...
The issue was that for a strange reason the comment was fetched directly from the form instead of using the sale_lib->get_comment like in the rest of the code.
2015-10-06 17:55:58 +01:00
Aamir Shahzad
986bbc9b36
Better Navigation with TAB key on Sales page
2015-10-06 03:31:57 +05:00
FrancescoUK
03f6d234bc
#175 Fix inverted sorting issue
2015-09-28 22:47:16 +01:00
FrancescoUK
79361c976c
Refactoring around items and sales search
2015-09-28 19:21:35 +01:00
FrancescoUK
1296f393d7
#175 Add pagination links
2015-09-28 18:24:02 +01:00
FrancescoUK
e49dd4e0b9
#179 Make Items Kit icon visible on home page
...
Remove the if statement that was in the end preventing any module having a _ to be displayed in the home page.
This solution is consistent with navigation bar one.
Also done some indentation in header and footer to improve readibility.
2015-09-28 13:12:22 +01:00
FrancescoUK
319545b989
#180 Fix to allowing a sale suspend before any payment
...
Reformatted the register code to increase readibility.
Please note that the real change is just moving the Suspend Sale button from finish_sale_form to cancel_sale_form, adding float:left style to Cancel button and changing the javascript for Suspend sale to address the correct form.
2015-09-28 08:59:22 +01:00
FrancescoUK
4a3e9ef79d
#167 Limit description and serialnumber to 30 char before saving item to sale or suspended sale tables
2015-09-27 18:08:10 +01:00
FrancescoUK
e566223db9
#168 Items Kit: search by KIT id
2015-09-27 16:49:50 +01:00
FrancescoUK
22406d0c3a
Merge pull request #176 from daN4cat/master
...
#165 Fix invoice wrong date on sale completion
2015-09-27 16:39:52 +01:00
FrancescoUK
8bb108503c
#165 Fix invoice wrong date on sale completion
2015-09-25 19:02:03 +01:00
jekkos
1eb43d2a74
Merge branch 'master' of https://github.com/jekkos/opensourcepos
2015-09-24 22:02:23 +02:00
jekkos
56f7be21ae
Merge pull request #171 from souparno/bug-fix-reset-database
...
reset database syntax contains check, so as it can be used to create…
2015-09-23 22:57:46 +02:00
FrancescoUK
ba6ecf0319
#132 Fix date range missing end date items
2015-09-23 18:04:04 +01:00
souparno
47c8d6c0bd
reset database syntax contains check, so as it ccan be used to create the database for the first time
2015-09-23 21:29:17 +05:30
FrancescoUK
d9c49c1a72
#132 revert a modification in item model
2015-09-23 13:00:34 +01:00
FrancescoUK
5af7473769
#132 Set 1-1-2010 as starting date for the date range
2015-09-22 19:01:40 +01:00
FrancescoUK
aa9cd1fe6a
#132 Make sure we don't show multiple times the same item given a range
2015-09-22 18:38:21 +01:00
FrancescoUK
58899ca4cf
#132 Added date range in item model. Smoke test fine, more to test
2015-09-22 18:38:20 +01:00
FrancescoUK
404bc47e96
#132 Added date picker to Items manage, added date range to controller + model
2015-09-22 18:38:19 +01:00
jekkos
7dfcec394f
Substitute invoice numbers on complete once again ( #163 , #150 )
2015-09-22 18:21:19 +02:00
jekkos
0646200f6c
Increase colspan for suppliers list
...
Multiple item kit price with quantity at hand
2015-09-22 07:40:48 +02:00
Martes Erede
2bc7b688ff
Fix dateformat value in SQL-Query app_config
2015-09-22 07:17:57 +02:00
FrancescoUK
9309d7f15b
Fix to COPYING file to follow correct license & copyright format (see http://mit-license.org/ )
2015-09-20 21:48:23 +01:00
FrancescoUK
87153fc70e
Add time ranges for quick report searches
2015-09-20 15:03:16 +01:00
FrancescoUK
ff12531b42
Revert " #159 Fixed typo in comment"
...
This reverts commit f18b54a758 .
2015-09-20 14:54:54 +01:00
FrancescoUK
f18b54a758
#159 Fixed typo in comment
2015-09-20 09:18:57 +01:00
FrancescoUK
9a47b448ac
#153 Set private internal functions
2015-09-20 09:18:03 +01:00
FrancescoUK
569bf4db69
#111 Change databse.sql barcode defaults
2015-09-19 17:52:14 +01:00
FrancescoUK
f97e02c3d4
Items: allow custom field suggestion and search if checkbox is ticked
2015-09-19 17:46:28 +01:00
FrancescoUK
893345d334
#111 Change barcode types from numbers to strings for better code readability
2015-09-19 17:44:43 +01:00
FrancescoUK
80fcede1ca
#152 Remove Alain name and add it to the COPYING under the Copyright section
2015-09-19 17:40:00 +01:00
FrancescoUK
461de2f048
#162 fix further issues due to cost & retail prices added to the table
2015-09-19 15:23:16 +01:00
FrancescoUK
4106378a6c
Changed CONCAT and use of " & '
2015-09-19 13:19:49 +01:00
FrancescoUK
dfb556b27b
Fixed typo in comment
2015-09-19 12:43:08 +01:00
FrancescoUK
41607c23bd
Fix to #161 when searching a Kit by name in Sales
2015-09-19 12:38:21 +01:00
FrancescoUK
a29b8c2a62
Added Kit prices to table view and barcode #162
...
Some spacing and retouching here and there.
2015-09-19 12:05:44 +01:00
FrancescoUK
dc45b77573
Fix to Gift card totals issue #159
...
Various indentation adjustments
2015-09-19 09:22:24 +01:00
FrancescoUK
ad948ac81e
Fix to rebase/merge mistake with Barcode_lib
2015-09-18 18:05:43 +01:00
FrancescoUK
eee7f137ef
Fix to rebase/merge mistake with Barcode_lib
2015-09-18 18:33:32 +02:00
jekkos
2237c332b9
Derive barcode id from item array
2015-09-18 18:33:22 +02:00
FrancescoUK
d5cf608bac
Fix to #152 remove name of people from code comment and add them to COPYING license file
2015-09-18 18:33:22 +02:00
FrancescoUK
96973da280
Item kits issue #155 fix
...
Added Kit Id column to table view
2015-09-18 18:33:22 +02:00
FrancescoUK
bca4386aed
Fix to sale and receiving receipt barcode
2015-09-18 18:33:22 +02:00
FrancescoUK
27f89a63be
remove the - from language/id/common_lang.php
2015-09-17 22:00:06 +02:00
FrancescoUK
3f5d0b781b
Fix to $lang["common_last_page"] issue #156
2015-09-17 22:00:06 +02:00
FrancescoUK
0984cdbfc4
Fix to sale and receiving receipt barcode
2015-09-17 22:00:06 +02:00
FrancescoUK
c48106f2f5
Fix items view search issue having a ' in the string. Bug #149
2015-09-17 21:59:34 +02:00
jekkos
e1ddcbbb5b
Rename Item_quantities model to Item_quantity
...
Rename Stock_locations model to Stock_location
Fix barcode generation in receipts (sales + receivings)
2015-09-17 21:59:33 +02:00
FrancescoUK
2b7ceb4228
Move Print button in sale/manage (Takings) to top right
2015-09-17 21:59:33 +02:00
jekkos
3c89416b83
Update languages
2015-09-15 23:21:59 +02:00
jekkos
290aee4671
Merge branch 'patch-13' of https://github.com/songwutk/opensourcepos
2015-09-15 23:01:10 +02:00
FrancescoUK
10ea821b2a
Leave item_number empty if Code39/128 is selected
...
Added Empty UPC checkbox in Items view to easily select empty items that need barcode code generation and in case of EAN8/13 fill in item_number
Added language for Empty UPC string
Indentation/spacing adjustment
2015-09-15 17:49:51 +01:00
FrancescoUK
cf0276c772
If item_number (UPC/EAN/ISBN) is empty and a new barcode is generated save it in the item_number field and update the item entry
...
Refactoring of barcode_lib
Some code alignment adjustment here and there
2015-09-15 11:13:58 +01:00
FrancescoUK
8f2740d349
Centred barcode image
...
Moved $data to base class and added getData
Fixed indentation
2015-09-14 23:20:20 +01:00
FrancescoUK
eb71dbc300
Fix EAN 13 typos + set pix per bar
...
Add EAN 8 support
2015-09-14 23:20:19 +01:00
FrancescoUK
68915dd28c
Ean13 code generation implementation
2015-09-14 23:20:19 +01:00
FrancescoUK
93d8775ac5
Remove extra comma from end of array
2015-09-14 23:20:18 +01:00
FrancescoUK
807d48ac7b
Add EAN13 in Barcode lib
...
Sketched EAN13 class code
Fix typo
2015-09-14 23:20:17 +01:00
FrancescoUK
79fd666bff
Add Ean13 file and class
...
Fixed typos
2015-09-14 23:20:16 +01:00
FrancescoUK
393ac9bb97
Fixed some minor issues
2015-09-14 23:20:15 +01:00
songwutk
ac95e1f7d8
Update common_lang.csv
...
Fill thai blank topic.
2015-09-14 16:30:40 +07:00
jekkos
c843c174ed
Initialize table sorting if this didn't happen when the page was loaded
...
initially (#139 )
2015-09-14 08:26:41 +02:00
jekkos
d6f052f082
Add default translation in other languages as well ( #142 )
2015-09-12 20:55:54 +02:00
jekkos
a78ef2fb08
Merge branch 'master' of https://github.com/marteserede/opensourcepos
2015-09-12 20:16:46 +02:00
Martes Erede
4cbbd3a6f7
[ #32 ] using to_currency for currency values in table-data
2015-09-11 16:16:34 +08:00
Martes Erede
4a8c3a83b3
[ #32 ] adding new language-strings and running generate_languages.php
2015-09-11 15:59:27 +08:00
Martes Erede
308be8079f
[ #32 ] improving the inventory summary report, including total inventory value
2015-09-11 15:58:57 +08:00
jekkos
335ced948e
Remove unneeded fields from sales_temp table
2015-09-09 23:20:31 +02:00
jekkos
b41a006a79
Fix duplicated payment amounts ( #136 )
2015-09-09 23:09:28 +02:00
jekkos
506aced23e
amount_due and change_due were incorrect if multiple items in sale
...
(#136 )
2015-09-09 19:25:44 +02:00
jekkos
e9ea2ba792
Create temp table when necessary
2015-09-07 22:53:19 +02:00
jekkos
2c5f3ee759
Add grunt-cache-breaker plugin ( #137 )
...
Fix tax inclusive pricing for daily sales overview (#136 )
Fix table sorting when using search in daily sales overview (#131 )
2015-09-07 22:15:41 +02:00
jekkos
b680cdff36
Fix table sorting after loading search results
2015-09-07 08:35:59 +02:00
jekkos
80f7966d1c
Add default dateformat and timeformat in data scripts
2015-09-06 15:53:11 +02:00
jekkos
e62df579f1
Keep last row in position even after filtering
2015-09-06 13:33:12 +02:00
jekkos
2b6b3914a7
Mark totals row as static (keep it at bottom of the table issue #131 )
2015-09-06 13:19:32 +02:00
jekkos
756b675e2b
use configured dateformat for jquery ui date parser
...
disable sorting on columns 0 and 9 (no data there)
default sorting enabled on column 1
2015-09-05 15:05:20 +02:00
jekkos
1d65ceaccf
Merge branch 'master' of https://github.com/daN4cat/opensourcepos
2015-09-05 09:52:48 +02:00
jekkos
0c92cc661f
Remove date field type for filters
2015-09-05 09:52:30 +02:00
FrancescoUK
c87a936e22
Fix language issue
2015-09-04 23:24:53 +01:00
FrancescoUK
c041a18624
Added Print button to print the current view
2015-09-04 22:51:12 +01:00
jekkos
ac3aab51fa
Fix payment summary update on search
2015-09-04 23:35:23 +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
FrancescoUK
7bbd651779
Remove commented out lines
2015-09-04 10:11:02 +01:00
jekkos
a624d21fcd
Fix sale detail edit
...
Make last row in sale table bold (css)
Add default date range between yesterday and today
Temporarily comment out payment type listing in table itself (tbd)
2015-09-04 08:44:20 +02:00
jekkos
9a2cafc1b1
Review payment type overview
...
Add some padding to bottom of content area
Fix invoice only searching
Make start and end dates optional
2015-09-03 23:35:57 +02:00
FrancescoUK
b226a40efc
Make Gift Card one payment item and not multiple ones in Sale/Overview and in Summary Payment report.
...
Fixed also the colspan and set to 10.
2015-09-03 19:18:15 +01:00
FrancescoUK
0b8a263443
Sale Overview change:
...
- set today as view date and comment out the debug dates
2015-09-02 23:22:44 +01:00
FrancescoUK
75fa706299
Sale Overview change
...
- Refactor and optimise payments part (added now amount to detail sale report too)
- fix some </tr> that should have been </td>
- minor indentation fixes
NOTE: The only_invoices checkbox is not responsive
2015-09-02 23:16:26 +01:00
FrancescoUK
c88f37f8e7
Change Sale Overview to become a daily takings view with totals.
2015-09-01 23:37:26 +01:00
jekkos
3e24b9caff
Remove non working datepicker icon
...
Remove in_array check for duplicated company_name
2015-08-24 21:52:41 +02:00
jekkos
517363b485
Fix deleted checkbox in items form
...
Clear suggestion cache when toggling deleted filter
2015-08-18 18:10:00 +02:00
jekkos
011caf375f
Apply is_deleted in item suggestion search
2015-08-18 08:35:21 +02:00
FrancescoUK
9f1485cfe5
Added Cost & Count to reports, improved Items suggest, added copyrights and some fixes
...
Added cost and count to reports
- Added cost in temp table, reports at bottom of page and in each
summary and detailed report
- Added count in all the reports
- Renamed some report fields name to make it generic and consistent
across views
- Fixed few issues here and there
- Adjusted some code indentation
NOTE: Proper translation of word Cost is required in all the languages
but English
Improved Items suggestion
- Added select to restrict results fields
- Added distinct in suppliers instead of the array match
- Added $is_deleted in model part but is not still effective
Add copyright statements in COPYING license file
- Added jekkos and FrancescoUK / daN4cat
Other people that contributed should add their statements.
2015-08-17 11:13:04 +01:00
jekkos
0336fe6298
Stop showing duplicate suggestions for company_name
2015-08-16 15:52:25 +02:00
jekkos
4ab2ec1b5b
Add supplier attribute search for items (pull request #106 )
...
Add company name to supplier column in summary report
2015-08-16 15:41:39 +02:00
jekkos
eb3657e76f
Fix upgrade script (2)
2015-08-13 22:53:52 +02:00
jekkos
61206547cb
FIll in empty location_ids for existing data
2015-08-12 15:10:08 +02:00
songwutk
9ae6e3242b
Update Thai translate (Pull requests #98 , #99 , #100 , #101 , #102 )
2015-08-11 18:49:28 +02:00
jekkos
7f5fe9efde
Upgrade grunt-mocha-webdriver
2015-08-10 15:32:00 +02:00
jekkos
9e189a503e
Merge pull request #105 from gabrielperezs/master
...
Solved to issues in this request. Spanish support, and temp table creation.
2015-08-10 11:03:58 +02:00
Gabriel Pérez S
da41aec0d1
Spanish traslation
2015-08-10 10:26:11 +02:00
Gabriel Pérez S
03b9924d57
Create table if not exists
2015-08-10 10:14:03 +02:00
jekkos
87222611e6
Remove duplicated last name for suppliers
2015-08-10 09:30:01 +02:00
FrancescoUK
cc06d93d30
Remove LICENSE file (use COPYING now instead)
...
Update agency_name constraint in update script
Show supplier_id in suppliers for use with item excel import
2015-08-09 12:01:09 +02:00
jekkos
7926a05948
Regenerate language files
...
Remove committed merge conflict in giftcard_numbering.js
Add sql upgrade script for 2.3.3
2015-08-07 17:17:53 +02:00
FrancescoUK
d7ff4a371c
Fix to the License naming clash issue
...
- Instead of LICENSE used COPYING (it's accepted see:
http://www.theregister.co.uk/2013/04/18/github_licensing_study )
- removed license.txt inside license dir to avoid unnecessary
duplications or clash of license of the ospos code. COPYING is anyway a
rename of LICENSE that was a newer version than the one in
license/license.txt
2015-08-07 15:02:15 +02:00
FrancescoUK
aa144b43eb
Fixed invoice date bug
...
The invoice date was not showing the correct date and neither following
the selected format
2015-08-07 15:02:15 +02:00
FrancescoUK
f806ea84b3
Update to Suppliers feature
...
- added Agency name to identify agent or distributor behind a brand
- updated view to show supplier ID useful for item imports via excel
sheet
- update database table
- updated language although missing translations
- various bit an pieces missing due to failed rebase
2015-08-07 15:02:15 +02:00
jekkos
17ac5b1837
Bump version number to 2.3.3
2015-07-25 12:03:04 +02:00
FrancescoUK
8bcd2a69dc
Add better locale config support (pull request #93 )
...
I've added in this commit the following:
- the means to configure date and time format
- date and time is shown with the selected formats
- a locale tab in the configuration page
- changed location tab to be stock tab and the same for the file names
- translation strings (only English) for the case
NOTE 1: Not related to Locale support but I removed an extra <div
class="field_row clearfix"> from general_config.php
NOTE 2: There is no rules in the submit checks of Locale. Probably this
is something to iron out a bit
NOTE 3: It would be probably nice to add a button in the Locale tab to
regenerate all the translation files in case somebody updates the
translations .csv
Fixed Local config
- Removed text in Red as really not mandatory configuration
- Added time format in 24h and 12h
Updated General Config tab
- reorganised the layout grouping things like company info, taxes and
invoice formating
- increased the limit of max lines per page to 1000 because 50 is too
little. People can do what they want with up to 1000
2015-07-25 12:02:10 +02:00
jekkos
e0f80528f4
Fix report generation regression
2015-07-15 18:14:58 +02:00
jekkos
491d8d0b72
Increase testcase delays
...
Keep keys order when reversing array for stock location options
2015-07-14 18:17:54 +02:00
jekkos
80dcc2f63f
Increase waiting timeout for phantomjs test
...
Revert old database script
Add styling rules for number typed input fields
2015-07-14 12:36:43 +02:00
jekkos
92da2749ad
Adapt report summary to chosen stock location
...
Update release notes
2015-07-13 18:39:50 +02:00
jekkos
83a297cf15
Add stock location as filter to detailed sales + receivings reports
2015-07-10 19:04:52 +02:00
jekkos
70b7a03c63
Show item location next to quantity purchased in detailed receiving and
...
sale report
Remove duplicate suggestions in sale and receiving module
Show item location on receipt if multiple are configured
Check if item location is allowed when adding items in sale or receiving
2015-07-08 21:41:41 +02:00
jekkos
b1f1feda48
Show alternative description on invoice only if not empty
2015-07-01 08:29:53 +02:00
jekkos
48fe4aa4cf
Show item alternative description if available
...
Show sale instead of customer comments on invoice
2015-06-30 23:08:56 +02:00
jekkos
0788f4eef9
Set precision to 5 decimals (constants.php)
...
Show item description if serialized (invoice.php)
2015-06-28 14:20:39 +02:00
jekkos
fc5f097820
Add proper validation for module grants (issue #87 )
2015-06-23 23:32:56 +02:00
jekkos
df7907fb8f
Don't lose date precision when editing sale or receiving
...
Extend date validator to allow timestamps as well (sale + receiving)
Fix receiving edit
2015-06-20 20:58:41 +02:00
jekkos
46b5c18aca
Add receiving_quantity field to ospos_receivings (issue #78 )
...
Detailed receiving now correctly shows purchased quantity
2015-06-20 14:59:37 +02:00
jekkos
5c1ecf4618
Update .gitattributes with merge strategy for specific files
2015-05-25 13:28:03 +02:00
jekkos
ccc2af2a26
Show tax exclusive subtotal in case of tax inclusive pricing
2015-05-23 16:51:42 +02:00
jekkos
872d6857cd
Add decent delay for waitForElement in wd test
2015-05-22 23:29:25 +02:00
jekkos
658792c1fc
Fix invoice return
2015-05-22 19:26:56 +02:00
jekkos
4a324fbf4c
Fix inventory update on deleting sale (issue #80 )
2015-05-22 19:26:56 +02:00
jekkos
97d268e323
Tax summary report calculation fixes
2015-05-22 07:54:07 +02:00
jekkos
ca05583ec3
Merge branch 'master' of https://github.com/jekkos/opensourcepos
2015-05-21 22:12:50 +02:00
jekkos
7d0a6dc7ae
Merge branch 'feature/travis-ci'
2015-05-21 22:12:30 +02:00
jekkos
3ba3a3dea0
Merge branch 'travis-ci-setup'
...
Conflicts:
test/login.js
2015-05-21 22:10:28 +02:00
jekkos
1ad08c014f
Fix giftcard numbering issue #65
2015-05-21 22:00:33 +02:00
jekkos
3936f2dcf3
Add giftcard numbering test
2015-05-20 18:35:10 +02:00
jekkos
fcc71a5f74
Sale reporting now takes tax inclusive pricing into account
2015-05-19 22:44:03 +02:00
jekkos
46f6824199
Fix rounding issues with tax inclusive pricing
...
Add autocomplete in return mode
2015-05-19 20:46:42 +02:00
jekkos
7c0f884872
Remove trailing space (issue #76 )
2015-05-19 09:40:30 +02:00
jekkos
15493ae58e
Set correct url
2015-05-17 22:36:00 +02:00
jekkos
ac7c0241e5
Merge pull request #79 from nalamapu/patch-1
...
Update general_config.php
2015-05-17 21:44:32 +02:00
A.K.M. Nurul Alam
fd933e3ed6
Update general_config.php
...
'Comma' is the original spelling in English.
2015-05-16 12:14:21 +06:00
jekkos
6a2a5278b8
Fix general test setup (finally)
...
Add basic selenium test for application login
Adapt default database template file
Add correct db settings for travis-ci
2015-05-15 00:47:25 +02:00
jekkos
687d4c06c6
Fix general test setup (finally)
...
Add basic selenium test for application login
Adapt default database template file
Add correct db settings for travis-ci
2015-05-15 00:45:55 +02:00
jekkos
19f7c6aa57
Initialize mysql on travis
2015-05-13 00:14:11 +02:00
jekkos
ccf1a6209f
Set travis.yml language to php (node should be default)
2015-05-12 23:44:43 +02:00
jekkos
4db6f28c76
Try to fix php-fpm absence (3)
2015-05-12 22:26:37 +02:00
jekkos
3e08ec99a5
Try to fix php-fpm absence (2)
2015-05-12 13:59:08 +02:00
jekkos
4142f0fc71
Try to fix php-fpm absence
2015-05-12 13:53:16 +02:00
jekkos
1d9a0bc8b6
Add travis-ci-apache
2015-05-12 13:52:32 +02:00
jekkos
a58510c541
Add apache2 + mysql setup for travis
2015-05-12 13:46:34 +02:00
jekkos
b2a37b7ded
Add category column again
2015-05-01 12:11:49 +02:00
jekkos
69528baa21
Merge pull request #60
...
Update common_lang.csv
Spanish translation to CSV files. Spanish translation updated - xepaez 20150424
Added translation labels missing in CSV import forms.
2015-04-27 19:07:28 +02:00
jekkos
c5defaab35
Empty person_id field in giftcard edit if id is null
2015-04-27 19:07:28 +02:00
jekkos
af7910a6a8
Show giftcard number instead of id in edit form
2015-04-27 19:07:28 +02:00
jekkos
86eb397866
Enable sorting on giftcard number
...
Add default stock permissions for sales and receivings in upgrade script
2015-04-27 19:07:28 +02:00
jekkos
9b1785df01
Correct obvious punctuation error in item form.php
2015-04-27 19:07:28 +02:00
jekkos
8f09a32ef5
Correct latest alter table statements for
2015-04-27 19:07:28 +02:00
jekkos
c6d9a8a994
Show correct quantity in item form
...
invert ternary condittions to show correct quantity at any time
2015-04-27 19:07:28 +02:00
jekkos
54855849b3
Show item number in order report
...
Conflicts:
application/controllers/reports.php
database/database.sql
2015-04-27 19:07:28 +02:00
jekkos
7a9590359e
Fix currency symbol when no dollars are chosen
2015-04-27 19:07:28 +02:00
jekkos
11eed40718
Update receivings.php
...
clear invoice number when changing receive mode
2015-04-27 19:07:28 +02:00
jekkos
bc7eeb5d30
Do not clear session state when switching sale or receiving modes
...
Set receiving quantity and discount validation to numeric instead of
integer
2015-04-27 19:07:27 +02:00
jekkos
4916f98bcb
Fix currency symbol when no dollars are chosen
2015-04-14 13:04:46 +02:00
jekkos
c85dd1660e
Add .idea folder to .gitignore
2015-04-13 18:21:15 +02:00
jekkos
08c0c2c63f
Giftcard remaining balance is always shown in cash register
...
Giftcard person_id is optional now
Add some extra translations for giftcard warnings
Conflicts:
database/2.3.1_to_2.3.2.sql
2015-04-09 18:28:57 +02:00
jekkos
81c24d7151
Do not clear sale and receiving libs when switching modes
2015-04-09 18:28:57 +02:00
jekkos
3d62a73c8c
Report subpermission labels are shown properly in employee form now
...
Fix logic to show correct report subpermissions
2015-04-09 18:28:53 +02:00
jekkos
b8fba91244
Show tax names and amounts in invoice and invoice_email views
...
Fix invoice numbering for $YCO after update
2015-04-09 18:28:23 +02:00
jekkos
80dbe6efa7
Company name can be DEFAULT NULL in database
2015-04-09 07:18:50 +02:00
jekkos
3f46f1aca9
Merge branch 'master' of https://github.com/jekkos/opensourcepos
2015-04-08 21:56:18 +02:00
jekkos
26fddcf8d4
Add custom repository for grunt-script-link-tags
2015-04-08 13:47:16 +02:00
jekkos
7a4df2a050
Fixup db script
2015-04-07 19:13:45 +02:00
jekkos
de3d7ce726
Add new language line for check_remainder
2015-04-07 19:10:46 +02:00
jekkos
4ffc5351af
Add customer as a required field for giftcard
...
Show giftcard remainder if at least one payment is done using giftcard
2015-04-07 17:28:44 +02:00
jekkos
3f14c51c97
Update travis.yml
2015-04-06 16:55:46 +02:00
jekkos
e9b4e57c06
Add company_name column to ospos_customers
2015-04-06 15:47:38 +02:00
jekkos
70bb02c753
Change button order (default is submit now)
2015-04-06 15:45:49 +02:00
jekkos
6f7090d7ba
Upgrade jquery.color
...
Conflicts:
dist/opensourcepos.js
dist/opensourcepos.min.js
2015-04-06 15:42:57 +02:00
jekkos
43ecda44e0
Receipt totals layout improvement (show top border when no discount or
...
tax section present)
Remove unexistant script include from invoice_email template
2015-04-06 15:38:52 +02:00
jekkos
04abb716fa
Merge branch 'master' of https://github.com/jekkos/opensourcepos
...
Conflicts:
dist/opensourcepos.min.js
2015-04-06 15:16:43 +02:00
jekkos
95ae2766cd
Giftcard get_all parameters were in opposite order
...
Invoice layout improvements
2015-04-06 15:15:40 +02:00
jekkos
f45f75e458
Add functionality to keep item edit form open for easier working (in
...
sales, receivings and items module)
Refactor duplicated custom field code in item form
2015-04-06 15:15:40 +02:00
jekkos
b85b9d37a1
Add company_name field to customers for invoicing purposes
...
Total discount is now shown as one amount in receipt
Conflicts:
application/controllers/sales.php
Conflicts:
database/migrate_phppos.sql
2015-04-06 15:15:34 +02:00
jekkos
ebd473ea11
Update README.md
...
Add build status to Readme.md
2015-04-06 15:15:20 +02:00
jekkos
7d7ee83ef4
Add test folder + basic unit test setup
...
Add grunt mochaWebdriver plugin for phantomJs test
Conflicts:
.travis.yml
dist/opensourcepos.min.js
2015-04-06 15:15:14 +02:00
jekkos
27c6f275d1
Set focus to scan field when refreshing receivings module
2015-04-06 15:13:42 +02:00
jekkos
39edf5ccdb
Add basic unit tests
2015-04-06 15:13:36 +02:00
jekkos
90c4df7f2a
Update README.md
...
Add build status to Readme.md
2015-04-01 00:01:19 +02:00
jekkos
ae99555fec
Add test folder + basic unit test setup
...
Add grunt mochaWebdriver plugin for phantomJs test
2015-03-31 23:58:05 +02:00
jekkos
8ff742085a
Multiple total disconuts are shown correctly now
2015-03-31 21:56:44 +02:00
jekkos
86bf8866f0
Do duplicated cookie check before echo'ing output in items (fix for #49 )
2015-03-31 16:33:29 +02:00
jekkos
a8f353de9c
Add constraint for trans_location foreign key
...
Use Code128 for receipt barcodes in sales and receivings
2015-03-31 15:05:30 +02:00
jekkos
9b98f15f69
Receiving cancel delete should work now (confirm result was ignored)
...
receivings_items will now store the correct quantity_purchased when
using a value > 1 for receiving_quantity
Receiving delete message corrected
2015-03-30 16:37:26 +02:00
jekkos
138d1cbeef
Remove duplicated click handlers on add/remove location
2015-03-26 13:00:08 +01:00
jekkos
9ead6fcca9
Add mochaSelenium config in Gruntfile (tests not running yet)
2015-03-20 13:50:14 +01:00
jekkos
ced5ca4e2e
Make invoice numbers more consistent
2015-03-17 18:05:43 +01:00
jekkos
ca2c9a6ae4
Item refresh fix for issue #42
...
Invoice number in email message are denoted with $INV
Sale id's in email message are denoted with POS $sale_id
2015-03-17 17:41:12 +01:00
jekkos
cae9d3b67e
Remove tags:css task in Grunfile (css files are imported the old way
...
again)
Fix sale delete confirmation in edit dialog
Add bower.json (still unused)
Fix autogenerated javascript load order
2015-03-17 16:47:49 +01:00
jekkos-t520
aa65593ce3
Add Gruntfile.js for concat+uglification of javascript
...
Enable debug=true cookie for full source inclusion in header.php
Add template in header.php to inject generated javascript files
2015-03-15 16:56:37 +01:00
jekkos-t520
c10860a005
Intercept pagination link click when search field is empty and filtering
...
checkboxes are set
2015-03-11 08:36:20 +01:00
jekkos-t520
a39e12e76d
Externalize nominatim autcomplete functionality
...
Add chosen language to nominatim request
2015-03-10 14:37:36 +01:00
jekkos-t520
b29cb85b9b
Add ticket suggestions for #40
2015-03-07 22:41:03 +01:00
jekkos-t520
6faaec53d6
Fix duplicate item suggestion issue #38
...
Fix return ticket suggestion issue #38
Fix discounted_total after hitting edit in sales register
2015-03-07 21:55:15 +01: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
4ac1a943eb
Update totals calculation
...
Update tax inclusive calculation
2015-03-06 00:58:44 +01:00
jekkos-t520
0e357f14f6
Add option to show total discounts on receipt
2015-03-05 08:28:58 +01:00
jekkos-t520
e0fd35220e
Add custom search back into items
...
Fix proper pagintaion for filtered item views w/o search
2015-03-04 20:53:38 +01:00
jekkos-t520
ffb8501276
Fix custom search
2015-02-27 16:03:52 +01:00
jekkos-t520
8981efbd2a
Fix error in database script
...
Add script to reset database easily (with root user)
Remove old git-svn script
2015-02-26 22:08:14 +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
98cae8928b
Cleanup table encoding + auto_increment
...
Conflicts:
database/database.sql
2015-02-26 14:38:13 +01:00
jekkos-t520
b02b16b63e
Only show company name in supplier's dropdown
2015-02-25 13:30:18 +01:00
jekkos-t520
81cb46bb8b
Add router for sales overview
2015-02-25 13:30:18 +01:00
jekkos-t520
b11bf919af
Automatically resize report columns
...
Remove text-transform for invoice header
2015-02-25 13:30:17 +01:00
jekkos-t520
9ee63294a4
Make report table headers resizable
...
Add suffix to pagination url (so extra filters can be maintained)
2015-02-25 13:30:17 +01:00
jekkos-t520
dbddb34ed4
Receipt total is recalculatd after edit now
...
Some css improvements for receipt printing
Adaptation of one or more labels
2015-02-25 13:30:17 +01:00
jekkos-t520
71c9294978
Giftcard customer selection cleanup
2015-02-25 13:30:17 +01:00
jekkos-t520
1226d217a6
Pagination search limit_from fixes (add limit_from hidden fields)
2015-02-25 13:30:17 +01:00
jekkos-t520
3204391521
Always show name instead of description (twice)
2015-02-25 13:30:17 +01:00
jekkos-t520
40ebba4252
Improve table layout a bit (change header sizes)
2015-02-25 13:30:17 +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
cb1075e6c0
Remove sale_type parameter from get_detailed_sales and
...
get_detailed_receivings methods
2015-02-24 10:22:19 +01:00
jekkos-t520
33cf0422a7
Make javascript selector more specific
2015-02-24 09:21:03 +01:00
jekkos-t520
bd54a180d5
Remove location field from bulk edit
2015-02-24 08:55:44 +01:00
jekkos-t520
b752ec9952
Fix item bulk update
2015-02-24 08:51:09 +01:00
jekkos-t520
e688a24326
Fix sale suspend (redundant payment_type field was removed)
...
Gender is now properly saved in suppliers module
2015-02-24 08:10:53 +01:00
jekkos-t520
468b3e3580
Fix item_number barcode generation for item kits
...
Fix supplier pagination
2015-02-22 00:04:47 +01:00
jekkos-t520
e96dd7883e
remove count_all
...
fix pagination row counts for modules
2015-02-21 23:58:31 +01:00
jekkos-t520
8e221033bf
Add label for products on low inventory (items filtering)
...
Add stock location to method call for items pagination
Move item pagination links
2015-02-21 22:35:28 +01:00
jekkos-t520
17594f95f1
Add lines per page option
...
Add default sales discount option
Fix supplier pagination
2015-02-21 21:57:41 +01:00
jekkos-t520
9e427485f3
Fix items module filtering
...
Fix double to_currency wrapper for amount_change in receipt
Fix tablesorter js error with empty tables
Upgrade tablesorter.js to latest version
Adapt some labels for dutch
2015-02-21 18:05:12 +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
9856f0bc65
Add invoice dom sanity check before print
2015-02-20 09:25:31 +01:00
jekkos-t520
378d45691b
invoice printer field greyed out if jsPrint addon is not installed
2015-02-20 09:22:21 +01:00
jekkos-t520
e7f9f29cd3
Create invoice checkbox was inverted
2015-02-19 18:15:35 +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
6ff19cb3f3
Merge branch 'feature/invoice_template'
2015-02-19 16:11:57 +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
8edff136d0
Show company name on receipt when no logo is set
2015-02-18 08:53:18 +01:00
jekkos-t520
f6fb275dff
Fix stock permission names (no more empty labels)
2015-02-18 07:42:20 +01:00
jekkos-t520
4025883765
show taxes was reversed
2015-02-18 00:16:18 +01:00
jekkos-t520
b9b8e2b4e5
remove php shorthand tags (incompatibility across installs)
2015-02-17 23:06:24 +01:00
jekkos-t520
13f6640576
Add show taxes checkbox value (state was not persisted)
...
Disable printing options when unchecking print after sale
2015-02-17 22:58:10 +01:00
jekkos-t520
aa969273db
Disable config fields that require addon when this one is not enabled
...
Obey to user confirm outcome to save config or not
Fallback to window.print when addon is not installed (as it was
previously)
2015-02-17 17:08:46 +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
2a07bbaef9
Merge branch 'master' into feature/receipt_config
2015-02-17 12:40:59 +01:00
jekkos-t520
4bc1d87782
Fix reports listing (listing itself was based on empty labels)
2015-02-17 12:39:32 +01:00
jekkos-t520
6710112f3d
Change to bc-style operations for totals calculation in receivings
2015-02-17 12:20:53 +01:00
jekkos-t520
7ec4c21587
Merge branch 'master' into feature/receipt_config
2015-02-17 12:20:33 +01:00
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
cf2ca1e6c7
Start receipt rework
2015-02-17 09:01:56 +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
9e9a9a80a9
Fix tax percentage calculations (issue #42 )
...
Use bcadd calculations for payment totals
Add tax inclusive option back into general_config
2015-02-12 14:57:39 +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
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
ed70fdc40b
Change female language in english to 'F'
2015-02-11 16:33:28 +01:00
jekkos-t520
ade913f0e4
Merge github pull request #30
2015-02-11 16:31:31 +01:00
jekkos-t520
cd92f85691
Merge branch 'feature/customer_gender'
2015-02-11 14:30:15 +01:00
jekkos-t520
081bf77782
Fix module hotkeys
2015-02-11 14:29:57 +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
4a6a69bdef
Enable image headers again
2015-02-11 13:53:21 +01:00
jekkos-t520
88a9193d3a
Remove escape characters from receivings_lang
...
Adapt confirmation dialog text for logout
2015-02-11 13:50:21 +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
b7751bde1a
Fix serialized search filter in items module
2015-02-11 12:19:32 +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
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
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
4579f16518
Add empty uploads/item_pics directories
...
Add .gitignore files to ignore uploaded item pics (or saved db scripts)
2015-02-10 11:17:46 +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
84ffe5d4eb
Add try catch to barcode generation (so errors are displayed in case of
...
config problems)
2015-02-10 00:05:42 +01:00
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
jekkos
16814f2d12
Update README.md
2015-01-25 16:39:31 +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
jekkos
df71cb9cf8
Merge pull request #26 from marteserede/master
...
Fix for bug #39 , error in excel_import
2015-01-25 00:22:26 +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