access database conflict commit
view stock function implemented
ommit
Merge branch 'Pubudu' of https://github.com/Kasunucsc/MotorYardInventory into Kasun

# By pubbzz92 (2) and GayanBandara (1)
# Via pubbzz92
* 'Pubudu' of https://github.com/Kasunucsc/MotorYardInventory:
  omitt
  Modified the add function in StockControl.cs
  trycatch around delete query

Conflicts:
	Motor Yard inventory/Motor Yard/Forms/StockControl.cs
	Motor Yard inventory/Motor Yard/bin/Debug/web_inventory.accdb
	Motor Yard inventory/Motor Yard/obj/Debug/Motor Yard.csproj.FileListAbsolute.txt
ommit
ommit
Merge branch 'Gayan' of https://github.com/Kasunucsc/MotorYardInventory into Kasun

Conflicts:
	Motor Yard inventory/Motor Yard/bin/Debug/web_inventory.accdb
	Motor Yard inventory/Motor Yard/obj/Debug/Motor Yard.csproj.FileListAbsolute.txt
database change
long text change in database engine capacity
Merge branch 'master' of https://github.com/Kasunucsc/MotorYardInventory into Kasun

* 'master' of https://github.com/Kasunucsc/MotorYardInventory:
  long text change in database engine capacity
error handling in AddNewStock Buttons and UpdateStock Buttons
Merge branch 'Gayan' of https://github.com/Kasunucsc/MotorYardInventory into Kasun

# By GayanBandara
# Via GayanBandara
* 'Gayan' of https://github.com/Kasunucsc/MotorYardInventory:
  error handling in AddNewStock Buttons and UpdateStock Buttons
database sync