[tryton-debian-vcs] tryton-modules-company branch upstream updated. upstream/2.8.0-1-g8586577
git repository hosting
tryton-debian-vcs at m9s.biz
Mon Nov 25 19:34:02 UTC 2013
The following commit has been merged in the upstream branch:
http://debian.tryton.org/gitweb/?p=packages/tryton-modules-company.git;a=commitdiff;h=upstream/2.8.0-1-g8586577
commit 858657792d6929d2ae8010f50b8ef1dad710032f
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Nov 24 17:26:54 2013 +0100
Adding upstream version 3.0.0.
diff --git a/CHANGELOG b/CHANGELOG
index e360a9f..b97ad05 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 c2b7795..0ec3ec4 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_company
-Version: 2.8.0
+Version: 3.0.0
Summary: Tryton module with companies and employees
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_company
===============
@@ -60,6 +60,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/company.py b/company.py
index 0a786be..a39897a 100644
--- a/company.py
+++ b/company.py
@@ -229,7 +229,7 @@ class Property:
company = fields.Many2One('company.company', 'Company',
domain=[
('id', If(Eval('context', {}).contains('company'), '=', '!='),
- Eval('context', {}).get('company', 0)),
+ Eval('context', {}).get('company', -1)),
])
@classmethod
@@ -246,11 +246,11 @@ class Property:
@classmethod
def search(cls, domain, offset=0, limit=None, order=None, count=False,
- query_string=False):
+ query=False):
if Transaction().user == 0 and not 'user' in Transaction().context:
domain = ['AND', domain[:], ('company', '=', None)]
return super(Property, cls).search(domain, offset=offset, limit=limit,
- order=order, count=count, query_string=query_string)
+ order=order, count=count, query=query)
class Sequence:
@@ -258,7 +258,7 @@ class Sequence:
company = fields.Many2One('company.company', 'Company',
domain=[
('id', If(Eval('context', {}).contains('company'), '=', '!='),
- Eval('context', {}).get('company', 0)),
+ Eval('context', {}).get('company', -1)),
])
@classmethod
diff --git a/company.xml b/company.xml
index 3c10eef..6bea031 100644
--- a/company.xml
+++ b/company.xml
@@ -24,7 +24,7 @@ this repository contains the full copyright notices and license terms. -->
<record model="ir.action.act_window" id="act_company_tree">
<field name="name">Companies</field>
<field name="res_model">company.company</field>
- <field name="domain">[('parent', '=', False)]</field>
+ <field name="domain">[('parent', '=', None)]</field>
</record>
<record model="ir.action.act_window.view"
id="act_company_tree_view1">
diff --git a/letter.odt b/letter.odt
index 9b38d1c..17ce07d 100644
Binary files a/letter.odt and b/letter.odt differ
diff --git a/locale/ca_ES.po b/locale/ca_ES.po
index e99bc7c..c34f3c9 100644
--- a/locale/ca_ES.po
+++ b/locale/ca_ES.po
@@ -312,7 +312,7 @@ msgstr "Nombre CIF/NIF:"
msgctxt "view:company.company.config.start:"
msgid "Create Company"
-msgstr "Ara pot afegir la seva empresa en el sistema."
+msgstr "Ara podeu afegir la vostra empresa al sistema."
msgctxt "view:company.company.config.start:"
msgid "You can now add your company into the system."
diff --git a/locale/es_AR.po b/locale/es_AR.po
index d5f7914..70b00f2 100644
--- a/locale/es_AR.po
+++ b/locale/es_AR.po
@@ -16,7 +16,7 @@ msgstr "Usuario creación"
msgctxt "field:company.company,currency:"
msgid "Currency"
-msgstr "Divisa"
+msgstr "Moneda"
msgctxt "field:company.company,employees:"
msgid "Employees"
diff --git a/locale/es_ES.po b/locale/es_ES.po
index e8f5ae6..8134100 100644
--- a/locale/es_ES.po
+++ b/locale/es_ES.po
@@ -264,7 +264,7 @@ msgstr "Carta"
msgctxt "model:ir.cron-company.company,name:"
msgid "Cron - Company"
-msgstr "Cron - Empresa"
+msgstr "Planificador - Empresa"
msgctxt "model:ir.ui.menu,name:menu_company_list"
msgid "Companies"
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
index 2168565..0a3486b 100644
--- a/locale/fr_FR.po
+++ b/locale/fr_FR.po
@@ -251,14 +251,6 @@ msgid "Best Regards,"
msgstr "Bien cordialement,"
msgctxt "odt:party.letter:"
-msgid "Best Regards,"
-msgstr "Bien cordialement,"
-
-msgctxt "odt:party.letter:"
-msgid "Date:"
-msgstr "Date :"
-
-msgctxt "odt:party.letter:"
msgid "Date:"
msgstr "Date :"
@@ -267,22 +259,10 @@ msgid "Dear Madams and Sirs,"
msgstr "Chère madame, cher monsieur,"
msgctxt "odt:party.letter:"
-msgid "Dear Madams and Sirs,"
-msgstr "Chère madame, cher monsieur,"
-
-msgctxt "odt:party.letter:"
msgid "E-Mail:"
msgstr "E-Mail :"
msgctxt "odt:party.letter:"
-msgid "E-Mail:"
-msgstr "E-Mail :"
-
-msgctxt "odt:party.letter:"
-msgid "Phone:"
-msgstr "Téléphone"
-
-msgctxt "odt:party.letter:"
msgid "Phone:"
msgstr "Téléphone"
@@ -291,14 +271,6 @@ msgid "Subject:"
msgstr "Sujet :"
msgctxt "odt:party.letter:"
-msgid "Subject:"
-msgstr "Sujet :"
-
-msgctxt "odt:party.letter:"
-msgid "VAT Number:"
-msgstr "Numéro TVA :"
-
-msgctxt "odt:party.letter:"
msgid "VAT Number:"
msgstr "Numéro TVA :"
@@ -315,14 +287,6 @@ msgid "Companies"
msgstr "Sociétés"
msgctxt "view:company.company:"
-msgid "Companies"
-msgstr "Sociétés"
-
-msgctxt "view:company.company:"
-msgid "Company"
-msgstr "Société"
-
-msgctxt "view:company.company:"
msgid "Company"
msgstr "Société"
@@ -330,14 +294,6 @@ msgctxt "view:company.company:"
msgid "Reports"
msgstr "Rapports"
-msgctxt "view:company.company:"
-msgid "Reports"
-msgstr "Rapports"
-
-msgctxt "view:company.employee:"
-msgid "Employee"
-msgstr "Employé"
-
msgctxt "view:company.employee:"
msgid "Employee"
msgstr "Employé"
@@ -346,10 +302,6 @@ msgctxt "view:company.employee:"
msgid "Employees"
msgstr "Employés"
-msgctxt "view:company.employee:"
-msgid "Employees"
-msgstr "Employés"
-
msgctxt "wizard_button:company.company.config,company,add:"
msgid "Add"
msgstr "Ajouter"
diff --git a/locale/es_AR.po b/locale/sl_SI.po
similarity index 74%
copy from locale/es_AR.po
copy to locale/sl_SI.po
index d5f7914..2a18c36 100644
--- a/locale/es_AR.po
+++ b/locale/sl_SI.po
@@ -4,31 +4,31 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "field:company.company,childs:"
msgid "Children"
-msgstr "Hijos"
+msgstr "Hčerinska podjetja"
msgctxt "field:company.company,create_date:"
msgid "Create Date"
-msgstr "Fecha creación"
+msgstr "Ustvarjeno"
msgctxt "field:company.company,create_uid:"
msgid "Create User"
-msgstr "Usuario creación"
+msgstr "Ustvaril"
msgctxt "field:company.company,currency:"
msgid "Currency"
-msgstr "Divisa"
+msgstr "Valuta"
msgctxt "field:company.company,employees:"
msgid "Employees"
-msgstr "Empleados"
+msgstr "Zaposlenci"
msgctxt "field:company.company,footer:"
msgid "Footer"
-msgstr "Pie de página"
+msgstr "Noga"
msgctxt "field:company.company,header:"
msgid "Header"
-msgstr "Encabezado"
+msgstr "Glava"
msgctxt "field:company.company,id:"
msgid "ID"
@@ -36,23 +36,23 @@ msgstr "ID"
msgctxt "field:company.company,parent:"
msgid "Parent"
-msgstr "Padre"
+msgstr "Matično podjetje"
msgctxt "field:company.company,party:"
msgid "Party"
-msgstr "Entidad"
+msgstr "Stranka"
msgctxt "field:company.company,rec_name:"
msgid "Name"
-msgstr "Nombre"
+msgstr "Ime"
msgctxt "field:company.company,write_date:"
msgid "Write Date"
-msgstr "Fecha modificación"
+msgstr "Zapisano"
msgctxt "field:company.company,write_uid:"
msgid "Write User"
-msgstr "Usuario modificación"
+msgstr "Zapisal"
msgctxt "field:company.company.config.start,id:"
msgid "ID"
@@ -60,15 +60,15 @@ msgstr "ID"
msgctxt "field:company.employee,company:"
msgid "Company"
-msgstr "Empresa"
+msgstr "Podjetje"
msgctxt "field:company.employee,create_date:"
msgid "Create Date"
-msgstr "Fecha creación"
+msgstr "Ustvarjeno"
msgctxt "field:company.employee,create_uid:"
msgid "Create User"
-msgstr "Usuario creación"
+msgstr "Ustvaril"
msgctxt "field:company.employee,id:"
msgid "ID"
@@ -76,39 +76,39 @@ msgstr "ID"
msgctxt "field:company.employee,party:"
msgid "Party"
-msgstr "Entidad"
+msgstr "Stranka"
msgctxt "field:company.employee,rec_name:"
msgid "Name"
-msgstr "Nombre"
+msgstr "Ime"
msgctxt "field:company.employee,write_date:"
msgid "Write Date"
-msgstr "Fecha modificación"
+msgstr "Zapisano"
msgctxt "field:company.employee,write_uid:"
msgid "Write User"
-msgstr "Usuario modificación"
+msgstr "Zapisal"
msgctxt "field:ir.cron,companies:"
msgid "Companies"
-msgstr "Empresas"
+msgstr "Podjetja"
msgctxt "field:ir.cron-company.company,company:"
msgid "Company"
-msgstr "Empresa"
+msgstr "Podjetje"
msgctxt "field:ir.cron-company.company,create_date:"
msgid "Create Date"
-msgstr "Fecha creación"
+msgstr "Ustvarjeno"
msgctxt "field:ir.cron-company.company,create_uid:"
msgid "Create User"
-msgstr "Usuario creación"
+msgstr "Ustvaril"
msgctxt "field:ir.cron-company.company,cron:"
msgid "Cron"
-msgstr "Programador de tareas"
+msgstr "Razporejevalnik"
msgctxt "field:ir.cron-company.company,id:"
msgid "ID"
@@ -116,59 +116,59 @@ msgstr "ID"
msgctxt "field:ir.cron-company.company,rec_name:"
msgid "Name"
-msgstr "Nombre"
+msgstr "Ime"
msgctxt "field:ir.cron-company.company,write_date:"
msgid "Write Date"
-msgstr "Fecha modificación"
+msgstr "Zapisano"
msgctxt "field:ir.cron-company.company,write_uid:"
msgid "Write User"
-msgstr "Usuario modificación"
+msgstr "Zapisal"
msgctxt "field:ir.property,company:"
msgid "Company"
-msgstr "Empresa"
+msgstr "Podjetje"
msgctxt "field:ir.sequence,company:"
msgid "Company"
-msgstr "Empresa"
+msgstr "Podjetje"
msgctxt "field:ir.sequence.strict,company:"
msgid "Company"
-msgstr "Empresa"
+msgstr "Podjetje"
msgctxt "field:res.user,companies:"
msgid "Current Companies"
-msgstr "Empresas actuales"
+msgstr "Trenutna podjetja"
msgctxt "field:res.user,company:"
msgid "Current Company"
-msgstr "Empresa actual"
+msgstr "Trenutno podjetje"
msgctxt "field:res.user,employee:"
msgid "Current Employee"
-msgstr "Empleado actual"
+msgstr "Zaposlenec"
msgctxt "field:res.user,employees:"
msgid "Employees"
-msgstr "Empleados"
+msgstr "Zaposlenci"
msgctxt "field:res.user,main_company:"
msgid "Main Company"
-msgstr "Empresa principal"
+msgstr "Glavno podjetje"
msgctxt "field:res.user-company.employee,create_date:"
msgid "Create Date"
-msgstr "Fecha creación"
+msgstr "Ustvarjeno"
msgctxt "field:res.user-company.employee,create_uid:"
msgid "Create User"
-msgstr "Usuario creación"
+msgstr "Ustvaril"
msgctxt "field:res.user-company.employee,employee:"
msgid "Employee"
-msgstr "Empleado"
+msgstr "Zaposlenec"
msgctxt "field:res.user-company.employee,id:"
msgid "ID"
@@ -176,144 +176,144 @@ msgstr "ID"
msgctxt "field:res.user-company.employee,rec_name:"
msgid "Name"
-msgstr "Nombre campo"
+msgstr "Ime"
msgctxt "field:res.user-company.employee,user:"
msgid "User"
-msgstr "Usuario"
+msgstr "Uporabnik"
msgctxt "field:res.user-company.employee,write_date:"
msgid "Write Date"
-msgstr "Fecha modificación"
+msgstr "Zapisano"
msgctxt "field:res.user-company.employee,write_uid:"
msgid "Write User"
-msgstr "Usuario modificación"
+msgstr "Zapisal"
msgctxt "help:ir.cron,companies:"
msgid "Companies registered for this cron"
-msgstr "Empresas registradas en este programador de tareas"
+msgstr "Podjetja, registrirana na ta razporejevalnik"
msgctxt "model:company.company,name:"
msgid "Company"
-msgstr "Empresa"
+msgstr "Podjetje"
msgctxt "model:company.company.config.start,name:"
msgid "Company Config"
-msgstr "Configuración de empresa"
+msgstr "Konfiguracija podjetja"
msgctxt "model:company.employee,name:"
msgid "Employee"
-msgstr "Empleado"
+msgstr "Zaposlenec"
msgctxt "model:ir.action,name:act_company_config"
msgid "Configure Company"
-msgstr "Configure su empresa"
+msgstr "Konfiguracija podjetja"
msgctxt "model:ir.action,name:act_company_list"
msgid "Companies"
-msgstr "Empresas"
+msgstr "Podjetja"
msgctxt "model:ir.action,name:act_company_tree"
msgid "Companies"
-msgstr "Empresas"
+msgstr "Podjetja"
msgctxt "model:ir.action,name:act_employee_form"
msgid "Employees"
-msgstr "Empleados"
+msgstr "Zaposlenci"
msgctxt "model:ir.action,name:report_letter"
msgid "Letter"
-msgstr "Carta"
+msgstr "Pismo"
msgctxt "model:ir.cron-company.company,name:"
msgid "Cron - Company"
-msgstr "Programador de tareas - Empresa"
+msgstr "Razporejevalnik - Podjetje"
msgctxt "model:ir.ui.menu,name:menu_company_list"
msgid "Companies"
-msgstr "Empresas"
+msgstr "Podjetja"
msgctxt "model:ir.ui.menu,name:menu_company_tree"
msgid "Companies"
-msgstr "Empresas"
+msgstr "Podjetja"
msgctxt "model:ir.ui.menu,name:menu_employee_form"
msgid "Employees"
-msgstr "Empleados"
+msgstr "Zaposlenci"
msgctxt "model:res.user-company.employee,name:"
msgid "User - Employee"
-msgstr "Usuario - Empleado"
+msgstr "Uporabnik - Zaposlenec"
msgctxt "odt:party.letter:"
msgid "Best Regards,"
-msgstr "Atentamente,"
+msgstr "S spoštovanjem,"
msgctxt "odt:party.letter:"
msgid "Date:"
-msgstr "Fecha:"
+msgstr "Datum:"
msgctxt "odt:party.letter:"
msgid "Dear Madams and Sirs,"
-msgstr "Estimados señores y señoras,"
+msgstr "Spoštovani gospa in gospod,"
msgctxt "odt:party.letter:"
msgid "E-Mail:"
-msgstr "Correo electrónico:"
+msgstr "E-pošta:"
msgctxt "odt:party.letter:"
msgid "Phone:"
-msgstr "Teléfono:"
+msgstr "Telefon:"
msgctxt "odt:party.letter:"
msgid "Subject:"
-msgstr "Asunto:"
+msgstr "Zadeva:"
msgctxt "odt:party.letter:"
msgid "VAT Number:"
-msgstr "CUIT:"
+msgstr "DDV številka:"
msgctxt "view:company.company.config.start:"
msgid "Create Company"
-msgstr "Crear empresa"
+msgstr "Ustvari podjetje"
msgctxt "view:company.company.config.start:"
msgid "You can now add your company into the system."
-msgstr "Ahora puede añadir su empresa al sistema."
+msgstr "Zdaj je možno v sistem dodati podjetje."
msgctxt "view:company.company:"
msgid "Companies"
-msgstr "Empresas"
+msgstr "Podjetja"
msgctxt "view:company.company:"
msgid "Company"
-msgstr "Empresa"
+msgstr "Podjetje"
msgctxt "view:company.company:"
msgid "Reports"
-msgstr "Informes"
+msgstr "Poročila"
msgctxt "view:company.employee:"
msgid "Employee"
-msgstr "Empleado"
+msgstr "Zaposlenec"
msgctxt "view:company.employee:"
msgid "Employees"
-msgstr "Empleados"
+msgstr "Zaposlenci"
msgctxt "wizard_button:company.company.config,company,add:"
msgid "Add"
-msgstr "Añadir"
+msgstr "Dodaj"
msgctxt "wizard_button:company.company.config,company,end:"
msgid "Cancel"
-msgstr "Cancelar"
+msgstr "Prekliči"
msgctxt "wizard_button:company.company.config,start,company:"
msgid "Ok"
-msgstr "Aceptar"
+msgstr "V redu"
msgctxt "wizard_button:company.company.config,start,end:"
msgid "Cancel"
-msgstr "Cancelar"
+msgstr "Prekliči"
diff --git a/setup.py b/setup.py
index 4a6f57d..750b6fd 100644
--- a/setup.py
+++ b/setup.py
@@ -65,6 +65,7 @@ setup(name='trytond_company',
'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 7d06523..962622c 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_company import suite
+
+__all__ = ['suite']
diff --git a/tryton.cfg b/tryton.cfg
index 0c4e53d..12e126d 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=2.8.0
+version=3.0.0
depends:
currency
ir
diff --git a/trytond_company.egg-info/PKG-INFO b/trytond_company.egg-info/PKG-INFO
index 097d169..deec5e1 100644
--- a/trytond_company.egg-info/PKG-INFO
+++ b/trytond_company.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond-company
-Version: 2.8.0
+Version: 3.0.0
Summary: Tryton module with companies and employees
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_company
===============
@@ -60,6 +60,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_company.egg-info/SOURCES.txt b/trytond_company.egg-info/SOURCES.txt
index 9bf9841..3da5b64 100644
--- a/trytond_company.egg-info/SOURCES.txt
+++ b/trytond_company.egg-info/SOURCES.txt
@@ -27,6 +27,7 @@ locale/es_ES.po
locale/fr_FR.po
locale/nl_NL.po
locale/ru_RU.po
+locale/sl_SI.po
trytond_company.egg-info/PKG-INFO
trytond_company.egg-info/SOURCES.txt
trytond_company.egg-info/dependency_links.txt
diff --git a/trytond_company.egg-info/requires.txt b/trytond_company.egg-info/requires.txt
index 161432c..a342ffb 100644
--- a/trytond_company.egg-info/requires.txt
+++ b/trytond_company.egg-info/requires.txt
@@ -1,3 +1,3 @@
-trytond_currency >= 2.8, < 2.9
-trytond_party >= 2.8, < 2.9
-trytond >= 2.8, < 2.9
\ No newline at end of file
+trytond_currency >= 3.0, < 3.1
+trytond_party >= 3.0, < 3.1
+trytond >= 3.0, < 3.1
\ No newline at end of file
--
tryton-modules-company
More information about the tryton-debian-vcs
mailing list