1. Correcting CompanyName for the login

2. Correcting Exception handling for Project Preferences
Acumatica · Nov 7, 2017 · 0eec549 · 0eec549
1 parent 1c554de
commit 0eec549
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 3 deletions.
diff --git a/AcumaticaSmartsheetIntegration.zip b/AcumaticaSmartsheetIntegration.zip
diff --git a/DeploymentSource/Bin/PX.SmartSheetIntegration.dll b/DeploymentSource/Bin/PX.SmartSheetIntegration.dll
diff --git a/DeploymentSource/Bin/PX.SmartSheetIntegration.pdb b/DeploymentSource/Bin/PX.SmartSheetIntegration.pdb
diff --git a/PX.SmartSheetIntegration/PM/SetupMaintExt.cs b/PX.SmartSheetIntegration/PM/SetupMaintExt.cs
@@ -20,8 +20,8 @@ protected virtual void PMSetup_RowPersisting(PXCache sender, PXRowPersistingEven
             if (pmSetupSSExtRow.UsrSmartsheetClientID != null
                     && String.IsNullOrEmpty(pmSetupSSExtRow.UsrDefaultRateTableID))
             {
-                sender.RaiseExceptionHandling<PMSetupSSExt.usrDefaultRateTableID>(pmSetupRow, null, new PXSetPropertyException(ErrorMessages.FieldIsEmpty, PXErrorLevel.Error));
-                e.Cancel = true;
+                throw new PXRowPersistingException(typeof(PMSetupSSExt.usrDefaultRateTableID).Name, null,
+                                                          ErrorMessages.FieldIsEmpty);
             }
         }
         #endregion

diff --git a/PX.SmartSheetIntegration/SM/MyProfileMaintExt.cs b/PX.SmartSheetIntegration/SM/MyProfileMaintExt.cs
@@ -29,7 +29,7 @@ protected virtual void RequestSSToken()
         {
             PMSetup pmSetupRow = PXSelect<PMSetup>.Select(Base);
             PMSetupSSExt pmSetupSSExtRow = PXCache<PMSetup>.GetExtension<PMSetupSSExt>(pmSetupRow);
-            string loginScopeCompany = PXDatabase.Companies.Length > 0 ? Base.Accessinfo.CompanyName : String.Empty;
+            string loginScopeCompany = PXDatabase.Companies.Length > 0 ? PXAccess.GetCompanyName() : String.Empty;
             string currentScope = String.Format(",{0},{1}", Base.Accessinfo.UserName, loginScopeCompany);
             if (pmSetupSSExtRow != null && pmSetupSSExtRow.UsrSmartsheetClientID != null)
             {