[tryton-debian-vcs] tryton-modules-purchase-shipment-cost branch upstream updated. upstream/3.2.0-1-g2bc53f1
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Thu Oct 23 12:17:41 UTC 2014
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-shipment-cost.git;a=commitdiff;h=upstream/3.2.0-1-g2bc53f1
commit 2bc53f111db04c58be7b2e92322323fac39f99ec
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Oct 21 11:29:19 2014 +0200
Adding upstream version 3.4.0.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/CHANGELOG b/CHANGELOG
index 6811c91..4a5942a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.4.0 - 2014-10-20
+* Bug fixes (see mercurial logs for details)
+
Version 3.2.0 - 2014-04-21
* Bug fixes (see mercurial logs for details)
diff --git a/COPYRIGHT b/COPYRIGHT
index 3731ce2..a770c53 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
Copyright (C) 2011-2014 Cédric Krier.
Copyright (C) 2011-2012 Bertrand Chenal.
-Copyright (C) 2011 Nicolas Évrard.
+Copyright (C) 2011-2014 Nicolas Évrard.
Copyright (C) 2011-2014 B2CK SPRL.
This program is free software: you can redistribute it and/or modify
diff --git a/PKG-INFO b/PKG-INFO
index b4cdc6d..65db756 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_purchase_shipment_cost
-Version: 3.2.0
+Version: 3.4.0
Summary: Tryton module for purchase shipment cost
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.2/
+Download-URL: http://downloads.tryton.org/3.4/
Description: trytond_purchase_shipment_cost
==============================
diff --git a/locale/es_EC.po b/locale/es_EC.po
new file mode 100644
index 0000000..7112544
--- /dev/null
+++ b/locale/es_EC.po
@@ -0,0 +1,31 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "field:carrier,carrier_cost_allocation_method:"
+msgid "Carrier Cost Allocation Method"
+msgstr "Método de Asignación de Costo de Transporte"
+
+msgctxt "field:stock.move,unit_shipment_cost:"
+msgid "Unit Shipment Cost"
+msgstr "Costo Unitario de Envío"
+
+msgctxt "field:stock.shipment.in,carrier:"
+msgid "Carrier"
+msgstr "Transporte"
+
+msgctxt "field:stock.shipment.in,cost:"
+msgid "Cost"
+msgstr "Costo"
+
+msgctxt "field:stock.shipment.in,cost_currency:"
+msgid "Cost Currency"
+msgstr "Moneda de Costo"
+
+msgctxt "field:stock.shipment.in,cost_currency_digits:"
+msgid "Cost Currency Digits"
+msgstr "Decimales de Moneda de Costo"
+
+msgctxt "selection:carrier,carrier_cost_allocation_method:"
+msgid "By Value"
+msgstr "Por Valor"
diff --git a/tests/scenario_purchase_shipment_cost_with_account_stock.rst b/tests/scenario_purchase_shipment_cost_with_account_stock.rst
index d313a74..bd3f0ad 100644
--- a/tests/scenario_purchase_shipment_cost_with_account_stock.rst
+++ b/tests/scenario_purchase_shipment_cost_with_account_stock.rst
@@ -69,6 +69,7 @@ Create fiscal year::
>>> fiscalyear.start_date = today + relativedelta(month=1, day=1)
>>> fiscalyear.end_date = today + relativedelta(month=12, day=31)
>>> fiscalyear.company = company
+ >>> fiscalyear.account_stock_method = 'continental'
>>> post_move_sequence = Sequence(name='%s' % today.year,
... code='account.move',
... company=company)
diff --git a/tests/scenario_purchase_shipment_cost_with_account_stock_anglo_saxon.rst b/tests/scenario_purchase_shipment_cost_with_account_stock_anglo_saxon.rst
index 8fb8757..7ae699f 100644
--- a/tests/scenario_purchase_shipment_cost_with_account_stock_anglo_saxon.rst
+++ b/tests/scenario_purchase_shipment_cost_with_account_stock_anglo_saxon.rst
@@ -81,6 +81,7 @@ Create fiscal year::
>>> fiscalyear.start_date = today + relativedelta(month=1, day=1)
>>> fiscalyear.end_date = today + relativedelta(month=12, day=31)
>>> fiscalyear.company = company
+ >>> fiscalyear.account_stock_method = 'anglo_saxon'
>>> post_move_sequence = Sequence(name='%s' % today.year,
... code='account.move',
... company=company)
@@ -219,11 +220,11 @@ Purchase 5 products::
>>> purchase.lines.append(purchase_line)
>>> purchase_line.product = product
>>> purchase_line.quantity = 5.0
- >>> purchase.save()
- >>> Purchase.quote([purchase.id], current_config.context)
- >>> Purchase.confirm([purchase.id], current_config.context)
+ >>> purchase.click('quote')
+ >>> purchase.click('confirm')
+ >>> purchase.click('process')
>>> purchase.state
- u'confirmed'
+ u'processing'
Receive 4 products::
diff --git a/tests/test_purchase_shipment_cost.py b/tests/test_purchase_shipment_cost.py
index 95dd442..0a72752 100644
--- a/tests/test_purchase_shipment_cost.py
+++ b/tests/test_purchase_shipment_cost.py
@@ -4,7 +4,8 @@
import unittest
import doctest
import trytond.tests.test_tryton
-from trytond.tests.test_tryton import test_view, test_depends, doctest_dropdb
+from trytond.tests.test_tryton import test_view, test_depends
+from trytond.tests.test_tryton import doctest_setup, doctest_teardown
class PurchaseShipmentCostTestCase(unittest.TestCase):
@@ -27,14 +28,14 @@ def suite():
suite.addTests(unittest.TestLoader().loadTestsFromTestCase(
PurchaseShipmentCostTestCase))
suite.addTests(doctest.DocFileSuite('scenario_purchase_shipment_cost.rst',
- setUp=doctest_dropdb, tearDown=doctest_dropdb, encoding='utf-8',
+ setUp=doctest_setup, tearDown=doctest_teardown, encoding='utf-8',
optionflags=doctest.REPORT_ONLY_FIRST_FAILURE))
suite.addTests(doctest.DocFileSuite(
'scenario_purchase_shipment_cost_with_account_stock.rst',
- setUp=doctest_dropdb, tearDown=doctest_dropdb, encoding='utf-8',
+ setUp=doctest_setup, tearDown=doctest_teardown, encoding='utf-8',
optionflags=doctest.REPORT_ONLY_FIRST_FAILURE))
suite.addTests(doctest.DocFileSuite(
'scenario_purchase_shipment_cost_with_account_stock_anglo_saxon.rst',
- setUp=doctest_dropdb, tearDown=doctest_dropdb, encoding='utf-8',
+ setUp=doctest_setup, tearDown=doctest_teardown, encoding='utf-8',
optionflags=doctest.REPORT_ONLY_FIRST_FAILURE))
return suite
diff --git a/tryton.cfg b/tryton.cfg
index 8206b49..425009b 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.2.0
+version=3.4.0
depends:
carrier
currency
diff --git a/trytond_purchase_shipment_cost.egg-info/PKG-INFO b/trytond_purchase_shipment_cost.egg-info/PKG-INFO
index 7d29bdb..b1b9a1f 100644
--- a/trytond_purchase_shipment_cost.egg-info/PKG-INFO
+++ b/trytond_purchase_shipment_cost.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond-purchase-shipment-cost
-Version: 3.2.0
+Version: 3.4.0
Summary: Tryton module for purchase shipment cost
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.2/
+Download-URL: http://downloads.tryton.org/3.4/
Description: trytond_purchase_shipment_cost
==============================
diff --git a/trytond_purchase_shipment_cost.egg-info/SOURCES.txt b/trytond_purchase_shipment_cost.egg-info/SOURCES.txt
index 03e67c0..9a5396c 100644
--- a/trytond_purchase_shipment_cost.egg-info/SOURCES.txt
+++ b/trytond_purchase_shipment_cost.egg-info/SOURCES.txt
@@ -10,9 +10,29 @@ stock.xml
tryton.cfg
./__init__.py
./carrier.py
+./carrier.xml
./stock.py
+./stock.xml
+./tryton.cfg
+./locale/bg_BG.po
+./locale/ca_ES.po
+./locale/cs_CZ.po
+./locale/de_DE.po
+./locale/es_AR.po
+./locale/es_CO.po
+./locale/es_EC.po
+./locale/es_ES.po
+./locale/fr_FR.po
+./locale/nl_NL.po
+./locale/ru_RU.po
+./locale/sl_SI.po
./tests/__init__.py
+./tests/scenario_purchase_shipment_cost.rst
+./tests/scenario_purchase_shipment_cost_with_account_stock.rst
+./tests/scenario_purchase_shipment_cost_with_account_stock_anglo_saxon.rst
./tests/test_purchase_shipment_cost.py
+./view/carrier_form.xml
+./view/shipment_in_form.xml
doc/index.rst
locale/bg_BG.po
locale/ca_ES.po
@@ -20,6 +40,7 @@ locale/cs_CZ.po
locale/de_DE.po
locale/es_AR.po
locale/es_CO.po
+locale/es_EC.po
locale/es_ES.po
locale/fr_FR.po
locale/nl_NL.po
diff --git a/trytond_purchase_shipment_cost.egg-info/requires.txt b/trytond_purchase_shipment_cost.egg-info/requires.txt
index a379f6c..af28c2b 100644
--- a/trytond_purchase_shipment_cost.egg-info/requires.txt
+++ b/trytond_purchase_shipment_cost.egg-info/requires.txt
@@ -1,13 +1,13 @@
-trytond_carrier >= 3.2, < 3.3
-trytond_currency >= 3.2, < 3.3
-trytond_stock >= 3.2, < 3.3
-trytond >= 3.2, < 3.3
+trytond_carrier >= 3.4, < 3.5
+trytond_currency >= 3.4, < 3.5
+trytond_stock >= 3.4, < 3.5
+trytond >= 3.4, < 3.5
[account_product]
-trytond_account_product >= 3.2, < 3.3
+trytond_account_product >= 3.4, < 3.5
[account_stock_continental]
-trytond_account_stock_continental >= 3.2, < 3.3
+trytond_account_stock_continental >= 3.4, < 3.5
[account_stock_anglo_saxon]
-trytond_account_stock_anglo_saxon >= 3.2, < 3.3
\ No newline at end of file
+trytond_account_stock_anglo_saxon >= 3.4, < 3.5
\ No newline at end of file
--
tryton-modules-purchase-shipment-cost
More information about the tryton-debian-vcs
mailing list