Use today as fallback for invoice date report
issue7453 review45541002
This commit is contained in:
Cédric Krier
@@ -1,3 +1,5 @@
|
||||
* Use today as fallback for invoice date report
|
||||
|
||||
Version 4.8.0 - 2018-04-23
|
||||
* Bug fixes (see mercurial logs for details)
|
||||
* Show invoice payment on Move Line
|
||||
|
||||
+12
-12
@@ -1,24 +1,24 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
|
||||
<office:document xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:rpt="http://openoffice.org/2005/report" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:grddl="http://www.w3.org/2003/g/data-view#" xmlns:officeooo="http://openoffice.org/2009/office" xmlns:tableooo="http://openoffice.org/2009/table" xmlns:drawooo="http://openoffice.org/2010/draw" xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:css3t="http://www.w3.org/TR/css3-text/" office:version="1.2" office:mimetype="application/vnd.oasis.opendocument.text">
|
||||
<office:meta><meta:generator>LibreOffice/5.4.5.1$Linux_X86_64 LibreOffice_project/40m0$Build-1</meta:generator><meta:creation-date>2012-11-15T15:00:35</meta:creation-date><meta:editing-cycles>1</meta:editing-cycles><meta:editing-duration>P0D</meta:editing-duration><meta:document-statistic meta:table-count="5" meta:image-count="0" meta:object-count="0" meta:page-count="6" meta:paragraph-count="118" meta:word-count="313" meta:character-count="3612" meta:non-whitespace-character-count="3417"/><meta:user-defined meta:name="Info 1"/><meta:user-defined meta:name="Info 2"/><meta:user-defined meta:name="Info 3"/><meta:user-defined meta:name="Info 4"/></office:meta>
|
||||
<office:meta><meta:generator>LibreOffice/6.0.3.2$Linux_X86_64 LibreOffice_project/00m0$Build-2</meta:generator><meta:creation-date>2012-11-15T15:00:35</meta:creation-date><meta:editing-cycles>1</meta:editing-cycles><meta:editing-duration>P0D</meta:editing-duration><meta:document-statistic meta:table-count="5" meta:image-count="0" meta:object-count="0" meta:page-count="6" meta:paragraph-count="116" meta:word-count="308" meta:character-count="3548" meta:non-whitespace-character-count="3356"/><meta:user-defined meta:name="Info 1"/><meta:user-defined meta:name="Info 2"/><meta:user-defined meta:name="Info 3"/><meta:user-defined meta:name="Info 4"/></office:meta>
|
||||
<office:settings>
|
||||
<config:config-item-set config:name="ooo:view-settings">
|
||||
<config:config-item config:name="ViewAreaTop" config:type="long">0</config:config-item>
|
||||
<config:config-item config:name="ViewAreaTop" config:type="long">27940</config:config-item>
|
||||
<config:config-item config:name="ViewAreaLeft" config:type="long">0</config:config-item>
|
||||
<config:config-item config:name="ViewAreaWidth" config:type="long">54700</config:config-item>
|
||||
<config:config-item config:name="ViewAreaHeight" config:type="long">26672</config:config-item>
|
||||
<config:config-item config:name="ViewAreaHeight" config:type="long">27571</config:config-item>
|
||||
<config:config-item config:name="ShowRedlineChanges" config:type="boolean">true</config:config-item>
|
||||
<config:config-item config:name="InBrowseMode" config:type="boolean">false</config:config-item>
|
||||
<config:config-item-map-indexed config:name="Views">
|
||||
<config:config-item-map-entry>
|
||||
<config:config-item config:name="ViewId" config:type="string">view2</config:config-item>
|
||||
<config:config-item config:name="ViewLeft" config:type="long">19853</config:config-item>
|
||||
<config:config-item config:name="ViewTop" config:type="long">51310</config:config-item>
|
||||
<config:config-item config:name="ViewLeft" config:type="long">23259</config:config-item>
|
||||
<config:config-item config:name="ViewTop" config:type="long">35426</config:config-item>
|
||||
<config:config-item config:name="VisibleLeft" config:type="long">0</config:config-item>
|
||||
<config:config-item config:name="VisibleTop" config:type="long">0</config:config-item>
|
||||
<config:config-item config:name="VisibleTop" config:type="long">27940</config:config-item>
|
||||
<config:config-item config:name="VisibleRight" config:type="long">54698</config:config-item>
|
||||
<config:config-item config:name="VisibleBottom" config:type="long">26670</config:config-item>
|
||||
<config:config-item config:name="VisibleBottom" config:type="long">55510</config:config-item>
|
||||
<config:config-item config:name="ZoomType" config:type="short">0</config:config-item>
|
||||
<config:config-item config:name="ViewLayoutColumns" config:type="short">1</config:config-item>
|
||||
<config:config-item config:name="ViewLayoutBookMode" config:type="boolean">false</config:config-item>
|
||||
@@ -39,6 +39,7 @@
|
||||
<config:config-item config:name="PrintFaxName" config:type="string"/>
|
||||
<config:config-item config:name="PrintPaperFromSetup" config:type="boolean">false</config:config-item>
|
||||
<config:config-item config:name="PrintTextPlaceholder" config:type="boolean">false</config:config-item>
|
||||
<config:config-item config:name="DisableOffPagePositioning" config:type="boolean">true</config:config-item>
|
||||
<config:config-item config:name="ApplyParagraphMarkFormatToNumbering" config:type="boolean">false</config:config-item>
|
||||
<config:config-item config:name="PrintReversed" config:type="boolean">false</config:config-item>
|
||||
<config:config-item config:name="TabOverMargin" config:type="boolean">false</config:config-item>
|
||||
@@ -71,7 +72,7 @@
|
||||
<config:config-item config:name="InvertBorderSpacing" config:type="boolean">false</config:config-item>
|
||||
<config:config-item config:name="SaveGlobalDocumentLinks" config:type="boolean">false</config:config-item>
|
||||
<config:config-item config:name="TabsRelativeToIndent" config:type="boolean">true</config:config-item>
|
||||
<config:config-item config:name="Rsid" config:type="int">2786566</config:config-item>
|
||||
<config:config-item config:name="Rsid" config:type="int">2903384</config:config-item>
|
||||
<config:config-item config:name="PrintProspectRTL" config:type="boolean">false</config:config-item>
|
||||
<config:config-item config:name="PrintEmptyPages" config:type="boolean">true</config:config-item>
|
||||
<config:config-item config:name="ApplyUserData" config:type="boolean">false</config:config-item>
|
||||
@@ -640,9 +641,7 @@
|
||||
<text:p text:style-name="Standard"><text:soft-page-break/><text:placeholder text:placeholder-type="text"></if></text:placeholder></text:p>
|
||||
<text:p text:style-name="P16">Description: <text:placeholder text:placeholder-type="text"><invoice.description or ''></text:placeholder></text:p>
|
||||
<text:p text:style-name="P16"><text:span text:style-name="T1">Reference</text:span>: <text:placeholder text:placeholder-type="text"><invoice.origins or ''></text:placeholder><text:placeholder text:placeholder-type="text"><', ' if (invoice.reference and invoice.origins) else ''></text:placeholder><text:placeholder text:placeholder-type="text"><invoice.reference or ''></text:placeholder></text:p>
|
||||
<text:p text:style-name="Text_20_body"><text:placeholder text:placeholder-type="text"><if test="invoice.invoice_date"></text:placeholder></text:p>
|
||||
<text:p text:style-name="Text_20_body">Date: <text:placeholder text:placeholder-type="text"><format_date(invoice.invoice_date, invoice.party.lang)></text:placeholder></text:p>
|
||||
<text:p text:style-name="P17"><text:placeholder text:placeholder-type="text"></if></text:placeholder></text:p>
|
||||
<text:p text:style-name="Text_20_body">Date: <text:placeholder text:placeholder-type="text"><format_date(invoice.invoice_date or today, invoice.party.lang)></text:placeholder></text:p>
|
||||
<text:p text:style-name="P17"><text:placeholder text:placeholder-type="text"><if test="invoice.tax_identifier"></text:placeholder></text:p>
|
||||
<text:p text:style-name="Text_20_body"><text:placeholder text:placeholder-type="text"><invoice.tax_identifier.type_string></text:placeholder>: <text:placeholder text:placeholder-type="text"><invoice.tax_identifier.code></text:placeholder></text:p>
|
||||
<text:p text:style-name="Standard"><text:placeholder text:placeholder-type="text"></if></text:placeholder></text:p>
|
||||
@@ -747,9 +746,10 @@
|
||||
<table:covered-table-cell/>
|
||||
<table:covered-table-cell/>
|
||||
<table:table-cell table:style-name="Table1.E8" office:value-type="string">
|
||||
<text:p text:style-name="P10"><text:placeholder text:placeholder-type="text"><format_currency(line.amount, invoice.party.lang, invoice.currency)></text:placeholder><text:soft-page-break/></text:p>
|
||||
<text:p text:style-name="P10"><text:placeholder text:placeholder-type="text"><format_currency(line.amount, invoice.party.lang, invoice.currency)></text:placeholder></text:p>
|
||||
</table:table-cell>
|
||||
</table:table-row>
|
||||
<text:soft-page-break/>
|
||||
<table:table-row>
|
||||
<table:table-cell table:style-name="Table1.A17" table:number-columns-spanned="5" office:value-type="string">
|
||||
<text:p text:style-name="Table_20_Contents"><text:placeholder text:placeholder-type="text"></when></text:placeholder></text:p>
|
||||
|
||||
@@ -2455,8 +2455,11 @@ class InvoiceReport(Report):
|
||||
|
||||
@classmethod
|
||||
def get_context(cls, records, data):
|
||||
pool = Pool()
|
||||
Date = pool.get('ir.date')
|
||||
context = super(InvoiceReport, cls).get_context(records, data)
|
||||
context['invoice'] = context['record']
|
||||
context['today'] = Date.today()
|
||||
return context
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user