Merge
This commit is contained in:
commit
69b0214a48
1 changed files with 50 additions and 1 deletions
|
@ -2748,4 +2748,53 @@ ELSE
|
|||
BEGIN
|
||||
UPDATE [dbo].[Providers] SET [DisableAutoDiscovery] = NULL WHERE [DisplayName] = 'MySQL Server 5.6'
|
||||
END
|
||||
GO
|
||||
GO
|
||||
|
||||
|
||||
-- CRM Quota
|
||||
|
||||
BEGIN
|
||||
UPDATE [dbo].[Quotas] SET QuotaOrder = 5 WHERE [QuotaName] = 'HostedCRM.MaxDatabaseSize'
|
||||
END
|
||||
GO
|
||||
|
||||
IF NOT EXISTS (SELECT * FROM [dbo].[Quotas] WHERE [QuotaName] = 'HostedCRM.ESSUsers')
|
||||
BEGIN
|
||||
INSERT [dbo].[Quotas] ([QuotaID], [GroupID],[QuotaOrder], [QuotaName], [QuotaDescription], [QuotaTypeID], [ServiceQuota], [ItemTypeID]) VALUES (462, 21, 4, N'HostedCRM.ESSUsers', N'ESS licenses per organization',3, 0 , NULL)
|
||||
END
|
||||
GO
|
||||
|
||||
|
||||
-- Lync
|
||||
|
||||
IF EXISTS (SELECT * FROM SYS.OBJECTS WHERE type = 'P' AND name = 'GetPackageIPAddressesCount')
|
||||
DROP PROCEDURE GetPackageIPAddressesCount
|
||||
GO
|
||||
|
||||
PROCEDURE [dbo].[GetPackageIPAddressesCount]
|
||||
(
|
||||
@PackageID int,
|
||||
@OrgID int,
|
||||
@PoolID int = 0
|
||||
)
|
||||
AS
|
||||
BEGIN
|
||||
|
||||
SELECT
|
||||
COUNT(PA.PackageAddressID)
|
||||
FROM
|
||||
dbo.PackageIPAddresses PA
|
||||
INNER JOIN
|
||||
dbo.IPAddresses AS IP ON PA.AddressID = IP.AddressID
|
||||
INNER JOIN
|
||||
dbo.Packages P ON PA.PackageID = P.PackageID
|
||||
INNER JOIN
|
||||
dbo.Users U ON U.UserID = P.UserID
|
||||
LEFT JOIN
|
||||
ServiceItems SI ON PA.ItemId = SI.ItemID
|
||||
WHERE
|
||||
(@PoolID = 0 OR @PoolID <> 0 AND IP.PoolID = @PoolID)
|
||||
AND (@OrgID = 0 OR @OrgID <> 0 AND PA.OrgID = @OrgID)
|
||||
|
||||
END
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue