diff --git a/contract/README.rst b/contract/README.rst index f946d8ba5..6b24bfa07 100644 --- a/contract/README.rst +++ b/contract/README.rst @@ -60,8 +60,8 @@ Usage * the recurrence parameters: interval (days, weeks, months, months last day or years), start date, date of next invoice (automatically computed, can be modified) and end date (optional) * auto-price, for having a price automatically obtained from the price list - * #START# or #END# in the description field to display the start/end date of - the invoiced period in the invoice line description + * #START# - #END# or #INVOICEMONTHNAME# in the description field to display + the start/end date or the start month of the invoiced period in the invoice line description * pre-paid (invoice at period start) or post-paid (invoice at start of next period) #. The "Generate Recurring Invoices from Contracts" cron runs daily to generate the invoices. diff --git a/contract/static/description/index.html b/contract/static/description/index.html index bac600a2e..f978fd1ea 100644 --- a/contract/static/description/index.html +++ b/contract/static/description/index.html @@ -407,8 +407,8 @@ user access rights.

  • the recurrence parameters: interval (days, weeks, months, months last day or years), start date, date of next invoice (automatically computed, can be modified) and end date (optional)
  • auto-price, for having a price automatically obtained from the price list
  • -
  • #START# or #END# in the description field to display the start/end date of -the invoiced period in the invoice line description
  • +
  • #START# - #END# or #INVOICEMONTHNAME# in the description field to display +the start/end date or the start month of the invoiced period in the invoice line description
  • pre-paid (invoice at period start) or post-paid (invoice at start of next period)