diff --git a/app/Controllers/Emergencypurchaseorder.php b/app/Controllers/Emergencypurchaseorder.php index 5aae2f09..671ee3ed 100644 --- a/app/Controllers/Emergencypurchaseorder.php +++ b/app/Controllers/Emergencypurchaseorder.php @@ -884,7 +884,7 @@ class Emergencypurchaseorder extends BaseController //$this->purchaseorder_model->UpdateRequistItemStatus(); $this->purchaseorder_model->UpdateRequistionStatus(); $data['POData'] = $this->purchaseorder_model->purchaseorderListing(); - + print_r($data['POData']);die; $this->global['pageTitle'] = 'Purchase Orders'; $this->loadViews("POlist", $this->global, $data, NULL); diff --git a/app/Views/EditservicePurchaseorder.php b/app/Views/EditservicePurchaseorder.php index ab707794..c5f79f4f 100644 --- a/app/Views/EditservicePurchaseorder.php +++ b/app/Views/EditservicePurchaseorder.php @@ -1418,8 +1418,8 @@ if (!empty($getlogpodtl)) {
+ Cancel Add Service - Cancel
@@ -2442,13 +2442,13 @@ if (!empty($getlogpodtl)) { - + +   Cancel +   Save   Submit   Approve and Release -   Cancel   OK   Submit diff --git a/app/Views/addCostCenter.php b/app/Views/addCostCenter.php index 1def3ef7..e4ce4ccf 100644 --- a/app/Views/addCostCenter.php +++ b/app/Views/addCostCenter.php @@ -75,13 +75,13 @@ $(function() {
- Back + Back

-
+
-
-
+
+
@@ -193,7 +193,7 @@ $(function() {
-   Add Budget +   Add Budget @@ -285,8 +285,8 @@ $(function() {
-   Add - cancel + Cancel +   Add
@@ -394,8 +394,8 @@ $(function() {
-   Edit - cancel + Cancel +   Edit
@@ -408,9 +408,9 @@ $(function() {
- - - Cancel + + Cancel +
diff --git a/app/Views/addRawMaterial.php b/app/Views/addRawMaterial.php index 43dffbb1..e94c8e3f 100644 --- a/app/Views/addRawMaterial.php +++ b/app/Views/addRawMaterial.php @@ -29,7 +29,7 @@
- Back + Back

@@ -142,7 +142,7 @@
- +
diff --git a/app/Views/addSupplier.php b/app/Views/addSupplier.php index 16ece59d..afb0f450 100644 --- a/app/Views/addSupplier.php +++ b/app/Views/addSupplier.php @@ -204,7 +204,7 @@
    -   Back +   Back
@@ -348,7 +348,7 @@
- +
diff --git a/app/Views/addasset.php b/app/Views/addasset.php index 77e11fdc..ad96e391 100644 --- a/app/Views/addasset.php +++ b/app/Views/addasset.php @@ -55,7 +55,7 @@ $(function() {
- Back + Back

@@ -293,8 +293,8 @@ $(function() {
+ -
diff --git a/app/Views/addconfig.php b/app/Views/addconfig.php index 00adb932..a5d2612c 100644 --- a/app/Views/addconfig.php +++ b/app/Views/addconfig.php @@ -9,7 +9,7 @@
- Back + Back

@@ -120,8 +120,8 @@
+ Cancel   Add - cancel
@@ -186,9 +186,8 @@
+ Cancel   Edit - - cancel
@@ -201,9 +200,8 @@
+ Cancel - - Cancel
diff --git a/app/Views/adddepartment.php b/app/Views/adddepartment.php index 6e0095ea..158ab09d 100644 --- a/app/Views/adddepartment.php +++ b/app/Views/adddepartment.php @@ -62,12 +62,12 @@
-

Add Employee

+

Add Department Details

- Back + Back

@@ -148,7 +148,7 @@
- +
diff --git a/app/Views/alterpurchaseorder.php b/app/Views/alterpurchaseorder.php index b789f664..c90314cc 100644 --- a/app/Views/alterpurchaseorder.php +++ b/app/Views/alterpurchaseorder.php @@ -2521,9 +2521,8 @@ if (!empty($INRSYMBOL)) {
- + Cancel   Ok - Cancel
@@ -2550,9 +2549,8 @@ if (!empty($INRSYMBOL)) {
- + Cancel   Ok - Cancel
@@ -2579,9 +2577,8 @@ if (!empty($INRSYMBOL)) {
- + Cancel   Ok - Cancel
@@ -2718,9 +2715,8 @@ if (!empty($INRSYMBOL)) {
+ Cancel   Submit - - Cancel
@@ -2777,9 +2773,8 @@ if (!empty($INRSYMBOL)) {
+ Cancel   Submit - - Cancel
@@ -2814,9 +2809,8 @@ if (!empty($INRSYMBOL)) {
- + Cancel   Ok - Cancel
@@ -2851,8 +2845,8 @@ if (!empty($INRSYMBOL)) {
+ Cancel   Ok - Cancel
@@ -2882,8 +2876,8 @@ if (!empty($INRSYMBOL)) {
+ Cancel   Ok - Cancel
@@ -2911,8 +2905,8 @@ if (!empty($INRSYMBOL)) {
+ Cancel   Ok - Cancel
@@ -3229,8 +3223,8 @@ if (!empty($INRSYMBOL)) {
+ Cancel   Update Service - Cancel
@@ -3588,9 +3582,8 @@ if (!empty($INRSYMBOL)) {
- + Cancel   Edit Revenue - Cancel
@@ -3928,12 +3921,8 @@ if (!empty($INRSYMBOL)) {
- + Cancel   Add Revenue - - - Cancel -
@@ -4234,8 +4223,8 @@ if (!empty($INRSYMBOL)) {
+ Cancel   Add Service - Cancel
@@ -4738,9 +4727,8 @@ if (!empty($INRSYMBOL)) {
-   Add Import - Cancel - + Cancel +   Add Import
@@ -5198,9 +5186,8 @@ if (!empty($INRSYMBOL)) {
-   Add Capital - Cancel - + Cancel +   Add Capital
@@ -5348,9 +5335,8 @@ if (!empty($INRSYMBOL)) { - +   Reset   Submit -   Reset @@ -5447,9 +5433,8 @@ if (!empty($INRSYMBOL)) { - +   Reset   Submit -   Reset
diff --git a/app/Views/capitalpurchaseorder.php b/app/Views/capitalpurchaseorder.php index ca5bd3d6..4749b7af 100644 --- a/app/Views/capitalpurchaseorder.php +++ b/app/Views/capitalpurchaseorder.php @@ -316,7 +316,7 @@ function vaildateBeforeOpenModal()

Capital Purchase Order

- Back + Back
- -   Draft -   Approve -   Reset +   Reset +   Save as Draft +   Approve
@@ -2581,9 +2576,9 @@ function vaildateBeforeOpenModal() -
+
+ Cancel   Ok - Cancel
diff --git a/app/Views/editCapitalAmendPO.php b/app/Views/editCapitalAmendPO.php index b97816ba..5f7a5ae6 100644 --- a/app/Views/editCapitalAmendPO.php +++ b/app/Views/editCapitalAmendPO.php @@ -924,9 +924,8 @@ document.getElementById('dispatchinternational').style.display = 'block';
- + Cancel   Ok - Cancel
@@ -2042,9 +2041,8 @@ document.getElementById('dispatchinternational').style.display = 'block';
+ Cancel   Update Capital - Cancel -
@@ -2291,10 +2289,8 @@ document.getElementById('dispatchinternational').style.display = 'block'; - - -   Submit - + +   Submit diff --git a/app/Views/editCapitalPo.php b/app/Views/editCapitalPo.php index 1259c5c6..9996e326 100644 --- a/app/Views/editCapitalPo.php +++ b/app/Views/editCapitalPo.php @@ -961,9 +961,8 @@ $("#PaymentMethod").select2();
- + Cancel   Ok - Cancel
@@ -996,9 +995,8 @@ $("#PaymentMethod").select2();
- + Cancel   Ok - Cancel
@@ -1030,9 +1028,8 @@ $("#PaymentMethod").select2();
- + Cancel   Ok - Cancel
@@ -2105,9 +2102,8 @@ $("#PaymentMethod").select2();
+ Cancel   Add Capital - Cancel -
@@ -2846,9 +2842,8 @@ $("#PaymentMethod").select2();
+ Cancel   Update Capital - Cancel -
@@ -3596,6 +3591,7 @@ $("#PaymentMethod").select2();
+ Cancel   Update Capital @@ -3603,7 +3599,6 @@ $("#PaymentMethod").select2(); - Cancel
@@ -3899,63 +3894,34 @@ $("#PaymentMethod").select2(); - -   Save - -   Submit -   Approve and Release - -   Cancel - - - OK - - - + +   Cancel + +   Save as Draft + +   Submit +   Approve + + OK +   Submit - -   OK - - - -   Submit - -   OK - - - + +   Submit +   OK + + +

- - + 'AWAITING APPROVE', 'AWAITING RELEASE' => 'AWAITING APPROVE', @@ -3972,7 +3938,7 @@ $("#PaymentMethod").select2(); } else { echo "Status not provided"; } - ?> --> + ?> diff --git a/app/Views/editCostCenter.php b/app/Views/editCostCenter.php index 467efc9d..a314ed39 100644 --- a/app/Views/editCostCenter.php +++ b/app/Views/editCostCenter.php @@ -174,7 +174,7 @@ for ($i = 1; $i < 5; $i++) {
- Back + Back

@@ -430,8 +430,8 @@ for ($i = 1; $i < 5; $i++) {
-   Add - cancel + cancel +   Add
@@ -577,8 +577,7 @@ for ($i = 1; $i < 5; $i++) {
-   Edit - cancel +   Edit
@@ -590,8 +589,8 @@ for ($i = 1; $i < 5; $i++) {
- - Cancel + Cancel +
diff --git a/app/Views/editEmployee.php b/app/Views/editEmployee.php index f5fa0976..86a0df12 100644 --- a/app/Views/editEmployee.php +++ b/app/Views/editEmployee.php @@ -655,7 +655,7 @@ function onlyAlphabets(evt) {
- Back + Back

@@ -1025,8 +1025,8 @@ function onlyAlphabets(evt) {
+ Cancel - Cancel
diff --git a/app/Views/editRawmaterial.php b/app/Views/editRawmaterial.php index 8d4e90ab..b3099f87 100644 --- a/app/Views/editRawmaterial.php +++ b/app/Views/editRawmaterial.php @@ -111,7 +111,7 @@ if ($total <= $reorder) {
- Back + Back

@@ -289,8 +289,8 @@ if ($total <= $reorder) {
+ Cancel - Cancel
diff --git a/app/Views/editSupplier.php b/app/Views/editSupplier.php index d8cfa5bc..a9c63c9d 100644 --- a/app/Views/editSupplier.php +++ b/app/Views/editSupplier.php @@ -252,7 +252,7 @@ if (!empty($supplier)) {
Edit Details
    -   Back +   Back

@@ -413,10 +413,10 @@ if (!empty($supplier)) {
+ Cancel - Cancel
diff --git a/app/Views/editasset.php b/app/Views/editasset.php index d0d4f9a4..7283aa07 100644 --- a/app/Views/editasset.php +++ b/app/Views/editasset.php @@ -112,7 +112,7 @@ if(!empty($assetList))
- Back + Back

@@ -347,8 +347,8 @@ if(!empty($assetList))
+ Cancel - Cancel
diff --git a/app/Views/editconfig.php b/app/Views/editconfig.php index 58efb457..19262af6 100644 --- a/app/Views/editconfig.php +++ b/app/Views/editconfig.php @@ -27,7 +27,7 @@ if (!empty($master)) {
- Back + Back

@@ -150,8 +150,8 @@ if (!empty($master)) {
+ Cancel   Add - cancel
@@ -258,16 +258,16 @@ if (!empty($master)) {
+ Cancel   Update - Cancel
+ Cancel - Cancel
diff --git a/app/Views/editdepartment.php b/app/Views/editdepartment.php index e9201947..24bf9deb 100644 --- a/app/Views/editdepartment.php +++ b/app/Views/editdepartment.php @@ -102,7 +102,7 @@ if(!empty($department))
- Back + Back

diff --git a/app/Views/editimportpo.php b/app/Views/editimportpo.php index 2a33712c..b1797b06 100644 --- a/app/Views/editimportpo.php +++ b/app/Views/editimportpo.php @@ -375,9 +375,9 @@ else
-

Edit Import Purchase Order-

+

Edit Import Purchase Order-

-

Amended Purchase Order-

+

Amended Import Purchase Order-

- Cancel
@@ -2102,10 +2102,10 @@ echo form_textarea($data);
+ Cancel   Edit Import - Cancel
@@ -2691,10 +2691,9 @@ echo form_textarea($data);
- + Cancel   Update - Cancel
@@ -3166,7 +3165,7 @@ echo form_textarea($data); - +   Cancel   Save @@ -3174,7 +3173,6 @@ echo form_textarea($data);   Submit   Approve and Release -   Cancel diff --git a/app/Views/editrequisitionform.php b/app/Views/editrequisitionform.php index ef5aaba1..435b8987 100644 --- a/app/Views/editrequisitionform.php +++ b/app/Views/editrequisitionform.php @@ -91,7 +91,7 @@ if (!empty($ReqPOType)) {
-

+

+   Save As Draft   Submit   Approve - +   Submit   Approve - diff --git a/app/Views/servicePurchaseorder.php b/app/Views/servicePurchaseorder.php index 53c5a401..17ebdb54 100644 --- a/app/Views/servicePurchaseorder.php +++ b/app/Views/servicePurchaseorder.php @@ -115,19 +115,6 @@ if (!empty($INRSYMBOL)) { } }); - - - $.each(Payment, function(idx, obj) { - if (obj.PaymentID == 'PT05') { - - - - } else { - $("#PaymentTerms").append($('').val(obj.PaymentID).html(obj.PaymentTerms)); - } - - }); - } }); @@ -158,13 +145,12 @@ if (!empty($INRSYMBOL)) { } else { $("#SupAddress").val(obj.Address); } - PaymentID = obj.PaymentID; + console.log(obj.PaymentID); } }); - if (PaymentID != 'PT08') { $('#otheroptiondiv').hide(); $('#Otherpayment').val('');