Merge branch 'master' of http://202.166.220.79:3000/IME_LONDON/DB_Script

# Conflicts: # StoredProc/proc_online_core_customerSetup.sql
5 months ago · d455628ea4
3 changed files with 4 additions and 1 deletions
--- a/Deployment/28122-SuperReferral/01-Alter-Query.sql
+++ b/Deployment/28122-SuperReferral/01-Alter-Query.sql
@ -5,3 +5,6 @@ ALTER TABLE REFERRAL_INCENTIVE_TRANSACTION_WISE
 ALTER COLUMN REFERRAL_ID VARCHAR(100)
 update staticDataType set isInternal=0 where typeID='4300'
 update applicationmenus set menugroup='Reports' where functionid='21100000' --admin
 update applicationmenus set menugroup='AgentPanel', agentmenugroup='Agent Report' where functionid='20203200' -- agent
--- a/StoredProc/proc_online_approve_Customer.sql
+++ b/StoredProc/proc_online_approve_Customer.sql
--- a/StoredProc/proc_online_core_customerSetup.sql
+++ b/StoredProc/proc_online_core_customerSetup.sql