[tryton-debian-vcs] tryton-modules-purchase-invoice-line-standalone branch upstream updated. upstream/3.4.1-1-g247d301
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Thu Apr 23 16:05:42 UTC 2015
The following commit has been merged in the upstream branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-purchase-invoice-line-standalone.git;a=commitdiff;h=upstream/3.4.1-1-g247d301
commit 247d3017054a5178b3b32fb23c03f48fba6fd767
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Thu Apr 23 17:00:03 2015 +0200
Adding upstream version 3.6.0.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/CHANGELOG b/CHANGELOG
index 19bf7bd..9fb2c68 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,6 @@
-Version 3.4.1 - 2015-02-21
+Version 3.6.0 - 2015-04-20
* Bug fixes (see mercurial logs for details)
-
+* Add support for PyPy
Version 3.4.0 - 2014-10-20
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index 75f6882..d71b5fb 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_purchase_invoice_line_standalone
-Version: 3.4.1
+Version: 3.6.0
Summary: Tryton module for standalone invoice line from purchase
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: issue_tracker at tryton.org
License: GPL-3
-Download-URL: http://downloads.tryton.org/3.4/
+Download-URL: http://downloads.tryton.org/3.6/
Description: trytond_purchase_invoice_line_standalone
========================================
@@ -64,4 +64,6 @@ Classifier: Natural Language :: Slovenian
Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
Classifier: Programming Language :: Python :: 2.7
+Classifier: Programming Language :: Python :: Implementation :: CPython
+Classifier: Programming Language :: Python :: Implementation :: PyPy
Classifier: Topic :: Office/Business
diff --git a/__init__.py b/__init__.py
index 26b3ece..fdb2cbd 100644
--- a/__init__.py
+++ b/__init__.py
@@ -1,5 +1,5 @@
-#This file is part of Tryton. The COPYRIGHT file at the top level of
-#this repository contains the full copyright notices and license terms.
+# This file is part of Tryton. The COPYRIGHT file at the top level of
+# this repository contains the full copyright notices and license terms.
from trytond.pool import Pool
from .purchase import *
diff --git a/invoice.py b/invoice.py
index d30c64d..9d5317c 100644
--- a/invoice.py
+++ b/invoice.py
@@ -1,5 +1,5 @@
-#This file is part of Tryton. The COPYRIGHT file at the top level
-#of this repository contains the full copyright notices and license terms.
+# This file is part of Tryton. The COPYRIGHT file at the top level of
+# this repository contains the full copyright notices and license terms.
from trytond.pool import Pool, PoolMeta
__all__ = ['InvoiceLine']
diff --git a/locale/bg_BG.po b/locale/bg_BG.po
index e686969..0f55b42 100644
--- a/locale/bg_BG.po
+++ b/locale/bg_BG.po
@@ -98,5 +98,5 @@ msgstr "Отказване"
#, fuzzy
msgctxt "wizard_button:purchase.handle.invoice.exception,ask,handle:"
-msgid "Ok"
+msgid "OK"
msgstr "Добре"
diff --git a/locale/ca_ES.po b/locale/ca_ES.po
index 8e0158e..aae2724 100644
--- a/locale/ca_ES.po
+++ b/locale/ca_ES.po
@@ -4,7 +4,7 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:account.invoice.line:"
msgid "You can not delete invoice lines that comes from a purchase."
-msgstr "No podeu esborrar línies de factures generades des d'una compra."
+msgstr "No podeu eliminar línies de factures generades des d'una compra."
msgctxt "field:purchase.purchase,invoice_lines:"
msgid "Invoice Lines"
@@ -95,5 +95,5 @@ msgid "Cancel"
msgstr "Cancel·la"
msgctxt "wizard_button:purchase.handle.invoice.exception,ask,handle:"
-msgid "Ok"
+msgid "OK"
msgstr "D'acord"
diff --git a/locale/cs_CZ.po b/locale/cs_CZ.po
index cd490ca..6642c7e 100644
--- a/locale/cs_CZ.po
+++ b/locale/cs_CZ.po
@@ -95,5 +95,5 @@ msgid "Cancel"
msgstr ""
msgctxt "wizard_button:purchase.handle.invoice.exception,ask,handle:"
-msgid "Ok"
+msgid "OK"
msgstr ""
diff --git a/locale/de_DE.po b/locale/de_DE.po
index 5f889ca..0029237 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -97,5 +97,5 @@ msgid "Cancel"
msgstr "Abbrechen"
msgctxt "wizard_button:purchase.handle.invoice.exception,ask,handle:"
-msgid "Ok"
+msgid "OK"
msgstr "OK"
diff --git a/locale/es_AR.po b/locale/es_AR.po
index c54be9c..01783bc 100644
--- a/locale/es_AR.po
+++ b/locale/es_AR.po
@@ -95,5 +95,5 @@ msgid "Cancel"
msgstr "Cancelar"
msgctxt "wizard_button:purchase.handle.invoice.exception,ask,handle:"
-msgid "Ok"
+msgid "OK"
msgstr "Aceptar"
diff --git a/locale/es_CO.po b/locale/es_CO.po
index 945afdf..ff14d46 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -95,5 +95,5 @@ msgid "Cancel"
msgstr "Cancelar"
msgctxt "wizard_button:purchase.handle.invoice.exception,ask,handle:"
-msgid "Ok"
+msgid "OK"
msgstr "Aceptar"
diff --git a/locale/es_EC.po b/locale/es_EC.po
index 028b7be..ca080ca 100644
--- a/locale/es_EC.po
+++ b/locale/es_EC.po
@@ -95,5 +95,5 @@ msgid "Cancel"
msgstr "Cancelar"
msgctxt "wizard_button:purchase.handle.invoice.exception,ask,handle:"
-msgid "Ok"
+msgid "OK"
msgstr "Aceptar"
diff --git a/locale/es_ES.po b/locale/es_ES.po
index 1d79cd9..01783bc 100644
--- a/locale/es_ES.po
+++ b/locale/es_ES.po
@@ -4,7 +4,7 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:account.invoice.line:"
msgid "You can not delete invoice lines that comes from a purchase."
-msgstr "No puede borrar líneas de facturas generadas por una compra."
+msgstr "No puede eliminar líneas de facturas generadas por una compra."
msgctxt "field:purchase.purchase,invoice_lines:"
msgid "Invoice Lines"
@@ -95,5 +95,5 @@ msgid "Cancel"
msgstr "Cancelar"
msgctxt "wizard_button:purchase.handle.invoice.exception,ask,handle:"
-msgid "Ok"
+msgid "OK"
msgstr "Aceptar"
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
index fe96160..684b54e 100644
--- a/locale/fr_FR.po
+++ b/locale/fr_FR.po
@@ -96,5 +96,5 @@ msgid "Cancel"
msgstr "Annuler"
msgctxt "wizard_button:purchase.handle.invoice.exception,ask,handle:"
-msgid "Ok"
-msgstr "Ok"
+msgid "OK"
+msgstr "OK"
diff --git a/locale/nl_NL.po b/locale/nl_NL.po
index fbf26e0..b861547 100644
--- a/locale/nl_NL.po
+++ b/locale/nl_NL.po
@@ -103,5 +103,5 @@ msgstr "Annuleren"
#, fuzzy
msgctxt "wizard_button:purchase.handle.invoice.exception,ask,handle:"
-msgid "Ok"
+msgid "OK"
msgstr "Oké"
diff --git a/locale/ru_RU.po b/locale/ru_RU.po
index 8790bcd..165ed5b 100644
--- a/locale/ru_RU.po
+++ b/locale/ru_RU.po
@@ -115,5 +115,5 @@ msgstr "Отменить"
#, fuzzy
msgctxt "wizard_button:purchase.handle.invoice.exception,ask,handle:"
-msgid "Ok"
+msgid "OK"
msgstr "Да"
diff --git a/purchase.py b/purchase.py
index 355df42..4866501 100644
--- a/purchase.py
+++ b/purchase.py
@@ -1,5 +1,5 @@
-#This file is part of Tryton. The COPYRIGHT file at the top level
-#of this repository contains the full copyright notices and license terms.
+# This file is part of Tryton. The COPYRIGHT file at the top level of
+# this repository contains the full copyright notices and license terms.
from sql import Table
from sql.functions import Overlay, Position
diff --git a/setup.py b/setup.py
index 7a3cbd3..0d3f227 100644
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,6 @@
#!/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.
+# This file is part of Tryton. The COPYRIGHT file at the top level of
+# this repository contains the full copyright notices and license terms.
from setuptools import setup
import re
@@ -92,6 +92,8 @@ setup(name=name,
'Natural Language :: Spanish',
'Operating System :: OS Independent',
'Programming Language :: Python :: 2.7',
+ 'Programming Language :: Python :: Implementation :: CPython',
+ 'Programming Language :: Python :: Implementation :: PyPy',
'Topic :: Office/Business',
],
license='GPL-3',
diff --git a/tests/__init__.py b/tests/__init__.py
index 544f41f..2b3485e 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -1,5 +1,5 @@
-#This file is part of Tryton. The COPYRIGHT file at the top level of
-#this repository contains the full copyright notices and license terms.
+# This file is part of Tryton. The COPYRIGHT file at the top level of
+# this repository contains the full copyright notices and license terms.
from .test_purchase_invoice_line_standalone import suite
diff --git a/tests/scenario_purchase_invoice_line_standalone.rst b/tests/scenario_purchase_invoice_line_standalone.rst
index 459c6e4..94b6beb 100644
--- a/tests/scenario_purchase_invoice_line_standalone.rst
+++ b/tests/scenario_purchase_invoice_line_standalone.rst
@@ -9,6 +9,12 @@ Imports::
>>> from decimal import Decimal
>>> from operator import attrgetter
>>> from proteus import config, Model, Wizard
+ >>> from trytond.modules.company.tests.tools import create_company, \
+ ... get_company
+ >>> from trytond.modules.account.tests.tools import create_fiscalyear, \
+ ... create_chart, get_accounts, create_tax, set_tax_code
+ >>> from.trytond.modules.account_invoice.tests.tools import \
+ ... set_fiscalyear_invoice_sequences, create_payment_term
>>> today = datetime.date.today()
Create database::
@@ -21,34 +27,13 @@ Install purchase_invoice_line_standalone::
>>> Module = Model.get('ir.module.module')
>>> purchase_module, = Module.find([('name', '=',
... 'purchase_invoice_line_standalone')])
- >>> Module.install([purchase_module.id], current_config.context)
+ >>> purchase_module.click('install')
>>> Wizard('ir.module.module.install_upgrade').execute('upgrade')
Create company::
- >>> Currency = Model.get('currency.currency')
- >>> CurrencyRate = Model.get('currency.currency.rate')
- >>> currencies = Currency.find([('code', '=', 'EUR')])
- >>> if not currencies:
- ... currency = Currency(name='Euro', symbol=u'€', code='EUR',
- ... rounding=Decimal('0.01'), mon_grouping='[3, 3, 0]',
- ... mon_decimal_point=',')
- ... currency.save()
- ... CurrencyRate(date=today + relativedelta(month=1, day=1),
- ... rate=Decimal('1.0'), currency=currency).save()
- ... else:
- ... currency, = currencies
- >>> Company = Model.get('company.company')
- >>> Party = Model.get('party.party')
- >>> company_config = Wizard('company.company.config')
- >>> company_config.execute('company')
- >>> company = company_config.form
- >>> party = Party(name='Dunder Mifflin')
- >>> party.save()
- >>> company.party = party
- >>> company.currency = currency
- >>> company_config.execute('add')
- >>> company, = Company.find([])
+ >>> _ = create_company()
+ >>> company = get_company()
Reload the context::
@@ -69,56 +54,17 @@ Create an accountant user::
Create fiscal year::
- >>> FiscalYear = Model.get('account.fiscalyear')
- >>> Sequence = Model.get('ir.sequence')
- >>> SequenceStrict = Model.get('ir.sequence.strict')
- >>> fiscalyear = FiscalYear(name=str(today.year))
- >>> fiscalyear.start_date = today + relativedelta(month=1, day=1)
- >>> fiscalyear.end_date = today + relativedelta(month=12, day=31)
- >>> fiscalyear.company = company
- >>> post_move_seq = Sequence(name=str(today.year), code='account.move',
- ... company=company)
- >>> post_move_seq.save()
- >>> fiscalyear.post_move_sequence = post_move_seq
- >>> invoice_seq = SequenceStrict(name=str(today.year),
- ... code='account.invoice', company=company)
- >>> invoice_seq.save()
- >>> fiscalyear.out_invoice_sequence = invoice_seq
- >>> fiscalyear.in_invoice_sequence = invoice_seq
- >>> fiscalyear.out_credit_note_sequence = invoice_seq
- >>> fiscalyear.in_credit_note_sequence = invoice_seq
- >>> fiscalyear.save()
- >>> FiscalYear.create_period([fiscalyear.id], current_config.context)
+ >>> fiscalyear = set_fiscalyear_invoice_sequences(
+ ... create_fiscalyear(company))
+ >>> fiscalyear.click('create_period')
Create chart of accounts::
- >>> AccountTemplate = Model.get('account.account.template')
- >>> Account = Model.get('account.account')
- >>> account_template, = AccountTemplate.find([('parent', '=', None)])
- >>> create_chart = Wizard('account.create_chart')
- >>> create_chart.execute('account')
- >>> create_chart.form.account_template = account_template
- >>> create_chart.form.company = company
- >>> create_chart.execute('create_account')
- >>> receivable, = Account.find([
- ... ('kind', '=', 'receivable'),
- ... ('company', '=', company.id),
- ... ])
- >>> payable, = Account.find([
- ... ('kind', '=', 'payable'),
- ... ('company', '=', company.id),
- ... ])
- >>> revenue, = Account.find([
- ... ('kind', '=', 'revenue'),
- ... ('company', '=', company.id),
- ... ])
- >>> expense, = Account.find([
- ... ('kind', '=', 'expense'),
- ... ('company', '=', company.id),
- ... ])
- >>> create_chart.form.account_receivable = receivable
- >>> create_chart.form.account_payable = payable
- >>> create_chart.execute('create_properties')
+ >>> _ = create_chart(company)
+ >>> accounts = get_accounts(company)
+ >>> receivable = accounts['receivable']
+ >>> revenue = accounts['revenue']
+ >>> expense = accounts['expense']
Create parties::
@@ -152,11 +98,7 @@ Create product::
Create payment term::
- >>> PaymentTerm = Model.get('account.invoice.payment_term')
- >>> PaymentTermLine = Model.get('account.invoice.payment_term.line')
- >>> payment_term = PaymentTerm(name='Direct')
- >>> payment_term_line = PaymentTermLine(type='remainder', days=0)
- >>> payment_term.lines.append(payment_term_line)
+ >>> payment_term = create_payment_term()
>>> payment_term.save()
Purchase 5 products::
diff --git a/tests/test_purchase_invoice_line_standalone.py b/tests/test_purchase_invoice_line_standalone.py
index 18a5461..647effd 100644
--- a/tests/test_purchase_invoice_line_standalone.py
+++ b/tests/test_purchase_invoice_line_standalone.py
@@ -1,26 +1,15 @@
-#This file is part of Tryton. The COPYRIGHT file at the top level of
-#this repository contains the full copyright notices and license terms.
+# 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 unittest
import doctest
import trytond.tests.test_tryton
-from trytond.tests.test_tryton import test_view, test_depends
+from trytond.tests.test_tryton import ModuleTestCase
from trytond.tests.test_tryton import doctest_setup, doctest_teardown
-class PurchaseInvoiceLineStandaloneTestCase(unittest.TestCase):
+class PurchaseInvoiceLineStandaloneTestCase(ModuleTestCase):
'Test PurchaseInvoiceLineStandalone module'
-
- def setUp(self):
- trytond.tests.test_tryton.install_module(
- 'purchase_invoice_line_standalone')
-
- def test0005views(self):
- 'Test views'
- test_view('purchase_invoice_line_standalone')
-
- def test0006depends(self):
- 'Test depends'
- test_depends()
+ module = 'purchase_invoice_line_standalone'
def suite():
diff --git a/tryton.cfg b/tryton.cfg
index eac6c45..6673a69 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.4.1
+version=3.6.0
depends:
account_invoice_line_standalone
ir
diff --git a/trytond_purchase_invoice_line_standalone.egg-info/PKG-INFO b/trytond_purchase_invoice_line_standalone.egg-info/PKG-INFO
index 574e252..107e215 100644
--- a/trytond_purchase_invoice_line_standalone.egg-info/PKG-INFO
+++ b/trytond_purchase_invoice_line_standalone.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond-purchase-invoice-line-standalone
-Version: 3.4.1
+Version: 3.6.0
Summary: Tryton module for standalone invoice line from purchase
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: issue_tracker at tryton.org
License: GPL-3
-Download-URL: http://downloads.tryton.org/3.4/
+Download-URL: http://downloads.tryton.org/3.6/
Description: trytond_purchase_invoice_line_standalone
========================================
@@ -64,4 +64,6 @@ Classifier: Natural Language :: Slovenian
Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
Classifier: Programming Language :: Python :: 2.7
+Classifier: Programming Language :: Python :: Implementation :: CPython
+Classifier: Programming Language :: Python :: Implementation :: PyPy
Classifier: Topic :: Office/Business
diff --git a/trytond_purchase_invoice_line_standalone.egg-info/requires.txt b/trytond_purchase_invoice_line_standalone.egg-info/requires.txt
index 1956e31..7823ded 100644
--- a/trytond_purchase_invoice_line_standalone.egg-info/requires.txt
+++ b/trytond_purchase_invoice_line_standalone.egg-info/requires.txt
@@ -1,4 +1,4 @@
python-sql
-trytond_account_invoice_line_standalone >= 3.4, < 3.5
-trytond_purchase >= 3.4, < 3.5
-trytond >= 3.4, < 3.5
\ No newline at end of file
+trytond_account_invoice_line_standalone >= 3.6, < 3.7
+trytond_purchase >= 3.6, < 3.7
+trytond >= 3.6, < 3.7
\ No newline at end of file
--
tryton-modules-purchase-invoice-line-standalone
More information about the tryton-debian-vcs
mailing list