diff --git a/application/controllers/purchaseorder.php b/application/controllers/purchaseorder.php index 416ecfd6..d6b6b1b0 100755 --- a/application/controllers/purchaseorder.php +++ b/application/controllers/purchaseorder.php @@ -183,7 +183,8 @@ class purchaseorder extends BaseController // $data['MaxPODate'] = $this->purchaseorder_model->getLastCreatedPODate(); $data['MaxPODate'] = $this->purchaseorder_model->getLastReleasedPODate(); $data['Currency']=$this->purchaseorder_model->GetCurrencytype(); - //print_r($data['Currency']); + $data['INRSYMBOL']=$this->purchaseorder_model->GetINRCurrencytype('INR'); + //print_r($data['INRSYMBOL']); // $data[$Rate->ExchangeRate]=$Rate->ExchangeRate; @@ -270,6 +271,7 @@ class purchaseorder extends BaseController $data['MaterialList'] = $result;//$this->purchaseorder_model->getRawMaterialList($ReqType,$ReqArray); $data['Suplist'] = $this->purchaseorder_model->getSupplierName(); $data['Payment']=$this->purchaseorder_model->getSupplierPayment(); + $data['INRSYMBOL']=$this->purchaseorder_model->GetINRCurrencytype('INR'); /* Cost code from Requisition - Client Review Fix Start here */ $ReqDetails = $this->purchaseorder_model->getRequistDetails($ReqArray); diff --git a/application/models/purchaseorder_model.php b/application/models/purchaseorder_model.php index 1e4233b6..d9357036 100755 --- a/application/models/purchaseorder_model.php +++ b/application/models/purchaseorder_model.php @@ -668,6 +668,15 @@ function GetCurrencytype() return $query->result(); } + function GetINRCurrencytype($Currency_Code='') + { + $subQuery='select FontCode2000 from T_Currency_Details where Currency_Code=?'; + $query=$this->db->query($subQuery,array($Currency_Code)); + //print_r($this->db->last_query()); + return $query->result(); + + } + diff --git a/application/views/EditservicePurchaseorder.php b/application/views/EditservicePurchaseorder.php index ea8fae50..8cec8234 100755 --- a/application/views/EditservicePurchaseorder.php +++ b/application/views/EditservicePurchaseorder.php @@ -23,6 +23,18 @@ $DeliverSchedule=''; $MaxPoDate = ''; $AvlAmount = 0; $Value="₹"; + + +if(!empty($INRSYMBOL)) +{ + + foreach($INRSYMBOL as $INRS) + { + $INRSYM=$INRS->FontCode2000; + + } +} + if(!empty($MaxPODate)) { foreach ($MaxPODate as $date) @@ -946,7 +958,7 @@ $(document).ready(function () {
- +
'Rate','value' => set_value('Rate'),'id'=>'Rate', 'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);' ,'onchange'=>'Ratechange()' ); @@ -955,7 +967,7 @@ $(document).ready(function () {
- +
'txtBasicValue','value' => set_value('txtBasicValue'),'id'=>'txtBasicValue', 'class' => 'form-control num' ,'readonly' => 'true'); @@ -1054,7 +1066,7 @@ $(document).ready(function () {
- +
@@ -1187,7 +1199,7 @@ $(document).ready(function () {
- +
'EditRate','value' => set_value('EditRate'),'id'=>'EditRate', 'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);' ,'onchange'=>'EditRatechange()' ); @@ -1196,7 +1208,7 @@ $(document).ready(function () {
- +
'txtEditBasicValue','value' => set_value('txtEditBasicValue'),'id'=>'txtEditBasicValue', 'class' => 'form-control num' ,'readonly' => 'true'); @@ -1295,7 +1307,7 @@ $(document).ready(function () {
- > + >
diff --git a/application/views/editRevenuepurchaseorder.php b/application/views/editRevenuepurchaseorder.php index 194bf33b..cb217a14 100755 --- a/application/views/editRevenuepurchaseorder.php +++ b/application/views/editRevenuepurchaseorder.php @@ -29,6 +29,16 @@ if(!empty($AvlBudAmt)) } +if(!empty($INRSYMBOL)) +{ + + foreach($INRSYMBOL as $INRS) + { + $INRSYM=$INRS->FontCode2000; + + } +} + foreach ($PaymentTerms as $TER) { $Terms=$TER->PaymentTerms; @@ -2183,7 +2193,7 @@ body {
- +
'Rate','value' => set_value('Rate'),'id'=>'Rate', 'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'change()' ); @@ -2192,7 +2202,7 @@ body {
- +
'txtBasicValue','value' => set_value('txtBasicValue'),'id'=>'txtBasicValue', 'class' => 'form-control num' ,'readonly' => 'true'); @@ -2237,7 +2247,7 @@ body {
- +
'txtAfterDiscount','value' => set_value('txtAfterDiscount'),'id'=>'txtAfterDiscount', 'class' => 'form-control num' ,'readonly' => 'true'); @@ -2247,7 +2257,7 @@ body {
- +
- +
'txtAfterPackaging','value' => set_value('txtAfterPackaging'),'id'=>'txtAfterPackaging', 'class' => 'form-control num' ,'readonly' => 'true'); @@ -2339,7 +2349,7 @@ body {
- +
'txtAfterGST','value' => set_value('txtAfterGST'),'id'=>'txtAfterGST', 'class' => 'form-control num' ,'readonly' => 'true'); @@ -2362,7 +2372,7 @@ body {
- +
'txtAfterExciseDuty','value' => set_value('txtAfterExciseDuty'),'id'=>'txtAfterExciseDuty', 'class' => 'form-control num' ,'readonly' => 'true'); @@ -2380,7 +2390,7 @@ body {
- +
'txtAfterOtherTax','value' => set_value('txtAfterOtherTax'),'id'=>'txtAfterOtherTax', 'class' => 'form-control num' ,'readonly' => 'true'); @@ -2426,7 +2436,7 @@ body {
- +
'txtAfterFreight','value' => set_value('txtAfterFreight'),'id'=>'txtAfterFreight', 'class' => 'form-control num' ,'readonly' => 'true'); @@ -2574,7 +2584,7 @@ body {
- +
'EditRate','value' => set_value('EditRate'),'id'=>'EditRate', 'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'Editchange()','style'=>'text-align:right;' ); @@ -2583,7 +2593,7 @@ body {
- +
'txtEditBasicValue','value' => set_value('txtEditBasicValue'),'id'=>'txtEditBasicValue', 'class' => 'form-control num' ,'readonly' => 'true','style'=>'text-align:right;'); @@ -2628,7 +2638,7 @@ body {
- +
'txtEditAfterDiscount','value' => set_value('txtEditAfterDiscount'),'id'=>'txtEditAfterDiscount', 'class' => 'form-control num' ,'readonly' => 'true','style'=>'text-align:right;'); @@ -2648,7 +2658,7 @@ body {
- +
'txtEditAfterVat','value' => set_value('txtEditAfterVat'),'id'=>'txtEditAfterVat', 'class' => 'form-control num' ,'readonly' => 'true','onkeypress'=>'return isNumberKey(event);','style'=>'text-align:right;'); @@ -2716,7 +2726,7 @@ body {
- +
'txtEditAfterPackaging','value' => set_value('txtEditAfterPackaging'),'id'=>'txtEditAfterPackaging', 'class' => 'form-control num' ,'readonly' => 'true','style'=>'text-align:right;'); @@ -2757,7 +2767,7 @@ body {
- +
'txtEditAfterExciseDuty','value' => set_value('txtEditAfterExciseDuty'),'id'=>'txtEditAfterExciseDuty', 'class' => 'form-control num' ,'readonly' => 'true','style'=>'text-align:right;'); @@ -2775,7 +2785,7 @@ body {
- + s
'txtEditAfterOtherTax','value' => set_value('txtEditAfterOtherTax'),'id'=>'txtEditAfterOtherTax', 'class' => 'form-control num' ,'readonly' => 'true','style'=>'text-align:right;'); @@ -2821,7 +2831,7 @@ body {
- +
'txtEditAfterFreight','value' => set_value('txtEditAfterFreight'),'id'=>'txtEditAfterFreight', 'class' => 'form-control num' ,'readonly' => 'true','style'=>'text-align:right;'); diff --git a/application/views/editimportpo.php b/application/views/editimportpo.php index 92a5c3b1..ac6c4825 100755 --- a/application/views/editimportpo.php +++ b/application/views/editimportpo.php @@ -1,4 +1,4 @@ -
-

Siddharth Industries - Edit Import Purchase Order

+

Siddharth Industries - Edit Import Purchase Order-

- +
- +
-

+

- +
'txtAfterPackaging','value' => set_value('txtAfterPackaging'),'id'=>'txtAfterPackaging', 'class' => 'form-control' ,'readonly' => 'true'); @@ -2336,7 +2350,7 @@ body {
- +
- +
- +
- +
-
+
- +
'EditRate','value' => set_value('EditRate'),'id'=>'EditRate', 'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'Editchange()','style'=>'text-align:right;' ); @@ -2583,7 +2597,7 @@ body {
- +
'txtEditBasicValue','value' => set_value('txtEditBasicValue'),'id'=>'txtEditBasicValue', 'class' => 'form-control' ,'readonly' => 'true','style'=>'text-align:right;'); @@ -2628,7 +2642,7 @@ body {
- +
'txtEditAfterDiscount','value' => set_value('txtEditAfterDiscount'),'id'=>'txtEditAfterDiscount', 'class' => 'form-control' ,'readonly' => 'true','style'=>'text-align:right;'); @@ -2648,7 +2662,7 @@ body {
- +
'txtEditAfterVat','value' => set_value('txtEditAfterVat'),'id'=>'txtEditAfterVat', 'class' => 'form-control' ,'readonly' => 'true','onkeypress'=>'return isNumberKey(event);','style'=>'text-align:right;'); @@ -2716,7 +2730,7 @@ body {
- +
- +
'txtEditAfterGST','value' => set_value('txtEditAfterGST'),'id'=>'txtEditAfterGST', 'class' => 'form-control' ,'readonly' => 'true','style'=>'text-align:right;'); @@ -2758,7 +2772,7 @@ body {
- +
'txtEditAfterExciseDuty','value' => set_value('txtEditAfterExciseDuty'),'id'=>'txtEditAfterExciseDuty', 'class' => 'form-control' ,'readonly' => 'true','style'=>'text-align:right;'); @@ -2776,7 +2790,7 @@ body {
- +
'txtEditAfterOtherTax','value' => set_value('txtEditAfterOtherTax'),'id'=>'txtEditAfterOtherTax', 'class' => 'form-control' ,'readonly' => 'true','style'=>'text-align:right;'); @@ -2822,7 +2836,7 @@ body {
- +
'txtEditAfterFreight','value' => set_value('txtEditAfterFreight'),'id'=>'txtEditAfterFreight', 'class' => 'form-control' ,'readonly' => 'true','style'=>'text-align:right;'); @@ -2846,7 +2860,7 @@ body {
-
+
FontCode2000; + + } +} + + ?>