|
@@ -75,12 +75,12 @@
|
|
|
var self= this;
|
|
|
var defer = $.Deferred();
|
|
|
var partnerIDS = _.flatten(_.map(self.resPartner, function (item) {
|
|
|
- return item.ref_personal_ids[0];
|
|
|
+ return item.ref_personal_ids;
|
|
|
}));
|
|
|
var fields=['id','name','phone','mobile'];
|
|
|
var domain=[['id','=',partnerIDS]];
|
|
|
var Partner = new openerp.web.Model('res.partner');
|
|
|
- Partner.query(fields).filter(domain).order_by('id').all().then(function(results){
|
|
|
+ Partner.query(fields).filter(domain).all().then(function(results){
|
|
|
defer.resolve(results);
|
|
|
});
|
|
|
return defer;
|
|
@@ -90,12 +90,12 @@
|
|
|
var self= this;
|
|
|
var defer = $.Deferred();
|
|
|
var partnerIDS = _.flatten(_.map(self.resPartner, function (item) {
|
|
|
- return item.ref_comercial_ids[0];
|
|
|
+ return item.ref_comercial_ids;
|
|
|
}));
|
|
|
var fields=['id','name','phone','mobile'];
|
|
|
var domain=[['id','=',partnerIDS]];
|
|
|
var Partner = new openerp.web.Model('res.partner');
|
|
|
- Partner.query(fields).filter(domain).order_by('id').all().then(function(results){
|
|
|
+ Partner.query(fields).filter(domain).all().then(function(results){
|
|
|
defer.resolve(results);
|
|
|
});
|
|
|
return defer;
|
|
@@ -136,8 +136,11 @@
|
|
|
var pdfDoc = new jsPDF();
|
|
|
var resPartner = self.resPartner.shift();
|
|
|
var resConyuge = self.resConyuge;
|
|
|
- var ref_Personal =self.ref_Personal;
|
|
|
- var ref_Comercial=self.ref_Comercial;
|
|
|
+ var ref_Personal = self.ref_Personal;
|
|
|
+ var ref_Comercial = self.ref_Comercial;
|
|
|
+ console.log(resPartner);
|
|
|
+ console.log(ref_Personal);
|
|
|
+ console.log(ref_Comercial);
|
|
|
var fecha = new Date();
|
|
|
// Generar Objeto
|
|
|
doc.push({
|
|
@@ -205,14 +208,16 @@
|
|
|
var y=0;
|
|
|
// si tiene datos personales
|
|
|
if(ref_Personal.length > 0 ){
|
|
|
+ y=135;
|
|
|
for (var i = 0; i < ref_Personal.length; i++) {
|
|
|
item=ref_Personal[i]
|
|
|
- y=135;
|
|
|
- pdfDoc.setFontSize('10');
|
|
|
- pdfDoc.setFontStyle('normal');
|
|
|
- pdfDoc.text(15,y, pdfDoc.splitTextToSize( (i+1)+'.'+self.valorNull(item.name),180));
|
|
|
- pdfDoc.text(130,y, pdfDoc.splitTextToSize('Teléfono: '+self.valorNull(item.phone)+" "+self.valorNull(item.mobile),180));
|
|
|
- y=y+5
|
|
|
+ if (i < 3){
|
|
|
+ pdfDoc.setFontSize('10');
|
|
|
+ pdfDoc.setFontStyle('normal');
|
|
|
+ pdfDoc.text(15,y, pdfDoc.splitTextToSize( (i+1)+'.'+self.valorNull(item.name),180));
|
|
|
+ pdfDoc.text(130,y, pdfDoc.splitTextToSize('Teléfono: '+self.valorNull(item.phone)+" "+self.valorNull(item.mobile),180));
|
|
|
+ y=y+5
|
|
|
+ }
|
|
|
}
|
|
|
}else{
|
|
|
y=135;
|
|
@@ -224,15 +229,16 @@
|
|
|
}
|
|
|
// si tiene datos comerciales
|
|
|
if(ref_Comercial.length > 0 ){
|
|
|
- var y=0;
|
|
|
+ y=155;
|
|
|
for (var i = 0; i < ref_Comercial.length; i++) {
|
|
|
item=ref_Comercial[i]
|
|
|
- y=155;
|
|
|
- pdfDoc.setFontSize('10');
|
|
|
- pdfDoc.setFontStyle('normal');
|
|
|
- pdfDoc.text(15,y, pdfDoc.splitTextToSize( (i+1)+'.'+self.valorNull(item.name),180));
|
|
|
- pdfDoc.text(130,y, pdfDoc.splitTextToSize('Teléfono: '+self.valorNull(item.phone)+" "+self.valorNull(item.mobile),180));
|
|
|
- y=y+5
|
|
|
+ if (i < 3){
|
|
|
+ pdfDoc.setFontSize('10');
|
|
|
+ pdfDoc.setFontStyle('normal');
|
|
|
+ pdfDoc.text(15,y, pdfDoc.splitTextToSize( (i+1)+'.'+self.valorNull(item.name),180));
|
|
|
+ pdfDoc.text(130,y, pdfDoc.splitTextToSize('Teléfono: '+self.valorNull(item.phone)+" "+self.valorNull(item.mobile),180));
|
|
|
+ y=y+5
|
|
|
+ }
|
|
|
}
|
|
|
}else{
|
|
|
y=155;
|
|
@@ -242,7 +248,7 @@
|
|
|
pdfDoc.text(15,y, pdfDoc.splitTextToSize('1. ........................................',180));
|
|
|
pdfDoc.text(130,y, pdfDoc.splitTextToSize('Teléfono: .................................',180));
|
|
|
}
|
|
|
- pdfDoc.output('dataurlnewwindow');
|
|
|
+ pdfDoc.save('SOLICITUD_CREDITO_PERSONAL.pdf');
|
|
|
}
|
|
|
},
|
|
|
});
|