Atualizando arquivos
This commit is contained in:
parent
ffc4bc0a78
commit
f163721666
2 changed files with 8 additions and 8 deletions
|
|
@ -1751,7 +1751,7 @@ function alternarCheckboxes() {
|
|||
$('.collapse').collapse();
|
||||
|
||||
/** Carrega a descrição */
|
||||
$('#description').val(descricoes.join(', '));
|
||||
$('#description').val(descricoes.join(','));
|
||||
|
||||
/** Seleciona o mês */
|
||||
$("#readjustment_month option:contains(" + reajuste + ")").attr('selected', true);
|
||||
|
|
|
|||
14
vendor/model/ProductsCompanies.class.php
vendored
14
vendor/model/ProductsCompanies.class.php
vendored
|
|
@ -122,13 +122,13 @@ class ProductsCompanies
|
|||
/** Consulta SQL */
|
||||
$this->sql = 'SELECT cp.maturity,
|
||||
cp.readjustment,
|
||||
GROUP_CONCAT(cp.product_company_id ORDER BY cp.product_company_id SEPARATOR \', \') AS product_company_ids,
|
||||
GROUP_CONCAT(cp.product_id ORDER BY cp.product_company_id SEPARATOR \', \') AS product_ids,
|
||||
GROUP_CONCAT(cp.description ORDER BY cp.product_company_id SEPARATOR \', \') AS descriptions,
|
||||
GROUP_CONCAT(p.description ORDER BY cp.product_company_id SEPARATOR \', \') AS products,
|
||||
GROUP_CONCAT(p.reference ORDER BY cp.product_company_id SEPARATOR \', \') AS `references`,
|
||||
GROUP_CONCAT(cp.product_value ORDER BY cp.product_company_id SEPARATOR \', \') AS product_values,
|
||||
GROUP_CONCAT(p.type ORDER BY cp.product_company_id SEPARATOR \', \') AS product_types,
|
||||
GROUP_CONCAT(cp.product_company_id ORDER BY cp.product_company_id SEPARATOR \',\') AS product_company_ids,
|
||||
GROUP_CONCAT(cp.product_id ORDER BY cp.product_company_id SEPARATOR \',\') AS product_ids,
|
||||
GROUP_CONCAT(cp.description ORDER BY cp.product_company_id SEPARATOR \',\') AS descriptions,
|
||||
GROUP_CONCAT(p.description ORDER BY cp.product_company_id SEPARATOR \',\') AS products,
|
||||
GROUP_CONCAT(p.reference ORDER BY cp.product_company_id SEPARATOR \',\') AS `references`,
|
||||
GROUP_CONCAT(cp.product_value ORDER BY cp.product_company_id SEPARATOR \',\') AS product_values,
|
||||
GROUP_CONCAT(p.type ORDER BY cp.product_company_id SEPARATOR \',\') AS product_types,
|
||||
SUM(cp.product_value) AS total_product_value
|
||||
FROM
|
||||
products_companies cp
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue