diff --git a/js/main.js b/js/main.js index 20e8699..07d934d 100644 --- a/js/main.js +++ b/js/main.js @@ -1686,6 +1686,34 @@ function questionModal(data, message){ modalPage(true, 0, 0, 'Atenção', message, '', 'question', func); } +//Geração de orçamento avulso +function generateBudget() { + + /** Desabilita o formulário caso esteja oculto */ + $('.collapse').collapse(); + + /** Aplica o foco no campo indicado */ + $('#budget').focus(); + + // /** Limpa o ID caso tenha um edição anterior */ + $('#companies_budgets_id').val(''); + + /** Limpa o valor do reajuste */ + $('#readjustment_value').val(''); + + /** Limpa o valor do reajuste */ + $('#readjustment_index').val(''); + + /** Limpa o valor reajustado */ + $('#readjustment_budget').val(''); + + /** Inicializa o select da categoria */ + $('#financial_categories_id').prop('selectedIndex',0); + + /** Inicializa o select da conta */ + $('#financial_accounts_id').prop('selectedIndex',0); +} + //Marca e desmarca todos os checkboxes de uma tabela function alternarCheckboxes() { diff --git a/vendor/model/CompaniesBudgets.class.php b/vendor/model/CompaniesBudgets.class.php index b3ea9c2..c9bde9f 100644 --- a/vendor/model/CompaniesBudgets.class.php +++ b/vendor/model/CompaniesBudgets.class.php @@ -162,7 +162,7 @@ class CompaniesBudgets cb.often, cb.date_start, cb.description, - u.name_first as responsible + u.name as responsible from companies_budgets cb left join users u on cb.user_id = u.user_id where cb.company_id = :company_id'; diff --git a/vendor/view/companies_budgets/companies_budgets_datagrid.php b/vendor/view/companies_budgets/companies_budgets_datagrid.php index 4675961..6b563d1 100644 --- a/vendor/view/companies_budgets/companies_budgets_datagrid.php +++ b/vendor/view/companies_budgets/companies_budgets_datagrid.php @@ -32,7 +32,7 @@ try{
-