Skip to content

Commit

Permalink
Merge branch '2024.11'
Browse files Browse the repository at this point in the history
  • Loading branch information
gitlabci committed Nov 12, 2024
2 parents 9d3d9d5 + 3889f4f commit 5efa565
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 14 deletions.
24 changes: 12 additions & 12 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -77,25 +77,25 @@ and follow the instructions of the repo.
## requirements / supported clients

### ActiveSync Clients
- iOS to version 17
- Android to version 14
- iOS to version 18
- Android to version 15

### WebDAV/CardDAV Clients
- OwnCloud Client to version 3.2.1
- OwnCloud Client to version 5.2.1
- Windows Explorer to version 11
- macOS X Finder to macOS 14.0
- KDE Plasma to version 5.27
- Gnome/Nautilus to version 44
- macOS X Finder to macOS 15
- KDE Plasma to version 6.2
- Gnome/Nautilus to version 47
- CardBook (Thunderbird addon)
- emClient to version 8.0
- emClient to version 10.1

### CalDAV Clients
- Mozilla Thunderbird to version 115.4
- eM Client to version 8.0
- iCal to version 14.0
- Reminders to macOS 14.0
- iOS to version 17
- DAVx5 to version 4.3.9
- eM Client to version 10.1
- iCal to version 15
- Reminders to macOS 15
- iOS to version 18
- DAVx5 to version 4.4.3

### Server
- PHP version 8.1 to 8.2
Expand Down
4 changes: 2 additions & 2 deletions tine20/Inventory/js/InventoryItemEditDialog.js
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ Tine.Inventory.InventoryItemEditDialog = Ext.extend(Tine.widgets.dialog.EditDial
* @private
*/
getFormItems: function() {
if (Tine.Sales.Model?.PurchaseInvoice) {
if (Tine.Sales && Tine.Tinebase.common.hasRight('run', 'Sales') && Tine.Sales.Model?.PurchaseInvoice) {
const app = Tine.Tinebase.appMgr.get('Sales')
this.invoiceRecordPicker = Tine.widgets.form.RecordPickerManager.get('Sales', 'PurchaseInvoice', {
fieldLabel: app.i18n._('Purchase Invoice'),
Expand All @@ -77,7 +77,7 @@ Tine.Inventory.InventoryItemEditDialog = Ext.extend(Tine.widgets.dialog.EditDial
hideMode: 'offsets'
},
items: [{
//Start first tab
// Start first tab
title: this.app.i18n._('General'),
border: false,
frame: true,
Expand Down

0 comments on commit 5efa565

Please sign in to comment.