diff --git a/application/config/constants.php b/application/config/constants.php index c81e4985..cb6944d7 100644 --- a/application/config/constants.php +++ b/application/config/constants.php @@ -63,7 +63,9 @@ define('REQITEM_ONHOLD', 'ST009'); define('REQITEM_PARTIALLY_DELIVERED', 'ST010'); define('REQITEM_DELIVERED', 'ST011'); define('REQ_DELETED', 'ST013'); - +define('REQITEM_POCREATED', 'ST022'); +define('REQITEM_PARTIALLY_PO_CREATED', 'ST023'); + define('REQUISTSTATUS', '0'); define('REQUISTITEMSTATUS', '1'); @@ -129,6 +131,13 @@ define('FREIGHT_LUMPSUM', 'FreightValue'); define('FREIGHT_PERUOM', 'FreightValue * Quantity'); define('FREIGHT_PERTRIP', 'FreightValue'); +/* SERVICE PO VARIABLES */ +define('SERVICETAX_SERVICETAX_14PERCENT', '((14/100) * basicValue)'); +define('SERVICETAX_EDUCESS_2PERCENT', '((2/100) * ServiceTaxAmount)'); +define('SERVICETAX_HIGHEREDUCESS_1PERCENT', '((1/100) * ServiceTaxAmount)'); +define('SERVICETAX_KRISHIKALYAN', '(((.5)/100) * basicValue)'); +define('SERVICETAX_SWACHHBHARAT', '(((.5)/100) * basicValue)'); + /* Purchase Order Status */ define('PO_DRAFT', 'ST014'); @@ -139,5 +148,8 @@ define('PO_DELIVERED', 'ST018'); define('PO_CANCELLED', 'ST019'); define('PO_ONHOLD', 'ST020'); define('PO_CLOSED', 'ST021'); + + + /* End of file constants.php */ /* Location: ./application/config/constants.php */ \ No newline at end of file diff --git a/application/config/routes.php b/application/config/routes.php index 5daadc2d..4ada5ad3 100644 --- a/application/config/routes.php +++ b/application/config/routes.php @@ -52,8 +52,8 @@ $route['logout'] = 'user/logout'; $route['userListing'] = 'user/userListing'; $route['userListing/(:num)'] = "user/userListing/$1"; -$route['purchaseorderListing'] = 'purchaseorder/purchaseorderListing'; -$route['purchaseorderListing/(:num)'] = "purchaseorder/purchaseorderListing/$1"; +//$route['purchaseorderListing'] = 'purchaseorder/purchaseorderListing'; +//$route['purchaseorderListing/(:num)'] = "purchaseorder/purchaseorderListing/$1"; $route['supplierListing'] = 'supplier/supplierListing'; $route['supplierListing/(:num)'] = "supplier/supplierListing/$1"; @@ -156,6 +156,8 @@ $route['EditRequisition'] = "requisitionform/EditRequistionForm"; //<-----------PO Flow------------> $route['CreatePO'] = "purchaseorder/requisition"; $route['PurchaseOrder'] = "purchaseorder/CreatePurchaseOrder"; +$route['purchaseorderListing'] = "purchaseorder/PurchaseOrderList"; +$route['EditServicePO'] = "purchaseorder/EditPurchaseOrder"; /* End of file routes.php */ /* Location: ./application/config/routes.php */