فهرست منبع

Retocar pagare decorart

Sebas 5 سال پیش
والد
کامیت
65e4697973
2فایلهای تغییر یافته به همراه210 افزوده شده و 70 حذف شده
  1. 29 29
      models.py
  2. 181 41
      static/src/js/main.js

+ 29 - 29
models.py

@@ -20,52 +20,52 @@ class AccountInvoice(models.Model):
                 'amount_untaxed': invoice.amount_untaxed,
                 'amount_tax': invoice.amount_untaxed,
                 'amount_total': invoice.amount_total,
-				'comment': invoice.comment,
+				'comment': invoice.comment or "",
 
                 # PARTNER INFO
 				'partner_id':[{
 					'id': invoice.partner_id.id,
-					'name': invoice.partner_id.name,
-					'ruc': invoice.partner_id.ruc,
-					'address': invoice.partner_id.street,
-					'city': invoice.partner_id.city,
-					'barrio': invoice.partner_id.street2,
+					'name': invoice.partner_id.name or "",
+					'ruc': invoice.partner_id.ruc or "",
+					'address': invoice.partner_id.street or "",
+					'city': invoice.partner_id.city or "",
+					'barrio': invoice.partner_id.street2 or "",
 					'email': invoice.partner_id.email,
-					'estado_civil': invoice.partner_id.estado_civil,
+					'estado_civil': invoice.partner_id.estado_civil or "",
 	                'phone': invoice.partner_id.phone,
 	                'mobile': invoice.partner_id.mobile,
 					'trab_empresa': invoice.partner_id.trab_empresa,
 					'trab_telefono': invoice.partner_id.trab_telefono,
 					'trab_street': invoice.partner_id.trab_street,
 	                'trab_city': invoice.partner_id.trab_city,
-	                'trab_cargo': invoice.partner_id.trab_cargo,
-					'trab_antiguedad_a': invoice.partner_id.trab_antiguedad_a,
-					'trab_antiguedad_m': invoice.partner_id.trab_antiguedad_m,
-					'casa_propia': invoice.partner_id.casa_propia,
-				    'casa_alquiler': invoice.partner_id.casa_alquiler,
-					'trab_salario': invoice.partner_id.trab_salario,
+	                'trab_cargo': invoice.partner_id.trab_cargo or "",
+					'trab_antiguedad_a': invoice.partner_id.trab_antiguedad_a or "",
+					'trab_antiguedad_m': invoice.partner_id.trab_antiguedad_m or "",
+					'casa_propia': invoice.partner_id.casa_propia or "",
+				    'casa_alquiler': invoice.partner_id.casa_alquiler or "",
+					'trab_salario': invoice.partner_id.trab_salario or "",
 					'conyuge_id':[{
-					        'cony_id': invoice.partner_id.conyuge_id.id,
-							'cony_name': invoice.partner_id.conyuge_id.name,
-							'cony_ruc': invoice.partner_id.conyuge_id.ruc,
-			                'cony_phone': invoice.partner_id.conyuge_id.phone,
-			                'cony_mobile': invoice.partner_id.conyuge_id.mobile,
-							'cony_city': invoice.partner_id.conyuge_id.city,
-							'cony_street': invoice.partner_id.conyuge_id.street,
-			                'cony_trab_empresa': invoice.partner_id.conyuge_id.trab_empresa,
-			                'cony_trab_telefono': invoice.partner_id.conyuge_id.trab_telefono,
+					        'cony_id': invoice.partner_id.conyuge_id.id or "",
+							'cony_name': invoice.partner_id.conyuge_id.name or "",
+							'cony_ruc': invoice.partner_id.conyuge_id.ruc or "",
+			                'cony_phone': invoice.partner_id.conyuge_id.phone or "",
+			                'cony_mobile': invoice.partner_id.conyuge_id.mobile or "",
+							'cony_city': invoice.partner_id.conyuge_id.city or "",
+							'cony_street': invoice.partner_id.conyuge_id.street or "",
+			                'cony_trab_empresa': invoice.partner_id.conyuge_id.trab_empresa or "",
+			                'cony_trab_telefono': invoice.partner_id.conyuge_id.trab_telefono or "",
 					}],
 					'ref_personal_ids': [{
-						'id': refPartner.id,
-						'name': refPartner.name,
-						'phone': refPartner.phone,
-					    'email': refPartner.email,
+						'id': refPartner.id or "",
+						'name': refPartner.name or "",
+						'phone': refPartner.phone or "",
+					    'email': refPartner.email or "",
 					} for refPartner in invoice.partner_id.ref_personal_ids],
 
 					'ref_comercial_ids': [{
-						'id': comPartner.id,
-						'name': comPartner.name,
-						'phone': comPartner.phone,
+						'id': comPartner.id  or "",
+						'name': comPartner.name or "",
+						'phone': comPartner.phone or "",
 					} for comPartner in invoice.partner_id.ref_comercial_ids],
 
 				}],

تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 181 - 41
static/src/js/main.js


برخی فایل ها در این مقایسه diff نمایش داده نمی شوند زیرا تعداد فایل ها بسیار زیاد است