Review template file.

template/n68.txt

@@ -11,7 +11,7 @@ ${fill(group.company.party.tax_identifier and group.company.party.tax_identifier
 ${fill('000', 3)}\
 ${fillblank(12)}\
 ${fill('001', 3)}\
-${group.planned_date and group.planned_date.strftime('%d%m%y') or fillblank(6)}\
+${datetime.datetime.now().strftime('%d%m%y') or fillblank(6)}\
 ${fillblank(9)}\
 ${fill(group.journal.confirming_bank_account_number.number.replace(' ', ''), 24)}\
 ${fillblank(30)}
@@ -41,7 +41,7 @@ ${fillblank(24)}
 {% end %}\
 {% if i == 3 %}\
 ${fill('013', 3)}\
-${fill(address.zip or u'', 9)}\
+${fill(address.country and address.country.code != 'ES' and address.zip or u'', 9)}\
 ${fill(address.subdivision and address.subdivision.name or u'', 30)}\
 ${fill(address.country and address.country.name or u'', 20)}\
 ${fillblank(10)}
@@ -49,7 +49,7 @@ ${fillblank(10)}
 {% if i == 4 %}\
 ${fill('014', 3)}\
 ${str(payment.id).zfill(7) + str(int('9000' + str(payment.id)) % 7)}\
-${fill(payment.date.strftime('%d%m%Y'), 8)}\
+${payment.date.strftime('%d%m%Y')}\
 ${format_number(payment.amount, 10, 2)}\
 0\
 ${fillblank(2)}\
@@ -58,9 +58,9 @@ ${fillblank(32)}
 {% end %}\
 {% if i == 5 %}\
 ${fill('015', 3)}\
-${fill(payment.group.number, 8)}\
+${str(payment.id).zfill(7) + str(int('9000' + str(payment.id)) % 7)}\
 ${fill(payment.line.origin.reference or payment.line.origin.number, 12)}\
-${payment.line.date.strftime('%d%m%Y')}\
+${payment.line.origin.invoice_date.strftime('%d%m%Y')}\
 ${format_number(payment.amount, 10, 2)}\
 ${'D' if payment.amount < 0 else 'H' }\
 ${fill(payment.description, 26)}\
@@ -78,4 +78,4 @@ ${fillblank(3)}\
 ${format_number(sum(p.amount for p in group.payments if p.amount), 10, 2)}\
 ${format_number(2 + len(group.payments) * 6, 10, 0)}\
 ${fillblank(42)}\
-${fillblank(5)}\
+${fillblank(5)}