[tryton-debian-vcs] tryton-modules-sale-supply-drop-shipment branch upstream updated. upstream/2.8.1-1-g412b7ee
git repository hosting
tryton-debian-vcs at m9s.biz
Mon Nov 25 19:37:36 UTC 2013
The following commit has been merged in the upstream branch:
http://debian.tryton.org/gitweb/?p=packages/tryton-modules-sale-supply-drop-shipment.git;a=commitdiff;h=upstream/2.8.1-1-g412b7ee
commit 412b7ee9f1209250a3d399f7a20133d3779c70fc
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Nov 24 17:28:18 2013 +0100
Adding upstream version 3.0.0.
diff --git a/CHANGELOG b/CHANGELOG
index 0f71d0d..cd2dc58 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,4 @@
-Version 2.8.1 - 2013-07-22
+Version 3.0.0 - 2013-10-21
* Bug fixes (see mercurial logs for details)
Version 2.8.0 - 2013-04-22
diff --git a/PKG-INFO b/PKG-INFO
index 68569c9..9c7dadf 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_sale_supply_drop_shipment
-Version: 2.8.1
+Version: 3.0.0
Summary: Tryton module for sale supply drop shipment
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: sale_supply_drop_shipment
=========================
@@ -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/de_DE.po b/locale/de_DE.po
index 9ea56fb..168370c 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -96,7 +96,7 @@ msgstr "Name"
msgctxt "field:stock.shipment.drop,reference:"
msgid "Reference"
-msgstr "Verweis"
+msgstr "Beleg"
msgctxt "field:stock.shipment.drop,state:"
msgid "State"
diff --git a/locale/es_AR.po b/locale/es_AR.po
index 066d00a..6faf354 100644
--- a/locale/es_AR.po
+++ b/locale/es_AR.po
@@ -12,7 +12,7 @@ msgstr ""
msgctxt "field:purchase.product_supplier,drop_shipment:"
msgid "Drop Shipment"
-msgstr "Envío directo"
+msgstr "Remito directo"
msgctxt "field:purchase.purchase,customer:"
msgid "Customer"
@@ -24,7 +24,7 @@ msgstr "Dirección envío"
msgctxt "field:purchase.purchase,drop_shipments:"
msgid "Drop Shipments"
-msgstr "Envíos directos"
+msgstr "Remitos directos"
msgctxt "field:purchase.request,customer:"
msgid "Customer"
@@ -36,11 +36,11 @@ msgstr "Dirección envío"
msgctxt "field:sale.sale,drop_shipments:"
msgid "Drop Shipments"
-msgstr "Envíos directos"
+msgstr "Remitos directos"
msgctxt "field:stock.configuration,shipment_drop_sequence:"
msgid "Drop Shipment Sequence"
-msgstr "Secuencia de envío directo"
+msgstr "Secuencia de Remito directo"
msgctxt "field:stock.move,customer_drop:"
msgid "Drop Customer"
@@ -116,15 +116,15 @@ msgstr "Usuario modificación"
msgctxt "model:ir.action,name:act_purchase_drop_shipment_form"
msgid "Drop Shipments"
-msgstr "Envíos directos"
+msgstr "Remitos directos"
msgctxt "model:ir.action,name:act_sale_drop_shipment_form"
msgid "Drop Shipments"
-msgstr "Envíos directos"
+msgstr "Remitos directos"
msgctxt "model:ir.action,name:act_shipment_drop_form"
msgid "Drop Shipments"
-msgstr "Envíos directos"
+msgstr "Remitos directos"
msgctxt ""
"model:ir.action.act_window.domain,name:act_shipment_drop_form_domain_all"
@@ -143,19 +143,19 @@ msgstr "En espera"
msgctxt "model:ir.sequence,name:sequence_shipment_drop"
msgid "Drop Shipment"
-msgstr "Envío directo"
+msgstr "Remito directo"
msgctxt "model:ir.sequence.type,name:sequence_type_shipment_drop"
msgid "Drop Shipment"
-msgstr "Envío directo"
+msgstr "Remito directo"
msgctxt "model:ir.ui.menu,name:menu_shipment_drop_form"
msgid "Drop Shipments"
-msgstr "Envíos directos"
+msgstr "Remitos directos"
msgctxt "model:stock.shipment.drop,name:"
msgid "Drop Shipment"
-msgstr "Envío directo"
+msgstr "Remito directo"
msgctxt "selection:stock.shipment.drop,state:"
msgid "Canceled"
@@ -187,11 +187,11 @@ msgstr "Borrador"
msgctxt "view:stock.shipment.drop:"
msgid "Drop Shipment"
-msgstr "Envío directo"
+msgstr "Remito directo"
msgctxt "view:stock.shipment.drop:"
msgid "Drop Shipments"
-msgstr "Envíos directos"
+msgstr "Remitos directos"
msgctxt "view:stock.shipment.drop:"
msgid "Wait"
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
index d41598d..88035c5 100644
--- a/locale/fr_FR.po
+++ b/locale/fr_FR.po
@@ -40,7 +40,7 @@ msgstr "Drop shipments"
msgctxt "field:stock.configuration,shipment_drop_sequence:"
msgid "Drop Shipment Sequence"
-msgstr "Séquence drop shipments"
+msgstr "Séquence de drop shipment"
msgctxt "field:stock.move,customer_drop:"
msgid "Drop Customer"
@@ -163,7 +163,7 @@ msgstr "Annulée"
msgctxt "selection:stock.shipment.drop,state:"
msgid "Done"
-msgstr "Terminée"
+msgstr "Fait"
msgctxt "selection:stock.shipment.drop,state:"
msgid "Draft"
@@ -175,11 +175,11 @@ msgstr "En attente"
msgctxt "view:stock.shipment.drop:"
msgid "Cancel"
-msgstr "Annulée"
+msgstr "Annuler"
msgctxt "view:stock.shipment.drop:"
msgid "Done"
-msgstr "Terminée"
+msgstr "Fait"
msgctxt "view:stock.shipment.drop:"
msgid "Draft"
@@ -195,7 +195,7 @@ msgstr "Expéditions drop shipping"
msgctxt "view:stock.shipment.drop:"
msgid "Wait"
-msgstr "En attente"
+msgstr "Attendre"
msgctxt "wizard_button:purchase.request.create_purchase,ask_party,end:"
msgid "Cancel"
diff --git a/locale/de_DE.po b/locale/sl_SI.po
similarity index 68%
copy from locale/de_DE.po
copy to locale/sl_SI.po
index 9ea56fb..06eb1c3 100644
--- a/locale/de_DE.po
+++ b/locale/sl_SI.po
@@ -7,76 +7,76 @@ msgid ""
"You cannot reset to draft move \"%s\" which was generated by a sale or a "
"purchase."
msgstr ""
-"Bewegung \"%s\" kann nicht auf Status \"Entwurf\" gesetzt werden, weil sie "
-"durch einen Einkauf oder Verkauf erzeugt wurde."
+"Prometa \"%s\" v stanju osnutka, ki je bil izdelan ob prodaji ali nabavi, ni"
+" možno ponastaviti."
msgctxt "field:purchase.product_supplier,drop_shipment:"
msgid "Drop Shipment"
-msgstr "Direktlieferung"
+msgstr "Dostava"
msgctxt "field:purchase.purchase,customer:"
msgid "Customer"
-msgstr "Kunde"
+msgstr "Kupec"
msgctxt "field:purchase.purchase,delivery_address:"
msgid "Delivery Address"
-msgstr "Lieferadresse"
+msgstr "Prejemnik"
msgctxt "field:purchase.purchase,drop_shipments:"
msgid "Drop Shipments"
-msgstr "Direktlieferungen"
+msgstr "Dostave"
msgctxt "field:purchase.request,customer:"
msgid "Customer"
-msgstr "Kunde"
+msgstr "Kupec"
msgctxt "field:purchase.request,delivery_address:"
msgid "Delivery Address"
-msgstr "Lieferadresse"
+msgstr "Prejemnik"
msgctxt "field:sale.sale,drop_shipments:"
msgid "Drop Shipments"
-msgstr "Direktlieferungen"
+msgstr "Dostave"
msgctxt "field:stock.configuration,shipment_drop_sequence:"
msgid "Drop Shipment Sequence"
-msgstr "Nummernkreis Direktlieferung"
+msgstr "Štetje dostav"
msgctxt "field:stock.move,customer_drop:"
msgid "Drop Customer"
-msgstr "Direktkunde"
+msgstr "Dostava kupcu"
msgctxt "field:stock.shipment.drop,code:"
msgid "Code"
-msgstr "Code"
+msgstr "Šifra"
msgctxt "field:stock.shipment.drop,company:"
msgid "Company"
-msgstr "Unternehmen"
+msgstr "Podjetje"
msgctxt "field:stock.shipment.drop,contact_address:"
msgid "Contact Address"
-msgstr "Kontaktadresse"
+msgstr "Kontakt"
msgctxt "field:stock.shipment.drop,create_date:"
msgid "Create Date"
-msgstr "Erstellungsdatum"
+msgstr "Ustvarjeno"
msgctxt "field:stock.shipment.drop,create_uid:"
msgid "Create User"
-msgstr "Erstellt durch"
+msgstr "Ustvaril"
msgctxt "field:stock.shipment.drop,customer:"
msgid "Customer"
-msgstr "Kunde"
+msgstr "Kupec"
msgctxt "field:stock.shipment.drop,delivery_address:"
msgid "Delivery Address"
-msgstr "Lieferadresse"
+msgstr "Prejemnik"
msgctxt "field:stock.shipment.drop,effective_date:"
msgid "Effective Date"
-msgstr "Effektives Datum"
+msgstr "Dejanski datum"
msgctxt "field:stock.shipment.drop,id:"
msgid "ID"
@@ -84,131 +84,115 @@ msgstr "ID"
msgctxt "field:stock.shipment.drop,moves:"
msgid "Moves"
-msgstr "Lagerbewegungen"
+msgstr "Promet"
msgctxt "field:stock.shipment.drop,planned_date:"
msgid "Planned Date"
-msgstr "Geplantes Datum"
+msgstr "Načrtovan datum"
msgctxt "field:stock.shipment.drop,rec_name:"
msgid "Name"
-msgstr "Name"
+msgstr "Ime"
msgctxt "field:stock.shipment.drop,reference:"
msgid "Reference"
-msgstr "Verweis"
+msgstr "Sklic"
msgctxt "field:stock.shipment.drop,state:"
msgid "State"
-msgstr "Status"
+msgstr "Stanje"
msgctxt "field:stock.shipment.drop,supplier:"
msgid "Supplier"
-msgstr "Lieferant"
+msgstr "Dobavitelj"
msgctxt "field:stock.shipment.drop,write_date:"
msgid "Write Date"
-msgstr "Zuletzt geändert"
+msgstr "Zapisano"
msgctxt "field:stock.shipment.drop,write_uid:"
msgid "Write User"
-msgstr "Letzte Änderung durch"
+msgstr "Zapisal"
msgctxt "model:ir.action,name:act_purchase_drop_shipment_form"
msgid "Drop Shipments"
-msgstr "Direktlieferungen"
+msgstr "Dostave"
msgctxt "model:ir.action,name:act_sale_drop_shipment_form"
msgid "Drop Shipments"
-msgstr "Direktlieferungen"
+msgstr "Dostave"
msgctxt "model:ir.action,name:act_shipment_drop_form"
msgid "Drop Shipments"
-msgstr "Direktlieferungen"
+msgstr "Dostave"
msgctxt ""
"model:ir.action.act_window.domain,name:act_shipment_drop_form_domain_all"
msgid "All"
-msgstr "Alle"
+msgstr "Vse"
msgctxt ""
"model:ir.action.act_window.domain,name:act_shipment_drop_form_domain_draft"
msgid "Draft"
-msgstr "Entwurf"
+msgstr "Osnutki"
msgctxt ""
"model:ir.action.act_window.domain,name:act_shipment_drop_form_domain_waiting"
msgid "Waiting"
-msgstr "Wartend"
+msgstr "Čakajoče"
msgctxt "model:ir.sequence,name:sequence_shipment_drop"
msgid "Drop Shipment"
-msgstr "Direktlieferung"
+msgstr "Dostava"
msgctxt "model:ir.sequence.type,name:sequence_type_shipment_drop"
msgid "Drop Shipment"
-msgstr "Direktlieferung"
+msgstr "Dostava"
msgctxt "model:ir.ui.menu,name:menu_shipment_drop_form"
msgid "Drop Shipments"
-msgstr "Direktlieferungen"
+msgstr "Dostave"
msgctxt "model:stock.shipment.drop,name:"
msgid "Drop Shipment"
-msgstr "Direktlieferung"
+msgstr "Dostava"
msgctxt "selection:stock.shipment.drop,state:"
msgid "Canceled"
-msgstr "Annulliert"
+msgstr "Preklicano"
msgctxt "selection:stock.shipment.drop,state:"
msgid "Done"
-msgstr "Erledigt"
+msgstr "Zaključeno"
msgctxt "selection:stock.shipment.drop,state:"
msgid "Draft"
-msgstr "Entwurf"
+msgstr "Osnutek"
msgctxt "selection:stock.shipment.drop,state:"
msgid "Waiting"
-msgstr "Wartend"
+msgstr "Čakajoče"
msgctxt "view:stock.shipment.drop:"
msgid "Cancel"
-msgstr "Abbrechen"
+msgstr "Preklic"
msgctxt "view:stock.shipment.drop:"
msgid "Done"
-msgstr "Erledigt"
+msgstr "Zaključeno"
msgctxt "view:stock.shipment.drop:"
msgid "Draft"
-msgstr "Entwurf"
+msgstr "Osnutek"
msgctxt "view:stock.shipment.drop:"
msgid "Drop Shipment"
-msgstr "Direktlieferung"
+msgstr "Dostava"
msgctxt "view:stock.shipment.drop:"
msgid "Drop Shipments"
-msgstr "Direktlieferungen"
+msgstr "Dostave"
msgctxt "view:stock.shipment.drop:"
msgid "Wait"
-msgstr "Warten"
-
-msgctxt "wizard_button:purchase.request.create_purchase,ask_party,end:"
-msgid "Cancel"
-msgstr "Abbrechen"
-
-msgctxt "wizard_button:purchase.request.create_purchase,ask_party,start:"
-msgid "Continue"
-msgstr "Fortfahren"
-
-msgctxt "wizard_button:purchase.request.create_purchase,ask_term,end:"
-msgid "Cancel"
-msgstr "Abbrechen"
-
-msgctxt "wizard_button:purchase.request.create_purchase,ask_term,start:"
-msgid "Continue"
-msgstr "Fortfahren"
+msgstr "Čakanje"
diff --git a/setup.py b/setup.py
index 848b856..6c6c63c 100644
--- a/setup.py
+++ b/setup.py
@@ -63,6 +63,7 @@ setup(name='trytond_sale_supply_drop_shipment',
'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/stock.py b/stock.py
index f504f9e..a990d12 100644
--- a/stock.py
+++ b/stock.py
@@ -16,7 +16,7 @@ class Configuration:
shipment_drop_sequence = fields.Property(fields.Many2One('ir.sequence',
'Drop Shipment Sequence', domain=[
('company', 'in',
- [Eval('context', {}).get('company'), False]),
+ [Eval('context', {}).get('company', -1), None]),
('code', '=', 'stock.shipment.drop'),
], required=True))
@@ -35,7 +35,7 @@ class ShipmentDrop(Workflow, ModelSQL, ModelView):
},
domain=[
('id', If(Eval('context', {}).contains('company'), '=', '!='),
- Eval('context', {}).get('company', 0)),
+ Eval('context', {}).get('company', -1)),
],
depends=['state'])
reference = fields.Char('Reference', select=1,
diff --git a/tests/__init__.py b/tests/__init__.py
index 9e0edfb..9a296fb 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_sale_supply_drop_shipment import suite
+
+__all__ = ['suite']
diff --git a/tests/scenario_sale_supply_drop_shipment.rst b/tests/scenario_sale_supply_drop_shipment.rst
index bf9696a..8bd73e6 100644
--- a/tests/scenario_sale_supply_drop_shipment.rst
+++ b/tests/scenario_sale_supply_drop_shipment.rst
@@ -123,7 +123,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 60b02d8..15e8bde 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=2.8.1
+version=3.0.0
depends:
company
ir
diff --git a/trytond_sale_supply_drop_shipment.egg-info/PKG-INFO b/trytond_sale_supply_drop_shipment.egg-info/PKG-INFO
index 90428df..d7fb817 100644
--- a/trytond_sale_supply_drop_shipment.egg-info/PKG-INFO
+++ b/trytond_sale_supply_drop_shipment.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond-sale-supply-drop-shipment
-Version: 2.8.1
+Version: 3.0.0
Summary: Tryton module for sale supply drop shipment
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: sale_supply_drop_shipment
=========================
@@ -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_sale_supply_drop_shipment.egg-info/SOURCES.txt b/trytond_sale_supply_drop_shipment.egg-info/SOURCES.txt
index 8925865..972377a 100644
--- a/trytond_sale_supply_drop_shipment.egg-info/SOURCES.txt
+++ b/trytond_sale_supply_drop_shipment.egg-info/SOURCES.txt
@@ -21,6 +21,7 @@ locale/de_DE.po
locale/es_AR.po
locale/es_ES.po
locale/fr_FR.po
+locale/sl_SI.po
tests/scenario_sale_supply_drop_shipment.rst
trytond_sale_supply_drop_shipment.egg-info/PKG-INFO
trytond_sale_supply_drop_shipment.egg-info/SOURCES.txt
diff --git a/trytond_sale_supply_drop_shipment.egg-info/requires.txt b/trytond_sale_supply_drop_shipment.egg-info/requires.txt
index 007cb27..5d631f7 100644
--- a/trytond_sale_supply_drop_shipment.egg-info/requires.txt
+++ b/trytond_sale_supply_drop_shipment.egg-info/requires.txt
@@ -1,6 +1,6 @@
-trytond_company >= 2.8, < 2.9
-trytond_purchase >= 2.8, < 2.9
-trytond_sale >= 2.8, < 2.9
-trytond_sale_supply >= 2.8, < 2.9
-trytond_stock >= 2.8, < 2.9
-trytond >= 2.8, < 2.9
\ No newline at end of file
+trytond_company >= 3.0, < 3.1
+trytond_purchase >= 3.0, < 3.1
+trytond_sale >= 3.0, < 3.1
+trytond_sale_supply >= 3.0, < 3.1
+trytond_stock >= 3.0, < 3.1
+trytond >= 3.0, < 3.1
\ No newline at end of file
diff --git a/view/shipment_drop_tree.xml b/view/shipment_drop_tree.xml
index 22c7ed6..f79dcc1 100644
--- a/view/shipment_drop_tree.xml
+++ b/view/shipment_drop_tree.xml
@@ -11,5 +11,4 @@ this repository contains the full copyright notices and license terms. -->
<field name="customer"/>
<field name="delivery_address"/>
<field name="state"/>
- <field name="create_date" tree_invisible="1"/>
</tree>
--
tryton-modules-sale-supply-drop-shipment
More information about the tryton-debian-vcs
mailing list