-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
\ No newline at end of file
+ });
+
\ No newline at end of file
diff --git a/app/Views/alterpurchaseorder.php b/app/Views/alterpurchaseorder.php
index 3a4cd529..c6f6634b 100644
--- a/app/Views/alterpurchaseorder.php
+++ b/app/Views/alterpurchaseorder.php
@@ -173,40 +173,40 @@ if (!empty($INRSYMBOL)) {
$(function() {
- $("#PODate").datepicker({
- // minDate : 'now',
- // maxDate : 'now',
- dateFormat: 'dd-mm-yy',
- changeMonth: true,
- changeYear: true,
- yearRange: '-100:+0'
- });
- $("#Deliverydt").datepicker({
- minDate: 'now',
- dateFormat: 'dd-mm-yy',
- changeMonth: true,
- changeYear: true,
- yearRange: '0:+10'
- });
+ // $("#PODate").datepicker({
+ // // minDate : 'now',
+ // // maxDate : 'now',
+ // dateFormat: 'dd-mm-yy',
+ // changeMonth: true,
+ // changeYear: true,
+ // yearRange: '-100:+0'
+ // });
+ // $("#Deliverydt").datepicker({
+ // minDate: 'now',
+ // dateFormat: 'dd-mm-yy',
+ // changeMonth: true,
+ // changeYear: true,
+ // yearRange: '0:+10'
+ // });
- $("#Date1").datepicker({
- // minDate : 'now',
- dateFormat: 'dd-mm-yy',
- changeMonth: true,
- changeYear: true,
- yearRange: '0:+10'
- });
+ // $("#Date1").datepicker({
+ // // minDate : 'now',
+ // dateFormat: 'dd-mm-yy',
+ // changeMonth: true,
+ // changeYear: true,
+ // yearRange: '0:+10'
+ // });
- $("#MRC").datepicker({
- // minDate : 'now',
- dateFormat: 'dd-mm-yy',
- changeMonth: true,
- changeYear: true,
- yearRange: '0:+10'
- });
+ // $("#MRC").datepicker({
+ // // minDate : 'now',
+ // dateFormat: 'dd-mm-yy',
+ // changeMonth: true,
+ // changeYear: true,
+ // yearRange: '0:+10'
+ // });
var SelectedMaterialList = {
Mat: []
@@ -1911,10 +1911,11 @@ if (!empty($INRSYMBOL)) {
$("#EditRevenueMaterialCode").select2();
$("#MaterialCode").select2();
$("#ServiceMaterialCode").select2();
+ $("#emergency_itemcode").select2();
+
});
- $("#emergency_itemcode").select2();
@@ -2021,6 +2022,7 @@ if (!empty($INRSYMBOL)) {
.num {
text-align: right;
}
+<<<<<<< HEAD
.header-container {
display: flex;
@@ -2128,13 +2130,135 @@ if (!empty($INRSYMBOL)) {
-
-
-
-
- -
Report - Pending Purchase Order
+ .dataTables_filter {
+ width: 50%;
+ float: right;
+ text-align: right;
+ }
-
-
Select Tax Range*
+======= + + .header-container { + display: flex; + justify-content: space-between; + align-items: center; + padding: 25px; + } + + .header-container h2 { + flex: 1; + text-align: center; + margin: 0; + } + + .centered { + display: flex; + /* justify-content: center; */ + align-items: center; + height: 10vh; + } + + .centered label, + .centered input { + margin: 0 5px; + } + + .mandatory { + color: red; + text-align: right; + background-color: white; + } + + + + +
+======= + + .header-container { + display: flex; + justify-content: space-between; + align-items: center; + padding: 25px; + } + + .header-container h2 { + flex: 1; + text-align: center; + margin: 0; + } + + .centered { + display: flex; + /* justify-content: center; */ + align-items: center; + height: 10vh; + } + + .centered label, + .centered input { + margin: 0 5px; + } + + .mandatory { + color: red; + text-align: right; + background-color: white; + } + + + + +
+
+
+
+
+
+ 'form-label-left CreatealterPO ', 'name' => 'CreatealterPO', 'id' => 'CreatealterPO');
+
+ echo form_open(base_url() . '/purchaseorder/addalterPO/', $attributes); ?>
+
+
+
+
+
+ Emergency Purchase Order
+
+
+
+
+
+
+
+
+ 'Select Request Type');
+
+ if (!empty($RequestType)) {
+
+ foreach ($RequestType as $RID) :
+ if ($RID->ConfigValue == "SERVICE" || $RID->ConfigValue == "REVENUE") {
+ $options[$RID->ConfigValue] = $RID->ConfigValue;
+ }
+ endforeach;
+ }
+
+ echo form_dropdown('RequestType', $options, set_value('ConfigValue'), 'id="purpose"', 'class = "form-control select2"', 'required="true"');
+
+ ?>
+
+
+
+
+
+
+ 'POType', 'value' => set_value('POType', $ReqType), 'id' => 'POType', 'class' => 'form-control', 'readonly' => 'true');
+ echo form_input($data);
+ ?>
+
+
+
+
+
+ 'Select Supplier');
+ //print_r( $options);
+
+ if (!empty($Suplist)) {
+ foreach ($Suplist as $SID) :
+ $options[$SID->SupplierID] = $SID->SupplierID . ' - ' . $SID->SupplierName;
+ endforeach;
+ }
+
+ echo form_dropdown('drpSupplier', $options, set_value('drpSupplier'), 'id="drpSupplier"', 'required="true"', 'class="form-control select2"');
+
+ ?>
+
+
+
+
+
+ 'SupAddress', 'value' => set_value('SupAddress'), 'id' => 'SupAddress', 'class' => 'form-control', 'readonly' => 'true', 'rows' => '3', 'cols' => '40');
+ echo Form_textarea($data);
+ ?>
+
+
+
+ Select Tax Range*
+>>>>>>> b5e10f55a3448c644114ed6e55752b30684440f3
+<<<<<<< HEAD
+>>>>>>> b5e10f55a3448c644114ed6e55752b30684440f3
"Range", "id" => "Local", "value" => "0", 'checked' => set_radio('Range', '0', TRUE))); ?>
"Range", "id" => "Inter_state", "value" => "1", 'checked' => set_radio('Range', '1', FALSE))); ?>
+=======
+
+
+>>>>>>> b5e10f55a3448c644114ed6e55752b30684440f3
'Selected Work Status');
@@ -2145,15 +2269,25 @@ if (!empty($INRSYMBOL)) {
echo form_dropdown('workstatus', $options4, set_value('workstatus'), 'id="workstatusValue"', 'required="true"', 'class="form-control select2');
?>
+<<<<<<< HEAD
Select Delivery By*
+======= +
+======= +
+ Select Delivery By*
+>>>>>>> b5e10f55a3448c644114ed6e55752b30684440f3
+<<<<<<< HEAD
+>>>>>>> b5e10f55a3448c644114ed6e55752b30684440f3
"DateRange", "id" => "Date", "value" => "0", 'checked' => set_radio('DateRange', '0', true))); ?>
"DateRange", "id" => "Schedule", "value" => "1", 'checked' => set_radio('DateRange', '1', false))); ?>
+=======
+
+
+>>>>>>> b5e10f55a3448c644114ed6e55752b30684440f3
'Scheduleby', 'value' => set_value('Scheduleby'), 'id' => 'Scheduleby', 'class' => 'form-control', 'required' => 'true', 'rows' => '3', 'cols' => '40', 'maxlength' => '110');
@@ -2169,9 +2303,15 @@ if (!empty($INRSYMBOL)) {
?>
+<<<<<<< HEAD
+=======
+
+<<<<<<< HEAD
+
+
+>>>>>>> b5e10f55a3448c644114ed6e55752b30684440f3
'DeliveryAddr', 'value' => set_value('DeliveryAddr', $CompanyAddress), 'id' => 'DeliveryAddr', 'class' => 'form-control', 'required' => 'true', 'rows' => '3', 'cols' => '40');
echo Form_textarea($data);
@@ -2180,6 +2320,7 @@ if (!empty($INRSYMBOL)) {
@@ -2201,13 +2342,43 @@ if (!empty($INRSYMBOL)) {
+=======
+
+
+
+<<<<<<< HEAD
+
+
+
+ 'txtcurrencytype', 'value' => set_value('txtcurrencytype'), 'id' => 'txtcurrencytype', 'class' => 'form-control', 'required' => 'true');
+ echo form_input($data);
+ ?>
+
+
+
+
+
+ 'txtexachangerate', 'value' => set_value('txtexachangerate'), 'id' => 'txtexachangerate', 'class' => 'form-control', 'required' => 'true');
+ echo form_input($data);
+ ?>
+
+
+
+>>>>>>> b5e10f55a3448c644114ed6e55752b30684440f3
To check Today's Foreign Exchange value
+=======
+
+
+
+>>>>>>> b5e10f55a3448c644114ed6e55752b30684440f3
+<<<<<<< HEAD
'Select Department Name');
@@ -2227,30 +2398,68 @@ if (!empty($INRSYMBOL)) {
'Cost Center Name');
+=======
+
; ?>public/assets/dist/img/red.png)
+=======
+
+<<<<<<< HEAD
+
+
+
+ 'Cost Center Name');
+
if (!empty($CostList)) {
foreach ($CostList as $cost) :
+>>>>>>> b5e10f55a3448c644114ed6e55752b30684440f3
+
+ if (!empty($CostList)) {
+
+<<<<<<< HEAD
+ foreach ($CostList as $cost) :
$options2[$cost['CostCenterCode']] = $cost['CostCenterCode'] . ' ' . ' - ' . ' ' . $cost['CostCenterName'];
endforeach;
}
+=======
+ $options2[$cost['CostCenterCode']] = $cost['CostCenterCode'] . ' ' . ' - ' . ' ' . $cost['CostCenterName'];
+
+ endforeach;
+ }
echo form_dropdown('CostCenterName', $options2, set_value('CostCenterName'), 'id="CostCenterName"', 'class="form-control select2"', 'required="true"', 'multiple="true"');
?>
+
+
+<<<<<<< HEAD
+
+ 'AvalBuget', 'value' => set_value('AvalBuget'), 'id' => 'AvalBuget', 'class' => 'form-control num', 'readonly' => 'true');
+ echo form_hidden($data);
+ // echo form_input($data);
+>>>>>>> b5e10f55a3448c644114ed6e55752b30684440f3
+
+ echo form_dropdown('CostCenterName', $options2, set_value('CostCenterName'), 'id="CostCenterName"', 'class="form-control select2"', 'required="true"', 'multiple="true"');
+
+ ?>
+
+
+=======
+
+
+>>>>>>> b5e10f55a3448c644114ed6e55752b30684440f3
'AvalBuget', 'value' => set_value('AvalBuget'), 'id' => 'AvalBuget', 'class' => 'form-control num', 'readonly' => 'true');
@@ -2303,6 +2512,7 @@ if (!empty($INRSYMBOL)) {
@@ -2343,6 +2553,68 @@ if (!empty($INRSYMBOL)) {
+=======
+
+
+
+
+
+
+ 'PODate', 'value' => set_value('PODate', $CurrentDate), 'id' => 'PODate', 'class' => 'form-control', 'required' => 'true', 'onkeypress' => 'return false;');
+ echo form_input($data);
+ ?>
+
+
+
+
+
+ 'emergmodeofshipment', 'value' => set_value('emergmodeofshipment'), 'id' => 'emergmodeofshipment', 'class' => 'form-control');
+ echo form_input($data);
+ ?>
+
+
+
+
+
+
+ 'emergsupplierreference', 'value' => set_value('emergsupplierreference'), 'id' => 'emergsupplierreference', 'class' => 'form-control', 'maxlength' => '40');
+ echo form_input($data);
+ ?>
+
+
+
+
+
+ 'emergsupplierofferno', 'value' => set_value('emergsupplierofferno'), 'id' => 'emergsupplierofferno', 'class' => 'form-control');
+ echo form_input($data);
+ ?>
+
+
+
+
+
+
+
+
+ 'emergotherreference', 'value' => set_value('emergotherreference'), 'id' => 'emergotherreference', 'class' => 'form-control');
+ echo form_input($data);
+ ?>
+
+
+
+
+<<<<<<< HEAD
+ 'Select');
+
+ if (!empty($PoTypeOptions)) {
+ foreach ($PoTypeOptions as $POpt) :
+>>>>>>> b5e10f55a3448c644114ed6e55752b30684440f3
+=======
+
+
+
+
+
+
+
+>>>>>>> b5e10f55a3448c644114ed6e55752b30684440f3
+
@@ -2418,17 +2697,55 @@ if (!empty($INRSYMBOL)) {
echo form_input($data);
?>
+<<<<<<< HEAD
+=======
+
+=======
+
+
+
+
+>>>>>>> b5e10f55a3448c644114ed6e55752b30684440f3
'Select', '1' => 'REVENUE', '2' => 'CAPITAL');
echo form_dropdown('BudgetType', $optionsnew, set_value('BudgetType'), 'id="BudgetType"', 'required="true"', 'class="form-control select2');
?>
+<<<<<<< HEAD
+
+
+
+
+
+ IS THIS OPEN ORDER FORMAT
+
+
+ Select Line Item
+
+
+
+
+
+
+
+
@@ -2755,97 +3073,108 @@ if (!empty($INRSYMBOL)) {
+
+
+
+
+<<<<<<< HEAD
+
+
Packing Calculation On
+>>>>>>> b5e10f55a3448c644114ed6e55752b30684440f3
@@ -2655,6 +2972,7 @@ if (!empty($INRSYMBOL)) {
-
Delivery Challan /Inv No
-
-
- Delivery Challan /Inv Date
-
- 'Date1', 'value' => set_value('Date1', $CurrentDate), 'id' => 'Date1', 'class' => 'form-control num', 'required' => 'true');
- echo form_input($data); ?>
-
- Material Received Date
- 'MRC', 'value' => set_value('MRC', $CurrentDate), 'id' => 'MRC', 'class' => 'form-control num', 'required' => 'true');
- echo form_input($data); ?>
+
Delivery Challan /Inv No
+
+
+ Delivery Challan /Inv Date
+
+ 'Date1', 'value' => set_value('Date1', $CurrentDate), 'id' => 'Date1', 'class' => 'form-control num', 'required' => 'true');
+ echo form_input($data); ?>
+
+ Material Received Date
+ 'MRC', 'value' => set_value('MRC', $CurrentDate), 'id' => 'MRC', 'class' => 'form-control num', 'required' => 'true');
+ echo form_input($data); ?>
-
-
+
+
+
+
+
+
+
+
+ Vehicle No
+
+
+ Courier No
+
-
-
-
-
-
-
-
-
-
Vehicle No
-
+
Is Quality Check Required
+
-
+
- Courier No
-
+
+<<<<<<< HEAD
+
-
- Is Quality Check Required
-
-
-
-
-
-
-
-
+=======
+
+
-->
+
+>>>>>>> b5e10f55a3448c644114ed6e55752b30684440f3
-
-
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+