Compare commits
10 Commits
eb910945db
...
ddfdc71944
| Author | SHA1 | Date | |
|---|---|---|---|
| ddfdc71944 | |||
| f0916380a4 | |||
| 47a1d4b240 | |||
| c7f1fa30a2 | |||
| 0c2d8d0f84 | |||
| a77392f7f1 | |||
| 7d19fd32f7 | |||
| 2e51163753 | |||
| f96016e0a5 | |||
| 2c8889af6f |
@@ -45,9 +45,9 @@ class Clientes(models.Model):
|
||||
conteo_mes = models.IntegerField(blank=True,null=True,default=0)
|
||||
def timbres_X_MES(self, mes=None, year=None, PAC=None):
|
||||
today = datetime.date.today()
|
||||
if year is None:
|
||||
if not year:
|
||||
year = today.year
|
||||
if mes==None:
|
||||
if not mes:
|
||||
mes = today.month
|
||||
|
||||
dat = datetime.datetime(int(year),int(mes),1)
|
||||
|
||||
@@ -319,10 +319,11 @@ def export_Excel(request):
|
||||
|
||||
RFC = request.GET.get('RFC', None)
|
||||
mes = request.GET.get('mes',None)
|
||||
year1 = request.GET.get('year', None)
|
||||
|
||||
today = datetime.date.today()
|
||||
month = today.month
|
||||
year = today.year
|
||||
month = mes if mes else today.month
|
||||
year = year1 if year1 else today.year
|
||||
|
||||
if mes is None or mes =='None' or mes=='':
|
||||
mes = month
|
||||
@@ -342,7 +343,7 @@ def export_Excel(request):
|
||||
else:
|
||||
objeto_a_trabajar = Clientes.objects.all()
|
||||
for i,ii in enumerate(objeto_a_trabajar):
|
||||
ii.timbres_X_MES(mes=mes )
|
||||
ii.timbres_X_MES(mes=mes,year=year )
|
||||
|
||||
wb = Workbook()
|
||||
ws = wb.active
|
||||
|
||||
@@ -74,7 +74,9 @@ Timbres disponibles Comercio Digital: {{saldo}}
|
||||
</th>
|
||||
<th>Estado</th>
|
||||
<th scope="col">
|
||||
<a target="_blank" rel="noopener noreferrer" href="{% url 'export_Excel' %}?mes={{mes}}&year={{year}}">Excel Todos los clientes X Mes </a>
|
||||
<a target="_blank" rel="noopener noreferrer" href="{% url 'export_Excel' %}?mes={{mes}}&year={{year}}">Excel Todos los clientes X Mes </a> <br>
|
||||
|
||||
|
||||
</th>
|
||||
</tr>
|
||||
</thead>
|
||||
|
||||
Reference in New Issue
Block a user