mirror/opensourcepos
1
0
Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-05-05 22:35:29 -04:00
Code Issues Packages Projects Releases Wiki Activity
4,772 Commits 91 Branches 39 Tags
b7fcc94eb0b79acbcb26b682823088e1e37ea2a2
Commit Graph

4772 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
SteveIreland
b7fcc94eb0 Fixes #2872 SQL Error in Sale.php 2020-07-01 08:58:04 +02:00
objecttothis
a11f25e983 Update Item.php 
Set group_concat_max_len session variable to prevent count totals at the bottom of the tables becoming `1 to null of null items` when database includes significant number of item rows.
 2020-06-29 11:23:10 +02:00
objecttothis
85fea45def Merge pull request #2780 from opensourcepos/fix-included-destination-tax 
Fix included destination tax
 2020-06-29 09:25:06 +04:00
SteveIreland
6d91ae3845 Fix included destination tax 2020-06-28 18:12:46 -04:00
FrancescoUK
be44fb2aa7 Merge pull request #2870 from opensourcepos/fix-invoice-field 
Fix invoice field visibility (#2820)
 2020-06-27 19:02:26 +01:00
Jeroen Peelaerts
fa15b1e94b Fix invoice field visibility (#2820) 2020-06-27 17:36:17 +02:00
objecttothis
535df2b706 Merge pull request #2840 from opensourcepos/System-Info 
Minor Changes & Footer Update
 2020-06-27 15:27:23 +04:00
objecttothis
5fa4e18eb7 Update common_lang.php 
Changes to British English at @daN4cat request.
 2020-06-27 15:08:43 +04:00
objecttothis
581ca8745a Update common_lang.php 
Inserting inline variable and resorted variables for ease of finding.
 2020-06-27 14:57:25 +04:00
objecttothis
687ae74a62 Update footer.php 
replaced " with ' to prevent the string from being parsed for variables unnecessarily.
 2020-06-27 14:54:39 +04:00
objecttothis
f3ee3d7dbd Update footer.php 
Corrected code to send the ending year to the language line for RTL languages to juggle.
 2020-06-27 14:53:28 +04:00
Emin Tufan Çetin
fb0cee0e74 Translated using Weblate (Turkish) 
Currently translated at 100.0% (292 of 292 strings)

Translation: ospos/config
Translate-URL: http://weblate.jpeelaer.net/projects/ospos/config/tr/
 2020-06-17 20:41:36 +02:00
jekkos
1bd9501e76 Translated using Weblate (Flemish) 
Currently translated at 93.1% (27 of 29 strings)

Translation: ospos/attributes
Translate-URL: http://weblate.jpeelaer.net/projects/ospos/attributes/nl_BE/
 2020-06-09 14:33:53 +02:00
Weblate
3fa55b2ff4 Merge branch 'origin/master' into Weblate 2020-06-09 14:19:16 +02:00
Corvin
633a888ae4 Translated using Weblate (Hungarian) 
Currently translated at 29.5% (13 of 44 strings)

Translation: ospos/expenses
Translate-URL: http://weblate.jpeelaer.net/projects/ospos/expenses/hu/
 2020-06-09 14:19:15 +02:00
Emin Tufan Çetin
12125dfbd7 Translated using Weblate (Turkish) 
Currently translated at 100.0% (291 of 291 strings)

Translation: ospos/config
Translate-URL: http://weblate.jpeelaer.net/projects/ospos/config/tr/
 2020-06-09 14:18:59 +02:00
Andrés Sánchez
06aa032d45 Translated using Weblate (Spanish) 
Currently translated at 100.0% (291 of 291 strings)

Translation: ospos/config
Translate-URL: http://weblate.jpeelaer.net/projects/ospos/config/es/
 2020-06-09 14:18:52 +02:00
mazbrili
46f0af4d48 Translated using Weblate (Indonesian) 
Currently translated at 100.0% (291 of 291 strings)

Translation: ospos/config
Translate-URL: http://weblate.jpeelaer.net/projects/ospos/config/id/
 2020-06-09 14:18:44 +02:00
Corvin
70857ba358 Translated using Weblate (Hungarian) 
Currently translated at 27.7% (10 of 36 strings)

Translation: ospos/cashups
Translate-URL: http://weblate.jpeelaer.net/projects/ospos/cashups/hu/
 2020-06-09 14:18:29 +02:00
jekkos
5cf0d5faeb Added translation using Weblate (Armenian) 2020-06-09 14:18:13 +02:00
FrancescoUK
d6df082d32 Merge pull request #2852 from opensourcepos/constant_location_patch 
Update constants.php
 2020-06-04 09:16:10 +01:00
objecttothis
2cd90ccb17 Update constants.php 
Correcting missing '
 2020-06-04 11:11:50 +04:00
objecttothis
63ea90f537 Merge pull request #2849 from opensourcepos/constant_location_patch 
Change the locations of global constants to make them global across files
 2020-06-03 22:01:41 +04:00
objecttothis
a3fb05b566 Change the locations of global constants to make them global across 
files

- Items Constants
- Attributes Constants
- Sale Constants
 2020-06-03 14:15:05 +04:00
WebShells
8fc27d88e0 Colors for User Setup section 
Colors for User Setup section
 2020-05-27 10:16:46 +03:00
WebShells
b2bb4d8b62 PHP Declaration 2020-05-27 10:10:52 +03:00
WebShells
2fd50471de Footer in License Section 2020-05-27 09:24:49 +03:00
WebShells
ecff38d5bb Language Updates 2020-05-27 09:06:42 +03:00
WebShells
026114457b Minor Changes & Footer Update 
Added timezone checkup to system info

1st Case:
Timezones are the same ( no warning )
2nd Case:
Difference in timezones: Warning will be displayed.

Simplifying OSPOS footer and replacing git project link by OSPOS website.
 2020-05-27 08:56:51 +03:00
objecttothis
d5659b5131 Merge pull request #2816 from opensourcepos/category_as_dropdown 
Category as dropdown
 2020-05-20 14:08:32 +04:00
objecttothis
979ec9fe02 Merge branch 'master' into category_as_dropdown 2020-05-20 13:55:41 +04:00
objecttothis
89a56820d2 Formatting Corrections 2020-05-20 13:52:54 +04:00
objecttothis
145f49d247 Code Review Changes 
- Refactored code to include constants
- Fixed comment formatting issues
 2020-05-20 13:48:24 +04:00
objecttothis
a155399ec0 Merge branch 'master' into category_as_dropdown 2020-05-19 18:14:31 +04:00
objecttothis
f5424a3ed2 Create Global Constants to clarify code 2020-05-19 18:06:20 +04:00
objecttothis
35023e648f Force Travis-CI to rebuild to demo 2020-05-14 19:35:55 +04:00
jekkos
00020ba7dc Fix token_lib regresssion 2020-05-13 13:53:14 +02:00
jekkos-t520
3854587907 Fix default quantity #2829 2020-05-13 13:53:14 +02:00
objecttothis
ba6826a31e Merge pull request #2824 from opensourcepos/custom_image_upload_restrictions 
Custom image upload restrictions
 2020-05-08 23:59:22 +04:00
objecttothis
a154a8705c Fixed indentation issue 
Fixed indentation issue
 2020-05-08 23:58:40 +04:00
WShells
e6dad3eb81 Updating System Info Section (#2805) 
* Updating Permissions Checkup & Fixed Clipboard issue on Mozilla and Other Browsers

* Re-ordering Tabs & Minor Changes

- Re-ordering Configuration Tabs, Merging Configuration/Settings tabs under Setup & Conf
- Minor Changes to Setup & Conf
- Translations Added

* Indent

* Minor Changes

* Dir Fix 

* Fixing Listing Sign

* Fixing Listing Sign in Warning messages
 2020-05-08 20:14:48 +03:00
objecttothis
b3b7b227a9 Fixed problem with Images not deleting 2020-05-08 16:52:35 +04:00
objecttothis
f4a941e209 Removed duplicate variable 2020-05-08 16:08:49 +04:00
objecttothis
75f45bdb47 Corrected variable names 2020-05-08 16:04:37 +04:00
objecttothis
8a9edb8963 Removing variable not yet merged into the master from another PR 2020-05-08 16:02:02 +04:00
WShells
6f78672f82 Avatar Permissions 
Editing Avatar file permissions to display 750 in place of 755 as our security check is set.
 2020-05-08 14:59:42 +03:00
objecttothis
68a2489e13 Add Save logic 
- Corrected minimum image size value in migration script
- Added save logic to save_general() in Config controller
- Added logic in the index() of the Config controller to properly prep
allowed_image_types data
 2020-05-08 15:58:37 +04:00
objecttothis
9b18072f1e migration corrections 2020-05-08 14:23:12 +04:00
objecttothis
59142d9f69 Database logic additions 
- Migration script to create default values
- Corrected naming of variables in general_config.php
- Replaced hardcoded values with db variables
 2020-05-08 14:22:49 +04:00
objecttothis
a79e9dd4cb Changes to allow custom image restrictions in view. 
- Added the fields to the general config view.
- Added Language lines to en_US and en_GB
- Corrected formatting of Columns in search suggestion layout
 2020-05-08 13:15:13 +04:00