mirror/opensourcepos
1
0 Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-09-30 14:45:03 -04:00
Code Issues Packages Projects Releases Wiki Activity
2,245 Commits 60 Branches 40 Tags
841c8166a2f4418a3aa72e7f080a978a89da8ed0
Commit Graph
2245 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
FrancescoUK 841c8166a2 Fixed missing English translation (#1355) 2017-06-24 13:39:35 +01:00
FrancescoUK 4e5ac5c521 Merge branch 'odiea-receivingquantity' 
# 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-06-24 13:03:54 +01:00
FrancescoUK d59e713f1f move receiving database update to common database update script 2017-06-24 13:03:00 +01:00
odiea 78877094fb Update receipt.php 2017-06-24 13:03:00 +01:00
odiea e2e0ade259 Update for Items receiving_quantity 2017-06-24 13:03:00 +01:00
FrancescoUK e61e409bfe Fix name Title Case issue (#1301) using a composer lib 2017-06-24 12:25:46 +01:00
jekkos 5d22e41fe2 Fix refresh on focusout (#1351, #1328) 2017-06-20 22:39:32 +02:00
jekkos 0d82db42da Show string placeholders if translations are missing (#1349) 2017-06-19 22:14:01 +02:00
jekkos ff7848dcff Fix escape error in french (#1344) 2017-06-19 22:06:57 +02:00
FrancescoUK 4866457164 Merge pull request #1342 from RuleDomain/fix-undefined-table-status 
Fix undefined table_status error in Sale.php
 2017-06-18 09:51:35 +01:00
Steve Ireland acd003a44c Fix undeifined table_status error in Sale.php 2017-06-13 20:43:47 -04:00
jekkos f407702dbe Add database.php to docker image (#1297) 2017-06-13 19:17:34 +02:00
FrancescoUK d129610b24 Merge pull request #1335 from Frontuari/master 
Fixed Dinner Tables feature
 2017-06-07 19:44:18 +01:00
Jorge Colmenarez 55bf5eddda Fixed Dinner Tables feature 2017-06-07 11:15:46 -04:00
FrancescoUK 94ea15bc18 Fixed notification pop up issues in Config with tables & rewards 2017-06-04 14:31:50 +01:00
FrancescoUK 91fd435cca Fixes to reports tax summary and rewards regressions 2017-06-04 10:46:24 +01:00
FrancescoUK 8f019b4631 Merge branch 'RuleDomain-sales-tax-reporting' 
# 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-06-03 23:09:15 +01:00
FrancescoUK 51e160982e Upgrades sales tax reporting 2017-06-03 23:08:09 +01:00
Steve Ireland 1f2218bbc9 Upgrades sales tax reporting 2017-06-03 21:51:02 +01:00
jekkos 77145d29a8 Regnerate language files (#1330) 2017-06-02 19:47:13 +02:00
jekkos 3a447561eb Merge pull request #1330 from rotrico/master 
Improve spanish translation
 2017-06-02 19:43:21 +02:00
rotrico 6ee545d6eb Improve spanish translation to master version 2017-06-01 13:56:48 +02:00
FrancescoUK afbf714bd2 Revert "Translated using Weblate (English)" mistakes 2017-05-30 21:04:22 +01:00
FrancescoUK 1a2bc1cc42 Merge pull request #1327 from joshua1234511/hotfix/giftcard-stuck-at-10-issue 
fix for Giftcard  issue both display and count (#1315)
 2017-05-30 07:07:05 +01:00
Joshua Fernandes 4268a70388 fix for that issue both display and count 2017-05-30 07:36:57 +05:30
Almubaraq Ratomi 189b189e08 Translated using Weblate (Indonesian) 
Currently translated at 100.0% (16 of 16 strings)
 2017-05-29 22:22:30 +00:00
Almubaraq Ratomi 403c875edf Translated using Weblate (Indonesian) 
Currently translated at 100.0% (133 of 133 strings)
 2017-05-29 22:22:29 +00:00
Almubaraq Ratomi 4f6cf8b917 Translated using Weblate (Indonesian) 
Currently translated at 100.0% (86 of 86 strings)
 2017-05-29 22:22:29 +00:00
Almubaraq Ratomi fd6335081d Translated using Weblate (English) 
Currently translated at 100.0% (29 of 29 strings)
 2017-05-29 22:22:29 +00:00
Almubaraq Ratomi 234cedff15 Translated using Weblate (Indonesian) 
Currently translated at 100.0% (67 of 67 strings)
 2017-05-29 22:22:29 +00:00
Almubaraq Ratomi 8348628dc6 Translated using Weblate (English) 
Currently translated at 100.0% (66 of 66 strings)
 2017-05-29 22:22:29 +00:00
Almubaraq Ratomi ade9a57fe0 Translated using Weblate (Indonesian) 
Currently translated at 100.0% (214 of 214 strings)
 2017-05-29 22:22:29 +00:00
Almubaraq Ratomi 6559f9c561 Translated using Weblate (Indonesian) 
Currently translated at 100.0% (62 of 62 strings)
 2017-05-29 22:22:29 +00:00
Almubaraq Ratomi a7a559fc72 Translated using Weblate (Indonesian) 
Currently translated at 92.7% (89 of 96 strings)
 2017-05-29 22:22:29 +00:00
Marcos e25d1483ae Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 83.6% (179 of 214 strings)
 2017-05-29 22:22:29 +00:00
Almubaraq Ratomi 41a5218583 Translated using Weblate (Indonesian) 
Currently translated at 100.0% (96 of 96 strings)
 2017-05-29 22:22:29 +00:00
Almubaraq Ratomi cc7fcaf264 Translated using Weblate (Indonesian) 
Currently translated at 100.0% (96 of 96 strings)
 2017-05-29 22:22:29 +00:00
Almubaraq Ratomi e776f31ec5 Translated using Weblate (Indonesian) 
Currently translated at 100.0% (62 of 62 strings)
 2017-05-29 22:22:29 +00:00
jekkos d60e1283bd Fix double submit issue (#1309) 2017-05-30 00:14:33 +02:00
FrancescoUK b2d80acafc Regenerate db files 2017-05-28 09:06:04 +01:00
jekkos 37097babcf Fix double submit after focusing OK button (#1309) 2017-05-24 09:21:58 +02:00
jekkos 15bb3ad6a3 Reset stock inventory when deleting items (#1288) 2017-05-22 19:33:13 +02:00
Adrian Wahyudi 5c0c74b037 Translated using Weblate (Indonesian) 
Currently translated at 98.9% (94 of 95 strings)
 2017-05-16 14:13:37 +00:00
Adrian Wahyudi 7093874366 Translated using Weblate (Indonesian) 
Currently translated at 100.0% (214 of 214 strings)
 2017-05-16 14:13:37 +00:00
Adrian Wahyudi 34ae6486dc Translated using Weblate (Indonesian) 
Currently translated at 100.0% (214 of 214 strings)
 2017-05-16 14:13:36 +00:00
FrancescoUK 2d3d385cbc Add migration support and upgrade db to new tax tables (#1133) 2017-05-14 18:40:46 +01:00
Steve Ireland c0a9349b60 Add support for database migration 2017-05-09 20:45:25 -04:00
FrancescoUK c4a76ad01c Fixed Takings filters bug (#1286) 2017-05-01 13:12:25 +01:00
FrancescoUK 8d1bc4cf17 Removed npm package dependencies section 2017-05-01 12:28:09 +01:00
FrancescoUK daa1614615 Revert "Merge pull request #1281 from RuleDomain/migrate-sales-tax-history" 
This reverts commit 11e1cc51aa, reversing
changes made to b32c23ce10.

# Conflicts:
#	application/models/Sale.php
 2017-05-01 11:50:13 +01:00