-- changed position of ns_log using payment_id
-- do not escape vars when defined in odt template
Merge remote-tracking branch 'intranet-invoices/master'
Merge remote-tracking branch 'intranet-payments/master'