[tryton-debian-vcs] tryton-modules-stock-supply branch upstream updated. upstream/3.0.1-1-gccb9f85
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Tue Apr 22 13:11:22 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-stock-supply.git;a=commitdiff;h=upstream/3.0.1-1-gccb9f85
commit ccb9f85dbe8c437849f02451a0ec026278d9ecc3
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Apr 22 14:23:56 2014 +0200
Adding upstream version 3.2.0.
diff --git a/CHANGELOG b/CHANGELOG
index e815e21..b6f3e6b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,4 @@
-Version 3.0.1 - 2014-03-22
+Version 3.2.0 - 2014-04-21
* Bug fixes (see mercurial logs for details)
Version 3.0.0 - 2013-10-21
diff --git a/COPYRIGHT b/COPYRIGHT
index afdd87b..d218cc9 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,4 +1,4 @@
-Copyright (C) 2013 NaN-tic.
+Copyright (C) 2013-2014 NaN-tic.
Copyright (C) 2008-2014 Cédric Krier.
Copyright (C) 2008-2013 Bertrand Chenal.
Copyright (C) 2008-2014 B2CK SPRL.
diff --git a/INSTALL b/INSTALL
index cf3c35d..d20c350 100644
--- a/INSTALL
+++ b/INSTALL
@@ -4,7 +4,7 @@ Installing trytond_stock_supply
Prerequisites
-------------
- * Python 2.6 or later (http://www.python.org/)
+ * Python 2.7 or later (http://www.python.org/)
* python-sql (http://code.google.com/p/python-sql/)
* trytond (http://www.tryton.org/)
* trytond_party (http://www.tryton.org/)
diff --git a/MANIFEST.in b/MANIFEST.in
index 2569955..e013c00 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,12 +1,10 @@
include INSTALL
include README
-include TODO
include COPYRIGHT
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 f5a53c7..0014bd3 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_stock_supply
-Version: 3.0.1
+Version: 3.2.0
Summary: Tryton module for stock supply
Home-page: http://www.tryton.org/
Author: Tryton
-Author-email: UNKNOWN
+Author-email: issue_tracker at tryton.org
License: GPL-3
-Download-URL: http://downloads.tryton.org/3.0/
+Download-URL: http://downloads.tryton.org/3.2/
Description: trytond_stock_supply
====================
@@ -43,6 +43,7 @@ Description: trytond_stock_supply
http://www.tryton.org/
+Keywords: tryton stock supply
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
Classifier: Environment :: Plugins
@@ -63,6 +64,5 @@ Classifier: Natural Language :: Russian
Classifier: Natural Language :: Slovenian
Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python :: 2.6
Classifier: Programming Language :: Python :: 2.7
Classifier: Topic :: Office/Business
diff --git a/locale/bg_BG.po b/locale/bg_BG.po
index 1c684b2..c1b4943 100644
--- a/locale/bg_BG.po
+++ b/locale/bg_BG.po
@@ -245,14 +245,14 @@ msgctxt "field:stock.shipment.internal.create.start,id:"
msgid "ID"
msgstr "ID"
+msgctxt "model:ir.action,name:"
+msgid "Purchases"
+msgstr "Покупки"
+
msgctxt "model:ir.action,name:act_order_point_form"
msgid "Order Points"
msgstr "Пренареждания"
-msgctxt "model:ir.action,name:act_purchase_form"
-msgid "Purchases"
-msgstr "Покупки"
-
msgctxt "model:ir.action,name:act_purchase_request_create"
msgid "Create Purchase Requests"
msgstr "Създаване на заявки за покупка"
@@ -364,13 +364,14 @@ msgctxt "selection:stock.order_point,type:"
msgid "Purchase"
msgstr "Покупка"
+#, fuzzy
msgctxt "view:purchase.request.create.start:"
-msgid "Create Purchase Request"
-msgstr "Създаване на заявка за покупка"
+msgid "Create Purchase Requests"
+msgstr "Създаване на заявки за покупка"
msgctxt "view:purchase.request.create.start:"
-msgid "Create Purchase Request?"
-msgstr "Създаване на заявка за покупка?"
+msgid "Create Purchase Requests?"
+msgstr ""
msgctxt "view:purchase.request.create_purchase.ask_party:"
msgid "Create Purchase: Missing Supplier"
diff --git a/locale/ca_ES.po b/locale/ca_ES.po
index 34f61d1..4bde04b 100644
--- a/locale/ca_ES.po
+++ b/locale/ca_ES.po
@@ -5,7 +5,7 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:purchase.request.create:"
msgid "There are some late supplier moves, are you sure to ignore them?"
msgstr ""
-"Hi ha moviments de proveïdor pendents. Esteu segur de voler ignorar-los?"
+"Hi ha alguns moviments de proveïdor pendents. Esteu segur d'ignorar-los?"
msgctxt "error:purchase.request.create_purchase:"
msgid "Purchase price is missing for product \"%s\"."
@@ -29,12 +29,12 @@ msgstr "No podeu eliminar una sol·licitud comprada."
msgctxt "error:stock.order_point:"
msgid "Maximal quantity must be bigger than Minimal quantity"
-msgstr "La quantitat màxima ha de ser major que la mínima"
+msgstr "La quantitat màxima ha de ser major que la mínima."
msgctxt "error:stock.order_point:"
msgid "Only one order point is allowed for each product-location pair."
msgstr ""
-"Només es permet una regla d'estoc mínim per cada parell de producte-"
+"Només es permet una regla de proveïment per cada combinació de producte-"
"ubicació."
msgctxt "error:stock.order_point:"
@@ -42,12 +42,12 @@ msgid ""
"You can not define two order points on the same product with opposite "
"locations."
msgstr ""
-"No podeu definir dues regles d'estoc mínim en el mateix producte amb "
+"No podeu definir dues regles de proveïment del mateix producte amb "
"ubicacions oposades."
msgctxt "field:product.product,order_points:"
msgid "Order Points"
-msgstr "Regles d'estoc mínim"
+msgstr "Regles de proveïment"
msgctxt "field:purchase.request,company:"
msgid "Company"
@@ -111,7 +111,7 @@ msgstr "Estat"
msgctxt "field:purchase.request,stock_level:"
msgid "Stock at Supply Date"
-msgstr "Existències a la data del subministrament"
+msgstr "Estoc a la data del subministrament"
msgctxt "field:purchase.request,supply_date:"
msgid "Expected Supply Date"
@@ -245,14 +245,14 @@ msgctxt "field:stock.shipment.internal.create.start,id:"
msgid "ID"
msgstr "ID"
-msgctxt "model:ir.action,name:act_order_point_form"
-msgid "Order Points"
-msgstr "Regles d'estoc mínim"
-
-msgctxt "model:ir.action,name:act_purchase_form"
+msgctxt "model:ir.action,name:"
msgid "Purchases"
msgstr "Compres"
+msgctxt "model:ir.action,name:act_order_point_form"
+msgid "Order Points"
+msgstr "Regles de proveïment"
+
msgctxt "model:ir.action,name:act_purchase_request_create"
msgid "Create Purchase Requests"
msgstr "Crea sol·licituds de compra"
@@ -285,11 +285,11 @@ msgstr "Generar peticions de compra"
msgctxt "model:ir.cron,name:cron_shipment_iternal"
msgid "Generate Internal Shipments"
-msgstr "Generar enviaments interns"
+msgstr "Generar albarans interns"
msgctxt "model:ir.ui.menu,name:menu_order_point_form"
msgid "Order Points"
-msgstr "Regles d'estoc mínim"
+msgstr "Regles de proveïment"
msgctxt "model:ir.ui.menu,name:menu_purchase_request_create"
msgid "Create Purchase Requests"
@@ -325,15 +325,15 @@ msgstr "Sol·licitud de compra"
msgctxt "model:res.user,name:user_generate_request"
msgid "Cron Purchase Request"
-msgstr "Programador de tasques de sol·licituds de compra"
+msgstr "Planificador de sol·licituds de compra"
msgctxt "model:res.user,name:user_generate_shipment_internal"
msgid "Cron Intenal Shipment"
-msgstr "Programador de tasques d'enviament intern"
+msgstr "Planificador d'enviaments interns"
msgctxt "model:stock.order_point,name:"
msgid "Order Point"
-msgstr "Regla d'estoc mínim"
+msgstr "Regla de proveïment"
msgctxt "model:stock.shipment.internal.create.start,name:"
msgid "Create Shipment Internal"
@@ -341,11 +341,11 @@ msgstr "Crea albarans interns"
msgctxt "selection:purchase.request,origin:"
msgid "Order Point"
-msgstr "Regla d'estoc mínim"
+msgstr "Regla de proveïment"
msgctxt "selection:purchase.request,state:"
msgid "Cancel"
-msgstr "Cancel·lat"
+msgstr "Cancel·lada"
msgctxt "selection:purchase.request,state:"
msgid "Done"
@@ -357,7 +357,7 @@ msgstr "Esborrany"
msgctxt "selection:purchase.request,state:"
msgid "Purchased"
-msgstr "Comprat"
+msgstr "Comprada"
msgctxt "selection:stock.order_point,type:"
msgid "Internal"
@@ -368,12 +368,12 @@ msgid "Purchase"
msgstr "Compra"
msgctxt "view:purchase.request.create.start:"
-msgid "Create Purchase Request"
-msgstr "Crear sol·licituds de compra?"
+msgid "Create Purchase Requests"
+msgstr "Crea sol·licituds de compra"
msgctxt "view:purchase.request.create.start:"
-msgid "Create Purchase Request?"
-msgstr "Crear sol·licituds de compra?"
+msgid "Create Purchase Requests?"
+msgstr "Voleu crear les comandes de compra?"
msgctxt "view:purchase.request.create_purchase.ask_party:"
msgid "Create Purchase: Missing Supplier"
@@ -401,15 +401,15 @@ msgstr "Informació del subministrament"
msgctxt "view:stock.order_point:"
msgid "Order Point"
-msgstr "Regla d'estoc mínim"
+msgstr "Regla de proveïment"
msgctxt "view:stock.order_point:"
msgid "Order Point Type"
-msgstr "Tipus d'ordre de pagament"
+msgstr "Tipus de regla de proveïment"
msgctxt "view:stock.order_point:"
msgid "Order Points"
-msgstr "Regles d'estoc mínim"
+msgstr "Regles de proveïment"
msgctxt "view:stock.order_point:"
msgid "Product Info"
@@ -421,7 +421,7 @@ msgstr "Crea albarans interns"
msgctxt "view:stock.shipment.internal.create.start:"
msgid "Create Internal Shipments?"
-msgstr "Crear albarans interns?"
+msgstr "Voleu crear els albarans interns?"
msgctxt "wizard_button:purchase.request.create,start,create_:"
msgid "Create"
diff --git a/locale/cs_CZ.po b/locale/cs_CZ.po
index 03af768..5e34aac 100644
--- a/locale/cs_CZ.po
+++ b/locale/cs_CZ.po
@@ -240,12 +240,12 @@ msgctxt "field:stock.shipment.internal.create.start,id:"
msgid "ID"
msgstr ""
-msgctxt "model:ir.action,name:act_order_point_form"
-msgid "Order Points"
+msgctxt "model:ir.action,name:"
+msgid "Purchases"
msgstr ""
-msgctxt "model:ir.action,name:act_purchase_form"
-msgid "Purchases"
+msgctxt "model:ir.action,name:act_order_point_form"
+msgid "Order Points"
msgstr ""
msgctxt "model:ir.action,name:act_purchase_request_create"
@@ -359,11 +359,11 @@ msgid "Purchase"
msgstr ""
msgctxt "view:purchase.request.create.start:"
-msgid "Create Purchase Request"
+msgid "Create Purchase Requests"
msgstr ""
msgctxt "view:purchase.request.create.start:"
-msgid "Create Purchase Request?"
+msgid "Create Purchase Requests?"
msgstr ""
msgctxt "view:purchase.request.create_purchase.ask_party:"
diff --git a/locale/de_DE.po b/locale/de_DE.po
index f1b7852..ad95173 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -95,7 +95,7 @@ msgstr "Bestes Einkaufsdatum"
msgctxt "field:purchase.request,purchase_line:"
msgid "Purchase Line"
-msgstr "Position Bestellvorschlag"
+msgstr "Einkaufsposition"
msgctxt "field:purchase.request,quantity:"
msgid "Quantity"
@@ -227,7 +227,7 @@ msgstr "Einheit"
msgctxt "field:stock.order_point,unit_digits:"
msgid "Unit Digits"
-msgstr "Anzahl Stellen"
+msgstr "Nachkommastellen"
msgctxt "field:stock.order_point,warehouse_location:"
msgid "Warehouse Location"
@@ -245,14 +245,14 @@ msgctxt "field:stock.shipment.internal.create.start,id:"
msgid "ID"
msgstr "ID"
+msgctxt "model:ir.action,name:"
+msgid "Purchases"
+msgstr "Einkäufe"
+
msgctxt "model:ir.action,name:act_order_point_form"
msgid "Order Points"
msgstr "Bestellpunkte"
-msgctxt "model:ir.action,name:act_purchase_form"
-msgid "Purchases"
-msgstr "Einkäufe"
-
msgctxt "model:ir.action,name:act_purchase_request_create"
msgid "Create Purchase Requests"
msgstr "Bestellvorschläge erstellen"
@@ -313,11 +313,11 @@ msgstr "Bestellvorschlag erstellen"
msgctxt "model:purchase.request.create_purchase.ask_party,name:"
msgid "Create Purchase Ask Party"
-msgstr "Verkauf Nachfrage Partei"
+msgstr "Nachfrage Partei Einkauf"
msgctxt "model:purchase.request.create_purchase.ask_term,name:"
msgid "Create Purchase Ask Term"
-msgstr "Verkauf Nachfrage Zahlungsbedingung"
+msgstr "Nachfrage Zahlungsbedingung Einkauf"
msgctxt "model:res.group,name:group_purchase_request"
msgid "Purchase Request"
@@ -368,12 +368,12 @@ msgid "Purchase"
msgstr "Bestellvorschlag"
msgctxt "view:purchase.request.create.start:"
-msgid "Create Purchase Request"
-msgstr "Bestellvorschlag erstellen"
+msgid "Create Purchase Requests"
+msgstr "Bestellvorschläge erstellen"
msgctxt "view:purchase.request.create.start:"
-msgid "Create Purchase Request?"
-msgstr "Bestellvorschlag erstellen?"
+msgid "Create Purchase Requests?"
+msgstr "Bestellvorschläge erstellen?"
msgctxt "view:purchase.request.create_purchase.ask_party:"
msgid "Create Purchase: Missing Supplier"
diff --git a/locale/es_AR.po b/locale/es_AR.po
index 7a8b0b9..a6a9b6b 100644
--- a/locale/es_AR.po
+++ b/locale/es_AR.po
@@ -245,14 +245,14 @@ msgctxt "field:stock.shipment.internal.create.start,id:"
msgid "ID"
msgstr "ID"
+msgctxt "model:ir.action,name:"
+msgid "Purchases"
+msgstr "Compras"
+
msgctxt "model:ir.action,name:act_order_point_form"
msgid "Order Points"
msgstr "Reglas de abastecimiento"
-msgctxt "model:ir.action,name:act_purchase_form"
-msgid "Purchases"
-msgstr "Compras"
-
msgctxt "model:ir.action,name:act_purchase_request_create"
msgid "Create Purchase Requests"
msgstr "Crear solicitudes de compra"
@@ -345,7 +345,7 @@ msgstr "Regla de abastecimiento"
msgctxt "selection:purchase.request,state:"
msgid "Cancel"
-msgstr "Cancelar"
+msgstr "Cancelado"
msgctxt "selection:purchase.request,state:"
msgid "Done"
@@ -368,12 +368,12 @@ msgid "Purchase"
msgstr "Compra"
msgctxt "view:purchase.request.create.start:"
-msgid "Create Purchase Request"
-msgstr "Crear solicitud de compra"
+msgid "Create Purchase Requests"
+msgstr "Crear solicitudes de compra"
msgctxt "view:purchase.request.create.start:"
-msgid "Create Purchase Request?"
-msgstr "¿Crear solicitud de compra?"
+msgid "Create Purchase Requests?"
+msgstr "¿Crear solicitudes de compra?"
msgctxt "view:purchase.request.create_purchase.ask_party:"
msgid "Create Purchase: Missing Supplier"
diff --git a/locale/es_CO.po b/locale/es_CO.po
index 31c2131..29022e5 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -42,12 +42,11 @@ msgid ""
"You can not define two order points on the same product with opposite "
"locations."
msgstr ""
-"No puede definir dos puntos de orden del mismo producto con lugares "
-"opuestos."
+"No puede definir dos requisiciones del mismo producto con lugares opuestos."
msgctxt "field:product.product,order_points:"
msgid "Order Points"
-msgstr "Puntos de Orden"
+msgstr "Requisiciones"
msgctxt "field:purchase.request,company:"
msgid "Company"
@@ -119,7 +118,7 @@ msgstr "Fecha Esperada de Abastecimiento"
msgctxt "field:purchase.request,uom:"
msgid "UOM"
-msgstr "UdM"
+msgstr "UDM"
msgctxt "field:purchase.request,warehouse:"
msgid "Warehouse"
@@ -231,7 +230,7 @@ msgstr "Decimales de Unidad"
msgctxt "field:stock.order_point,warehouse_location:"
msgid "Warehouse Location"
-msgstr "Bodega de Depósito"
+msgstr "Bodega"
msgctxt "field:stock.order_point,write_date:"
msgid "Write Date"
@@ -245,21 +244,21 @@ msgctxt "field:stock.shipment.internal.create.start,id:"
msgid "ID"
msgstr "ID"
-msgctxt "model:ir.action,name:act_order_point_form"
-msgid "Order Points"
-msgstr "Puntos de Orden"
-
-msgctxt "model:ir.action,name:act_purchase_form"
+msgctxt "model:ir.action,name:"
msgid "Purchases"
msgstr "Compras"
+msgctxt "model:ir.action,name:act_order_point_form"
+msgid "Order Points"
+msgstr "Requisiciones"
+
msgctxt "model:ir.action,name:act_purchase_request_create"
msgid "Create Purchase Requests"
msgstr "Crear Ordenes de Compras"
msgctxt "model:ir.action,name:act_purchase_request_form"
msgid "Purchase Requests"
-msgstr "Solicitudes de Compra"
+msgstr "Ordenes de Compra"
msgctxt "model:ir.action,name:act_shipment_internal_create"
msgid "Create Internal Shipments"
@@ -289,7 +288,7 @@ msgstr "Generar Envío Interno"
msgctxt "model:ir.ui.menu,name:menu_order_point_form"
msgid "Order Points"
-msgstr "Puntos de Orden"
+msgstr "Requisiciones"
msgctxt "model:ir.ui.menu,name:menu_purchase_request_create"
msgid "Create Purchase Requests"
@@ -313,11 +312,11 @@ msgstr "Crear Orden de Compra"
msgctxt "model:purchase.request.create_purchase.ask_party,name:"
msgid "Create Purchase Ask Party"
-msgstr "Crear Pregunta a Tercero de Compra"
+msgstr "Crear Compra Pregunta Tercero"
msgctxt "model:purchase.request.create_purchase.ask_term,name:"
msgid "Create Purchase Ask Term"
-msgstr "Crear Pregunta a Tercero de Término"
+msgstr "Crear Compra Pregunta Forma de Pago"
msgctxt "model:res.group,name:group_purchase_request"
msgid "Purchase Request"
@@ -333,7 +332,7 @@ msgstr "Cron Envío Interno"
msgctxt "model:stock.order_point,name:"
msgid "Order Point"
-msgstr "Punto de Orden"
+msgstr "Requisición"
msgctxt "model:stock.shipment.internal.create.start,name:"
msgid "Create Shipment Internal"
@@ -341,7 +340,7 @@ msgstr "Crear Envío Interno"
msgctxt "selection:purchase.request,origin:"
msgid "Order Point"
-msgstr "Punto de Orden"
+msgstr "Requisición"
msgctxt "selection:purchase.request,state:"
msgid "Cancel"
@@ -368,12 +367,12 @@ msgid "Purchase"
msgstr "Compra"
msgctxt "view:purchase.request.create.start:"
-msgid "Create Purchase Request"
-msgstr "Crear Orden de Compra"
+msgid "Create Purchase Requests"
+msgstr "Crear Ordenes de Compras"
msgctxt "view:purchase.request.create.start:"
-msgid "Create Purchase Request?"
-msgstr "Crear Orden de Compra?"
+msgid "Create Purchase Requests?"
+msgstr "Crear Ordenes de Compras?"
msgctxt "view:purchase.request.create_purchase.ask_party:"
msgid "Create Purchase: Missing Supplier"
@@ -381,7 +380,7 @@ msgstr "Crear Compra: Sin Proveedor"
msgctxt "view:purchase.request.create_purchase.ask_term:"
msgid "Create Purchase: Missing Payment Term"
-msgstr "Crear Compra: Sin Término de Pago"
+msgstr "Crear Compra: Sin Forma de Pago"
msgctxt "view:purchase.request:"
msgid "Product Info"
@@ -389,7 +388,7 @@ msgstr "Información de Producto"
msgctxt "view:purchase.request:"
msgid "Purchase Request"
-msgstr "Solicitud de Compra"
+msgstr "Orden de Compra"
msgctxt "view:purchase.request:"
msgid "Purchase Requests"
@@ -401,15 +400,15 @@ msgstr "Información de Proveedor"
msgctxt "view:stock.order_point:"
msgid "Order Point"
-msgstr "Punto de Orden"
+msgstr "Requisición"
msgctxt "view:stock.order_point:"
msgid "Order Point Type"
-msgstr "Tipo de Punto de Orden"
+msgstr "Tipo de Requisición"
msgctxt "view:stock.order_point:"
msgid "Order Points"
-msgstr "Puntos de Orden"
+msgstr "Requisiciones"
msgctxt "view:stock.order_point:"
msgid "Product Info"
diff --git a/locale/es_ES.po b/locale/es_ES.po
index 0d4fb99..f6df76d 100644
--- a/locale/es_ES.po
+++ b/locale/es_ES.po
@@ -42,8 +42,8 @@ msgid ""
"You can not define two order points on the same product with opposite "
"locations."
msgstr ""
-"No puede definir dos reglas de abastecimiento en el mismo producto con "
-"ubicaciones opuestas."
+"No puede definir dos reglas de abastecimiento del producto con ubicaciones "
+"opuestas."
msgctxt "field:product.product,order_points:"
msgid "Order Points"
@@ -245,14 +245,14 @@ msgctxt "field:stock.shipment.internal.create.start,id:"
msgid "ID"
msgstr "ID"
+msgctxt "model:ir.action,name:"
+msgid "Purchases"
+msgstr "Compras"
+
msgctxt "model:ir.action,name:act_order_point_form"
msgid "Order Points"
msgstr "Reglas de abastecimiento"
-msgctxt "model:ir.action,name:act_purchase_form"
-msgid "Purchases"
-msgstr "Compras"
-
msgctxt "model:ir.action,name:act_purchase_request_create"
msgid "Create Purchase Requests"
msgstr "Crear solicitudes de compra"
@@ -285,7 +285,7 @@ msgstr "Generar solicitudes de compra"
msgctxt "model:ir.cron,name:cron_shipment_iternal"
msgid "Generate Internal Shipments"
-msgstr "Generar envíos internos"
+msgstr "Generar albaranes internos"
msgctxt "model:ir.ui.menu,name:menu_order_point_form"
msgid "Order Points"
@@ -325,11 +325,11 @@ msgstr "Solicitud de compra"
msgctxt "model:res.user,name:user_generate_request"
msgid "Cron Purchase Request"
-msgstr "Planificador solicitud de compra"
+msgstr "Planificador de solicitudes de compra"
msgctxt "model:res.user,name:user_generate_shipment_internal"
msgid "Cron Intenal Shipment"
-msgstr "Planificador de envío interno"
+msgstr "Planificador de envíos internos"
msgctxt "model:stock.order_point,name:"
msgid "Order Point"
@@ -345,7 +345,7 @@ msgstr "Regla de abastecimiento"
msgctxt "selection:purchase.request,state:"
msgid "Cancel"
-msgstr "Cancelar"
+msgstr "Cancelada"
msgctxt "selection:purchase.request,state:"
msgid "Done"
@@ -357,7 +357,7 @@ msgstr "Borrador"
msgctxt "selection:purchase.request,state:"
msgid "Purchased"
-msgstr "Comprado"
+msgstr "Comprada"
msgctxt "selection:stock.order_point,type:"
msgid "Internal"
@@ -368,12 +368,12 @@ msgid "Purchase"
msgstr "Compra"
msgctxt "view:purchase.request.create.start:"
-msgid "Create Purchase Request"
-msgstr "Crear solicitud de compra"
+msgid "Create Purchase Requests"
+msgstr "Crear solicitudes de compra"
msgctxt "view:purchase.request.create.start:"
-msgid "Create Purchase Request?"
-msgstr "¿Crear solicitudes de compra?"
+msgid "Create Purchase Requests?"
+msgstr "¿Quiere crear las solicitudes de compra?"
msgctxt "view:purchase.request.create_purchase.ask_party:"
msgid "Create Purchase: Missing Supplier"
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
index cab1ed1..7546200 100644
--- a/locale/fr_FR.po
+++ b/locale/fr_FR.po
@@ -245,14 +245,14 @@ msgctxt "field:stock.shipment.internal.create.start,id:"
msgid "ID"
msgstr "ID"
+msgctxt "model:ir.action,name:"
+msgid "Purchases"
+msgstr "Achats"
+
msgctxt "model:ir.action,name:act_order_point_form"
msgid "Order Points"
msgstr "Règles d'approvisionnement"
-msgctxt "model:ir.action,name:act_purchase_form"
-msgid "Purchases"
-msgstr "Achats"
-
msgctxt "model:ir.action,name:act_purchase_request_create"
msgid "Create Purchase Requests"
msgstr "Créer les demandes d'achat"
@@ -317,7 +317,7 @@ msgstr "Créer l'achat - Demande de tiers"
msgctxt "model:purchase.request.create_purchase.ask_term,name:"
msgid "Create Purchase Ask Term"
-msgstr "Créer l'achat - Demande de condition de paiment"
+msgstr "Créer l'achat - Demande de condition de paiement"
msgctxt "model:res.group,name:group_purchase_request"
msgid "Purchase Request"
@@ -368,11 +368,11 @@ msgid "Purchase"
msgstr "Achat"
msgctxt "view:purchase.request.create.start:"
-msgid "Create Purchase Request"
+msgid "Create Purchase Requests"
msgstr "Créer les demandes d'achat"
msgctxt "view:purchase.request.create.start:"
-msgid "Create Purchase Request?"
+msgid "Create Purchase Requests?"
msgstr "Créer les demandes d'achat ?"
msgctxt "view:purchase.request.create_purchase.ask_party:"
diff --git a/locale/nl_NL.po b/locale/nl_NL.po
index 9cb2df9..1934643 100644
--- a/locale/nl_NL.po
+++ b/locale/nl_NL.po
@@ -259,12 +259,12 @@ msgctxt "field:stock.shipment.internal.create.start,id:"
msgid "ID"
msgstr ""
-msgctxt "model:ir.action,name:act_order_point_form"
-msgid "Order Points"
+msgctxt "model:ir.action,name:"
+msgid "Purchases"
msgstr ""
-msgctxt "model:ir.action,name:act_purchase_form"
-msgid "Purchases"
+msgctxt "model:ir.action,name:act_order_point_form"
+msgid "Order Points"
msgstr ""
msgctxt "model:ir.action,name:act_purchase_request_create"
@@ -382,11 +382,11 @@ msgid "Purchase"
msgstr ""
msgctxt "view:purchase.request.create.start:"
-msgid "Create Purchase Request"
+msgid "Create Purchase Requests"
msgstr ""
msgctxt "view:purchase.request.create.start:"
-msgid "Create Purchase Request?"
+msgid "Create Purchase Requests?"
msgstr ""
msgctxt "view:purchase.request.create_purchase.ask_party:"
diff --git a/locale/ru_RU.po b/locale/ru_RU.po
index 873f709..2e8fd5f 100644
--- a/locale/ru_RU.po
+++ b/locale/ru_RU.po
@@ -244,14 +244,14 @@ msgctxt "field:stock.shipment.internal.create.start,id:"
msgid "ID"
msgstr "ID"
+msgctxt "model:ir.action,name:"
+msgid "Purchases"
+msgstr "Покупки"
+
msgctxt "model:ir.action,name:act_order_point_form"
msgid "Order Points"
msgstr "Точки заказа"
-msgctxt "model:ir.action,name:act_purchase_form"
-msgid "Purchases"
-msgstr "Покупки"
-
msgctxt "model:ir.action,name:act_purchase_request_create"
msgid "Create Purchase Requests"
msgstr "Создать запросы на покупку"
@@ -362,13 +362,14 @@ msgctxt "selection:stock.order_point,type:"
msgid "Purchase"
msgstr "Покупки"
+#, fuzzy
msgctxt "view:purchase.request.create.start:"
-msgid "Create Purchase Request"
-msgstr "Создать запрос на покупку"
+msgid "Create Purchase Requests"
+msgstr "Создать запросы на покупку"
msgctxt "view:purchase.request.create.start:"
-msgid "Create Purchase Request?"
-msgstr "Создать запрос на покупку?"
+msgid "Create Purchase Requests?"
+msgstr ""
msgctxt "view:purchase.request.create_purchase.ask_party:"
msgid "Create Purchase: Missing Supplier"
diff --git a/locale/sl_SI.po b/locale/sl_SI.po
index 5092d47..ee0feb9 100644
--- a/locale/sl_SI.po
+++ b/locale/sl_SI.po
@@ -50,7 +50,7 @@ msgstr "Točke naročanja"
msgctxt "field:purchase.request,company:"
msgid "Company"
-msgstr "Podjetje"
+msgstr "Družba"
msgctxt "field:purchase.request,computed_quantity:"
msgid "Computed Quantity"
@@ -78,7 +78,7 @@ msgstr "Poreklo"
msgctxt "field:purchase.request,party:"
msgid "Party"
-msgstr "Stranka"
+msgstr "Partner"
msgctxt "field:purchase.request,product:"
msgid "Product"
@@ -142,7 +142,7 @@ msgstr "ID"
msgctxt "field:purchase.request.create_purchase.ask_party,company:"
msgid "Company"
-msgstr "Podjetje"
+msgstr "Družba"
msgctxt "field:purchase.request.create_purchase.ask_party,id:"
msgid "ID"
@@ -158,7 +158,7 @@ msgstr "Izdelek"
msgctxt "field:purchase.request.create_purchase.ask_term,company:"
msgid "Company"
-msgstr "Podjetje"
+msgstr "Družba"
msgctxt "field:purchase.request.create_purchase.ask_term,id:"
msgid "ID"
@@ -174,7 +174,7 @@ msgstr "Plačilni rok"
msgctxt "field:stock.order_point,company:"
msgid "Company"
-msgstr "Podjetje"
+msgstr "Družba"
msgctxt "field:stock.order_point,create_date:"
msgid "Create Date"
@@ -244,14 +244,14 @@ msgctxt "field:stock.shipment.internal.create.start,id:"
msgid "ID"
msgstr "ID"
+msgctxt "model:ir.action,name:"
+msgid "Purchases"
+msgstr "Nabavni nalogi"
+
msgctxt "model:ir.action,name:act_order_point_form"
msgid "Order Points"
msgstr "Točke naročanja"
-msgctxt "model:ir.action,name:act_purchase_form"
-msgid "Purchases"
-msgstr "Nabavni nalogi"
-
msgctxt "model:ir.action,name:act_purchase_request_create"
msgid "Create Purchase Requests"
msgstr "Izdelava nabavnih zahtevkov"
@@ -276,7 +276,7 @@ msgstr "Vse"
msgctxt ""
"model:ir.action.act_window.domain,name:act_purchase_request_form_domain_draft"
msgid "Draft"
-msgstr "Osnutki"
+msgstr "Priprava"
msgctxt "model:ir.cron,name:cron_generate_request"
msgid "Generate Purchase Requests"
@@ -312,7 +312,7 @@ msgstr "Izdelava nabavnega zahtevka"
msgctxt "model:purchase.request.create_purchase.ask_party,name:"
msgid "Create Purchase Ask Party"
-msgstr "Izdelava nabavnega naloga: Stranka"
+msgstr "Izdelava nabavnega naloga: Partner"
msgctxt "model:purchase.request.create_purchase.ask_term,name:"
msgid "Create Purchase Ask Term"
@@ -348,7 +348,7 @@ msgstr "Zaključeno"
msgctxt "selection:purchase.request,state:"
msgid "Draft"
-msgstr "Osnutek"
+msgstr "V pripravi"
msgctxt "selection:purchase.request,state:"
msgid "Purchased"
@@ -363,12 +363,12 @@ msgid "Purchase"
msgstr "Nabavni nalog"
msgctxt "view:purchase.request.create.start:"
-msgid "Create Purchase Request"
-msgstr "Izdelava nabavnega zahtevka"
+msgid "Create Purchase Requests"
+msgstr "Izdelava nabavnih zahtevkov"
msgctxt "view:purchase.request.create.start:"
-msgid "Create Purchase Request?"
-msgstr "Izdelava nabavnega zahtevka?"
+msgid "Create Purchase Requests?"
+msgstr "Izdelava nabavnih zahtevkov?"
msgctxt "view:purchase.request.create_purchase.ask_party:"
msgid "Create Purchase: Missing Supplier"
diff --git a/order_point.py b/order_point.py
index 9cce236..c03f76d 100644
--- a/order_point.py
+++ b/order_point.py
@@ -24,8 +24,7 @@ class OrderPoint(ModelSQL, ModelView):
('purchasable', 'in', If(Equal(Eval('type'), 'purchase'),
[True], [True, False])),
],
- depends=['type'],
- on_change=['product'])
+ depends=['type'])
warehouse_location = fields.Many2One('stock.location',
'Warehouse Location', select=True,
domain=[('type', '=', 'warehouse')],
@@ -99,6 +98,7 @@ class OrderPoint(ModelSQL, ModelView):
def default_type():
return "purchase"
+ @fields.depends('product')
def on_change_product(self):
res = {
'unit': None,
diff --git a/purchase_request.py b/purchase_request.py
index ebf7985..40b2b78 100644
--- a/purchase_request.py
+++ b/purchase_request.py
@@ -467,7 +467,7 @@ class CreatePurchaseRequestStart(ModelView):
class CreatePurchaseRequest(Wizard):
- 'Create Purchase Request'
+ 'Create Purchase Requests'
__name__ = 'purchase.request.create'
start = StateView('purchase.request.create.start',
'stock_supply.purchase_request_create_start_view_form', [
diff --git a/purchase_request.xml b/purchase_request.xml
index c8b5e8c..c24ae3a 100644
--- a/purchase_request.xml
+++ b/purchase_request.xml
@@ -103,29 +103,6 @@ this repository contains the full copyright notices and license terms. -->
<field name="action" ref="wizard_create_purchase"/>
</record>
- <record model="ir.action.act_window" id="act_purchase_form">
- <field name="name">Purchases</field>
- <field name="res_model">purchase.purchase</field>
- <field name="domain">[("id", "=", Eval('purchase'))]</field>
- </record>
- <record model="ir.action.act_window.view" id="act_purchase_form_view1">
- <field name="sequence" eval="10"/>
- <field name="view" ref="purchase.purchase_view_tree"/>
- <field name="act_window" ref="act_purchase_form"/>
- </record>
- <record model="ir.action.act_window.view" id="act_purchase_form_view2">
- <field name="sequence" eval="20"/>
- <field name="view" ref="purchase.purchase_view_form"/>
- <field name="act_window" ref="act_purchase_form"/>
- </record>
- <record model="ir.action.keyword"
- id="act_open_purchase_keyword1">
- <field name="keyword">form_relate</field>
- <field name="model">purchase.request,-1</field>
- <field name="action" ref="act_purchase_form"/>
- </record>
-
-
<record model="ir.rule.group" id="rule_group_purchase_request">
<field name="model" search="[('model', '=', 'purchase.request')]"/>
<field name="global_p" eval="True"/>
@@ -187,9 +164,9 @@ this repository contains the full copyright notices and license terms. -->
<field name="request_user" ref="res.user_admin"/>
<field name="user" ref="user_generate_request"/>
<field name="active" eval="True"/>
- <field name="interval_number">1</field>
+ <field name="interval_number" eval="1"/>
<field name="interval_type">days</field>
- <field name="number_calls">-1</field>
+ <field name="number_calls" eval="-1"/>
<field name="repeat_missed" eval="False"/>
<field name="model">purchase.request</field>
<field name="function">generate_requests</field>
diff --git a/setup.py b/setup.py
index d61c602..b131d56 100644
--- a/setup.py
+++ b/setup.py
@@ -11,33 +11,51 @@ import ConfigParser
def read(fname):
return open(os.path.join(os.path.dirname(__file__), fname)).read()
+
+def get_require_version(name):
+ if minor_version % 2:
+ require = '%s >= %s.%s.dev0, < %s.%s'
+ else:
+ require = '%s >= %s.%s, < %s.%s'
+ require %= (name, major_version, minor_version,
+ major_version, minor_version + 1)
+ return require
+
config = ConfigParser.ConfigParser()
config.readfp(open('tryton.cfg'))
info = dict(config.items('tryton'))
for key in ('depends', 'extras_depend', 'xml'):
if key in info:
info[key] = info[key].strip().splitlines()
-major_version, minor_version, _ = info.get('version', '0.0.1').split('.', 2)
+version = info.get('version', '0.0.1')
+major_version, minor_version, _ = version.split('.', 2)
major_version = int(major_version)
minor_version = int(minor_version)
+name = 'trytond_stock_supply'
+
+download_url = 'http://downloads.tryton.org/%s.%s/' % (
+ major_version, minor_version)
+if minor_version % 2:
+ version = '%s.%s.dev0' % (major_version, minor_version)
+ download_url = (
+ 'hg+http://hg.tryton.org/modules/%s#egg=%s-%s' % (
+ name[8:], name, version))
requires = ['python-sql']
for dep in info.get('depends', []):
if not re.match(r'(ir|res|webdav)(\W|$)', dep):
- requires.append('trytond_%s >= %s.%s, < %s.%s' %
- (dep, major_version, minor_version, major_version,
- minor_version + 1))
-requires.append('trytond >= %s.%s, < %s.%s' %
- (major_version, minor_version, major_version, minor_version + 1))
+ requires.append(get_require_version('trytond_%s' % dep))
+requires.append(get_require_version('trytond'))
-setup(name='trytond_stock_supply',
- version=info.get('version', '0.0.1'),
+setup(name=name,
+ version=version,
description='Tryton module for stock supply',
long_description=read('README'),
author='Tryton',
+ author_email='issue_tracker at tryton.org',
url='http://www.tryton.org/',
- download_url=("http://downloads.tryton.org/" +
- info.get('version', '0.0.1').rsplit('.', 1)[0] + '/'),
+ download_url=download_url,
+ keywords='tryton stock supply',
package_dir={'trytond.modules.stock_supply': '.'},
packages=[
'trytond.modules.stock_supply',
@@ -67,7 +85,6 @@ setup(name='trytond_stock_supply',
'Natural Language :: Slovenian',
'Natural Language :: Spanish',
'Operating System :: OS Independent',
- 'Programming Language :: Python :: 2.6',
'Programming Language :: Python :: 2.7',
'Topic :: Office/Business',
],
diff --git a/shipment.xml b/shipment.xml
index 7963904..71811e9 100644
--- a/shipment.xml
+++ b/shipment.xml
@@ -20,9 +20,9 @@ this repository contains the full copyright notices and license terms. -->
<field name="request_user" ref="res.user_admin"/>
<field name="user" ref="user_generate_shipment_internal"/>
<field name="active" eval="True"/>
- <field name="interval_number">1</field>
+ <field name="interval_number" eval="1"/>
<field name="interval_type">days</field>
- <field name="number_calls">-1</field>
+ <field name="number_calls" eval="-1"/>
<field name="repeat_missed" eval="False"/>
<field name="model">stock.shipment.internal</field>
<field name="function">generate_internal_shipment</field>
diff --git a/tests/test_stock_supply.py b/tests/test_stock_supply.py
index 1d78c0a..70fc771 100644
--- a/tests/test_stock_supply.py
+++ b/tests/test_stock_supply.py
@@ -1,23 +1,13 @@
-#!/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.
-
-import sys
-import os
-DIR = os.path.abspath(os.path.normpath(os.path.join(__file__,
- '..', '..', '..', '..', '..', 'trytond')))
-if os.path.isdir(DIR):
- sys.path.insert(0, os.path.dirname(DIR))
-
import unittest
import doctest
import datetime
from decimal import Decimal
import trytond.tests.test_tryton
from trytond.tests.test_tryton import POOL, DB_NAME, USER, CONTEXT, test_view,\
- test_depends
+ test_depends, doctest_dropdb
from trytond.transaction import Transaction
-from trytond.backend.sqlite.database import Database as SQLiteDatabase
DATES = [
# purchase date, delivery time, supply date
@@ -32,9 +22,7 @@ DATES = [
class StockSupplyTestCase(unittest.TestCase):
- '''
- Test StockSupply module.
- '''
+ 'Test StockSupply module'
def setUp(self):
trytond.tests.test_tryton.install_module('stock_supply')
@@ -50,21 +38,15 @@ class StockSupplyTestCase(unittest.TestCase):
self.user = POOL.get('res.user')
def test0005views(self):
- '''
- Test views.
- '''
+ 'Test views'
test_view('stock_supply')
def test0006depends(self):
- '''
- Test depends.
- '''
+ 'Test depends'
test_depends()
def test0010compute_supply_date(self):
- '''
- Test compute_supply_date.
- '''
+ 'Test compute_supply_date'
for purchase_date, delivery_time, supply_date in DATES:
with Transaction().start(DB_NAME, USER, context=CONTEXT):
product_supplier = self.create_product_supplier(delivery_time)
@@ -73,9 +55,7 @@ class StockSupplyTestCase(unittest.TestCase):
self.assertEqual(date, supply_date)
def test0020compute_purchase_date(self):
- '''
- Test compute_purchase_date.
- '''
+ 'Test compute_purchase_date'
for purchase_date, delivery_time, supply_date in DATES:
with Transaction().start(DB_NAME, USER, context=CONTEXT):
product_supplier = self.create_product_supplier(delivery_time)
@@ -110,7 +90,9 @@ class StockSupplyTestCase(unittest.TestCase):
product, = self.product.create([{
'template': template.id,
}])
- company, = self.company.search([('rec_name', '=', 'B2CK')])
+ company, = self.company.search([
+ ('rec_name', '=', 'Dunder Mifflin'),
+ ])
self.user.write([self.user(USER)], {
'main_company': company.id,
'company': company.id,
@@ -137,16 +119,6 @@ class StockSupplyTestCase(unittest.TestCase):
return product_supplier
-def doctest_dropdb(test):
- database = SQLiteDatabase().connect()
- cursor = database.cursor(autocommit=True)
- try:
- database.drop(cursor, ':memory:')
- cursor.commit()
- finally:
- cursor.close()
-
-
def suite():
suite = trytond.tests.test_tryton.suite()
from trytond.modules.company.tests import test_company
@@ -163,6 +135,3 @@ def suite():
setUp=doctest_dropdb, tearDown=doctest_dropdb, encoding='utf-8',
optionflags=doctest.REPORT_ONLY_FIRST_FAILURE))
return suite
-
-if __name__ == '__main__':
- unittest.TextTestRunner(verbosity=2).run(suite())
diff --git a/tryton.cfg b/tryton.cfg
index d13f669..d0b4451 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.0.1
+version=3.2.0
depends:
account
ir
diff --git a/trytond_stock_supply.egg-info/PKG-INFO b/trytond_stock_supply.egg-info/PKG-INFO
index 51f5cf2..dc47b29 100644
--- a/trytond_stock_supply.egg-info/PKG-INFO
+++ b/trytond_stock_supply.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond-stock-supply
-Version: 3.0.1
+Version: 3.2.0
Summary: Tryton module for stock supply
Home-page: http://www.tryton.org/
Author: Tryton
-Author-email: UNKNOWN
+Author-email: issue_tracker at tryton.org
License: GPL-3
-Download-URL: http://downloads.tryton.org/3.0/
+Download-URL: http://downloads.tryton.org/3.2/
Description: trytond_stock_supply
====================
@@ -43,6 +43,7 @@ Description: trytond_stock_supply
http://www.tryton.org/
+Keywords: tryton stock supply
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
Classifier: Environment :: Plugins
@@ -63,6 +64,5 @@ Classifier: Natural Language :: Russian
Classifier: Natural Language :: Slovenian
Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python :: 2.6
Classifier: Programming Language :: Python :: 2.7
Classifier: Topic :: Office/Business
diff --git a/trytond_stock_supply.egg-info/requires.txt b/trytond_stock_supply.egg-info/requires.txt
index 32963a6..f521c1a 100644
--- a/trytond_stock_supply.egg-info/requires.txt
+++ b/trytond_stock_supply.egg-info/requires.txt
@@ -1,7 +1,7 @@
python-sql
-trytond_account >= 3.0, < 3.1
-trytond_party >= 3.0, < 3.1
-trytond_product >= 3.0, < 3.1
-trytond_purchase >= 3.0, < 3.1
-trytond_stock >= 3.0, < 3.1
-trytond >= 3.0, < 3.1
\ No newline at end of file
+trytond_account >= 3.2, < 3.3
+trytond_party >= 3.2, < 3.3
+trytond_product >= 3.2, < 3.3
+trytond_purchase >= 3.2, < 3.3
+trytond_stock >= 3.2, < 3.3
+trytond >= 3.2, < 3.3
\ No newline at end of file
diff --git a/view/purchase_request_create_start_form.xml b/view/purchase_request_create_start_form.xml
index 9c7d3cc..0a4dc1e 100644
--- a/view/purchase_request_create_start_form.xml
+++ b/view/purchase_request_create_start_form.xml
@@ -1,8 +1,8 @@
<?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. -->
-<form string="Create Purchase Request" col="2">
+<form string="Create Purchase Requests" col="2">
<image name="tryton-dialog-information" xexpand="0" xfill="0"/>
- <label string="Create Purchase Request?" id="create"
+ <label string="Create Purchase Requests?" id="create"
yalign="0.0" xalign="0.0" xexpand="1"/>
</form>
--
tryton-modules-stock-supply
More information about the tryton-debian-vcs
mailing list