Commit Graph

4341 Commits

Author SHA1 Message Date
FrancescoUK
fa71bc6ed6 Merge pull request #2490 from opensourcepos/3.3.0_patch_empty_reports
fix empty reports
2019-07-14 13:40:50 +01:00
objecttothis
f235cede08 Update date_input.php
Corrected this from 1 to 2.  'All' is counted in the array which means that if there is only one stock location, this dropdown will still appear.  Setting this to 2 means that the dropdown only shows when there is more than 1 stock location.
2019-07-12 15:16:21 +04:00
objecttothis
991830817e Create 20190712150200_fix_empty_reports.php
This corrects an error in a previous migration (2.3_to_2.3.1.sql) that assigned a null value to receivings_stock and sales_stock for the location_id when it should have been the location_id of that particular stock_location.
2019-07-12 15:05:14 +04:00
Weblate
929dc7fbb8 Merge branch 'origin/master' into Weblate 2019-07-10 12:20:26 +02:00
Francisco xyko
764b3d2a84 Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (173 of 173 strings)

Translation: ospos/sales
Translate-URL: http://weblate.jpeelaer.net/projects/ospos/sales/pt_BR/
2019-07-10 12:20:25 +02:00
Francisco xyko
a89cc74ba5 Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (109 of 109 strings)

Translation: ospos/items
Translate-URL: http://weblate.jpeelaer.net/projects/ospos/items/pt_BR/
2019-07-10 12:20:12 +02:00
FrancescoUK
7daa69db43 Merge pull request #2488 from opensourcepos/3.3.0_patch_datetime_to_date
3.3.0 patch datetime to date
2019-07-10 07:54:22 +01:00
objecttothis
8c173540e6 Update Attribute.php
changed DATETIME to DATE since constant name was changed but it wasn't changed here.
2019-07-09 18:05:23 +04:00
objecttothis
9297e73b69 Update locale_helper.php
Adding back in deleted method.
2019-07-09 18:03:28 +04:00
FrancescoUK
79e1ccc9a0 Add new languages to config selection list 2019-07-07 11:19:26 +01:00
Weblate
e275486efe Add th config 2019-07-06 14:10:09 +02:00
jekkos
7da7c0e16f Send back to bintray (#2464) 2019-07-04 19:30:50 +02:00
jekkos
abcf12c3d7 Change newlines into html breaks (invoice template) 2019-07-03 19:44:55 +02:00
jekkos
a45b8e2689 Keep history for downloads branch 2019-07-01 09:19:55 +02:00
Weblate
4269884008 Merge branch 'master' of https://github.com/opensourcepos/opensourcepos 2019-06-30 23:16:03 +02:00
jekkos
efd92fb94f Push to downloads branch instead 2019-06-30 23:00:41 +02:00
jekkos
4cecfb5079 Merge branch 'master' of https://github.com/opensourcepos/opensourcepos 2019-06-30 22:44:49 +02:00
jekkos
84a4f53aa0 Add repo name (#2464) 2019-06-30 22:43:17 +02:00
jekkos
8daab70725 Fix text attribute parsing (#2476) 2019-06-30 22:03:02 +02:00
jekkos
89654f8b00 Use underscors in .travis.yml (#2464) 2019-06-30 19:03:31 +02:00
jekkos
d8173e79e5 Fix dpl argument format 2019-06-30 18:44:21 +02:00
Weblate
7591b7418f Merge branch 'origin/master' into Weblate 2019-06-30 18:43:31 +02:00
Ho
f62c668c09 Translated using Weblate (Chinese (Traditional))
Currently translated at 6.4% (5 of 77 strings)

Translation: ospos/taxes
Translate-URL: http://weblate.jpeelaer.net/projects/ospos/taxes/zh_Hant/
2019-06-30 18:43:26 +02:00
Ho
27b81de285 Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (21 of 21 strings)

Translation: ospos/suppliers
Translate-URL: http://weblate.jpeelaer.net/projects/ospos/suppliers/zh_Hant/
2019-06-30 18:43:13 +02:00
Ho
cd79cd16ac Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (173 of 173 strings)

Translation: ospos/sales
Translate-URL: http://weblate.jpeelaer.net/projects/ospos/sales/zh_Hant/
2019-06-30 18:43:01 +02:00
Ho
d22dc1fa93 Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (52 of 52 strings)

Translation: ospos/receivings
Translate-URL: http://weblate.jpeelaer.net/projects/ospos/receivings/zh_Hant/
2019-06-30 18:42:47 +02:00
Ho
d865d64e4d Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (12 of 12 strings)

Translation: ospos/messages
Translate-URL: http://weblate.jpeelaer.net/projects/ospos/messages/zh_Hant/
2019-06-30 18:42:35 +02:00
Ho
28885ed1e0 Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (52 of 52 strings)

Translation: ospos/customers
Translate-URL: http://weblate.jpeelaer.net/projects/ospos/customers/zh_Hant/
2019-06-30 18:42:07 +02:00
khao_lek
6c1853bdb5 Translated using Weblate (Thai)
Currently translated at 61.8% (172 of 278 strings)

Translation: ospos/config
Translate-URL: http://weblate.jpeelaer.net/projects/ospos/config/th/
2019-06-30 18:41:52 +02:00
Ho
7d21e08e7d Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (8 of 8 strings)

Translation: ospos/bootstrap_tables
Translate-URL: http://weblate.jpeelaer.net/projects/ospos/bootstrap_tables/zh_Hans/
2019-06-30 18:41:39 +02:00
Ho
09805d1fd0 Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (67 of 67 strings)

Translation: ospos/common
Translate-URL: http://weblate.jpeelaer.net/projects/ospos/common/zh_Hant/
2019-06-30 18:41:26 +02:00
jekkos
6817620808 Use sudo to move artifact 2019-06-30 17:52:42 +02:00
jekkos
cfe5a3c84e Enable attribute search for datetime (#2441) 2019-06-30 17:52:32 +02:00
jekkos
6167a164ad Keep artifact in the same folder 2019-06-30 17:38:25 +02:00
jekkos
6d6a983b9d Add before_deploy hook 2019-06-30 17:31:54 +02:00
jekkos
d0bf865e6b Use gh-pages brnach for deployment 2019-06-30 17:25:46 +02:00
Alex Garcia
7bb05a09d9 Translated using Weblate (Spanish (Mexico))
Currently translated at 96.1% (74 of 77 strings)

Translation: ospos/taxes
Translate-URL: http://weblate.jpeelaer.net/projects/ospos/taxes/es_MX/
2019-06-27 21:14:07 +02:00
Trần Ngọc Quân
9d17cd1322 Translated using Weblate (Vietnamese)
Currently translated at 93.5% (102 of 109 strings)

Translation: ospos/items
Translate-URL: http://weblate.jpeelaer.net/projects/ospos/items/vi/
2019-06-27 21:14:07 +02:00
Alex Garcia
c47b3aceaa Translated using Weblate (Spanish (Mexico))
Currently translated at 100.0% (278 of 278 strings)

Translation: ospos/config
Translate-URL: http://weblate.jpeelaer.net/projects/ospos/config/es_MX/
2019-06-27 21:14:07 +02:00
Trần Ngọc Quân
29e5a5959d Translated using Weblate (Vietnamese)
Currently translated at 44.8% (13 of 29 strings)

Translation: ospos/attributes
Translate-URL: http://weblate.jpeelaer.net/projects/ospos/attributes/vi/
2019-06-27 21:14:07 +02:00
objecttothis
fe2b609446 Update LICENSE
Added copyright claim regarding my pull requests.
2019-06-26 12:14:41 +04:00
FrancescoUK
cfd1bd13e1 Merge pull request #2468 from opensourcepos/add-decimal-attrs-to-items
Add decimals to items search result + fix reports
2019-06-23 14:29:18 +01:00
FrancescoUK
1f2aa2708d Fix missing ) and minor change 2019-06-22 16:39:18 +01:00
jekkos
8ca5449b79 Add decimals to items search result + fix reports 2019-06-20 18:39:17 +02:00
FrancescoUK
54925b27a8 Merge pull request #2467 from opensourcepos/fix-payment-update
Fix a couple of issues with payment processing.
2019-06-20 04:27:23 +01:00
Steve Ireland
a34f017dbd Fix a couple of issues with payment processing. 2019-06-19 21:50:20 -04:00
Robby Triadi Susanto
5355b671fe Translated using Weblate (Indonesian)
Currently translated at 100.0% (109 of 109 strings)

Translation: ospos/items
Translate-URL: http://weblate.jpeelaer.net/projects/ospos/items/id/
2019-06-18 23:14:48 +02:00
Robby Triadi Susanto
eea25b1e17 Translated using Weblate (Indonesian)
Currently translated at 100.0% (52 of 52 strings)

Translation: ospos/customers
Translate-URL: http://weblate.jpeelaer.net/projects/ospos/customers/id/
2019-06-18 23:14:48 +02:00
FrancescoUK
196573f49b Merge pull request #2410 from opensourcepos/letsencryptdocker
docker-compose with nginx reverse proxy and letsencrypt certbot
2019-06-16 14:46:59 +01:00
FrancescoUK
37e369ce46 Fix .env issue and add logs as volume 2019-06-16 14:14:37 +01:00