fixed stock out date bug
fixed conflicts