|
@@ -166,7 +166,7 @@ function report_customer_payment (reporting){
|
|
if(desde){
|
|
if(desde){
|
|
var date = desde.split('/')
|
|
var date = desde.split('/')
|
|
date = (date[2]+"-"+date[1]+"-"+date[0]);
|
|
date = (date[2]+"-"+date[1]+"-"+date[0]);
|
|
- domain.push(['date_voucher','>=',date]);
|
|
|
|
|
|
+ domain.push(['date','>=',date]);
|
|
}
|
|
}
|
|
|
|
|
|
if(hasta){
|
|
if(hasta){
|
|
@@ -361,8 +361,8 @@ function report_customer_payment (reporting){
|
|
amount_in: accounting.formatMoney(total_price,'', CurrencyBase.decimal_places, CurrencyBase.thousands_separator, CurrencyBase.decimal_separator),
|
|
amount_in: accounting.formatMoney(total_price,'', CurrencyBase.decimal_places, CurrencyBase.thousands_separator, CurrencyBase.decimal_separator),
|
|
total_comision: accounting.formatMoney(tcomision,'', CurrencyBase.decimal_places, CurrencyBase.thousands_separator, CurrencyBase.decimal_separator),
|
|
total_comision: accounting.formatMoney(tcomision,'', CurrencyBase.decimal_places, CurrencyBase.thousands_separator, CurrencyBase.decimal_separator),
|
|
date: item.date,
|
|
date: item.date,
|
|
- empl_name: self.valorNull(item.employee_id[1]),
|
|
|
|
- employee_name: self.valorNull(item.employee_id2[1]),
|
|
|
|
|
|
+ empl_name: self.valorNull(item.employee_id),
|
|
|
|
+ employee_name: self.valorNull(item.employee_id2),
|
|
journal_id: item.journal_id[0],
|
|
journal_id: item.journal_id[0],
|
|
partner_id: item.partner_id[0],
|
|
partner_id: item.partner_id[0],
|
|
|
|
|