chitanda 发布系统代码

app_CRM/public/assets/json/data-dictionary.json

@@ -6387,6 +6387,53 @@
             }
         ]
     }, 
+    {
+        "srfkey": "Invoice__StateCode",
+        "emptytext": "未定义",
+        "codelisttype":"static",
+        "items": [
+             {
+                "id": "3",
+                "label": "已取消",
+                "text": "已取消",
+                "data":"",
+                "codename":"Item_3",
+                "value": "3",
+                
+                "disabled": false
+            }
+            , {
+                "id": "2",
+                "label": "已支付",
+                "text": "已支付",
+                "data":"",
+                "codename":"Item_2",
+                "value": "2",
+                
+                "disabled": false
+            }
+            , {
+                "id": "1",
+                "label": "已结束(已弃用)",
+                "text": "已结束(已弃用)",
+                "data":"",
+                "codename":"Item_1",
+                "value": "1",
+                
+                "disabled": false
+            }
+            , {
+                "id": "0",
+                "label": "有效",
+                "text": "有效",
+                "data":"",
+                "codename":"Item_0",
+                "value": "0",
+                
+                "disabled": false
+            }
+        ]
+    }, 
     {
         "srfkey": "Invoice__PaymentTermsCode",
         "emptytext": "未定义",

app_CRM/public/assets/json/view-config.json

@@ -809,6 +809,16 @@
         "viewtag": "3d538df4ca389d372347f7b53d67269f",
         "memo": "系统自动添加"
     },
+    "invoiceedit_datapanelview": {
+        "title": "头部信息编辑",
+        "caption": "发票",
+        "viewtype": "DEEDITVIEW",
+        "viewmodule": "Finance",
+        "viewname": "InvoiceEdit_DataPanelView",
+        "viewfilename": "invoice-edit-data-panel-view",
+        "viewtag": "3dce5b12278b797f02c77e6dad5f6b17",
+        "memo": ""
+    },
     "competitorpickupgridview": {
         "title": "竞争对手选择表格视图",
         "caption": "竞争对手",

app_CRM/src/locale/lanres/codelist/codelist_en_US.ts

@@ -819,6 +819,13 @@ export default {
         "LINK": "链接",
         "empty": ""
     },
+    Invoice__StateCode: {
+        "3": "已取消",
+        "2": "已支付",
+        "1": "已结束(已弃用)",
+        "0": "有效",
+        "empty": ""
+    },
     Invoice__PaymentTermsCode: {
         "2": "2/10 N30",
         "1": "N30",

app_CRM/src/locale/lanres/codelist/codelist_zh_CN.ts

@@ -819,6 +819,13 @@ export default {
         "LINK": "链接",
         "empty": "",
     },
+    Invoice__StateCode: {
+        "3": "已取消",
+        "2": "已支付",
+        "1": "已结束(已弃用)",
+        "0": "有效",
+        "empty": "",
+    },
     Invoice__PaymentTermsCode: {
         "2": "2/10 N30",
         "1": "N30",

app_CRM/src/locale/lanres/entities/invoice/invoice_en_US.ts

@@ -111,6 +111,10 @@ export default {
 			caption: "发票",
       		title: "发票信息",
 		},
+		edit_datapanelview: {
+			caption: "发票",
+      		title: "头部信息编辑",
+		},
 		paidgridview: {
 			caption: "发票",
       		title: "发票信息",
@@ -226,6 +230,26 @@ export default {
 		uiactions: {
 		},
 	},
+	edit_datapanel_form: {
+		details: {
+			group1: "发票基本信息", 
+			formpage1: "基本信息", 
+			srfupdatedate: "更新时间", 
+			srforikey: "", 
+			srfkey: "发票", 
+			srfmajortext: "发票名称", 
+			srftempmode: "", 
+			srfuf: "", 
+			srfdeid: "", 
+			srfsourcekey: "", 
+			totalamount: "总金额", 
+			statecode: "状态", 
+			ownername: "负责人", 
+			invoiceid: "发票", 
+		},
+		uiactions: {
+		},
+	},
 	main_grid: {
 		columns: {
 			invoicename: "发票名称",

app_CRM/src/locale/lanres/entities/invoice/invoice_zh_CN.ts

@@ -110,6 +110,10 @@ export default {
 			caption: "发票",
       		title: "发票信息",
 		},
+		edit_datapanelview: {
+			caption: "发票",
+      		title: "头部信息编辑",
+		},
 		paidgridview: {
 			caption: "发票",
       		title: "发票信息",
@@ -225,6 +229,26 @@ export default {
 		uiactions: {
 		},
 	},
+	edit_datapanel_form: {
+		details: {
+			group1: "发票基本信息", 
+			formpage1: "基本信息", 
+			srfupdatedate: "更新时间", 
+			srforikey: "", 
+			srfkey: "发票", 
+			srfmajortext: "发票名称", 
+			srftempmode: "", 
+			srfuf: "", 
+			srfdeid: "", 
+			srfsourcekey: "", 
+			totalamount: "总金额", 
+			statecode: "状态", 
+			ownername: "负责人", 
+			invoiceid: "发票", 
+		},
+		uiactions: {
+		},
+	},
 	main_grid: {
 		columns: {
 			invoicename: "发票名称",

app_CRM/src/mock/codelist/codelist.ts

@@ -6395,6 +6395,53 @@ mock.onGet('./assets/json/data-dictionary.json').reply((config: any) => {
             },
         ]
     },
+    {
+        srfkey: "Invoice__StateCode",
+        emptytext: "未定义",
+        "codelisttype":"static",
+        items: [
+            {
+                id: "3",
+                label: "已取消",
+                text: "已取消",
+                "data":"",
+                "codename":"Item_3",
+                value: "3",
+                
+                disabled: false,
+            },
+            {
+                id: "2",
+                label: "已支付",
+                text: "已支付",
+                "data":"",
+                "codename":"Item_2",
+                value: "2",
+                
+                disabled: false,
+            },
+            {
+                id: "1",
+                label: "已结束(已弃用)",
+                text: "已结束(已弃用)",
+                "data":"",
+                "codename":"Item_1",
+                value: "1",
+                
+                disabled: false,
+            },
+            {
+                id: "0",
+                label: "有效",
+                text: "有效",
+                "data":"",
+                "codename":"Item_0",
+                value: "0",
+                
+                disabled: false,
+            },
+        ]
+    },
     {
         srfkey: "Invoice__PaymentTermsCode",
         emptytext: "未定义",

app_CRM/src/mock/viewconfig/viewconfig.ts

@@ -655,6 +655,14 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
             "viewname": "LetterEditView",
             "viewtag": "3d538df4ca389d372347f7b53d67269f"
         },
+        "invoiceedit_datapanelview": {
+            "title": "头部信息编辑",
+            "caption": "发票",
+            "viewtype": "DEEDITVIEW",
+            "viewmodule": "Finance",
+            "viewname": "InvoiceEdit_DataPanelView",
+            "viewtag": "3dce5b12278b797f02c77e6dad5f6b17"
+        },
         "competitorpickupgridview": {
             "title": "竞争对手选择表格视图",
             "caption": "竞争对手",

app_CRM/src/service/account/account-service-base.ts

@@ -80,21 +80,6 @@ export default class AccountServiceBase extends EntityService {
             }
         }
         masterData.leads = leadsData;
-        let opportunitiesData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunities'),'undefined')){
-            opportunitiesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunities') as any);
-            if(opportunitiesData && opportunitiesData.length && opportunitiesData.length > 0){
-                opportunitiesData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.opportunityid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.opportunities = opportunitiesData;
         let listaccountsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listaccounts'),'undefined')){
             listaccountsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listaccounts') as any);
@@ -125,6 +110,21 @@ export default class AccountServiceBase extends EntityService {
             }
         }
         masterData.contacts = contactsData;
+        let opportunitiesData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunities'),'undefined')){
+            opportunitiesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunities') as any);
+            if(opportunitiesData && opportunitiesData.length && opportunitiesData.length > 0){
+                opportunitiesData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.opportunityid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.opportunities = opportunitiesData;
         Object.assign(data,masterData);
         if(!data.srffrontuf || data.srffrontuf !== "1"){
             data[this.APPDEKEY] = null;
@@ -135,9 +135,9 @@ export default class AccountServiceBase extends EntityService {
         let tempContext:any = JSON.parse(JSON.stringify(context));
         let res:any = await Http.getInstance().post(`/accounts`,data,isloading);
         this.tempStorage.setItem(tempContext.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
-        this.tempStorage.setItem(tempContext.srfsessionkey+'_opportunities',JSON.stringify(res.data.opportunities));
         this.tempStorage.setItem(tempContext.srfsessionkey+'_listaccounts',JSON.stringify(res.data.listaccounts));
         this.tempStorage.setItem(tempContext.srfsessionkey+'_contacts',JSON.stringify(res.data.contacts));
+        this.tempStorage.setItem(tempContext.srfsessionkey+'_opportunities',JSON.stringify(res.data.opportunities));
         return res;
     }
 
@@ -167,21 +167,6 @@ export default class AccountServiceBase extends EntityService {
             }
         }
         masterData.leads = leadsData;
-        let opportunitiesData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunities'),'undefined')){
-            opportunitiesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunities') as any);
-            if(opportunitiesData && opportunitiesData.length && opportunitiesData.length > 0){
-                opportunitiesData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.opportunityid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.opportunities = opportunitiesData;
         let listaccountsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listaccounts'),'undefined')){
             listaccountsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listaccounts') as any);
@@ -212,12 +197,27 @@ export default class AccountServiceBase extends EntityService {
             }
         }
         masterData.contacts = contactsData;
+        let opportunitiesData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunities'),'undefined')){
+            opportunitiesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunities') as any);
+            if(opportunitiesData && opportunitiesData.length && opportunitiesData.length > 0){
+                opportunitiesData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.opportunityid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.opportunities = opportunitiesData;
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().put(`/accounts/${context.account}`,data,isloading);
             this.tempStorage.setItem(context.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunities',JSON.stringify(res.data.opportunities));
             this.tempStorage.setItem(context.srfsessionkey+'_listaccounts',JSON.stringify(res.data.listaccounts));
             this.tempStorage.setItem(context.srfsessionkey+'_contacts',JSON.stringify(res.data.contacts));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunities',JSON.stringify(res.data.opportunities));
             return res;
     }
 
@@ -246,9 +246,9 @@ export default class AccountServiceBase extends EntityService {
     public async Get(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
             let res:any = await Http.getInstance().get(`/accounts/${context.account}`,isloading);
             this.tempStorage.setItem(context.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunities',JSON.stringify(res.data.opportunities));
             this.tempStorage.setItem(context.srfsessionkey+'_listaccounts',JSON.stringify(res.data.listaccounts));
             this.tempStorage.setItem(context.srfsessionkey+'_contacts',JSON.stringify(res.data.contacts));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunities',JSON.stringify(res.data.opportunities));
             return res;
     }
 
@@ -265,9 +265,9 @@ export default class AccountServiceBase extends EntityService {
         let res:any = await  Http.getInstance().get(`/accounts/getdraft`,isloading);
         res.data.account = data.account;
             this.tempStorage.setItem(context.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunities',JSON.stringify(res.data.opportunities));
             this.tempStorage.setItem(context.srfsessionkey+'_listaccounts',JSON.stringify(res.data.listaccounts));
             this.tempStorage.setItem(context.srfsessionkey+'_contacts',JSON.stringify(res.data.contacts));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunities',JSON.stringify(res.data.opportunities));
         return res;
     }
 
@@ -353,21 +353,6 @@ export default class AccountServiceBase extends EntityService {
             }
         }
         masterData.leads = leadsData;
-        let opportunitiesData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunities'),'undefined')){
-            opportunitiesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunities') as any);
-            if(opportunitiesData && opportunitiesData.length && opportunitiesData.length > 0){
-                opportunitiesData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.opportunityid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.opportunities = opportunitiesData;
         let listaccountsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listaccounts'),'undefined')){
             listaccountsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listaccounts') as any);
@@ -398,12 +383,27 @@ export default class AccountServiceBase extends EntityService {
             }
         }
         masterData.contacts = contactsData;
+        let opportunitiesData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunities'),'undefined')){
+            opportunitiesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunities') as any);
+            if(opportunitiesData && opportunitiesData.length && opportunitiesData.length > 0){
+                opportunitiesData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.opportunityid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.opportunities = opportunitiesData;
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().post(`/accounts/${context.account}/save`,data,isloading);
             this.tempStorage.setItem(context.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunities',JSON.stringify(res.data.opportunities));
             this.tempStorage.setItem(context.srfsessionkey+'_listaccounts',JSON.stringify(res.data.listaccounts));
             this.tempStorage.setItem(context.srfsessionkey+'_contacts',JSON.stringify(res.data.contacts));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunities',JSON.stringify(res.data.opportunities));
             return res;
     }
 

app_CRM/src/service/campaign/campaign-service-base.ts

@@ -62,21 +62,6 @@ export default class CampaignServiceBase extends EntityService {
      */
     public async Create(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let masterData:any = {};
-        let campaignlistsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_campaignlists'),'undefined')){
-            campaignlistsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_campaignlists') as any);
-            if(campaignlistsData && campaignlistsData.length && campaignlistsData.length > 0){
-                campaignlistsData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.relationshipsid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.campaignlists = campaignlistsData;
         let campaigncampaignsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_campaigncampaigns'),'undefined')){
             campaigncampaignsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_campaigncampaigns') as any);
@@ -107,6 +92,21 @@ export default class CampaignServiceBase extends EntityService {
             }
         }
         masterData.leads = leadsData;
+        let campaignlistsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_campaignlists'),'undefined')){
+            campaignlistsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_campaignlists') as any);
+            if(campaignlistsData && campaignlistsData.length && campaignlistsData.length > 0){
+                campaignlistsData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.relationshipsid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.campaignlists = campaignlistsData;
         Object.assign(data,masterData);
         if(!data.srffrontuf || data.srffrontuf !== "1"){
             data[this.APPDEKEY] = null;
@@ -116,9 +116,9 @@ export default class CampaignServiceBase extends EntityService {
         }
         let tempContext:any = JSON.parse(JSON.stringify(context));
         let res:any = await Http.getInstance().post(`/campaigns`,data,isloading);
-        this.tempStorage.setItem(tempContext.srfsessionkey+'_campaignlists',JSON.stringify(res.data.campaignlists));
         this.tempStorage.setItem(tempContext.srfsessionkey+'_campaigncampaigns',JSON.stringify(res.data.campaigncampaigns));
         this.tempStorage.setItem(tempContext.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
+        this.tempStorage.setItem(tempContext.srfsessionkey+'_campaignlists',JSON.stringify(res.data.campaignlists));
         return res;
     }
 
@@ -133,21 +133,6 @@ export default class CampaignServiceBase extends EntityService {
      */
     public async Update(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let masterData:any = {};
-        let campaignlistsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_campaignlists'),'undefined')){
-            campaignlistsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_campaignlists') as any);
-            if(campaignlistsData && campaignlistsData.length && campaignlistsData.length > 0){
-                campaignlistsData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.relationshipsid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.campaignlists = campaignlistsData;
         let campaigncampaignsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_campaigncampaigns'),'undefined')){
             campaigncampaignsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_campaigncampaigns') as any);
@@ -178,11 +163,26 @@ export default class CampaignServiceBase extends EntityService {
             }
         }
         masterData.leads = leadsData;
+        let campaignlistsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_campaignlists'),'undefined')){
+            campaignlistsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_campaignlists') as any);
+            if(campaignlistsData && campaignlistsData.length && campaignlistsData.length > 0){
+                campaignlistsData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.relationshipsid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.campaignlists = campaignlistsData;
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().put(`/campaigns/${context.campaign}`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_campaignlists',JSON.stringify(res.data.campaignlists));
             this.tempStorage.setItem(context.srfsessionkey+'_campaigncampaigns',JSON.stringify(res.data.campaigncampaigns));
             this.tempStorage.setItem(context.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
+            this.tempStorage.setItem(context.srfsessionkey+'_campaignlists',JSON.stringify(res.data.campaignlists));
             return res;
     }
 
@@ -210,9 +210,9 @@ export default class CampaignServiceBase extends EntityService {
      */
     public async Get(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
             let res:any = await Http.getInstance().get(`/campaigns/${context.campaign}`,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_campaignlists',JSON.stringify(res.data.campaignlists));
             this.tempStorage.setItem(context.srfsessionkey+'_campaigncampaigns',JSON.stringify(res.data.campaigncampaigns));
             this.tempStorage.setItem(context.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
+            this.tempStorage.setItem(context.srfsessionkey+'_campaignlists',JSON.stringify(res.data.campaignlists));
             return res;
     }
 
@@ -228,9 +228,9 @@ export default class CampaignServiceBase extends EntityService {
     public async GetDraft(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let res:any = await  Http.getInstance().get(`/campaigns/getdraft`,isloading);
         res.data.campaign = data.campaign;
-            this.tempStorage.setItem(context.srfsessionkey+'_campaignlists',JSON.stringify(res.data.campaignlists));
             this.tempStorage.setItem(context.srfsessionkey+'_campaigncampaigns',JSON.stringify(res.data.campaigncampaigns));
             this.tempStorage.setItem(context.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
+            this.tempStorage.setItem(context.srfsessionkey+'_campaignlists',JSON.stringify(res.data.campaignlists));
         return res;
     }
 
@@ -258,21 +258,6 @@ export default class CampaignServiceBase extends EntityService {
      */
     public async Save(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let masterData:any = {};
-        let campaignlistsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_campaignlists'),'undefined')){
-            campaignlistsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_campaignlists') as any);
-            if(campaignlistsData && campaignlistsData.length && campaignlistsData.length > 0){
-                campaignlistsData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.relationshipsid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.campaignlists = campaignlistsData;
         let campaigncampaignsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_campaigncampaigns'),'undefined')){
             campaigncampaignsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_campaigncampaigns') as any);
@@ -303,11 +288,26 @@ export default class CampaignServiceBase extends EntityService {
             }
         }
         masterData.leads = leadsData;
+        let campaignlistsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_campaignlists'),'undefined')){
+            campaignlistsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_campaignlists') as any);
+            if(campaignlistsData && campaignlistsData.length && campaignlistsData.length > 0){
+                campaignlistsData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.relationshipsid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.campaignlists = campaignlistsData;
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().post(`/campaigns/${context.campaign}/save`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_campaignlists',JSON.stringify(res.data.campaignlists));
             this.tempStorage.setItem(context.srfsessionkey+'_campaigncampaigns',JSON.stringify(res.data.campaigncampaigns));
             this.tempStorage.setItem(context.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
+            this.tempStorage.setItem(context.srfsessionkey+'_campaignlists',JSON.stringify(res.data.campaignlists));
             return res;
     }
 

app_CRM/src/service/contact/contact-service-base.ts

@@ -68,21 +68,21 @@ export default class ContactServiceBase extends EntityService {
     public async Create(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         if(context.account && true){
             let masterData:any = {};
-        let opportunitiesData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunities'),'undefined')){
-            opportunitiesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunities') as any);
-            if(opportunitiesData && opportunitiesData.length && opportunitiesData.length > 0){
-                opportunitiesData.forEach((item:any) => {
+        let leadsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_leads'),'undefined')){
+            leadsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_leads') as any);
+            if(leadsData && leadsData.length && leadsData.length > 0){
+                leadsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.opportunityid = null;
+                            item.leadid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.opportunities = opportunitiesData;
+        masterData.leads = leadsData;
         let listcontactsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts'),'undefined')){
             listcontactsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts') as any);
@@ -98,21 +98,21 @@ export default class ContactServiceBase extends EntityService {
             }
         }
         masterData.listcontacts = listcontactsData;
-        let leadsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_leads'),'undefined')){
-            leadsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_leads') as any);
-            if(leadsData && leadsData.length && leadsData.length > 0){
-                leadsData.forEach((item:any) => {
+        let opportunitiesData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunities'),'undefined')){
+            opportunitiesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunities') as any);
+            if(opportunitiesData && opportunitiesData.length && opportunitiesData.length > 0){
+                opportunitiesData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.leadid = null;
+                            item.opportunityid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.leads = leadsData;
+        masterData.opportunities = opportunitiesData;
             Object.assign(data,masterData);
             if(!data.srffrontuf || data.srffrontuf !== "1"){
                 data[this.APPDEKEY] = null;
@@ -122,27 +122,27 @@ export default class ContactServiceBase extends EntityService {
             }
             let tempContext:any = JSON.parse(JSON.stringify(context));
             let res:any = await Http.getInstance().post(`/accounts/${context.account}/contacts`,data,isloading);
-            this.tempStorage.setItem(tempContext.srfsessionkey+'_opportunities',JSON.stringify(res.data.opportunities));
-            this.tempStorage.setItem(tempContext.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
             this.tempStorage.setItem(tempContext.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
+            this.tempStorage.setItem(tempContext.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
+            this.tempStorage.setItem(tempContext.srfsessionkey+'_opportunities',JSON.stringify(res.data.opportunities));
             return res;
         }
         let masterData:any = {};
-        let opportunitiesData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunities'),'undefined')){
-            opportunitiesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunities') as any);
-            if(opportunitiesData && opportunitiesData.length && opportunitiesData.length > 0){
-                opportunitiesData.forEach((item:any) => {
+        let leadsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_leads'),'undefined')){
+            leadsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_leads') as any);
+            if(leadsData && leadsData.length && leadsData.length > 0){
+                leadsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.opportunityid = null;
+                            item.leadid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.opportunities = opportunitiesData;
+        masterData.leads = leadsData;
         let listcontactsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts'),'undefined')){
             listcontactsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts') as any);
@@ -158,21 +158,21 @@ export default class ContactServiceBase extends EntityService {
             }
         }
         masterData.listcontacts = listcontactsData;
-        let leadsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_leads'),'undefined')){
-            leadsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_leads') as any);
-            if(leadsData && leadsData.length && leadsData.length > 0){
-                leadsData.forEach((item:any) => {
+        let opportunitiesData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunities'),'undefined')){
+            opportunitiesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunities') as any);
+            if(opportunitiesData && opportunitiesData.length && opportunitiesData.length > 0){
+                opportunitiesData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.leadid = null;
+                            item.opportunityid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.leads = leadsData;
+        masterData.opportunities = opportunitiesData;
         Object.assign(data,masterData);
         if(!data.srffrontuf || data.srffrontuf !== "1"){
             data[this.APPDEKEY] = null;
@@ -182,9 +182,9 @@ export default class ContactServiceBase extends EntityService {
         }
         let tempContext:any = JSON.parse(JSON.stringify(context));
         let res:any = await Http.getInstance().post(`/contacts`,data,isloading);
-        this.tempStorage.setItem(tempContext.srfsessionkey+'_opportunities',JSON.stringify(res.data.opportunities));
-        this.tempStorage.setItem(tempContext.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
         this.tempStorage.setItem(tempContext.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
+        this.tempStorage.setItem(tempContext.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
+        this.tempStorage.setItem(tempContext.srfsessionkey+'_opportunities',JSON.stringify(res.data.opportunities));
         return res;
     }
 
@@ -200,21 +200,21 @@ export default class ContactServiceBase extends EntityService {
     public async Update(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         if(context.account && context.contact){
             let masterData:any = {};
-        let opportunitiesData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunities'),'undefined')){
-            opportunitiesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunities') as any);
-            if(opportunitiesData && opportunitiesData.length && opportunitiesData.length > 0){
-                opportunitiesData.forEach((item:any) => {
+        let leadsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_leads'),'undefined')){
+            leadsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_leads') as any);
+            if(leadsData && leadsData.length && leadsData.length > 0){
+                leadsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.opportunityid = null;
+                            item.leadid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.opportunities = opportunitiesData;
+        masterData.leads = leadsData;
         let listcontactsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts'),'undefined')){
             listcontactsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts') as any);
@@ -230,44 +230,44 @@ export default class ContactServiceBase extends EntityService {
             }
         }
         masterData.listcontacts = listcontactsData;
-        let leadsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_leads'),'undefined')){
-            leadsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_leads') as any);
-            if(leadsData && leadsData.length && leadsData.length > 0){
-                leadsData.forEach((item:any) => {
+        let opportunitiesData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunities'),'undefined')){
+            opportunitiesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunities') as any);
+            if(opportunitiesData && opportunitiesData.length && opportunitiesData.length > 0){
+                opportunitiesData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.leadid = null;
+                            item.opportunityid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.leads = leadsData;
+        masterData.opportunities = opportunitiesData;
             Object.assign(data,masterData);
             let res:any = await Http.getInstance().put(`/accounts/${context.account}/contacts/${context.contact}`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunities',JSON.stringify(res.data.opportunities));
-            this.tempStorage.setItem(context.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
             this.tempStorage.setItem(context.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
+            this.tempStorage.setItem(context.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunities',JSON.stringify(res.data.opportunities));
             return res;
         }
         let masterData:any = {};
-        let opportunitiesData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunities'),'undefined')){
-            opportunitiesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunities') as any);
-            if(opportunitiesData && opportunitiesData.length && opportunitiesData.length > 0){
-                opportunitiesData.forEach((item:any) => {
+        let leadsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_leads'),'undefined')){
+            leadsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_leads') as any);
+            if(leadsData && leadsData.length && leadsData.length > 0){
+                leadsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.opportunityid = null;
+                            item.leadid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.opportunities = opportunitiesData;
+        masterData.leads = leadsData;
         let listcontactsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts'),'undefined')){
             listcontactsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts') as any);
@@ -283,26 +283,26 @@ export default class ContactServiceBase extends EntityService {
             }
         }
         masterData.listcontacts = listcontactsData;
-        let leadsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_leads'),'undefined')){
-            leadsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_leads') as any);
-            if(leadsData && leadsData.length && leadsData.length > 0){
-                leadsData.forEach((item:any) => {
+        let opportunitiesData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunities'),'undefined')){
+            opportunitiesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunities') as any);
+            if(opportunitiesData && opportunitiesData.length && opportunitiesData.length > 0){
+                opportunitiesData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.leadid = null;
+                            item.opportunityid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.leads = leadsData;
+        masterData.opportunities = opportunitiesData;
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().put(`/contacts/${context.contact}`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunities',JSON.stringify(res.data.opportunities));
-            this.tempStorage.setItem(context.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
             this.tempStorage.setItem(context.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
+            this.tempStorage.setItem(context.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunities',JSON.stringify(res.data.opportunities));
             return res;
     }
 
@@ -334,15 +334,15 @@ export default class ContactServiceBase extends EntityService {
     public async Get(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         if(context.account && context.contact){
             let res:any = await Http.getInstance().get(`/accounts/${context.account}/contacts/${context.contact}`,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunities',JSON.stringify(res.data.opportunities));
-            this.tempStorage.setItem(context.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
             this.tempStorage.setItem(context.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
+            this.tempStorage.setItem(context.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunities',JSON.stringify(res.data.opportunities));
             return res;
         }
             let res:any = await Http.getInstance().get(`/contacts/${context.contact}`,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunities',JSON.stringify(res.data.opportunities));
-            this.tempStorage.setItem(context.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
             this.tempStorage.setItem(context.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
+            this.tempStorage.setItem(context.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunities',JSON.stringify(res.data.opportunities));
             return res;
     }
 
@@ -359,16 +359,16 @@ export default class ContactServiceBase extends EntityService {
         if(context.account && true){
             let res:any = await Http.getInstance().get(`/accounts/${context.account}/contacts/getdraft`,isloading);
             res.data.contact = data.contact;
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunities',JSON.stringify(res.data.opportunities));
-            this.tempStorage.setItem(context.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
             this.tempStorage.setItem(context.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
+            this.tempStorage.setItem(context.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunities',JSON.stringify(res.data.opportunities));
             return res;
         }
         let res:any = await  Http.getInstance().get(`/contacts/getdraft`,isloading);
         res.data.contact = data.contact;
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunities',JSON.stringify(res.data.opportunities));
-            this.tempStorage.setItem(context.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
             this.tempStorage.setItem(context.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
+            this.tempStorage.setItem(context.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunities',JSON.stringify(res.data.opportunities));
         return res;
     }
 
@@ -399,21 +399,21 @@ export default class ContactServiceBase extends EntityService {
     public async AddList(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         if(context.account && context.contact){
             let masterData:any = {};
-        let opportunitiesData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunities'),'undefined')){
-            opportunitiesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunities') as any);
-            if(opportunitiesData && opportunitiesData.length && opportunitiesData.length > 0){
-                opportunitiesData.forEach((item:any) => {
+        let leadsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_leads'),'undefined')){
+            leadsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_leads') as any);
+            if(leadsData && leadsData.length && leadsData.length > 0){
+                leadsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.opportunityid = null;
+                            item.leadid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.opportunities = opportunitiesData;
+        masterData.leads = leadsData;
         let listcontactsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts'),'undefined')){
             listcontactsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts') as any);
@@ -429,26 +429,26 @@ export default class ContactServiceBase extends EntityService {
             }
         }
         masterData.listcontacts = listcontactsData;
-        let leadsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_leads'),'undefined')){
-            leadsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_leads') as any);
-            if(leadsData && leadsData.length && leadsData.length > 0){
-                leadsData.forEach((item:any) => {
+        let opportunitiesData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunities'),'undefined')){
+            opportunitiesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunities') as any);
+            if(opportunitiesData && opportunitiesData.length && opportunitiesData.length > 0){
+                opportunitiesData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.leadid = null;
+                            item.opportunityid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.leads = leadsData;
+        masterData.opportunities = opportunitiesData;
             Object.assign(data,masterData);
             let res:any = await Http.getInstance().post(`/accounts/${context.account}/contacts/${context.contact}/addlist`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunities',JSON.stringify(res.data.opportunities));
-            this.tempStorage.setItem(context.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
             this.tempStorage.setItem(context.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
+            this.tempStorage.setItem(context.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunities',JSON.stringify(res.data.opportunities));
             return res;
         }
             return Http.getInstance().post(`/contacts/${context.contact}/addlist`,data,isloading);
@@ -466,21 +466,21 @@ export default class ContactServiceBase extends EntityService {
     public async CheckKey(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         if(context.account && context.contact){
             let masterData:any = {};
-        let opportunitiesData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunities'),'undefined')){
-            opportunitiesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunities') as any);
-            if(opportunitiesData && opportunitiesData.length && opportunitiesData.length > 0){
-                opportunitiesData.forEach((item:any) => {
+        let leadsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_leads'),'undefined')){
+            leadsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_leads') as any);
+            if(leadsData && leadsData.length && leadsData.length > 0){
+                leadsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.opportunityid = null;
+                            item.leadid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.opportunities = opportunitiesData;
+        masterData.leads = leadsData;
         let listcontactsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts'),'undefined')){
             listcontactsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts') as any);
@@ -496,26 +496,26 @@ export default class ContactServiceBase extends EntityService {
             }
         }
         masterData.listcontacts = listcontactsData;
-        let leadsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_leads'),'undefined')){
-            leadsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_leads') as any);
-            if(leadsData && leadsData.length && leadsData.length > 0){
-                leadsData.forEach((item:any) => {
+        let opportunitiesData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunities'),'undefined')){
+            opportunitiesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunities') as any);
+            if(opportunitiesData && opportunitiesData.length && opportunitiesData.length > 0){
+                opportunitiesData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.leadid = null;
+                            item.opportunityid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.leads = leadsData;
+        masterData.opportunities = opportunitiesData;
             Object.assign(data,masterData);
             let res:any = await Http.getInstance().post(`/accounts/${context.account}/contacts/${context.contact}/checkkey`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunities',JSON.stringify(res.data.opportunities));
-            this.tempStorage.setItem(context.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
             this.tempStorage.setItem(context.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
+            this.tempStorage.setItem(context.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunities',JSON.stringify(res.data.opportunities));
             return res;
         }
             return Http.getInstance().post(`/contacts/${context.contact}/checkkey`,data,isloading);
@@ -548,21 +548,21 @@ export default class ContactServiceBase extends EntityService {
     public async Save(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         if(context.account && context.contact){
             let masterData:any = {};
-        let opportunitiesData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunities'),'undefined')){
-            opportunitiesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunities') as any);
-            if(opportunitiesData && opportunitiesData.length && opportunitiesData.length > 0){
-                opportunitiesData.forEach((item:any) => {
+        let leadsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_leads'),'undefined')){
+            leadsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_leads') as any);
+            if(leadsData && leadsData.length && leadsData.length > 0){
+                leadsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.opportunityid = null;
+                            item.leadid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.opportunities = opportunitiesData;
+        masterData.leads = leadsData;
         let listcontactsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts'),'undefined')){
             listcontactsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts') as any);
@@ -578,44 +578,44 @@ export default class ContactServiceBase extends EntityService {
             }
         }
         masterData.listcontacts = listcontactsData;
-        let leadsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_leads'),'undefined')){
-            leadsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_leads') as any);
-            if(leadsData && leadsData.length && leadsData.length > 0){
-                leadsData.forEach((item:any) => {
+        let opportunitiesData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunities'),'undefined')){
+            opportunitiesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunities') as any);
+            if(opportunitiesData && opportunitiesData.length && opportunitiesData.length > 0){
+                opportunitiesData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.leadid = null;
+                            item.opportunityid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.leads = leadsData;
+        masterData.opportunities = opportunitiesData;
             Object.assign(data,masterData);
             let res:any = await Http.getInstance().post(`/accounts/${context.account}/contacts/${context.contact}/save`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunities',JSON.stringify(res.data.opportunities));
-            this.tempStorage.setItem(context.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
             this.tempStorage.setItem(context.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
+            this.tempStorage.setItem(context.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunities',JSON.stringify(res.data.opportunities));
             return res;
         }
         let masterData:any = {};
-        let opportunitiesData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunities'),'undefined')){
-            opportunitiesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunities') as any);
-            if(opportunitiesData && opportunitiesData.length && opportunitiesData.length > 0){
-                opportunitiesData.forEach((item:any) => {
+        let leadsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_leads'),'undefined')){
+            leadsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_leads') as any);
+            if(leadsData && leadsData.length && leadsData.length > 0){
+                leadsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.opportunityid = null;
+                            item.leadid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.opportunities = opportunitiesData;
+        masterData.leads = leadsData;
         let listcontactsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts'),'undefined')){
             listcontactsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts') as any);
@@ -631,26 +631,26 @@ export default class ContactServiceBase extends EntityService {
             }
         }
         masterData.listcontacts = listcontactsData;
-        let leadsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_leads'),'undefined')){
-            leadsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_leads') as any);
-            if(leadsData && leadsData.length && leadsData.length > 0){
-                leadsData.forEach((item:any) => {
+        let opportunitiesData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunities'),'undefined')){
+            opportunitiesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunities') as any);
+            if(opportunitiesData && opportunitiesData.length && opportunitiesData.length > 0){
+                opportunitiesData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.leadid = null;
+                            item.opportunityid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.leads = leadsData;
+        masterData.opportunities = opportunitiesData;
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().post(`/contacts/${context.contact}/save`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunities',JSON.stringify(res.data.opportunities));
-            this.tempStorage.setItem(context.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
             this.tempStorage.setItem(context.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
+            this.tempStorage.setItem(context.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunities',JSON.stringify(res.data.opportunities));
             return res;
     }
 
@@ -666,21 +666,21 @@ export default class ContactServiceBase extends EntityService {
     public async SetPrimary(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         if(context.account && context.contact){
             let masterData:any = {};
-        let opportunitiesData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunities'),'undefined')){
-            opportunitiesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunities') as any);
-            if(opportunitiesData && opportunitiesData.length && opportunitiesData.length > 0){
-                opportunitiesData.forEach((item:any) => {
+        let leadsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_leads'),'undefined')){
+            leadsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_leads') as any);
+            if(leadsData && leadsData.length && leadsData.length > 0){
+                leadsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.opportunityid = null;
+                            item.leadid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.opportunities = opportunitiesData;
+        masterData.leads = leadsData;
         let listcontactsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts'),'undefined')){
             listcontactsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts') as any);
@@ -696,26 +696,26 @@ export default class ContactServiceBase extends EntityService {
             }
         }
         masterData.listcontacts = listcontactsData;
-        let leadsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_leads'),'undefined')){
-            leadsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_leads') as any);
-            if(leadsData && leadsData.length && leadsData.length > 0){
-                leadsData.forEach((item:any) => {
+        let opportunitiesData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunities'),'undefined')){
+            opportunitiesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunities') as any);
+            if(opportunitiesData && opportunitiesData.length && opportunitiesData.length > 0){
+                opportunitiesData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.leadid = null;
+                            item.opportunityid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.leads = leadsData;
+        masterData.opportunities = opportunitiesData;
             Object.assign(data,masterData);
             let res:any = await Http.getInstance().post(`/accounts/${context.account}/contacts/${context.contact}/setprimary`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunities',JSON.stringify(res.data.opportunities));
-            this.tempStorage.setItem(context.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
             this.tempStorage.setItem(context.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
+            this.tempStorage.setItem(context.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunities',JSON.stringify(res.data.opportunities));
             return res;
         }
             return Http.getInstance().post(`/contacts/${context.contact}/setprimary`,data,isloading);

app_CRM/src/service/ibiz-list/ibiz-list-service-base.ts

@@ -62,6 +62,21 @@ export default class IBizListServiceBase extends EntityService {
      */
     public async Create(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let masterData:any = {};
+        let listcontactsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts'),'undefined')){
+            listcontactsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts') as any);
+            if(listcontactsData && listcontactsData.length && listcontactsData.length > 0){
+                listcontactsData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.relationshipsid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.listcontacts = listcontactsData;
         let campaignlistsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_campaignlists'),'undefined')){
             campaignlistsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_campaignlists') as any);
@@ -107,21 +122,6 @@ export default class IBizListServiceBase extends EntityService {
             }
         }
         masterData.listleads = listleadsData;
-        let listcontactsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts'),'undefined')){
-            listcontactsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts') as any);
-            if(listcontactsData && listcontactsData.length && listcontactsData.length > 0){
-                listcontactsData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.relationshipsid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.listcontacts = listcontactsData;
         Object.assign(data,masterData);
         if(!data.srffrontuf || data.srffrontuf !== "1"){
             data[this.APPDEKEY] = null;
@@ -131,10 +131,10 @@ export default class IBizListServiceBase extends EntityService {
         }
         let tempContext:any = JSON.parse(JSON.stringify(context));
         let res:any = await Http.getInstance().post(`/ibizlists`,data,isloading);
+        this.tempStorage.setItem(tempContext.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
         this.tempStorage.setItem(tempContext.srfsessionkey+'_campaignlists',JSON.stringify(res.data.campaignlists));
         this.tempStorage.setItem(tempContext.srfsessionkey+'_listaccounts',JSON.stringify(res.data.listaccounts));
         this.tempStorage.setItem(tempContext.srfsessionkey+'_listleads',JSON.stringify(res.data.listleads));
-        this.tempStorage.setItem(tempContext.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
         return res;
     }
 
@@ -149,6 +149,21 @@ export default class IBizListServiceBase extends EntityService {
      */
     public async Update(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let masterData:any = {};
+        let listcontactsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts'),'undefined')){
+            listcontactsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts') as any);
+            if(listcontactsData && listcontactsData.length && listcontactsData.length > 0){
+                listcontactsData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.relationshipsid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.listcontacts = listcontactsData;
         let campaignlistsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_campaignlists'),'undefined')){
             campaignlistsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_campaignlists') as any);
@@ -194,27 +209,12 @@ export default class IBizListServiceBase extends EntityService {
             }
         }
         masterData.listleads = listleadsData;
-        let listcontactsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts'),'undefined')){
-            listcontactsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts') as any);
-            if(listcontactsData && listcontactsData.length && listcontactsData.length > 0){
-                listcontactsData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.relationshipsid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.listcontacts = listcontactsData;
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().put(`/ibizlists/${context.ibizlist}`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
             this.tempStorage.setItem(context.srfsessionkey+'_campaignlists',JSON.stringify(res.data.campaignlists));
             this.tempStorage.setItem(context.srfsessionkey+'_listaccounts',JSON.stringify(res.data.listaccounts));
             this.tempStorage.setItem(context.srfsessionkey+'_listleads',JSON.stringify(res.data.listleads));
-            this.tempStorage.setItem(context.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
             return res;
     }
 
@@ -242,10 +242,10 @@ export default class IBizListServiceBase extends EntityService {
      */
     public async Get(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
             let res:any = await Http.getInstance().get(`/ibizlists/${context.ibizlist}`,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
             this.tempStorage.setItem(context.srfsessionkey+'_campaignlists',JSON.stringify(res.data.campaignlists));
             this.tempStorage.setItem(context.srfsessionkey+'_listaccounts',JSON.stringify(res.data.listaccounts));
             this.tempStorage.setItem(context.srfsessionkey+'_listleads',JSON.stringify(res.data.listleads));
-            this.tempStorage.setItem(context.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
             return res;
     }
 
@@ -261,10 +261,10 @@ export default class IBizListServiceBase extends EntityService {
     public async GetDraft(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let res:any = await  Http.getInstance().get(`/ibizlists/getdraft`,isloading);
         res.data.ibizlist = data.ibizlist;
+            this.tempStorage.setItem(context.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
             this.tempStorage.setItem(context.srfsessionkey+'_campaignlists',JSON.stringify(res.data.campaignlists));
             this.tempStorage.setItem(context.srfsessionkey+'_listaccounts',JSON.stringify(res.data.listaccounts));
             this.tempStorage.setItem(context.srfsessionkey+'_listleads',JSON.stringify(res.data.listleads));
-            this.tempStorage.setItem(context.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
         return res;
     }
 
@@ -292,6 +292,21 @@ export default class IBizListServiceBase extends EntityService {
      */
     public async Save(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let masterData:any = {};
+        let listcontactsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts'),'undefined')){
+            listcontactsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts') as any);
+            if(listcontactsData && listcontactsData.length && listcontactsData.length > 0){
+                listcontactsData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.relationshipsid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.listcontacts = listcontactsData;
         let campaignlistsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_campaignlists'),'undefined')){
             campaignlistsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_campaignlists') as any);
@@ -337,27 +352,12 @@ export default class IBizListServiceBase extends EntityService {
             }
         }
         masterData.listleads = listleadsData;
-        let listcontactsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts'),'undefined')){
-            listcontactsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts') as any);
-            if(listcontactsData && listcontactsData.length && listcontactsData.length > 0){
-                listcontactsData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.relationshipsid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.listcontacts = listcontactsData;
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().post(`/ibizlists/${context.ibizlist}/save`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
             this.tempStorage.setItem(context.srfsessionkey+'_campaignlists',JSON.stringify(res.data.campaignlists));
             this.tempStorage.setItem(context.srfsessionkey+'_listaccounts',JSON.stringify(res.data.listaccounts));
             this.tempStorage.setItem(context.srfsessionkey+'_listleads',JSON.stringify(res.data.listleads));
-            this.tempStorage.setItem(context.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
             return res;
     }
 

app_CRM/src/service/opportunity/opportunity-service-base.ts

@@ -74,21 +74,6 @@ export default class OpportunityServiceBase extends EntityService {
     public async Create(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         if(context.account && context.contact && true){
             let masterData:any = {};
-        let opportunityproductsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts'),'undefined')){
-            opportunityproductsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts') as any);
-            if(opportunityproductsData && opportunityproductsData.length && opportunityproductsData.length > 0){
-                opportunityproductsData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.opportunityproductid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.opportunityproducts = opportunityproductsData;
         let quotesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
             quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
@@ -119,22 +104,6 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.opportunitycompetitors = opportunitycompetitorsData;
-            Object.assign(data,masterData);
-            if(!data.srffrontuf || data.srffrontuf !== "1"){
-                data[this.APPDEKEY] = null;
-            }
-            if(data.srffrontuf){
-                delete data.srffrontuf;
-            }
-            let tempContext:any = JSON.parse(JSON.stringify(context));
-            let res:any = await Http.getInstance().post(`/accounts/${context.account}/contacts/${context.contact}/opportunities`,data,isloading);
-            this.tempStorage.setItem(tempContext.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
-            this.tempStorage.setItem(tempContext.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
-            this.tempStorage.setItem(tempContext.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
-            return res;
-        }
-        if(context.contact && true){
-            let masterData:any = {};
         let opportunityproductsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts'),'undefined')){
             opportunityproductsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts') as any);
@@ -150,6 +119,22 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.opportunityproducts = opportunityproductsData;
+            Object.assign(data,masterData);
+            if(!data.srffrontuf || data.srffrontuf !== "1"){
+                data[this.APPDEKEY] = null;
+            }
+            if(data.srffrontuf){
+                delete data.srffrontuf;
+            }
+            let tempContext:any = JSON.parse(JSON.stringify(context));
+            let res:any = await Http.getInstance().post(`/accounts/${context.account}/contacts/${context.contact}/opportunities`,data,isloading);
+            this.tempStorage.setItem(tempContext.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
+            this.tempStorage.setItem(tempContext.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
+            this.tempStorage.setItem(tempContext.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
+            return res;
+        }
+        if(context.contact && true){
+            let masterData:any = {};
         let quotesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
             quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
@@ -180,22 +165,6 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.opportunitycompetitors = opportunitycompetitorsData;
-            Object.assign(data,masterData);
-            if(!data.srffrontuf || data.srffrontuf !== "1"){
-                data[this.APPDEKEY] = null;
-            }
-            if(data.srffrontuf){
-                delete data.srffrontuf;
-            }
-            let tempContext:any = JSON.parse(JSON.stringify(context));
-            let res:any = await Http.getInstance().post(`/contacts/${context.contact}/opportunities`,data,isloading);
-            this.tempStorage.setItem(tempContext.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
-            this.tempStorage.setItem(tempContext.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
-            this.tempStorage.setItem(tempContext.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
-            return res;
-        }
-        if(context.account && true){
-            let masterData:any = {};
         let opportunityproductsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts'),'undefined')){
             opportunityproductsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts') as any);
@@ -211,6 +180,22 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.opportunityproducts = opportunityproductsData;
+            Object.assign(data,masterData);
+            if(!data.srffrontuf || data.srffrontuf !== "1"){
+                data[this.APPDEKEY] = null;
+            }
+            if(data.srffrontuf){
+                delete data.srffrontuf;
+            }
+            let tempContext:any = JSON.parse(JSON.stringify(context));
+            let res:any = await Http.getInstance().post(`/contacts/${context.contact}/opportunities`,data,isloading);
+            this.tempStorage.setItem(tempContext.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
+            this.tempStorage.setItem(tempContext.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
+            this.tempStorage.setItem(tempContext.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
+            return res;
+        }
+        if(context.account && true){
+            let masterData:any = {};
         let quotesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
             quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
@@ -241,21 +226,6 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.opportunitycompetitors = opportunitycompetitorsData;
-            Object.assign(data,masterData);
-            if(!data.srffrontuf || data.srffrontuf !== "1"){
-                data[this.APPDEKEY] = null;
-            }
-            if(data.srffrontuf){
-                delete data.srffrontuf;
-            }
-            let tempContext:any = JSON.parse(JSON.stringify(context));
-            let res:any = await Http.getInstance().post(`/accounts/${context.account}/opportunities`,data,isloading);
-            this.tempStorage.setItem(tempContext.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
-            this.tempStorage.setItem(tempContext.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
-            this.tempStorage.setItem(tempContext.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
-            return res;
-        }
-        let masterData:any = {};
         let opportunityproductsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts'),'undefined')){
             opportunityproductsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts') as any);
@@ -271,6 +241,21 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.opportunityproducts = opportunityproductsData;
+            Object.assign(data,masterData);
+            if(!data.srffrontuf || data.srffrontuf !== "1"){
+                data[this.APPDEKEY] = null;
+            }
+            if(data.srffrontuf){
+                delete data.srffrontuf;
+            }
+            let tempContext:any = JSON.parse(JSON.stringify(context));
+            let res:any = await Http.getInstance().post(`/accounts/${context.account}/opportunities`,data,isloading);
+            this.tempStorage.setItem(tempContext.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
+            this.tempStorage.setItem(tempContext.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
+            this.tempStorage.setItem(tempContext.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
+            return res;
+        }
+        let masterData:any = {};
         let quotesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
             quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
@@ -301,6 +286,21 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.opportunitycompetitors = opportunitycompetitorsData;
+        let opportunityproductsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts'),'undefined')){
+            opportunityproductsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts') as any);
+            if(opportunityproductsData && opportunityproductsData.length && opportunityproductsData.length > 0){
+                opportunityproductsData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.opportunityproductid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.opportunityproducts = opportunityproductsData;
         Object.assign(data,masterData);
         if(!data.srffrontuf || data.srffrontuf !== "1"){
             data[this.APPDEKEY] = null;
@@ -310,9 +310,9 @@ export default class OpportunityServiceBase extends EntityService {
         }
         let tempContext:any = JSON.parse(JSON.stringify(context));
         let res:any = await Http.getInstance().post(`/opportunities`,data,isloading);
-        this.tempStorage.setItem(tempContext.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
         this.tempStorage.setItem(tempContext.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
         this.tempStorage.setItem(tempContext.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
+        this.tempStorage.setItem(tempContext.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
         return res;
     }
 
@@ -328,21 +328,6 @@ export default class OpportunityServiceBase extends EntityService {
     public async Update(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         if(context.account && context.contact && context.opportunity){
             let masterData:any = {};
-        let opportunityproductsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts'),'undefined')){
-            opportunityproductsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts') as any);
-            if(opportunityproductsData && opportunityproductsData.length && opportunityproductsData.length > 0){
-                opportunityproductsData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.opportunityproductid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.opportunityproducts = opportunityproductsData;
         let quotesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
             quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
@@ -373,15 +358,6 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.opportunitycompetitors = opportunitycompetitorsData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().put(`/accounts/${context.account}/contacts/${context.contact}/opportunities/${context.opportunity}`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
-            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
-            return res;
-        }
-        if(context.contact && context.opportunity){
-            let masterData:any = {};
         let opportunityproductsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts'),'undefined')){
             opportunityproductsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts') as any);
@@ -397,6 +373,15 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.opportunityproducts = opportunityproductsData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().put(`/accounts/${context.account}/contacts/${context.contact}/opportunities/${context.opportunity}`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
+            return res;
+        }
+        if(context.contact && context.opportunity){
+            let masterData:any = {};
         let quotesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
             quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
@@ -427,15 +412,6 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.opportunitycompetitors = opportunitycompetitorsData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().put(`/contacts/${context.contact}/opportunities/${context.opportunity}`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
-            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
-            return res;
-        }
-        if(context.account && context.opportunity){
-            let masterData:any = {};
         let opportunityproductsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts'),'undefined')){
             opportunityproductsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts') as any);
@@ -451,6 +427,15 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.opportunityproducts = opportunityproductsData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().put(`/contacts/${context.contact}/opportunities/${context.opportunity}`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
+            return res;
+        }
+        if(context.account && context.opportunity){
+            let masterData:any = {};
         let quotesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
             quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
@@ -481,14 +466,6 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.opportunitycompetitors = opportunitycompetitorsData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().put(`/accounts/${context.account}/opportunities/${context.opportunity}`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
-            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
-            return res;
-        }
-        let masterData:any = {};
         let opportunityproductsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts'),'undefined')){
             opportunityproductsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts') as any);
@@ -504,6 +481,14 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.opportunityproducts = opportunityproductsData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().put(`/accounts/${context.account}/opportunities/${context.opportunity}`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
+            return res;
+        }
+        let masterData:any = {};
         let quotesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
             quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
@@ -534,11 +519,26 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.opportunitycompetitors = opportunitycompetitorsData;
+        let opportunityproductsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts'),'undefined')){
+            opportunityproductsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts') as any);
+            if(opportunityproductsData && opportunityproductsData.length && opportunityproductsData.length > 0){
+                opportunityproductsData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.opportunityproductid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.opportunityproducts = opportunityproductsData;
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().put(`/opportunities/${context.opportunity}`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
             this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
             return res;
     }
 
@@ -576,29 +576,29 @@ export default class OpportunityServiceBase extends EntityService {
     public async Get(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         if(context.account && context.contact && context.opportunity){
             let res:any = await Http.getInstance().get(`/accounts/${context.account}/contacts/${context.contact}/opportunities/${context.opportunity}`,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
             this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
             return res;
         }
         if(context.contact && context.opportunity){
             let res:any = await Http.getInstance().get(`/contacts/${context.contact}/opportunities/${context.opportunity}`,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
             this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
             return res;
         }
         if(context.account && context.opportunity){
             let res:any = await Http.getInstance().get(`/accounts/${context.account}/opportunities/${context.opportunity}`,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
             this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
             return res;
         }
             let res:any = await Http.getInstance().get(`/opportunities/${context.opportunity}`,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
             this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
             return res;
     }
 
@@ -615,32 +615,32 @@ export default class OpportunityServiceBase extends EntityService {
         if(context.account && context.contact && true){
             let res:any = await Http.getInstance().get(`/accounts/${context.account}/contacts/${context.contact}/opportunities/getdraft`,isloading);
             res.data.opportunity = data.opportunity;
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
             this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
             return res;
         }
         if(context.contact && true){
             let res:any = await Http.getInstance().get(`/contacts/${context.contact}/opportunities/getdraft`,isloading);
             res.data.opportunity = data.opportunity;
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
             this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
             return res;
         }
         if(context.account && true){
             let res:any = await Http.getInstance().get(`/accounts/${context.account}/opportunities/getdraft`,isloading);
             res.data.opportunity = data.opportunity;
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
             this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
             return res;
         }
         let res:any = await  Http.getInstance().get(`/opportunities/getdraft`,isloading);
         res.data.opportunity = data.opportunity;
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
             this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
         return res;
     }
 
@@ -656,21 +656,6 @@ export default class OpportunityServiceBase extends EntityService {
     public async Active(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         if(context.account && context.contact && context.opportunity){
             let masterData:any = {};
-        let opportunityproductsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts'),'undefined')){
-            opportunityproductsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts') as any);
-            if(opportunityproductsData && opportunityproductsData.length && opportunityproductsData.length > 0){
-                opportunityproductsData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.opportunityproductid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.opportunityproducts = opportunityproductsData;
         let quotesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
             quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
@@ -701,15 +686,6 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.opportunitycompetitors = opportunitycompetitorsData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().post(`/accounts/${context.account}/contacts/${context.contact}/opportunities/${context.opportunity}/active`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
-            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
-            return res;
-        }
-        if(context.contact && context.opportunity){
-            let masterData:any = {};
         let opportunityproductsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts'),'undefined')){
             opportunityproductsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts') as any);
@@ -725,6 +701,15 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.opportunityproducts = opportunityproductsData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/accounts/${context.account}/contacts/${context.contact}/opportunities/${context.opportunity}/active`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
+            return res;
+        }
+        if(context.contact && context.opportunity){
+            let masterData:any = {};
         let quotesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
             quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
@@ -755,15 +740,6 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.opportunitycompetitors = opportunitycompetitorsData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().post(`/contacts/${context.contact}/opportunities/${context.opportunity}/active`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
-            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
-            return res;
-        }
-        if(context.account && context.opportunity){
-            let masterData:any = {};
         let opportunityproductsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts'),'undefined')){
             opportunityproductsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts') as any);
@@ -779,6 +755,15 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.opportunityproducts = opportunityproductsData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/contacts/${context.contact}/opportunities/${context.opportunity}/active`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
+            return res;
+        }
+        if(context.account && context.opportunity){
+            let masterData:any = {};
         let quotesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
             quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
@@ -809,11 +794,26 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.opportunitycompetitors = opportunitycompetitorsData;
+        let opportunityproductsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts'),'undefined')){
+            opportunityproductsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts') as any);
+            if(opportunityproductsData && opportunityproductsData.length && opportunityproductsData.length > 0){
+                opportunityproductsData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.opportunityproductid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.opportunityproducts = opportunityproductsData;
             Object.assign(data,masterData);
             let res:any = await Http.getInstance().post(`/accounts/${context.account}/opportunities/${context.opportunity}/active`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
             this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
             return res;
         }
             return Http.getInstance().post(`/opportunities/${context.opportunity}/active`,data,isloading);
@@ -831,21 +831,6 @@ export default class OpportunityServiceBase extends EntityService {
     public async CheckKey(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         if(context.account && context.contact && context.opportunity){
             let masterData:any = {};
-        let opportunityproductsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts'),'undefined')){
-            opportunityproductsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts') as any);
-            if(opportunityproductsData && opportunityproductsData.length && opportunityproductsData.length > 0){
-                opportunityproductsData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.opportunityproductid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.opportunityproducts = opportunityproductsData;
         let quotesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
             quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
@@ -876,15 +861,6 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.opportunitycompetitors = opportunitycompetitorsData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().post(`/accounts/${context.account}/contacts/${context.contact}/opportunities/${context.opportunity}/checkkey`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
-            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
-            return res;
-        }
-        if(context.contact && context.opportunity){
-            let masterData:any = {};
         let opportunityproductsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts'),'undefined')){
             opportunityproductsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts') as any);
@@ -900,6 +876,15 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.opportunityproducts = opportunityproductsData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/accounts/${context.account}/contacts/${context.contact}/opportunities/${context.opportunity}/checkkey`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
+            return res;
+        }
+        if(context.contact && context.opportunity){
+            let masterData:any = {};
         let quotesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
             quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
@@ -930,15 +915,6 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.opportunitycompetitors = opportunitycompetitorsData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().post(`/contacts/${context.contact}/opportunities/${context.opportunity}/checkkey`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
-            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
-            return res;
-        }
-        if(context.account && context.opportunity){
-            let masterData:any = {};
         let opportunityproductsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts'),'undefined')){
             opportunityproductsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts') as any);
@@ -954,6 +930,15 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.opportunityproducts = opportunityproductsData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/contacts/${context.contact}/opportunities/${context.opportunity}/checkkey`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
+            return res;
+        }
+        if(context.account && context.opportunity){
+            let masterData:any = {};
         let quotesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
             quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
@@ -984,11 +969,26 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.opportunitycompetitors = opportunitycompetitorsData;
+        let opportunityproductsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts'),'undefined')){
+            opportunityproductsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts') as any);
+            if(opportunityproductsData && opportunityproductsData.length && opportunityproductsData.length > 0){
+                opportunityproductsData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.opportunityproductid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.opportunityproducts = opportunityproductsData;
             Object.assign(data,masterData);
             let res:any = await Http.getInstance().post(`/accounts/${context.account}/opportunities/${context.opportunity}/checkkey`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
             this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
             return res;
         }
             return Http.getInstance().post(`/opportunities/${context.opportunity}/checkkey`,data,isloading);
@@ -1021,21 +1021,6 @@ export default class OpportunityServiceBase extends EntityService {
     public async Save(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         if(context.account && context.contact && context.opportunity){
             let masterData:any = {};
-        let opportunityproductsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts'),'undefined')){
-            opportunityproductsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts') as any);
-            if(opportunityproductsData && opportunityproductsData.length && opportunityproductsData.length > 0){
-                opportunityproductsData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.opportunityproductid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.opportunityproducts = opportunityproductsData;
         let quotesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
             quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
@@ -1066,15 +1051,6 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.opportunitycompetitors = opportunitycompetitorsData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().post(`/accounts/${context.account}/contacts/${context.contact}/opportunities/${context.opportunity}/save`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
-            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
-            return res;
-        }
-        if(context.contact && context.opportunity){
-            let masterData:any = {};
         let opportunityproductsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts'),'undefined')){
             opportunityproductsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts') as any);
@@ -1090,6 +1066,15 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.opportunityproducts = opportunityproductsData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/accounts/${context.account}/contacts/${context.contact}/opportunities/${context.opportunity}/save`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
+            return res;
+        }
+        if(context.contact && context.opportunity){
+            let masterData:any = {};
         let quotesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
             quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
@@ -1120,15 +1105,6 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.opportunitycompetitors = opportunitycompetitorsData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().post(`/contacts/${context.contact}/opportunities/${context.opportunity}/save`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
-            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
-            return res;
-        }
-        if(context.account && context.opportunity){
-            let masterData:any = {};
         let opportunityproductsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts'),'undefined')){
             opportunityproductsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts') as any);
@@ -1144,6 +1120,15 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.opportunityproducts = opportunityproductsData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/contacts/${context.contact}/opportunities/${context.opportunity}/save`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
+            return res;
+        }
+        if(context.account && context.opportunity){
+            let masterData:any = {};
         let quotesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
             quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
@@ -1174,14 +1159,6 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.opportunitycompetitors = opportunitycompetitorsData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().post(`/accounts/${context.account}/opportunities/${context.opportunity}/save`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
-            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
-            return res;
-        }
-        let masterData:any = {};
         let opportunityproductsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts'),'undefined')){
             opportunityproductsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts') as any);
@@ -1197,6 +1174,14 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.opportunityproducts = opportunityproductsData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/accounts/${context.account}/opportunities/${context.opportunity}/save`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
+            return res;
+        }
+        let masterData:any = {};
         let quotesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
             quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
@@ -1227,11 +1212,26 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.opportunitycompetitors = opportunitycompetitorsData;
+        let opportunityproductsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts'),'undefined')){
+            opportunityproductsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts') as any);
+            if(opportunityproductsData && opportunityproductsData.length && opportunityproductsData.length > 0){
+                opportunityproductsData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.opportunityproductid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.opportunityproducts = opportunityproductsData;
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().post(`/opportunities/${context.opportunity}/save`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
             this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
             return res;
     }
 

app_CRM/src/service/product/product-service-base.ts

@@ -62,6 +62,21 @@ export default class ProductServiceBase extends EntityService {
      */
     public async Create(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let masterData:any = {};
+        let productassociationsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_productassociations'),'undefined')){
+            productassociationsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_productassociations') as any);
+            if(productassociationsData && productassociationsData.length && productassociationsData.length > 0){
+                productassociationsData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.productassociationid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.productassociations = productassociationsData;
         let productsubstitutesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_productsubstitutes'),'undefined')){
             productsubstitutesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_productsubstitutes') as any);
@@ -92,21 +107,6 @@ export default class ProductServiceBase extends EntityService {
             }
         }
         masterData.productpricelevels = productpricelevelsData;
-        let productassociationsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_productassociations'),'undefined')){
-            productassociationsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_productassociations') as any);
-            if(productassociationsData && productassociationsData.length && productassociationsData.length > 0){
-                productassociationsData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.productassociationid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.productassociations = productassociationsData;
         Object.assign(data,masterData);
         if(!data.srffrontuf || data.srffrontuf !== "1"){
             data[this.APPDEKEY] = null;
@@ -116,9 +116,9 @@ export default class ProductServiceBase extends EntityService {
         }
         let tempContext:any = JSON.parse(JSON.stringify(context));
         let res:any = await Http.getInstance().post(`/products`,data,isloading);
+        this.tempStorage.setItem(tempContext.srfsessionkey+'_productassociations',JSON.stringify(res.data.productassociations));
         this.tempStorage.setItem(tempContext.srfsessionkey+'_productsubstitutes',JSON.stringify(res.data.productsubstitutes));
         this.tempStorage.setItem(tempContext.srfsessionkey+'_productpricelevels',JSON.stringify(res.data.productpricelevels));
-        this.tempStorage.setItem(tempContext.srfsessionkey+'_productassociations',JSON.stringify(res.data.productassociations));
         return res;
     }
 
@@ -133,6 +133,21 @@ export default class ProductServiceBase extends EntityService {
      */
     public async Update(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let masterData:any = {};
+        let productassociationsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_productassociations'),'undefined')){
+            productassociationsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_productassociations') as any);
+            if(productassociationsData && productassociationsData.length && productassociationsData.length > 0){
+                productassociationsData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.productassociationid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.productassociations = productassociationsData;
         let productsubstitutesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_productsubstitutes'),'undefined')){
             productsubstitutesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_productsubstitutes') as any);
@@ -163,26 +178,11 @@ export default class ProductServiceBase extends EntityService {
             }
         }
         masterData.productpricelevels = productpricelevelsData;
-        let productassociationsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_productassociations'),'undefined')){
-            productassociationsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_productassociations') as any);
-            if(productassociationsData && productassociationsData.length && productassociationsData.length > 0){
-                productassociationsData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.productassociationid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.productassociations = productassociationsData;
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().put(`/products/${context.product}`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_productassociations',JSON.stringify(res.data.productassociations));
             this.tempStorage.setItem(context.srfsessionkey+'_productsubstitutes',JSON.stringify(res.data.productsubstitutes));
             this.tempStorage.setItem(context.srfsessionkey+'_productpricelevels',JSON.stringify(res.data.productpricelevels));
-            this.tempStorage.setItem(context.srfsessionkey+'_productassociations',JSON.stringify(res.data.productassociations));
             return res;
     }
 
@@ -210,9 +210,9 @@ export default class ProductServiceBase extends EntityService {
      */
     public async Get(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
             let res:any = await Http.getInstance().get(`/products/${context.product}`,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_productassociations',JSON.stringify(res.data.productassociations));
             this.tempStorage.setItem(context.srfsessionkey+'_productsubstitutes',JSON.stringify(res.data.productsubstitutes));
             this.tempStorage.setItem(context.srfsessionkey+'_productpricelevels',JSON.stringify(res.data.productpricelevels));
-            this.tempStorage.setItem(context.srfsessionkey+'_productassociations',JSON.stringify(res.data.productassociations));
             return res;
     }
 
@@ -228,9 +228,9 @@ export default class ProductServiceBase extends EntityService {
     public async GetDraft(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let res:any = await  Http.getInstance().get(`/products/getdraft`,isloading);
         res.data.product = data.product;
+            this.tempStorage.setItem(context.srfsessionkey+'_productassociations',JSON.stringify(res.data.productassociations));
             this.tempStorage.setItem(context.srfsessionkey+'_productsubstitutes',JSON.stringify(res.data.productsubstitutes));
             this.tempStorage.setItem(context.srfsessionkey+'_productpricelevels',JSON.stringify(res.data.productpricelevels));
-            this.tempStorage.setItem(context.srfsessionkey+'_productassociations',JSON.stringify(res.data.productassociations));
         return res;
     }
 
@@ -258,6 +258,21 @@ export default class ProductServiceBase extends EntityService {
      */
     public async Save(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let masterData:any = {};
+        let productassociationsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_productassociations'),'undefined')){
+            productassociationsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_productassociations') as any);
+            if(productassociationsData && productassociationsData.length && productassociationsData.length > 0){
+                productassociationsData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.productassociationid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.productassociations = productassociationsData;
         let productsubstitutesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_productsubstitutes'),'undefined')){
             productsubstitutesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_productsubstitutes') as any);
@@ -288,26 +303,11 @@ export default class ProductServiceBase extends EntityService {
             }
         }
         masterData.productpricelevels = productpricelevelsData;
-        let productassociationsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_productassociations'),'undefined')){
-            productassociationsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_productassociations') as any);
-            if(productassociationsData && productassociationsData.length && productassociationsData.length > 0){
-                productassociationsData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.productassociationid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.productassociations = productassociationsData;
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().post(`/products/${context.product}/save`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_productassociations',JSON.stringify(res.data.productassociations));
             this.tempStorage.setItem(context.srfsessionkey+'_productsubstitutes',JSON.stringify(res.data.productsubstitutes));
             this.tempStorage.setItem(context.srfsessionkey+'_productpricelevels',JSON.stringify(res.data.productpricelevels));
-            this.tempStorage.setItem(context.srfsessionkey+'_productassociations',JSON.stringify(res.data.productassociations));
             return res;
     }
 

app_CRM/src/service/sales-literature/sales-literature-service-base.ts

@@ -77,36 +77,36 @@ export default class SalesLiteratureServiceBase extends EntityService {
             }
         }
         masterData.productsalesliteratures = productsalesliteraturesData;
-        let salesliteratureitemsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesliteratureitems'),'undefined')){
-            salesliteratureitemsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesliteratureitems') as any);
-            if(salesliteratureitemsData && salesliteratureitemsData.length && salesliteratureitemsData.length > 0){
-                salesliteratureitemsData.forEach((item:any) => {
+        let competitorsalesliteraturesData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_competitorsalesliteratures'),'undefined')){
+            competitorsalesliteraturesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_competitorsalesliteratures') as any);
+            if(competitorsalesliteraturesData && competitorsalesliteraturesData.length && competitorsalesliteraturesData.length > 0){
+                competitorsalesliteraturesData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.salesliteratureitemid = null;
+                            item.relationshipsid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.salesliteratureitems = salesliteratureitemsData;
-        let competitorsalesliteraturesData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_competitorsalesliteratures'),'undefined')){
-            competitorsalesliteraturesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_competitorsalesliteratures') as any);
-            if(competitorsalesliteraturesData && competitorsalesliteraturesData.length && competitorsalesliteraturesData.length > 0){
-                competitorsalesliteraturesData.forEach((item:any) => {
+        masterData.competitorsalesliteratures = competitorsalesliteraturesData;
+        let salesliteratureitemsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesliteratureitems'),'undefined')){
+            salesliteratureitemsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesliteratureitems') as any);
+            if(salesliteratureitemsData && salesliteratureitemsData.length && salesliteratureitemsData.length > 0){
+                salesliteratureitemsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.relationshipsid = null;
+                            item.salesliteratureitemid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.competitorsalesliteratures = competitorsalesliteraturesData;
+        masterData.salesliteratureitems = salesliteratureitemsData;
         Object.assign(data,masterData);
         if(!data.srffrontuf || data.srffrontuf !== "1"){
             data[this.APPDEKEY] = null;
@@ -117,8 +117,8 @@ export default class SalesLiteratureServiceBase extends EntityService {
         let tempContext:any = JSON.parse(JSON.stringify(context));
         let res:any = await Http.getInstance().post(`/salesliteratures`,data,isloading);
         this.tempStorage.setItem(tempContext.srfsessionkey+'_productsalesliteratures',JSON.stringify(res.data.productsalesliteratures));
-        this.tempStorage.setItem(tempContext.srfsessionkey+'_salesliteratureitems',JSON.stringify(res.data.salesliteratureitems));
         this.tempStorage.setItem(tempContext.srfsessionkey+'_competitorsalesliteratures',JSON.stringify(res.data.competitorsalesliteratures));
+        this.tempStorage.setItem(tempContext.srfsessionkey+'_salesliteratureitems',JSON.stringify(res.data.salesliteratureitems));
         return res;
     }
 
@@ -148,41 +148,41 @@ export default class SalesLiteratureServiceBase extends EntityService {
             }
         }
         masterData.productsalesliteratures = productsalesliteraturesData;
-        let salesliteratureitemsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesliteratureitems'),'undefined')){
-            salesliteratureitemsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesliteratureitems') as any);
-            if(salesliteratureitemsData && salesliteratureitemsData.length && salesliteratureitemsData.length > 0){
-                salesliteratureitemsData.forEach((item:any) => {
+        let competitorsalesliteraturesData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_competitorsalesliteratures'),'undefined')){
+            competitorsalesliteraturesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_competitorsalesliteratures') as any);
+            if(competitorsalesliteraturesData && competitorsalesliteraturesData.length && competitorsalesliteraturesData.length > 0){
+                competitorsalesliteraturesData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.salesliteratureitemid = null;
+                            item.relationshipsid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.salesliteratureitems = salesliteratureitemsData;
-        let competitorsalesliteraturesData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_competitorsalesliteratures'),'undefined')){
-            competitorsalesliteraturesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_competitorsalesliteratures') as any);
-            if(competitorsalesliteraturesData && competitorsalesliteraturesData.length && competitorsalesliteraturesData.length > 0){
-                competitorsalesliteraturesData.forEach((item:any) => {
+        masterData.competitorsalesliteratures = competitorsalesliteraturesData;
+        let salesliteratureitemsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesliteratureitems'),'undefined')){
+            salesliteratureitemsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesliteratureitems') as any);
+            if(salesliteratureitemsData && salesliteratureitemsData.length && salesliteratureitemsData.length > 0){
+                salesliteratureitemsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.relationshipsid = null;
+                            item.salesliteratureitemid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.competitorsalesliteratures = competitorsalesliteraturesData;
+        masterData.salesliteratureitems = salesliteratureitemsData;
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().put(`/salesliteratures/${context.salesliterature}`,data,isloading);
             this.tempStorage.setItem(context.srfsessionkey+'_productsalesliteratures',JSON.stringify(res.data.productsalesliteratures));
-            this.tempStorage.setItem(context.srfsessionkey+'_salesliteratureitems',JSON.stringify(res.data.salesliteratureitems));
             this.tempStorage.setItem(context.srfsessionkey+'_competitorsalesliteratures',JSON.stringify(res.data.competitorsalesliteratures));
+            this.tempStorage.setItem(context.srfsessionkey+'_salesliteratureitems',JSON.stringify(res.data.salesliteratureitems));
             return res;
     }
 
@@ -211,8 +211,8 @@ export default class SalesLiteratureServiceBase extends EntityService {
     public async Get(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
             let res:any = await Http.getInstance().get(`/salesliteratures/${context.salesliterature}`,isloading);
             this.tempStorage.setItem(context.srfsessionkey+'_productsalesliteratures',JSON.stringify(res.data.productsalesliteratures));
-            this.tempStorage.setItem(context.srfsessionkey+'_salesliteratureitems',JSON.stringify(res.data.salesliteratureitems));
             this.tempStorage.setItem(context.srfsessionkey+'_competitorsalesliteratures',JSON.stringify(res.data.competitorsalesliteratures));
+            this.tempStorage.setItem(context.srfsessionkey+'_salesliteratureitems',JSON.stringify(res.data.salesliteratureitems));
             return res;
     }
 
@@ -229,8 +229,8 @@ export default class SalesLiteratureServiceBase extends EntityService {
         let res:any = await  Http.getInstance().get(`/salesliteratures/getdraft`,isloading);
         res.data.salesliterature = data.salesliterature;
             this.tempStorage.setItem(context.srfsessionkey+'_productsalesliteratures',JSON.stringify(res.data.productsalesliteratures));
-            this.tempStorage.setItem(context.srfsessionkey+'_salesliteratureitems',JSON.stringify(res.data.salesliteratureitems));
             this.tempStorage.setItem(context.srfsessionkey+'_competitorsalesliteratures',JSON.stringify(res.data.competitorsalesliteratures));
+            this.tempStorage.setItem(context.srfsessionkey+'_salesliteratureitems',JSON.stringify(res.data.salesliteratureitems));
         return res;
     }
 
@@ -273,41 +273,41 @@ export default class SalesLiteratureServiceBase extends EntityService {
             }
         }
         masterData.productsalesliteratures = productsalesliteraturesData;
-        let salesliteratureitemsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesliteratureitems'),'undefined')){
-            salesliteratureitemsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesliteratureitems') as any);
-            if(salesliteratureitemsData && salesliteratureitemsData.length && salesliteratureitemsData.length > 0){
-                salesliteratureitemsData.forEach((item:any) => {
+        let competitorsalesliteraturesData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_competitorsalesliteratures'),'undefined')){
+            competitorsalesliteraturesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_competitorsalesliteratures') as any);
+            if(competitorsalesliteraturesData && competitorsalesliteraturesData.length && competitorsalesliteraturesData.length > 0){
+                competitorsalesliteraturesData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.salesliteratureitemid = null;
+                            item.relationshipsid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.salesliteratureitems = salesliteratureitemsData;
-        let competitorsalesliteraturesData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_competitorsalesliteratures'),'undefined')){
-            competitorsalesliteraturesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_competitorsalesliteratures') as any);
-            if(competitorsalesliteraturesData && competitorsalesliteraturesData.length && competitorsalesliteraturesData.length > 0){
-                competitorsalesliteraturesData.forEach((item:any) => {
+        masterData.competitorsalesliteratures = competitorsalesliteraturesData;
+        let salesliteratureitemsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesliteratureitems'),'undefined')){
+            salesliteratureitemsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesliteratureitems') as any);
+            if(salesliteratureitemsData && salesliteratureitemsData.length && salesliteratureitemsData.length > 0){
+                salesliteratureitemsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.relationshipsid = null;
+                            item.salesliteratureitemid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.competitorsalesliteratures = competitorsalesliteraturesData;
+        masterData.salesliteratureitems = salesliteratureitemsData;
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().post(`/salesliteratures/${context.salesliterature}/save`,data,isloading);
             this.tempStorage.setItem(context.srfsessionkey+'_productsalesliteratures',JSON.stringify(res.data.productsalesliteratures));
-            this.tempStorage.setItem(context.srfsessionkey+'_salesliteratureitems',JSON.stringify(res.data.salesliteratureitems));
             this.tempStorage.setItem(context.srfsessionkey+'_competitorsalesliteratures',JSON.stringify(res.data.competitorsalesliteratures));
+            this.tempStorage.setItem(context.srfsessionkey+'_salesliteratureitems',JSON.stringify(res.data.salesliteratureitems));
             return res;
     }
 

app_CRM/src/service/sales-order/sales-order-service-base.ts

@@ -80,21 +80,6 @@ export default class SalesOrderServiceBase extends EntityService {
     public async Create(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         if(context.account && context.contact && context.opportunity && context.quote && true){
             let masterData:any = {};
-        let invoicesData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_invoices'),'undefined')){
-            invoicesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_invoices') as any);
-            if(invoicesData && invoicesData.length && invoicesData.length > 0){
-                invoicesData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.invoiceid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.invoices = invoicesData;
         let salesorderdetailsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails'),'undefined')){
             salesorderdetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails') as any);
@@ -110,21 +95,6 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.salesorderdetails = salesorderdetailsData;
-            Object.assign(data,masterData);
-            if(!data.srffrontuf || data.srffrontuf !== "1"){
-                data[this.APPDEKEY] = null;
-            }
-            if(data.srffrontuf){
-                delete data.srffrontuf;
-            }
-            let tempContext:any = JSON.parse(JSON.stringify(context));
-            let res:any = await Http.getInstance().post(`/accounts/${context.account}/contacts/${context.contact}/opportunities/${context.opportunity}/quotes/${context.quote}/salesorders`,data,isloading);
-            this.tempStorage.setItem(tempContext.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
-            this.tempStorage.setItem(tempContext.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
-            return res;
-        }
-        if(context.contact && context.opportunity && context.quote && true){
-            let masterData:any = {};
         let invoicesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_invoices'),'undefined')){
             invoicesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_invoices') as any);
@@ -140,6 +110,21 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.invoices = invoicesData;
+            Object.assign(data,masterData);
+            if(!data.srffrontuf || data.srffrontuf !== "1"){
+                data[this.APPDEKEY] = null;
+            }
+            if(data.srffrontuf){
+                delete data.srffrontuf;
+            }
+            let tempContext:any = JSON.parse(JSON.stringify(context));
+            let res:any = await Http.getInstance().post(`/accounts/${context.account}/contacts/${context.contact}/opportunities/${context.opportunity}/quotes/${context.quote}/salesorders`,data,isloading);
+            this.tempStorage.setItem(tempContext.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
+            this.tempStorage.setItem(tempContext.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
+            return res;
+        }
+        if(context.contact && context.opportunity && context.quote && true){
+            let masterData:any = {};
         let salesorderdetailsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails'),'undefined')){
             salesorderdetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails') as any);
@@ -155,21 +140,6 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.salesorderdetails = salesorderdetailsData;
-            Object.assign(data,masterData);
-            if(!data.srffrontuf || data.srffrontuf !== "1"){
-                data[this.APPDEKEY] = null;
-            }
-            if(data.srffrontuf){
-                delete data.srffrontuf;
-            }
-            let tempContext:any = JSON.parse(JSON.stringify(context));
-            let res:any = await Http.getInstance().post(`/contacts/${context.contact}/opportunities/${context.opportunity}/quotes/${context.quote}/salesorders`,data,isloading);
-            this.tempStorage.setItem(tempContext.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
-            this.tempStorage.setItem(tempContext.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
-            return res;
-        }
-        if(context.account && context.opportunity && context.quote && true){
-            let masterData:any = {};
         let invoicesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_invoices'),'undefined')){
             invoicesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_invoices') as any);
@@ -185,6 +155,21 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.invoices = invoicesData;
+            Object.assign(data,masterData);
+            if(!data.srffrontuf || data.srffrontuf !== "1"){
+                data[this.APPDEKEY] = null;
+            }
+            if(data.srffrontuf){
+                delete data.srffrontuf;
+            }
+            let tempContext:any = JSON.parse(JSON.stringify(context));
+            let res:any = await Http.getInstance().post(`/contacts/${context.contact}/opportunities/${context.opportunity}/quotes/${context.quote}/salesorders`,data,isloading);
+            this.tempStorage.setItem(tempContext.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
+            this.tempStorage.setItem(tempContext.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
+            return res;
+        }
+        if(context.account && context.opportunity && context.quote && true){
+            let masterData:any = {};
         let salesorderdetailsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails'),'undefined')){
             salesorderdetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails') as any);
@@ -200,21 +185,6 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.salesorderdetails = salesorderdetailsData;
-            Object.assign(data,masterData);
-            if(!data.srffrontuf || data.srffrontuf !== "1"){
-                data[this.APPDEKEY] = null;
-            }
-            if(data.srffrontuf){
-                delete data.srffrontuf;
-            }
-            let tempContext:any = JSON.parse(JSON.stringify(context));
-            let res:any = await Http.getInstance().post(`/accounts/${context.account}/opportunities/${context.opportunity}/quotes/${context.quote}/salesorders`,data,isloading);
-            this.tempStorage.setItem(tempContext.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
-            this.tempStorage.setItem(tempContext.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
-            return res;
-        }
-        if(context.opportunity && context.quote && true){
-            let masterData:any = {};
         let invoicesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_invoices'),'undefined')){
             invoicesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_invoices') as any);
@@ -230,6 +200,21 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.invoices = invoicesData;
+            Object.assign(data,masterData);
+            if(!data.srffrontuf || data.srffrontuf !== "1"){
+                data[this.APPDEKEY] = null;
+            }
+            if(data.srffrontuf){
+                delete data.srffrontuf;
+            }
+            let tempContext:any = JSON.parse(JSON.stringify(context));
+            let res:any = await Http.getInstance().post(`/accounts/${context.account}/opportunities/${context.opportunity}/quotes/${context.quote}/salesorders`,data,isloading);
+            this.tempStorage.setItem(tempContext.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
+            this.tempStorage.setItem(tempContext.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
+            return res;
+        }
+        if(context.opportunity && context.quote && true){
+            let masterData:any = {};
         let salesorderdetailsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails'),'undefined')){
             salesorderdetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails') as any);
@@ -245,21 +230,6 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.salesorderdetails = salesorderdetailsData;
-            Object.assign(data,masterData);
-            if(!data.srffrontuf || data.srffrontuf !== "1"){
-                data[this.APPDEKEY] = null;
-            }
-            if(data.srffrontuf){
-                delete data.srffrontuf;
-            }
-            let tempContext:any = JSON.parse(JSON.stringify(context));
-            let res:any = await Http.getInstance().post(`/opportunities/${context.opportunity}/quotes/${context.quote}/salesorders`,data,isloading);
-            this.tempStorage.setItem(tempContext.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
-            this.tempStorage.setItem(tempContext.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
-            return res;
-        }
-        if(context.quote && true){
-            let masterData:any = {};
         let invoicesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_invoices'),'undefined')){
             invoicesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_invoices') as any);
@@ -275,6 +245,21 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.invoices = invoicesData;
+            Object.assign(data,masterData);
+            if(!data.srffrontuf || data.srffrontuf !== "1"){
+                data[this.APPDEKEY] = null;
+            }
+            if(data.srffrontuf){
+                delete data.srffrontuf;
+            }
+            let tempContext:any = JSON.parse(JSON.stringify(context));
+            let res:any = await Http.getInstance().post(`/opportunities/${context.opportunity}/quotes/${context.quote}/salesorders`,data,isloading);
+            this.tempStorage.setItem(tempContext.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
+            this.tempStorage.setItem(tempContext.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
+            return res;
+        }
+        if(context.quote && true){
+            let masterData:any = {};
         let salesorderdetailsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails'),'undefined')){
             salesorderdetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails') as any);
@@ -290,20 +275,6 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.salesorderdetails = salesorderdetailsData;
-            Object.assign(data,masterData);
-            if(!data.srffrontuf || data.srffrontuf !== "1"){
-                data[this.APPDEKEY] = null;
-            }
-            if(data.srffrontuf){
-                delete data.srffrontuf;
-            }
-            let tempContext:any = JSON.parse(JSON.stringify(context));
-            let res:any = await Http.getInstance().post(`/quotes/${context.quote}/salesorders`,data,isloading);
-            this.tempStorage.setItem(tempContext.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
-            this.tempStorage.setItem(tempContext.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
-            return res;
-        }
-        let masterData:any = {};
         let invoicesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_invoices'),'undefined')){
             invoicesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_invoices') as any);
@@ -319,6 +290,20 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.invoices = invoicesData;
+            Object.assign(data,masterData);
+            if(!data.srffrontuf || data.srffrontuf !== "1"){
+                data[this.APPDEKEY] = null;
+            }
+            if(data.srffrontuf){
+                delete data.srffrontuf;
+            }
+            let tempContext:any = JSON.parse(JSON.stringify(context));
+            let res:any = await Http.getInstance().post(`/quotes/${context.quote}/salesorders`,data,isloading);
+            this.tempStorage.setItem(tempContext.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
+            this.tempStorage.setItem(tempContext.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
+            return res;
+        }
+        let masterData:any = {};
         let salesorderdetailsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails'),'undefined')){
             salesorderdetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails') as any);
@@ -334,6 +319,21 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.salesorderdetails = salesorderdetailsData;
+        let invoicesData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_invoices'),'undefined')){
+            invoicesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_invoices') as any);
+            if(invoicesData && invoicesData.length && invoicesData.length > 0){
+                invoicesData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.invoiceid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.invoices = invoicesData;
         Object.assign(data,masterData);
         if(!data.srffrontuf || data.srffrontuf !== "1"){
             data[this.APPDEKEY] = null;
@@ -343,8 +343,8 @@ export default class SalesOrderServiceBase extends EntityService {
         }
         let tempContext:any = JSON.parse(JSON.stringify(context));
         let res:any = await Http.getInstance().post(`/salesorders`,data,isloading);
-        this.tempStorage.setItem(tempContext.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
         this.tempStorage.setItem(tempContext.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
+        this.tempStorage.setItem(tempContext.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
         return res;
     }
 
@@ -360,21 +360,6 @@ export default class SalesOrderServiceBase extends EntityService {
     public async Update(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         if(context.account && context.contact && context.opportunity && context.quote && context.salesorder){
             let masterData:any = {};
-        let invoicesData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_invoices'),'undefined')){
-            invoicesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_invoices') as any);
-            if(invoicesData && invoicesData.length && invoicesData.length > 0){
-                invoicesData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.invoiceid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.invoices = invoicesData;
         let salesorderdetailsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails'),'undefined')){
             salesorderdetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails') as any);
@@ -390,14 +375,6 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.salesorderdetails = salesorderdetailsData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().put(`/accounts/${context.account}/contacts/${context.contact}/opportunities/${context.opportunity}/quotes/${context.quote}/salesorders/${context.salesorder}`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
-            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
-            return res;
-        }
-        if(context.contact && context.opportunity && context.quote && context.salesorder){
-            let masterData:any = {};
         let invoicesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_invoices'),'undefined')){
             invoicesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_invoices') as any);
@@ -413,6 +390,14 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.invoices = invoicesData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().put(`/accounts/${context.account}/contacts/${context.contact}/opportunities/${context.opportunity}/quotes/${context.quote}/salesorders/${context.salesorder}`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
+            this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
+            return res;
+        }
+        if(context.contact && context.opportunity && context.quote && context.salesorder){
+            let masterData:any = {};
         let salesorderdetailsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails'),'undefined')){
             salesorderdetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails') as any);
@@ -428,14 +413,6 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.salesorderdetails = salesorderdetailsData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().put(`/contacts/${context.contact}/opportunities/${context.opportunity}/quotes/${context.quote}/salesorders/${context.salesorder}`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
-            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
-            return res;
-        }
-        if(context.account && context.opportunity && context.quote && context.salesorder){
-            let masterData:any = {};
         let invoicesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_invoices'),'undefined')){
             invoicesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_invoices') as any);
@@ -451,6 +428,14 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.invoices = invoicesData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().put(`/contacts/${context.contact}/opportunities/${context.opportunity}/quotes/${context.quote}/salesorders/${context.salesorder}`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
+            this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
+            return res;
+        }
+        if(context.account && context.opportunity && context.quote && context.salesorder){
+            let masterData:any = {};
         let salesorderdetailsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails'),'undefined')){
             salesorderdetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails') as any);
@@ -466,14 +451,6 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.salesorderdetails = salesorderdetailsData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().put(`/accounts/${context.account}/opportunities/${context.opportunity}/quotes/${context.quote}/salesorders/${context.salesorder}`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
-            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
-            return res;
-        }
-        if(context.opportunity && context.quote && context.salesorder){
-            let masterData:any = {};
         let invoicesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_invoices'),'undefined')){
             invoicesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_invoices') as any);
@@ -489,6 +466,14 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.invoices = invoicesData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().put(`/accounts/${context.account}/opportunities/${context.opportunity}/quotes/${context.quote}/salesorders/${context.salesorder}`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
+            this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
+            return res;
+        }
+        if(context.opportunity && context.quote && context.salesorder){
+            let masterData:any = {};
         let salesorderdetailsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails'),'undefined')){
             salesorderdetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails') as any);
@@ -504,14 +489,6 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.salesorderdetails = salesorderdetailsData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().put(`/opportunities/${context.opportunity}/quotes/${context.quote}/salesorders/${context.salesorder}`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
-            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
-            return res;
-        }
-        if(context.quote && context.salesorder){
-            let masterData:any = {};
         let invoicesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_invoices'),'undefined')){
             invoicesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_invoices') as any);
@@ -527,6 +504,14 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.invoices = invoicesData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().put(`/opportunities/${context.opportunity}/quotes/${context.quote}/salesorders/${context.salesorder}`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
+            this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
+            return res;
+        }
+        if(context.quote && context.salesorder){
+            let masterData:any = {};
         let salesorderdetailsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails'),'undefined')){
             salesorderdetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails') as any);
@@ -542,13 +527,6 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.salesorderdetails = salesorderdetailsData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().put(`/quotes/${context.quote}/salesorders/${context.salesorder}`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
-            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
-            return res;
-        }
-        let masterData:any = {};
         let invoicesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_invoices'),'undefined')){
             invoicesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_invoices') as any);
@@ -564,6 +542,13 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.invoices = invoicesData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().put(`/quotes/${context.quote}/salesorders/${context.salesorder}`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
+            this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
+            return res;
+        }
+        let masterData:any = {};
         let salesorderdetailsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails'),'undefined')){
             salesorderdetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails') as any);
@@ -579,10 +564,25 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.salesorderdetails = salesorderdetailsData;
+        let invoicesData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_invoices'),'undefined')){
+            invoicesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_invoices') as any);
+            if(invoicesData && invoicesData.length && invoicesData.length > 0){
+                invoicesData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.invoiceid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.invoices = invoicesData;
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().put(`/salesorders/${context.salesorder}`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
             this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
+            this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
             return res;
     }
 
@@ -626,37 +626,37 @@ export default class SalesOrderServiceBase extends EntityService {
     public async Get(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         if(context.account && context.contact && context.opportunity && context.quote && context.salesorder){
             let res:any = await Http.getInstance().get(`/accounts/${context.account}/contacts/${context.contact}/opportunities/${context.opportunity}/quotes/${context.quote}/salesorders/${context.salesorder}`,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
             this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
+            this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
             return res;
         }
         if(context.contact && context.opportunity && context.quote && context.salesorder){
             let res:any = await Http.getInstance().get(`/contacts/${context.contact}/opportunities/${context.opportunity}/quotes/${context.quote}/salesorders/${context.salesorder}`,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
             this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
+            this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
             return res;
         }
         if(context.account && context.opportunity && context.quote && context.salesorder){
             let res:any = await Http.getInstance().get(`/accounts/${context.account}/opportunities/${context.opportunity}/quotes/${context.quote}/salesorders/${context.salesorder}`,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
             this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
+            this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
             return res;
         }
         if(context.opportunity && context.quote && context.salesorder){
             let res:any = await Http.getInstance().get(`/opportunities/${context.opportunity}/quotes/${context.quote}/salesorders/${context.salesorder}`,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
             this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
+            this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
             return res;
         }
         if(context.quote && context.salesorder){
             let res:any = await Http.getInstance().get(`/quotes/${context.quote}/salesorders/${context.salesorder}`,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
             this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
+            this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
             return res;
         }
             let res:any = await Http.getInstance().get(`/salesorders/${context.salesorder}`,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
             this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
+            this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
             return res;
     }
 
@@ -673,42 +673,42 @@ export default class SalesOrderServiceBase extends EntityService {
         if(context.account && context.contact && context.opportunity && context.quote && true){
             let res:any = await Http.getInstance().get(`/accounts/${context.account}/contacts/${context.contact}/opportunities/${context.opportunity}/quotes/${context.quote}/salesorders/getdraft`,isloading);
             res.data.salesorder = data.salesorder;
-            this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
             this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
+            this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
             return res;
         }
         if(context.contact && context.opportunity && context.quote && true){
             let res:any = await Http.getInstance().get(`/contacts/${context.contact}/opportunities/${context.opportunity}/quotes/${context.quote}/salesorders/getdraft`,isloading);
             res.data.salesorder = data.salesorder;
-            this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
             this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
+            this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
             return res;
         }
         if(context.account && context.opportunity && context.quote && true){
             let res:any = await Http.getInstance().get(`/accounts/${context.account}/opportunities/${context.opportunity}/quotes/${context.quote}/salesorders/getdraft`,isloading);
             res.data.salesorder = data.salesorder;
-            this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
             this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
+            this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
             return res;
         }
         if(context.opportunity && context.quote && true){
             let res:any = await Http.getInstance().get(`/opportunities/${context.opportunity}/quotes/${context.quote}/salesorders/getdraft`,isloading);
             res.data.salesorder = data.salesorder;
-            this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
             this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
+            this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
             return res;
         }
         if(context.quote && true){
             let res:any = await Http.getInstance().get(`/quotes/${context.quote}/salesorders/getdraft`,isloading);
             res.data.salesorder = data.salesorder;
-            this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
             this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
+            this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
             return res;
         }
         let res:any = await  Http.getInstance().get(`/salesorders/getdraft`,isloading);
         res.data.salesorder = data.salesorder;
-            this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
             this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
+            this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
         return res;
     }
 
@@ -739,21 +739,6 @@ export default class SalesOrderServiceBase extends EntityService {
     public async CheckKey(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         if(context.account && context.contact && context.opportunity && context.quote && context.salesorder){
             let masterData:any = {};
-        let invoicesData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_invoices'),'undefined')){
-            invoicesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_invoices') as any);
-            if(invoicesData && invoicesData.length && invoicesData.length > 0){
-                invoicesData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.invoiceid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.invoices = invoicesData;
         let salesorderdetailsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails'),'undefined')){
             salesorderdetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails') as any);
@@ -769,14 +754,6 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.salesorderdetails = salesorderdetailsData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().post(`/accounts/${context.account}/contacts/${context.contact}/opportunities/${context.opportunity}/quotes/${context.quote}/salesorders/${context.salesorder}/checkkey`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
-            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
-            return res;
-        }
-        if(context.contact && context.opportunity && context.quote && context.salesorder){
-            let masterData:any = {};
         let invoicesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_invoices'),'undefined')){
             invoicesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_invoices') as any);
@@ -792,6 +769,14 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.invoices = invoicesData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/accounts/${context.account}/contacts/${context.contact}/opportunities/${context.opportunity}/quotes/${context.quote}/salesorders/${context.salesorder}/checkkey`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
+            this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
+            return res;
+        }
+        if(context.contact && context.opportunity && context.quote && context.salesorder){
+            let masterData:any = {};
         let salesorderdetailsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails'),'undefined')){
             salesorderdetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails') as any);
@@ -807,14 +792,6 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.salesorderdetails = salesorderdetailsData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().post(`/contacts/${context.contact}/opportunities/${context.opportunity}/quotes/${context.quote}/salesorders/${context.salesorder}/checkkey`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
-            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
-            return res;
-        }
-        if(context.account && context.opportunity && context.quote && context.salesorder){
-            let masterData:any = {};
         let invoicesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_invoices'),'undefined')){
             invoicesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_invoices') as any);
@@ -830,6 +807,14 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.invoices = invoicesData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/contacts/${context.contact}/opportunities/${context.opportunity}/quotes/${context.quote}/salesorders/${context.salesorder}/checkkey`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
+            this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
+            return res;
+        }
+        if(context.account && context.opportunity && context.quote && context.salesorder){
+            let masterData:any = {};
         let salesorderdetailsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails'),'undefined')){
             salesorderdetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails') as any);
@@ -845,14 +830,6 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.salesorderdetails = salesorderdetailsData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().post(`/accounts/${context.account}/opportunities/${context.opportunity}/quotes/${context.quote}/salesorders/${context.salesorder}/checkkey`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
-            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
-            return res;
-        }
-        if(context.opportunity && context.quote && context.salesorder){
-            let masterData:any = {};
         let invoicesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_invoices'),'undefined')){
             invoicesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_invoices') as any);
@@ -868,6 +845,14 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.invoices = invoicesData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/accounts/${context.account}/opportunities/${context.opportunity}/quotes/${context.quote}/salesorders/${context.salesorder}/checkkey`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
+            this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
+            return res;
+        }
+        if(context.opportunity && context.quote && context.salesorder){
+            let masterData:any = {};
         let salesorderdetailsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails'),'undefined')){
             salesorderdetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails') as any);
@@ -883,14 +868,6 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.salesorderdetails = salesorderdetailsData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().post(`/opportunities/${context.opportunity}/quotes/${context.quote}/salesorders/${context.salesorder}/checkkey`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
-            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
-            return res;
-        }
-        if(context.quote && context.salesorder){
-            let masterData:any = {};
         let invoicesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_invoices'),'undefined')){
             invoicesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_invoices') as any);
@@ -906,6 +883,14 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.invoices = invoicesData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/opportunities/${context.opportunity}/quotes/${context.quote}/salesorders/${context.salesorder}/checkkey`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
+            this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
+            return res;
+        }
+        if(context.quote && context.salesorder){
+            let masterData:any = {};
         let salesorderdetailsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails'),'undefined')){
             salesorderdetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails') as any);
@@ -921,10 +906,25 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.salesorderdetails = salesorderdetailsData;
+        let invoicesData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_invoices'),'undefined')){
+            invoicesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_invoices') as any);
+            if(invoicesData && invoicesData.length && invoicesData.length > 0){
+                invoicesData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.invoiceid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.invoices = invoicesData;
             Object.assign(data,masterData);
             let res:any = await Http.getInstance().post(`/quotes/${context.quote}/salesorders/${context.salesorder}/checkkey`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
             this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
+            this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
             return res;
         }
             return Http.getInstance().post(`/salesorders/${context.salesorder}/checkkey`,data,isloading);
@@ -957,21 +957,6 @@ export default class SalesOrderServiceBase extends EntityService {
     public async GenInvoice(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         if(context.account && context.contact && context.opportunity && context.quote && context.salesorder){
             let masterData:any = {};
-        let invoicesData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_invoices'),'undefined')){
-            invoicesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_invoices') as any);
-            if(invoicesData && invoicesData.length && invoicesData.length > 0){
-                invoicesData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.invoiceid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.invoices = invoicesData;
         let salesorderdetailsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails'),'undefined')){
             salesorderdetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails') as any);
@@ -987,14 +972,6 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.salesorderdetails = salesorderdetailsData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().post(`/accounts/${context.account}/contacts/${context.contact}/opportunities/${context.opportunity}/quotes/${context.quote}/salesorders/${context.salesorder}/geninvoice`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
-            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
-            return res;
-        }
-        if(context.contact && context.opportunity && context.quote && context.salesorder){
-            let masterData:any = {};
         let invoicesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_invoices'),'undefined')){
             invoicesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_invoices') as any);
@@ -1010,6 +987,14 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.invoices = invoicesData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/accounts/${context.account}/contacts/${context.contact}/opportunities/${context.opportunity}/quotes/${context.quote}/salesorders/${context.salesorder}/geninvoice`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
+            this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
+            return res;
+        }
+        if(context.contact && context.opportunity && context.quote && context.salesorder){
+            let masterData:any = {};
         let salesorderdetailsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails'),'undefined')){
             salesorderdetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails') as any);
@@ -1025,14 +1010,6 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.salesorderdetails = salesorderdetailsData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().post(`/contacts/${context.contact}/opportunities/${context.opportunity}/quotes/${context.quote}/salesorders/${context.salesorder}/geninvoice`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
-            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
-            return res;
-        }
-        if(context.account && context.opportunity && context.quote && context.salesorder){
-            let masterData:any = {};
         let invoicesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_invoices'),'undefined')){
             invoicesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_invoices') as any);
@@ -1048,6 +1025,14 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.invoices = invoicesData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/contacts/${context.contact}/opportunities/${context.opportunity}/quotes/${context.quote}/salesorders/${context.salesorder}/geninvoice`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
+            this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
+            return res;
+        }
+        if(context.account && context.opportunity && context.quote && context.salesorder){
+            let masterData:any = {};
         let salesorderdetailsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails'),'undefined')){
             salesorderdetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails') as any);
@@ -1063,14 +1048,6 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.salesorderdetails = salesorderdetailsData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().post(`/accounts/${context.account}/opportunities/${context.opportunity}/quotes/${context.quote}/salesorders/${context.salesorder}/geninvoice`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
-            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
-            return res;
-        }
-        if(context.opportunity && context.quote && context.salesorder){
-            let masterData:any = {};
         let invoicesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_invoices'),'undefined')){
             invoicesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_invoices') as any);
@@ -1086,6 +1063,14 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.invoices = invoicesData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/accounts/${context.account}/opportunities/${context.opportunity}/quotes/${context.quote}/salesorders/${context.salesorder}/geninvoice`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
+            this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
+            return res;
+        }
+        if(context.opportunity && context.quote && context.salesorder){
+            let masterData:any = {};
         let salesorderdetailsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails'),'undefined')){
             salesorderdetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails') as any);
@@ -1101,14 +1086,6 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.salesorderdetails = salesorderdetailsData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().post(`/opportunities/${context.opportunity}/quotes/${context.quote}/salesorders/${context.salesorder}/geninvoice`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
-            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
-            return res;
-        }
-        if(context.quote && context.salesorder){
-            let masterData:any = {};
         let invoicesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_invoices'),'undefined')){
             invoicesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_invoices') as any);
@@ -1124,6 +1101,14 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.invoices = invoicesData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/opportunities/${context.opportunity}/quotes/${context.quote}/salesorders/${context.salesorder}/geninvoice`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
+            this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
+            return res;
+        }
+        if(context.quote && context.salesorder){
+            let masterData:any = {};
         let salesorderdetailsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails'),'undefined')){
             salesorderdetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails') as any);
@@ -1139,10 +1124,25 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.salesorderdetails = salesorderdetailsData;
+        let invoicesData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_invoices'),'undefined')){
+            invoicesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_invoices') as any);
+            if(invoicesData && invoicesData.length && invoicesData.length > 0){
+                invoicesData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.invoiceid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.invoices = invoicesData;
             Object.assign(data,masterData);
             let res:any = await Http.getInstance().post(`/quotes/${context.quote}/salesorders/${context.salesorder}/geninvoice`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
             this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
+            this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
             return res;
         }
             return Http.getInstance().post(`/salesorders/${context.salesorder}/geninvoice`,data,isloading);
@@ -1160,21 +1160,6 @@ export default class SalesOrderServiceBase extends EntityService {
     public async Save(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         if(context.account && context.contact && context.opportunity && context.quote && context.salesorder){
             let masterData:any = {};
-        let invoicesData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_invoices'),'undefined')){
-            invoicesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_invoices') as any);
-            if(invoicesData && invoicesData.length && invoicesData.length > 0){
-                invoicesData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.invoiceid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.invoices = invoicesData;
         let salesorderdetailsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails'),'undefined')){
             salesorderdetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails') as any);
@@ -1190,14 +1175,6 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.salesorderdetails = salesorderdetailsData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().post(`/accounts/${context.account}/contacts/${context.contact}/opportunities/${context.opportunity}/quotes/${context.quote}/salesorders/${context.salesorder}/save`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
-            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
-            return res;
-        }
-        if(context.contact && context.opportunity && context.quote && context.salesorder){
-            let masterData:any = {};
         let invoicesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_invoices'),'undefined')){
             invoicesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_invoices') as any);
@@ -1213,6 +1190,14 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.invoices = invoicesData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/accounts/${context.account}/contacts/${context.contact}/opportunities/${context.opportunity}/quotes/${context.quote}/salesorders/${context.salesorder}/save`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
+            this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
+            return res;
+        }
+        if(context.contact && context.opportunity && context.quote && context.salesorder){
+            let masterData:any = {};
         let salesorderdetailsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails'),'undefined')){
             salesorderdetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails') as any);
@@ -1228,14 +1213,6 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.salesorderdetails = salesorderdetailsData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().post(`/contacts/${context.contact}/opportunities/${context.opportunity}/quotes/${context.quote}/salesorders/${context.salesorder}/save`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
-            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
-            return res;
-        }
-        if(context.account && context.opportunity && context.quote && context.salesorder){
-            let masterData:any = {};
         let invoicesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_invoices'),'undefined')){
             invoicesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_invoices') as any);
@@ -1251,6 +1228,14 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.invoices = invoicesData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/contacts/${context.contact}/opportunities/${context.opportunity}/quotes/${context.quote}/salesorders/${context.salesorder}/save`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
+            this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
+            return res;
+        }
+        if(context.account && context.opportunity && context.quote && context.salesorder){
+            let masterData:any = {};
         let salesorderdetailsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails'),'undefined')){
             salesorderdetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails') as any);
@@ -1266,14 +1251,6 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.salesorderdetails = salesorderdetailsData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().post(`/accounts/${context.account}/opportunities/${context.opportunity}/quotes/${context.quote}/salesorders/${context.salesorder}/save`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
-            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
-            return res;
-        }
-        if(context.opportunity && context.quote && context.salesorder){
-            let masterData:any = {};
         let invoicesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_invoices'),'undefined')){
             invoicesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_invoices') as any);
@@ -1289,6 +1266,14 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.invoices = invoicesData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/accounts/${context.account}/opportunities/${context.opportunity}/quotes/${context.quote}/salesorders/${context.salesorder}/save`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
+            this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
+            return res;
+        }
+        if(context.opportunity && context.quote && context.salesorder){
+            let masterData:any = {};
         let salesorderdetailsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails'),'undefined')){
             salesorderdetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails') as any);
@@ -1304,14 +1289,6 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.salesorderdetails = salesorderdetailsData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().post(`/opportunities/${context.opportunity}/quotes/${context.quote}/salesorders/${context.salesorder}/save`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
-            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
-            return res;
-        }
-        if(context.quote && context.salesorder){
-            let masterData:any = {};
         let invoicesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_invoices'),'undefined')){
             invoicesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_invoices') as any);
@@ -1327,6 +1304,14 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.invoices = invoicesData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/opportunities/${context.opportunity}/quotes/${context.quote}/salesorders/${context.salesorder}/save`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
+            this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
+            return res;
+        }
+        if(context.quote && context.salesorder){
+            let masterData:any = {};
         let salesorderdetailsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails'),'undefined')){
             salesorderdetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails') as any);
@@ -1342,13 +1327,6 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.salesorderdetails = salesorderdetailsData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().post(`/quotes/${context.quote}/salesorders/${context.salesorder}/save`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
-            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
-            return res;
-        }
-        let masterData:any = {};
         let invoicesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_invoices'),'undefined')){
             invoicesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_invoices') as any);
@@ -1364,6 +1342,13 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.invoices = invoicesData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/quotes/${context.quote}/salesorders/${context.salesorder}/save`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
+            this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
+            return res;
+        }
+        let masterData:any = {};
         let salesorderdetailsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails'),'undefined')){
             salesorderdetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails') as any);
@@ -1379,10 +1364,25 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.salesorderdetails = salesorderdetailsData;
+        let invoicesData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_invoices'),'undefined')){
+            invoicesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_invoices') as any);
+            if(invoicesData && invoicesData.length && invoicesData.length > 0){
+                invoicesData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.invoiceid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.invoices = invoicesData;
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().post(`/salesorders/${context.salesorder}/save`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
             this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
+            this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
             return res;
     }
 

app_CRM/src/uiservice/invoice/invoice-ui-service-base.ts

@@ -83,6 +83,7 @@ export default class InvoiceUIServiceBase extends UIService {
         this.allViewMap.set(':',{viewname:'statetabview',srfappde:'invoices'});
         this.allViewMap.set(':',{viewname:'quickcreateview',srfappde:'invoices'});
         this.allViewMap.set(':',{viewname:'byparentkey',srfappde:'invoices'});
+        this.allViewMap.set(':',{viewname:'edit_datapanelview',srfappde:'invoices'});
         this.allViewMap.set(':',{viewname:'paidgridview',srfappde:'invoices'});
         this.allViewMap.set(':',{viewname:'cancelgridview',srfappde:'invoices'});
         this.allViewMap.set(':',{viewname:'summaryview',srfappde:'invoices'});

app_CRM/src/widgets/account/info-all-form/info-all-form-base.tsx

@@ -211,7 +211,7 @@ export class Info_AllEditFormBase extends EditFormControlBase {
      * @memberof Info_AllEditFormBase
      */
     public detailsModel: any = {
-        group1: new FormGroupPanelModel({ caption: '账户信息', detailType: 'GROUPPANEL', name: 'group1', visible: true, isShowCaption: true, form: this, showMoreMode: 2, anchorPoints: ['sic', 'tickersymbol', 'ownershipcode', ], controlledItems: [
+        group1: new FormGroupPanelModel({ caption: '账户信息', detailType: 'GROUPPANEL', name: 'group1', visible: true, isShowCaption: true, form: this, showMoreMode: 2, anchorPoints: ['telephone1', 'sic', 'fax', 'websiteurl', 'tickersymbol', 'ownershipcode', ], controlledItems: [
                     'sic',
                     'fax',
                     'websiteurl',

app_CRM/src/widgets/contact/date-panel-form/date-panel-form.html

@@ -32,7 +32,7 @@
         <div  v-show="detailsModel.button1.visible" :style="{}">
     <i-button type="primary" @click="button1_click($event)"
          style="">
-           
+        <i class="fa fa-angle-down" style="margin-right: 2px;"></i>   
         
     </i-button>
 

businesscentral-core/src/main/resources/liquibase/h2_table.xml

@@ -4,7 +4,7 @@
 
 
     <!--输出实体[ACCOUNT]数据结构 -->
-    <changeSet author="a_LAB01_e85d8801c" id="tab-account-609-1">
+    <changeSet author="a_LAB01_e85d8801c" id="tab-account-611-1">
         <createTable tableName="ACCOUNT">
                 <column name="ADDRESS1_PRIMARYCONTACTNAME" remarks="" type="VARCHAR(100)">
                 </column>
@@ -2757,7 +2757,7 @@
 
 
     <!--输出实体[CONTACT]数据结构 -->
-    <changeSet author="a_LAB01_e85d8801c" id="tab-contact-347-38">
+    <changeSet author="a_LAB01_e85d8801c" id="tab-contact-348-38">
         <createTable tableName="CONTACT">
                 <column name="ADDRESS1_FREIGHTTERMSCODE" remarks="" type="VARCHAR(30)">
                 </column>
@@ -5157,7 +5157,7 @@
 
 
     <!--输出实体[INVOICE]数据结构 -->
-    <changeSet author="a_LAB01_e85d8801c" id="tab-invoice-88-63">
+    <changeSet author="a_LAB01_e85d8801c" id="tab-invoice-96-63">
         <createTable tableName="INVOICE">
                 <column name="BILLTO_LINE1" remarks="" type="VARCHAR(250)">
                 </column>
@@ -5805,7 +5805,7 @@
 
 
     <!--输出实体[LEAD]数据结构 -->
-    <changeSet author="a_LAB01_e85d8801c" id="tab-lead-227-70">
+    <changeSet author="a_LAB01_e85d8801c" id="tab-lead-230-70">
         <createTable tableName="LEAD">
                 <column name="ADDRESS1_FAX" remarks="" type="VARCHAR(50)">
                 </column>
@@ -10987,31 +10987,31 @@
     </changeSet>
 
         <!--输出实体[ACCOUNT]外键关系 -->
-    <changeSet author="a_LAB01_e85d8801c" id="fk-account-609-135">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-account-611-135">
        <addForeignKeyConstraint baseColumnNames="PARENTACCOUNTID" baseTableName="ACCOUNT" constraintName="DER1N_ACCOUNT__ACCOUNT__PARENT" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="ACCOUNTID" referencedTableName="ACCOUNT" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-account-609-136">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-account-611-136">
        <addForeignKeyConstraint baseColumnNames="PRIMARYCONTACTID" baseTableName="ACCOUNT" constraintName="DER1N_ACCOUNT__CONTACT__PRIMAR" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="CONTACTID" referencedTableName="CONTACT" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-account-609-137">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-account-611-137">
        <addForeignKeyConstraint baseColumnNames="PREFERREDEQUIPMENTID" baseTableName="ACCOUNT" constraintName="DER1N_ACCOUNT__EQUIPMENT__PREF" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="EQUIPMENTID" referencedTableName="EQUIPMENT" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-account-609-138">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-account-611-138">
        <addForeignKeyConstraint baseColumnNames="ORIGINATINGLEADID" baseTableName="ACCOUNT" constraintName="DER1N_ACCOUNT__LEAD__ORIGINATI" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="LEADID" referencedTableName="LEAD" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-account-609-139">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-account-611-139">
        <addForeignKeyConstraint baseColumnNames="DEFAULTPRICELEVELID" baseTableName="ACCOUNT" constraintName="DER1N_ACCOUNT__PRICELEVEL__DEF" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="PRICELEVELID" referencedTableName="PRICELEVEL" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-account-609-140">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-account-611-140">
        <addForeignKeyConstraint baseColumnNames="PREFERREDSERVICEID" baseTableName="ACCOUNT" constraintName="DER1N_ACCOUNT__SERVICE__PREFER" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="SERVICEID" referencedTableName="SERVICE" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-account-609-141">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-account-611-141">
        <addForeignKeyConstraint baseColumnNames="SLAID" baseTableName="ACCOUNT" constraintName="DER1N_ACCOUNT__SLA__SLAID" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="SLAID" referencedTableName="SLA" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-account-609-142">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-account-611-142">
        <addForeignKeyConstraint baseColumnNames="TERRITORYID" baseTableName="ACCOUNT" constraintName="DER1N_ACCOUNT__TERRITORY__TERR" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="TERRITORYID" referencedTableName="TERRITORY" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-account-609-143">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-account-611-143">
        <addForeignKeyConstraint baseColumnNames="TRANSACTIONCURRENCYID" baseTableName="ACCOUNT" constraintName="DER1N_ACCOUNT__TRANSACTIONCURR" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="TRANSACTIONCURRENCYID" referencedTableName="TRANSACTIONCURRENCY" validate="true"/>
     </changeSet>
         <!--输出实体[ACTIVITYMIMEATTACHMENT]外键关系 -->
@@ -11186,25 +11186,25 @@
        <addForeignKeyConstraint baseColumnNames="BUSINESSUNITID" baseTableName="CONSTRAINTBASEDGROUP" constraintName="DER1N_CONSTRAINTBASEDGROUP__BU" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="BUSINESSUNITID" referencedTableName="BUSINESSUNIT" validate="true"/>
     </changeSet>
         <!--输出实体[CONTACT]外键关系 -->
-    <changeSet author="a_LAB01_e85d8801c" id="fk-contact-347-199">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-contact-348-199">
        <addForeignKeyConstraint baseColumnNames="CUSTOMERID" baseTableName="CONTACT" constraintName="DER1N_CONTACT_ACCOUNT_CUSTOMER" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="ACCOUNTID" referencedTableName="ACCOUNT" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-contact-347-200">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-contact-348-200">
        <addForeignKeyConstraint baseColumnNames="PREFERREDEQUIPMENTID" baseTableName="CONTACT" constraintName="DER1N_CONTACT__EQUIPMENT__PREF" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="EQUIPMENTID" referencedTableName="EQUIPMENT" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-contact-347-201">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-contact-348-201">
        <addForeignKeyConstraint baseColumnNames="ORIGINATINGLEADID" baseTableName="CONTACT" constraintName="DER1N_CONTACT__LEAD__ORIGINATI" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="LEADID" referencedTableName="LEAD" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-contact-347-202">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-contact-348-202">
        <addForeignKeyConstraint baseColumnNames="DEFAULTPRICELEVELID" baseTableName="CONTACT" constraintName="DER1N_CONTACT__PRICELEVEL__DEF" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="PRICELEVELID" referencedTableName="PRICELEVEL" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-contact-347-203">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-contact-348-203">
        <addForeignKeyConstraint baseColumnNames="PREFERREDSERVICEID" baseTableName="CONTACT" constraintName="DER1N_CONTACT__SERVICE__PREFER" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="SERVICEID" referencedTableName="SERVICE" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-contact-347-204">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-contact-348-204">
        <addForeignKeyConstraint baseColumnNames="SLAID" baseTableName="CONTACT" constraintName="DER1N_CONTACT__SLA__SLAID" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="SLAID" referencedTableName="SLA" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-contact-347-205">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-contact-348-205">
        <addForeignKeyConstraint baseColumnNames="TRANSACTIONCURRENCYID" baseTableName="CONTACT" constraintName="DER1N_CONTACT__TRANSACTIONCURR" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="TRANSACTIONCURRENCYID" referencedTableName="TRANSACTIONCURRENCY" validate="true"/>
     </changeSet>
         <!--输出实体[CONTRACT]外键关系 -->
@@ -11418,19 +11418,19 @@
        <addForeignKeyConstraint baseColumnNames="UOMID" baseTableName="T_INVENTORY" constraintName="DER1N_INVENTORY_UOM_UOMID" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="UOMID" referencedTableName="UOM" validate="true"/>
     </changeSet>
         <!--输出实体[INVOICE]外键关系 -->
-    <changeSet author="a_LAB01_e85d8801c" id="fk-invoice-88-280">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-invoice-96-280">
        <addForeignKeyConstraint baseColumnNames="OPPORTUNITYID" baseTableName="INVOICE" constraintName="DER1N_INVOICE__OPPORTUNITY__OP" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="OPPORTUNITYID" referencedTableName="OPPORTUNITY" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-invoice-88-281">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-invoice-96-281">
        <addForeignKeyConstraint baseColumnNames="PRICELEVELID" baseTableName="INVOICE" constraintName="DER1N_INVOICE__PRICELEVEL__PRI" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="PRICELEVELID" referencedTableName="PRICELEVEL" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-invoice-88-282">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-invoice-96-282">
        <addForeignKeyConstraint baseColumnNames="SALESORDERID" baseTableName="INVOICE" constraintName="DER1N_INVOICE__SALESORDER__SAL" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="SALESORDERID" referencedTableName="SALESORDER" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-invoice-88-283">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-invoice-96-283">
        <addForeignKeyConstraint baseColumnNames="SLAID" baseTableName="INVOICE" constraintName="DER1N_INVOICE__SLA__SLAID" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="SLAID" referencedTableName="SLA" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-invoice-88-284">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-invoice-96-284">
        <addForeignKeyConstraint baseColumnNames="TRANSACTIONCURRENCYID" baseTableName="INVOICE" constraintName="DER1N_INVOICE__TRANSACTIONCURR" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="TRANSACTIONCURRENCYID" referencedTableName="TRANSACTIONCURRENCY" validate="true"/>
     </changeSet>
         <!--输出实体[INVOICEDETAIL]外键关系 -->
@@ -11479,28 +11479,28 @@
     </changeSet>
         <!--输出实体[LANGUAGELOCALE]外键关系 -->
         <!--输出实体[LEAD]外键关系 -->
-    <changeSet author="a_LAB01_e85d8801c" id="fk-lead-227-301">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-lead-230-301">
        <addForeignKeyConstraint baseColumnNames="PARENTACCOUNTID" baseTableName="LEAD" constraintName="DER1N_LEAD__ACCOUNT__PARENTACC" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="ACCOUNTID" referencedTableName="ACCOUNT" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-lead-227-302">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-lead-230-302">
        <addForeignKeyConstraint baseColumnNames="RELATEDOBJECTID" baseTableName="LEAD" constraintName="DER1N_LEAD__CAMPAIGNRESPONSE__" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="ACTIVITYID" referencedTableName="CAMPAIGNRESPONSE" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-lead-227-303">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-lead-230-303">
        <addForeignKeyConstraint baseColumnNames="CAMPAIGNID" baseTableName="LEAD" constraintName="DER1N_LEAD__CAMPAIGN__CAMPAIGN" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="CAMPAIGNID" referencedTableName="CAMPAIGN" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-lead-227-304">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-lead-230-304">
        <addForeignKeyConstraint baseColumnNames="PARENTCONTACTID" baseTableName="LEAD" constraintName="DER1N_LEAD__CONTACT__PARENTCON" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="CONTACTID" referencedTableName="CONTACT" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-lead-227-305">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-lead-230-305">
        <addForeignKeyConstraint baseColumnNames="ORIGINATINGCASEID" baseTableName="LEAD" constraintName="DER1N_LEAD__INCIDENT__ORIGINAT" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="INCIDENTID" referencedTableName="INCIDENT" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-lead-227-306">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-lead-230-306">
        <addForeignKeyConstraint baseColumnNames="QUALIFYINGOPPORTUNITYID" baseTableName="LEAD" constraintName="DER1N_LEAD__OPPORTUNITY__QUALI" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="OPPORTUNITYID" referencedTableName="OPPORTUNITY" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-lead-227-307">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-lead-230-307">
        <addForeignKeyConstraint baseColumnNames="SLAID" baseTableName="LEAD" constraintName="DER1N_LEAD__SLA__SLAID" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="SLAID" referencedTableName="SLA" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-lead-227-308">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-lead-230-308">
        <addForeignKeyConstraint baseColumnNames="TRANSACTIONCURRENCYID" baseTableName="LEAD" constraintName="DER1N_LEAD__TRANSACTIONCURRENC" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="TRANSACTIONCURRENCYID" referencedTableName="TRANSACTIONCURRENCY" validate="true"/>
     </changeSet>
         <!--输出实体[LEADADDRESS]外键关系 -->