mirror/opensourcepos
1
0
Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-05-05 14:24:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix invoice code indentation

Browse Source
This commit is contained in:
FrancescoUK
2017-07-14 09:56:53 +01:00
parent 1798b4553b
commit fe05845bd4
2 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
application/models/Tax.php
View File

@@ -87,8 +87,7 @@ class Tax extends CI_Model
public function get_rate_info($tax_code, $tax_category_id)
{
$this->db->from('tax_code_rates');
$this->db->join('tax_categories',
'rate_tax_category_id = tax_category_id');
$this->db->join('tax_categories', 'rate_tax_category_id = tax_category_id');
$this->db->where('rate_tax_code', $tax_code);
$this->db->where('rate_tax_category_id', $tax_category_id);

20
application/views/sales/invoice.php
View File

@@ -119,14 +119,15 @@ $(document).ready(function()
<td style='border-right: solid 1px; text-align:right;'><textarea rows="4" cols="6"><?php echo to_currency($item['discounted_total']); ?></textarea>
</td>
</tr>
<?php if($item['is_serialized'] || $item['allow_alt_description'] && !empty($item['description']))
{
?>
<tr class="item-row" >
<td ></td >
<td class="item-description" colspan = "4" ><textarea cols = "6" ><?php echo $item['description']; ?></textarea></td>
<td style='text-align:center;'><textarea cols="6"><?php echo $item['serialnumber']; ?></textarea></td>
</tr>
<?php
if($item['is_serialized'] || $item['allow_alt_description'] && !empty($item['description']))
{
?>
<tr class="item-row" >
<td ></td >
<td class="item-description" colspan = "4" ><textarea cols = "6" ><?php echo $item['description']; ?></textarea></td>
<td style='text-align:center;'><textarea cols="6"><?php echo $item['serialnumber']; ?></textarea></td>
</tr>
<?php
}
}
@@ -173,6 +174,7 @@ $(document).ready(function()
</tr>
<?php
}
if(isset($cur_giftcard_value) && $show_giftcard_remainder)
{
?>
@@ -183,6 +185,7 @@ $(document).ready(function()
</tr>
<?php
}
if(!empty($payments))
{
?>
@@ -227,6 +230,7 @@ $(window).on("load", function()
jsPrintSetup.setOption('headerStrRight', '');
<?php
}
if (!$this->Appconfig->get('print_footer'))
{
?>