diff --git a/application/config/constants.php b/application/config/constants.php index e5ea10c2..2762466b 100644 --- a/application/config/constants.php +++ b/application/config/constants.php @@ -41,7 +41,7 @@ define('FOPEN_READ_WRITE_CREATE_STRICT', 'x+b'); define('ROLE_ADMIN', '1'); define('ROLE_MANAGER', '2'); define('ROLE_EMPLOYEE', '3'); -/*define('ROLE_PRODUCTION', '4'); +/*define('ROLE_PRODUCTION', '4'); define('ROLE_QUALITY', '5'); define('ROLE_SECURITY', '6'); define('ROLE_SALES', '7'); @@ -49,7 +49,7 @@ define('ROLE_ACCOUNTS', '8');*/ /***** USER DESIGNATION ******/ -define('SECURITY', 'SECURITY'); +//define('SECURITY', 'SECURITY'); define('SEGMENT', 2); @@ -65,28 +65,28 @@ define('REQ_ONHOLD', 'ST008'); define('REQITEM_ONHOLD', 'ST009'); define('REQITEM_PARTIALLY_DELIVERED', 'ST010'); define('REQITEM_DELIVERED', 'ST011'); -define('REQ_DELETED', 'ST013'); +define('REQ_DELETED', 'ST013'); define('REQITEM_POCREATED', 'ST022'); -define('REQITEM_PARTIALLY_PO_CREATED', 'ST023'); -define('REQITEM_Emergency_PO_CREATED', 'ST024'); -define('POLINEITEM_IGR_CREATED', 'ST040'); -define('REQ_READYFORDELIVERY', 'ST049'); -define('REQ_DELIVERED', 'ST050'); +define('REQITEM_PARTIALLY_PO_CREATED', 'ST023'); +define('REQITEM_Emergency_PO_CREATED', 'ST024'); +define('POLINEITEM_IGR_CREATED', 'ST040'); +define('REQ_READYFORDELIVERY', 'ST049'); +define('REQ_DELIVERED', 'ST050'); /*IGR Status */ define('IGR_CREATED', 'ST027'); -define('IGR_CLOSED', 'ST028'); -define('IGR_CANCELLED', 'ST029'); -define('POLINEITEM_IGRPARTIAL_CREATED', 'ST042'); +define('IGR_CLOSED', 'ST028'); +define('IGR_CANCELLED', 'ST029'); +define('POLINEITEM_IGRPARTIAL_CREATED', 'ST042'); /*IGR Status*/ /*MRIR Status */ -define('MRIR_CREATED', 'ST041'); +define('MRIR_CREATED', 'ST041'); define('MRIR_APPROVED', 'ST044'); define('MRIR_REJECTED', 'ST045'); -define('PARTIAL_MRIRAPPROVED', 'ST054'); +define('PARTIAL_MRIRAPPROVED', 'ST054'); define('REQUISTSTATUS', '0'); -define('REQUISTITEMSTATUS', '1'); +define('REQUISTITEMSTATUS', '1'); /* Purchase Order Status */ @@ -98,17 +98,17 @@ define('PO_DELIVERED', 'ST018'); define('PO_CANCELLED', 'ST019'); define('PO_ONHOLD', 'ST020'); define('PO_CLOSED', 'ST021'); -define('PO_AMENDED', 'ST030'); -define('PO_RELEASED', 'ST026'); -define('PO_AWAITING_RELEASE', 'ST025'); -define('PO_APPROVED', 'ST025'); +define('PO_AMENDED', 'ST030'); +define('PO_RELEASED', 'ST026'); +define('PO_AWAITING_RELEASE', 'ST025'); +define('PO_APPROVED', 'ST025'); define('PO_APPROVER_ONHOLD', 'ST051'); define('PO_RELEASER_ONHOLD', 'ST052'); -define('SPECIAL_PO', 'ST056'); +define('SPECIAL_PO', 'ST056'); /*store Status*/ define('STORE_DRAFT', 'ST043'); -define('STORE_CREATED', 'ST015'); +define('STORE_CREATED', 'ST015'); /*store requisition*/ define('STORE REQUISTION STATUS', '6'); @@ -122,8 +122,8 @@ define('STORE_REJECT', 'ST039'); /* Work status code */ -define('SERVICE_COMPLETED', 'ST046'); -define('PO_SERVICE_COMPLETED', 'ST053'); +define('SERVICE_COMPLETED', 'ST046'); +define('PO_SERVICE_COMPLETED', 'ST053'); /* Department Code */ define('ADMIN', 'DEP01'); @@ -137,8 +137,9 @@ define('COATING', 'DEP08'); define('MAINTENANANCE', 'DEP09'); define('FINANCE', 'DEP10'); define('PURCHASE', 'DEP11'); -define('MANAGEMENT', 'DEP12'); -define('HR', 'DEP13'); +define('MANAGEMENT', 'DEP12'); +define('HR', 'DEP13'); +define('SECURITY', 'DEP14'); define('SYSTEM_ADMIN', '1'); /* PO Type */ define('REVENUE', 'REVENUE'); @@ -147,7 +148,7 @@ define('IMPORT', 'IMPORT'); define('CAPITAL', 'CAPITAL'); // Tax Type -define('PERCENTAGE', 'PERCENTAGE'); +define('PERCENTAGE', 'PERCENTAGE'); define('LUMPSUM', 'LUMP SUM'); define('NILTYPE', 'NIL'); diff --git a/application/views/addnewIncomeExpense.php b/application/views/addnewIncomeExpense.php index 27105744..097085cd 100755 --- a/application/views/addnewIncomeExpense.php +++ b/application/views/addnewIncomeExpense.php @@ -197,8 +197,8 @@
File Upload: - your image
- + your image
+
@@ -302,8 +302,8 @@
- Account Description:* - + Account Description: +
@@ -338,10 +338,12 @@
+
- File Upload: - your image
- + + File Upload: + your image
+
@@ -423,25 +425,39 @@ $("#PaymentDate").datepicker({ }); -function readURL(input) { +function readURL(input,id) { - - if (input.files && input.files[0]) { + //alert(id); + if (input.files && input.files[0]) { var reader = new FileReader(); reader.onload = function (e) { - $('#slip') + + if(id == "receiptfile"){ + $('#receiptslip') .attr('src', e.target.result) .width(100) .height(100); - //alert(e.target.result); + } + else{ + $('#paymentslip') + .attr('src', e.target.result) + .width(100) + .height(100); + } + // alert(e.target.result); }; reader.readAsDataURL(input.files[0]); - $('#slip').val(input.files[0]['name']); + if(id == "receiptfile"){ + $('#receiptslip').val(input.files[0]['name']);} + else{ + $('#paymentslip').val(input.files[0]['name']);} } } + + function isNumberKey(evt) { var charCode = (evt.which) ? evt.which : evt.keyCode; @@ -718,13 +734,12 @@ function add_more() $('#Paymentaccode1').focus(); return false; } - else if($('#subdescription1').val() == '') - { - alert("Provide Account description..!"); - $('#subdescription1').focus(); - return false; - - } +// else if($('#subdescription1').val() == '') +// { +// alert("Provide Account description..!"); +// $('#subdescription1').focus(); +// return false; +// } else if($('#Paymentamount1').val() == '') { alert("Provide Amount data..!"); diff --git a/application/views/editincomeexpenses.php b/application/views/editincomeexpenses.php index efc189fb..ef24e500 100755 --- a/application/views/editincomeexpenses.php +++ b/application/views/editincomeexpenses.php @@ -213,12 +213,12 @@ if(!empty($PaymentMultiple))
- No Receipt Available
+ No Receipt Available
File Upload: - +
@@ -442,10 +442,10 @@ if(!empty($PaymentMultiple))
- No Receipt Available
+ No Receipt Available
File Upload: - +
@@ -573,25 +573,58 @@ if(type == "RECEIPT") }); -function readURL(input) { +function readURL(input,id) { - - if (input.files && input.files[0]) { + //alert(id); + if (input.files && input.files[0]) { var reader = new FileReader(); reader.onload = function (e) { - $('#receipt') + + if(id == "receiptfile"){ + $('#receiptslip') .attr('src', e.target.result) .width(100) .height(100); - //alert(e.target.result); + } + else{ + $('#paymentslip') + .attr('src', e.target.result) + .width(100) + .height(100); + } + // alert(e.target.result); }; reader.readAsDataURL(input.files[0]); - $('#receipt').val(input.files[0]['name']); + if(id == "receiptfile"){ + $('#receiptslip').val(input.files[0]['name']);} + else{ + $('#paymentslip').val(input.files[0]['name']);} } } + +function paymentreadURL(input) { + + + if (input.files && input.files[0]) { + var reader = new FileReader(); + + reader.onload = function (e) { + $('#payment') + .attr('src', e.target.result) + .width(100) + .height(100); + //alert(e.target.result); + }; + + reader.readAsDataURL(input.files[0]); +$('#payment').val(input.files[0]['name']); + } + +} + function isNumberKey(evt) { var charCode = (evt.which) ? evt.which : evt.keyCode; @@ -793,7 +826,7 @@ $.ajax({ { $('#content').loader('hide'); alert('Delete Successfully'); - $('#receipt').attr('src', ''); + $('#receiptslip').attr('src', ''); //window.location ="cashbook/incomeExpenseList"; } @@ -901,13 +934,13 @@ function add_more() $('#Paymentaccode1').focus(); return false; } - else if($('#subdescription1').val() == '') - { - alert("Provide Account description..!"); - $('#subdescription1').focus(); - return false; +// else if($('#subdescription1').val() == '') +// { +// alert("Provide Account description..!"); +// $('#subdescription1').focus(); +// return false; - } +// } else if($('#Paymentamount1').val() == '') { alert("Provide Amount data..!"); @@ -934,7 +967,7 @@ div.innerHTML='
'+ 'Account Description: '+ - ''+ + ''+ '
'+ '
'+ 'Amount(₹): '+ diff --git a/application/views/includes/header.php b/application/views/includes/header.php index 6e1d77f3..5bb7c76e 100644 --- a/application/views/includes/header.php +++ b/application/views/includes/header.php @@ -147,6 +147,7 @@ legend{ color:#5d0411 !important; } + .li .active { background:blue } Resico Industries @@ -228,115 +229,103 @@ diff --git a/application/views/income_expense_list.php b/application/views/income_expense_list.php index c1a4d85b..0707b8f8 100755 --- a/application/views/income_expense_list.php +++ b/application/views/income_expense_list.php @@ -40,23 +40,23 @@ { ?> - - id.'">'.$l->type.'';?> - date),'d-m-Y');?> - type == 'PAYMENT' && $l->account_code == '999') { echo " "; } else {echo $l->name;}?> - total;?> - description;?> - -     - - type == 'PAYMENT' && $l->account_code == '999') { ?> - - - - - - + + id.'">'.$l->type.'';?> + date),'d-m-Y');?> + type == 'PAYMENT' && $l->account_code == '999') { echo $l->description; } else {echo $l->name;}?> + total;?> + description;?> + +     + + type == 'PAYMENT' && $l->account_code == '999') { ?> + + + + + +