Merge branch 'master' into r700-currency

Conflicts:
	include/class/acc_ledger.class.php
	include/constant.php
	include/export/export_fiche_balance_csv.php
	include/lib/http_input.class.php
	sql/upgrade.sql
This commit is contained in:
Dany De Bontridder 2018-06-17 18:49:14 +02:00
commit 457290f4e2
3 changed files with 7 additions and 3 deletions

View file

@ -1,4 +1,3 @@
-- Bug in 7004 : the amount qp_dep_priv was not saved
CREATE OR REPLACE FUNCTION comptaproc.insert_quant_purchase(p_internal text, p_j_id numeric, p_fiche character varying, p_quant numeric, p_price numeric, p_vat numeric, p_vat_code integer, p_nd_amount numeric, p_nd_tva numeric, p_nd_tva_recup numeric, p_dep_priv numeric, p_client character varying, p_tva_sided numeric, p_price_unit numeric)
RETURNS void
LANGUAGE plpgsql
@ -53,4 +52,5 @@ begin
p_price_unit);
return;
end;
$function$
$function$