spencerrlongg fb001caee4 fix conflicts

2023-09-11 17:33:31 -05:00

..

Labels

Don’t 500 if the 1D barcode doesn’t match the format requested - log an error instead

2023-08-18 22:18:38 +01:00

Recipients

…

Traits

Automatically add table prefixes when building multi-column search string

2023-05-23 15:58:58 -07:00

Accessory.php

Move the declinedCheckout function so it don/'t separate the class properties

2023-08-14 16:16:28 -06:00

Actionlog.php

…

Asset.php

fix conflicts

2023-09-11 17:33:31 -05:00

AssetMaintenance.php

Fix #8208, #8896, #8985, #9789

2023-03-29 09:56:34 +02:00

AssetModel.php

adds min_amt to asset model edit, index, and table

2023-08-24 10:30:07 -07:00

Category.php

Added showableAssets() relationship to Category model

2023-03-08 13:01:38 -08:00

CheckoutAcceptance.php

Add CheckoutAcceptance factory

2023-05-03 14:21:13 -07:00

CheckoutRequest.php

Add the withTrashed() method to requestingUser() method in CheckoutRequest model, so the view of requestable assets doesn't crash

2023-07-10 16:34:00 -06:00

Company.php

Update Company.php

2023-08-13 17:21:55 +02:00

CompanyableChildScope.php

…

CompanyableChildTrait.php

…

CompanyableScope.php

…

CompanyableTrait.php

…

Component.php

Added eloquent model relationships

2023-04-13 11:10:16 -07:00

Consumable.php

Added eloquent model relationships

2023-04-13 11:10:16 -07:00

ConsumableAssignment.php

…

CustomField.php

Merge pull request #12761 from spencerrlongg/bulk_edit_custom_fields

2023-08-22 12:40:18 +01:00

CustomFieldset.php

…

Department.php

Added phone, fax to departments, locations, companies

2023-07-10 19:44:21 +01:00

Depreciable.php

Check that $this->get_depreciation() returns

2023-07-20 16:30:07 +01:00

Depreciation.php

doesn't allow months to be zero

2023-03-06 09:41:14 -08:00

Group.php

Corrected gates, added fillable

2023-03-18 11:53:20 -07:00

ICompanyableChild.php

…

Import.php

…

Ldap.php

removed a typo

2023-04-25 11:49:33 -07:00

License.php

Add guard clauses around some License and LicenseSeat models functions

2023-09-06 11:54:11 -06:00

LicenseSeat.php

Add guard clauses around some License and LicenseSeat models functions

2023-09-06 11:54:11 -06:00

Location.php

Added phone, fax to departments, locations, companies

2023-07-10 19:44:21 +01:00

Loggable.php

Add rtd_location_id to tracked changes on checkin actionlog

2023-09-06 00:36:48 +00:00

Manufacturer.php

Fixed #12946 - warranty lookup url was not nullable

2023-04-29 13:47:52 -07:00

PredefinedKit.php

…

Requestable.php

Refactor Requestable@cancelRequest() firm to admit a user_id so we can cancel a request of whatever user we want

2023-06-27 17:13:11 -06:00

SCIMUser.php

…

Setting.php

Added validation on google client ID

2023-05-10 02:40:45 -07:00

SnipeModel.php

Fix #8208, #8896, #8985, #9789

2023-03-29 09:56:34 +02:00

SnipeSCIMConfig.php

Change from a standard Eloquent mapping for ID to a custom setRead

2023-04-25 11:50:55 -07:00

Statuslabel.php

…

Supplier.php

Make validation match database fields

2023-05-08 14:12:54 -07:00

User.php

Merge pull request #12901 from Godmartinz/user_total_cost

2023-09-05 13:52:34 +01:00