finish first module of IM
merge
Merge branch 'master' of https://github.com/summerz8/WeAreAce

Conflicts:
	IslandFurnitureERPSystem/IslandFurnitureERPSystem-war/nbproject/build-impl.xml
	IslandFurnitureERPSystem/IslandFurnitureERPSystem-war/nbproject/genfiles.properties
InventoryManagement
no message
no message
changes
some changes
Merge branch 'Mengdan' of https://github.com/summerz8/WeAreAce into hjq

Conflicts:
	.DS_Store
	IslandFurnitureERPSystem/.DS_Store
	IslandFurnitureERPSystem/CustomerWeb/nbproject/build-impl.xml
	IslandFurnitureERPSystem/CustomerWeb/nbproject/genfiles.properties
	IslandFurnitureERPSystem/CustomerWeb/nbproject/project.properties
	IslandFurnitureERPSystem/CustomerWeb/nbproject/project.xml
	IslandFurnitureERPSystem/CustomerWeb/web/index.xhtml
	IslandFurnitureERPSystem/IslandFurnitureERPSystem-ejb/.DS_Store
	IslandFurnitureERPSystem/IslandFurnitureERPSystem-ejb/nbproject/jax-ws.xml
	IslandFurnitureERPSystem/IslandFurnitureERPSystem-ejb/nbproject/jaxws-build.xml
	IslandFurnitureERPSystem/IslandFurnitureERPSystem-ejb/src/java/.DS_Store
	IslandFurnitureERPSystem/IslandFurnitureERPSystem-ejb/src/java/Entity/Kitchen/IngredientPurchaseOrderEntity.java
	IslandFurnitureERPSystem/IslandFurnitureERPSystem-ejb/src/java/SessionBean/CommonInFrastructure/InternalUserAccountManagementModule.java
	IslandFurnitureERPSystem/IslandFurnitureERPSystem-ejb/src/java/SessionBean/CommonInFrastructure/InternalUserAccountManagementModuleLocal.java
	IslandFurnitureERPSystem/IslandFurnitureERPSystem-ejb/src/java/SessionBean/KM/ProcurementManagementModule.java
	IslandFurnitureERPSystem/IslandFurnitureERPSystem-ejb/src/java/SessionBean/KM/ProcurementManagementModuleLocal.java
	IslandFurnitureERPSystem/IslandFurnitureERPSystem-ejb/src/java/SessionBean/OCRM/MemberRegistrationModule.java
	IslandFurnitureERPSystem/IslandFurnitureERPSystem-ejb/src/java/SessionBean/OCRM/MemberRegistrationModuleLocal.java
	IslandFurnitureERPSystem/IslandFurnitureERPSystem-war/.DS_Store
	IslandFurnitureERPSystem/IslandFurnitureERPSystem-war/nbproject/build-impl.xml
	IslandFurnitureERPSystem/IslandFurnitureERPSystem-war/nbproject/genfiles.properties
	IslandFurnitureERPSystem/IslandFurnitureERPSystem-war/src/.DS_Store
	IslandFurnitureERPSystem/IslandFurnitureERPSystem-war/src/java/.DS_Store
	IslandFurnitureERPSystem/IslandFurnitureERPSystem-war/src/java/ManagedBean/.DS_Store
	IslandFurnitureERPSystem/IslandFurnitureERPSystem-war/src/java/ManagedBean/KM/ProcurementManagementModule/IngredientPurchaseOrderBean.java
	IslandFurnitureERPSystem/IslandFurnitureERPSystem-war/web/secured/.DS_Store
	IslandFurnitureERPSystem/IslandFurnitureERPSystem-war/web/secured/public/WorkPlace.xhtml
	IslandFurnitureERPSystem/IslandFurnitureERPSystem-war/web/secured/restricted/Store/KM/DailyDemandForecastingModule/MenuItemForecast.xhtml
	IslandFurnitureERPSystem/IslandFurnitureERPSystem-war/web/secured/restricted/Store/KM/ProcurementManagementModule/IngredientPurchaseOrder.xhtml
	IslandFurnitureERPSystem/IslandFurnitureERPSystem-war/web/secured/restricted/Store/KM/ProcurementManagementModule/ProcurementManagementPage.xhtml
	IslandFurniturePOS/catalog.xml
ds store
no message
Merge branch 'hjq' of https://github.com/summerz8/WeAreAce into Mengdan

Conflicts:
	.DS_Store
	IslandFurnitureERPSystem/.DS_Store
	IslandFurnitureERPSystem/IslandFurnitureERPSystem-ejb/.DS_Store
	IslandFurnitureERPSystem/IslandFurnitureERPSystem-ejb/nbproject/jax-ws.xml
	IslandFurnitureERPSystem/IslandFurnitureERPSystem-ejb/nbproject/jaxws-build.xml
	IslandFurnitureERPSystem/IslandFurnitureERPSystem-ejb/src/java/.DS_Store
	IslandFurnitureERPSystem/IslandFurnitureERPSystem-ejb/src/java/Entity/.DS_Store
new
bug fixed
finish the inbound movement & good receipt
commit
Merge branch 'Mengdan' of https://github.com/summerz8/WeAreAce into shiyu
inventory management module
Workplace and SCM
finish 95% of inv