[tryton-debian-vcs] tryton-modules-stock branch debian updated. debian/4.4.3-1-4-g20b251a

Mathias Behrle tryton-debian-vcs at alioth.debian.org
Fri Nov 10 12:20:20 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-stock.git;a=commitdiff;h=debian/4.4.3-1-4-g20b251a

commit 20b251aaab95eab5bd7263e6218657a1d144c183
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Tue Nov 7 16:24:59 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 73b2f0d..699438e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+tryton-modules-stock (4.6.0-1) unstable; urgency=medium
+
+  * 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:20:35 +0100
+
 tryton-modules-stock (4.4.3-1) unstable; urgency=medium
 
   * Bump the Standards-Version to 4.1.0, no changes needed.
commit fdfd10d50a4387d379abcbe1c782eaaad3e3ba15
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 250de90..cbd9e56 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
 version=3
-opts=pgpsigurlmangle=s/$/.asc/ http://downloads.tryton.org/current/ .*trytond_stock-(\d.*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz))
+opts=pgpsigurlmangle=s/$/.asc/ https://downloads.tryton.org/current/ .*trytond_stock-(\d.*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz))
commit 0e8fe6204dd05ee7681cf3cda1e2576280778d7d
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Mon Nov 6 14:41:22 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 0b0dc67..52d855b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,11 +1,12 @@
-Version 4.4.3 - 2017-10-04
-* Bug fixes (see mercurial logs for details)
-
-Version 4.4.2 - 2017-08-08
-* Bug fixes (see mercurial logs for details)
-
-Version 4.4.1 - 2017-07-01
-* Bug fixes (see mercurial logs for details)
+Version 4.6.0 - 2017-10-30
+* Bug fixes (see mercurial logs for details)
+* Add flat children option on location
+* Raise single warning for move without origin
+* Allow to set manual effective date on move
+* Improve computation of cost price
+* Limit move locations 'child_of' constraints to specific shipment states
+* Allow to delete staging move
+* Allow to deactivate only empty locations
 
 Version 4.4.0 - 2017-05-01
 * Bug fixes (see mercurial logs for details)
diff --git a/MANIFEST.in b/MANIFEST.in
index fb91042..4a5843d 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 icons/*
diff --git a/PKG-INFO b/PKG-INFO
index 7105358..735044f 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
 Metadata-Version: 1.1
 Name: trytond_stock
-Version: 4.4.3
+Version: 4.6.0
 Summary: Tryton module for stock and inventory
 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_stock
         =============
         
@@ -70,9 +70,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/customer_return_restocking_list.fodt b/customer_return_restocking_list.fodt
new file mode 100644
index 0000000..0618eb1
--- /dev/null
+++ b/customer_return_restocking_list.fodt
@@ -0,0 +1,491 @@
+<?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.2.7.2$Linux_X86_64 LibreOffice_project/20m0$Build-2</meta:generator><meta:initial-creator>Bertrand Chenal</meta:initial-creator><meta:creation-date>2009-03-26T13:54:48</meta:creation-date><dc:date>2016-03-21T16:02:20.533874912</dc:date><meta:editing-cycles>56</meta:editing-cycles><meta:editing-duration>PT7H2M27S</meta:editing-duration><meta:document-statistic meta:character-count="834" meta:image-count="0" meta:non-whitespace-character-count="791" meta:object-count="0" meta:page-count="2" meta:paragraph-count="30" meta:table-count="1" meta:word-count="73"/><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">43760</config:config-item>
+   <config:config-item config:name="ViewAreaHeight" config:type="long">21691</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">2630</config:config-item>
+     <config:config-item config:name="ViewTop" config:type="long">5313</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">43759</config:config-item>
+     <config:config-item config:name="VisibleBottom" config:type="long">21689</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>
+     <config:config-item config:name="ZoomFactor" config:type="short">100</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="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="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">440606</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">true</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">68753</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 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="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="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="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="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="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.6924in" fo:margin-left="0in" fo:margin-right="0in" fo:margin-top="0.15in" fo:margin-bottom="0in" table:align="margins"/>
+  </style:style>
+  <style:style style:name="Table1.A" style:family="table-column">
+   <style:table-column-properties style:column-width="1.8438in" style:rel-column-width="18053*"/>
+  </style:style>
+  <style:style style:name="Table1.C" style:family="table-column">
+   <style:table-column-properties style:column-width="1.8444in" style:rel-column-width="18060*"/>
+  </style:style>
+  <style:style style:name="Table1.D" style:family="table-column">
+   <style:table-column-properties style:column-width="1.1611in" style:rel-column-width="11369*"/>
+  </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.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: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.C2" 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.D2" 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="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
+  </style:style>
+  <style:style style:name="Table1.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="Table1.C3" 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.D3" 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="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
+  </style:style>
+  <style:style style:name="Table1.C4" 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.D4" 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="00053457"/>
+  </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="00053457"/>
+  </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="00053457" style:font-size-asian="12pt" style:font-size-complex="12pt"/>
+  </style:style>
+  <style:style style:name="P4" style:family="paragraph" style:parent-style-name="Footer">
+   <style:paragraph-properties fo:text-align="end" style:justify-single-word="false"/>
+  </style:style>
+  <style:style style:name="P5" 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="00053457"/>
+  </style:style>
+  <style:style style:name="P6" 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="00053457" style:font-size-asian="12pt" style:font-size-complex="12pt"/>
+  </style:style>
+  <style:style style:name="P7" 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="00053457"/>
+  </style:style>
+  <style:style style:name="P8" style:family="paragraph" style:parent-style-name="Footer">
+   <style:paragraph-properties fo:text-align="end" style:justify-single-word="false"/>
+  </style:style>
+  <style:style style:name="P9" style:family="paragraph" style:parent-style-name="Table_20_Heading">
+   <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
+   <style:text-properties style:font-name="Liberation Serif2"/>
+  </style:style>
+  <style:style style:name="P10" style:family="paragraph" style:parent-style-name="Table_20_Contents">
+   <style:text-properties style:font-name="Liberation Serif2"/>
+  </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:style>
+  <style:style style:name="P12" style:family="paragraph" style:parent-style-name="Standard">
+   <style:paragraph-properties fo:break-before="page"/>
+  </style:style>
+  <style:style style:name="P13" style:family="paragraph" style:parent-style-name="Heading_20_1" style:master-page-name="">
+   <style:paragraph-properties fo:text-align="center" style:justify-single-word="false" style:page-number="auto" fo:break-before="page"/>
+   <style:text-properties style:text-underline-style="solid" style:text-underline-width="auto" style:text-underline-color="font-color" fo:font-weight="bold" style:font-weight-asian="bold" style:font-weight-complex="bold"/>
+  </style:style>
+  <style:style style:name="P14" style:family="paragraph" style:parent-style-name="Standard">
+   <style:text-properties officeooo:paragraph-rsid="0002e6f0"/>
+  </style:style>
+  <style:style style:name="T1" style:family="text">
+   <style:text-properties fo:font-weight="bold" style:font-weight-asian="bold" style:font-weight-complex="bold"/>
+  </style:style>
+  <style:style style:name="T2" style:family="text">
+   <style:text-properties fo:font-weight="bold" officeooo:rsid="0002e6f0" style:font-weight-asian="bold" style:font-weight-complex="bold"/>
+  </style:style>
+  <style:style style:name="T3" style:family="text">
+   <style:text-properties fo:font-weight="bold" officeooo:rsid="00058f93" style:font-weight-asian="bold" style:font-weight-complex="bold"/>
+  </style:style>
+  <style:style style:name="T4" style:family="text">
+   <style:text-properties fo:font-weight="bold" officeooo:rsid="0006a771" style:font-weight-asian="bold" style:font-weight-complex="bold"/>
+  </style:style>
+  <style:style style:name="T5" style:family="text">
+   <style:text-properties fo:font-weight="normal" style:font-weight-asian="normal" style:font-weight-complex="normal"/>
+  </style:style>
+  <style:page-layout style:name="pm1">
+   <style:page-layout-properties fo:page-width="8.2673in" fo:page-height="11.6925in" 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: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="company.header"></text:placeholder></text:p>
+    <text:p text:style-name="P1"><text:placeholder text:placeholder-type="text"><for each="line in 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"><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="company.footer"></text:placeholder></text:p>
+    <text:p text:style-name="P2"><text:placeholder text:placeholder-type="text"><for each="line in 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>
+    <text:p text:style-name="P4"><text:page-number text:select-page="current">2</text:page-number>/<text:page-count>2</text:page-count></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="P12"><text:placeholder text:placeholder-type="text"><for each="shipment in records"></text:placeholder></text:p>
+   <text:p text:style-name="P13">Restocking List</text:p>
+   <text:p text:style-name="P14"><text:span text:style-name="T4">Shipment </text:span><text:span text:style-name="T3">Number</text:span><text:span text:style-name="T1">: </text:span><text:span text:style-name="T1"><text:placeholder text:placeholder-type="text"><shipment.number></text:placeholder></text:span></text:p>
+   <text:p text:style-name="P14"><text:span text:style-name="T1">Reference:</text:span><text:span text:style-name="T5"> </text:span><text:span text:style-name="T5"><text:placeholder text:placeholder-type="text"><shipment.origins or ''></text:placeholder></text:span><text:span text:style-name="T5"><text:placeholder text:placeholder-type="text"><', ' if (shipment.origins and shipment.reference) else ''></text:placeholder></text:span><text:span text:style-name="T5"><text:placeholder text:placeholder-type="text"><shipment.reference or ''></text:placeholder></text:span></text:p>
+   <text:p text:style-name="Standard"><text:span text:style-name="T2">Customer</text:span><text:span text:style-name="T1">:</text:span><text:span text:style-name="T5"> </text:span><text:span text:style-name="T5"><text:placeholder text:placeholder-type="text"><shipment.customer.rec_name></text:placeholder></text:span></text:p>
+   <text:p text:style-name="Standard"><text:span text:style-name="T1">Planned Date:</text:span><text:span text:style-name="T5"> </text:span><text:span text:style-name="T5"><text:placeholder text:placeholder-type="text"><shipment.planned_date and format_date(shipment.planned_date, user.language) or ''></text:placeholder></text:span></text:p>
+   <text:p text:style-name="Standard"><text:span text:style-name="T1">Warehouse:</text:span><text:span text:style-name="T5"> </text:span><text:span text:style-name="T5"><text:placeholder text:placeholder-type="text"><shipment.warehouse.rec_name></text:placeholder></text:span></text:p>
+   <table:table table:name="Table1" table:style-name="Table1">
+    <table:table-column table:style-name="Table1.A" table:number-columns-repeated="2"/>
+    <table:table-column table:style-name="Table1.C"/>
+    <table:table-column table:style-name="Table1.D"/>
+    <table:table-header-rows>
+     <table:table-row>
+      <table:table-cell table:style-name="Table1.A1" office:value-type="string">
+       <text:p text:style-name="P9">From Location</text:p>
+      </table:table-cell>
+      <table:table-cell table:style-name="Table1.A1" office:value-type="string">
+       <text:p text:style-name="P9">To Location</text:p>
+      </table:table-cell>
+      <table:table-cell table:style-name="Table1.A1" office:value-type="string">
+       <text:p text:style-name="P9">Product</text:p>
+      </table:table-cell>
+      <table:table-cell table:style-name="Table1.D1" office:value-type="string">
+       <text:p text:style-name="P9">Quantity</text:p>
+      </table:table-cell>
+     </table:table-row>
+    </table:table-header-rows>
+    <table:table-row>
+     <table:table-cell table:style-name="Table1.A4" table:number-columns-spanned="2" office:value-type="string">
+      <text:p text:style-name="P10"><text:placeholder text:placeholder-type="text"><for each="move in moves[shipment.id]"></text:placeholder></text:p>
+     </table:table-cell>
+     <table:covered-table-cell/>
+     <table:table-cell table:style-name="Table1.C4" office:value-type="string">
+      <text:p text:style-name="P10"/>
+     </table:table-cell>
+     <table:table-cell table:style-name="Table1.D4" office:value-type="string">
+      <text:p text:style-name="P10"/>
+     </table:table-cell>
+    </table:table-row>
+    <table:table-row>
+     <table:table-cell table:style-name="Table1.B3" office:value-type="string">
+      <text:p text:style-name="Table_20_Contents"><text:placeholder text:placeholder-type="text"><move.from_location.rec_name></text:placeholder></text:p>
+     </table:table-cell>
+     <table:table-cell table:style-name="Table1.B3" office:value-type="string">
+      <text:p text:style-name="Table_20_Contents"><text:placeholder text:placeholder-type="text"><move.to_location.rec_name></text:placeholder></text:p>
+     </table:table-cell>
+     <table:table-cell table:style-name="Table1.C4" office:value-type="string">
+      <text:p text:style-name="Table_20_Contents"><text:placeholder text:placeholder-type="text"><move.product.rec_name></text:placeholder></text:p>
+     </table:table-cell>
+     <table:table-cell table:style-name="Table1.D4" office:value-type="string">
+      <text:p text:style-name="P11"><text:placeholder text:placeholder-type="text"><format_number(move.quantity, user.language, digits=move.unit_digits)></text:placeholder> <text:placeholder text:placeholder-type="text"><move.uom.symbol></text:placeholder></text:p>
+     </table:table-cell>
+    </table:table-row>
+    <table:table-row>
+     <table:table-cell table:style-name="Table1.A4" 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-cell table:style-name="Table1.C4" office:value-type="string">
+      <text:p text:style-name="P10"/>
+     </table:table-cell>
+     <table:table-cell table:style-name="Table1.D4" office:value-type="string">
+      <text:p text:style-name="P10"/>
+     </table:table-cell>
+    </table:table-row>
+   </table:table>
+   <text:p text:style-name="Text_20_body"><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/customer_return_restocking_list.odt b/customer_return_restocking_list.odt
deleted file mode 100644
index 3de0c68..0000000
Binary files a/customer_return_restocking_list.odt and /dev/null differ
diff --git a/delivery_note.fodt b/delivery_note.fodt
new file mode 100644
index 0000000..320ebfd
--- /dev/null
+++ b/delivery_note.fodt
@@ -0,0 +1,461 @@
+<?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.2.7.2$Linux_X86_64 LibreOffice_project/20m0$Build-2</meta:generator><meta:creation-date>2008-06-07T15:29:02</meta:creation-date><dc:date>2009-03-26T18:33:13</dc:date><meta:editing-cycles>1</meta:editing-cycles><meta:editing-duration>PT0S</meta:editing-duration><meta:document-statistic meta:table-count="1" meta:image-count="0" meta:object-count="0" meta:page-count="2" meta:paragraph-count="27" meta:word-count="81" meta:character-count="1082" meta:non-whitespace-character-count="1028"/><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">29012</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">23440</config:config-item>
+   <config:config-item config:name="ViewAreaHeight" config:type="long">21451</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">14501</config:config-item>
+     <config:config-item config:name="ViewTop" config:type="long">37947</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">29012</config:config-item>
+     <config:config-item config:name="VisibleRight" config:type="long">23439</config:config-item>
+     <config:config-item config:name="VisibleBottom" config:type="long">50461</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>
+     <config:config-item config:name="ZoomFactor" config:type="short">100</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="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="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">2676851</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">1813180</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="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_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="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: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.6924in" fo:margin-left="0in" fo:margin-right="0in" fo:margin-top="0.15in" fo:margin-bottom="0in" table:align="margins"/>
+  </style:style>
+  <style:style style:name="Table1.A" style:family="table-column">
+   <style:table-column-properties style:column-width="3.7819in" style:rel-column-width="37032*"/>
+  </style:style>
+  <style:style style:name="Table1.B" style:family="table-column">
+   <style:table-column-properties style:column-width="2.9104in" style:rel-column-width="28503*"/>
+  </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.B1" 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="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
+  </style:style>
+  <style:style style:name="Table1.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="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="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="00224f9c"/>
+  </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="00224f9c"/>
+  </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="00224f9c" style:font-size-asian="12pt" style:font-size-complex="12pt"/>
+  </style:style>
+  <style:style style:name="P4" style:family="paragraph" style:parent-style-name="Footer">
+   <style:paragraph-properties fo:text-align="end" style:justify-single-word="false"/>
+  </style:style>
+  <style:style style:name="P5" 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="00224f9c"/>
+  </style:style>
+  <style:style style:name="P6" 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="00224f9c" style:font-size-asian="12pt" style:font-size-complex="12pt"/>
+  </style:style>
+  <style:style style:name="P7" 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="00224f9c"/>
+  </style:style>
+  <style:style style:name="P8" style:family="paragraph" style:parent-style-name="Footer">
+   <style:paragraph-properties fo:text-align="end" style:justify-single-word="false"/>
+  </style:style>
+  <style:style style:name="P9" style:family="paragraph" style:parent-style-name="Text_20_body">
+   <style:text-properties style:font-name="Liberation Serif2"/>
+  </style:style>
+  <style:style style:name="P10" style:family="paragraph" style:parent-style-name="Table_20_Heading">
+   <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
+   <style:text-properties style:font-name="Liberation Serif2"/>
+  </style:style>
+  <style:style style:name="P11" style:family="paragraph" style:parent-style-name="Table_20_Contents">
+   <style:text-properties style:font-name="Liberation Serif2"/>
+  </style:style>
+  <style:style style:name="P12" 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 style:font-name="Liberation Serif2"/>
+  </style:style>
+  <style:style style:name="P13" style:family="paragraph" style:parent-style-name="Table_20_Contents">
+   <style:text-properties style:font-name="Liberation Serif2" officeooo:paragraph-rsid="0025e811"/>
+  </style:style>
+  <style:style style:name="P14" style:family="paragraph" style:parent-style-name="Standard">
+   <style:paragraph-properties fo:break-before="page"/>
+  </style:style>
+  <style:style style:name="P15" 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="P16" 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="P17" 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="P18" style:family="paragraph" style:parent-style-name="Standard">
+   <style:text-properties officeooo:paragraph-rsid="001d64ef"/>
+  </style:style>
+  <style:style style:name="P19" 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="0028d873"/>
+  </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" officeooo:paragraph-rsid="0028d873"/>
+  </style:style>
+  <style:style style:name="T1" style:family="text">
+   <style:text-properties fo:font-weight="bold" style:font-weight-asian="bold" style:font-weight-complex="bold"/>
+  </style:style>
+  <style:style style:name="T2" style:family="text">
+   <style:text-properties fo:font-weight="normal" style:font-weight-asian="normal" style:font-weight-complex="normal"/>
+  </style:style>
+  <style:page-layout style:name="pm1">
+   <style:page-layout-properties fo:page-width="8.2673in" fo:page-height="11.6925in" 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="company.header"></text:placeholder></text:p>
+    <text:p text:style-name="P1"><text:placeholder text:placeholder-type="text"><for each="line in 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"><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="company.footer"></text:placeholder></text:p>
+    <text:p text:style-name="P2"><text:placeholder text:placeholder-type="text"><for each="line in 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>
+    <text:p text:style-name="P4"><text:page-number text:select-page="current">2</text:page-number>/<text:page-count>2</text:page-count></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="P14"><text:placeholder text:placeholder-type="text"><for each="shipment in records"></text:placeholder></text:p>
+   <text:p text:style-name="P19"><text:placeholder text:placeholder-type="text"><replace text:p="set_lang(shipment.delivery_address.party.lang and shipment.delivery_address.party.lang.code or 'en')"></text:placeholder></text:p>
+   <text:p text:style-name="P20"><text:placeholder text:placeholder-type="text"><replace text:p="shipment.set_lang(shipment.delivery_address.party.lang and shipment.delivery_address.party.lang.code or 'en')"></text:placeholder></text:p>
+   <text:p text:style-name="P20"><text:placeholder text:placeholder-type="text"><for each="line in shipment.delivery_address.full_address.split('\n')"></text:placeholder></text:p>
+   <text:p text:style-name="P15"><text:placeholder text:placeholder-type="text"><line></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="P17">Delivery Note</text:p>
+   <text:p text:style-name="P18"><text:span text:style-name="T1">Shipment Number:</text:span> <text:placeholder text:placeholder-type="text"><shipment.number></text:placeholder><text:span text:style-name="T2"><text:line-break/></text:span><text:span text:style-name="T1">Customer Code:</text:span><text:span text:style-name="T2"> </text:span><text:span text:style-name="T2"><text:placeholder text:placeholder-type="text"><shipment.customer.code></text:placeholder></text:span><text:span text:style-name="T2"><text:line-break/></text:span><text:span text:style-name="T1">Reference:</text:span><text:span text:style-name="T2"> </text:span><text:span text:style-name="T2"><text:placeholder text:placeholder-type="text"><shipment.origins or ''></text:placeholder></text:span><text:span text:style-name="T2"><text:placeholder text:placeholder-type="text"><', ' if (shipment.origins and shipment.reference) else ''></text:placeholder></text:span><text:span text:style-name="T2"><text:placeholder text:placeholder-type="text"><shipment.reference or ''></text:placeholder></text:span><text:span text:style-name="T2"><text:line-break/></text:span><text:span text:style-name="T1">Date: </text:span><text:span text:style-name="T2"><text:placeholder text:placeholder-type="text"><format_date(shipment.effective_date and shipment.effective_date or datetime.datetime.today(), shipment.delivery_address.party.lang)></text:placeholder></text:span></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:table-header-rows>
+     <table:table-row>
+      <table:table-cell table:style-name="Table1.A1" office:value-type="string">
+       <text:p text:style-name="P10">Product</text:p>
+      </table:table-cell>
+      <table:table-cell table:style-name="Table1.B1" office:value-type="string">
+       <text:p text:style-name="P10">Quantity</text:p>
+      </table:table-cell>
+     </table:table-row>
+    </table:table-header-rows>
+    <table:table-row>
+     <table:table-cell table:style-name="Table1.A4" table:number-columns-spanned="2" office:value-type="string">
+      <text:p text:style-name="P11"><text:placeholder text:placeholder-type="text"><for each="move in shipment.outgoing_moves"></text:placeholder></text:p>
+     </table:table-cell>
+     <table:covered-table-cell/>
+    </table:table-row>
+    <table:table-row>
+     <table:table-cell table:style-name="Table1.A3" office:value-type="string">
+      <text:p text:style-name="P13"><text:placeholder text:placeholder-type="text"><move.product.rec_name></text:placeholder></text:p>
+     </table:table-cell>
+     <table:table-cell table:style-name="Table1.B3" office:value-type="string">
+      <text:p text:style-name="P12"><text:placeholder text:placeholder-type="text"><format_number(move.quantity, shipment.delivery_address.party.lang, digits=move.unit_digits)></text:placeholder> <text:placeholder text:placeholder-type="text"><move.uom.symbol></text:placeholder></text:p>
+     </table:table-cell>
+    </table:table-row>
+    <table:table-row>
+     <table:table-cell table:style-name="Table1.A4" table:number-columns-spanned="2" office:value-type="string">
+      <text:p text:style-name="P11"><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="P9"><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/delivery_note.odt b/delivery_note.odt
deleted file mode 100644
index 89068e9..0000000
Binary files a/delivery_note.odt and /dev/null differ
diff --git a/doc/index.rst b/doc/index.rst
index cd51aa5..1c95705 100644
--- a/doc/index.rst
+++ b/doc/index.rst
@@ -57,6 +57,8 @@ virtually stored. The following location types are defined:
 
 Locations are organised in tree structures, allowing to define
 fine grained structures.
+It is possible to restrict a location to have only one level of children, this
+allows to improve the performance of the stock quantity computation.
 
 Location Lead Time
 ------------------
@@ -264,3 +266,9 @@ real quantity (the real products on the shelves).
 
 When the inventory is confirmed, moves are created to balance expected
 quantities and real ones.
+
+.. warning::
+    Inventory is not suited to import initial stock level especially if other
+    cost price method than `fixed` is used.
+    Individual moves from supplier to each locations must be used with the cost
+    price as unit price.
diff --git a/internal_shipment.fodt b/internal_shipment.fodt
new file mode 100644
index 0000000..ff1be2f
--- /dev/null
+++ b/internal_shipment.fodt
@@ -0,0 +1,496 @@
+<?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.2.7.2$Linux_X86_64 LibreOffice_project/20m0$Build-2</meta:generator><meta:initial-creator>Bertrand Chenal</meta:initial-creator><meta:creation-date>2009-03-26T13:54:48</meta:creation-date><dc:date>2016-08-14T17:42:50.327378604</dc:date><meta:editing-cycles>61</meta:editing-cycles><meta:editing-duration>PT7H26M47S</meta:editing-duration><meta:document-statistic meta:character-count="953" meta:image-count="0" meta:non-whitespace-character-count="911" meta:object-count="0" meta:page-count="2" meta:paragraph-count="35" meta:table-count="1" meta:word-count="77"/><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">43760</config:config-item>
+   <config:config-item config:name="ViewAreaHeight" config:type="long">21691</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">2630</config:config-item>
+     <config:config-item config:name="ViewTop" config:type="long">5313</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">43759</config:config-item>
+     <config:config-item config:name="VisibleBottom" config:type="long">21689</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>
+     <config:config-item config:name="ZoomFactor" config:type="short">100</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="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="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">2010487</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">true</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">1178252</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 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="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="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="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="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="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.6924in" fo:margin-left="0in" fo:margin-right="0in" fo:margin-top="0.15in" fo:margin-bottom="0in" table:align="margins"/>
+  </style:style>
+  <style:style style:name="Table1.A" style:family="table-column">
+   <style:table-column-properties style:column-width="1.8438in" style:rel-column-width="18053*"/>
+  </style:style>
+  <style:style style:name="Table1.C" style:family="table-column">
+   <style:table-column-properties style:column-width="1.8444in" style:rel-column-width="18060*"/>
+  </style:style>
+  <style:style style:name="Table1.D" style:family="table-column">
+   <style:table-column-properties style:column-width="1.1611in" style:rel-column-width="11369*"/>
+  </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.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: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.C2" 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.D2" 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="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
+  </style:style>
+  <style:style style:name="Table1.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="Table1.C3" 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.D3" 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="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
+  </style:style>
+  <style:style style:name="Table1.C4" 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.D4" 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="0019177b"/>
+  </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="0019177b"/>
+  </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="0019177b" style:font-size-asian="12pt" style:font-size-complex="12pt"/>
+  </style:style>
+  <style:style style:name="P4" style:family="paragraph" style:parent-style-name="Footer">
+   <style:paragraph-properties fo:text-align="end" style:justify-single-word="false"/>
+  </style:style>
+  <style:style style:name="P5" 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="0019177b"/>
+  </style:style>
+  <style:style style:name="P6" 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="0019177b" style:font-size-asian="12pt" style:font-size-complex="12pt"/>
+  </style:style>
+  <style:style style:name="P7" 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="0019177b"/>
+  </style:style>
+  <style:style style:name="P8" style:family="paragraph" style:parent-style-name="Footer">
+   <style:paragraph-properties fo:text-align="end" style:justify-single-word="false"/>
+  </style:style>
+  <style:style style:name="P9" style:family="paragraph" style:parent-style-name="Table_20_Heading">
+   <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
+   <style:text-properties style:font-name="Liberation Serif2"/>
+  </style:style>
+  <style:style style:name="P10" style:family="paragraph" style:parent-style-name="Table_20_Contents">
+   <style:text-properties style:font-name="Liberation Serif2"/>
+  </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:style>
+  <style:style style:name="P12" style:family="paragraph" style:parent-style-name="Standard">
+   <style:paragraph-properties fo:break-before="page"/>
+  </style:style>
+  <style:style style:name="P13" style:family="paragraph" style:parent-style-name="Standard">
+   <style:text-properties officeooo:paragraph-rsid="00139706"/>
+  </style:style>
+  <style:style style:name="P14" style:family="paragraph" style:parent-style-name="Standard">
+   <style:paragraph-properties fo:margin-left="4.4291in" fo:margin-right="0in" fo:text-align="end" style:justify-single-word="false" fo:text-indent="0in" style:auto-text-indent="false"/>
+  </style:style>
+  <style:style style:name="P15" style:family="paragraph" style:parent-style-name="Standard" style:master-page-name="">
+   <style:paragraph-properties fo:margin-left="4.4291in" fo:margin-right="0in" fo:text-align="end" style:justify-single-word="false" fo:text-indent="0in" style:auto-text-indent="false" style:page-number="auto" fo:break-before="page"/>
+  </style:style>
+  <style:style style:name="P16" 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" fo:font-weight="bold" style:font-weight-asian="bold" style:font-weight-complex="bold"/>
+  </style:style>
+  <style:style style:name="T1" style:family="text">
+   <style:text-properties fo:font-weight="bold" style:font-weight-asian="bold" style:font-weight-complex="bold"/>
+  </style:style>
+  <style:style style:name="T2" style:family="text">
+   <style:text-properties fo:font-weight="bold" officeooo:rsid="001d148e" style:font-weight-asian="bold" style:font-weight-complex="bold"/>
+  </style:style>
+  <style:style style:name="T3" style:family="text">
+   <style:text-properties fo:font-weight="normal" style:font-weight-asian="normal" style:font-weight-complex="normal"/>
+  </style:style>
+  <style:page-layout style:name="pm1">
+   <style:page-layout-properties fo:page-width="8.2673in" fo:page-height="11.6925in" 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: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="company.header"></text:placeholder></text:p>
+    <text:p text:style-name="P1"><text:placeholder text:placeholder-type="text"><for each="line in 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"><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="company.footer"></text:placeholder></text:p>
+    <text:p text:style-name="P2"><text:placeholder text:placeholder-type="text"><for each="line in 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>
+    <text:p text:style-name="P4"><text:page-number text:select-page="current">2</text:page-number>/<text:page-count>2</text:page-count></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="P12"><text:placeholder text:placeholder-type="text"><for each="shipment in records"></text:placeholder></text:p>
+   <text:p text:style-name="P15"><text:placeholder text:placeholder-type="text"><if test="shipment.to_location.warehouse and shipment.to_location.warehouse.address"></text:placeholder></text:p>
+   <text:p text:style-name="P14"><text:placeholder text:placeholder-type="text"><for each="line in shipment.to_location.warehouse.address.full_address.split('\n')"></text:placeholder></text:p>
+   <text:p text:style-name="P14"><text:placeholder text:placeholder-type="text"><line></text:placeholder></text:p>
+   <text:p text:style-name="P14"><text:placeholder text:placeholder-type="text"></for></text:placeholder></text:p>
+   <text:p text:style-name="P14"><text:placeholder text:placeholder-type="text"></if></text:placeholder></text:p>
+   <text:p text:style-name="P16">Internal Shipment</text:p>
+   <text:p text:style-name="P13"><text:span text:style-name="T2">Shipment Number</text:span><text:span text:style-name="T1">: </text:span><text:span text:style-name="T1"><text:placeholder text:placeholder-type="text"><shipment.number></text:placeholder></text:span></text:p>
+   <text:p text:style-name="Standard"><text:span text:style-name="T1">Reference:</text:span><text:span text:style-name="T3"> </text:span><text:span text:style-name="T3"><text:placeholder text:placeholder-type="text"><shipment.reference or ''></text:placeholder></text:span></text:p>
+   <text:p text:style-name="Standard"><text:span text:style-name="T1">From Location:</text:span> <text:placeholder text:placeholder-type="text"><shipment.from_location.rec_name></text:placeholder></text:p>
+   <text:p text:style-name="Standard"><text:span text:style-name="T1">To Location:</text:span> <text:placeholder text:placeholder-type="text"><shipment.to_location.rec_name></text:placeholder></text:p>
+   <text:p text:style-name="Standard"><text:span text:style-name="T1">Planned Date:</text:span><text:span text:style-name="T3"> </text:span><text:span text:style-name="T3"><text:placeholder text:placeholder-type="text"><shipment.planned_date and format_date(shipment.planned_date, user.language) or ''></text:placeholder></text:span></text:p>
+   <table:table table:name="Table1" table:style-name="Table1">
+    <table:table-column table:style-name="Table1.A" table:number-columns-repeated="2"/>
+    <table:table-column table:style-name="Table1.C"/>
+    <table:table-column table:style-name="Table1.D"/>
+    <table:table-header-rows>
+     <table:table-row>
+      <table:table-cell table:style-name="Table1.A1" office:value-type="string">
+       <text:p text:style-name="P9">From Location</text:p>
+      </table:table-cell>
+      <table:table-cell table:style-name="Table1.A1" office:value-type="string">
+       <text:p text:style-name="P9">To Location</text:p>
+      </table:table-cell>
+      <table:table-cell table:style-name="Table1.A1" office:value-type="string">
+       <text:p text:style-name="P9">Product</text:p>
+      </table:table-cell>
+      <table:table-cell table:style-name="Table1.D1" office:value-type="string">
+       <text:p text:style-name="P9">Quantity</text:p>
+      </table:table-cell>
+     </table:table-row>
+    </table:table-header-rows>
+    <table:table-row>
+     <table:table-cell table:style-name="Table1.A4" 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="move in moves[shipment.id]"></text:placeholder></text:p>
+     </table:table-cell>
+     <table:covered-table-cell/>
+     <table:table-cell table:style-name="Table1.C4" office:value-type="string">
+      <text:p text:style-name="P10"/>
+     </table:table-cell>
+     <table:table-cell table:style-name="Table1.D4" office:value-type="string">
+      <text:p text:style-name="P10"/>
+     </table:table-cell>
+    </table:table-row>
+    <table:table-row>
+     <table:table-cell table:style-name="Table1.B3" office:value-type="string">
+      <text:p text:style-name="Table_20_Contents"><text:placeholder text:placeholder-type="text"><move.from_location.rec_name></text:placeholder></text:p>
+     </table:table-cell>
+     <table:table-cell table:style-name="Table1.B3" office:value-type="string">
+      <text:p text:style-name="Table_20_Contents"><text:placeholder text:placeholder-type="text"><move.to_location.rec_name></text:placeholder></text:p>
+     </table:table-cell>
+     <table:table-cell table:style-name="Table1.C4" office:value-type="string">
+      <text:p text:style-name="Table_20_Contents"><text:placeholder text:placeholder-type="text"><move.product.rec_name></text:placeholder></text:p>
+     </table:table-cell>
+     <table:table-cell table:style-name="Table1.D4" office:value-type="string">
+      <text:p text:style-name="P11"><text:placeholder text:placeholder-type="text"><format_number(move.quantity, user.language, digits=move.unit_digits)></text:placeholder> <text:placeholder text:placeholder-type="text"><move.uom.symbol></text:placeholder></text:p>
+     </table:table-cell>
+    </table:table-row>
+    <table:table-row>
+     <table:table-cell table:style-name="Table1.A4" 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-cell table:style-name="Table1.C4" office:value-type="string">
+      <text:p text:style-name="P10"/>
+     </table:table-cell>
+     <table:table-cell table:style-name="Table1.D4" office:value-type="string">
+      <text:p text:style-name="P10"/>
+     </table:table-cell>
+    </table:table-row>
+   </table:table>
+   <text:p text:style-name="Text_20_body"><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/internal_shipment.odt b/internal_shipment.odt
deleted file mode 100644
index 0de628e..0000000
Binary files a/internal_shipment.odt and /dev/null differ
diff --git a/inventory.py b/inventory.py
index 17ca0a8..4fef065 100644
--- a/inventory.py
+++ b/inventory.py
@@ -358,7 +358,7 @@ class InventoryLine(ModelSQL, ModelView):
 
     @classmethod
     def search_rec_name(cls, name, clause):
-        return [('product',) + tuple(clause[1:])]
+        return [('product.rec_name',) + tuple(clause[1:])]
 
     def get_uom(self, name):
         return self.product.default_uom.id
diff --git a/locale/bg.po b/locale/bg.po
index 88e0a74..483397a 100644
--- a/locale/bg.po
+++ b/locale/bg.po
@@ -1,4 +1,4 @@
-# 
+#
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
@@ -41,6 +41,10 @@ msgid ""
 "not support moves."
 msgstr ""
 
+msgctxt "error:stock.location:"
+msgid "The location '%(location)s' must be empty to be deactivated."
+msgstr ""
+
 msgctxt "error:stock.move:"
 msgid "Internal move quantity must be positive"
 msgstr "Количествата на движение трябва да са положително число"
@@ -54,13 +58,13 @@ msgid "Source and destination location must be different"
 msgstr "Източника и целта на местонахождението трябва да са различни"
 
 msgctxt "error:stock.move:"
-msgid "The stock move \"%s\" has no origin."
+msgid "The stock moves \"%s\" have no origin."
 msgstr ""
 
 msgctxt "error:stock.move:"
 msgid ""
-"You can not delete stock move \"%s\" because it is not in draft or cancelled"
-" state."
+"You can not delete stock move \"%s\" because it is not in staging, draft nor"
+" cancelled state."
 msgstr ""
 
 msgctxt "error:stock.move:"
@@ -169,10 +173,9 @@ msgctxt "field:party.party.location,party:"
 msgid "Party"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:party.party.location,rec_name:"
-msgid "Name"
-msgstr "Име"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:party.party.location,supplier_location:"
@@ -243,8 +246,8 @@ msgid "Inventory Sequence"
 msgstr ""
 
 msgctxt "field:stock.configuration,rec_name:"
-msgid "Name"
-msgstr "Име"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.configuration,shipment_in_return_sequence:"
 msgid "Supplier Return Shipment Sequence"
@@ -293,10 +296,9 @@ msgctxt "field:stock.configuration.location,id:"
 msgid "ID"
 msgstr "ID"
 
-#, fuzzy
 msgctxt "field:stock.configuration.location,rec_name:"
-msgid "Name"
-msgstr "Име"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.configuration.location,shipment_internal_transit:"
 msgid "Internal Shipment Transit"
@@ -336,10 +338,9 @@ msgctxt "field:stock.configuration.sequence,inventory_sequence:"
 msgid "Inventory Sequence"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.configuration.sequence,rec_name:"
-msgid "Name"
-msgstr "Име"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:stock.configuration.sequence,shipment_in_return_sequence:"
@@ -414,8 +415,8 @@ msgid "Number"
 msgstr "Номер"
 
 msgctxt "field:stock.inventory,rec_name:"
-msgid "Name"
-msgstr "Име"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.inventory,state:"
 msgid "State"
@@ -467,8 +468,8 @@ msgid "Quantity"
 msgstr "Количество"
 
 msgctxt "field:stock.inventory.line,rec_name:"
-msgid "Name"
-msgstr "Име"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.inventory.line,unit_digits:"
 msgid "Unit Digits"
@@ -514,6 +515,10 @@ msgctxt "field:stock.location,create_uid:"
 msgid "Create User"
 msgstr "Създадено от"
 
+msgctxt "field:stock.location,flat_childs:"
+msgid "Flat Children"
+msgstr ""
+
 msgctxt "field:stock.location,forecast_quantity:"
 msgid "Forecast Quantity"
 msgstr "Планирани количества"
@@ -551,8 +556,8 @@ msgid "Quantity"
 msgstr "Количество"
 
 msgctxt "field:stock.location,rec_name:"
-msgid "Name"
-msgstr "Име"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.location,right:"
 msgid "Right"
@@ -598,10 +603,9 @@ msgctxt "field:stock.location.lead_time,lead_time:"
 msgid "Lead Time"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.location.lead_time,rec_name:"
-msgid "Name"
-msgstr "Условие за плащане"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:stock.location.lead_time,sequence:"
@@ -690,8 +694,8 @@ msgid "Quantity"
 msgstr "Количество"
 
 msgctxt "field:stock.move,rec_name:"
-msgid "Name"
-msgstr "Име"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:stock.move,shipment:"
@@ -755,8 +759,8 @@ msgid "ID"
 msgstr "ID"
 
 msgctxt "field:stock.period,rec_name:"
-msgid "Name"
-msgstr "Име на прикачен файл"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.period,state:"
 msgid "State"
@@ -799,8 +803,8 @@ msgid "Product"
 msgstr "Продукт"
 
 msgctxt "field:stock.period.cache,rec_name:"
-msgid "Name"
-msgstr "Име на прикачен файл"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.period.cache,write_date:"
 msgid "Write Date"
@@ -835,10 +839,9 @@ msgctxt "field:stock.product_quantities_warehouse,quantity:"
 msgid "Quantity"
 msgstr "Количество"
 
-#, fuzzy
 msgctxt "field:stock.product_quantities_warehouse,rec_name:"
-msgid "Name"
-msgstr "Име на прикачен файл"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:stock.product_quantities_warehouse,write_date:"
@@ -928,8 +931,8 @@ msgid "Planned Date"
 msgstr "Планирана дата"
 
 msgctxt "field:stock.shipment.in,rec_name:"
-msgid "Name"
-msgstr "Име"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.shipment.in,received_by:"
 msgid "Received By"
@@ -1027,8 +1030,8 @@ msgid "Planned Date"
 msgstr "Планирана дата"
 
 msgctxt "field:stock.shipment.in.return,rec_name:"
-msgid "Name"
-msgstr "Име"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.shipment.in.return,reference:"
 msgid "Reference"
@@ -1127,8 +1130,8 @@ msgid "Planned Start Date"
 msgstr ""
 
 msgctxt "field:stock.shipment.internal,rec_name:"
-msgid "Name"
-msgstr "Име"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.shipment.internal,reference:"
 msgid "Reference"
@@ -1237,8 +1240,8 @@ msgid "Planned Date"
 msgstr "Планирана дата"
 
 msgctxt "field:stock.shipment.out,rec_name:"
-msgid "Name"
-msgstr "Име"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.shipment.out,reference:"
 msgid "Reference"
@@ -1339,8 +1342,8 @@ msgid "Planned Date"
 msgstr "Планирана дата"
 
 msgctxt "field:stock.shipment.out.return,rec_name:"
-msgid "Name"
-msgstr "Име"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.shipment.out.return,received_by:"
 msgid "Received By"
@@ -1407,6 +1410,10 @@ msgid ""
 "* A date in the past will provide historical values."
 msgstr ""
 
+msgctxt "help:stock.location,flat_childs:"
+msgid "Check to restrict to one level of children."
+msgstr ""
+
 msgctxt "help:stock.location,picking_location:"
 msgid "If empty the Storage is used"
 msgstr ""
diff --git a/locale/ca.po b/locale/ca.po
index 8191a6d..f7bd1c9 100644
--- a/locale/ca.po
+++ b/locale/ca.po
@@ -1,4 +1,4 @@
-# 
+#
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
@@ -43,6 +43,10 @@ msgstr ""
 "No es pot canviar la ubicació \"%s\" amb moviments existents a un tipus que "
 "no suporta moviments."
 
+msgctxt "error:stock.location:"
+msgid "The location '%(location)s' must be empty to be deactivated."
+msgstr "La ubicació '%(location)s' ha d'estar buida abans de ser desactivada."
+
 msgctxt "error:stock.move:"
 msgid "Internal move quantity must be positive"
 msgstr "La quantitat de moviment intern ha de ser positiva."
@@ -56,16 +60,16 @@ msgid "Source and destination location must be different"
 msgstr "Les ubicacions origen i destí han de ser diferents."
 
 msgctxt "error:stock.move:"
-msgid "The stock move \"%s\" has no origin."
-msgstr "El moviment d'existències \"%s\" no té origen."
+msgid "The stock moves \"%s\" have no origin."
+msgstr "Els moviments d'existències \"%s\" no tenen origen."
 
 msgctxt "error:stock.move:"
 msgid ""
-"You can not delete stock move \"%s\" because it is not in draft or cancelled"
-" state."
+"You can not delete stock move \"%s\" because it is not in staging, draft nor"
+" cancelled state."
 msgstr ""
 "No podeu eliminar el moviment d'existències \"%s\" perquè no està en estat "
-"esborrany o cancel·lat."
+"en procès, esborrany o cancel·lat."
 
 msgctxt "error:stock.move:"
 msgid "You can not modify move \"%(move)s\" because period \"%(period)s\" is closed."
@@ -183,8 +187,8 @@ msgid "Party"
 msgstr "Tercer"
 
 msgctxt "field:party.party.location,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom del registre"
 
 msgctxt "field:party.party.location,supplier_location:"
 msgid "Supplier Location"
@@ -251,8 +255,8 @@ msgid "Inventory Sequence"
 msgstr "Seqüència d'inventari"
 
 msgctxt "field:stock.configuration,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom del registre"
 
 msgctxt "field:stock.configuration,shipment_in_return_sequence:"
 msgid "Supplier Return Shipment Sequence"
@@ -299,8 +303,8 @@ msgid "ID"
 msgstr "ID"
 
 msgctxt "field:stock.configuration.location,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom del registre"
 
 msgctxt "field:stock.configuration.location,shipment_internal_transit:"
 msgid "Internal Shipment Transit"
@@ -335,8 +339,8 @@ msgid "Inventory Sequence"
 msgstr "Seqüència d'inventari"
 
 msgctxt "field:stock.configuration.sequence,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom del registre"
 
 msgctxt "field:stock.configuration.sequence,shipment_in_return_sequence:"
 msgid "Supplier Return Shipment Sequence"
@@ -403,8 +407,8 @@ msgid "Number"
 msgstr "Número"
 
 msgctxt "field:stock.inventory,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom del registre"
 
 msgctxt "field:stock.inventory,state:"
 msgid "State"
@@ -455,8 +459,8 @@ msgid "Quantity"
 msgstr "Quantitat"
 
 msgctxt "field:stock.inventory.line,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom del registre"
 
 msgctxt "field:stock.inventory.line,unit_digits:"
 msgid "Unit Digits"
@@ -502,6 +506,10 @@ msgctxt "field:stock.location,create_uid:"
 msgid "Create User"
 msgstr "Usuari de creació"
 
+msgctxt "field:stock.location,flat_childs:"
+msgid "Flat Children"
+msgstr "Fills plans"
+
 msgctxt "field:stock.location,forecast_quantity:"
 msgid "Forecast Quantity"
 msgstr "Quantitat prevista"
@@ -539,8 +547,8 @@ msgid "Quantity"
 msgstr "Quantitat"
 
 msgctxt "field:stock.location,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom del registre"
 
 msgctxt "field:stock.location,right:"
 msgid "Right"
@@ -583,8 +591,8 @@ msgid "Lead Time"
 msgstr "Temps d'espera"
 
 msgctxt "field:stock.location.lead_time,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom del registre"
 
 msgctxt "field:stock.location.lead_time,sequence:"
 msgid "Sequence"
@@ -667,8 +675,8 @@ msgid "Quantity"
 msgstr "Quantitat"
 
 msgctxt "field:stock.move,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom del registre"
 
 msgctxt "field:stock.move,shipment:"
 msgid "Shipment"
@@ -731,8 +739,8 @@ msgid "ID"
 msgstr "ID"
 
 msgctxt "field:stock.period,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom del registre"
 
 msgctxt "field:stock.period,state:"
 msgid "State"
@@ -775,8 +783,8 @@ msgid "Product"
 msgstr "Productes"
 
 msgctxt "field:stock.period.cache,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom del registre"
 
 msgctxt "field:stock.period.cache,write_date:"
 msgid "Write Date"
@@ -807,8 +815,8 @@ msgid "Quantity"
 msgstr "Quantitat"
 
 msgctxt "field:stock.product_quantities_warehouse,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom del registre"
 
 msgctxt "field:stock.product_quantities_warehouse,write_date:"
 msgid "Write Date"
@@ -891,8 +899,8 @@ msgid "Planned Date"
 msgstr "Data estimada"
 
 msgctxt "field:stock.shipment.in,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom del registre"
 
 msgctxt "field:stock.shipment.in,received_by:"
 msgid "Received By"
@@ -987,8 +995,8 @@ msgid "Planned Date"
 msgstr "Data estimada"
 
 msgctxt "field:stock.shipment.in.return,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom del registre"
 
 msgctxt "field:stock.shipment.in.return,reference:"
 msgid "Reference"
@@ -1083,8 +1091,8 @@ msgid "Planned Start Date"
 msgstr "Inici data estimada"
 
 msgctxt "field:stock.shipment.internal,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom del registre"
 
 msgctxt "field:stock.shipment.internal,reference:"
 msgid "Reference"
@@ -1191,8 +1199,8 @@ msgid "Planned Date"
 msgstr "Data estimada"
 
 msgctxt "field:stock.shipment.out,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom del registre"
 
 msgctxt "field:stock.shipment.out,reference:"
 msgid "Reference"
@@ -1291,8 +1299,8 @@ msgid "Planned Date"
 msgstr "Data estimada"
 
 msgctxt "field:stock.shipment.out.return,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom del registre"
 
 msgctxt "field:stock.shipment.out.return,received_by:"
 msgid "Received By"
@@ -1356,6 +1364,10 @@ msgstr ""
 "* Un valor buit és un data infinita en el futur.\n"
 "* Una data en el passat proporcionarà valors històrics."
 
+msgctxt "help:stock.location,flat_childs:"
+msgid "Check to restrict to one level of children."
+msgstr "Marqueu per restringir a només un nivell de fills."
+
 msgctxt "help:stock.location,picking_location:"
 msgid "If empty the Storage is used"
 msgstr "Si està buit s'utilitzarà l'emmagatzemament."
diff --git a/locale/cs.po b/locale/cs.po
index c8ff490..d36ed11 100644
--- a/locale/cs.po
+++ b/locale/cs.po
@@ -1,4 +1,4 @@
-# 
+#
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
@@ -35,6 +35,10 @@ msgid ""
 "not support moves."
 msgstr ""
 
+msgctxt "error:stock.location:"
+msgid "The location '%(location)s' must be empty to be deactivated."
+msgstr ""
+
 msgctxt "error:stock.move:"
 msgid "Internal move quantity must be positive"
 msgstr ""
@@ -48,13 +52,13 @@ msgid "Source and destination location must be different"
 msgstr ""
 
 msgctxt "error:stock.move:"
-msgid "The stock move \"%s\" has no origin."
+msgid "The stock moves \"%s\" have no origin."
 msgstr ""
 
 msgctxt "error:stock.move:"
 msgid ""
-"You can not delete stock move \"%s\" because it is not in draft or cancelled"
-" state."
+"You can not delete stock move \"%s\" because it is not in staging, draft nor"
+" cancelled state."
 msgstr ""
 
 msgctxt "error:stock.move:"
@@ -158,10 +162,9 @@ msgctxt "field:party.party.location,party:"
 msgid "Party"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:party.party.location,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:party.party.location,supplier_location:"
 msgid "Supplier Location"
@@ -227,10 +230,9 @@ msgctxt "field:stock.configuration,inventory_sequence:"
 msgid "Inventory Sequence"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.configuration,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.configuration,shipment_in_return_sequence:"
 msgid "Supplier Return Shipment Sequence"
@@ -276,10 +278,9 @@ msgctxt "field:stock.configuration.location,id:"
 msgid "ID"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.configuration.location,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.configuration.location,shipment_internal_transit:"
 msgid "Internal Shipment Transit"
@@ -313,10 +314,9 @@ msgctxt "field:stock.configuration.sequence,inventory_sequence:"
 msgid "Inventory Sequence"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.configuration.sequence,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.configuration.sequence,shipment_in_return_sequence:"
 msgid "Supplier Return Shipment Sequence"
@@ -382,10 +382,9 @@ msgctxt "field:stock.inventory,number:"
 msgid "Number"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.inventory,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.inventory,state:"
 msgid "State"
@@ -435,10 +434,9 @@ msgctxt "field:stock.inventory.line,quantity:"
 msgid "Quantity"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.inventory.line,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.inventory.line,unit_digits:"
 msgid "Unit Digits"
@@ -484,6 +482,10 @@ msgctxt "field:stock.location,create_uid:"
 msgid "Create User"
 msgstr ""
 
+msgctxt "field:stock.location,flat_childs:"
+msgid "Flat Children"
+msgstr ""
+
 msgctxt "field:stock.location,forecast_quantity:"
 msgid "Forecast Quantity"
 msgstr ""
@@ -521,10 +523,9 @@ msgctxt "field:stock.location,quantity:"
 msgid "Quantity"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.location,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.location,right:"
 msgid "Right"
@@ -566,10 +567,9 @@ msgctxt "field:stock.location.lead_time,lead_time:"
 msgid "Lead Time"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.location.lead_time,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.location.lead_time,sequence:"
 msgid "Sequence"
@@ -651,10 +651,9 @@ msgctxt "field:stock.move,quantity:"
 msgid "Quantity"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.move,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.move,shipment:"
 msgid "Shipment"
@@ -716,10 +715,9 @@ msgctxt "field:stock.period,id:"
 msgid "ID"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.period,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.period,state:"
 msgid "State"
@@ -761,10 +759,9 @@ msgctxt "field:stock.period.cache,product:"
 msgid "Product"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.period.cache,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.period.cache,write_date:"
 msgid "Write Date"
@@ -794,10 +791,9 @@ msgctxt "field:stock.product_quantities_warehouse,quantity:"
 msgid "Quantity"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.product_quantities_warehouse,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.product_quantities_warehouse,write_date:"
 msgid "Write Date"
@@ -879,10 +875,9 @@ msgctxt "field:stock.shipment.in,planned_date:"
 msgid "Planned Date"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.shipment.in,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.shipment.in,received_by:"
 msgid "Received By"
@@ -976,10 +971,9 @@ msgctxt "field:stock.shipment.in.return,planned_date:"
 msgid "Planned Date"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.shipment.in.return,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.shipment.in.return,reference:"
 msgid "Reference"
@@ -1073,10 +1067,9 @@ msgctxt "field:stock.shipment.internal,planned_start_date:"
 msgid "Planned Start Date"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.shipment.internal,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.shipment.internal,reference:"
 msgid "Reference"
@@ -1182,10 +1175,9 @@ msgctxt "field:stock.shipment.out,planned_date:"
 msgid "Planned Date"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.shipment.out,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.shipment.out,reference:"
 msgid "Reference"
@@ -1283,10 +1275,9 @@ msgctxt "field:stock.shipment.out.return,planned_date:"
 msgid "Planned Date"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.shipment.out.return,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.shipment.out.return,received_by:"
 msgid "Received By"
@@ -1343,6 +1334,10 @@ msgid ""
 "* A date in the past will provide historical values."
 msgstr ""
 
+msgctxt "help:stock.location,flat_childs:"
+msgid "Check to restrict to one level of children."
+msgstr ""
+
 msgctxt "help:stock.location,picking_location:"
 msgid "If empty the Storage is used"
 msgstr ""
diff --git a/locale/de.po b/locale/de.po
index 9e15deb..1e4dcd6 100644
--- a/locale/de.po
+++ b/locale/de.po
@@ -1,4 +1,4 @@
-# 
+#
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
@@ -45,6 +45,10 @@ msgstr ""
 "Lagerort \"%s\" weist Warenbewegungen auf und kann deshalb nicht zu einem "
 "Typ geändert werden, der keine Warenbewegungen unterstützt."
 
+msgctxt "error:stock.location:"
+msgid "The location '%(location)s' must be empty to be deactivated."
+msgstr ""
+
 msgctxt "error:stock.move:"
 msgid "Internal move quantity must be positive"
 msgstr "Interne Anzahl von Bewegungen muss positiv sein!"
@@ -57,14 +61,16 @@ msgctxt "error:stock.move:"
 msgid "Source and destination location must be different"
 msgstr "Herkunfts- und Bestimmungsort müssen unterschiedlich sein"
 
+#, fuzzy
 msgctxt "error:stock.move:"
-msgid "The stock move \"%s\" has no origin."
+msgid "The stock moves \"%s\" have no origin."
 msgstr "Die Lagerbewegung \"%s\" hat keinen Ursprung."
 
+#, fuzzy
 msgctxt "error:stock.move:"
 msgid ""
-"You can not delete stock move \"%s\" because it is not in draft or cancelled"
-" state."
+"You can not delete stock move \"%s\" because it is not in staging, draft nor"
+" cancelled state."
 msgstr ""
 "Lagerbewegung \"%s\" kann nicht gelöscht werden, weil sie nicht in Status "
 "\"Entwurf\" oder \"Annulliert\" ist."
@@ -195,8 +201,8 @@ msgid "Party"
 msgstr "Partei"
 
 msgctxt "field:party.party.location,rec_name:"
-msgid "Name"
-msgstr "Name"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:party.party.location,supplier_location:"
 msgid "Supplier Location"
@@ -263,8 +269,8 @@ msgid "Inventory Sequence"
 msgstr "Nummernkreis Inventur"
 
 msgctxt "field:stock.configuration,rec_name:"
-msgid "Name"
-msgstr "Name"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.configuration,shipment_in_return_sequence:"
 msgid "Supplier Return Shipment Sequence"
@@ -311,8 +317,8 @@ msgid "ID"
 msgstr "ID"
 
 msgctxt "field:stock.configuration.location,rec_name:"
-msgid "Name"
-msgstr "Name"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.configuration.location,shipment_internal_transit:"
 msgid "Internal Shipment Transit"
@@ -347,8 +353,8 @@ msgid "Inventory Sequence"
 msgstr "Nummernkreis Inventur"
 
 msgctxt "field:stock.configuration.sequence,rec_name:"
-msgid "Name"
-msgstr "Name"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.configuration.sequence,shipment_in_return_sequence:"
 msgid "Supplier Return Shipment Sequence"
@@ -415,8 +421,8 @@ msgid "Number"
 msgstr "Nummer"
 
 msgctxt "field:stock.inventory,rec_name:"
-msgid "Name"
-msgstr "Name"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.inventory,state:"
 msgid "State"
@@ -467,8 +473,8 @@ msgid "Quantity"
 msgstr "Anzahl"
 
 msgctxt "field:stock.inventory.line,rec_name:"
-msgid "Name"
-msgstr "Name"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.inventory.line,unit_digits:"
 msgid "Unit Digits"
@@ -514,6 +520,10 @@ msgctxt "field:stock.location,create_uid:"
 msgid "Create User"
 msgstr "Erstellt durch"
 
+msgctxt "field:stock.location,flat_childs:"
+msgid "Flat Children"
+msgstr ""
+
 msgctxt "field:stock.location,forecast_quantity:"
 msgid "Forecast Quantity"
 msgstr "Voraussichtliche Anzahl"
@@ -551,8 +561,8 @@ msgid "Quantity"
 msgstr "Anzahl"
 
 msgctxt "field:stock.location,rec_name:"
-msgid "Name"
-msgstr "Name"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.location,right:"
 msgid "Right"
@@ -595,8 +605,8 @@ msgid "Lead Time"
 msgstr "Beschaffungszeit"
 
 msgctxt "field:stock.location.lead_time,rec_name:"
-msgid "Name"
-msgstr "Name"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.location.lead_time,sequence:"
 msgid "Sequence"
@@ -679,8 +689,8 @@ msgid "Quantity"
 msgstr "Anzahl"
 
 msgctxt "field:stock.move,rec_name:"
-msgid "Name"
-msgstr "Name"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.move,shipment:"
 msgid "Shipment"
@@ -743,8 +753,8 @@ msgid "ID"
 msgstr "ID"
 
 msgctxt "field:stock.period,rec_name:"
-msgid "Name"
-msgstr "Name"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.period,state:"
 msgid "State"
@@ -787,8 +797,8 @@ msgid "Product"
 msgstr "Variante"
 
 msgctxt "field:stock.period.cache,rec_name:"
-msgid "Name"
-msgstr "Name"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.period.cache,write_date:"
 msgid "Write Date"
@@ -819,8 +829,8 @@ msgid "Quantity"
 msgstr "Menge"
 
 msgctxt "field:stock.product_quantities_warehouse,rec_name:"
-msgid "Name"
-msgstr "Name"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.product_quantities_warehouse,write_date:"
 msgid "Write Date"
@@ -903,8 +913,8 @@ msgid "Planned Date"
 msgstr "Geplantes Datum"
 
 msgctxt "field:stock.shipment.in,rec_name:"
-msgid "Name"
-msgstr "Name"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.shipment.in,received_by:"
 msgid "Received By"
@@ -999,8 +1009,8 @@ msgid "Planned Date"
 msgstr "Geplantes Datum"
 
 msgctxt "field:stock.shipment.in.return,rec_name:"
-msgid "Name"
-msgstr "Name"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.shipment.in.return,reference:"
 msgid "Reference"
@@ -1095,8 +1105,8 @@ msgid "Planned Start Date"
 msgstr "Geplantes Startdatum"
 
 msgctxt "field:stock.shipment.internal,rec_name:"
-msgid "Name"
-msgstr "Name"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.shipment.internal,reference:"
 msgid "Reference"
@@ -1203,8 +1213,8 @@ msgid "Planned Date"
 msgstr "Geplantes Datum"
 
 msgctxt "field:stock.shipment.out,rec_name:"
-msgid "Name"
-msgstr "Name"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.shipment.out,reference:"
 msgid "Reference"
@@ -1303,8 +1313,8 @@ msgid "Planned Date"
 msgstr "Geplantes Datum"
 
 msgctxt "field:stock.shipment.out.return,rec_name:"
-msgid "Name"
-msgstr "Name"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.shipment.out.return,received_by:"
 msgid "Received By"
@@ -1364,6 +1374,10 @@ msgstr ""
 "* Ein leerer Wert bedeutet ein unendliches Datum in der Zukunft.\n"
 "* Ein Wert in der Vergangenheit berechnet historische Werte."
 
+msgctxt "help:stock.location,flat_childs:"
+msgid "Check to restrict to one level of children."
+msgstr ""
+
 msgctxt "help:stock.location,picking_location:"
 msgid "If empty the Storage is used"
 msgstr "Bei leerem Feld wird das Lager verwendet"
diff --git a/locale/es.po b/locale/es.po
index 884eb08..915182c 100644
--- a/locale/es.po
+++ b/locale/es.po
@@ -1,4 +1,4 @@
-# 
+#
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
@@ -41,6 +41,11 @@ msgstr ""
 "No puede cambiar la ubicación \"%s\" con movimientos a otra ubicación que no"
 " soporte movimientos."
 
+msgctxt "error:stock.location:"
+msgid "The location '%(location)s' must be empty to be deactivated."
+msgstr ""
+"La ubicación '%location)s' tiene que esta vacía antes de ser desactivada."
+
 msgctxt "error:stock.move:"
 msgid "Internal move quantity must be positive"
 msgstr "La cantidad del movimiento interno debe ser positiva."
@@ -54,16 +59,16 @@ msgid "Source and destination location must be different"
 msgstr "Las ubicaciones origen y destino deben ser distintas."
 
 msgctxt "error:stock.move:"
-msgid "The stock move \"%s\" has no origin."
-msgstr "El movimiento de existencias \"%s\" no tiene ningún origen."
+msgid "The stock moves \"%s\" have no origin."
+msgstr "Los movimientos de existencias \"%s\" no tienen ningún origen."
 
 msgctxt "error:stock.move:"
 msgid ""
-"You can not delete stock move \"%s\" because it is not in draft or cancelled"
-" state."
+"You can not delete stock move \"%s\" because it is not in staging, draft nor"
+" cancelled state."
 msgstr ""
 "No puede eliminar el movimiento de existencias \"%s\" porque no está en "
-"estado borrador o cancelado."
+"estado en proceso, borrador o cancelado."
 
 msgctxt "error:stock.move:"
 msgid "You can not modify move \"%(move)s\" because period \"%(period)s\" is closed."
@@ -177,8 +182,8 @@ msgid "Party"
 msgstr "Tercero"
 
 msgctxt "field:party.party.location,rec_name:"
-msgid "Name"
-msgstr "Nombre"
+msgid "Record Name"
+msgstr "Nombre del registro"
 
 msgctxt "field:party.party.location,supplier_location:"
 msgid "Supplier Location"
@@ -245,8 +250,8 @@ msgid "Inventory Sequence"
 msgstr "Secuencia de inventario"
 
 msgctxt "field:stock.configuration,rec_name:"
-msgid "Name"
-msgstr "Nombre"
+msgid "Record Name"
+msgstr "Nombre del registro"
 
 msgctxt "field:stock.configuration,shipment_in_return_sequence:"
 msgid "Supplier Return Shipment Sequence"
@@ -293,8 +298,8 @@ msgid "ID"
 msgstr "ID"
 
 msgctxt "field:stock.configuration.location,rec_name:"
-msgid "Name"
-msgstr "Nombre"
+msgid "Record Name"
+msgstr "Nombre del registro"
 
 msgctxt "field:stock.configuration.location,shipment_internal_transit:"
 msgid "Internal Shipment Transit"
@@ -329,8 +334,8 @@ msgid "Inventory Sequence"
 msgstr "Secuencia de inventario"
 
 msgctxt "field:stock.configuration.sequence,rec_name:"
-msgid "Name"
-msgstr "Nombre"
+msgid "Record Name"
+msgstr "Nombre del registro"
 
 msgctxt "field:stock.configuration.sequence,shipment_in_return_sequence:"
 msgid "Supplier Return Shipment Sequence"
@@ -397,8 +402,8 @@ msgid "Number"
 msgstr "Número"
 
 msgctxt "field:stock.inventory,rec_name:"
-msgid "Name"
-msgstr "Nombre"
+msgid "Record Name"
+msgstr "Nombre del registro"
 
 msgctxt "field:stock.inventory,state:"
 msgid "State"
@@ -449,8 +454,8 @@ msgid "Quantity"
 msgstr "Cantidad"
 
 msgctxt "field:stock.inventory.line,rec_name:"
-msgid "Name"
-msgstr "Nombre"
+msgid "Record Name"
+msgstr "Nombre del registro"
 
 msgctxt "field:stock.inventory.line,unit_digits:"
 msgid "Unit Digits"
@@ -496,6 +501,10 @@ msgctxt "field:stock.location,create_uid:"
 msgid "Create User"
 msgstr "Usuario de creación"
 
+msgctxt "field:stock.location,flat_childs:"
+msgid "Flat Children"
+msgstr "Hijos llanos"
+
 msgctxt "field:stock.location,forecast_quantity:"
 msgid "Forecast Quantity"
 msgstr "Cantidad prevista"
@@ -533,8 +542,8 @@ msgid "Quantity"
 msgstr "Cantidad"
 
 msgctxt "field:stock.location,rec_name:"
-msgid "Name"
-msgstr "Nombre"
+msgid "Record Name"
+msgstr "Nombre del registro"
 
 msgctxt "field:stock.location,right:"
 msgid "Right"
@@ -577,8 +586,8 @@ msgid "Lead Time"
 msgstr "Tiempo de espera"
 
 msgctxt "field:stock.location.lead_time,rec_name:"
-msgid "Name"
-msgstr "Nombre"
+msgid "Record Name"
+msgstr "Nombre del registro"
 
 msgctxt "field:stock.location.lead_time,sequence:"
 msgid "Sequence"
@@ -661,8 +670,8 @@ msgid "Quantity"
 msgstr "Cantidad"
 
 msgctxt "field:stock.move,rec_name:"
-msgid "Name"
-msgstr "Nombre"
+msgid "Record Name"
+msgstr "Nombre del registro"
 
 msgctxt "field:stock.move,shipment:"
 msgid "Shipment"
@@ -725,8 +734,8 @@ msgid "ID"
 msgstr "ID"
 
 msgctxt "field:stock.period,rec_name:"
-msgid "Name"
-msgstr "Nombre"
+msgid "Record Name"
+msgstr "Nombre del registro"
 
 msgctxt "field:stock.period,state:"
 msgid "State"
@@ -769,8 +778,8 @@ msgid "Product"
 msgstr "Producto"
 
 msgctxt "field:stock.period.cache,rec_name:"
-msgid "Name"
-msgstr "Nombre"
+msgid "Record Name"
+msgstr "Nombre del registro"
 
 msgctxt "field:stock.period.cache,write_date:"
 msgid "Write Date"
@@ -801,8 +810,8 @@ msgid "Quantity"
 msgstr "Cantidad"
 
 msgctxt "field:stock.product_quantities_warehouse,rec_name:"
-msgid "Name"
-msgstr "Nombre"
+msgid "Record Name"
+msgstr "Nombre del registro"
 
 msgctxt "field:stock.product_quantities_warehouse,write_date:"
 msgid "Write Date"
@@ -885,8 +894,8 @@ msgid "Planned Date"
 msgstr "Fecha estimada"
 
 msgctxt "field:stock.shipment.in,rec_name:"
-msgid "Name"
-msgstr "Nombre"
+msgid "Record Name"
+msgstr "Nombre del registro"
 
 msgctxt "field:stock.shipment.in,received_by:"
 msgid "Received By"
@@ -981,8 +990,8 @@ msgid "Planned Date"
 msgstr "Fecha estimada"
 
 msgctxt "field:stock.shipment.in.return,rec_name:"
-msgid "Name"
-msgstr "Nombre"
+msgid "Record Name"
+msgstr "Nombre del registro"
 
 msgctxt "field:stock.shipment.in.return,reference:"
 msgid "Reference"
@@ -1077,8 +1086,8 @@ msgid "Planned Start Date"
 msgstr "Fecha inicio planeada"
 
 msgctxt "field:stock.shipment.internal,rec_name:"
-msgid "Name"
-msgstr "Nombre"
+msgid "Record Name"
+msgstr "Nombre del registro"
 
 msgctxt "field:stock.shipment.internal,reference:"
 msgid "Reference"
@@ -1185,8 +1194,8 @@ msgid "Planned Date"
 msgstr "Fecha estimada"
 
 msgctxt "field:stock.shipment.out,rec_name:"
-msgid "Name"
-msgstr "Nombre"
+msgid "Record Name"
+msgstr "Nombre del registro"
 
 msgctxt "field:stock.shipment.out,reference:"
 msgid "Reference"
@@ -1285,8 +1294,8 @@ msgid "Planned Date"
 msgstr "Fecha estimada"
 
 msgctxt "field:stock.shipment.out.return,rec_name:"
-msgid "Name"
-msgstr "Nombre"
+msgid "Record Name"
+msgstr "Nombre del registro"
 
 msgctxt "field:stock.shipment.out.return,received_by:"
 msgid "Received By"
@@ -1350,6 +1359,10 @@ msgstr ""
 "* Un valor vacío es una fecha infinita en el futuro.\n"
 "* Una fecha en el pasado proporcionará los valores históricos."
 
+msgctxt "help:stock.location,flat_childs:"
+msgid "Check to restrict to one level of children."
+msgstr "Marcar para restringir a solo un nivel de hijos."
+
 msgctxt "help:stock.location,picking_location:"
 msgid "If empty the Storage is used"
 msgstr "Si está vacío se utilizará el almacenamiento."
diff --git a/locale/es_419.po b/locale/es_419.po
index c42b196..d550492 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"
 
@@ -37,6 +37,10 @@ msgid ""
 "not support moves."
 msgstr ""
 
+msgctxt "error:stock.location:"
+msgid "The location '%(location)s' must be empty to be deactivated."
+msgstr ""
+
 msgctxt "error:stock.move:"
 msgid "Internal move quantity must be positive"
 msgstr ""
@@ -50,13 +54,13 @@ msgid "Source and destination location must be different"
 msgstr ""
 
 msgctxt "error:stock.move:"
-msgid "The stock move \"%s\" has no origin."
+msgid "The stock moves \"%s\" have no origin."
 msgstr ""
 
 msgctxt "error:stock.move:"
 msgid ""
-"You can not delete stock move \"%s\" because it is not in draft or cancelled"
-" state."
+"You can not delete stock move \"%s\" because it is not in staging, draft nor"
+" cancelled state."
 msgstr ""
 
 msgctxt "error:stock.move:"
@@ -164,7 +168,7 @@ msgid "Party"
 msgstr ""
 
 msgctxt "field:party.party.location,rec_name:"
-msgid "Name"
+msgid "Record Name"
 msgstr ""
 
 msgctxt "field:party.party.location,supplier_location:"
@@ -234,7 +238,7 @@ msgid "Inventory Sequence"
 msgstr ""
 
 msgctxt "field:stock.configuration,rec_name:"
-msgid "Name"
+msgid "Record Name"
 msgstr ""
 
 msgctxt "field:stock.configuration,shipment_in_return_sequence:"
@@ -283,7 +287,7 @@ msgid "ID"
 msgstr ""
 
 msgctxt "field:stock.configuration.location,rec_name:"
-msgid "Name"
+msgid "Record Name"
 msgstr ""
 
 msgctxt "field:stock.configuration.location,shipment_internal_transit:"
@@ -320,7 +324,7 @@ msgid "Inventory Sequence"
 msgstr ""
 
 msgctxt "field:stock.configuration.sequence,rec_name:"
-msgid "Name"
+msgid "Record Name"
 msgstr ""
 
 msgctxt "field:stock.configuration.sequence,shipment_in_return_sequence:"
@@ -390,7 +394,7 @@ msgid "Number"
 msgstr ""
 
 msgctxt "field:stock.inventory,rec_name:"
-msgid "Name"
+msgid "Record Name"
 msgstr ""
 
 msgctxt "field:stock.inventory,state:"
@@ -443,7 +447,7 @@ msgid "Quantity"
 msgstr ""
 
 msgctxt "field:stock.inventory.line,rec_name:"
-msgid "Name"
+msgid "Record Name"
 msgstr ""
 
 msgctxt "field:stock.inventory.line,unit_digits:"
@@ -491,6 +495,10 @@ msgctxt "field:stock.location,create_uid:"
 msgid "Create User"
 msgstr "Creado por usuario"
 
+msgctxt "field:stock.location,flat_childs:"
+msgid "Flat Children"
+msgstr ""
+
 msgctxt "field:stock.location,forecast_quantity:"
 msgid "Forecast Quantity"
 msgstr ""
@@ -528,7 +536,7 @@ msgid "Quantity"
 msgstr ""
 
 msgctxt "field:stock.location,rec_name:"
-msgid "Name"
+msgid "Record Name"
 msgstr ""
 
 msgctxt "field:stock.location,right:"
@@ -573,7 +581,7 @@ msgid "Lead Time"
 msgstr ""
 
 msgctxt "field:stock.location.lead_time,rec_name:"
-msgid "Name"
+msgid "Record Name"
 msgstr ""
 
 msgctxt "field:stock.location.lead_time,sequence:"
@@ -658,7 +666,7 @@ msgid "Quantity"
 msgstr ""
 
 msgctxt "field:stock.move,rec_name:"
-msgid "Name"
+msgid "Record Name"
 msgstr ""
 
 msgctxt "field:stock.move,shipment:"
@@ -723,7 +731,7 @@ msgid "ID"
 msgstr ""
 
 msgctxt "field:stock.period,rec_name:"
-msgid "Name"
+msgid "Record Name"
 msgstr ""
 
 msgctxt "field:stock.period,state:"
@@ -768,7 +776,7 @@ msgid "Product"
 msgstr ""
 
 msgctxt "field:stock.period.cache,rec_name:"
-msgid "Name"
+msgid "Record Name"
 msgstr ""
 
 msgctxt "field:stock.period.cache,write_date:"
@@ -801,7 +809,7 @@ msgid "Quantity"
 msgstr ""
 
 msgctxt "field:stock.product_quantities_warehouse,rec_name:"
-msgid "Name"
+msgid "Record Name"
 msgstr ""
 
 msgctxt "field:stock.product_quantities_warehouse,write_date:"
@@ -885,7 +893,7 @@ msgid "Planned Date"
 msgstr ""
 
 msgctxt "field:stock.shipment.in,rec_name:"
-msgid "Name"
+msgid "Record Name"
 msgstr ""
 
 msgctxt "field:stock.shipment.in,received_by:"
@@ -983,7 +991,7 @@ msgid "Planned Date"
 msgstr ""
 
 msgctxt "field:stock.shipment.in.return,rec_name:"
-msgid "Name"
+msgid "Record Name"
 msgstr ""
 
 #, fuzzy
@@ -1080,7 +1088,7 @@ msgid "Planned Start Date"
 msgstr ""
 
 msgctxt "field:stock.shipment.internal,rec_name:"
-msgid "Name"
+msgid "Record Name"
 msgstr ""
 
 #, fuzzy
@@ -1191,7 +1199,7 @@ msgid "Planned Date"
 msgstr ""
 
 msgctxt "field:stock.shipment.out,rec_name:"
-msgid "Name"
+msgid "Record Name"
 msgstr ""
 
 #, fuzzy
@@ -1294,7 +1302,7 @@ msgid "Planned Date"
 msgstr ""
 
 msgctxt "field:stock.shipment.out.return,rec_name:"
-msgid "Name"
+msgid "Record Name"
 msgstr ""
 
 msgctxt "field:stock.shipment.out.return,received_by:"
@@ -1353,6 +1361,10 @@ msgid ""
 "* A date in the past will provide historical values."
 msgstr ""
 
+msgctxt "help:stock.location,flat_childs:"
+msgid "Check to restrict to one level of children."
+msgstr ""
+
 msgctxt "help:stock.location,picking_location:"
 msgid "If empty the Storage is used"
 msgstr "Si está vacío se utiliza el almacenamiento"
diff --git a/locale/fr.po b/locale/fr.po
index f1c0a5b..7c8dc1d 100644
--- a/locale/fr.po
+++ b/locale/fr.po
@@ -1,4 +1,4 @@
-# 
+#
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
@@ -43,6 +43,10 @@ msgstr ""
 "L'emplacement « %s », liée à des mouvements, ne peut être changer en un type"
 " qui ne supporte pas les mouvements."
 
+msgctxt "error:stock.location:"
+msgid "The location '%(location)s' must be empty to be deactivated."
+msgstr "L'emplacement « %(location)s » doit être vide pour être désactivée."
+
 msgctxt "error:stock.move:"
 msgid "Internal move quantity must be positive"
 msgstr "La quantité interne doit être positive"
@@ -56,16 +60,16 @@ msgid "Source and destination location must be different"
 msgstr "Les emplacements d'origine et de destination doivent être distincts"
 
 msgctxt "error:stock.move:"
-msgid "The stock move \"%s\" has no origin."
-msgstr "Le mouvement de stock « %s » n'a pas d'origine."
+msgid "The stock moves \"%s\" have no origin."
+msgstr "Les mouvements de stock « %s » n'ont pas d'origine."
 
 msgctxt "error:stock.move:"
 msgid ""
-"You can not delete stock move \"%s\" because it is not in draft or cancelled"
-" state."
+"You can not delete stock move \"%s\" because it is not in staging, draft nor"
+" cancelled state."
 msgstr ""
 "Vous ne pouvez supprimer le mouvement de stock « %s » car il n'est pas dans "
-"l'état brouillon ou annulé."
+"l'état intermédiaire, brouillon ou annulé."
 
 msgctxt "error:stock.move:"
 msgid "You can not modify move \"%(move)s\" because period \"%(period)s\" is closed."
@@ -144,11 +148,11 @@ msgstr "L'expédition interne « %s » doit être annulée avant suppression."
 msgctxt "error:stock.shipment.out.return:"
 msgid "Customer Return Shipment \"%s\" must be cancelled before deletion."
 msgstr ""
-"Le retour d'expédition client « %s » doit être annulé avant suppression."
+"Le retour d'expédition cliente « %s » doit être annulée avant suppression."
 
 msgctxt "error:stock.shipment.out:"
 msgid "Customer Shipment \"%s\" must be cancelled before deletion."
-msgstr "L'expédition cliente « %s » doit être annulées avant suppression."
+msgstr "L'expédition cliente « %s » doit être annulée avant suppression."
 
 msgctxt "field:party.address,delivery:"
 msgid "Delivery"
@@ -187,8 +191,8 @@ msgid "Party"
 msgstr "Tiers"
 
 msgctxt "field:party.party.location,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom de l'enregistrement"
 
 msgctxt "field:party.party.location,supplier_location:"
 msgid "Supplier Location"
@@ -255,8 +259,8 @@ msgid "Inventory Sequence"
 msgstr "Séquence d'inventaire"
 
 msgctxt "field:stock.configuration,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom de l'enregistrement"
 
 msgctxt "field:stock.configuration,shipment_in_return_sequence:"
 msgid "Supplier Return Shipment Sequence"
@@ -272,15 +276,15 @@ msgstr "Séquence d'expédition interne"
 
 msgctxt "field:stock.configuration,shipment_internal_transit:"
 msgid "Internal Shipment Transit"
-msgstr "Transit de livraison interne"
+msgstr "Transit d'expédition interne"
 
 msgctxt "field:stock.configuration,shipment_out_return_sequence:"
 msgid "Customer Return Shipment Sequence"
-msgstr "Séquence de retour d'expédition client"
+msgstr "Séquence de retour d'expédition cliente"
 
 msgctxt "field:stock.configuration,shipment_out_sequence:"
 msgid "Customer Shipment Sequence"
-msgstr "Séquence d'expéditions client"
+msgstr "Séquence d'expédition cliente"
 
 msgctxt "field:stock.configuration,write_date:"
 msgid "Write Date"
@@ -303,12 +307,12 @@ msgid "ID"
 msgstr "ID"
 
 msgctxt "field:stock.configuration.location,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom de l'enregistrement"
 
 msgctxt "field:stock.configuration.location,shipment_internal_transit:"
 msgid "Internal Shipment Transit"
-msgstr "Transit de livraison interne"
+msgstr "Transit d'expédition interne"
 
 msgctxt "field:stock.configuration.location,write_date:"
 msgid "Write Date"
@@ -339,8 +343,8 @@ msgid "Inventory Sequence"
 msgstr "Séquence d'inventaire"
 
 msgctxt "field:stock.configuration.sequence,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom de l'enregistrement"
 
 msgctxt "field:stock.configuration.sequence,shipment_in_return_sequence:"
 msgid "Supplier Return Shipment Sequence"
@@ -356,11 +360,11 @@ msgstr "Séquence d'expédition interne"
 
 msgctxt "field:stock.configuration.sequence,shipment_out_return_sequence:"
 msgid "Customer Return Shipment Sequence"
-msgstr "Séquence de retour d'expédition client"
+msgstr "Séquence de retour d'expédition cliente"
 
 msgctxt "field:stock.configuration.sequence,shipment_out_sequence:"
 msgid "Customer Shipment Sequence"
-msgstr "Séquence d'expédition client"
+msgstr "Séquence d'expédition cliente"
 
 msgctxt "field:stock.configuration.sequence,write_date:"
 msgid "Write Date"
@@ -407,8 +411,8 @@ msgid "Number"
 msgstr "Numéro"
 
 msgctxt "field:stock.inventory,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom de l'enregistrement"
 
 msgctxt "field:stock.inventory,state:"
 msgid "State"
@@ -459,8 +463,8 @@ msgid "Quantity"
 msgstr "Quantité"
 
 msgctxt "field:stock.inventory.line,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom de l'enregistrement"
 
 msgctxt "field:stock.inventory.line,unit_digits:"
 msgid "Unit Digits"
@@ -506,6 +510,10 @@ msgctxt "field:stock.location,create_uid:"
 msgid "Create User"
 msgstr "Créé par"
 
+msgctxt "field:stock.location,flat_childs:"
+msgid "Flat Children"
+msgstr "Enfants plats"
+
 msgctxt "field:stock.location,forecast_quantity:"
 msgid "Forecast Quantity"
 msgstr "Quantité prévisionnelle"
@@ -543,8 +551,8 @@ msgid "Quantity"
 msgstr "Quantité"
 
 msgctxt "field:stock.location,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom de l'enregistrement"
 
 msgctxt "field:stock.location,right:"
 msgid "Right"
@@ -587,8 +595,8 @@ msgid "Lead Time"
 msgstr "Délai de livraison"
 
 msgctxt "field:stock.location.lead_time,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom de l'enregistrement"
 
 msgctxt "field:stock.location.lead_time,sequence:"
 msgid "Sequence"
@@ -671,8 +679,8 @@ msgid "Quantity"
 msgstr "Quantité"
 
 msgctxt "field:stock.move,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom de l'enregistrement"
 
 msgctxt "field:stock.move,shipment:"
 msgid "Shipment"
@@ -735,8 +743,8 @@ msgid "ID"
 msgstr "ID"
 
 msgctxt "field:stock.period,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom de l'enregistrement"
 
 msgctxt "field:stock.period,state:"
 msgid "State"
@@ -779,8 +787,8 @@ msgid "Product"
 msgstr "Produit"
 
 msgctxt "field:stock.period.cache,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom de l'enregistrement"
 
 msgctxt "field:stock.period.cache,write_date:"
 msgid "Write Date"
@@ -811,8 +819,8 @@ msgid "Quantity"
 msgstr "Quantité"
 
 msgctxt "field:stock.product_quantities_warehouse,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom de l'enregistrement"
 
 msgctxt "field:stock.product_quantities_warehouse,write_date:"
 msgid "Write Date"
@@ -895,8 +903,8 @@ msgid "Planned Date"
 msgstr "Date planifiée"
 
 msgctxt "field:stock.shipment.in,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom de l'enregistrement"
 
 msgctxt "field:stock.shipment.in,received_by:"
 msgid "Received By"
@@ -991,8 +999,8 @@ msgid "Planned Date"
 msgstr "Date planifiée"
 
 msgctxt "field:stock.shipment.in.return,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom de l'enregistrement"
 
 msgctxt "field:stock.shipment.in.return,reference:"
 msgid "Reference"
@@ -1087,8 +1095,8 @@ msgid "Planned Start Date"
 msgstr "Date de début planifiée"
 
 msgctxt "field:stock.shipment.internal,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom de l'enregistrement"
 
 msgctxt "field:stock.shipment.internal,reference:"
 msgid "Reference"
@@ -1195,8 +1203,8 @@ msgid "Planned Date"
 msgstr "Date planifiée"
 
 msgctxt "field:stock.shipment.out,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom de l'enregistrement"
 
 msgctxt "field:stock.shipment.out,reference:"
 msgid "Reference"
@@ -1295,8 +1303,8 @@ msgid "Planned Date"
 msgstr "Date planifiée"
 
 msgctxt "field:stock.shipment.out.return,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom de l'enregistrement"
 
 msgctxt "field:stock.shipment.out.return,received_by:"
 msgid "Received By"
@@ -1364,6 +1372,10 @@ msgstr ""
 "* Une valeur vide est une date infinie dans le futur.\n"
 "* Une date dans le passé fournira des valeurs historiques."
 
+msgctxt "help:stock.location,flat_childs:"
+msgid "Check to restrict to one level of children."
+msgstr "Cocher pour restreindre à une niveau d'enfants."
+
 msgctxt "help:stock.location,picking_location:"
 msgid "If empty the Storage is used"
 msgstr "Si vide le magasin est utilisé"
@@ -1424,15 +1436,15 @@ msgstr "Retours d'expédition fournisseur"
 
 msgctxt "model:ir.action,name:act_shipment_internal_form"
 msgid "Internal Shipments"
-msgstr "Expédition interne"
+msgstr "Expéditions internes"
 
 msgctxt "model:ir.action,name:act_shipment_out_form"
 msgid "Customer Shipments"
-msgstr "Expéditions client"
+msgstr "Expéditions clientes"
 
 msgctxt "model:ir.action,name:act_shipment_out_form2"
 msgid "Customer Shipments"
-msgstr "Expéditions client"
+msgstr "Expéditions clientes"
 
 msgctxt "model:ir.action,name:act_shipment_out_form3"
 msgid "Supplier Shipments"
@@ -1480,7 +1492,7 @@ msgstr "Assigner l'expédition interne"
 
 msgctxt "model:ir.action,name:wizard_shipment_out_assign"
 msgid "Assign Shipment Out"
-msgstr "Assigner l'expédition de sortie"
+msgstr "Assigner l'expédition cliente"
 
 msgctxt "model:ir.action.act_window.domain,name:act_inventory_form_domain_all"
 msgid "All"
@@ -1633,11 +1645,11 @@ msgstr "Expédition interne"
 
 msgctxt "model:ir.sequence,name:sequence_shipment_out"
 msgid "Customer Shipment"
-msgstr "Expédition client"
+msgstr "Expédition cliente"
 
 msgctxt "model:ir.sequence,name:sequence_shipment_out_return"
 msgid "Customer Return Shipment"
-msgstr "Retours d'expédition client"
+msgstr "Retours d'expédition cliente"
 
 msgctxt "model:ir.sequence.type,name:sequence_type_inventory"
 msgid "Inventory"
@@ -1657,11 +1669,11 @@ msgstr "Expédition interne"
 
 msgctxt "model:ir.sequence.type,name:sequence_type_shipment_out"
 msgid "Customer Shipment"
-msgstr "Expédition client"
+msgstr "Expédition cliente"
 
 msgctxt "model:ir.sequence.type,name:sequence_type_shipment_out_return"
 msgid "Customer Return Shipment"
-msgstr "Retour d'expédition client"
+msgstr "Retour d'expédition cliente"
 
 msgctxt "model:ir.ui.menu,name:menu_configuration"
 msgid "Configuration"
@@ -1673,7 +1685,7 @@ msgstr "Inventaires"
 
 msgctxt "model:ir.ui.menu,name:menu_location_form"
 msgid "Locations"
-msgstr "Éditer les emplacements"
+msgstr "Emplacements"
 
 msgctxt "model:ir.ui.menu,name:menu_location_lead_time_form"
 msgid "Location Lead Times"
@@ -1709,11 +1721,11 @@ msgstr "Expéditions internes"
 
 msgctxt "model:ir.ui.menu,name:menu_shipment_out_form"
 msgid "Customer Shipments"
-msgstr "Expéditions client"
+msgstr "Expéditions clientes"
 
 msgctxt "model:ir.ui.menu,name:menu_shipment_out_return_form"
 msgid "Customer Return Shipments"
-msgstr "Retours d'expédition client"
+msgstr "Retours d'expédition cliente"
 
 msgctxt "model:ir.ui.menu,name:menu_stock"
 msgid "Inventory & Stock"
@@ -1749,7 +1761,7 @@ msgstr "Configuration des stocks"
 
 msgctxt "model:stock.configuration.location,name:"
 msgid "Stock Configuration Location"
-msgstr "Configuration de stock Emplacement"
+msgstr "Configuration des emplacements de stockage"
 
 msgctxt "model:stock.configuration.sequence,name:"
 msgid "Stock Configuration Sequence"
@@ -1765,7 +1777,7 @@ msgstr "Ligne d'inventaire de stock"
 
 msgctxt "model:stock.location,name:"
 msgid "Stock Location"
-msgstr "Lieu de Stockage"
+msgstr "Emplacement de Stockage"
 
 msgctxt "model:stock.location,name:location_customer"
 msgid "Customer"
@@ -1837,7 +1849,7 @@ msgstr "Retour d'expédition fournisseur"
 
 msgctxt "model:stock.shipment.in.return.assign.failed,name:"
 msgid "Assign Supplier Return Shipment"
-msgstr "Assigner les éxpéditions de retour fournisseur"
+msgstr "Assigner le retour d'expédition fournisseur"
 
 msgctxt "model:stock.shipment.internal,name:"
 msgid "Internal Shipment"
@@ -1849,15 +1861,15 @@ msgstr "Assigner l'expédition interne"
 
 msgctxt "model:stock.shipment.out,name:"
 msgid "Customer Shipment"
-msgstr "Expédition Client"
+msgstr "Expédition cliente"
 
 msgctxt "model:stock.shipment.out.assign.failed,name:"
 msgid "Assign Shipment Out"
-msgstr "Assigner l'expédition de sortie"
+msgstr "Assigner l'expédition cliente"
 
 msgctxt "model:stock.shipment.out.return,name:"
 msgid "Customer Return Shipment"
-msgstr "Retour d'expédition client"
+msgstr "Retour d'expédition cliente"
 
 msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "/"
diff --git a/locale/hu_HU.po b/locale/hu_HU.po
index 39589e5..8d04a22 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"
 
@@ -39,6 +39,10 @@ msgid ""
 "not support moves."
 msgstr ""
 
+msgctxt "error:stock.location:"
+msgid "The location '%(location)s' must be empty to be deactivated."
+msgstr ""
+
 msgctxt "error:stock.move:"
 msgid "Internal move quantity must be positive"
 msgstr ""
@@ -53,13 +57,13 @@ msgid "Source and destination location must be different"
 msgstr ""
 
 msgctxt "error:stock.move:"
-msgid "The stock move \"%s\" has no origin."
+msgid "The stock moves \"%s\" have no origin."
 msgstr ""
 
 msgctxt "error:stock.move:"
 msgid ""
-"You can not delete stock move \"%s\" because it is not in draft or cancelled"
-" state."
+"You can not delete stock move \"%s\" because it is not in staging, draft nor"
+" cancelled state."
 msgstr ""
 
 msgctxt "error:stock.move:"
@@ -167,10 +171,9 @@ msgctxt "field:party.party.location,party:"
 msgid "Party"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:party.party.location,rec_name:"
-msgid "Name"
-msgstr "Név"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:party.party.location,supplier_location:"
 msgid "Supplier Location"
@@ -246,10 +249,9 @@ msgctxt "field:stock.configuration,inventory_sequence:"
 msgid "Inventory Sequence"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.configuration,rec_name:"
-msgid "Name"
-msgstr "Név"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.configuration,shipment_in_return_sequence:"
 msgid "Supplier Return Shipment Sequence"
@@ -300,10 +302,9 @@ msgctxt "field:stock.configuration.location,id:"
 msgid "ID"
 msgstr "ID"
 
-#, fuzzy
 msgctxt "field:stock.configuration.location,rec_name:"
-msgid "Name"
-msgstr "Név"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.configuration.location,shipment_internal_transit:"
 msgid "Internal Shipment Transit"
@@ -343,10 +344,9 @@ msgctxt "field:stock.configuration.sequence,inventory_sequence:"
 msgid "Inventory Sequence"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.configuration.sequence,rec_name:"
-msgid "Name"
-msgstr "Név"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.configuration.sequence,shipment_in_return_sequence:"
 msgid "Supplier Return Shipment Sequence"
@@ -423,10 +423,9 @@ msgctxt "field:stock.inventory,number:"
 msgid "Number"
 msgstr "Szám"
 
-#, fuzzy
 msgctxt "field:stock.inventory,rec_name:"
-msgid "Name"
-msgstr "Név"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:stock.inventory,state:"
@@ -485,10 +484,9 @@ msgctxt "field:stock.inventory.line,quantity:"
 msgid "Quantity"
 msgstr "Mennyiség"
 
-#, fuzzy
 msgctxt "field:stock.inventory.line,rec_name:"
-msgid "Name"
-msgstr "Név"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:stock.inventory.line,unit_digits:"
@@ -544,6 +542,10 @@ msgctxt "field:stock.location,create_uid:"
 msgid "Create User"
 msgstr "Által létrehozva "
 
+msgctxt "field:stock.location,flat_childs:"
+msgid "Flat Children"
+msgstr ""
+
 #, fuzzy
 msgctxt "field:stock.location,forecast_quantity:"
 msgid "Forecast Quantity"
@@ -585,10 +587,9 @@ msgctxt "field:stock.location,quantity:"
 msgid "Quantity"
 msgstr "Mennyiség"
 
-#, fuzzy
 msgctxt "field:stock.location,rec_name:"
-msgid "Name"
-msgstr "Név"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.location,right:"
 msgid "Right"
@@ -637,10 +638,9 @@ msgctxt "field:stock.location.lead_time,lead_time:"
 msgid "Lead Time"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.location.lead_time,rec_name:"
-msgid "Name"
-msgstr "Név"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:stock.location.lead_time,sequence:"
@@ -737,10 +737,9 @@ msgctxt "field:stock.move,quantity:"
 msgid "Quantity"
 msgstr "Mennyiség"
 
-#, fuzzy
 msgctxt "field:stock.move,rec_name:"
-msgid "Name"
-msgstr "Név"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:stock.move,shipment:"
@@ -813,10 +812,9 @@ msgctxt "field:stock.period,id:"
 msgid "ID"
 msgstr "ID"
 
-#, fuzzy
 msgctxt "field:stock.period,rec_name:"
-msgid "Name"
-msgstr "Név"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:stock.period,state:"
@@ -868,10 +866,9 @@ msgctxt "field:stock.period.cache,product:"
 msgid "Product"
 msgstr "Termék"
 
-#, fuzzy
 msgctxt "field:stock.period.cache,rec_name:"
-msgid "Name"
-msgstr "Név"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:stock.period.cache,write_date:"
@@ -908,10 +905,9 @@ msgctxt "field:stock.product_quantities_warehouse,quantity:"
 msgid "Quantity"
 msgstr "Mennyiség"
 
-#, fuzzy
 msgctxt "field:stock.product_quantities_warehouse,rec_name:"
-msgid "Name"
-msgstr "Név"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:stock.product_quantities_warehouse,write_date:"
@@ -1004,10 +1000,9 @@ msgctxt "field:stock.shipment.in,planned_date:"
 msgid "Planned Date"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.shipment.in,rec_name:"
-msgid "Name"
-msgstr "Név"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.shipment.in,received_by:"
 msgid "Received By"
@@ -1112,10 +1107,9 @@ msgctxt "field:stock.shipment.in.return,planned_date:"
 msgid "Planned Date"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.shipment.in.return,rec_name:"
-msgid "Name"
-msgstr "Név"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.shipment.in.return,reference:"
 msgid "Reference"
@@ -1221,10 +1215,9 @@ msgctxt "field:stock.shipment.internal,planned_start_date:"
 msgid "Planned Start Date"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.shipment.internal,rec_name:"
-msgid "Name"
-msgstr "Név"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.shipment.internal,reference:"
 msgid "Reference"
@@ -1342,10 +1335,9 @@ msgctxt "field:stock.shipment.out,planned_date:"
 msgid "Planned Date"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.shipment.out,rec_name:"
-msgid "Name"
-msgstr "Név"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.shipment.out,reference:"
 msgid "Reference"
@@ -1455,10 +1447,9 @@ msgctxt "field:stock.shipment.out.return,planned_date:"
 msgid "Planned Date"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.shipment.out.return,rec_name:"
-msgid "Name"
-msgstr "Név"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.shipment.out.return,received_by:"
 msgid "Received By"
@@ -1519,6 +1510,10 @@ msgid ""
 "* A date in the past will provide historical values."
 msgstr ""
 
+msgctxt "help:stock.location,flat_childs:"
+msgid "Check to restrict to one level of children."
+msgstr ""
+
 msgctxt "help:stock.location,picking_location:"
 msgid "If empty the Storage is used"
 msgstr ""
diff --git a/locale/it_IT.po b/locale/it_IT.po
index 6f91c64..d577029 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"
 
@@ -35,6 +35,10 @@ msgid ""
 "not support moves."
 msgstr ""
 
+msgctxt "error:stock.location:"
+msgid "The location '%(location)s' must be empty to be deactivated."
+msgstr ""
+
 msgctxt "error:stock.move:"
 msgid "Internal move quantity must be positive"
 msgstr ""
@@ -48,13 +52,13 @@ msgid "Source and destination location must be different"
 msgstr ""
 
 msgctxt "error:stock.move:"
-msgid "The stock move \"%s\" has no origin."
+msgid "The stock moves \"%s\" have no origin."
 msgstr ""
 
 msgctxt "error:stock.move:"
 msgid ""
-"You can not delete stock move \"%s\" because it is not in draft or cancelled"
-" state."
+"You can not delete stock move \"%s\" because it is not in staging, draft nor"
+" cancelled state."
 msgstr ""
 
 msgctxt "error:stock.move:"
@@ -162,10 +166,9 @@ msgctxt "field:party.party.location,party:"
 msgid "Party"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:party.party.location,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:party.party.location,supplier_location:"
 msgid "Supplier Location"
@@ -239,10 +242,9 @@ msgctxt "field:stock.configuration,inventory_sequence:"
 msgid "Inventory Sequence"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.configuration,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.configuration,shipment_in_return_sequence:"
 msgid "Supplier Return Shipment Sequence"
@@ -293,10 +295,9 @@ msgctxt "field:stock.configuration.location,id:"
 msgid "ID"
 msgstr "Movimento contabile"
 
-#, fuzzy
 msgctxt "field:stock.configuration.location,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.configuration.location,shipment_internal_transit:"
 msgid "Internal Shipment Transit"
@@ -336,10 +337,9 @@ msgctxt "field:stock.configuration.sequence,inventory_sequence:"
 msgid "Inventory Sequence"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.configuration.sequence,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.configuration.sequence,shipment_in_return_sequence:"
 msgid "Supplier Return Shipment Sequence"
@@ -415,10 +415,9 @@ msgctxt "field:stock.inventory,number:"
 msgid "Number"
 msgstr "Numero"
 
-#, fuzzy
 msgctxt "field:stock.inventory,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:stock.inventory,state:"
@@ -477,10 +476,9 @@ msgctxt "field:stock.inventory.line,quantity:"
 msgid "Quantity"
 msgstr "Quantità"
 
-#, fuzzy
 msgctxt "field:stock.inventory.line,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:stock.inventory.line,unit_digits:"
@@ -535,6 +533,10 @@ msgctxt "field:stock.location,create_uid:"
 msgid "Create User"
 msgstr "Utente creazione"
 
+msgctxt "field:stock.location,flat_childs:"
+msgid "Flat Children"
+msgstr ""
+
 msgctxt "field:stock.location,forecast_quantity:"
 msgid "Forecast Quantity"
 msgstr ""
@@ -576,10 +578,9 @@ msgctxt "field:stock.location,quantity:"
 msgid "Quantity"
 msgstr "Quantità"
 
-#, fuzzy
 msgctxt "field:stock.location,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:stock.location,right:"
@@ -627,10 +628,9 @@ msgctxt "field:stock.location.lead_time,lead_time:"
 msgid "Lead Time"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.location.lead_time,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:stock.location.lead_time,sequence:"
@@ -725,10 +725,9 @@ msgctxt "field:stock.move,quantity:"
 msgid "Quantity"
 msgstr "Quantità"
 
-#, fuzzy
 msgctxt "field:stock.move,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.move,shipment:"
 msgid "Shipment"
@@ -800,10 +799,9 @@ msgctxt "field:stock.period,id:"
 msgid "ID"
 msgstr "Movimento contabile"
 
-#, fuzzy
 msgctxt "field:stock.period,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:stock.period,state:"
@@ -854,10 +852,9 @@ msgctxt "field:stock.period.cache,product:"
 msgid "Product"
 msgstr "Prodotto"
 
-#, fuzzy
 msgctxt "field:stock.period.cache,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:stock.period.cache,write_date:"
@@ -894,10 +891,9 @@ msgctxt "field:stock.product_quantities_warehouse,quantity:"
 msgid "Quantity"
 msgstr "Quantità"
 
-#, fuzzy
 msgctxt "field:stock.product_quantities_warehouse,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:stock.product_quantities_warehouse,write_date:"
@@ -991,10 +987,9 @@ msgctxt "field:stock.shipment.in,planned_date:"
 msgid "Planned Date"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.shipment.in,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.shipment.in,received_by:"
 msgid "Received By"
@@ -1101,10 +1096,9 @@ msgctxt "field:stock.shipment.in.return,planned_date:"
 msgid "Planned Date"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.shipment.in.return,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:stock.shipment.in.return,reference:"
@@ -1212,10 +1206,9 @@ msgctxt "field:stock.shipment.internal,planned_start_date:"
 msgid "Planned Start Date"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.shipment.internal,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:stock.shipment.internal,reference:"
@@ -1336,10 +1329,9 @@ msgctxt "field:stock.shipment.out,planned_date:"
 msgid "Planned Date"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.shipment.out,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:stock.shipment.out,reference:"
@@ -1451,10 +1443,9 @@ msgctxt "field:stock.shipment.out.return,planned_date:"
 msgid "Planned Date"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.shipment.out.return,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.shipment.out.return,received_by:"
 msgid "Received By"
@@ -1515,6 +1506,10 @@ msgid ""
 "* A date in the past will provide historical values."
 msgstr ""
 
+msgctxt "help:stock.location,flat_childs:"
+msgid "Check to restrict to one level of children."
+msgstr ""
+
 msgctxt "help:stock.location,picking_location:"
 msgid "If empty the Storage is used"
 msgstr ""
diff --git a/locale/ja_JP.po b/locale/ja_JP.po
index 572b6ef..9d0d9db 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"
 
@@ -35,6 +35,10 @@ msgid ""
 "not support moves."
 msgstr ""
 
+msgctxt "error:stock.location:"
+msgid "The location '%(location)s' must be empty to be deactivated."
+msgstr ""
+
 msgctxt "error:stock.move:"
 msgid "Internal move quantity must be positive"
 msgstr ""
@@ -48,13 +52,13 @@ msgid "Source and destination location must be different"
 msgstr ""
 
 msgctxt "error:stock.move:"
-msgid "The stock move \"%s\" has no origin."
+msgid "The stock moves \"%s\" have no origin."
 msgstr ""
 
 msgctxt "error:stock.move:"
 msgid ""
-"You can not delete stock move \"%s\" because it is not in draft or cancelled"
-" state."
+"You can not delete stock move \"%s\" because it is not in staging, draft nor"
+" cancelled state."
 msgstr ""
 
 msgctxt "error:stock.move:"
@@ -160,7 +164,7 @@ msgid "Party"
 msgstr ""
 
 msgctxt "field:party.party.location,rec_name:"
-msgid "Name"
+msgid "Record Name"
 msgstr ""
 
 msgctxt "field:party.party.location,supplier_location:"
@@ -228,7 +232,7 @@ msgid "Inventory Sequence"
 msgstr ""
 
 msgctxt "field:stock.configuration,rec_name:"
-msgid "Name"
+msgid "Record Name"
 msgstr ""
 
 msgctxt "field:stock.configuration,shipment_in_return_sequence:"
@@ -276,7 +280,7 @@ msgid "ID"
 msgstr ""
 
 msgctxt "field:stock.configuration.location,rec_name:"
-msgid "Name"
+msgid "Record Name"
 msgstr ""
 
 msgctxt "field:stock.configuration.location,shipment_internal_transit:"
@@ -312,7 +316,7 @@ msgid "Inventory Sequence"
 msgstr ""
 
 msgctxt "field:stock.configuration.sequence,rec_name:"
-msgid "Name"
+msgid "Record Name"
 msgstr ""
 
 msgctxt "field:stock.configuration.sequence,shipment_in_return_sequence:"
@@ -382,7 +386,7 @@ msgid "Number"
 msgstr ""
 
 msgctxt "field:stock.inventory,rec_name:"
-msgid "Name"
+msgid "Record Name"
 msgstr ""
 
 msgctxt "field:stock.inventory,state:"
@@ -437,7 +441,7 @@ msgid "Quantity"
 msgstr ""
 
 msgctxt "field:stock.inventory.line,rec_name:"
-msgid "Name"
+msgid "Record Name"
 msgstr ""
 
 msgctxt "field:stock.inventory.line,unit_digits:"
@@ -484,6 +488,10 @@ msgctxt "field:stock.location,create_uid:"
 msgid "Create User"
 msgstr ""
 
+msgctxt "field:stock.location,flat_childs:"
+msgid "Flat Children"
+msgstr ""
+
 msgctxt "field:stock.location,forecast_quantity:"
 msgid "Forecast Quantity"
 msgstr ""
@@ -521,7 +529,7 @@ msgid "Quantity"
 msgstr ""
 
 msgctxt "field:stock.location,rec_name:"
-msgid "Name"
+msgid "Record Name"
 msgstr ""
 
 msgctxt "field:stock.location,right:"
@@ -566,7 +574,7 @@ msgid "Lead Time"
 msgstr ""
 
 msgctxt "field:stock.location.lead_time,rec_name:"
-msgid "Name"
+msgid "Record Name"
 msgstr ""
 
 msgctxt "field:stock.location.lead_time,sequence:"
@@ -653,7 +661,7 @@ msgid "Quantity"
 msgstr ""
 
 msgctxt "field:stock.move,rec_name:"
-msgid "Name"
+msgid "Record Name"
 msgstr ""
 
 msgctxt "field:stock.move,shipment:"
@@ -717,7 +725,7 @@ msgid "ID"
 msgstr ""
 
 msgctxt "field:stock.period,rec_name:"
-msgid "Name"
+msgid "Record Name"
 msgstr ""
 
 msgctxt "field:stock.period,state:"
@@ -764,7 +772,7 @@ msgid "Product"
 msgstr "Products"
 
 msgctxt "field:stock.period.cache,rec_name:"
-msgid "Name"
+msgid "Record Name"
 msgstr ""
 
 msgctxt "field:stock.period.cache,write_date:"
@@ -796,7 +804,7 @@ msgid "Quantity"
 msgstr ""
 
 msgctxt "field:stock.product_quantities_warehouse,rec_name:"
-msgid "Name"
+msgid "Record Name"
 msgstr ""
 
 msgctxt "field:stock.product_quantities_warehouse,write_date:"
@@ -882,7 +890,7 @@ msgid "Planned Date"
 msgstr ""
 
 msgctxt "field:stock.shipment.in,rec_name:"
-msgid "Name"
+msgid "Record Name"
 msgstr ""
 
 msgctxt "field:stock.shipment.in,received_by:"
@@ -981,7 +989,7 @@ msgid "Planned Date"
 msgstr ""
 
 msgctxt "field:stock.shipment.in.return,rec_name:"
-msgid "Name"
+msgid "Record Name"
 msgstr ""
 
 msgctxt "field:stock.shipment.in.return,reference:"
@@ -1080,7 +1088,7 @@ msgid "Planned Start Date"
 msgstr ""
 
 msgctxt "field:stock.shipment.internal,rec_name:"
-msgid "Name"
+msgid "Record Name"
 msgstr ""
 
 msgctxt "field:stock.shipment.internal,reference:"
@@ -1191,7 +1199,7 @@ msgid "Planned Date"
 msgstr ""
 
 msgctxt "field:stock.shipment.out,rec_name:"
-msgid "Name"
+msgid "Record Name"
 msgstr ""
 
 msgctxt "field:stock.shipment.out,reference:"
@@ -1294,7 +1302,7 @@ msgid "Planned Date"
 msgstr ""
 
 msgctxt "field:stock.shipment.out.return,rec_name:"
-msgid "Name"
+msgid "Record Name"
 msgstr ""
 
 msgctxt "field:stock.shipment.out.return,received_by:"
@@ -1353,6 +1361,10 @@ msgid ""
 "* A date in the past will provide historical values."
 msgstr ""
 
+msgctxt "help:stock.location,flat_childs:"
+msgid "Check to restrict to one level of children."
+msgstr ""
+
 msgctxt "help:stock.location,picking_location:"
 msgid "If empty the Storage is used"
 msgstr ""
diff --git a/locale/lo.po b/locale/lo.po
index de5d4e8..da0554e 100644
--- a/locale/lo.po
+++ b/locale/lo.po
@@ -1,4 +1,4 @@
-# 
+#
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
@@ -35,6 +35,10 @@ msgid ""
 "not support moves."
 msgstr ""
 
+msgctxt "error:stock.location:"
+msgid "The location '%(location)s' must be empty to be deactivated."
+msgstr ""
+
 msgctxt "error:stock.move:"
 msgid "Internal move quantity must be positive"
 msgstr ""
@@ -48,13 +52,13 @@ msgid "Source and destination location must be different"
 msgstr ""
 
 msgctxt "error:stock.move:"
-msgid "The stock move \"%s\" has no origin."
+msgid "The stock moves \"%s\" have no origin."
 msgstr ""
 
 msgctxt "error:stock.move:"
 msgid ""
-"You can not delete stock move \"%s\" because it is not in draft or cancelled"
-" state."
+"You can not delete stock move \"%s\" because it is not in staging, draft nor"
+" cancelled state."
 msgstr ""
 
 msgctxt "error:stock.move:"
@@ -162,10 +166,9 @@ msgctxt "field:party.party.location,party:"
 msgid "Party"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:party.party.location,rec_name:"
-msgid "Name"
-msgstr "ຊື່"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:party.party.location,supplier_location:"
 msgid "Supplier Location"
@@ -239,10 +242,9 @@ msgctxt "field:stock.configuration,inventory_sequence:"
 msgid "Inventory Sequence"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.configuration,rec_name:"
-msgid "Name"
-msgstr "ຊື່"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.configuration,shipment_in_return_sequence:"
 msgid "Supplier Return Shipment Sequence"
@@ -293,10 +295,9 @@ msgctxt "field:stock.configuration.location,id:"
 msgid "ID"
 msgstr "ເລດລຳດັບ"
 
-#, fuzzy
 msgctxt "field:stock.configuration.location,rec_name:"
-msgid "Name"
-msgstr "ຊື່"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.configuration.location,shipment_internal_transit:"
 msgid "Internal Shipment Transit"
@@ -336,10 +337,9 @@ msgctxt "field:stock.configuration.sequence,inventory_sequence:"
 msgid "Inventory Sequence"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.configuration.sequence,rec_name:"
-msgid "Name"
-msgstr "ຊື່"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.configuration.sequence,shipment_in_return_sequence:"
 msgid "Supplier Return Shipment Sequence"
@@ -416,10 +416,9 @@ msgctxt "field:stock.inventory,number:"
 msgid "Number"
 msgstr "ເລກທີ"
 
-#, fuzzy
 msgctxt "field:stock.inventory,rec_name:"
-msgid "Name"
-msgstr "ຊື່"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:stock.inventory,state:"
@@ -476,10 +475,9 @@ msgctxt "field:stock.inventory.line,quantity:"
 msgid "Quantity"
 msgstr "ຈຳນວນ"
 
-#, fuzzy
 msgctxt "field:stock.inventory.line,rec_name:"
-msgid "Name"
-msgstr "ຊື່"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:stock.inventory.line,unit_digits:"
@@ -534,6 +532,10 @@ msgctxt "field:stock.location,create_uid:"
 msgid "Create User"
 msgstr "ສ້າງຜູ້ໃຊ້ງານ"
 
+msgctxt "field:stock.location,flat_childs:"
+msgid "Flat Children"
+msgstr ""
+
 msgctxt "field:stock.location,forecast_quantity:"
 msgid "Forecast Quantity"
 msgstr ""
@@ -574,10 +576,9 @@ msgctxt "field:stock.location,quantity:"
 msgid "Quantity"
 msgstr "ຈຳນວນ"
 
-#, fuzzy
 msgctxt "field:stock.location,rec_name:"
-msgid "Name"
-msgstr "ຊື່"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.location,right:"
 msgid "Right"
@@ -625,10 +626,9 @@ msgctxt "field:stock.location.lead_time,lead_time:"
 msgid "Lead Time"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.location.lead_time,rec_name:"
-msgid "Name"
-msgstr "ຊື່"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:stock.location.lead_time,sequence:"
@@ -724,10 +724,9 @@ msgctxt "field:stock.move,quantity:"
 msgid "Quantity"
 msgstr "ຈຳນວນ"
 
-#, fuzzy
 msgctxt "field:stock.move,rec_name:"
-msgid "Name"
-msgstr "ຊື່"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.move,shipment:"
 msgid "Shipment"
@@ -796,8 +795,8 @@ msgid "ID"
 msgstr "ເລກປະຈຳໂຕ"
 
 msgctxt "field:stock.period,rec_name:"
-msgid "Name"
-msgstr "ຊື່"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.period,state:"
 msgid "State"
@@ -845,10 +844,9 @@ msgctxt "field:stock.period.cache,product:"
 msgid "Product"
 msgstr "ຜະລິດຕະພັນ"
 
-#, fuzzy
 msgctxt "field:stock.period.cache,rec_name:"
-msgid "Name"
-msgstr "ຊື່"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:stock.period.cache,write_date:"
@@ -884,10 +882,9 @@ msgctxt "field:stock.product_quantities_warehouse,quantity:"
 msgid "Quantity"
 msgstr "ຈຳນວນ"
 
-#, fuzzy
 msgctxt "field:stock.product_quantities_warehouse,rec_name:"
-msgid "Name"
-msgstr "ຊື່"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:stock.product_quantities_warehouse,write_date:"
@@ -980,10 +977,9 @@ msgctxt "field:stock.shipment.in,planned_date:"
 msgid "Planned Date"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.shipment.in,rec_name:"
-msgid "Name"
-msgstr "ຊື່"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.shipment.in,received_by:"
 msgid "Received By"
@@ -1090,10 +1086,9 @@ msgctxt "field:stock.shipment.in.return,planned_date:"
 msgid "Planned Date"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.shipment.in.return,rec_name:"
-msgid "Name"
-msgstr "ຊື່"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:stock.shipment.in.return,reference:"
@@ -1201,10 +1196,9 @@ msgctxt "field:stock.shipment.internal,planned_start_date:"
 msgid "Planned Start Date"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.shipment.internal,rec_name:"
-msgid "Name"
-msgstr "ຊື່"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:stock.shipment.internal,reference:"
@@ -1324,10 +1318,9 @@ msgctxt "field:stock.shipment.out,planned_date:"
 msgid "Planned Date"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.shipment.out,rec_name:"
-msgid "Name"
-msgstr "ຊື່"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:stock.shipment.out,reference:"
@@ -1438,10 +1431,9 @@ msgctxt "field:stock.shipment.out.return,planned_date:"
 msgid "Planned Date"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.shipment.out.return,rec_name:"
-msgid "Name"
-msgstr "ຊື່"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.shipment.out.return,received_by:"
 msgid "Received By"
@@ -1502,6 +1494,10 @@ msgid ""
 "* A date in the past will provide historical values."
 msgstr ""
 
+msgctxt "help:stock.location,flat_childs:"
+msgid "Check to restrict to one level of children."
+msgstr ""
+
 msgctxt "help:stock.location,picking_location:"
 msgid "If empty the Storage is used"
 msgstr ""
diff --git a/locale/lt.po b/locale/lt.po
index c8ff490..d36ed11 100644
--- a/locale/lt.po
+++ b/locale/lt.po
@@ -1,4 +1,4 @@
-# 
+#
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
@@ -35,6 +35,10 @@ msgid ""
 "not support moves."
 msgstr ""
 
+msgctxt "error:stock.location:"
+msgid "The location '%(location)s' must be empty to be deactivated."
+msgstr ""
+
 msgctxt "error:stock.move:"
 msgid "Internal move quantity must be positive"
 msgstr ""
@@ -48,13 +52,13 @@ msgid "Source and destination location must be different"
 msgstr ""
 
 msgctxt "error:stock.move:"
-msgid "The stock move \"%s\" has no origin."
+msgid "The stock moves \"%s\" have no origin."
 msgstr ""
 
 msgctxt "error:stock.move:"
 msgid ""
-"You can not delete stock move \"%s\" because it is not in draft or cancelled"
-" state."
+"You can not delete stock move \"%s\" because it is not in staging, draft nor"
+" cancelled state."
 msgstr ""
 
 msgctxt "error:stock.move:"
@@ -158,10 +162,9 @@ msgctxt "field:party.party.location,party:"
 msgid "Party"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:party.party.location,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:party.party.location,supplier_location:"
 msgid "Supplier Location"
@@ -227,10 +230,9 @@ msgctxt "field:stock.configuration,inventory_sequence:"
 msgid "Inventory Sequence"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.configuration,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.configuration,shipment_in_return_sequence:"
 msgid "Supplier Return Shipment Sequence"
@@ -276,10 +278,9 @@ msgctxt "field:stock.configuration.location,id:"
 msgid "ID"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.configuration.location,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.configuration.location,shipment_internal_transit:"
 msgid "Internal Shipment Transit"
@@ -313,10 +314,9 @@ msgctxt "field:stock.configuration.sequence,inventory_sequence:"
 msgid "Inventory Sequence"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.configuration.sequence,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.configuration.sequence,shipment_in_return_sequence:"
 msgid "Supplier Return Shipment Sequence"
@@ -382,10 +382,9 @@ msgctxt "field:stock.inventory,number:"
 msgid "Number"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.inventory,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.inventory,state:"
 msgid "State"
@@ -435,10 +434,9 @@ msgctxt "field:stock.inventory.line,quantity:"
 msgid "Quantity"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.inventory.line,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.inventory.line,unit_digits:"
 msgid "Unit Digits"
@@ -484,6 +482,10 @@ msgctxt "field:stock.location,create_uid:"
 msgid "Create User"
 msgstr ""
 
+msgctxt "field:stock.location,flat_childs:"
+msgid "Flat Children"
+msgstr ""
+
 msgctxt "field:stock.location,forecast_quantity:"
 msgid "Forecast Quantity"
 msgstr ""
@@ -521,10 +523,9 @@ msgctxt "field:stock.location,quantity:"
 msgid "Quantity"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.location,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.location,right:"
 msgid "Right"
@@ -566,10 +567,9 @@ msgctxt "field:stock.location.lead_time,lead_time:"
 msgid "Lead Time"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.location.lead_time,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.location.lead_time,sequence:"
 msgid "Sequence"
@@ -651,10 +651,9 @@ msgctxt "field:stock.move,quantity:"
 msgid "Quantity"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.move,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.move,shipment:"
 msgid "Shipment"
@@ -716,10 +715,9 @@ msgctxt "field:stock.period,id:"
 msgid "ID"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.period,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.period,state:"
 msgid "State"
@@ -761,10 +759,9 @@ msgctxt "field:stock.period.cache,product:"
 msgid "Product"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.period.cache,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.period.cache,write_date:"
 msgid "Write Date"
@@ -794,10 +791,9 @@ msgctxt "field:stock.product_quantities_warehouse,quantity:"
 msgid "Quantity"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.product_quantities_warehouse,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.product_quantities_warehouse,write_date:"
 msgid "Write Date"
@@ -879,10 +875,9 @@ msgctxt "field:stock.shipment.in,planned_date:"
 msgid "Planned Date"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.shipment.in,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.shipment.in,received_by:"
 msgid "Received By"
@@ -976,10 +971,9 @@ msgctxt "field:stock.shipment.in.return,planned_date:"
 msgid "Planned Date"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.shipment.in.return,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.shipment.in.return,reference:"
 msgid "Reference"
@@ -1073,10 +1067,9 @@ msgctxt "field:stock.shipment.internal,planned_start_date:"
 msgid "Planned Start Date"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.shipment.internal,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.shipment.internal,reference:"
 msgid "Reference"
@@ -1182,10 +1175,9 @@ msgctxt "field:stock.shipment.out,planned_date:"
 msgid "Planned Date"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.shipment.out,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.shipment.out,reference:"
 msgid "Reference"
@@ -1283,10 +1275,9 @@ msgctxt "field:stock.shipment.out.return,planned_date:"
 msgid "Planned Date"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.shipment.out.return,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.shipment.out.return,received_by:"
 msgid "Received By"
@@ -1343,6 +1334,10 @@ msgid ""
 "* A date in the past will provide historical values."
 msgstr ""
 
+msgctxt "help:stock.location,flat_childs:"
+msgid "Check to restrict to one level of children."
+msgstr ""
+
 msgctxt "help:stock.location,picking_location:"
 msgid "If empty the Storage is used"
 msgstr ""
diff --git a/locale/nl.po b/locale/nl.po
index 6d4310f..ca44da4 100644
--- a/locale/nl.po
+++ b/locale/nl.po
@@ -1,4 +1,4 @@
-# 
+#
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
@@ -35,6 +35,10 @@ msgid ""
 "not support moves."
 msgstr ""
 
+msgctxt "error:stock.location:"
+msgid "The location '%(location)s' must be empty to be deactivated."
+msgstr ""
+
 msgctxt "error:stock.move:"
 msgid "Internal move quantity must be positive"
 msgstr ""
@@ -48,13 +52,13 @@ msgid "Source and destination location must be different"
 msgstr ""
 
 msgctxt "error:stock.move:"
-msgid "The stock move \"%s\" has no origin."
+msgid "The stock moves \"%s\" have no origin."
 msgstr ""
 
 msgctxt "error:stock.move:"
 msgid ""
-"You can not delete stock move \"%s\" because it is not in draft or cancelled"
-" state."
+"You can not delete stock move \"%s\" because it is not in staging, draft nor"
+" cancelled state."
 msgstr ""
 
 msgctxt "error:stock.move:"
@@ -161,10 +165,9 @@ msgctxt "field:party.party.location,party:"
 msgid "Party"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:party.party.location,rec_name:"
-msgid "Name"
-msgstr "Naam bijlage"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:party.party.location,supplier_location:"
 msgid "Supplier Location"
@@ -238,10 +241,9 @@ msgctxt "field:stock.configuration,inventory_sequence:"
 msgid "Inventory Sequence"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.configuration,rec_name:"
-msgid "Name"
-msgstr "Naam bijlage"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.configuration,shipment_in_return_sequence:"
 msgid "Supplier Return Shipment Sequence"
@@ -292,10 +294,9 @@ msgctxt "field:stock.configuration.location,id:"
 msgid "ID"
 msgstr "ID"
 
-#, fuzzy
 msgctxt "field:stock.configuration.location,rec_name:"
-msgid "Name"
-msgstr "Naam bijlage"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.configuration.location,shipment_internal_transit:"
 msgid "Internal Shipment Transit"
@@ -335,10 +336,9 @@ msgctxt "field:stock.configuration.sequence,inventory_sequence:"
 msgid "Inventory Sequence"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.configuration.sequence,rec_name:"
-msgid "Name"
-msgstr "Naam bijlage"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.configuration.sequence,shipment_in_return_sequence:"
 msgid "Supplier Return Shipment Sequence"
@@ -413,10 +413,9 @@ msgctxt "field:stock.inventory,number:"
 msgid "Number"
 msgstr "Nummer"
 
-#, fuzzy
 msgctxt "field:stock.inventory,rec_name:"
-msgid "Name"
-msgstr "Naam bijlage"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:stock.inventory,state:"
@@ -475,10 +474,9 @@ msgctxt "field:stock.inventory.line,quantity:"
 msgid "Quantity"
 msgstr "Hoeveelheid"
 
-#, fuzzy
 msgctxt "field:stock.inventory.line,rec_name:"
-msgid "Name"
-msgstr "Naam bijlage"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:stock.inventory.line,unit_digits:"
@@ -533,6 +531,10 @@ msgctxt "field:stock.location,create_uid:"
 msgid "Create User"
 msgstr "Gebruiker"
 
+msgctxt "field:stock.location,flat_childs:"
+msgid "Flat Children"
+msgstr ""
+
 msgctxt "field:stock.location,forecast_quantity:"
 msgid "Forecast Quantity"
 msgstr ""
@@ -574,10 +576,9 @@ msgctxt "field:stock.location,quantity:"
 msgid "Quantity"
 msgstr "Hoeveelheid"
 
-#, fuzzy
 msgctxt "field:stock.location,rec_name:"
-msgid "Name"
-msgstr "Naam bijlage"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:stock.location,right:"
@@ -626,10 +627,9 @@ msgctxt "field:stock.location.lead_time,lead_time:"
 msgid "Lead Time"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.location.lead_time,rec_name:"
-msgid "Name"
-msgstr "Naam bijlage"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:stock.location.lead_time,sequence:"
@@ -726,10 +726,9 @@ msgctxt "field:stock.move,quantity:"
 msgid "Quantity"
 msgstr "Hoeveelheid"
 
-#, fuzzy
 msgctxt "field:stock.move,rec_name:"
-msgid "Name"
-msgstr "Naam bijlage"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:stock.move,shipment:"
@@ -802,10 +801,9 @@ msgctxt "field:stock.period,id:"
 msgid "ID"
 msgstr "ID"
 
-#, fuzzy
 msgctxt "field:stock.period,rec_name:"
-msgid "Name"
-msgstr "Naam bijlage"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:stock.period,state:"
@@ -855,10 +853,9 @@ msgctxt "field:stock.period.cache,product:"
 msgid "Product"
 msgstr "Producten"
 
-#, fuzzy
 msgctxt "field:stock.period.cache,rec_name:"
-msgid "Name"
-msgstr "Naam bijlage"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:stock.period.cache,write_date:"
@@ -895,10 +892,9 @@ msgctxt "field:stock.product_quantities_warehouse,quantity:"
 msgid "Quantity"
 msgstr "Hoeveelheid"
 
-#, fuzzy
 msgctxt "field:stock.product_quantities_warehouse,rec_name:"
-msgid "Name"
-msgstr "Naam bijlage"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:stock.product_quantities_warehouse,write_date:"
@@ -993,10 +989,9 @@ msgctxt "field:stock.shipment.in,planned_date:"
 msgid "Planned Date"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.shipment.in,rec_name:"
-msgid "Name"
-msgstr "Naam bijlage"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.shipment.in,received_by:"
 msgid "Received By"
@@ -1104,10 +1099,9 @@ msgctxt "field:stock.shipment.in.return,planned_date:"
 msgid "Planned Date"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.shipment.in.return,rec_name:"
-msgid "Name"
-msgstr "Naam bijlage"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:stock.shipment.in.return,reference:"
@@ -1215,10 +1209,9 @@ msgctxt "field:stock.shipment.internal,planned_start_date:"
 msgid "Planned Start Date"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.shipment.internal,rec_name:"
-msgid "Name"
-msgstr "Naam bijlage"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:stock.shipment.internal,reference:"
@@ -1339,10 +1332,9 @@ msgctxt "field:stock.shipment.out,planned_date:"
 msgid "Planned Date"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.shipment.out,rec_name:"
-msgid "Name"
-msgstr "Naam bijlage"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:stock.shipment.out,reference:"
@@ -1455,10 +1447,9 @@ msgctxt "field:stock.shipment.out.return,planned_date:"
 msgid "Planned Date"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.shipment.out.return,rec_name:"
-msgid "Name"
-msgstr "Naam bijlage"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.shipment.out.return,received_by:"
 msgid "Received By"
@@ -1520,6 +1511,10 @@ msgid ""
 "* A date in the past will provide historical values."
 msgstr ""
 
+msgctxt "help:stock.location,flat_childs:"
+msgid "Check to restrict to one level of children."
+msgstr ""
+
 msgctxt "help:stock.location,picking_location:"
 msgid "If empty the Storage is used"
 msgstr ""
diff --git a/locale/pl.po b/locale/pl.po
index 4799765..28ef51a 100644
--- a/locale/pl.po
+++ b/locale/pl.po
@@ -1,4 +1,4 @@
-# 
+#
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
@@ -7,11 +7,13 @@ msgid ""
 "You cannot change the default uom for a product which is associated to stock"
 " moves."
 msgstr ""
+"Brak możliwości zmiany domyślnej jednostki miary dla produktu wykazującego "
+"ruch."
 
 msgctxt "error:product.template:"
 msgid ""
 "You cannot change the type for a product which is associated to stock moves."
-msgstr ""
+msgstr "Brak możliwości zmiany typu dla produktu wykazującego ruch."
 
 msgctxt "error:stock.inventory.line:"
 msgid "Line quantity must be positive."
@@ -35,6 +37,10 @@ msgid ""
 "not support moves."
 msgstr ""
 
+msgctxt "error:stock.location:"
+msgid "The location '%(location)s' must be empty to be deactivated."
+msgstr ""
+
 msgctxt "error:stock.move:"
 msgid "Internal move quantity must be positive"
 msgstr ""
@@ -48,13 +54,13 @@ msgid "Source and destination location must be different"
 msgstr ""
 
 msgctxt "error:stock.move:"
-msgid "The stock move \"%s\" has no origin."
+msgid "The stock moves \"%s\" have no origin."
 msgstr ""
 
 msgctxt "error:stock.move:"
 msgid ""
-"You can not delete stock move \"%s\" because it is not in draft or cancelled"
-" state."
+"You can not delete stock move \"%s\" because it is not in staging, draft nor"
+" cancelled state."
 msgstr ""
 
 msgctxt "error:stock.move:"
@@ -126,66 +132,54 @@ msgctxt "field:party.address,delivery:"
 msgid "Delivery"
 msgstr "Dostawa"
 
-#, fuzzy
 msgctxt "field:party.party,customer_location:"
 msgid "Customer Location"
 msgstr "Lokalizacja klienta"
 
-#, fuzzy
 msgctxt "field:party.party,locations:"
 msgid "Locations"
 msgstr "Lokalizacje"
 
-#, fuzzy
 msgctxt "field:party.party,supplier_location:"
 msgid "Supplier Location"
 msgstr "Lokalizacja dostawcy"
 
-#, fuzzy
 msgctxt "field:party.party.location,create_date:"
 msgid "Create Date"
 msgstr "Data utworzenia"
 
-#, fuzzy
 msgctxt "field:party.party.location,create_uid:"
 msgid "Create User"
 msgstr "Utworzył"
 
-#, fuzzy
 msgctxt "field:party.party.location,customer_location:"
 msgid "Customer Location"
 msgstr "Lokalizacja klienta"
 
-#, fuzzy
 msgctxt "field:party.party.location,id:"
 msgid "ID"
 msgstr "ID"
 
 msgctxt "field:party.party.location,party:"
 msgid "Party"
-msgstr ""
+msgstr "Strona"
 
-#, fuzzy
 msgctxt "field:party.party.location,rec_name:"
-msgid "Name"
-msgstr "Nazwa"
+msgid "Record Name"
+msgstr "Nazwa rekordu"
 
-#, fuzzy
 msgctxt "field:party.party.location,supplier_location:"
 msgid "Supplier Location"
 msgstr "Lokalizacja dostawcy"
 
-#, fuzzy
 msgctxt "field:party.party.location,write_date:"
 msgid "Write Date"
 msgstr "Data zapisu"
 
-#, fuzzy
 msgctxt "field:party.party.location,write_uid:"
 msgid "Write User"
 msgstr "Zapisał"
 
-#, fuzzy
 msgctxt "field:product.by_location.context,forecast_date:"
 msgid "At Date"
 msgstr "Na dzień"
@@ -194,14 +188,13 @@ msgctxt "field:product.by_location.context,id:"
 msgid "ID"
 msgstr "ID"
 
-#, fuzzy
 msgctxt "field:product.by_location.context,stock_date_end:"
 msgid "At Date"
 msgstr "Na dzień"
 
 msgctxt "field:product.product,cost_value:"
 msgid "Cost Value"
-msgstr ""
+msgstr "Wartość kosztu"
 
 #, fuzzy
 msgctxt "field:product.product,forecast_quantity:"
@@ -214,7 +207,7 @@ msgstr "Ilość"
 
 msgctxt "field:product.template,cost_value:"
 msgid "Cost Value"
-msgstr ""
+msgstr "Wartość kosztu"
 
 #, fuzzy
 msgctxt "field:product.template,forecast_quantity:"
@@ -241,10 +234,9 @@ msgctxt "field:stock.configuration,inventory_sequence:"
 msgid "Inventory Sequence"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.configuration,rec_name:"
-msgid "Name"
-msgstr "Nazwa"
+msgid "Record Name"
+msgstr "Nazwa rekordu"
 
 msgctxt "field:stock.configuration,shipment_in_return_sequence:"
 msgid "Supplier Return Shipment Sequence"
@@ -252,7 +244,7 @@ msgstr ""
 
 msgctxt "field:stock.configuration,shipment_in_sequence:"
 msgid "Supplier Shipment Sequence"
-msgstr ""
+msgstr "Sekwencja wysyłki od dostawcy"
 
 msgctxt "field:stock.configuration,shipment_internal_sequence:"
 msgid "Internal Shipment Sequence"
@@ -278,56 +270,46 @@ msgctxt "field:stock.configuration,write_uid:"
 msgid "Write User"
 msgstr "Zapisał"
 
-#, fuzzy
 msgctxt "field:stock.configuration.location,create_date:"
 msgid "Create Date"
 msgstr "Data utworzenia"
 
-#, fuzzy
 msgctxt "field:stock.configuration.location,create_uid:"
 msgid "Create User"
 msgstr "Utworzył"
 
-#, fuzzy
 msgctxt "field:stock.configuration.location,id:"
 msgid "ID"
 msgstr "ID"
 
-#, fuzzy
 msgctxt "field:stock.configuration.location,rec_name:"
-msgid "Name"
-msgstr "Nazwa"
+msgid "Record Name"
+msgstr "Nazwa rekordu"
 
 msgctxt "field:stock.configuration.location,shipment_internal_transit:"
 msgid "Internal Shipment Transit"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.configuration.location,write_date:"
 msgid "Write Date"
 msgstr "Data zapisu"
 
-#, fuzzy
 msgctxt "field:stock.configuration.location,write_uid:"
 msgid "Write User"
 msgstr "Zapisał"
 
-#, fuzzy
 msgctxt "field:stock.configuration.sequence,company:"
 msgid "Company"
 msgstr "Firma"
 
-#, fuzzy
 msgctxt "field:stock.configuration.sequence,create_date:"
 msgid "Create Date"
 msgstr "Data utworzenia"
 
-#, fuzzy
 msgctxt "field:stock.configuration.sequence,create_uid:"
 msgid "Create User"
 msgstr "Utworzył"
 
-#, fuzzy
 msgctxt "field:stock.configuration.sequence,id:"
 msgid "ID"
 msgstr "ID"
@@ -336,10 +318,9 @@ msgctxt "field:stock.configuration.sequence,inventory_sequence:"
 msgid "Inventory Sequence"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.configuration.sequence,rec_name:"
-msgid "Name"
-msgstr "Nazwa"
+msgid "Record Name"
+msgstr "Nazwa rekordu"
 
 msgctxt "field:stock.configuration.sequence,shipment_in_return_sequence:"
 msgid "Supplier Return Shipment Sequence"
@@ -361,12 +342,10 @@ msgctxt "field:stock.configuration.sequence,shipment_out_sequence:"
 msgid "Customer Shipment Sequence"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.configuration.sequence,write_date:"
 msgid "Write Date"
 msgstr "Data zapisu"
 
-#, fuzzy
 msgctxt "field:stock.configuration.sequence,write_uid:"
 msgid "Write User"
 msgstr "Zapisał"
@@ -408,8 +387,8 @@ msgid "Number"
 msgstr "Numer"
 
 msgctxt "field:stock.inventory,rec_name:"
-msgid "Name"
-msgstr "Nazwa"
+msgid "Record Name"
+msgstr "Nazwa rekordu"
 
 msgctxt "field:stock.inventory,state:"
 msgid "State"
@@ -448,10 +427,9 @@ msgctxt "field:stock.inventory.line,inventory_state:"
 msgid "Inventory State"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.inventory.line,moves:"
 msgid "Moves"
-msgstr "Moves"
+msgstr "Ruchy"
 
 msgctxt "field:stock.inventory.line,product:"
 msgid "Product"
@@ -462,16 +440,16 @@ msgid "Quantity"
 msgstr "Ilość"
 
 msgctxt "field:stock.inventory.line,rec_name:"
-msgid "Name"
-msgstr "Nazwa"
+msgid "Record Name"
+msgstr "Nazwa rekordu"
 
 msgctxt "field:stock.inventory.line,unit_digits:"
 msgid "Unit Digits"
-msgstr ""
+msgstr "Cyfry jednostki"
 
 msgctxt "field:stock.inventory.line,uom:"
 msgid "UOM"
-msgstr "Jednostka miary"
+msgstr "Jm"
 
 msgctxt "field:stock.inventory.line,write_date:"
 msgid "Write Date"
@@ -491,7 +469,7 @@ msgstr "Adres"
 
 msgctxt "field:stock.location,childs:"
 msgid "Children"
-msgstr "Elementy podrzędne"
+msgstr "Lokalizacje podrzędne"
 
 msgctxt "field:stock.location,code:"
 msgid "Code"
@@ -499,7 +477,7 @@ msgstr "Kod"
 
 msgctxt "field:stock.location,cost_value:"
 msgid "Cost Value"
-msgstr ""
+msgstr "Wartość kosztu"
 
 msgctxt "field:stock.location,create_date:"
 msgid "Create Date"
@@ -509,6 +487,10 @@ msgctxt "field:stock.location,create_uid:"
 msgid "Create User"
 msgstr "Utworzył"
 
+msgctxt "field:stock.location,flat_childs:"
+msgid "Flat Children"
+msgstr ""
+
 msgctxt "field:stock.location,forecast_quantity:"
 msgid "Forecast Quantity"
 msgstr "Ilość przewidywana"
@@ -517,14 +499,13 @@ msgctxt "field:stock.location,id:"
 msgid "ID"
 msgstr "ID"
 
-#, fuzzy
 msgctxt "field:stock.location,input_location:"
 msgid "Input"
 msgstr "Wejście"
 
 msgctxt "field:stock.location,left:"
 msgid "Left"
-msgstr ""
+msgstr "W lewo"
 
 msgctxt "field:stock.location,name:"
 msgid "Name"
@@ -532,11 +513,11 @@ msgstr "Nazwa"
 
 msgctxt "field:stock.location,output_location:"
 msgid "Output"
-msgstr ""
+msgstr "Wyjście"
 
 msgctxt "field:stock.location,parent:"
 msgid "Parent"
-msgstr "Element nadrzędny"
+msgstr "Lokalizacje nadrzędne"
 
 msgctxt "field:stock.location,picking_location:"
 msgid "Picking"
@@ -547,12 +528,12 @@ msgid "Quantity"
 msgstr "Ilość"
 
 msgctxt "field:stock.location,rec_name:"
-msgid "Name"
-msgstr "Nazwa"
+msgid "Record Name"
+msgstr "Nazwa rekordu"
 
 msgctxt "field:stock.location,right:"
 msgid "Right"
-msgstr ""
+msgstr "W prawo"
 
 msgctxt "field:stock.location,storage_location:"
 msgid "Storage"
@@ -560,7 +541,7 @@ msgstr ""
 
 msgctxt "field:stock.location,type:"
 msgid "Location type"
-msgstr ""
+msgstr "Typ lokalizacji"
 
 msgctxt "field:stock.location,warehouse:"
 msgid "Warehouse"
@@ -588,25 +569,23 @@ msgstr "ID"
 
 msgctxt "field:stock.location.lead_time,lead_time:"
 msgid "Lead Time"
-msgstr ""
+msgstr "Czas przesunięcia"
 
 msgctxt "field:stock.location.lead_time,rec_name:"
-msgid "Name"
-msgstr "Nazwa"
+msgid "Record Name"
+msgstr "Nazwa rekordu"
 
 msgctxt "field:stock.location.lead_time,sequence:"
 msgid "Sequence"
-msgstr "Kolejność"
+msgstr "Sekwencja"
 
-#, fuzzy
 msgctxt "field:stock.location.lead_time,warehouse_from:"
 msgid "Warehouse From"
-msgstr "Warehouse"
+msgstr "Z magazynu"
 
-#, fuzzy
 msgctxt "field:stock.location.lead_time,warehouse_to:"
 msgid "Warehouse To"
-msgstr "Warehouse"
+msgstr "Do magazynu"
 
 msgctxt "field:stock.location.lead_time,write_date:"
 msgid "Write Date"
@@ -626,7 +605,7 @@ msgstr "Firma"
 
 msgctxt "field:stock.move,cost_price:"
 msgid "Cost Price"
-msgstr ""
+msgstr "Cena kosztów"
 
 msgctxt "field:stock.move,create_date:"
 msgid "Create Date"
@@ -642,9 +621,8 @@ msgstr "Waluta"
 
 msgctxt "field:stock.move,effective_date:"
 msgid "Effective Date"
-msgstr ""
+msgstr "Data rzeczywista"
 
-#, fuzzy
 msgctxt "field:stock.move,from_location:"
 msgid "From Location"
 msgstr "Z lokalizacji"
@@ -659,7 +637,7 @@ msgstr ""
 
 msgctxt "field:stock.move,origin:"
 msgid "Origin"
-msgstr "Pochodzenie"
+msgstr "Źródło"
 
 msgctxt "field:stock.move,planned_date:"
 msgid "Planned Date"
@@ -671,32 +649,31 @@ msgstr "Produkt"
 
 msgctxt "field:stock.move,product_uom_category:"
 msgid "Product Uom Category"
-msgstr ""
+msgstr "Kategoria jm produktu"
 
 msgctxt "field:stock.move,quantity:"
 msgid "Quantity"
 msgstr "Ilość"
 
 msgctxt "field:stock.move,rec_name:"
-msgid "Name"
-msgstr "Nazwa"
+msgid "Record Name"
+msgstr "Nazwa rekordu"
 
 msgctxt "field:stock.move,shipment:"
 msgid "Shipment"
-msgstr ""
+msgstr "Wysyłka"
 
 msgctxt "field:stock.move,state:"
 msgid "State"
 msgstr "Stan"
 
-#, fuzzy
 msgctxt "field:stock.move,to_location:"
 msgid "To Location"
 msgstr "Do lokalizacji"
 
 msgctxt "field:stock.move,unit_digits:"
 msgid "Unit Digits"
-msgstr ""
+msgstr "Cyfry jednostki"
 
 msgctxt "field:stock.move,unit_price:"
 msgid "Unit Price"
@@ -704,11 +681,11 @@ msgstr "Cena jednostkowa"
 
 msgctxt "field:stock.move,unit_price_required:"
 msgid "Unit Price Required"
-msgstr ""
+msgstr "Wymagana cena jednostkowa"
 
 msgctxt "field:stock.move,uom:"
 msgid "Uom"
-msgstr "Jednostka miary"
+msgstr "Jm"
 
 msgctxt "field:stock.move,write_date:"
 msgid "Write Date"
@@ -743,8 +720,8 @@ msgid "ID"
 msgstr "ID"
 
 msgctxt "field:stock.period,rec_name:"
-msgid "Name"
-msgstr "Nazwa"
+msgid "Record Name"
+msgstr "Nazwa rekordu"
 
 msgctxt "field:stock.period,state:"
 msgid "State"
@@ -787,8 +764,8 @@ msgid "Product"
 msgstr "Produkt"
 
 msgctxt "field:stock.period.cache,rec_name:"
-msgid "Name"
-msgstr "Nazwa"
+msgid "Record Name"
+msgstr "Nazwa rekordu"
 
 msgctxt "field:stock.period.cache,write_date:"
 msgid "Write Date"
@@ -819,8 +796,8 @@ msgid "Quantity"
 msgstr "Ilość"
 
 msgctxt "field:stock.product_quantities_warehouse,rec_name:"
-msgid "Name"
-msgstr "Nazwa"
+msgid "Record Name"
+msgstr "Nazwa rekordu"
 
 msgctxt "field:stock.product_quantities_warehouse,write_date:"
 msgid "Write Date"
@@ -868,11 +845,11 @@ msgstr "Utworzył"
 
 msgctxt "field:stock.shipment.in,done_by:"
 msgid "Done By"
-msgstr ""
+msgstr "Wykonano przez"
 
 msgctxt "field:stock.shipment.in,effective_date:"
 msgid "Effective Date"
-msgstr ""
+msgstr "Data rzeczywista"
 
 msgctxt "field:stock.shipment.in,id:"
 msgid "ID"
@@ -886,17 +863,14 @@ msgctxt "field:stock.shipment.in,inventory_moves:"
 msgid "Inventory Moves"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.shipment.in,moves:"
 msgid "Moves"
-msgstr "Moves"
+msgstr "Ruchy"
 
-#, fuzzy
 msgctxt "field:stock.shipment.in,number:"
 msgid "Number"
 msgstr "Numer"
 
-#, fuzzy
 msgctxt "field:stock.shipment.in,origins:"
 msgid "Origins"
 msgstr "Źródła"
@@ -906,8 +880,8 @@ msgid "Planned Date"
 msgstr "Data planowana"
 
 msgctxt "field:stock.shipment.in,rec_name:"
-msgid "Name"
-msgstr "Nazwa"
+msgid "Record Name"
+msgstr "Nazwa rekordu"
 
 msgctxt "field:stock.shipment.in,received_by:"
 msgid "Received By"
@@ -915,7 +889,7 @@ msgstr ""
 
 msgctxt "field:stock.shipment.in,reference:"
 msgid "Reference"
-msgstr ""
+msgstr "Referencja"
 
 msgctxt "field:stock.shipment.in,state:"
 msgid "State"
@@ -975,9 +949,8 @@ msgstr ""
 
 msgctxt "field:stock.shipment.in.return,effective_date:"
 msgid "Effective Date"
-msgstr ""
+msgstr "Data rzeczywista"
 
-#, fuzzy
 msgctxt "field:stock.shipment.in.return,from_location:"
 msgid "From Location"
 msgstr "Z lokalizacji"
@@ -986,16 +959,14 @@ msgctxt "field:stock.shipment.in.return,id:"
 msgid "ID"
 msgstr "ID"
 
-#, fuzzy
 msgctxt "field:stock.shipment.in.return,moves:"
 msgid "Moves"
-msgstr "Moves"
+msgstr "Ruchy"
 
 msgctxt "field:stock.shipment.in.return,number:"
 msgid "Number"
 msgstr "Numer"
 
-#, fuzzy
 msgctxt "field:stock.shipment.in.return,origins:"
 msgid "Origins"
 msgstr "Źródła"
@@ -1005,12 +976,12 @@ msgid "Planned Date"
 msgstr "Data planowana"
 
 msgctxt "field:stock.shipment.in.return,rec_name:"
-msgid "Name"
-msgstr "Nazwa"
+msgid "Record Name"
+msgstr "Nazwa rekordu"
 
 msgctxt "field:stock.shipment.in.return,reference:"
 msgid "Reference"
-msgstr ""
+msgstr "Referencja"
 
 msgctxt "field:stock.shipment.in.return,state:"
 msgid "State"
@@ -1020,7 +991,6 @@ msgctxt "field:stock.shipment.in.return,supplier:"
 msgid "Supplier"
 msgstr "Dostawca"
 
-#, fuzzy
 msgctxt "field:stock.shipment.in.return,to_location:"
 msgid "To Location"
 msgstr "Do lokalizacji"
@@ -1037,10 +1007,9 @@ msgctxt "field:stock.shipment.in.return.assign.failed,id:"
 msgid "ID"
 msgstr "ID"
 
-#, fuzzy
 msgctxt "field:stock.shipment.in.return.assign.failed,moves:"
 msgid "Moves"
-msgstr "Moves"
+msgstr "Ruchy"
 
 msgctxt "field:stock.shipment.internal,assigned_by:"
 msgid "Received By"
@@ -1064,13 +1033,12 @@ msgstr ""
 
 msgctxt "field:stock.shipment.internal,effective_date:"
 msgid "Effective Date"
-msgstr ""
+msgstr "Data rzeczywista"
 
 msgctxt "field:stock.shipment.internal,effective_start_date:"
 msgid "Effective Start Date"
-msgstr ""
+msgstr "Rzeczywista data rozpoczęcia"
 
-#, fuzzy
 msgctxt "field:stock.shipment.internal,from_location:"
 msgid "From Location"
 msgstr "Z lokalizacji"
@@ -1083,10 +1051,9 @@ msgctxt "field:stock.shipment.internal,incoming_moves:"
 msgid "Incoming Moves"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.shipment.internal,moves:"
 msgid "Moves"
-msgstr "Moves"
+msgstr "Ruchy"
 
 msgctxt "field:stock.shipment.internal,number:"
 msgid "Number"
@@ -1105,12 +1072,12 @@ msgid "Planned Start Date"
 msgstr "Zaplanowana data rozpoczęcia"
 
 msgctxt "field:stock.shipment.internal,rec_name:"
-msgid "Name"
-msgstr "Nazwa"
+msgid "Record Name"
+msgstr "Nazwa rekordu"
 
 msgctxt "field:stock.shipment.internal,reference:"
 msgid "Reference"
-msgstr ""
+msgstr "Referencja"
 
 msgctxt "field:stock.shipment.internal,shipped_by:"
 msgid "Shipped By"
@@ -1140,10 +1107,9 @@ msgctxt "field:stock.shipment.internal.assign.failed,id:"
 msgid "ID"
 msgstr "ID"
 
-#, fuzzy
 msgctxt "field:stock.shipment.internal.assign.failed,moves:"
 msgid "Moves"
-msgstr "Moves"
+msgstr "Ruchy"
 
 msgctxt "field:stock.shipment.out,assigned_by:"
 msgid "Assigned By"
@@ -1179,7 +1145,7 @@ msgstr ""
 
 msgctxt "field:stock.shipment.out,effective_date:"
 msgid "Effective Date"
-msgstr ""
+msgstr "Rzeczywista data"
 
 msgctxt "field:stock.shipment.out,id:"
 msgid "ID"
@@ -1189,10 +1155,9 @@ msgctxt "field:stock.shipment.out,inventory_moves:"
 msgid "Inventory Moves"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.shipment.out,moves:"
 msgid "Moves"
-msgstr "Moves"
+msgstr "Ruchy"
 
 msgctxt "field:stock.shipment.out,number:"
 msgid "Number"
@@ -1215,12 +1180,12 @@ msgid "Planned Date"
 msgstr "Data planowana"
 
 msgctxt "field:stock.shipment.out,rec_name:"
-msgid "Name"
-msgstr "Nazwa"
+msgid "Record Name"
+msgstr "Nazwa rekordu"
 
 msgctxt "field:stock.shipment.out,reference:"
 msgid "Reference"
-msgstr ""
+msgstr "Referencja"
 
 msgctxt "field:stock.shipment.out,state:"
 msgid "State"
@@ -1268,11 +1233,11 @@ msgstr "Utworzył"
 
 msgctxt "field:stock.shipment.out.return,customer:"
 msgid "Customer"
-msgstr "Klient"
+msgstr "Odbiorca"
 
 msgctxt "field:stock.shipment.out.return,customer_location:"
 msgid "Customer Location"
-msgstr "Lokalizacja klienta"
+msgstr "Lokalizacja odbiorcy"
 
 msgctxt "field:stock.shipment.out.return,delivery_address:"
 msgid "Delivery Address"
@@ -1284,7 +1249,7 @@ msgstr ""
 
 msgctxt "field:stock.shipment.out.return,effective_date:"
 msgid "Effective Date"
-msgstr ""
+msgstr "Rzeczywista data"
 
 msgctxt "field:stock.shipment.out.return,id:"
 msgid "ID"
@@ -1298,16 +1263,14 @@ msgctxt "field:stock.shipment.out.return,inventory_moves:"
 msgid "Inventory Moves"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.shipment.out.return,moves:"
 msgid "Moves"
-msgstr "Moves"
+msgstr "Ruchy"
 
 msgctxt "field:stock.shipment.out.return,number:"
 msgid "Number"
 msgstr "Numer"
 
-#, fuzzy
 msgctxt "field:stock.shipment.out.return,origins:"
 msgid "Origins"
 msgstr "Źródła"
@@ -1317,8 +1280,8 @@ msgid "Planned Date"
 msgstr "Planowana data"
 
 msgctxt "field:stock.shipment.out.return,rec_name:"
-msgid "Name"
-msgstr "Nazwa"
+msgid "Record Name"
+msgstr "Nazwa rekordu"
 
 msgctxt "field:stock.shipment.out.return,received_by:"
 msgid "Received By"
@@ -1326,7 +1289,7 @@ msgstr ""
 
 msgctxt "field:stock.shipment.out.return,reference:"
 msgid "Reference"
-msgstr ""
+msgstr "Referencja"
 
 msgctxt "field:stock.shipment.out.return,state:"
 msgid "State"
@@ -1375,6 +1338,10 @@ msgid ""
 "* A date in the past will provide historical values."
 msgstr ""
 
+msgctxt "help:stock.location,flat_childs:"
+msgid "Check to restrict to one level of children."
+msgstr ""
+
 msgctxt "help:stock.location,picking_location:"
 msgid "If empty the Storage is used"
 msgstr ""
@@ -1388,7 +1355,7 @@ msgstr ""
 
 msgctxt "model:ir.action,name:act_inventory_form"
 msgid "Inventories"
-msgstr "Inventories"
+msgstr ""
 
 msgctxt "model:ir.action,name:act_location_form"
 msgid "Locations"
@@ -1396,11 +1363,11 @@ msgstr "Lokalizacje"
 
 msgctxt "model:ir.action,name:act_location_lead_time_form"
 msgid "Location Lead Times"
-msgstr "Location Lead Times"
+msgstr "Czas przesunięcia między magazynami"
 
 msgctxt "model:ir.action,name:act_location_quantity_tree"
 msgid "Locations Quantity"
-msgstr "Locations Quantity"
+msgstr ""
 
 msgctxt "model:ir.action,name:act_location_tree"
 msgid "Locations"
@@ -1408,7 +1375,7 @@ msgstr "Lokalizacje"
 
 msgctxt "model:ir.action,name:act_move_form"
 msgid "Moves"
-msgstr "Moves"
+msgstr "Ruchy"
 
 msgctxt "model:ir.action,name:act_period_list"
 msgid "Periods"
@@ -1424,43 +1391,43 @@ msgstr "Produkty"
 
 msgctxt "model:ir.action,name:act_shipment_in_form"
 msgid "Supplier Shipments"
-msgstr "Supplier Shipments"
+msgstr ""
 
 msgctxt "model:ir.action,name:act_shipment_in_return_form"
 msgid "Supplier Return Shipments"
-msgstr "Supplier Return Shipments"
+msgstr ""
 
 msgctxt "model:ir.action,name:act_shipment_internal_form"
 msgid "Internal Shipments"
-msgstr "Internal Shipments"
+msgstr ""
 
 msgctxt "model:ir.action,name:act_shipment_out_form"
 msgid "Customer Shipments"
-msgstr "Customer Shipments"
+msgstr ""
 
 msgctxt "model:ir.action,name:act_shipment_out_form2"
 msgid "Customer Shipments"
-msgstr "Customer Shipments"
+msgstr ""
 
 msgctxt "model:ir.action,name:act_shipment_out_form3"
 msgid "Supplier Shipments"
-msgstr "Supplier Shipments"
+msgstr ""
 
 msgctxt "model:ir.action,name:act_shipment_out_return_form"
 msgid "Customer Return Shipments"
-msgstr "Customer Return Shipments"
+msgstr ""
 
 msgctxt "model:ir.action,name:act_stock_configuration_form"
 msgid "Stock Configuration"
-msgstr "Stock Configuration"
+msgstr "Konfiguracja zapasów"
 
 msgctxt "model:ir.action,name:report_shipment_in_restocking_list"
 msgid "Restocking List"
-msgstr "Restocking List"
+msgstr ""
 
 msgctxt "model:ir.action,name:report_shipment_internal"
 msgid "Internal Shipment"
-msgstr "Internal Shipment"
+msgstr ""
 
 msgctxt "model:ir.action,name:report_shipment_out_delivery_note"
 msgid "Delivery Note"
@@ -1468,27 +1435,27 @@ msgstr "List przewozowy"
 
 msgctxt "model:ir.action,name:report_shipment_out_picking_list"
 msgid "Picking List"
-msgstr "Picking List"
+msgstr ""
 
 msgctxt "model:ir.action,name:report_shipment_out_return_restocking_list"
 msgid "Restocking List"
-msgstr "Restocking List"
+msgstr ""
 
 msgctxt "model:ir.action,name:wizard_recompute_cost_price"
 msgid "Recompute Cost Price"
-msgstr "Recompute Cost Price"
+msgstr ""
 
 msgctxt "model:ir.action,name:wizard_shipment_in_return_assign"
 msgid "Assign Purchase Return Shipment"
-msgstr "Assign Purchase Return Shipment"
+msgstr ""
 
 msgctxt "model:ir.action,name:wizard_shipment_internal_assign"
 msgid "Assign Shipment Internal"
-msgstr "Assign Shipment Internal"
+msgstr ""
 
 msgctxt "model:ir.action,name:wizard_shipment_out_assign"
 msgid "Assign Shipment Out"
-msgstr "Assign Shipment Out"
+msgstr ""
 
 msgctxt "model:ir.action.act_window.domain,name:act_inventory_form_domain_all"
 msgid "All"
@@ -1497,7 +1464,7 @@ msgstr "Wszystko"
 msgctxt ""
 "model:ir.action.act_window.domain,name:act_inventory_form_domain_draft"
 msgid "Draft"
-msgstr "Szkic"
+msgstr ""
 
 msgctxt "model:ir.action.act_window.domain,name:act_move_form_domain_all"
 msgid "All"
@@ -1511,12 +1478,12 @@ msgstr "Od dostawców"
 msgctxt ""
 "model:ir.action.act_window.domain,name:act_move_form_domain_from_supplier_waiting"
 msgid "From Suppliers Waiting"
-msgstr "From Suppliers Waiting"
+msgstr ""
 
 msgctxt ""
 "model:ir.action.act_window.domain,name:act_move_form_domain_to_customer"
 msgid "To Customers"
-msgstr "Do klientów"
+msgstr "Do odbiorców"
 
 msgctxt ""
 "model:ir.action.act_window.domain,name:act_shipment_in_form_domain_all"
@@ -1526,7 +1493,7 @@ msgstr "Wszystko"
 msgctxt ""
 "model:ir.action.act_window.domain,name:act_shipment_in_form_domain_draft"
 msgid "Draft"
-msgstr "Szkic"
+msgstr ""
 
 msgctxt ""
 "model:ir.action.act_window.domain,name:act_shipment_in_form_domain_received"
@@ -1541,12 +1508,12 @@ msgstr "Wszystko"
 msgctxt ""
 "model:ir.action.act_window.domain,name:act_shipment_in_return_form_domain_assigned"
 msgid "Assigned"
-msgstr "Przypisany"
+msgstr "Przydzielony"
 
 msgctxt ""
 "model:ir.action.act_window.domain,name:act_shipment_in_return_form_domain_draft"
 msgid "Draft"
-msgstr "Szkic"
+msgstr ""
 
 msgctxt ""
 "model:ir.action.act_window.domain,name:act_shipment_in_return_form_domain_waiting"
@@ -1561,12 +1528,12 @@ msgstr "Wszystko"
 msgctxt ""
 "model:ir.action.act_window.domain,name:act_shipment_internal_form_domain_assigned"
 msgid "Assigned"
-msgstr "Przypisany"
+msgstr "Przydzielony"
 
 msgctxt ""
 "model:ir.action.act_window.domain,name:act_shipment_internal_form_domain_draft"
 msgid "Draft"
-msgstr "Szkic"
+msgstr ""
 
 msgctxt ""
 "model:ir.action.act_window.domain,name:act_shipment_internal_form_domain_requests"
@@ -1576,7 +1543,7 @@ msgstr ""
 msgctxt ""
 "model:ir.action.act_window.domain,name:act_shipment_internal_form_domain_shipped"
 msgid "Shipped"
-msgstr "Shipped"
+msgstr ""
 
 msgctxt ""
 "model:ir.action.act_window.domain,name:act_shipment_internal_form_domain_waiting"
@@ -1591,17 +1558,17 @@ msgstr "Wszystko"
 msgctxt ""
 "model:ir.action.act_window.domain,name:act_shipment_out_form_domain_assigned"
 msgid "Assigned"
-msgstr "Przypisany"
+msgstr "Przydzielony"
 
 msgctxt ""
 "model:ir.action.act_window.domain,name:act_shipment_out_form_domain_draft"
 msgid "Draft"
-msgstr "Szkic"
+msgstr ""
 
 msgctxt ""
 "model:ir.action.act_window.domain,name:act_shipment_out_form_domain_packed"
 msgid "Packed"
-msgstr "Packed"
+msgstr ""
 
 msgctxt ""
 "model:ir.action.act_window.domain,name:act_shipment_out_form_domain_waiting"
@@ -1616,7 +1583,7 @@ msgstr "Wszystko"
 msgctxt ""
 "model:ir.action.act_window.domain,name:act_shipment_out_return_form_domain_draft"
 msgid "Draft"
-msgstr "Szkic"
+msgstr ""
 
 msgctxt ""
 "model:ir.action.act_window.domain,name:act_shipment_out_return_form_domain_received"
@@ -1625,51 +1592,51 @@ msgstr "Otrzymany"
 
 msgctxt "model:ir.sequence,name:sequence_inventory"
 msgid "Inventory"
-msgstr "Inventory"
+msgstr ""
 
 msgctxt "model:ir.sequence,name:sequence_shipment_in"
 msgid "Supplier Shipment"
-msgstr "Supplier Shipment"
+msgstr ""
 
 msgctxt "model:ir.sequence,name:sequence_shipment_in_return"
 msgid "Supplier Return Shipment"
-msgstr "Supplier Return Shipment"
+msgstr ""
 
 msgctxt "model:ir.sequence,name:sequence_shipment_internal"
 msgid "Internal Shipment"
-msgstr "Internal Shipment"
+msgstr ""
 
 msgctxt "model:ir.sequence,name:sequence_shipment_out"
 msgid "Customer Shipment"
-msgstr "Customer Shipment"
+msgstr ""
 
 msgctxt "model:ir.sequence,name:sequence_shipment_out_return"
 msgid "Customer Return Shipment"
-msgstr "Customer Return Shipment"
+msgstr ""
 
 msgctxt "model:ir.sequence.type,name:sequence_type_inventory"
 msgid "Inventory"
-msgstr "Inventory"
+msgstr ""
 
 msgctxt "model:ir.sequence.type,name:sequence_type_shipment_in"
 msgid "Supplier Shipment"
-msgstr "Supplier Shipment"
+msgstr ""
 
 msgctxt "model:ir.sequence.type,name:sequence_type_shipment_in_return"
 msgid "Supplier Return Shipment"
-msgstr "Supplier Return Shipment"
+msgstr ""
 
 msgctxt "model:ir.sequence.type,name:sequence_type_shipment_internal"
 msgid "Internal Shipment"
-msgstr "Internal Shipment"
+msgstr ""
 
 msgctxt "model:ir.sequence.type,name:sequence_type_shipment_out"
 msgid "Customer Shipment"
-msgstr "Customer Shipment"
+msgstr ""
 
 msgctxt "model:ir.sequence.type,name:sequence_type_shipment_out_return"
 msgid "Customer Return Shipment"
-msgstr "Customer Return Shipment"
+msgstr ""
 
 msgctxt "model:ir.ui.menu,name:menu_configuration"
 msgid "Configuration"
@@ -1677,7 +1644,7 @@ msgstr "Konfiguracja"
 
 msgctxt "model:ir.ui.menu,name:menu_inventory_form"
 msgid "Inventories"
-msgstr "Inventories"
+msgstr ""
 
 msgctxt "model:ir.ui.menu,name:menu_location_form"
 msgid "Locations"
@@ -1685,15 +1652,15 @@ msgstr "Lokalizacje"
 
 msgctxt "model:ir.ui.menu,name:menu_location_lead_time_form"
 msgid "Location Lead Times"
-msgstr "Location Lead Times"
+msgstr "Czas przesunięcia między magazynami"
 
 msgctxt "model:ir.ui.menu,name:menu_location_tree"
 msgid "Locations"
-msgstr "Locations"
+msgstr "Lokalizacje"
 
 msgctxt "model:ir.ui.menu,name:menu_move_form"
 msgid "Moves"
-msgstr "Moves"
+msgstr "Ruchy"
 
 msgctxt "model:ir.ui.menu,name:menu_period_list"
 msgid "Periods"
@@ -1701,39 +1668,39 @@ msgstr "Okresy"
 
 msgctxt "model:ir.ui.menu,name:menu_reporting"
 msgid "Reporting"
-msgstr "Reporting"
+msgstr ""
 
 msgctxt "model:ir.ui.menu,name:menu_shipment_in_form"
 msgid "Supplier Shipments"
-msgstr "Supplier Shipments"
+msgstr ""
 
 msgctxt "model:ir.ui.menu,name:menu_shipment_in_return_form"
 msgid "Supplier Return Shipments"
-msgstr "Supplier Return Shipments"
+msgstr ""
 
 msgctxt "model:ir.ui.menu,name:menu_shipment_internal_form"
 msgid "Internal Shipments"
-msgstr "Internal Shipments"
+msgstr ""
 
 msgctxt "model:ir.ui.menu,name:menu_shipment_out_form"
 msgid "Customer Shipments"
-msgstr "Customer Shipments"
+msgstr ""
 
 msgctxt "model:ir.ui.menu,name:menu_shipment_out_return_form"
 msgid "Customer Return Shipments"
-msgstr "Customer Return Shipments"
+msgstr ""
 
 msgctxt "model:ir.ui.menu,name:menu_stock"
 msgid "Inventory & Stock"
-msgstr "Inventory & Stock"
+msgstr "Magazyn"
 
 msgctxt "model:ir.ui.menu,name:menu_stock_configuration"
 msgid "Stock Configuration"
-msgstr "Stock Configuration"
+msgstr "Konfiguracja zapasów"
 
 msgctxt "model:party.party.location,name:"
 msgid "Party Location"
-msgstr ""
+msgstr "Lokalizacja strony"
 
 msgctxt "model:product.by_location.context,name:"
 msgid "Product by Location"
@@ -1741,20 +1708,19 @@ msgstr "Produkt wg lokalizacji"
 
 msgctxt "model:res.group,name:group_stock"
 msgid "Stock"
-msgstr "Stock"
+msgstr ""
 
 msgctxt "model:res.group,name:group_stock_admin"
 msgid "Stock Administration"
-msgstr "Stock Administration"
+msgstr ""
 
 msgctxt "model:res.group,name:group_stock_force_assignment"
 msgid "Stock Force Assignment"
-msgstr "Stock Force Assignment"
+msgstr ""
 
-#, fuzzy
 msgctxt "model:stock.configuration,name:"
 msgid "Stock Configuration"
-msgstr "Stock Configuration"
+msgstr "Konfiguracja zapasów"
 
 msgctxt "model:stock.configuration.location,name:"
 msgid "Stock Configuration Location"
@@ -1778,11 +1744,11 @@ msgstr ""
 
 msgctxt "model:stock.location,name:location_customer"
 msgid "Customer"
-msgstr "Klient"
+msgstr "Odbiorca"
 
 msgctxt "model:stock.location,name:location_input"
 msgid "Input Zone"
-msgstr "Input Zone"
+msgstr "Strefa wejścia"
 
 msgctxt "model:stock.location,name:location_lost_found"
 msgid "Lost and Found"
@@ -1790,11 +1756,11 @@ msgstr "Zgubione i znalezione"
 
 msgctxt "model:stock.location,name:location_output"
 msgid "Output Zone"
-msgstr "Output Zone"
+msgstr "Strefa wyjścia"
 
 msgctxt "model:stock.location,name:location_storage"
 msgid "Storage Zone"
-msgstr "Storage Zone"
+msgstr "Strefa magazynowania"
 
 msgctxt "model:stock.location,name:location_supplier"
 msgid "Supplier"
@@ -1802,16 +1768,15 @@ msgstr "Dostawca"
 
 msgctxt "model:stock.location,name:location_transit"
 msgid "Transit"
-msgstr "Transit"
+msgstr ""
 
 msgctxt "model:stock.location,name:location_warehouse"
 msgid "Warehouse"
 msgstr "Magazyn"
 
-#, fuzzy
 msgctxt "model:stock.location.lead_time,name:"
 msgid "Location Lead Time"
-msgstr "Location Lead Times"
+msgstr "Czas przesunięcia między magazynami"
 
 msgctxt "model:stock.move,name:"
 msgid "Stock Move"
@@ -1903,7 +1868,7 @@ msgstr "Ilość"
 
 msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Reference:"
-msgstr ""
+msgstr "Referencja:"
 
 #, fuzzy
 msgctxt "report:stock.shipment.in.restocking_list:"
@@ -1912,7 +1877,7 @@ msgstr "Restocking List"
 
 msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Shipment Number"
-msgstr ""
+msgstr "Numer wysyłki"
 
 msgctxt "report:stock.shipment.in.restocking_list:"
 msgid "Supplier:"
@@ -1961,11 +1926,11 @@ msgstr "Ilość"
 
 msgctxt "report:stock.shipment.internal.report:"
 msgid "Reference:"
-msgstr ""
+msgstr "Referencja:"
 
 msgctxt "report:stock.shipment.internal.report:"
 msgid "Shipment Number"
-msgstr ""
+msgstr "Numer wysyłki"
 
 msgctxt "report:stock.shipment.internal.report:"
 msgid "To Location"
@@ -1981,7 +1946,7 @@ msgstr "/"
 
 msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Customer Code:"
-msgstr "Kod klienta:"
+msgstr "Kod odbiorcy:"
 
 msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Date:"
@@ -2001,11 +1966,11 @@ msgstr "Ilość"
 
 msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Reference:"
-msgstr ""
+msgstr "Referencja"
 
 msgctxt "report:stock.shipment.out.delivery_note:"
 msgid "Shipment Number:"
-msgstr ""
+msgstr "Numer wysyłki:"
 
 msgctxt "report:stock.shipment.out.picking_list:"
 msgid "/"
@@ -2017,7 +1982,7 @@ msgstr ":"
 
 msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Customer:"
-msgstr "Klient:"
+msgstr "Odbiorca:"
 
 msgctxt "report:stock.shipment.out.picking_list:"
 msgid "From Location"
@@ -2042,11 +2007,11 @@ msgstr "Ilość"
 
 msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Reference:"
-msgstr ""
+msgstr "Referencja:"
 
 msgctxt "report:stock.shipment.out.picking_list:"
 msgid "Shipment Number"
-msgstr ""
+msgstr "Numer wysyłki"
 
 msgctxt "report:stock.shipment.out.picking_list:"
 msgid "To Location"
@@ -2066,7 +2031,7 @@ msgstr ":"
 
 msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Customer"
-msgstr "Klient"
+msgstr "Odbiorca"
 
 msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "From Location"
@@ -2090,7 +2055,7 @@ msgstr "Ilość"
 
 msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Reference:"
-msgstr ""
+msgstr "Referencja:"
 
 #, fuzzy
 msgctxt "report:stock.shipment.out.return.restocking_list:"
@@ -2099,7 +2064,7 @@ msgstr "Restocking List"
 
 msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "Shipment"
-msgstr ""
+msgstr "Wysyłka"
 
 msgctxt "report:stock.shipment.out.return.restocking_list:"
 msgid "To Location"
@@ -2111,31 +2076,31 @@ msgstr "Magazyn:"
 
 msgctxt "selection:stock.inventory,state:"
 msgid "Canceled"
-msgstr "Anulowany"
+msgstr "Anulowano"
 
 msgctxt "selection:stock.inventory,state:"
 msgid "Done"
-msgstr "Ukończony"
+msgstr "Wykonano"
 
 msgctxt "selection:stock.inventory,state:"
 msgid "Draft"
-msgstr "Szkic"
+msgstr ""
 
 msgctxt "selection:stock.inventory.line,inventory_state:"
 msgid "Canceled"
-msgstr "Anulowany"
+msgstr "Anulowano"
 
 msgctxt "selection:stock.inventory.line,inventory_state:"
 msgid "Done"
-msgstr "Ukończony"
+msgstr "Wykonano"
 
 msgctxt "selection:stock.inventory.line,inventory_state:"
 msgid "Draft"
-msgstr "Szkic"
+msgstr ""
 
 msgctxt "selection:stock.location,type:"
 msgid "Customer"
-msgstr "Klient"
+msgstr "Odbiorca"
 
 msgctxt "selection:stock.location,type:"
 msgid "Drop"
@@ -2167,19 +2132,19 @@ msgstr "Magazyn"
 
 msgctxt "selection:stock.move,state:"
 msgid "Assigned"
-msgstr "Przypisany"
+msgstr "Przydzielono"
 
 msgctxt "selection:stock.move,state:"
 msgid "Canceled"
-msgstr "Anulowany"
+msgstr "Anulowano"
 
 msgctxt "selection:stock.move,state:"
 msgid "Done"
-msgstr "Ukończony"
+msgstr "Wykonano"
 
 msgctxt "selection:stock.move,state:"
 msgid "Draft"
-msgstr "Szkic"
+msgstr ""
 
 msgctxt "selection:stock.move,state:"
 msgid "Staging"
@@ -2187,23 +2152,23 @@ msgstr ""
 
 msgctxt "selection:stock.period,state:"
 msgid "Closed"
-msgstr "Zamknięty"
+msgstr "Zamknięto"
 
 msgctxt "selection:stock.period,state:"
 msgid "Draft"
-msgstr "Szkic"
+msgstr ""
 
 msgctxt "selection:stock.shipment.in,state:"
 msgid "Canceled"
-msgstr "Anulowany"
+msgstr "Anulowano"
 
 msgctxt "selection:stock.shipment.in,state:"
 msgid "Done"
-msgstr "Ukończony"
+msgstr "Wykonano"
 
 msgctxt "selection:stock.shipment.in,state:"
 msgid "Draft"
-msgstr "Szkic"
+msgstr ""
 
 msgctxt "selection:stock.shipment.in,state:"
 msgid "Received"
@@ -2211,19 +2176,19 @@ msgstr "Odebrany"
 
 msgctxt "selection:stock.shipment.in.return,state:"
 msgid "Assigned"
-msgstr "Przypisany"
+msgstr "Przydzielono"
 
 msgctxt "selection:stock.shipment.in.return,state:"
 msgid "Canceled"
-msgstr "Anulowany"
+msgstr "Anulowano"
 
 msgctxt "selection:stock.shipment.in.return,state:"
 msgid "Done"
-msgstr "Ukończony"
+msgstr "Wykonano"
 
 msgctxt "selection:stock.shipment.in.return,state:"
 msgid "Draft"
-msgstr "Szkic"
+msgstr ""
 
 msgctxt "selection:stock.shipment.in.return,state:"
 msgid "Waiting"
@@ -2231,19 +2196,19 @@ msgstr "Oczekujący"
 
 msgctxt "selection:stock.shipment.internal,state:"
 msgid "Assigned"
-msgstr "Przypisany"
+msgstr "Przydzielono"
 
 msgctxt "selection:stock.shipment.internal,state:"
 msgid "Canceled"
-msgstr "Anulowany"
+msgstr "Anulowano"
 
 msgctxt "selection:stock.shipment.internal,state:"
 msgid "Done"
-msgstr "Ukończony"
+msgstr "Wykonano"
 
 msgctxt "selection:stock.shipment.internal,state:"
 msgid "Draft"
-msgstr "Szkic"
+msgstr ""
 
 msgctxt "selection:stock.shipment.internal,state:"
 msgid "Request"
@@ -2260,19 +2225,19 @@ msgstr "Oczekujący"
 
 msgctxt "selection:stock.shipment.out,state:"
 msgid "Assigned"
-msgstr "Przypisany"
+msgstr "Przydzielono"
 
 msgctxt "selection:stock.shipment.out,state:"
 msgid "Canceled"
-msgstr "Anulowany"
+msgstr "Anulowano"
 
 msgctxt "selection:stock.shipment.out,state:"
 msgid "Done"
-msgstr "Ukończony"
+msgstr "Wykonano"
 
 msgctxt "selection:stock.shipment.out,state:"
 msgid "Draft"
-msgstr "Szkic"
+msgstr ""
 
 #, fuzzy
 msgctxt "selection:stock.shipment.out,state:"
@@ -2285,15 +2250,15 @@ msgstr "Oczekujący"
 
 msgctxt "selection:stock.shipment.out.return,state:"
 msgid "Canceled"
-msgstr "Anulowany"
+msgstr "Anulowano"
 
 msgctxt "selection:stock.shipment.out.return,state:"
 msgid "Done"
-msgstr "Ukończony"
+msgstr "Wykonano"
 
 msgctxt "selection:stock.shipment.out.return,state:"
 msgid "Draft"
-msgstr "Szkic"
+msgstr ""
 
 msgctxt "selection:stock.shipment.out.return,state:"
 msgid "Received"
@@ -2306,7 +2271,7 @@ msgstr "Stock"
 
 msgctxt "view:product.product:"
 msgid "Cost Value"
-msgstr ""
+msgstr "Wartość kosztu"
 
 #, fuzzy
 msgctxt "view:stock.configuration:"
@@ -2315,7 +2280,7 @@ msgstr "Inventory"
 
 msgctxt "view:stock.configuration:"
 msgid "Shipments"
-msgstr ""
+msgstr "Wysyłki"
 
 msgctxt "view:stock.inventory:"
 msgid "Add an inventory line for each missing products"
@@ -2339,7 +2304,7 @@ msgstr "Anuluj"
 
 msgctxt "view:stock.move:"
 msgid "Do"
-msgstr ""
+msgstr "Wykonaj"
 
 #, fuzzy
 msgctxt "view:stock.move:"
@@ -2352,7 +2317,7 @@ msgstr "Zamknij"
 
 msgctxt "view:stock.period:"
 msgid "Draft"
-msgstr "Szkic"
+msgstr ""
 
 msgctxt "view:stock.shipment.in.return.assign.failed:"
 msgid "Unable to assign those products:"
@@ -2368,15 +2333,15 @@ msgstr "Anuluj"
 
 msgctxt "view:stock.shipment.in.return:"
 msgid "Done"
-msgstr "Ukończony"
+msgstr "Wykonano"
 
 msgctxt "view:stock.shipment.in.return:"
 msgid "Draft"
-msgstr "Szkic"
+msgstr ""
 
 msgctxt "view:stock.shipment.in.return:"
 msgid "Other Info"
-msgstr ""
+msgstr "Inne informacje"
 
 msgctxt "view:stock.shipment.in.return:"
 msgid "Wait"
@@ -2388,7 +2353,7 @@ msgstr "Anuluj"
 
 msgctxt "view:stock.shipment.in:"
 msgid "Done"
-msgstr "Ukończony"
+msgstr "Wykonano"
 
 msgctxt "view:stock.shipment.in:"
 msgid "Incoming Moves"
@@ -2400,7 +2365,7 @@ msgstr ""
 
 msgctxt "view:stock.shipment.in:"
 msgid "Other Info"
-msgstr ""
+msgstr "Inne informacje"
 
 msgctxt "view:stock.shipment.in:"
 msgid "Receive"
@@ -2408,7 +2373,7 @@ msgstr "Odbierz"
 
 msgctxt "view:stock.shipment.in:"
 msgid "Reset to Draft"
-msgstr "Przywróć do szkicu"
+msgstr ""
 
 msgctxt "view:stock.shipment.internal.assign.failed:"
 msgid "Unable to assign those products:"
@@ -2424,15 +2389,15 @@ msgstr "Anuluj"
 
 msgctxt "view:stock.shipment.internal:"
 msgid "Done"
-msgstr "Ukończony"
+msgstr "Wykonano"
 
 msgctxt "view:stock.shipment.internal:"
 msgid "Draft"
-msgstr "Szkic"
+msgstr ""
 
 msgctxt "view:stock.shipment.internal:"
 msgid "Other Info"
-msgstr ""
+msgstr "Inne informacje"
 
 msgctxt "view:stock.shipment.internal:"
 msgid "Ship"
@@ -2452,11 +2417,11 @@ msgstr "Anuluj"
 
 msgctxt "view:stock.shipment.out.return:"
 msgid "Done"
-msgstr "Ukończony"
+msgstr "Wykonano"
 
 msgctxt "view:stock.shipment.out.return:"
 msgid "Draft"
-msgstr "Szkic"
+msgstr ""
 
 msgctxt "view:stock.shipment.out.return:"
 msgid "Incoming Moves"
@@ -2468,7 +2433,7 @@ msgstr ""
 
 msgctxt "view:stock.shipment.out.return:"
 msgid "Other Info"
-msgstr ""
+msgstr "Inne informacje"
 
 #, fuzzy
 msgctxt "view:stock.shipment.out.return:"
@@ -2485,11 +2450,11 @@ msgstr "Anuluj"
 
 msgctxt "view:stock.shipment.out:"
 msgid "Done"
-msgstr "Ukończony"
+msgstr "Wykonano"
 
 msgctxt "view:stock.shipment.out:"
 msgid "Draft"
-msgstr "Szkic"
+msgstr ""
 
 msgctxt "view:stock.shipment.out:"
 msgid "Make shipment"
@@ -2497,7 +2462,7 @@ msgstr ""
 
 msgctxt "view:stock.shipment.out:"
 msgid "Other Info"
-msgstr ""
+msgstr "Inne informacje"
 
 msgctxt "view:stock.shipment.out:"
 msgid "Outgoing Moves"
diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index 9c27437..b0add71 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"
 
@@ -43,6 +43,10 @@ msgstr ""
 "A localização \"%s\" com movimentações existentes não pode ser modificada "
 "para um tipo que não suporta movimentações."
 
+msgctxt "error:stock.location:"
+msgid "The location '%(location)s' must be empty to be deactivated."
+msgstr "A localização '%(location)s' deve estar vazia para ser desativada."
+
 msgctxt "error:stock.move:"
 msgid "Internal move quantity must be positive"
 msgstr "A quantidade na movimentação interna deve ser um valor positivo"
@@ -56,16 +60,16 @@ msgid "Source and destination location must be different"
 msgstr "A origem e o destino devem ser diferentes"
 
 msgctxt "error:stock.move:"
-msgid "The stock move \"%s\" has no origin."
-msgstr "A movimentação de estoque \"%s\" não tem origem."
+msgid "The stock moves \"%s\" have no origin."
+msgstr "As movimentações de estoque \"%s\" não têm origem."
 
 msgctxt "error:stock.move:"
 msgid ""
-"You can not delete stock move \"%s\" because it is not in draft or cancelled"
-" state."
+"You can not delete stock move \"%s\" because it is not in staging, draft nor"
+" cancelled state."
 msgstr ""
 "Você não pode apagar a movimentação de estoque \"%s\" porque ela não está no"
-" estado \"Rascunho\" ou \"Cancelado\"."
+" estado Em processamento, Rascunho ou Cancelado."
 
 msgctxt "error:stock.move:"
 msgid "You can not modify move \"%(move)s\" because period \"%(period)s\" is closed."
@@ -186,8 +190,8 @@ msgid "Party"
 msgstr "Pessoa"
 
 msgctxt "field:party.party.location,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr "Nome do Registro"
 
 msgctxt "field:party.party.location,supplier_location:"
 msgid "Supplier Location"
@@ -254,8 +258,8 @@ msgid "Inventory Sequence"
 msgstr "Sequência do Inventário"
 
 msgctxt "field:stock.configuration,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr "Nome do Registro"
 
 msgctxt "field:stock.configuration,shipment_in_return_sequence:"
 msgid "Supplier Return Shipment Sequence"
@@ -302,8 +306,8 @@ msgid "ID"
 msgstr "ID"
 
 msgctxt "field:stock.configuration.location,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr "Nome do Registro"
 
 msgctxt "field:stock.configuration.location,shipment_internal_transit:"
 msgid "Internal Shipment Transit"
@@ -338,8 +342,8 @@ msgid "Inventory Sequence"
 msgstr "Sequência de Inventório"
 
 msgctxt "field:stock.configuration.sequence,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr "Nome do Registro"
 
 msgctxt "field:stock.configuration.sequence,shipment_in_return_sequence:"
 msgid "Supplier Return Shipment Sequence"
@@ -406,8 +410,8 @@ msgid "Number"
 msgstr "Número"
 
 msgctxt "field:stock.inventory,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr "Nome do Registro"
 
 msgctxt "field:stock.inventory,state:"
 msgid "State"
@@ -458,8 +462,8 @@ msgid "Quantity"
 msgstr "Quantidade"
 
 msgctxt "field:stock.inventory.line,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr "Nome do Registro"
 
 msgctxt "field:stock.inventory.line,unit_digits:"
 msgid "Unit Digits"
@@ -505,6 +509,10 @@ msgctxt "field:stock.location,create_uid:"
 msgid "Create User"
 msgstr "Criado por"
 
+msgctxt "field:stock.location,flat_childs:"
+msgid "Flat Children"
+msgstr "Filhos planificados"
+
 msgctxt "field:stock.location,forecast_quantity:"
 msgid "Forecast Quantity"
 msgstr "Quantidade Prevista"
@@ -542,8 +550,8 @@ msgid "Quantity"
 msgstr "Quantidade"
 
 msgctxt "field:stock.location,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr "Nome do Registro"
 
 msgctxt "field:stock.location,right:"
 msgid "Right"
@@ -586,8 +594,8 @@ msgid "Lead Time"
 msgstr "Tempo de Espera"
 
 msgctxt "field:stock.location.lead_time,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr "Nome do Registro"
 
 msgctxt "field:stock.location.lead_time,sequence:"
 msgid "Sequence"
@@ -670,8 +678,8 @@ msgid "Quantity"
 msgstr "Quantidade"
 
 msgctxt "field:stock.move,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr "Nome do Registro"
 
 msgctxt "field:stock.move,shipment:"
 msgid "Shipment"
@@ -734,8 +742,8 @@ msgid "ID"
 msgstr "ID"
 
 msgctxt "field:stock.period,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr "Nome do Registro"
 
 msgctxt "field:stock.period,state:"
 msgid "State"
@@ -778,8 +786,8 @@ msgid "Product"
 msgstr "Produto"
 
 msgctxt "field:stock.period.cache,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr "Nome do Registro"
 
 msgctxt "field:stock.period.cache,write_date:"
 msgid "Write Date"
@@ -810,8 +818,8 @@ msgid "Quantity"
 msgstr "Quantidade"
 
 msgctxt "field:stock.product_quantities_warehouse,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr "Nome do Registro"
 
 msgctxt "field:stock.product_quantities_warehouse,write_date:"
 msgid "Write Date"
@@ -894,8 +902,8 @@ msgid "Planned Date"
 msgstr "Data planejada"
 
 msgctxt "field:stock.shipment.in,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr "Nome do Registro"
 
 msgctxt "field:stock.shipment.in,received_by:"
 msgid "Received By"
@@ -990,8 +998,8 @@ msgid "Planned Date"
 msgstr "Data planejada"
 
 msgctxt "field:stock.shipment.in.return,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr "Nome do Registro"
 
 msgctxt "field:stock.shipment.in.return,reference:"
 msgid "Reference"
@@ -1086,8 +1094,8 @@ msgid "Planned Start Date"
 msgstr "Data Planejada de Início"
 
 msgctxt "field:stock.shipment.internal,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr "Nome do Registro"
 
 msgctxt "field:stock.shipment.internal,reference:"
 msgid "Reference"
@@ -1194,8 +1202,8 @@ msgid "Planned Date"
 msgstr "Data planejada"
 
 msgctxt "field:stock.shipment.out,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr "Nome do Registro"
 
 msgctxt "field:stock.shipment.out,reference:"
 msgid "Reference"
@@ -1294,8 +1302,8 @@ msgid "Planned Date"
 msgstr "Data planejada"
 
 msgctxt "field:stock.shipment.out.return,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr "Nome do Registro"
 
 msgctxt "field:stock.shipment.out.return,received_by:"
 msgid "Received By"
@@ -1355,6 +1363,10 @@ msgstr ""
 "* Um valor vazio é uma data infinita no futuro.\n"
 "* Uma data no passado fornecerá valores do histórico."
 
+msgctxt "help:stock.location,flat_childs:"
+msgid "Check to restrict to one level of children."
+msgstr "Marque para restringir os níveis dos filhos a um nível."
+
 msgctxt "help:stock.location,picking_location:"
 msgid "If empty the Storage is used"
 msgstr "Se vazio, o armazém é usado"
diff --git a/locale/ru.po b/locale/ru.po
index cbf483d..4756b05 100644
--- a/locale/ru.po
+++ b/locale/ru.po
@@ -1,4 +1,4 @@
-# 
+#
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
@@ -44,6 +44,10 @@ msgstr ""
 "Местоположение \"%s\" с существующими перемещениями не может быть изменено "
 "на тип который не поддерживает перемещения."
 
+msgctxt "error:stock.location:"
+msgid "The location '%(location)s' must be empty to be deactivated."
+msgstr ""
+
 msgctxt "error:stock.move:"
 msgid "Internal move quantity must be positive"
 msgstr "Внутреннее перемещение должно быть положительным числом"
@@ -57,13 +61,14 @@ msgid "Source and destination location must be different"
 msgstr "Исходное и принимающее местоположения должны быть разными"
 
 msgctxt "error:stock.move:"
-msgid "The stock move \"%s\" has no origin."
+msgid "The stock moves \"%s\" have no origin."
 msgstr ""
 
+#, fuzzy
 msgctxt "error:stock.move:"
 msgid ""
-"You can not delete stock move \"%s\" because it is not in draft or cancelled"
-" state."
+"You can not delete stock move \"%s\" because it is not in staging, draft nor"
+" cancelled state."
 msgstr ""
 "Вы не можете удалить перемещение \"%s\" так как оно не в состоянии "
 "\"Черновик\" или \"Отменено\"."
@@ -180,10 +185,9 @@ msgctxt "field:party.party.location,party:"
 msgid "Party"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:party.party.location,rec_name:"
-msgid "Name"
-msgstr "Наименование"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:party.party.location,supplier_location:"
@@ -254,8 +258,8 @@ msgid "Inventory Sequence"
 msgstr ""
 
 msgctxt "field:stock.configuration,rec_name:"
-msgid "Name"
-msgstr "Наименование"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.configuration,shipment_in_return_sequence:"
 msgid "Supplier Return Shipment Sequence"
@@ -304,10 +308,9 @@ msgctxt "field:stock.configuration.location,id:"
 msgid "ID"
 msgstr "ID"
 
-#, fuzzy
 msgctxt "field:stock.configuration.location,rec_name:"
-msgid "Name"
-msgstr "Наименование"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.configuration.location,shipment_internal_transit:"
 msgid "Internal Shipment Transit"
@@ -347,10 +350,9 @@ msgctxt "field:stock.configuration.sequence,inventory_sequence:"
 msgid "Inventory Sequence"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.configuration.sequence,rec_name:"
-msgid "Name"
-msgstr "Наименование"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:stock.configuration.sequence,shipment_in_return_sequence:"
@@ -425,8 +427,8 @@ msgid "Number"
 msgstr "Номер"
 
 msgctxt "field:stock.inventory,rec_name:"
-msgid "Name"
-msgstr "Наименование"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.inventory,state:"
 msgid "State"
@@ -478,8 +480,8 @@ msgid "Quantity"
 msgstr "Кол-во"
 
 msgctxt "field:stock.inventory.line,rec_name:"
-msgid "Name"
-msgstr "Наименование"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.inventory.line,unit_digits:"
 msgid "Unit Digits"
@@ -525,6 +527,10 @@ msgctxt "field:stock.location,create_uid:"
 msgid "Create User"
 msgstr "Создано пользователем"
 
+msgctxt "field:stock.location,flat_childs:"
+msgid "Flat Children"
+msgstr ""
+
 msgctxt "field:stock.location,forecast_quantity:"
 msgid "Forecast Quantity"
 msgstr "Прогноз количества"
@@ -562,8 +568,8 @@ msgid "Quantity"
 msgstr "Кол-во"
 
 msgctxt "field:stock.location,rec_name:"
-msgid "Name"
-msgstr "Наименование"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.location,right:"
 msgid "Right"
@@ -609,10 +615,9 @@ msgctxt "field:stock.location.lead_time,lead_time:"
 msgid "Lead Time"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.location.lead_time,rec_name:"
-msgid "Name"
-msgstr "Правило оплаты"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:stock.location.lead_time,sequence:"
@@ -700,8 +705,8 @@ msgid "Quantity"
 msgstr "Кол-во"
 
 msgctxt "field:stock.move,rec_name:"
-msgid "Name"
-msgstr "Наименование"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.move,shipment:"
 msgid "Shipment"
@@ -764,8 +769,8 @@ msgid "ID"
 msgstr "ID"
 
 msgctxt "field:stock.period,rec_name:"
-msgid "Name"
-msgstr "Наименование"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.period,state:"
 msgid "State"
@@ -808,8 +813,8 @@ msgid "Product"
 msgstr "Продукт"
 
 msgctxt "field:stock.period.cache,rec_name:"
-msgid "Name"
-msgstr "Наименование"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.period.cache,write_date:"
 msgid "Write Date"
@@ -840,8 +845,8 @@ msgid "Quantity"
 msgstr "Кол-во"
 
 msgctxt "field:stock.product_quantities_warehouse,rec_name:"
-msgid "Name"
-msgstr "Наименование"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.product_quantities_warehouse,write_date:"
 msgid "Write Date"
@@ -929,8 +934,8 @@ msgid "Planned Date"
 msgstr "Плановая дата"
 
 msgctxt "field:stock.shipment.in,rec_name:"
-msgid "Name"
-msgstr "Наименование"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.shipment.in,received_by:"
 msgid "Received By"
@@ -1028,8 +1033,8 @@ msgid "Planned Date"
 msgstr "Плановая дата"
 
 msgctxt "field:stock.shipment.in.return,rec_name:"
-msgid "Name"
-msgstr "Наименование"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.shipment.in.return,reference:"
 msgid "Reference"
@@ -1128,8 +1133,8 @@ msgid "Planned Start Date"
 msgstr ""
 
 msgctxt "field:stock.shipment.internal,rec_name:"
-msgid "Name"
-msgstr "Наименование"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.shipment.internal,reference:"
 msgid "Reference"
@@ -1238,8 +1243,8 @@ msgid "Planned Date"
 msgstr "Плановая дата"
 
 msgctxt "field:stock.shipment.out,rec_name:"
-msgid "Name"
-msgstr "Наименование"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.shipment.out,reference:"
 msgid "Reference"
@@ -1340,8 +1345,8 @@ msgid "Planned Date"
 msgstr "Плановая дата"
 
 msgctxt "field:stock.shipment.out.return,rec_name:"
-msgid "Name"
-msgstr "Наименование"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.shipment.out.return,received_by:"
 msgid "Received By"
@@ -1402,6 +1407,10 @@ msgid ""
 "* A date in the past will provide historical values."
 msgstr ""
 
+msgctxt "help:stock.location,flat_childs:"
+msgid "Check to restrict to one level of children."
+msgstr ""
+
 msgctxt "help:stock.location,picking_location:"
 msgid "If empty the Storage is used"
 msgstr ""
diff --git a/locale/sl.po b/locale/sl.po
index daf094a..bd7fc8a 100644
--- a/locale/sl.po
+++ b/locale/sl.po
@@ -1,4 +1,4 @@
-# 
+#
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
@@ -39,6 +39,10 @@ msgstr ""
 "Lokacije \"%s\" z obstoječim prometom ni možno pretvoriti v lokacijo, ki ne "
 "podpira prometa."
 
+msgctxt "error:stock.location:"
+msgid "The location '%(location)s' must be empty to be deactivated."
+msgstr ""
+
 msgctxt "error:stock.move:"
 msgid "Internal move quantity must be positive"
 msgstr "Količina notranjega prometa mora biti večja od nič."
@@ -51,14 +55,16 @@ msgctxt "error:stock.move:"
 msgid "Source and destination location must be different"
 msgstr "Izvorna in ciljna lokacija mora biti različni."
 
+#, fuzzy
 msgctxt "error:stock.move:"
-msgid "The stock move \"%s\" has no origin."
+msgid "The stock moves \"%s\" have no origin."
 msgstr "Promet zaloge \"%s\" nima porekla."
 
+#, fuzzy
 msgctxt "error:stock.move:"
 msgid ""
-"You can not delete stock move \"%s\" because it is not in draft or cancelled"
-" state."
+"You can not delete stock move \"%s\" because it is not in staging, draft nor"
+" cancelled state."
 msgstr ""
 "Prometa zaloge \"%s\" ni možno brisati, ker niso v stanju priprave ali "
 "preklica."
@@ -174,8 +180,8 @@ msgid "Party"
 msgstr "Partner"
 
 msgctxt "field:party.party.location,rec_name:"
-msgid "Name"
-msgstr "Ime"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:party.party.location,supplier_location:"
 msgid "Supplier Location"
@@ -242,8 +248,8 @@ msgid "Inventory Sequence"
 msgstr "Štetje inventur"
 
 msgctxt "field:stock.configuration,rec_name:"
-msgid "Name"
-msgstr "Ime"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.configuration,shipment_in_return_sequence:"
 msgid "Supplier Return Shipment Sequence"
@@ -290,8 +296,8 @@ msgid "ID"
 msgstr "ID"
 
 msgctxt "field:stock.configuration.location,rec_name:"
-msgid "Name"
-msgstr "Ime"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.configuration.location,shipment_internal_transit:"
 msgid "Internal Shipment Transit"
@@ -326,8 +332,8 @@ msgid "Inventory Sequence"
 msgstr "Štetje inventur"
 
 msgctxt "field:stock.configuration.sequence,rec_name:"
-msgid "Name"
-msgstr "Ime"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.configuration.sequence,shipment_in_return_sequence:"
 msgid "Supplier Return Shipment Sequence"
@@ -394,8 +400,8 @@ msgid "Number"
 msgstr "Številka"
 
 msgctxt "field:stock.inventory,rec_name:"
-msgid "Name"
-msgstr "Ime"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.inventory,state:"
 msgid "State"
@@ -446,8 +452,8 @@ msgid "Quantity"
 msgstr "Količina"
 
 msgctxt "field:stock.inventory.line,rec_name:"
-msgid "Name"
-msgstr "Ime"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.inventory.line,unit_digits:"
 msgid "Unit Digits"
@@ -493,6 +499,10 @@ msgctxt "field:stock.location,create_uid:"
 msgid "Create User"
 msgstr "Izdelal"
 
+msgctxt "field:stock.location,flat_childs:"
+msgid "Flat Children"
+msgstr ""
+
 msgctxt "field:stock.location,forecast_quantity:"
 msgid "Forecast Quantity"
 msgstr "Predvidena količina"
@@ -530,8 +540,8 @@ msgid "Quantity"
 msgstr "Količina"
 
 msgctxt "field:stock.location,rec_name:"
-msgid "Name"
-msgstr "Ime"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.location,right:"
 msgid "Right"
@@ -574,8 +584,8 @@ msgid "Lead Time"
 msgstr "Dobavni rok"
 
 msgctxt "field:stock.location.lead_time,rec_name:"
-msgid "Name"
-msgstr "Ime"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.location.lead_time,sequence:"
 msgid "Sequence"
@@ -658,8 +668,8 @@ msgid "Quantity"
 msgstr "Količina"
 
 msgctxt "field:stock.move,rec_name:"
-msgid "Name"
-msgstr "Ime"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.move,shipment:"
 msgid "Shipment"
@@ -722,8 +732,8 @@ msgid "ID"
 msgstr "ID"
 
 msgctxt "field:stock.period,rec_name:"
-msgid "Name"
-msgstr "Ime"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.period,state:"
 msgid "State"
@@ -766,8 +776,8 @@ msgid "Product"
 msgstr "Izdelek"
 
 msgctxt "field:stock.period.cache,rec_name:"
-msgid "Name"
-msgstr "Ime"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.period.cache,write_date:"
 msgid "Write Date"
@@ -798,8 +808,8 @@ msgid "Quantity"
 msgstr "Količina"
 
 msgctxt "field:stock.product_quantities_warehouse,rec_name:"
-msgid "Name"
-msgstr "Ime"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.product_quantities_warehouse,write_date:"
 msgid "Write Date"
@@ -882,8 +892,8 @@ msgid "Planned Date"
 msgstr "Načrtovan datum"
 
 msgctxt "field:stock.shipment.in,rec_name:"
-msgid "Name"
-msgstr "Ime"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.shipment.in,received_by:"
 msgid "Received By"
@@ -978,8 +988,8 @@ msgid "Planned Date"
 msgstr "Načrtovan datum"
 
 msgctxt "field:stock.shipment.in.return,rec_name:"
-msgid "Name"
-msgstr "Ime"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.shipment.in.return,reference:"
 msgid "Reference"
@@ -1074,8 +1084,8 @@ msgid "Planned Start Date"
 msgstr "Načrtovan začetek"
 
 msgctxt "field:stock.shipment.internal,rec_name:"
-msgid "Name"
-msgstr "Ime"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.shipment.internal,reference:"
 msgid "Reference"
@@ -1182,8 +1192,8 @@ msgid "Planned Date"
 msgstr "Načrtovan datum"
 
 msgctxt "field:stock.shipment.out,rec_name:"
-msgid "Name"
-msgstr "Ime"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.shipment.out,reference:"
 msgid "Reference"
@@ -1282,8 +1292,8 @@ msgid "Planned Date"
 msgstr "Načrtovan datum"
 
 msgctxt "field:stock.shipment.out.return,rec_name:"
-msgid "Name"
-msgstr "Ime"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.shipment.out.return,received_by:"
 msgid "Received By"
@@ -1343,6 +1353,10 @@ msgstr ""
 "* Prazno polje pomeni neskončno v prihodnost.\n"
 "* Pretekli datum daje zgodovino zaloge."
 
+msgctxt "help:stock.location,flat_childs:"
+msgid "Check to restrict to one level of children."
+msgstr ""
+
 msgctxt "help:stock.location,picking_location:"
 msgid "If empty the Storage is used"
 msgstr "Če je prazno, se uporabi Shramba"
diff --git a/locale/zh_CN.po b/locale/zh_CN.po
index 4709715..617294b 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"
 
@@ -35,6 +35,10 @@ msgid ""
 "not support moves."
 msgstr ""
 
+msgctxt "error:stock.location:"
+msgid "The location '%(location)s' must be empty to be deactivated."
+msgstr ""
+
 msgctxt "error:stock.move:"
 msgid "Internal move quantity must be positive"
 msgstr ""
@@ -48,13 +52,13 @@ msgid "Source and destination location must be different"
 msgstr ""
 
 msgctxt "error:stock.move:"
-msgid "The stock move \"%s\" has no origin."
+msgid "The stock moves \"%s\" have no origin."
 msgstr ""
 
 msgctxt "error:stock.move:"
 msgid ""
-"You can not delete stock move \"%s\" because it is not in draft or cancelled"
-" state."
+"You can not delete stock move \"%s\" because it is not in staging, draft nor"
+" cancelled state."
 msgstr ""
 
 msgctxt "error:stock.move:"
@@ -161,10 +165,9 @@ msgctxt "field:party.party.location,party:"
 msgid "Party"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:party.party.location,rec_name:"
-msgid "Name"
-msgstr "纳木"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:party.party.location,supplier_location:"
 msgid "Supplier Location"
@@ -236,10 +239,9 @@ msgctxt "field:stock.configuration,inventory_sequence:"
 msgid "Inventory Sequence"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.configuration,rec_name:"
-msgid "Name"
-msgstr "纳木"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.configuration,shipment_in_return_sequence:"
 msgid "Supplier Return Shipment Sequence"
@@ -290,10 +292,9 @@ msgctxt "field:stock.configuration.location,id:"
 msgid "ID"
 msgstr "编号"
 
-#, fuzzy
 msgctxt "field:stock.configuration.location,rec_name:"
-msgid "Name"
-msgstr "纳木"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.configuration.location,shipment_internal_transit:"
 msgid "Internal Shipment Transit"
@@ -332,10 +333,9 @@ msgctxt "field:stock.configuration.sequence,inventory_sequence:"
 msgid "Inventory Sequence"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.configuration.sequence,rec_name:"
-msgid "Name"
-msgstr "纳木"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.configuration.sequence,shipment_in_return_sequence:"
 msgid "Supplier Return Shipment Sequence"
@@ -407,10 +407,9 @@ msgctxt "field:stock.inventory,number:"
 msgid "Number"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.inventory,rec_name:"
-msgid "Name"
-msgstr "纳木"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:stock.inventory,state:"
@@ -466,10 +465,9 @@ msgctxt "field:stock.inventory.line,quantity:"
 msgid "Quantity"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.inventory.line,rec_name:"
-msgid "Name"
-msgstr "纳木"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.inventory.line,unit_digits:"
 msgid "Unit Digits"
@@ -522,6 +520,10 @@ msgctxt "field:stock.location,create_uid:"
 msgid "Create User"
 msgstr "添加用户"
 
+msgctxt "field:stock.location,flat_childs:"
+msgid "Flat Children"
+msgstr ""
+
 msgctxt "field:stock.location,forecast_quantity:"
 msgid "Forecast Quantity"
 msgstr ""
@@ -561,10 +563,9 @@ msgctxt "field:stock.location,quantity:"
 msgid "Quantity"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.location,rec_name:"
-msgid "Name"
-msgstr "纳木"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.location,right:"
 msgid "Right"
@@ -611,10 +612,9 @@ msgctxt "field:stock.location.lead_time,lead_time:"
 msgid "Lead Time"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.location.lead_time,rec_name:"
-msgid "Name"
-msgstr "纳木"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:stock.location.lead_time,sequence:"
@@ -702,10 +702,9 @@ msgctxt "field:stock.move,quantity:"
 msgid "Quantity"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.move,rec_name:"
-msgid "Name"
-msgstr "纳木"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.move,shipment:"
 msgid "Shipment"
@@ -774,10 +773,9 @@ msgctxt "field:stock.period,id:"
 msgid "ID"
 msgstr "编号"
 
-#, fuzzy
 msgctxt "field:stock.period,rec_name:"
-msgid "Name"
-msgstr "纳木"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:stock.period,state:"
@@ -825,10 +823,9 @@ msgctxt "field:stock.period.cache,product:"
 msgid "Product"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.period.cache,rec_name:"
-msgid "Name"
-msgstr "纳木"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:stock.period.cache,write_date:"
@@ -864,10 +861,9 @@ msgctxt "field:stock.product_quantities_warehouse,quantity:"
 msgid "Quantity"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.product_quantities_warehouse,rec_name:"
-msgid "Name"
-msgstr "纳木"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:stock.product_quantities_warehouse,write_date:"
@@ -956,10 +952,9 @@ msgctxt "field:stock.shipment.in,planned_date:"
 msgid "Planned Date"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.shipment.in,rec_name:"
-msgid "Name"
-msgstr "纳木"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.shipment.in,received_by:"
 msgid "Received By"
@@ -1059,10 +1054,9 @@ msgctxt "field:stock.shipment.in.return,planned_date:"
 msgid "Planned Date"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.shipment.in.return,rec_name:"
-msgid "Name"
-msgstr "纳木"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.shipment.in.return,reference:"
 msgid "Reference"
@@ -1163,10 +1157,9 @@ msgctxt "field:stock.shipment.internal,planned_start_date:"
 msgid "Planned Start Date"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.shipment.internal,rec_name:"
-msgid "Name"
-msgstr "纳木"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.shipment.internal,reference:"
 msgid "Reference"
@@ -1279,10 +1272,9 @@ msgctxt "field:stock.shipment.out,planned_date:"
 msgid "Planned Date"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.shipment.out,rec_name:"
-msgid "Name"
-msgstr "纳木"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.shipment.out,reference:"
 msgid "Reference"
@@ -1387,10 +1379,9 @@ msgctxt "field:stock.shipment.out.return,planned_date:"
 msgid "Planned Date"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:stock.shipment.out.return,rec_name:"
-msgid "Name"
-msgstr "纳木"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:stock.shipment.out.return,received_by:"
 msgid "Received By"
@@ -1450,6 +1441,10 @@ msgid ""
 "* A date in the past will provide historical values."
 msgstr ""
 
+msgctxt "help:stock.location,flat_childs:"
+msgid "Check to restrict to one level of children."
+msgstr ""
+
 msgctxt "help:stock.location,picking_location:"
 msgid "If empty the Storage is used"
 msgstr ""
diff --git a/location.py b/location.py
index fcfd97d..6556b84 100644
--- a/location.py
+++ b/location.py
@@ -54,6 +54,9 @@ class Location(ModelSQL, ModelView):
     left = fields.Integer('Left', required=True, select=True)
     right = fields.Integer('Right', required=True, select=True)
     childs = fields.One2Many("stock.location", "parent", "Children")
+    flat_childs = fields.Boolean(
+        "Flat Children",
+        help="Check to restrict to one level of children.")
     warehouse = fields.Function(fields.Many2One('stock.location', 'Warehouse'),
         'get_warehouse')
     input_location = fields.Many2One(
@@ -121,10 +124,22 @@ class Location(ModelSQL, ModelView):
                     ),
                 'child_of_warehouse': ('Location "%(location)s" must be a '
                     'child of warehouse "%(warehouse)s".'),
+                'inactive_location_with_moves': (
+                    "The location '%(location)s' must be empty "
+                    "to be deactivated."),
                 })
 
-        parent_domain = []
-        childs_domain = []
+        parent_domain = [
+            ['OR',
+                ('parent.flat_childs', '=', False),
+                ('parent', '=', None),
+                ]
+            ]
+        childs_domain = [
+            If(Eval('flat_childs', False),
+                ('childs', '=', None),
+                ()),
+            ]
         childs_mapping = cls._childs_domain()
         for type_, allowed_parents in cls._parent_domain().iteritems():
             parent_domain.append(If(Eval('type') == type_,
@@ -133,7 +148,7 @@ class Location(ModelSQL, ModelView):
                     ('type', 'in', childs_mapping[type_]), ()))
         cls.parent.domain = parent_domain
         cls.childs.domain = childs_domain
-        cls.childs.depends.append('type')
+        cls.childs.depends.extend(['flat_childs', 'type'])
 
     @classmethod
     def _parent_domain(cls):
@@ -170,8 +185,12 @@ class Location(ModelSQL, ModelView):
     def validate(cls, locations):
         super(Location, cls).validate(locations)
         cls.check_recursion(locations)
+        inactives = []
         for location in locations:
             location.check_type_for_moves()
+            if not location.active:
+                inactives.append(location)
+        cls.check_inactive(inactives)
 
     def check_type_for_moves(self):
         """ Check locations with moves have types compatible with moves. """
@@ -191,6 +210,52 @@ class Location(ModelSQL, ModelView):
                 self.raise_user_error(
                     'invalid_type_for_moves', (self.rec_name,))
 
+    @classmethod
+    def check_inactive(cls, locations):
+        "Check inactive location are empty"
+        assert all(not l.active for l in locations)
+        empty = cls.get_empty_locations(locations)
+        non_empty = set(locations) - set(empty)
+        if non_empty:
+            cls.raise_user_error('inactive_location_with_moves', {
+                    'location': next(iter(non_empty)).rec_name,
+                    })
+
+    @classmethod
+    def get_empty_locations(cls, locations=None):
+        pool = Pool()
+        Move = pool.get('stock.move')
+        if locations is None:
+            locations = cls.search([])
+        if not locations:
+            return []
+        location_ids = map(int, locations)
+        # Use root to compute for all companies
+        # and ensures inactive locations are in the query
+        with Transaction().set_user(0), \
+                Transaction().set_context(active_test=False):
+            query = Move.compute_quantities_query(
+                location_ids, with_childs=True)
+            quantities = Move.compute_quantities(
+                query, location_ids, with_childs=True)
+            empty = set(location_ids)
+            for (location_id, product), quantity in quantities.iteritems():
+                if quantity:
+                    empty.discard(location_id)
+            for sub_ids in grouped_slice(list(empty)):
+                sub_ids = list(sub_ids)
+                moves = Move.search([
+                        ('state', 'not in', ['done', 'cancel']),
+                        ['OR',
+                            ('from_location', 'in', sub_ids),
+                            ('to_location', 'in', sub_ids),
+                            ],
+                        ])
+                for move in moves:
+                    for location in [move.from_location, move.to_location]:
+                        empty.discard(location.id)
+        return cls.browse(empty)
+
     @staticmethod
     def default_active():
         return True
@@ -203,6 +268,10 @@ class Location(ModelSQL, ModelView):
     def default_right():
         return 0
 
+    @classmethod
+    def default_flat_childs(cls):
+        return False
+
     @staticmethod
     def default_type():
         return 'storage'
diff --git a/move.py b/move.py
index 19e2a04..58c0576 100644
--- a/move.py
+++ b/move.py
@@ -1,15 +1,15 @@
 # This file is part of Tryton.  The COPYRIGHT file at the top level of
 # this repository contains the full copyright notices and license terms.
 import datetime
+import hashlib
 import operator
 from decimal import Decimal
-from functools import partial
 from collections import OrderedDict, defaultdict
 from itertools import groupby
 
 from sql import Literal, Union, Column, Null, For
 from sql.aggregate import Sum
-from sql.conditionals import Coalesce
+from sql.conditionals import Coalesce, Case
 from sql.operators import Concat
 
 from trytond.model import Workflow, Model, ModelView, ModelSQL, fields, Check
@@ -19,7 +19,7 @@ from trytond.tools import reduce_ids
 from trytond.transaction import Transaction
 from trytond.pool import Pool
 
-from trytond.modules.product import price_digits, TemplateFunction
+from trytond.modules.product import price_digits
 
 __all__ = ['StockMixin', 'Move']
 
@@ -31,6 +31,9 @@ LOCATION_DOMAIN = [
     If(Eval('state').in_(['staging', 'draft', 'cancel']),
         ('type', 'not in', ['warehouse']),
         ('type', 'not in', ['warehouse', 'view'])),
+    If(~Eval('state').in_(['done', 'cancel']),
+        ('active', '=', True),
+        ()),
     ]
 LOCATION_DEPENDS = ['state']
 
@@ -154,8 +157,13 @@ class Move(Workflow, ModelSQL, ModelView):
     _order_name = 'product'
     product = fields.Many2One("product.product", "Product", required=True,
         select=True, states=STATES,
-        domain=[('type', '!=', 'service')],
-        depends=DEPENDS)
+        domain=[
+            ('type', '!=', 'service'),
+            If(Bool(Eval('product_uom_category')),
+                ('default_uom_category', '=', Eval('product_uom_category')),
+                ())
+            ],
+        depends=DEPENDS + ['product_uom_category'])
     product_uom_category = fields.Function(
         fields.Many2One('product.uom.category', 'Product Uom Category'),
         'on_change_with_product_uom_category')
@@ -189,11 +197,13 @@ class Move(Workflow, ModelSQL, ModelView):
                 | Eval('shipment'))
             }, depends=['state', 'shipment'],
         select=True)
-    effective_date = fields.Date("Effective Date", readonly=True, select=True,
+    effective_date = fields.Date("Effective Date", select=True,
         states={
             'required': Eval('state') == 'done',
+            'readonly': (Eval('state').in_(['cancel', 'done'])
+                | Eval('shipment')),
             },
-        depends=['state'])
+        depends=['state', 'shipment'])
     state = fields.Selection([
         ('staging', 'Staging'),
         ('draft', 'Draft'),
@@ -260,18 +270,19 @@ class Move(Workflow, ModelSQL, ModelView):
             'set_state_assigned': ('You can not set stock move "%s" to '
                 'assigned state.'),
             'set_state_done': 'You can not set stock move "%s" to done state.',
-            'del_draft_cancel': ('You can not delete stock move "%s" because '
-                'it is not in draft or cancelled state.'),
+            'delele_state': ('You can not delete stock move "%s" because '
+                'it is not in staging, draft nor cancelled state.'),
             'period_closed': ('You can not modify move "%(move)s" because '
                 'period "%(period)s" is closed.'),
             'modify_assigned': ('You can not modify stock move "%s" because '
                 'it is in "Assigned" state.'),
             'modify_done_cancel': ('You can not modify stock move "%s" '
                 'because it is in "Done" or "Cancel" state.'),
-            'no_origin': 'The stock move "%s" has no origin.',
+            'no_origin': 'The stock moves "%s" have no origin.',
             })
         cls._transitions |= set((
                 ('staging', 'draft'),
+                ('staging', 'cancel'),
                 ('draft', 'assigned'),
                 ('draft', 'done'),
                 ('draft', 'cancel'),
@@ -447,22 +458,23 @@ class Move(Workflow, ModelSQL, ModelView):
 
     @fields.depends('from_location', 'to_location')
     def on_change_with_unit_price_required(self, name=None):
-        if (self.from_location
-                and self.from_location.type in ('supplier', 'production')):
+        from_type = self.from_location.type if self.from_location else None
+        to_type = self.to_location.type if self.to_location else None
+
+        if from_type == 'supplier' and to_type == 'storage':
             return True
-        if (self.to_location
-                and self.to_location.type == 'customer'):
+        if from_type == 'production':
             return True
-        if (self.from_location and self.to_location
-                and self.from_location.type == 'storage'
-                and self.to_location.type == 'supplier'):
+        if from_type == 'storage' and to_type == 'customer':
+            return True
+        if from_type == 'storage' and to_type == 'supplier':
             return True
         return False
 
     @fields.depends('from_location')
     def on_change_with_assignation_required(self, name=None):
         if self.from_location:
-            return self.from_location.type == 'storage'
+            return self.from_location.type in {'storage', 'view'}
 
     @staticmethod
     def _get_shipment():
@@ -527,9 +539,9 @@ class Move(Workflow, ModelSQL, ModelView):
 
     @classmethod
     def search_rec_name(cls, name, clause):
-        return [('product',) + tuple(clause[1:])]
+        return [('product.rec_name',) + tuple(clause[1:])]
 
-    def _update_product_cost_price(self, direction):
+    def _compute_product_cost_price(self, direction):
         """
         Update the cost price on the given product.
         The direction must be "in" if incoming and "out" if outgoing.
@@ -537,59 +549,38 @@ class Move(Workflow, ModelSQL, ModelView):
         pool = Pool()
         Uom = pool.get('product.uom')
         Product = pool.get('product.product')
-        ProductTemplate = pool.get('product.template')
-        Location = pool.get('stock.location')
         Currency = pool.get('currency.currency')
-        Date = pool.get('ir.date')
 
         if direction == 'in':
             quantity = self.quantity
         elif direction == 'out':
             quantity = -self.quantity
-        context = {}
-        locations = Location.search([
-                ('type', '=', 'storage'),
-                ])
-        context['with_childs'] = False
-        context['locations'] = [l.id for l in locations]
-        context['stock_date_end'] = Date.today()
-        with Transaction().set_context(context):
-            product = Product(self.product.id)
-        qty = Uom.compute_qty(self.uom, quantity, product.default_uom)
+        qty = Uom.compute_qty(self.uom, quantity, self.product.default_uom)
 
         qty = Decimal(str(qty))
-        if not isinstance(Product.cost_price, TemplateFunction):
-            product_qty = product.quantity
-        else:
-            product_qty = product.template.quantity
-        product_qty = Decimal(str(max(product_qty, 0)))
+        product_qty = Decimal(str(self.product.quantity))
         # convert wrt currency
         with Transaction().set_context(date=self.effective_date):
             unit_price = Currency.compute(self.currency, self.unit_price,
                 self.company.currency, round=False)
         # convert wrt to the uom
         unit_price = Uom.compute_price(self.uom, unit_price,
-            product.default_uom)
-        if product_qty + qty != Decimal('0.0'):
+            self.product.default_uom)
+        cost_price = self.product.get_multivalue(
+            'cost_price', **self._cost_price_pattern)
+        if product_qty + qty > 0 and product_qty >= 0:
             new_cost_price = (
-                (product.cost_price * product_qty) + (unit_price * qty)
+                (cost_price * product_qty) + (unit_price * qty)
                 ) / (product_qty + qty)
-        else:
-            new_cost_price = product.cost_price
+        elif direction == 'in':
+            new_cost_price = unit_price
+        elif direction == 'out':
+            new_cost_price = cost_price
 
-        if not isinstance(Product.cost_price, TemplateFunction):
-            digits = Product.cost_price.digits
-            write = partial(Product.write, [product])
-        else:
-            digits = ProductTemplate.cost_price.digits
-            write = partial(ProductTemplate.write, [product.template])
-        new_cost_price = new_cost_price.quantize(
+        digits = Product.cost_price.digits
+        return new_cost_price.quantize(
             Decimal(str(10.0 ** -digits[1])))
 
-        write({
-                'cost_price': new_cost_price,
-                })
-
     @staticmethod
     def _get_internal_quantity(quantity, uom, product):
         Uom = Pool().get('product.uom')
@@ -624,26 +615,93 @@ class Move(Workflow, ModelSQL, ModelView):
     @ModelView.button
     @Workflow.transition('done')
     def do(cls, moves):
+        pool = Pool()
+        Product = pool.get('product.product')
+
+        def set_cost_values(cost_values):
+            Value = Product.multivalue_model('cost_price')
+            values = []
+            for product, cost_price, pattern in cost_values:
+                values.extend(product.set_multivalue(
+                        'cost_price', cost_price, save=False, **pattern))
+            Value.save(values)
+
         cls.check_origin(moves)
-        for move in moves:
-            move.set_effective_date()
-            move._do()
-            move.state = 'done'
-            # This save() call can't be grouped because the average computation
-            # of product cost price requires each move to be done separately
-            move.save()
+        for key, grouped_moves in groupby(moves, key=cls._cost_price_key):
+            to_save = []
+            cost_values = []
+            products = set()
+            grouped_moves = list(grouped_moves)
+            context = dict(key)
+            context.update(cls._cost_price_context(grouped_moves))
+            with Transaction().set_context(context):
+                grouped_moves = cls.browse(grouped_moves)
+                for move in grouped_moves:
+                    if move.product in products:
+                        # The average computation of product cost price
+                        # requires each previous move of the same product to be
+                        # saved
+                        cls.save(to_save)
+                        set_cost_values(cost_values)
+                        del to_save[:]
+                        del cost_values[:]
+                        products.clear()
+
+                    move.set_effective_date()
+                    cost_price = move._do()
+                    if cost_price is not None:
+                        cost_values.append(
+                            (move.product, cost_price,
+                                move._cost_price_pattern))
+                    if move.cost_price is None:
+                        if cost_price is None:
+                            cost_price = move.product.get_multivalue(
+                                'cost_price', **move._cost_price_pattern)
+                        move.cost_price = cost_price
+                    move.state = 'done'
+
+                    to_save.append(move)
+                    products.add(move.product)
+
+                if to_save:
+                    cls.save(to_save)
+                if cost_values:
+                    set_cost_values(cost_values)
+
+    @property
+    def _cost_price_pattern(self):
+        return {
+            'company': self.company.id,
+            }
+
+    def _cost_price_key(self):
+        return (
+            ('company', self.company.id),
+            )
+
+    @classmethod
+    def _cost_price_context(cls, moves):
+        pool = Pool()
+        Location = pool.get('stock.location')
+        Date = pool.get('ir.date')
+        context = {}
+        locations = Location.search([
+                ('type', '=', 'storage'),
+                ])
+        context['with_childs'] = False
+        context['locations'] = [l.id for l in locations]
+        context['stock_date_end'] = Date.today()
+        return context
 
     def _do(self):
         if (self.from_location.type in ('supplier', 'production')
                 and self.to_location.type == 'storage'
                 and self.product.cost_price_method == 'average'):
-            self._update_product_cost_price('in')
+            return self._compute_product_cost_price('in')
         elif (self.to_location.type == 'supplier'
                 and self.from_location.type == 'storage'
                 and self.product.cost_price_method == 'average'):
-            self._update_product_cost_price('out')
-        if self.cost_price is None:
-            self.cost_price = self.product.cost_price
+            return self._compute_product_cost_price('out')
 
     @classmethod
     @ModelView.button
@@ -708,8 +766,8 @@ class Move(Workflow, ModelSQL, ModelView):
     @classmethod
     def delete(cls, moves):
         for move in moves:
-            if move.state not in ('draft', 'cancel'):
-                cls.raise_user_error('del_draft_cancel', (move.rec_name,))
+            if move.state not in {'staging', 'draft', 'cancel'}:
+                cls.raise_user_error('delele_state', (move.rec_name,))
         super(Move, cls).delete(moves)
 
     @staticmethod
@@ -723,12 +781,19 @@ class Move(Workflow, ModelSQL, ModelView):
             types = cls.check_origin_types()
         if not types:
             return
-        for move in moves:
-            if ((move.from_location.type in types
-                        or move.to_location.type in types)
-                    and not move.origin):
-                cls.raise_user_warning('%s.done' % move,
-                    'no_origin', move.rec_name)
+
+        def no_origin(move):
+            return ((move.from_location.type in types) ^
+                (move.to_location.type in types)
+                and not move.origin)
+        moves = filter(no_origin, moves)
+        if moves:
+            names = ', '.join(m.rec_name for m in moves[:5])
+            if len(moves) > 5:
+                names += '...'
+            warning_name = '%s.done' % hashlib.md5(
+                str(moves).encode('utf-8')).hexdigest()
+            cls.raise_user_warning(warning_name, 'no_origin', names)
 
     def pick_product(self, location_quantities):
         """
@@ -952,6 +1017,84 @@ class Move(Workflow, ModelSQL, ModelView):
         if PeriodCache:
             period_cache = PeriodCache.__table__()
 
+        if with_childs:
+            # Replace tables with union which replaces flat children locations
+            # by their parent location.
+            from_location = Location.__table__()
+            from_parent_location = Location.__table__()
+            to_location = Location.__table__()
+            to_parent_location = Location.__table__()
+            columns = ['id', 'state', 'effective_date', 'planned_date',
+                'internal_quantity'] + list(grouping)
+            columns = [Column(move, c).as_(c) for c in columns]
+
+            move_with_parent = (move
+                .join(from_location,
+                    condition=move.from_location == from_location.id)
+                .join(from_parent_location, type_='LEFT',
+                    condition=from_location.parent == from_parent_location.id)
+                .join(to_location,
+                    condition=move.to_location == to_location.id)
+                .join(to_parent_location, type_='LEFT',
+                    condition=to_location.parent == to_parent_location.id))
+
+            move = Union(
+                # Moves not linked to any flat location
+                move_with_parent.select(
+                    move.from_location.as_('from_location'),
+                    move.to_location.as_('to_location'),
+                    *columns,
+                    where=(Coalesce(from_parent_location.flat_childs, False)
+                        != True)
+                    & (Coalesce(to_parent_location.flat_childs, False)
+                        != True)),
+                # Append moves linked from/to flat locations to their parents
+                move_with_parent.select(
+                    Case(
+                        (from_parent_location.flat_childs,
+                            from_parent_location.id),
+                        else_=move.from_location).as_('from_location'),
+                    Case(
+                        (to_parent_location.flat_childs,
+                            to_parent_location.id),
+                        else_=move.to_location).as_('to_location'),
+                    *columns,
+                    where=(from_parent_location.flat_childs == True)
+                    | (to_parent_location.flat_childs == True)),
+                # Append moves linked to from/to flat locations only
+                move_with_parent.select(
+                    Case(
+                        (from_parent_location.flat_childs,
+                            from_location.id),
+                        else_=Null).as_('from_location'),
+                    Case(
+                        (to_parent_location.flat_childs,
+                            to_location.id),
+                        else_=Null).as_('to_location'),
+                    *columns,
+                    where=(from_parent_location.flat_childs == True)
+                    | (to_parent_location.flat_childs == True)),
+                all_=True)
+
+            if PeriodCache:
+                location = Location.__table__()
+                parent_location = Location.__table__()
+                columns = ['internal_quantity', 'period'] + list(grouping)
+                columns = [Column(period_cache, c).as_(c) for c in columns]
+                period_cache = Union(
+                    period_cache.select(
+                        period_cache.location.as_('location'),
+                        *columns),
+                    period_cache.join(location,
+                        condition=period_cache.location == location.id
+                        ).join(parent_location, type_='LEFT',
+                        condition=location.parent == parent_location.id
+                        ).select(
+                        parent_location.id.as_('location'),
+                        *columns,
+                        where=parent_location.flat_childs == True),
+                    all_=True)
+
         if not context.get('stock_date_end'):
             context['stock_date_end'] = datetime.date.max
 
@@ -1092,9 +1235,7 @@ class Move(Workflow, ModelSQL, ModelView):
                 state_date_clause_out &= state_date_clause()
 
         if with_childs:
-            location_query = Location.search([
-                    ('parent', 'child_of', location_ids),
-                    ], query=True, order=[])
+            location_query = _location_children(location_ids, query=True)
         else:
             location_query = location_ids[:]
 
@@ -1191,7 +1332,6 @@ class Move(Workflow, ModelSQL, ModelView):
             and quantity as value.
         """
         pool = Pool()
-        Location = pool.get('stock.location')
         Product = pool.get('product.product')
 
         assert query is not None, (
@@ -1223,15 +1363,13 @@ class Move(Workflow, ModelSQL, ModelView):
         # Propagate quantities on from child locations to their parents
         if with_childs and len(location_ids) > 1:
             # Fetch all child locations
-            locations = Location.search([
-                    ('parent', 'child_of', location_ids),
-                    ])
+            locations = _location_children(location_ids)
             # Generate a set of locations without childs and a dict
             # giving the parent of each location.
             leafs = set([l.id for l in locations])
             parent = {}
             for location in locations:
-                if not location.parent:
+                if not location.parent or location.parent.flat_childs:
                     continue
                 if location.parent.id in leafs:
                     leafs.remove(location.parent.id)
@@ -1270,3 +1408,26 @@ class Move(Workflow, ModelSQL, ModelView):
             quantities[key] = uom.round(quantity)
 
         return quantities
+
+
+def _location_children(location_ids, query=False):
+    "Return children location without including flat children"
+    pool = Pool()
+    Location = pool.get('stock.location')
+    nested_location_ids = []
+    flat_location_ids = []
+    for location in Location.browse(location_ids):
+        if location.flat_childs:
+            flat_location_ids.append(location.id)
+        else:
+            nested_location_ids.append(location.id)
+    if nested_location_ids:
+        return Location.search(['OR',
+                ('parent', 'child_of', nested_location_ids),
+                ('id', 'in', flat_location_ids),
+                ], query=query, order=[])
+    else:
+        if query:
+            return flat_location_ids
+        else:
+            return Location.browse(flat_location_ids)
diff --git a/picking_list.fodt b/picking_list.fodt
new file mode 100644
index 0000000..8b0bb53
--- /dev/null
+++ b/picking_list.fodt
@@ -0,0 +1,490 @@
+<?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.2.7.2$Linux_X86_64 LibreOffice_project/20m0$Build-2</meta:generator><meta:initial-creator>Bertrand Chenal</meta:initial-creator><meta:creation-date>2009-03-26T13:54:48</meta:creation-date><dc:date>2016-03-21T16:05:27.395388483</dc:date><meta:editing-cycles>50</meta:editing-cycles><meta:editing-duration>PT7H39M6S</meta:editing-duration><meta:document-statistic meta:character-count="829" meta:image-count="0" meta:non-whitespace-character-count="786" meta:object-count="0" meta:page-count="2" meta:paragraph-count="30" meta:table-count="1" meta:word-count="73"/><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">43760</config:config-item>
+   <config:config-item config:name="ViewAreaHeight" config:type="long">21691</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">2630</config:config-item>
+     <config:config-item config:name="ViewTop" config:type="long">5313</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">43759</config:config-item>
+     <config:config-item config:name="VisibleBottom" config:type="long">21689</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>
+     <config:config-item config:name="ZoomFactor" config:type="short">100</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="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="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">2539458</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">true</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">1812667</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 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="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="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="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="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="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.6924in" fo:margin-left="0in" fo:margin-right="0in" fo:margin-top="0.15in" fo:margin-bottom="0in" table:align="margins"/>
+  </style:style>
+  <style:style style:name="Table1.A" style:family="table-column">
+   <style:table-column-properties style:column-width="1.8438in" style:rel-column-width="18053*"/>
+  </style:style>
+  <style:style style:name="Table1.C" style:family="table-column">
+   <style:table-column-properties style:column-width="1.8444in" style:rel-column-width="18060*"/>
+  </style:style>
+  <style:style style:name="Table1.D" style:family="table-column">
+   <style:table-column-properties style:column-width="1.1611in" style:rel-column-width="11369*"/>
+  </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.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: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.C2" 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.D2" 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="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
+  </style:style>
+  <style:style style:name="Table1.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="Table1.C3" 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.D3" 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="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
+  </style:style>
+  <style:style style:name="Table1.C4" 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.D4" 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="00201d29"/>
+  </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="00201d29"/>
+  </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="00201d29" style:font-size-asian="12pt" style:font-size-complex="12pt"/>
+  </style:style>
+  <style:style style:name="P4" 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="00215c08"/>
+  </style:style>
+  <style:style style:name="P5" style:family="paragraph" style:parent-style-name="Footer">
+   <style:paragraph-properties fo:text-align="end" style:justify-single-word="false"/>
+  </style:style>
+  <style:style style:name="P6" 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="00201d29"/>
+  </style:style>
+  <style:style style:name="P7" 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="00201d29" style:font-size-asian="12pt" style:font-size-complex="12pt"/>
+  </style:style>
+  <style:style style:name="P8" 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="00201d29"/>
+  </style:style>
+  <style:style style:name="P9" 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="00215c08"/>
+  </style:style>
+  <style:style style:name="P10" style:family="paragraph" style:parent-style-name="Footer">
+   <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_Heading">
+   <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
+   <style:text-properties style:font-name="Liberation Serif2"/>
+  </style:style>
+  <style:style style:name="P12" 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="P13" style:family="paragraph" style:parent-style-name="Standard">
+   <style:paragraph-properties fo:break-before="page"/>
+  </style:style>
+  <style:style style:name="P14" style:family="paragraph" style:parent-style-name="Heading_20_1">
+   <style:paragraph-properties fo:text-align="center" style:justify-single-word="false" fo:break-before="page"/>
+   <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="P15" style:family="paragraph" style:parent-style-name="Standard">
+   <style:text-properties officeooo:paragraph-rsid="001d944d"/>
+  </style:style>
+  <style:style style:name="T1" style:family="text">
+   <style:text-properties fo:font-weight="bold" style:font-weight-asian="bold" style:font-weight-complex="bold"/>
+  </style:style>
+  <style:style style:name="T2" style:family="text">
+   <style:text-properties fo:font-weight="bold" officeooo:rsid="00236359" style:font-weight-asian="bold" style:font-weight-complex="bold"/>
+  </style:style>
+  <style:style style:name="T3" style:family="text">
+   <style:text-properties fo:font-weight="normal" style:font-weight-asian="normal" style:font-weight-complex="normal"/>
+  </style:style>
+  <style:page-layout style:name="pm1">
+   <style:page-layout-properties fo:page-width="8.2673in" fo:page-height="11.6925in" 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: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="company.header"></text:placeholder></text:p>
+    <text:p text:style-name="P1"><text:placeholder text:placeholder-type="text"><for each="line in 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"><company.rec_name></text:placeholder></text:p>
+   </style:header>
+   <style:footer>
+    <text:p text:style-name="P4"><text:placeholder text:placeholder-type="text"><if test="company.footer"></text:placeholder></text:p>
+    <text:p text:style-name="P4"><text:placeholder text:placeholder-type="text"><for each="line in company.footer.split('\n')"></text:placeholder></text:p>
+    <text:p text:style-name="P4"><text:placeholder text:placeholder-type="text"><line></text:placeholder></text:p>
+    <text:p text:style-name="P4"><text:placeholder text:placeholder-type="text"></for></text:placeholder></text:p>
+    <text:p text:style-name="P4"><text:placeholder text:placeholder-type="text"></if></text:placeholder></text:p>
+    <text:p text:style-name="P5"><text:page-number text:select-page="current">2</text:page-number>/<text:page-count>2</text:page-count></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="P13"><text:placeholder text:placeholder-type="text"><for each="shipment in records"></text:placeholder></text:p>
+   <text:p text:style-name="P14">Picking List</text:p>
+   <text:p text:style-name="P15"><text:span text:style-name="T2">Shipment Number</text:span><text:span text:style-name="T1">: </text:span><text:span text:style-name="T1"><text:placeholder text:placeholder-type="text"><shipment.number></text:placeholder></text:span></text:p>
+   <text:p text:style-name="Standard"><text:span text:style-name="T1">Reference:</text:span><text:span text:style-name="T3"> </text:span><text:span text:style-name="T3"><text:placeholder text:placeholder-type="text"><shipment.origins or ''></text:placeholder></text:span><text:span text:style-name="T3"><text:placeholder text:placeholder-type="text"><', ' if (shipment.origins and shipment.reference) else ''></text:placeholder></text:span><text:span text:style-name="T3"><text:placeholder text:placeholder-type="text"><shipment.reference or ''></text:placeholder></text:span></text:p>
+   <text:p text:style-name="Standard"><text:span text:style-name="T1">Customer:</text:span><text:span text:style-name="T3"> </text:span><text:span text:style-name="T3"><text:placeholder text:placeholder-type="text"><shipment.customer.rec_name></text:placeholder></text:span></text:p>
+   <text:p text:style-name="Standard"><text:span text:style-name="T1">Planned Date:</text:span><text:span text:style-name="T3"> </text:span><text:span text:style-name="T3"><text:placeholder text:placeholder-type="text"><shipment.planned_date and format_date(shipment.planned_date, user.language) or ''></text:placeholder></text:span></text:p>
+   <text:p text:style-name="Standard"><text:span text:style-name="T1">Warehouse:</text:span><text:span text:style-name="T3"> </text:span><text:span text:style-name="T3"><text:placeholder text:placeholder-type="text"><shipment.warehouse.rec_name></text:placeholder></text:span></text:p>
+   <table:table table:name="Table1" table:style-name="Table1">
+    <table:table-column table:style-name="Table1.A" table:number-columns-repeated="2"/>
+    <table:table-column table:style-name="Table1.C"/>
+    <table:table-column table:style-name="Table1.D"/>
+    <table:table-header-rows>
+     <table:table-row>
+      <table:table-cell table:style-name="Table1.A1" office:value-type="string">
+       <text:p text:style-name="P11">From Location</text:p>
+      </table:table-cell>
+      <table:table-cell table:style-name="Table1.A1" office:value-type="string">
+       <text:p text:style-name="P11">To Location</text:p>
+      </table:table-cell>
+      <table:table-cell table:style-name="Table1.A1" office:value-type="string">
+       <text:p text:style-name="P11">Product</text:p>
+      </table:table-cell>
+      <table:table-cell table:style-name="Table1.D1" office:value-type="string">
+       <text:p text:style-name="P11">Quantity</text:p>
+      </table:table-cell>
+     </table:table-row>
+    </table:table-header-rows>
+    <table:table-row>
+     <table:table-cell table:style-name="Table1.A4" 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="move in moves[shipment.id]"></text:placeholder></text:p>
+     </table:table-cell>
+     <table:covered-table-cell/>
+     <table:table-cell table:style-name="Table1.C4" office:value-type="string">
+      <text:p text:style-name="Table_20_Contents"/>
+     </table:table-cell>
+     <table:table-cell table:style-name="Table1.D4" office:value-type="string">
+      <text:p text:style-name="Table_20_Contents"/>
+     </table:table-cell>
+    </table:table-row>
+    <table:table-row>
+     <table:table-cell table:style-name="Table1.B3" office:value-type="string">
+      <text:p text:style-name="Table_20_Contents"><text:placeholder text:placeholder-type="text"><move.from_location.rec_name></text:placeholder></text:p>
+     </table:table-cell>
+     <table:table-cell table:style-name="Table1.B3" office:value-type="string">
+      <text:p text:style-name="Table_20_Contents"><text:placeholder text:placeholder-type="text"><move.to_location.rec_name></text:placeholder></text:p>
+     </table:table-cell>
+     <table:table-cell table:style-name="Table1.C4" office:value-type="string">
+      <text:p text:style-name="Table_20_Contents"><text:placeholder text:placeholder-type="text"><move.product.rec_name></text:placeholder></text:p>
+     </table:table-cell>
+     <table:table-cell table:style-name="Table1.D4" office:value-type="string">
+      <text:p text:style-name="P12"><text:placeholder text:placeholder-type="text"><format_number(move.quantity, user.language, digits=move.unit_digits)></text:placeholder> <text:placeholder text:placeholder-type="text"><move.uom.symbol></text:placeholder></text:p>
+     </table:table-cell>
+    </table:table-row>
+    <table:table-row>
+     <table:table-cell table:style-name="Table1.A4" 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-cell table:style-name="Table1.C4" office:value-type="string">
+      <text:p text:style-name="Table_20_Contents"/>
+     </table:table-cell>
+     <table:table-cell table:style-name="Table1.D4" office:value-type="string">
+      <text:p text:style-name="Table_20_Contents"/>
+     </table:table-cell>
+    </table:table-row>
+   </table:table>
+   <text:p text:style-name="Text_20_body"><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/picking_list.odt b/picking_list.odt
deleted file mode 100644
index a48d3c0..0000000
Binary files a/picking_list.odt and /dev/null differ
diff --git a/product.py b/product.py
index c0504ae..395e857 100644
--- a/product.py
+++ b/product.py
@@ -185,18 +185,7 @@ class Product(StockMixin, object):
 
     @classmethod
     def recompute_cost_price(cls, products):
-        pool = Pool()
-        Template = pool.get('product.template')
-
-        if not isinstance(cls.cost_price, TemplateFunction):
-            digits = cls.cost_price.digits
-            write = cls.write
-            record = lambda p: p
-        else:
-            digits = Template.cost_price.digits
-            write = Template.write
-            record = lambda p: p.template
-
+        digits = cls.cost_price.digits
         costs = defaultdict(list)
         for product in products:
             if product.type == 'service':
@@ -204,7 +193,7 @@ class Product(StockMixin, object):
             cost = getattr(product,
                 'recompute_cost_price_%s' % product.cost_price_method)()
             cost = cost.quantize(Decimal(str(10.0 ** -digits[1])))
-            costs[cost].append(record(product))
+            costs[cost].append(product)
 
         if not costs:
             return
@@ -216,7 +205,7 @@ class Product(StockMixin, object):
 
         # Enforce check access for account_stock*
         with Transaction().set_context(_check_access=True):
-            write(*to_write)
+            cls.write(*to_write)
 
     def recompute_cost_price_fixed(self):
         return self.cost_price
@@ -265,10 +254,12 @@ class Product(StockMixin, object):
                         move.company.currency, round=False)
                 unit_price = Uom.compute_price(move.uom, unit_price,
                     self.default_uom)
-                if quantity + qty != 0:
+                if quantity + qty > 0 and quantity >= 0:
                     cost_price = (
                         (cost_price * quantity) + (unit_price * qty)
                         ) / (quantity + qty)
+                elif qty > 0:
+                    cost_price = unit_price
             quantity += qty
         return cost_price
 
diff --git a/setup.py b/setup.py
index 2c54199..de975bf 100644
--- a/setup.py
+++ b/setup.py
@@ -75,7 +75,7 @@ setup(name=name,
         ],
     package_data={
         'trytond.modules.stock': (info.get('xml', [])
-            + ['tryton.cfg', 'view/*.xml', 'locale/*.po', '*.odt',
+            + ['tryton.cfg', 'view/*.xml', 'locale/*.po', '*.fodt',
                 'icons/*.svg', 'tests/*.rst']),
         },
     classifiers=[
@@ -104,9 +104,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/shipment.py b/shipment.py
index 638b77a..1b6b766 100644
--- a/shipment.py
+++ b/shipment.py
@@ -140,8 +140,10 @@ class ShipmentIn(Workflow, ModelSQL, ModelView):
             'Inventory Moves',
             domain=[
                 ('from_location', '=', Eval('warehouse_input')),
-                ('to_location', 'child_of', [Eval('warehouse_storage', -1)],
-                    'parent'),
+                If(~Eval('state').in_(['done', 'cancel']),
+                    ('to_location', 'child_of',
+                        [Eval('warehouse_storage', -1)], 'parent'),
+                    (),),
                 ('company', '=', Eval('company')),
                 ],
             states={
@@ -577,12 +579,14 @@ class ShipmentInReturn(Workflow, ModelSQL, ModelView):
             If(Eval('state') == 'draft', [
                     ('from_location', '=', Eval('from_location')),
                     ('to_location', '=', Eval('to_location')),
-                    ], [
-                    ('from_location', 'child_of', [Eval('from_location', -1)],
-                        'parent'),
-                    ('to_location', 'child_of', [Eval('to_location', -1)],
-                        'parent'),
-                    ]),
+                    ],
+                If(~Eval('state').in_(['done', 'cancel']), [
+                        ('from_location', 'child_of',
+                            [Eval('from_location', -1)], 'parent'),
+                        ('to_location', 'child_of',
+                            [Eval('to_location', -1)], 'parent'),
+                        ],
+                    [])),
             ('company', '=', Eval('company')),
             ],
         depends=['state', 'from_location', 'to_location', 'company'])
@@ -833,8 +837,9 @@ class ShipmentInReturn(Workflow, ModelSQL, ModelView):
     def assign_try(cls, shipments):
         pool = Pool()
         Move = pool.get('stock.move')
-        if Move.assign_try([m for s in shipments for m in s.moves],
-                with_childs=False):
+        to_assign = [m for s in shipments for m in s.moves
+            if m.assignation_required]
+        if Move.assign_try(to_assign, with_childs=False):
             cls.assign(shipments)
             return True
         else:
@@ -914,8 +919,10 @@ class ShipmentOut(Workflow, ModelSQL, ModelView):
     inventory_moves = fields.Function(fields.One2Many('stock.move', 'shipment',
             'Inventory Moves',
             domain=[
-                ('from_location', 'child_of', [Eval('warehouse_storage', -1)],
-                    'parent'),
+                If(Eval('state').in_(['waiting']),
+                    ('from_location', 'child_of',
+                        [Eval('warehouse_storage', -1)], 'parent'),
+                    ()),
                 ('to_location', '=', Eval('warehouse_output')),
                 ('company', '=', Eval('company')),
                 ],
@@ -1425,8 +1432,9 @@ class ShipmentOut(Workflow, ModelSQL, ModelView):
     @ModelView.button
     def assign_try(cls, shipments):
         Move = Pool().get('stock.move')
-        if Move.assign_try([m for s in shipments
-                    for m in s.inventory_moves]):
+        to_assign = [m for s in shipments for m in s.inventory_moves
+            if m.assignation_required]
+        if Move.assign_try(to_assign):
             cls.assign(shipments)
             return True
         else:
@@ -1508,8 +1516,10 @@ class ShipmentOutReturn(Workflow, ModelSQL, ModelView):
             'Inventory Moves',
             domain=[
                 ('from_location', '=', Eval('warehouse_input')),
-                ('to_location', 'child_of', [Eval('warehouse_storage', -1)],
-                    'parent'),
+                If(Eval('state').in_(['received']),
+                    ('to_location', 'child_of',
+                        [Eval('warehouse_storage', -1)], 'parent'),
+                    ()),
                 ('company', '=', Eval('company')),
                 ],
             states={
@@ -1956,25 +1966,28 @@ class ShipmentInternal(Workflow, ModelSQL, ModelView):
                     ('from_location', '=', Eval('from_location')),
                     ('to_location', '=', Eval('to_location')),
                     ],
-                If(~Eval('transit_location'),
-                    [
-                        ('from_location', 'child_of',
-                            [Eval('from_location', -1)], 'parent'),
-                        ('to_location', 'child_of',
-                            [Eval('to_location', -1)], 'parent'),
-                        ],
-                    ['OR',
+                If(~Eval('state').in_(['done', 'cancel']),
+                    If(~Eval('transit_location'),
                         [
                             ('from_location', 'child_of',
                                 [Eval('from_location', -1)], 'parent'),
-                            ('to_location', '=', Eval('transit_location')),
-                            ],
-                        [
-                            ('from_location', '=', Eval('transit_location')),
                             ('to_location', 'child_of',
                                 [Eval('to_location', -1)], 'parent'),
                             ],
-                        ])),
+                        ['OR',
+                            [
+                                ('from_location', 'child_of',
+                                    [Eval('from_location', -1)], 'parent'),
+                                ('to_location', '=', Eval('transit_location')),
+                                ],
+                            [
+                                ('from_location', '=',
+                                    Eval('transit_location')),
+                                ('to_location', 'child_of',
+                                    [Eval('to_location', -1)], 'parent'),
+                                ],
+                            ]),
+                    [])),
             ('company', '=', Eval('company')),
             ],
         depends=['state', 'from_location', 'to_location', 'transit_location',
@@ -1982,12 +1995,15 @@ class ShipmentInternal(Workflow, ModelSQL, ModelView):
     outgoing_moves = fields.Function(fields.One2Many('stock.move', 'shipment',
             'Outgoing Moves',
             domain=[
-                ('from_location', 'child_of', [Eval('from_location', -1)],
-                    'parent'),
-                If(~Eval('transit_location'),
-                    ('to_location', 'child_of', [Eval('to_location', -1)],
-                        'parent'),
-                    ('to_location', '=', Eval('transit_location'))),
+                If(Eval('state').in_(['request', 'draft']), [
+                        ('from_location', 'child_of',
+                            [Eval('from_location', -1)], 'parent'),
+                        If(~Eval('transit_location'),
+                            ('to_location', 'child_of',
+                                [Eval('to_location', -1)], 'parent'),
+                            ('to_location', '=', Eval('transit_location'))),
+                        ],
+                    []),
                 ],
             states={
                 'readonly': Eval('state').in_(
@@ -2001,12 +2017,15 @@ class ShipmentInternal(Workflow, ModelSQL, ModelView):
     incoming_moves = fields.Function(fields.One2Many('stock.move', 'shipment',
             'Incoming Moves',
             domain=[
-                If(~Eval('transit_location'),
-                    ('from_location', 'child_of', [Eval('from_location', -1)],
-                        'parent'),
-                    ('from_location', '=', Eval('transit_location'))),
-                ('to_location', 'child_of', [Eval('to_location', -1)],
-                    'parent'),
+                If(~Eval('state').in_(['done', 'cancel']), [
+                        If(~Eval('transit_location'),
+                            ('from_location', 'child_of',
+                                [Eval('from_location', -1)], 'parent'),
+                            ('from_location', '=', Eval('transit_location'))),
+                        ('to_location', 'child_of',
+                            [Eval('to_location', -1)], 'parent'),
+                        ],
+                    []),
                 ],
             states={
                 'readonly': Eval('state').in_(['done', 'cancel']),
@@ -2418,7 +2437,7 @@ class ShipmentInternal(Workflow, ModelSQL, ModelView):
     def assign_try(cls, shipments):
         Move = Pool().get('stock.move')
         to_assign = [m for s in shipments for m in s.outgoing_moves
-            if m.from_location.type != 'lost_found']
+            if m.assignation_required]
         if not to_assign or Move.assign_try(to_assign):
             cls.assign(shipments)
             return True
diff --git a/shipment.xml b/shipment.xml
index ab51f00..8051c14 100644
--- a/shipment.xml
+++ b/shipment.xml
@@ -353,7 +353,7 @@ this repository contains the full copyright notices and license terms. -->
             <field name="name">Delivery Note</field>
             <field name="model">stock.shipment.out</field>
             <field name="report_name">stock.shipment.out.delivery_note</field>
-            <field name="report">stock/delivery_note.odt</field>
+            <field name="report">stock/delivery_note.fodt</field>
         </record>
         <record model="ir.action.keyword"
          id="report_shipment_out_delivery_note_keyword">
@@ -366,7 +366,7 @@ this repository contains the full copyright notices and license terms. -->
             <field name="name">Picking List</field>
             <field name="model">stock.shipment.out</field>
             <field name="report_name">stock.shipment.out.picking_list</field>
-            <field name="report">stock/picking_list.odt</field>
+            <field name="report">stock/picking_list.fodt</field>
         </record>
         <record model="ir.action.keyword"
          id="report_shipment_out_picking_list_keyword">
@@ -379,7 +379,7 @@ this repository contains the full copyright notices and license terms. -->
             <field name="name">Restocking List</field>
             <field name="model">stock.shipment.in</field>
             <field name="report_name">stock.shipment.in.restocking_list</field>
-            <field name="report">stock/supplier_restocking_list.odt</field>
+            <field name="report">stock/supplier_restocking_list.fodt</field>
         </record>
         <record model="ir.action.keyword"
          id="report_shipment_in_restocking_list_keyword">
@@ -392,7 +392,7 @@ this repository contains the full copyright notices and license terms. -->
             <field name="name">Restocking List</field>
             <field name="model">stock.shipment.out.return</field>
             <field name="report_name">stock.shipment.out.return.restocking_list</field>
-            <field name="report">stock/customer_return_restocking_list.odt</field>
+            <field name="report">stock/customer_return_restocking_list.fodt</field>
         </record>
         <record model="ir.action.keyword"
          id="report_shipment_out_return_restocking_list_keyword">
@@ -405,7 +405,7 @@ this repository contains the full copyright notices and license terms. -->
             <field name="name">Internal Shipment</field>
             <field name="model">stock.shipment.internal</field>
             <field name="report_name">stock.shipment.internal.report</field>
-            <field name="report">stock/internal_shipment.odt</field>
+            <field name="report">stock/internal_shipment.fodt</field>
         </record>
         <record model="ir.action.keyword"
          id="report_shipment_internal_keyword">
diff --git a/supplier_restocking_list.fodt b/supplier_restocking_list.fodt
new file mode 100644
index 0000000..867063d
--- /dev/null
+++ b/supplier_restocking_list.fodt
@@ -0,0 +1,482 @@
+<?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.2.7.2$Linux_X86_64 LibreOffice_project/20m0$Build-2</meta:generator><meta:initial-creator>Bertrand Chenal</meta:initial-creator><meta:creation-date>2009-03-26T13:54:48</meta:creation-date><dc:date>2016-03-21T16:06:02.540152813</dc:date><meta:editing-cycles>51</meta:editing-cycles><meta:editing-duration>PT6H57M42S</meta:editing-duration><meta:document-statistic meta:character-count="832" meta:image-count="0" meta:non-whitespace-character-count="789" meta:object-count="0" meta:page-count="2" meta:paragraph-count="30" meta:table-count="1" meta:word-count="73"/><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">43760</config:config-item>
+   <config:config-item config:name="ViewAreaHeight" config:type="long">21691</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">2630</config:config-item>
+     <config:config-item config:name="ViewTop" config:type="long">5313</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">43759</config:config-item>
+     <config:config-item config:name="VisibleBottom" config:type="long">21689</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>
+     <config:config-item config:name="ZoomFactor" config:type="short">100</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="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="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">1829759</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">true</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">1289861</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 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="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="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="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="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="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.6924in" fo:margin-left="0in" fo:margin-right="0in" fo:margin-top="0.15in" fo:margin-bottom="0in" table:align="margins"/>
+  </style:style>
+  <style:style style:name="Table1.A" style:family="table-column">
+   <style:table-column-properties style:column-width="1.8438in" style:rel-column-width="18053*"/>
+  </style:style>
+  <style:style style:name="Table1.C" style:family="table-column">
+   <style:table-column-properties style:column-width="1.8444in" style:rel-column-width="18060*"/>
+  </style:style>
+  <style:style style:name="Table1.D" style:family="table-column">
+   <style:table-column-properties style:column-width="1.1611in" style:rel-column-width="11369*"/>
+  </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.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: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.C2" 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.D2" 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="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
+  </style:style>
+  <style:style style:name="Table1.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="Table1.C3" 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.D3" 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="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
+  </style:style>
+  <style:style style:name="Table1.C4" 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.D4" 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="0018924f"/>
+  </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="0018924f"/>
+  </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="0018924f" style:font-size-asian="12pt" style:font-size-complex="12pt"/>
+  </style:style>
+  <style:style style:name="P4" style:family="paragraph" style:parent-style-name="Footer">
+   <style:paragraph-properties fo:text-align="end" style:justify-single-word="false"/>
+  </style:style>
+  <style:style style:name="P5" 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="0018924f"/>
+  </style:style>
+  <style:style style:name="P6" 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="0018924f" style:font-size-asian="12pt" style:font-size-complex="12pt"/>
+  </style:style>
+  <style:style style:name="P7" 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="0018924f"/>
+  </style:style>
+  <style:style style:name="P8" style:family="paragraph" style:parent-style-name="Footer">
+   <style:paragraph-properties fo:text-align="end" style:justify-single-word="false"/>
+  </style:style>
+  <style:style style:name="P9" style:family="paragraph" style:parent-style-name="Table_20_Heading">
+   <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
+   <style:text-properties style:font-name="Liberation Serif2"/>
+  </style:style>
+  <style:style style:name="P10" style:family="paragraph" style:parent-style-name="Standard">
+   <style:paragraph-properties fo:break-before="page"/>
+  </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:style>
+  <style:style style:name="P12" style:family="paragraph" style:parent-style-name="Standard">
+   <style:text-properties officeooo:paragraph-rsid="0014daa2"/>
+  </style:style>
+  <style:style style:name="P13" style:family="paragraph" style:parent-style-name="Heading_20_1" style:master-page-name="">
+   <style:paragraph-properties fo:text-align="center" style:justify-single-word="false" style:page-number="auto" fo:break-before="page"/>
+   <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="T1" style:family="text">
+   <style:text-properties fo:font-weight="bold" style:font-weight-asian="bold" style:font-weight-complex="bold"/>
+  </style:style>
+  <style:style style:name="T2" style:family="text">
+   <style:text-properties fo:font-weight="bold" officeooo:rsid="001a23ce" style:font-weight-asian="bold" style:font-weight-complex="bold"/>
+  </style:style>
+  <style:style style:name="T3" style:family="text">
+   <style:text-properties fo:font-weight="normal" style:font-weight-asian="normal" style:font-weight-complex="normal"/>
+  </style:style>
+  <style:page-layout style:name="pm1">
+   <style:page-layout-properties fo:page-width="8.2673in" fo:page-height="11.6925in" 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: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="company.header"></text:placeholder></text:p>
+    <text:p text:style-name="P1"><text:placeholder text:placeholder-type="text"><for each="line in 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"><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="company.footer"></text:placeholder></text:p>
+    <text:p text:style-name="P2"><text:placeholder text:placeholder-type="text"><for each="line in 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>
+    <text:p text:style-name="P4"><text:page-number text:select-page="current">2</text:page-number>/<text:page-count>2</text:page-count></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="P10"><text:placeholder text:placeholder-type="text"><for each="shipment in records"></text:placeholder></text:p>
+   <text:p text:style-name="P13">Restocking List</text:p>
+   <text:p text:style-name="P12"><text:span text:style-name="T2">Shipment Number</text:span><text:span text:style-name="T1">: </text:span><text:span text:style-name="T1"><text:placeholder text:placeholder-type="text"><shipment.number></text:placeholder></text:span></text:p>
+   <text:p text:style-name="Standard"><text:span text:style-name="T1">Reference:</text:span><text:span text:style-name="T3"> </text:span><text:span text:style-name="T3"><text:placeholder text:placeholder-type="text"><shipment.origins or ''></text:placeholder></text:span><text:span text:style-name="T3"><text:placeholder text:placeholder-type="text"><', ' if (shipment.origins and shipment.reference) else ''></text:placeholder></text:span><text:span text:style-name="T3"><text:placeholder text:placeholder-type="text"><shipment.reference or ''></text:placeholder></text:span></text:p>
+   <text:p text:style-name="Standard"><text:span text:style-name="T1">Supplier:</text:span><text:span text:style-name="T3"> </text:span><text:span text:style-name="T3"><text:placeholder text:placeholder-type="text"><shipment.supplier.rec_name></text:placeholder></text:span></text:p>
+   <text:p text:style-name="Standard"><text:span text:style-name="T1">Planned Date:</text:span><text:span text:style-name="T3"> </text:span><text:span text:style-name="T3"><text:placeholder text:placeholder-type="text"><shipment.planned_date and format_date(shipment.planned_date, user.language) or ''></text:placeholder></text:span></text:p>
+   <text:p text:style-name="Standard"><text:span text:style-name="T1">Warehouse:</text:span><text:span text:style-name="T3"> </text:span><text:span text:style-name="T3"><text:placeholder text:placeholder-type="text"><shipment.warehouse.rec_name></text:placeholder></text:span></text:p>
+   <table:table table:name="Table1" table:style-name="Table1">
+    <table:table-column table:style-name="Table1.A" table:number-columns-repeated="2"/>
+    <table:table-column table:style-name="Table1.C"/>
+    <table:table-column table:style-name="Table1.D"/>
+    <table:table-header-rows>
+     <table:table-row>
+      <table:table-cell table:style-name="Table1.A1" office:value-type="string">
+       <text:p text:style-name="P9">From Location</text:p>
+      </table:table-cell>
+      <table:table-cell table:style-name="Table1.A1" office:value-type="string">
+       <text:p text:style-name="P9">To Location</text:p>
+      </table:table-cell>
+      <table:table-cell table:style-name="Table1.A1" office:value-type="string">
+       <text:p text:style-name="P9">Product</text:p>
+      </table:table-cell>
+      <table:table-cell table:style-name="Table1.D1" office:value-type="string">
+       <text:p text:style-name="P9">Quantity</text:p>
+      </table:table-cell>
+     </table:table-row>
+    </table:table-header-rows>
+    <table:table-row>
+     <table:table-cell table:style-name="Table1.A4" 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="move in moves[shipment.id]"></text:placeholder></text:p>
+     </table:table-cell>
+     <table:covered-table-cell/>
+     <table:table-cell table:style-name="Table1.C4" office:value-type="string">
+      <text:p text:style-name="Table_20_Contents"/>
+     </table:table-cell>
+     <table:table-cell table:style-name="Table1.D4" office:value-type="string">
+      <text:p text:style-name="Table_20_Contents"/>
+     </table:table-cell>
+    </table:table-row>
+    <table:table-row>
+     <table:table-cell table:style-name="Table1.B3" office:value-type="string">
+      <text:p text:style-name="Table_20_Contents"><text:placeholder text:placeholder-type="text"><move.from_location.rec_name></text:placeholder></text:p>
+     </table:table-cell>
+     <table:table-cell table:style-name="Table1.B3" office:value-type="string">
+      <text:p text:style-name="Table_20_Contents"><text:placeholder text:placeholder-type="text"><move.to_location.rec_name></text:placeholder></text:p>
+     </table:table-cell>
+     <table:table-cell table:style-name="Table1.C4" office:value-type="string">
+      <text:p text:style-name="Table_20_Contents"><text:placeholder text:placeholder-type="text"><move.product.rec_name></text:placeholder></text:p>
+     </table:table-cell>
+     <table:table-cell table:style-name="Table1.D4" office:value-type="string">
+      <text:p text:style-name="P11"><text:placeholder text:placeholder-type="text"><format_number(move.quantity, user.language, digits=move.unit_digits)></text:placeholder> <text:placeholder text:placeholder-type="text"><move.uom.symbol></text:placeholder></text:p>
+     </table:table-cell>
+    </table:table-row>
+    <table:table-row>
+     <table:table-cell table:style-name="Table1.A4" 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-cell table:style-name="Table1.C4" office:value-type="string">
+      <text:p text:style-name="Table_20_Contents"/>
+     </table:table-cell>
+     <table:table-cell table:style-name="Table1.D4" office:value-type="string">
+      <text:p text:style-name="Table_20_Contents"/>
+     </table:table-cell>
+    </table:table-row>
+   </table:table>
+   <text:p text:style-name="Text_20_body"><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/supplier_restocking_list.odt b/supplier_restocking_list.odt
deleted file mode 100644
index df8175f..0000000
Binary files a/supplier_restocking_list.odt and /dev/null differ
diff --git a/tests/scenario_stock_average_cost_price.rst b/tests/scenario_stock_average_cost_price.rst
index e2bc0ad..ac695a3 100644
--- a/tests/scenario_stock_average_cost_price.rst
+++ b/tests/scenario_stock_average_cost_price.rst
@@ -28,34 +28,37 @@ Create product::
     >>> ProductTemplate = Model.get('product.template')
     >>> Product = Model.get('product.product')
     >>> unit, = ProductUom.find([('name', '=', 'Unit')])
-    >>> product = Product()
+
     >>> template = ProductTemplate()
     >>> template.name = 'Product'
     >>> template.default_uom = unit
     >>> template.type = 'goods'
     >>> template.list_price = Decimal('300')
-    >>> template.cost_price = Decimal('80')
     >>> template.cost_price_method = 'average'
+    >>> product, = template.products
+    >>> product.cost_price = Decimal('80')
     >>> template.save()
-    >>> product.template = template
-    >>> product.save()
-    >>> negative_product = Product()
+    >>> product, = template.products
+
     >>> template = ProductTemplate()
     >>> template.name = 'Negative Product'
     >>> template.default_uom = unit
     >>> template.type = 'goods'
     >>> template.list_price = Decimal('28')
-    >>> template.cost_price = Decimal('5')
     >>> template.cost_price_method = 'average'
+    >>> negative_product, = template.products
+    >>> negative_product.cost_price = Decimal('5.0000')
     >>> template.save()
-    >>> negative_product.template = template
-    >>> negative_product.save()
+    >>> negative_product, = template.products
 
 Get stock locations::
 
     >>> Location = Model.get('stock.location')
     >>> supplier_loc, = Location.find([('code', '=', 'SUP')])
     >>> storage_loc, = Location.find([('code', '=', 'STO')])
+    >>> storage_sub_loc = Location(
+    ...     name="Storage Sub", type='storage', parent=storage_loc)
+    >>> storage_sub_loc.save()
     >>> customer_loc, = Location.find([('code', '=', 'CUS')])
 
 Make 1 unit of the product available @ 100 ::
@@ -66,7 +69,7 @@ Make 1 unit of the product available @ 100 ::
     >>> incoming_move.uom = unit
     >>> incoming_move.quantity = 1
     >>> incoming_move.from_location = supplier_loc
-    >>> incoming_move.to_location = storage_loc
+    >>> incoming_move.to_location = storage_sub_loc
     >>> incoming_move.planned_date = today
     >>> incoming_move.effective_date = today
     >>> incoming_move.company = company
@@ -77,7 +80,7 @@ Make 1 unit of the product available @ 100 ::
 Check Cost Price is 100::
 
     >>> product.reload()
-    >>> product.template.cost_price
+    >>> product.cost_price
     Decimal('100.0000')
 
 Add 1 more unit @ 200::
@@ -98,7 +101,7 @@ Add 1 more unit @ 200::
 Check Cost Price Average is 150::
 
     >>> product.reload()
-    >>> product.template.cost_price
+    >>> product.cost_price
     Decimal('150.0000')
 
 Add twice 1 more unit @ 200::
@@ -137,23 +140,23 @@ Add twice 1 more unit @ 200::
 Check Cost Price Average is 175::
 
     >>> product.reload()
-    >>> product.template.cost_price
+    >>> product.cost_price
     Decimal('175.0000')
 
 Change Cost Price to 125, to force to write recomputed price later::
 
-    >>> product.template.cost_price = Decimal('125.0000')
-    >>> product.template.save()
-    >>> product.template.cost_price
+    >>> product.cost_price = Decimal('125.0000')
+    >>> product.save()
+    >>> product.cost_price
     Decimal('125.0000')
 
 Recompute Cost Price::
 
     >>> recompute = Wizard('product.recompute_cost_price', [product])
-    >>> product.template.cost_price
+    >>> product.cost_price
     Decimal('175.0000')
 
-Send one product we dont have in stock::
+Send one product we don't have in stock::
 
     >>> outgoing_move = StockMove()
     >>> outgoing_move.product = negative_product
@@ -167,7 +170,52 @@ Send one product we dont have in stock::
     >>> outgoing_move.currency = company.currency
     >>> outgoing_move.click('do')
 
-Recieve two units of the product with negative stock::
+Cost price should stay 5::
+
+    >>> negative_product.cost_price
+    Decimal('5.0000')
+
+Return one product to the supplier::
+
+    >>> outgoing_move = StockMove()
+    >>> outgoing_move.product = negative_product
+    >>> outgoing_move.uom = unit
+    >>> outgoing_move.quantity = 1
+    >>> outgoing_move.from_location = storage_loc
+    >>> outgoing_move.to_location = supplier_loc
+    >>> outgoing_move.planned_date = today
+    >>> outgoing_move.effective_date = today
+    >>> outgoing_move.company = company
+    >>> outgoing_move.currency = company.currency
+    >>> outgoing_move.click('do')
+
+Cost price should stay 5::
+
+    >>> negative_product.cost_price
+    Decimal('5.0000')
+
+Receive one unit of the product with negative stock so the stock stays negative::
+
+    >>> incoming_move = StockMove()
+    >>> incoming_move.product = negative_product
+    >>> incoming_move.uom = unit
+    >>> incoming_move.quantity = 1
+    >>> incoming_move.from_location = supplier_loc
+    >>> incoming_move.to_location = storage_loc
+    >>> incoming_move.planned_date = today
+    >>> incoming_move.effective_date = today
+    >>> incoming_move.company = company
+    >>> incoming_move.unit_price = Decimal('3')
+    >>> incoming_move.currency = company.currency
+    >>> incoming_move.click('do')
+
+Cost price should be set to last unit price::
+
+    >>> negative_product.reload()
+    >>> negative_product.cost_price
+    Decimal('3.0000')
+
+Receive two units of the product so the stock becomes positive::
 
     >>> incoming_move = StockMove()
     >>> incoming_move.product = negative_product
@@ -182,7 +230,21 @@ Recieve two units of the product with negative stock::
     >>> incoming_move.currency = company.currency
     >>> incoming_move.click('do')
 
-Cost price should be set to 2::
+Cost price should be set to last unit price::
+
+    >>> negative_product.reload()
+    >>> negative_product.cost_price
+    Decimal('2.0000')
+
+Change Cost Price to 5, to force to write recomputed price later::
+
+    >>> negative_product.cost_price = Decimal('5.0000')
+    >>> negative_product.save()
+    >>> negative_product.cost_price
+    Decimal('5.0000')
+
+Recompute Cost Price::
 
-    >>> negative_product.template.cost_price
+    >>> recompute = Wizard('product.recompute_cost_price', [negative_product])
+    >>> negative_product.cost_price
     Decimal('2.0000')
diff --git a/tests/scenario_stock_inventory.rst b/tests/scenario_stock_inventory.rst
index 7b44689..5fbd253 100644
--- a/tests/scenario_stock_inventory.rst
+++ b/tests/scenario_stock_inventory.rst
@@ -33,14 +33,16 @@ Create products::
 
     >>> ProductUom = Model.get('product.uom')
     >>> ProductTemplate = Model.get('product.template')
+
     >>> unit, = ProductUom.find([('name', '=', 'Unit')])
     >>> template = ProductTemplate()
     >>> template.name = 'Product'
     >>> template.default_uom = unit
     >>> template.type = 'goods'
     >>> template.list_price = Decimal('300')
-    >>> template.cost_price = Decimal('80')
     >>> template.cost_price_method = 'average'
+    >>> product, = template.products
+    >>> product.cost_price = Decimal('80')
     >>> template.save()
     >>> product, = template.products
 
@@ -50,8 +52,9 @@ Create products::
     >>> template2.default_uom = kg
     >>> template2.type = 'goods'
     >>> template2.list_price = Decimal('140')
-    >>> template2.cost_price = Decimal('60')
     >>> template2.cost_price_method = 'average'
+    >>> product2, = template2.products
+    >>> product2.cost_price = Decimal('60')
     >>> template2.save()
     >>> product2, = template2.products
 
diff --git a/tests/scenario_stock_reporting.rst b/tests/scenario_stock_reporting.rst
index 552144f..ff8fb45 100644
--- a/tests/scenario_stock_reporting.rst
+++ b/tests/scenario_stock_reporting.rst
@@ -37,16 +37,13 @@ Create product::
     >>> ProductTemplate = Model.get('product.template')
     >>> Product = Model.get('product.product')
     >>> unit, = ProductUom.find([('name', '=', 'Unit')])
-    >>> product = Product()
     >>> template = ProductTemplate()
     >>> template.name = 'Product'
     >>> template.default_uom = unit
     >>> template.type = 'goods'
     >>> template.list_price = Decimal('20')
-    >>> template.cost_price = Decimal('8')
     >>> template.save()
-    >>> product.template = template
-    >>> product.save()
+    >>> product, = template.products
 
 Get stock locations::
 
diff --git a/tests/scenario_stock_shipment_internal.rst b/tests/scenario_stock_shipment_internal.rst
index 8ff130e..37b769f 100644
--- a/tests/scenario_stock_shipment_internal.rst
+++ b/tests/scenario_stock_shipment_internal.rst
@@ -8,7 +8,7 @@ Imports::
     >>> from dateutil.relativedelta import relativedelta
     >>> from decimal import Decimal
     >>> from proteus import Model, Wizard
-    >>> from trytond.tests.tools import activate_modules
+    >>> from trytond.tests.tools import activate_modules, set_user
     >>> from trytond.modules.company.tests.tools import create_company, \
     ...     get_company
     >>> today = datetime.date.today()
@@ -30,16 +30,13 @@ Create product::
     >>> ProductTemplate = Model.get('product.template')
     >>> Product = Model.get('product.product')
     >>> unit, = ProductUom.find([('name', '=', 'Unit')])
-    >>> product = Product()
     >>> template = ProductTemplate()
     >>> template.name = 'Product'
     >>> template.default_uom = unit
     >>> template.type = 'goods'
     >>> template.list_price = Decimal('20')
-    >>> template.cost_price = Decimal('8')
     >>> template.save()
-    >>> product.template = template
-    >>> product.save()
+    >>> product, = template.products
 
 Get stock locations::
 
@@ -71,7 +68,7 @@ Create stock user::
 
 Create Internal Shipment::
 
-    >>> config.user = stock_user.id
+    >>> set_user(stock_user)
     >>> Shipment = Model.get('stock.shipment.internal')
     >>> StockMove = Model.get('stock.move')
     >>> shipment = Shipment()
@@ -136,7 +133,7 @@ Check that now whe can finish the older shipment::
 
 Add lead time inside the warehouse::
 
-    >>> config.user = 1
+    >>> set_user(1)
     >>> LeadTime = Model.get('stock.location.lead_time')
     >>> lead_time = LeadTime()
     >>> lead_time.from_warehouse = storage_loc.warehouse
@@ -146,7 +143,7 @@ Add lead time inside the warehouse::
 
 Create Internal Shipment with lead time::
 
-    >>> config.user = stock_user.id
+    >>> set_user(stock_user)
     >>> shipment = Shipment()
     >>> shipment.planned_date = tomorrow
     >>> shipment.from_location = internal_loc
diff --git a/tests/scenario_stock_shipment_out.rst b/tests/scenario_stock_shipment_out.rst
index 4f163a4..aa97edc 100644
--- a/tests/scenario_stock_shipment_out.rst
+++ b/tests/scenario_stock_shipment_out.rst
@@ -8,7 +8,7 @@ Imports::
     >>> from dateutil.relativedelta import relativedelta
     >>> from decimal import Decimal
     >>> from proteus import Model, Wizard
-    >>> from trytond.tests.tools import activate_modules
+    >>> from trytond.tests.tools import activate_modules, set_user
     >>> from trytond.modules.company.tests.tools import create_company, \
     ...     get_company
     >>> today = datetime.date.today()
@@ -35,16 +35,13 @@ Create product::
     >>> ProductTemplate = Model.get('product.template')
     >>> Product = Model.get('product.product')
     >>> unit, = ProductUom.find([('name', '=', 'Unit')])
-    >>> product = Product()
     >>> template = ProductTemplate()
     >>> template.name = 'Product'
     >>> template.default_uom = unit
     >>> template.type = 'goods'
     >>> template.list_price = Decimal('20')
-    >>> template.cost_price = Decimal('8')
     >>> template.save()
-    >>> product.template = template
-    >>> product.save()
+    >>> product, = template.products
 
 Create stock user::
 
@@ -66,7 +63,7 @@ Create stock user::
     >>> stock_user.employee = employee
     >>> stock_user.save()
 
-    >>> config.user = stock_user.id
+    >>> set_user(stock_user)
 
 Get stock locations::
 
diff --git a/tests/scenario_stock_shipment_out_same_storage_output.rst b/tests/scenario_stock_shipment_out_same_storage_output.rst
index 9e4714d..27fa6c2 100644
--- a/tests/scenario_stock_shipment_out_same_storage_output.rst
+++ b/tests/scenario_stock_shipment_out_same_storage_output.rst
@@ -31,16 +31,13 @@ Create product::
     >>> ProductTemplate = Model.get('product.template')
     >>> Product = Model.get('product.product')
     >>> unit, = ProductUom.find([('name', '=', 'Unit')])
-    >>> product = Product()
     >>> template = ProductTemplate()
     >>> template.name = 'Product'
     >>> template.default_uom = unit
     >>> template.type = 'goods'
     >>> template.list_price = Decimal('20')
-    >>> template.cost_price = Decimal('8')
     >>> template.save()
-    >>> product.template = template
-    >>> product.save()
+    >>> product, = template.products
 
 Get stock locations::
 
diff --git a/tests/test_stock.py b/tests/test_stock.py
index b670eab..158a2b0 100644
--- a/tests/test_stock.py
+++ b/tests/test_stock.py
@@ -13,7 +13,7 @@ from trytond.tests.test_tryton import ModuleTestCase, with_transaction
 from trytond.tests.test_tryton import doctest_teardown
 from trytond.tests.test_tryton import doctest_checker
 from trytond.transaction import Transaction
-from trytond.exceptions import UserWarning
+from trytond.exceptions import UserWarning, UserError
 from trytond.pool import Pool
 
 from trytond.modules.company.tests import create_company, set_company
@@ -40,8 +40,6 @@ class StockTestCase(ModuleTestCase):
                     'name': 'Test Move.internal_quantity',
                     'type': 'goods',
                     'list_price': Decimal(1),
-                    'cost_price': Decimal(0),
-                    'cost_price_method': 'fixed',
                     'default_uom': kg.id,
                     }])
         product, = Product.create([{
@@ -98,8 +96,6 @@ class StockTestCase(ModuleTestCase):
                     'name': 'Test products_by_location',
                     'type': 'goods',
                     'list_price': Decimal(0),
-                    'cost_price': Decimal(0),
-                    'cost_price_method': 'fixed',
                     'default_uom': kg.id,
                     }])
         product, = Product.create([{
@@ -364,8 +360,6 @@ class StockTestCase(ModuleTestCase):
                     'name': 'Test products_by_location',
                     'type': 'goods',
                     'list_price': Decimal(0),
-                    'cost_price': Decimal(0),
-                    'cost_price_method': 'fixed',
                     'default_uom': unit.id,
                     }])
         product, = Product.create([{
@@ -426,15 +420,136 @@ class StockTestCase(ModuleTestCase):
                 products_by_location[(warehouse.id, product.id)], 1)
             self.assertEqual(products_by_location[(storage.id, product.id)], 2)
 
+            with Transaction().set_context(locations=[warehouse.id]):
+                found_products = Product.search([
+                        ('quantity', '=', 1),
+                        ])
+                self.assertListEqual([product], found_products)
+
             with Transaction().set_context(stock_skip_warehouse=True):
                 products_by_location = Product.products_by_location(
                     [warehouse.id], [product.id], with_childs=True)
                 products_by_location_all = Product.products_by_location(
                     [warehouse.id], None, with_childs=True)
+                self.assertEqual(
+                    products_by_location[(warehouse.id, product.id)], 2)
+                self.assertEqual(
+                    products_by_location_all[(warehouse.id, product.id)], 2)
+
+                with Transaction().set_context(locations=[warehouse.id]):
+                    found_products = Product.search([
+                            ('quantity', '=', 2),
+                            ])
+                    self.assertListEqual([product], found_products)
+
+    @with_transaction()
+    def test_products_by_location_flat_childs(self, period_closed=False):
+        "Test products_by_location on flat_childs"
+        pool = Pool()
+        Uom = pool.get('product.uom')
+        Template = pool.get('product.template')
+        Product = pool.get('product.product')
+        Location = pool.get('stock.location')
+        Move = pool.get('stock.move')
+        Date = pool.get('ir.date')
+        Period = pool.get('stock.period')
+
+        unit, = Uom.search([('name', '=', 'Unit')])
+        template, = Template.create([{
+                    'name': "Product",
+                    'type': 'goods',
+                    'list_price': Decimal(0),
+                    'default_uom': unit.id,
+                    }])
+        product, = Product.create([{
+                    'template': template.id,
+                    }])
+
+        lost_found, = Location.search([('type', '=', 'lost_found')])
+        storage, = Location.search([('code', '=', 'STO')])
+        storage.flat_childs = True
+        storage.save()
+        storage1, = Location.create([{
+                    'name': 'Storage 1',
+                    'type': 'storage',
+                    'parent': storage.id,
+                    }])
+        storage2, = Location.create([{
+                    'name': 'Storage 2',
+                    'type': 'storage',
+                    'parent': storage.id,
+                    }])
+
+        company = create_company()
+        with set_company(company):
+            date = Date.today() - relativedelta(days=1)
+
+            moves = Move.create([{
+                        'product': product.id,
+                        'uom': unit.id,
+                        'quantity': 1,
+                        'from_location': lost_found.id,
+                        'to_location': storage.id,
+                        'planned_date': date,
+                        'effective_date': date,
+                        'company': company.id,
+                        }, {
+                        'product': product.id,
+                        'uom': unit.id,
+                        'quantity': 1,
+                        'from_location': lost_found.id,
+                        'to_location': storage1.id,
+                        'planned_date': date,
+                        'effective_date': date,
+                        'company': company.id,
+                        }, {
+                        'product': product.id,
+                        'uom': unit.id,
+                        'quantity': 1,
+                        'from_location': storage1.id,
+                        'to_location': storage2.id,
+                        'planned_date': date,
+                        'effective_date': date,
+                        'company': company.id,
+                        }])
+            Move.do(moves)
+
+            if period_closed:
+                period, = Period.create([{
+                            'date': date,
+                            'company': company.id,
+                            }])
+                Period.close([period])
+
+            # Test flat location
+            products_by_location = Product.products_by_location(
+                [storage.id], [product.id], with_childs=True)
             self.assertEqual(
-                products_by_location[(warehouse.id, product.id)], 2)
+                products_by_location[(storage.id, product.id)], 2)
+
+            # Test mixed flat and nested location
+            products_by_location = Product.products_by_location(
+                [storage.parent.id, storage.id, storage1.id, storage2.id],
+                [product.id],
+                with_childs=True)
+            self.assertEqual(
+                products_by_location[(storage.parent.id, product.id)], 2)
+            self.assertEqual(
+                products_by_location[(storage.id, product.id)], 2)
+            self.assertEqual(
+                products_by_location[(storage1.id, product.id)], 0)
             self.assertEqual(
-                products_by_location_all[(warehouse.id, product.id)], 2)
+                products_by_location[(storage2.id, product.id)], 1)
+
+            # Test non flat
+            products_by_location = Product.products_by_location(
+                [lost_found.id], [product.id], with_childs=True)
+            self.assertEqual(
+                products_by_location[(lost_found.id, product.id)], -2)
+
+    def test_products_by_location_flat_childs_period_closed(self):
+        "Test products_by_location on flat_childs with period closed"
+        self.test_products_by_location_flat_childs(period_closed=True)
 
     @with_transaction()
     def test_period(self):
@@ -452,10 +567,8 @@ class StockTestCase(ModuleTestCase):
         template, = Template.create([{
                     'name': 'Test period',
                     'type': 'goods',
-                    'cost_price_method': 'fixed',
                     'default_uom': unit.id,
                     'list_price': Decimal(0),
-                    'cost_price': Decimal(0),
                     }])
         product, = Product.create([{
                     'template': template.id,
@@ -624,8 +737,6 @@ class StockTestCase(ModuleTestCase):
                     'name': 'Test Move.check_origin',
                     'type': 'goods',
                     'list_price': Decimal(1),
-                    'cost_price': Decimal(0),
-                    'cost_price_method': 'fixed',
                     'default_uom': uom.id,
                     }])
         product, = Product.create([{
@@ -676,8 +787,6 @@ class StockTestCase(ModuleTestCase):
             name='Test Move.assign_try',
             type='goods',
             list_price=Decimal(1),
-            cost_price=Decimal(0),
-            cost_price_method='fixed',
             default_uom=uom,
             )
         template.save()
@@ -743,8 +852,6 @@ class StockTestCase(ModuleTestCase):
             name='Test Move.assign_try',
             type='goods',
             list_price=Decimal(1),
-            cost_price=Decimal(0),
-            cost_price_method='fixed',
             default_uom=uom,
             )
         template.save()
@@ -810,8 +917,6 @@ class StockTestCase(ModuleTestCase):
             name="Product",
             type='goods',
             list_price=Decimal(1),
-            cost_price=Decimal(1),
-            cost_price_method='fixed',
             default_uom=unit,
             )
         template.save()
@@ -887,6 +992,107 @@ class StockTestCase(ModuleTestCase):
                 pbl = Product.products_by_location([storage.id], [product.id])
                 self.assertDictEqual(pbl, {(storage.id, product.id): -5})
 
+    @with_transaction()
+    def test_location_inactive_without_move(self):
+        "Test inactivate location without move"
+        pool = Pool()
+        Location = pool.get('stock.location')
+        storage, = Location.search([('code', '=', 'STO')])
+        location, = Location.create([{
+                    'name': "Location",
+                    'parent': storage.id,
+                    }])
+
+        location.active = False
+        location.save()
+
+    @with_transaction()
+    def test_location_inactive_with_quantity(self):
+        "Test inactivate location with quantity"
+        pool = Pool()
+        Location = pool.get('stock.location')
+        Move = pool.get('stock.move')
+        Template = pool.get('product.template')
+        Product = pool.get('product.product')
+        Uom = pool.get('product.uom')
+
+        storage, = Location.search([('code', '=', 'STO')])
+        location, = Location.create([{
+                    'name': "Location",
+                    'parent': storage.id,
+                    }])
+        unit, = Uom.search([('name', '=', "Unit")])
+        template, = Template.create([{
+                    'name': "Product",
+                    'type': 'goods',
+                    'list_price': Decimal(0),
+                    'cost_price': Decimal(0),
+                    'default_uom': unit.id,
+                    }])
+        product, = Product.create([{'template': template.id}])
+
+        company = create_company()
+        with set_company(company):
+
+            moves = Move.create([{
+                        'product': product.id,
+                        'uom': unit.id,
+                        'quantity': 1,
+                        'from_location': storage.id,
+                        'to_location': location.id,
+                        'company': company.id,
+                        }])
+            Move.do(moves)
+            with self.assertRaises(UserError):
+                location.active = False
+                location.save()
+
+    @with_transaction()
+    def test_location_inactive_with_draft_moves(self):
+        "Test inactivate location with draft moves"
+        pool = Pool()
+        Location = pool.get('stock.location')
+        Move = pool.get('stock.move')
+        Template = pool.get('product.template')
+        Product = pool.get('product.product')
+        Uom = pool.get('product.uom')
+
+        storage, = Location.search([('code', '=', 'STO')])
+        location, = Location.create([{
+                    'name': "Location",
+                    'parent': storage.id,
+                    }])
+        unit, = Uom.search([('name', '=', "Unit")])
+        template, = Template.create([{
+                    'name': "Product",
+                    'type': 'goods',
+                    'list_price': Decimal(0),
+                    'cost_price': Decimal(0),
+                    'default_uom': unit.id,
+                    }])
+        product, = Product.create([{'template': template.id}])
+
+        company = create_company()
+        with set_company(company):
+            Move.create([{
+                        'product': product.id,
+                        'uom': unit.id,
+                        'quantity': 1,
+                        'from_location': storage.id,
+                        'to_location': location.id,
+                        'company': company.id,
+                        }, {
+                        'product': product.id,
+                        'uom': unit.id,
+                        'quantity': 1,
+                        'from_location': location.id,
+                        'to_location': storage.id,
+                        'company': company.id,
+                        }])
+            with self.assertRaises(UserError):
+                location.active = False
+                location.save()
+
 
 def suite():
     suite = trytond.tests.test_tryton.suite()
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 472b545..364020a 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=4.4.3
+version=4.6.0
 depends:
     company
     currency
diff --git a/trytond_stock.egg-info/PKG-INFO b/trytond_stock.egg-info/PKG-INFO
index c25e83b..1e106e6 100644
--- a/trytond_stock.egg-info/PKG-INFO
+++ b/trytond_stock.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
 Metadata-Version: 1.1
 Name: trytond-stock
-Version: 4.4.3
+Version: 4.6.0
 Summary: Tryton module for stock and inventory
 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_stock
         =============
         
@@ -70,9 +70,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_stock.egg-info/SOURCES.txt b/trytond_stock.egg-info/SOURCES.txt
index 3e27da6..d17c46d 100644
--- a/trytond_stock.egg-info/SOURCES.txt
+++ b/trytond_stock.egg-info/SOURCES.txt
@@ -1,31 +1,43 @@
+.drone.yml
+.hgtags
 CHANGELOG
 COPYRIGHT
 INSTALL
 LICENSE
 MANIFEST.in
 README
+__init__.py
+configuration.py
 configuration.xml
-customer_return_restocking_list.odt
-delivery_note.odt
-internal_shipment.odt
+customer_return_restocking_list.fodt
+delivery_note.fodt
+internal_shipment.fodt
+inventory.py
 inventory.xml
+location.py
 location.xml
+move.py
 move.xml
+party.py
 party.xml
+period.py
 period.xml
-picking_list.odt
+picking_list.fodt
+product.py
 product.xml
 setup.py
+shipment.py
 shipment.xml
 stock.xml
-supplier_restocking_list.odt
+supplier_restocking_list.fodt
+tox.ini
 tryton.cfg
 ./__init__.py
 ./configuration.py
 ./configuration.xml
-./customer_return_restocking_list.odt
-./delivery_note.odt
-./internal_shipment.odt
+./customer_return_restocking_list.fodt
+./delivery_note.fodt
+./internal_shipment.fodt
 ./inventory.py
 ./inventory.xml
 ./location.py
@@ -36,13 +48,13 @@ tryton.cfg
 ./party.xml
 ./period.py
 ./period.xml
-./picking_list.odt
+./picking_list.fodt
 ./product.py
 ./product.xml
 ./shipment.py
 ./shipment.xml
 ./stock.xml
-./supplier_restocking_list.odt
+./supplier_restocking_list.fodt
 ./tryton.cfg
 ./icons/tryton-inventory.svg
 ./locale/bg.po
@@ -132,12 +144,14 @@ locale/pt_BR.po
 locale/ru.po
 locale/sl.po
 locale/zh_CN.po
+tests/__init__.py
 tests/scenario_stock_average_cost_price.rst
 tests/scenario_stock_inventory.rst
 tests/scenario_stock_reporting.rst
 tests/scenario_stock_shipment_internal.rst
 tests/scenario_stock_shipment_out.rst
 tests/scenario_stock_shipment_out_same_storage_output.rst
+tests/test_stock.py
 trytond_stock.egg-info/PKG-INFO
 trytond_stock.egg-info/SOURCES.txt
 trytond_stock.egg-info/dependency_links.txt
diff --git a/trytond_stock.egg-info/requires.txt b/trytond_stock.egg-info/requires.txt
index 012d7fb..6f3a8cc 100644
--- a/trytond_stock.egg-info/requires.txt
+++ b/trytond_stock.egg-info/requires.txt
@@ -1,6 +1,6 @@
 python-sql >= 0.4
-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_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/location_form.xml b/view/location_form.xml
index 7e0e3f2..5134360 100644
--- a/view/location_form.xml
+++ b/view/location_form.xml
@@ -6,13 +6,14 @@ this repository contains the full copyright notices and license terms. -->
     <field name="name"/>
     <label name="code"/>
     <field name="code"/>
-    <label name="parent"/>
-    <field name="parent"/>
-    <newline/>
     <label name="type"/>
     <field name="type"/>
     <label name="active"/>
     <field name="active"/>
+    <label name="parent"/>
+    <field name="parent"/>
+    <label name="flat_childs"/>
+    <field name="flat_childs"/>
     <newline/>
     <label name="address"/>
     <field name="address"/>
-- 
tryton-modules-stock



More information about the tryton-debian-vcs mailing list