[tryton-debian-vcs] tryton-modules-company branch debian updated. debian/3.2.0-1-5-g4b5192f
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Thu Oct 23 12:15:34 UTC 2014
The following commit has been merged in the debian branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-company.git;a=commitdiff;h=debian/3.2.0-1-5-g4b5192f
commit 4b5192fb3126785edeac00efc9d7332f171293d0
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Thu Oct 23 13:32:01 2014 +0200
Releasing debian version 3.4.0-1.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/debian/changelog b/debian/changelog
index d198eb5..4d96169 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+tryton-modules-company (3.4.0-1) unstable; urgency=medium
+
+ * Updating signing key while using now plain .asc files instead of .pgp
+ binaries.
+ * Adding actual upstream signing key.
+ * Updating to Standards-Version: 3.9.6, no changes needed.
+ * Merging upstream version 3.4.0.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Tue, 21 Oct 2014 20:24:02 +0200
+
tryton-modules-company (3.2.0-1) unstable; urgency=medium
* Removing LC_ALL=C.UTF-8 as build environment.
commit 3dc92a5499ed83aa7f9990ead999649bc534394e
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Oct 21 11:29:11 2014 +0200
Merging upstream version 3.4.0.
diff --git a/CHANGELOG b/CHANGELOG
index 783d149..e1bbccd 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)
* Read employee according to the context
diff --git a/PKG-INFO b/PKG-INFO
index 90fb81b..1edd91a 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_company
-Version: 3.2.0
+Version: 3.4.0
Summary: Tryton module with companies and employees
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_company
===============
diff --git a/company.py b/company.py
index 3456529..70eb2ca 100644
--- a/company.py
+++ b/company.py
@@ -7,6 +7,7 @@ from trytond.report import Report
from trytond.pyson import Eval, If
from trytond.transaction import Transaction
from trytond.pool import Pool, PoolMeta
+from trytond.backend.database import CursorInterface
try:
import pytz
@@ -15,6 +16,8 @@ except ImportError:
TIMEZONES = []
TIMEZONES += [(None, '')]
+CursorInterface.cache_keys.update({'company', 'employee'})
+
__all__ = ['Company', 'Employee', 'UserEmployee', 'User', 'Property',
'Sequence', 'SequenceStrict', 'Date', 'CompanyConfigStart',
'CompanyConfig', 'CompanyReport', 'LetterReport']
@@ -61,6 +64,10 @@ class Employee(ModelSQL, ModelView):
party = fields.Many2One('party.party', 'Party', required=True)
company = fields.Many2One('company.company', 'Company', required=True)
+ @staticmethod
+ def default_company():
+ return Transaction().context.get('company')
+
def get_rec_name(self, name):
return self.party.rec_name
diff --git a/locale/ca_ES.po b/locale/ca_ES.po
index 8da6277..32bbc5e 100644
--- a/locale/ca_ES.po
+++ b/locale/ca_ES.po
@@ -312,7 +312,7 @@ msgstr "Assumpte:"
msgctxt "odt:party.letter:"
msgid "VAT Number:"
-msgstr "Nombre CIF/NIF:"
+msgstr "CIF/NIF:"
msgctxt "view:company.company.config.start:"
msgid "Create Company"
diff --git a/locale/es_CO.po b/locale/es_CO.po
index 4d3cf82..7ed433c 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -46,7 +46,6 @@ msgctxt "field:company.company,rec_name:"
msgid "Name"
msgstr "Nombre"
-#, fuzzy
msgctxt "field:company.company,timezone:"
msgid "Timezone"
msgstr "Zona Horaria"
diff --git a/locale/es_CO.po b/locale/es_EC.po
similarity index 91%
copy from locale/es_CO.po
copy to locale/es_EC.po
index 4d3cf82..fd84baa 100644
--- a/locale/es_CO.po
+++ b/locale/es_EC.po
@@ -46,7 +46,6 @@ msgctxt "field:company.company,rec_name:"
msgid "Name"
msgstr "Nombre"
-#, fuzzy
msgctxt "field:company.company,timezone:"
msgid "Timezone"
msgstr "Zona Horaria"
@@ -65,7 +64,7 @@ msgstr "ID"
msgctxt "field:company.employee,company:"
msgid "Company"
-msgstr "Compañia"
+msgstr "Empresa"
msgctxt "field:company.employee,create_date:"
msgid "Create Date"
@@ -97,11 +96,11 @@ msgstr "Modificado por Usuario"
msgctxt "field:ir.cron,companies:"
msgid "Companies"
-msgstr "Compañias"
+msgstr "Empresas"
msgctxt "field:ir.cron-company.company,company:"
msgid "Company"
-msgstr "Compañia"
+msgstr "Empresa"
msgctxt "field:ir.cron-company.company,create_date:"
msgid "Create Date"
@@ -133,23 +132,23 @@ msgstr "Modificado por Usuario"
msgctxt "field:ir.property,company:"
msgid "Company"
-msgstr "Compañia"
+msgstr "Empresa"
msgctxt "field:ir.sequence,company:"
msgid "Company"
-msgstr "Compañia"
+msgstr "Empresa"
msgctxt "field:ir.sequence.strict,company:"
msgid "Company"
-msgstr "Compañia"
+msgstr "Empresa"
msgctxt "field:res.user,companies:"
msgid "Current Companies"
-msgstr "Compañias Actuales"
+msgstr "Empresas Actuales"
msgctxt "field:res.user,company:"
msgid "Current Company"
-msgstr "Compañia Actual"
+msgstr "Empresa Actual"
msgctxt "field:res.user,employee:"
msgid "Current Employee"
@@ -161,7 +160,7 @@ msgstr "Empleados"
msgctxt "field:res.user,main_company:"
msgid "Main Company"
-msgstr "Compañia principal"
+msgstr "Empresa Principal"
msgctxt "field:res.user-company.employee,create_date:"
msgid "Create Date"
@@ -197,15 +196,15 @@ msgstr "Modificado por Usuario"
msgctxt "help:ir.cron,companies:"
msgid "Companies registered for this cron"
-msgstr "compañias registradas en este programador de tareas"
+msgstr "Empresas registradas en este programador de tareas."
msgctxt "model:company.company,name:"
msgid "Company"
-msgstr "Compañia"
+msgstr "Empresa"
msgctxt "model:company.company.config.start,name:"
msgid "Company Config"
-msgstr "Configuración de Compañia"
+msgstr "Configuración de Empresa"
msgctxt "model:company.employee,name:"
msgid "Employee"
@@ -213,15 +212,15 @@ msgstr "Empleado"
msgctxt "model:ir.action,name:act_company_config"
msgid "Configure Company"
-msgstr "Configurar Compañia"
+msgstr "Configurar Empresa"
msgctxt "model:ir.action,name:act_company_list"
msgid "Companies"
-msgstr "Compañias"
+msgstr "Empresas"
msgctxt "model:ir.action,name:act_company_tree"
msgid "Companies"
-msgstr "Compañias"
+msgstr "Empresas"
msgctxt "model:ir.action,name:act_employee_form"
msgid "Employees"
@@ -233,15 +232,15 @@ msgstr "Carta"
msgctxt "model:ir.cron-company.company,name:"
msgid "Cron - Company"
-msgstr "Cron - Compañia"
+msgstr "Programador de tareas - Empresa"
msgctxt "model:ir.ui.menu,name:menu_company_list"
msgid "Companies"
-msgstr "Compañias"
+msgstr "Empresas"
msgctxt "model:ir.ui.menu,name:menu_company_tree"
msgid "Companies"
-msgstr "Compañias"
+msgstr "Empresas"
msgctxt "model:ir.ui.menu,name:menu_employee_form"
msgid "Employees"
@@ -277,23 +276,23 @@ msgstr "Asunto:"
msgctxt "odt:party.letter:"
msgid "VAT Number:"
-msgstr "NIT:"
+msgstr "Número de RUC:"
msgctxt "view:company.company.config.start:"
msgid "Create Company"
-msgstr "Crear Compañia"
+msgstr "Crear Empresa"
msgctxt "view:company.company.config.start:"
msgid "You can now add your company into the system."
-msgstr "Ahora puede añadir su compañia al sistema."
+msgstr "Ahora puede añadir su empresa al sistema."
msgctxt "view:company.company:"
msgid "Companies"
-msgstr "Compañias"
+msgstr "Empresas"
msgctxt "view:company.company:"
msgid "Company"
-msgstr "Compañia"
+msgstr "Empresa"
msgctxt "view:company.company:"
msgid "Reports"
diff --git a/locale/es_ES.po b/locale/es_ES.po
index 5b9e4f9..0cd245d 100644
--- a/locale/es_ES.po
+++ b/locale/es_ES.po
@@ -312,7 +312,7 @@ msgstr "Asunto:"
msgctxt "odt:party.letter:"
msgid "VAT Number:"
-msgstr "Número CIF/NIF:"
+msgstr "CIF/NIF:"
msgctxt "view:company.company.config.start:"
msgid "Create Company"
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
index e434bdc..bf9bdab 100644
--- a/locale/fr_FR.po
+++ b/locale/fr_FR.po
@@ -256,7 +256,7 @@ msgstr "Bien cordialement,"
msgctxt "odt:party.letter:"
msgid "Date:"
-msgstr "Date :"
+msgstr "Date :"
msgctxt "odt:party.letter:"
msgid "Dear Madams and Sirs,"
@@ -264,7 +264,7 @@ msgstr "Chère madame, cher monsieur,"
msgctxt "odt:party.letter:"
msgid "E-Mail:"
-msgstr "E-Mail :"
+msgstr "Email :"
msgctxt "odt:party.letter:"
msgid "Phone:"
@@ -272,11 +272,11 @@ msgstr "Téléphone"
msgctxt "odt:party.letter:"
msgid "Subject:"
-msgstr "Sujet :"
+msgstr "Sujet :"
msgctxt "odt:party.letter:"
msgid "VAT Number:"
-msgstr "Numéro TVA :"
+msgstr "Numéro TVA :"
msgctxt "view:company.company.config.start:"
msgid "Create Company"
diff --git a/locale/sl_SI.po b/locale/sl_SI.po
index 16fbf42..f1620e9 100644
--- a/locale/sl_SI.po
+++ b/locale/sl_SI.po
@@ -8,11 +8,11 @@ msgstr "Hčerinske družbe"
msgctxt "field:company.company,create_date:"
msgid "Create Date"
-msgstr "Ustvarjeno"
+msgstr "Izdelano"
msgctxt "field:company.company,create_uid:"
msgid "Create User"
-msgstr "Ustvaril"
+msgstr "Izdelal"
msgctxt "field:company.company,currency:"
msgid "Currency"
@@ -68,11 +68,11 @@ msgstr "Družba"
msgctxt "field:company.employee,create_date:"
msgid "Create Date"
-msgstr "Ustvarjeno"
+msgstr "Izdelano"
msgctxt "field:company.employee,create_uid:"
msgid "Create User"
-msgstr "Ustvaril"
+msgstr "Izdelal"
msgctxt "field:company.employee,id:"
msgid "ID"
@@ -104,11 +104,11 @@ msgstr "Družba"
msgctxt "field:ir.cron-company.company,create_date:"
msgid "Create Date"
-msgstr "Ustvarjeno"
+msgstr "Izdelano"
msgctxt "field:ir.cron-company.company,create_uid:"
msgid "Create User"
-msgstr "Ustvaril"
+msgstr "Izdelal"
msgctxt "field:ir.cron-company.company,cron:"
msgid "Cron"
@@ -164,11 +164,11 @@ msgstr "Glavno družba"
msgctxt "field:res.user-company.employee,create_date:"
msgid "Create Date"
-msgstr "Ustvarjeno"
+msgstr "Izdelano"
msgctxt "field:res.user-company.employee,create_uid:"
msgid "Create User"
-msgstr "Ustvaril"
+msgstr "Izdelal"
msgctxt "field:res.user-company.employee,employee:"
msgid "Employee"
diff --git a/tryton.cfg b/tryton.cfg
index b26414e..41eac7b 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.2.0
+version=3.4.0
depends:
currency
ir
diff --git a/trytond_company.egg-info/PKG-INFO b/trytond_company.egg-info/PKG-INFO
index 0a001cb..17fdb3e 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: 3.2.0
+Version: 3.4.0
Summary: Tryton module with companies and employees
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_company
===============
diff --git a/trytond_company.egg-info/SOURCES.txt b/trytond_company.egg-info/SOURCES.txt
index 3da5b64..6e2b129 100644
--- a/trytond_company.egg-info/SOURCES.txt
+++ b/trytond_company.egg-info/SOURCES.txt
@@ -12,10 +12,40 @@ setup.py
tryton.cfg
./__init__.py
./company.py
+./company.xml
./cron.py
+./cron.xml
+./header_A4.odt
+./letter.odt
./party.py
+./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/test_company.py
+./view/company_config_start_form.xml
+./view/company_form.xml
+./view/company_list.xml
+./view/company_tree.xml
+./view/cron_form.xml
+./view/employee_form.xml
+./view/employee_tree.xml
+./view/property_form.xml
+./view/property_tree.xml
+./view/sequence_form.xml
+./view/sequence_tree.xml
+./view/user_form.xml
+./view/user_form_preferences.xml
doc/index.rst
locale/bg_BG.po
locale/ca_ES.po
@@ -23,6 +53,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_company.egg-info/requires.txt b/trytond_company.egg-info/requires.txt
index b984ff7..716f86c 100644
--- a/trytond_company.egg-info/requires.txt
+++ b/trytond_company.egg-info/requires.txt
@@ -1,6 +1,6 @@
-trytond_currency >= 3.2, < 3.3
-trytond_party >= 3.2, < 3.3
-trytond >= 3.2, < 3.3
+trytond_currency >= 3.4, < 3.5
+trytond_party >= 3.4, < 3.5
+trytond >= 3.4, < 3.5
[timezone]
pytz
\ No newline at end of file
--
tryton-modules-company
More information about the tryton-debian-vcs
mailing list