fixed merge conflict
fixed merge conflict

rohitwaghchaure/New_Theme_Erp,saurabh6790/test-med-app,gangadharkadam/office_erp,njmube/erpnext,gangadhar-kadam/mic-erpnext,dieface/erpnext,Tejal011089/trufil-erpnext,Suninus/erpnext,ShashaQin/erpnext,gangadhar-kadam/church-erpnext,mbauskar/helpdesk-erpnext,gangadharkadam/saloon_erp,mbauskar/omnitech-demo-erpnext,mbauskar/sapphire-erpnext,anandpdoshi/erpnext,gangadharkadam/smrterp,suyashphadtare/vestasi-erp-1,rohitwaghchaure/erpnext_smart,gangadhar-kadam/verve_erp,geekroot/erpnext,Drooids/erpnext,sagar30051991/ozsmart-erp,saurabh6790/trufil_app,indictranstech/vestasi-erpnext,saurabh6790/omnit-app,BhupeshGupta/erpnext,suyashphadtare/vestasi-erp-final,mbauskar/phrerp,saurabh6790/medsynaptic-app,saurabh6790/med_app_rels,gangadharkadam/v5_erp,saurabh6790/omn-app,gangadhar-kadam/latestchurcherp,mbauskar/internal-hr,Drooids/erpnext,SPKian/Testing,mbauskar/Das_Erpnext,Aptitudetech/ERPNext,anandpdoshi/erpnext,gangadhar-kadam/adb-erp,treejames/erpnext,saurabh6790/alert-med-app,suyashphadtare/sajil-erp,susuchina/ERPNEXT,indictranstech/phrerp,hatwar/focal-erpnext,hatwar/Das_erpnext,Drooids/erpnext,indictranstech/biggift-erpnext,sheafferusa/erpnext,gangadhar-kadam/helpdesk-erpnext,Suninus/erpnext,Tejal011089/osmosis_erpnext,gangadharkadam/contributionerp,mbauskar/internal-hr,SPKian/Testing2,ShashaQin/erpnext,ThiagoGarciaAlves/erpnext,hatwar/buyback-erpnext,mbauskar/Das_Erpnext,mahabuber/erpnext,rohitwaghchaure/erpnext_smart,gangadharkadam/tailorerp,indictranstech/internal-erpnext,mbauskar/sapphire-erpnext,gangadhar-kadam/powapp,saurabh6790/aimobilize-app-backup,suyashphadtare/vestasi-erp-final,gmarke/erpnext,saurabh6790/omni-apps,gangadharkadam/v6_erp,gangadhar-kadam/latestchurcherp,njmube/erpnext,suyashphadtare/sajil-final-erp,Tejal011089/huntercamp_erpnext,rohitwaghchaure/erpnext_smart,indictranstech/trufil-erpnext,saurabh6790/omnitech-apps,indictranstech/buyback-erp,indictranstech/focal-erpnext,indictranstech/erpnext,gsnbng/erpnext,indictranstech/internal-erpnext,4commerce-technologies-AG/erpnext,mbauskar/alec_frappe5_erpnext,sheafferusa/erpnext,shitolepriya/test-erp,Tejal011089/med2-app,pombredanne/erpnext,mahabuber/erpnext,rohitwaghchaure/GenieManager-erpnext,pawaranand/phrerp,ThiagoGarciaAlves/erpnext,hatwar/focal-erpnext,saurabh6790/trufil_app,ShashaQin/erpnext,indictranstech/reciphergroup-erpnext,pawaranand/phrerp,gangadhar-kadam/verve_erp,gangadharkadam/v6_erp,saurabh6790/medapp,indictranstech/buyback-erp,saurabh6790/omn-app,indictranstech/reciphergroup-erpnext,saurabh6790/OFF-RISAPP,mbauskar/phrerp,shft117/SteckerApp,Tejal011089/digitales_erpnext,gangadharkadam/v6_erp,rohitwaghchaure/erpnext-receipher,saurabh6790/med_app_rels,indictranstech/fbd_erpnext,hatwar/Das_erpnext,rohitwaghchaure/digitales_erpnext,rohitwaghchaure/digitales_erpnext,gangadharkadam/vlinkerp,MartinEnder/erpnext-de,indictranstech/Das_Erpnext,SPKian/Testing,indictranstech/Das_Erpnext,gangadhar-kadam/nassimapp,treejames/erpnext,hatwar/buyback-erpnext,saurabh6790/med_new_app,suyashphadtare/gd-erp,mbauskar/helpdesk-erpnext,Tejal011089/paypal_erpnext,gangadhar-kadam/prjapp,treejames/erpnext,suyashphadtare/sajil-erp,indictranstech/Das_Erpnext,shitolepriya/test-erp,suyashphadtare/gd-erp,ShashaQin/erpnext,gangadharkadam/v6_erp,MartinEnder/erpnext-de,gangadharkadam/vlinkerp,gangadhar-kadam/helpdesk-erpnext,indictranstech/vestasi-erpnext,saurabh6790/omni-apps,gangadharkadam/contributionerp,rohitwaghchaure/GenieManager-erpnext,tmimori/erpnext,hernad/erpnext,4commerce-technologies-AG/erpnext,indictranstech/biggift-erpnext,saurabh6790/medsynaptic1-app,rohitwaghchaure/erpnext-receipher,saurabh6790/test_final_med_app,indictranstech/vestasi-erpnext,Drooids/erpnext,indictranstech/focal-erpnext,indictranstech/vestasi-erpnext,suyashphadtare/test,pawaranand/phrerp,Tejal011089/trufil-erpnext,BhupeshGupta/erpnext,mbauskar/phrerp,gangadharkadam/saloon_erp_install,saurabh6790/ON-RISAPP,suyashphadtare/sajil-final-erp,fuhongliang/erpnext,aruizramon/alec_erpnext,SPKian/Testing,indictranstech/tele-erpnext,rohitwaghchaure/digitales_erpnext,indictranstech/focal-erpnext,gangadhar-kadam/verve_live_erp,shft117/SteckerApp,rohitwaghchaure/erpnext-receipher,mbauskar/alec_frappe5_erpnext,gmarke/erpnext,mahabuber/erpnext,gangadharkadam/letzerp,Tejal011089/huntercamp_erpnext,indictranstech/erpnext,gangadhar-kadam/nassimapp,geekroot/erpnext,gangadharkadam/sher,indictranstech/trufil-erpnext,gangadhar-kadam/powapp,hatwar/Das_erpnext,SPKian/Testing2,aruizramon/alec_erpnext,aruizramon/alec_erpnext,gangadhar-kadam/sapphire_app,gmarke/erpnext,SPKian/Testing2,Tejal011089/digitales_erpnext,mbauskar/omnitech-demo-erpnext,sagar30051991/ozsmart-erp,mbauskar/omnitech-erpnext,gangadharkadam/saloon_erp,suyashphadtare/vestasi-update-erp,indictranstech/biggift-erpnext,saurabh6790/medsyn-app,shft117/SteckerApp,pombredanne/erpnext,suyashphadtare/gd-erp,hatwar/focal-erpnext,mbauskar/omnitech-erpnext,gangadharkadam/saloon_erp,gangadhar-kadam/hrerp,hernad/erpnext,susuchina/ERPNEXT,gangadhar-kadam/helpdesk-erpnext,SPKian/Testing2,hernad/erpnext,Tejal011089/osmosis_erpnext,gangadhar-kadam/mtn-erpnext,saurabh6790/OFF-RISAPP,gangadhar-kadam/mic-erpnext,gangadhar-kadam/adb-erp,anandpdoshi/erpnext,rohitwaghchaure/New_Theme_Erp,gangadhar-kadam/helpdesk-erpnext,4commerce-technologies-AG/erpnext,saurabh6790/ON-RISAPP,gangadhar-kadam/sapphire_app,hatwar/Das_erpnext,geekroot/erpnext,pombredanne/erpnext,indictranstech/phrerp,gangadhar-kadam/verve-erp,saurabh6790/medapp,mbauskar/internal-hr,gangadhar-kadam/verve_live_erp,gangadharkadam/verveerp,gangadhar-kadam/verve-erp,rohitwaghchaure/New_Theme_Erp,saurabh6790/pow-app,rohitwaghchaure/GenieManager-erpnext,indictranstech/phrerp,Tejal011089/trufil-erpnext,gangadhar-kadam/sms-erpnext,gangadhar-kadam/smrterp,mbauskar/omnitech-erpnext,indictranstech/tele-erpnext,Tejal011089/digitales_erpnext,indictranstech/tele-erpnext,indictranstech/phrerp,gangadhar-kadam/latestchurcherp,mbauskar/sapphire-erpnext,gangadharkadam/smrterp,hatwar/buyback-erpnext,Suninus/erpnext,shitolepriya/test-erp,indictranstech/Das_Erpnext,gangadhar-kadam/smrterp,saurabh6790/aimobilize,gangadharkadam/v4_erp,gangadharkadam/v4_erp,hanselke/erpnext-1,Yellowen/Owrang,gangadhar-kadam/verve_test_erp,indictranstech/focal-erpnext,suyashphadtare/vestasi-update-erp,rohitwaghchaure/erpnext-receipher,gangadharkadam/vlinkerp,gangadhar-kadam/laganerp,saurabh6790/med_new_app,indictranstech/buyback-erp,mbauskar/Das_Erpnext,gangadharkadam/contributionerp,saurabh6790/tru_app_back,suyashphadtare/vestasi-erp-jan-end,indictranstech/reciphergroup-erpnext,BhupeshGupta/erpnext,saurabh6790/aimobilize-app-backup,gangadhar-kadam/verve_test_erp,gangadharkadam/johnerp,ThiagoGarciaAlves/erpnext,gangadhar-kadam/prjapp,gsnbng/erpnext,saurabh6790/test-med-app,gangadhar-kadam/laganerp,gangadharkadam/saloon_erp,indictranstech/biggift-erpnext,gangadharkadam/sterp,fuhongliang/erpnext,rohitwaghchaure/New_Theme_Erp,gangadharkadam/letzerp,indictranstech/erpnext,dieface/erpnext,gangadharkadam/verveerp,saurabh6790/omnisys-app,geekroot/erpnext,indictranstech/fbd_erpnext,gmarke/erpnext,SPKian/Testing,Tejal011089/fbd_erpnext,sheafferusa/erpnext,suyashphadtare/vestasi-erp-1,saurabh6790/alert-med-app,gangadharkadam/saloon_erp_install,tmimori/erpnext,gsnbng/erpnext,hernad/erpnext,gangadhar-kadam/latestchurcherp,rohitwaghchaure/digitales_erpnext,indictranstech/osmosis-erpnext,susuchina/ERPNEXT,fuhongliang/erpnext,indictranstech/reciphergroup-erpnext,Tejal011089/trufil-erpnext,rohitwaghchaure/GenieManager-erpnext,Tejal011089/Medsyn2_app,gsnbng/erpnext,gangadharkadam/v5_erp,indictranstech/internal-erpnext,suyashphadtare/vestasi-update-erp,gangadharkadam/office_erp,hanselke/erpnext-1,gangadhar-kadam/verve-erp,mbauskar/omnitech-demo-erpnext,suyashphadtare/test,gangadhar-kadam/powapp,sagar30051991/ozsmart-erp,njmube/erpnext,shitolepriya/test-erp,mbauskar/omnitech-erpnext,gangadhar-kadam/verve_test_erp,indictranstech/trufil-erpnext,indictranstech/fbd_erpnext,gangadharkadam/letzerp,hanselke/erpnext-1,hatwar/buyback-erpnext,MartinEnder/erpnext-de,indictranstech/fbd_erpnext,saurabh6790/omnit-app,MartinEnder/erpnext-de,mbauskar/phrerp,mbauskar/Das_Erpnext,netfirms/erpnext,anandpdoshi/erpnext,gangadharkadam/v5_erp,saurabh6790/medsyn-app1,gangadhar-kadam/verve_erp,meisterkleister/erpnext,gangadhar-kadam/verve_erp,suyashphadtare/vestasi-erp-1,indictranstech/erpnext,meisterkleister/erpnext,gangadharkadam/sher,sheafferusa/erpnext,gangadharkadam/verveerp,dieface/erpnext,gangadhar-kadam/hrerp,suyashphadtare/vestasi-erp-jan-end,suyashphadtare/vestasi-erp-jan-end,saurabh6790/test-erp,sagar30051991/ozsmart-erp,netfirms/erpnext,indictranstech/osmosis-erpnext,suyashphadtare/sajil-erp,tmimori/erpnext,gangadharkadam/contributionerp,gangadharkadam/v4_erp,pombredanne/erpnext,suyashphadtare/sajil-final-erp,Tejal011089/digitales_erpnext,gangadharkadam/v4_erp,gangadharkadam/v5_erp,Tejal011089/huntercamp_erpnext,netfirms/erpnext,BhupeshGupta/erpnext,aruizramon/alec_erpnext,gangadharkadam/sterp,Tejal011089/fbd_erpnext,Tejal011089/fbd_erpnext,indictranstech/tele-erpnext,susuchina/ERPNEXT,netfirms/erpnext,gangadharkadam/tailorerp,Tejal011089/Medsyn2_app,mbauskar/sapphire-erpnext,pawaranand/phrerp,gangadhar-kadam/verve_test_erp,saurabh6790/omnisys-app,hatwar/focal-erpnext,meisterkleister/erpnext,suyashphadtare/gd-erp,Suninus/erpnext,gangadhar-kadam/sms-erpnext,indictranstech/osmosis-erpnext,mahabuber/erpnext,treejames/erpnext,mbauskar/alec_frappe5_erpnext,indictranstech/buyback-erp,Tejal011089/paypal_erpnext,Tejal011089/fbd_erpnext,saurabh6790/medsyn-app1,gangadharkadam/office_erp,shft117/SteckerApp,Tejal011089/med2-app,suyashphadtare/vestasi-erp-jan-end,gangadharkadam/vlinkerp,gangadharkadam/saloon_erp_install,dieface/erpnext,gangadhar-kadam/mtn-erpnext,tmimori/erpnext,gangadhar-kadam/church-erpnext,gangadharkadam/johnerp,indictranstech/internal-erpnext,fuhongliang/erpnext,gangadhar-kadam/laganerp,saurabh6790/aimobilize,Yellowen/Owrang,suyashphadtare/vestasi-erp-final,gangadhar-kadam/verve_live_erp,saurabh6790/pow-app,saurabh6790/omnitech-apps,mbauskar/helpdesk-erpnext,saurabh6790/medsyn-app,saurabh6790/test_final_med_app,saurabh6790/medsynaptic1-app,Tejal011089/osmosis_erpnext,gangadharkadam/letzerp,saurabh6790/medsynaptic-app,Tejal011089/paypal_erpnext,mbauskar/omnitech-demo-erpnext,gangadharkadam/saloon_erp_install,indictranstech/osmosis-erpnext,njmube/erpnext,mbauskar/alec_frappe5_erpnext,indictranstech/trufil-erpnext,mbauskar/helpdesk-erpnext,Tejal011089/paypal_erpnext,meisterkleister/erpnext,saurabh6790/tru_app_back,gangadharkadam/verveerp,ThiagoGarciaAlves/erpnext,saurabh6790/test-erp,gangadhar-kadam/verve_live_erp,saurabh6790/test-erp,gangadhar-kadam/sapphire_app,suyashphadtare/test,saurabh6790/test-erp,hanselke/erpnext-1,Tejal011089/huntercamp_erpnext,Tejal011089/osmosis_erpnext