mirror/opensourcepos
1
0
Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-01-26 10:17:59 -05:00
Code Issues Packages Projects Releases Wiki Activity

Add duplicate invoice number error message in sales module

Browse Source 
Fix colspan width for receivings (one column was added for
receiving_quantity)
This commit is contained in:
jekkos-t520
2014-11-26 21:56:18 +01:00
parent 27e1bfe871
commit d7a61080e2
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
application/controllers/sales.php
View File

@@ -235,7 +235,7 @@ class Sales extends Secure_area
{
$data['invoice_number']=$invoice_number;
//SAVE sale to database
$data['sale_id']='POS '.$this->Sale->save($data['cart'], $customer_id,$employee_id,$comment,$data['payments'],$invoice_number);
$data['sale_id']='POS '.$this->Sale->save($data['cart'], $customer_id,$employee_id,$comment,$invoice_number,$data['payments']);
if ($data['sale_id'] == 'POS -1')
{
$data['error_message'] = $this->lang->line('sales_transaction_failed');

2
application/models/sale.php
View File

@@ -40,7 +40,7 @@ class Sale extends CI_Model
return $success;
}
function save ($items,$customer_id,$employee_id,$comment,$payments,$sale_id=false,$invoice_number=NULL)
function save ($items,$customer_id,$employee_id,$comment,$invoice_number,$payments,$sale_id=false)
{
if(count($items)==0)
return -1;

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

@@ -76,7 +76,7 @@ if(isset($error))
if(count($cart)==0)
{
?>
<tr><td colspan='7'>
<tr><td colspan='8'>
<div class='warning_message' style='padding:7px;'><?php echo $this->lang->line('sales_no_items_in_cart'); ?></div>
</tr></tr>
<?php