Commit Graph
4661 Commits
Author SHA1 Message Date
objecttothis 3281fc9bb0 Correct indentation problems 2020-03-24 14:04:04 +04:00
objecttothis 971ae5ec19 Correcting indentation problems 2020-03-24 13:18:35 +04:00
objecttothis fb9fec1a10 Merge branch 'master' into pos_bool 2020-03-18 16:19:45 +04:00
objecttothis c4c475b51f Updated CSV import to handle checkboxes
0, FALSE values create attributes marked as "unchecked"
NULL, "" and spaces do not create an attribute
1, TRUE and ANY other value creates an attribute and marks as checked.

Blank lines in CSV files are skipped with no error.
2020-03-18 15:49:49 +04:00
Emil Ebsen e7ec8aa49f Added translation using Weblate (Danish) 2020-03-16 13:56:49 +01:00
Weblate 1be27549df Merge branch 'origin/master' into Weblate 2020-03-16 13:35:34 +01:00
khao_lek 8e979deb99 Translated using Weblate (Thai)
Currently translated at 68.4% (191 of 279 strings)

Translation: ospos/config
Translate-URL: http://weblate.jpeelaer.net/projects/ospos/config/th/
2020-03-16 13:35:33 +01:00
Emil Ebsen 5ba9746264 Translated using Weblate (Danish)
Currently translated at 50.0% (18 of 36 strings)

Translation: ospos/cashups
Translate-URL: http://weblate.jpeelaer.net/projects/ospos/cashups/da/
2020-03-16 13:35:20 +01:00
Emil Ebsen 20e4040d02 Added translation using Weblate (Danish) 2020-03-16 13:35:03 +01:00
FrancescoUK 425bee0ba1 Merge pull request #2764 from opensourcepos/fix-attribute-search
Fix attribute search (#2723)
2020-03-14 07:22:04 +00:00
FrancescoUK 5fe7186571 Merge pull request #2763 from opensourcepos/currency-format-test
Add unit test for locale_helper (#2748)
2020-03-14 07:20:59 +00:00
FrancescoUK 3382610871 Merge pull request #2760 from opensourcepos/attribute-colon-patch
Removing the restriction for colons in the name
2020-03-14 07:18:44 +00:00
jekkos-t520 0f2bafc7dd Fix attribute search (#2723) 2020-03-14 01:44:08 +01:00
jekkos-t520 ea85a85518 Add unit test for locale_helper (#2748) 2020-03-13 23:12:56 +01:00
jekkos 531035fef2 Update invalid chars 2020-03-13 22:41:42 +01:00
FrancescoUK 1d39ec3aa5 Merge pull request #2762 from opensourcepos/amp-attribute-bug-patch
Correct a bug causing & to break in POST
2020-03-13 18:11:24 +00:00
objecttothis ecb21d2d5e Same correction for removing attribute value 2020-03-13 16:38:18 +04:00
objecttothis a2a5db8901 Correct a bug causing & to break in POST
See #2758 for details
2020-03-13 16:32:39 +04:00
objecttothis 04ade7ab0b Removing the restriction for colons in the name
Please see #2665
2020-03-13 13:22:23 +04:00
Weblate e579029ded Merge branch 'origin/master' into Weblate 2020-03-11 17:26:52 +01:00
Emil Ebsen be06cec80d Translated using Weblate (Danish)
Currently translated at 100.0% (8 of 8 strings)

Translation: ospos/bootstrap_tables
Translate-URL: http://weblate.jpeelaer.net/projects/ospos/bootstrap_tables/da/
2020-03-11 17:26:50 +01:00
Emil Ebsen ba1ef472e6 Added translation using Weblate (Danish) 2020-03-11 17:26:34 +01:00
jekkos-t520 45894857a6 Fix tests 2020-03-11 00:46:46 +01:00
jekkos-t520 4f60465fa0 Revert barcode rework 2020-03-11 00:15:37 +01:00
objecttothis cefd287668 Resolve bug not updating attributes correctly
Prior to this fix, if the attribute was of DECIMAL or DATE type and the action was an UPDATE, then it would try to update the attribute_value, not the corresponding attribute_decimal or attribute_date.
2020-03-10 09:21:09 +01:00
Weblate 009905e405 Merge branch 'origin/master' into Weblate 2020-03-09 22:48:34 +01:00
Emin Tufan Çetin bc38e94f42 Translated using Weblate (Turkish)
Currently translated at 100.0% (78 of 78 strings)

Translation: ospos/taxes
Translate-URL: http://weblate.jpeelaer.net/projects/ospos/taxes/tr/
2020-03-09 22:48:34 +01:00
Johntini ff8625fbe7 Translated using Weblate (Spanish)
Currently translated at 100.0% (78 of 78 strings)

Translation: ospos/taxes
Translate-URL: http://weblate.jpeelaer.net/projects/ospos/taxes/es/
2020-03-09 22:48:20 +01:00
Qbin a5440f0443 Translated using Weblate (Chinese (Simplified))
Currently translated at 42.3% (33 of 78 strings)

Translation: ospos/taxes
Translate-URL: http://weblate.jpeelaer.net/projects/ospos/taxes/zh_Hans/
2020-03-09 22:48:06 +01:00
khao_lek 5692ae4902 Translated using Weblate (Thai)
Currently translated at 84.1% (149 of 177 strings)

Translation: ospos/sales
Translate-URL: http://weblate.jpeelaer.net/projects/ospos/sales/th/
2020-03-09 22:47:43 +01:00
Johntini 1cf5cbadd0 Translated using Weblate (Spanish)
Currently translated at 100.0% (177 of 177 strings)

Translation: ospos/sales
Translate-URL: http://weblate.jpeelaer.net/projects/ospos/sales/es/
2020-03-09 22:47:35 +01:00
Qbin 82351243f9 Translated using Weblate (Chinese (Simplified))
Currently translated at 98.0% (51 of 52 strings)

Translation: ospos/receivings
Translate-URL: http://weblate.jpeelaer.net/projects/ospos/receivings/zh_Hans/
2020-03-09 22:47:20 +01:00
Qbin d47e687337 Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (8 of 8 strings)

Translation: ospos/login
Translate-URL: http://weblate.jpeelaer.net/projects/ospos/login/zh_Hans/
2020-03-09 22:47:04 +01:00
khao_lek 3700674045 Translated using Weblate (Thai)
Currently translated at 100.0% (35 of 35 strings)

Translation: ospos/employees
Translate-URL: http://weblate.jpeelaer.net/projects/ospos/employees/th/
2020-03-09 22:46:50 +01:00
Johntini b646e78ba6 Translated using Weblate (Spanish)
Currently translated at 100.0% (278 of 278 strings)

Translation: ospos/config
Translate-URL: http://weblate.jpeelaer.net/projects/ospos/config/es/
2020-03-09 22:46:35 +01:00
Emil Ebsen b1cb951a9e Translated using Weblate (Danish)
Currently translated at 100.0% (29 of 29 strings)

Translation: ospos/attributes
Translate-URL: http://weblate.jpeelaer.net/projects/ospos/attributes/da/
2020-03-09 22:46:21 +01:00
Jintao-Yao f30e085d78 Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (29 of 29 strings)

Translation: ospos/attributes
Translate-URL: http://weblate.jpeelaer.net/projects/ospos/attributes/zh_Hans/
2020-03-09 22:46:13 +01:00
khao_lek 91c6508317 Translated using Weblate (Thai)
Currently translated at 100.0% (67 of 67 strings)

Translation: ospos/common
Translate-URL: http://weblate.jpeelaer.net/projects/ospos/common/th/
2020-03-09 22:46:00 +01:00
Qbin d341f1987a Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (67 of 67 strings)

Translation: ospos/common
Translate-URL: http://weblate.jpeelaer.net/projects/ospos/common/zh_Hans/
2020-03-09 22:45:52 +01:00
Emil Ebsen 34b7e68f04 Added translation using Weblate (Danish) 2020-03-09 22:45:33 +01:00
jekkos-t520 858320fe20 Disable attribute sort (#2722) 2020-03-09 19:54:14 +01:00
jekkos-t520 4300f0a3c6 Rework barcode format parser 2020-03-08 20:15:22 +01:00
jekkos-t520 7c33159a38 Fix config.php in testing mode 2020-03-07 15:21:45 +01:00
jekkos-t520 9583483543 Update after_success line 2020-03-07 12:59:07 +01:00
jekkos ba19bc5ad6 Update INSTALL.md 2020-03-07 12:51:28 +01:00
jekkos a9b63fa360 Update INSTALL.md 2020-03-07 12:50:07 +01:00
jekkos-t520 dbe525a724 Run regular container build before push 2020-03-07 00:13:41 +01:00
jekkos-t520 7a1891e5e8 Try to fix docker push (#2751) 2020-03-06 23:52:48 +01:00
jekkos-t520 c6048c8461 Set global variables in .travis.env 2020-03-06 23:36:01 +01:00
jekkos-t520 1c76edfc01 Fix config.php (#2751) 2020-03-06 23:22:34 +01:00