mirror/opensourcepos
1
0
Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-07-27 15:17:09 -04:00
Code Issues Packages Projects Releases Wiki Activity
6,725 Commits 49 Branches 39 Tags
WebShells-Second-Display
Commit Graph

6725 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
WShells
6eb5ed9381 Fixing TR Issues 
Fixing TR Issues
 2020-05-07 17:57:09 +03:00
Pete Ongsuwan
bfa42dba4a Translated using Weblate (Thai) 
Currently translated at 92.8% (259 of 279 strings)

Translation: ospos/config
Translate-URL: http://weblate.jpeelaer.net/projects/ospos/config/th/
 2020-05-07 08:36:24 +02:00
Pete Ongsuwan
54d07e9063 Translated using Weblate (Thai) 
Currently translated at 100.0% (67 of 67 strings)

Translation: ospos/common
Translate-URL: http://weblate.jpeelaer.net/projects/ospos/common/th/
 2020-05-07 08:36:09 +02:00
Robby Triadi Susanto
e830595f43 Translated using Weblate (Indonesian) 
Currently translated at 100.0% (78 of 78 strings)

Translation: ospos/taxes
Translate-URL: http://weblate.jpeelaer.net/projects/ospos/taxes/id/
 2020-05-05 17:47:31 +02:00
Pete Ongsuwan
79632731f8 Translated using Weblate (Thai) 
Currently translated at 100.0% (21 of 21 strings)

Translation: ospos/suppliers
Translate-URL: http://weblate.jpeelaer.net/projects/ospos/suppliers/th/
 2020-05-05 17:47:31 +02:00
Robby Triadi Susanto
5ed8384d45 Translated using Weblate (Indonesian) 
Currently translated at 100.0% (177 of 177 strings)

Translation: ospos/sales
Translate-URL: http://weblate.jpeelaer.net/projects/ospos/sales/id/
 2020-05-05 17:47:31 +02:00
Pete Ongsuwan
307407d732 Translated using Weblate (Thai) 
Currently translated at 100.0% (109 of 109 strings)

Translation: ospos/items
Translate-URL: http://weblate.jpeelaer.net/projects/ospos/items/th/
 2020-05-05 17:47:31 +02:00
khao_lek
a0b885d5ca Translated using Weblate (Thai) 
Currently translated at 98.5% (67 of 68 strings)

Translation: ospos/giftcards
Translate-URL: http://weblate.jpeelaer.net/projects/ospos/giftcards/th/
 2020-05-05 17:47:31 +02:00
Pete Ongsuwan
5bf2f2ec43 Translated using Weblate (Thai) 
Currently translated at 86.7% (242 of 279 strings)

Translation: ospos/config
Translate-URL: http://weblate.jpeelaer.net/projects/ospos/config/th/
 2020-05-05 17:47:31 +02:00
Pete Ongsuwan
a5f9185308 Translated using Weblate (Thai) 
Currently translated at 100.0% (36 of 36 strings)

Translation: ospos/cashups
Translate-URL: http://weblate.jpeelaer.net/projects/ospos/cashups/th/
 2020-05-05 17:47:31 +02:00
Pete Ongsuwan
c9535653c9 Translated using Weblate (Thai) 
Currently translated at 100.0% (8 of 8 strings)

Translation: ospos/bootstrap_tables
Translate-URL: http://weblate.jpeelaer.net/projects/ospos/bootstrap_tables/th/
 2020-05-05 17:47:31 +02:00
Pete Ongsuwan
249aa091fd Translated using Weblate (Thai) 
Currently translated at 100.0% (29 of 29 strings)

Translation: ospos/attributes
Translate-URL: http://weblate.jpeelaer.net/projects/ospos/attributes/th/
 2020-05-05 17:47:31 +02:00
Pete Ongsuwan
569e09e741 Translated using Weblate (Thai) 
Currently translated at 100.0% (67 of 67 strings)

Translation: ospos/common
Translate-URL: http://weblate.jpeelaer.net/projects/ospos/common/th/
 2020-05-05 17:47:31 +02:00
objecttothis
5a58af7a01 Removing LEFT JOIN of supplier table 
per #2788 the Supplier table results from Item->get_all() and Item->get_info() are not used anywhere and causing a bug where the duplicate fields between the items table and the suppliers table (deleted and category) are returning just one value to the results.  This creates the undesired effect of expecting items.deleted and items.category but getting values from suppliers.deleted and suppliers.category.
 2020-05-05 15:01:32 +02:00
objecttothis
9557f1c310 Forgotten commit 
- This was correct in my code base.  I just forgot to commit it.
 2020-05-05 14:47:42 +04:00
objecttothis
ee860e3b71 Disable fields on category_dropdown attribute view 
- These changes prevent the type of attribute to be changed from
dropdown for categories as dropdown.
 2020-05-05 14:06:11 +04:00
objecttothis
1dc3e15a55 Implement dropdown into item form view 
- Created business logic in view to show dropdown if enabled
- Created business logic in controller to calculate key/value pairs of
dropdown
- Adjusted attribute model get_definition values to send values also if
definition_id is -1 or > 0 but not 0 which is what we are now using as
no definition instead of -1
 2020-05-05 11:59:03 +04:00
objecttothis
d5d6d6668c Corrected errors 2020-05-04 17:19:03 +04:00
objecttothis
0051fa87ec Corrected errors 2020-05-04 17:18:48 +04:00
objecttothis
15a987cfd9 Adjust functions related to attributes 2020-05-04 17:00:02 +04:00
objecttothis
96bfa330ba Added the creation and removal of ospos_category attribute 
- Added undelete function in Attribute model which could be useful for
adding the ability to restore attributes once deleted.
- Added business logic to Config controller save_general to
create/remove the attribute when the box is checked or unchecked.
 2020-05-04 16:45:58 +04:00
objecttothis
231fe483d9 Add Config to enable show Category as dropdown 
- Added the config item and label to view.
- Added the language line in en_US and en_GB.
- Added save business to Config controller.
- Fixed formatting issues in Config controller (removed tabs on blank
lines)
 2020-05-04 15:23:50 +04:00
jekkos-t520
431074af58 Fix token lib test 2020-05-02 18:06:28 +02:00
objecttothis
06d73959af Merge pull request #2814 from opensourcepos/attr-dropdown-sort-patch 
Added ORDER BY to sort various dropdowns
 2020-05-01 17:54:01 +04:00
objecttothis
06eebc2ad3 Make DROPDOWN values sorted by alphabet. 2020-05-01 17:51:13 +04:00
objecttothis
42f8d71404 Added ORDER BY to sort various dropdowns 
This sorts alphabetically:
- Attributes on the Attribute->Item view
- Dropdowns for adding attributes in the Attribute->Item view
- Dropdowns for the attribute values themselves.
 2020-04-30 17:12:59 +04:00
Pete Ongsuwan
9b4621d3b8 Translated using Weblate (Thai) 
Currently translated at 74.9% (209 of 279 strings)

Translation: ospos/config
Translate-URL: http://weblate.jpeelaer.net/projects/ospos/config/th/
 2020-04-29 12:39:02 +02:00
khao_lek
6b830d7acd Translated using Weblate (Thai) 
Currently translated at 74.9% (209 of 279 strings)

Translation: ospos/config
Translate-URL: http://weblate.jpeelaer.net/projects/ospos/config/th/
 2020-04-29 12:38:56 +02:00
jekkos-t520
99fb55051a Divide quantity and price according to configured precision 2020-04-23 22:50:41 +02:00
jekkos-t520
6bd0d6277b Move parsing to token_lib 2020-04-23 22:50:41 +02:00
FrancescoUK
494b112424 Merge pull request #2806 from opensourcepos/values-keyword-patch-checkbox 
Values is a mysql keyword
 2020-04-22 18:55:59 +01:00
objecttothis
b0ba354b31 Values is a mysql keyword 
Corrected the name of the alias from values to vals to prevent DB errors on conversion from DROPDOWN to CHECKBOX.
 2020-04-22 13:37:31 +04:00
Weblate
e27c703026 Merge branch 'origin/master' into Weblate 2020-04-20 15:41:42 +02:00
khao_lek
822cd9f4ce Translated using Weblate (Thai) 
Currently translated at 80.7% (42 of 52 strings)

Translation: ospos/receivings
Translate-URL: http://weblate.jpeelaer.net/projects/ospos/receivings/th/
 2020-04-20 15:41:41 +02:00
Emil Ebsen
a964c9b7d0 Added translation using Weblate (Danish) 2020-04-20 15:41:24 +02:00
WShells
7e49a7b82a Indent... 2020-04-18 05:56:44 +03:00
WShells
5fe3b2ff00 Updating Dir/File Location 2020-04-18 05:48:50 +03:00
WShells
c1b2e0cec6 Clipboard.js 2020-04-18 05:47:51 +03:00
WShells
11f2f1eafa Updating Copy to Clipboard 
Updating Copy to Clipboard Function Supporting Mozilla Firefox Again
 2020-04-18 05:46:18 +03:00
FrancescoUK
60d2dfcf1e Merge pull request #2791 from blutme/patch-1 
loginButton Update login.php
 2020-04-13 06:20:15 +01:00
blutme
64b2843cf6 loginButton Update login.php 
the "loginButton" valule had no translation when changing languages.
 2020-04-12 18:27:08 -05:00
Weblate
d716cf9a48 Merge branch 'origin/master' into Weblate 2020-04-10 19:00:22 +02:00
Emil Ebsen
01bb4e1b7a Added translation using Weblate (Danish) 2020-04-10 19:00:18 +02:00
WShells
3572ed1f86 Adding Andriux 
...
 2020-04-10 05:27:02 +03:00
objecttothis
66d426a1b6 Merge pull request #2739 from opensourcepos/pos_bool 
Implement CHECKBOX attribute type
 2020-04-08 15:37:12 +04:00
Weblate
62946906d8 Merge branch 'origin/master' into Weblate 2020-04-07 10:28:36 +02:00
Emil Ebsen
20e0eae9bd Translated using Weblate (Danish) 
Currently translated at 99.6% (278 of 279 strings)

Translation: ospos/config
Translate-URL: http://weblate.jpeelaer.net/projects/ospos/config/da/
 2020-04-07 10:28:35 +02:00