admin/raven
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
John Cardinal
2021-03-19 14:23:58 +00:00
parent 3bdaa38c4a
commit 770fbc64d1
2 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/AyaNova/DataList/OutsideUserDataList.cs
View File

@@ -8,7 +8,7 @@ namespace AyaNova.DataList
public OutsideUserDataList()
{
DefaultListObjectType = AyaType.User;
DefaultListObjectType = AyaType.Customer;
SQLFrom = "from auser left join aheadoffice on (auser.headofficeid=aheadoffice.id) left join acustomer on (auser.customerid=acustomer.id)";
var RoleSet = BizRoles.GetRoleSet(DefaultListObjectType);
AllowedRoles = RoleSet.ReadFullRecord | RoleSet.Change;

23
server/AyaNova/biz/TaxCodeBiz.cs
View File

@@ -234,23 +234,20 @@ namespace AyaNova.Biz
|| ServerGlobalBizSettings.TaxPartSaleId == proposedObj.Id
|| ServerGlobalBizSettings.TaxRateSaleId == proposedObj.Id);
if (!isNew)
if (proposedObj.Active != currentObj.Active
|| proposedObj.Name != currentObj.Name
|| proposedObj.TaxAPct != currentObj.TaxAPct
if (!isNew && (proposedObj.TaxAPct != currentObj.TaxAPct
|| proposedObj.TaxBPct != currentObj.TaxBPct
|| proposedObj.TaxOnTax != currentObj.TaxOnTax)
{
//MIGRATE_OUTSTANDING - check workorder records once wo is coded here for this tax code in use
//also any other object that uses tax codes besides global settings and purchase order items
|| proposedObj.TaxOnTax != currentObj.TaxOnTax))
{
//MIGRATE_OUTSTANDING - check workorder records once wo is coded here for this tax code in use
//also any other object that uses tax codes besides global settings and purchase order items
if (await ct.PurchaseOrderItem.AnyAsync(x => x.PurchaseTaxCodeId == proposedObj.Id))
AddError(ApiErrorCode.VALIDATION_REFERENTIAL_INTEGRITY, "generalerror", await Translate("PurchaseOrder"));
if (await ct.PurchaseOrderItem.AnyAsync(x => x.PurchaseTaxCodeId == proposedObj.Id))
AddError(ApiErrorCode.VALIDATION_REFERENTIAL_INTEGRITY, "generalerror", await Translate("PurchaseOrder"));
if (isGlobalDefault)
AddError(ApiErrorCode.VALIDATION_REFERENTIAL_INTEGRITY, "generalerror", await Translate("AdministrationGlobalSettings"));
if (isGlobalDefault)
AddError(ApiErrorCode.VALIDATION_REFERENTIAL_INTEGRITY, "generalerror", await Translate("AdministrationGlobalSettings"));
}
}
//Active not changeable for global default
if (isGlobalDefault && proposedObj.Active == false)