[tryton-debian-vcs] tryton-modules-account-stock-continental branch upstream updated. upstream/2.8.1-1-g5c5e3f7
git repository hosting
tryton-debian-vcs at m9s.biz
Mon Nov 25 19:32:57 UTC 2013
The following commit has been merged in the upstream branch:
http://debian.tryton.org/gitweb/?p=packages/tryton-modules-account-stock-continental.git;a=commitdiff;h=upstream/2.8.1-1-g5c5e3f7
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
--
tryton-modules-account-stock-continental
More information about the tryton-debian-vcs
mailing list