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 barcode generation (removed whitespace from stock_locations model)

Browse Source 
Fix error in receivings receipt
Update database migration script (needs more review)
This commit is contained in:
jekkos-t520
2014-08-10 17:51:14 +02:00
parent b3b19ab4c5
commit aed9fb8dd7
4 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
application/controllers/receivings.php
View File

@@ -140,6 +140,7 @@ class Receivings extends Secure_area
$data['total']=$this->receiving_lib->get_total();
$data['receipt_title']=$this->lang->line('recvs_receipt');
$data['transaction_time']= date('m/d/Y h:i:s a');
$data['mode']=$this->receiving_lib->get_mode();
$supplier_id=$this->receiving_lib->get_supplier();
$employee_id=$this->Employee->get_logged_in_employee_info()->person_id;
$comment = $this->input->post('comment');

1
application/models/stock_locations.php
View File

@@ -100,4 +100,3 @@ class Stock_locations extends CI_Model
}
}
?>

5
application/views/receivings/receipt.php
View File

@@ -41,7 +41,10 @@ if (isset($error_message))
<tr>
<td><span class='long_name'><?php echo $item['name']; ?></span><span class='short_name'><?php echo character_limiter($item['name'],10); ?></span></td>
<td><?php echo to_currency($item['price']); ?></td>
<td style='text-align:center;'><?php echo $item['quantity']; ?></td>
<td style='text-align:center;'>
<?php
echo $item['quantity'];
?></td>
<td style='text-align:center;'><?php echo $item['discount']; ?></td>
<td style='text-align:right;'><?php echo to_currency($item['price']*$item['quantity']-$item['price']*$item['quantity']*$item['discount']/100); ?></td>
</tr>

4
database/2.2.2_to_2.3.sql
View File

@@ -21,6 +21,8 @@ ALTER TABLE ospos_inventory
ALTER TABLE ospos_items DROP COLUMN location;
INSERT INTO `ospos_stock_locations` ( `deleted` ) VALUES ('0');
ALTER TABLE ospos_receivings_items
ADD COLUMN item_location int(11) NOT NULL,
ADD KEY `item_location` (`item_location`),
@@ -47,8 +49,6 @@ ALTER TABLE ospos_sales_suspended_items
ADD CONSTRAINT `ospos_sales_suspended_items_ibfk_2` FOREIGN KEY (`sale_id`) REFERENCES `ospos_sales_suspended` (`sale_id`),
ADD CONSTRAINT `ospos_sales_suspended_items_ibfk_3` FOREIGN KEY (`item_location`) REFERENCES `ospos_stock_locations` (`location_id`);
INSERT INTO `ospos_stock_locations` ( `deleted` ) VALUES ('0');
ALTER TABLE `ospos_item_quantities`
ADD CONSTRAINT `ospos_item_quantities_ibfk_1` FOREIGN KEY (`item_id`) REFERENCES `ospos_items` (`item_id`),
ADD CONSTRAINT `ospos_item_quantities_ibfk_2` FOREIGN KEY (`location_id`) REFERENCES `ospos_stock_locations` (`location_id`);