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

Detailed sales + receiving fix (#2967)

Browse Source
This commit is contained in:
Jeroen Peelaerts
2020-10-29 21:35:04 +01:00
parent f04ff91f44
commit 47f61e1a30
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
application/models/Receiving.php
View File

@@ -256,13 +256,13 @@ class Receiving extends CI_Model
SELECT
MAX(DATE(receiving_time)) AS receiving_date,
MAX(receiving_time) AS receiving_time,
MAX(receivings_items.receiving_id) AS receiving_id,
receivings_items.receiving_id AS receiving_id,
MAX(comment) AS comment,
MAX(item_location) AS item_location,
MAX(reference) AS reference,
MAX(payment_type) AS payment_type,
MAX(employee_id) AS employee_id,
MAX(items.item_id) AS item_id,
items.item_id AS item_id,
MAX(receivings.supplier_id) AS supplier_id,
MAX(quantity_purchased) AS quantity_purchased,
MAX(receivings_items.receiving_quantity) AS item_receiving_quantity,
@@ -270,7 +270,7 @@ class Receiving extends CI_Model
MAX(item_unit_price) AS item_unit_price,
MAX(discount) AS discount,
MAX(discount_type) AS discount_type,
MAX(receivings_items.line) AS line,
receivings_items.line AS line,
MAX(serialnumber) AS serialnumber,
MAX(receivings_items.description) AS description,
MAX(CASE WHEN receivings_items.discount_type = ' . PERCENT . ' THEN item_unit_price * quantity_purchased * receivings_items.receiving_quantity - item_unit_price * quantity_purchased * receivings_items.receiving_quantity * discount / 100 ELSE item_unit_price * quantity_purchased * receivings_items.receiving_quantity - discount END) AS subtotal,

2
application/models/reports/Detailed_receivings.php
View File

@@ -118,9 +118,9 @@ class Detailed_receivings extends Report
$this->db->select('GROUP_CONCAT(DISTINCT CONCAT_WS(\'_\', definition_id, attribute_decimal) SEPARATOR \'|\') AS attribute_dvalues');
$this->db->join('attribute_links', 'attribute_links.item_id = items.item_id AND attribute_links.receiving_id = receivings_items_temp.receiving_id AND definition_id IN (' . implode(',', $inputs['definition_ids']) . ')', 'left');
$this->db->join('attribute_values', 'attribute_values.attribute_id = attribute_links.attribute_id', 'left');
$this->db->group_by('receivings_items_temp.receiving_id, receivings_items_temp.item_id');
}
$this->db->where('receivings_items_temp.receiving_id', $value['receiving_id']);
$this->db->group_by('receivings_items_temp.receiving_id, receivings_items_temp.item_id');
$data['details'][$key] = $this->db->get()->result_array();
}