changeset fb89dcf7c374 in modules/account:default
details: https://hg.tryton.org/modules/account?cmd=changeset&node=fb89dcf7c374
description:
Print general journal from moves
issue3696
review347601003
diffstat:
CHANGELOG | 1 +
__init__.py | 2 -
doc/design/journal.rst | 19 -
doc/design/move.rst | 12 +
general_journal.fodt | 526 ++++++++++++++++-------------
move.py | 75 +----
move.xml | 23 +-
tests/scenario_reports.rst | 4 +-
view/print_general_journal_start_form.xml | 13 -
9 files changed, 323 insertions(+), 352 deletions(-)
diffs (997 lines):
diff -r 3d5661114326 -r fb89dcf7c374 CHANGELOG
--- a/CHANGELOG Thu Mar 11 23:00:09 2021 +0100
+++ b/CHANGELOG Tue Mar 16 22:13:51 2021 +0100
@@ -1,3 +1,4 @@
+* Print general journal from moves
* Add reconciliation sequence to configuration
* Add report for income statement and balance sheet
* Allow filtering general ledger by journal
diff -r 3d5661114326 -r fb89dcf7c374 __init__.py
--- a/__init__.py Thu Mar 11 23:00:09 2021 +0100
+++ b/__init__.py Tue Mar 16 22:13:51 2021 +0100
@@ -60,7 +60,6 @@
move.ReconcileShow,
move.CancelMovesDefault,
move.GroupLinesStart,
- move.PrintGeneralJournalStart,
tax.TaxGroup,
tax.TaxCodeTemplate,
tax.TaxCode,
@@ -101,7 +100,6 @@
move.Reconcile,
move.CancelMoves,
move.GroupLines,
- move.PrintGeneralJournal,
move_template.CreateMove,
tax.OpenChartTaxCode,
tax.OpenTaxCode,
diff -r 3d5661114326 -r fb89dcf7c374 doc/design/journal.rst
--- a/doc/design/journal.rst Thu Mar 11 23:00:09 2021 +0100
+++ b/doc/design/journal.rst Tue Mar 16 22:13:51 2021 +0100
@@ -22,25 +22,6 @@
.. |Financial --> Configuration --> Journals --> Journals| replace::
:menuselection:`Financial --> Configuration --> Journals --> Journals`
__ https://demo.tryton.org/model/account.journal
-Reports
--------
-
-.. _report-account.move.general_journal:
-
-General Journal
-^^^^^^^^^^^^^^^
-
-In Tryton the general journal lists all of the
-`Account Moves <model-account.move>` that happened between the selected start
-and end dates.
-It also includes details such as the accounts, debits and credits involved.
-
-.. seealso::
-
- The general journal can be printed by using the main menu item:
-
- :menuselection:`Financial --> Reporting --> Print General Journal`
-
Wizards
-------
diff -r 3d5661114326 -r fb89dcf7c374 doc/design/move.rst
--- a/doc/design/move.rst Thu Mar 11 23:00:09 2021 +0100
+++ b/doc/design/move.rst Tue Mar 16 22:13:51 2021 +0100
@@ -31,6 +31,18 @@
.. |Financial --> Entries --> Account Moves| replace::
:menuselection:`Financial --> Entries --> Account Moves`
__ https://demo.tryton.org/model/account.move
+Reports
+-------
+
+.. _report-account.move.general_journal:
+
+General Journal
+^^^^^^^^^^^^^^^
+
+In Tryton the general journal lists all of the selected `Account Moves
+<model-account.move>`.
+It also includes details such as the accounts, debits and credits involved.
+
Wizards
-------
diff -r 3d5661114326 -r fb89dcf7c374 general_journal.fodt
--- a/general_journal.fodt Thu Mar 11 23:00:09 2021 +0100
+++ b/general_journal.fodt Tue Mar 16 22:13:51 2021 +0100
@@ -1,24 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
-<office:document
xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0"
xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0"
xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"
xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0"
xmlns:xlink="http://www.w3.org/1999/xlink";
xmlns:dc="http://purl.org/dc/elements/1.1/";
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0"
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0"
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0"
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0"
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0"
xmlns:math="http://www.w3.org/1998/Math/MathML";
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0"
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0"
xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0"
xmlns:ooo="http://openoffice.org/2004/office";
xmlns:ooow="http://openoffice.org/2004/writer";
xmlns:oooc="http://openoffice.org/2004/calc";
xmlns:dom="http://www.w3.org/2001/xml-events";
xmlns:xforms="http://www.w3.org/2002/xforms";
xmlns:xsd="http://www.w3.org/2001/XMLSchema";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns:rpt="http://openoffice.org/2005/report";
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2"
xmlns:xhtml="http://www.w3.org/1999/xhtml";
xmlns:grddl="http://www.w3.org/2003/g/data-view#";
xmlns:officeooo="http://openoffice.org/2009/office";
xmlns:tableooo="http://openoffice.org/2009/table";
xmlns:drawooo="http://openoffice.org/2010/draw";
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0"
xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0"
xmlns:css3t="http://www.w3.org/TR/css3-text/"; office:version="1.2"
office:mimetype="application/vnd.oasis.opendocument.text">
- <office:meta><meta:generator>LibreOffice/5.4.5.1$Linux_X86_64
LibreOffice_project/40m0$Build-1</meta:generator><meta:creation-date>2012-11-14T22:45:37</meta:creation-date><meta:editing-cycles>1</meta:editing-cycles><meta:editing-duration>P0D</meta:editing-duration><meta:document-statistic
meta:table-count="3" meta:image-count="0" meta:object-count="0"
meta:page-count="1" meta:paragraph-count="29" meta:word-count="80"
meta:character-count="900"
meta:non-whitespace-character-count="849"/><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:document xmlns:officeooo="http://openoffice.org/2009/office";
xmlns:grddl="http://www.w3.org/2003/g/data-view#";
xmlns:xhtml="http://www.w3.org/1999/xhtml";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns:xsd="http://www.w3.org/2001/XMLSchema";
xmlns:xforms="http://www.w3.org/2002/xforms";
xmlns:dom="http://www.w3.org/2001/xml-events";
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0"
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0"
xmlns:math="http://www.w3.org/1998/Math/MathML";
xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0"
xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0"
xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0"
xmlns:dc="http://purl.org/dc/elements/1.1/";
xmlns:ooo="http://openoffice.org/2004/office";
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0"
xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0"
xmlns:xlink="http://www.w3.org/1999/xlink";
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0"
xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0"
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0"
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2"
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0"
xmlns:rpt="http://openoffice.org/2005/report";
xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0"
xmlns:css3t="http://www.w3.org/TR/css3-text/";
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0"
xmlns:ooow="http://openoffice.org/2004/writer";
xmlns:oooc="http://openoffice.org/2004/calc";
xmlns:tableooo="http://openoffice.org/2009/table";
xmlns:drawooo="http://openoffice.org/2010/draw"; office:version="1.2"
office:mimetype="application/vnd.oasis.opendocument.text">
+ <office:meta><meta:generator>LibreOffice/6.4.7.2$Linux_X86_64
LibreOffice_project/40$Build-2</meta:generator><meta:creation-date>2012-11-14T22:45:37</meta:creation-date><meta:editing-cycles>1</meta:editing-cycles><meta:editing-duration>P0D</meta:editing-duration><meta:document-statistic
meta:table-count="3" meta:image-count="0" meta:object-count="0"
meta:page-count="1" meta:paragraph-count="34" meta:word-count="76"
meta:character-count="875"
meta:non-whitespace-character-count="832"/><meta:user-defined meta:name="Info
1"/><meta:user-defined meta:name="Info 2"/><meta:user-defined meta:name="Info
3"/><meta:user-defined meta:name="Info 4"/></office:meta>
<office:settings>
<config:config-item-set config:name="ooo:view-settings">
<config:config-item config:name="ViewAreaTop"
config:type="long">0</config:config-item>
<config:config-item config:name="ViewAreaLeft"
config:type="long">0</config:config-item>
- <config:config-item config:name="ViewAreaWidth"
config:type="long">54700</config:config-item>
- <config:config-item config:name="ViewAreaHeight"
config:type="long">26672</config:config-item>
+ <config:config-item config:name="ViewAreaWidth"
config:type="long">25640</config:config-item>
+ <config:config-item config:name="ViewAreaHeight"
config:type="long">23021</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">16499</config:config-item>
- <config:config-item config:name="ViewTop"
config:type="long">9366</config:config-item>
+ <config:config-item config:name="ViewLeft"
config:type="long">13259</config:config-item>
+ <config:config-item config:name="ViewTop"
config:type="long">10862</config:config-item>
<config:config-item config:name="VisibleLeft"
config:type="long">0</config:config-item>
<config:config-item config:name="VisibleTop"
config:type="long">0</config:config-item>
- <config:config-item config:name="VisibleRight"
config:type="long">54698</config:config-item>
- <config:config-item config:name="VisibleBottom"
config:type="long">26670</config:config-item>
+ <config:config-item config:name="VisibleRight"
config:type="long">25638</config:config-item>
+ <config:config-item config:name="VisibleBottom"
config:type="long">23019</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">0</config:config-item>
<config:config-item config:name="ViewLayoutBookMode"
config:type="boolean">false</config:config-item>
@@ -29,90 +29,102 @@
</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="PrintProspectRTL"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="ClipAsCharacterAnchoredWriterFlyFrames"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="PrinterSetup" config:type="base64Binary"/>
+ <config:config-item config:name="CurrentDatabaseCommand"
config:type="string"/>
+ <config:config-item config:name="DoNotCaptureDrawObjsOnPage"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="LoadReadonly"
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="DoNotResetParaAttrsForNumFont"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="DoNotJustifyLinesWithManualBreak"
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="StylesNoDefault"
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="TabAtLeftIndentForParagraphsInList"
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="PrintDrawings"
config:type="boolean">true</config:config-item>
+ <config:config-item config:name="UseFormerLineSpacing"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="UseFormerTextWrapping"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="AllowPrintJobCancel"
config:type="boolean">true</config:config-item>
+ <config:config-item config:name="SubtractFlysAnchoredAtFlys"
config:type="boolean">true</config:config-item>
+ <config:config-item config:name="AddVerticalFrameOffsets"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="MathBaselineAlignment"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="AddParaLineSpacingToTableCells"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="TreatSingleColumnBreakAsPageBreak"
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="IsKernAsianPunctuation"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="PrinterIndependentLayout"
config:type="string">high-resolution</config:config-item>
+ <config:config-item config:name="SaveVersionOnClose"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="CharacterCompressionType"
config:type="short">0</config:config-item>
<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="AddExternalLeading"
config:type="boolean">true</config:config-item>
+ <config:config-item config:name="PrinterPaperFromSetup"
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="MsWordCompTrailingBlanks"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="RedlineProtectionKey"
config:type="base64Binary"/>
+ <config:config-item config:name="UseOldNumbering"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="FieldAutoUpdate"
config:type="boolean">true</config:config-item>
+ <config:config-item config:name="CurrentDatabaseDataSource"
config:type="string"/>
+ <config:config-item config:name="PrintHiddenText"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="ApplyUserData"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="PropLineSpacingShrinksFirstLine"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="EmbeddedDatabaseName"
config:type="string"/>
+ <config:config-item config:name="SaveGlobalDocumentLinks"
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="InvertBorderSpacing"
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="UseOldPrinterMetrics"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="IgnoreTabsAndBlanksForLineCalculation"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="Rsid"
config:type="int">2105963</config:config-item>
+ <config:config-item config:name="TableRowKeep"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="PrintBlackFonts"
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="OutlineLevelYieldsNumbering"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="PrinterName" config:type="string"/>
+ <config:config-item config:name="IsLabelDocument"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="RsidRoot"
config:type="int">991389</config:config-item>
+ <config:config-item config:name="MsWordCompMinLineHeightByFly"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="CollapseEmptyCellPara"
config:type="boolean">true</config:config-item>
+ <config:config-item config:name="SmallCapsPercentage66"
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="PrintTables"
config:type="boolean">true</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="TreatSingleColumnBreakAsPageBreak"
config:type="boolean">false</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="MsWordCompTrailingBlanks"
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="EmbedComplexScriptFonts"
config:type="boolean">true</config:config-item>
+ <config:config-item config:name="EmbedSystemFonts"
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="ClippedPictures"
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="SurroundTextWrapSmall"
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="EmbedOnlyUsedFonts"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="ProtectForm"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="DisableOffPagePositioning"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="EmbedLatinScriptFonts"
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="EmbedAsianScriptFonts"
config:type="boolean">true</config:config-item>
+ <config:config-item config:name="HeaderSpacingBelowLastPara"
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="PrintReversed"
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="SaveThumbnail"
config:type="boolean">true</config:config-item>
+ <config:config-item config:name="EmptyDbFieldHidesPara"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="ContinuousEndnotes"
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="PrintTextPlaceholder"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="PrintFaxName" config:type="string"/>
+ <config:config-item config:name="PrintRightPages"
config:type="boolean">true</config:config-item>
+ <config:config-item config:name="AddParaTableSpacing"
config:type="boolean">true</config:config-item>
+ <config:config-item config:name="PrintGraphics"
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="PrintControls"
config:type="boolean">true</config:config-item>
+ <config:config-item config:name="AlignTabStopPosition"
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="PrintLeftPages"
config:type="boolean">true</config:config-item>
+ <config:config-item config:name="AddParaTableSpacingAtStart"
config:type="boolean">true</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">1458629</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">991389</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 config:name="PrintProspect"
config:type="boolean">false</config:config-item>
</config:config-item-set>
</office:settings>
<office:scripts>
@@ -131,15 +143,15 @@
</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:font-independent-line-spacing="false">
+ <style:graphic-properties svg:stroke-color="#000000"
draw:fill-color="#99ccff" fo:wrap-option="no-wrap" draw:shadow-offset-x="0.3cm"
draw:shadow-offset-y="0.3cm" draw:start-line-spacing-horizontal="0.283cm"
draw:start-line-spacing-vertical="0.283cm"
draw:end-line-spacing-horizontal="0.283cm"
draw:end-line-spacing-vertical="0.283cm" 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: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="1.251cm"
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"
loext:hyphenation-no-caps="false"/>
</style:default-style>
<style:default-style style:family="table">
<style:table-properties table:border-model="collapsing"/>
@@ -151,18 +163,18 @@
<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:paragraph-properties fo:margin-top="0.423cm"
fo:margin-bottom="0.212cm" 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:paragraph-properties fo:margin-top="0cm" fo:margin-bottom="0.212cm"
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:paragraph-properties fo:margin-top="0.212cm"
fo:margin-bottom="0.212cm" 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">
@@ -180,11 +192,19 @@
<style:paragraph-properties fo:text-align="center"
style:justify-single-word="false" 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="Header_20_and_20_Footer" style:display-name="Header
and 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="8.5cm" style:type="center"/>
+ <style:tab-stop style:position="17cm" style:type="right"/>
+ </style:tab-stops>
+ </style:paragraph-properties>
+ </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-stop style:position="8.795cm" style:type="center"/>
+ <style:tab-stop style:position="17.59cm" style:type="right"/>
</style:tab-stops>
</style:paragraph-properties>
<style:text-properties fo:font-size="9pt" style:font-size-asian="10.5pt"/>
@@ -195,8 +215,8 @@
<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-stop style:position="8.795cm" style:type="center"/>
+ <style:tab-stop style:position="17.59cm" style:type="right"/>
</style:tab-stops>
</style:paragraph-properties>
<style:text-properties fo:font-size="9pt" style:font-size-asian="10.5pt"/>
@@ -205,21 +225,21 @@
<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="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:paragraph-properties fo:margin-left="0.499cm" fo:margin-right="0cm"
fo:margin-top="0cm" fo:margin-bottom="0cm" loext:contextual-spacing="false"
fo:text-indent="0cm" style:auto-text-indent="false"/>
</style:style>
<style:style style:name="Header_20_right" style:display-name="Header right"
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-stop style:position="8.795cm" style:type="center"/>
+ <style:tab-stop style:position="17.59cm" style:type="right"/>
</style:tab-stops>
</style:paragraph-properties>
</style:style>
<style:style style:name="Header_20_left" style:display-name="Header left"
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-stop style:position="8.795cm" style:type="center"/>
+ <style:tab-stop style:position="17.59cm" style:type="right"/>
</style:tab-stops>
</style:paragraph-properties>
</style:style>
@@ -231,136 +251,154 @@
</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"/>
+ <style:list-level-properties text:min-label-distance="0.381cm"/>
</text:outline-level-style>
<text:outline-level-style text:level="2" style:num-format="">
- <style:list-level-properties text:min-label-distance="0.15in"/>
+ <style:list-level-properties text:min-label-distance="0.381cm"/>
</text:outline-level-style>
<text:outline-level-style text:level="3" style:num-format="">
- <style:list-level-properties text:min-label-distance="0.15in"/>
+ <style:list-level-properties text:min-label-distance="0.381cm"/>
</text:outline-level-style>
<text:outline-level-style text:level="4" style:num-format="">
- <style:list-level-properties text:min-label-distance="0.15in"/>
+ <style:list-level-properties text:min-label-distance="0.381cm"/>
</text:outline-level-style>
<text:outline-level-style text:level="5" style:num-format="">
- <style:list-level-properties text:min-label-distance="0.15in"/>
+ <style:list-level-properties text:min-label-distance="0.381cm"/>
</text:outline-level-style>
<text:outline-level-style text:level="6" style:num-format="">
- <style:list-level-properties text:min-label-distance="0.15in"/>
+ <style:list-level-properties text:min-label-distance="0.381cm"/>
</text:outline-level-style>
<text:outline-level-style text:level="7" style:num-format="">
- <style:list-level-properties text:min-label-distance="0.15in"/>
+ <style:list-level-properties text:min-label-distance="0.381cm"/>
</text:outline-level-style>
<text:outline-level-style text:level="8" style:num-format="">
- <style:list-level-properties text:min-label-distance="0.15in"/>
+ <style:list-level-properties text:min-label-distance="0.381cm"/>
</text:outline-level-style>
<text:outline-level-style text:level="9" style:num-format="">
- <style:list-level-properties text:min-label-distance="0.15in"/>
+ <style:list-level-properties text:min-label-distance="0.381cm"/>
</text:outline-level-style>
<text:outline-level-style text:level="10" style:num-format="">
- <style:list-level-properties text:min-label-distance="0.15in"/>
+ <style:list-level-properties text:min-label-distance="0.381cm"/>
</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"/>
+ <text:linenumbering-configuration text:number-lines="false"
text:offset="0.499cm" style:num-format="1" text:number-position="left"
text:increment="5"/>
</office:styles>
<office:automatic-styles>
<style:style style:name="Table3" style:family="table">
- <style:table-properties style:width="6.925in" table:align="margins"/>
+ <style:table-properties style:width="17.59cm" table:align="margins"/>
</style:style>
<style:style style:name="Table3.A" style:family="table-column">
- <style:table-column-properties style:column-width="2.3083in"
style:rel-column-width="21845*"/>
+ <style:table-column-properties style:column-width="5.863cm"
style:rel-column-width="21845*"/>
</style:style>
<style:style style:name="Table3.A1" style:family="table-cell">
- <style:table-cell-properties fo:background-color="transparent"
fo:padding="0.0382in" fo:border="none">
+ <style:table-cell-properties fo:background-color="transparent"
fo:padding="0.097cm" fo:border="none">
+ <style:background-image/>
+ </style:table-cell-properties>
+ </style:style>
+ <style:style style:name="Table2" style:family="table">
+ <style:table-properties style:width="17.59cm" table:align="margins"/>
+ </style:style>
+ <style:style style:name="Table2.A" style:family="table-column">
+ <style:table-column-properties style:column-width="8.795cm"
style:rel-column-width="32768*"/>
+ </style:style>
+ <style:style style:name="Table2.B" style:family="table-column">
+ <style:table-column-properties style:column-width="8.795cm"
style:rel-column-width="32767*"/>
+ </style:style>
+ <style:style style:name="Table2.A1" style:family="table-cell">
+ <style:table-cell-properties fo:padding="0.097cm" fo:border="none"/>
+ </style:style>
+ <style:style style:name="Table3" style:family="table">
+ <style:table-properties style:width="17.59cm" table:align="margins"/>
+ </style:style>
+ <style:style style:name="Table3.A" style:family="table-column">
+ <style:table-column-properties style:column-width="5.863cm"
style:rel-column-width="21845*"/>
+ </style:style>
+ <style:style style:name="Table3.A1" style:family="table-cell">
+ <style:table-cell-properties fo:background-color="transparent"
fo:padding="0.097cm" fo:border="none">
<style:background-image/>
</style:table-cell-properties>
</style:style>
<style:style style:name="Table2" style:family="table">
- <style:table-properties style:width="6.925in" table:align="margins"/>
+ <style:table-properties style:width="17.59cm" table:align="margins"/>
</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="32768*"/>
+ <style:table-column-properties style:column-width="8.795cm"
style:rel-column-width="32768*"/>
</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="32767*"/>
+ <style:table-column-properties style:column-width="8.795cm"
style:rel-column-width="32767*"/>
</style:style>
<style:style style:name="Table2.A1" style:family="table-cell">
- <style:table-cell-properties fo:padding="0.0382in" fo:border="none"/>
+ <style:table-cell-properties fo:padding="0.097cm" fo:border="none"/>
</style:style>
- <style:style style:name="Table3" style:family="table">
- <style:table-properties style:width="6.925in" table:align="margins"/>
+ <style:style style:name="Table4" style:family="table">
+ <style:table-properties style:width="17.59cm" fo:margin-top="0.4cm"
fo:margin-bottom="0cm" table:align="margins" fo:background-color="transparent"
style:may-break-between-rows="false">
+ <style:background-image/>
+ </style:table-properties>
+ </style:style>
+ <style:style style:name="Table4.A" style:family="table-column">
+ <style:table-column-properties style:column-width="3.517cm"
style:rel-column-width="13107*"/>
</style:style>
- <style:style style:name="Table3.A" style:family="table-column">
- <style:table-column-properties style:column-width="2.3083in"
style:rel-column-width="21845*"/>
+ <style:style style:name="Table4.1" style:family="table-row">
+ <style:table-row-properties fo:background-color="transparent">
+ <style:background-image/>
+ </style:table-row-properties>
</style:style>
- <style:style style:name="Table3.A1" style:family="table-cell">
- <style:table-cell-properties fo:background-color="transparent"
fo:padding="0.0382in" fo:border="none">
+ <style:style style:name="Table4.A1" style:family="table-cell">
+ <style:table-cell-properties style:vertical-align=""
fo:background-color="#cccccc" fo:padding="0.049cm" fo:border-left="0.05pt solid
#000000" fo:border-right="none" fo:border-top="0.05pt solid #000000"
fo:border-bottom="none" style:writing-mode="lr-tb">
+ <style:background-image/>
+ </style:table-cell-properties>
+ </style:style>
+ <style:style style:name="Table4.B1" style:family="table-cell">
+ <style:table-cell-properties fo:background-color="#cccccc"
fo:padding="0.049cm" fo:border-left="none" fo:border-right="none"
fo:border-top="0.05pt solid #000000" fo:border-bottom="none"
style:writing-mode="page">
+ <style:background-image/>
+ </style:table-cell-properties>
+ </style:style>
+ <style:style style:name="Table4.C1" style:family="table-cell">
+ <style:table-cell-properties fo:background-color="#cccccc"
fo:padding="0.049cm" fo:border-left="none" fo:border-right="none"
fo:border-top="0.05pt solid #000000" fo:border-bottom="none"
style:writing-mode="page">
<style:background-image/>
</style:table-cell-properties>
</style:style>
- <style:style style:name="Table2" style:family="table">
- <style:table-properties style:width="6.925in" table:align="margins"/>
- </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="32768*"/>
- </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="32767*"/>
- </style:style>
- <style:style style:name="Table2.A1" style:family="table-cell">
- <style:table-cell-properties fo:padding="0.0382in" fo:border="none"/>
+ <style:style style:name="Table4.D1" style:family="table-cell">
+ <style:table-cell-properties fo:background-color="#cccccc"
fo:padding="0.049cm" fo:border-left="none" fo:border-right="0.05pt solid
#000000" fo:border-top="0.05pt solid #000000" fo:border-bottom="none"
style:writing-mode="page">
+ <style:background-image/>
+ </style:table-cell-properties>
</style:style>
- <style:style style:name="Table1" style:family="table">
- <style:table-properties style:width="6.9243in" fo:margin-top="0.15in"
fo:margin-bottom="0in" table:align="left" style:may-break-between-rows="false"/>
- </style:style>
- <style:style style:name="Table1.A" style:family="table-column">
- <style:table-column-properties style:column-width="1.7313in"/>
+ <style:style style:name="Table4.A2" style:family="table-cell">
+ <style:table-cell-properties style:vertical-align="middle"
fo:background-color="#cccccc" fo:padding="0.049cm" 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:writing-mode="lr-tb">
+ <style:background-image/>
+ </style:table-cell-properties>
</style:style>
- <style:style style:name="Table1.B" style:family="table-column">
- <style:table-column-properties style:column-width="1.709in"/>
+ <style:style style:name="Table4.A3" style:family="table-cell">
+ <style:table-cell-properties fo:background-color="#dddddd"
fo:padding="0.049cm" fo:border-left="0.05pt solid #000000"
fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid
#000000" style:writing-mode="page">
+ <style:background-image/>
+ </style:table-cell-properties>
</style:style>
- <style:style style:name="Table1.D" style:family="table-column">
- <style:table-column-properties style:column-width="0.8875in"/>
- </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:style style:name="Table4.D3" style:family="table-cell">
+ <style:table-cell-properties fo:background-color="#dddddd"
fo:padding="0.049cm" fo:border-left="0.05pt solid #000000"
fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid
#000000" style:writing-mode="page">
<style:background-image/>
</style:table-cell-properties>
</style:style>
- <style:style style:name="Table1.D1" 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:background-color="#e6e6e6"
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="Table1.E2" 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:style style:name="Table4.E3" style:family="table-cell">
+ <style:table-cell-properties fo:background-color="#dddddd"
fo:padding="0.049cm" 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:writing-mode="page">
<style:background-image/>
</style:table-cell-properties>
</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:name="Table4.A4" style:family="table-cell">
+ <style:table-cell-properties fo:padding="0.049cm" 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:writing-mode="page"/>
</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="none" fo:border-top="none"
fo:border-bottom="0.05pt solid #000000"/>
- </style:style>
- <style:style style:name="Table1.B4" 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:name="Table4.A5" style:family="table-cell">
+ <style:table-cell-properties fo:padding="0.049cm" fo:border-left="0.05pt
solid #000000" fo:border-right="none" fo:border-top="none"
fo:border-bottom="0.05pt solid #000000" style:writing-mode="page"/>
</style:style>
- <style:style style:name="Table1.D4" 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:name="Table4.D5" style:family="table-cell">
+ <style:table-cell-properties style:vertical-align="middle"
fo:padding="0.049cm" fo:border-left="0.05pt solid #000000"
fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid
#000000" style:writing-mode="page"/>
</style:style>
- <style:style style:name="Table1.E4" 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:name="Table4.E5" style:family="table-cell">
+ <style:table-cell-properties style:vertical-align="middle"
fo:padding="0.049cm" 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:writing-mode="page"/>
</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="0.05pt solid #000000" fo:border-top="none"
fo:border-bottom="0.05pt solid #000000"/>
+ <style:style style:name="Table4.A6" style:family="table-cell">
+ <style:table-cell-properties fo:padding="0.049cm" 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:writing-mode="page"/>
</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"/>
@@ -374,32 +412,54 @@
<style:style style:name="P4" style:family="paragraph"
style:parent-style-name="Table_20_Heading">
<style:text-properties fo:font-size="12pt" style:font-size-asian="12pt"
style:font-size-complex="12pt"/>
</style:style>
- <style:style style:name="P5" style:family="paragraph"
style:parent-style-name="Table_20_Contents">
+ <style:style style:name="P5" style:family="paragraph"
style:parent-style-name="Table_20_Heading">
+ <style:paragraph-properties fo:text-align="start"
style:justify-single-word="false"/>
+ <style:text-properties officeooo:paragraph-rsid="001e5148"/>
+ </style:style>
+ <style:style style:name="P6" style:family="paragraph"
style:parent-style-name="Table_20_Contents">
<style:paragraph-properties fo:text-align="start"
style:justify-single-word="false"/>
<style:text-properties fo:font-size="12pt" style:font-size-asian="12pt"
style:font-size-complex="12pt"/>
</style:style>
- <style:style style:name="P6" style:family="paragraph"
style:parent-style-name="Table_20_Contents">
+ <style:style style:name="P7" style:family="paragraph"
style:parent-style-name="Table_20_Contents">
+ <style:paragraph-properties fo:text-align="start"
style:justify-single-word="false"/>
+ <style:text-properties fo:font-size="12pt"
officeooo:paragraph-rsid="001960ab" style:font-size-asian="12pt"
style:font-size-complex="12pt"/>
+ </style:style>
+ <style:style style:name="P8" style:family="paragraph"
style:parent-style-name="Table_20_Contents">
+ <style:paragraph-properties fo:text-align="start"
style:justify-single-word="false"/>
+ <style:text-properties fo:font-size="12pt"
officeooo:paragraph-rsid="001b5738" style:font-size-asian="12pt"
style:font-size-complex="12pt"/>
+ </style:style>
+ <style:style style:name="P9" 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 fo:font-size="12pt" style:font-size-asian="12pt"
style:font-size-complex="12pt"/>
</style:style>
- <style:style style:name="P7" style:family="paragraph"
style:parent-style-name="Heading_20_1">
+ <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:text-properties fo:font-size="12pt"
officeooo:paragraph-rsid="001b5738" style:font-size-asian="12pt"
style:font-size-complex="12pt"/>
+ </style:style>
+ <style:style style:name="P11" 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="P12" 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="T1" 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="Sect1" style:family="section">
<style:section-properties style:editable="false">
- <style:columns fo:column-count="1" fo:column-gap="0in"/>
+ <style:columns fo:column-count="1" fo:column-gap="0cm"/>
</style:section-properties>
</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 fo:page-width="21.59cm"
fo:page-height="27.94cm" style:num-format="1"
style:print-orientation="portrait" fo:margin-top="2cm" fo:margin-bottom="2cm"
fo:margin-left="2cm" fo:margin-right="2cm" style:writing-mode="lr-tb"
style:layout-grid-color="#c0c0c0" style:layout-grid-lines="44"
style:layout-grid-base-height="0.55cm" style:layout-grid-ruby-height="0cm"
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="0cm">
+ <style:footnote-sep style:width="0.018cm"
style:distance-before-sep="0.101cm" style:distance-after-sep="0.101cm"
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-footer-properties fo:min-height="0cm" fo:margin-left="0cm"
fo:margin-right="0cm" fo:margin-bottom="0.499cm"/>
</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:header-footer-properties fo:min-height="0cm" fo:margin-left="0cm"
fo:margin-right="0cm" fo:margin-top="0.499cm"/>
</style:footer-style>
</style:page-layout>
</office:automatic-styles>
@@ -408,7 +468,7 @@
<style:header>
<table:table table:name="Table3" table:style-name="Table3">
<table:table-column table:style-name="Table3.A"
table:number-columns-repeated="3"/>
- <table:table-row>
+ <table:table-row table:style-name="TableLine94266545094448">
<table:table-cell table:style-name="Table3.A1"
office:value-type="string">
<text:p text:style-name="Header">Company: <text:placeholder
text:placeholder-type="text"><company.rec_name></text:placeholder></text:p>
</table:table-cell>
@@ -425,7 +485,7 @@
<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"/>
- <table:table-row>
+ <table:table-row table:style-name="TableLine94266545229984">
<table:table-cell table:style-name="Table2.A1"
office:value-type="string">
<text:p text:style-name="Footer">User: <text:placeholder
text:placeholder-type="text"><user.rec_name></text:placeholder></text:p>
</table:table-cell>
@@ -445,28 +505,27 @@
<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-decl text:display-outline-level="0" text:name="Figure"/>
</text:sequence-decls>
- <text:p text:style-name="P7">General Journal</text:p>
- <text:p text:style-name="Text_20_body">From Date: <text:placeholder
text:placeholder-type="text"><format_date(from_date,
user.language)></text:placeholder></text:p>
- <text:p text:style-name="Text_20_body">To Date: <text:placeholder
text:placeholder-type="text"><format_date(to_date,
user.language)></text:placeholder></text:p>
+ <text:p text:style-name="P11">General Journal</text:p>
<text:section text:style-name="Sect1" text:name="Section1">
<text:p text:style-name="Text_20_body"><text:placeholder
text:placeholder-type="text"><for each="move in
records"></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="2"/>
- <table:table-column table:style-name="Table1.D"
table:number-columns-repeated="2"/>
+ <table:table table:name="Table4" table:style-name="Table4">
+ <table:table-column table:style-name="Table4.A"
table:number-columns-repeated="5"/>
<table:table-header-rows>
- <table:table-row>
- <table:table-cell table:style-name="Table1.A1"
office:value-type="string">
- <text:p text:style-name="Table_20_Heading">Journal Entry:
<text:placeholder
text:placeholder-type="text"><move.number></text:placeholder><text:line-break/><text:placeholder
text:placeholder-type="text"><move.description></text:placeholder></text:p>
+ <table:table-row table:style-name="Table4.1">
+ <table:table-cell table:style-name="Table4.A1"
office:value-type="string">
+ <text:p text:style-name="Table_20_Heading">Journal
Entry:<text:line-break/><text:placeholder
text:placeholder-type="text"><move.number></text:placeholder></text:p>
+ </table:table-cell>
+ <table:table-cell table:style-name="Table4.C1"
office:value-type="string">
+ <text:p text:style-name="Table_20_Heading">Date:<text:line-break/>
<text:placeholder text:placeholder-type="text"><format_date(move.date,
user.language)></text:placeholder></text:p>
</table:table-cell>
- <table:table-cell table:style-name="Table1.A1"
office:value-type="string">
- <text:p text:style-name="Table_20_Heading">Date: <text:placeholder
text:placeholder-type="text"><format_date(move.date,
user.language)></text:placeholder></text:p>
+ <table:table-cell table:style-name="Table4.C1"
office:value-type="string">
+ <text:p text:style-name="Table_20_Heading"><text:placeholder
text:placeholder-type="text"><if
test="move.origin"></text:placeholder></text:p>
+ <text:p
text:style-name="Table_20_Heading">Origin:<text:line-break/><text:placeholder
text:placeholder-type="text"><getattr(move.origin, 'rec_name',
'')></text:placeholder></text:p>
+ <text:p text:style-name="Table_20_Heading"><text:placeholder
text:placeholder-type="text"></if></text:placeholder></text:p>
</table:table-cell>
- <table:table-cell table:style-name="Table1.A1"
office:value-type="string">
- <text:p text:style-name="Table_20_Heading">Origin: <text:placeholder
text:placeholder-type="text"><getattr(move.origin, 'rec_name',
'')></text:placeholder></text:p>
- </table:table-cell>
- <table:table-cell table:style-name="Table1.D1"
table:number-columns-spanned="2" office:value-type="string">
+ <table:table-cell table:style-name="Table4.D1"
table:number-columns-spanned="2" office:value-type="string">
<text:p text:style-name="Table_20_Heading"><text:placeholder
text:placeholder-type="text"><if test="move.state ==
'posted'"></text:placeholder></text:p>
<text:p text:style-name="Table_20_Heading">Posted <text:placeholder
text:placeholder-type="text"><move.post_number></text:placeholder><text:line-break/><text:placeholder
text:placeholder-type="text"><format_date(move.post_date,
user.language)></text:placeholder></text:p>
<text:p text:style-name="Table_20_Heading"><text:placeholder
text:placeholder-type="text"></if></text:placeholder></text:p>
@@ -476,49 +535,60 @@
</table:table-cell>
<table:covered-table-cell/>
</table:table-row>
- <table:table-row>
- <table:table-cell table:style-name="Table1.A2"
office:value-type="string">
- <text:p text:style-name="P4">Account</text:p>
- </table:table-cell>
- <table:table-cell table:style-name="Table1.A2"
table:number-columns-spanned="2" office:value-type="string">
- <text:p text:style-name="P4">Description</text:p>
+ <table:table-row table:style-name="Table4.1">
+ <table:table-cell table:style-name="Table4.A2"
table:number-columns-spanned="5" office:value-type="string">
+ <text:p text:style-name="P5"><text:placeholder
text:placeholder-type="text"><move.description></text:placeholder></text:p>
</table:table-cell>
<table:covered-table-cell/>
- <table:table-cell table:style-name="Table1.A2"
office:value-type="string">
- <text:p text:style-name="P4">Debit</text:p>
+ <table:covered-table-cell/>
+ <table:covered-table-cell/>
+ <table:covered-table-cell/>
+ </table:table-row>
+ <table:table-row table:style-name="Table4.1">
+ <table:table-cell table:style-name="Table4.A3"
table:number-columns-spanned="3" office:value-type="string">
+ <text:p text:style-name="Table_20_Heading">Account</text:p>
</table:table-cell>
- <table:table-cell table:style-name="Table1.E2"
office:value-type="string">
- <text:p text:style-name="P4">Credit</text:p>
+ <table:covered-table-cell/>
+ <table:covered-table-cell/>
+ <table:table-cell table:style-name="Table4.D3"
office:value-type="string">
+ <text:p text:style-name="Table_20_Heading">Debit</text:p>
+ </table:table-cell>
+ <table:table-cell table:style-name="Table4.E3"
office:value-type="string">
+ <text:p text:style-name="Table_20_Heading">Credit</text:p>
</table:table-cell>
</table:table-row>
</table:table-header-rows>
- <table:table-row>
- <table:table-cell table:style-name="Table1.A5"
table:number-columns-spanned="5" office:value-type="string">
- <text:p text:style-name="P5"><text:placeholder
text:placeholder-type="text"><for each="line in
move.lines"></text:placeholder></text:p>
+ <table:table-row table:style-name="TableLine94266545333792">
+ <table:table-cell table:style-name="Table4.A4"
table:number-columns-spanned="5" office:value-type="string">
+ <text:p text:style-name="P8"><text:placeholder
text:placeholder-type="text"><for each="line in
move.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.A4"
office:value-type="string">
- <text:p text:style-name="P5"><text:placeholder
text:placeholder-type="text"><(line.account.code and (line.account.code +
' ') or '') +
line.account.name></text:placeholder></text:p>
- </table:table-cell>
- <table:table-cell table:style-name="Table1.B4"
table:number-columns-spanned="2" office:value-type="string">
- <text:p text:style-name="P5"><text:placeholder
text:placeholder-type="text"><line.description></text:placeholder></text:p>
+ <table:table-row table:style-name="TableLine94266545335008">
+ <table:table-cell table:style-name="Table4.A5"
table:number-columns-spanned="3" office:value-type="string">
+ <text:p text:style-name="P8"><text:placeholder
text:placeholder-type="text"><line.account.rec_name></text:placeholder></text:p>
+ <text:p text:style-name="P8"><text:placeholder
text:placeholder-type="text"><if
test="line.party"></text:placeholder></text:p>
+ <text:p text:style-name="P8"><text:placeholder
text:placeholder-type="text"><'[%s] %s' % (line.party.code,
line.party.name)></text:placeholder></text:p>
+ <text:p text:style-name="P8"><text:placeholder
text:placeholder-type="text"></if></text:placeholder></text:p>
+ <text:p text:style-name="P8"><text:placeholder
text:placeholder-type="text"><if
test="line.description"></text:placeholder></text:p>
+ <text:p text:style-name="P8"><text:placeholder
text:placeholder-type="text"><line.description></text:placeholder></text:p>
+ <text:p text:style-name="P8"><text:placeholder
text:placeholder-type="text"></if></text:placeholder></text:p>
</table:table-cell>
<table:covered-table-cell/>
- <table:table-cell table:style-name="Table1.D4"
office:value-type="string">
- <text:p text:style-name="P6"><text:placeholder
text:placeholder-type="text"><format_currency(line.debit, user.language,
company.currency)></text:placeholder></text:p>
+ <table:covered-table-cell/>
+ <table:table-cell table:style-name="Table4.D5"
office:value-type="string">
+ <text:p text:style-name="P10"><text:placeholder
text:placeholder-type="text"><format_currency(line.debit, user.language,
company.currency)></text:placeholder></text:p>
</table:table-cell>
- <table:table-cell table:style-name="Table1.E4"
office:value-type="string">
- <text:p text:style-name="P6"><text:placeholder
text:placeholder-type="text"><format_currency(line.credit, user.language,
company.currency)></text:placeholder></text:p>
+ <table:table-cell table:style-name="Table4.E5"
office:value-type="string">
+ <text:p text:style-name="P10"><text:placeholder
text:placeholder-type="text"><format_currency(line.credit, user.language,
company.currency)></text:placeholder></text:p>
</table:table-cell>
</table:table-row>
- <table:table-row>
- <table:table-cell table:style-name="Table1.A5"
table:number-columns-spanned="5" office:value-type="string">
- <text:p text:style-name="P5"><text:placeholder
text:placeholder-type="text"></for></text:placeholder></text:p>
+ <table:table-row table:style-name="TableLine94266545337328">
+ <table:table-cell table:style-name="Table4.A6"
table:number-columns-spanned="5" office:value-type="string">
+ <text:p text:style-name="P8"><text:placeholder
text:placeholder-type="text"></for></text:placeholder></text:p>
</table:table-cell>
<table:covered-table-cell/>
<table:covered-table-cell/>
diff -r 3d5661114326 -r fb89dcf7c374 move.py
--- a/move.py Thu Mar 11 23:00:09 2021 +0100
+++ b/move.py Tue Mar 16 22:13:51 2021 +0100
@@ -2063,81 +2063,14 @@
description = fields.Char("Description")
-class PrintGeneralJournalStart(ModelView):
- 'Print General Journal'
- __name__ = 'account.move.print_general_journal.start'
- from_date = fields.Date('From Date', required=True)
- to_date = fields.Date('To Date', required=True)
- company = fields.Many2One('company.company', 'Company', required=True)
- posted = fields.Boolean('Posted Move', help="Only include posted moves.")
-
- @staticmethod
- def default_from_date():
- Date = Pool().get('ir.date')
- return datetime.date(Date.today().year, 1, 1)
-
- @staticmethod
- def default_to_date():
- Date = Pool().get('ir.date')
- return Date.today()
-
- @staticmethod
- def default_company():
- return Transaction().context.get('company')
-
- @staticmethod
- def default_posted():
- return False
-
-
-class PrintGeneralJournal(Wizard):
- 'Print General Journal'
- __name__ = 'account.move.print_general_journal'
- start = StateView('account.move.print_general_journal.start',
- 'account.print_general_journal_start_view_form', [
- Button('Cancel', 'end', 'tryton-cancel'),
- Button('Print', 'print_', 'tryton-print', default=True),
- ])
- print_ = StateReport('account.move.general_journal')
-
- def do_print_(self, action):
- data = {
- 'company': self.start.company.id,
- 'from_date': self.start.from_date,
- 'to_date': self.start.to_date,
- 'posted': self.start.posted,
- }
- return action, data
-
-
class GeneralJournal(Report):
__name__ = 'account.move.general_journal'
@classmethod
- def _get_records(cls, ids, model, data):
- Move = Pool().get('account.move')
-
- clause = [
- ('date', '>=', data['from_date']),
- ('date', '<=', data['to_date']),
- ('period.fiscalyear.company', '=', data['company']),
- ]
- if data['posted']:
- clause.append(('state', '=', 'posted'))
- return Move.search(clause,
- order=[('date', 'ASC'), ('id', 'ASC')])
-
- @classmethod
def get_context(cls, records, header, data):
+ pool = Pool()
+ Company = pool.get('company.company')
+ context = Transaction().context
report_context = super().get_context(records, header, data)
-
- Company = Pool().get('company.company')
-
- company = Company(data['company'])
-
- report_context['company'] = company
- report_context['digits'] = company.currency.digits
- report_context['from_date'] = data['from_date']
- report_context['to_date'] = data['to_date']
-
+ report_context['company'] = Company(context['company'])
return report_context
diff -r 3d5661114326 -r fb89dcf7c374 move.xml
--- a/move.xml Thu Mar 11 23:00:09 2021 +0100
+++ b/move.xml Tue Mar 16 22:13:51 2021 +0100
@@ -403,29 +403,18 @@
<field name="name">move_line_group_start_form</field>
</record>
- <record model="ir.ui.view" id="print_general_journal_start_view_form">
- <field
name="model">account.move.print_general_journal.start</field>
- <field name="type">form</field>
- <field name="name">print_general_journal_start_form</field>
- </record>
-
- <record model="ir.action.wizard" id="wizard_print_general_journal">
- <field name="name">Print General Journal</field>
- <field name="wiz_name">account.move.print_general_journal</field>
- </record>
- <menuitem
- parent="menu_reporting"
- action="wizard_print_general_journal"
- sequence="50"
- id="menu_print_general_journal"
- icon="tryton-print"/>
-
<record model="ir.action.report" id="report_general_journal">
<field name="name">General Journal</field>
<field name="model">account.move</field>
<field name="report_name">account.move.general_journal</field>
<field name="report">account/general_journal.fodt</field>
</record>
+ <record model="ir.action.keyword" id="report_general_journal_keyword">
+ <field name="keyword">form_print</field>
+ <field name="model">account.move,-1</field>
+ <field name="action" ref="report_general_journal"/>
+ </record>
+
<record model="ir.action.act_window" id="act_move_form_grouping">
<field name="name">Grouped Account Move</field>
<field name="res_model">account.move</field>
diff -r 3d5661114326 -r fb89dcf7c374 tests/scenario_reports.rst
--- a/tests/scenario_reports.rst Thu Mar 11 23:00:09 2021 +0100
+++ b/tests/scenario_reports.rst Tue Mar 16 22:13:51 2021 +0100
@@ -200,8 +200,8 @@
>>> aged_balance = Report('account.aged_balance', context=context)
>>> _ = aged_balance.execute(aged_balances)
- >>> print_general_journal = Wizard('account.move.print_general_journal')
- >>> print_general_journal.execute('print_')
+ >>> general_journal = Report('account.move.general_journal')
+ >>> _ = general_journal.execute(Move.find([]))
>>> with config.set_context(
... start_date=period.start_date,
diff -r 3d5661114326 -r fb89dcf7c374 view/print_general_journal_start_form.xml
--- a/view/print_general_journal_start_form.xml Thu Mar 11 23:00:09 2021 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +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>
- <label name="from_date"/>
- <field name="from_date"/>
- <label name="to_date"/>
- <field name="to_date"/>
- <label name="company"/>
- <field name="company"/>
- <label name="posted"/>
- <field name="posted"/>
-</form>
