[tryton-debian-vcs] tryton-modules-carrier-percentage branch upstream created. 55306e9ccc39845c5c0db2b8492728374e5b1ad6
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Wed Nov 27 17:00: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-carrier-percentage.git;a=commitdiff;h=55306e9ccc39845c5c0db2b8492728374e5b1ad6
commit 55306e9ccc39845c5c0db2b8492728374e5b1ad6
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Nov 24 17:26:53 2013 +0100
Adding upstream version 3.0.0.
diff --git a/CHANGELOG b/CHANGELOG
index 8d85d43..69dc0e9 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.0.0 - 2013-10-21
+* 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 c0e2bb5..12b5202 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_carrier_percentage
-Version: 2.8.0
+Version: 3.0.0
Summary: Tryton module to add cost method "on percentage" on carrier
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_carrier_percentage
==========================
@@ -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/sl_SI.po b/locale/sl_SI.po
new file mode 100644
index 0000000..9079a3b
--- /dev/null
+++ b/locale/sl_SI.po
@@ -0,0 +1,11 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "field:carrier,percentage:"
+msgid "Percentage"
+msgstr "Odstoten"
+
+msgctxt "selection:carrier,carrier_cost_method:"
+msgid "Percentage"
+msgstr "Odstoten"
diff --git a/setup.py b/setup.py
index 6806903..eec35ce 100644
--- a/setup.py
+++ b/setup.py
@@ -63,6 +63,7 @@ setup(name='trytond_carrier_percentage',
'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 d3dc579..1803291 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_carrier_percentage import suite
+
+__all__ = ['suite']
diff --git a/tests/scenario_carrier_percentage_with_purchase_shipment_cost.rst b/tests/scenario_carrier_percentage_with_purchase_shipment_cost.rst
index 492ea10..eef5a7f 100644
--- a/tests/scenario_carrier_percentage_with_purchase_shipment_cost.rst
+++ b/tests/scenario_carrier_percentage_with_purchase_shipment_cost.rst
@@ -90,7 +90,7 @@ Create chart of accounts::
>>> AccountTemplate = Model.get('account.account.template')
>>> Account = Model.get('account.account')
>>> AccountJournal = Model.get('account.journal')
- >>> 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 792c9c3..dea281d 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=2.8.0
+version=3.0.0
depends:
carrier
currency
diff --git a/trytond_carrier_percentage.egg-info/PKG-INFO b/trytond_carrier_percentage.egg-info/PKG-INFO
index 3ff2797..6de05d3 100644
--- a/trytond_carrier_percentage.egg-info/PKG-INFO
+++ b/trytond_carrier_percentage.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond-carrier-percentage
-Version: 2.8.0
+Version: 3.0.0
Summary: Tryton module to add cost method "on percentage" on carrier
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_carrier_percentage
==========================
@@ -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_carrier_percentage.egg-info/SOURCES.txt b/trytond_carrier_percentage.egg-info/SOURCES.txt
index 4789396..9cfe658 100644
--- a/trytond_carrier_percentage.egg-info/SOURCES.txt
+++ b/trytond_carrier_percentage.egg-info/SOURCES.txt
@@ -24,6 +24,7 @@ locale/es_ES.po
locale/fr_FR.po
locale/nl_NL.po
locale/ru_RU.po
+locale/sl_SI.po
tests/scenario_carrier_percentage_with_purchase_shipment_cost.rst
trytond_carrier_percentage.egg-info/PKG-INFO
trytond_carrier_percentage.egg-info/SOURCES.txt
diff --git a/trytond_carrier_percentage.egg-info/requires.txt b/trytond_carrier_percentage.egg-info/requires.txt
index 1b1359d..e08e1be 100644
--- a/trytond_carrier_percentage.egg-info/requires.txt
+++ b/trytond_carrier_percentage.egg-info/requires.txt
@@ -1,3 +1,3 @@
-trytond_carrier >= 2.8, < 2.9
-trytond_currency >= 2.8, < 2.9
-trytond >= 2.8, < 2.9
\ No newline at end of file
+trytond_carrier >= 3.0, < 3.1
+trytond_currency >= 3.0, < 3.1
+trytond >= 3.0, < 3.1
\ No newline at end of file
commit e23edc7b0984cfeb15c1db1cd637f07ea3cd5ff4
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Thu May 2 00:35:45 2013 +0200
Adding upstream version 2.8.0.
diff --git a/CHANGELOG b/CHANGELOG
index d2beb67..8d85d43 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.8.0 - 2013-04-22
+* Bug fixes (see mercurial logs for details)
+
Version 2.6.0 - 2012-10-22
* Bug fixes (see mercurial logs for details)
diff --git a/COPYRIGHT b/COPYRIGHT
index 7fcb680..87a90a4 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,7 +1,7 @@
-Copyright (C) 2011-2012 Cédric Krier.
+Copyright (C) 2011-2013 Cédric Krier.
Copyright (C) 2011-2012 Bertrand Chenal.
Copyright (C) 2011 Nicolas Évrard.
-Copyright (C) 2011-2012 B2CK SPRL.
+Copyright (C) 2011-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 07449ff..05c3f79 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -5,6 +5,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 5197b03..c0e2bb5 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
Name: trytond_carrier_percentage
-Version: 2.6.0
+Version: 2.8.0
Summary: Tryton module to add cost method "on percentage" on carrier
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_carrier_percentage
==========================
diff --git a/carrier.xml b/carrier.xml
index 54b1631..260ea0e 100644
--- a/carrier.xml
+++ b/carrier.xml
@@ -5,41 +5,9 @@ this repository contains the full copyright notices and license terms. -->
<data>
<record model="ir.ui.view" id="carrier_view_form">
<field name="model">carrier</field>
- <field name="inherit" ref="carrier.carrier_view_form"/>
- <field name="arch" type="xml">
- <![CDATA[
- <data>
- <xpath
- expr="/form/notebook/page[@id='carrier']/field[@name='carrier_cost_method']"
- position="after">
- <newline/>
- <label name="percentage"/>
- <field name="percentage"/>
- <newline/>
- </xpath>
- </data>
- ]]>
- </field>
- </record>
-
- <record model="ir.ui.view" id="carrier_view_form2">
- <field name="model">carrier</field>
<field name="type">form</field>
- <field name="inherit" ref="carrier.carrier_view_form2"/>
- <field name="arch" type="xml">
- <![CDATA[
- <data>
- <xpath
- expr="/form/field[@name='carrier_cost_method']"
- position="after">
- <newline/>
- <label name="percentage"/>
- <field name="percentage"/>
- <newline/>
- </xpath>
- </data>
- ]]>
- </field>
+ <field name="inherit" ref="carrier.carrier_view_form"/>
+ <field name="name">carrier_form</field>
</record>
</data>
</tryton>
diff --git a/locale/ru_RU.po b/locale/ru_RU.po
index 821caba..feb5ab8 100644
--- a/locale/ru_RU.po
+++ b/locale/ru_RU.po
@@ -2,10 +2,12 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
+#, fuzzy
msgctxt "field:carrier,percentage:"
msgid "Percentage"
-msgstr ""
+msgstr "Процент"
+#, fuzzy
msgctxt "selection:carrier,carrier_cost_method:"
msgid "Percentage"
-msgstr ""
+msgstr "Процент"
diff --git a/setup.py b/setup.py
index d1f310b..6806903 100644
--- a/setup.py
+++ b/setup.py
@@ -36,16 +36,16 @@ setup(name='trytond_carrier_percentage',
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.carrier_percentage': '.'},
packages=[
'trytond.modules.carrier_percentage',
'trytond.modules.carrier_percentage.tests',
],
package_data={
- 'trytond.modules.carrier_percentage': info.get('xml', []) \
- + ['tryton.cfg', 'locale/*.po', 'tests/*.rst'],
+ 'trytond.modules.carrier_percentage': (info.get('xml', [])
+ + ['tryton.cfg', 'view/*.xml', 'locale/*.po', 'tests/*.rst']),
},
classifiers=[
'Development Status :: 5 - Production/Stable',
diff --git a/tests/scenario_carrier_percentage_with_purchase_shipment_cost.rst b/tests/scenario_carrier_percentage_with_purchase_shipment_cost.rst
index 0af7957..492ea10 100644
--- a/tests/scenario_carrier_percentage_with_purchase_shipment_cost.rst
+++ b/tests/scenario_carrier_percentage_with_purchase_shipment_cost.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',
@@ -130,34 +133,43 @@ Create category::
Create products::
>>> ProductUom = Model.get('product.uom')
+ >>> ProductTemplate = Model.get('product.template')
>>> Product = Model.get('product.product')
>>> unit, = ProductUom.find([('name', '=', 'Unit')])
>>> product = Product()
- >>> product.name = 'Product'
- >>> product.category = category
- >>> product.default_uom = unit
- >>> product.type = 'goods'
- >>> product.salable = True
- >>> product.list_price = Decimal('20')
- >>> product.cost_price = Decimal('8')
- >>> product.account_revenue = revenue
+ >>> template = ProductTemplate()
+ >>> template.name = 'Product'
+ >>> template.category = category
+ >>> template.default_uom = unit
+ >>> template.type = 'goods'
+ >>> template.salable = True
+ >>> template.list_price = Decimal('20')
+ >>> template.cost_price = Decimal('8')
+ >>> template.account_revenue = revenue
+ >>> template.save()
+ >>> product.template = template
>>> product.save()
>>> carrier_product = Product()
- >>> carrier_product.name = 'Carrier Product'
- >>> carrier_product.category = category
- >>> carrier_product.default_uom = unit
- >>> carrier_product.type = 'service'
- >>> carrier_product.salable = True
- >>> carrier_product.list_price = Decimal('5')
- >>> carrier_product.cost_price = Decimal('3')
- >>> carrier_product.account_revenue = revenue
+ >>> carrier_template = ProductTemplate()
+ >>> carrier_template.name = 'Carrier Product'
+ >>> carrier_template.category = category
+ >>> carrier_template.default_uom = unit
+ >>> carrier_template.type = 'service'
+ >>> carrier_template.salable = True
+ >>> carrier_template.list_price = Decimal('5')
+ >>> carrier_template.cost_price = Decimal('3')
+ >>> carrier_template.account_revenue = revenue
+ >>> carrier_template.save()
+ >>> carrier_product.template = carrier_template
>>> carrier_product.save()
Create carrier::
>>> Carrier = Model.get('carrier')
>>> carrier = Carrier()
- >>> carrier.name = 'Carrier'
+ >>> party = Party(name='Carrier')
+ >>> party.save()
+ >>> carrier.party = party
>>> carrier.carrier_product = carrier_product
>>> carrier.carrier_cost_method = 'percentage'
>>> carrier.percentage = Decimal('15')
diff --git a/tests/test_carrier_percentage.py b/tests/test_carrier_percentage.py
index b5f7c79..4a250b0 100644
--- a/tests/test_carrier_percentage.py
+++ b/tests/test_carrier_percentage.py
@@ -27,6 +27,7 @@ class CarrierWeightTestCase(unittest.TestCase):
trytond.tests.test_tryton.install_module('carrier_percentage')
self.party = POOL.get('party.party')
self.uom = POOL.get('product.uom')
+ self.template = POOL.get('product.template')
self.product = POOL.get('product.product')
self.category = POOL.get('product.category')
self.currency = POOL.get('currency.currency')
@@ -49,32 +50,35 @@ class CarrierWeightTestCase(unittest.TestCase):
Test compute_percentage.
'''
with Transaction().start(DB_NAME, USER, context=CONTEXT):
- party = self.party.create({
- 'name': 'Carrier',
- })
+ party, = self.party.create([{
+ 'name': 'Carrier',
+ }])
uom, = self.uom.search([
('name', '=', 'Unit'),
])
- category = self.category.create({
- 'name': 'Category',
- })
- product = self.product.create({
- 'name': 'Carrier',
- 'default_uom': uom.id,
- 'category': category.id,
- 'type': 'service',
- 'list_price': Decimal(0),
- 'cost_price': Decimal(0),
- })
+ category, = self.category.create([{
+ 'name': 'Category',
+ }])
+ template, = self.template.create([{
+ 'name': 'Carrier',
+ 'default_uom': uom.id,
+ 'category': category.id,
+ 'type': 'service',
+ 'list_price': Decimal(0),
+ 'cost_price': Decimal(0),
+ }])
+ product, = self.product.create([{
+ 'template': template.id,
+ }])
currency, = self.currency.search([
('code', '=', 'cu1'),
])
- carrier = self.carrier.create({
- 'party': party.id,
- 'carrier_product': product.id,
- 'carrier_cost_method': 'percentage',
- 'percentage': Decimal(15),
- })
+ carrier, = self.carrier.create([{
+ 'party': party.id,
+ 'carrier_product': product.id,
+ 'carrier_cost_method': 'percentage',
+ 'percentage': Decimal(15),
+ }])
for amount, price in [
(Decimal(0), Decimal(0)),
(Decimal(100), Decimal('15.00')),
diff --git a/tryton.cfg b/tryton.cfg
index 3050a5f..792c9c3 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=2.6.0
+version=2.8.0
depends:
carrier
currency
diff --git a/trytond_carrier_percentage.egg-info/PKG-INFO b/trytond_carrier_percentage.egg-info/PKG-INFO
index a9d727b..3ff2797 100644
--- a/trytond_carrier_percentage.egg-info/PKG-INFO
+++ b/trytond_carrier_percentage.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
Name: trytond-carrier-percentage
-Version: 2.6.0
+Version: 2.8.0
Summary: Tryton module to add cost method "on percentage" on carrier
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_carrier_percentage
==========================
diff --git a/trytond_carrier_percentage.egg-info/SOURCES.txt b/trytond_carrier_percentage.egg-info/SOURCES.txt
index 6285b78..4789396 100644
--- a/trytond_carrier_percentage.egg-info/SOURCES.txt
+++ b/trytond_carrier_percentage.egg-info/SOURCES.txt
@@ -31,4 +31,5 @@ trytond_carrier_percentage.egg-info/dependency_links.txt
trytond_carrier_percentage.egg-info/entry_points.txt
trytond_carrier_percentage.egg-info/not-zip-safe
trytond_carrier_percentage.egg-info/requires.txt
-trytond_carrier_percentage.egg-info/top_level.txt
\ No newline at end of file
+trytond_carrier_percentage.egg-info/top_level.txt
+view/carrier_form.xml
\ No newline at end of file
diff --git a/trytond_carrier_percentage.egg-info/requires.txt b/trytond_carrier_percentage.egg-info/requires.txt
index abc1177..1b1359d 100644
--- a/trytond_carrier_percentage.egg-info/requires.txt
+++ b/trytond_carrier_percentage.egg-info/requires.txt
@@ -1,3 +1,3 @@
-trytond_carrier >= 2.6, < 2.7
-trytond_currency >= 2.6, < 2.7
-trytond >= 2.6, < 2.7
\ No newline at end of file
+trytond_carrier >= 2.8, < 2.9
+trytond_currency >= 2.8, < 2.9
+trytond >= 2.8, < 2.9
\ No newline at end of file
diff --git a/view/carrier_form.xml b/view/carrier_form.xml
new file mode 100644
index 0000000..f933186
--- /dev/null
+++ b/view/carrier_form.xml
@@ -0,0 +1,11 @@
+<?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/field[@name='carrier_cost_method']" position="after">
+ <newline/>
+ <label name="percentage"/>
+ <field name="percentage"/>
+ <newline/>
+ </xpath>
+</data>
--
tryton-modules-carrier-percentage
More information about the tryton-debian-vcs
mailing list