[tryton-debian-vcs] tryton-modules-purchase-shipment-cost branch debian updated. debian/3.6.0-1-4-ge6f034d
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Wed Nov 11 11:27:14 UTC 2015
The following commit has been merged in the debian branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-purchase-shipment-cost.git;a=commitdiff;h=debian/3.6.0-1-4-ge6f034d
commit e6f034dd7b8fa139e5817173aa1e605ee14d0a7f
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Nov 11 12:11:15 2015 +0100
Merging upstream version 3.8.0.
diff --git a/CHANGELOG b/CHANGELOG
index 9ad7c30..b62ae71 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.8.0 - 2015-11-02
+* Bug fixes (see mercurial logs for details)
+
Version 3.6.0 - 2015-04-20
* Bug fixes (see mercurial logs for details)
* Add support for PyPy
diff --git a/PKG-INFO b/PKG-INFO
index 1a98c73..bf2a076 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_purchase_shipment_cost
-Version: 3.6.0
+Version: 3.8.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.6/
+Download-URL: http://downloads.tryton.org/3.8/
Description: trytond_purchase_shipment_cost
==============================
@@ -59,6 +59,9 @@ Classifier: Natural Language :: Dutch
Classifier: Natural Language :: English
Classifier: Natural Language :: French
Classifier: Natural Language :: German
+Classifier: Natural Language :: Hungarian
+Classifier: Natural Language :: Italian
+Classifier: Natural Language :: Portuguese (Brazilian)
Classifier: Natural Language :: Russian
Classifier: Natural Language :: Slovenian
Classifier: Natural Language :: Spanish
diff --git a/locale/ca_ES.po b/locale/ca_ES.po
index fcaa762..bbef948 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 "field:carrier,carrier_cost_allocation_method:"
msgid "Carrier Cost Allocation Method"
-msgstr "Mètode assignació cost transportista"
+msgstr "Mètode d'assignació cost transportista"
msgctxt "field:stock.move,unit_shipment_cost:"
msgid "Unit Shipment Cost"
diff --git a/locale/es_EC.po b/locale/es_EC.po
index 7112544..b0cbf51 100644
--- a/locale/es_EC.po
+++ b/locale/es_EC.po
@@ -4,11 +4,11 @@ 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"
+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"
+msgstr "Costo unitario de envío"
msgctxt "field:stock.shipment.in,carrier:"
msgid "Carrier"
@@ -20,12 +20,12 @@ msgstr "Costo"
msgctxt "field:stock.shipment.in,cost_currency:"
msgid "Cost Currency"
-msgstr "Moneda de Costo"
+msgstr "Moneda de costo"
msgctxt "field:stock.shipment.in,cost_currency_digits:"
msgid "Cost Currency Digits"
-msgstr "Decimales de Moneda de Costo"
+msgstr "Decimales de moneda de costo"
msgctxt "selection:carrier,carrier_cost_allocation_method:"
msgid "By Value"
-msgstr "Por Valor"
+msgstr "Por valor"
diff --git a/locale/es_EC.po b/locale/es_MX.po
similarity index 77%
copy from locale/es_EC.po
copy to locale/es_MX.po
index 7112544..54a050f 100644
--- a/locale/es_EC.po
+++ b/locale/es_MX.po
@@ -4,11 +4,11 @@ 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"
+msgstr "Método de asignación del costo del transporte"
msgctxt "field:stock.move,unit_shipment_cost:"
msgid "Unit Shipment Cost"
-msgstr "Costo Unitario de Envío"
+msgstr "Costo unitario de envío"
msgctxt "field:stock.shipment.in,carrier:"
msgid "Carrier"
@@ -20,12 +20,12 @@ msgstr "Costo"
msgctxt "field:stock.shipment.in,cost_currency:"
msgid "Cost Currency"
-msgstr "Moneda de Costo"
+msgstr "Divisa del costo"
msgctxt "field:stock.shipment.in,cost_currency_digits:"
msgid "Cost Currency Digits"
-msgstr "Decimales de Moneda de Costo"
+msgstr "Decimales de la divisa de costo"
msgctxt "selection:carrier,carrier_cost_allocation_method:"
msgid "By Value"
-msgstr "Por Valor"
+msgstr "Por valor"
diff --git a/locale/ca_ES.po b/locale/hu_HU.po
similarity index 74%
copy from locale/ca_ES.po
copy to locale/hu_HU.po
index fcaa762..426102f 100644
--- a/locale/ca_ES.po
+++ b/locale/hu_HU.po
@@ -4,28 +4,28 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "field:carrier,carrier_cost_allocation_method:"
msgid "Carrier Cost Allocation Method"
-msgstr "Mètode assignació cost transportista"
+msgstr ""
msgctxt "field:stock.move,unit_shipment_cost:"
msgid "Unit Shipment Cost"
-msgstr "Cost unitat enviament"
+msgstr ""
msgctxt "field:stock.shipment.in,carrier:"
msgid "Carrier"
-msgstr "Transportista"
+msgstr ""
msgctxt "field:stock.shipment.in,cost:"
msgid "Cost"
-msgstr "Cost"
+msgstr ""
msgctxt "field:stock.shipment.in,cost_currency:"
msgid "Cost Currency"
-msgstr "Moneda cost"
+msgstr ""
msgctxt "field:stock.shipment.in,cost_currency_digits:"
msgid "Cost Currency Digits"
-msgstr "Decimals de la moneda de cost"
+msgstr ""
msgctxt "selection:carrier,carrier_cost_allocation_method:"
msgid "By Value"
-msgstr "Per valor"
+msgstr ""
diff --git a/locale/ca_ES.po b/locale/it_IT.po
similarity index 74%
copy from locale/ca_ES.po
copy to locale/it_IT.po
index fcaa762..426102f 100644
--- a/locale/ca_ES.po
+++ b/locale/it_IT.po
@@ -4,28 +4,28 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "field:carrier,carrier_cost_allocation_method:"
msgid "Carrier Cost Allocation Method"
-msgstr "Mètode assignació cost transportista"
+msgstr ""
msgctxt "field:stock.move,unit_shipment_cost:"
msgid "Unit Shipment Cost"
-msgstr "Cost unitat enviament"
+msgstr ""
msgctxt "field:stock.shipment.in,carrier:"
msgid "Carrier"
-msgstr "Transportista"
+msgstr ""
msgctxt "field:stock.shipment.in,cost:"
msgid "Cost"
-msgstr "Cost"
+msgstr ""
msgctxt "field:stock.shipment.in,cost_currency:"
msgid "Cost Currency"
-msgstr "Moneda cost"
+msgstr ""
msgctxt "field:stock.shipment.in,cost_currency_digits:"
msgid "Cost Currency Digits"
-msgstr "Decimals de la moneda de cost"
+msgstr ""
msgctxt "selection:carrier,carrier_cost_allocation_method:"
msgid "By Value"
-msgstr "Per valor"
+msgstr ""
diff --git a/locale/ca_ES.po b/locale/ja_JP.po
similarity index 74%
copy from locale/ca_ES.po
copy to locale/ja_JP.po
index fcaa762..426102f 100644
--- a/locale/ca_ES.po
+++ b/locale/ja_JP.po
@@ -4,28 +4,28 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "field:carrier,carrier_cost_allocation_method:"
msgid "Carrier Cost Allocation Method"
-msgstr "Mètode assignació cost transportista"
+msgstr ""
msgctxt "field:stock.move,unit_shipment_cost:"
msgid "Unit Shipment Cost"
-msgstr "Cost unitat enviament"
+msgstr ""
msgctxt "field:stock.shipment.in,carrier:"
msgid "Carrier"
-msgstr "Transportista"
+msgstr ""
msgctxt "field:stock.shipment.in,cost:"
msgid "Cost"
-msgstr "Cost"
+msgstr ""
msgctxt "field:stock.shipment.in,cost_currency:"
msgid "Cost Currency"
-msgstr "Moneda cost"
+msgstr ""
msgctxt "field:stock.shipment.in,cost_currency_digits:"
msgid "Cost Currency Digits"
-msgstr "Decimals de la moneda de cost"
+msgstr ""
msgctxt "selection:carrier,carrier_cost_allocation_method:"
msgid "By Value"
-msgstr "Per valor"
+msgstr ""
diff --git a/locale/ca_ES.po b/locale/lt_LT.po
similarity index 74%
copy from locale/ca_ES.po
copy to locale/lt_LT.po
index fcaa762..426102f 100644
--- a/locale/ca_ES.po
+++ b/locale/lt_LT.po
@@ -4,28 +4,28 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "field:carrier,carrier_cost_allocation_method:"
msgid "Carrier Cost Allocation Method"
-msgstr "Mètode assignació cost transportista"
+msgstr ""
msgctxt "field:stock.move,unit_shipment_cost:"
msgid "Unit Shipment Cost"
-msgstr "Cost unitat enviament"
+msgstr ""
msgctxt "field:stock.shipment.in,carrier:"
msgid "Carrier"
-msgstr "Transportista"
+msgstr ""
msgctxt "field:stock.shipment.in,cost:"
msgid "Cost"
-msgstr "Cost"
+msgstr ""
msgctxt "field:stock.shipment.in,cost_currency:"
msgid "Cost Currency"
-msgstr "Moneda cost"
+msgstr ""
msgctxt "field:stock.shipment.in,cost_currency_digits:"
msgid "Cost Currency Digits"
-msgstr "Decimals de la moneda de cost"
+msgstr ""
msgctxt "selection:carrier,carrier_cost_allocation_method:"
msgid "By Value"
-msgstr "Per valor"
+msgstr ""
diff --git a/locale/ca_ES.po b/locale/pt_BR.po
similarity index 72%
copy from locale/ca_ES.po
copy to locale/pt_BR.po
index fcaa762..e45d184 100644
--- a/locale/ca_ES.po
+++ b/locale/pt_BR.po
@@ -4,28 +4,28 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "field:carrier,carrier_cost_allocation_method:"
msgid "Carrier Cost Allocation Method"
-msgstr "Mètode assignació cost transportista"
+msgstr "Método de atribuição de custo da transportadora"
msgctxt "field:stock.move,unit_shipment_cost:"
msgid "Unit Shipment Cost"
-msgstr "Cost unitat enviament"
+msgstr "Custo unitário de remessa"
msgctxt "field:stock.shipment.in,carrier:"
msgid "Carrier"
-msgstr "Transportista"
+msgstr "Transportadora"
msgctxt "field:stock.shipment.in,cost:"
msgid "Cost"
-msgstr "Cost"
+msgstr "Custo"
msgctxt "field:stock.shipment.in,cost_currency:"
msgid "Cost Currency"
-msgstr "Moneda cost"
+msgstr "Moeda de custo"
msgctxt "field:stock.shipment.in,cost_currency_digits:"
msgid "Cost Currency Digits"
-msgstr "Decimals de la moneda de cost"
+msgstr "Dígitos decimais da moeda de custo"
msgctxt "selection:carrier,carrier_cost_allocation_method:"
msgid "By Value"
-msgstr "Per valor"
+msgstr "Por valor"
diff --git a/setup.py b/setup.py
index 0cbc5f9..f1afb84 100644
--- a/setup.py
+++ b/setup.py
@@ -94,6 +94,9 @@ setup(name=name,
'Natural Language :: English',
'Natural Language :: French',
'Natural Language :: German',
+ 'Natural Language :: Hungarian',
+ 'Natural Language :: Italian',
+ 'Natural Language :: Portuguese (Brazilian)',
'Natural Language :: Russian',
'Natural Language :: Slovenian',
'Natural Language :: Spanish',
diff --git a/stock.py b/stock.py
index 256f61f..f9b2c6c 100644
--- a/stock.py
+++ b/stock.py
@@ -119,10 +119,9 @@ class ShipmentIn:
move.currency, round=False)
unit_shipment_cost = unit_shipment_cost.quantize(
exp, rounding=ROUND_HALF_EVEN)
- Move.write([move], {
- 'unit_price': move.unit_price + unit_shipment_cost,
- 'unit_shipment_cost': unit_shipment_cost,
- })
+ move.unit_price += unit_shipment_cost
+ move.unit_shipment_cost = unit_shipment_cost
+ Move.save(moves)
@classmethod
@ModelView.button
diff --git a/tests/scenario_purchase_shipment_cost.rst b/tests/scenario_purchase_shipment_cost.rst
index 95cc6b4..2fb7899 100644
--- a/tests/scenario_purchase_shipment_cost.rst
+++ b/tests/scenario_purchase_shipment_cost.rst
@@ -19,13 +19,13 @@ Create database::
Install purchase_shipment_cost::
- >>> Module = Model.get('ir.module.module')
+ >>> Module = Model.get('ir.module')
>>> modules = Module.find([
... ('name', '=', 'purchase_shipment_cost'),
... ])
>>> for module in modules:
... module.click('install')
- >>> Wizard('ir.module.module.install_upgrade').execute('upgrade')
+ >>> Wizard('ir.module.install_upgrade').execute('upgrade')
Create company::
diff --git a/tests/scenario_purchase_shipment_cost_with_account_stock.rst b/tests/scenario_purchase_shipment_cost_with_account_stock.rst
index 4deb616..7e047c3 100644
--- a/tests/scenario_purchase_shipment_cost_with_account_stock.rst
+++ b/tests/scenario_purchase_shipment_cost_with_account_stock.rst
@@ -25,14 +25,14 @@ Create database::
Install purchase_shipment_cost::
- >>> Module = Model.get('ir.module.module')
+ >>> Module = Model.get('ir.module')
>>> modules = Module.find([
... ('name', 'in', ['purchase_shipment_cost',
... 'account_stock_continental']),
... ])
>>> for module in modules:
... module.click('install')
- >>> Wizard('ir.module.module.install_upgrade').execute('upgrade')
+ >>> Wizard('ir.module.install_upgrade').execute('upgrade')
Create 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 d762999..f2c9992 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
@@ -27,14 +27,14 @@ Create database::
Install purchase_shipment_cost, account_stock_continental and purchase::
- >>> Module = Model.get('ir.module.module')
+ >>> Module = Model.get('ir.module')
>>> modules = Module.find([
... ('name', 'in', ('purchase_shipment_cost',
... 'account_stock_anglo_saxon', 'purchase')),
... ])
>>> for module in modules:
... module.click('install')
- >>> Wizard('ir.module.module.install_upgrade').execute('upgrade')
+ >>> Wizard('ir.module.install_upgrade').execute('upgrade')
Create company::
diff --git a/tryton.cfg b/tryton.cfg
index 10009a1..ef25b3a 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.6.0
+version=3.8.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 001bbe0..f9c5a4d 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.6.0
+Version: 3.8.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.6/
+Download-URL: http://downloads.tryton.org/3.8/
Description: trytond_purchase_shipment_cost
==============================
@@ -59,6 +59,9 @@ Classifier: Natural Language :: Dutch
Classifier: Natural Language :: English
Classifier: Natural Language :: French
Classifier: Natural Language :: German
+Classifier: Natural Language :: Hungarian
+Classifier: Natural Language :: Italian
+Classifier: Natural Language :: Portuguese (Brazilian)
Classifier: Natural Language :: Russian
Classifier: Natural Language :: Slovenian
Classifier: Natural Language :: Spanish
diff --git a/trytond_purchase_shipment_cost.egg-info/SOURCES.txt b/trytond_purchase_shipment_cost.egg-info/SOURCES.txt
index 9a5396c..fedf4c7 100644
--- a/trytond_purchase_shipment_cost.egg-info/SOURCES.txt
+++ b/trytond_purchase_shipment_cost.egg-info/SOURCES.txt
@@ -22,8 +22,14 @@ tryton.cfg
./locale/es_CO.po
./locale/es_EC.po
./locale/es_ES.po
+./locale/es_MX.po
./locale/fr_FR.po
+./locale/hu_HU.po
+./locale/it_IT.po
+./locale/ja_JP.po
+./locale/lt_LT.po
./locale/nl_NL.po
+./locale/pt_BR.po
./locale/ru_RU.po
./locale/sl_SI.po
./tests/__init__.py
@@ -42,8 +48,14 @@ locale/es_AR.po
locale/es_CO.po
locale/es_EC.po
locale/es_ES.po
+locale/es_MX.po
locale/fr_FR.po
+locale/hu_HU.po
+locale/it_IT.po
+locale/ja_JP.po
+locale/lt_LT.po
locale/nl_NL.po
+locale/pt_BR.po
locale/ru_RU.po
locale/sl_SI.po
tests/scenario_purchase_shipment_cost.rst
diff --git a/trytond_purchase_shipment_cost.egg-info/requires.txt b/trytond_purchase_shipment_cost.egg-info/requires.txt
index 2b98609..2f43031 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.6, < 3.7
-trytond_currency >= 3.6, < 3.7
-trytond_stock >= 3.6, < 3.7
-trytond >= 3.6, < 3.7
+trytond_carrier >= 3.8, < 3.9
+trytond_currency >= 3.8, < 3.9
+trytond_stock >= 3.8, < 3.9
+trytond >= 3.8, < 3.9
[account_product]
-trytond_account_product >= 3.6, < 3.7
+trytond_account_product >= 3.8, < 3.9
[account_stock_continental]
-trytond_account_stock_continental >= 3.6, < 3.7
+trytond_account_stock_continental >= 3.8, < 3.9
[account_stock_anglo_saxon]
-trytond_account_stock_anglo_saxon >= 3.6, < 3.7
\ No newline at end of file
+trytond_account_stock_anglo_saxon >= 3.8, < 3.9
\ No newline at end of file
--
tryton-modules-purchase-shipment-cost
More information about the tryton-debian-vcs
mailing list