mirror/opensourcepos
1
0
Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-01-06 00:17:54 -05:00
Code Issues Packages Projects Releases Wiki Activity
4,834 Commits 36 Branches 40 Tags
3.3.2
Commit Graph

577 Commits

Author SHA1 Message Date
jekkos-t520
b4fadbf84f Add quote year count to token list (#2886) 2020-08-24 13:21:40 +02:00
jekkos-t520
7873110fc5 Code style remarks (#2886) 2020-08-24 13:21:40 +02:00
Jeroen Peelaerts
46d957f5b4 Quote improvements 2020-08-24 13:21:40 +02:00
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
SteveIreland
6d91ae3845 Fix included destination tax 2020-06-28 18:12:46 -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
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
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
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
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
jekkos-t520
431074af58 Fix token lib test 2020-05-02 18:06:28 +02: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
jekkos-t520
6bd0d6277b Move parsing to token_lib 2020-04-23 22:50:41 +02: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
objecttothis
b5265870be More descriptive alias 2020-03-24 14:21:57 +04:00
objecttothis
8a0c88b11c More indentation corrections 2020-03-24 14:13:08 +04:00
objecttothis
3281fc9bb0 Correct indentation problems 2020-03-24 14:04:04 +04:00
objecttothis
fb9fec1a10 Merge branch 'master' into pos_bool 2020-03-18 16:19:45 +04:00
jekkos-t520
0f2bafc7dd Fix attribute search (#2723) 2020-03-14 01:44:08 +01:00
jekkos-t520
4f60465fa0 Revert barcode rework 2020-03-11 00:15:37 +01:00
objecttothis
cefd287668 Resolve bug not updating attributes correctly 
Prior to this fix, if the attribute was of DECIMAL or DATE type and the action was an UPDATE, then it would try to update the attribute_value, not the corresponding attribute_decimal or attribute_date.
 2020-03-10 09:21:09 +01:00
jekkos-t520
4300f0a3c6 Rework barcode format parser 2020-03-08 20:15:22 +01:00
FrancescoUK
f3e87d3c3c Revert change causing issues with Detailed Transactions 2020-03-06 19:56:48 +00:00
objecttothis
ea7cb48f1c CHECKBOX Attribute type 
Conversion from DROPDOWN or TEXT logic
 2020-03-02 14:17:48 +04:00
objecttothis
ff79b73e34 Implement CHECKBOX attribute type 
Attribute Configuration view
Attributes section of item management view
Attributes section of CSV item import
 2020-02-25 15:44:49 +04:00
FrancescoUK
efd53cbccf Add Employee name to suspended form (#2678) 2020-02-16 13:46:25 +00:00
FrancescoUK
622fdc27aa Fix detailed reports error with attributes (#2721) 2020-02-15 22:01:51 +00:00
jekkos
8d6a23d0e7 Check if grant for module exists (#2702) 2020-01-30 08:56:39 +01:00
jekkos
4722a5600f Do not show deleted items in low inventory report (#2702) 2020-01-29 23:26:08 +01:00
FrancescoUK
aba9c2bc30 Fix Customer delete issue 2020-01-26 09:12:02 +00:00
FrancescoUK
dfe66e8083 Fix Customer delete error 2020-01-25 21:11:30 +00:00
FrancescoUK
5007410c1a Change Employee input type in Sales edit form 2020-01-19 20:32:57 +00:00
FrancescoUK
b4eabd2265 Fix missing cash refund in sale edit form 2020-01-19 18:24:11 +00:00
FrancescoUK
40d8ea0268 Replace serial number with item_number (barcode) in detailed reports 2020-01-18 15:32:12 +00:00
FrancescoUK
af2fd78348 Fix Graphical Summary Payment report 2020-01-12 20:28:55 +00:00
FrancescoUK
472e15ab0a Add detailed supplier report 2020-01-12 20:28:55 +00:00
FrancescoUK
bdddb945f0 Reports minor fixes 2020-01-12 20:28:55 +00:00
FrancescoUK
a081b72916 Fix issue with POS transaction return when Items are deleted (#2659) 2020-01-03 21:56:43 +00:00
jekkos
d52c16fbba Fix item form refresh (#2538) 2020-01-03 14:26:11 +01:00
jekkos
f9da801f06 Add aggregate to fix only_full_group_by (#2538) 2020-01-03 00:16:34 +01:00
FrancescoUK
a56a4070a6 Revert "Fix "only_full_group_by" issue (#2538)" 
This reverts commit 424eb4cf14.
 2019-10-06 20:15:24 +01:00
FrancescoUK
69d57b3744 Merge pull request #2567 from opensourcepos/fix-initial-tax-config 
Clear initial default for Cascade and Seq for Tax Config Tables
 2019-10-06 18:54:31 +01:00
FrancescoUK
424eb4cf14 Fix "only_full_group_by" issue (#2538) 2019-10-06 18:43:58 +01:00