mirror/opensourcepos
1
0
Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-02-27 04:18:40 -05:00
Code Issues Packages Projects Releases Wiki Activity
2,619 Commits 41 Branches 39 Tags
d63446cdb8ff29533d5ed6b4a6e4fbb3de5381eb
Commit Graph

1889 Commits

Author SHA1 Message Date
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
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
Steve Ireland
62c5f2ad16 Change invalid SALE_SALE reference to SALE_RETURN. 2017-09-13 20:53:39 -04: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
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
8d7e8d6b9b Save value of allow_duplicate_barcodes 2017-09-13 09:10:22 +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
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
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
Steve Ireland
3e91eb33de Final touch on Work Orders 2017-09-10 12:43:00 -04:00
Steve Ireland
4f93bc7430 Final touch on Work Orders 2017-09-10 11:12:34 -04: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
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
4de3cbeab6 More support for Work Orders (#1539) 2017-09-08 22:18:12 +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
FrancescoUK
e42e01a07f Bump version to 3.2.0 2017-09-08 22:04:45 +01:00