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

Fix inventory summary report (#540)

Browse Source
This commit is contained in:
jekkos
2016-05-11 21:51:54 +02:00
parent 349000bd8a
commit 53060397e5
10 changed files with 23 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
application/views/partial/header.php
View File

@@ -61,10 +61,10 @@
<!-- start mincss template tags -->
<link rel="stylesheet" type="text/css" href="dist/bootstrap.min.css?rel=9ed20b1ee8"/>
<link rel="stylesheet" type="text/css" href="dist/jquery-ui.css"/>
<link rel="stylesheet" type="text/css" href="dist/opensourcepos.min.css?rel=11a1576e8b"/>
<link rel="stylesheet" type="text/css" href="dist/opensourcepos.min.css?rel=d260cbcc2a"/>
<!-- end mincss template tags -->
<!-- start minjs template tags -->
<script type="text/javascript" src="dist/opensourcepos.min.js?rel=3b5df3cc1d" language="javascript"></script>
<script type="text/javascript" src="dist/opensourcepos.min.js?rel=faf76c76c4" language="javascript"></script>
<!-- end minjs template tags -->
<?php endif; ?>

2
application/views/receivings/receiving.php
View File

@@ -96,7 +96,7 @@ if (isset($error))
<th style="width:5%;"></th>
<th style="width:10%;"><?php echo $this->lang->line('recvs_discount'); ?></th>
<th style="width:10%;"><?php echo $this->lang->line('recvs_total'); ?></th>
<th style="width:5%;"><?php echo $this->lang->line('recvs_update'); ?></th>
<th style="width:5%;"><?php echo $this->lang->line('receivings_update'); ?></th>
</tr>
</thead>

10
application/views/reports/inventory_summary_input.php
View File

@@ -36,3 +36,13 @@ if(isset($error))
<?php echo form_close(); ?>
<?php $this->load->view("partial/footer"); ?>
<script type="text/javascript" language="javascript">
$(document).ready(function()
{
$("#generate_report").click(function()
{
window.location = [window.location, $("#location_id").val(), $("#item_count").val()].join("/");
});
});
</script>

2
css/ospos.css
View File

@@ -146,7 +146,7 @@ button.btn.dropdown-toggle.btn-sm
{
background-color: white;
color: black;
border: 2px solid #dce4ec;
border: 1px solid #dce4ec;
}
.dropdown-menu

4
css/register.css
View File

@@ -110,13 +110,13 @@
#sale_totals, #payment_totals
{
border-top: 2px solid #000;
border-top: 1px solid #000;
}
#payment_details
{
float: left;
border-top: 2px solid #000;
border-top: 1px solid #000;
background-color: #DDD;
margin-top: 0.2em;
padding: 0.5em;

1
dist/opensourcepos.js vendored
View File

@@ -44342,6 +44342,7 @@ THE SOFTWARE.*/
});
enable_actions();
$(this).remove();
$(this).siblings(".detail-view").remove();
});
});
set_feedback(response.message, 'alert alert-dismissible alert-success', false);

2
dist/opensourcepos.min.css vendored
View File

File diff suppressed because one or more lines are too long

2
dist/opensourcepos.min.js vendored
View File

File diff suppressed because one or more lines are too long

4
js/manage_tables.js
View File

@@ -159,9 +159,9 @@
field: 'id',
values: selected_ids()
});
enable_actions();
$(this).remove();
});
enable_actions();
$(this).remove().siblings(".detail-view").remove();
});
set_feedback(response.message, 'alert alert-dismissible alert-success', false);
} else {

4
templates/spacelab/views/partial/header.php
View File

@@ -61,11 +61,11 @@
<link rel="stylesheet" type="text/css" href="templates/spacelab/css/bootstrap.min.css?rel=9ed20b1ee8"/>
<!-- start mincss template tags -->
<link rel="stylesheet" type="text/css" href="dist/jquery-ui.css"/>
<link rel="stylesheet" type="text/css" href="dist/opensourcepos.min.css?rel=11a1576e8b"/>
<link rel="stylesheet" type="text/css" href="dist/opensourcepos.min.css?rel=d260cbcc2a"/>
<!-- end mincss template tags -->
<link rel="stylesheet" type="text/css" href="templates/spacelab/css/style.css"/>
<!-- start minjs template tags -->
<script type="text/javascript" src="dist/opensourcepos.min.js?rel=3b5df3cc1d" language="javascript"></script>
<script type="text/javascript" src="dist/opensourcepos.min.js?rel=faf76c76c4" language="javascript"></script>
<!-- end minjs template tags -->
<?php endif; ?>