pulling changes after confict -vadiel J
This commit is contained in:
parent
3215793357
commit
f55325a2e9
@ -2582,11 +2582,7 @@ if (!empty($getlogpodtl)) {
|
||||
<input type="hidden" name="txtPoRange" id="txtPoRange" />
|
||||
<input type="hidden" name="isEdit" id="isEdit" value="0" />
|
||||
<input type="hidden" name="txtStatus" id="txtStatus" />
|
||||
<<<<<<< HEAD
|
||||
<input type="hidden" name="txtRowCount" id="txtRowCount" value="<?php if(isset($index)){ echo $index;} ?>">
|
||||
=======
|
||||
<input type="hidden" name="txtRowCount" id="txtRowCount" value="<?php if(isset($index)){ echo $index; } ?>">
|
||||
>>>>>>> 419726d72f274d53d4d672dc7a4ea1c1398dd2db
|
||||
<input type="hidden" name="txtDeletedRow" id="txtDeletedRow" />
|
||||
<input type="hidden" name="txtPONO" id="txtPONO" value="<?php echo $PONO; ?>" />
|
||||
<input type="hidden" name="txttaxcheck" id="txttaxcheck" value="" />
|
||||
|
||||
Loading…
Reference in New Issue
Block a user