[tryton-debian-vcs] tryton-modules-account-stock-continental branch upstream created. 5c5e3f769595216c134952b81c51ac1c29266506
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Wed Nov 27 16:57:28 UTC 2013
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=5c5e3f769595216c134952b81c51ac1c29266506
commit 5c5e3f769595216c134952b81c51ac1c29266506
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Nov 24 17:26:28 2013 +0100
Adding upstream version 3.0.0.
diff --git a/CHANGELOG b/CHANGELOG
index d5b2779..ec13836 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,4 @@
-Version 2.8.1 - 2013-06-09
+Version 3.0.0 - 2013-10-21
* Bug fixes (see mercurial logs for details)
Version 2.8.0 - 2013-04-22
diff --git a/PKG-INFO b/PKG-INFO
index 5e6e92d..d26251b 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_account_stock_continental
-Version: 2.8.1
+Version: 3.0.0
Summary: Tryton module for continental real-time stock valuation
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: UNKNOWN
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.8/
+Download-URL: http://downloads.tryton.org/3.0/
Description: trytond_account_stock_continental
=================================
@@ -59,6 +59,7 @@ Classifier: Natural Language :: English
Classifier: Natural Language :: French
Classifier: Natural Language :: German
Classifier: Natural Language :: Russian
+Classifier: Natural Language :: Slovenian
Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
Classifier: Programming Language :: Python :: 2.6
diff --git a/locale/ca_ES.po b/locale/ca_ES.po
index 1b9c1cb..d85f42f 100644
--- a/locale/ca_ES.po
+++ b/locale/ca_ES.po
@@ -215,11 +215,11 @@ msgstr "Cancel·la"
msgctxt "wizard_button:product.update_cost_price,ask_price,should_show_move:"
msgid "Ok"
-msgstr "D'acord"
+msgstr "Accepta"
msgctxt "wizard_button:product.update_cost_price,show_move,create_move:"
msgid "Ok"
-msgstr "D'acord"
+msgstr "Accepta"
msgctxt "wizard_button:product.update_cost_price,show_move,end:"
msgid "Cancel"
diff --git a/locale/es_AR.po b/locale/es_AR.po
index 656cc46..22427ee 100644
--- a/locale/es_AR.po
+++ b/locale/es_AR.po
@@ -117,7 +117,7 @@ msgstr "Contrapartida"
msgctxt "field:product.update_cost_price.show_move,currency_digits:"
msgid "Currency Digits"
-msgstr "Dígitos de divisa"
+msgstr "Dígitos de moneda"
msgctxt "field:product.update_cost_price.show_move,description:"
msgid "Description"
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
index e57a56f..78c7b65 100644
--- a/locale/fr_FR.po
+++ b/locale/fr_FR.po
@@ -8,7 +8,7 @@ msgstr "Le compte de stock doit être différent du compte de contrepartie"
msgctxt "field:account.configuration,cost_price_counterpart_account:"
msgid "Cost Price Counterpart Account"
-msgstr "Contrepartie prix de revient"
+msgstr "Contrepartie du prix de revient"
msgctxt "field:account.configuration,stock_journal:"
msgid "Stock Journal"
diff --git a/locale/ca_ES.po b/locale/sl_SI.po
similarity index 73%
copy from locale/ca_ES.po
copy to locale/sl_SI.po
index 1b9c1cb..79bbd52 100644
--- a/locale/ca_ES.po
+++ b/locale/sl_SI.po
@@ -4,99 +4,99 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:product.update_cost_price:"
msgid "The stock account and the counterpart can not be the same account"
-msgstr "El compte d'estoc i la contrapartida no poden ser el mateix compte."
+msgstr "Konto in protikonto zaloge ne moreta biti isti konto"
msgctxt "field:account.configuration,cost_price_counterpart_account:"
msgid "Cost Price Counterpart Account"
-msgstr "Compte contrapartida preu de cost"
+msgstr "Protikonto nabavne cene"
msgctxt "field:account.configuration,stock_journal:"
msgid "Stock Journal"
-msgstr "Diari d'estoc"
+msgstr "Dnevnik zaloge"
msgctxt "field:product.category,account_stock:"
msgid "Account Stock"
-msgstr "Compte d'estoc"
+msgstr "Konto zaloge"
msgctxt "field:product.category,account_stock_customer:"
msgid "Account Stock Customer"
-msgstr "Compte d'estoc client"
+msgstr "Konto zaloge pri kupcu"
msgctxt "field:product.category,account_stock_customer_used:"
msgid "Account Stock Customer Used"
-msgstr "Compte d'estoc client usat"
+msgstr "Uporabljen konto zaloge pri kupcu"
msgctxt "field:product.category,account_stock_lost_found:"
msgid "Account Stock Lost and Found"
-msgstr "Compte d'estoc perdut/trobat"
+msgstr "Konto zaloge pri izgubljeno/najdeno"
msgctxt "field:product.category,account_stock_lost_found_used:"
msgid "Account Stock Lost and Found"
-msgstr "Compte d'estoc perdut/trobat"
+msgstr "Konto zaloge pri izgubljeno/najdeno"
msgctxt "field:product.category,account_stock_production:"
msgid "Account Stock Production"
-msgstr "Compte d'estoc producció"
+msgstr "Konto zaloge pri proizvodnji"
msgctxt "field:product.category,account_stock_production_used:"
msgid "Account Stock Production Used"
-msgstr "Compte d'estoc producció usat"
+msgstr "Uporabljen konto zaloge pri proizvodnji"
msgctxt "field:product.category,account_stock_supplier:"
msgid "Account Stock Supplier"
-msgstr "Compte d'estoc proveïdor"
+msgstr "Konto zaloge pri dobavitelju"
msgctxt "field:product.category,account_stock_supplier_used:"
msgid "Account Stock Supplier Used"
-msgstr "Compte d'estoc proveïdor usat"
+msgstr "Uporabljen konto zaloge pri dobavitelju"
msgctxt "field:product.category,account_stock_used:"
msgid "Account Stock Used"
-msgstr "Compte d'estoc usat"
+msgstr "Uporabljen konto zaloge"
msgctxt "field:product.template,account_stock:"
msgid "Account Stock"
-msgstr "Compte d'estoc"
+msgstr "Konto zaloge"
msgctxt "field:product.template,account_stock_customer:"
msgid "Account Stock Customer"
-msgstr "Compte d'estoc client"
+msgstr "Konto zaloge pri kupcu"
msgctxt "field:product.template,account_stock_customer_used:"
msgid "Account Stock Customer Used"
-msgstr "Compte d'estoc client usat"
+msgstr "Uporabljen konto zaloge pri kupcu"
msgctxt "field:product.template,account_stock_lost_found:"
msgid "Account Stock Lost and Found"
-msgstr "Compte d'estoc perdut/trobat"
+msgstr "Konto zaloge pri izgubljeno/najdeno"
msgctxt "field:product.template,account_stock_lost_found_used:"
msgid "Account Stock Lost and Found"
-msgstr "Compte d'estoc perdut/trobat"
+msgstr "Konto zaloge pri izgubljeno/najdeno"
msgctxt "field:product.template,account_stock_production:"
msgid "Account Stock Production"
-msgstr "Compte d'estoc producció"
+msgstr "Konto zaloge pri proizvodnji"
msgctxt "field:product.template,account_stock_production_used:"
msgid "Account Stock Production Used"
-msgstr "Compte d'estoc producció usat"
+msgstr "Uporabljen konto zaloge pri proizvodnji"
msgctxt "field:product.template,account_stock_supplier:"
msgid "Account Stock Supplier"
-msgstr "Compte d'estoc proveïdor"
+msgstr "Konto zaloge pri dobavitelju"
msgctxt "field:product.template,account_stock_supplier_used:"
msgid "Account Stock Supplier Used"
-msgstr "Compte d'estoc proveïdor usat"
+msgstr "Uporabljen konto zaloge pri dobavitelju"
msgctxt "field:product.template,account_stock_used:"
msgid "Account Stock Used"
-msgstr "Compte d'estoc usat"
+msgstr "Uporabljen konto zaloge"
msgctxt "field:product.update_cost_price.ask,cost_price:"
msgid "Cost Price"
-msgstr "Preu de cost"
+msgstr "Nabavna cena"
msgctxt "field:product.update_cost_price.ask,id:"
msgid "ID"
@@ -104,23 +104,23 @@ msgstr "ID"
msgctxt "field:product.update_cost_price.ask,product:"
msgid "Product"
-msgstr "Producte"
+msgstr "Izdelek"
msgctxt "field:product.update_cost_price.show_move,amount:"
msgid "Amount"
-msgstr "Import"
+msgstr "Znesek"
msgctxt "field:product.update_cost_price.show_move,counterpart:"
msgid "Counterpart"
-msgstr "Contrapartida"
+msgstr "Protikonto"
msgctxt "field:product.update_cost_price.show_move,currency_digits:"
msgid "Currency Digits"
-msgstr "Decimals de la moneda"
+msgstr "Decimalke"
msgctxt "field:product.update_cost_price.show_move,description:"
msgid "Description"
-msgstr "Descripció"
+msgstr "Opis"
msgctxt "field:product.update_cost_price.show_move,id:"
msgid "ID"
@@ -128,99 +128,99 @@ msgstr "ID"
msgctxt "field:product.update_cost_price.show_move,journal:"
msgid "Journal"
-msgstr "Diari"
+msgstr "Dnevnik"
msgctxt "field:product.update_cost_price.show_move,price_difference:"
msgid "Price Difference"
-msgstr "Diferència de preu"
+msgstr "Razlika v ceni"
msgctxt "field:product.update_cost_price.show_move,stock_account:"
msgid "Stock Account"
-msgstr "Compte d'estoc"
+msgstr "Konto zaloge"
msgctxt "field:stock.move,account_move:"
msgid "Account Move"
-msgstr "Assentament comptable"
+msgstr "Knjižba"
msgctxt "help:product.template,account_stock:"
msgid "This account will be used instead of the one defined on the category."
-msgstr "S'utilitzarà aquest compte en lloc del definit a la categoria."
+msgstr "Namesto konta v kategoriji se bo uporabil ta konto prihodkov."
msgctxt "help:product.template,account_stock_customer:"
msgid "This account will be used instead of the one defined on the category."
-msgstr "S'utilitzarà aquest compte en lloc del definit a la categoria."
+msgstr "Namesto konta v kategoriji se bo uporabil ta konto prihodkov."
msgctxt "help:product.template,account_stock_lost_found:"
msgid "This account will be used instead of the one defined on the category."
-msgstr "S'utilitzarà aquest compte en lloc del definit a la categoria."
+msgstr "Namesto konta v kategoriji se bo uporabil ta konto prihodkov."
msgctxt "help:product.template,account_stock_production:"
msgid "This account will be used instead of the one defined on the category."
-msgstr "S'utilitzarà aquest compte en lloc del definit a la categoria."
+msgstr "Namesto konta v kategoriji se bo uporabil ta konto prihodkov."
msgctxt "help:product.template,account_stock_supplier:"
msgid "This account will be used instead of the one defined on the category."
-msgstr "S'utilitzarà aquest compte en lloc del definit a la categoria."
+msgstr "Namesto konta v kategoriji se bo uporabil ta konto prihodkov."
msgctxt "model:account.account.template,name:account_template_stock"
msgid "Stock"
-msgstr "Estoc"
+msgstr "Zaloga"
msgctxt "model:account.account.template,name:account_template_stock_customer"
msgid "Stock Customer"
-msgstr "Estoc client"
+msgstr "Zaloga kupca"
msgctxt ""
"model:account.account.template,name:account_template_stock_lost_found"
msgid "Stock Lost and Found"
-msgstr "Estoc perdut/trobat"
+msgstr "Zaloga izgubljeno/najdeno"
msgctxt ""
"model:account.account.template,name:account_template_stock_production"
msgid "Stock Production"
-msgstr "Estoc producció"
+msgstr "Zaloga proizvodnje"
msgctxt "model:account.account.template,name:account_template_stock_supplier"
msgid "Stock Supplier"
-msgstr "Estoc proveïdor"
+msgstr "Zaloga dobavitelja"
msgctxt ""
"model:account.account.type.template,name:account_type_template_asset_current_inventories"
msgid "Inventories"
-msgstr "Inventaris"
+msgstr "Popisi"
msgctxt "model:ir.action,name:wizard_update_cost_price"
msgid "Update Cost Price"
-msgstr "Actualitza preu de cost"
+msgstr "Popravek nabavne cene"
msgctxt "model:product.update_cost_price.ask,name:"
msgid "Update Cost Price Ask"
-msgstr "Demana actualitzar preu de cost"
+msgstr "Popravek nabavne cene"
msgctxt "model:product.update_cost_price.show_move,name:"
msgid "Update Cost Price Show Move"
-msgstr "Actualitza preu de cost. Mostra assentament"
+msgstr "Popravek nabavne cene - Prikaz prometa"
msgctxt "view:product.update_cost_price.ask:"
msgid "Update Cost Price"
-msgstr "Actualitza preu de cost"
+msgstr "Popravek nabavne cene"
msgctxt "view:product.update_cost_price.show_move:"
msgid "Update Cost Price - Move"
-msgstr "Actualitza preu de cost - Assentament"
+msgstr "Popravek nabavne cene - Promet"
msgctxt "wizard_button:product.update_cost_price,ask_price,end:"
msgid "Cancel"
-msgstr "Cancel·la"
+msgstr "Prekliči"
msgctxt "wizard_button:product.update_cost_price,ask_price,should_show_move:"
msgid "Ok"
-msgstr "D'acord"
+msgstr "V redu"
msgctxt "wizard_button:product.update_cost_price,show_move,create_move:"
msgid "Ok"
-msgstr "D'acord"
+msgstr "V redu"
msgctxt "wizard_button:product.update_cost_price,show_move,end:"
msgid "Cancel"
-msgstr "Cancel·la"
+msgstr "Prekliči"
diff --git a/product.py b/product.py
index cb43842..98fe1a0 100644
--- a/product.py
+++ b/product.py
@@ -17,7 +17,7 @@ class Category:
account_stock = fields.Property(fields.Many2One('account.account',
'Account Stock', domain=[
('kind', '=', 'stock'),
- ('company', '=', Eval('context', {}).get('company', 0)),
+ ('company', '=', Eval('context', {}).get('company', -1)),
],
states={
'invisible': (~Eval('context', {}).get('company')
@@ -27,7 +27,7 @@ class Category:
account_stock_supplier = fields.Property(fields.Many2One('account.account',
'Account Stock Supplier', domain=[
('kind', '=', 'stock'),
- ('company', '=', Eval('context', {}).get('company', 0)),
+ ('company', '=', Eval('context', {}).get('company', -1)),
],
states={
'invisible': (~Eval('context', {}).get('company')
@@ -37,7 +37,7 @@ class Category:
account_stock_customer = fields.Property(fields.Many2One('account.account',
'Account Stock Customer', domain=[
('kind', '=', 'stock'),
- ('company', '=', Eval('context', {}).get('company', 0)),
+ ('company', '=', Eval('context', {}).get('company', -1)),
],
states={
'invisible': (~Eval('context', {}).get('company')
@@ -48,7 +48,7 @@ class Category:
fields.Many2One('account.account',
'Account Stock Production', domain=[
('kind', '=', 'stock'),
- ('company', '=', Eval('context', {}).get('company', 0)),
+ ('company', '=', Eval('context', {}).get('company', -1)),
],
states={
'invisible': (~Eval('context', {}).get('company')
@@ -58,7 +58,7 @@ class Category:
account_stock_lost_found = fields.Property(fields.Many2One(
'account.account', 'Account Stock Lost and Found', domain=[
('kind', '=', 'stock'),
- ('company', '=', Eval('context', {}).get('company', 0)),
+ ('company', '=', Eval('context', {}).get('company', -1)),
],
states={
'invisible': (~Eval('context', {}).get('company')
@@ -83,7 +83,7 @@ class Template:
'Account Stock',
domain=[
('kind', '=', 'stock'),
- ('company', '=', Eval('context', {}).get('company', 0)),
+ ('company', '=', Eval('context', {}).get('company', -1)),
],
states={
'invisible': (~Eval('context', {}).get('company')
@@ -99,7 +99,7 @@ class Template:
'Account Stock Supplier',
domain=[
('kind', '=', 'stock'),
- ('company', '=', Eval('context', {}).get('company', 0)),
+ ('company', '=', Eval('context', {}).get('company', -1)),
],
states={
'invisible': (~Eval('context', {}).get('company')
@@ -115,7 +115,7 @@ class Template:
'Account Stock Customer',
domain=[
('kind', '=', 'stock'),
- ('company', '=', Eval('context', {}).get('company', 0)),
+ ('company', '=', Eval('context', {}).get('company', -1)),
],
states={
'invisible': (~Eval('context', {}).get('company')
@@ -132,7 +132,7 @@ class Template:
'Account Stock Production',
domain=[
('kind', '=', 'stock'),
- ('company', '=', Eval('context', {}).get('company', 0)),
+ ('company', '=', Eval('context', {}).get('company', -1)),
],
states={
'invisible': (~Eval('context', {}).get('company')
@@ -148,7 +148,7 @@ class Template:
'account.account', 'Account Stock Lost and Found',
domain=[
('kind', '=', 'stock'),
- ('company', '=', Eval('context', {}).get('company', 0)),
+ ('company', '=', Eval('context', {}).get('company', -1)),
],
states={
'invisible': (~Eval('context', {}).get('company')
@@ -201,7 +201,8 @@ class UpdateCostPriceShowMove(ModelView):
readonly=True)
counterpart = fields.Many2One('account.account', 'Counterpart',
domain=[
- ('company', 'in', [Get(Eval('context', {}), 'company'), False]),
+ ('company', 'in',
+ [Eval('context', {}).get('company', -1), None]),
('id', '!=', Eval('stock_account')),
],
depends=['stock_account'], required=True)
@@ -334,8 +335,6 @@ class UpdateCostPrice(Wizard):
return 'update_price'
def transition_update_price(self):
- Product = Pool().get('product.product')
- Product.write([self.ask_price.product], {
- 'cost_price': self.ask_price.cost_price,
- })
+ self.ask_price.product.cost_price = self.ask_price.cost_price
+ self.ask_price.product.save()
return 'end'
diff --git a/setup.py b/setup.py
index 3102977..a5f4047 100644
--- a/setup.py
+++ b/setup.py
@@ -70,6 +70,7 @@ setup(name='trytond_account_stock_continental',
'Natural Language :: French',
'Natural Language :: German',
'Natural Language :: Russian',
+ 'Natural Language :: Slovenian',
'Natural Language :: Spanish',
'Operating System :: OS Independent',
'Programming Language :: Python :: 2.6',
diff --git a/tests/__init__.py b/tests/__init__.py
index 9963b30..f884411 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -2,3 +2,5 @@
#this repository contains the full copyright notices and license terms.
from .test_account_stock_continental import suite
+
+__all__ = ['suite']
diff --git a/tests/scenario_account_stock_continental.rst b/tests/scenario_account_stock_continental.rst
index 08a2bcf..f4b8cba 100644
--- a/tests/scenario_account_stock_continental.rst
+++ b/tests/scenario_account_stock_continental.rst
@@ -89,7 +89,7 @@ Create chart of accounts::
>>> AccountTemplate = Model.get('account.account.template')
>>> Account = Model.get('account.account')
- >>> account_template, = AccountTemplate.find([('parent', '=', False)])
+ >>> account_template, = AccountTemplate.find([('parent', '=', None)])
>>> create_chart = Wizard('account.create_chart')
>>> create_chart.execute('account')
>>> create_chart.form.account_template = account_template
diff --git a/tryton.cfg b/tryton.cfg
index d975e84..4cbc310 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=2.8.1
+version=3.0.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 072aeb2..e00c89c 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: 2.8.1
+Version: 3.0.0
Summary: Tryton module for continental real-time stock valuation
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: UNKNOWN
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.8/
+Download-URL: http://downloads.tryton.org/3.0/
Description: trytond_account_stock_continental
=================================
@@ -59,6 +59,7 @@ Classifier: Natural Language :: English
Classifier: Natural Language :: French
Classifier: Natural Language :: German
Classifier: Natural Language :: Russian
+Classifier: Natural Language :: Slovenian
Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
Classifier: Programming Language :: Python :: 2.6
diff --git a/trytond_account_stock_continental.egg-info/SOURCES.txt b/trytond_account_stock_continental.egg-info/SOURCES.txt
index 0f9a154..f7ee579 100644
--- a/trytond_account_stock_continental.egg-info/SOURCES.txt
+++ b/trytond_account_stock_continental.egg-info/SOURCES.txt
@@ -26,6 +26,7 @@ locale/es_ES.po
locale/fr_FR.po
locale/nl_NL.po
locale/ru_RU.po
+locale/sl_SI.po
tests/scenario_account_stock_continental.rst
trytond_account_stock_continental.egg-info/PKG-INFO
trytond_account_stock_continental.egg-info/SOURCES.txt
diff --git a/trytond_account_stock_continental.egg-info/requires.txt b/trytond_account_stock_continental.egg-info/requires.txt
index 09fefb4..8652fa9 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 >= 2.8, < 2.9
-trytond_account_product >= 2.8, < 2.9
-trytond_stock >= 2.8, < 2.9
-trytond >= 2.8, < 2.9
\ No newline at end of file
+trytond_account >= 3.0, < 3.1
+trytond_account_product >= 3.0, < 3.1
+trytond_stock >= 3.0, < 3.1
+trytond >= 3.0, < 3.1
\ No newline at end of file
commit 3d53aa47319e98fac1c886f0f3f34b648035171e
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon Jun 10 13:44:09 2013 +0200
Adding upstream version 2.8.1.
diff --git a/CHANGELOG b/CHANGELOG
index 1efbf33..d5b2779 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.8.1 - 2013-06-09
+* Bug fixes (see mercurial logs for details)
+
Version 2.8.0 - 2013-04-22
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index 70f2e3c..5e6e92d 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_account_stock_continental
-Version: 2.8.0
+Version: 2.8.1
Summary: Tryton module for continental real-time stock valuation
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/product.py b/product.py
index 158cd60..cb43842 100644
--- a/product.py
+++ b/product.py
@@ -289,7 +289,7 @@ class UpdateCostPrice(Wizard):
}
def get_move_lines(self):
- Line = Pool.get('account.move.line')
+ Line = Pool().get('account.move.line')
amount = self.show_move.amount
return [Line(
debit=amount if amount > 0 else 0,
diff --git a/tryton.cfg b/tryton.cfg
index c322bc2..d975e84 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=2.8.0
+version=2.8.1
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 44e8077..072aeb2 100644
--- a/trytond_account_stock_continental.egg-info/PKG-INFO
+++ b/trytond_account_stock_continental.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond-account-stock-continental
-Version: 2.8.0
+Version: 2.8.1
Summary: Tryton module for continental real-time stock valuation
Home-page: http://www.tryton.org/
Author: Tryton
commit 437510a168fa298cedca6774a33e8fa9454605c7
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Thu May 2 00:35:09 2013 +0200
Adding upstream version 2.8.0.
diff --git a/CHANGELOG b/CHANGELOG
index 6b47a7a..1efbf33 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,4 @@
-Version 2.6.1 - 2012-10-24
+Version 2.8.0 - 2013-04-22
* Bug fixes (see mercurial logs for details)
Version 2.6.0 - 2012-10-22
diff --git a/COPYRIGHT b/COPYRIGHT
index e792a2c..7e8c156 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,5 +1,5 @@
-Copyright (C) 2010-2012 Cédric Krier.
-Copyright (C) 2010-2012 B2CK SPRL.
+Copyright (C) 2010-2013 Cédric Krier.
+Copyright (C) 2010-2013 B2CK SPRL.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/MANIFEST.in b/MANIFEST.in
index 478d5ff..fc0b03e 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -6,6 +6,7 @@ include CHANGELOG
include LICENSE
include tryton.cfg
include *.xml
+include view/*.xml
include *.odt
include locale/*.po
include doc/*
diff --git a/PKG-INFO b/PKG-INFO
index c7ddcae..70f2e3c 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
Name: trytond_account_stock_continental
-Version: 2.6.1
+Version: 2.8.0
Summary: Tryton module for continental real-time stock valuation
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: UNKNOWN
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.6/
+Download-URL: http://downloads.tryton.org/2.8/
Description: trytond_account_stock_continental
=================================
@@ -52,6 +52,7 @@ Classifier: Intended Audience :: Financial and Insurance Industry
Classifier: Intended Audience :: Legal Industry
Classifier: License :: OSI Approved :: GNU General Public License (GPL)
Classifier: Natural Language :: Bulgarian
+Classifier: Natural Language :: Catalan
Classifier: Natural Language :: Czech
Classifier: Natural Language :: Dutch
Classifier: Natural Language :: English
diff --git a/account.xml b/account.xml
index 5c49971..1ea085d 100644
--- a/account.xml
+++ b/account.xml
@@ -6,22 +6,7 @@ this repository contains the full copyright notices and license terms. -->
<record model="ir.ui.view" id="configuration_view_form">
<field name="model">account.configuration</field>
<field name="inherit" ref="account.configuration_view_form"/>
- <field name="arch" type="xml">
- <![CDATA[
- <data>
- <xpath
- expr="/form"
- position="inside">
- <newline/>
- <label name="stock_journal"/>
- <field name="stock_journal"/>
- <label name="cost_price_counterpart_account"/>
- <field name="cost_price_counterpart_account"/>
- <newline/>
- </xpath>
- </data>
- ]]>
- </field>
+ <field name="name">configuration_form</field>
</record>
<record model="ir.property" id="property_stock_journal">
diff --git a/configuration.xml b/configuration.xml
index 72e6fbb..ab61424 100644
--- a/configuration.xml
+++ b/configuration.xml
@@ -1,20 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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="arch" type="xml">
- <![CDATA[
- <data>
- <xpath expr="//field[@name='shipment_internal_sequence']"
- position="after">
- <label name="cost_price_counterpart_account"/>
- <field name="cost_price_counterpart_account"/>
- </xpath>
- </data>
- ]]>
- </field>
+ <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"/>
diff --git a/locale/ca_ES.po b/locale/ca_ES.po
index bee545e..1b9c1cb 100644
--- a/locale/ca_ES.po
+++ b/locale/ca_ES.po
@@ -16,83 +16,83 @@ msgstr "Diari d'estoc"
msgctxt "field:product.category,account_stock:"
msgid "Account Stock"
-msgstr "Compte estoc"
+msgstr "Compte d'estoc"
msgctxt "field:product.category,account_stock_customer:"
msgid "Account Stock Customer"
-msgstr "Compte estoc client"
+msgstr "Compte d'estoc client"
msgctxt "field:product.category,account_stock_customer_used:"
msgid "Account Stock Customer Used"
-msgstr "Compte estoc client usat"
+msgstr "Compte d'estoc client usat"
msgctxt "field:product.category,account_stock_lost_found:"
msgid "Account Stock Lost and Found"
-msgstr "Compte estoc perdut/trobat"
+msgstr "Compte d'estoc perdut/trobat"
msgctxt "field:product.category,account_stock_lost_found_used:"
msgid "Account Stock Lost and Found"
-msgstr "Compte estoc perdut/trobat"
+msgstr "Compte d'estoc perdut/trobat"
msgctxt "field:product.category,account_stock_production:"
msgid "Account Stock Production"
-msgstr "Compte estoc producció"
+msgstr "Compte d'estoc producció"
msgctxt "field:product.category,account_stock_production_used:"
msgid "Account Stock Production Used"
-msgstr "Compte estoc producció usat"
+msgstr "Compte d'estoc producció usat"
msgctxt "field:product.category,account_stock_supplier:"
msgid "Account Stock Supplier"
-msgstr "Compte estoc proveïdor"
+msgstr "Compte d'estoc proveïdor"
msgctxt "field:product.category,account_stock_supplier_used:"
msgid "Account Stock Supplier Used"
-msgstr "Compte estoc proveïdor usat"
+msgstr "Compte d'estoc proveïdor usat"
msgctxt "field:product.category,account_stock_used:"
msgid "Account Stock Used"
-msgstr "Compte estoc usat"
+msgstr "Compte d'estoc usat"
msgctxt "field:product.template,account_stock:"
msgid "Account Stock"
-msgstr "Compte estoc"
+msgstr "Compte d'estoc"
msgctxt "field:product.template,account_stock_customer:"
msgid "Account Stock Customer"
-msgstr "Compte estoc client"
+msgstr "Compte d'estoc client"
msgctxt "field:product.template,account_stock_customer_used:"
msgid "Account Stock Customer Used"
-msgstr "Compte estoc client usat"
+msgstr "Compte d'estoc client usat"
msgctxt "field:product.template,account_stock_lost_found:"
msgid "Account Stock Lost and Found"
-msgstr "Compte estoc perdut/trobat"
+msgstr "Compte d'estoc perdut/trobat"
msgctxt "field:product.template,account_stock_lost_found_used:"
msgid "Account Stock Lost and Found"
-msgstr "Compte estoc perdut/trobat"
+msgstr "Compte d'estoc perdut/trobat"
msgctxt "field:product.template,account_stock_production:"
msgid "Account Stock Production"
-msgstr "Compte estoc producció"
+msgstr "Compte d'estoc producció"
msgctxt "field:product.template,account_stock_production_used:"
msgid "Account Stock Production Used"
-msgstr "Compte estoc producció usat"
+msgstr "Compte d'estoc producció usat"
msgctxt "field:product.template,account_stock_supplier:"
msgid "Account Stock Supplier"
-msgstr "Compte estoc proveïdor"
+msgstr "Compte d'estoc proveïdor"
msgctxt "field:product.template,account_stock_supplier_used:"
msgid "Account Stock Supplier Used"
-msgstr "Compte estoc proveïdor usat"
+msgstr "Compte d'estoc proveïdor usat"
msgctxt "field:product.template,account_stock_used:"
msgid "Account Stock Used"
-msgstr "Compte estoc usat"
+msgstr "Compte d'estoc usat"
msgctxt "field:product.update_cost_price.ask,cost_price:"
msgid "Cost Price"
@@ -144,23 +144,23 @@ msgstr "Assentament comptable"
msgctxt "help:product.template,account_stock:"
msgid "This account will be used instead of the one defined on the category."
-msgstr "Aquest compte s'utilitzarà en lloc del definit a la categoria."
+msgstr "S'utilitzarà aquest compte en lloc del definit a la categoria."
msgctxt "help:product.template,account_stock_customer:"
msgid "This account will be used instead of the one defined on the category."
-msgstr "Aquest compte s'utilitzarà en lloc del definit a la categoria."
+msgstr "S'utilitzarà aquest compte en lloc del definit a la categoria."
msgctxt "help:product.template,account_stock_lost_found:"
msgid "This account will be used instead of the one defined on the category."
-msgstr "Aquest compte s'utilitzarà en lloc del definit a la categoria."
+msgstr "S'utilitzarà aquest compte en lloc del definit a la categoria."
msgctxt "help:product.template,account_stock_production:"
msgid "This account will be used instead of the one defined on the category."
-msgstr "Aquest compte s'utilitzarà en lloc del definit a la categoria."
+msgstr "S'utilitzarà aquest compte en lloc del definit a la categoria."
msgctxt "help:product.template,account_stock_supplier:"
msgid "This account will be used instead of the one defined on the category."
-msgstr "Aquest compte s'utilitzarà en lloc del definit a la categoria."
+msgstr "S'utilitzarà aquest compte en lloc del definit a la categoria."
msgctxt "model:account.account.template,name:account_template_stock"
msgid "Stock"
diff --git a/locale/de_DE.po b/locale/de_DE.po
index 5ce211b..de697d0 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -4,7 +4,7 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:product.update_cost_price:"
msgid "The stock account and the counterpart can not be the same account"
-msgstr "Lagerkonto und Gegenkonto können nicht das selbe Konto sein"
+msgstr "Lagerkonto und Gegenkonto können nicht dasselbe Konto sein"
msgctxt "field:account.configuration,cost_price_counterpart_account:"
msgid "Cost Price Counterpart Account"
diff --git a/locale/es_AR.po b/locale/es_AR.po
index bd74882..656cc46 100644
--- a/locale/es_AR.po
+++ b/locale/es_AR.po
@@ -5,8 +5,7 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:product.update_cost_price:"
msgid "The stock account and the counterpart can not be the same account"
msgstr ""
-"La cuenta de existencias y la contrapartida\n"
-"no pueden ser la misma cuenta"
+"La cuenta de existencias y la contrapartida no pueden ser la misma cuenta."
msgctxt "field:account.configuration,cost_price_counterpart_account:"
msgid "Cost Price Counterpart Account"
@@ -14,87 +13,87 @@ msgstr "Cuenta contraparte del Precio de costo"
msgctxt "field:account.configuration,stock_journal:"
msgid "Stock Journal"
-msgstr "Diario de Existencias"
+msgstr "Diario de existencias"
msgctxt "field:product.category,account_stock:"
msgid "Account Stock"
-msgstr "Cuenta de Existencias"
+msgstr "Cuenta de existencias"
msgctxt "field:product.category,account_stock_customer:"
msgid "Account Stock Customer"
-msgstr "Cuenta de Existencias del Cliente"
+msgstr "Cuenta de existencias del cliente"
msgctxt "field:product.category,account_stock_customer_used:"
msgid "Account Stock Customer Used"
-msgstr "Cuenta de Existencias del 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 de Existencias Perdidas y Encontradas"
+msgstr "Cuenta de existencias Perdidas y encontradas"
msgctxt "field:product.category,account_stock_lost_found_used:"
msgid "Account Stock Lost and Found"
-msgstr "Cuenta de Existencias Perdidas y Encontradas"
+msgstr "Cuenta de existencias Perdidas y encontradas"
msgctxt "field:product.category,account_stock_production:"
msgid "Account Stock Production"
-msgstr "Cuenta de Existencias de Producción"
+msgstr "Cuenta de existencias de producción"
msgctxt "field:product.category,account_stock_production_used:"
msgid "Account Stock Production Used"
-msgstr "Cuenta de Existencias de Producción utilizada"
+msgstr "Cuenta de existencias de producción utilizada"
msgctxt "field:product.category,account_stock_supplier:"
msgid "Account Stock Supplier"
-msgstr "Cuenta de Existencias del Proveedor"
+msgstr "Cuenta de existencias del proveedor"
msgctxt "field:product.category,account_stock_supplier_used:"
msgid "Account Stock Supplier Used"
-msgstr "Cuenta de Existencias del Proveedor utilizada"
+msgstr "Cuenta de existencias del proveedor utilizada"
msgctxt "field:product.category,account_stock_used:"
msgid "Account Stock Used"
-msgstr "Cuenta de Existencias utilizada"
+msgstr "Cuenta de existencias utilizada"
msgctxt "field:product.template,account_stock:"
msgid "Account Stock"
-msgstr "Cuenta de Existencias"
+msgstr "Cuenta de existencias"
msgctxt "field:product.template,account_stock_customer:"
msgid "Account Stock Customer"
-msgstr "Cuenta de Existencias del Cliente"
+msgstr "Cuenta de existencias del cliente"
msgctxt "field:product.template,account_stock_customer_used:"
msgid "Account Stock Customer Used"
-msgstr "Cuenta de Existencias del 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 de Existencias Perdidas y Encontradas"
+msgstr "Cuenta de existencias Perdidas y encontradas"
msgctxt "field:product.template,account_stock_lost_found_used:"
msgid "Account Stock Lost and Found"
-msgstr "Cuenta de Existencias Perdidas y Encontradas"
+msgstr "Cuenta de existencias Perdidas y encontradas"
msgctxt "field:product.template,account_stock_production:"
msgid "Account Stock Production"
-msgstr "Cuenta de Existencias de Producción"
+msgstr "Cuenta de existencias de producción"
msgctxt "field:product.template,account_stock_production_used:"
msgid "Account Stock Production Used"
-msgstr "Cuenta de Existencias de Producción utilizada"
+msgstr "Cuenta de existencias de producción utilizada"
msgctxt "field:product.template,account_stock_supplier:"
msgid "Account Stock Supplier"
-msgstr "Cuenta de Existencias del Proveedor"
+msgstr "Cuenta de existencias del proveedor"
msgctxt "field:product.template,account_stock_supplier_used:"
msgid "Account Stock Supplier Used"
-msgstr "Cuenta de Existencias del Proveedor utilizada"
+msgstr "Cuenta de existencias del proveedor utilizada"
msgctxt "field:product.template,account_stock_used:"
msgid "Account Stock Used"
-msgstr "Cuenta de Existencias utilizada"
+msgstr "Cuenta de existencias utilizada"
msgctxt "field:product.update_cost_price.ask,cost_price:"
msgid "Cost Price"
@@ -118,7 +117,7 @@ msgstr "Contrapartida"
msgctxt "field:product.update_cost_price.show_move,currency_digits:"
msgid "Currency Digits"
-msgstr "Dígitos de la divisa"
+msgstr "Dígitos de divisa"
msgctxt "field:product.update_cost_price.show_move,description:"
msgid "Description"
@@ -134,11 +133,11 @@ msgstr "Diario"
msgctxt "field:product.update_cost_price.show_move,price_difference:"
msgid "Price Difference"
-msgstr "Diferencia de Precio"
+msgstr "Diferencia de precio"
msgctxt "field:product.update_cost_price.show_move,stock_account:"
msgid "Stock Account"
-msgstr "Cuenta de Existencias"
+msgstr "Cuenta de existencias"
msgctxt "field:stock.move,account_move:"
msgid "Account Move"
@@ -146,23 +145,23 @@ msgstr "Asiento contable"
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 usará 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 usará 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 usará 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 usará 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 usará esta cuenta en lugar de la definida en la categoría."
msgctxt "model:account.account.template,name:account_template_stock"
msgid "Stock"
@@ -170,21 +169,21 @@ msgstr "Existencias"
msgctxt "model:account.account.template,name:account_template_stock_customer"
msgid "Stock Customer"
-msgstr "Existencias del Cliente"
+msgstr "Existencias del cliente"
msgctxt ""
"model:account.account.template,name:account_template_stock_lost_found"
msgid "Stock Lost and Found"
-msgstr "Existencias Perdidas y Encontradas"
+msgstr "Existencias perdidas y encontradas"
msgctxt ""
"model:account.account.template,name:account_template_stock_production"
msgid "Stock Production"
-msgstr "Existencias de Producción"
+msgstr "Existencias de producción"
msgctxt "model:account.account.template,name:account_template_stock_supplier"
msgid "Stock Supplier"
-msgstr "Existencias del Proveedor"
+msgstr "Existencias del proveedor"
msgctxt ""
"model:account.account.type.template,name:account_type_template_asset_current_inventories"
@@ -193,23 +192,23 @@ msgstr "Inventarios"
msgctxt "model:ir.action,name:wizard_update_cost_price"
msgid "Update Cost Price"
-msgstr "Actualizar Precio de costo"
+msgstr "Actualizar precio de costo"
msgctxt "model:product.update_cost_price.ask,name:"
msgid "Update Cost Price Ask"
-msgstr "Actualizar Precio de costo - Petición"
+msgstr "Solicitar actualizar precio de costo"
msgctxt "model:product.update_cost_price.show_move,name:"
msgid "Update Cost Price Show Move"
-msgstr "Actualizar Precio de costo - Mostrar movimiento"
+msgstr "Actualizar precio de costo - Mostrar asiento"
msgctxt "view:product.update_cost_price.ask:"
msgid "Update Cost Price"
-msgstr "Actualizar Precio de costo"
+msgstr "Actualizar precio de costo"
msgctxt "view:product.update_cost_price.show_move:"
msgid "Update Cost Price - Move"
-msgstr "Actualizar Precio de costo - Movimiento"
+msgstr "Actualizar precio de costo - Asiento"
msgctxt "wizard_button:product.update_cost_price,ask_price,end:"
msgid "Cancel"
diff --git a/locale/es_CO.po b/locale/es_CO.po
index 54c8863..5bb533b 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -5,10 +5,11 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:product.update_cost_price:"
msgid "The stock account and the counterpart can not be the same account"
msgstr ""
+"La cuenta de existencias y su contraparte no pued ser la misma cuenta."
msgctxt "field:account.configuration,cost_price_counterpart_account:"
msgid "Cost Price Counterpart Account"
-msgstr ""
+msgstr "Cuenta Equivalente de Precio de Costo"
msgctxt "field:account.configuration,stock_journal:"
msgid "Stock Journal"
@@ -24,7 +25,7 @@ msgstr "Cuenta Existencias Cliente"
msgctxt "field:product.category,account_stock_customer_used:"
msgid "Account Stock Customer Used"
-msgstr "Cuenta Existencias Cliente Usado"
+msgstr "Cuenta Existencias Cliente Usada"
msgctxt "field:product.category,account_stock_lost_found:"
msgid "Account Stock Lost and Found"
@@ -36,11 +37,11 @@ msgstr "Cuenta Existencias Perdidos y Encontrados"
msgctxt "field:product.category,account_stock_production:"
msgid "Account Stock Production"
-msgstr ""
+msgstr "Cuenta Existencias en Producción"
msgctxt "field:product.category,account_stock_production_used:"
msgid "Account Stock Production Used"
-msgstr ""
+msgstr "Cuenta Existencias en Producción Usada"
msgctxt "field:product.category,account_stock_supplier:"
msgid "Account Stock Supplier"
@@ -48,11 +49,11 @@ msgstr "Cuenta Existencias Proveedor"
msgctxt "field:product.category,account_stock_supplier_used:"
msgid "Account Stock Supplier Used"
-msgstr "Cuenta Existencias Proveedor Usado"
+msgstr "Cuenta Existencias Proveedor Usada"
msgctxt "field:product.category,account_stock_used:"
msgid "Account Stock Used"
-msgstr "Usado en Cuenta Existencias"
+msgstr "Cuenta Existencias Usada"
msgctxt "field:product.template,account_stock:"
msgid "Account Stock"
@@ -64,7 +65,7 @@ msgstr "Cuenta Existencias Cliente"
msgctxt "field:product.template,account_stock_customer_used:"
msgid "Account Stock Customer Used"
-msgstr "Cuenta Existencias Cliente Usado"
+msgstr "Cuenta Existencias Cliente Usada"
msgctxt "field:product.template,account_stock_lost_found:"
msgid "Account Stock Lost and Found"
@@ -76,11 +77,11 @@ msgstr "Cuenta Existencias Perdidos y Encontrados"
msgctxt "field:product.template,account_stock_production:"
msgid "Account Stock Production"
-msgstr ""
+msgstr "Cuenta Existencias en Producción"
msgctxt "field:product.template,account_stock_production_used:"
msgid "Account Stock Production Used"
-msgstr ""
+msgstr "Cuenta Existencias en Producción Usada"
msgctxt "field:product.template,account_stock_supplier:"
msgid "Account Stock Supplier"
@@ -88,67 +89,59 @@ msgstr "Cuenta Existencias Proveedor"
msgctxt "field:product.template,account_stock_supplier_used:"
msgid "Account Stock Supplier Used"
-msgstr "Cuenta Existencias Proveedor Usado"
+msgstr "Cuenta Existencias Proveedor Usada"
msgctxt "field:product.template,account_stock_used:"
msgid "Account Stock Used"
-msgstr "Cuenta Existencias Proveedor"
+msgstr "Cuenta Existencias Usada"
-#, fuzzy
msgctxt "field:product.update_cost_price.ask,cost_price:"
msgid "Cost Price"
msgstr "Precio de Costo"
-#, fuzzy
msgctxt "field:product.update_cost_price.ask,id:"
msgid "ID"
msgstr "ID"
-#, fuzzy
msgctxt "field:product.update_cost_price.ask,product:"
msgid "Product"
msgstr "Productos"
-#, fuzzy
msgctxt "field:product.update_cost_price.show_move,amount:"
msgid "Amount"
-msgstr "Importe"
+msgstr "Cantidad"
msgctxt "field:product.update_cost_price.show_move,counterpart:"
msgid "Counterpart"
-msgstr ""
+msgstr "Equivalente"
-#, fuzzy
msgctxt "field:product.update_cost_price.show_move,currency_digits:"
msgid "Currency Digits"
-msgstr "Gestión de Moneda"
+msgstr "Decimales de Moneda"
-#, fuzzy
msgctxt "field:product.update_cost_price.show_move,description:"
msgid "Description"
msgstr "Descripción"
-#, fuzzy
msgctxt "field:product.update_cost_price.show_move,id:"
msgid "ID"
msgstr "ID"
-#, fuzzy
msgctxt "field:product.update_cost_price.show_move,journal:"
msgid "Journal"
-msgstr "Diario"
+msgstr "Libro Diario"
msgctxt "field:product.update_cost_price.show_move,price_difference:"
msgid "Price Difference"
-msgstr ""
+msgstr "Diferencia en Precio"
msgctxt "field:product.update_cost_price.show_move,stock_account:"
msgid "Stock Account"
-msgstr ""
+msgstr "Cuenta de Existencias"
msgctxt "field:stock.move,account_move:"
msgid "Account Move"
-msgstr "Cuenta Movimiento"
+msgstr "Asiento Contable"
msgctxt "help:product.template,account_stock:"
msgid "This account will be used instead of the one defined on the category."
@@ -162,7 +155,6 @@ 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."
-#, fuzzy
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."
@@ -187,7 +179,7 @@ msgstr "Existencias de Perdido y Encontrado"
msgctxt ""
"model:account.account.template,name:account_template_stock_production"
msgid "Stock Production"
-msgstr ""
+msgstr "Existencias en Producción"
msgctxt "model:account.account.template,name:account_template_stock_supplier"
msgid "Stock Supplier"
@@ -200,40 +192,36 @@ msgstr "Inventarios"
msgctxt "model:ir.action,name:wizard_update_cost_price"
msgid "Update Cost Price"
-msgstr ""
+msgstr "Actualizar Precio de Costo"
msgctxt "model:product.update_cost_price.ask,name:"
msgid "Update Cost Price Ask"
-msgstr ""
+msgstr "Pregunta Actualiza Precio de Costo"
msgctxt "model:product.update_cost_price.show_move,name:"
msgid "Update Cost Price Show Move"
-msgstr ""
+msgstr "Actualizar Costo Precio del Asiento Mostrado"
msgctxt "view:product.update_cost_price.ask:"
msgid "Update Cost Price"
-msgstr ""
+msgstr "Actualizar Precio de Costo"
msgctxt "view:product.update_cost_price.show_move:"
msgid "Update Cost Price - Move"
-msgstr ""
+msgstr "Asiento Actualiza Precio de Costo"
-#, fuzzy
msgctxt "wizard_button:product.update_cost_price,ask_price,end:"
msgid "Cancel"
msgstr "Cancelar"
-#, fuzzy
msgctxt "wizard_button:product.update_cost_price,ask_price,should_show_move:"
msgid "Ok"
msgstr "Aceptar"
-#, fuzzy
msgctxt "wizard_button:product.update_cost_price,show_move,create_move:"
msgid "Ok"
msgstr "Aceptar"
-#, fuzzy
msgctxt "wizard_button:product.update_cost_price,show_move,end:"
msgid "Cancel"
msgstr "Cancelar"
diff --git a/locale/es_ES.po b/locale/es_ES.po
index 023d15d..7b0555c 100644
--- a/locale/es_ES.po
+++ b/locale/es_ES.po
@@ -16,83 +16,83 @@ msgstr "Diario de stock"
msgctxt "field:product.category,account_stock:"
msgid "Account Stock"
-msgstr "Cuenta stock"
+msgstr "Cuenta de stock"
msgctxt "field:product.category,account_stock_customer:"
msgid "Account Stock Customer"
-msgstr "Cuenta stock cliente"
+msgstr "Cuenta de stock cliente"
msgctxt "field:product.category,account_stock_customer_used:"
msgid "Account Stock Customer Used"
-msgstr "Cuenta stock cliente usada"
+msgstr "Cuenta de stock cliente usada"
msgctxt "field:product.category,account_stock_lost_found:"
msgid "Account Stock Lost and Found"
-msgstr "Cuenta stock perdido/encontrado"
+msgstr "Cuenta de stock perdido/encontrado"
msgctxt "field:product.category,account_stock_lost_found_used:"
msgid "Account Stock Lost and Found"
-msgstr "Cuenta stock perdido/encontrado"
+msgstr "Cuenta de stock perdido/encontrado"
msgctxt "field:product.category,account_stock_production:"
msgid "Account Stock Production"
-msgstr "Cuenta stock producción"
+msgstr "Cuenta de stock producción"
msgctxt "field:product.category,account_stock_production_used:"
msgid "Account Stock Production Used"
-msgstr "Cuenta stock producción usada"
+msgstr "Cuenta de stock producción usada"
msgctxt "field:product.category,account_stock_supplier:"
msgid "Account Stock Supplier"
-msgstr "Cuenta stock proveedor"
+msgstr "Cuenta de stock proveedor"
msgctxt "field:product.category,account_stock_supplier_used:"
msgid "Account Stock Supplier Used"
-msgstr "Cuenta stock proveedor usada"
+msgstr "Cuenta de stock proveedor usada"
msgctxt "field:product.category,account_stock_used:"
msgid "Account Stock Used"
-msgstr "Cuenta stock usada"
+msgstr "Cuenta de stock usada"
msgctxt "field:product.template,account_stock:"
msgid "Account Stock"
-msgstr "Cuenta stock"
+msgstr "Cuenta de stock"
msgctxt "field:product.template,account_stock_customer:"
msgid "Account Stock Customer"
-msgstr "Cuenta stock cliente"
+msgstr "Cuenta de stock cliente"
msgctxt "field:product.template,account_stock_customer_used:"
msgid "Account Stock Customer Used"
-msgstr "Cuenta stock cliente usada"
+msgstr "Cuenta de stock cliente usada"
msgctxt "field:product.template,account_stock_lost_found:"
msgid "Account Stock Lost and Found"
-msgstr "Cuenta stock perdido/encontrado"
+msgstr "Cuenta de stock perdido/encontrado"
msgctxt "field:product.template,account_stock_lost_found_used:"
msgid "Account Stock Lost and Found"
-msgstr "Cuenta stock perdido/encontrado"
+msgstr "Cuenta de stock perdido/encontrado"
msgctxt "field:product.template,account_stock_production:"
msgid "Account Stock Production"
-msgstr "Cuenta stock producción"
+msgstr "Cuenta de stock producción"
msgctxt "field:product.template,account_stock_production_used:"
msgid "Account Stock Production Used"
-msgstr "Cuenta stock producción usada"
+msgstr "Cuenta de stock producción usada"
msgctxt "field:product.template,account_stock_supplier:"
msgid "Account Stock Supplier"
-msgstr "Cuenta stock proveedor"
+msgstr "Cuenta de stock proveedor"
msgctxt "field:product.template,account_stock_supplier_used:"
msgid "Account Stock Supplier Used"
-msgstr "Cuenta stock proveedor usada"
+msgstr "Cuenta de stock proveedor usada"
msgctxt "field:product.template,account_stock_used:"
msgid "Account Stock Used"
-msgstr "Cuenta stock usada"
+msgstr "Cuenta de stock usada"
msgctxt "field:product.update_cost_price.ask,cost_price:"
msgid "Cost Price"
diff --git a/locale/ru_RU.po b/locale/ru_RU.po
index ccaab7f..d2ea565 100644
--- a/locale/ru_RU.po
+++ b/locale/ru_RU.po
@@ -99,39 +99,44 @@ msgctxt "field:product.update_cost_price.ask,cost_price:"
msgid "Cost Price"
msgstr "Цена за единицу"
+#, fuzzy
msgctxt "field:product.update_cost_price.ask,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
#, fuzzy
msgctxt "field:product.update_cost_price.ask,product:"
msgid "Product"
msgstr "Товарно материальные ценности (ТМЦ)"
+#, fuzzy
msgctxt "field:product.update_cost_price.show_move,amount:"
msgid "Amount"
-msgstr ""
+msgstr "Сумма"
msgctxt "field:product.update_cost_price.show_move,counterpart:"
msgid "Counterpart"
msgstr ""
+#, fuzzy
msgctxt "field:product.update_cost_price.show_move,currency_digits:"
msgid "Currency Digits"
-msgstr ""
+msgstr "Кол-во цифр валюты"
#, fuzzy
msgctxt "field:product.update_cost_price.show_move,description:"
msgid "Description"
msgstr "Описание"
+#, fuzzy
msgctxt "field:product.update_cost_price.show_move,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
+#, fuzzy
msgctxt "field:product.update_cost_price.show_move,journal:"
msgid "Journal"
-msgstr ""
+msgstr "Журнал"
msgctxt "field:product.update_cost_price.show_move,price_difference:"
msgid "Price Difference"
@@ -141,29 +146,35 @@ msgctxt "field:product.update_cost_price.show_move,stock_account:"
msgid "Stock Account"
msgstr ""
+#, fuzzy
msgctxt "field:stock.move,account_move:"
msgid "Account Move"
-msgstr ""
+msgstr "Проводка"
+#, fuzzy
msgctxt "help:product.template,account_stock:"
msgid "This account will be used instead of the one defined on the category."
-msgstr ""
+msgstr "Этот счет будет использован вместо указанного в категории."
+#, fuzzy
msgctxt "help:product.template,account_stock_customer:"
msgid "This account will be used instead of the one defined on the category."
-msgstr ""
+msgstr "Этот счет будет использован вместо указанного в категории."
+#, fuzzy
msgctxt "help:product.template,account_stock_lost_found:"
msgid "This account will be used instead of the one defined on the category."
-msgstr ""
+msgstr "Этот счет будет использован вместо указанного в категории."
+#, fuzzy
msgctxt "help:product.template,account_stock_production:"
msgid "This account will be used instead of the one defined on the category."
-msgstr ""
+msgstr "Этот счет будет использован вместо указанного в категории."
+#, fuzzy
msgctxt "help:product.template,account_stock_supplier:"
msgid "This account will be used instead of the one defined on the category."
-msgstr ""
+msgstr "Этот счет будет использован вместо указанного в категории."
#, fuzzy
msgctxt "model:account.account.template,name:account_template_stock"
diff --git a/product.py b/product.py
index 0873a13..158cd60 100644
--- a/product.py
+++ b/product.py
@@ -204,7 +204,7 @@ class UpdateCostPriceShowMove(ModelView):
('company', 'in', [Get(Eval('context', {}), 'company'), False]),
('id', '!=', Eval('stock_account')),
],
- depends=['company', 'stock_account'], required=True)
+ depends=['stock_account'], required=True)
description = fields.Char('Description')
diff --git a/product.xml b/product.xml
index 219a3d7..a9fa732 100644
--- a/product.xml
+++ b/product.xml
@@ -6,39 +6,12 @@ this repository contains the full copyright notices and license terms. -->
<record model="ir.ui.view" id="update_cost_price_ask_form">
<field name="model">product.update_cost_price.ask</field>
<field name="type">form</field>
- <field name="arch" type="xml">
- <![CDATA[
- <form string="Update Cost Price" cursor="cost_price">
- <label name="product"/>
- <field name="product"/>
- <label name="cost_price"/>
- <field name="cost_price"/>
- </form>
- ]]>
- </field>
+ <field name="name">update_cost_price_ask_form</field>
</record>
<record model="ir.ui.view" id="update_cost_price_show_move_form">
<field name="model">product.update_cost_price.show_move</field>
<field name="type">form</field>
- <field name="arch" type="xml">
- <![CDATA[
- <form string="Update Cost Price - Move">
- <label name="description"/>
- <field name="description" colspan="3"/>
- <label name="journal"/>
- <field name="journal"/>
- <newline/>
- <label name="amount"/>
- <field name="amount"/>
- <label name="price_difference"/>
- <field name="price_difference"/>
- <label name="stock_account"/>
- <field name="stock_account"/>
- <label name="counterpart"/>
- <field name="counterpart"/>
- </form>
- ]]>
- </field>
+ <field name="name">update_cost_price_show_move_form</field>
</record>
<record model="ir.action.wizard" id="wizard_update_cost_price">
<field name="name">Update Cost Price</field>
@@ -58,53 +31,13 @@ this repository contains the full copyright notices and license terms. -->
<record model="ir.ui.view" id="category_view_form">
<field name="model">product.category</field>
<field name="inherit" ref="product.category_view_form"/>
- <field name="arch" type="xml">
- <![CDATA[
- <data>
- <xpath
- expr="/form/notebook/page[@id='accounting']/field[@name='account_expense']"
- position="after">
- <label name="account_stock"/>
- <field name="account_stock"/>
- <newline/>
- <label name="account_stock_customer"/>
- <field name="account_stock_customer"/>
- <label name="account_stock_supplier"/>
- <field name="account_stock_supplier"/>
- <label name="account_stock_production"/>
- <field name="account_stock_production"/>
- <label name="account_stock_lost_found"/>
- <field name="account_stock_lost_found"/>
- </xpath>
- </data>
- ]]>
- </field>
+ <field name="name">category_form</field>
</record>
<record model="ir.ui.view" id="template_view_form">
<field name="model">product.template</field>
<field name="inherit" ref="product.template_view_form"/>
- <field name="arch" type="xml">
- <![CDATA[
- <data>
- <xpath
- expr="/form/notebook/page[@id='accounting']/field[@name='account_expense']"
- position="after">
- <label name="account_stock"/>
- <field name="account_stock"/>
- <newline/>
- <label name="account_stock_customer"/>
- <field name="account_stock_customer"/>
- <label name="account_stock_supplier"/>
- <field name="account_stock_supplier"/>
- <label name="account_stock_production"/>
- <field name="account_stock_production"/>
- <label name="account_stock_lost_found"/>
- <field name="account_stock_lost_found"/>
- </xpath>
- </data>
- ]]>
- </field>
+ <field name="name">template_form</field>
</record>
</data>
</tryton>
diff --git a/setup.py b/setup.py
index b8e50c4..3102977 100644
--- a/setup.py
+++ b/setup.py
@@ -25,10 +25,10 @@ requires = []
for dep in info.get('depends', []):
if not re.match(r'(ir|res|webdav)(\W|$)', dep):
requires.append('trytond_%s >= %s.%s, < %s.%s' %
- (dep, major_version, minor_version, major_version,
- minor_version + 1))
+ (dep, major_version, minor_version, major_version,
+ minor_version + 1))
requires.append('trytond >= %s.%s, < %s.%s' %
- (major_version, minor_version, major_version, minor_version + 1))
+ (major_version, minor_version, major_version, minor_version + 1))
tests_require = ['proteus >= %s.%s, < %s.%s' %
(major_version, minor_version, major_version, minor_version + 1)]
@@ -43,16 +43,16 @@ setup(name='trytond_account_stock_continental',
long_description=read('README'),
author='Tryton',
url='http://www.tryton.org/',
- download_url="http://downloads.tryton.org/" + \
- info.get('version', '0.0.1').rsplit('.', 1)[0] + '/',
+ download_url=("http://downloads.tryton.org/" +
+ info.get('version', '0.0.1').rsplit('.', 1)[0] + '/'),
package_dir={'trytond.modules.account_stock_continental': '.'},
packages=[
'trytond.modules.account_stock_continental',
'trytond.modules.account_stock_continental.tests',
],
package_data={
- 'trytond.modules.account_stock_continental': info.get('xml', []) \
- + ['tryton.cfg', 'locale/*.po', 'tests/*.rst'],
+ 'trytond.modules.account_stock_continental': (info.get('xml', [])
+ + ['tryton.cfg', 'view/*.xml', 'locale/*.po', 'tests/*.rst']),
},
classifiers=[
'Development Status :: 5 - Production/Stable',
@@ -63,6 +63,7 @@ setup(name='trytond_account_stock_continental',
'Intended Audience :: Legal Industry',
'License :: OSI Approved :: GNU General Public License (GPL)',
'Natural Language :: Bulgarian',
+ 'Natural Language :: Catalan',
'Natural Language :: Czech',
'Natural Language :: Dutch',
'Natural Language :: English',
diff --git a/stock.py b/stock.py
index 161b238..abfb0d0 100644
--- a/stock.py
+++ b/stock.py
@@ -2,7 +2,7 @@
#this repository contains the full copyright notices and license terms.
from decimal import Decimal
-from trytond.model import fields
+from trytond.model import Workflow, ModelView, fields
from trytond.pool import Pool, PoolMeta
from trytond.transaction import Transaction
@@ -22,6 +22,7 @@ class Move:
pool = Pool()
Uom = pool.get('product.uom')
AccountMoveLine = pool.get('account.move.line')
+ Currency = pool.get('currency.currency')
assert type_.startswith('in_') or type_.startswith('out_'), \
'wrong type'
@@ -30,7 +31,9 @@ class Move:
if ((type_.endswith('supplier')
or type_ == 'in_production')
and self.product.cost_price_method != 'fixed'):
- unit_price = self.unit_price
+ with Transaction().set_context(date=self.effective_date):
+ unit_price = Currency.compute(self.currency, self.unit_price,
+ self.company.currency, round=False)
else:
unit_price = Uom.compute_price(self.product.default_uom,
self.cost_price, self.uom)
@@ -168,15 +171,9 @@ class Move:
return super(Move, cls).copy(moves, default=default)
@classmethod
- def create(cls, vals):
- move = super(Move, cls).create(vals)
- if vals.get('state') == 'done':
+ @ModelView.button
+ @Workflow.transition('done')
+ def do(cls, moves):
+ super(Move, cls).do(moves)
+ for move in moves:
move._create_account_stock_move()
- return move
-
- @classmethod
- def write(cls, moves, vals):
- super(Move, cls).write(moves, vals)
- if vals.get('state') == 'done':
- for move in moves:
- move._create_account_stock_move()
diff --git a/tests/scenario_account_stock_continental.rst b/tests/scenario_account_stock_continental.rst
index e0b70d5..08a2bcf 100644
--- a/tests/scenario_account_stock_continental.rst
+++ b/tests/scenario_account_stock_continental.rst
@@ -34,10 +34,13 @@ Create company::
>>> Currency = Model.get('currency.currency')
>>> CurrencyRate = Model.get('currency.currency.rate')
>>> Company = Model.get('company.company')
+ >>> Party = Model.get('party.party')
>>> company_config = Wizard('company.company.config')
>>> company_config.execute('company')
>>> company = company_config.form
- >>> company.name = 'B2CK'
+ >>> party = Party(name='B2CK')
+ >>> party.save()
+ >>> company.party = party
>>> currencies = Currency.find([('code', '=', 'EUR')])
>>> if not currencies:
... currency = Currency(name='Euro', symbol=u'€', code='EUR',
@@ -136,29 +139,36 @@ Create product::
>>> ProductUom = Model.get('product.uom')
>>> unit, = ProductUom.find([('name', '=', 'Unit')])
+ >>> ProductTemplate = Model.get('product.template')
>>> Product = Model.get('product.product')
>>> product = Product()
- >>> product.name = 'product'
- >>> product.category = category
- >>> product.default_uom = unit
- >>> product.type = 'goods'
- >>> product.purchasable = True
- >>> product.salable = True
- >>> product.list_price = Decimal('10')
- >>> product.cost_price = Decimal('5')
- >>> product.cost_price_method = 'fixed'
- >>> product.delivery_time = 0
- >>> product.account_expense = expense
- >>> product.account_revenue = revenue
- >>> product.account_stock = stock
- >>> product.account_stock_supplier = stock_supplier
- >>> product.account_stock_customer = stock_customer
- >>> product.account_stock_production = stock_production
- >>> product.account_stock_lost_found = stock_lost_found
+ >>> template = ProductTemplate()
+ >>> template.name = 'product'
+ >>> template.category = category
+ >>> template.default_uom = unit
+ >>> template.type = 'goods'
+ >>> template.purchasable = True
+ >>> template.salable = True
+ >>> template.list_price = Decimal('10')
+ >>> template.cost_price = Decimal('5')
+ >>> template.cost_price_method = 'fixed'
+ >>> template.delivery_time = 0
+ >>> template.account_expense = expense
+ >>> template.account_revenue = revenue
+ >>> template.account_stock = stock
+ >>> template.account_stock_supplier = stock_supplier
+ >>> template.account_stock_customer = stock_customer
+ >>> template.account_stock_production = stock_production
+ >>> template.account_stock_lost_found = stock_lost_found
+ >>> template.save()
+ >>> product.template = template
>>> product.save()
- >>> product_average = Product(Product.copy([product.id], config.context)[0])
- >>> product_average.cost_price_method = 'average'
- >>> product_average.save()
+ >>> template_average = ProductTemplate(ProductTemplate.copy([template.id], {
+ ... 'cost_price_method': 'average',
+ ... }, config.context)[0])
+ >>> product_average = Product(Product.copy([product.id], {
+ ... 'template': template_average.id,
+ ... }, config.context)[0])
Create payment term::
@@ -227,10 +237,11 @@ Open supplier invoice::
>>> invoice_line.unit_price = Decimal('6')
>>> invoice_line = invoice.lines[1]
>>> invoice_line.unit_price = Decimal('4')
+ >>> invoice.invoice_date = today
>>> invoice.save()
- >>> Invoice.open([invoice.id], config.context)
+ >>> Invoice.post([invoice.id], config.context)
>>> invoice.state
- u'open'
+ u'posted'
>>> payable.reload()
>>> (payable.debit, payable.credit) == \
... (Decimal('0.00'), Decimal('44.00'))
@@ -292,9 +303,9 @@ Open customer invoice::
>>> sale.reload()
>>> invoice, = sale.invoices
- >>> Invoice.open([invoice.id], config.context)
+ >>> Invoice.post([invoice.id], config.context)
>>> invoice.state
- u'open'
+ u'posted'
>>> receivable.reload()
>>> (receivable.debit, receivable.credit) == \
... (Decimal('50.00'), Decimal('0.00'))
@@ -344,8 +355,8 @@ Create Move from Supplier to Customer::
>>> move.unit_price = Decimal(6)
>>> move.cost_price = move.unit_price
>>> move.currency = currency
- >>> move.state = 'done'
>>> move.save()
+ >>> Move.do([move.id], config.context)
>>> stock_supplier.reload()
>>> (stock_supplier.debit, stock_supplier.credit) == \
... (Decimal(0), Decimal(68))
@@ -362,8 +373,8 @@ Create Move from Supplier to Customer::
>>> move.unit_price = Decimal(5)
>>> move.cost_price = move.unit_price
>>> move.currency = currency
- >>> move.state = 'done'
>>> move.save()
+ >>> Move.do([move.id], config.context)
>>> stock_supplier.reload()
>>> (stock_supplier.debit, stock_supplier.credit) == \
... (Decimal(0), Decimal(88))
diff --git a/tryton.cfg b/tryton.cfg
index fb4275f..c322bc2 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=2.6.1
+version=2.8.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 469c27e..44e8077 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.0
+Metadata-Version: 1.1
Name: trytond-account-stock-continental
-Version: 2.6.1
+Version: 2.8.0
Summary: Tryton module for continental real-time stock valuation
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: UNKNOWN
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.6/
+Download-URL: http://downloads.tryton.org/2.8/
Description: trytond_account_stock_continental
=================================
@@ -52,6 +52,7 @@ Classifier: Intended Audience :: Financial and Insurance Industry
Classifier: Intended Audience :: Legal Industry
Classifier: License :: OSI Approved :: GNU General Public License (GPL)
Classifier: Natural Language :: Bulgarian
+Classifier: Natural Language :: Catalan
Classifier: Natural Language :: Czech
Classifier: Natural Language :: Dutch
Classifier: Natural Language :: English
diff --git a/trytond_account_stock_continental.egg-info/SOURCES.txt b/trytond_account_stock_continental.egg-info/SOURCES.txt
index 9bf22de..0f9a154 100644
--- a/trytond_account_stock_continental.egg-info/SOURCES.txt
+++ b/trytond_account_stock_continental.egg-info/SOURCES.txt
@@ -33,4 +33,10 @@ trytond_account_stock_continental.egg-info/dependency_links.txt
trytond_account_stock_continental.egg-info/entry_points.txt
trytond_account_stock_continental.egg-info/not-zip-safe
trytond_account_stock_continental.egg-info/requires.txt
-trytond_account_stock_continental.egg-info/top_level.txt
\ No newline at end of file
+trytond_account_stock_continental.egg-info/top_level.txt
+view/category_form.xml
+view/configuration_form.xml
+view/stock_configuration_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 2060a6e..09fefb4 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 >= 2.6, < 2.7
-trytond_account_product >= 2.6, < 2.7
-trytond_stock >= 2.6, < 2.7
-trytond >= 2.6, < 2.7
\ No newline at end of file
+trytond_account >= 2.8, < 2.9
+trytond_account_product >= 2.8, < 2.9
+trytond_stock >= 2.8, < 2.9
+trytond >= 2.8, < 2.9
\ No newline at end of file
diff --git a/view/category_form.xml b/view/category_form.xml
new file mode 100644
index 0000000..e6ab87b
--- /dev/null
+++ b/view/category_form.xml
@@ -0,0 +1,20 @@
+<?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/page[@id='accounting']/field[@name='account_expense']"
+ position="after">
+ <label name="account_stock"/>
+ <field name="account_stock"/>
+ <newline/>
+ <label name="account_stock_customer"/>
+ <field name="account_stock_customer"/>
+ <label name="account_stock_supplier"/>
+ <field name="account_stock_supplier"/>
+ <label name="account_stock_production"/>
+ <field name="account_stock_production"/>
+ <label name="account_stock_lost_found"/>
+ <field name="account_stock_lost_found"/>
+ </xpath>
+</data>
diff --git a/view/configuration_form.xml b/view/configuration_form.xml
new file mode 100644
index 0000000..34f3238
--- /dev/null
+++ b/view/configuration_form.xml
@@ -0,0 +1,13 @@
+<?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" position="inside">
+ <newline/>
+ <label name="stock_journal"/>
+ <field name="stock_journal"/>
+ <label name="cost_price_counterpart_account"/>
+ <field name="cost_price_counterpart_account"/>
+ <newline/>
+ </xpath>
+</data>
diff --git a/view/stock_configuration_form.xml b/view/stock_configuration_form.xml
new file mode 100644
index 0000000..c74d0b6
--- /dev/null
+++ b/view/stock_configuration_form.xml
@@ -0,0 +1,10 @@
+<?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>
diff --git a/view/template_form.xml b/view/template_form.xml
new file mode 100644
index 0000000..e6ab87b
--- /dev/null
+++ b/view/template_form.xml
@@ -0,0 +1,20 @@
+<?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/page[@id='accounting']/field[@name='account_expense']"
+ position="after">
+ <label name="account_stock"/>
+ <field name="account_stock"/>
+ <newline/>
+ <label name="account_stock_customer"/>
+ <field name="account_stock_customer"/>
+ <label name="account_stock_supplier"/>
+ <field name="account_stock_supplier"/>
+ <label name="account_stock_production"/>
+ <field name="account_stock_production"/>
+ <label name="account_stock_lost_found"/>
+ <field name="account_stock_lost_found"/>
+ </xpath>
+</data>
diff --git a/view/update_cost_price_ask_form.xml b/view/update_cost_price_ask_form.xml
new file mode 100644
index 0000000..744bc88
--- /dev/null
+++ b/view/update_cost_price_ask_form.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<!-- This file is part of Tryton. The COPYRIGHT file at the top level of
+this repository contains the full copyright notices and license terms. -->
+<form string="Update Cost Price" cursor="cost_price">
+ <label name="product"/>
+ <field name="product"/>
+ <label name="cost_price"/>
+ <field name="cost_price"/>
+</form>
diff --git a/view/update_cost_price_show_move_form.xml b/view/update_cost_price_show_move_form.xml
new file mode 100644
index 0000000..36afcbe
--- /dev/null
+++ b/view/update_cost_price_show_move_form.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<!-- This file is part of Tryton. The COPYRIGHT file at the top level of
+this repository contains the full copyright notices and license terms. -->
+<form string="Update Cost Price - Move">
+ <label name="description"/>
+ <field name="description" colspan="3"/>
+ <label name="journal"/>
+ <field name="journal"/>
+ <newline/>
+ <label name="amount"/>
+ <field name="amount"/>
+ <label name="price_difference"/>
+ <field name="price_difference"/>
+ <label name="stock_account"/>
+ <field name="stock_account"/>
+ <label name="counterpart"/>
+ <field name="counterpart"/>
+</form>
commit 0f104d856ac8c27fe21dff431737b67d56ac072b
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon Apr 22 23:19:22 2013 +0200
Adding upstream version 2.6.1.
diff --git a/CHANGELOG b/CHANGELOG
index e600cac..6b47a7a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.6.1 - 2012-10-24
+* Bug fixes (see mercurial logs for details)
+
Version 2.6.0 - 2012-10-22
* Bug fixes (see mercurial logs for details)
* Updating cost price must update stock accounting
diff --git a/MANIFEST.in b/MANIFEST.in
index de59bbf..478d5ff 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -4,6 +4,7 @@ include TODO
include COPYRIGHT
include CHANGELOG
include LICENSE
+include tryton.cfg
include *.xml
include *.odt
include locale/*.po
diff --git a/PKG-INFO b/PKG-INFO
index 6519ef9..c7ddcae 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond_account_stock_continental
-Version: 2.6.0
+Version: 2.6.1
Summary: Tryton module for continental real-time stock valuation
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/tryton.cfg b/tryton.cfg
new file mode 100644
index 0000000..fb4275f
--- /dev/null
+++ b/tryton.cfg
@@ -0,0 +1,11 @@
+[tryton]
+version=2.6.1
+depends:
+ account
+ account_product
+ ir
+ res
+ stock
+xml:
+ product.xml
+ account.xml
diff --git a/trytond_account_stock_continental.egg-info/PKG-INFO b/trytond_account_stock_continental.egg-info/PKG-INFO
index 1b95dce..469c27e 100644
--- a/trytond_account_stock_continental.egg-info/PKG-INFO
+++ b/trytond_account_stock_continental.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond-account-stock-continental
-Version: 2.6.0
+Version: 2.6.1
Summary: Tryton module for continental real-time stock valuation
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/trytond_account_stock_continental.egg-info/SOURCES.txt b/trytond_account_stock_continental.egg-info/SOURCES.txt
index 363598a..9bf22de 100644
--- a/trytond_account_stock_continental.egg-info/SOURCES.txt
+++ b/trytond_account_stock_continental.egg-info/SOURCES.txt
@@ -8,6 +8,7 @@ account.xml
configuration.xml
product.xml
setup.py
+tryton.cfg
./__init__.py
./account.py
./product.py
--
tryton-modules-account-stock-continental
More information about the tryton-debian-vcs
mailing list