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
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
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
