[tryton-debian-vcs] tryton-modules-account-invoice branch debian updated. debian/4.4.2-3-5-g4b53209

Mathias Behrle tryton-debian-vcs at alioth.debian.org
Fri Nov 10 12:06:22 UTC 2017


The following commit has been merged in the debian branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-account-invoice.git;a=commitdiff;h=debian/4.4.2-3-5-g4b53209

commit 4b53209a6d19a2d8abc28919d08388c972f78275
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Tue Nov 7 16:24:36 2017 +0100

    Releasing debian version 4.6.0-1.
    
    Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>

diff --git a/debian/changelog b/debian/changelog
index cc119b6..7f1b8ae 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+tryton-modules-account-invoice (4.6.0-1) unstable; urgency=medium
+
+  * Bump the Standards-Version to 4.1.0, no changes needed.
+  * Bump the Standards-Version to 4.1.1, no changes needed.
+  * Merging upstream version 4.6.0.
+  * Use https in the watch file.
+
+ -- Mathias Behrle <mathiasb at m9s.biz>  Tue, 07 Nov 2017 10:19:48 +0100
+
 tryton-modules-account-invoice (4.4.2-3) unstable; urgency=medium
 
   * Switch to Python3.
commit 4b06fe8b000fb71d481fffd2d25b4e953a480588
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Tue Nov 7 10:16:46 2017 +0100

    Use https in the watch file.

diff --git a/debian/watch b/debian/watch
index 5519e77..118448b 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
 version=3
-opts=pgpsigurlmangle=s/$/.asc/ http://downloads.tryton.org/current/ .*trytond_account_invoice-(\d.*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz))
+opts=pgpsigurlmangle=s/$/.asc/ https://downloads.tryton.org/current/ .*trytond_account_invoice-(\d.*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz))
commit 19985ec56c64aa17cb4246c6d5eba0da3ddd92ec
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Mon Nov 6 14:40:25 2017 +0100

    Merging upstream version 4.6.0.

diff --git a/.drone.yml b/.drone.yml
new file mode 100644
index 0000000..e0bc2f7
--- /dev/null
+++ b/.drone.yml
@@ -0,0 +1,51 @@
+clone:
+    hg:
+        image: plugins/hg
+
+pipeline:
+    tox:
+        image: ${IMAGE}
+        environment:
+            - CFLAGS=-O0
+            - DB_CACHE=/cache
+            - TOX_TESTENV_PASSENV=CFLAGS DB_CACHE
+            - POSTGRESQL_URI=postgresql://postgres@postgresql:5432/
+        commands:
+            - pip install tox
+            - tox -e "${TOXENV}-${DATABASE}"
+        volumes:
+            - cache:/root/.cache
+
+services:
+    postgresql:
+        image: postgres
+        when:
+            matrix:
+                DATABASE: postgresql
+
+matrix:
+    include:
+        - IMAGE: python:2.7
+          TOXENV: py27
+          DATABASE: sqlite
+        - IMAGE: python:2.7
+          TOXENV: py27
+          DATABASE: postgresql
+        - IMAGE: python:3.4
+          TOXENV: py34
+          DATABASE: sqlite
+        - IMAGE: python:3.4
+          TOXENV: py34
+          DATABASE: postgresql
+        - IMAGE: python:3.5
+          TOXENV: py35
+          DATABASE: sqlite
+        - IMAGE: python:3.5
+          TOXENV: py35
+          DATABASE: postgresql
+        - IMAGE: python:3.6
+          TOXENV: py36
+          DATABASE: sqlite
+        - IMAGE: python:3.6
+          TOXENV: py36
+          DATABASE: postgresql
diff --git a/CHANGELOG b/CHANGELOG
index f60a43e..06db1dd 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,8 +1,7 @@
-Version 4.4.2 - 2017-07-01
-* Bug fixes (see mercurial logs for details)
-
-Version 4.4.1 - 2017-06-06
+Version 4.6.0 - 2017-10-30
 * Bug fixes (see mercurial logs for details)
+* Use tax sequence as default value for invoice taxes sequence
+* Add party tax identifier on invoice
 
 Version 4.4.0 - 2017-05-01
 * Bug fixes (see mercurial logs for details)
diff --git a/MANIFEST.in b/MANIFEST.in
index 05c3f79..71b68f1 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -6,7 +6,7 @@ include LICENSE
 include tryton.cfg
 include *.xml
 include view/*.xml
-include *.odt
+include *.fodt
 include locale/*.po
 include doc/*
 include tests/*.rst
diff --git a/PKG-INFO b/PKG-INFO
index 3978aa7..695064f 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
 Metadata-Version: 1.1
 Name: trytond_account_invoice
-Version: 4.4.2
+Version: 4.6.0
 Summary: Tryton module for invoicing
 Home-page: http://www.tryton.org/
 Author: Tryton
 Author-email: issue_tracker at tryton.org
 License: GPL-3
-Download-URL: http://downloads.tryton.org/4.4/
+Download-URL: http://downloads.tryton.org/4.6/
 Description: trytond_account_invoice
         =======================
         
@@ -69,9 +69,9 @@ Classifier: Natural Language :: Slovenian
 Classifier: Natural Language :: Spanish
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 2.7
-Classifier: Programming Language :: Python :: 3.3
 Classifier: Programming Language :: Python :: 3.4
 Classifier: Programming Language :: Python :: 3.5
+Classifier: Programming Language :: Python :: 3.6
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy
 Classifier: Topic :: Office/Business
diff --git a/__init__.py b/__init__.py
index 3969171..911272c 100644
--- a/__init__.py
+++ b/__init__.py
@@ -20,7 +20,6 @@ def register():
         InvoiceLine,
         InvoiceLineTax,
         InvoiceTax,
-        PrintInvoiceWarning,
         PayInvoiceStart,
         PayInvoiceAsk,
         CreditInvoiceStart,
@@ -37,10 +36,10 @@ def register():
         module='account_invoice', type_='model')
     Pool.register(
         TestPaymentTerm,
-        PrintInvoice,
         PayInvoice,
         CreditInvoice,
         PartyReplace,
+        RenewFiscalYear,
         module='account_invoice', type_='wizard')
     Pool.register(
         InvoiceReport,
diff --git a/account.py b/account.py
index 0dfc1ce..4754fc8 100644
--- a/account.py
+++ b/account.py
@@ -1,5 +1,7 @@
 # This file is part of Tryton.  The COPYRIGHT file at the top level of
 # this repository contains the full copyright notices and license terms.
+from collections import OrderedDict
+
 from sql import Literal
 from sql.conditionals import Coalesce
 
@@ -11,7 +13,7 @@ from trytond.transaction import Transaction
 from trytond import backend
 
 __all__ = ['FiscalYear',
-    'Period', 'Move', 'Reconciliation', 'InvoiceSequence']
+    'Period', 'Move', 'Reconciliation', 'InvoiceSequence', 'RenewFiscalYear']
 
 
 class FiscalYear:
@@ -223,3 +225,45 @@ class Reconciliation:
                 ])
         super(Reconciliation, cls).delete(reconciliations)
         Invoice.process(invoices)
+
+
+class RenewFiscalYear:
+    __name__ = 'account.fiscalyear.renew'
+    __metaclass__ = PoolMeta
+
+    @property
+    def invoice_sequence_fields(self):
+        return ['out_invoice_sequence', 'out_credit_note_sequence',
+            'in_invoice_sequence', 'in_credit_note_sequence']
+
+    def create_fiscalyear(self):
+        pool = Pool()
+        Sequence = pool.get('ir.sequence.strict')
+        InvoiceSequence = pool.get('account.fiscalyear.invoice_sequence')
+        fiscalyear = super(RenewFiscalYear, self).create_fiscalyear()
+        if not self.start.reset_sequences:
+            return fiscalyear
+        sequences = OrderedDict()
+        for invoice_sequence in fiscalyear.invoice_sequences:
+            for field in self.invoice_sequence_fields:
+                sequence = getattr(invoice_sequence, field, None)
+                sequences[sequence.id] = sequence
+        copies = Sequence.copy(sequences.values(), default={
+                'next_number': 1,
+                })
+
+        mapping = {}
+        for previous_id, new_sequence in zip(sequences.keys(), copies):
+            mapping[previous_id] = new_sequence.id
+        to_write = []
+        for new_sequence, old_sequence in zip(
+                fiscalyear.invoice_sequences,
+                self.start.previous_fiscalyear.invoice_sequences):
+            values = {}
+            for field in self.invoice_sequence_fields:
+                sequence = getattr(old_sequence, field, None)
+                values[field] = mapping[sequence.id]
+            to_write.extend(([new_sequence], values))
+        if to_write:
+            InvoiceSequence.write(*to_write)
+        return fiscalyear
diff --git a/doc/index.rst b/doc/index.rst
index 12d2148..d8a4ec5 100644
--- a/doc/index.rst
+++ b/doc/index.rst
@@ -18,6 +18,7 @@ There are 4 types of invoice: *Invoice*, *Supplier Invoice*, *Credit Note* and
 - Reference: The optional external reference of the invoice.
 - Party: The party for which or from which the invoice is issued.
 - Invoice Address: The address of the party.
+- Party Tax Identifier: The tax identifier of the party.
 - Description: An optional description of the invoice.
 - Comment: A text fields to add custom comments.
 - Invoice Date: The date of the invoice. It is set on posting the invoice if not.
diff --git a/invoice.fodt b/invoice.fodt
new file mode 100644
index 0000000..6a49836
--- /dev/null
+++ b/invoice.fodt
@@ -0,0 +1,989 @@
+<?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.1.6.2$Linux_X86_64 LibreOffice_project/10m0$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="113" meta:word-count="304" meta:character-count="3539" meta:non-whitespace-character-count="3348"/><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">89958</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">28665</config:config-item>
+   <config:config-item config:name="ViewAreaHeight" config:type="long">11755</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">6835</config:config-item>
+     <config:config-item config:name="ViewTop" config:type="long">97846</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">89958</config:config-item>
+     <config:config-item config:name="VisibleRight" config:type="long">28663</config:config-item>
+     <config:config-item config:name="VisibleBottom" config:type="long">101711</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>
+     <config:config-item config:name="ZoomFactor" config:type="short">120</config:config-item>
+     <config:config-item config:name="IsSelectedFrame" config:type="boolean">false</config:config-item>
+    </config:config-item-map-entry>
+   </config:config-item-map-indexed>
+  </config:config-item-set>
+  <config:config-item-set config:name="ooo:configuration-settings">
+   <config:config-item config:name="PrintProspect" config:type="boolean">false</config:config-item>
+   <config:config-item config:name="PrintLeftPages" config:type="boolean">true</config:config-item>
+   <config:config-item config:name="PrintPageBackground" config:type="boolean">true</config:config-item>
+   <config:config-item config:name="PrintControls" config:type="boolean">true</config:config-item>
+   <config:config-item config:name="PrintAnnotationMode" config:type="short">0</config:config-item>
+   <config:config-item config:name="PrintGraphics" config:type="boolean">true</config:config-item>
+   <config:config-item config:name="PrintRightPages" config:type="boolean">true</config:config-item>
+   <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="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>
+   <config:config-item config:name="EmbedFonts" config:type="boolean">false</config:config-item>
+   <config:config-item config:name="SurroundTextWrapSmall" config:type="boolean">false</config:config-item>
+   <config:config-item config:name="BackgroundParaOverDrawings" config:type="boolean">false</config:config-item>
+   <config:config-item config:name="ClippedPictures" config:type="boolean">false</config:config-item>
+   <config:config-item config:name="FloattableNomargins" config:type="boolean">false</config:config-item>
+   <config:config-item config:name="UnbreakableNumberings" config:type="boolean">false</config:config-item>
+   <config:config-item config:name="EmbedSystemFonts" config:type="boolean">false</config:config-item>
+   <config:config-item config:name="TabOverflow" config:type="boolean">false</config:config-item>
+   <config:config-item config:name="PrintTables" config:type="boolean">true</config:config-item>
+   <config:config-item config:name="PrintSingleJobs" config:type="boolean">false</config:config-item>
+   <config:config-item config:name="SmallCapsPercentage66" config:type="boolean">true</config:config-item>
+   <config:config-item config:name="CollapseEmptyCellPara" config:type="boolean">true</config:config-item>
+   <config:config-item config:name="MathBaselineAlignment" config:type="boolean">false</config:config-item>
+   <config:config-item config:name="AddFrameOffsets" config:type="boolean">false</config:config-item>
+   <config:config-item config:name="IsLabelDocument" config:type="boolean">false</config:config-item>
+   <config:config-item config:name="PrinterName" config:type="string"/>
+   <config:config-item config:name="OutlineLevelYieldsNumbering" config:type="boolean">false</config:config-item>
+   <config:config-item config:name="IgnoreFirstLineIndentInNumbering" config:type="boolean">false</config:config-item>
+   <config:config-item config:name="UpdateFromTemplate" config:type="boolean">true</config:config-item>
+   <config:config-item config:name="PrintBlackFonts" config:type="boolean">false</config:config-item>
+   <config:config-item config:name="TableRowKeep" config:type="boolean">false</config:config-item>
+   <config:config-item config:name="EmbeddedDatabaseName" config:type="string"/>
+   <config:config-item config:name="IgnoreTabsAndBlanksForLineCalculation" config:type="boolean">false</config:config-item>
+   <config:config-item config:name="UseOldPrinterMetrics" config:type="boolean">false</config:config-item>
+   <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">2522830</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>
+   <config:config-item config:name="PrintHiddenText" config:type="boolean">false</config:config-item>
+   <config:config-item config:name="AddParaTableSpacingAtStart" config:type="boolean">true</config:config-item>
+   <config:config-item config:name="FieldAutoUpdate" config:type="boolean">true</config:config-item>
+   <config:config-item config:name="UseOldNumbering" config:type="boolean">false</config:config-item>
+   <config:config-item config:name="AddParaTableSpacing" config:type="boolean">true</config:config-item>
+   <config:config-item config:name="CharacterCompressionType" config:type="short">0</config:config-item>
+   <config:config-item config:name="SaveVersionOnClose" config:type="boolean">false</config:config-item>
+   <config:config-item config:name="ChartAutoUpdate" config:type="boolean">true</config:config-item>
+   <config:config-item config:name="PrinterIndependentLayout" config:type="string">high-resolution</config:config-item>
+   <config:config-item config:name="IsKernAsianPunctuation" config:type="boolean">false</config:config-item>
+   <config:config-item config:name="UseFormerObjectPositioning" config:type="boolean">false</config:config-item>
+   <config:config-item config:name="AddVerticalFrameOffsets" config:type="boolean">false</config:config-item>
+   <config:config-item config:name="SubtractFlysAnchoredAtFlys" config:type="boolean">true</config:config-item>
+   <config:config-item config:name="AddParaSpacingToTableCells" config:type="boolean">true</config:config-item>
+   <config:config-item config:name="AddExternalLeading" config:type="boolean">true</config:config-item>
+   <config:config-item config:name="CurrentDatabaseDataSource" config:type="string"/>
+   <config:config-item config:name="AllowPrintJobCancel" config:type="boolean">true</config:config-item>
+   <config:config-item config:name="ProtectForm" config:type="boolean">false</config:config-item>
+   <config:config-item config:name="UseFormerLineSpacing" config:type="boolean">false</config:config-item>
+   <config:config-item config:name="PrintDrawings" config:type="boolean">true</config:config-item>
+   <config:config-item config:name="UseFormerTextWrapping" config:type="boolean">false</config:config-item>
+   <config:config-item config:name="UnxForceZeroExtLeading" config:type="boolean">false</config:config-item>
+   <config:config-item config:name="TabAtLeftIndentForParagraphsInList" config:type="boolean">false</config:config-item>
+   <config:config-item config:name="RedlineProtectionKey" config:type="base64Binary"/>
+   <config:config-item config:name="PropLineSpacingShrinksFirstLine" config:type="boolean">false</config:config-item>
+   <config:config-item config:name="ConsiderTextWrapOnObjPos" config:type="boolean">false</config:config-item>
+   <config:config-item config:name="RsidRoot" config:type="int">882034</config:config-item>
+   <config:config-item config:name="StylesNoDefault" config:type="boolean">false</config:config-item>
+   <config:config-item config:name="LinkUpdateMode" config:type="short">1</config:config-item>
+   <config:config-item config:name="AlignTabStopPosition" config:type="boolean">true</config:config-item>
+   <config:config-item config:name="DoNotJustifyLinesWithManualBreak" config:type="boolean">false</config:config-item>
+   <config:config-item config:name="DoNotResetParaAttrsForNumFont" config:type="boolean">false</config:config-item>
+   <config:config-item config:name="CurrentDatabaseCommandType" config:type="int">0</config:config-item>
+   <config:config-item config:name="LoadReadonly" config:type="boolean">false</config:config-item>
+   <config:config-item config:name="DoNotCaptureDrawObjsOnPage" config:type="boolean">false</config:config-item>
+   <config:config-item config:name="CurrentDatabaseCommand" config:type="string"/>
+   <config:config-item config:name="PrinterSetup" config:type="base64Binary"/>
+   <config:config-item config:name="ClipAsCharacterAnchoredWriterFlyFrames" config:type="boolean">false</config:config-item>
+  </config:config-item-set>
+ </office:settings>
+ <office:scripts>
+  <office:script script:language="ooo:Basic">
+   <ooo:libraries xmlns:ooo="http://openoffice.org/2004/office" xmlns:xlink="http://www.w3.org/1999/xlink"/>
+  </office:script>
+ </office:scripts>
+ <office:font-face-decls>
+  <style:font-face style:name="StarSymbol" svg:font-family="StarSymbol"/>
+  <style:font-face style:name="Liberation Serif2" svg:font-family="'Liberation Serif'" style:font-family-generic="roman" style:font-pitch="variable"/>
+  <style:font-face style:name="Liberation Serif1" svg:font-family="'Liberation Serif'" style:font-adornments="Bold" style:font-family-generic="roman" style:font-pitch="variable"/>
+  <style:font-face style:name="Liberation Serif" svg:font-family="'Liberation Serif'" style:font-adornments="Regular" style:font-family-generic="roman" style:font-pitch="variable"/>
+  <style:font-face style:name="Thorndale AMT" svg:font-family="'Thorndale AMT'" style:font-family-generic="roman" style:font-pitch="variable"/>
+  <style:font-face style:name="Liberation Sans1" svg:font-family="'Liberation Sans'" style:font-family-generic="swiss" style:font-pitch="variable"/>
+  <style:font-face style:name="Liberation Sans" svg:font-family="'Liberation Sans'" style:font-adornments="Regular" style:font-family-generic="swiss" style:font-pitch="variable"/>
+  <style:font-face style:name="Andale Sans UI" svg:font-family="'Andale Sans UI'" style:font-family-generic="system" style:font-pitch="variable"/>
+  <style:font-face style:name="DejaVu Sans" svg:font-family="'DejaVu Sans'" style:font-family-generic="system" style:font-pitch="variable"/>
+ </office:font-face-decls>
+ <office:styles>
+  <style:default-style style:family="graphic">
+   <style:graphic-properties svg:stroke-color="#000000" draw:fill-color="#99ccff" fo:wrap-option="no-wrap" draw:shadow-offset-x="0.1181in" draw:shadow-offset-y="0.1181in" draw:start-line-spacing-horizontal="0.1114in" draw:start-line-spacing-vertical="0.1114in" draw:end-line-spacing-horizontal="0.1114in" draw:end-line-spacing-vertical="0.1114in" style:flow-with-text="false"/>
+   <style:paragraph-properties style:text-autospace="ideograph-alpha" style:line-break="strict" style:writing-mode="lr-tb" style:font-independent-line-spacing="false">
+    <style:tab-stops/>
+   </style:paragraph-properties>
+   <style:text-properties style:use-window-font-color="true" style:font-name="Thorndale AMT" fo:font-size="12pt" fo:language="en" fo:country="US" style:letter-kerning="true" style:font-name-asian="Andale Sans UI" style:font-size-asian="10.5pt" style:language-asian="zxx" style:country-asian="none" style:font-name-complex="Andale Sans UI" style:font-size-complex="12pt" style:language-complex="zxx" style:country-complex="none"/>
+  </style:default-style>
+  <style:default-style style:family="paragraph">
+   <style:paragraph-properties fo:hyphenation-ladder-count="no-limit" style:text-autospace="ideograph-alpha" style:punctuation-wrap="hanging" style:line-break="strict" style:tab-stop-distance="0.4925in" style:writing-mode="lr-tb"/>
+   <style:text-properties style:use-window-font-color="true" style:font-name="Thorndale AMT" fo:font-size="12pt" fo:language="en" fo:country="US" style:letter-kerning="true" style:font-name-asian="Andale Sans UI" style:font-size-asian="10.5pt" style:language-asian="zxx" style:country-asian="none" style:font-name-complex="Andale Sans UI" style:font-size-complex="12pt" style:language-complex="zxx" style:country-complex="none" fo:hyphenate="false" fo:hyphenation-remain-char-count="2" fo:hyphenation-push-char-count="2"/>
+  </style:default-style>
+  <style:default-style style:family="table">
+   <style:table-properties table:border-model="collapsing"/>
+  </style:default-style>
+  <style:default-style style:family="table-row">
+   <style:table-row-properties fo:keep-together="auto"/>
+  </style:default-style>
+  <style:style style:name="Standard" style:family="paragraph" style:class="text">
+   <style:text-properties style:font-name="Liberation Sans" fo:font-family="'Liberation Sans'" style:font-style-name="Regular" style:font-family-generic="swiss" style:font-pitch="variable" style:font-size-asian="10.5pt"/>
+  </style:style>
+  <style:style style:name="Heading" style:family="paragraph" style:parent-style-name="Standard" style:next-style-name="Text_20_body" style:class="text">
+   <style:paragraph-properties fo:margin-top="0.1665in" fo:margin-bottom="0.0835in" loext:contextual-spacing="false" fo:keep-with-next="always"/>
+   <style:text-properties style:font-name="Liberation Serif" fo:font-family="'Liberation Serif'" style:font-style-name="Regular" style:font-family-generic="roman" style:font-pitch="variable" fo:font-size="16pt" style:font-name-asian="DejaVu Sans" style:font-family-asian="'DejaVu Sans'" style:font-family-generic-asian="system" style:font-pitch-asian="variable" style:font-size-asian="14pt" style:font-name-complex="DejaVu Sans" style:font-family-complex="'DejaVu Sans'" style:font-family-generic-complex="system" style:font-pitch-complex="variable" style:font-size-complex="14pt"/>
+  </style:style>
+  <style:style style:name="Text_20_body" style:display-name="Text body" style:family="paragraph" style:parent-style-name="Standard" style:class="text">
+   <style:paragraph-properties fo:margin-top="0in" fo:margin-bottom="0.0835in" loext:contextual-spacing="false"/>
+   <style:text-properties style:font-name="Liberation Sans" fo:font-family="'Liberation Sans'" style:font-style-name="Regular" style:font-family-generic="swiss" style:font-pitch="variable" style:font-size-asian="10.5pt"/>
+  </style:style>
+  <style:style style:name="List" style:family="paragraph" style:parent-style-name="Text_20_body" style:class="list">
+   <style:text-properties style:font-size-asian="12pt"/>
+  </style:style>
+  <style:style style:name="Caption" style:family="paragraph" style:parent-style-name="Standard" style:class="extra">
+   <style:paragraph-properties fo:margin-top="0.0835in" fo:margin-bottom="0.0835in" loext:contextual-spacing="false" text:number-lines="false" text:line-number="0"/>
+   <style:text-properties fo:font-size="12pt" fo:font-style="italic" style:font-size-asian="12pt" style:font-style-asian="italic" style:font-size-complex="12pt" style:font-style-complex="italic"/>
+  </style:style>
+  <style:style style:name="Index" style:family="paragraph" style:parent-style-name="Standard" style:class="index">
+   <style:paragraph-properties text:number-lines="false" text:line-number="0"/>
+   <style:text-properties style:font-size-asian="12pt"/>
+  </style:style>
+  <style:style style:name="Heading_20_1" style:display-name="Heading 1" style:family="paragraph" style:parent-style-name="Heading" style:next-style-name="Text_20_body" style:class="text">
+   <style:text-properties fo:font-size="16pt" fo:font-weight="bold" style:font-size-asian="115%" style:font-weight-asian="bold" style:font-size-complex="115%" style:font-weight-complex="bold"/>
+  </style:style>
+  <style:style style:name="Table_20_Contents" style:display-name="Table Contents" style:family="paragraph" style:parent-style-name="Standard" style:class="extra">
+   <style:paragraph-properties text:number-lines="false" text:line-number="0"/>
+   <style:text-properties style:font-size-asian="10.5pt"/>
+  </style:style>
+  <style:style style:name="Table_20_Heading" style:display-name="Table Heading" style:family="paragraph" style:parent-style-name="Table_20_Contents" style:class="extra" style:master-page-name="">
+   <style:paragraph-properties fo:text-align="center" style:justify-single-word="false" style:page-number="auto" text:number-lines="false" text:line-number="0"/>
+   <style:text-properties style:font-name="Liberation Serif1" fo:font-family="'Liberation Serif'" style:font-style-name="Bold" style:font-family-generic="roman" style:font-pitch="variable" fo:font-weight="bold" style:font-size-asian="10.5pt" style:font-weight-asian="bold" style:font-weight-complex="bold"/>
+  </style:style>
+  <style:style style:name="Heading_20_2" style:display-name="Heading 2" style:family="paragraph" style:parent-style-name="Heading" style:next-style-name="Text_20_body" style:class="text">
+   <style:text-properties fo:font-size="14pt" fo:font-style="italic" fo:font-weight="bold" style:font-size-asian="14pt" style:font-style-asian="italic" style:font-weight-asian="bold" style:font-size-complex="14pt" style:font-style-complex="italic" style:font-weight-complex="bold"/>
+  </style:style>
+  <style:style style:name="Heading_20_3" style:display-name="Heading 3" style:family="paragraph" style:parent-style-name="Heading" style:next-style-name="Text_20_body" style:class="text">
+   <style:text-properties fo:font-size="14pt" fo:font-weight="bold" style:font-size-asian="14pt" style:font-weight-asian="bold" style:font-size-complex="14pt" style:font-weight-complex="bold"/>
+  </style:style>
+  <style:style style:name="Header" style:family="paragraph" style:parent-style-name="Standard" style:class="extra">
+   <style:paragraph-properties text:number-lines="false" text:line-number="0">
+    <style:tab-stops>
+     <style:tab-stop style:position="3.4626in" style:type="center"/>
+     <style:tab-stop style:position="6.9252in" style:type="right"/>
+    </style:tab-stops>
+   </style:paragraph-properties>
+   <style:text-properties fo:font-size="9pt" style:font-size-asian="10.5pt"/>
+  </style:style>
+  <style:style style:name="Footer" style:family="paragraph" style:parent-style-name="Standard" style:class="extra">
+   <style:paragraph-properties text:number-lines="false" text:line-number="0">
+    <style:tab-stops>
+     <style:tab-stop style:position="3.4626in" style:type="center"/>
+     <style:tab-stop style:position="6.9252in" style:type="right"/>
+    </style:tab-stops>
+   </style:paragraph-properties>
+   <style:text-properties fo:font-size="9pt" style:font-size-asian="10.5pt"/>
+  </style:style>
+  <style:style style:name="Text_20_body_20_indent" style:display-name="Text body indent" style:family="paragraph" style:parent-style-name="Text_20_body" style:class="text">
+   <style:paragraph-properties fo:margin-left="0.1965in" fo:margin-right="0in" fo:margin-top="0in" fo:margin-bottom="0in" loext:contextual-spacing="false" fo:text-indent="0in" style:auto-text-indent="false"/>
+  </style:style>
+  <style:style style:name="Text" style:family="paragraph" style:parent-style-name="Caption" style:class="extra"/>
+  <style:style style:name="Quotations" style:family="paragraph" style:parent-style-name="Standard" style:class="html">
+   <style:paragraph-properties fo:margin-left="0.3937in" fo:margin-right="0.3937in" fo:margin-top="0in" fo:margin-bottom="0.1965in" loext:contextual-spacing="false" fo:text-indent="0in" style:auto-text-indent="false"/>
+  </style:style>
+  <style:style style:name="Title" style:family="paragraph" style:parent-style-name="Heading" style:next-style-name="Text_20_body" style:class="chapter">
+   <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
+   <style:text-properties fo:font-size="28pt" fo:font-weight="bold" style:font-size-asian="28pt" style:font-weight-asian="bold" style:font-size-complex="28pt" style:font-weight-complex="bold"/>
+  </style:style>
+  <style:style style:name="Subtitle" style:family="paragraph" style:parent-style-name="Heading" style:next-style-name="Text_20_body" style:class="chapter">
+   <style:paragraph-properties fo:margin-top="0.0417in" fo:margin-bottom="0.0835in" loext:contextual-spacing="false" fo:text-align="center" style:justify-single-word="false"/>
+   <style:text-properties fo:font-size="18pt" style:font-size-asian="18pt" style:font-size-complex="18pt"/>
+  </style:style>
+  <style:style style:name="Placeholder" style:family="text">
+   <style:text-properties fo:font-variant="small-caps" fo:color="#008080" style:text-underline-style="dotted" style:text-underline-width="auto" style:text-underline-color="font-color"/>
+  </style:style>
+  <style:style style:name="Bullet_20_Symbols" style:display-name="Bullet Symbols" style:family="text">
+   <style:text-properties style:font-name="StarSymbol" fo:font-family="StarSymbol" fo:font-size="9pt" style:font-name-asian="StarSymbol" style:font-family-asian="StarSymbol" style:font-size-asian="9pt" style:font-name-complex="StarSymbol" style:font-family-complex="StarSymbol" style:font-size-complex="9pt"/>
+  </style:style>
+  <text:outline-style style:name="Outline">
+   <text:outline-level-style text:level="1" style:num-format="">
+    <style:list-level-properties text:min-label-distance="0.15in"/>
+   </text:outline-level-style>
+   <text:outline-level-style text:level="2" style:num-format="">
+    <style:list-level-properties text:min-label-distance="0.15in"/>
+   </text:outline-level-style>
+   <text:outline-level-style text:level="3" style:num-format="">
+    <style:list-level-properties text:min-label-distance="0.15in"/>
+   </text:outline-level-style>
+   <text:outline-level-style text:level="4" style:num-format="">
+    <style:list-level-properties text:min-label-distance="0.15in"/>
+   </text:outline-level-style>
+   <text:outline-level-style text:level="5" style:num-format="">
+    <style:list-level-properties text:min-label-distance="0.15in"/>
+   </text:outline-level-style>
+   <text:outline-level-style text:level="6" style:num-format="">
+    <style:list-level-properties text:min-label-distance="0.15in"/>
+   </text:outline-level-style>
+   <text:outline-level-style text:level="7" style:num-format="">
+    <style:list-level-properties text:min-label-distance="0.15in"/>
+   </text:outline-level-style>
+   <text:outline-level-style text:level="8" style:num-format="">
+    <style:list-level-properties text:min-label-distance="0.15in"/>
+   </text:outline-level-style>
+   <text:outline-level-style text:level="9" style:num-format="">
+    <style:list-level-properties text:min-label-distance="0.15in"/>
+   </text:outline-level-style>
+   <text:outline-level-style text:level="10" style:num-format="">
+    <style:list-level-properties text:min-label-distance="0.15in"/>
+   </text:outline-level-style>
+  </text:outline-style>
+  <text:notes-configuration text:note-class="footnote" style:num-format="1" text:start-value="0" text:footnotes-position="page" text:start-numbering-at="document"/>
+  <text:notes-configuration text:note-class="endnote" style:num-format="i" text:start-value="0"/>
+  <text:linenumbering-configuration text:number-lines="false" text:offset="0.1965in" style:num-format="1" text:number-position="left" text:increment="5"/>
+ </office:styles>
+ <office:automatic-styles>
+  <style:style style:name="Table1" style:family="table">
+   <style:table-properties style:width="6.9243in" table:align="left"/>
+  </style:style>
+  <style:style style:name="Table1.A" style:family="table-column">
+   <style:table-column-properties style:column-width="2.741in"/>
+  </style:style>
+  <style:style style:name="Table1.B" style:family="table-column">
+   <style:table-column-properties style:column-width="1.0458in"/>
+  </style:style>
+  <style:style style:name="Table1.A1" style:family="table-cell">
+   <style:table-cell-properties fo:background-color="#cccccc" fo:padding="0.0382in" fo:border-left="0.05pt solid #000000" fo:border-right="none" fo:border-top="0.05pt solid #000000" fo:border-bottom="0.05pt solid #000000">
+    <style:background-image/>
+   </style:table-cell-properties>
+  </style:style>
+  <style:style style:name="Table1.E1" style:family="table-cell">
+   <style:table-cell-properties fo:background-color="#cccccc" fo:padding="0.0382in" fo:border="0.05pt solid #000000">
+    <style:background-image/>
+   </style:table-cell-properties>
+  </style:style>
+  <style:style style:name="Table1.A2" style:family="table-cell">
+   <style:table-cell-properties fo:padding="0.0382in" fo:border-left="0.05pt solid #000000" fo:border-right="0.05pt solid #000000" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
+  </style:style>
+  <style:style style:name="Table1.A3" style:family="table-cell">
+   <style:table-cell-properties fo:padding="0.0382in" fo:border-left="0.05pt solid #000000" fo:border-right="0.05pt solid #000000" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
+  </style:style>
+  <style:style style:name="Table1.A4" style:family="table-cell">
+   <style:table-cell-properties fo:padding="0.0382in" fo:border-left="0.05pt solid #000000" fo:border-right="0.05pt solid #000000" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
+  </style:style>
+  <style:style style:name="Table1.A5" style:family="table-cell">
+   <style:table-cell-properties fo:padding="0.0382in" fo:border-left="0.05pt solid #000000" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
+  </style:style>
+  <style:style style:name="Table1.B5" style:family="table-cell">
+   <style:table-cell-properties fo:padding="0.0382in" fo:border-left="0.05pt solid #000000" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
+  </style:style>
+  <style:style style:name="Table1.C5" style:family="table-cell">
+   <style:table-cell-properties fo:padding="0.0382in" fo:border-left="0.05pt solid #000000" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
+  </style:style>
+  <style:style style:name="Table1.D5" style:family="table-cell">
+   <style:table-cell-properties fo:padding="0.0382in" fo:border-left="0.05pt solid #000000" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
+  </style:style>
+  <style:style style:name="Table1.E5" style:family="table-cell">
+   <style:table-cell-properties fo:padding="0.0382in" fo:border-left="0.05pt solid #000000" fo:border-right="0.05pt solid #000000" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
+  </style:style>
+  <style:style style:name="Table1.A6" style:family="table-cell">
+   <style:table-cell-properties fo:padding="0.0382in" fo:border-left="0.05pt solid #000000" fo:border-right="0.05pt solid #000000" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
+  </style:style>
+  <style:style style:name="Table1.A7" style:family="table-cell">
+   <style:table-cell-properties fo:padding="0.0382in" fo:border-left="0.05pt solid #000000" fo:border-right="0.05pt solid #000000" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
+  </style:style>
+  <style:style style:name="Table1.A8" style:family="table-cell">
+   <style:table-cell-properties fo:padding="0.0382in" fo:border-left="0.05pt solid #000000" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
+  </style:style>
+  <style:style style:name="Table1.E8" style:family="table-cell">
+   <style:table-cell-properties fo:padding="0.0382in" fo:border-left="0.05pt solid #000000" fo:border-right="0.05pt solid #000000" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
+  </style:style>
+  <style:style style:name="Table1.A9" style:family="table-cell">
+   <style:table-cell-properties fo:padding="0.0382in" fo:border-left="0.05pt solid #000000" fo:border-right="0.05pt solid #000000" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
+  </style:style>
+  <style:style style:name="Table1.A10" style:family="table-cell">
+   <style:table-cell-properties fo:padding="0.0382in" fo:border-left="0.05pt solid #000000" fo:border-right="0.05pt solid #000000" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
+  </style:style>
+  <style:style style:name="Table1.A11" style:family="table-cell">
+   <style:table-cell-properties fo:background-color="#e6e6e6" fo:padding="0.0382in" fo:border-left="0.05pt solid #000000" fo:border-right="0.05pt solid #000000" fo:border-top="none" fo:border-bottom="0.05pt solid #000000">
+    <style:background-image/>
+   </style:table-cell-properties>
+  </style:style>
+  <style:style style:name="Table1.A12" style:family="table-cell">
+   <style:table-cell-properties fo:padding="0.0382in" fo:border-left="0.05pt solid #000000" fo:border-right="0.05pt solid #000000" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
+  </style:style>
+  <style:style style:name="Table1.A13" style:family="table-cell">
+   <style:table-cell-properties fo:padding="0.0382in" fo:border-left="0.05pt solid #000000" fo:border-right="0.05pt solid #000000" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
+  </style:style>
+  <style:style style:name="Table1.A14" style:family="table-cell">
+   <style:table-cell-properties fo:padding="0.0382in" fo:border-left="0.05pt solid #000000" fo:border-right="0.05pt solid #000000" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
+  </style:style>
+  <style:style style:name="Table1.A15" style:family="table-cell">
+   <style:table-cell-properties fo:padding="0.0382in" fo:border-left="0.05pt solid #000000" fo:border-right="0.05pt solid #000000" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
+  </style:style>
+  <style:style style:name="Table1.A16" style:family="table-cell">
+   <style:table-cell-properties fo:padding="0.0382in" fo:border-left="0.05pt solid #000000" fo:border-right="0.05pt solid #000000" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
+  </style:style>
+  <style:style style:name="Table1.A17" style:family="table-cell">
+   <style:table-cell-properties fo:padding="0.0382in" fo:border-left="0.05pt solid #000000" fo:border-right="0.05pt solid #000000" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
+  </style:style>
+  <style:style style:name="Table2" style:family="table">
+   <style:table-properties style:width="6.925in" table:align="margins" style:may-break-between-rows="false"/>
+  </style:style>
+  <style:style style:name="Table2.A" style:family="table-column">
+   <style:table-column-properties style:column-width="3.4625in" style:rel-column-width="32767*"/>
+  </style:style>
+  <style:style style:name="Table2.B" style:family="table-column">
+   <style:table-column-properties style:column-width="3.4625in" style:rel-column-width="32768*"/>
+  </style:style>
+  <style:style style:name="Table3" style:family="table">
+   <style:table-properties style:width="2.7396in" table:align="left"/>
+  </style:style>
+  <style:style style:name="Table3.A" style:family="table-column">
+   <style:table-column-properties style:column-width="0.9132in"/>
+  </style:style>
+  <style:style style:name="Table3.A1" style:family="table-cell">
+   <style:table-cell-properties fo:background-color="#cccccc" fo:padding="0.0382in" fo:border-left="0.05pt solid #000000" fo:border-right="none" fo:border-top="0.05pt solid #000000" fo:border-bottom="0.05pt solid #000000">
+    <style:background-image/>
+   </style:table-cell-properties>
+  </style:style>
+  <style:style style:name="Table3.C1" style:family="table-cell">
+   <style:table-cell-properties fo:background-color="#cccccc" fo:padding="0.0382in" fo:border="0.05pt solid #000000">
+    <style:background-image/>
+   </style:table-cell-properties>
+  </style:style>
+  <style:style style:name="Table3.A2" style:family="table-cell">
+   <style:table-cell-properties fo:padding="0.0382in" fo:border-left="0.05pt solid #000000" fo:border-right="0.05pt solid #000000" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
+  </style:style>
+  <style:style style:name="Table3.A3" style:family="table-cell">
+   <style:table-cell-properties fo:padding="0.0382in" fo:border-left="0.05pt solid #000000" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
+  </style:style>
+  <style:style style:name="Table3.B3" style:family="table-cell">
+   <style:table-cell-properties fo:padding="0.0382in" fo:border-left="0.05pt solid #000000" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
+  </style:style>
+  <style:style style:name="Table3.C3" style:family="table-cell">
+   <style:table-cell-properties fo:padding="0.0382in" fo:border-left="0.05pt solid #000000" fo:border-right="0.05pt solid #000000" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
+  </style:style>
+  <style:style style:name="Table3.A4" style:family="table-cell">
+   <style:table-cell-properties fo:padding="0.0382in" fo:border-left="0.05pt solid #000000" fo:border-right="0.05pt solid #000000" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
+  </style:style>
+  <style:style style:name="Table3.A5" style:family="table-cell">
+   <style:table-cell-properties fo:padding="0.0382in" fo:border-left="0.05pt solid #000000" fo:border-right="0.05pt solid #000000" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
+  </style:style>
+  <style:style style:name="Table3.A6" style:family="table-cell">
+   <style:table-cell-properties fo:padding="0.0382in" fo:border-left="0.05pt solid #000000" fo:border-right="0.05pt solid #000000" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
+  </style:style>
+  <style:style style:name="Table3.A7" style:family="table-cell">
+   <style:table-cell-properties fo:padding="0.0382in" fo:border-left="0.05pt solid #000000" fo:border-right="0.05pt solid #000000" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
+  </style:style>
+  <style:style style:name="Table4" style:family="table">
+   <style:table-properties style:width="3.1375in" table:align="right" style:may-break-between-rows="true"/>
+  </style:style>
+  <style:style style:name="Table4.A" style:family="table-column">
+   <style:table-column-properties style:column-width="2.0896in"/>
+  </style:style>
+  <style:style style:name="Table4.B" style:family="table-column">
+   <style:table-column-properties style:column-width="1.0479in"/>
+  </style:style>
+  <style:style style:name="Table4.A1" style:family="table-cell">
+   <style:table-cell-properties fo:background-color="#cccccc" fo:padding="0.0382in" fo:border-left="0.05pt solid #000000" fo:border-right="none" fo:border-top="0.05pt solid #000000" fo:border-bottom="0.05pt solid #000000">
+    <style:background-image/>
+   </style:table-cell-properties>
+  </style:style>
+  <style:style style:name="Table4.B1" style:family="table-cell">
+   <style:table-cell-properties fo:padding="0.0382in" fo:border="0.05pt solid #000000"/>
+  </style:style>
+  <style:style style:name="Table4.A2" style:family="table-cell">
+   <style:table-cell-properties fo:background-color="#cccccc" fo:padding="0.0382in" fo:border-left="0.05pt solid #000000" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000">
+    <style:background-image/>
+   </style:table-cell-properties>
+  </style:style>
+  <style:style style:name="Table4.B2" style:family="table-cell">
+   <style:table-cell-properties fo:padding="0.0382in" fo:border-left="0.05pt solid #000000" fo:border-right="0.05pt solid #000000" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
+  </style:style>
+  <style:style style:name="Table4.B3" style:family="table-cell">
+   <style:table-cell-properties fo:padding="0.0382in" fo:border-left="0.05pt solid #000000" fo:border-right="0.05pt solid #000000" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
+  </style:style>
+  <style:style style:name="Table5" style:family="table">
+   <style:table-properties style:width="3.1375in" table:align="right" style:may-break-between-rows="false"/>
+  </style:style>
+  <style:style style:name="Table5.A" style:family="table-column">
+   <style:table-column-properties style:column-width="2.0896in"/>
+  </style:style>
+  <style:style style:name="Table5.B" style:family="table-column">
+   <style:table-column-properties style:column-width="1.0479in"/>
+  </style:style>
+  <style:style style:name="Table5.A1" style:family="table-cell">
+   <style:table-cell-properties fo:background-color="#cccccc" fo:padding="0.0382in" fo:border="0.05pt solid #000000">
+    <style:background-image/>
+   </style:table-cell-properties>
+  </style:style>
+  <style:style style:name="Table5.A2" style:family="table-cell">
+   <style:table-cell-properties fo:background-color="#cccccc" fo:padding="0.0382in" fo:border-left="0.05pt solid #000000" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000">
+    <style:background-image/>
+   </style:table-cell-properties>
+  </style:style>
+  <style:style style:name="Table5.B2" style:family="table-cell">
+   <style:table-cell-properties fo:background-color="#cccccc" fo:padding="0.0382in" fo:border-left="0.05pt solid #000000" fo:border-right="0.05pt solid #000000" fo:border-top="none" fo:border-bottom="0.05pt solid #000000">
+    <style:background-image/>
+   </style:table-cell-properties>
+  </style:style>
+  <style:style style:name="Table5.A3" style:family="table-cell">
+   <style:table-cell-properties fo:padding="0.0382in" fo:border-left="0.05pt solid #000000" fo:border-right="0.05pt solid #000000" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
+  </style:style>
+  <style:style style:name="Table5.A4" style:family="table-cell">
+   <style:table-cell-properties fo:padding="0.0382in" fo:border-left="0.05pt solid #000000" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
+  </style:style>
+  <style:style style:name="Table5.B4" style:family="table-cell">
+   <style:table-cell-properties fo:padding="0.0382in" fo:border-left="0.05pt solid #000000" fo:border-right="0.05pt solid #000000" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
+  </style:style>
+  <style:style style:name="Table5.A5" style:family="table-cell">
+   <style:table-cell-properties fo:padding="0.0382in" fo:border-left="0.05pt solid #000000" fo:border-right="0.05pt solid #000000" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
+  </style:style>
+  <style:style style:name="P1" style:family="paragraph" style:parent-style-name="Header">
+   <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
+   <style:text-properties officeooo:paragraph-rsid="00124376"/>
+  </style:style>
+  <style:style style:name="P2" style:family="paragraph" style:parent-style-name="Footer">
+   <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
+   <style:text-properties officeooo:paragraph-rsid="00124376"/>
+  </style:style>
+  <style:style style:name="P3" style:family="paragraph" style:parent-style-name="Header">
+   <style:paragraph-properties fo:text-align="start" style:justify-single-word="false"/>
+   <style:text-properties fo:font-size="12pt" officeooo:paragraph-rsid="001973ce" style:font-size-asian="12pt" style:font-size-complex="12pt"/>
+  </style:style>
+  <style:style style:name="P4" style:family="paragraph" style:parent-style-name="Header">
+   <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
+   <style:text-properties officeooo:paragraph-rsid="00124376"/>
+  </style:style>
+  <style:style style:name="P5" style:family="paragraph" style:parent-style-name="Header">
+   <style:paragraph-properties fo:text-align="start" style:justify-single-word="false"/>
+   <style:text-properties fo:font-size="12pt" officeooo:paragraph-rsid="001973ce" style:font-size-asian="12pt" style:font-size-complex="12pt"/>
+  </style:style>
+  <style:style style:name="P6" style:family="paragraph" style:parent-style-name="Footer">
+   <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
+   <style:text-properties officeooo:paragraph-rsid="00124376"/>
+  </style:style>
+  <style:style style:name="P7" style:family="paragraph" style:parent-style-name="Table_20_Contents">
+   <style:text-properties style:font-name="Liberation Serif2"/>
+  </style:style>
+  <style:style style:name="P8" style:family="paragraph" style:parent-style-name="Table_20_Contents">
+   <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
+  </style:style>
+  <style:style style:name="P9" style:family="paragraph" style:parent-style-name="Table_20_Contents">
+   <style:text-properties fo:font-style="italic" style:font-style-asian="italic" style:font-style-complex="italic"/>
+  </style:style>
+  <style:style style:name="P10" style:family="paragraph" style:parent-style-name="Table_20_Contents">
+   <style:paragraph-properties fo:text-align="end" style:justify-single-word="false"/>
+  </style:style>
+  <style:style style:name="P11" style:family="paragraph" style:parent-style-name="Table_20_Contents">
+   <style:paragraph-properties fo:text-align="end" style:justify-single-word="false"/>
+   <style:text-properties officeooo:paragraph-rsid="001611c2"/>
+  </style:style>
+  <style:style style:name="P12" style:family="paragraph" style:parent-style-name="Table_20_Contents">
+   <style:text-properties officeooo:paragraph-rsid="00257920"/>
+  </style:style>
+  <style:style style:name="P13" style:family="paragraph" style:parent-style-name="Table_20_Heading">
+   <style:text-properties style:font-name="Liberation Serif2"/>
+  </style:style>
+  <style:style style:name="P14" style:family="paragraph" style:parent-style-name="Table_20_Heading">
+   <style:paragraph-properties fo:text-align="end" style:justify-single-word="false"/>
+   <style:text-properties style:font-name="Liberation Serif2"/>
+  </style:style>
+  <style:style style:name="P15" style:family="paragraph" style:parent-style-name="Text_20_body">
+   <style:text-properties style:font-name="Liberation Serif2"/>
+  </style:style>
+  <style:style style:name="P16" style:family="paragraph" style:parent-style-name="Text_20_body">
+   <style:text-properties officeooo:paragraph-rsid="000d7572"/>
+  </style:style>
+  <style:style style:name="P17" style:family="paragraph" style:parent-style-name="Text_20_body">
+   <style:text-properties officeooo:paragraph-rsid="0020411c"/>
+  </style:style>
+  <style:style style:name="P18" style:family="paragraph" style:parent-style-name="Heading_20_1">
+   <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
+   <style:text-properties style:text-underline-style="solid" style:text-underline-width="auto" style:text-underline-color="font-color"/>
+  </style:style>
+  <style:style style:name="P19" style:family="paragraph" style:parent-style-name="Heading_20_1">
+   <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
+  </style:style>
+  <style:style style:name="P20" style:family="paragraph" style:parent-style-name="Standard">
+   <style:paragraph-properties fo:margin-left="4.4409in" fo:margin-right="0in" fo:text-indent="0in" style:auto-text-indent="false"/>
+   <style:text-properties style:font-name="Liberation Sans1"/>
+  </style:style>
+  <style:style style:name="P21" style:family="paragraph" style:parent-style-name="Standard">
+   <style:paragraph-properties fo:margin-left="4.4409in" fo:margin-right="0in" fo:text-indent="0in" style:auto-text-indent="false"/>
+   <style:text-properties style:font-name="Liberation Sans1" officeooo:paragraph-rsid="001ba80b"/>
+  </style:style>
+  <style:style style:name="P22" style:family="paragraph" style:parent-style-name="Standard" style:master-page-name="">
+   <style:paragraph-properties fo:margin-left="4.4409in" fo:margin-right="0in" fo:text-indent="0in" style:auto-text-indent="false" style:page-number="auto" fo:break-before="page"/>
+   <style:text-properties style:font-name="Liberation Sans1"/>
+  </style:style>
+  <style:style style:name="P23" style:family="paragraph" style:parent-style-name="Standard" style:master-page-name="">
+   <style:paragraph-properties fo:margin-left="4.4409in" fo:margin-right="0in" fo:text-indent="0in" style:auto-text-indent="false" style:page-number="auto" fo:break-before="page"/>
+   <style:text-properties style:font-name="Liberation Sans1" officeooo:paragraph-rsid="001ba80b"/>
+  </style:style>
+  <style:style style:name="P24" style:family="paragraph" style:parent-style-name="Standard">
+   <style:paragraph-properties fo:margin-left="4.4409in" fo:margin-right="0in" fo:text-indent="0in" style:auto-text-indent="false" fo:break-before="page"/>
+  </style:style>
+  <style:style style:name="P25" style:family="paragraph" style:parent-style-name="Standard">
+   <style:paragraph-properties fo:margin-left="4.4409in" fo:margin-right="0in" fo:text-indent="0in" style:auto-text-indent="false" fo:break-before="page"/>
+   <style:text-properties officeooo:paragraph-rsid="0020411c"/>
+  </style:style>
+  <style:style style:name="P26" style:family="paragraph" style:parent-style-name="Standard">
+   <style:paragraph-properties fo:margin-left="4.4409in" fo:margin-right="0in" fo:text-indent="0in" style:auto-text-indent="false" fo:break-before="page"/>
+   <style:text-properties style:font-name="Liberation Sans1" officeooo:paragraph-rsid="0020411c"/>
+  </style:style>
+  <style:style style:name="P27" style:family="paragraph" style:parent-style-name="Standard">
+   <style:paragraph-properties fo:break-before="page"/>
+  </style:style>
+  <style:style style:name="P28" style:family="paragraph" style:parent-style-name="Standard">
+   <style:text-properties officeooo:paragraph-rsid="00257920"/>
+  </style:style>
+  <style:style style:name="P29" style:family="paragraph" style:parent-style-name="Standard">
+   <style:text-properties officeooo:paragraph-rsid="00267ece"/>
+  </style:style>
+  <style:style style:name="T1" style:family="text">
+   <style:text-properties officeooo:rsid="000dd611"/>
+  </style:style>
+  <style:style style:name="T2" style:family="text">
+   <style:text-properties style:text-underline-style="solid" style:text-underline-width="auto" style:text-underline-color="font-color"/>
+  </style:style>
+  <style:style style:name="T3" style:family="text">
+   <style:text-properties style:font-name="Liberation Sans1"/>
+  </style:style>
+  <style:page-layout style:name="pm1">
+   <style:page-layout-properties fo:page-width="8.5in" fo:page-height="11in" style:num-format="1" style:print-orientation="portrait" fo:margin-top="0.7874in" fo:margin-bottom="0.7874in" fo:margin-left="0.7874in" fo:margin-right="0.7874in" style:writing-mode="lr-tb" style:layout-grid-color="#c0c0c0" style:layout-grid-lines="44" style:layout-grid-base-height="0.2165in" style:layout-grid-ruby-height="0in" style:layout-grid-mode="none" style:layout-grid-ruby-below="false" style:layout-grid-print="true" style:layout-grid-display="true" style:footnote-max-height="0in">
+    <style:footnote-sep style:width="0.0071in" style:distance-before-sep="0.0398in" style:distance-after-sep="0.0398in" style:line-style="none" style:adjustment="left" style:rel-width="25%" style:color="#000000"/>
+   </style:page-layout-properties>
+   <style:header-style>
+    <style:header-footer-properties fo:min-height="0in" fo:margin-left="0in" fo:margin-right="0in" fo:margin-bottom="0.1965in"/>
+   </style:header-style>
+   <style:footer-style>
+    <style:header-footer-properties fo:min-height="0in" fo:margin-left="0in" fo:margin-right="0in" fo:margin-top="0.1965in"/>
+   </style:footer-style>
+  </style:page-layout>
+ </office:automatic-styles>
+ <office:master-styles>
+  <style:master-page style:name="Standard" style:page-layout-name="pm1">
+   <style:header>
+    <text:p text:style-name="P1"><text:placeholder text:placeholder-type="text"><if test="invoice.company.header"></text:placeholder></text:p>
+    <text:p text:style-name="P1"><text:placeholder text:placeholder-type="text"><for each="line in invoice.company.header.split('\n')"></text:placeholder></text:p>
+    <text:p text:style-name="P1"><text:placeholder text:placeholder-type="text"><line></text:placeholder></text:p>
+    <text:p text:style-name="P1"><text:placeholder text:placeholder-type="text"></for></text:placeholder></text:p>
+    <text:p text:style-name="P2"><text:placeholder text:placeholder-type="text"></if></text:placeholder></text:p>
+    <text:p text:style-name="P3"><text:placeholder text:placeholder-type="text"><invoice.company.rec_name></text:placeholder></text:p>
+   </style:header>
+   <style:footer>
+    <text:p text:style-name="P2"><text:placeholder text:placeholder-type="text"><if test="invoice.company.footer"></text:placeholder></text:p>
+    <text:p text:style-name="P2"><text:placeholder text:placeholder-type="text"><for each="line in invoice.company.footer.split('\n')"></text:placeholder></text:p>
+    <text:p text:style-name="P2"><text:placeholder text:placeholder-type="text"><line></text:placeholder></text:p>
+    <text:p text:style-name="P2"><text:placeholder text:placeholder-type="text"></for></text:placeholder></text:p>
+    <text:p text:style-name="P2"><text:placeholder text:placeholder-type="text"></if></text:placeholder></text:p>
+   </style:footer>
+  </style:master-page>
+ </office:master-styles>
+ <office:body>
+  <office:text text:use-soft-page-breaks="true">
+   <office:forms form:automatic-focus="false" form:apply-design-mode="false"/>
+   <text:sequence-decls>
+    <text:sequence-decl text:display-outline-level="0" text:name="Illustration"/>
+    <text:sequence-decl text:display-outline-level="0" text:name="Table"/>
+    <text:sequence-decl text:display-outline-level="0" text:name="Text"/>
+    <text:sequence-decl text:display-outline-level="0" text:name="Drawing"/>
+   </text:sequence-decls>
+   <text:p text:style-name="P26"><text:placeholder text:placeholder-type="text"><replace text:p="set_lang(invoice.party.lang and invoice.party.lang.code or 'en')"></text:placeholder></text:p>
+   <text:p text:style-name="P21"><text:placeholder text:placeholder-type="text"><replace text:p="invoice.set_lang(invoice.party.lang and invoice.party.lang.code or 'en')"></text:placeholder></text:p>
+   <text:p text:style-name="P21"><text:placeholder text:placeholder-type="text"><for each="line in invoice.invoice_address.full_address.split('\n')"></text:placeholder></text:p>
+   <text:p text:style-name="P20"><text:placeholder text:placeholder-type="text"><line></text:placeholder></text:p>
+   <text:p text:style-name="P20"><text:placeholder text:placeholder-type="text"></for></text:placeholder></text:p>
+   <text:p text:style-name="P20"><text:placeholder text:placeholder-type="text"><if test="invoice.party_tax_identifier"></text:placeholder></text:p>
+   <text:p text:style-name="P20"><text:placeholder text:placeholder-type="text"><invoice.party_tax_identifier.type_string></text:placeholder>: <text:placeholder text:placeholder-type="text"><invoice.party_tax_identifier.code></text:placeholder></text:p>
+   <text:p text:style-name="P20"><text:placeholder text:placeholder-type="text"></if></text:placeholder></text:p>
+   <text:p text:style-name="Standard"><text:placeholder text:placeholder-type="text"><if test="invoice.type == 'in'"></text:placeholder></text:p>
+   <text:p text:style-name="P19"><text:span text:style-name="T2">Supplier Invoice N°:</text:span><text:span text:style-name="T2"><text:placeholder text:placeholder-type="text"><invoice.number and ' ' + invoice.number or ''></text:placeholder></text:span></text:p>
+   <text:p text:style-name="Standard"><text:placeholder text:placeholder-type="text"></if></text:placeholder></text:p>
+   <text:p text:style-name="Standard"><text:placeholder text:placeholder-type="text"><if test="invoice.type == 'out'"></text:placeholder></text:p>
+   <text:p text:style-name="Standard"><text:placeholder text:placeholder-type="text"><choose test=""></text:placeholder></text:p>
+   <text:p text:style-name="Standard"><text:placeholder text:placeholder-type="text"><when test="invoice.state == 'draft'"></text:placeholder></text:p>
+   <text:p text:style-name="P18">Draft Invoice</text:p>
+   <text:p text:style-name="Standard"><text:placeholder text:placeholder-type="text"></when></text:placeholder></text:p>
+   <text:p text:style-name="Standard"><text:placeholder text:placeholder-type="text"><when test="invoice.state == 'validated'"></text:placeholder></text:p>
+   <text:p text:style-name="P18">Pro forma Invoice</text:p>
+   <text:p text:style-name="Standard"><text:placeholder text:placeholder-type="text"></when></text:placeholder></text:p>
+   <text:p text:style-name="Standard"><text:placeholder text:placeholder-type="text"><otherwise test=""></text:placeholder></text:p>
+   <text:p text:style-name="P18"><text:soft-page-break/>Invoice N°:<text:placeholder text:placeholder-type="text"><invoice.number and ' ' + invoice.number or ''></text:placeholder></text:p>
+   <text:p text:style-name="Standard"><text:placeholder text:placeholder-type="text"></otherwise></text:placeholder></text:p>
+   <text:p text:style-name="Standard"><text:placeholder text:placeholder-type="text"></choose></text:placeholder></text:p>
+   <text:p text:style-name="Standard"><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="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>
+   <table:table table:name="Table1" table:style-name="Table1">
+    <table:table-column table:style-name="Table1.A"/>
+    <table:table-column table:style-name="Table1.B" table:number-columns-repeated="4"/>
+    <table:table-header-rows>
+     <table:table-row>
+      <table:table-cell table:style-name="Table1.A1" office:value-type="string">
+       <text:p text:style-name="P13">Description</text:p>
+      </table:table-cell>
+      <table:table-cell table:style-name="Table1.A1" office:value-type="string">
+       <text:p text:style-name="P13">Quantity</text:p>
+      </table:table-cell>
+      <table:table-cell table:style-name="Table1.A1" office:value-type="string">
+       <text:p text:style-name="P13">Unit Price</text:p>
+      </table:table-cell>
+      <table:table-cell table:style-name="Table1.A1" office:value-type="string">
+       <text:p text:style-name="P13">Taxes</text:p>
+      </table:table-cell>
+      <table:table-cell table:style-name="Table1.E1" office:value-type="string">
+       <text:p text:style-name="P13">Amount</text:p>
+      </table:table-cell>
+     </table:table-row>
+    </table:table-header-rows>
+    <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"><for each="line in invoice.lines"></text:placeholder></text:p>
+     </table:table-cell>
+     <table:covered-table-cell/>
+     <table:covered-table-cell/>
+     <table:covered-table-cell/>
+     <table:covered-table-cell/>
+    </table:table-row>
+    <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"><choose test=""></text:placeholder></text:p>
+     </table:table-cell>
+     <table:covered-table-cell/>
+     <table:covered-table-cell/>
+     <table:covered-table-cell/>
+     <table:covered-table-cell/>
+    </table:table-row>
+    <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 test="line.type == 'line'"></text:placeholder></text:p>
+     </table:table-cell>
+     <table:covered-table-cell/>
+     <table:covered-table-cell/>
+     <table:covered-table-cell/>
+     <table:covered-table-cell/>
+    </table:table-row>
+    <table:table-row>
+     <table:table-cell table:style-name="Table1.A5" office:value-type="string">
+      <text:p text:style-name="Table_20_Contents"><text:placeholder text:placeholder-type="text"><for each="line in line.description.split('\n')"></text:placeholder></text:p>
+      <text:p text:style-name="Table_20_Contents"><text:placeholder text:placeholder-type="text"><line></text:placeholder></text:p>
+      <text:p text:style-name="Table_20_Contents"><text:placeholder text:placeholder-type="text"></for></text:placeholder></text:p>
+     </table:table-cell>
+     <table:table-cell table:style-name="Table1.D5" office:value-type="string">
+      <text:p text:style-name="P10"><text:placeholder text:placeholder-type="text"><(format_number(line.quantity, invoice.party.lang, digits=line.unit_digits) + (line.unit and (' ' + line.unit.symbol) or '')) or ''></text:placeholder></text:p>
+     </table:table-cell>
+     <table:table-cell table:style-name="Table1.D5" office:value-type="string">
+      <text:p text:style-name="P11"><text:placeholder text:placeholder-type="text"><format_number(line.unit_price, invoice.party.lang, digits=line.__class__.unit_price.digits[1], monetary=invoice.currency)></text:placeholder></text:p>
+     </table:table-cell>
+     <table:table-cell table:style-name="Table1.D5" office:value-type="string">
+      <text:p text:style-name="P8"><text:placeholder text:placeholder-type="text"><','.join('[' + '%s' % x.sequence_number + ']' for x in line.invoice_taxes)></text:placeholder></text:p>
+     </table: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:p>
+     </table:table-cell>
+    </table:table-row>
+    <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>
+     </table:table-cell>
+     <table:covered-table-cell/>
+     <table:covered-table-cell/>
+     <table:covered-table-cell/>
+     <table:covered-table-cell/>
+    </table:table-row>
+    <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 test="line.type == 'subtotal'"></text:placeholder></text:p>
+     </table:table-cell>
+     <table:covered-table-cell/>
+     <table:covered-table-cell/>
+     <table:covered-table-cell/>
+     <table:covered-table-cell/>
+    </table:table-row>
+    <text:soft-page-break/>
+    <table:table-row>
+     <table:table-cell table:style-name="Table1.A8" table:number-columns-spanned="4" office:value-type="string">
+      <text:p text:style-name="Table_20_Contents"><text:placeholder text:placeholder-type="text"><for each="line in line.description.split('\n')"></text:placeholder></text:p>
+      <text:p text:style-name="Table_20_Contents"><text:placeholder text:placeholder-type="text"><line></text:placeholder></text:p>
+      <text:p text:style-name="Table_20_Contents"><text:placeholder text:placeholder-type="text"></for></text:placeholder></text:p>
+     </table:table-cell>
+     <table:covered-table-cell/>
+     <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:p>
+     </table:table-cell>
+    </table:table-row>
+    <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>
+     </table:table-cell>
+     <table:covered-table-cell/>
+     <table:covered-table-cell/>
+     <table:covered-table-cell/>
+     <table:covered-table-cell/>
+    </table:table-row>
+    <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 test="line.type == 'title'"></text:placeholder></text:p>
+     </table:table-cell>
+     <table:covered-table-cell/>
+     <table:covered-table-cell/>
+     <table:covered-table-cell/>
+     <table:covered-table-cell/>
+    </table:table-row>
+    <table:table-row>
+     <table:table-cell table:style-name="Table1.A11" table:number-columns-spanned="5" office:value-type="string">
+      <text:p text:style-name="Table_20_Contents"><text:placeholder text:placeholder-type="text"><for each="line in line.description.split('\n')"></text:placeholder></text:p>
+      <text:p text:style-name="P9"><text:placeholder text:placeholder-type="text"><line></text:placeholder></text:p>
+      <text:p text:style-name="Table_20_Contents"><text:placeholder text:placeholder-type="text"></for></text:placeholder></text:p>
+     </table:table-cell>
+     <table:covered-table-cell/>
+     <table:covered-table-cell/>
+     <table:covered-table-cell/>
+     <table:covered-table-cell/>
+    </table:table-row>
+    <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>
+     </table:table-cell>
+     <table:covered-table-cell/>
+     <table:covered-table-cell/>
+     <table:covered-table-cell/>
+     <table:covered-table-cell/>
+    </table:table-row>
+    <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"><otherwise test=""></text:placeholder></text:p>
+     </table:table-cell>
+     <table:covered-table-cell/>
+     <table:covered-table-cell/>
+     <table:covered-table-cell/>
+     <table:covered-table-cell/>
+    </table:table-row>
+    <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"><for each="line in line.description.split('\n')"></text:placeholder></text:p>
+      <text:p text:style-name="Table_20_Contents"><text:placeholder text:placeholder-type="text"><line></text:placeholder></text:p>
+      <text:p text:style-name="Table_20_Contents"><text:placeholder text:placeholder-type="text"></for></text:placeholder></text:p>
+     </table:table-cell>
+     <table:covered-table-cell/>
+     <table:covered-table-cell/>
+     <table:covered-table-cell/>
+     <table:covered-table-cell/>
+    </table:table-row>
+    <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"></otherwise></text:placeholder></text:p>
+     </table:table-cell>
+     <table:covered-table-cell/>
+     <table:covered-table-cell/>
+     <table:covered-table-cell/>
+     <table:covered-table-cell/>
+    </table:table-row>
+    <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"></choose></text:placeholder></text:p>
+     </table:table-cell>
+     <table:covered-table-cell/>
+     <table:covered-table-cell/>
+     <table:covered-table-cell/>
+     <table:covered-table-cell/>
+    </table:table-row>
+    <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"></for></text:placeholder></text:p>
+     </table:table-cell>
+     <table:covered-table-cell/>
+     <table:covered-table-cell/>
+     <table:covered-table-cell/>
+     <table:covered-table-cell/>
+    </table:table-row>
+   </table:table>
+   <text:p text:style-name="P15"/>
+   <table:table table:name="Table2" table:style-name="Table2">
+    <table:table-column table:style-name="Table2.A"/>
+    <table:table-column table:style-name="Table2.B"/>
+    <text:soft-page-break/>
+    <table:table-row>
+     <table:table-cell office:value-type="string">
+      <table:table table:name="Table3" table:style-name="Table3">
+       <table:table-column table:style-name="Table3.A" table:number-columns-repeated="3"/>
+       <table:table-header-rows>
+        <table:table-row>
+         <table:table-cell table:style-name="Table3.A1" office:value-type="string">
+          <text:p text:style-name="P13">Tax</text:p>
+         </table:table-cell>
+         <table:table-cell table:style-name="Table3.A1" office:value-type="string">
+          <text:p text:style-name="P13">Base</text:p>
+         </table:table-cell>
+         <table:table-cell table:style-name="Table3.C1" office:value-type="string">
+          <text:p text:style-name="P13">Amount</text:p>
+         </table:table-cell>
+        </table:table-row>
+       </table:table-header-rows>
+       <table:table-row>
+        <table:table-cell table:style-name="Table3.A2" table:number-columns-spanned="3" office:value-type="string">
+         <text:p text:style-name="Table_20_Contents"><text:placeholder text:placeholder-type="text"><for each="tax in invoice.taxes"></text:placeholder></text:p>
+        </table:table-cell>
+        <table:covered-table-cell/>
+        <table:covered-table-cell/>
+       </table:table-row>
+       <table:table-row>
+        <table:table-cell table:style-name="Table3.A3" office:value-type="string">
+         <text:p text:style-name="Table_20_Contents"><text:placeholder text:placeholder-type="text"><'[' + '%s' % tax.sequence_number + ']'></text:placeholder> <text:placeholder text:placeholder-type="text"><tax.description or ''></text:placeholder></text:p>
+        </table:table-cell>
+        <table:table-cell table:style-name="Table3.B3" office:value-type="string">
+         <text:p text:style-name="P10"><text:placeholder text:placeholder-type="text"><format_currency(tax.base, invoice.party.lang, invoice.currency)></text:placeholder></text:p>
+        </table:table-cell>
+        <table:table-cell table:style-name="Table3.C3" office:value-type="string">
+         <text:p text:style-name="P10"><text:placeholder text:placeholder-type="text"><format_currency(tax.amount, invoice.party.lang, invoice.currency)></text:placeholder></text:p>
+        </table:table-cell>
+       </table:table-row>
+       <table:table-row>
+        <table:table-cell table:style-name="Table3.A4" table:number-columns-spanned="3" office:value-type="string">
+         <text:p text:style-name="P29"><text:placeholder text:placeholder-type="text"><if test="tax.legal_notice"></text:placeholder></text:p>
+        </table:table-cell>
+        <table:covered-table-cell/>
+        <table:covered-table-cell/>
+       </table:table-row>
+       <table:table-row>
+        <table:table-cell table:style-name="Table3.A6" table:number-columns-spanned="3" office:value-type="string">
+         <text:p text:style-name="P28"><text:placeholder text:placeholder-type="text"><for each="line in tax.legal_notice.split('\n')"></text:placeholder></text:p>
+         <text:p text:style-name="P12"><text:placeholder text:placeholder-type="text"><line></text:placeholder></text:p>
+         <text:p text:style-name="P12"><text:placeholder text:placeholder-type="text"></for></text:placeholder></text:p>
+        </table:table-cell>
+        <table:covered-table-cell/>
+        <table:covered-table-cell/>
+       </table:table-row>
+       <table:table-row>
+        <table:table-cell table:style-name="Table3.A6" table:number-columns-spanned="3" office:value-type="string">
+         <text:p text:style-name="P29"><text:placeholder text:placeholder-type="text"></if></text:placeholder></text:p>
+        </table:table-cell>
+        <table:covered-table-cell/>
+        <table:covered-table-cell/>
+       </table:table-row>
+       <table:table-row>
+        <table:table-cell table:style-name="Table3.A7" table:number-columns-spanned="3" office:value-type="string">
+         <text:p text:style-name="Table_20_Contents"><text:placeholder text:placeholder-type="text"></for></text:placeholder></text:p>
+        </table:table-cell>
+        <table:covered-table-cell/>
+        <table:covered-table-cell/>
+       </table:table-row>
+      </table:table>
+      <text:p text:style-name="Table_20_Contents"/>
+     </table:table-cell>
+     <table:table-cell office:value-type="string">
+      <table:table table:name="Table4" table:style-name="Table4">
+       <table:table-column table:style-name="Table4.A"/>
+       <table:table-column table:style-name="Table4.B"/>
+       <table:table-row>
+        <table:table-cell table:style-name="Table4.A1" office:value-type="string">
+         <text:p text:style-name="P14">Total (excl. taxes):</text:p>
+        </table:table-cell>
+        <table:table-cell table:style-name="Table4.B1" office:value-type="string">
+         <text:p text:style-name="P10"><text:placeholder text:placeholder-type="text"><format_currency(invoice.untaxed_amount, invoice.party.lang, invoice.currency)></text:placeholder></text:p>
+        </table:table-cell>
+       </table:table-row>
+       <table:table-row>
+        <table:table-cell table:style-name="Table4.A2" office:value-type="string">
+         <text:p text:style-name="P14">Taxes:</text:p>
+        </table:table-cell>
+        <table:table-cell table:style-name="Table4.B3" office:value-type="string">
+         <text:p text:style-name="P10"><text:placeholder text:placeholder-type="text"><format_currency(invoice.tax_amount, invoice.party.lang, invoice.currency)></text:placeholder></text:p>
+        </table:table-cell>
+       </table:table-row>
+       <table:table-row>
+        <table:table-cell table:style-name="Table4.A2" office:value-type="string">
+         <text:p text:style-name="P14">Total:</text:p>
+        </table:table-cell>
+        <table:table-cell table:style-name="Table4.B3" office:value-type="string">
+         <text:p text:style-name="P10"><text:placeholder text:placeholder-type="text"><format_currency(invoice.total_amount, invoice.party.lang, invoice.currency)></text:placeholder></text:p>
+        </table:table-cell>
+       </table:table-row>
+      </table:table>
+      <text:p text:style-name="P7"/>
+     </table:table-cell>
+    </table:table-row>
+   </table:table>
+   <text:p text:style-name="Text_20_body"><text:placeholder text:placeholder-type="text"><if test="invoice.lines_to_pay"></text:placeholder></text:p>
+   <table:table table:name="Table5" table:style-name="Table5">
+    <table:table-column table:style-name="Table5.A"/>
+    <table:table-column table:style-name="Table5.B"/>
+    <table:table-header-rows>
+     <text:soft-page-break/>
+     <table:table-row>
+      <table:table-cell table:style-name="Table5.A1" table:number-columns-spanned="2" office:value-type="string">
+       <text:p text:style-name="P13">Payment Term</text:p>
+       <text:p text:style-name="P15"><text:placeholder text:placeholder-type="text"><if test="invoice.payment_term and invoice.payment_term.description"></text:placeholder></text:p>
+       <text:p text:style-name="P15"><text:placeholder text:placeholder-type="text"><for each="description in (invoice.payment_term.description or '').split('\n')"></text:placeholder></text:p>
+       <text:p text:style-name="P15"><text:placeholder text:placeholder-type="text"><description></text:placeholder></text:p>
+       <text:p text:style-name="P15"><text:placeholder text:placeholder-type="text"></for></text:placeholder></text:p>
+       <text:p text:style-name="P15"><text:placeholder text:placeholder-type="text"></if></text:placeholder></text:p>
+      </table:table-cell>
+      <table:covered-table-cell/>
+     </table:table-row>
+     <table:table-row>
+      <table:table-cell table:style-name="Table5.A2" office:value-type="string">
+       <text:p text:style-name="P13">Date</text:p>
+      </table:table-cell>
+      <table:table-cell table:style-name="Table5.B2" office:value-type="string">
+       <text:p text:style-name="P13">Amount</text:p>
+      </table:table-cell>
+     </table:table-row>
+    </table:table-header-rows>
+    <table:table-row>
+     <table:table-cell table:style-name="Table5.A5" table:number-columns-spanned="2" office:value-type="string">
+      <text:p text:style-name="Table_20_Contents"><text:placeholder text:placeholder-type="text"><for each="line in invoice.lines_to_pay"></text:placeholder></text:p>
+     </table:table-cell>
+     <table:covered-table-cell/>
+    </table:table-row>
+    <table:table-row>
+     <table:table-cell table:style-name="Table5.A4" office:value-type="string">
+      <text:p text:style-name="Table_20_Contents"><text:placeholder text:placeholder-type="text"><format_date(line.maturity_date, invoice.party.lang)></text:placeholder></text:p>
+     </table:table-cell>
+     <table:table-cell table:style-name="Table5.B4" office:value-type="string">
+      <text:p text:style-name="P10"><text:placeholder text:placeholder-type="text"><line.amount_second_currency and format_currency(line.amount_second_currency, invoice.party.lang, invoice.currency) or format_currency(line.debit - line.credit, invoice.party.lang, invoice.currency)></text:placeholder></text:p>
+     </table:table-cell>
+    </table:table-row>
+    <table:table-row>
+     <table:table-cell table:style-name="Table5.A5" table:number-columns-spanned="2" office:value-type="string">
+      <text:p text:style-name="Table_20_Contents"><text:placeholder text:placeholder-type="text"></for></text:placeholder></text:p>
+     </table:table-cell>
+     <table:covered-table-cell/>
+    </table:table-row>
+   </table:table>
+   <text:p text:style-name="Text_20_body"><text:placeholder text:placeholder-type="text"></if></text:placeholder></text:p>
+   <text:p text:style-name="Text_20_body"><text:placeholder text:placeholder-type="text"><for each="comment in (invoice.comment or '').split('\n')"></text:placeholder></text:p>
+   <text:p text:style-name="Text_20_body"><text:placeholder text:placeholder-type="text"><comment></text:placeholder></text:p>
+   <text:p text:style-name="Text_20_body"><text:soft-page-break/><text:placeholder text:placeholder-type="text"></for></text:placeholder></text:p>
+  </office:text>
+ </office:body>
+</office:document>
\ No newline at end of file
diff --git a/invoice.odt b/invoice.odt
deleted file mode 100644
index fcbc3f6..0000000
Binary files a/invoice.odt and /dev/null differ
diff --git a/invoice.py b/invoice.py
index e8a0f66..4b4f539 100644
--- a/invoice.py
+++ b/invoice.py
@@ -15,7 +15,7 @@ from trytond.model import Workflow, ModelView, ModelSQL, fields, Check, \
     sequence_ordered
 from trytond.report import Report
 from trytond.wizard import Wizard, StateView, StateTransition, StateAction, \
-    StateReport, Button
+    Button
 from trytond import backend
 from trytond.pyson import If, Eval, Bool
 from trytond.tools import reduce_ids, grouped_slice
@@ -29,7 +29,7 @@ from trytond.modules.product import price_digits
 
 __all__ = ['Invoice', 'InvoicePaymentLine', 'InvoiceLine',
     'InvoiceLineTax', 'InvoiceTax',
-    'PrintInvoiceWarning', 'PrintInvoice', 'InvoiceReport',
+    'InvoiceReport',
     'PayInvoiceStart', 'PayInvoiceAsk', 'PayInvoice',
     'CreditInvoiceStart', 'CreditInvoice']
 
@@ -111,6 +111,13 @@ class Invoice(Workflow, ModelSQL, ModelView, TaxableMixin):
         depends=_DEPENDS)
     party = fields.Many2One('party.party', 'Party',
         required=True, states=_STATES, depends=_DEPENDS)
+    party_tax_identifier = fields.Many2One(
+        'party.identifier', "Party Tax Identifier",
+        states=_STATES,
+        domain=[
+            ('party', '=', Eval('party', -1)),
+            ],
+        depends=_DEPENDS + ['party'])
     party_lang = fields.Function(fields.Char('Party Language'),
         'on_change_with_party_lang')
     invoice_address = fields.Many2One('party.address', 'Invoice Address',
@@ -154,7 +161,10 @@ class Invoice(Workflow, ModelSQL, ModelView, TaxableMixin):
         domain=[
             ('company', '=', Eval('company', -1)),
             ],
-        states=_STATES, depends=['state', 'currency_date', 'company'])
+        states={
+            'readonly': (Eval('state') != 'draft') | ~Eval('company'),
+            },
+        depends=['state', 'company'])
     taxes = fields.One2Many('account.invoice.tax', 'invoice', 'Tax Lines',
         states=_STATES, depends=_DEPENDS)
     comment = fields.Text('Comment', states=_STATES, depends=_DEPENDS)
@@ -432,11 +442,11 @@ class Invoice(Workflow, ModelSQL, ModelView, TaxableMixin):
         self.account = None
         if self.party:
             if self.type == 'out':
-                self.account = self.party.account_receivable
+                self.account = self.party.account_receivable_used
                 if self.party.customer_payment_term:
                     self.payment_term = self.party.customer_payment_term
             elif self.type == 'in':
-                self.account = self.party.account_payable
+                self.account = self.party.account_payable_used
                 if self.party.supplier_payment_term:
                     self.payment_term = self.party.supplier_payment_term
 
@@ -458,6 +468,7 @@ class Invoice(Workflow, ModelSQL, ModelView, TaxableMixin):
 
         if self.party:
             self.invoice_address = self.party.address_get(type='invoice')
+            self.party_tax_identifier = self.party.tax_identifier
 
     @fields.depends('currency')
     def on_change_with_currency_digits(self, name=None):
@@ -545,7 +556,10 @@ class Invoice(Workflow, ModelSQL, ModelView, TaxableMixin):
                 self.tax_amount += computed_taxes[key]['amount']
                 value = InvoiceTax.default_get(InvoiceTax._fields.keys())
                 value.update(computed_taxes[key])
-                taxes.append(InvoiceTax(**value))
+                invoice_tax = InvoiceTax(**value)
+                if invoice_tax.tax:
+                    invoice_tax.sequence = invoice_tax.tax.sequence
+                taxes.append(invoice_tax)
         self.taxes = taxes
         if self.currency:
             self.untaxed_amount = self.currency.round(self.untaxed_amount)
@@ -993,6 +1007,9 @@ class Invoice(Workflow, ModelSQL, ModelView, TaxableMixin):
                 continue
             if not invoice.tax_identifier:
                 invoice.tax_identifier = invoice.get_tax_identifier()
+            # Generated invoice may not fill the party tax identifier
+            if not invoice.party_tax_identifier:
+                invoice.party_tax_identifier = invoice.party.tax_identifier
 
             if invoice.number:
                 continue
@@ -2113,6 +2130,8 @@ class InvoiceTax(sequence_ordered(), ModelSQL, ModelView):
             'readonly': ~Eval('manual', False) | _states['readonly'],
             },
         depends=['manual'] + _depends)
+    legal_notice = fields.Text("Legal Notice", states=_states,
+        depends=_depends)
 
     del _states, _depends
 
@@ -2317,39 +2336,6 @@ class InvoiceTax(sequence_ordered(), ModelSQL, ModelView):
         return line
 
 
-class PrintInvoiceWarning(ModelView):
-    'Print Invoice Report Warning'
-    __name__ = 'account.invoice.print.warning'
-
-
-class PrintInvoice(Wizard):
-    'Print Invoice Report'
-    __name__ = 'account.invoice.print'
-    start = StateTransition()
-    warning = StateView('account.invoice.print.warning',
-        'account_invoice.print_warning_view_form', [
-            Button('Cancel', 'end', 'tryton-cancel'),
-            Button('Print', 'print_', 'tryton-print', default=True),
-            ])
-    print_ = StateReport('account.invoice')
-
-    def transition_start(self):
-        if len(Transaction().context['active_ids']) > 1:
-            return 'warning'
-        return 'print_'
-
-    def do_print_(self, action):
-        data = {}
-        data['id'] = Transaction().context['active_ids'].pop()
-        data['ids'] = [data['id']]
-        return action, data
-
-    def transition_print_(self):
-        if Transaction().context['active_ids']:
-            return 'print_'
-        return 'end'
-
-
 class InvoiceReport(Report):
     __name__ = 'account.invoice'
 
@@ -2359,42 +2345,51 @@ class InvoiceReport(Report):
         cls.__rpc__['execute'] = RPC(False)
 
     @classmethod
-    def execute(cls, ids, data):
-        Invoice = Pool().get('account.invoice')
-
-        with Transaction().set_context(address_with_party=True):
-            result = super(InvoiceReport, cls).execute(ids, data)
-        invoice = Invoice(ids[0])
-
-        if len(ids) > 1:
-            result = result[:2] + (True,) + result[3:]
-        else:
-            if invoice.number:
-                result = result[:3] + (result[3] + ' - ' + invoice.number,)
-
+    def _execute(cls, records, data, action):
+        pool = Pool()
+        Invoice = pool.get('account.invoice')
+        # Re-instantiate because records are TranslateModel
+        invoice, = Invoice.browse(records)
         if invoice.invoice_report_cache:
-            result = (invoice.invoice_report_format,
-                invoice.invoice_report_cache) + result[2:]
+            return (
+                invoice.invoice_report_format,
+                bytes(invoice.invoice_report_cache))
         else:
+            result = super(InvoiceReport, cls)._execute(records, data, action)
             # If the invoice is posted or paid and the report not saved in
             # invoice_report_cache there was an error somewhere. So we save it
             # now in invoice_report_cache
             if invoice.state in {'posted', 'paid'} and invoice.type == 'out':
-                invoice.invoice_report_format, invoice.invoice_report_cache = \
-                    result[:2]
+                format_, data = result
+                invoice.invoice_report_format = format_
+                invoice.invoice_report_cache = \
+                    Invoice.invoice_report_cache.cast(data)
                 invoice.save()
+            return result
+
+    @classmethod
+    def execute(cls, ids, data):
+        pool = Pool()
+        Invoice = pool.get('account.invoice')
+        result = super(InvoiceReport, cls).execute(ids, data)
+        if len(ids) == 1:
+            invoice, = Invoice.browse(ids)
+            if invoice.number:
+                result = result[:3] + (result[3] + ' - ' + invoice.number,)
         return result
 
     @classmethod
     def _get_records(cls, ids, model, data):
-        with Transaction().set_context(language=False):
-            return super(InvoiceReport, cls)._get_records(ids[:1], model, data)
+        with Transaction().set_context(
+                language=False,
+                address_with_party=True):
+            return super(InvoiceReport, cls)._get_records(ids, model, data)
 
     @classmethod
     def get_context(cls, records, data):
-        report_context = super(InvoiceReport, cls).get_context(records, data)
-        report_context['company'] = report_context['user'].company
-        return report_context
+        context = super(InvoiceReport, cls).get_context(records, data)
+        context['invoice'] = context['record']
+        return context
 
 
 class PayInvoiceStart(ModelView):
diff --git a/invoice.xml b/invoice.xml
index b3fb14d..46422a4 100644
--- a/invoice.xml
+++ b/invoice.xml
@@ -201,8 +201,15 @@ this repository contains the full copyright notices and license terms. -->
             <field name="name">Invoice</field>
             <field name="model">account.invoice</field>
             <field name="report_name">account.invoice</field>
-            <field name="report">account_invoice/invoice.odt</field>
+            <field name="report">account_invoice/invoice.fodt</field>
+            <field name="single" eval="True"/>
         </record>
+        <record model="ir.action.keyword" id="report_invoice_keyword">
+            <field name="keyword">form_print</field>
+            <field name="model">account.invoice,-1</field>
+            <field name="action" ref="report_invoice"/>
+        </record>
+
         <record model="ir.sequence.type" id="sequence_type_account_invoice">
             <field name="name">Invoice</field>
             <field name="code">account.invoice</field>
@@ -300,23 +307,6 @@ this repository contains the full copyright notices and license terms. -->
             <field name="name">pay_ask_form</field>
         </record>
 
-        <record model="ir.ui.view" id="print_warning_view_form">
-            <field name="model">account.invoice.print.warning</field>
-            <field name="type">form</field>
-            <field name="name">print_warning_form</field>
-        </record>
-
-        <record model="ir.action.wizard" id="print">
-            <field name="name">Invoice</field>
-            <field name="wiz_name">account.invoice.print</field>
-            <field name="model">account.invoice</field>
-        </record>
-        <record model="ir.action.keyword" id="print_keyword">
-            <field name="keyword">form_print</field>
-            <field name="model">account.invoice,-1</field>
-            <field name="action" ref="print"/>
-        </record>
-
         <record model="ir.ui.view" id="credit_start_view_form">
             <field name="model">account.invoice.credit.start</field>
             <field name="type">form</field>
diff --git a/locale/bg.po b/locale/bg.po
index e6420f4..ca01a65 100644
--- a/locale/bg.po
+++ b/locale/bg.po
@@ -1,4 +1,4 @@
-# 
+#
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
@@ -210,10 +210,9 @@ msgctxt "field:account.fiscalyear.invoice_sequence,period:"
 msgid "Period"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:account.fiscalyear.invoice_sequence,rec_name:"
-msgid "Name"
-msgstr "Име"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:account.fiscalyear.invoice_sequence,sequence:"
@@ -344,6 +343,10 @@ msgctxt "field:account.invoice,party_lang:"
 msgid "Party Language"
 msgstr "Език на партньор"
 
+msgctxt "field:account.invoice,party_tax_identifier:"
+msgid "Party Tax Identifier"
+msgstr ""
+
 msgctxt "field:account.invoice,payment_lines:"
 msgid "Payment Lines"
 msgstr "Редове от плащане"
@@ -353,8 +356,8 @@ msgid "Payment Term"
 msgstr "Условие за плащане"
 
 msgctxt "field:account.invoice,rec_name:"
-msgid "Name"
-msgstr "Име"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:account.invoice,reconciled:"
 msgid "Reconciled"
@@ -425,8 +428,8 @@ msgid "Payment Line"
 msgstr "Ред от плащане"
 
 msgctxt "field:account.invoice-account.move.line,rec_name:"
-msgid "Name"
-msgstr "Име"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:account.invoice-account.move.line,write_date:"
 msgid "Write Date"
@@ -531,8 +534,8 @@ msgid "Quantity"
 msgstr "Количество"
 
 msgctxt "field:account.invoice.line,rec_name:"
-msgid "Name"
-msgstr "Име"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:account.invoice.line,sequence:"
 msgid "Sequence"
@@ -583,8 +586,8 @@ msgid "Invoice Line"
 msgstr "Ред от фактура"
 
 msgctxt "field:account.invoice.line-account.tax,rec_name:"
-msgid "Name"
-msgstr "Име"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:account.invoice.line-account.tax,tax:"
 msgid "Tax"
@@ -717,8 +720,8 @@ msgid "Name"
 msgstr "Условие за плащане"
 
 msgctxt "field:account.invoice.payment_term,rec_name:"
-msgid "Name"
-msgstr "Име"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:account.invoice.payment_term,write_date:"
 msgid "Write Date"
@@ -765,8 +768,8 @@ msgid "Ratio"
 msgstr ""
 
 msgctxt "field:account.invoice.payment_term.line,rec_name:"
-msgid "Name"
-msgstr "Име"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:account.invoice.payment_term.line,relativedeltas:"
 msgid "Deltas"
@@ -825,10 +828,9 @@ msgctxt "field:account.invoice.payment_term.line.delta,months:"
 msgid "Number of Months"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:account.invoice.payment_term.line.delta,rec_name:"
-msgid "Name"
-msgstr "Условие за плащане"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:account.invoice.payment_term.line.delta,sequence:"
@@ -907,10 +909,6 @@ msgctxt "field:account.invoice.payment_term.test.result,id:"
 msgid "ID"
 msgstr "ID"
 
-msgctxt "field:account.invoice.print.warning,id:"
-msgid "ID"
-msgstr "ID"
-
 msgctxt "field:account.invoice.tax,account:"
 msgid "Account"
 msgstr "Сметка"
@@ -956,13 +954,17 @@ msgctxt "field:account.invoice.tax,invoice_state:"
 msgid "Invoice State"
 msgstr "Състояние на фактура"
 
+msgctxt "field:account.invoice.tax,legal_notice:"
+msgid "Legal Notice"
+msgstr ""
+
 msgctxt "field:account.invoice.tax,manual:"
 msgid "Manual"
 msgstr "Ръчно"
 
 msgctxt "field:account.invoice.tax,rec_name:"
-msgid "Name"
-msgstr "Име"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:account.invoice.tax,sequence:"
 msgid "Sequence"
@@ -1034,10 +1036,9 @@ msgctxt "field:party.party.payment_term,party:"
 msgid "Party"
 msgstr "Партньор"
 
-#, fuzzy
 msgctxt "field:party.party.payment_term,rec_name:"
-msgid "Name"
-msgstr "Име"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:party.party.payment_term,supplier_payment_term:"
@@ -1111,10 +1112,6 @@ msgctxt "model:account.invoice.payment_term.test.result,name:"
 msgid "Test Payment Term"
 msgstr ""
 
-msgctxt "model:account.invoice.print.warning,name:"
-msgid "Print Invoice Report Warning"
-msgstr "Предупреждение при отпечатване на справка за фактура"
-
 msgctxt "model:account.invoice.tax,name:"
 msgid "Invoice Tax"
 msgstr "Данък към фактура"
@@ -1145,10 +1142,6 @@ msgctxt "model:ir.action,name:credit"
 msgid "Credit"
 msgstr "Кредит"
 
-msgctxt "model:ir.action,name:print"
-msgid "Invoice"
-msgstr "Фактура"
-
 msgctxt "model:ir.action,name:report_invoice"
 msgid "Invoice"
 msgstr "Фактура"
@@ -1560,14 +1553,6 @@ msgctxt "view:account.invoice.payment_term.line:"
 msgid "%"
 msgstr "%"
 
-msgctxt "view:account.invoice.print.warning:"
-msgid "The invoices will be sent directly to the printer."
-msgstr ""
-
-msgctxt "view:account.invoice.print.warning:"
-msgid "You have selected more than one invoice to print."
-msgstr "Избрали сте за печат повече от една фактура"
-
 msgctxt "view:account.invoice.tax:"
 msgid "Tax Code"
 msgstr "Код на данък"
@@ -1611,6 +1596,10 @@ msgctxt "view:account.invoice:"
 msgid "Post"
 msgstr "Публикуван"
 
+msgctxt "view:account.invoice:"
+msgid "Tax Identifier"
+msgstr ""
+
 #, fuzzy
 msgctxt "view:account.invoice:"
 msgid "Validate"
diff --git a/locale/ca.po b/locale/ca.po
index dbc3481..a25f70b 100644
--- a/locale/ca.po
+++ b/locale/ca.po
@@ -1,4 +1,4 @@
-# 
+#
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
@@ -246,8 +246,8 @@ msgid "Period"
 msgstr "Període"
 
 msgctxt "field:account.fiscalyear.invoice_sequence,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom del registre"
 
 msgctxt "field:account.fiscalyear.invoice_sequence,sequence:"
 msgid "Sequence"
@@ -373,6 +373,10 @@ msgctxt "field:account.invoice,party_lang:"
 msgid "Party Language"
 msgstr "Idioma tercer"
 
+msgctxt "field:account.invoice,party_tax_identifier:"
+msgid "Party Tax Identifier"
+msgstr "Identificador impositiu del tercer"
+
 msgctxt "field:account.invoice,payment_lines:"
 msgid "Payment Lines"
 msgstr "Línies de pagament"
@@ -382,8 +386,8 @@ msgid "Payment Term"
 msgstr "Termini de pagament"
 
 msgctxt "field:account.invoice,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom del registre"
 
 msgctxt "field:account.invoice,reconciled:"
 msgid "Reconciled"
@@ -454,8 +458,8 @@ msgid "Payment Line"
 msgstr "Línia de pagament"
 
 msgctxt "field:account.invoice-account.move.line,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom del registre"
 
 msgctxt "field:account.invoice-account.move.line,write_date:"
 msgid "Write Date"
@@ -558,8 +562,8 @@ msgid "Quantity"
 msgstr "Quantitat"
 
 msgctxt "field:account.invoice.line,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom del registre"
 
 msgctxt "field:account.invoice.line,sequence:"
 msgid "Sequence"
@@ -610,8 +614,8 @@ msgid "Invoice Line"
 msgstr "Línia de factura"
 
 msgctxt "field:account.invoice.line-account.tax,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom del registre"
 
 msgctxt "field:account.invoice.line-account.tax,tax:"
 msgid "Tax"
@@ -742,8 +746,8 @@ msgid "Name"
 msgstr "Nom"
 
 msgctxt "field:account.invoice.payment_term,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom del registre"
 
 msgctxt "field:account.invoice.payment_term,write_date:"
 msgid "Write Date"
@@ -790,8 +794,8 @@ msgid "Ratio"
 msgstr "Percentatge"
 
 msgctxt "field:account.invoice.payment_term.line,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom del registre"
 
 msgctxt "field:account.invoice.payment_term.line,relativedeltas:"
 msgid "Deltas"
@@ -846,8 +850,8 @@ msgid "Number of Months"
 msgstr "Nombre de mesos"
 
 msgctxt "field:account.invoice.payment_term.line.delta,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom del registre"
 
 msgctxt "field:account.invoice.payment_term.line.delta,sequence:"
 msgid "Sequence"
@@ -913,10 +917,6 @@ msgctxt "field:account.invoice.payment_term.test.result,id:"
 msgid "ID"
 msgstr "ID"
 
-msgctxt "field:account.invoice.print.warning,id:"
-msgid "ID"
-msgstr "ID"
-
 msgctxt "field:account.invoice.tax,account:"
 msgid "Account"
 msgstr "Compte"
@@ -961,13 +961,17 @@ msgctxt "field:account.invoice.tax,invoice_state:"
 msgid "Invoice State"
 msgstr "Estat factura"
 
+msgctxt "field:account.invoice.tax,legal_notice:"
+msgid "Legal Notice"
+msgstr "Avís legal"
+
 msgctxt "field:account.invoice.tax,manual:"
 msgid "Manual"
 msgstr "Manual"
 
 msgctxt "field:account.invoice.tax,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom del registre"
 
 msgctxt "field:account.invoice.tax,sequence:"
 msgid "Sequence"
@@ -1034,8 +1038,8 @@ msgid "Party"
 msgstr "Tercer"
 
 msgctxt "field:party.party.payment_term,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom del registre"
 
 msgctxt "field:party.party.payment_term,supplier_payment_term:"
 msgid "Supplier Payment Term"
@@ -1105,10 +1109,6 @@ msgctxt "model:account.invoice.payment_term.test.result,name:"
 msgid "Test Payment Term"
 msgstr "Prova termini de pagament"
 
-msgctxt "model:account.invoice.print.warning,name:"
-msgid "Print Invoice Report Warning"
-msgstr "Imprimeix avís informe de factura"
-
 msgctxt "model:account.invoice.tax,name:"
 msgid "Invoice Tax"
 msgstr "Impost de factura"
@@ -1137,10 +1137,6 @@ msgctxt "model:ir.action,name:credit"
 msgid "Credit"
 msgstr "Abona"
 
-msgctxt "model:ir.action,name:print"
-msgid "Invoice"
-msgstr "Factura"
-
 msgctxt "model:ir.action,name:report_invoice"
 msgid "Invoice"
 msgstr "Factura"
@@ -1519,14 +1515,6 @@ msgctxt "view:account.invoice.payment_term.line:"
 msgid "%"
 msgstr "%"
 
-msgctxt "view:account.invoice.print.warning:"
-msgid "The invoices will be sent directly to the printer."
-msgstr "Les factures s'enviaran directament a l'impressora."
-
-msgctxt "view:account.invoice.print.warning:"
-msgid "You have selected more than one invoice to print."
-msgstr "Heu seleccionat més d'una factura per imprimir."
-
 msgctxt "view:account.invoice.tax:"
 msgid "Tax Code"
 msgstr "Codi d'impost"
@@ -1568,6 +1556,10 @@ msgid "Post"
 msgstr "Comptabilitza"
 
 msgctxt "view:account.invoice:"
+msgid "Tax Identifier"
+msgstr "Identificador impositiu"
+
+msgctxt "view:account.invoice:"
 msgid "Validate"
 msgstr "Valida"
 
diff --git a/locale/cs.po b/locale/cs.po
index cabe31e..d8b7e73 100644
--- a/locale/cs.po
+++ b/locale/cs.po
@@ -1,4 +1,4 @@
-# 
+#
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
@@ -202,10 +202,9 @@ msgctxt "field:account.fiscalyear.invoice_sequence,period:"
 msgid "Period"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:account.fiscalyear.invoice_sequence,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:account.fiscalyear.invoice_sequence,sequence:"
 msgid "Sequence"
@@ -331,6 +330,10 @@ msgctxt "field:account.invoice,party_lang:"
 msgid "Party Language"
 msgstr ""
 
+msgctxt "field:account.invoice,party_tax_identifier:"
+msgid "Party Tax Identifier"
+msgstr ""
+
 msgctxt "field:account.invoice,payment_lines:"
 msgid "Payment Lines"
 msgstr ""
@@ -339,10 +342,9 @@ msgctxt "field:account.invoice,payment_term:"
 msgid "Payment Term"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:account.invoice,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:account.invoice,reconciled:"
 msgid "Reconciled"
@@ -412,10 +414,9 @@ msgctxt "field:account.invoice-account.move.line,line:"
 msgid "Payment Line"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:account.invoice-account.move.line,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:account.invoice-account.move.line,write_date:"
 msgid "Write Date"
@@ -517,10 +518,9 @@ msgctxt "field:account.invoice.line,quantity:"
 msgid "Quantity"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:account.invoice.line,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:account.invoice.line,sequence:"
 msgid "Sequence"
@@ -570,10 +570,9 @@ msgctxt "field:account.invoice.line-account.tax,line:"
 msgid "Invoice Line"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:account.invoice.line-account.tax,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:account.invoice.line-account.tax,tax:"
 msgid "Tax"
@@ -704,10 +703,9 @@ msgctxt "field:account.invoice.payment_term,name:"
 msgid "Name"
 msgstr "Namu"
 
-#, fuzzy
 msgctxt "field:account.invoice.payment_term,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:account.invoice.payment_term,write_date:"
 msgid "Write Date"
@@ -753,10 +751,9 @@ msgctxt "field:account.invoice.payment_term.line,ratio:"
 msgid "Ratio"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:account.invoice.payment_term.line,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:account.invoice.payment_term.line,relativedeltas:"
 msgid "Deltas"
@@ -810,10 +807,9 @@ msgctxt "field:account.invoice.payment_term.line.delta,months:"
 msgid "Number of Months"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:account.invoice.payment_term.line.delta,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:account.invoice.payment_term.line.delta,sequence:"
 msgid "Sequence"
@@ -879,10 +875,6 @@ msgctxt "field:account.invoice.payment_term.test.result,id:"
 msgid "ID"
 msgstr ""
 
-msgctxt "field:account.invoice.print.warning,id:"
-msgid "ID"
-msgstr ""
-
 msgctxt "field:account.invoice.tax,account:"
 msgid "Account"
 msgstr ""
@@ -927,14 +919,17 @@ msgctxt "field:account.invoice.tax,invoice_state:"
 msgid "Invoice State"
 msgstr ""
 
+msgctxt "field:account.invoice.tax,legal_notice:"
+msgid "Legal Notice"
+msgstr ""
+
 msgctxt "field:account.invoice.tax,manual:"
 msgid "Manual"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:account.invoice.tax,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:account.invoice.tax,sequence:"
 msgid "Sequence"
@@ -1000,10 +995,9 @@ msgctxt "field:party.party.payment_term,party:"
 msgid "Party"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:party.party.payment_term,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:party.party.payment_term,supplier_payment_term:"
 msgid "Supplier Payment Term"
@@ -1073,10 +1067,6 @@ msgctxt "model:account.invoice.payment_term.test.result,name:"
 msgid "Test Payment Term"
 msgstr ""
 
-msgctxt "model:account.invoice.print.warning,name:"
-msgid "Print Invoice Report Warning"
-msgstr ""
-
 msgctxt "model:account.invoice.tax,name:"
 msgid "Invoice Tax"
 msgstr ""
@@ -1105,10 +1095,6 @@ msgctxt "model:ir.action,name:credit"
 msgid "Credit"
 msgstr ""
 
-msgctxt "model:ir.action,name:print"
-msgid "Invoice"
-msgstr ""
-
 msgctxt "model:ir.action,name:report_invoice"
 msgid "Invoice"
 msgstr ""
@@ -1489,14 +1475,6 @@ msgctxt "view:account.invoice.payment_term.line:"
 msgid "%"
 msgstr "%"
 
-msgctxt "view:account.invoice.print.warning:"
-msgid "The invoices will be sent directly to the printer."
-msgstr ""
-
-msgctxt "view:account.invoice.print.warning:"
-msgid "You have selected more than one invoice to print."
-msgstr ""
-
 msgctxt "view:account.invoice.tax:"
 msgid "Tax Code"
 msgstr ""
@@ -1538,6 +1516,10 @@ msgid "Post"
 msgstr ""
 
 msgctxt "view:account.invoice:"
+msgid "Tax Identifier"
+msgstr ""
+
+msgctxt "view:account.invoice:"
 msgid "Validate"
 msgstr ""
 
@@ -1584,11 +1566,3 @@ msgstr ""
 msgctxt "wizard_button:account.invoice.payment_term.test,test,end:"
 msgid "Close"
 msgstr ""
-
-msgctxt "wizard_button:account.invoice.print,warning,end:"
-msgid "Cancel"
-msgstr ""
-
-msgctxt "wizard_button:account.invoice.print,warning,print_:"
-msgid "Print"
-msgstr ""
diff --git a/locale/de.po b/locale/de.po
index c151c8d..189e10e 100644
--- a/locale/de.po
+++ b/locale/de.po
@@ -1,4 +1,4 @@
-# 
+#
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
@@ -255,8 +255,8 @@ msgid "Period"
 msgstr "Buchungszeitraum"
 
 msgctxt "field:account.fiscalyear.invoice_sequence,rec_name:"
-msgid "Name"
-msgstr "Name"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:account.fiscalyear.invoice_sequence,sequence:"
 msgid "Sequence"
@@ -382,6 +382,10 @@ msgctxt "field:account.invoice,party_lang:"
 msgid "Party Language"
 msgstr "Sprache Partei"
 
+msgctxt "field:account.invoice,party_tax_identifier:"
+msgid "Party Tax Identifier"
+msgstr ""
+
 msgctxt "field:account.invoice,payment_lines:"
 msgid "Payment Lines"
 msgstr "Zahlungspositionen"
@@ -391,8 +395,8 @@ msgid "Payment Term"
 msgstr "Zahlungsbedingung"
 
 msgctxt "field:account.invoice,rec_name:"
-msgid "Name"
-msgstr "Name"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:account.invoice,reconciled:"
 msgid "Reconciled"
@@ -463,8 +467,8 @@ msgid "Payment Line"
 msgstr "Zahlungsposition"
 
 msgctxt "field:account.invoice-account.move.line,rec_name:"
-msgid "Name"
-msgstr "Name"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:account.invoice-account.move.line,write_date:"
 msgid "Write Date"
@@ -567,8 +571,8 @@ msgid "Quantity"
 msgstr "Anzahl"
 
 msgctxt "field:account.invoice.line,rec_name:"
-msgid "Name"
-msgstr "Name"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:account.invoice.line,sequence:"
 msgid "Sequence"
@@ -619,8 +623,8 @@ msgid "Invoice Line"
 msgstr "Rechnungsposition"
 
 msgctxt "field:account.invoice.line-account.tax,rec_name:"
-msgid "Name"
-msgstr "Name"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:account.invoice.line-account.tax,tax:"
 msgid "Tax"
@@ -672,7 +676,7 @@ msgstr "ID"
 
 msgctxt "field:account.invoice.pay.ask,invoice:"
 msgid "Invoice"
-msgstr "Rechnungsadresse"
+msgstr "Rechnung"
 
 msgctxt "field:account.invoice.pay.ask,journal_writeoff:"
 msgid "Write-Off Journal"
@@ -751,8 +755,8 @@ msgid "Name"
 msgstr "Name"
 
 msgctxt "field:account.invoice.payment_term,rec_name:"
-msgid "Name"
-msgstr "Name"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:account.invoice.payment_term,write_date:"
 msgid "Write Date"
@@ -799,8 +803,8 @@ msgid "Ratio"
 msgstr "Verhältnis"
 
 msgctxt "field:account.invoice.payment_term.line,rec_name:"
-msgid "Name"
-msgstr "Name"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:account.invoice.payment_term.line,relativedeltas:"
 msgid "Deltas"
@@ -855,8 +859,8 @@ msgid "Number of Months"
 msgstr "Anzahl an Monaten"
 
 msgctxt "field:account.invoice.payment_term.line.delta,rec_name:"
-msgid "Name"
-msgstr "Name"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:account.invoice.payment_term.line.delta,sequence:"
 msgid "Sequence"
@@ -922,10 +926,6 @@ msgctxt "field:account.invoice.payment_term.test.result,id:"
 msgid "ID"
 msgstr "ID"
 
-msgctxt "field:account.invoice.print.warning,id:"
-msgid "ID"
-msgstr "ID"
-
 msgctxt "field:account.invoice.tax,account:"
 msgid "Account"
 msgstr "Konto"
@@ -970,13 +970,17 @@ msgctxt "field:account.invoice.tax,invoice_state:"
 msgid "Invoice State"
 msgstr "Rechnungsstatus"
 
+msgctxt "field:account.invoice.tax,legal_notice:"
+msgid "Legal Notice"
+msgstr ""
+
 msgctxt "field:account.invoice.tax,manual:"
 msgid "Manual"
 msgstr "Manuell"
 
 msgctxt "field:account.invoice.tax,rec_name:"
-msgid "Name"
-msgstr "Name"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:account.invoice.tax,sequence:"
 msgid "Sequence"
@@ -1008,7 +1012,7 @@ msgstr "Letzte Änderung durch"
 
 msgctxt "field:party.address,invoice:"
 msgid "Invoice"
-msgstr "Rechnungsadresse"
+msgstr "Rechnung"
 
 msgctxt "field:party.party,customer_payment_term:"
 msgid "Customer Payment Term"
@@ -1043,8 +1047,8 @@ msgid "Party"
 msgstr "Partei"
 
 msgctxt "field:party.party.payment_term,rec_name:"
-msgid "Name"
-msgstr "Name"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:party.party.payment_term,supplier_payment_term:"
 msgid "Supplier Payment Term"
@@ -1116,10 +1120,6 @@ msgctxt "model:account.invoice.payment_term.test.result,name:"
 msgid "Test Payment Term"
 msgstr "Zahlungsbedingung testen"
 
-msgctxt "model:account.invoice.print.warning,name:"
-msgid "Print Invoice Report Warning"
-msgstr "Druck Rechnungsbericht Warnung"
-
 msgctxt "model:account.invoice.tax,name:"
 msgid "Invoice Tax"
 msgstr "Rechnung Steuer"
@@ -1148,10 +1148,6 @@ msgctxt "model:ir.action,name:credit"
 msgid "Credit"
 msgstr "Gutschrift erstellen"
 
-msgctxt "model:ir.action,name:print"
-msgid "Invoice"
-msgstr "Rechnung"
-
 msgctxt "model:ir.action,name:report_invoice"
 msgid "Invoice"
 msgstr "Rechnung"
@@ -1530,14 +1526,6 @@ msgctxt "view:account.invoice.payment_term.line:"
 msgid "%"
 msgstr "%"
 
-msgctxt "view:account.invoice.print.warning:"
-msgid "The invoices will be sent directly to the printer."
-msgstr "Die Rechnungen werden direkt zum Drucker gesendet."
-
-msgctxt "view:account.invoice.print.warning:"
-msgid "You have selected more than one invoice to print."
-msgstr "Sie haben mehr als eine Rechnung zum Ausdrucken gewählt."
-
 msgctxt "view:account.invoice.tax:"
 msgid "Tax Code"
 msgstr "Steuerkennziffer"
@@ -1578,6 +1566,11 @@ msgctxt "view:account.invoice:"
 msgid "Post"
 msgstr "Festschreiben"
 
+#, fuzzy
+msgctxt "view:account.invoice:"
+msgid "Tax Identifier"
+msgstr "Steueridentifikator"
+
 msgctxt "view:account.invoice:"
 msgid "Validate"
 msgstr "Prüfen"
diff --git a/locale/es.po b/locale/es.po
index dd06795..91cbec4 100644
--- a/locale/es.po
+++ b/locale/es.po
@@ -1,4 +1,4 @@
-# 
+#
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
@@ -242,8 +242,8 @@ msgid "Period"
 msgstr "Periodo"
 
 msgctxt "field:account.fiscalyear.invoice_sequence,rec_name:"
-msgid "Name"
-msgstr "Nombre"
+msgid "Record Name"
+msgstr "Nombre del registro"
 
 msgctxt "field:account.fiscalyear.invoice_sequence,sequence:"
 msgid "Sequence"
@@ -369,6 +369,10 @@ msgctxt "field:account.invoice,party_lang:"
 msgid "Party Language"
 msgstr "Idioma del tercero"
 
+msgctxt "field:account.invoice,party_tax_identifier:"
+msgid "Party Tax Identifier"
+msgstr "Identificador impositivo del tercero"
+
 msgctxt "field:account.invoice,payment_lines:"
 msgid "Payment Lines"
 msgstr "Líneas de pago"
@@ -378,8 +382,8 @@ msgid "Payment Term"
 msgstr "Plazo de pago"
 
 msgctxt "field:account.invoice,rec_name:"
-msgid "Name"
-msgstr "Nombre"
+msgid "Record Name"
+msgstr "Nombre del registro"
 
 msgctxt "field:account.invoice,reconciled:"
 msgid "Reconciled"
@@ -450,8 +454,8 @@ msgid "Payment Line"
 msgstr "Línea de pago"
 
 msgctxt "field:account.invoice-account.move.line,rec_name:"
-msgid "Name"
-msgstr "Nombre"
+msgid "Record Name"
+msgstr "Nombre del registro"
 
 msgctxt "field:account.invoice-account.move.line,write_date:"
 msgid "Write Date"
@@ -554,8 +558,8 @@ msgid "Quantity"
 msgstr "Cantidad"
 
 msgctxt "field:account.invoice.line,rec_name:"
-msgid "Name"
-msgstr "Nombre"
+msgid "Record Name"
+msgstr "Nombre del registro"
 
 msgctxt "field:account.invoice.line,sequence:"
 msgid "Sequence"
@@ -606,8 +610,8 @@ msgid "Invoice Line"
 msgstr "Línea de factura"
 
 msgctxt "field:account.invoice.line-account.tax,rec_name:"
-msgid "Name"
-msgstr "Nombre"
+msgid "Record Name"
+msgstr "Nombre del registro"
 
 msgctxt "field:account.invoice.line-account.tax,tax:"
 msgid "Tax"
@@ -738,8 +742,8 @@ msgid "Name"
 msgstr "Nombre"
 
 msgctxt "field:account.invoice.payment_term,rec_name:"
-msgid "Name"
-msgstr "Nombre"
+msgid "Record Name"
+msgstr "Nombre del registro"
 
 msgctxt "field:account.invoice.payment_term,write_date:"
 msgid "Write Date"
@@ -786,8 +790,8 @@ msgid "Ratio"
 msgstr "Porcentaje"
 
 msgctxt "field:account.invoice.payment_term.line,rec_name:"
-msgid "Name"
-msgstr "Nombre"
+msgid "Record Name"
+msgstr "Nombre del registro"
 
 msgctxt "field:account.invoice.payment_term.line,relativedeltas:"
 msgid "Deltas"
@@ -842,8 +846,8 @@ msgid "Number of Months"
 msgstr "Número de meses"
 
 msgctxt "field:account.invoice.payment_term.line.delta,rec_name:"
-msgid "Name"
-msgstr "Nombre"
+msgid "Record Name"
+msgstr "Nombre del registro"
 
 msgctxt "field:account.invoice.payment_term.line.delta,sequence:"
 msgid "Sequence"
@@ -909,10 +913,6 @@ msgctxt "field:account.invoice.payment_term.test.result,id:"
 msgid "ID"
 msgstr "ID"
 
-msgctxt "field:account.invoice.print.warning,id:"
-msgid "ID"
-msgstr "ID"
-
 msgctxt "field:account.invoice.tax,account:"
 msgid "Account"
 msgstr "Cuenta"
@@ -957,13 +957,17 @@ msgctxt "field:account.invoice.tax,invoice_state:"
 msgid "Invoice State"
 msgstr "Estado factura"
 
+msgctxt "field:account.invoice.tax,legal_notice:"
+msgid "Legal Notice"
+msgstr "Aviso legal"
+
 msgctxt "field:account.invoice.tax,manual:"
 msgid "Manual"
 msgstr "Manual"
 
 msgctxt "field:account.invoice.tax,rec_name:"
-msgid "Name"
-msgstr "Nombre"
+msgid "Record Name"
+msgstr "Nombre del registro"
 
 msgctxt "field:account.invoice.tax,sequence:"
 msgid "Sequence"
@@ -1030,8 +1034,8 @@ msgid "Party"
 msgstr "Tercero"
 
 msgctxt "field:party.party.payment_term,rec_name:"
-msgid "Name"
-msgstr "Nombre"
+msgid "Record Name"
+msgstr "Nombre del registro"
 
 msgctxt "field:party.party.payment_term,supplier_payment_term:"
 msgid "Supplier Payment Term"
@@ -1101,10 +1105,6 @@ msgctxt "model:account.invoice.payment_term.test.result,name:"
 msgid "Test Payment Term"
 msgstr "Probar plazo de pago"
 
-msgctxt "model:account.invoice.print.warning,name:"
-msgid "Print Invoice Report Warning"
-msgstr "Aviso al imprimir la factura"
-
 msgctxt "model:account.invoice.tax,name:"
 msgid "Invoice Tax"
 msgstr "Impuesto de factura"
@@ -1133,10 +1133,6 @@ msgctxt "model:ir.action,name:credit"
 msgid "Credit"
 msgstr "Abonar"
 
-msgctxt "model:ir.action,name:print"
-msgid "Invoice"
-msgstr "Factura"
-
 msgctxt "model:ir.action,name:report_invoice"
 msgid "Invoice"
 msgstr "Factura"
@@ -1515,14 +1511,6 @@ msgctxt "view:account.invoice.payment_term.line:"
 msgid "%"
 msgstr "%"
 
-msgctxt "view:account.invoice.print.warning:"
-msgid "The invoices will be sent directly to the printer."
-msgstr "Las facturas se enviarán directamente a la impresora."
-
-msgctxt "view:account.invoice.print.warning:"
-msgid "You have selected more than one invoice to print."
-msgstr "Ha seleccionado más de una factura para imprimir."
-
 msgctxt "view:account.invoice.tax:"
 msgid "Tax Code"
 msgstr "Código de impuesto"
@@ -1564,6 +1552,10 @@ msgid "Post"
 msgstr "Contabilizar"
 
 msgctxt "view:account.invoice:"
+msgid "Tax Identifier"
+msgstr "Identificador impositivo"
+
+msgctxt "view:account.invoice:"
 msgid "Validate"
 msgstr "Validar"
 
diff --git a/locale/es_419.po b/locale/es_419.po
index 112adff..0bc14d3 100644
--- a/locale/es_419.po
+++ b/locale/es_419.po
@@ -1,4 +1,4 @@
-# 
+#
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
@@ -230,7 +230,7 @@ msgid "Period"
 msgstr ""
 
 msgctxt "field:account.fiscalyear.invoice_sequence,rec_name:"
-msgid "Name"
+msgid "Record Name"
 msgstr ""
 
 msgctxt "field:account.fiscalyear.invoice_sequence,sequence:"
@@ -358,6 +358,10 @@ msgctxt "field:account.invoice,party_lang:"
 msgid "Party Language"
 msgstr ""
 
+msgctxt "field:account.invoice,party_tax_identifier:"
+msgid "Party Tax Identifier"
+msgstr ""
+
 msgctxt "field:account.invoice,payment_lines:"
 msgid "Payment Lines"
 msgstr ""
@@ -367,7 +371,7 @@ msgid "Payment Term"
 msgstr "Término de pago"
 
 msgctxt "field:account.invoice,rec_name:"
-msgid "Name"
+msgid "Record Name"
 msgstr ""
 
 msgctxt "field:account.invoice,reconciled:"
@@ -439,7 +443,7 @@ msgid "Payment Line"
 msgstr ""
 
 msgctxt "field:account.invoice-account.move.line,rec_name:"
-msgid "Name"
+msgid "Record Name"
 msgstr ""
 
 msgctxt "field:account.invoice-account.move.line,write_date:"
@@ -545,7 +549,7 @@ msgid "Quantity"
 msgstr ""
 
 msgctxt "field:account.invoice.line,rec_name:"
-msgid "Name"
+msgid "Record Name"
 msgstr ""
 
 msgctxt "field:account.invoice.line,sequence:"
@@ -598,7 +602,7 @@ msgid "Invoice Line"
 msgstr "Fecha de factura"
 
 msgctxt "field:account.invoice.line-account.tax,rec_name:"
-msgid "Name"
+msgid "Record Name"
 msgstr ""
 
 msgctxt "field:account.invoice.line-account.tax,tax:"
@@ -730,7 +734,7 @@ msgid "Name"
 msgstr ""
 
 msgctxt "field:account.invoice.payment_term,rec_name:"
-msgid "Name"
+msgid "Record Name"
 msgstr ""
 
 msgctxt "field:account.invoice.payment_term,write_date:"
@@ -778,7 +782,7 @@ msgid "Ratio"
 msgstr ""
 
 msgctxt "field:account.invoice.payment_term.line,rec_name:"
-msgid "Name"
+msgid "Record Name"
 msgstr ""
 
 msgctxt "field:account.invoice.payment_term.line,relativedeltas:"
@@ -834,7 +838,7 @@ msgid "Number of Months"
 msgstr ""
 
 msgctxt "field:account.invoice.payment_term.line.delta,rec_name:"
-msgid "Name"
+msgid "Record Name"
 msgstr ""
 
 msgctxt "field:account.invoice.payment_term.line.delta,sequence:"
@@ -901,10 +905,6 @@ msgctxt "field:account.invoice.payment_term.test.result,id:"
 msgid "ID"
 msgstr ""
 
-msgctxt "field:account.invoice.print.warning,id:"
-msgid "ID"
-msgstr ""
-
 msgctxt "field:account.invoice.tax,account:"
 msgid "Account"
 msgstr ""
@@ -949,12 +949,16 @@ msgctxt "field:account.invoice.tax,invoice_state:"
 msgid "Invoice State"
 msgstr "Estado de la factura"
 
+msgctxt "field:account.invoice.tax,legal_notice:"
+msgid "Legal Notice"
+msgstr ""
+
 msgctxt "field:account.invoice.tax,manual:"
 msgid "Manual"
 msgstr ""
 
 msgctxt "field:account.invoice.tax,rec_name:"
-msgid "Name"
+msgid "Record Name"
 msgstr ""
 
 msgctxt "field:account.invoice.tax,sequence:"
@@ -1025,7 +1029,7 @@ msgid "Party"
 msgstr ""
 
 msgctxt "field:party.party.payment_term,rec_name:"
-msgid "Name"
+msgid "Record Name"
 msgstr ""
 
 #, fuzzy
@@ -1099,10 +1103,6 @@ msgctxt "model:account.invoice.payment_term.test.result,name:"
 msgid "Test Payment Term"
 msgstr "Prueba de término de pago"
 
-msgctxt "model:account.invoice.print.warning,name:"
-msgid "Print Invoice Report Warning"
-msgstr "Advertencia al imprimir la factura"
-
 #, fuzzy
 msgctxt "model:account.invoice.tax,name:"
 msgid "Invoice Tax"
@@ -1132,10 +1132,6 @@ msgctxt "model:ir.action,name:credit"
 msgid "Credit"
 msgstr "Generar nota de crédito"
 
-msgctxt "model:ir.action,name:print"
-msgid "Invoice"
-msgstr ""
-
 msgctxt "model:ir.action,name:report_invoice"
 msgid "Invoice"
 msgstr ""
@@ -1515,14 +1511,6 @@ msgctxt "view:account.invoice.payment_term.line:"
 msgid "%"
 msgstr ""
 
-msgctxt "view:account.invoice.print.warning:"
-msgid "The invoices will be sent directly to the printer."
-msgstr ""
-
-msgctxt "view:account.invoice.print.warning:"
-msgid "You have selected more than one invoice to print."
-msgstr ""
-
 msgctxt "view:account.invoice.tax:"
 msgid "Tax Code"
 msgstr ""
@@ -1563,6 +1551,11 @@ msgctxt "view:account.invoice:"
 msgid "Post"
 msgstr ""
 
+#, fuzzy
+msgctxt "view:account.invoice:"
+msgid "Tax Identifier"
+msgstr "Identificador de impuesto"
+
 msgctxt "view:account.invoice:"
 msgid "Validate"
 msgstr ""
@@ -1610,11 +1603,3 @@ msgstr ""
 msgctxt "wizard_button:account.invoice.payment_term.test,test,end:"
 msgid "Close"
 msgstr ""
-
-msgctxt "wizard_button:account.invoice.print,warning,end:"
-msgid "Cancel"
-msgstr ""
-
-msgctxt "wizard_button:account.invoice.print,warning,print_:"
-msgid "Print"
-msgstr ""
diff --git a/locale/fr.po b/locale/fr.po
index 4fba78e..edd7144 100644
--- a/locale/fr.po
+++ b/locale/fr.po
@@ -1,4 +1,4 @@
-# 
+#
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
@@ -254,8 +254,8 @@ msgid "Period"
 msgstr "Période"
 
 msgctxt "field:account.fiscalyear.invoice_sequence,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom de l'enregistrement"
 
 msgctxt "field:account.fiscalyear.invoice_sequence,sequence:"
 msgid "Sequence"
@@ -381,6 +381,10 @@ msgctxt "field:account.invoice,party_lang:"
 msgid "Party Language"
 msgstr "Langue du tiers"
 
+msgctxt "field:account.invoice,party_tax_identifier:"
+msgid "Party Tax Identifier"
+msgstr "Identifiant de taxe du tiers"
+
 msgctxt "field:account.invoice,payment_lines:"
 msgid "Payment Lines"
 msgstr "Lignes de paiement"
@@ -390,8 +394,8 @@ msgid "Payment Term"
 msgstr "Condition de paiement"
 
 msgctxt "field:account.invoice,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom de l'enregistrement"
 
 msgctxt "field:account.invoice,reconciled:"
 msgid "Reconciled"
@@ -462,8 +466,8 @@ msgid "Payment Line"
 msgstr "Ligne de paiement"
 
 msgctxt "field:account.invoice-account.move.line,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom de l'enregistrement"
 
 msgctxt "field:account.invoice-account.move.line,write_date:"
 msgid "Write Date"
@@ -566,8 +570,8 @@ msgid "Quantity"
 msgstr "Quantité"
 
 msgctxt "field:account.invoice.line,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom de l'enregistrement"
 
 msgctxt "field:account.invoice.line,sequence:"
 msgid "Sequence"
@@ -618,8 +622,8 @@ msgid "Invoice Line"
 msgstr "Ligne de facture"
 
 msgctxt "field:account.invoice.line-account.tax,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom de l'enregistrement"
 
 msgctxt "field:account.invoice.line-account.tax,tax:"
 msgid "Tax"
@@ -750,8 +754,8 @@ msgid "Name"
 msgstr "Nom"
 
 msgctxt "field:account.invoice.payment_term,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom de l'enregistrement"
 
 msgctxt "field:account.invoice.payment_term,write_date:"
 msgid "Write Date"
@@ -798,8 +802,8 @@ msgid "Ratio"
 msgstr "Ratio"
 
 msgctxt "field:account.invoice.payment_term.line,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom de l'enregistrement"
 
 msgctxt "field:account.invoice.payment_term.line,relativedeltas:"
 msgid "Deltas"
@@ -854,8 +858,8 @@ msgid "Number of Months"
 msgstr "Nombre de mois"
 
 msgctxt "field:account.invoice.payment_term.line.delta,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom de l'enregistrement"
 
 msgctxt "field:account.invoice.payment_term.line.delta,sequence:"
 msgid "Sequence"
@@ -921,10 +925,6 @@ msgctxt "field:account.invoice.payment_term.test.result,id:"
 msgid "ID"
 msgstr "ID"
 
-msgctxt "field:account.invoice.print.warning,id:"
-msgid "ID"
-msgstr "ID"
-
 msgctxt "field:account.invoice.tax,account:"
 msgid "Account"
 msgstr "Compte"
@@ -969,13 +969,17 @@ msgctxt "field:account.invoice.tax,invoice_state:"
 msgid "Invoice State"
 msgstr "État de la facture"
 
+msgctxt "field:account.invoice.tax,legal_notice:"
+msgid "Legal Notice"
+msgstr "Mention légale"
+
 msgctxt "field:account.invoice.tax,manual:"
 msgid "Manual"
 msgstr "Manuel"
 
 msgctxt "field:account.invoice.tax,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom de l'enregistrement"
 
 msgctxt "field:account.invoice.tax,sequence:"
 msgid "Sequence"
@@ -1042,8 +1046,8 @@ msgid "Party"
 msgstr "Tiers"
 
 msgctxt "field:party.party.payment_term,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom de l'enregistrement"
 
 msgctxt "field:party.party.payment_term,supplier_payment_term:"
 msgid "Supplier Payment Term"
@@ -1113,10 +1117,6 @@ msgctxt "model:account.invoice.payment_term.test.result,name:"
 msgid "Test Payment Term"
 msgstr "Test de condition de paiement"
 
-msgctxt "model:account.invoice.print.warning,name:"
-msgid "Print Invoice Report Warning"
-msgstr "Avertissement impression facture"
-
 msgctxt "model:account.invoice.tax,name:"
 msgid "Invoice Tax"
 msgstr "Tax de facture"
@@ -1145,10 +1145,6 @@ msgctxt "model:ir.action,name:credit"
 msgid "Credit"
 msgstr "Créditer"
 
-msgctxt "model:ir.action,name:print"
-msgid "Invoice"
-msgstr "Facture"
-
 msgctxt "model:ir.action,name:report_invoice"
 msgid "Invoice"
 msgstr "Facture"
@@ -1527,14 +1523,6 @@ msgctxt "view:account.invoice.payment_term.line:"
 msgid "%"
 msgstr "%"
 
-msgctxt "view:account.invoice.print.warning:"
-msgid "The invoices will be sent directly to the printer."
-msgstr "Les factures seront envoyées directement à l'imprimante."
-
-msgctxt "view:account.invoice.print.warning:"
-msgid "You have selected more than one invoice to print."
-msgstr "Vous avez sélectionné plus d'une facture pour imprimer."
-
 msgctxt "view:account.invoice.tax:"
 msgid "Tax Code"
 msgstr "Code de taxe"
@@ -1576,6 +1564,10 @@ msgid "Post"
 msgstr "Poster"
 
 msgctxt "view:account.invoice:"
+msgid "Tax Identifier"
+msgstr "Identifiant de taxe"
+
+msgctxt "view:account.invoice:"
 msgid "Validate"
 msgstr "Valider"
 
diff --git a/locale/hu_HU.po b/locale/hu_HU.po
index 7ac521c..5196e89 100644
--- a/locale/hu_HU.po
+++ b/locale/hu_HU.po
@@ -1,4 +1,4 @@
-# 
+#
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
@@ -206,10 +206,9 @@ msgctxt "field:account.fiscalyear.invoice_sequence,period:"
 msgid "Period"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:account.fiscalyear.invoice_sequence,rec_name:"
-msgid "Name"
-msgstr "Név"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:account.fiscalyear.invoice_sequence,sequence:"
@@ -350,6 +349,10 @@ msgctxt "field:account.invoice,party_lang:"
 msgid "Party Language"
 msgstr ""
 
+msgctxt "field:account.invoice,party_tax_identifier:"
+msgid "Party Tax Identifier"
+msgstr ""
+
 msgctxt "field:account.invoice,payment_lines:"
 msgid "Payment Lines"
 msgstr ""
@@ -358,10 +361,9 @@ msgctxt "field:account.invoice,payment_term:"
 msgid "Payment Term"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:account.invoice,rec_name:"
-msgid "Name"
-msgstr "Név"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:account.invoice,reconciled:"
 msgid "Reconciled"
@@ -439,10 +441,9 @@ msgctxt "field:account.invoice-account.move.line,line:"
 msgid "Payment Line"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:account.invoice-account.move.line,rec_name:"
-msgid "Name"
-msgstr "Név"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:account.invoice-account.move.line,write_date:"
@@ -558,10 +559,9 @@ msgctxt "field:account.invoice.line,quantity:"
 msgid "Quantity"
 msgstr "Mennyiség"
 
-#, fuzzy
 msgctxt "field:account.invoice.line,rec_name:"
-msgid "Name"
-msgstr "Név"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:account.invoice.line,sequence:"
@@ -620,10 +620,9 @@ msgctxt "field:account.invoice.line-account.tax,line:"
 msgid "Invoice Line"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:account.invoice.line-account.tax,rec_name:"
-msgid "Name"
-msgstr "Név"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:account.invoice.line-account.tax,tax:"
 msgid "Tax"
@@ -771,10 +770,9 @@ msgctxt "field:account.invoice.payment_term,name:"
 msgid "Name"
 msgstr "Név"
 
-#, fuzzy
 msgctxt "field:account.invoice.payment_term,rec_name:"
-msgid "Name"
-msgstr "Név"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:account.invoice.payment_term,write_date:"
@@ -826,10 +824,9 @@ msgctxt "field:account.invoice.payment_term.line,ratio:"
 msgid "Ratio"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:account.invoice.payment_term.line,rec_name:"
-msgid "Name"
-msgstr "Név"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:account.invoice.payment_term.line,relativedeltas:"
 msgid "Deltas"
@@ -891,10 +888,9 @@ msgctxt "field:account.invoice.payment_term.line.delta,months:"
 msgid "Number of Months"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:account.invoice.payment_term.line.delta,rec_name:"
-msgid "Name"
-msgstr "Név"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:account.invoice.payment_term.line.delta,sequence:"
@@ -969,11 +965,6 @@ msgid "ID"
 msgstr "ID"
 
 #, fuzzy
-msgctxt "field:account.invoice.print.warning,id:"
-msgid "ID"
-msgstr "ID"
-
-#, fuzzy
 msgctxt "field:account.invoice.tax,account:"
 msgid "Account"
 msgstr "Számla"
@@ -1022,14 +1013,17 @@ msgctxt "field:account.invoice.tax,invoice_state:"
 msgid "Invoice State"
 msgstr ""
 
+msgctxt "field:account.invoice.tax,legal_notice:"
+msgid "Legal Notice"
+msgstr ""
+
 msgctxt "field:account.invoice.tax,manual:"
 msgid "Manual"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:account.invoice.tax,rec_name:"
-msgid "Name"
-msgstr "Név"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:account.invoice.tax,sequence:"
@@ -1102,10 +1096,9 @@ msgctxt "field:party.party.payment_term,party:"
 msgid "Party"
 msgstr "Partner"
 
-#, fuzzy
 msgctxt "field:party.party.payment_term,rec_name:"
-msgid "Name"
-msgstr "Név"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:party.party.payment_term,supplier_payment_term:"
 msgid "Supplier Payment Term"
@@ -1177,10 +1170,6 @@ msgctxt "model:account.invoice.payment_term.test.result,name:"
 msgid "Test Payment Term"
 msgstr ""
 
-msgctxt "model:account.invoice.print.warning,name:"
-msgid "Print Invoice Report Warning"
-msgstr ""
-
 msgctxt "model:account.invoice.tax,name:"
 msgid "Invoice Tax"
 msgstr ""
@@ -1209,10 +1198,6 @@ msgctxt "model:ir.action,name:credit"
 msgid "Credit"
 msgstr ""
 
-msgctxt "model:ir.action,name:print"
-msgid "Invoice"
-msgstr ""
-
 msgctxt "model:ir.action,name:report_invoice"
 msgid "Invoice"
 msgstr ""
@@ -1617,14 +1602,6 @@ msgctxt "view:account.invoice.payment_term.line:"
 msgid "%"
 msgstr "%"
 
-msgctxt "view:account.invoice.print.warning:"
-msgid "The invoices will be sent directly to the printer."
-msgstr ""
-
-msgctxt "view:account.invoice.print.warning:"
-msgid "You have selected more than one invoice to print."
-msgstr ""
-
 msgctxt "view:account.invoice.tax:"
 msgid "Tax Code"
 msgstr ""
@@ -1667,6 +1644,10 @@ msgid "Post"
 msgstr ""
 
 msgctxt "view:account.invoice:"
+msgid "Tax Identifier"
+msgstr ""
+
+msgctxt "view:account.invoice:"
 msgid "Validate"
 msgstr ""
 
diff --git a/locale/it_IT.po b/locale/it_IT.po
index 3504723..d7f1e93 100644
--- a/locale/it_IT.po
+++ b/locale/it_IT.po
@@ -1,4 +1,4 @@
-# 
+#
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
@@ -247,10 +247,9 @@ msgctxt "field:account.fiscalyear.invoice_sequence,period:"
 msgid "Period"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:account.fiscalyear.invoice_sequence,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:account.fiscalyear.invoice_sequence,sequence:"
@@ -379,6 +378,10 @@ msgctxt "field:account.invoice,party_lang:"
 msgid "Party Language"
 msgstr "Lingua Controparte"
 
+msgctxt "field:account.invoice,party_tax_identifier:"
+msgid "Party Tax Identifier"
+msgstr ""
+
 msgctxt "field:account.invoice,payment_lines:"
 msgid "Payment Lines"
 msgstr "Righe del pagamento"
@@ -388,8 +391,8 @@ msgid "Payment Term"
 msgstr "Termine di pagamento"
 
 msgctxt "field:account.invoice,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:account.invoice,reconciled:"
 msgid "Reconciled"
@@ -460,8 +463,8 @@ msgid "Payment Line"
 msgstr "Riga pagamento"
 
 msgctxt "field:account.invoice-account.move.line,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:account.invoice-account.move.line,write_date:"
 msgid "Write Date"
@@ -564,8 +567,8 @@ msgid "Quantity"
 msgstr "Quantità"
 
 msgctxt "field:account.invoice.line,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:account.invoice.line,sequence:"
 msgid "Sequence"
@@ -616,8 +619,8 @@ msgid "Invoice Line"
 msgstr "Riga fattura"
 
 msgctxt "field:account.invoice.line-account.tax,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:account.invoice.line-account.tax,tax:"
 msgid "Tax"
@@ -748,8 +751,8 @@ msgid "Name"
 msgstr "Nome"
 
 msgctxt "field:account.invoice.payment_term,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:account.invoice.payment_term,write_date:"
 msgid "Write Date"
@@ -796,8 +799,8 @@ msgid "Ratio"
 msgstr "Rapporto"
 
 msgctxt "field:account.invoice.payment_term.line,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:account.invoice.payment_term.line,relativedeltas:"
 msgid "Deltas"
@@ -852,8 +855,8 @@ msgid "Number of Months"
 msgstr "Numero di Mesi"
 
 msgctxt "field:account.invoice.payment_term.line.delta,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:account.invoice.payment_term.line.delta,sequence:"
 msgid "Sequence"
@@ -919,10 +922,6 @@ msgctxt "field:account.invoice.payment_term.test.result,id:"
 msgid "ID"
 msgstr "ID"
 
-msgctxt "field:account.invoice.print.warning,id:"
-msgid "ID"
-msgstr "ID"
-
 msgctxt "field:account.invoice.tax,account:"
 msgid "Account"
 msgstr "Conto"
@@ -967,13 +966,17 @@ msgctxt "field:account.invoice.tax,invoice_state:"
 msgid "Invoice State"
 msgstr "Stato fattura"
 
+msgctxt "field:account.invoice.tax,legal_notice:"
+msgid "Legal Notice"
+msgstr ""
+
 msgctxt "field:account.invoice.tax,manual:"
 msgid "Manual"
 msgstr "Manuale"
 
 msgctxt "field:account.invoice.tax,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:account.invoice.tax,sequence:"
 msgid "Sequence"
@@ -1045,10 +1048,9 @@ msgctxt "field:party.party.payment_term,party:"
 msgid "Party"
 msgstr "Controparti"
 
-#, fuzzy
 msgctxt "field:party.party.payment_term,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:party.party.payment_term,supplier_payment_term:"
@@ -1122,10 +1124,6 @@ msgctxt "model:account.invoice.payment_term.test.result,name:"
 msgid "Test Payment Term"
 msgstr "Testa il termine di pagamento"
 
-msgctxt "model:account.invoice.print.warning,name:"
-msgid "Print Invoice Report Warning"
-msgstr "Avviso nel rapporto di stampa fattura"
-
 msgctxt "model:account.invoice.tax,name:"
 msgid "Invoice Tax"
 msgstr "Imposta fattura"
@@ -1154,10 +1152,6 @@ msgctxt "model:ir.action,name:credit"
 msgid "Credit"
 msgstr "AVERE"
 
-msgctxt "model:ir.action,name:print"
-msgid "Invoice"
-msgstr "Fattura"
-
 msgctxt "model:ir.action,name:report_invoice"
 msgid "Invoice"
 msgstr "Fattura"
@@ -1537,14 +1531,6 @@ msgctxt "view:account.invoice.payment_term.line:"
 msgid "%"
 msgstr "%"
 
-msgctxt "view:account.invoice.print.warning:"
-msgid "The invoices will be sent directly to the printer."
-msgstr "Le fatture saranno inviate direttamente alla stampante"
-
-msgctxt "view:account.invoice.print.warning:"
-msgid "You have selected more than one invoice to print."
-msgstr "Più di una fattura selezionate per la stampa"
-
 msgctxt "view:account.invoice.tax:"
 msgid "Tax Code"
 msgstr "Codice Imposta"
@@ -1585,6 +1571,11 @@ msgctxt "view:account.invoice:"
 msgid "Post"
 msgstr "Registra"
 
+#, fuzzy
+msgctxt "view:account.invoice:"
+msgid "Tax Identifier"
+msgstr "Identificativo fiscale"
+
 msgctxt "view:account.invoice:"
 msgid "Validate"
 msgstr "Valida"
diff --git a/locale/ja_JP.po b/locale/ja_JP.po
index 2c6639f..4e1bac3 100644
--- a/locale/ja_JP.po
+++ b/locale/ja_JP.po
@@ -1,4 +1,4 @@
-# 
+#
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
@@ -203,7 +203,7 @@ msgid "Period"
 msgstr ""
 
 msgctxt "field:account.fiscalyear.invoice_sequence,rec_name:"
-msgid "Name"
+msgid "Record Name"
 msgstr ""
 
 msgctxt "field:account.fiscalyear.invoice_sequence,sequence:"
@@ -330,6 +330,10 @@ msgctxt "field:account.invoice,party_lang:"
 msgid "Party Language"
 msgstr ""
 
+msgctxt "field:account.invoice,party_tax_identifier:"
+msgid "Party Tax Identifier"
+msgstr ""
+
 msgctxt "field:account.invoice,payment_lines:"
 msgid "Payment Lines"
 msgstr ""
@@ -340,7 +344,7 @@ msgid "Payment Term"
 msgstr "Payment Terms"
 
 msgctxt "field:account.invoice,rec_name:"
-msgid "Name"
+msgid "Record Name"
 msgstr ""
 
 msgctxt "field:account.invoice,reconciled:"
@@ -413,7 +417,7 @@ msgid "Payment Line"
 msgstr ""
 
 msgctxt "field:account.invoice-account.move.line,rec_name:"
-msgid "Name"
+msgid "Record Name"
 msgstr ""
 
 msgctxt "field:account.invoice-account.move.line,write_date:"
@@ -518,7 +522,7 @@ msgid "Quantity"
 msgstr ""
 
 msgctxt "field:account.invoice.line,rec_name:"
-msgid "Name"
+msgid "Record Name"
 msgstr ""
 
 msgctxt "field:account.invoice.line,sequence:"
@@ -570,7 +574,7 @@ msgid "Invoice Line"
 msgstr ""
 
 msgctxt "field:account.invoice.line-account.tax,rec_name:"
-msgid "Name"
+msgid "Record Name"
 msgstr ""
 
 msgctxt "field:account.invoice.line-account.tax,tax:"
@@ -703,7 +707,7 @@ msgid "Name"
 msgstr ""
 
 msgctxt "field:account.invoice.payment_term,rec_name:"
-msgid "Name"
+msgid "Record Name"
 msgstr ""
 
 msgctxt "field:account.invoice.payment_term,write_date:"
@@ -752,7 +756,7 @@ msgid "Ratio"
 msgstr ""
 
 msgctxt "field:account.invoice.payment_term.line,rec_name:"
-msgid "Name"
+msgid "Record Name"
 msgstr ""
 
 msgctxt "field:account.invoice.payment_term.line,relativedeltas:"
@@ -808,7 +812,7 @@ msgid "Number of Months"
 msgstr ""
 
 msgctxt "field:account.invoice.payment_term.line.delta,rec_name:"
-msgid "Name"
+msgid "Record Name"
 msgstr ""
 
 msgctxt "field:account.invoice.payment_term.line.delta,sequence:"
@@ -876,10 +880,6 @@ msgctxt "field:account.invoice.payment_term.test.result,id:"
 msgid "ID"
 msgstr ""
 
-msgctxt "field:account.invoice.print.warning,id:"
-msgid "ID"
-msgstr ""
-
 msgctxt "field:account.invoice.tax,account:"
 msgid "Account"
 msgstr ""
@@ -925,12 +925,16 @@ msgctxt "field:account.invoice.tax,invoice_state:"
 msgid "Invoice State"
 msgstr ""
 
+msgctxt "field:account.invoice.tax,legal_notice:"
+msgid "Legal Notice"
+msgstr ""
+
 msgctxt "field:account.invoice.tax,manual:"
 msgid "Manual"
 msgstr ""
 
 msgctxt "field:account.invoice.tax,rec_name:"
-msgid "Name"
+msgid "Record Name"
 msgstr ""
 
 msgctxt "field:account.invoice.tax,sequence:"
@@ -1000,7 +1004,7 @@ msgid "Party"
 msgstr ""
 
 msgctxt "field:party.party.payment_term,rec_name:"
-msgid "Name"
+msgid "Record Name"
 msgstr ""
 
 msgctxt "field:party.party.payment_term,supplier_payment_term:"
@@ -1077,10 +1081,6 @@ msgctxt "model:account.invoice.payment_term.test.result,name:"
 msgid "Test Payment Term"
 msgstr "Test Payment Term"
 
-msgctxt "model:account.invoice.print.warning,name:"
-msgid "Print Invoice Report Warning"
-msgstr ""
-
 msgctxt "model:account.invoice.tax,name:"
 msgid "Invoice Tax"
 msgstr ""
@@ -1109,10 +1109,6 @@ msgctxt "model:ir.action,name:credit"
 msgid "Credit"
 msgstr "Credit"
 
-msgctxt "model:ir.action,name:print"
-msgid "Invoice"
-msgstr "Invoice"
-
 msgctxt "model:ir.action,name:report_invoice"
 msgid "Invoice"
 msgstr "Invoice"
@@ -1503,14 +1499,6 @@ msgctxt "view:account.invoice.payment_term.line:"
 msgid "%"
 msgstr ""
 
-msgctxt "view:account.invoice.print.warning:"
-msgid "The invoices will be sent directly to the printer."
-msgstr ""
-
-msgctxt "view:account.invoice.print.warning:"
-msgid "You have selected more than one invoice to print."
-msgstr ""
-
 msgctxt "view:account.invoice.tax:"
 msgid "Tax Code"
 msgstr ""
@@ -1553,6 +1541,10 @@ msgctxt "view:account.invoice:"
 msgid "Post"
 msgstr ""
 
+msgctxt "view:account.invoice:"
+msgid "Tax Identifier"
+msgstr ""
+
 #, fuzzy
 msgctxt "view:account.invoice:"
 msgid "Validate"
@@ -1604,11 +1596,3 @@ msgstr ""
 msgctxt "wizard_button:account.invoice.payment_term.test,test,end:"
 msgid "Close"
 msgstr ""
-
-msgctxt "wizard_button:account.invoice.print,warning,end:"
-msgid "Cancel"
-msgstr ""
-
-msgctxt "wizard_button:account.invoice.print,warning,print_:"
-msgid "Print"
-msgstr ""
diff --git a/locale/lo.po b/locale/lo.po
index f912bb0..8c9f313 100644
--- a/locale/lo.po
+++ b/locale/lo.po
@@ -1,4 +1,4 @@
-# 
+#
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
@@ -206,10 +206,9 @@ msgctxt "field:account.fiscalyear.invoice_sequence,period:"
 msgid "Period"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:account.fiscalyear.invoice_sequence,rec_name:"
-msgid "Name"
-msgstr "ຊື່"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:account.fiscalyear.invoice_sequence,sequence:"
@@ -339,6 +338,10 @@ msgctxt "field:account.invoice,party_lang:"
 msgid "Party Language"
 msgstr "ພາສາ"
 
+msgctxt "field:account.invoice,party_tax_identifier:"
+msgid "Party Tax Identifier"
+msgstr ""
+
 msgctxt "field:account.invoice,payment_lines:"
 msgid "Payment Lines"
 msgstr "ຮ່ວງຊໍາລະ"
@@ -348,8 +351,8 @@ msgid "Payment Term"
 msgstr "ຮູບແບບການຈ່າຍ"
 
 msgctxt "field:account.invoice,rec_name:"
-msgid "Name"
-msgstr "ຊື່"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:account.invoice,reconciled:"
 msgid "Reconciled"
@@ -423,10 +426,9 @@ msgctxt "field:account.invoice-account.move.line,line:"
 msgid "Payment Line"
 msgstr "ຮ່ວງຊໍາລະ"
 
-#, fuzzy
 msgctxt "field:account.invoice-account.move.line,rec_name:"
-msgid "Name"
-msgstr "ຊື່"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:account.invoice-account.move.line,write_date:"
 msgid "Write Date"
@@ -541,10 +543,9 @@ msgctxt "field:account.invoice.line,quantity:"
 msgid "Quantity"
 msgstr "ຈຳນວນ"
 
-#, fuzzy
 msgctxt "field:account.invoice.line,rec_name:"
-msgid "Name"
-msgstr "ຊື່"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:account.invoice.line,sequence:"
@@ -597,10 +598,9 @@ msgctxt "field:account.invoice.line-account.tax,line:"
 msgid "Invoice Line"
 msgstr "ລາຍການ"
 
-#, fuzzy
 msgctxt "field:account.invoice.line-account.tax,rec_name:"
-msgid "Name"
-msgstr "ຊື່"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:account.invoice.line-account.tax,tax:"
 msgid "Tax"
@@ -746,10 +746,9 @@ msgctxt "field:account.invoice.payment_term,name:"
 msgid "Name"
 msgstr "ຊື່"
 
-#, fuzzy
 msgctxt "field:account.invoice.payment_term,rec_name:"
-msgid "Name"
-msgstr "ຊື່"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:account.invoice.payment_term,write_date:"
 msgid "Write Date"
@@ -800,10 +799,9 @@ msgctxt "field:account.invoice.payment_term.line,ratio:"
 msgid "Ratio"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:account.invoice.payment_term.line,rec_name:"
-msgid "Name"
-msgstr "ຊື່"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:account.invoice.payment_term.line,relativedeltas:"
 msgid "Deltas"
@@ -863,10 +861,9 @@ msgctxt "field:account.invoice.payment_term.line.delta,months:"
 msgid "Number of Months"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:account.invoice.payment_term.line.delta,rec_name:"
-msgid "Name"
-msgstr "ຊື່"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:account.invoice.payment_term.line.delta,sequence:"
@@ -945,11 +942,6 @@ msgctxt "field:account.invoice.payment_term.test.result,id:"
 msgid "ID"
 msgstr "ລໍາດັບໃບເກັບເງິນ"
 
-#, fuzzy
-msgctxt "field:account.invoice.print.warning,id:"
-msgid "ID"
-msgstr "ລໍາດັບໃບເກັບເງິນ"
-
 msgctxt "field:account.invoice.tax,account:"
 msgid "Account"
 msgstr "ບັນຊີ"
@@ -997,13 +989,17 @@ msgctxt "field:account.invoice.tax,invoice_state:"
 msgid "Invoice State"
 msgstr "ວັນທີໃບເກັບເງິນ"
 
+msgctxt "field:account.invoice.tax,legal_notice:"
+msgid "Legal Notice"
+msgstr ""
+
 msgctxt "field:account.invoice.tax,manual:"
 msgid "Manual"
 msgstr "ໃສ່ເອົາເອງ"
 
 msgctxt "field:account.invoice.tax,rec_name:"
-msgid "Name"
-msgstr "ຊື່"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:account.invoice.tax,sequence:"
 msgid "Sequence"
@@ -1075,10 +1071,9 @@ msgctxt "field:party.party.payment_term,party:"
 msgid "Party"
 msgstr "ພາກສ່ວນ"
 
-#, fuzzy
 msgctxt "field:party.party.payment_term,rec_name:"
-msgid "Name"
-msgstr "ຊື່"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:party.party.payment_term,supplier_payment_term:"
 msgid "Supplier Payment Term"
@@ -1155,10 +1150,6 @@ msgctxt "model:account.invoice.payment_term.test.result,name:"
 msgid "Test Payment Term"
 msgstr ""
 
-msgctxt "model:account.invoice.print.warning,name:"
-msgid "Print Invoice Report Warning"
-msgstr ""
-
 msgctxt "model:account.invoice.tax,name:"
 msgid "Invoice Tax"
 msgstr "ອາກອນໃບເກັບເງິນ"
@@ -1192,11 +1183,6 @@ msgid "Credit"
 msgstr "ມີ"
 
 #, fuzzy
-msgctxt "model:ir.action,name:print"
-msgid "Invoice"
-msgstr "ໃບເກັບເງິນ"
-
-#, fuzzy
 msgctxt "model:ir.action,name:report_invoice"
 msgid "Invoice"
 msgstr "ໃບເກັບເງິນ"
@@ -1607,14 +1593,6 @@ msgctxt "view:account.invoice.payment_term.line:"
 msgid "%"
 msgstr "%"
 
-msgctxt "view:account.invoice.print.warning:"
-msgid "The invoices will be sent directly to the printer."
-msgstr ""
-
-msgctxt "view:account.invoice.print.warning:"
-msgid "You have selected more than one invoice to print."
-msgstr ""
-
 #, fuzzy
 msgctxt "view:account.invoice.tax:"
 msgid "Tax Code"
@@ -1661,6 +1639,10 @@ msgid "Post"
 msgstr "ປະກາດ"
 
 msgctxt "view:account.invoice:"
+msgid "Tax Identifier"
+msgstr ""
+
+msgctxt "view:account.invoice:"
 msgid "Validate"
 msgstr "ກວດສອບ"
 
diff --git a/locale/lt.po b/locale/lt.po
index cabe31e..d8b7e73 100644
--- a/locale/lt.po
+++ b/locale/lt.po
@@ -1,4 +1,4 @@
-# 
+#
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
@@ -202,10 +202,9 @@ msgctxt "field:account.fiscalyear.invoice_sequence,period:"
 msgid "Period"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:account.fiscalyear.invoice_sequence,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:account.fiscalyear.invoice_sequence,sequence:"
 msgid "Sequence"
@@ -331,6 +330,10 @@ msgctxt "field:account.invoice,party_lang:"
 msgid "Party Language"
 msgstr ""
 
+msgctxt "field:account.invoice,party_tax_identifier:"
+msgid "Party Tax Identifier"
+msgstr ""
+
 msgctxt "field:account.invoice,payment_lines:"
 msgid "Payment Lines"
 msgstr ""
@@ -339,10 +342,9 @@ msgctxt "field:account.invoice,payment_term:"
 msgid "Payment Term"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:account.invoice,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:account.invoice,reconciled:"
 msgid "Reconciled"
@@ -412,10 +414,9 @@ msgctxt "field:account.invoice-account.move.line,line:"
 msgid "Payment Line"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:account.invoice-account.move.line,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:account.invoice-account.move.line,write_date:"
 msgid "Write Date"
@@ -517,10 +518,9 @@ msgctxt "field:account.invoice.line,quantity:"
 msgid "Quantity"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:account.invoice.line,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:account.invoice.line,sequence:"
 msgid "Sequence"
@@ -570,10 +570,9 @@ msgctxt "field:account.invoice.line-account.tax,line:"
 msgid "Invoice Line"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:account.invoice.line-account.tax,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:account.invoice.line-account.tax,tax:"
 msgid "Tax"
@@ -704,10 +703,9 @@ msgctxt "field:account.invoice.payment_term,name:"
 msgid "Name"
 msgstr "Namu"
 
-#, fuzzy
 msgctxt "field:account.invoice.payment_term,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:account.invoice.payment_term,write_date:"
 msgid "Write Date"
@@ -753,10 +751,9 @@ msgctxt "field:account.invoice.payment_term.line,ratio:"
 msgid "Ratio"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:account.invoice.payment_term.line,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:account.invoice.payment_term.line,relativedeltas:"
 msgid "Deltas"
@@ -810,10 +807,9 @@ msgctxt "field:account.invoice.payment_term.line.delta,months:"
 msgid "Number of Months"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:account.invoice.payment_term.line.delta,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:account.invoice.payment_term.line.delta,sequence:"
 msgid "Sequence"
@@ -879,10 +875,6 @@ msgctxt "field:account.invoice.payment_term.test.result,id:"
 msgid "ID"
 msgstr ""
 
-msgctxt "field:account.invoice.print.warning,id:"
-msgid "ID"
-msgstr ""
-
 msgctxt "field:account.invoice.tax,account:"
 msgid "Account"
 msgstr ""
@@ -927,14 +919,17 @@ msgctxt "field:account.invoice.tax,invoice_state:"
 msgid "Invoice State"
 msgstr ""
 
+msgctxt "field:account.invoice.tax,legal_notice:"
+msgid "Legal Notice"
+msgstr ""
+
 msgctxt "field:account.invoice.tax,manual:"
 msgid "Manual"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:account.invoice.tax,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:account.invoice.tax,sequence:"
 msgid "Sequence"
@@ -1000,10 +995,9 @@ msgctxt "field:party.party.payment_term,party:"
 msgid "Party"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:party.party.payment_term,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:party.party.payment_term,supplier_payment_term:"
 msgid "Supplier Payment Term"
@@ -1073,10 +1067,6 @@ msgctxt "model:account.invoice.payment_term.test.result,name:"
 msgid "Test Payment Term"
 msgstr ""
 
-msgctxt "model:account.invoice.print.warning,name:"
-msgid "Print Invoice Report Warning"
-msgstr ""
-
 msgctxt "model:account.invoice.tax,name:"
 msgid "Invoice Tax"
 msgstr ""
@@ -1105,10 +1095,6 @@ msgctxt "model:ir.action,name:credit"
 msgid "Credit"
 msgstr ""
 
-msgctxt "model:ir.action,name:print"
-msgid "Invoice"
-msgstr ""
-
 msgctxt "model:ir.action,name:report_invoice"
 msgid "Invoice"
 msgstr ""
@@ -1489,14 +1475,6 @@ msgctxt "view:account.invoice.payment_term.line:"
 msgid "%"
 msgstr "%"
 
-msgctxt "view:account.invoice.print.warning:"
-msgid "The invoices will be sent directly to the printer."
-msgstr ""
-
-msgctxt "view:account.invoice.print.warning:"
-msgid "You have selected more than one invoice to print."
-msgstr ""
-
 msgctxt "view:account.invoice.tax:"
 msgid "Tax Code"
 msgstr ""
@@ -1538,6 +1516,10 @@ msgid "Post"
 msgstr ""
 
 msgctxt "view:account.invoice:"
+msgid "Tax Identifier"
+msgstr ""
+
+msgctxt "view:account.invoice:"
 msgid "Validate"
 msgstr ""
 
@@ -1584,11 +1566,3 @@ msgstr ""
 msgctxt "wizard_button:account.invoice.payment_term.test,test,end:"
 msgid "Close"
 msgstr ""
-
-msgctxt "wizard_button:account.invoice.print,warning,end:"
-msgid "Cancel"
-msgstr ""
-
-msgctxt "wizard_button:account.invoice.print,warning,print_:"
-msgid "Print"
-msgstr ""
diff --git a/locale/nl.po b/locale/nl.po
index abce84d..b8c1be1 100644
--- a/locale/nl.po
+++ b/locale/nl.po
@@ -1,4 +1,4 @@
-# 
+#
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
@@ -210,10 +210,9 @@ msgctxt "field:account.fiscalyear.invoice_sequence,period:"
 msgid "Period"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:account.fiscalyear.invoice_sequence,rec_name:"
-msgid "Name"
-msgstr "Naam"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:account.fiscalyear.invoice_sequence,sequence:"
@@ -346,6 +345,10 @@ msgctxt "field:account.invoice,party_lang:"
 msgid "Party Language"
 msgstr "Taal relatie"
 
+msgctxt "field:account.invoice,party_tax_identifier:"
+msgid "Party Tax Identifier"
+msgstr ""
+
 msgctxt "field:account.invoice,payment_lines:"
 msgid "Payment Lines"
 msgstr "Betalingen"
@@ -355,8 +358,8 @@ msgid "Payment Term"
 msgstr "Betalingstermijn"
 
 msgctxt "field:account.invoice,rec_name:"
-msgid "Name"
-msgstr "Naam"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:account.invoice,reconciled:"
 msgid "Reconciled"
@@ -432,8 +435,8 @@ msgid "Payment Line"
 msgstr "Betalingen"
 
 msgctxt "field:account.invoice-account.move.line,rec_name:"
-msgid "Name"
-msgstr "Naam"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:account.invoice-account.move.line,write_date:"
@@ -544,8 +547,8 @@ msgid "Quantity"
 msgstr "Hoeveelheid"
 
 msgctxt "field:account.invoice.line,rec_name:"
-msgid "Name"
-msgstr "Naam"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:account.invoice.line,sequence:"
 msgid "Sequence"
@@ -601,8 +604,8 @@ msgid "Invoice Line"
 msgstr "Factuurregel"
 
 msgctxt "field:account.invoice.line-account.tax,rec_name:"
-msgid "Name"
-msgstr "Naam"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:account.invoice.line-account.tax,tax:"
 msgid "Tax"
@@ -754,8 +757,8 @@ msgid "Name"
 msgstr "Betalingstermijn"
 
 msgctxt "field:account.invoice.payment_term,rec_name:"
-msgid "Name"
-msgstr "Naam"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:account.invoice.payment_term,write_date:"
@@ -807,8 +810,8 @@ msgid "Ratio"
 msgstr ""
 
 msgctxt "field:account.invoice.payment_term.line,rec_name:"
-msgid "Name"
-msgstr "Naam"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:account.invoice.payment_term.line,relativedeltas:"
 msgid "Deltas"
@@ -869,10 +872,9 @@ msgctxt "field:account.invoice.payment_term.line.delta,months:"
 msgid "Number of Months"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:account.invoice.payment_term.line.delta,rec_name:"
-msgid "Name"
-msgstr "Naam bijlage"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:account.invoice.payment_term.line.delta,sequence:"
@@ -951,11 +953,6 @@ msgctxt "field:account.invoice.payment_term.test.result,id:"
 msgid "ID"
 msgstr "ID"
 
-#, fuzzy
-msgctxt "field:account.invoice.print.warning,id:"
-msgid "ID"
-msgstr "ID"
-
 msgctxt "field:account.invoice.tax,account:"
 msgid "Account"
 msgstr "Rekening"
@@ -1004,13 +1001,17 @@ msgctxt "field:account.invoice.tax,invoice_state:"
 msgid "Invoice State"
 msgstr "Factuur status"
 
+msgctxt "field:account.invoice.tax,legal_notice:"
+msgid "Legal Notice"
+msgstr ""
+
 msgctxt "field:account.invoice.tax,manual:"
 msgid "Manual"
 msgstr "Handmatig"
 
 msgctxt "field:account.invoice.tax,rec_name:"
-msgid "Name"
-msgstr "Naam"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:account.invoice.tax,sequence:"
 msgid "Sequence"
@@ -1085,10 +1086,9 @@ msgctxt "field:party.party.payment_term,party:"
 msgid "Party"
 msgstr "Relatie"
 
-#, fuzzy
 msgctxt "field:party.party.payment_term,rec_name:"
-msgid "Name"
-msgstr "Naam"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:party.party.payment_term,supplier_payment_term:"
@@ -1161,10 +1161,6 @@ msgctxt "model:account.invoice.payment_term.test.result,name:"
 msgid "Test Payment Term"
 msgstr ""
 
-msgctxt "model:account.invoice.print.warning,name:"
-msgid "Print Invoice Report Warning"
-msgstr ""
-
 msgctxt "model:account.invoice.tax,name:"
 msgid "Invoice Tax"
 msgstr "Belasting factuur"
@@ -1196,11 +1192,6 @@ msgctxt "model:ir.action,name:credit"
 msgid "Credit"
 msgstr "Credit"
 
-#, fuzzy
-msgctxt "model:ir.action,name:print"
-msgid "Invoice"
-msgstr "Verkoopfactuur"
-
 msgctxt "model:ir.action,name:report_invoice"
 msgid "Invoice"
 msgstr "Verkoopfactuur"
@@ -1607,14 +1598,6 @@ msgctxt "view:account.invoice.payment_term.line:"
 msgid "%"
 msgstr "%"
 
-msgctxt "view:account.invoice.print.warning:"
-msgid "The invoices will be sent directly to the printer."
-msgstr ""
-
-msgctxt "view:account.invoice.print.warning:"
-msgid "You have selected more than one invoice to print."
-msgstr ""
-
 msgctxt "view:account.invoice.tax:"
 msgid "Tax Code"
 msgstr "Belastingcode"
@@ -1659,6 +1642,10 @@ msgctxt "view:account.invoice:"
 msgid "Post"
 msgstr "Boeken"
 
+msgctxt "view:account.invoice:"
+msgid "Tax Identifier"
+msgstr ""
+
 #, fuzzy
 msgctxt "view:account.invoice:"
 msgid "Validate"
diff --git a/locale/pl.po b/locale/pl.po
index 2c6639f..fe0c721 100644
--- a/locale/pl.po
+++ b/locale/pl.po
@@ -1,4 +1,4 @@
-# 
+#
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
@@ -164,23 +164,23 @@ msgstr ""
 
 msgctxt "field:account.fiscalyear.invoice_sequence,company:"
 msgid "Company"
-msgstr ""
+msgstr "Firma"
 
 msgctxt "field:account.fiscalyear.invoice_sequence,create_date:"
 msgid "Create Date"
-msgstr ""
+msgstr "Data utworzenia"
 
 msgctxt "field:account.fiscalyear.invoice_sequence,create_uid:"
 msgid "Create User"
-msgstr ""
+msgstr "Utworzył"
 
 msgctxt "field:account.fiscalyear.invoice_sequence,fiscalyear:"
 msgid "Fiscal Year"
-msgstr ""
+msgstr "Rok podatkowy"
 
 msgctxt "field:account.fiscalyear.invoice_sequence,id:"
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 msgctxt "field:account.fiscalyear.invoice_sequence,in_credit_note_sequence:"
 msgid "Supplier Credit Note Sequence"
@@ -200,27 +200,27 @@ msgstr ""
 
 msgctxt "field:account.fiscalyear.invoice_sequence,period:"
 msgid "Period"
-msgstr ""
+msgstr "Okres"
 
 msgctxt "field:account.fiscalyear.invoice_sequence,rec_name:"
-msgid "Name"
-msgstr ""
+msgid "Record Name"
+msgstr "Nazwa rekordu"
 
 msgctxt "field:account.fiscalyear.invoice_sequence,sequence:"
 msgid "Sequence"
-msgstr ""
+msgstr "Sekwencja"
 
 msgctxt "field:account.fiscalyear.invoice_sequence,write_date:"
 msgid "Write Date"
-msgstr ""
+msgstr "Data zapisu"
 
 msgctxt "field:account.fiscalyear.invoice_sequence,write_uid:"
 msgid "Write User"
-msgstr ""
+msgstr "Zapisał"
 
 msgctxt "field:account.invoice,account:"
 msgid "Account"
-msgstr ""
+msgstr "Konto"
 
 msgctxt "field:account.invoice,accounting_date:"
 msgid "Accounting Date"
@@ -240,11 +240,11 @@ msgstr ""
 
 msgctxt "field:account.invoice,comment:"
 msgid "Comment"
-msgstr ""
+msgstr "Komentarz"
 
 msgctxt "field:account.invoice,company:"
 msgid "Company"
-msgstr ""
+msgstr "Firma"
 
 msgctxt "field:account.invoice,company_party:"
 msgid "Company Party"
@@ -252,15 +252,15 @@ msgstr ""
 
 msgctxt "field:account.invoice,create_date:"
 msgid "Create Date"
-msgstr ""
+msgstr "Data utworzenia"
 
 msgctxt "field:account.invoice,create_uid:"
 msgid "Create User"
-msgstr ""
+msgstr "Utworzył"
 
 msgctxt "field:account.invoice,currency:"
 msgid "Currency"
-msgstr ""
+msgstr "Waluta"
 
 msgctxt "field:account.invoice,currency_date:"
 msgid "Currency Date"
@@ -272,11 +272,11 @@ msgstr ""
 
 msgctxt "field:account.invoice,description:"
 msgid "Description"
-msgstr ""
+msgstr "Opis"
 
 msgctxt "field:account.invoice,id:"
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 msgctxt "field:account.invoice,invoice_address:"
 msgid "Invoice Address"
@@ -324,10 +324,14 @@ msgstr ""
 
 msgctxt "field:account.invoice,party:"
 msgid "Party"
-msgstr ""
+msgstr "Strona"
 
 msgctxt "field:account.invoice,party_lang:"
 msgid "Party Language"
+msgstr "Język strony"
+
+msgctxt "field:account.invoice,party_tax_identifier:"
+msgid "Party Tax Identifier"
 msgstr ""
 
 msgctxt "field:account.invoice,payment_lines:"
@@ -340,8 +344,8 @@ msgid "Payment Term"
 msgstr "Payment Terms"
 
 msgctxt "field:account.invoice,rec_name:"
-msgid "Name"
-msgstr ""
+msgid "Record Name"
+msgstr "Nazwa rekordu"
 
 msgctxt "field:account.invoice,reconciled:"
 msgid "Reconciled"
@@ -353,11 +357,11 @@ msgstr ""
 
 msgctxt "field:account.invoice,state:"
 msgid "State"
-msgstr ""
+msgstr "Stan"
 
 msgctxt "field:account.invoice,tax_amount:"
 msgid "Tax"
-msgstr ""
+msgstr "Podatek"
 
 msgctxt "field:account.invoice,tax_identifier:"
 msgid "Tax Identifier"
@@ -373,11 +377,11 @@ msgstr ""
 
 msgctxt "field:account.invoice,type:"
 msgid "Type"
-msgstr ""
+msgstr "Typ"
 
 msgctxt "field:account.invoice,type_name:"
 msgid "Type"
-msgstr ""
+msgstr "Typ"
 
 msgctxt "field:account.invoice,untaxed_amount:"
 msgid "Untaxed"
@@ -385,48 +389,47 @@ msgstr ""
 
 msgctxt "field:account.invoice,write_date:"
 msgid "Write Date"
-msgstr ""
+msgstr "Data zapisu"
 
 msgctxt "field:account.invoice,write_uid:"
 msgid "Write User"
-msgstr ""
+msgstr "Zapisał"
 
 msgctxt "field:account.invoice-account.move.line,create_date:"
 msgid "Create Date"
-msgstr ""
+msgstr "Data utworzenia"
 
 msgctxt "field:account.invoice-account.move.line,create_uid:"
 msgid "Create User"
-msgstr ""
+msgstr "Utworzył"
 
 msgctxt "field:account.invoice-account.move.line,id:"
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
-#, fuzzy
 msgctxt "field:account.invoice-account.move.line,invoice:"
 msgid "Invoice"
-msgstr "Invoice"
+msgstr "Faktura"
 
 msgctxt "field:account.invoice-account.move.line,line:"
 msgid "Payment Line"
 msgstr ""
 
 msgctxt "field:account.invoice-account.move.line,rec_name:"
-msgid "Name"
-msgstr ""
+msgid "Record Name"
+msgstr "Nazwa rekordu"
 
 msgctxt "field:account.invoice-account.move.line,write_date:"
 msgid "Write Date"
-msgstr ""
+msgstr "Data zapisu"
 
 msgctxt "field:account.invoice-account.move.line,write_uid:"
 msgid "Write User"
-msgstr ""
+msgstr "Zapisał"
 
 msgctxt "field:account.invoice.credit.start,id:"
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 msgctxt "field:account.invoice.credit.start,with_refund:"
 msgid "With Refund"
@@ -438,7 +441,7 @@ msgstr ""
 
 msgctxt "field:account.invoice.line,account:"
 msgid "Account"
-msgstr ""
+msgstr "Konto"
 
 msgctxt "field:account.invoice.line,amount:"
 msgid "Amount"
@@ -446,19 +449,19 @@ msgstr ""
 
 msgctxt "field:account.invoice.line,company:"
 msgid "Company"
-msgstr ""
+msgstr "Firma"
 
 msgctxt "field:account.invoice.line,create_date:"
 msgid "Create Date"
-msgstr ""
+msgstr "Data utworzenia"
 
 msgctxt "field:account.invoice.line,create_uid:"
 msgid "Create User"
-msgstr ""
+msgstr "Utworzył"
 
 msgctxt "field:account.invoice.line,currency:"
 msgid "Currency"
-msgstr ""
+msgstr "Waluta"
 
 msgctxt "field:account.invoice.line,currency_digits:"
 msgid "Currency Digits"
@@ -466,16 +469,15 @@ msgstr ""
 
 msgctxt "field:account.invoice.line,description:"
 msgid "Description"
-msgstr ""
+msgstr "Opis"
 
 msgctxt "field:account.invoice.line,id:"
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
-#, fuzzy
 msgctxt "field:account.invoice.line,invoice:"
 msgid "Invoice"
-msgstr "Invoice"
+msgstr "Faktura"
 
 msgctxt "field:account.invoice.line,invoice_state:"
 msgid "Invoice State"
@@ -499,15 +501,15 @@ msgstr ""
 
 msgctxt "field:account.invoice.line,party:"
 msgid "Party"
-msgstr ""
+msgstr "Strona"
 
 msgctxt "field:account.invoice.line,party_lang:"
 msgid "Party Language"
-msgstr ""
+msgstr "Język strony"
 
 msgctxt "field:account.invoice.line,product:"
 msgid "Product"
-msgstr ""
+msgstr "Produkt"
 
 msgctxt "field:account.invoice.line,product_uom_category:"
 msgid "Product Uom Category"
@@ -518,20 +520,20 @@ msgid "Quantity"
 msgstr ""
 
 msgctxt "field:account.invoice.line,rec_name:"
-msgid "Name"
-msgstr ""
+msgid "Record Name"
+msgstr "Nazwa rekordu"
 
 msgctxt "field:account.invoice.line,sequence:"
 msgid "Sequence"
-msgstr ""
+msgstr "Sekwencja"
 
 msgctxt "field:account.invoice.line,taxes:"
 msgid "Taxes"
-msgstr ""
+msgstr "Podatki"
 
 msgctxt "field:account.invoice.line,type:"
 msgid "Type"
-msgstr ""
+msgstr "Typ"
 
 msgctxt "field:account.invoice.line,unit:"
 msgid "Unit"
@@ -547,43 +549,43 @@ msgstr ""
 
 msgctxt "field:account.invoice.line,write_date:"
 msgid "Write Date"
-msgstr ""
+msgstr "Data zapisu"
 
 msgctxt "field:account.invoice.line,write_uid:"
 msgid "Write User"
-msgstr ""
+msgstr "Zapisał"
 
 msgctxt "field:account.invoice.line-account.tax,create_date:"
 msgid "Create Date"
-msgstr ""
+msgstr "Data utworzenia"
 
 msgctxt "field:account.invoice.line-account.tax,create_uid:"
 msgid "Create User"
-msgstr ""
+msgstr "Utworzył"
 
 msgctxt "field:account.invoice.line-account.tax,id:"
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 msgctxt "field:account.invoice.line-account.tax,line:"
 msgid "Invoice Line"
 msgstr ""
 
 msgctxt "field:account.invoice.line-account.tax,rec_name:"
-msgid "Name"
-msgstr ""
+msgid "Record Name"
+msgstr "Nazwa rekordu"
 
 msgctxt "field:account.invoice.line-account.tax,tax:"
 msgid "Tax"
-msgstr ""
+msgstr "Podatek"
 
 msgctxt "field:account.invoice.line-account.tax,write_date:"
 msgid "Write Date"
-msgstr ""
+msgstr "Data zapisu"
 
 msgctxt "field:account.invoice.line-account.tax,write_uid:"
 msgid "Write User"
-msgstr ""
+msgstr "Zapisał"
 
 msgctxt "field:account.invoice.pay.ask,amount:"
 msgid "Payment Amount"
@@ -595,7 +597,7 @@ msgstr ""
 
 msgctxt "field:account.invoice.pay.ask,company:"
 msgid "Company"
-msgstr ""
+msgstr "Firma"
 
 msgctxt "field:account.invoice.pay.ask,currency:"
 msgid "Payment Currency"
@@ -615,16 +617,15 @@ msgstr ""
 
 msgctxt "field:account.invoice.pay.ask,date:"
 msgid "Date"
-msgstr ""
+msgstr "Data"
 
 msgctxt "field:account.invoice.pay.ask,id:"
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
-#, fuzzy
 msgctxt "field:account.invoice.pay.ask,invoice:"
 msgid "Invoice"
-msgstr "Invoice"
+msgstr "Faktura"
 
 msgctxt "field:account.invoice.pay.ask,journal_writeoff:"
 msgid "Write-Off Journal"
@@ -644,7 +645,7 @@ msgstr ""
 
 msgctxt "field:account.invoice.pay.ask,type:"
 msgid "Type"
-msgstr ""
+msgstr "Typ"
 
 msgctxt "field:account.invoice.pay.start,amount:"
 msgid "Amount"
@@ -652,7 +653,7 @@ msgstr ""
 
 msgctxt "field:account.invoice.pay.start,currency:"
 msgid "Currency"
-msgstr ""
+msgstr "Waluta"
 
 msgctxt "field:account.invoice.pay.start,currency_digits:"
 msgid "Currency Digits"
@@ -660,15 +661,15 @@ msgstr ""
 
 msgctxt "field:account.invoice.pay.start,date:"
 msgid "Date"
-msgstr ""
+msgstr "Data"
 
 msgctxt "field:account.invoice.pay.start,description:"
 msgid "Description"
-msgstr ""
+msgstr "Opis"
 
 msgctxt "field:account.invoice.pay.start,id:"
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 msgctxt "field:account.invoice.pay.start,journal:"
 msgid "Journal"
@@ -680,19 +681,19 @@ msgstr ""
 
 msgctxt "field:account.invoice.payment_term,create_date:"
 msgid "Create Date"
-msgstr ""
+msgstr "Data utworzenia"
 
 msgctxt "field:account.invoice.payment_term,create_uid:"
 msgid "Create User"
-msgstr ""
+msgstr "Utworzył"
 
 msgctxt "field:account.invoice.payment_term,description:"
 msgid "Description"
-msgstr ""
+msgstr "Opis"
 
 msgctxt "field:account.invoice.payment_term,id:"
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 msgctxt "field:account.invoice.payment_term,lines:"
 msgid "Lines"
@@ -700,19 +701,19 @@ msgstr ""
 
 msgctxt "field:account.invoice.payment_term,name:"
 msgid "Name"
-msgstr ""
+msgstr "Nazwa"
 
 msgctxt "field:account.invoice.payment_term,rec_name:"
-msgid "Name"
-msgstr ""
+msgid "Record Name"
+msgstr "Nazwa rekordu"
 
 msgctxt "field:account.invoice.payment_term,write_date:"
 msgid "Write Date"
-msgstr ""
+msgstr "Data zapisu"
 
 msgctxt "field:account.invoice.payment_term,write_uid:"
 msgid "Write User"
-msgstr ""
+msgstr "Zapisał"
 
 msgctxt "field:account.invoice.payment_term.line,amount:"
 msgid "Amount"
@@ -720,15 +721,15 @@ msgstr ""
 
 msgctxt "field:account.invoice.payment_term.line,create_date:"
 msgid "Create Date"
-msgstr ""
+msgstr "Data utworzenia"
 
 msgctxt "field:account.invoice.payment_term.line,create_uid:"
 msgid "Create User"
-msgstr ""
+msgstr "Utworzył"
 
 msgctxt "field:account.invoice.payment_term.line,currency:"
 msgid "Currency"
-msgstr ""
+msgstr "Waluta"
 
 msgctxt "field:account.invoice.payment_term.line,currency_digits:"
 msgid "Currency Digits"
@@ -740,7 +741,7 @@ msgstr ""
 
 msgctxt "field:account.invoice.payment_term.line,id:"
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 #, fuzzy
 msgctxt "field:account.invoice.payment_term.line,payment:"
@@ -752,8 +753,8 @@ msgid "Ratio"
 msgstr ""
 
 msgctxt "field:account.invoice.payment_term.line,rec_name:"
-msgid "Name"
-msgstr ""
+msgid "Record Name"
+msgstr "Nazwa rekordu"
 
 msgctxt "field:account.invoice.payment_term.line,relativedeltas:"
 msgid "Deltas"
@@ -761,31 +762,31 @@ msgstr ""
 
 msgctxt "field:account.invoice.payment_term.line,sequence:"
 msgid "Sequence"
-msgstr ""
+msgstr "Sekwencja"
 
 msgctxt "field:account.invoice.payment_term.line,type:"
 msgid "Type"
-msgstr ""
+msgstr "Typ"
 
 msgctxt "field:account.invoice.payment_term.line,write_date:"
 msgid "Write Date"
-msgstr ""
+msgstr "Data zapisu"
 
 msgctxt "field:account.invoice.payment_term.line,write_uid:"
 msgid "Write User"
-msgstr ""
+msgstr "Zapisał"
 
 msgctxt "field:account.invoice.payment_term.line.delta,create_date:"
 msgid "Create Date"
-msgstr ""
+msgstr "Data utworzenia"
 
 msgctxt "field:account.invoice.payment_term.line.delta,create_uid:"
 msgid "Create User"
-msgstr ""
+msgstr "Utworzył"
 
 msgctxt "field:account.invoice.payment_term.line.delta,day:"
 msgid "Day of Month"
-msgstr ""
+msgstr "Dzień miesiąca"
 
 msgctxt "field:account.invoice.payment_term.line.delta,days:"
 msgid "Number of Days"
@@ -793,7 +794,7 @@ msgstr ""
 
 msgctxt "field:account.invoice.payment_term.line.delta,id:"
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 msgctxt "field:account.invoice.payment_term.line.delta,line:"
 msgid "Payment Term Line"
@@ -801,23 +802,23 @@ msgstr ""
 
 msgctxt "field:account.invoice.payment_term.line.delta,month:"
 msgid "Month"
-msgstr ""
+msgstr "Miesiąc"
 
 msgctxt "field:account.invoice.payment_term.line.delta,months:"
 msgid "Number of Months"
 msgstr ""
 
 msgctxt "field:account.invoice.payment_term.line.delta,rec_name:"
-msgid "Name"
-msgstr ""
+msgid "Record Name"
+msgstr "Nazwa rekordu"
 
 msgctxt "field:account.invoice.payment_term.line.delta,sequence:"
 msgid "Sequence"
-msgstr ""
+msgstr "Sekwencja"
 
 msgctxt "field:account.invoice.payment_term.line.delta,weekday:"
 msgid "Day of Week"
-msgstr ""
+msgstr "Dzień tygodnia"
 
 msgctxt "field:account.invoice.payment_term.line.delta,weeks:"
 msgid "Number of Weeks"
@@ -825,11 +826,11 @@ msgstr ""
 
 msgctxt "field:account.invoice.payment_term.line.delta,write_date:"
 msgid "Write Date"
-msgstr ""
+msgstr "Data zapisu"
 
 msgctxt "field:account.invoice.payment_term.line.delta,write_uid:"
 msgid "Write User"
-msgstr ""
+msgstr "Zapisał"
 
 msgctxt "field:account.invoice.payment_term.test,amount:"
 msgid "Amount"
@@ -837,7 +838,7 @@ msgstr ""
 
 msgctxt "field:account.invoice.payment_term.test,currency:"
 msgid "Currency"
-msgstr ""
+msgstr "Waluta"
 
 msgctxt "field:account.invoice.payment_term.test,currency_digits:"
 msgid "Currency Digits"
@@ -845,11 +846,11 @@ msgstr ""
 
 msgctxt "field:account.invoice.payment_term.test,date:"
 msgid "Date"
-msgstr ""
+msgstr "Data"
 
 msgctxt "field:account.invoice.payment_term.test,id:"
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 #, fuzzy
 msgctxt "field:account.invoice.payment_term.test,payment_term:"
@@ -870,19 +871,15 @@ msgstr ""
 
 msgctxt "field:account.invoice.payment_term.test.result,date:"
 msgid "Date"
-msgstr ""
+msgstr "Data"
 
 msgctxt "field:account.invoice.payment_term.test.result,id:"
 msgid "ID"
-msgstr ""
-
-msgctxt "field:account.invoice.print.warning,id:"
-msgid "ID"
-msgstr ""
+msgstr "ID"
 
 msgctxt "field:account.invoice.tax,account:"
 msgid "Account"
-msgstr ""
+msgstr "Konto"
 
 msgctxt "field:account.invoice.tax,amount:"
 msgid "Amount"
@@ -902,40 +899,43 @@ msgstr ""
 
 msgctxt "field:account.invoice.tax,create_date:"
 msgid "Create Date"
-msgstr ""
+msgstr "Data utworzenia"
 
 msgctxt "field:account.invoice.tax,create_uid:"
 msgid "Create User"
-msgstr ""
+msgstr "Utworzył"
 
 msgctxt "field:account.invoice.tax,description:"
 msgid "Description"
-msgstr ""
+msgstr "Opis"
 
 msgctxt "field:account.invoice.tax,id:"
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
-#, fuzzy
 msgctxt "field:account.invoice.tax,invoice:"
 msgid "Invoice"
-msgstr "Invoice"
+msgstr "Faktura"
 
 msgctxt "field:account.invoice.tax,invoice_state:"
 msgid "Invoice State"
 msgstr ""
 
+msgctxt "field:account.invoice.tax,legal_notice:"
+msgid "Legal Notice"
+msgstr ""
+
 msgctxt "field:account.invoice.tax,manual:"
 msgid "Manual"
 msgstr ""
 
 msgctxt "field:account.invoice.tax,rec_name:"
-msgid "Name"
-msgstr ""
+msgid "Record Name"
+msgstr "Nazwa rekordu"
 
 msgctxt "field:account.invoice.tax,sequence:"
 msgid "Sequence"
-msgstr ""
+msgstr "Sekwencja"
 
 msgctxt "field:account.invoice.tax,sequence_number:"
 msgid "Sequence Number"
@@ -943,11 +943,11 @@ msgstr ""
 
 msgctxt "field:account.invoice.tax,tax:"
 msgid "Tax"
-msgstr ""
+msgstr "Podatek"
 
 msgctxt "field:account.invoice.tax,tax_code:"
 msgid "Tax Code"
-msgstr ""
+msgstr "Kod podatku"
 
 msgctxt "field:account.invoice.tax,tax_sign:"
 msgid "Tax Sign"
@@ -955,16 +955,15 @@ msgstr ""
 
 msgctxt "field:account.invoice.tax,write_date:"
 msgid "Write Date"
-msgstr ""
+msgstr "Data zapisu"
 
 msgctxt "field:account.invoice.tax,write_uid:"
 msgid "Write User"
-msgstr ""
+msgstr "Zapisał"
 
-#, fuzzy
 msgctxt "field:party.address,invoice:"
 msgid "Invoice"
-msgstr "Invoice"
+msgstr "Faktura"
 
 msgctxt "field:party.party,customer_payment_term:"
 msgid "Customer Payment Term"
@@ -981,11 +980,11 @@ msgstr ""
 
 msgctxt "field:party.party.payment_term,create_date:"
 msgid "Create Date"
-msgstr ""
+msgstr "Data utworzenia"
 
 msgctxt "field:party.party.payment_term,create_uid:"
 msgid "Create User"
-msgstr ""
+msgstr "Utworzył"
 
 msgctxt "field:party.party.payment_term,customer_payment_term:"
 msgid "Customer Payment Term"
@@ -993,15 +992,15 @@ msgstr ""
 
 msgctxt "field:party.party.payment_term,id:"
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 msgctxt "field:party.party.payment_term,party:"
 msgid "Party"
-msgstr ""
+msgstr "Strona"
 
 msgctxt "field:party.party.payment_term,rec_name:"
-msgid "Name"
-msgstr ""
+msgid "Record Name"
+msgstr "Nazwa rekordu"
 
 msgctxt "field:party.party.payment_term,supplier_payment_term:"
 msgid "Supplier Payment Term"
@@ -1009,11 +1008,11 @@ msgstr ""
 
 msgctxt "field:party.party.payment_term,write_date:"
 msgid "Write Date"
-msgstr ""
+msgstr "Data zapisu"
 
 msgctxt "field:party.party.payment_term,write_uid:"
 msgid "Write User"
-msgstr ""
+msgstr "Zapisał"
 
 msgctxt "help:account.invoice.credit.start,with_refund:"
 msgid "If true, the current invoice(s) will be paid."
@@ -1023,10 +1022,9 @@ msgctxt "model:account.fiscalyear.invoice_sequence,name:"
 msgid "Invoice Sequence"
 msgstr ""
 
-#, fuzzy
 msgctxt "model:account.invoice,name:"
 msgid "Invoice"
-msgstr "Invoice"
+msgstr "Faktura"
 
 msgctxt "model:account.invoice-account.move.line,name:"
 msgid "Invoice - Payment Line"
@@ -1077,115 +1075,107 @@ msgctxt "model:account.invoice.payment_term.test.result,name:"
 msgid "Test Payment Term"
 msgstr "Test Payment Term"
 
-msgctxt "model:account.invoice.print.warning,name:"
-msgid "Print Invoice Report Warning"
-msgstr ""
-
 msgctxt "model:account.invoice.tax,name:"
 msgid "Invoice Tax"
 msgstr ""
 
 msgctxt "model:ir.action,name:act_invoice_form"
 msgid "Invoices"
-msgstr "Invoices"
+msgstr "Faktury"
 
 msgctxt "model:ir.action,name:act_invoice_form2"
 msgid "Invoices"
-msgstr "Invoices"
+msgstr "Faktury"
 
 msgctxt "model:ir.action,name:act_invoice_in_form"
 msgid "Supplier Invoices"
-msgstr "Supplier Invoices"
+msgstr ""
 
 msgctxt "model:ir.action,name:act_invoice_out_form"
 msgid "Customer Invoices"
-msgstr "Customer Invoices"
+msgstr ""
 
 msgctxt "model:ir.action,name:act_payment_term_form"
 msgid "Payment Terms"
-msgstr "Payment Terms"
+msgstr ""
 
 msgctxt "model:ir.action,name:credit"
 msgid "Credit"
-msgstr "Credit"
-
-msgctxt "model:ir.action,name:print"
-msgid "Invoice"
-msgstr "Invoice"
+msgstr ""
 
 msgctxt "model:ir.action,name:report_invoice"
 msgid "Invoice"
-msgstr "Invoice"
+msgstr "Faktura"
 
 msgctxt "model:ir.action,name:wizard_pay"
 msgid "Pay Invoice"
-msgstr "Pay Invoice"
+msgstr ""
 
 msgctxt "model:ir.action,name:wizard_payment_term_test"
 msgid "Test Payment Term"
-msgstr "Test Payment Term"
+msgstr ""
 
 msgctxt "model:ir.action.act_window.domain,name:act_invoice_in_domain_all"
 msgid "All"
-msgstr "All"
+msgstr ""
 
 msgctxt "model:ir.action.act_window.domain,name:act_invoice_in_domain_draft"
 msgid "Draft"
-msgstr "Draft"
+msgstr ""
 
 msgctxt "model:ir.action.act_window.domain,name:act_invoice_in_domain_posted"
 msgid "Posted"
-msgstr "Posted"
+msgstr ""
 
 msgctxt ""
 "model:ir.action.act_window.domain,name:act_invoice_in_domain_validated"
 msgid "Validated"
-msgstr "Validated"
+msgstr ""
 
 msgctxt "model:ir.action.act_window.domain,name:act_invoice_out_domain_all"
 msgid "All"
-msgstr "All"
+msgstr ""
 
 msgctxt "model:ir.action.act_window.domain,name:act_invoice_out_domain_draft"
 msgid "Draft"
-msgstr "Draft"
+msgstr ""
 
 msgctxt "model:ir.action.act_window.domain,name:act_invoice_out_domain_posted"
 msgid "Posted"
-msgstr "Posted"
+msgstr ""
 
 msgctxt ""
 "model:ir.action.act_window.domain,name:act_invoice_out_domain_validated"
 msgid "Validated"
-msgstr "Validated"
+msgstr ""
 
 msgctxt "model:ir.sequence.type,name:sequence_type_account_invoice"
 msgid "Invoice"
-msgstr "Invoice"
+msgstr "Faktura"
 
 msgctxt "model:ir.ui.menu,name:menu_invoice_in_form"
 msgid "Supplier Invoices"
-msgstr "Supplier Invoices"
+msgstr ""
 
 msgctxt "model:ir.ui.menu,name:menu_invoice_out_form"
 msgid "Customer Invoices"
-msgstr "Customer Invoices"
+msgstr ""
 
 msgctxt "model:ir.ui.menu,name:menu_invoices"
 msgid "Invoices"
-msgstr "Invoices"
+msgstr "Faktury"
 
 msgctxt "model:ir.ui.menu,name:menu_payment_term_form"
 msgid "Payment Terms"
-msgstr "Payment Terms"
+msgstr ""
 
 msgctxt "model:ir.ui.menu,name:menu_payment_term_test"
 msgid "Test Payment Term"
-msgstr "Test Payment Term"
+msgstr ""
 
 msgctxt "model:ir.ui.menu,name:menu_payment_terms_configuration"
 msgid "Payment Terms"
-msgstr "Payment Terms"
+msgstr ""
 
 #, fuzzy
 msgctxt "model:party.party.payment_term,name:"
@@ -1194,7 +1184,7 @@ msgstr "Test Payment Term"
 
 msgctxt "report:account.invoice:"
 msgid ":"
-msgstr ""
+msgstr ":"
 
 msgctxt "report:account.invoice:"
 msgid "Amount"
@@ -1206,19 +1196,19 @@ msgstr ""
 
 msgctxt "report:account.invoice:"
 msgid "Date"
-msgstr ""
+msgstr "Data"
 
 msgctxt "report:account.invoice:"
 msgid "Date:"
-msgstr ""
+msgstr "Data:"
 
 msgctxt "report:account.invoice:"
 msgid "Description"
-msgstr ""
+msgstr "Opis"
 
 msgctxt "report:account.invoice:"
 msgid "Description:"
-msgstr ""
+msgstr "Opis:"
 
 msgctxt "report:account.invoice:"
 msgid "Draft Invoice"
@@ -1235,7 +1225,7 @@ msgstr "Payment Terms"
 
 msgctxt "report:account.invoice:"
 msgid "Pro forma Invoice"
-msgstr ""
+msgstr "Faktura Pro Forma"
 
 msgctxt "report:account.invoice:"
 msgid "Quantity"
@@ -1252,15 +1242,15 @@ msgstr "Supplier Invoices"
 
 msgctxt "report:account.invoice:"
 msgid "Tax"
-msgstr ""
+msgstr "Podatek"
 
 msgctxt "report:account.invoice:"
 msgid "Taxes"
-msgstr ""
+msgstr "Podatki"
 
 msgctxt "report:account.invoice:"
 msgid "Taxes:"
-msgstr ""
+msgstr "Podatki:"
 
 msgctxt "report:account.invoice:"
 msgid "Total (excl. taxes):"
@@ -1303,7 +1293,7 @@ msgstr ""
 
 msgctxt "selection:account.invoice,type:"
 msgid "Supplier"
-msgstr ""
+msgstr "Dostawca"
 
 msgctxt "selection:account.invoice.line,invoice_state:"
 msgid "Canceled"
@@ -1338,11 +1328,11 @@ msgstr ""
 
 msgctxt "selection:account.invoice.line,invoice_type:"
 msgid "Supplier"
-msgstr ""
+msgstr "Dostawca"
 
 msgctxt "selection:account.invoice.line,type:"
 msgid "Comment"
-msgstr ""
+msgstr "Komentarz"
 
 msgctxt "selection:account.invoice.line,type:"
 msgid "Line"
@@ -1354,7 +1344,7 @@ msgstr ""
 
 msgctxt "selection:account.invoice.line,type:"
 msgid "Title"
-msgstr ""
+msgstr "Tytuł"
 
 msgctxt "selection:account.invoice.pay.ask,type:"
 msgid "Partial Payment"
@@ -1366,7 +1356,7 @@ msgstr ""
 
 msgctxt "selection:account.invoice.payment_term.line,type:"
 msgid "Fixed"
-msgstr ""
+msgstr "Stały"
 
 msgctxt "selection:account.invoice.payment_term.line,type:"
 msgid "Percentage on Remainder"
@@ -1386,51 +1376,51 @@ msgstr ""
 
 msgctxt "selection:account.invoice.payment_term.line.delta,month:"
 msgid "April"
-msgstr ""
+msgstr "Kwiecień"
 
 msgctxt "selection:account.invoice.payment_term.line.delta,month:"
 msgid "August"
-msgstr ""
+msgstr "Sierpień"
 
 msgctxt "selection:account.invoice.payment_term.line.delta,month:"
 msgid "December"
-msgstr ""
+msgstr "Grudzień"
 
 msgctxt "selection:account.invoice.payment_term.line.delta,month:"
 msgid "February"
-msgstr ""
+msgstr "Luty"
 
 msgctxt "selection:account.invoice.payment_term.line.delta,month:"
 msgid "January"
-msgstr ""
+msgstr "Styczeń"
 
 msgctxt "selection:account.invoice.payment_term.line.delta,month:"
 msgid "July"
-msgstr ""
+msgstr "Lipiec"
 
 msgctxt "selection:account.invoice.payment_term.line.delta,month:"
 msgid "June"
-msgstr ""
+msgstr "Czerwiec"
 
 msgctxt "selection:account.invoice.payment_term.line.delta,month:"
 msgid "March"
-msgstr ""
+msgstr "Marzec"
 
 msgctxt "selection:account.invoice.payment_term.line.delta,month:"
 msgid "May"
-msgstr ""
+msgstr "Maj"
 
 msgctxt "selection:account.invoice.payment_term.line.delta,month:"
 msgid "November"
-msgstr ""
+msgstr "Listopad"
 
 msgctxt "selection:account.invoice.payment_term.line.delta,month:"
 msgid "October"
-msgstr ""
+msgstr "Październik"
 
 msgctxt "selection:account.invoice.payment_term.line.delta,month:"
 msgid "September"
-msgstr ""
+msgstr "Wrzesień"
 
 msgctxt "selection:account.invoice.payment_term.line.delta,weekday:"
 msgid ""
@@ -1438,31 +1428,31 @@ msgstr ""
 
 msgctxt "selection:account.invoice.payment_term.line.delta,weekday:"
 msgid "Friday"
-msgstr ""
+msgstr "Piątek"
 
 msgctxt "selection:account.invoice.payment_term.line.delta,weekday:"
 msgid "Monday"
-msgstr ""
+msgstr "Poniedziałek"
 
 msgctxt "selection:account.invoice.payment_term.line.delta,weekday:"
 msgid "Saturday"
-msgstr ""
+msgstr "Sobota"
 
 msgctxt "selection:account.invoice.payment_term.line.delta,weekday:"
 msgid "Sunday"
-msgstr ""
+msgstr "Niedziela"
 
 msgctxt "selection:account.invoice.payment_term.line.delta,weekday:"
 msgid "Thursday"
-msgstr ""
+msgstr "Czwartek"
 
 msgctxt "selection:account.invoice.payment_term.line.delta,weekday:"
 msgid "Tuesday"
-msgstr ""
+msgstr "Wtorek"
 
 msgctxt "selection:account.invoice.payment_term.line.delta,weekday:"
 msgid "Wednesday"
-msgstr ""
+msgstr "Środa"
 
 msgctxt "selection:account.invoice.tax,invoice_state:"
 msgid "Canceled"
@@ -1497,23 +1487,15 @@ msgstr ""
 
 msgctxt "view:account.invoice.line:"
 msgid "Notes"
-msgstr ""
+msgstr "Notatki"
 
 msgctxt "view:account.invoice.payment_term.line:"
 msgid "%"
-msgstr ""
-
-msgctxt "view:account.invoice.print.warning:"
-msgid "The invoices will be sent directly to the printer."
-msgstr ""
-
-msgctxt "view:account.invoice.print.warning:"
-msgid "You have selected more than one invoice to print."
-msgstr ""
+msgstr "%"
 
 msgctxt "view:account.invoice.tax:"
 msgid "Tax Code"
-msgstr ""
+msgstr "Kod podatku"
 
 msgctxt "view:account.invoice:"
 msgid "Also known as Pro Forma"
@@ -1525,21 +1507,20 @@ msgstr ""
 
 msgctxt "view:account.invoice:"
 msgid "Cancel"
-msgstr ""
+msgstr "Anuluj"
 
 #, fuzzy
 msgctxt "view:account.invoice:"
 msgid "Draft"
 msgstr "Draft"
 
-#, fuzzy
 msgctxt "view:account.invoice:"
 msgid "Invoice"
-msgstr "Invoice"
+msgstr "Faktura"
 
 msgctxt "view:account.invoice:"
 msgid "Other Info"
-msgstr ""
+msgstr "Inne informacje"
 
 msgctxt "view:account.invoice:"
 msgid "Pay"
@@ -1553,6 +1534,10 @@ msgctxt "view:account.invoice:"
 msgid "Post"
 msgstr ""
 
+msgctxt "view:account.invoice:"
+msgid "Tax Identifier"
+msgstr ""
+
 #, fuzzy
 msgctxt "view:account.invoice:"
 msgid "Validate"
@@ -1583,32 +1568,24 @@ msgstr "Credit"
 
 msgctxt "wizard_button:account.invoice.credit,start,end:"
 msgid "Cancel"
-msgstr ""
+msgstr "Anuluj"
 
 msgctxt "wizard_button:account.invoice.pay,ask,end:"
 msgid "Cancel"
-msgstr ""
+msgstr "Anuluj"
 
 msgctxt "wizard_button:account.invoice.pay,ask,pay:"
 msgid "OK"
-msgstr ""
+msgstr "OK"
 
 msgctxt "wizard_button:account.invoice.pay,start,choice:"
 msgid "OK"
-msgstr ""
+msgstr "OK"
 
 msgctxt "wizard_button:account.invoice.pay,start,end:"
 msgid "Cancel"
-msgstr ""
+msgstr "Anuluj"
 
 msgctxt "wizard_button:account.invoice.payment_term.test,test,end:"
 msgid "Close"
-msgstr ""
-
-msgctxt "wizard_button:account.invoice.print,warning,end:"
-msgid "Cancel"
-msgstr ""
-
-msgctxt "wizard_button:account.invoice.print,warning,print_:"
-msgid "Print"
-msgstr ""
+msgstr "Zamknij"
diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index dba75fd..bc45ace 100644
--- a/locale/pt_BR.po
+++ b/locale/pt_BR.po
@@ -1,4 +1,4 @@
-# 
+#
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
@@ -248,8 +248,8 @@ msgid "Period"
 msgstr "Período"
 
 msgctxt "field:account.fiscalyear.invoice_sequence,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr "Nome do Registro"
 
 msgctxt "field:account.fiscalyear.invoice_sequence,sequence:"
 msgid "Sequence"
@@ -375,6 +375,10 @@ msgctxt "field:account.invoice,party_lang:"
 msgid "Party Language"
 msgstr "Idioma da Pessoa"
 
+msgctxt "field:account.invoice,party_tax_identifier:"
+msgid "Party Tax Identifier"
+msgstr "Identificador de Tributos da Pessoa"
+
 msgctxt "field:account.invoice,payment_lines:"
 msgid "Payment Lines"
 msgstr "Linhas de Pagamento"
@@ -384,8 +388,8 @@ msgid "Payment Term"
 msgstr "Prazo de Pagamento"
 
 msgctxt "field:account.invoice,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr "Nome do Registro"
 
 msgctxt "field:account.invoice,reconciled:"
 msgid "Reconciled"
@@ -449,15 +453,15 @@ msgstr "ID"
 
 msgctxt "field:account.invoice-account.move.line,invoice:"
 msgid "Invoice"
-msgstr "Faturar"
+msgstr "Fatura"
 
 msgctxt "field:account.invoice-account.move.line,line:"
 msgid "Payment Line"
 msgstr "Linha de Pagamento"
 
 msgctxt "field:account.invoice-account.move.line,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr "Nome do Registro"
 
 msgctxt "field:account.invoice-account.move.line,write_date:"
 msgid "Write Date"
@@ -517,7 +521,7 @@ msgstr "ID"
 
 msgctxt "field:account.invoice.line,invoice:"
 msgid "Invoice"
-msgstr "Faturar"
+msgstr "Fatura"
 
 msgctxt "field:account.invoice.line,invoice_state:"
 msgid "Invoice State"
@@ -560,8 +564,8 @@ msgid "Quantity"
 msgstr "Quantidade"
 
 msgctxt "field:account.invoice.line,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr "Nome do Registro"
 
 msgctxt "field:account.invoice.line,sequence:"
 msgid "Sequence"
@@ -612,8 +616,8 @@ msgid "Invoice Line"
 msgstr "Linha da fatura"
 
 msgctxt "field:account.invoice.line-account.tax,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr "Nome do Registro"
 
 msgctxt "field:account.invoice.line-account.tax,tax:"
 msgid "Tax"
@@ -665,7 +669,7 @@ msgstr "ID"
 
 msgctxt "field:account.invoice.pay.ask,invoice:"
 msgid "Invoice"
-msgstr "Faturar"
+msgstr "Fatura"
 
 msgctxt "field:account.invoice.pay.ask,journal_writeoff:"
 msgid "Write-Off Journal"
@@ -744,8 +748,8 @@ msgid "Name"
 msgstr "Nome"
 
 msgctxt "field:account.invoice.payment_term,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr "Nome do Registro"
 
 msgctxt "field:account.invoice.payment_term,write_date:"
 msgid "Write Date"
@@ -792,8 +796,8 @@ msgid "Ratio"
 msgstr "Percentual"
 
 msgctxt "field:account.invoice.payment_term.line,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr "Nome do Registro"
 
 msgctxt "field:account.invoice.payment_term.line,relativedeltas:"
 msgid "Deltas"
@@ -848,8 +852,8 @@ msgid "Number of Months"
 msgstr "Número de Meses"
 
 msgctxt "field:account.invoice.payment_term.line.delta,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr "Nome do Registro"
 
 msgctxt "field:account.invoice.payment_term.line.delta,sequence:"
 msgid "Sequence"
@@ -915,10 +919,6 @@ msgctxt "field:account.invoice.payment_term.test.result,id:"
 msgid "ID"
 msgstr "ID"
 
-msgctxt "field:account.invoice.print.warning,id:"
-msgid "ID"
-msgstr "ID"
-
 msgctxt "field:account.invoice.tax,account:"
 msgid "Account"
 msgstr "Contas"
@@ -957,19 +957,23 @@ msgstr "ID"
 
 msgctxt "field:account.invoice.tax,invoice:"
 msgid "Invoice"
-msgstr "Faturar"
+msgstr "Fatura"
 
 msgctxt "field:account.invoice.tax,invoice_state:"
 msgid "Invoice State"
 msgstr "Estado da Fatura"
 
+msgctxt "field:account.invoice.tax,legal_notice:"
+msgid "Legal Notice"
+msgstr "Aviso Legal"
+
 msgctxt "field:account.invoice.tax,manual:"
 msgid "Manual"
 msgstr "Manual"
 
 msgctxt "field:account.invoice.tax,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr "Nome do Registro"
 
 msgctxt "field:account.invoice.tax,sequence:"
 msgid "Sequence"
@@ -1001,7 +1005,7 @@ msgstr "Gravado pelo usuário"
 
 msgctxt "field:party.address,invoice:"
 msgid "Invoice"
-msgstr "Faturar"
+msgstr "Fatura"
 
 msgctxt "field:party.party,customer_payment_term:"
 msgid "Customer Payment Term"
@@ -1036,8 +1040,8 @@ msgid "Party"
 msgstr "Pessoa"
 
 msgctxt "field:party.party.payment_term,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr "Nome do Registro"
 
 msgctxt "field:party.party.payment_term,supplier_payment_term:"
 msgid "Supplier Payment Term"
@@ -1061,7 +1065,7 @@ msgstr "Sequência de Fatura"
 
 msgctxt "model:account.invoice,name:"
 msgid "Invoice"
-msgstr "Faturar"
+msgstr "Fatura"
 
 msgctxt "model:account.invoice-account.move.line,name:"
 msgid "Invoice - Payment Line"
@@ -1107,10 +1111,6 @@ msgctxt "model:account.invoice.payment_term.test.result,name:"
 msgid "Test Payment Term"
 msgstr "Simulação do Prazo de Pagamento"
 
-msgctxt "model:account.invoice.print.warning,name:"
-msgid "Print Invoice Report Warning"
-msgstr "Imprimir Alerta de Impressão da Fatura"
-
 msgctxt "model:account.invoice.tax,name:"
 msgid "Invoice Tax"
 msgstr "Tributo da Fatura"
@@ -1139,13 +1139,9 @@ msgctxt "model:ir.action,name:credit"
 msgid "Credit"
 msgstr "Crédito"
 
-msgctxt "model:ir.action,name:print"
-msgid "Invoice"
-msgstr "Faturar"
-
 msgctxt "model:ir.action,name:report_invoice"
 msgid "Invoice"
-msgstr "Faturar"
+msgstr "Fatura"
 
 msgctxt "model:ir.action,name:wizard_pay"
 msgid "Pay Invoice"
@@ -1191,7 +1187,7 @@ msgstr "Validado"
 
 msgctxt "model:ir.sequence.type,name:sequence_type_account_invoice"
 msgid "Invoice"
-msgstr "Faturar"
+msgstr "Fatura"
 
 msgctxt "model:ir.ui.menu,name:menu_invoice_in_form"
 msgid "Supplier Invoices"
@@ -1521,14 +1517,6 @@ msgctxt "view:account.invoice.payment_term.line:"
 msgid "%"
 msgstr "%"
 
-msgctxt "view:account.invoice.print.warning:"
-msgid "The invoices will be sent directly to the printer."
-msgstr "As faturas serão enviadas diretamente à impressora."
-
-msgctxt "view:account.invoice.print.warning:"
-msgid "You have selected more than one invoice to print."
-msgstr "Você selecionou mais de uma fatura para imprimir."
-
 msgctxt "view:account.invoice.tax:"
 msgid "Tax Code"
 msgstr "Código Tributário"
@@ -1551,7 +1539,7 @@ msgstr "Rascunho"
 
 msgctxt "view:account.invoice:"
 msgid "Invoice"
-msgstr "Faturar"
+msgstr "Fatura"
 
 msgctxt "view:account.invoice:"
 msgid "Other Info"
@@ -1570,6 +1558,10 @@ msgid "Post"
 msgstr "Confirmar"
 
 msgctxt "view:account.invoice:"
+msgid "Tax Identifier"
+msgstr "Identificador de Tributos"
+
+msgctxt "view:account.invoice:"
 msgid "Validate"
 msgstr "Validar"
 
diff --git a/locale/ru.po b/locale/ru.po
index 53d4f42..ef53051 100644
--- a/locale/ru.po
+++ b/locale/ru.po
@@ -1,4 +1,4 @@
-# 
+#
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
@@ -251,10 +251,9 @@ msgctxt "field:account.fiscalyear.invoice_sequence,period:"
 msgid "Period"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:account.fiscalyear.invoice_sequence,rec_name:"
-msgid "Name"
-msgstr "Наименование"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:account.fiscalyear.invoice_sequence,sequence:"
@@ -385,6 +384,10 @@ msgctxt "field:account.invoice,party_lang:"
 msgid "Party Language"
 msgstr "Язык контрагента"
 
+msgctxt "field:account.invoice,party_tax_identifier:"
+msgid "Party Tax Identifier"
+msgstr ""
+
 msgctxt "field:account.invoice,payment_lines:"
 msgid "Payment Lines"
 msgstr "Строки оплаты"
@@ -394,8 +397,8 @@ msgid "Payment Term"
 msgstr "Правило оплаты"
 
 msgctxt "field:account.invoice,rec_name:"
-msgid "Name"
-msgstr "Наименование"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:account.invoice,reconciled:"
 msgid "Reconciled"
@@ -466,8 +469,8 @@ msgid "Payment Line"
 msgstr "Строка оплаты"
 
 msgctxt "field:account.invoice-account.move.line,rec_name:"
-msgid "Name"
-msgstr "Наименование"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:account.invoice-account.move.line,write_date:"
 msgid "Write Date"
@@ -571,8 +574,8 @@ msgid "Quantity"
 msgstr "Кол-во"
 
 msgctxt "field:account.invoice.line,rec_name:"
-msgid "Name"
-msgstr "Наименование"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:account.invoice.line,sequence:"
 msgid "Sequence"
@@ -623,8 +626,8 @@ msgid "Invoice Line"
 msgstr "Строка инвойса"
 
 msgctxt "field:account.invoice.line-account.tax,rec_name:"
-msgid "Name"
-msgstr "Наименование"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:account.invoice.line-account.tax,tax:"
 msgid "Tax"
@@ -757,8 +760,8 @@ msgid "Name"
 msgstr "Правило оплаты"
 
 msgctxt "field:account.invoice.payment_term,rec_name:"
-msgid "Name"
-msgstr "Наименование"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:account.invoice.payment_term,write_date:"
 msgid "Write Date"
@@ -805,8 +808,8 @@ msgid "Ratio"
 msgstr ""
 
 msgctxt "field:account.invoice.payment_term.line,rec_name:"
-msgid "Name"
-msgstr "Наименование"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:account.invoice.payment_term.line,relativedeltas:"
 msgid "Deltas"
@@ -865,10 +868,9 @@ msgctxt "field:account.invoice.payment_term.line.delta,months:"
 msgid "Number of Months"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:account.invoice.payment_term.line.delta,rec_name:"
-msgid "Name"
-msgstr "Правило оплаты"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:account.invoice.payment_term.line.delta,sequence:"
@@ -947,10 +949,6 @@ msgctxt "field:account.invoice.payment_term.test.result,id:"
 msgid "ID"
 msgstr "ID"
 
-msgctxt "field:account.invoice.print.warning,id:"
-msgid "ID"
-msgstr "ID"
-
 msgctxt "field:account.invoice.tax,account:"
 msgid "Account"
 msgstr "Счет"
@@ -996,13 +994,17 @@ msgctxt "field:account.invoice.tax,invoice_state:"
 msgid "Invoice State"
 msgstr "Состояние инвойса"
 
+msgctxt "field:account.invoice.tax,legal_notice:"
+msgid "Legal Notice"
+msgstr ""
+
 msgctxt "field:account.invoice.tax,manual:"
 msgid "Manual"
 msgstr "Ручной"
 
 msgctxt "field:account.invoice.tax,rec_name:"
-msgid "Name"
-msgstr "Наименование"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:account.invoice.tax,sequence:"
 msgid "Sequence"
@@ -1074,10 +1076,9 @@ msgctxt "field:party.party.payment_term,party:"
 msgid "Party"
 msgstr "Контрагент"
 
-#, fuzzy
 msgctxt "field:party.party.payment_term,rec_name:"
-msgid "Name"
-msgstr "Наименование"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:party.party.payment_term,supplier_payment_term:"
@@ -1151,10 +1152,6 @@ msgctxt "model:account.invoice.payment_term.test.result,name:"
 msgid "Test Payment Term"
 msgstr ""
 
-msgctxt "model:account.invoice.print.warning,name:"
-msgid "Print Invoice Report Warning"
-msgstr "Предупреждение при распечатке отчета Инвойса"
-
 msgctxt "model:account.invoice.tax,name:"
 msgid "Invoice Tax"
 msgstr "Налог по инвойсу"
@@ -1184,10 +1181,6 @@ msgctxt "model:ir.action,name:credit"
 msgid "Credit"
 msgstr "Кредит"
 
-msgctxt "model:ir.action,name:print"
-msgid "Invoice"
-msgstr "Инвойс"
-
 msgctxt "model:ir.action,name:report_invoice"
 msgid "Invoice"
 msgstr "Инвойс"
@@ -1599,14 +1592,6 @@ msgctxt "view:account.invoice.payment_term.line:"
 msgid "%"
 msgstr "%"
 
-msgctxt "view:account.invoice.print.warning:"
-msgid "The invoices will be sent directly to the printer."
-msgstr ""
-
-msgctxt "view:account.invoice.print.warning:"
-msgid "You have selected more than one invoice to print."
-msgstr "Выбрано более одного инвойса для печати."
-
 msgctxt "view:account.invoice.tax:"
 msgid "Tax Code"
 msgstr "Код налога"
@@ -1650,6 +1635,10 @@ msgid "Post"
 msgstr "Отправить"
 
 msgctxt "view:account.invoice:"
+msgid "Tax Identifier"
+msgstr ""
+
+msgctxt "view:account.invoice:"
 msgid "Validate"
 msgstr "Утвердить"
 
diff --git a/locale/sl.po b/locale/sl.po
index 1dfe971..41e78e0 100644
--- a/locale/sl.po
+++ b/locale/sl.po
@@ -1,4 +1,4 @@
-# 
+#
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
@@ -244,8 +244,8 @@ msgid "Period"
 msgstr "Obdobje"
 
 msgctxt "field:account.fiscalyear.invoice_sequence,rec_name:"
-msgid "Name"
-msgstr "Ime"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:account.fiscalyear.invoice_sequence,sequence:"
 msgid "Sequence"
@@ -371,6 +371,10 @@ msgctxt "field:account.invoice,party_lang:"
 msgid "Party Language"
 msgstr "Jezik partnerja"
 
+msgctxt "field:account.invoice,party_tax_identifier:"
+msgid "Party Tax Identifier"
+msgstr ""
+
 msgctxt "field:account.invoice,payment_lines:"
 msgid "Payment Lines"
 msgstr "Postavke plačila"
@@ -380,8 +384,8 @@ msgid "Payment Term"
 msgstr "Plačilni rok"
 
 msgctxt "field:account.invoice,rec_name:"
-msgid "Name"
-msgstr "Ime"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:account.invoice,reconciled:"
 msgid "Reconciled"
@@ -452,8 +456,8 @@ msgid "Payment Line"
 msgstr "Postavka plačila"
 
 msgctxt "field:account.invoice-account.move.line,rec_name:"
-msgid "Name"
-msgstr "Ime"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:account.invoice-account.move.line,write_date:"
 msgid "Write Date"
@@ -556,8 +560,8 @@ msgid "Quantity"
 msgstr "Količina"
 
 msgctxt "field:account.invoice.line,rec_name:"
-msgid "Name"
-msgstr "Ime"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:account.invoice.line,sequence:"
 msgid "Sequence"
@@ -608,8 +612,8 @@ msgid "Invoice Line"
 msgstr "Postavka računa"
 
 msgctxt "field:account.invoice.line-account.tax,rec_name:"
-msgid "Name"
-msgstr "Ime"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:account.invoice.line-account.tax,tax:"
 msgid "Tax"
@@ -740,8 +744,8 @@ msgid "Name"
 msgstr "Plačilni rok"
 
 msgctxt "field:account.invoice.payment_term,rec_name:"
-msgid "Name"
-msgstr "Ime"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:account.invoice.payment_term,write_date:"
 msgid "Write Date"
@@ -788,8 +792,8 @@ msgid "Ratio"
 msgstr "Delež"
 
 msgctxt "field:account.invoice.payment_term.line,rec_name:"
-msgid "Name"
-msgstr "Ime"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:account.invoice.payment_term.line,relativedeltas:"
 msgid "Deltas"
@@ -844,8 +848,8 @@ msgid "Number of Months"
 msgstr "Število mesecev"
 
 msgctxt "field:account.invoice.payment_term.line.delta,rec_name:"
-msgid "Name"
-msgstr "Ime"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:account.invoice.payment_term.line.delta,sequence:"
 msgid "Sequence"
@@ -911,10 +915,6 @@ msgctxt "field:account.invoice.payment_term.test.result,id:"
 msgid "ID"
 msgstr "ID"
 
-msgctxt "field:account.invoice.print.warning,id:"
-msgid "ID"
-msgstr "ID"
-
 msgctxt "field:account.invoice.tax,account:"
 msgid "Account"
 msgstr "Konto"
@@ -959,13 +959,17 @@ msgctxt "field:account.invoice.tax,invoice_state:"
 msgid "Invoice State"
 msgstr "Stanje računa"
 
+msgctxt "field:account.invoice.tax,legal_notice:"
+msgid "Legal Notice"
+msgstr ""
+
 msgctxt "field:account.invoice.tax,manual:"
 msgid "Manual"
 msgstr "Ročno"
 
 msgctxt "field:account.invoice.tax,rec_name:"
-msgid "Name"
-msgstr "Ime"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:account.invoice.tax,sequence:"
 msgid "Sequence"
@@ -1032,8 +1036,8 @@ msgid "Party"
 msgstr "Partner"
 
 msgctxt "field:party.party.payment_term,rec_name:"
-msgid "Name"
-msgstr "Ime"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:party.party.payment_term,supplier_payment_term:"
 msgid "Supplier Payment Term"
@@ -1103,10 +1107,6 @@ msgctxt "model:account.invoice.payment_term.test.result,name:"
 msgid "Test Payment Term"
 msgstr "Preizkus plačilnega roka"
 
-msgctxt "model:account.invoice.print.warning,name:"
-msgid "Print Invoice Report Warning"
-msgstr "Opozorilo pri izpisu računa"
-
 msgctxt "model:account.invoice.tax,name:"
 msgid "Invoice Tax"
 msgstr "Davek računa"
@@ -1135,10 +1135,6 @@ msgctxt "model:ir.action,name:credit"
 msgid "Credit"
 msgstr "Kredit"
 
-msgctxt "model:ir.action,name:print"
-msgid "Invoice"
-msgstr "Račun"
-
 msgctxt "model:ir.action,name:report_invoice"
 msgid "Invoice"
 msgstr "Račun"
@@ -1517,14 +1513,6 @@ msgctxt "view:account.invoice.payment_term.line:"
 msgid "%"
 msgstr "%"
 
-msgctxt "view:account.invoice.print.warning:"
-msgid "The invoices will be sent directly to the printer."
-msgstr "Računi bodo direktno poslani na tiskalnik."
-
-msgctxt "view:account.invoice.print.warning:"
-msgid "You have selected more than one invoice to print."
-msgstr "Za tiskanje je izbranih več kot en račun."
-
 msgctxt "view:account.invoice.tax:"
 msgid "Tax Code"
 msgstr "Davčna šifra"
@@ -1565,6 +1553,11 @@ msgctxt "view:account.invoice:"
 msgid "Post"
 msgstr "Vknjižba"
 
+#, fuzzy
+msgctxt "view:account.invoice:"
+msgid "Tax Identifier"
+msgstr "Davčna identifikacija"
+
 msgctxt "view:account.invoice:"
 msgid "Validate"
 msgstr "Odobritev"
diff --git a/locale/zh_CN.po b/locale/zh_CN.po
index 55dcfe0..ee3261f 100644
--- a/locale/zh_CN.po
+++ b/locale/zh_CN.po
@@ -1,4 +1,4 @@
-# 
+#
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
@@ -205,10 +205,9 @@ msgctxt "field:account.fiscalyear.invoice_sequence,period:"
 msgid "Period"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:account.fiscalyear.invoice_sequence,rec_name:"
-msgid "Name"
-msgstr "纳木"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:account.fiscalyear.invoice_sequence,sequence:"
@@ -341,6 +340,10 @@ msgctxt "field:account.invoice,party_lang:"
 msgid "Party Language"
 msgstr ""
 
+msgctxt "field:account.invoice,party_tax_identifier:"
+msgid "Party Tax Identifier"
+msgstr ""
+
 msgctxt "field:account.invoice,payment_lines:"
 msgid "Payment Lines"
 msgstr ""
@@ -349,10 +352,9 @@ msgctxt "field:account.invoice,payment_term:"
 msgid "Payment Term"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:account.invoice,rec_name:"
-msgid "Name"
-msgstr "纳木"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:account.invoice,reconciled:"
 msgid "Reconciled"
@@ -430,10 +432,9 @@ msgctxt "field:account.invoice-account.move.line,line:"
 msgid "Payment Line"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:account.invoice-account.move.line,rec_name:"
-msgid "Name"
-msgstr "纳木"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:account.invoice-account.move.line,write_date:"
@@ -543,10 +544,9 @@ msgctxt "field:account.invoice.line,quantity:"
 msgid "Quantity"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:account.invoice.line,rec_name:"
-msgid "Name"
-msgstr "纳木"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:account.invoice.line,sequence:"
@@ -603,10 +603,9 @@ msgctxt "field:account.invoice.line-account.tax,line:"
 msgid "Invoice Line"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:account.invoice.line-account.tax,rec_name:"
-msgid "Name"
-msgstr "纳木"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:account.invoice.line-account.tax,tax:"
 msgid "Tax"
@@ -750,10 +749,9 @@ msgctxt "field:account.invoice.payment_term,name:"
 msgid "Name"
 msgstr "纳木"
 
-#, fuzzy
 msgctxt "field:account.invoice.payment_term,rec_name:"
-msgid "Name"
-msgstr "纳木"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:account.invoice.payment_term,write_date:"
@@ -804,10 +802,9 @@ msgctxt "field:account.invoice.payment_term.line,ratio:"
 msgid "Ratio"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:account.invoice.payment_term.line,rec_name:"
-msgid "Name"
-msgstr "纳木"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:account.invoice.payment_term.line,relativedeltas:"
 msgid "Deltas"
@@ -868,10 +865,9 @@ msgctxt "field:account.invoice.payment_term.line.delta,months:"
 msgid "Number of Months"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:account.invoice.payment_term.line.delta,rec_name:"
-msgid "Name"
-msgstr "纳木"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:account.invoice.payment_term.line.delta,sequence:"
@@ -944,11 +940,6 @@ msgctxt "field:account.invoice.payment_term.test.result,id:"
 msgid "ID"
 msgstr "编号"
 
-#, fuzzy
-msgctxt "field:account.invoice.print.warning,id:"
-msgid "ID"
-msgstr "编号"
-
 msgctxt "field:account.invoice.tax,account:"
 msgid "Account"
 msgstr ""
@@ -997,14 +988,17 @@ msgctxt "field:account.invoice.tax,invoice_state:"
 msgid "Invoice State"
 msgstr ""
 
+msgctxt "field:account.invoice.tax,legal_notice:"
+msgid "Legal Notice"
+msgstr ""
+
 msgctxt "field:account.invoice.tax,manual:"
 msgid "Manual"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:account.invoice.tax,rec_name:"
-msgid "Name"
-msgstr "纳木"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:account.invoice.tax,sequence:"
@@ -1076,10 +1070,9 @@ msgctxt "field:party.party.payment_term,party:"
 msgid "Party"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:party.party.payment_term,rec_name:"
-msgid "Name"
-msgstr "纳木"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:party.party.payment_term,supplier_payment_term:"
 msgid "Supplier Payment Term"
@@ -1151,10 +1144,6 @@ msgctxt "model:account.invoice.payment_term.test.result,name:"
 msgid "Test Payment Term"
 msgstr ""
 
-msgctxt "model:account.invoice.print.warning,name:"
-msgid "Print Invoice Report Warning"
-msgstr ""
-
 msgctxt "model:account.invoice.tax,name:"
 msgid "Invoice Tax"
 msgstr ""
@@ -1183,10 +1172,6 @@ msgctxt "model:ir.action,name:credit"
 msgid "Credit"
 msgstr ""
 
-msgctxt "model:ir.action,name:print"
-msgid "Invoice"
-msgstr ""
-
 msgctxt "model:ir.action,name:report_invoice"
 msgid "Invoice"
 msgstr ""
@@ -1578,14 +1563,6 @@ msgctxt "view:account.invoice.payment_term.line:"
 msgid "%"
 msgstr "%"
 
-msgctxt "view:account.invoice.print.warning:"
-msgid "The invoices will be sent directly to the printer."
-msgstr ""
-
-msgctxt "view:account.invoice.print.warning:"
-msgid "You have selected more than one invoice to print."
-msgstr ""
-
 msgctxt "view:account.invoice.tax:"
 msgid "Tax Code"
 msgstr ""
@@ -1628,6 +1605,10 @@ msgid "Post"
 msgstr ""
 
 msgctxt "view:account.invoice:"
+msgid "Tax Identifier"
+msgstr ""
+
+msgctxt "view:account.invoice:"
 msgid "Validate"
 msgstr ""
 
diff --git a/setup.py b/setup.py
index 29d682e..9a832ba 100644
--- a/setup.py
+++ b/setup.py
@@ -75,7 +75,7 @@ setup(name=name,
         ],
     package_data={
         'trytond.modules.account_invoice': (info.get('xml', [])
-            + ['tryton.cfg', 'view/*.xml', 'locale/*.po', 'invoice.odt',
+            + ['tryton.cfg', 'view/*.xml', 'locale/*.po', '*.fodt',
                 'tests/*.rst']),
         },
     classifiers=[
@@ -103,9 +103,9 @@ setup(name=name,
         'Natural Language :: Spanish',
         'Operating System :: OS Independent',
         'Programming Language :: Python :: 2.7',
-        'Programming Language :: Python :: 3.3',
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: Implementation :: CPython',
         'Programming Language :: Python :: Implementation :: PyPy',
         'Topic :: Office/Business',
diff --git a/tests/scenario_invoice.rst b/tests/scenario_invoice.rst
index d332fa5..3b7479d 100644
--- a/tests/scenario_invoice.rst
+++ b/tests/scenario_invoice.rst
@@ -84,27 +84,24 @@ Create product::
     >>> ProductUom = Model.get('product.uom')
     >>> unit, = ProductUom.find([('name', '=', 'Unit')])
     >>> ProductTemplate = Model.get('product.template')
-    >>> Product = Model.get('product.product')
-    >>> product = Product()
     >>> template = ProductTemplate()
     >>> template.name = 'product'
     >>> template.default_uom = unit
     >>> template.type = 'service'
     >>> template.list_price = Decimal('40')
-    >>> template.cost_price = Decimal('25')
     >>> template.account_expense = expense
     >>> template.account_revenue = revenue
     >>> template.customer_taxes.append(tax)
     >>> template.save()
-    >>> product.template = template
-    >>> product.save()
+    >>> product, = template.products
 
 Create payment term::
 
     >>> PaymentTerm = Model.get('account.invoice.payment_term')
     >>> payment_term = PaymentTerm(name='Term')
     >>> line = payment_term.lines.new(type='percent', ratio=Decimal('.5'))
-    >>> delta = line.relativedeltas.new(days=20)
+    >>> delta, = line.relativedeltas
+    >>> delta.days = 20
     >>> line = payment_term.lines.new(type='remainder')
     >>> delta = line.relativedeltas.new(days=40)
     >>> payment_term.save()
@@ -343,3 +340,20 @@ The invoice is posted when the reconciliation is deleted::
     >>> invoice.state
     u'posted'
     >>> invoice.tax_identifier
+
+Credit invoice with non line lines::
+
+    >>> invoice = Invoice()
+    >>> invoice.party = party
+    >>> invoice.payment_term = payment_term
+    >>> line = invoice.lines.new()
+    >>> line.product = product
+    >>> line.quantity = 5
+    >>> line.unit_price = Decimal('40')
+    >>> line = invoice.lines.new()
+    >>> line.type = 'comment'
+    >>> line.description = 'Comment'
+    >>> invoice.click('post')
+    >>> credit = Wizard('account.invoice.credit', [invoice])
+    >>> credit.form.with_refund = True
+    >>> credit.execute('credit')
diff --git a/tests/scenario_invoice_alternate_currency.rst b/tests/scenario_invoice_alternate_currency.rst
index 7bdf33e..fe1ec5b 100644
--- a/tests/scenario_invoice_alternate_currency.rst
+++ b/tests/scenario_invoice_alternate_currency.rst
@@ -93,20 +93,16 @@ Create product::
     >>> ProductUom = Model.get('product.uom')
     >>> unit, = ProductUom.find([('name', '=', 'Unit')])
     >>> ProductTemplate = Model.get('product.template')
-    >>> Product = Model.get('product.product')
-    >>> product = Product()
     >>> template = ProductTemplate()
     >>> template.name = 'product'
     >>> template.default_uom = unit
     >>> template.type = 'service'
     >>> template.list_price = Decimal('40')
-    >>> template.cost_price = Decimal('25')
     >>> template.account_expense = expense
     >>> template.account_revenue = revenue
     >>> template.customer_taxes.append(tax)
     >>> template.save()
-    >>> product.template = template
-    >>> product.save()
+    >>> product, = template.products
 
 Create invoice with alternate currency::
 
diff --git a/tests/scenario_invoice_supplier.rst b/tests/scenario_invoice_supplier.rst
index 4870492..9c0c213 100644
--- a/tests/scenario_invoice_supplier.rst
+++ b/tests/scenario_invoice_supplier.rst
@@ -61,20 +61,16 @@ Create product::
     >>> ProductUom = Model.get('product.uom')
     >>> unit, = ProductUom.find([('name', '=', 'Unit')])
     >>> ProductTemplate = Model.get('product.template')
-    >>> Product = Model.get('product.product')
-    >>> product = Product()
     >>> template = ProductTemplate()
     >>> template.name = 'product'
     >>> template.default_uom = unit
     >>> template.type = 'service'
     >>> template.list_price = Decimal('40')
-    >>> template.cost_price = Decimal('20')
     >>> template.account_expense = expense
     >>> template.account_revenue = revenue
     >>> template.supplier_taxes.append(tax)
     >>> template.save()
-    >>> product.template = template
-    >>> product.save()
+    >>> product, = template.products
 
 Create payment term::
 
diff --git a/tox.ini b/tox.ini
new file mode 100644
index 0000000..527d859
--- /dev/null
+++ b/tox.ini
@@ -0,0 +1,18 @@
+[tox]
+envlist = {py27,py34,py35,py36}-{sqlite,postgresql,mysql},pypy-{sqlite,postgresql}
+
+[testenv]
+commands = {envpython} setup.py test
+deps =
+    {py27,py34,py35,py36}-postgresql: psycopg2 >= 2.5
+    pypy-postgresql: psycopg2cffi >= 2.5
+    mysql: MySQL-python
+    sqlite: sqlitebck
+setenv =
+    sqlite: TRYTOND_DATABASE_URI={env:SQLITE_URI:sqlite://}
+    postgresql: TRYTOND_DATABASE_URI={env:POSTGRESQL_URI:postgresql://}
+    mysql: TRYTOND_DATABASE_URI={env:MYSQL_URI:mysql://}
+    sqlite: DB_NAME={env:SQLITE_NAME::memory:}
+    postgresql: DB_NAME={env:POSTGRESQL_NAME:test}
+    mysql: DB_NAME={env:MYSQL_NAME:test}
+install_command = pip install --pre --find-links https://trydevpi.tryton.org/ {opts} {packages}
diff --git a/tryton.cfg b/tryton.cfg
index 2e6bf37..639d322 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=4.4.2
+version=4.6.0
 depends:
     account
     account_product
diff --git a/trytond_account_invoice.egg-info/PKG-INFO b/trytond_account_invoice.egg-info/PKG-INFO
index 8f2847e..808c14f 100644
--- a/trytond_account_invoice.egg-info/PKG-INFO
+++ b/trytond_account_invoice.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
 Metadata-Version: 1.1
 Name: trytond-account-invoice
-Version: 4.4.2
+Version: 4.6.0
 Summary: Tryton module for invoicing
 Home-page: http://www.tryton.org/
 Author: Tryton
 Author-email: issue_tracker at tryton.org
 License: GPL-3
-Download-URL: http://downloads.tryton.org/4.4/
+Download-URL: http://downloads.tryton.org/4.6/
 Description: trytond_account_invoice
         =======================
         
@@ -69,9 +69,9 @@ Classifier: Natural Language :: Slovenian
 Classifier: Natural Language :: Spanish
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 2.7
-Classifier: Programming Language :: Python :: 3.3
 Classifier: Programming Language :: Python :: 3.4
 Classifier: Programming Language :: Python :: 3.5
+Classifier: Programming Language :: Python :: 3.6
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy
 Classifier: Topic :: Office/Business
diff --git a/trytond_account_invoice.egg-info/SOURCES.txt b/trytond_account_invoice.egg-info/SOURCES.txt
index 01b1c93..cde8394 100644
--- a/trytond_account_invoice.egg-info/SOURCES.txt
+++ b/trytond_account_invoice.egg-info/SOURCES.txt
@@ -1,20 +1,28 @@
+.drone.yml
+.hgtags
 CHANGELOG
 COPYRIGHT
 INSTALL
 LICENSE
 MANIFEST.in
 README
+__init__.py
+account.py
 account.xml
-invoice.odt
+invoice.fodt
+invoice.py
 invoice.xml
+party.py
 party.xml
+payment_term.py
 payment_term.xml
 setup.py
+tox.ini
 tryton.cfg
 ./__init__.py
 ./account.py
 ./account.xml
-./invoice.odt
+./invoice.fodt
 ./invoice.py
 ./invoice.xml
 ./party.py
@@ -77,7 +85,6 @@ tryton.cfg
 ./view/payment_term_test_form.xml
 ./view/payment_term_test_result_list.xml
 ./view/payment_term_tree.xml
-./view/print_warning_form.xml
 doc/index.rst
 locale/bg.po
 locale/ca.po
@@ -97,9 +104,12 @@ locale/pt_BR.po
 locale/ru.po
 locale/sl.po
 locale/zh_CN.po
+tests/__init__.py
 tests/scenario_invoice.rst
 tests/scenario_invoice_alternate_currency.rst
 tests/scenario_invoice_supplier.rst
+tests/test_account_invoice.py
+tests/tools.py
 trytond_account_invoice.egg-info/PKG-INFO
 trytond_account_invoice.egg-info/SOURCES.txt
 trytond_account_invoice.egg-info/dependency_links.txt
@@ -137,5 +147,4 @@ view/payment_term_line_relativedelta_list.xml
 view/payment_term_line_relativedelta_list_sequence.xml
 view/payment_term_test_form.xml
 view/payment_term_test_result_list.xml
-view/payment_term_tree.xml
-view/print_warning_form.xml
\ No newline at end of file
+view/payment_term_tree.xml
\ No newline at end of file
diff --git a/trytond_account_invoice.egg-info/requires.txt b/trytond_account_invoice.egg-info/requires.txt
index 1afeaf7..ae5c6e0 100644
--- a/trytond_account_invoice.egg-info/requires.txt
+++ b/trytond_account_invoice.egg-info/requires.txt
@@ -1,9 +1,9 @@
 python-dateutil
 python-sql >= 0.4
-trytond_account >= 4.4, < 4.5
-trytond_account_product >= 4.4, < 4.5
-trytond_company >= 4.4, < 4.5
-trytond_currency >= 4.4, < 4.5
-trytond_party >= 4.4, < 4.5
-trytond_product >= 4.4, < 4.5
-trytond >= 4.4, < 4.5
+trytond_account >= 4.6, < 4.7
+trytond_account_product >= 4.6, < 4.7
+trytond_company >= 4.6, < 4.7
+trytond_currency >= 4.6, < 4.7
+trytond_party >= 4.6, < 4.7
+trytond_product >= 4.6, < 4.7
+trytond >= 4.6, < 4.7
diff --git a/view/invoice_form.xml b/view/invoice_form.xml
index 346759f..be4f4b7 100644
--- a/view/invoice_form.xml
+++ b/view/invoice_form.xml
@@ -12,7 +12,8 @@ this repository contains the full copyright notices and license terms. -->
     <field name="party"/>
     <label name="invoice_address"/>
     <field name="invoice_address"/>
-    <newline/>
+    <label name="party_tax_identifier" string="Tax Identifier"/>
+    <field name="party_tax_identifier"/>
     <label name="description"/>
     <field name="description" colspan="3"/>
     <label name="reference"/>
diff --git a/view/invoice_tax_form.xml b/view/invoice_tax_form.xml
index f39202f..b88cf80 100644
--- a/view/invoice_tax_form.xml
+++ b/view/invoice_tax_form.xml
@@ -28,4 +28,6 @@ this repository contains the full copyright notices and license terms. -->
         <label name="tax_sign"/>
         <field name="tax_sign"/>
     </group>
+    <separator name="legal_notice" colspan="4"/>
+    <field name="legal_notice" colspan="4"/>
 </form>
diff --git a/view/invoice_tax_tree_sequence.xml b/view/invoice_tax_tree_sequence.xml
index 75f8e75..d717de9 100644
--- a/view/invoice_tax_tree_sequence.xml
+++ b/view/invoice_tax_tree_sequence.xml
@@ -13,4 +13,5 @@ this repository contains the full copyright notices and license terms. -->
     <field name="tax_sign" tree_invisible="1"/>
     <field name="account" tree_invisible="1"/>
     <field name="tax" tree_invisible="1"/>
+    <field name="legal_notice" tree_invisible="1"/>
 </tree>
diff --git a/view/print_warning_form.xml b/view/print_warning_form.xml
deleted file mode 100644
index 8e232d4..0000000
--- a/view/print_warning_form.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<!-- This file is part of Tryton.  The COPYRIGHT file at the top level of
-this repository contains the full copyright notices and license terms. -->
-<form col="2">
-    <image name="tryton-dialog-warning" xexpand="0" xfill="0"/>
-    <group col="1" id="labels">
-        <label string="You have selected more than one invoice to print."
-            id="selected"
-            yalign="0.0" xalign="0.0" xexpand="1"/>
-        <label string="The invoices will be sent directly to the printer."
-            id="printer"
-            yalign="0.0" xalign="0.0" xexpand="1"/>
-    </group>
-</form>
-- 
tryton-modules-account-invoice



More information about the tryton-debian-vcs mailing list