Gud Initial Commit
first commit
long commit
schema.xml
milestone db
all controller re set
added bootstrap.cache
added web/bundles
	modified:   app/propel/sql/default.sql
	modified:   src/PDN/SymErpBundle/Controller/ServiceManagement/DeliveryController.php
	modified:   src/PDN/SymErpBundle/Controller/ServiceManagement/ReceiveController.php
	modified:   src/PDN/SymErpBundle/Model/map/BranchSupervisorTableMap.php
	modified:   src/PDN/SymErpBundle/Model/map/BranchTableMap.php
	modified:   src/PDN/SymErpBundle/Model/map/CcMaterialRequestTableMap.php
	modified:   src/PDN/SymErpBundle/Model/map/CcReceiveTableMap.php
	modified:   src/PDN/SymErpBundle/Model/map/CcStockTableMap.php
	modified:   src/PDN/SymErpBundle/Model/map/CustomerTableMap.php
	modified:   src/PDN/SymErpBundle/Model/map/CwMaterialRequestTableMap.php
	modified:   src/PDN/SymErpBundle/Model/map/GlobalSettingsTableMap.php
	modified:   src/PDN/SymErpBundle/Model/map/HotlineMessageTableMap.php
	modified:   src/PDN/SymErpBundle/Model/map/PaymentTableMap.php
	modified:   src/PDN/SymErpBundle/Model/map/ServiceTableMap.php
	modified:   src/PDN/SymErpBundle/Model/map/SparePartsTableMap.php
	modified:   src/PDN/SymErpBundle/Model/map/UserTableMap.php
	modified:   src/PDN/SymErpBundle/Model/om/BaseBranch.php
	modified:   src/PDN/SymErpBundle/Model/om/BaseBranchPeer.php
	modified:   src/PDN/SymErpBundle/Model/om/BaseBranchQuery.php
	modified:   src/PDN/SymErpBundle/Model/om/BaseBranchSupervisor.php
	modified:   src/PDN/SymErpBundle/Model/om/BaseBranchSupervisorPeer.php
	modified:   src/PDN/SymErpBundle/Model/om/BaseBranchSupervisorQuery.php
	modified:   src/PDN/SymErpBundle/Model/om/BaseCcMaterialRequest.php
	modified:   src/PDN/SymErpBundle/Model/om/BaseCcMaterialRequestPeer.php
	modified:   src/PDN/SymErpBundle/Model/om/BaseCcMaterialRequestQuery.php
	modified:   src/PDN/SymErpBundle/Model/om/BaseCcReceive.php
	modified:   src/PDN/SymErpBundle/Model/om/BaseCcReceivePeer.php
	modified:   src/PDN/SymErpBundle/Model/om/BaseCcReceiveQuery.php
	modified:   src/PDN/SymErpBundle/Model/om/BaseCcStock.php
	modified:   src/PDN/SymErpBundle/Model/om/BaseCcStockPeer.php
	modified:   src/PDN/SymErpBundle/Model/om/BaseCcStockQuery.php
	modified:   src/PDN/SymErpBundle/Model/om/BaseCustomer.php
	modified:   src/PDN/SymErpBundle/Model/om/BaseCustomerPeer.php
	modified:   src/PDN/SymErpBundle/Model/om/BaseCustomerQuery.php
	modified:   src/PDN/SymErpBundle/Model/om/BaseCwMaterialRequest.php
	modified:   src/PDN/SymErpBundle/Model/om/BaseCwMaterialRequestPeer.php
	modified:   src/PDN/SymErpBundle/Model/om/BaseCwMaterialRequestQuery.php
	modified:   src/PDN/SymErpBundle/Model/om/BaseGlobalSettings.php
	modified:   src/PDN/SymErpBundle/Model/om/BaseGlobalSettingsPeer.php
	modified:   src/PDN/SymErpBundle/Model/om/BaseGlobalSettingsQuery.php
	modified:   src/PDN/SymErpBundle/Model/om/BaseHotlineMessage.php
	modified:   src/PDN/SymErpBundle/Model/om/BaseHotlineMessagePeer.php
	modified:   src/PDN/SymErpBundle/Model/om/BaseHotlineMessageQuery.php
	modified:   src/PDN/SymErpBundle/Model/om/BasePayment.php
	modified:   src/PDN/SymErpBundle/Model/om/BasePaymentPeer.php
	modified:   src/PDN/SymErpBundle/Model/om/BasePaymentQuery.php
	modified:   src/PDN/SymErpBundle/Model/om/BaseService.php
	modified:   src/PDN/SymErpBundle/Model/om/BaseServiceAssignment.php
	modified:   src/PDN/SymErpBundle/Model/om/BaseServicePeer.php
	modified:   src/PDN/SymErpBundle/Model/om/BaseServiceQuery.php
	modified:   src/PDN/SymErpBundle/Model/om/BaseSpareParts.php
	modified:   src/PDN/SymErpBundle/Model/om/BaseSparePartsPeer.php
	modified:   src/PDN/SymErpBundle/Model/om/BaseSparePartsQuery.php
	modified:   src/PDN/SymErpBundle/Model/om/BaseUser.php
	modified:   src/PDN/SymErpBundle/Model/om/BaseUserQuery.php
	modified:   src/PDN/SymErpBundle/Resources/config/schema.xml
	modified:   src/PDN/SymErpBundle/Resources/views/ServiceManagement/Receive/receive.html.twig
	modified:   src/PDN/SymErpBundle/Resources/views/ServiceManagement/Receive/receiveEntry.html.twig
	src/PDN/SymErpBundle/Resources/views/ServiceManagement/Delivery/delivery.html.twig
	src/PDN/SymErpBundle/Resources/views/ServiceManagement/Delivery/deliveryEntry.html.twig
	src/PDN/SymErpBundle/Resources/views/ServiceManagement/Receive/receiveEntrySave.html.twig
	new file:   src/PDN/SymErpBundle/Helper/ActiveInactiveStatus.php
	new file:   src/PDN/SymErpBundle/Helper/HotlineMessageStatus.php
	new file:   src/PDN/SymErpBundle/Helper/MaterialRequestStatus.php
	new file:   src/PDN/SymErpBundle/Helper/ServiceStatus.php
working on supervisor and eng desk
Merge branch 'master' of teampdn.com:symerp
change db. added enum
change db. added enum
change db. added enum chaned unassignend to unassigned
	modified:   app/propel/sql/default.sql
	modified:   src/PDN/SymErpBundle/Controller/ServiceManagement/DeliveryController.php
	modified:   src/PDN/SymErpBundle/Controller/ServiceManagement/ReceiveController.php
	modified:   src/PDN/SymErpBundle/Resources/views/ServiceManagement/Receive/receive.html.twig
	modified:   src/PDN/SymErpBundle/Resources/views/ServiceManagement/Receive/receiveEntry.html.twig
	src/PDN/SymErpBundle/Resources/views/ServiceManagement/Delivery/delivery.html.twig
	src/PDN/SymErpBundle/Resources/views/ServiceManagement/Delivery/deliveryEntry.html.twig
	src/PDN/SymErpBundle/Resources/views/ServiceManagement/Receive/receiveEntrySave.html.twig
	new file:   src/PDN/SymErpBundle/Controller/EngineerDesk/EngineerController.php
	src/PDN/SymErpBundle/Resources/views/ServiceManagement/Delivery/delivery.html.twig
	src/PDN/SymErpBundle/Resources/views/ServiceManagement/Delivery/deliveryEntry.html.twig
	src/PDN/SymErpBundle/Resources/views/ServiceManagement/Receive/receiveEntrySave.html.twig
job assignment completed
Merge branch 'master' of teampdn.com:symerp
	new file:   EngineerDesk/Engineer/hotline.html.twig
	new file:   ServiceManagement/Delivery/delivery.html.twig
	new file:   ServiceManagement/Delivery/deliveryEntry.html.twig
	new file:   ServiceManagement/Hotline/hotline.html.twig
	new file:   ServiceManagement/Receive/receiveEntrySave.html.twig
	modified:   ../../Controller/EngineerDesk/EngineerController.php
	modified:   ../../Controller/ServiceManagement/ReceiveController.php
	modified:   ../config/routing.yml