mirror/opensourcepos
1
0 Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-09-17 16:07:04 -04:00
Code Issues Packages Projects Releases Wiki Activity
3,576 Commits 50 Branches 39 Tags
deed04cd46d64afa26cb49cbf39c2b3c2a203fd6
Commit Graph
3576 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
FrancescoUK deed04cd46 Alter cashup db table (#440 #2131) 2018-10-03 21:10:20 +01:00
FrancescoUK bc34293cac Add due payment to cashup (#440 #2131) 2018-09-30 15:17:31 +01:00
Zhivko Vanev cc47df6ee6 Translated using Weblate (Bulgarian) 
Currently translated at 100.0% (30 of 30 strings)

Translation: opensourcepos/taxes
Translate-URL: http://weblate.jpeelaer.net/projects/ospos/taxes/bg/
 2018-09-30 09:43:01 +02:00
Zhivko Vanev 1b8d7a6de5 Translated using Weblate (Bulgarian) 
Currently translated at 100.0% (17 of 17 strings)
 2018-09-30 08:24:16 +02:00
Xyko Arteiro cfa7844a42 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (272 of 272 strings)
 2018-09-30 08:24:16 +02:00
Zhivko Vanev c2f8fcb0c4 Translated using Weblate (Bulgarian) 
Currently translated at 100.0% (30 of 30 strings)

Translation: opensourcepos/taxes
Translate-URL: http://weblate.jpeelaer.net/projects/ospos/taxes/bg/
 2018-09-30 08:24:16 +02:00
Zhivko Vanev ef8dc97de9 Translated using Weblate (Bulgarian) 
Currently translated at 100.0% (17 of 17 strings)
 2018-09-30 08:24:16 +02:00
Xyko Arteiro 710ab32b2f Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (272 of 272 strings)
 2018-09-30 08:24:16 +02:00
Xyko Arteiro 87f63c4655 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (162 of 162 strings)
 2018-09-30 08:24:16 +02:00
Xyko Arteiro adc72571ba Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (114 of 114 strings)
 2018-09-30 08:24:16 +02:00
jekkos c57f063dc1 Fix discount calculation 2018-09-29 16:47:28 +02:00
jekkos 511f21931c Fix discount totals 2018-09-28 20:52:42 +02:00
jekkos 46b845ab01 Add totals to discount repor 2018-09-28 20:43:12 +02:00
jekkos 68051bdcdb Add totals to discount report 2018-09-28 20:42:52 +02:00
Steve Ireland 6d5f518855 Fix issue with deleted items not being included in reprinted receipts. 2018-09-28 20:37:51 +02:00
Steve Ireland 3a7d8415f6 Merge pull request #2162 from RuleDomain/fix_receipt_missing_del_item 
Fix issue with deleted items not being included in reprinted receipts.
 2018-09-25 21:06:08 -04:00
Steve Ireland 68fe267fad Fix issue with deleted items not being included in reprinted receipts. 2018-09-25 20:24:20 -04:00
Xyko Arteiro dd83139760 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (37 of 37 strings)

Translation: opensourcepos/module
Translate-URL: http://weblate.jpeelaer.net/projects/ospos/module/pt_BR/
 2018-09-23 20:45:40 +02:00
Xyko Arteiro b561de77ab Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (108 of 108 strings)
 2018-09-23 20:43:07 +02:00
Xyko Arteiro 1ffbbefca4 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (19 of 19 strings)

Translation: opensourcepos/expenses_categories
Translate-URL: http://weblate.jpeelaer.net/projects/ospos/expenses_categories/pt_BR/
 2018-09-23 20:41:37 +02:00
Xyko Arteiro d692553d02 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (51 of 51 strings)
 2018-09-23 20:41:05 +02:00
Xyko Arteiro b38e090fe8 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (52 of 52 strings)
 2018-09-23 20:40:08 +02:00
Xyko Arteiro 6db892467c Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (33 of 33 strings)
 2018-09-23 20:37:42 +02:00
Xyko Arteiro 330ec999b5 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (7 of 7 strings)

Translation: opensourcepos/enum
Translate-URL: http://weblate.jpeelaer.net/projects/ospos/enum/pt_BR/
 2018-09-23 20:26:53 +02:00
FrancescoUK a30d2d2506 Merge pull request #2144 from opensourcepos/public_redirect 
Correct errors in redirect with advanced install
 2018-09-23 16:47:56 +01:00
jekkos a6b5726cdc Start migration after installation check (#2148) 2018-09-23 14:28:23 +02:00
jekkos 9f71427fee Check for employee language property first (#2148) 2018-09-23 14:17:30 +02:00
jekkos 2cc58ad546 Fix language fallback (#2148) 2018-09-23 02:04:16 +02:00
Josh c3ba10f2e5 update invoice_email.css typo (#2146) 
Correcting css html color code.
 2018-09-19 11:58:00 +03:00
objecttothis 0ffece7cb8 Correct errors in redirect with advanced install 
This should cover the following scenarios
1- Install is in the root folder (www.example.com)
2- Install is in a subfolder (www.example.com/pos/)
3- Install is in an subdomain or subdomain and subfolder (pos.example.com or pos.example.com/abc)
4- User attempts to navigate to other subfolders (www.example.com/vendor).

In each case the expected behavior is to redirect to URI/public as an external redirect with no errors.

When testing PLEASE clear your browser cache/history and restart your browser.  Most browsers have a bad habit of caching errors and then you don't know if you are getting a cached error or the current results.
 2018-09-18 18:15:34 +04:00
jekkos dbfe9b7e55 Migration script fixes 2018-09-16 23:50:07 +02:00
jekkos 9307ebbaa9 Revert wrong change 2018-09-16 23:50:07 +02:00
jekkos 2181b0ebce Update second method 2018-09-16 23:50:07 +02:00
jekkos ec5e016401 Fix tax migration script 2018-09-16 23:50:07 +02:00
Weblate 513f847f4d Upade Czech translation 2018-09-16 15:39:30 +02:00
Weblate d5c270b4dc Translated using Weblate (Flemish) 
Currently translated at 99.3% (161 of 162 strings)
 2018-09-16 15:39:30 +02:00
FrancescoUK 522011b92c Fix migration scripts (#440) 2018-09-09 20:14:59 +01:00
Rostislav Hučka 26ac789e57 Translated using Weblate (Czech) 
Currently translated at 90.1% (46 of 51 strings)
 2018-09-09 20:08:05 +02:00
Rostislav Hučka 3e07d2cd01 Translated using Weblate (Czech) 
Currently translated at 86.4% (140 of 162 strings)
 2018-09-09 20:08:05 +02:00
Rostislav Hučka 922143aacf Translated using Weblate (Czech) 
Currently translated at 91.8% (101 of 110 strings)
 2018-09-09 20:08:05 +02:00
FrancescoUK d8cb0dfc9b Add cashup feature (#440) 
Add cashup feature
 2018-09-09 12:48:11 +01:00
FrancescoUK b3bfc51ee8 Add cashup feature 2018-09-09 11:09:43 +01:00
FrancescoUK 4420dccc60 Add (commented out) phpmyadmin to docker-compose 2018-09-09 10:18:44 +01:00
FrancescoUK c7b32a5a0e Minor fixes 2018-09-08 15:48:21 +01:00
FrancescoUK 493eb5051c Merge pull request #2127 from erastus/master 
fixed in specific_customer change discount_fixed for discount_type
 2018-09-08 06:43:45 +01:00
Erastus 82a228fa99 fixed in specific_customer change discount_fixed for discount_type 2018-09-07 16:35:52 -05:00
Weblate f80d42e211 Translated using Weblate (Flemish) 
Currently translated at 99.3% (161 of 162 strings)
 2018-09-07 20:22:53 +02:00
Weblate e52634bd06 Update German + Flemish 2018-09-07 19:51:16 +02:00
Aril Apria Susanto 0bcee8eff2 Translated using Weblate (Indonesian) 
Currently translated at 100.0% (17 of 17 strings)
 2018-09-07 19:51:16 +02:00
Weblate 801c8e284d Translated using Weblate (Flemish) 
Currently translated at 100.0% (17 of 17 strings)
 2018-09-07 19:51:16 +02:00