diff --git a/app/Views/EditservicePurchaseorder.php b/app/Views/EditservicePurchaseorder.php index c5f79f4f..a5b60ad3 100644 --- a/app/Views/EditservicePurchaseorder.php +++ b/app/Views/EditservicePurchaseorder.php @@ -36,6 +36,7 @@ $ServiceTypeOptions = ''; $DescriptionOfPo = ''; $BudgetType = ''; $PrePOFile = ''; +$parentPO= ''; if (!empty($INRSYMBOL)) { @@ -53,6 +54,7 @@ if (!empty($MaxPODate)) { if (!empty($POMaster)) { foreach ($POMaster as $Req) { + $parentPO =$Req->ParentPO; $SupId = $Req->SupplierID; $SupName = $Req->SupplierName; @@ -728,9 +730,11 @@ if (!empty($getlogpodtl)) {
-
-

Edit Service Purchase Order -

-
+ +

Edit Service Purchase Order-

+ +

Amended Service Purchase Order-

+
@@ -1706,8 +1710,8 @@ if (!empty($getlogpodtl)) {
+ Cancel   Update Service - Cancel
@@ -1998,7 +2002,7 @@ if (!empty($getlogpodtl)) {
- Cancel + Cancel
@@ -2405,11 +2409,11 @@ if (!empty($getlogpodtl)) {
+ Cancel   Update - Cancel
@@ -2448,7 +2452,7 @@ if (!empty($getlogpodtl)) {   Save   Submit -   Approve and Release +   Approve   OK   Submit diff --git a/app/Views/capitalpurchaseorder.php b/app/Views/capitalpurchaseorder.php index 4749b7af..78fd2f8f 100644 --- a/app/Views/capitalpurchaseorder.php +++ b/app/Views/capitalpurchaseorder.php @@ -2549,7 +2549,7 @@ function vaildateBeforeOpenModal()   Reset   Save as Draft -   Approve +   Submit

diff --git a/app/Views/createPOfromRequistion.php b/app/Views/createPOfromRequistion.php index 8cbb4192..8e9451cc 100644 --- a/app/Views/createPOfromRequistion.php +++ b/app/Views/createPOfromRequistion.php @@ -1,510 +1,425 @@ - - -
- 'form-label-left CreatePO ','name' => 'CreatePO','id' => 'CreatePO','method' => 'post','role' => 'form' ); - - echo form_open(base_url().'purchaseOrder',$attributes); ?> - -
- -
- -
-

Create Purchase Order from Requistion

-
-
-
-
-
- getFlashdata('error'); - if ($error) { - ?> -
- - getFlashdata('error'); ?> -
- - getFlashdata('success'); - if ($success) { - ?> -
- - getFlashdata('success'); ?> -
- + 'form-label-left CreatePO ', 'name' => 'CreatePO', 'id' => 'CreatePO', 'method' => 'post', 'role' => 'form'); + echo form_open(base_url() . 'purchaseOrder', $attributes); ?> -
-
- listErrors('
', '
'); - ?>
-
-
- getFlashdata('listErrors'); - if($listErrors) - { - ?> +
+ +
+
+
+

Create Purchase Order from Requistion

+
+
+ +
+
-
-
- - getFlashdata('listErrors'); ?> +
+ getFlashdata('error'); + if ($error) { + ?> +
+ + getFlashdata('error'); ?> +
+ + getFlashdata('success'); + if ($success) { + ?> +
+ + getFlashdata('success'); ?> +
+ + +
+
+ listErrors('
', '
'); + ?>
-
- -
-
-

-

-
-
-
-
- -
- - - -
+
+
- + }); + }); - + function Validate() { + var ReqNo = $('#txtReqNo').val(); + if (ReqNo.length <= 0) { + alert('Please select the Requisition Number to Create Purchase Order'); + return false; + } else { + $('#ImportPOCheck').modal('show'); + } + } + + $(function() { + $('#REQLIST').DataTable({ + "paging": true, + "lengthChange": true, + "searching": true, + "columnDefs": [{ + "targets": 1, + "type": "date-eu" + }], + "aaSorting": [ + [2, "desc"] + ], + "ordering": true, + "info": true, + "autoWidth": true, + "pageLength": 10, + "lengthMenu": [10, 25, 50, 100] + }); + }); + + \ No newline at end of file diff --git a/app/Views/editCapitalPo.php b/app/Views/editCapitalPo.php index 9996e326..e76d19ae 100644 --- a/app/Views/editCapitalPo.php +++ b/app/Views/editCapitalPo.php @@ -1,4 +1,4 @@ - "NO","value"=>"0"),array("name"=>"YES","value"=>"1") @@ -119,7 +119,8 @@ if(!empty($POMaster)) foreach ($POMaster as $Req) { - + $parentPO =$Req->ParentPO; + $SupId = $Req->SupplierID; $SupName = $Req->SupplierName; @@ -473,9 +474,11 @@ $("#PaymentMethod").select2();
- -

Edit Capital Purchase Order-

- + +

Edit Capital Purchase Order-

+ +

Amended Capital Purchase Order-

+ @@ -3900,7 +3903,7 @@ $("#PaymentMethod").select2();   Save as Draft   Submit -   Approve +   Approve OK diff --git a/app/Views/editImportAmendPO.php b/app/Views/editImportAmendPO.php index 9acb48b6..fdf35321 100644 --- a/app/Views/editImportAmendPO.php +++ b/app/Views/editImportAmendPO.php @@ -1425,11 +1425,9 @@ echo form_textarea($data);
+ Cancel   Edit Import - - Cancel -
@@ -1924,9 +1922,9 @@ echo form_textarea($data); +   Cancel   Submit -   Cancel
@@ -1937,8 +1935,8 @@ echo form_textarea($data);

- - + 'AWAITING APPROVE', 'AWAITING RELEASE' => 'AWAITING APPROVE', @@ -1955,7 +1953,7 @@ echo form_textarea($data); } else { echo "Status not provided"; } - ?> --> + ?> diff --git a/app/Views/editRevenuepurchaseorder.php b/app/Views/editRevenuepurchaseorder.php index a721e663..1314be29 100644 --- a/app/Views/editRevenuepurchaseorder.php +++ b/app/Views/editRevenuepurchaseorder.php @@ -14,6 +14,7 @@ $otherref = ''; $revenuesubtype = ''; $insurencestatus = ''; $insurenceno = ''; +$parentPO= ''; if (!empty($MaxPODate)) { foreach ($MaxPODate as $date) { $MaxPoDate = $date->PODate; @@ -65,6 +66,7 @@ if (!empty($POMaster)) { //print_r($POMaster); //print_r($POItem); foreach ($POMaster as $Req) { + $parentPO =$Req->ParentPO; $SupId = $Req->SupplierID; $SupName = $Req->SupplierName; $Address = $Req->MSME ? "MSME : ".$Req->MSME."\n".$Req->Address :$Req->Address ; @@ -1846,9 +1848,11 @@ if (!empty($getlogpodtl)) {
-
-

Edit Revenue Purchase Order -

-
+ +

Edit Revenue Purchase Order -

+ +

Amended Revenue Purchase Order -

+
@@ -2162,9 +2166,8 @@ if (!empty($getlogpodtl)) {
- + Cancel   Ok - Cancel
@@ -2690,7 +2693,8 @@ if (!empty($getlogpodtl)) {

-   Add Revenue     Cancel + Cancel     +   Add Revenue
@@ -3059,7 +3063,8 @@ if (!empty($getlogpodtl)) {

-   Edit Revenue    Cancel + Cancel     +   Edit Revenue
@@ -3964,13 +3969,13 @@ if (!empty($getlogpodtl)) { - -   Save + +   Cancel + +   Save as Draft   Submit -   Approve and Release -   Cancel +   Approve   Submit diff --git a/app/Views/editSupplier.php b/app/Views/editSupplier.php index a9c63c9d..0933bd4b 100644 --- a/app/Views/editSupplier.php +++ b/app/Views/editSupplier.php @@ -363,10 +363,10 @@ if (!empty($supplier)) {
IFSC Code* - +
Bank Branch Name - +
Bank Address diff --git a/app/Views/editimportpo.php b/app/Views/editimportpo.php index b1797b06..bb432e23 100644 --- a/app/Views/editimportpo.php +++ b/app/Views/editimportpo.php @@ -378,7 +378,7 @@ else

Edit Import Purchase Order-

Amended Import Purchase Order-

- +
@@ -3183,7 +3183,7 @@ echo form_textarea($data); else{?>   Submit -   Approve and Release +   Approve OK @@ -3194,8 +3194,7 @@ echo form_textarea($data);

- - diff --git a/app/Views/importpo.php b/app/Views/importpo.php index 06426380..fa70f7f5 100644 --- a/app/Views/importpo.php +++ b/app/Views/importpo.php @@ -249,7 +249,7 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
- Back + Back
@@ -1243,13 +1243,9 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
- - + Cancel   Add Import - - Cancel -
@@ -1842,11 +1838,9 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
+ Cancel   Edit Import - - Cancel -
@@ -2000,7 +1994,7 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
-

+


@@ -2009,10 +2003,9 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) { - -   Save + +   Save as Draft   Submit -

diff --git a/app/Views/inwardgateregister.php b/app/Views/inwardgateregister.php index 79c4bb0f..ddd9d371 100755 --- a/app/Views/inwardgateregister.php +++ b/app/Views/inwardgateregister.php @@ -314,11 +314,13 @@
-
-
-   Save - Close -
+
+
+
+ Close +   Save +
+
diff --git a/app/Views/purchaseorder.php b/app/Views/purchaseorder.php index 4571bc30..2d334b5b 100644 --- a/app/Views/purchaseorder.php +++ b/app/Views/purchaseorder.php @@ -1829,7 +1829,7 @@ if (!empty($INRSYMBOL)) {

Revenue Purchase Order

- Back + Back
@@ -2151,9 +2151,8 @@ if (!empty($INRSYMBOL)) {
- + Cancel   Ok - Cancel
@@ -2182,9 +2181,8 @@ if (!empty($INRSYMBOL)) {
- + Cancel   Ok - Cancel
@@ -2221,8 +2219,8 @@ if (!empty($INRSYMBOL)) {
+ Cancel   Ok - Cancel
@@ -2252,8 +2250,8 @@ if (!empty($INRSYMBOL)) {
+ Cancel   Ok - Cancel
@@ -2689,7 +2687,8 @@ if (!empty($INRSYMBOL)) {

-   Add Revenue    Cancel + Cancel     +   Add Revenue
@@ -3058,7 +3057,9 @@ if (!empty($INRSYMBOL)) {

-   Edit Revenue     Cancel + Cancel     +   Edit Revenue +
@@ -3203,7 +3204,7 @@ if (!empty($INRSYMBOL)) {
-

+


@@ -3211,12 +3212,9 @@ if (!empty($INRSYMBOL)) { -   Save +   Reset +   Save as Draft   Submit -   Reset - - -

diff --git a/app/Views/servicePurchaseorder.php b/app/Views/servicePurchaseorder.php index 17ebdb54..7005903a 100644 --- a/app/Views/servicePurchaseorder.php +++ b/app/Views/servicePurchaseorder.php @@ -603,7 +603,7 @@ if (!empty($INRSYMBOL)) {
- Back + Back
@@ -1245,8 +1245,8 @@ if (!empty($INRSYMBOL)) {
+ Cancel   Add Service - Cancel
@@ -1533,8 +1533,8 @@ if (!empty($INRSYMBOL)) {
+ Cancel   Update Service - Cancel
@@ -1651,9 +1651,9 @@ if (!empty($INRSYMBOL)) { -   Save +   Reset +   Save as Draft   Submit -   Reset
diff --git a/app/Views/servicepo.php b/app/Views/servicepo.php index 64de71c2..36e53a51 100644 --- a/app/Views/servicepo.php +++ b/app/Views/servicepo.php @@ -7,7 +7,7 @@
-

Service Purchase Order

+

Service Purchase Order.