Merge branch 'main' of https://github.com/penaverdeglenn/GBG-Web into main

# Conflicts:
#	salesinquiry.php
