RIA/ria
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge : GWM

Browse Source
This commit is contained in:
Smart 2024-09-20 15:14:09 +05:30
parent 17e5633cec
commit edf162c81f
3 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/Controllers/Purchaseorder.php
View File

@ -1452,8 +1452,11 @@ class Purchaseorder extends BaseController
$POLineItem = $this->purchaseorder_model->updatePOLineItem($PONO, $POLineItemNo, $POLineItemList); $POLineItem = $this->purchaseorder_model->updatePOLineItem($PONO, $POLineItemNo, $POLineItemList);
} }
$isExists = $this->purchaseorder_model->LineItemExistsinRevenueTax($LineItemNo); $isExists = $this->purchaseorder_model->LineItemExistsinRevenueTax($LineItemNo);
if (count($isExists) == 0) {
if (is_array($isExists) && count($isExists) == 0) {
} else { } else {
$RevenueTaxList = array('DiscountType' => $DiscountType, 'DiscountValue' => $DiscountValue, 'AfterDiscount' => $AfterDiscount, 'PackagingType' => $PackagingType, 'PackagingValue' => $PackagingValue, 'PackagingCalulatedOn' => $PackagingOption, 'AfterPackagingValue' => $AfterPackagingValue, 'FreightType' => $FreightType, 'FreightValue' => $FreightValue, 'AfterFreightValue' => $AfterFreightValue, 'Insurance' => $InsuranceValue, 'TotalValue' => $TotalOrderValue, 'UpdateBY' => $updatedBy, 'UpdatedOn' => $updateddt, 'CGST' => $Cgst, 'AfterCGST' => $AfterCgst, 'SGST' => $Sgst, 'AfterSGST' => $AfterSgst, 'IGST' => $Igst, 'AfterIGST' => $AfterIgst, 'CreatedBy' => $updatedBy, 'NoOfTrip' => $NOOfTrip); $RevenueTaxList = array('DiscountType' => $DiscountType, 'DiscountValue' => $DiscountValue, 'AfterDiscount' => $AfterDiscount, 'PackagingType' => $PackagingType, 'PackagingValue' => $PackagingValue, 'PackagingCalulatedOn' => $PackagingOption, 'AfterPackagingValue' => $AfterPackagingValue, 'FreightType' => $FreightType, 'FreightValue' => $FreightValue, 'AfterFreightValue' => $AfterFreightValue, 'Insurance' => $InsuranceValue, 'TotalValue' => $TotalOrderValue, 'UpdateBY' => $updatedBy, 'UpdatedOn' => $updateddt, 'CGST' => $Cgst, 'AfterCGST' => $AfterCgst, 'SGST' => $Sgst, 'AfterSGST' => $AfterSgst, 'IGST' => $Igst, 'AfterIGST' => $AfterIgst, 'CreatedBy' => $updatedBy, 'NoOfTrip' => $NOOfTrip);

18
app/Views/editRevenuepurchaseorder.php
View File

@ -4000,18 +4000,12 @@ if (!empty($getlogpodtl)) {
<td align="left">${Reqnumber}</td> <td align="left">${Reqnumber}</td>
<td align="left">${materialCode}</td> <td align="left">${materialCode}</td>
<td align="left">${materialName}</td> <td align="left">${materialName}</td>
<td align="right">${quantity}</td> <td align="left">${quantity}</td>
<td align="left">${uom}</td> <td align="left">${uom}</td>
<td align="right">${itemRate}</td> <td align="left">${itemRate}</td>
<td align="right">${PER}</td> <td align="left">${basicval}</td>
<td align="right">${service_description}</td> <td align="left">${TotalTaxValue}</td>
<td align="right">${basicval}</td> <td align="left">${TotalOrderValue}</td>
<td align="right">${TotalTaxValue}</td>
<td align="right">${TotalOrderValue}</td>
<td align="right">${quantity}</td>
<td align="right">0</td>
<td align="right">${quantity}</td>
<td> <td>
<a data-target='#EDITREVENUE' data-id="${temp}" data-userid="${temp}" data-toggle="modal" href="#EDITREVENUE"> <a data-target='#EDITREVENUE' data-id="${temp}" data-userid="${temp}" data-toggle="modal" href="#EDITREVENUE">
<i class="ri-pencil-fill"></i> <i class="ri-pencil-fill"></i>
@ -4902,7 +4896,7 @@ if (!empty($getlogpodtl)) {
window.location = "purchaseorderListing"; window.location = "purchaseorderListing";
} else { } else {
alert("Error"); alert("Something went wrong");
} }
}, },

10
app/Views/porelease_view.php
View File

@ -315,7 +315,7 @@ if (empty($Status)) {
/* MSG*/ /* MSG*/
var answer = confirm(strMsg); var answer = confirm(strMsg);
if (answer) { if (answer) {
$('#content').loader('show'); $('#loader').show();
$.ajax({ $.ajax({
data: { data: {
PONO: PO, PONO: PO,
@ -326,7 +326,7 @@ if (empty($Status)) {
url: "<?php echo base_url() ?>purchaseorder/ReleasePO", url: "<?php echo base_url() ?>purchaseorder/ReleasePO",
success: function(data) { success: function(data) {
if (data) { if (data) {
$('#content').loader('hide'); $('#loader').hide();
alert(data); alert(data);
location.reload(); location.reload();
} else { } else {
@ -388,7 +388,7 @@ if (empty($Status)) {
$("#txtSpcialInstruction").val(''); $("#txtSpcialInstruction").val('');
$('#AlertImg').attr("style", "display:none;"); $('#AlertImg').attr("style", "display:none;");
$('#content').loader('show'); $('#loader').show();
$.ajax({ $.ajax({
data: { data: {
id: ReqId id: ReqId
@ -397,8 +397,8 @@ if (empty($Status)) {
dataType: 'json', dataType: 'json',
url: "<?php echo base_url() ?>requisitionform/ViewRequest", url: "<?php echo base_url() ?>requisitionform/ViewRequest",
success: function(json) { success: function(json) {
// success:function(data) {
$('#content').loader('hide'); $('#loader').hide();
//alert(data); //alert(data);
$("#ReqType").val(json.Requist[0]['ReqType']); $("#ReqType").val(json.Requist[0]['ReqType']);
$("#ReqBy").val(json.Requist[0]['Requestedby']); $("#ReqBy").val(json.Requist[0]['Requestedby']);