mirror/opensourcepos
1
0
Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-06-04 13:49:12 -04:00
Code Issues Packages Projects Releases Wiki Activity
3,851 Commits 46 Branches 39 Tags
a33db6f0554cc391b18cf99b38c2efa73b6bbbf2
Commit Graph

3851 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Steve Ireland
a33db6f055 Merge pull request #2356 from opensourcepos/stock-type-visibility 
Allow user excluded from item kit maintenance to maintain stock type.
 2019-02-09 13:02:08 -05:00
Steve Ireland
03fe400e9e Allow user excluded from item kit maintenance to maintain stock type. 2019-02-09 11:56:49 -05:00
jekkos
929f3e63fc Show 6 character git hash instead of 5 (#2352) 2019-02-08 08:26:16 +01:00
objecttothis
3b9bf5eaa4 Correcting positioning of the ospos.css file 
I wasn't aware of the need to build the project before css changes would take effect nor that I could just add `?debug=true` to the URL to see changes.  I've put the line back in its original position and it works without other changes.
 2019-02-05 09:40:27 +01:00
objecttothis
81b056b8f0 Merge pull request #2330 from opensourcepos/third_party_integrations 
Third party integrations
 2019-02-04 17:07:03 +04:00
objecttothis
2d7ea8d4e7 modified CSS id to be unique 
Rather than override an existing CSS id with potential consequences I just created a unique ID in ospos.css
 2019-02-04 13:47:43 +04:00
objecttothis
381b741f42 Add css for integrations header 2019-02-04 13:46:08 +04:00
objecttothis
9b6edaea4d Move ospos.css below opensourcepos.min.css 
This prevents changes in ospos.css from being ignored
 2019-02-04 13:44:40 +04:00
jekkos
9527ad4f33 Use dev as default commit hash (#2324) 2019-02-02 18:44:12 +01:00
jekkos
bf28072f0d Try to reuse $rev variable in pre_install secion (#2324) 2019-02-02 15:16:10 +01:00
jekkos
231f7485fe Temporarily fix supplier update (#2309) 2019-02-02 14:36:05 +01:00
jekkos
6f75ec3ae2 Skip india GST migration if it ran before + force cleanup (#2302) 2019-02-02 14:08:20 +01:00
jekkos
2674fbd03f Disable .gitattributes ident (#2324) 2019-02-02 14:08:20 +01:00
jekkos
a36bfdd32d Translated using Weblate (Flemish) 
Currently translated at 100.0% (20 of 20 strings)

Translation: ospos/datepicker
Translate-URL: http://weblate.jpeelaer.net/projects/ospos/datepicker/nl_BE/
 2019-02-02 12:47:12 +01:00
Weblate
b75f486e6e Merge branch 'origin/master' into Weblate 2019-02-01 22:05:48 +01:00
Héctor Martín
618465bf80 Translated using Weblate (Spanish) 
Currently translated at 67.5% (52 of 77 strings)

Translation: ospos/taxes
Translate-URL: http://weblate.jpeelaer.net/projects/ospos/taxes/es/
 2019-02-01 22:05:45 +01:00
jekkos
33f4471364 Translated using Weblate (Flemish) 
Currently translated at 100.0% (173 of 173 strings)

Translation: ospos/sales
Translate-URL: http://weblate.jpeelaer.net/projects/ospos/sales/nl_BE/
 2019-02-01 22:05:31 +01:00
Héctor Martín
7cb5bb98ff Translated using Weblate (Spanish) 
Currently translated at 100.0% (8 of 8 strings)

Translation: ospos/login
Translate-URL: http://weblate.jpeelaer.net/projects/ospos/login/es/
 2019-02-01 22:05:17 +01:00
haygcao
71a1c2ac08 Translated using Weblate (Chinese (Simplified)) 
Currently translated at 69.2% (18 of 26 strings)

Translation: ospos/attributes
Translate-URL: http://weblate.jpeelaer.net/projects/ospos/attributes/zh_Hans/
 2019-02-01 22:05:01 +01:00
jekkos
80a1c73652 Ignore apache rewrite rule for let's encrypt challenge renewal 2019-02-01 21:14:08 +01:00
objecttothis
00a16ac50b Update manage.php 
Fixed another forgotten change
 2019-01-31 16:42:58 +04:00
objecttothis
d3155ed8be Merge pull request #2325 from opensourcepos/attribute_value_duplicate_check 
Check to see if attribute_value already exists
 2019-01-30 13:29:09 +04:00
objecttothis
749c41c43c Merge pull request #2333 from opensourcepos/attribute_migrations_values_fix 
Add IGNORE to insert and UNIQUE constraint to attribute_value
 2019-01-30 13:27:02 +04:00
objecttothis
ab2a46ff22 Add IGNORE to insert and UNIQUE constraint to attribute_value 2019-01-30 13:08:12 +04:00
objecttothis
2c06edba02 Remove function and combine call to reduce redundant code. 2019-01-30 11:30:28 +04:00
objecttothis
6b12cd6cc7 Correct missing change 
Not sure how this didn't get changed before.  I had the change in my test database.  I must have just missed it.
 2019-01-30 10:35:41 +04:00
Steve Ireland
cb79bbe5ef Merge pull request #2332 from opensourcepos/fix-upgrade-sequence 
India GST script is dependent on the 3.3.0 script.
 2019-01-29 21:43:00 -05:00
Steve Ireland
57fa8c1a4b India GST script is dependent on the 3.3.0 script. 2019-01-29 21:30:52 -05:00
objecttothis
f238bc7d40 Rename mailchimp_config.php to integrations_config.php 
Rename file to match generic integrations rather than specific mailchimp
 2019-01-29 18:27:41 +04:00
objecttothis
4d13cf2f67 Converting mailchimp config to integrations config 2019-01-29 18:25:44 +04:00
objecttothis
e080873ec3 Check to see if attribute_value already exists 2019-01-28 18:16:17 +04:00
Weblate
74417024b4 Merge branch 'origin/master' into Weblate 2019-01-20 01:05:47 +01:00
Marek Borowik
322dc85e2c Added translation using Weblate (Polish) 2019-01-20 01:05:44 +01:00
Steve Ireland
740305c2ca Merge pull request #2314 from opensourcepos/fix-sales-tax-amount 
It's a small change and I couldn't have introduced too many problems.  I tested the change locally to confirm that it works (at least with gift cards).  So I went ahead and merged this change.
 2019-01-16 22:04:12 -05:00
Steve Ireland
0dc5a8e3a2 Rename sales_tax_amount to sale_tax_amount 2019-01-16 21:45:55 -05:00
FrancescoUK
cbfb8e5a89 Merge pull request #2289 from opensourcepos/refactor-tax-config 
Refactor Tax Configuration
 2019-01-14 10:59:09 +00:00
bashar alghnnam
2c76f90f67 Translated using Weblate (Arabic (Egypt)) 
Currently translated at 43.2% (29 of 67 strings)

Translation: ospos/taxes
Translate-URL: http://weblate.jpeelaer.net/projects/ospos/taxes/ar_EG/
 2019-01-13 13:21:17 +01:00
bashar alghnnam
32813fc65e Translated using Weblate (Arabic (Egypt)) 
Currently translated at 94.7% (164 of 173 strings)

Translation: ospos/sales
Translate-URL: http://weblate.jpeelaer.net/projects/ospos/sales/ar_EG/
 2019-01-13 13:21:17 +01:00
Albert García
2ed5ff3c02 Translated using Weblate (Spanish) 
Currently translated at 100.0% (12 of 12 strings)

Translation: ospos/messages
Translate-URL: http://weblate.jpeelaer.net/projects/ospos/messages/es/
 2019-01-13 13:21:17 +01:00
Albert García
86144b7816 Translated using Weblate (Spanish) 
Currently translated at 96.6% (260 of 269 strings)

Translation: ospos/config
Translate-URL: http://weblate.jpeelaer.net/projects/ospos/config/es/
 2019-01-13 13:21:17 +01:00
Albert García
687229dbec Translated using Weblate (Spanish) 
Currently translated at 100.0% (66 of 66 strings)

Translation: ospos/common
Translate-URL: http://weblate.jpeelaer.net/projects/ospos/common/es/
 2019-01-13 13:21:17 +01:00
jekkos
f911cebae2 Revert translation update + bump migration script version 2019-01-13 13:18:51 +01:00
jekkos
02d7588e59 Add config item for default order discount 2019-01-13 13:18:51 +01:00
Steve Ireland
20cb007f3c Refactor Tax Configuration 2019-01-10 21:42:15 -05:00
FrancescoUK
74f5bb17bb Update to Bootswatch and Bootstrap 3.4.0 2019-01-07 21:51:36 +00:00
jekkos
acba94baf2 Fix broken dialogs after column visiblity toggle (#2132) 2019-01-07 18:44:24 +01:00
jekkos
6792c829b2 Cleanup duplicated field 2019-01-07 18:44:24 +01:00
FrancescoUK
0ada6ba25d Fix login missing version issue 2019-01-06 17:21:21 +00:00
Weblate
85564d9201 Merge branch 'origin/master' into Weblate 2019-01-05 11:53:48 +01:00
jekkos
489ed6c23f Translated using Weblate (Flemish) 
Currently translated at 99.6% (268 of 269 strings)

Translation: ospos/config
Translate-URL: http://weblate.jpeelaer.net/projects/ospos/config/nl_BE/
 2019-01-05 11:53:47 +01:00