mirror/opensourcepos
1
0
Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-03-22 00:41:22 -04:00
Code Issues Packages Projects Releases Wiki Activity
2,030 Commits 64 Branches 38 Tags
8140d1aee4e4fc820452d09ea222da9def674fb6
Commit Graph

2030 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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