mirror/opensourcepos
1
0
Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-07-11 23:46:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

Hide delete button from Takings print, fix null value for margins, add a missing / (#507)

Browse Source
This commit is contained in:
FrancescoUK
2016-05-05 22:31:24 +01:00
parent 76560ca458
commit 18764d5caf
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
application/views/partial/print_receipt.php
View File

@@ -8,10 +8,10 @@ function printdoc()
if (window.jsPrintSetup)
{
// set top margins in millimeters
jsPrintSetup.setOption('marginTop', <?php echo $this->Appconfig->get('print_top_margin'); ?>);
jsPrintSetup.setOption('marginLeft', <?php echo $this->Appconfig->get('print_left_margin'); ?>);
jsPrintSetup.setOption('marginBottom', <?php echo $this->Appconfig->get('print_bottom_margin'); ?>);
jsPrintSetup.setOption('marginRight', <?php echo $this->Appconfig->get('print_right_margin'); ?>);
jsPrintSetup.setOption('marginTop', '<?php echo $this->Appconfig->get('print_top_margin'); ?>');
jsPrintSetup.setOption('marginLeft', '<?php echo $this->Appconfig->get('print_left_margin'); ?>');
jsPrintSetup.setOption('marginBottom', '<?php echo $this->Appconfig->get('print_bottom_margin'); ?>');
jsPrintSetup.setOption('marginRight', '<?php echo $this->Appconfig->get('print_right_margin'); ?>');
<?php if (!$this->Appconfig->get('print_header'))
{

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

@@ -50,7 +50,7 @@ if (isset($error))
</div>
<?php echo form_close(); ?>
<?php echo form_open($controller_name."add", array('id'=>'add_item_form', 'class'=>'form-horizontal panel panel-default')); ?>
<?php echo form_open($controller_name."/add", array('id'=>'add_item_form', 'class'=>'form-horizontal panel panel-default')); ?>
<div class="panel-body form-group">
<ul>
<li class="pull-left first_li">

2
application/views/sales/manage.php
View File

@@ -54,7 +54,7 @@ $(document).ready(function()
<div id="toolbar">
<div class="pull-left form-inline" role="toolbar">
<button id="delete" class="btn btn-default btn-sm">
<button id="delete" class="btn btn-default btn-sm print_hide">
<span class="glyphicon glyphicon-trash">&nbsp</span><?php echo $this->lang->line("common_delete");?>
</button>