Sarand/BusinessMgr-2019
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Contacts

Browse Source
This commit is contained in:
Andy Howard
2024-11-26 11:33:22 +00:00
parent 8b872cc8f3
commit c8b5df5909
56 changed files with 1122 additions and 860 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SaBusMgrStandardDbas/Dbas/Mgr/SbmAccountMgr_Dbas-Affiliate.cs
+5 -7
View File
@@ -280,10 +280,9 @@ namespace Sarand.BusinessMgr.Net.Standard.Dbas.Mgr
dbAffiliate._Website = affiliate.Website;
// Ogranisation.
dbAffiliate._AffIdParent = affiliate.AffiliateIdParent.ToInt();
if (!affiliate.IsIndividual())
dbAffiliate._Name = affiliate.Name;
else
dbAffiliate._Name = affiliate.GetDisplayName();
if (affiliate.IsIndividual())
affiliate.Name = affiliate.GetDisplayName();
dbAffiliate._Name = affiliate.Name;
dbAffiliate._Abbrev = affiliate.Abbr;
dbAffiliate._Nature = affiliate.Nature;
dbAffiliate._Contact = affiliate.Contact;
@@ -293,8 +292,6 @@ namespace Sarand.BusinessMgr.Net.Standard.Dbas.Mgr
// Individual.
dbAffiliate._Title = affiliate.Title;
dbAffiliate._Initials = affiliate.Initials;
if (affiliate.AffiliateType == Sbm.AffiliateType.Individual)
dbAffiliate._Name = affiliate.GetDisplayName();
dbAffiliate._FirstName = affiliate.FirstName;
dbAffiliate._LastName = affiliate.LastName;
dbAffiliate._Salutation = affiliate.Salutation;
@@ -548,7 +545,7 @@ namespace Sarand.BusinessMgr.Net.Standard.Dbas.Mgr
String colAffiliate_Id = SbmDbDfn.GetColumnNameQual(SbmDbDfn.ColumnIdx.Affiliate_Id, aliasAffiliate);
if (prm.IdsIncluded.HasValidIds())
filter.Add($"{colAffiliate_Id} IN ({prm.IdsIncluded.Concat(",")})");
if (prm.IdsExcluded.HasValidIds() )
if (prm.IdsExcluded.HasValidIds())
filter.Add($"{colAffiliate_Id} NOT IN ({prm.IdsExcluded.Concat(",")})");
// Type.
@@ -832,6 +829,7 @@ namespace Sarand.BusinessMgr.Net.Standard.Dbas.Mgr
{
// Default sort columns:
sortColumnNames.Add(SbmDbDfn.GetColumnNameQual(SbmDbDfn.ColumnIdx.Affiliate_Type, aliasAffiliate) + " ASC");
sortColumnNames.Add(SbmDbDfn.GetColumnNameQual(SbmDbDfn.ColumnIdx.Affiliate_Name, aliasAffiliate) + " ASC");
}
return sortColumnNames;
}