[tryton-debian-vcs] tryton-modules-sale-shipment-grouping branch upstream updated. upstream/3.4.1-1-g2b5d035
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Thu Apr 23 16:06:29 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-sale-shipment-grouping.git;a=commitdiff;h=upstream/3.4.1-1-g2b5d035
commit 2b5d035f44bb8f79599d4193202f2444f48e13e3
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Thu Apr 23 17:00:06 2015 +0200
Adding upstream version 3.6.0.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/CHANGELOG b/CHANGELOG
index a9b0397..24733d1 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 fcb4cad..6307048 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_sale_shipment_grouping
-Version: 3.4.1
+Version: 3.6.0
Summary: Tryton module to group sale stock moves
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: issue_tracker at tryton.org
License: GPL-3
-Download-URL: http://dowloads.tryton.org/3.4/
+Download-URL: http://dowloads.tryton.org/3.6/
Description: sale_shipment_grouping
======================
@@ -64,5 +64,7 @@ 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
Classifier: Topic :: Office/Business :: Financial :: Accounting
diff --git a/__init__.py b/__init__.py
index 91f5675..7f277d2 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 .party import *
diff --git a/sale.py b/sale.py
index bdb963f..5648135 100644
--- a/sale.py
+++ b/sale.py
@@ -1,8 +1,7 @@
-#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 PoolMeta
-from trytond.transaction import Transaction
__metaclass__ = PoolMeta
__all__ = ['Sale']
diff --git a/setup.py b/setup.py
index 33d2b6e..96efc2f 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
@@ -89,6 +89,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',
'Topic :: Office/Business :: Financial :: Accounting',
],
diff --git a/tests/scenario_sale_shipment_grouping.rst b/tests/scenario_sale_shipment_grouping.rst
index a6a4b99..19cb526 100644
--- a/tests/scenario_sale_shipment_grouping.rst
+++ b/tests/scenario_sale_shipment_grouping.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
+ >>> from.trytond.modules.account_invoice.tests.tools import \
+ ... set_fiscalyear_invoice_sequences, create_payment_term
>>> today = datetime.date.today()
Create database::
@@ -25,29 +31,8 @@ Install sale::
Create company::
- >>> Currency = Model.get('currency.currency')
- >>> CurrencyRate = Model.get('currency.currency.rate')
- >>> currencies = Currency.find([('code', '=', 'USD')])
- >>> if not currencies:
- ... currency = Currency(name='U.S. Dollar', symbol=u'$', code='USD',
- ... 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::
@@ -77,56 +62,16 @@ Create stock 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], 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)
+ >>> revenue = accounts['revenue']
+ >>> expense = accounts['expense']
Create parties::
@@ -161,11 +106,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()
Create an inventory::
@@ -206,7 +147,7 @@ Sell some products::
Make another sale::
- >>> sale = Sale(Sale.copy([sale.id], config.context)[0])
+ >>> sale, = Sale.duplicate([sale])
>>> sale.click('quote')
>>> sale.click('confirm')
>>> sale.click('process')
@@ -221,7 +162,7 @@ Check the shipments::
>>> len(shipments)
2
>>> for shipment in shipments:
- ... _ = ShipmentOut.assign_try([shipment.id], config.context)
+ ... _ = shipment.click('assign_try')
... shipment.click('pack')
... shipment.click('done')
diff --git a/tryton.cfg b/tryton.cfg
index 14dffd9..5b5c4ed 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.4.1
+version=3.6.0
depends:
ir
res
diff --git a/trytond_sale_shipment_grouping.egg-info/PKG-INFO b/trytond_sale_shipment_grouping.egg-info/PKG-INFO
index d031050..ad65ee8 100644
--- a/trytond_sale_shipment_grouping.egg-info/PKG-INFO
+++ b/trytond_sale_shipment_grouping.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond-sale-shipment-grouping
-Version: 3.4.1
+Version: 3.6.0
Summary: Tryton module to group sale stock moves
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: issue_tracker at tryton.org
License: GPL-3
-Download-URL: http://dowloads.tryton.org/3.4/
+Download-URL: http://dowloads.tryton.org/3.6/
Description: sale_shipment_grouping
======================
@@ -64,5 +64,7 @@ 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
Classifier: Topic :: Office/Business :: Financial :: Accounting
diff --git a/trytond_sale_shipment_grouping.egg-info/requires.txt b/trytond_sale_shipment_grouping.egg-info/requires.txt
index 04eb019..a807599 100644
--- a/trytond_sale_shipment_grouping.egg-info/requires.txt
+++ b/trytond_sale_shipment_grouping.egg-info/requires.txt
@@ -1,4 +1,4 @@
-trytond_party >= 3.4, < 3.5
-trytond_stock >= 3.4, < 3.5
-trytond_sale >= 3.4, < 3.5
-trytond >= 3.4, < 3.5
\ No newline at end of file
+trytond_party >= 3.6, < 3.7
+trytond_stock >= 3.6, < 3.7
+trytond_sale >= 3.6, < 3.7
+trytond >= 3.6, < 3.7
\ No newline at end of file
--
tryton-modules-sale-shipment-grouping
More information about the tryton-debian-vcs
mailing list