jekkos-t520
10bc0b5720
Fix custom invoice number ( #2820 )
2020-07-05 23:13:36 +02: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
a154a8705c
Fixed indentation issue
...
Fixed indentation issue
2020-05-08 23:58:40 +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
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
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
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
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
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
6bd0d6277b
Move parsing to token_lib
2020-04-23 22:50:41 +02:00
objecttothis
4584b7eace
Final indentation and formatting fixes
2020-03-24 14:17:36 +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
971ae5ec19
Correcting indentation problems
2020-03-24 13:18:35 +04:00
objecttothis
fb9fec1a10
Merge branch 'master' into pos_bool
2020-03-18 16:19:45 +04:00
objecttothis
c4c475b51f
Updated CSV import to handle checkboxes
...
0, FALSE values create attributes marked as "unchecked"
NULL, "" and spaces do not create an attribute
1, TRUE and ANY other value creates an attribute and marks as checked.
Blank lines in CSV files are skipped with no error.
2020-03-18 15:49:49 +04:00
jekkos-t520
4f60465fa0
Revert barcode rework
2020-03-11 00:15:37 +01:00
jekkos-t520
4300f0a3c6
Rework barcode format parser
2020-03-08 20:15:22 +01:00
objecttothis
ea7cb48f1c
CHECKBOX Attribute type
...
Conversion from DROPDOWN or TEXT logic
2020-03-02 14:17:48 +04:00
FrancescoUK
cdaf88ef28
Fix Employee autocomplete bug ( #2736 )
2020-03-01 17:34:39 +00: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
SteveIreland
57dc2d2b11
Add unique contraint to tax group
2020-02-16 21:08:58 -05:00
FrancescoUK
efd53cbccf
Add Employee name to suspended form ( #2678 )
2020-02-16 13:46:25 +00:00
jekkos
8d97efd52d
Fix inventory summary regression ( #2702 )
2020-02-04 18:07:52 +01:00
FrancescoUK
99d861535e
Add allow sales change price permission ( #2653 )
2020-01-25 17:22:26 +00:00
FrancescoUK
ba40783017
Fix graphical payment report bug
2020-01-22 22:10:56 +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
60b9069a60
Fix Inventory Summary wrong filters input
2020-01-12 20:28:55 +00:00
FrancescoUK
472e15ab0a
Add detailed supplier report
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
43420f02f2
Codestyle remarks
2020-01-02 12:40:31 +01:00
SteveIreland
230d822fce
Add support to parse_decimal function for tax_decimals and quantity_decimals parsing.
2019-12-22 11:04:01 -05:00
objecttothis
619742de4e
Refactoring files and variable names in Customer/People
2019-11-25 17:27:59 +04:00
objecttothis
35a59fc400
refactor variable names to reflect Excel --> CSV wording
2019-11-18 14:39:21 +04:00
SteveIreland
fffb70933d
Fix item type maintenance issue regardless.
2019-11-10 19:40:57 -05:00
FrancescoUK
ac1c6b2286
Minor fixes, add CI_ENV to docker-compose
2019-10-26 17:42:30 +01:00
SteveIreland
4c4725795c
Fix numeric locale configuration.
2019-10-19 17:10:51 -04:00
SteveIreland
d4c2693511
Fix numeric locale configuration.
2019-10-16 21:37:46 -04:00
