[tryton-debian-vcs] tryton-modules-account-stock-continental branch upstream updated. upstream/3.2.0-1-ga5df61d
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Thu Oct 23 12:14:23 UTC 2014
The following commit has been merged in the upstream branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-account-stock-continental.git;a=commitdiff;h=upstream/3.2.0-1-ga5df61d
commit a5df61d07decb5270e2c8032846c1ce8378d171b
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Oct 21 11:29:07 2014 +0200
Adding upstream version 3.4.0.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/CHANGELOG b/CHANGELOG
index f6a670d..5f1c2cd 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,7 @@
+Version 3.4.0 - 2014-10-20
+* Bug fixes (see mercurial logs for details)
+* Add account stock method on fiscal year
+
Version 3.2.0 - 2014-04-21
* Bug fixes (see mercurial logs for details)
* Remove account_move
diff --git a/PKG-INFO b/PKG-INFO
index debbe73..45f1776 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_account_stock_continental
-Version: 3.2.0
+Version: 3.4.0
Summary: Tryton module for continental real-time stock valuation
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: issue_tracker at tryton.org
License: GPL-3
-Download-URL: http://downloads.tryton.org/3.2/
+Download-URL: http://downloads.tryton.org/3.4/
Description: trytond_account_stock_continental
=================================
diff --git a/__init__.py b/__init__.py
index c729ff4..c4392c5 100644
--- a/__init__.py
+++ b/__init__.py
@@ -13,6 +13,7 @@ def register():
Category,
Template,
Configuration,
+ FiscalYear,
AccountMove,
UpdateCostPriceAsk,
UpdateCostPriceShowMove,
diff --git a/account.py b/account.py
index 44d6724..154b48c 100644
--- a/account.py
+++ b/account.py
@@ -4,7 +4,7 @@ from trytond.model import fields
from trytond.pyson import Eval, Bool, Get
from trytond.pool import PoolMeta
-__all__ = ['Configuration', 'AccountMove']
+__all__ = ['Configuration', 'FiscalYear', 'AccountMove']
__metaclass__ = PoolMeta
@@ -21,6 +21,14 @@ class Configuration:
]))
+class FiscalYear:
+ __name__ = 'account.fiscalyear'
+ account_stock_method = fields.Selection([
+ (None, 'None'),
+ ('continental', 'Continental'),
+ ], 'Account Stock Method')
+
+
class AccountMove:
__name__ = 'account.move'
diff --git a/account.xml b/account.xml
index 1ea085d..4771424 100644
--- a/account.xml
+++ b/account.xml
@@ -15,6 +15,12 @@ this repository contains the full copyright notices and license terms. -->
<field name="value" eval="'account.journal,' + str(ref('account.journal_stock'))"/>
</record>
+ <record model="ir.ui.view" id="fiscalyear_view_form">
+ <field name="model">account.fiscalyear</field>
+ <field name="inherit" ref="account.fiscalyear_view_form"/>
+ <field name="name">fiscalyear_form</field>
+ </record>
+
<record model="account.account.type.template"
id="account_type_template_asset_current_inventories">
<field name="name">Inventories</field>
diff --git a/configuration.xml b/configuration.xml
deleted file mode 100644
index ab61424..0000000
--- a/configuration.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0"?>
-<!-- This file is part of Tryton. The COPYRIGHT file at the top level of
-this repository contains the full copyright notices and license terms. -->
-<tryton>
- <data>
- <record model="ir.ui.view" id="stock_configuration_form">
- <field name="model">stock.configuration</field>
- <field name="inherit" ref="stock.stock_configuration_view_form"/>
- <field name="name">stock_configuration_form</field>
- </record>
- <record model="ir.action.act_window.view" id="stock.act_stock_configuration_view1">
- <field name="view" ref="stock_configuration_form"/>
- </record>
- </data>
-</tryton>
diff --git a/doc/index.rst b/doc/index.rst
index a2147d3..15611d0 100644
--- a/doc/index.rst
+++ b/doc/index.rst
@@ -20,9 +20,10 @@ Four new fields are added to Product and Category:
As usual, if the "Use Category's accounts" is checked it is the category one
that is used otherwise it is the product one.
-An Account Move is created for each Stock Move for which one Stock Location has
-the type "Storage" and an the other has the type "Supplier", "Customer",
-"Production" or "Lost and Found".
+An Account Move is created for each Stock Move done under a fiscal year with
+the account stock method set and for which one Stock Location has the type
+"Storage" and an the other has the type "Supplier", "Customer", "Production" or
+"Lost and Found".
If the Stock Move has a "Supplier" Location as origin, then the Account Stock
of the Product is debited and the Account Stock Supplier of the Product is
diff --git a/locale/bg_BG.po b/locale/bg_BG.po
index 4aa74be..69a1d96 100644
--- a/locale/bg_BG.po
+++ b/locale/bg_BG.po
@@ -20,6 +20,10 @@ msgctxt "field:account.configuration,stock_journal:"
msgid "Stock Journal"
msgstr ""
+msgctxt "field:account.fiscalyear,account_stock_method:"
+msgid "Account Stock Method"
+msgstr ""
+
msgctxt "field:product.category,account_stock:"
msgid "Account Stock"
msgstr ""
@@ -223,6 +227,19 @@ msgctxt "model:product.update_cost_price.show_move,name:"
msgid "Update Cost Price Show Move"
msgstr ""
+msgctxt "selection:account.fiscalyear,account_stock_method:"
+msgid "Continental"
+msgstr ""
+
+#, fuzzy
+msgctxt "selection:account.fiscalyear,account_stock_method:"
+msgid "None"
+msgstr "Няма"
+
+msgctxt "view:account.fiscalyear:"
+msgid "Account Stock"
+msgstr ""
+
msgctxt "view:product.update_cost_price.ask:"
msgid "Update Cost Price"
msgstr ""
diff --git a/locale/ca_ES.po b/locale/ca_ES.po
index f65faa6..bee93cf 100644
--- a/locale/ca_ES.po
+++ b/locale/ca_ES.po
@@ -22,6 +22,10 @@ msgctxt "field:account.configuration,stock_journal:"
msgid "Stock Journal"
msgstr "Diari d'estoc"
+msgctxt "field:account.fiscalyear,account_stock_method:"
+msgid "Account Stock Method"
+msgstr "Mètode comptabilització de l'estoc"
+
msgctxt "field:product.category,account_stock:"
msgid "Account Stock"
msgstr "Compte d'estoc"
@@ -209,6 +213,18 @@ msgctxt "model:product.update_cost_price.show_move,name:"
msgid "Update Cost Price Show Move"
msgstr "Actualitza preu de cost. Mostra assentament"
+msgctxt "selection:account.fiscalyear,account_stock_method:"
+msgid "Continental"
+msgstr "Continental"
+
+msgctxt "selection:account.fiscalyear,account_stock_method:"
+msgid "None"
+msgstr "Cap"
+
+msgctxt "view:account.fiscalyear:"
+msgid "Account Stock"
+msgstr "Comptabilització de l'estoc"
+
msgctxt "view:product.update_cost_price.ask:"
msgid "Update Cost Price"
msgstr "Actualitza preu de cost"
diff --git a/locale/cs_CZ.po b/locale/cs_CZ.po
index 33c01bc..47b2a6b 100644
--- a/locale/cs_CZ.po
+++ b/locale/cs_CZ.po
@@ -20,6 +20,10 @@ msgctxt "field:account.configuration,stock_journal:"
msgid "Stock Journal"
msgstr ""
+msgctxt "field:account.fiscalyear,account_stock_method:"
+msgid "Account Stock Method"
+msgstr ""
+
msgctxt "field:product.category,account_stock:"
msgid "Account Stock"
msgstr ""
@@ -207,6 +211,18 @@ msgctxt "model:product.update_cost_price.show_move,name:"
msgid "Update Cost Price Show Move"
msgstr ""
+msgctxt "selection:account.fiscalyear,account_stock_method:"
+msgid "Continental"
+msgstr ""
+
+msgctxt "selection:account.fiscalyear,account_stock_method:"
+msgid "None"
+msgstr ""
+
+msgctxt "view:account.fiscalyear:"
+msgid "Account Stock"
+msgstr ""
+
msgctxt "view:product.update_cost_price.ask:"
msgid "Update Cost Price"
msgstr ""
diff --git a/locale/de_DE.po b/locale/de_DE.po
index e375e43..352d57f 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -16,12 +16,16 @@ msgstr "Lagerkonto und Gegenkonto können nicht dasselbe Konto sein"
msgctxt "field:account.configuration,cost_price_counterpart_account:"
msgid "Cost Price Counterpart Account"
-msgstr "Kostenpreis Gegenkonto"
+msgstr "Gegenkonto Kostenpreis"
msgctxt "field:account.configuration,stock_journal:"
msgid "Stock Journal"
msgstr "Journal Lager"
+msgctxt "field:account.fiscalyear,account_stock_method:"
+msgid "Account Stock Method"
+msgstr "Lagerbewertungsmethode"
+
msgctxt "field:product.category,account_stock:"
msgid "Account Stock"
msgstr "Konto Lager"
@@ -153,32 +157,32 @@ msgstr "Lagerkonto"
msgctxt "help:product.template,account_stock:"
msgid "This account will be used instead of the one defined on the category."
msgstr ""
-"Dieses Konto überschreibt das Konto welches in der Kategorie eingestellt "
-"ist."
+"Dieses Konto wird benutzt anstelle des Kontos, welches in der Kategorie "
+"eingestellt ist."
msgctxt "help:product.template,account_stock_customer:"
msgid "This account will be used instead of the one defined on the category."
msgstr ""
-"Dieses Konto überschreibt das Konto welches in der Kategorie eingestellt "
-"ist."
+"Dieses Konto wird benutzt anstelle des Kontos, welches in der Kategorie "
+"eingestellt ist."
msgctxt "help:product.template,account_stock_lost_found:"
msgid "This account will be used instead of the one defined on the category."
msgstr ""
-"Dieses Konto überschreibt das Konto welches in der Kategorie eingestellt "
-"ist."
+"Dieses Konto wird benutzt anstelle des Kontos, welches in der Kategorie "
+"eingestellt ist."
msgctxt "help:product.template,account_stock_production:"
msgid "This account will be used instead of the one defined on the category."
msgstr ""
-"Dieses Konto wird benutzt an Stelle des Kontos welches in der Kategorie "
+"Dieses Konto wird benutzt anstelle des Kontos, welches in der Kategorie "
"eingestellt ist."
msgctxt "help:product.template,account_stock_supplier:"
msgid "This account will be used instead of the one defined on the category."
msgstr ""
-"Dieses Konto überschreibt das Konto welches in der Kategorie eingestellt "
-"ist."
+"Dieses Konto wird benutzt anstelle des Kontos, welches in der Kategorie "
+"eingestellt ist."
msgctxt "model:account.account.template,name:account_template_stock"
msgid "Stock"
@@ -223,6 +227,18 @@ msgctxt "model:product.update_cost_price.show_move,name:"
msgid "Update Cost Price Show Move"
msgstr "Kostenpreis Aktualisierung Anzeige Buchungssatz"
+msgctxt "selection:account.fiscalyear,account_stock_method:"
+msgid "Continental"
+msgstr "Kontinental"
+
+msgctxt "selection:account.fiscalyear,account_stock_method:"
+msgid "None"
+msgstr "Keine"
+
+msgctxt "view:account.fiscalyear:"
+msgid "Account Stock"
+msgstr "Lagerbewertung"
+
msgctxt "view:product.update_cost_price.ask:"
msgid "Update Cost Price"
msgstr "Kostenpreis aktualisieren"
diff --git a/locale/es_AR.po b/locale/es_AR.po
index 9373e1e..b62d2eb 100644
--- a/locale/es_AR.po
+++ b/locale/es_AR.po
@@ -23,6 +23,10 @@ msgctxt "field:account.configuration,stock_journal:"
msgid "Stock Journal"
msgstr "Diario de existencias"
+msgctxt "field:account.fiscalyear,account_stock_method:"
+msgid "Account Stock Method"
+msgstr "Método de contabilización de existencias"
+
msgctxt "field:product.category,account_stock:"
msgid "Account Stock"
msgstr "Cuenta de existencias"
@@ -210,6 +214,18 @@ msgctxt "model:product.update_cost_price.show_move,name:"
msgid "Update Cost Price Show Move"
msgstr "Actualizar precio de costo - Mostrar asiento"
+msgctxt "selection:account.fiscalyear,account_stock_method:"
+msgid "Continental"
+msgstr "Continental"
+
+msgctxt "selection:account.fiscalyear,account_stock_method:"
+msgid "None"
+msgstr "Ninguno"
+
+msgctxt "view:account.fiscalyear:"
+msgid "Account Stock"
+msgstr "Cuenta de existencias"
+
msgctxt "view:product.update_cost_price.ask:"
msgid "Update Cost Price"
msgstr "Actualizar precio de costo"
diff --git a/locale/es_CO.po b/locale/es_CO.po
index 06e8c16..6d6263c 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -21,7 +21,11 @@ msgstr "Cuenta Equivalente del Costo"
msgctxt "field:account.configuration,stock_journal:"
msgid "Stock Journal"
-msgstr "Inventario Diario "
+msgstr "Libro Contable de Inventarios"
+
+msgctxt "field:account.fiscalyear,account_stock_method:"
+msgid "Account Stock Method"
+msgstr "Método Contabilización de Inventario"
msgctxt "field:product.category,account_stock:"
msgid "Account Stock"
@@ -210,6 +214,18 @@ msgctxt "model:product.update_cost_price.show_move,name:"
msgid "Update Cost Price Show Move"
msgstr "Actualizar Costo Precio del Asiento Mostrado"
+msgctxt "selection:account.fiscalyear,account_stock_method:"
+msgid "Continental"
+msgstr "Continental"
+
+msgctxt "selection:account.fiscalyear,account_stock_method:"
+msgid "None"
+msgstr "Ninguno"
+
+msgctxt "view:account.fiscalyear:"
+msgid "Account Stock"
+msgstr "Cuenta de Inventarios"
+
msgctxt "view:product.update_cost_price.ask:"
msgid "Update Cost Price"
msgstr "Actualizar Precio de Costo"
diff --git a/locale/es_CO.po b/locale/es_EC.po
similarity index 69%
copy from locale/es_CO.po
copy to locale/es_EC.po
index 06e8c16..bb76e24 100644
--- a/locale/es_CO.po
+++ b/locale/es_EC.po
@@ -7,101 +7,105 @@ msgid ""
"You cannot change the cost price for a product which is associated to stock moves.\n"
"You must use the \"Update Cost Price\" wizard."
msgstr ""
-"No puede cambiar el costo de un producto el cual esta asociado a movimientos de inventarios.\n"
-"Usted debe usar el asistente de \"Actualización de Costo\"."
+"No puede cambiar el precio de costo de un producto el cual está asociado a movimientos de existencias.\n"
+"Debe utilizar el asistente \"Actualizar Precio de Costo\"."
msgctxt "error:product.update_cost_price:"
msgid "The stock account and the counterpart can not be the same account"
msgstr ""
-"La cuenta de inventarios y su contraparte no puede ser la misma cuenta."
+"La cuenta de existencias y la de contrapartida no puede ser la misma cuenta."
msgctxt "field:account.configuration,cost_price_counterpart_account:"
msgid "Cost Price Counterpart Account"
-msgstr "Cuenta Equivalente del Costo"
+msgstr "Cuenta Contrapartida de Costo"
msgctxt "field:account.configuration,stock_journal:"
msgid "Stock Journal"
-msgstr "Inventario Diario "
+msgstr "Libro Diario de Existencias"
+
+msgctxt "field:account.fiscalyear,account_stock_method:"
+msgid "Account Stock Method"
+msgstr "Método de Contabilización de Existencias"
msgctxt "field:product.category,account_stock:"
msgid "Account Stock"
-msgstr "Cuenta de Inventarios"
+msgstr "Cuenta de Existencias"
msgctxt "field:product.category,account_stock_customer:"
msgid "Account Stock Customer"
-msgstr "Cuenta de Inventarios Cliente"
+msgstr "Cuenta de Existencias del Cliente"
msgctxt "field:product.category,account_stock_customer_used:"
msgid "Account Stock Customer Used"
-msgstr "Cuenta de Inventarios Cliente Utilizada"
+msgstr "Cuenta de Existencias del Cliente Utilizada"
msgctxt "field:product.category,account_stock_lost_found:"
msgid "Account Stock Lost and Found"
-msgstr "Cuenta Inventarios Perdidos y Encontrados"
+msgstr "Cuenta de Existencias Perdidas y Encontradas"
msgctxt "field:product.category,account_stock_lost_found_used:"
msgid "Account Stock Lost and Found"
-msgstr "Cuenta Inventarios Perdidos y Encontrados"
+msgstr "Cuenta de Existencias Perdidas y Encontradas"
msgctxt "field:product.category,account_stock_production:"
msgid "Account Stock Production"
-msgstr "Cuenta Inventarios en Producción"
+msgstr "Cuenta de Existencias de Producción"
msgctxt "field:product.category,account_stock_production_used:"
msgid "Account Stock Production Used"
-msgstr "Cuenta Inventarios en Producción Utilizada"
+msgstr "Cuenta de Existencias de Producción Utilizada"
msgctxt "field:product.category,account_stock_supplier:"
msgid "Account Stock Supplier"
-msgstr "Cuenta Inventarios Proveedor"
+msgstr "Cuenta de Existencias del Proveedor"
msgctxt "field:product.category,account_stock_supplier_used:"
msgid "Account Stock Supplier Used"
-msgstr "Cuenta Inventarios Proveedor Utilizada"
+msgstr "Cuenta de Existencias del Proveedor Utilizada"
msgctxt "field:product.category,account_stock_used:"
msgid "Account Stock Used"
-msgstr "Cuenta Inventarios Utilizada"
+msgstr "Cuenta de Existencias Utilizada"
msgctxt "field:product.template,account_stock:"
msgid "Account Stock"
-msgstr "Cuenta Inventarios"
+msgstr "Cuenta de Existencias"
msgctxt "field:product.template,account_stock_customer:"
msgid "Account Stock Customer"
-msgstr "Cuenta Inventarios Cliente"
+msgstr "Cuenta de Existencias del Cliente"
msgctxt "field:product.template,account_stock_customer_used:"
msgid "Account Stock Customer Used"
-msgstr "Cuenta Inventarios Cliente Utilizada"
+msgstr "Cuenta de Existencias del Cliente Utilizada"
msgctxt "field:product.template,account_stock_lost_found:"
msgid "Account Stock Lost and Found"
-msgstr "Cuenta Inventarios Perdidos y Encontrados"
+msgstr "Cuenta de Existencias Perdidas y Encontradas"
msgctxt "field:product.template,account_stock_lost_found_used:"
msgid "Account Stock Lost and Found"
-msgstr "Cuenta Inventarios Perdidos y Encontrados"
+msgstr "Cuenta de Existencias Perdidas y Encontradas"
msgctxt "field:product.template,account_stock_production:"
msgid "Account Stock Production"
-msgstr "Cuenta Inventarios en Producción"
+msgstr "Cuenta de Existencias de Producción"
msgctxt "field:product.template,account_stock_production_used:"
msgid "Account Stock Production Used"
-msgstr "Cuenta Inventarios en Producción Utilizada"
+msgstr "Cuenta de Existencias de Producción Utilizada"
msgctxt "field:product.template,account_stock_supplier:"
msgid "Account Stock Supplier"
-msgstr "Cuenta Inventarios Proveedor"
+msgstr "Cuenta de Existencias del Proveedor"
msgctxt "field:product.template,account_stock_supplier_used:"
msgid "Account Stock Supplier Used"
-msgstr "Cuenta Inventarios Proveedor Utilizada"
+msgstr "Cuenta de Existencias del Proveedor Utilizada"
msgctxt "field:product.template,account_stock_used:"
msgid "Account Stock Used"
-msgstr "Cuenta Inventarios Utilizada"
+msgstr "Cuenta de Existencias Utilizada"
msgctxt "field:product.update_cost_price.ask,cost_price:"
msgid "Cost Price"
@@ -113,7 +117,7 @@ msgstr "ID"
msgctxt "field:product.update_cost_price.ask,product:"
msgid "Variant"
-msgstr "Productos"
+msgstr "Variante"
msgctxt "field:product.update_cost_price.ask,template:"
msgid "Product"
@@ -125,7 +129,7 @@ msgstr "Valor"
msgctxt "field:product.update_cost_price.show_move,counterpart:"
msgid "Counterpart"
-msgstr "Equivalente"
+msgstr "Contrapartida"
msgctxt "field:product.update_cost_price.show_move,currency_digits:"
msgid "Currency Digits"
@@ -141,57 +145,57 @@ msgstr "ID"
msgctxt "field:product.update_cost_price.show_move,journal:"
msgid "Journal"
-msgstr "Libro Contable"
+msgstr "Libro Diario"
msgctxt "field:product.update_cost_price.show_move,price_difference:"
msgid "Price Difference"
-msgstr "Diferencia en Precio"
+msgstr "Diferencia de Precio"
msgctxt "field:product.update_cost_price.show_move,stock_account:"
msgid "Stock Account"
-msgstr "Cuenta de Inventarios"
+msgstr "Cuenta de de Existencias"
msgctxt "help:product.template,account_stock:"
msgid "This account will be used instead of the one defined on the category."
-msgstr "Esta cuenta se usará en lugar de la definida en la categoría."
+msgstr "Se utilizará esta cuenta en lugar de la definida en la categoría."
msgctxt "help:product.template,account_stock_customer:"
msgid "This account will be used instead of the one defined on the category."
-msgstr "Esta cuenta se usará en lugar de la definida en la categoría."
+msgstr "Se utilizará esta cuenta en lugar de la definida en la categoría."
msgctxt "help:product.template,account_stock_lost_found:"
msgid "This account will be used instead of the one defined on the category."
-msgstr "Esta cuenta se usará en lugar de la definida en la categoría."
+msgstr "Se utilizará esta cuenta en lugar de la definida en la categoría."
msgctxt "help:product.template,account_stock_production:"
msgid "This account will be used instead of the one defined on the category."
-msgstr "Esta cuenta se usará en lugar de la definida en la categoría."
+msgstr "Se utilizará esta cuenta en lugar de la definida en la categoría."
msgctxt "help:product.template,account_stock_supplier:"
msgid "This account will be used instead of the one defined on the category."
-msgstr "Esta cuenta se usará en lugar de la definida en la categoría."
+msgstr "Se utilizará esta cuenta en lugar de la definida en la categoría."
msgctxt "model:account.account.template,name:account_template_stock"
msgid "Stock"
-msgstr "Inventarios"
+msgstr "Existencias"
msgctxt "model:account.account.template,name:account_template_stock_customer"
msgid "Stock Customer"
-msgstr "Inventarios de Cliente"
+msgstr "Existencias del Cliente"
msgctxt ""
"model:account.account.template,name:account_template_stock_lost_found"
msgid "Stock Lost and Found"
-msgstr "Inventarios Perdidos y Encontrados"
+msgstr "Existencias Perdidas y Encontradas"
msgctxt ""
"model:account.account.template,name:account_template_stock_production"
msgid "Stock Production"
-msgstr "Inventarios en Producción"
+msgstr "Existencias de Producción"
msgctxt "model:account.account.template,name:account_template_stock_supplier"
msgid "Stock Supplier"
-msgstr "Inventarios de Proveedor"
+msgstr "Existencias de Proveedor"
msgctxt ""
"model:account.account.type.template,name:account_type_template_asset_current_inventories"
@@ -204,11 +208,23 @@ msgstr "Actualizar Precio de Costo"
msgctxt "model:product.update_cost_price.ask,name:"
msgid "Update Cost Price Ask"
-msgstr "Pregunta Actualiza Precio de Costo"
+msgstr "Solicitar Actualizar Precio de Costo"
msgctxt "model:product.update_cost_price.show_move,name:"
msgid "Update Cost Price Show Move"
-msgstr "Actualizar Costo Precio del Asiento Mostrado"
+msgstr "Actualizar Precio de Costo - Mostrar Asiento"
+
+msgctxt "selection:account.fiscalyear,account_stock_method:"
+msgid "Continental"
+msgstr "Continental"
+
+msgctxt "selection:account.fiscalyear,account_stock_method:"
+msgid "None"
+msgstr "Ninguno"
+
+msgctxt "view:account.fiscalyear:"
+msgid "Account Stock"
+msgstr "Cuenta de Existencias"
msgctxt "view:product.update_cost_price.ask:"
msgid "Update Cost Price"
@@ -216,7 +232,7 @@ msgstr "Actualizar Precio de Costo"
msgctxt "view:product.update_cost_price.show_move:"
msgid "Update Cost Price - Move"
-msgstr "Asiento Actualiza Precio de Costo"
+msgstr "Actualizar Precio de Costo - Asiento"
msgctxt "wizard_button:product.update_cost_price,ask_price,end:"
msgid "Cancel"
diff --git a/locale/es_ES.po b/locale/es_ES.po
index 3244ecb..85dfeb8 100644
--- a/locale/es_ES.po
+++ b/locale/es_ES.po
@@ -22,6 +22,10 @@ msgctxt "field:account.configuration,stock_journal:"
msgid "Stock Journal"
msgstr "Diario de stock"
+msgctxt "field:account.fiscalyear,account_stock_method:"
+msgid "Account Stock Method"
+msgstr "Método contabilización del stock"
+
msgctxt "field:product.category,account_stock:"
msgid "Account Stock"
msgstr "Cuenta de stock"
@@ -209,6 +213,18 @@ msgctxt "model:product.update_cost_price.show_move,name:"
msgid "Update Cost Price Show Move"
msgstr "Actualizar precio de coste. Mostrar asiento"
+msgctxt "selection:account.fiscalyear,account_stock_method:"
+msgid "Continental"
+msgstr "Continental"
+
+msgctxt "selection:account.fiscalyear,account_stock_method:"
+msgid "None"
+msgstr "Ninguno"
+
+msgctxt "view:account.fiscalyear:"
+msgid "Account Stock"
+msgstr "Contabilización del stock"
+
msgctxt "view:product.update_cost_price.ask:"
msgid "Update Cost Price"
msgstr "Actualizar precio de coste"
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
index 0843b45..d997345 100644
--- a/locale/fr_FR.po
+++ b/locale/fr_FR.po
@@ -8,7 +8,7 @@ msgid ""
"You must use the \"Update Cost Price\" wizard."
msgstr ""
"Vous ne pouvez pas changer le prix de revient pour un produit qui a déjà fait l'objet de mouvements de stock.\n"
-"Vous devez utiliser l'assistant \"Mise à jour du prix de revient\"."
+"Vous devez utiliser l'assistant « Mise à jour du prix de revient »."
msgctxt "error:product.update_cost_price:"
msgid "The stock account and the counterpart can not be the same account"
@@ -22,6 +22,10 @@ msgctxt "field:account.configuration,stock_journal:"
msgid "Stock Journal"
msgstr "Journal de stock"
+msgctxt "field:account.fiscalyear,account_stock_method:"
+msgid "Account Stock Method"
+msgstr "Méthode de comptabilité de stock"
+
msgctxt "field:product.category,account_stock:"
msgid "Account Stock"
msgstr "Compte de stock"
@@ -36,11 +40,11 @@ msgstr "Compte de stock client utilisé"
msgctxt "field:product.category,account_stock_lost_found:"
msgid "Account Stock Lost and Found"
-msgstr "Compte de stock \"pertes et surplus\""
+msgstr "Compte de stock « pertes et surplus »"
msgctxt "field:product.category,account_stock_lost_found_used:"
msgid "Account Stock Lost and Found"
-msgstr "Compte de stock \"pertes et surplus\""
+msgstr "Compte de stock « pertes et surplus »"
msgctxt "field:product.category,account_stock_production:"
msgid "Account Stock Production"
@@ -76,11 +80,11 @@ msgstr "Compte de stock client utilisé"
msgctxt "field:product.template,account_stock_lost_found:"
msgid "Account Stock Lost and Found"
-msgstr "Compte de stock \"pertes et surplus\""
+msgstr "Compte de stock « pertes et surplus »"
msgctxt "field:product.template,account_stock_lost_found_used:"
msgid "Account Stock Lost and Found"
-msgstr "Compte de stock \"pertes et surplus\""
+msgstr "Compte de stock « pertes et surplus »"
msgctxt "field:product.template,account_stock_production:"
msgid "Account Stock Production"
@@ -181,7 +185,7 @@ msgstr "Stock client"
msgctxt ""
"model:account.account.template,name:account_template_stock_lost_found"
msgid "Stock Lost and Found"
-msgstr "Stock \"pertes et surplus\""
+msgstr "Stock « pertes et surplus »"
msgctxt ""
"model:account.account.template,name:account_template_stock_production"
@@ -209,6 +213,18 @@ msgctxt "model:product.update_cost_price.show_move,name:"
msgid "Update Cost Price Show Move"
msgstr "Mise à jour du prix de revient - Afficher mouvement"
+msgctxt "selection:account.fiscalyear,account_stock_method:"
+msgid "Continental"
+msgstr "Continentale"
+
+msgctxt "selection:account.fiscalyear,account_stock_method:"
+msgid "None"
+msgstr "Aucune"
+
+msgctxt "view:account.fiscalyear:"
+msgid "Account Stock"
+msgstr "Compte de stock"
+
msgctxt "view:product.update_cost_price.ask:"
msgid "Update Cost Price"
msgstr "Mise à jour du prix de revient"
diff --git a/locale/nl_NL.po b/locale/nl_NL.po
index a4af13c..9db8ede 100644
--- a/locale/nl_NL.po
+++ b/locale/nl_NL.po
@@ -20,6 +20,10 @@ msgctxt "field:account.configuration,stock_journal:"
msgid "Stock Journal"
msgstr ""
+msgctxt "field:account.fiscalyear,account_stock_method:"
+msgid "Account Stock Method"
+msgstr ""
+
msgctxt "field:product.category,account_stock:"
msgid "Account Stock"
msgstr ""
@@ -225,6 +229,19 @@ msgctxt "model:product.update_cost_price.show_move,name:"
msgid "Update Cost Price Show Move"
msgstr ""
+msgctxt "selection:account.fiscalyear,account_stock_method:"
+msgid "Continental"
+msgstr ""
+
+#, fuzzy
+msgctxt "selection:account.fiscalyear,account_stock_method:"
+msgid "None"
+msgstr "Geen"
+
+msgctxt "view:account.fiscalyear:"
+msgid "Account Stock"
+msgstr ""
+
msgctxt "view:product.update_cost_price.ask:"
msgid "Update Cost Price"
msgstr ""
diff --git a/locale/ru_RU.po b/locale/ru_RU.po
index 265233f..659f95b 100644
--- a/locale/ru_RU.po
+++ b/locale/ru_RU.po
@@ -20,6 +20,10 @@ msgctxt "field:account.configuration,stock_journal:"
msgid "Stock Journal"
msgstr ""
+msgctxt "field:account.fiscalyear,account_stock_method:"
+msgid "Account Stock Method"
+msgstr ""
+
msgctxt "field:product.category,account_stock:"
msgid "Account Stock"
msgstr ""
@@ -223,6 +227,19 @@ msgctxt "model:product.update_cost_price.show_move,name:"
msgid "Update Cost Price Show Move"
msgstr ""
+msgctxt "selection:account.fiscalyear,account_stock_method:"
+msgid "Continental"
+msgstr ""
+
+#, fuzzy
+msgctxt "selection:account.fiscalyear,account_stock_method:"
+msgid "None"
+msgstr "Отсутствует"
+
+msgctxt "view:account.fiscalyear:"
+msgid "Account Stock"
+msgstr ""
+
msgctxt "view:product.update_cost_price.ask:"
msgid "Update Cost Price"
msgstr ""
diff --git a/locale/sl_SI.po b/locale/sl_SI.po
index d64b726..62d3e5f 100644
--- a/locale/sl_SI.po
+++ b/locale/sl_SI.po
@@ -22,6 +22,10 @@ msgctxt "field:account.configuration,stock_journal:"
msgid "Stock Journal"
msgstr "Dnevnik zaloge"
+msgctxt "field:account.fiscalyear,account_stock_method:"
+msgid "Account Stock Method"
+msgstr "Način vodenja zaloge"
+
msgctxt "field:product.category,account_stock:"
msgid "Account Stock"
msgstr "Konto zaloge"
@@ -209,6 +213,18 @@ msgctxt "model:product.update_cost_price.show_move,name:"
msgid "Update Cost Price Show Move"
msgstr "Popravek nabavne cene - Prikaz prometa"
+msgctxt "selection:account.fiscalyear,account_stock_method:"
+msgid "Continental"
+msgstr "Kontinentalen"
+
+msgctxt "selection:account.fiscalyear,account_stock_method:"
+msgid "None"
+msgstr "Brez"
+
+msgctxt "view:account.fiscalyear:"
+msgid "Account Stock"
+msgstr "Konto zaloge"
+
msgctxt "view:product.update_cost_price.ask:"
msgid "Update Cost Price"
msgstr "Popravek nabavne cene"
diff --git a/product.py b/product.py
index 84cb8ab..df9f13e 100644
--- a/product.py
+++ b/product.py
@@ -9,6 +9,8 @@ from trytond.pyson import Eval, Get
from trytond.transaction import Transaction
from trytond.pool import Pool, PoolMeta
+from trytond.modules.account_product import MissingFunction
+
__all__ = ['Category', 'Template', 'UpdateCostPriceAsk',
'UpdateCostPriceShowMove', 'UpdateCostPrice']
__metaclass__ = PoolMeta
@@ -67,16 +69,20 @@ class Category:
| Eval('account_parent')),
},
depends=['account_parent']))
- account_stock_used = fields.Function(fields.Many2One('account.account',
- 'Account Stock Used'), 'get_account')
- account_stock_supplier_used = fields.Function(fields.Many2One(
- 'account.account', 'Account Stock Supplier Used'), 'get_account')
- account_stock_customer_used = fields.Function(fields.Many2One(
- 'account.account', 'Account Stock Customer Used'), 'get_account')
- account_stock_production_used = fields.Function(fields.Many2One(
- 'account.account', 'Account Stock Production Used'), 'get_account')
- account_stock_lost_found_used = fields.Function(fields.Many2One(
- 'account.account', 'Account Stock Lost and Found'), 'get_account')
+ account_stock_used = MissingFunction(fields.Many2One('account.account',
+ 'Account Stock Used'), 'missing_account', 'get_account')
+ account_stock_supplier_used = MissingFunction(fields.Many2One(
+ 'account.account', 'Account Stock Supplier Used'),
+ 'missing_account', 'get_account')
+ account_stock_customer_used = MissingFunction(fields.Many2One(
+ 'account.account', 'Account Stock Customer Used'),
+ 'missing_account', 'get_account')
+ account_stock_production_used = MissingFunction(fields.Many2One(
+ 'account.account', 'Account Stock Production Used'),
+ 'missing_account', 'get_account')
+ account_stock_lost_found_used = MissingFunction(fields.Many2One(
+ 'account.account', 'Account Stock Lost and Found'),
+ 'missing_account', 'get_account')
class Template:
@@ -91,9 +97,6 @@ class Template:
'invisible': (~Eval('context', {}).get('company')
| Eval('account_category')
| (Eval('type') != 'goods')),
- 'required': ((Eval('type') == 'goods')
- & Eval('context', {}).get('company')
- & ~Eval('account_category')),
}, help='This account will be used instead of the one defined '
'on the category.',
depends=['account_category', 'type']))
@@ -107,9 +110,6 @@ class Template:
'invisible': (~Eval('context', {}).get('company')
| Eval('account_category')
| (Eval('type') != 'goods')),
- 'required': ((Eval('type') == 'goods')
- & Eval('context', {}).get('company')
- & ~Eval('account_category')),
}, help='This account will be used instead of the one defined '
'on the category.',
depends=['account_category', 'type']))
@@ -123,9 +123,6 @@ class Template:
'invisible': (~Eval('context', {}).get('company')
| Eval('account_category')
| (Eval('type') != 'goods')),
- 'required': ((Eval('type') == 'goods')
- & Eval('context', {}).get('company')
- & ~Eval('account_category')),
}, help='This account will be used instead of the one defined '
'on the category.',
depends=['account_category', 'type']))
@@ -140,9 +137,6 @@ class Template:
'invisible': (~Eval('context', {}).get('company')
| Eval('account_category')
| (Eval('type') != 'goods')),
- 'required': ((Eval('type') == 'goods')
- & Eval('context', {}).get('company')
- & ~Eval('account_category')),
}, help='This account will be used instead of the one defined '
'on the category.',
depends=['account_category', 'type']))
@@ -156,22 +150,23 @@ class Template:
'invisible': (~Eval('context', {}).get('company')
| Eval('account_category')
| (Eval('type') != 'goods')),
- 'required': ((Eval('type') == 'goods')
- & Eval('context', {}).get('company')
- & ~Eval('account_category')),
}, help='This account will be used instead of the one defined '
'on the category.',
depends=['account_category', 'type']))
- account_stock_used = fields.Function(fields.Many2One('account.account',
- 'Account Stock Used'), 'get_account')
- account_stock_supplier_used = fields.Function(fields.Many2One(
- 'account.account', 'Account Stock Supplier Used'), 'get_account')
- account_stock_customer_used = fields.Function(fields.Many2One(
- 'account.account', 'Account Stock Customer Used'), 'get_account')
- account_stock_production_used = fields.Function(fields.Many2One(
- 'account.account', 'Account Stock Production Used'), 'get_account')
- account_stock_lost_found_used = fields.Function(fields.Many2One(
- 'account.account', 'Account Stock Lost and Found'), 'get_account')
+ account_stock_used = MissingFunction(fields.Many2One('account.account',
+ 'Account Stock Used'), 'missing_account', 'get_account')
+ account_stock_supplier_used = MissingFunction(fields.Many2One(
+ 'account.account', 'Account Stock Supplier Used'),
+ 'missing_account', 'get_account')
+ account_stock_customer_used = MissingFunction(fields.Many2One(
+ 'account.account', 'Account Stock Customer Used'),
+ 'missing_account', 'get_account')
+ account_stock_production_used = MissingFunction(fields.Many2One(
+ 'account.account', 'Account Stock Production Used'),
+ 'missing_account', 'get_account')
+ account_stock_lost_found_used = MissingFunction(fields.Many2One(
+ 'account.account', 'Account Stock Lost and Found'),
+ 'missing_account', 'get_account')
@classmethod
def __setup__(cls):
@@ -342,15 +337,14 @@ class UpdateCostPrice(Wizard):
user = User(Transaction().user)
period_id = Period.find(user.company.id)
- with Transaction().set_user(0, set_context=True):
- return Move(
- description=self.show_move.description,
- period=period_id,
- journal=self.show_move.journal,
- date=Date.today(),
- origin=self.get_product(),
- lines=self.get_move_lines(),
- )
+ return Move(
+ description=self.show_move.description,
+ period=period_id,
+ journal=self.show_move.journal,
+ date=Date.today(),
+ origin=self.get_product(),
+ lines=self.get_move_lines(),
+ )
def transition_create_move(self):
Move = Pool().get('account.move')
@@ -359,8 +353,7 @@ class UpdateCostPrice(Wizard):
self.raise_user_error('same_account')
move = self.get_move()
move.save()
- with Transaction().set_user(0, set_context=True):
- Move.post([move])
+ Move.post([move])
return 'update_price'
def transition_update_price(self):
@@ -377,6 +370,5 @@ class UpdateCostPrice(Wizard):
template = self.ask_price.product.template
write = partial(ProductTemplate.write, [template])
- with Transaction().set_user(0, set_context=True):
- write({'cost_price': self.ask_price.cost_price})
+ write({'cost_price': self.ask_price.cost_price})
return 'end'
diff --git a/stock.py b/stock.py
index d077bf9..69bb2c2 100644
--- a/stock.py
+++ b/stock.py
@@ -24,8 +24,7 @@ class Move:
assert type_.startswith('in_') or type_.startswith('out_'), \
'wrong type'
- with Transaction().set_user(0, set_context=True):
- move_line = AccountMoveLine()
+ move_line = AccountMoveLine()
if ((type_.endswith('supplier')
or type_ == 'in_production')
and self.product.cost_price_method != 'fixed'):
@@ -58,10 +57,9 @@ class Move:
'''
pool = Pool()
AccountMoveLine = pool.get('account.move.line')
- with Transaction().set_user(0, set_context=True):
- move_line = AccountMoveLine(
- account=self.product.account_stock_used,
- )
+ move_line = AccountMoveLine(
+ account=self.product.account_stock_used,
+ )
if not amount:
return
if amount >= Decimal('0.0'):
@@ -110,6 +108,13 @@ class Move:
if self.product.type != 'goods':
return
+
+ date = self.effective_date or Date.today()
+ period_id = Period.find(self.company.id, date=date)
+ period = Period(period_id)
+ if not period.fiscalyear.account_stock_method:
+ return
+
type_ = self._get_account_stock_move_type()
if not type_:
return
@@ -133,17 +138,14 @@ class Move:
if move_line:
account_move_lines.append(move_line)
- date = self.effective_date or Date.today()
- period_id = Period.find(self.company.id, date=date)
account_configuration = AccountConfiguration(1)
- with Transaction().set_user(0, set_context=True):
- return AccountMove(
- journal=account_configuration.stock_journal,
- period=period_id,
- date=date,
- origin=self,
- lines=account_move_lines,
- )
+ return AccountMove(
+ journal=account_configuration.stock_journal,
+ period=period_id,
+ date=date,
+ origin=self,
+ lines=account_move_lines,
+ )
@classmethod
def copy(cls, moves, default=None):
@@ -163,7 +165,6 @@ class Move:
account_moves = []
for move in moves:
account_moves.append(move._get_account_stock_move())
- with Transaction().set_user(0, set_context=True):
- account_moves = AccountMove.create(
- [m._save_values for m in account_moves if m])
- AccountMove.post(account_moves)
+ account_moves = AccountMove.create(
+ [m._save_values for m in account_moves if m])
+ AccountMove.post(account_moves)
diff --git a/tests/scenario_account_stock_continental.rst b/tests/scenario_account_stock_continental.rst
index 0436942..637ddda 100644
--- a/tests/scenario_account_stock_continental.rst
+++ b/tests/scenario_account_stock_continental.rst
@@ -69,6 +69,7 @@ Create fiscal year::
>>> fiscalyear.start_date = today + relativedelta(month=1, day=1)
>>> fiscalyear.end_date = today + relativedelta(month=12, day=31)
>>> fiscalyear.company = company
+ >>> fiscalyear.account_stock_method = 'continental'
>>> post_move_sequence = Sequence(name='%s' % today.year,
... code='account.move',
... company=company)
@@ -197,11 +198,11 @@ Purchase 12 products::
>>> purchase_line.product = product_average
>>> purchase_line.quantity = 7.0
>>> purchase_line.unit_price = Decimal(6)
- >>> purchase.save()
- >>> Purchase.quote([purchase.id], config.context)
- >>> Purchase.confirm([purchase.id], config.context)
+ >>> purchase.click('quote')
+ >>> purchase.click('confirm')
+ >>> purchase.click('process')
>>> purchase.state
- u'confirmed'
+ u'processing'
Receive 9 products::
@@ -381,15 +382,15 @@ Create Drop Shipment Move::
>>> purchase_request, = PurchaseRequest.find()
>>> create_purchase = Wizard('purchase.request.create_purchase',
... [purchase_request])
- >>> create_purchase.form.payment_term = payment_term
- >>> create_purchase.execute('start')
>>> purchase = purchase_request.purchase
+ >>> purchase.payment_term = payment_term
>>> purchase_line, = purchase.lines
>>> purchase_line.unit_price = Decimal(6)
>>> purchase.click('quote')
>>> purchase.click('confirm')
+ >>> purchase.click('process')
>>> purchase.state
- u'confirmed'
+ u'processing'
>>> shipment, = sale.drop_shipments
>>> shipment.click('done')
@@ -433,12 +434,14 @@ Create Drop Shipment Move::
>>> create_purchase = Wizard('purchase.request.create_purchase',
... [purchase_request])
>>> purchase = purchase_request.purchase
+ >>> purchase.payment_term = payment_term
>>> purchase_line, = purchase.lines
>>> purchase_line.unit_price = Decimal(5)
>>> purchase.click('quote')
>>> purchase.click('confirm')
+ >>> purchase.click('process')
>>> purchase.state
- u'confirmed'
+ u'processing'
>>> shipment, = sale.drop_shipments
>>> shipment.click('done')
diff --git a/tests/test_account_stock_continental.py b/tests/test_account_stock_continental.py
index 2a5a423..31679aa 100644
--- a/tests/test_account_stock_continental.py
+++ b/tests/test_account_stock_continental.py
@@ -3,7 +3,8 @@
import unittest
import doctest
import trytond.tests.test_tryton
-from trytond.tests.test_tryton import test_view, test_depends, doctest_dropdb
+from trytond.tests.test_tryton import test_view, test_depends
+from trytond.tests.test_tryton import doctest_setup, doctest_teardown
class AccountStockContinentalTestCase(unittest.TestCase):
@@ -27,6 +28,6 @@ def suite():
AccountStockContinentalTestCase))
suite.addTests(doctest.DocFileSuite(
'scenario_account_stock_continental.rst',
- setUp=doctest_dropdb, tearDown=doctest_dropdb, encoding='utf-8',
+ setUp=doctest_setup, tearDown=doctest_teardown, encoding='utf-8',
optionflags=doctest.REPORT_ONLY_FIRST_FAILURE))
return suite
diff --git a/tryton.cfg b/tryton.cfg
index 5f372f3..6f81ece 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.2.0
+version=3.4.0
depends:
account
account_product
diff --git a/trytond_account_stock_continental.egg-info/PKG-INFO b/trytond_account_stock_continental.egg-info/PKG-INFO
index d4649e7..743ec7e 100644
--- a/trytond_account_stock_continental.egg-info/PKG-INFO
+++ b/trytond_account_stock_continental.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond-account-stock-continental
-Version: 3.2.0
+Version: 3.4.0
Summary: Tryton module for continental real-time stock valuation
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: issue_tracker at tryton.org
License: GPL-3
-Download-URL: http://downloads.tryton.org/3.2/
+Download-URL: http://downloads.tryton.org/3.4/
Description: trytond_account_stock_continental
=================================
diff --git a/trytond_account_stock_continental.egg-info/SOURCES.txt b/trytond_account_stock_continental.egg-info/SOURCES.txt
index f7ee579..7ca1e41 100644
--- a/trytond_account_stock_continental.egg-info/SOURCES.txt
+++ b/trytond_account_stock_continental.egg-info/SOURCES.txt
@@ -5,16 +5,37 @@ LICENSE
MANIFEST.in
README
account.xml
-configuration.xml
product.xml
setup.py
tryton.cfg
./__init__.py
./account.py
+./account.xml
./product.py
+./product.xml
./stock.py
+./tryton.cfg
+./locale/bg_BG.po
+./locale/ca_ES.po
+./locale/cs_CZ.po
+./locale/de_DE.po
+./locale/es_AR.po
+./locale/es_CO.po
+./locale/es_EC.po
+./locale/es_ES.po
+./locale/fr_FR.po
+./locale/nl_NL.po
+./locale/ru_RU.po
+./locale/sl_SI.po
./tests/__init__.py
+./tests/scenario_account_stock_continental.rst
./tests/test_account_stock_continental.py
+./view/category_form.xml
+./view/configuration_form.xml
+./view/fiscalyear_form.xml
+./view/template_form.xml
+./view/update_cost_price_ask_form.xml
+./view/update_cost_price_show_move_form.xml
doc/index.rst
locale/bg_BG.po
locale/ca_ES.po
@@ -22,6 +43,7 @@ locale/cs_CZ.po
locale/de_DE.po
locale/es_AR.po
locale/es_CO.po
+locale/es_EC.po
locale/es_ES.po
locale/fr_FR.po
locale/nl_NL.po
@@ -37,7 +59,7 @@ trytond_account_stock_continental.egg-info/requires.txt
trytond_account_stock_continental.egg-info/top_level.txt
view/category_form.xml
view/configuration_form.xml
-view/stock_configuration_form.xml
+view/fiscalyear_form.xml
view/template_form.xml
view/update_cost_price_ask_form.xml
view/update_cost_price_show_move_form.xml
\ No newline at end of file
diff --git a/trytond_account_stock_continental.egg-info/requires.txt b/trytond_account_stock_continental.egg-info/requires.txt
index fac8bed..ec20cfc 100644
--- a/trytond_account_stock_continental.egg-info/requires.txt
+++ b/trytond_account_stock_continental.egg-info/requires.txt
@@ -1,4 +1,4 @@
-trytond_account >= 3.2, < 3.3
-trytond_account_product >= 3.2, < 3.3
-trytond_stock >= 3.2, < 3.3
-trytond >= 3.2, < 3.3
\ No newline at end of file
+trytond_account >= 3.4, < 3.5
+trytond_account_product >= 3.4, < 3.5
+trytond_stock >= 3.4, < 3.5
+trytond >= 3.4, < 3.5
\ No newline at end of file
diff --git a/view/fiscalyear_form.xml b/view/fiscalyear_form.xml
new file mode 100644
index 0000000..c7e1f22
--- /dev/null
+++ b/view/fiscalyear_form.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<!-- This file is part of Tryton. The COPYRIGHT file at the top level of
+this repository contains the full copyright notices and license terms. -->
+<data>
+ <xpath expr="/form/notebook" position="inside">
+ <page string="Account Stock" id="account_stock">
+ <label name="account_stock_method"/>
+ <field name="account_stock_method"/>
+ </page>
+ </xpath>
+</data>
diff --git a/view/stock_configuration_form.xml b/view/stock_configuration_form.xml
deleted file mode 100644
index c74d0b6..0000000
--- a/view/stock_configuration_form.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0"?>
-<!-- This file is part of Tryton. The COPYRIGHT file at the top level of
-this repository contains the full copyright notices and license terms. -->
-<data>
- <xpath expr="//field[@name='shipment_internal_sequence']"
- position="after">
- <label name="cost_price_counterpart_account"/>
- <field name="cost_price_counterpart_account"/>
- </xpath>
-</data>
--
tryton-modules-account-stock-continental
More information about the tryton-debian-vcs
mailing list