[tryton-debian-vcs] tryton-modules-account-stock-anglo-saxon branch debian updated. debian/3.0.1-1-2-gf626155
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Tue Apr 22 13:05:47 UTC 2014
The following commit has been merged in the debian branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-account-stock-anglo-saxon.git;a=commitdiff;h=debian/3.0.1-1-2-gf626155
commit f6261556453f3f4151dd64931147475c5c99c943
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Apr 22 14:59:39 2014 +0200
Bumping minimal required Python version to 2.7.
diff --git a/debian/control b/debian/control
index cbef0b4..1178e1e 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Standards-Version: 3.9.5
Homepage: http://www.tryton.org/
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=tryton/tryton-modules-account-stock-anglo-saxon.git
Vcs-Git: git://anonscm.debian.org/tryton/tryton-modules-account-stock-anglo-saxon.git
-X-Python-Version: >= 2.6
+X-Python-Version: >= 2.7
Package: tryton-modules-account-stock-anglo-saxon
Architecture: all
commit f088ea937df226b6ccaa3af250ad21b61c9e4077
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Apr 22 14:20:51 2014 +0200
Merging upstream version 3.2.0.
diff --git a/CHANGELOG b/CHANGELOG
index cdb9c54..c021b04 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,4 @@
-Version 3.0.1 - 2014-03-22
+Version 3.2.0 - 2014-04-21
* Bug fixes (see mercurial logs for details)
Version 3.0.0 - 2013-10-21
diff --git a/INSTALL b/INSTALL
index 88be2f1..22ba814 100644
--- a/INSTALL
+++ b/INSTALL
@@ -4,7 +4,7 @@ Installing trytond_account_stock_anglo_saxon
Prerequisites
-------------
- * Python 2.6 or later (http://www.python.org/)
+ * Python 2.7 or later (http://www.python.org/)
* trytond (http://www.tryton.org/)
* trytond_account (http://www.tryton.org/)
* trytond_account_invoice (http://www.tryton.org/)
diff --git a/MANIFEST.in b/MANIFEST.in
index fc0b03e..f2f691a 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,13 +1,11 @@
include INSTALL
include README
-include TODO
include COPYRIGHT
include CHANGELOG
include LICENSE
include tryton.cfg
include *.xml
include view/*.xml
-include *.odt
include locale/*.po
include doc/*
include tests/*.rst
diff --git a/PKG-INFO b/PKG-INFO
index 454618b..5c35715 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_account_stock_anglo_saxon
-Version: 3.0.1
+Version: 3.2.0
Summary: Tryton module for anglo-saxon real-time stock valuation
Home-page: http://www.tryton.org/
Author: Tryton
-Author-email: UNKNOWN
+Author-email: issue_tracker at tryton.org
License: GPL-3
-Download-URL: http://downloads.tryton.org/3.0/
+Download-URL: http://downloads.tryton.org/3.2/
Description: trytond_account_stock_anglo_saxon
=================================
@@ -43,6 +43,7 @@ Description: trytond_account_stock_anglo_saxon
http://www.tryton.org/
+Keywords: tryton account stock valuation anglo-saxon
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
Classifier: Environment :: Plugins
@@ -61,7 +62,6 @@ Classifier: Natural Language :: Russian
Classifier: Natural Language :: Slovenian
Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python :: 2.6
Classifier: Programming Language :: Python :: 2.7
Classifier: Topic :: Office/Business
Classifier: Topic :: Office/Business :: Financial :: Accounting
diff --git a/locale/es_CO.po b/locale/es_CO.po
index fbb5f5c..cd2439d 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -5,36 +5,36 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:stock.move:"
msgid "Anglo-Saxon quantity can not be greater than quantity."
msgstr ""
+"La cantidad del sistema Anglosajon no puede ser mayor que la cantidad."
msgctxt "field:product.category,account_cogs:"
msgid "Account Cost of Goods Sold"
-msgstr ""
+msgstr "Cuenta de Costos de Ventas"
msgctxt "field:product.category,account_cogs_used:"
msgid "Account Cost of Goods Sold Used"
-msgstr ""
+msgstr "Cuenta de Costos de Ventas Usada"
msgctxt "field:product.template,account_cogs:"
msgid "Account Cost of Goods Sold"
-msgstr ""
+msgstr "Cuenta de Costos de Ventas"
msgctxt "field:product.template,account_cogs_used:"
msgid "Account Cost of Goods Sold Used"
-msgstr ""
+msgstr "Cuenta de Costos de Ventas Usada"
msgctxt "field:stock.move,in_anglo_saxon_quantity:"
msgid "Input Anglo-Saxon Quantity"
-msgstr ""
+msgstr "Cantidad Anglosajona a Ingresar "
msgctxt "field:stock.move,out_anglo_saxon_quantity:"
msgid "Output Anglo-Saxon Quantity"
-msgstr ""
+msgstr "Cantidad Anglosajona de Salida"
-#, fuzzy
msgctxt "help:product.template,account_cogs:"
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."
msgctxt "model:account.account.template,name:account_template_cogs"
msgid "COGS"
-msgstr ""
+msgstr "Costos de Ventas"
diff --git a/setup.py b/setup.py
index 61f1d0a..85cbe2d 100644
--- a/setup.py
+++ b/setup.py
@@ -11,36 +11,53 @@ import ConfigParser
def read(fname):
return open(os.path.join(os.path.dirname(__file__), fname)).read()
+
+def get_require_version(name):
+ if minor_version % 2:
+ require = '%s >= %s.%s.dev0, < %s.%s'
+ else:
+ require = '%s >= %s.%s, < %s.%s'
+ require %= (name, major_version, minor_version,
+ major_version, minor_version + 1)
+ return require
+
config = ConfigParser.ConfigParser()
config.readfp(open('tryton.cfg'))
info = dict(config.items('tryton'))
for key in ('depends', 'extras_depend', 'xml'):
if key in info:
info[key] = info[key].strip().splitlines()
-major_version, minor_version, _ = info.get('version', '0.0.1').split('.', 2)
+version = info.get('version', '0.0.1')
+major_version, minor_version, _ = version.split('.', 2)
major_version = int(major_version)
minor_version = int(minor_version)
+name = 'trytond_account_stock_anglo_saxon'
+
+download_url = 'http://downloads.tryton.org/%s.%s/' % (
+ major_version, minor_version)
+if minor_version % 2:
+ version = '%s.%s.dev0' % (major_version, minor_version)
+ download_url = (
+ 'hg+http://hg.tryton.org/modules/%s#egg=%s-%s' % (
+ name[8:], name, version))
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))
-requires.append('trytond >= %s.%s, < %s.%s' %
- (major_version, minor_version, major_version, minor_version + 1))
+ requires.append(get_require_version('trytond_%s' % dep))
+requires.append(get_require_version('trytond'))
-tests_require = ['proteus >= %s.%s, < %s.%s' %
- (major_version, minor_version, major_version, minor_version + 1)]
+tests_require = [get_require_version('proteus')]
-setup(name='trytond_account_stock_anglo_saxon',
- version=info.get('version', '0.0.1'),
+setup(name=name,
+ version=version,
description='Tryton module for anglo-saxon real-time stock valuation',
long_description=read('README'),
author='Tryton',
+ author_email='issue_tracker at tryton.org',
url='http://www.tryton.org/',
- download_url=("http://downloads.tryton.org/" +
- info.get('version', '0.0.1').rsplit('.', 1)[0] + '/'),
+ download_url=download_url,
+ keywords='tryton account stock valuation anglo-saxon',
package_dir={'trytond.modules.account_stock_anglo_saxon': '.'},
packages=[
'trytond.modules.account_stock_anglo_saxon',
@@ -68,7 +85,6 @@ setup(name='trytond_account_stock_anglo_saxon',
'Natural Language :: Slovenian',
'Natural Language :: Spanish',
'Operating System :: OS Independent',
- 'Programming Language :: Python :: 2.6',
'Programming Language :: Python :: 2.7',
'Topic :: Office/Business',
'Topic :: Office/Business :: Financial :: Accounting',
diff --git a/tests/scenario_account_stock_anglo_saxon.rst b/tests/scenario_account_stock_anglo_saxon.rst
index 95f464f..39da1ee 100644
--- a/tests/scenario_account_stock_anglo_saxon.rst
+++ b/tests/scenario_account_stock_anglo_saxon.rst
@@ -38,14 +38,14 @@ Create company::
>>> company_config = Wizard('company.company.config')
>>> company_config.execute('company')
>>> company = company_config.form
- >>> party = Party(name='B2CK')
+ >>> party = Party(name='Dunder Mifflin')
>>> party.save()
>>> company.party = party
- >>> currencies = Currency.find([('code', '=', 'EUR')])
+ >>> currencies = Currency.find([('code', '=', 'USD')])
>>> if not currencies:
- ... currency = Currency(name='Euro', symbol=u'€', code='EUR',
+ ... currency = Currency(name='U.S. Dollar', symbol='$', code='USD',
... rounding=Decimal('0.01'), mon_grouping='[3, 3, 0]',
- ... mon_decimal_point=',')
+ ... mon_decimal_point='.', mon_thousands_sep=',')
... currency.save()
... CurrencyRate(date=today + relativedelta(month=1, day=1),
... rate=Decimal('1.0'), currency=currency).save()
@@ -245,17 +245,20 @@ Receive 9 products::
u'done'
>>> stock_supplier.reload()
>>> stock.reload()
- >>> (stock_supplier.debit, stock_supplier.credit) == \
- ... (Decimal('0.00'), Decimal('46.00'))
- True
+ >>> stock_supplier.debit
+ Decimal('0.00')
+ >>> stock_supplier.credit
+ Decimal('46.00')
>>> stock.reload()
- >>> (stock.debit, stock.credit) == \
- ... (Decimal('50.00'), Decimal('0.00'))
- True
+ >>> stock.debit
+ Decimal('50.00')
+ >>> stock.credit
+ Decimal('0.00')
>>> expense.reload()
- >>> (expense.debit, expense.credit) == \
- ... (Decimal('0.00'), Decimal('4.00'))
- True
+ >>> expense.debit
+ Decimal('0.00')
+ >>> expense.credit
+ Decimal('4.00')
Open supplier invoice::
@@ -272,17 +275,20 @@ Open supplier invoice::
>>> invoice.state
u'posted'
>>> payable.reload()
- >>> (payable.debit, payable.credit) == \
- ... (Decimal('0.00'), Decimal('44.00'))
- True
+ >>> payable.debit
+ Decimal('0.00')
+ >>> payable.credit
+ Decimal('44.00')
>>> expense.reload()
- >>> (expense.debit, expense.credit) == \
- ... (Decimal('44.00'), Decimal('50.00'))
- True
+ >>> expense.debit
+ Decimal('44.00')
+ >>> expense.credit
+ Decimal('50.00')
>>> stock_supplier.reload()
- >>> (stock_supplier.debit, stock_supplier.credit) == \
- ... (Decimal('46.00'), Decimal('46.00'))
- True
+ >>> stock_supplier.debit
+ Decimal('46.00')
+ >>> stock_supplier.credit
+ Decimal('46.00')
Sale 5 products::
@@ -324,13 +330,15 @@ Send 5 products::
>>> shipment.state
u'done'
>>> stock_customer.reload()
- >>> (stock_customer.debit, stock_customer.credit) == \
- ... (Decimal('28.00'), Decimal('0.00'))
- True
+ >>> stock_customer.debit
+ Decimal('28.00')
+ >>> stock_customer.credit
+ Decimal('0.00')
>>> stock.reload()
- >>> (stock.debit, stock.credit) == \
- ... (Decimal('50.00'), Decimal('28.00'))
- True
+ >>> stock.debit
+ Decimal('50.00')
+ >>> stock.credit
+ Decimal('28.00')
Open customer invoice::
@@ -340,21 +348,25 @@ Open customer invoice::
>>> invoice.state
u'posted'
>>> receivable.reload()
- >>> (receivable.debit, receivable.credit) == \
- ... (Decimal('50.00'), Decimal('0.00'))
- True
+ >>> receivable.debit
+ Decimal('50.00')
+ >>> receivable.credit
+ Decimal('0.00')
>>> revenue.reload()
- >>> (revenue.debit, revenue.credit) == \
- ... (Decimal('0.00'), Decimal('50.00'))
- True
+ >>> revenue.debit
+ Decimal('0.00')
+ >>> revenue.credit
+ Decimal('50.00')
>>> stock_customer.reload()
- >>> (stock_customer.debit, stock_customer.credit) == \
- ... (Decimal('28.00'), Decimal('28.00'))
- True
+ >>> stock_customer.debit
+ Decimal('28.00')
+ >>> stock_customer.credit
+ Decimal('28.00')
>>> cogs.reload()
- >>> (cogs.debit, cogs.credit) == \
- ... (Decimal('28.00'), Decimal('0.00'))
- True
+ >>> cogs.debit
+ Decimal('28.00')
+ >>> cogs.credit
+ Decimal('0.00')
Now create a supplier invoice with an accountant::
@@ -394,8 +406,8 @@ Create customer invoice with negative quantity::
u'posted'
>>> move = invoice.move
>>> line_cogs, = (l for l in move.lines if l.account == cogs)
- >>> line_cogs.credit == Decimal('5')
- True
+ >>> line_cogs.credit
+ Decimal('5.00')
>>> line_stock, = (l for l in move.lines if l.account == stock_customer)
- >>> line_stock.debit == Decimal('5')
- True
+ >>> line_stock.debit
+ Decimal('5.00')
diff --git a/tests/scenario_account_stock_anglo_saxon_with_drop_shipment.rst b/tests/scenario_account_stock_anglo_saxon_with_drop_shipment.rst
index a94d5cb..85e037d 100644
--- a/tests/scenario_account_stock_anglo_saxon_with_drop_shipment.rst
+++ b/tests/scenario_account_stock_anglo_saxon_with_drop_shipment.rst
@@ -280,17 +280,20 @@ Receive 50 products::
>>> shipment.state
u'done'
>>> stock_supplier.reload()
- >>> (stock_supplier.debit, stock_supplier.credit) == \
- ... (Decimal('0'), Decimal('150'))
- True
+ >>> stock_supplier.debit
+ Decimal('0.00')
+ >>> stock_supplier.credit
+ Decimal('150.00')
>>> stock_customer.reload()
- >>> (stock_customer.debit, stock_customer.credit) == \
- ... (Decimal('150'), Decimal('0'))
- True
+ >>> stock_customer.debit
+ Decimal('150.00')
+ >>> stock_customer.credit
+ Decimal('0.00')
>>> stock.reload()
- >>> (stock.debit, stock.credit) == \
- ... (Decimal('0'), Decimal('0'))
- True
+ >>> stock.debit
+ Decimal('0.00')
+ >>> stock.credit
+ Decimal('0.00')
Open supplier invoice::
@@ -305,17 +308,20 @@ Open supplier invoice::
>>> invoice.state
u'posted'
>>> payable.reload()
- >>> (payable.debit, payable.credit) == \
- ... (Decimal('0.00'), Decimal('150.00'))
- True
+ >>> payable.debit
+ Decimal('0.00')
+ >>> payable.credit
+ Decimal('150.00')
>>> expense.reload()
- >>> (expense.debit, expense.credit) == \
- ... (Decimal('150.00'), Decimal('150.00'))
- True
+ >>> expense.debit
+ Decimal('150.00')
+ >>> expense.credit
+ Decimal('150.00')
>>> stock_supplier.reload()
- >>> (stock_supplier.debit, stock_supplier.credit) == \
- ... (Decimal('150.00'), Decimal('150.00'))
- True
+ >>> stock_supplier.debit
+ Decimal('150.00')
+ >>> stock_supplier.credit
+ Decimal('150.00')
Open customer invoice::
@@ -327,18 +333,22 @@ Open customer invoice::
>>> invoice.state
u'posted'
>>> receivable.reload()
- >>> (receivable.debit, receivable.credit) == \
- ... (Decimal('500.00'), Decimal('0.00'))
- True
+ >>> receivable.debit
+ Decimal('500.00')
+ >>> receivable.credit
+ Decimal('0.00')
>>> revenue.reload()
- >>> (revenue.debit, revenue.credit) == \
- ... (Decimal('0.00'), Decimal('500.00'))
- True
+ >>> revenue.debit
+ Decimal('0.00')
+ >>> revenue.credit
+ Decimal('500.00')
>>> stock_customer.reload()
- >>> (stock_customer.debit, stock_customer.credit) == \
- ... (Decimal('150.00'), Decimal('150.00'))
- True
+ >>> stock_customer.debit
+ Decimal('150.00')
+ >>> stock_customer.credit
+ Decimal('150.00')
>>> cogs.reload()
- >>> (cogs.debit, cogs.credit) == \
- ... (Decimal('150.00'), Decimal('0.00'))
- True
+ >>> cogs.debit
+ Decimal('150.00')
+ >>> cogs.credit
+ Decimal('0.00')
diff --git a/tests/test_account_stock_anglo_saxon.py b/tests/test_account_stock_anglo_saxon.py
index 423cd3b..e0b5b9f 100644
--- a/tests/test_account_stock_anglo_saxon.py
+++ b/tests/test_account_stock_anglo_saxon.py
@@ -1,55 +1,26 @@
-#!/usr/bin/env python
#This file is part of Tryton. The COPYRIGHT file at the top level of
#this repository contains the full copyright notices and license terms.
-
-import sys
-import os
-DIR = os.path.abspath(os.path.normpath(os.path.join(__file__,
- '..', '..', '..', '..', '..', 'trytond')))
-if os.path.isdir(DIR):
- sys.path.insert(0, os.path.dirname(DIR))
-
import unittest
import doctest
import trytond.tests.test_tryton
-from trytond.tests.test_tryton import test_view, test_depends
-from trytond.backend.sqlite.database import Database as SQLiteDatabase
+from trytond.tests.test_tryton import test_view, test_depends, doctest_dropdb
class AccountStockAngloSaxonTestCase(unittest.TestCase):
- '''
- Test Account Stock Anglo Saxon module.
- '''
+ 'Test Account Stock Anglo Saxon module'
def setUp(self):
trytond.tests.test_tryton.install_module('account_stock_anglo_saxon')
def test0005views(self):
- '''
- Test views.
- '''
+ 'Test views'
test_view('account_stock_anglo_saxon')
def test0006depends(self):
- '''
- Test depends.
- '''
+ 'Test depends'
test_depends()
-def doctest_dropdb(test):
- '''
- Remove sqlite memory database
- '''
- database = SQLiteDatabase().connect()
- cursor = database.cursor(autocommit=True)
- try:
- database.drop(cursor, ':memory:')
- cursor.commit()
- finally:
- cursor.close()
-
-
def suite():
suite = trytond.tests.test_tryton.suite()
suite.addTests(unittest.TestLoader().loadTestsFromTestCase(
@@ -63,6 +34,3 @@ def suite():
setUp=doctest_dropdb, tearDown=doctest_dropdb, encoding='utf-8',
optionflags=doctest.REPORT_ONLY_FIRST_FAILURE))
return suite
-
-if __name__ == '__main__':
- unittest.TextTestRunner(verbosity=2).run(suite())
diff --git a/tryton.cfg b/tryton.cfg
index 320fba7..cead7ca 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.0.1
+version=3.2.0
depends:
account
account_invoice
diff --git a/trytond_account_stock_anglo_saxon.egg-info/PKG-INFO b/trytond_account_stock_anglo_saxon.egg-info/PKG-INFO
index 1d80134..01d31a6 100644
--- a/trytond_account_stock_anglo_saxon.egg-info/PKG-INFO
+++ b/trytond_account_stock_anglo_saxon.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond-account-stock-anglo-saxon
-Version: 3.0.1
+Version: 3.2.0
Summary: Tryton module for anglo-saxon real-time stock valuation
Home-page: http://www.tryton.org/
Author: Tryton
-Author-email: UNKNOWN
+Author-email: issue_tracker at tryton.org
License: GPL-3
-Download-URL: http://downloads.tryton.org/3.0/
+Download-URL: http://downloads.tryton.org/3.2/
Description: trytond_account_stock_anglo_saxon
=================================
@@ -43,6 +43,7 @@ Description: trytond_account_stock_anglo_saxon
http://www.tryton.org/
+Keywords: tryton account stock valuation anglo-saxon
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
Classifier: Environment :: Plugins
@@ -61,7 +62,6 @@ Classifier: Natural Language :: Russian
Classifier: Natural Language :: Slovenian
Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python :: 2.6
Classifier: Programming Language :: Python :: 2.7
Classifier: Topic :: Office/Business
Classifier: Topic :: Office/Business :: Financial :: Accounting
diff --git a/trytond_account_stock_anglo_saxon.egg-info/requires.txt b/trytond_account_stock_anglo_saxon.egg-info/requires.txt
index d3213c1..746b146 100644
--- a/trytond_account_stock_anglo_saxon.egg-info/requires.txt
+++ b/trytond_account_stock_anglo_saxon.egg-info/requires.txt
@@ -1,7 +1,7 @@
-trytond_account >= 3.0, < 3.1
-trytond_account_invoice >= 3.0, < 3.1
-trytond_account_product >= 3.0, < 3.1
-trytond_account_stock_continental >= 3.0, < 3.1
-trytond_purchase >= 3.0, < 3.1
-trytond_sale >= 3.0, < 3.1
-trytond >= 3.0, < 3.1
\ No newline at end of file
+trytond_account >= 3.2, < 3.3
+trytond_account_invoice >= 3.2, < 3.3
+trytond_account_product >= 3.2, < 3.3
+trytond_account_stock_continental >= 3.2, < 3.3
+trytond_purchase >= 3.2, < 3.3
+trytond_sale >= 3.2, < 3.3
+trytond >= 3.2, < 3.3
\ No newline at end of file
--
tryton-modules-account-stock-anglo-saxon
More information about the tryton-debian-vcs
mailing list