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

Fix sale and receiving return (incorrect receipt numbers were generated)

Browse Source 
Fix item form width in receivings
This commit is contained in:
jekkos-t520
2015-02-12 10:47:09 +01:00
parent d6f27141af
commit 1267e92117
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
application/controllers/receivings.php
View File

@@ -285,8 +285,9 @@ class Receivings extends Secure_area
$emp_info=$this->Employee->get_info($receiving_info['employee_id']);
$data['payment_type']=$receiving_info['payment_type'];
$data['invoice_number']=$this->receiving_lib->get_invoice_number();
$data['receiving_id']='RECV '.$receiving_id;
$barcode_config=array('barcode_type'=>1,'barcode_width'=>180, 'barcode_height'=>30, 'barcode_quality'=>100);
$data['barcode']=$this->barcode_lib->generate_barcode($receiving_id,$barcode_config);
$data['barcode']=$this->barcode_lib->generate_barcode($data['receiving_id'],$barcode_config);
$data['employee']=$emp_info->first_name.' '.$emp_info->last_name;
if($supplier_id!=-1)
@@ -294,7 +295,6 @@ class Receivings extends Secure_area
$supplier_info=$this->Supplier->get_info($supplier_id);
$data['supplier']=$supplier_info->first_name.' '.$supplier_info->last_name;
}
$data['receiving_id']='RECV '.$receiving_id;
$this->load->view("receivings/receipt",$data);
$this->receiving_lib->clear_all();
$this->_remove_duplicate_cookies();

2
application/controllers/sales.php
View File

@@ -325,7 +325,7 @@ class Sales extends Secure_area
}
$data['sale_id']='POS '.$sale_id;
$barcode_config=array('barcode_type'=>1,'barcode_width'=>180, 'barcode_height'=>30, 'barcode_quality'=>100);
$data['barcode']=$this->barcode_lib->generate_barcode($sale_id,$barcode_config);
$data['barcode']=$this->barcode_lib->generate_barcode($data['sale_id'],$barcode_config);
$this->load->view("sales/receipt",$data);
$this->sale_lib->clear_all();
$this->_remove_duplicate_cookies();

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

@@ -48,7 +48,7 @@ if(isset($error))
</label>
<?php echo form_input(array('name'=>'item','id'=>'item','size'=>'40'));?>
<div id="new_item_button_register" >
<?php echo anchor("items/view/-1/width:360",
<?php echo anchor("items/view/-1/width:400",
"<div class='small_button'><span>".$this->lang->line('sales_new_item')."</span></div>",
array('class'=>'thickbox none','title'=>$this->lang->line('sales_new_item')));
?>