[tryton-debian-vcs] tryton-modules-company branch debian updated. debian/4.2.0-1-2-g5e96f80
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Wed Jun 7 13:33:20 UTC 2017
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/4.2.0-1-2-g5e96f80
commit 5e96f80cca14253586d05eaae5c39fd35196ce88
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Jun 7 15:26:06 2017 +0200
Merging upstream version 4.4.0.
diff --git a/CHANGELOG b/CHANGELOG
index 4a7b56f..0eb6d80 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,7 @@
+Version 4.4.0 - 2017-05-01
+* Bug fixes (see mercurial logs for details)
+* Remove multi-company on Party sequence
+
Version 4.2.0 - 2016-11-28
* Bug fixes (see mercurial logs for details)
* Add start and end dates on employee
diff --git a/COPYRIGHT b/COPYRIGHT
index fcc5eeb..5af5413 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
-Copyright (C) 2008-2016 Cédric Krier.
+Copyright (C) 2008-2017 Cédric Krier.
Copyright (C) 2008-2013 Bertrand Chenal.
-Copyright (C) 2008-2016 B2CK SPRL.
+Copyright (C) 2008-2017 B2CK SPRL.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/PKG-INFO b/PKG-INFO
index 1de5f10..0cffeb6 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_company
-Version: 4.2.0
+Version: 4.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/4.2/
+Download-URL: http://downloads.tryton.org/4.4/
Description: trytond_company
===============
@@ -52,7 +52,7 @@ Classifier: Intended Audience :: Developers
Classifier: Intended Audience :: Financial and Insurance Industry
Classifier: Intended Audience :: Legal Industry
Classifier: Intended Audience :: Manufacturing
-Classifier: License :: OSI Approved :: GNU General Public License (GPL)
+Classifier: License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)
Classifier: Natural Language :: Bulgarian
Classifier: Natural Language :: Catalan
Classifier: Natural Language :: Chinese (Simplified)
diff --git a/__init__.py b/__init__.py
index 792a342..d78136b 100644
--- a/__init__.py
+++ b/__init__.py
@@ -13,14 +13,16 @@ def register():
Employee,
UserEmployee,
User,
- Property,
Sequence,
SequenceStrict,
Date,
CompanyConfigStart,
Cron,
CronCompany,
- PartyConfiguration,
+ Configuration,
+ PartyConfigurationLang,
+ Party,
+ PartyLang,
Rule,
module='company', type_='model')
Pool.register(
diff --git a/company.py b/company.py
index 3223270..3ffbc60 100644
--- a/company.py
+++ b/company.py
@@ -18,7 +18,7 @@ TIMEZONES += [(None, '')]
Transaction.cache_keys.update({'company', 'employee'})
-__all__ = ['Company', 'Employee', 'UserEmployee', 'User', 'Property',
+__all__ = ['Company', 'Employee', 'UserEmployee', 'User',
'Sequence', 'SequenceStrict', 'Date', 'CompanyConfigStart',
'CompanyConfig', 'CompanyReport', 'LetterReport', 'Rule']
@@ -29,17 +29,20 @@ class Company(ModelSQL, ModelView):
_rec_name = 'party'
party = fields.Many2One('party.party', 'Party', required=True,
ondelete='CASCADE')
- parent = fields.Many2One('company.company', 'Parent')
- childs = fields.One2Many('company.company', 'parent', 'Children')
- header = fields.Text('Header')
- footer = fields.Text('Footer')
- currency = fields.Many2One('currency.currency', 'Currency', required=True)
- timezone = fields.Selection(TIMEZONES, 'Timezone', translate=False)
- employees = fields.One2Many('company.employee', 'company', 'Employees')
-
- @classmethod
- def __setup__(cls):
- super(Company, cls).__setup__()
+ parent = fields.Many2One('company.company', 'Parent',
+ help="Add the company below the parent.")
+ childs = fields.One2Many('company.company', 'parent', 'Children',
+ help="Add children below the company.")
+ header = fields.Text(
+ 'Header', help="The text to display on report headers.")
+ footer = fields.Text(
+ 'Footer', help="The text to display on report footers.")
+ currency = fields.Many2One('currency.currency', 'Currency', required=True,
+ help="The main currency for the company.")
+ timezone = fields.Selection(TIMEZONES, 'Timezone', translate=False,
+ help="Used to compute the today date.")
+ employees = fields.One2Many('company.employee', 'company', 'Employees',
+ help="Add employees to the company.")
@classmethod
def validate(cls, companies):
@@ -60,22 +63,26 @@ class Employee(ModelSQL, ModelView):
'Employee'
__name__ = 'company.employee'
_rec_name = 'party'
- party = fields.Many2One('party.party', 'Party', required=True)
- company = fields.Many2One('company.company', 'Company', required=True)
+ party = fields.Many2One('party.party', 'Party', required=True,
+ help="The party which represents the employee.")
+ company = fields.Many2One('company.company', 'Company', required=True,
+ help="The company to which the employee belongs.")
start_date = fields.Date('Start Date',
domain=[If((Eval('start_date')) & (Eval('end_date')),
('start_date', '<=', Eval('end_date')),
(),
)
],
- depends=['end_date'])
+ depends=['end_date'],
+ help="When the employee joins the company.")
end_date = fields.Date('End Date',
domain=[If((Eval('start_date')) & (Eval('end_date')),
('end_date', '>=', Eval('start_date')),
(),
)
],
- depends=['start_date'])
+ depends=['start_date'],
+ help="When the employee leaves the company.")
@staticmethod
def default_company():
@@ -97,20 +104,24 @@ class UserEmployee(ModelSQL):
class User:
__metaclass__ = PoolMeta
__name__ = 'res.user'
- main_company = fields.Many2One('company.company', 'Main Company')
+ main_company = fields.Many2One('company.company', 'Main Company',
+ help="Grant access to the company and its children.")
company = fields.Many2One('company.company', 'Current Company',
domain=[('parent', 'child_of', [Eval('main_company')], 'parent')],
- depends=['main_company'])
+ depends=['main_company'],
+ help="Select the company to work for.")
companies = fields.Function(fields.One2Many('company.company', None,
- 'Current Companies'), 'get_companies')
+ 'Companies'), 'get_companies')
employees = fields.Many2Many('res.user-company.employee', 'user',
- 'employee', 'Employees')
+ 'employee', 'Employees',
+ help="Add employees to grant the user access to them.")
employee = fields.Many2One('company.employee', 'Current Employee',
domain=[
('company', '=', Eval('company', -1)),
('id', 'in', Eval('employees', [])),
],
- depends=['company', 'employees'])
+ depends=['company', 'employees'],
+ help="Select the employee to make the user behave as such.")
@classmethod
def __setup__(cls):
@@ -272,36 +283,6 @@ class User:
Rule._domain_get_cache.clear()
-class Property:
- __metaclass__ = PoolMeta
- __name__ = 'ir.property'
- company = fields.Many2One('company.company', 'Company',
- domain=[
- ('id', If(Eval('context', {}).contains('company'), '=', '!='),
- Eval('context', {}).get('company', -1)),
- ])
-
- @classmethod
- def _set_values(cls, model, res_id, val, field_id):
- User = Pool().get('res.user')
- user_id = Transaction().user
- if user_id == 0:
- user_id = Transaction().context.get('user', user_id)
- user = User(user_id)
- res = super(Property, cls)._set_values(model, res_id, val, field_id)
- if user and user.company:
- res['company'] = user.company.id
- return res
-
- @classmethod
- def search(cls, domain, offset=0, limit=None, order=None, count=False,
- query=False):
- if Transaction().user == 0 and 'user' not in Transaction().context:
- domain = ['AND', domain[:], ('company', '=', None)]
- return super(Property, cls).search(domain, offset=offset, limit=limit,
- order=order, count=count, query=query)
-
-
class Sequence:
__metaclass__ = PoolMeta
__name__ = 'ir.sequence'
@@ -309,7 +290,7 @@ class Sequence:
domain=[
('id', If(Eval('context', {}).contains('company'), '=', '!='),
Eval('context', {}).get('company', -1)),
- ])
+ ], help="Restrict the sequence usage to the company.")
@classmethod
def __setup__(cls):
diff --git a/company.xml b/company.xml
index 04827d5..fa20e4d 100644
--- a/company.xml
+++ b/company.xml
@@ -86,31 +86,6 @@ this repository contains the full copyright notices and license terms. -->
<field name="inherit" ref="res.user_view_form_preferences"/>
<field name="name">user_form_preferences</field>
</record>
- <record model="ir.ui.view" id="property_view_form">
- <field name="model">ir.property</field>
- <field name="inherit" ref="ir.property_view_form"/>
- <field name="name">property_form</field>
- </record>
- <record model="ir.ui.view" id="property_view_tree">
- <field name="model">ir.property</field>
- <field name="inherit" ref="ir.property_view_tree"/>
- <field name="name">property_tree</field>
- </record>
-
- <record model="ir.rule.group" id="rule_group_property">
- <field name="model" search="[('model', '=', 'ir.property')]"/>
- <field name="global_p" eval="True"/>
- </record>
- <record model="ir.rule" id="rule_property1">
- <field name="domain"
- eval="[('company', '=', Eval('user', {}).get('company', None))]"
- pyson="1"/>
- <field name="rule_group" ref="rule_group_property"/>
- </record>
- <record model="ir.rule" id="rule_property2">
- <field name="domain" eval="[('company', '=', None)]" pyson="1"/>
- <field name="rule_group" ref="rule_group_property"/>
- </record>
<record model="ir.ui.view" id="sequence_view_form">
<field name="model">ir.sequence</field>
diff --git a/locale/bg.po b/locale/bg.po
index 8f4cdfb..9f7a6d1 100644
--- a/locale/bg.po
+++ b/locale/bg.po
@@ -139,21 +139,28 @@ msgctxt "field:ir.cron-company.company,write_uid:"
msgid "Write User"
msgstr "Променено от"
-msgctxt "field:ir.property,company:"
+msgctxt "field:ir.sequence,company:"
msgid "Company"
msgstr "Фирма"
-msgctxt "field:ir.sequence,company:"
+msgctxt "field:ir.sequence.strict,company:"
msgid "Company"
msgstr "Фирма"
-msgctxt "field:ir.sequence.strict,company:"
+#, fuzzy
+msgctxt "field:party.configuration.party_lang,company:"
+msgid "Company"
+msgstr "Фирма"
+
+#, fuzzy
+msgctxt "field:party.party.lang,company:"
msgid "Company"
msgstr "Фирма"
+#, fuzzy
msgctxt "field:res.user,companies:"
-msgid "Current Companies"
-msgstr "Текущи фирми"
+msgid "Companies"
+msgstr "Фирми"
msgctxt "field:res.user,company:"
msgid "Current Company"
@@ -204,10 +211,78 @@ msgctxt "field:res.user-company.employee,write_uid:"
msgid "Write User"
msgstr "Променено от"
+msgctxt "help:company.company,childs:"
+msgid "Add children below the company."
+msgstr ""
+
+msgctxt "help:company.company,currency:"
+msgid "The main currency for the company."
+msgstr ""
+
+msgctxt "help:company.company,employees:"
+msgid "Add employees to the company."
+msgstr ""
+
+msgctxt "help:company.company,footer:"
+msgid "The text to display on report footers."
+msgstr ""
+
+msgctxt "help:company.company,header:"
+msgid "The text to display on report headers."
+msgstr ""
+
+msgctxt "help:company.company,parent:"
+msgid "Add the company below the parent."
+msgstr ""
+
+msgctxt "help:company.company,timezone:"
+msgid "Used to compute the today date."
+msgstr ""
+
+msgctxt "help:company.employee,company:"
+msgid "The company to which the employee belongs."
+msgstr ""
+
+msgctxt "help:company.employee,end_date:"
+msgid "When the employee leaves the company."
+msgstr ""
+
+msgctxt "help:company.employee,party:"
+msgid "The party which represents the employee."
+msgstr ""
+
+msgctxt "help:company.employee,start_date:"
+msgid "When the employee joins the company."
+msgstr ""
+
msgctxt "help:ir.cron,companies:"
msgid "Companies registered for this cron"
msgstr "Фирми регистрирани за този планировщик"
+msgctxt "help:ir.sequence,company:"
+msgid "Restrict the sequence usage to the company."
+msgstr ""
+
+msgctxt "help:ir.sequence.strict,company:"
+msgid "Restrict the sequence usage to the company."
+msgstr ""
+
+msgctxt "help:res.user,company:"
+msgid "Select the company to work for."
+msgstr ""
+
+msgctxt "help:res.user,employee:"
+msgid "Select the employee to make the user behave as such."
+msgstr ""
+
+msgctxt "help:res.user,employees:"
+msgid "Add employees to grant the user access to them."
+msgstr ""
+
+msgctxt "help:res.user,main_company:"
+msgid "Grant access to the company and its children."
+msgstr ""
+
msgctxt "model:company.company,name:"
msgid "Company"
msgstr "Фирма"
diff --git a/locale/ca.po b/locale/ca.po
index d80787d..64665cb 100644
--- a/locale/ca.po
+++ b/locale/ca.po
@@ -138,21 +138,25 @@ msgctxt "field:ir.cron-company.company,write_uid:"
msgid "Write User"
msgstr "Usuari de modificació"
-msgctxt "field:ir.property,company:"
+msgctxt "field:ir.sequence,company:"
msgid "Company"
msgstr "Empresa"
-msgctxt "field:ir.sequence,company:"
+msgctxt "field:ir.sequence.strict,company:"
msgid "Company"
msgstr "Empresa"
-msgctxt "field:ir.sequence.strict,company:"
+msgctxt "field:party.configuration.party_lang,company:"
+msgid "Company"
+msgstr "Empresa"
+
+msgctxt "field:party.party.lang,company:"
msgid "Company"
msgstr "Empresa"
msgctxt "field:res.user,companies:"
-msgid "Current Companies"
-msgstr "Empreses actuals"
+msgid "Companies"
+msgstr "Empreses"
msgctxt "field:res.user,company:"
msgid "Current Company"
@@ -202,10 +206,78 @@ msgctxt "field:res.user-company.employee,write_uid:"
msgid "Write User"
msgstr "Usuari de modificació"
+msgctxt "help:company.company,childs:"
+msgid "Add children below the company."
+msgstr "Afegeix fills davall de l'empresa."
+
+msgctxt "help:company.company,currency:"
+msgid "The main currency for the company."
+msgstr "La moneda principal de l'empresa."
+
+msgctxt "help:company.company,employees:"
+msgid "Add employees to the company."
+msgstr "Afegiu empleats a l'empresa."
+
+msgctxt "help:company.company,footer:"
+msgid "The text to display on report footers."
+msgstr "El text a mostrar als peus dels informes."
+
+msgctxt "help:company.company,header:"
+msgid "The text to display on report headers."
+msgstr "El text a mostrar a les capcel·leres dels informes."
+
+msgctxt "help:company.company,parent:"
+msgid "Add the company below the parent."
+msgstr "Afegeix l'empresa davall del pare."
+
+msgctxt "help:company.company,timezone:"
+msgid "Used to compute the today date."
+msgstr "Utilitzat per calcular la data d'avui."
+
+msgctxt "help:company.employee,company:"
+msgid "The company to which the employee belongs."
+msgstr "L'empresa a la que pertany l'empleat."
+
+msgctxt "help:company.employee,end_date:"
+msgid "When the employee leaves the company."
+msgstr "Quan l'empleat marxa de l'empresa."
+
+msgctxt "help:company.employee,party:"
+msgid "The party which represents the employee."
+msgstr "El tercer que representa l'empleat."
+
+msgctxt "help:company.employee,start_date:"
+msgid "When the employee joins the company."
+msgstr "Quan l'empleat entra a l'empresa."
+
msgctxt "help:ir.cron,companies:"
msgid "Companies registered for this cron"
msgstr "Empreses registrades en aquest planificador."
+msgctxt "help:ir.sequence,company:"
+msgid "Restrict the sequence usage to the company."
+msgstr "Restringeix l'ús de la seqüencia a l'empresa."
+
+msgctxt "help:ir.sequence.strict,company:"
+msgid "Restrict the sequence usage to the company."
+msgstr "Restringeix l'ús de la seqüencia a l'empresa."
+
+msgctxt "help:res.user,company:"
+msgid "Select the company to work for."
+msgstr "Seleccioneu l'empresa en la que voleu treballar."
+
+msgctxt "help:res.user,employee:"
+msgid "Select the employee to make the user behave as such."
+msgstr "Seleccioneu l'empleat com al que es comportarà l'usuari."
+
+msgctxt "help:res.user,employees:"
+msgid "Add employees to grant the user access to them."
+msgstr "Afegeix empleats als que podrà accedir l'usuari."
+
+msgctxt "help:res.user,main_company:"
+msgid "Grant access to the company and its children."
+msgstr "Permet accedir a l'empresa i a totes les seves filles."
+
msgctxt "model:company.company,name:"
msgid "Company"
msgstr "Empresa"
diff --git a/locale/cs.po b/locale/cs.po
index efc3fd9..e148076 100644
--- a/locale/cs.po
+++ b/locale/cs.po
@@ -141,20 +141,24 @@ msgctxt "field:ir.cron-company.company,write_uid:"
msgid "Write User"
msgstr ""
-msgctxt "field:ir.property,company:"
+msgctxt "field:ir.sequence,company:"
msgid "Company"
msgstr ""
-msgctxt "field:ir.sequence,company:"
+msgctxt "field:ir.sequence.strict,company:"
msgid "Company"
msgstr ""
-msgctxt "field:ir.sequence.strict,company:"
+msgctxt "field:party.configuration.party_lang,company:"
+msgid "Company"
+msgstr ""
+
+msgctxt "field:party.party.lang,company:"
msgid "Company"
msgstr ""
msgctxt "field:res.user,companies:"
-msgid "Current Companies"
+msgid "Companies"
msgstr ""
msgctxt "field:res.user,company:"
@@ -206,10 +210,78 @@ msgctxt "field:res.user-company.employee,write_uid:"
msgid "Write User"
msgstr ""
+msgctxt "help:company.company,childs:"
+msgid "Add children below the company."
+msgstr ""
+
+msgctxt "help:company.company,currency:"
+msgid "The main currency for the company."
+msgstr ""
+
+msgctxt "help:company.company,employees:"
+msgid "Add employees to the company."
+msgstr ""
+
+msgctxt "help:company.company,footer:"
+msgid "The text to display on report footers."
+msgstr ""
+
+msgctxt "help:company.company,header:"
+msgid "The text to display on report headers."
+msgstr ""
+
+msgctxt "help:company.company,parent:"
+msgid "Add the company below the parent."
+msgstr ""
+
+msgctxt "help:company.company,timezone:"
+msgid "Used to compute the today date."
+msgstr ""
+
+msgctxt "help:company.employee,company:"
+msgid "The company to which the employee belongs."
+msgstr ""
+
+msgctxt "help:company.employee,end_date:"
+msgid "When the employee leaves the company."
+msgstr ""
+
+msgctxt "help:company.employee,party:"
+msgid "The party which represents the employee."
+msgstr ""
+
+msgctxt "help:company.employee,start_date:"
+msgid "When the employee joins the company."
+msgstr ""
+
msgctxt "help:ir.cron,companies:"
msgid "Companies registered for this cron"
msgstr ""
+msgctxt "help:ir.sequence,company:"
+msgid "Restrict the sequence usage to the company."
+msgstr ""
+
+msgctxt "help:ir.sequence.strict,company:"
+msgid "Restrict the sequence usage to the company."
+msgstr ""
+
+msgctxt "help:res.user,company:"
+msgid "Select the company to work for."
+msgstr ""
+
+msgctxt "help:res.user,employee:"
+msgid "Select the employee to make the user behave as such."
+msgstr ""
+
+msgctxt "help:res.user,employees:"
+msgid "Add employees to grant the user access to them."
+msgstr ""
+
+msgctxt "help:res.user,main_company:"
+msgid "Grant access to the company and its children."
+msgstr ""
+
msgctxt "model:company.company,name:"
msgid "Company"
msgstr ""
diff --git a/locale/de.po b/locale/de.po
index a511782..dbf332f 100644
--- a/locale/de.po
+++ b/locale/de.po
@@ -138,21 +138,25 @@ msgctxt "field:ir.cron-company.company,write_uid:"
msgid "Write User"
msgstr "Letzte Änderung durch"
-msgctxt "field:ir.property,company:"
+msgctxt "field:ir.sequence,company:"
msgid "Company"
msgstr "Unternehmen"
-msgctxt "field:ir.sequence,company:"
+msgctxt "field:ir.sequence.strict,company:"
msgid "Company"
msgstr "Unternehmen"
-msgctxt "field:ir.sequence.strict,company:"
+msgctxt "field:party.configuration.party_lang,company:"
+msgid "Company"
+msgstr "Unternehmen"
+
+msgctxt "field:party.party.lang,company:"
msgid "Company"
msgstr "Unternehmen"
msgctxt "field:res.user,companies:"
-msgid "Current Companies"
-msgstr "Aktuelle Unternehmen"
+msgid "Companies"
+msgstr "Unternehmen"
msgctxt "field:res.user,company:"
msgid "Current Company"
@@ -202,10 +206,78 @@ msgctxt "field:res.user-company.employee,write_uid:"
msgid "Write User"
msgstr "Letzte Änderung durch"
+msgctxt "help:company.company,childs:"
+msgid "Add children below the company."
+msgstr "Untergeordnete Unternehmen hinzufügen."
+
+msgctxt "help:company.company,currency:"
+msgid "The main currency for the company."
+msgstr "Die Standardwährung des Unternehmens."
+
+msgctxt "help:company.company,employees:"
+msgid "Add employees to the company."
+msgstr "Dem Unternehmen Mitarbeiter hinzufügen."
+
+msgctxt "help:company.company,footer:"
+msgid "The text to display on report footers."
+msgstr "Der anzuzeigende Text in der Fußzeile der Berichte."
+
+msgctxt "help:company.company,header:"
+msgid "The text to display on report headers."
+msgstr "Der anzuzeigende Text in der Kopfzeile der Berichte."
+
+msgctxt "help:company.company,parent:"
+msgid "Add the company below the parent."
+msgstr "Übergordnetes Unternehmen hinzufügen."
+
+msgctxt "help:company.company,timezone:"
+msgid "Used to compute the today date."
+msgstr "Wird zum berechnen des heutigen Datums verwendet."
+
+msgctxt "help:company.employee,company:"
+msgid "The company to which the employee belongs."
+msgstr "Das Unternehmen dem der Mitarbeiter angehört."
+
+msgctxt "help:company.employee,end_date:"
+msgid "When the employee leaves the company."
+msgstr "Wann ein Mitarbeiter das Unternehmen verlässt."
+
+msgctxt "help:company.employee,party:"
+msgid "The party which represents the employee."
+msgstr "Die Partei die den Mitarbeite repräsentiert."
+
+msgctxt "help:company.employee,start_date:"
+msgid "When the employee joins the company."
+msgstr "Wann ein Mitarbeiter dem Unternehmen beitritt."
+
msgctxt "help:ir.cron,companies:"
msgid "Companies registered for this cron"
msgstr "Unternehmen, für welche dieser Job durchgeführt werden soll"
+msgctxt "help:ir.sequence,company:"
+msgid "Restrict the sequence usage to the company."
+msgstr "Die Nutzung des Nummernkreises auf das Unternehmen beschränken."
+
+msgctxt "help:ir.sequence.strict,company:"
+msgid "Restrict the sequence usage to the company."
+msgstr "Die Nutzung des Nummernkreises auf das Unternehmen beschränken."
+
+msgctxt "help:res.user,company:"
+msgid "Select the company to work for."
+msgstr "Das Unternehmen für das gearbeitet wird auswählen."
+
+msgctxt "help:res.user,employee:"
+msgid "Select the employee to make the user behave as such."
+msgstr "Den Mitarbeiter auswählen als der sich der User verhalten soll."
+
+msgctxt "help:res.user,employees:"
+msgid "Add employees to grant the user access to them."
+msgstr "Dem Unternehmen Mitarbeiter hinzufügen."
+
+msgctxt "help:res.user,main_company:"
+msgid "Grant access to the company and its children."
+msgstr "Zugriff auf das Unternehmen und untergeordnete Unternehmen erlauben."
+
msgctxt "model:company.company,name:"
msgid "Company"
msgstr "Unternehmen"
diff --git a/locale/es.po b/locale/es.po
index a04af67..ad7e262 100644
--- a/locale/es.po
+++ b/locale/es.po
@@ -138,21 +138,25 @@ msgctxt "field:ir.cron-company.company,write_uid:"
msgid "Write User"
msgstr "Usuario de modificación"
-msgctxt "field:ir.property,company:"
+msgctxt "field:ir.sequence,company:"
msgid "Company"
msgstr "Empresa"
-msgctxt "field:ir.sequence,company:"
+msgctxt "field:ir.sequence.strict,company:"
msgid "Company"
msgstr "Empresa"
-msgctxt "field:ir.sequence.strict,company:"
+msgctxt "field:party.configuration.party_lang,company:"
+msgid "Company"
+msgstr "Empresa"
+
+msgctxt "field:party.party.lang,company:"
msgid "Company"
msgstr "Empresa"
msgctxt "field:res.user,companies:"
-msgid "Current Companies"
-msgstr "Empresas actuales"
+msgid "Companies"
+msgstr "Empresas"
msgctxt "field:res.user,company:"
msgid "Current Company"
@@ -202,10 +206,78 @@ msgctxt "field:res.user-company.employee,write_uid:"
msgid "Write User"
msgstr "Usuario de modificación"
+msgctxt "help:company.company,childs:"
+msgid "Add children below the company."
+msgstr "Añade hijos debajo de la empresa."
+
+msgctxt "help:company.company,currency:"
+msgid "The main currency for the company."
+msgstr "La moneda principal de la empresa."
+
+msgctxt "help:company.company,employees:"
+msgid "Add employees to the company."
+msgstr "Añade empleados a la empresa."
+
+msgctxt "help:company.company,footer:"
+msgid "The text to display on report footers."
+msgstr "El texto a mostrar en los pies de página de los informes."
+
+msgctxt "help:company.company,header:"
+msgid "The text to display on report headers."
+msgstr "El texto a mostrar en los las cabeceras de los informes."
+
+msgctxt "help:company.company,parent:"
+msgid "Add the company below the parent."
+msgstr "Añade la empresa debajo del padre."
+
+msgctxt "help:company.company,timezone:"
+msgid "Used to compute the today date."
+msgstr "Utilizado para calcular la fecha de hoy."
+
+msgctxt "help:company.employee,company:"
+msgid "The company to which the employee belongs."
+msgstr "La empresa a la que pertenece el empleado."
+
+msgctxt "help:company.employee,end_date:"
+msgid "When the employee leaves the company."
+msgstr "Cuando el empleado se va de la empresa."
+
+msgctxt "help:company.employee,party:"
+msgid "The party which represents the employee."
+msgstr "El tercero que representa el empleado."
+
+msgctxt "help:company.employee,start_date:"
+msgid "When the employee joins the company."
+msgstr "Cuando el empleado entra en la empresa."
+
msgctxt "help:ir.cron,companies:"
msgid "Companies registered for this cron"
msgstr "Empresas registradas en este planificador."
+msgctxt "help:ir.sequence,company:"
+msgid "Restrict the sequence usage to the company."
+msgstr "Restringir el uso de la secuencia para la empresa."
+
+msgctxt "help:ir.sequence.strict,company:"
+msgid "Restrict the sequence usage to the company."
+msgstr "Restringir el uso de la secuencia para la empresa."
+
+msgctxt "help:res.user,company:"
+msgid "Select the company to work for."
+msgstr "Seleccionar la empresa en la que se quiere trabajar."
+
+msgctxt "help:res.user,employee:"
+msgid "Select the employee to make the user behave as such."
+msgstr "Seleccionar el empleado para que el usuario se comporte como tal."
+
+msgctxt "help:res.user,employees:"
+msgid "Add employees to grant the user access to them."
+msgstr "Añadir empleados a los que podrá acceder el usuario."
+
+msgctxt "help:res.user,main_company:"
+msgid "Grant access to the company and its children."
+msgstr "Permite acceder a la empresa y a todas sus hijas."
+
msgctxt "model:company.company,name:"
msgid "Company"
msgstr "Empresa"
diff --git a/locale/es_419.po b/locale/es_419.po
index 21dd2d1..9ea9db6 100644
--- a/locale/es_419.po
+++ b/locale/es_419.po
@@ -18,10 +18,9 @@ msgctxt "field:company.company,currency:"
msgid "Currency"
msgstr ""
-#, fuzzy
msgctxt "field:company.company,employees:"
msgid "Employees"
-msgstr "Employees"
+msgstr ""
msgctxt "field:company.company,footer:"
msgid "Footer"
@@ -103,10 +102,9 @@ msgctxt "field:company.employee,write_uid:"
msgid "Write User"
msgstr ""
-#, fuzzy
msgctxt "field:ir.cron,companies:"
msgid "Companies"
-msgstr "Companies"
+msgstr ""
msgctxt "field:ir.cron-company.company,company:"
msgid "Company"
@@ -122,7 +120,7 @@ msgstr ""
msgctxt "field:ir.cron-company.company,cron:"
msgid "Cron"
-msgstr ""
+msgstr "Programador de tareas"
msgctxt "field:ir.cron-company.company,id:"
msgid "ID"
@@ -140,20 +138,24 @@ msgctxt "field:ir.cron-company.company,write_uid:"
msgid "Write User"
msgstr ""
-msgctxt "field:ir.property,company:"
+msgctxt "field:ir.sequence,company:"
msgid "Company"
msgstr ""
-msgctxt "field:ir.sequence,company:"
+msgctxt "field:ir.sequence.strict,company:"
msgid "Company"
msgstr ""
-msgctxt "field:ir.sequence.strict,company:"
+msgctxt "field:party.configuration.party_lang,company:"
+msgid "Company"
+msgstr ""
+
+msgctxt "field:party.party.lang,company:"
msgid "Company"
msgstr ""
msgctxt "field:res.user,companies:"
-msgid "Current Companies"
+msgid "Companies"
msgstr ""
msgctxt "field:res.user,company:"
@@ -164,10 +166,9 @@ msgctxt "field:res.user,employee:"
msgid "Current Employee"
msgstr ""
-#, fuzzy
msgctxt "field:res.user,employees:"
msgid "Employees"
-msgstr "Employees"
+msgstr ""
msgctxt "field:res.user,main_company:"
msgid "Main Company"
@@ -181,10 +182,9 @@ msgctxt "field:res.user-company.employee,create_uid:"
msgid "Create User"
msgstr ""
-#, fuzzy
msgctxt "field:res.user-company.employee,employee:"
msgid "Employee"
-msgstr "Employees"
+msgstr ""
msgctxt "field:res.user-company.employee,id:"
msgid "ID"
@@ -206,10 +206,78 @@ msgctxt "field:res.user-company.employee,write_uid:"
msgid "Write User"
msgstr ""
+msgctxt "help:company.company,childs:"
+msgid "Add children below the company."
+msgstr ""
+
+msgctxt "help:company.company,currency:"
+msgid "The main currency for the company."
+msgstr ""
+
+msgctxt "help:company.company,employees:"
+msgid "Add employees to the company."
+msgstr ""
+
+msgctxt "help:company.company,footer:"
+msgid "The text to display on report footers."
+msgstr ""
+
+msgctxt "help:company.company,header:"
+msgid "The text to display on report headers."
+msgstr ""
+
+msgctxt "help:company.company,parent:"
+msgid "Add the company below the parent."
+msgstr ""
+
+msgctxt "help:company.company,timezone:"
+msgid "Used to compute the today date."
+msgstr ""
+
+msgctxt "help:company.employee,company:"
+msgid "The company to which the employee belongs."
+msgstr ""
+
+msgctxt "help:company.employee,end_date:"
+msgid "When the employee leaves the company."
+msgstr ""
+
+msgctxt "help:company.employee,party:"
+msgid "The party which represents the employee."
+msgstr ""
+
+msgctxt "help:company.employee,start_date:"
+msgid "When the employee joins the company."
+msgstr ""
+
msgctxt "help:ir.cron,companies:"
msgid "Companies registered for this cron"
msgstr ""
+msgctxt "help:ir.sequence,company:"
+msgid "Restrict the sequence usage to the company."
+msgstr ""
+
+msgctxt "help:ir.sequence.strict,company:"
+msgid "Restrict the sequence usage to the company."
+msgstr ""
+
+msgctxt "help:res.user,company:"
+msgid "Select the company to work for."
+msgstr ""
+
+msgctxt "help:res.user,employee:"
+msgid "Select the employee to make the user behave as such."
+msgstr ""
+
+msgctxt "help:res.user,employees:"
+msgid "Add employees to grant the user access to them."
+msgstr ""
+
+msgctxt "help:res.user,main_company:"
+msgid "Grant access to the company and its children."
+msgstr ""
+
msgctxt "model:company.company,name:"
msgid "Company"
msgstr ""
@@ -218,30 +286,29 @@ msgctxt "model:company.company.config.start,name:"
msgid "Company Config"
msgstr ""
-#, fuzzy
msgctxt "model:company.employee,name:"
msgid "Employee"
-msgstr "Employees"
+msgstr ""
msgctxt "model:ir.action,name:act_company_config"
msgid "Configure Company"
-msgstr "Configure Company"
+msgstr ""
msgctxt "model:ir.action,name:act_company_list"
msgid "Companies"
-msgstr "Companies"
+msgstr ""
msgctxt "model:ir.action,name:act_company_tree"
msgid "Companies"
-msgstr "Companies"
+msgstr ""
msgctxt "model:ir.action,name:act_employee_form"
msgid "Employees"
-msgstr "Employees"
+msgstr ""
msgctxt "model:ir.action,name:report_letter"
msgid "Letter"
-msgstr "Letter"
+msgstr ""
msgctxt "model:ir.cron-company.company,name:"
msgid "Cron - Company"
@@ -249,15 +316,15 @@ msgstr ""
msgctxt "model:ir.ui.menu,name:menu_company_list"
msgid "Companies"
-msgstr "Companies"
+msgstr ""
msgctxt "model:ir.ui.menu,name:menu_company_tree"
msgid "Companies"
-msgstr "Companies"
+msgstr ""
msgctxt "model:ir.ui.menu,name:menu_employee_form"
msgid "Employees"
-msgstr "Employees"
+msgstr ""
msgctxt "model:res.user-company.employee,name:"
msgid "User - Employee"
diff --git a/locale/fr.po b/locale/fr.po
index 595c9ff..8a370ca 100644
--- a/locale/fr.po
+++ b/locale/fr.po
@@ -138,21 +138,25 @@ msgctxt "field:ir.cron-company.company,write_uid:"
msgid "Write User"
msgstr "Mis à jour par"
-msgctxt "field:ir.property,company:"
+msgctxt "field:ir.sequence,company:"
msgid "Company"
msgstr "Société"
-msgctxt "field:ir.sequence,company:"
+msgctxt "field:ir.sequence.strict,company:"
msgid "Company"
msgstr "Société"
-msgctxt "field:ir.sequence.strict,company:"
+msgctxt "field:party.configuration.party_lang,company:"
+msgid "Company"
+msgstr "Société"
+
+msgctxt "field:party.party.lang,company:"
msgid "Company"
msgstr "Société"
msgctxt "field:res.user,companies:"
-msgid "Current Companies"
-msgstr "Sociétés actuelles"
+msgid "Companies"
+msgstr "Sociétés"
msgctxt "field:res.user,company:"
msgid "Current Company"
@@ -202,10 +206,80 @@ msgctxt "field:res.user-company.employee,write_uid:"
msgid "Write User"
msgstr "Mis à jour par"
+msgctxt "help:company.company,childs:"
+msgid "Add children below the company."
+msgstr "Ajouter des enfants sous la société."
+
+msgctxt "help:company.company,currency:"
+msgid "The main currency for the company."
+msgstr "La devise principale pour la société."
+
+msgctxt "help:company.company,employees:"
+msgid "Add employees to the company."
+msgstr "Ajouter des employés à la société."
+
+msgctxt "help:company.company,footer:"
+msgid "The text to display on report footers."
+msgstr "Le texte à afficher en pied de rapport."
+
+msgctxt "help:company.company,header:"
+msgid "The text to display on report headers."
+msgstr "Le texte à afficher en entête de rapport."
+
+msgctxt "help:company.company,parent:"
+msgid "Add the company below the parent."
+msgstr "Ajouter la société sous le parent."
+
+msgctxt "help:company.company,timezone:"
+msgid "Used to compute the today date."
+msgstr "Utilisé pour calculer la date du jour."
+
+msgctxt "help:company.employee,company:"
+msgid "The company to which the employee belongs."
+msgstr "La société à qui l'employé appartient."
+
+msgctxt "help:company.employee,end_date:"
+msgid "When the employee leaves the company."
+msgstr "Quand l'employé quitte la société."
+
+msgctxt "help:company.employee,party:"
+msgid "The party which represents the employee."
+msgstr "Le tiers qui représente l'employé."
+
+msgctxt "help:company.employee,start_date:"
+msgid "When the employee joins the company."
+msgstr "Quand l'employé rejoins la société."
+
msgctxt "help:ir.cron,companies:"
msgid "Companies registered for this cron"
msgstr "Sociétés enregistrées pour ce planificateur"
+msgctxt "help:ir.sequence,company:"
+msgid "Restrict the sequence usage to the company."
+msgstr "Restreint l'utilisation de la séquence à la société."
+
+msgctxt "help:ir.sequence.strict,company:"
+msgid "Restrict the sequence usage to the company."
+msgstr "Restreint l'utilisation de la séquence à la société."
+
+msgctxt "help:res.user,company:"
+msgid "Select the company to work for."
+msgstr "Sélectionner la société pour laquelle travailler."
+
+msgctxt "help:res.user,employee:"
+msgid "Select the employee to make the user behave as such."
+msgstr ""
+"Sélectionner l'employé pour lequel l'utilisateur se comportera en tant que "
+"tel."
+
+msgctxt "help:res.user,employees:"
+msgid "Add employees to grant the user access to them."
+msgstr "Ajouter les employés dont l'utilisateur en aura l'accès."
+
+msgctxt "help:res.user,main_company:"
+msgid "Grant access to the company and its children."
+msgstr "Donner l'accès à la société et ces enfants."
+
msgctxt "model:company.company,name:"
msgid "Company"
msgstr "Société"
diff --git a/locale/hu_HU.po b/locale/hu_HU.po
index e80acf3..d0dc4d6 100644
--- a/locale/hu_HU.po
+++ b/locale/hu_HU.po
@@ -138,21 +138,28 @@ msgctxt "field:ir.cron-company.company,write_uid:"
msgid "Write User"
msgstr "Által módosítva"
-msgctxt "field:ir.property,company:"
+msgctxt "field:ir.sequence,company:"
msgid "Company"
msgstr "Társaság"
-msgctxt "field:ir.sequence,company:"
+msgctxt "field:ir.sequence.strict,company:"
msgid "Company"
msgstr "Társaság"
-msgctxt "field:ir.sequence.strict,company:"
+#, fuzzy
+msgctxt "field:party.configuration.party_lang,company:"
msgid "Company"
msgstr "Társaság"
+#, fuzzy
+msgctxt "field:party.party.lang,company:"
+msgid "Company"
+msgstr "Társaság"
+
+#, fuzzy
msgctxt "field:res.user,companies:"
-msgid "Current Companies"
-msgstr "Aktuális társaság"
+msgid "Companies"
+msgstr "Társaságok"
msgctxt "field:res.user,company:"
msgid "Current Company"
@@ -202,10 +209,78 @@ msgctxt "field:res.user-company.employee,write_uid:"
msgid "Write User"
msgstr "Által módosítva"
+msgctxt "help:company.company,childs:"
+msgid "Add children below the company."
+msgstr ""
+
+msgctxt "help:company.company,currency:"
+msgid "The main currency for the company."
+msgstr ""
+
+msgctxt "help:company.company,employees:"
+msgid "Add employees to the company."
+msgstr ""
+
+msgctxt "help:company.company,footer:"
+msgid "The text to display on report footers."
+msgstr ""
+
+msgctxt "help:company.company,header:"
+msgid "The text to display on report headers."
+msgstr ""
+
+msgctxt "help:company.company,parent:"
+msgid "Add the company below the parent."
+msgstr ""
+
+msgctxt "help:company.company,timezone:"
+msgid "Used to compute the today date."
+msgstr ""
+
+msgctxt "help:company.employee,company:"
+msgid "The company to which the employee belongs."
+msgstr ""
+
+msgctxt "help:company.employee,end_date:"
+msgid "When the employee leaves the company."
+msgstr ""
+
+msgctxt "help:company.employee,party:"
+msgid "The party which represents the employee."
+msgstr ""
+
+msgctxt "help:company.employee,start_date:"
+msgid "When the employee joins the company."
+msgstr ""
+
msgctxt "help:ir.cron,companies:"
msgid "Companies registered for this cron"
msgstr "Társaság, mely részére készül a megbízás"
+msgctxt "help:ir.sequence,company:"
+msgid "Restrict the sequence usage to the company."
+msgstr ""
+
+msgctxt "help:ir.sequence.strict,company:"
+msgid "Restrict the sequence usage to the company."
+msgstr ""
+
+msgctxt "help:res.user,company:"
+msgid "Select the company to work for."
+msgstr ""
+
+msgctxt "help:res.user,employee:"
+msgid "Select the employee to make the user behave as such."
+msgstr ""
+
+msgctxt "help:res.user,employees:"
+msgid "Add employees to grant the user access to them."
+msgstr ""
+
+msgctxt "help:res.user,main_company:"
+msgid "Grant access to the company and its children."
+msgstr ""
+
msgctxt "model:company.company,name:"
msgid "Company"
msgstr "Társaság"
diff --git a/locale/it_IT.po b/locale/it_IT.po
index fae641d..9785707 100644
--- a/locale/it_IT.po
+++ b/locale/it_IT.po
@@ -162,21 +162,28 @@ msgctxt "field:ir.cron-company.company,write_uid:"
msgid "Write User"
msgstr "Scrivente"
-msgctxt "field:ir.property,company:"
+msgctxt "field:ir.sequence,company:"
msgid "Company"
msgstr "Azienda"
-msgctxt "field:ir.sequence,company:"
+msgctxt "field:ir.sequence.strict,company:"
msgid "Company"
msgstr "Azienda"
-msgctxt "field:ir.sequence.strict,company:"
+#, fuzzy
+msgctxt "field:party.configuration.party_lang,company:"
+msgid "Company"
+msgstr "Azienda"
+
+#, fuzzy
+msgctxt "field:party.party.lang,company:"
msgid "Company"
msgstr "Azienda"
+#, fuzzy
msgctxt "field:res.user,companies:"
-msgid "Current Companies"
-msgstr "Attuali Aziende"
+msgid "Companies"
+msgstr "Aziende"
msgctxt "field:res.user,company:"
msgid "Current Company"
@@ -233,10 +240,78 @@ msgctxt "field:res.user-company.employee,write_uid:"
msgid "Write User"
msgstr "Scrivente"
+msgctxt "help:company.company,childs:"
+msgid "Add children below the company."
+msgstr ""
+
+msgctxt "help:company.company,currency:"
+msgid "The main currency for the company."
+msgstr ""
+
+msgctxt "help:company.company,employees:"
+msgid "Add employees to the company."
+msgstr ""
+
+msgctxt "help:company.company,footer:"
+msgid "The text to display on report footers."
+msgstr ""
+
+msgctxt "help:company.company,header:"
+msgid "The text to display on report headers."
+msgstr ""
+
+msgctxt "help:company.company,parent:"
+msgid "Add the company below the parent."
+msgstr ""
+
+msgctxt "help:company.company,timezone:"
+msgid "Used to compute the today date."
+msgstr ""
+
+msgctxt "help:company.employee,company:"
+msgid "The company to which the employee belongs."
+msgstr ""
+
+msgctxt "help:company.employee,end_date:"
+msgid "When the employee leaves the company."
+msgstr ""
+
+msgctxt "help:company.employee,party:"
+msgid "The party which represents the employee."
+msgstr ""
+
+msgctxt "help:company.employee,start_date:"
+msgid "When the employee joins the company."
+msgstr ""
+
msgctxt "help:ir.cron,companies:"
msgid "Companies registered for this cron"
msgstr "Aziende registrate per questo cron"
+msgctxt "help:ir.sequence,company:"
+msgid "Restrict the sequence usage to the company."
+msgstr ""
+
+msgctxt "help:ir.sequence.strict,company:"
+msgid "Restrict the sequence usage to the company."
+msgstr ""
+
+msgctxt "help:res.user,company:"
+msgid "Select the company to work for."
+msgstr ""
+
+msgctxt "help:res.user,employee:"
+msgid "Select the employee to make the user behave as such."
+msgstr ""
+
+msgctxt "help:res.user,employees:"
+msgid "Add employees to grant the user access to them."
+msgstr ""
+
+msgctxt "help:res.user,main_company:"
+msgid "Grant access to the company and its children."
+msgstr ""
+
msgctxt "model:company.company,name:"
msgid "Company"
msgstr "Azienda"
diff --git a/locale/ja_JP.po b/locale/ja_JP.po
index 21dd2d1..19fc0a1 100644
--- a/locale/ja_JP.po
+++ b/locale/ja_JP.po
@@ -140,22 +140,27 @@ msgctxt "field:ir.cron-company.company,write_uid:"
msgid "Write User"
msgstr ""
-msgctxt "field:ir.property,company:"
+msgctxt "field:ir.sequence,company:"
msgid "Company"
msgstr ""
-msgctxt "field:ir.sequence,company:"
+msgctxt "field:ir.sequence.strict,company:"
msgid "Company"
msgstr ""
-msgctxt "field:ir.sequence.strict,company:"
+msgctxt "field:party.configuration.party_lang,company:"
msgid "Company"
msgstr ""
-msgctxt "field:res.user,companies:"
-msgid "Current Companies"
+msgctxt "field:party.party.lang,company:"
+msgid "Company"
msgstr ""
+#, fuzzy
+msgctxt "field:res.user,companies:"
+msgid "Companies"
+msgstr "Companies"
+
msgctxt "field:res.user,company:"
msgid "Current Company"
msgstr ""
@@ -206,10 +211,78 @@ msgctxt "field:res.user-company.employee,write_uid:"
msgid "Write User"
msgstr ""
+msgctxt "help:company.company,childs:"
+msgid "Add children below the company."
+msgstr ""
+
+msgctxt "help:company.company,currency:"
+msgid "The main currency for the company."
+msgstr ""
+
+msgctxt "help:company.company,employees:"
+msgid "Add employees to the company."
+msgstr ""
+
+msgctxt "help:company.company,footer:"
+msgid "The text to display on report footers."
+msgstr ""
+
+msgctxt "help:company.company,header:"
+msgid "The text to display on report headers."
+msgstr ""
+
+msgctxt "help:company.company,parent:"
+msgid "Add the company below the parent."
+msgstr ""
+
+msgctxt "help:company.company,timezone:"
+msgid "Used to compute the today date."
+msgstr ""
+
+msgctxt "help:company.employee,company:"
+msgid "The company to which the employee belongs."
+msgstr ""
+
+msgctxt "help:company.employee,end_date:"
+msgid "When the employee leaves the company."
+msgstr ""
+
+msgctxt "help:company.employee,party:"
+msgid "The party which represents the employee."
+msgstr ""
+
+msgctxt "help:company.employee,start_date:"
+msgid "When the employee joins the company."
+msgstr ""
+
msgctxt "help:ir.cron,companies:"
msgid "Companies registered for this cron"
msgstr ""
+msgctxt "help:ir.sequence,company:"
+msgid "Restrict the sequence usage to the company."
+msgstr ""
+
+msgctxt "help:ir.sequence.strict,company:"
+msgid "Restrict the sequence usage to the company."
+msgstr ""
+
+msgctxt "help:res.user,company:"
+msgid "Select the company to work for."
+msgstr ""
+
+msgctxt "help:res.user,employee:"
+msgid "Select the employee to make the user behave as such."
+msgstr ""
+
+msgctxt "help:res.user,employees:"
+msgid "Add employees to grant the user access to them."
+msgstr ""
+
+msgctxt "help:res.user,main_company:"
+msgid "Grant access to the company and its children."
+msgstr ""
+
msgctxt "model:company.company,name:"
msgid "Company"
msgstr ""
diff --git a/locale/lo.po b/locale/lo.po
index 1f97633..a3c0765 100644
--- a/locale/lo.po
+++ b/locale/lo.po
@@ -58,10 +58,9 @@ msgctxt "field:company.company,write_uid:"
msgid "Write User"
msgstr "ຜູ້ຂຽນ"
-#, fuzzy
msgctxt "field:company.company.config.start,id:"
msgid "ID"
-msgstr "ເລດລຳດັບ"
+msgstr "ເລກລຳດັບ"
msgctxt "field:company.employee,company:"
msgid "Company"
@@ -77,7 +76,7 @@ msgstr "ຜູ້ສ້າງ"
msgctxt "field:company.employee,end_date:"
msgid "End Date"
-msgstr ""
+msgstr "ວັນທີສິ້ນສຸດ"
msgctxt "field:company.employee,id:"
msgid "ID"
@@ -93,7 +92,7 @@ msgstr "ຊື່"
msgctxt "field:company.employee,start_date:"
msgid "Start Date"
-msgstr ""
+msgstr "ວັນທີເລີ່ມ"
msgctxt "field:company.employee,write_date:"
msgid "Write Date"
@@ -115,59 +114,60 @@ msgctxt "field:ir.cron-company.company,create_date:"
msgid "Create Date"
msgstr "ວັນທີສ້າງ"
-#, fuzzy
msgctxt "field:ir.cron-company.company,create_uid:"
msgid "Create User"
-msgstr "ສ້າງຜູ້ໃຊ້ງານ"
+msgstr "ຜູ້ສ້າງ"
msgctxt "field:ir.cron-company.company,cron:"
msgid "Cron"
-msgstr ""
+msgstr "ຄຣັອນ"
-#, fuzzy
msgctxt "field:ir.cron-company.company,id:"
msgid "ID"
-msgstr "ເລດລຳດັບ"
+msgstr "ເລກລຳດັບ"
-#, fuzzy
msgctxt "field:ir.cron-company.company,rec_name:"
msgid "Name"
msgstr "ຊື່"
-#, fuzzy
msgctxt "field:ir.cron-company.company,write_date:"
msgid "Write Date"
msgstr "ວັນທີບັນທຶກ"
-#, fuzzy
msgctxt "field:ir.cron-company.company,write_uid:"
msgid "Write User"
-msgstr "ສ້າງຜູ້ໃຊ້"
+msgstr "ຜູ້ບັນທຶກ"
-msgctxt "field:ir.property,company:"
+msgctxt "field:ir.sequence,company:"
msgid "Company"
msgstr "ຫ້ອງການ/ສຳນັກງານ"
-msgctxt "field:ir.sequence,company:"
+msgctxt "field:ir.sequence.strict,company:"
msgid "Company"
msgstr "ຫ້ອງການ/ສຳນັກງານ"
-msgctxt "field:ir.sequence.strict,company:"
+#, fuzzy
+msgctxt "field:party.configuration.party_lang,company:"
msgid "Company"
msgstr "ຫ້ອງການ/ສຳນັກງານ"
-msgctxt "field:res.user,companies:"
-msgid "Current Companies"
-msgstr "ຫ້ອງການ/ສຳນັກງານ ປັດຈຸບັນ"
+#, fuzzy
+msgctxt "field:party.party.lang,company:"
+msgid "Company"
+msgstr "ຫ້ອງການ/ສຳນັກງານ"
#, fuzzy
+msgctxt "field:res.user,companies:"
+msgid "Companies"
+msgstr "ຫ້ອງການ/ສຳນັກງານ"
+
msgctxt "field:res.user,company:"
msgid "Current Company"
-msgstr "ຫ້ອງການ/ສຳນັກງານ ປັດຈຸບັນ"
+msgstr "ຫ້ອງການ/ສຳນັກງານປັດຈຸບັນ"
msgctxt "field:res.user,employee:"
msgid "Current Employee"
-msgstr ""
+msgstr "ປັດຈຸບັນເຮັດວຽກຢູ່"
msgctxt "field:res.user,employees:"
msgid "Employees"
@@ -181,44 +181,106 @@ msgctxt "field:res.user-company.employee,create_date:"
msgid "Create Date"
msgstr "ວັນທີສ້າງ"
-#, fuzzy
msgctxt "field:res.user-company.employee,create_uid:"
msgid "Create User"
-msgstr "ສ້າງຜູ້ໃຊ້ງານ"
+msgstr "ຜູ້ສ້າງ"
msgctxt "field:res.user-company.employee,employee:"
msgid "Employee"
msgstr "ພະນັກງານ"
-#, fuzzy
msgctxt "field:res.user-company.employee,id:"
msgid "ID"
-msgstr "ເລດລຳດັບ"
+msgstr "ເລກລຳດັບ"
-#, fuzzy
msgctxt "field:res.user-company.employee,rec_name:"
msgid "Name"
msgstr "ຊື່"
-#, fuzzy
msgctxt "field:res.user-company.employee,user:"
msgid "User"
msgstr "ຜູ້ໃຊ້"
-#, fuzzy
msgctxt "field:res.user-company.employee,write_date:"
msgid "Write Date"
msgstr "ວັນທີບັນທຶກ"
-#, fuzzy
msgctxt "field:res.user-company.employee,write_uid:"
msgid "Write User"
-msgstr "ສ້າງຜູ້ໃຊ້"
+msgstr "ຜູ້ບັນທຶກ"
+
+msgctxt "help:company.company,childs:"
+msgid "Add children below the company."
+msgstr ""
+
+msgctxt "help:company.company,currency:"
+msgid "The main currency for the company."
+msgstr ""
+
+msgctxt "help:company.company,employees:"
+msgid "Add employees to the company."
+msgstr ""
+
+msgctxt "help:company.company,footer:"
+msgid "The text to display on report footers."
+msgstr ""
+
+msgctxt "help:company.company,header:"
+msgid "The text to display on report headers."
+msgstr ""
+
+msgctxt "help:company.company,parent:"
+msgid "Add the company below the parent."
+msgstr ""
+
+msgctxt "help:company.company,timezone:"
+msgid "Used to compute the today date."
+msgstr ""
+
+msgctxt "help:company.employee,company:"
+msgid "The company to which the employee belongs."
+msgstr ""
+
+msgctxt "help:company.employee,end_date:"
+msgid "When the employee leaves the company."
+msgstr ""
+
+msgctxt "help:company.employee,party:"
+msgid "The party which represents the employee."
+msgstr ""
+
+msgctxt "help:company.employee,start_date:"
+msgid "When the employee joins the company."
+msgstr ""
msgctxt "help:ir.cron,companies:"
msgid "Companies registered for this cron"
msgstr "ຫ້ອງການ/ສຳນັກງານ ທີ່ລົງທະບຽນ"
+msgctxt "help:ir.sequence,company:"
+msgid "Restrict the sequence usage to the company."
+msgstr ""
+
+msgctxt "help:ir.sequence.strict,company:"
+msgid "Restrict the sequence usage to the company."
+msgstr ""
+
+msgctxt "help:res.user,company:"
+msgid "Select the company to work for."
+msgstr ""
+
+msgctxt "help:res.user,employee:"
+msgid "Select the employee to make the user behave as such."
+msgstr ""
+
+msgctxt "help:res.user,employees:"
+msgid "Add employees to grant the user access to them."
+msgstr ""
+
+msgctxt "help:res.user,main_company:"
+msgid "Grant access to the company and its children."
+msgstr ""
+
msgctxt "model:company.company,name:"
msgid "Company"
msgstr "ຫ້ອງການ/ສຳນັກງານ"
@@ -249,11 +311,11 @@ msgstr "ພະນັກງານ"
msgctxt "model:ir.action,name:report_letter"
msgid "Letter"
-msgstr ""
+msgstr "ຈົດໝາຍ"
msgctxt "model:ir.cron-company.company,name:"
msgid "Cron - Company"
-msgstr ""
+msgstr "ຄຣັອນ - ສຳນັກງານ"
msgctxt "model:ir.ui.menu,name:menu_company_list"
msgid "Companies"
@@ -269,7 +331,7 @@ msgstr "ພະນັກງານ"
msgctxt "model:res.user-company.employee,name:"
msgid "User - Employee"
-msgstr ""
+msgstr "ຜູ້ໃຊ້ - ພະນັກງານ"
msgctxt "report:party.letter:"
msgid "Best Regards,"
@@ -289,7 +351,7 @@ msgstr "ເລື່ອງ:"
msgctxt "view:company.company.config.start:"
msgid "You can now add your company into the system."
-msgstr ""
+msgstr "ທ່ານສາມາດເພີ່ມສຳນັກງານຂອງທ່ານເຂົ້າໃສ່ໃນລະບົບໄດ້ແລ້ວ."
msgctxt "view:company.company:"
msgid "Company"
diff --git a/locale/lt.po b/locale/lt.po
index efc3fd9..e148076 100644
--- a/locale/lt.po
+++ b/locale/lt.po
@@ -141,20 +141,24 @@ msgctxt "field:ir.cron-company.company,write_uid:"
msgid "Write User"
msgstr ""
-msgctxt "field:ir.property,company:"
+msgctxt "field:ir.sequence,company:"
msgid "Company"
msgstr ""
-msgctxt "field:ir.sequence,company:"
+msgctxt "field:ir.sequence.strict,company:"
msgid "Company"
msgstr ""
-msgctxt "field:ir.sequence.strict,company:"
+msgctxt "field:party.configuration.party_lang,company:"
+msgid "Company"
+msgstr ""
+
+msgctxt "field:party.party.lang,company:"
msgid "Company"
msgstr ""
msgctxt "field:res.user,companies:"
-msgid "Current Companies"
+msgid "Companies"
msgstr ""
msgctxt "field:res.user,company:"
@@ -206,10 +210,78 @@ msgctxt "field:res.user-company.employee,write_uid:"
msgid "Write User"
msgstr ""
+msgctxt "help:company.company,childs:"
+msgid "Add children below the company."
+msgstr ""
+
+msgctxt "help:company.company,currency:"
+msgid "The main currency for the company."
+msgstr ""
+
+msgctxt "help:company.company,employees:"
+msgid "Add employees to the company."
+msgstr ""
+
+msgctxt "help:company.company,footer:"
+msgid "The text to display on report footers."
+msgstr ""
+
+msgctxt "help:company.company,header:"
+msgid "The text to display on report headers."
+msgstr ""
+
+msgctxt "help:company.company,parent:"
+msgid "Add the company below the parent."
+msgstr ""
+
+msgctxt "help:company.company,timezone:"
+msgid "Used to compute the today date."
+msgstr ""
+
+msgctxt "help:company.employee,company:"
+msgid "The company to which the employee belongs."
+msgstr ""
+
+msgctxt "help:company.employee,end_date:"
+msgid "When the employee leaves the company."
+msgstr ""
+
+msgctxt "help:company.employee,party:"
+msgid "The party which represents the employee."
+msgstr ""
+
+msgctxt "help:company.employee,start_date:"
+msgid "When the employee joins the company."
+msgstr ""
+
msgctxt "help:ir.cron,companies:"
msgid "Companies registered for this cron"
msgstr ""
+msgctxt "help:ir.sequence,company:"
+msgid "Restrict the sequence usage to the company."
+msgstr ""
+
+msgctxt "help:ir.sequence.strict,company:"
+msgid "Restrict the sequence usage to the company."
+msgstr ""
+
+msgctxt "help:res.user,company:"
+msgid "Select the company to work for."
+msgstr ""
+
+msgctxt "help:res.user,employee:"
+msgid "Select the employee to make the user behave as such."
+msgstr ""
+
+msgctxt "help:res.user,employees:"
+msgid "Add employees to grant the user access to them."
+msgstr ""
+
+msgctxt "help:res.user,main_company:"
+msgid "Grant access to the company and its children."
+msgstr ""
+
msgctxt "model:company.company,name:"
msgid "Company"
msgstr ""
diff --git a/locale/nl.po b/locale/nl.po
index 480eb82..25e5240 100644
--- a/locale/nl.po
+++ b/locale/nl.po
@@ -154,21 +154,28 @@ msgctxt "field:ir.cron-company.company,write_uid:"
msgid "Write User"
msgstr "Gebruiker"
-msgctxt "field:ir.property,company:"
+msgctxt "field:ir.sequence,company:"
msgid "Company"
msgstr "Bedrijf"
-msgctxt "field:ir.sequence,company:"
+msgctxt "field:ir.sequence.strict,company:"
msgid "Company"
msgstr "Bedrijf"
-msgctxt "field:ir.sequence.strict,company:"
+#, fuzzy
+msgctxt "field:party.configuration.party_lang,company:"
+msgid "Company"
+msgstr "Bedrijf"
+
+#, fuzzy
+msgctxt "field:party.party.lang,company:"
msgid "Company"
msgstr "Bedrijf"
+#, fuzzy
msgctxt "field:res.user,companies:"
-msgid "Current Companies"
-msgstr "Huidige bedrijven"
+msgid "Companies"
+msgstr "Bedrijven"
msgctxt "field:res.user,company:"
msgid "Current Company"
@@ -228,10 +235,78 @@ msgctxt "field:res.user-company.employee,write_uid:"
msgid "Write User"
msgstr "Gebruiker"
+msgctxt "help:company.company,childs:"
+msgid "Add children below the company."
+msgstr ""
+
+msgctxt "help:company.company,currency:"
+msgid "The main currency for the company."
+msgstr ""
+
+msgctxt "help:company.company,employees:"
+msgid "Add employees to the company."
+msgstr ""
+
+msgctxt "help:company.company,footer:"
+msgid "The text to display on report footers."
+msgstr ""
+
+msgctxt "help:company.company,header:"
+msgid "The text to display on report headers."
+msgstr ""
+
+msgctxt "help:company.company,parent:"
+msgid "Add the company below the parent."
+msgstr ""
+
+msgctxt "help:company.company,timezone:"
+msgid "Used to compute the today date."
+msgstr ""
+
+msgctxt "help:company.employee,company:"
+msgid "The company to which the employee belongs."
+msgstr ""
+
+msgctxt "help:company.employee,end_date:"
+msgid "When the employee leaves the company."
+msgstr ""
+
+msgctxt "help:company.employee,party:"
+msgid "The party which represents the employee."
+msgstr ""
+
+msgctxt "help:company.employee,start_date:"
+msgid "When the employee joins the company."
+msgstr ""
+
msgctxt "help:ir.cron,companies:"
msgid "Companies registered for this cron"
msgstr "Bedrijven aangesloten op deze cyclische opdracht"
+msgctxt "help:ir.sequence,company:"
+msgid "Restrict the sequence usage to the company."
+msgstr ""
+
+msgctxt "help:ir.sequence.strict,company:"
+msgid "Restrict the sequence usage to the company."
+msgstr ""
+
+msgctxt "help:res.user,company:"
+msgid "Select the company to work for."
+msgstr ""
+
+msgctxt "help:res.user,employee:"
+msgid "Select the employee to make the user behave as such."
+msgstr ""
+
+msgctxt "help:res.user,employees:"
+msgid "Add employees to grant the user access to them."
+msgstr ""
+
+msgctxt "help:res.user,main_company:"
+msgid "Grant access to the company and its children."
+msgstr ""
+
msgctxt "model:company.company,name:"
msgid "Company"
msgstr "Bedrijf"
diff --git a/locale/pl.po b/locale/pl.po
index 84b37e1..33c7c97 100644
--- a/locale/pl.po
+++ b/locale/pl.po
@@ -4,7 +4,7 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "field:company.company,childs:"
msgid "Children"
-msgstr "Elementy podrzędne"
+msgstr "Firmy córki"
msgctxt "field:company.company,create_date:"
msgid "Create Date"
@@ -36,7 +36,7 @@ msgstr "ID"
msgctxt "field:company.company,parent:"
msgid "Parent"
-msgstr "Element nadrzędny"
+msgstr "Firma nadrzędna"
msgctxt "field:company.company,party:"
msgid "Party"
@@ -138,21 +138,25 @@ msgctxt "field:ir.cron-company.company,write_uid:"
msgid "Write User"
msgstr "Zapisał"
-msgctxt "field:ir.property,company:"
+msgctxt "field:ir.sequence,company:"
msgid "Company"
msgstr "Firma"
-msgctxt "field:ir.sequence,company:"
+msgctxt "field:ir.sequence.strict,company:"
msgid "Company"
msgstr "Firma"
-msgctxt "field:ir.sequence.strict,company:"
+msgctxt "field:party.configuration.party_lang,company:"
+msgid "Company"
+msgstr "Firma"
+
+msgctxt "field:party.party.lang,company:"
msgid "Company"
msgstr "Firma"
msgctxt "field:res.user,companies:"
-msgid "Current Companies"
-msgstr "Aktualne firmy"
+msgid "Companies"
+msgstr "Firmy"
msgctxt "field:res.user,company:"
msgid "Current Company"
@@ -202,10 +206,78 @@ msgctxt "field:res.user-company.employee,write_uid:"
msgid "Write User"
msgstr "Zapisał"
+msgctxt "help:company.company,childs:"
+msgid "Add children below the company."
+msgstr "Dodaj firmy zależne od firmy matki."
+
+msgctxt "help:company.company,currency:"
+msgid "The main currency for the company."
+msgstr "Podstawowa waluta firmy."
+
+msgctxt "help:company.company,employees:"
+msgid "Add employees to the company."
+msgstr "Dodaj pracowników do firmy."
+
+msgctxt "help:company.company,footer:"
+msgid "The text to display on report footers."
+msgstr "Tekst w stopkach raportów."
+
+msgctxt "help:company.company,header:"
+msgid "The text to display on report headers."
+msgstr "Tekst w nagłówkach raportów."
+
+msgctxt "help:company.company,parent:"
+msgid "Add the company below the parent."
+msgstr "Wybierz firmę nadrzędną."
+
+msgctxt "help:company.company,timezone:"
+msgid "Used to compute the today date."
+msgstr "Służy do wznaczenia lokalnej daty."
+
+msgctxt "help:company.employee,company:"
+msgid "The company to which the employee belongs."
+msgstr "Firma, do której należą pracownicy."
+
+msgctxt "help:company.employee,end_date:"
+msgid "When the employee leaves the company."
+msgstr "Data rozstania się pracownika z firmą."
+
+msgctxt "help:company.employee,party:"
+msgid "The party which represents the employee."
+msgstr "Strona reprezentująca pracownika."
+
+msgctxt "help:company.employee,start_date:"
+msgid "When the employee joins the company."
+msgstr "Data przyjęcia pracownika do firmy."
+
msgctxt "help:ir.cron,companies:"
msgid "Companies registered for this cron"
msgstr "Firmy zarejestrowane dla crona"
+msgctxt "help:ir.sequence,company:"
+msgid "Restrict the sequence usage to the company."
+msgstr "Ograniczenie użycia sekwencji do firmy."
+
+msgctxt "help:ir.sequence.strict,company:"
+msgid "Restrict the sequence usage to the company."
+msgstr "Ograniczenie użycia sekwencji do firmy."
+
+msgctxt "help:res.user,company:"
+msgid "Select the company to work for."
+msgstr "Firma, w której użytkownik pracuje."
+
+msgctxt "help:res.user,employee:"
+msgid "Select the employee to make the user behave as such."
+msgstr "Wybór pracownika reprezentującego użytkownika."
+
+msgctxt "help:res.user,employees:"
+msgid "Add employees to grant the user access to them."
+msgstr "Pracownicy, do których użytkownik ma dostęp."
+
+msgctxt "help:res.user,main_company:"
+msgid "Grant access to the company and its children."
+msgstr "Przyznanie dostępu do firmy i jej córek."
+
msgctxt "model:company.company,name:"
msgid "Company"
msgstr "Firma"
@@ -228,7 +300,7 @@ msgstr "Firmy"
msgctxt "model:ir.action,name:act_company_tree"
msgid "Companies"
-msgstr "Firmy"
+msgstr "Struktura firm"
msgctxt "model:ir.action,name:act_employee_form"
msgid "Employees"
@@ -248,7 +320,7 @@ msgstr "Firmy"
msgctxt "model:ir.ui.menu,name:menu_company_tree"
msgid "Companies"
-msgstr "Firmy"
+msgstr "Struktura firm"
msgctxt "model:ir.ui.menu,name:menu_employee_form"
msgid "Employees"
diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index f4fe486..9be05dd 100644
--- a/locale/pt_BR.po
+++ b/locale/pt_BR.po
@@ -76,7 +76,7 @@ msgstr "Criado pelo usuário"
msgctxt "field:company.employee,end_date:"
msgid "End Date"
-msgstr ""
+msgstr "Data de término"
msgctxt "field:company.employee,id:"
msgid "ID"
@@ -92,7 +92,7 @@ msgstr "Nome"
msgctxt "field:company.employee,start_date:"
msgid "Start Date"
-msgstr ""
+msgstr "Data de início"
msgctxt "field:company.employee,write_date:"
msgid "Write Date"
@@ -138,21 +138,25 @@ msgctxt "field:ir.cron-company.company,write_uid:"
msgid "Write User"
msgstr "Gravado pelo usuário"
-msgctxt "field:ir.property,company:"
+msgctxt "field:ir.sequence,company:"
msgid "Company"
msgstr "Empresa"
-msgctxt "field:ir.sequence,company:"
+msgctxt "field:ir.sequence.strict,company:"
msgid "Company"
msgstr "Empresa"
-msgctxt "field:ir.sequence.strict,company:"
+msgctxt "field:party.configuration.party_lang,company:"
+msgid "Company"
+msgstr "Empresa"
+
+msgctxt "field:party.party.lang,company:"
msgid "Company"
msgstr "Empresa"
msgctxt "field:res.user,companies:"
-msgid "Current Companies"
-msgstr "Empresas Atuais"
+msgid "Companies"
+msgstr "Empresas"
msgctxt "field:res.user,company:"
msgid "Current Company"
@@ -202,10 +206,78 @@ msgctxt "field:res.user-company.employee,write_uid:"
msgid "Write User"
msgstr "Gravado pelo usuário"
+msgctxt "help:company.company,childs:"
+msgid "Add children below the company."
+msgstr "Adicione filhos abaixo da empresa."
+
+msgctxt "help:company.company,currency:"
+msgid "The main currency for the company."
+msgstr "A principal moeda para a empresa."
+
+msgctxt "help:company.company,employees:"
+msgid "Add employees to the company."
+msgstr "Adicione empregados à empresa."
+
+msgctxt "help:company.company,footer:"
+msgid "The text to display on report footers."
+msgstr "Texto a ser exibido no rodapé dos relatórios."
+
+msgctxt "help:company.company,header:"
+msgid "The text to display on report headers."
+msgstr "Texto a ser exibido no cabeçalho dos relatórios."
+
+msgctxt "help:company.company,parent:"
+msgid "Add the company below the parent."
+msgstr "Adicione a empresa abaixo do pai."
+
+msgctxt "help:company.company,timezone:"
+msgid "Used to compute the today date."
+msgstr "Usado para computar a data de hoje."
+
+msgctxt "help:company.employee,company:"
+msgid "The company to which the employee belongs."
+msgstr "A empresa a qual o empregado pertence."
+
+msgctxt "help:company.employee,end_date:"
+msgid "When the employee leaves the company."
+msgstr "Quando o empregado sai da empresa."
+
+msgctxt "help:company.employee,party:"
+msgid "The party which represents the employee."
+msgstr "A pessoa que representa o empregado."
+
+msgctxt "help:company.employee,start_date:"
+msgid "When the employee joins the company."
+msgstr "Quando o empregado entra na empresa."
+
msgctxt "help:ir.cron,companies:"
msgid "Companies registered for this cron"
msgstr "Empresas registradas para este cron"
+msgctxt "help:ir.sequence,company:"
+msgid "Restrict the sequence usage to the company."
+msgstr "Restringe a sequência usada pela empresa."
+
+msgctxt "help:ir.sequence.strict,company:"
+msgid "Restrict the sequence usage to the company."
+msgstr "Restringe a sequência usada pela empresa."
+
+msgctxt "help:res.user,company:"
+msgid "Select the company to work for."
+msgstr "Selecione a empresa a trabalhar para."
+
+msgctxt "help:res.user,employee:"
+msgid "Select the employee to make the user behave as such."
+msgstr "Selecione o empregado para fazer com que o usuário o represente."
+
+msgctxt "help:res.user,employees:"
+msgid "Add employees to grant the user access to them."
+msgstr "Adicione empregados para que os usuários tenham acesso a eles."
+
+msgctxt "help:res.user,main_company:"
+msgid "Grant access to the company and its children."
+msgstr "Permitir acesso à empresa e seus filhos."
+
msgctxt "model:company.company,name:"
msgid "Company"
msgstr "Empresa"
diff --git a/locale/ru.po b/locale/ru.po
index 616a15f..1fd7244 100644
--- a/locale/ru.po
+++ b/locale/ru.po
@@ -139,21 +139,28 @@ msgctxt "field:ir.cron-company.company,write_uid:"
msgid "Write User"
msgstr "Изменено пользователем"
-msgctxt "field:ir.property,company:"
+msgctxt "field:ir.sequence,company:"
msgid "Company"
msgstr "Организация"
-msgctxt "field:ir.sequence,company:"
+msgctxt "field:ir.sequence.strict,company:"
msgid "Company"
msgstr "Организация"
-msgctxt "field:ir.sequence.strict,company:"
+#, fuzzy
+msgctxt "field:party.configuration.party_lang,company:"
+msgid "Company"
+msgstr "Организация"
+
+#, fuzzy
+msgctxt "field:party.party.lang,company:"
msgid "Company"
msgstr "Организация"
+#, fuzzy
msgctxt "field:res.user,companies:"
-msgid "Current Companies"
-msgstr "Текущие организации"
+msgid "Companies"
+msgstr "Организация"
msgctxt "field:res.user,company:"
msgid "Current Company"
@@ -203,10 +210,78 @@ msgctxt "field:res.user-company.employee,write_uid:"
msgid "Write User"
msgstr "Изменено пользователем"
+msgctxt "help:company.company,childs:"
+msgid "Add children below the company."
+msgstr ""
+
+msgctxt "help:company.company,currency:"
+msgid "The main currency for the company."
+msgstr ""
+
+msgctxt "help:company.company,employees:"
+msgid "Add employees to the company."
+msgstr ""
+
+msgctxt "help:company.company,footer:"
+msgid "The text to display on report footers."
+msgstr ""
+
+msgctxt "help:company.company,header:"
+msgid "The text to display on report headers."
+msgstr ""
+
+msgctxt "help:company.company,parent:"
+msgid "Add the company below the parent."
+msgstr ""
+
+msgctxt "help:company.company,timezone:"
+msgid "Used to compute the today date."
+msgstr ""
+
+msgctxt "help:company.employee,company:"
+msgid "The company to which the employee belongs."
+msgstr ""
+
+msgctxt "help:company.employee,end_date:"
+msgid "When the employee leaves the company."
+msgstr ""
+
+msgctxt "help:company.employee,party:"
+msgid "The party which represents the employee."
+msgstr ""
+
+msgctxt "help:company.employee,start_date:"
+msgid "When the employee joins the company."
+msgstr ""
+
msgctxt "help:ir.cron,companies:"
msgid "Companies registered for this cron"
msgstr "Организации зарегистрированные для этого планировщика"
+msgctxt "help:ir.sequence,company:"
+msgid "Restrict the sequence usage to the company."
+msgstr ""
+
+msgctxt "help:ir.sequence.strict,company:"
+msgid "Restrict the sequence usage to the company."
+msgstr ""
+
+msgctxt "help:res.user,company:"
+msgid "Select the company to work for."
+msgstr ""
+
+msgctxt "help:res.user,employee:"
+msgid "Select the employee to make the user behave as such."
+msgstr ""
+
+msgctxt "help:res.user,employees:"
+msgid "Add employees to grant the user access to them."
+msgstr ""
+
+msgctxt "help:res.user,main_company:"
+msgid "Grant access to the company and its children."
+msgstr ""
+
msgctxt "model:company.company,name:"
msgid "Company"
msgstr "Организация"
diff --git a/locale/sl.po b/locale/sl.po
index 6daa48e..1a2bc8b 100644
--- a/locale/sl.po
+++ b/locale/sl.po
@@ -74,10 +74,9 @@ msgctxt "field:company.employee,create_uid:"
msgid "Create User"
msgstr "Izdelal"
-#, fuzzy
msgctxt "field:company.employee,end_date:"
msgid "End Date"
-msgstr "Konec amortizacije"
+msgstr "Zapustil"
msgctxt "field:company.employee,id:"
msgid "ID"
@@ -139,21 +138,25 @@ msgctxt "field:ir.cron-company.company,write_uid:"
msgid "Write User"
msgstr "Zapisal"
-msgctxt "field:ir.property,company:"
+msgctxt "field:ir.sequence,company:"
msgid "Company"
msgstr "Družba"
-msgctxt "field:ir.sequence,company:"
+msgctxt "field:ir.sequence.strict,company:"
msgid "Company"
msgstr "Družba"
-msgctxt "field:ir.sequence.strict,company:"
+msgctxt "field:party.configuration.party_lang,company:"
+msgid "Company"
+msgstr "Družba"
+
+msgctxt "field:party.party.lang,company:"
msgid "Company"
msgstr "Družba"
msgctxt "field:res.user,companies:"
-msgid "Current Companies"
-msgstr "Trenutne družbe"
+msgid "Companies"
+msgstr "Družbe"
msgctxt "field:res.user,company:"
msgid "Current Company"
@@ -169,7 +172,7 @@ msgstr "Zaposlenci"
msgctxt "field:res.user,main_company:"
msgid "Main Company"
-msgstr "Glavno družba"
+msgstr "Glavna družba"
msgctxt "field:res.user-company.employee,create_date:"
msgid "Create Date"
@@ -203,10 +206,78 @@ msgctxt "field:res.user-company.employee,write_uid:"
msgid "Write User"
msgstr "Zapisal"
+msgctxt "help:company.company,childs:"
+msgid "Add children below the company."
+msgstr "Dodajanje hčerinskih družb."
+
+msgctxt "help:company.company,currency:"
+msgid "The main currency for the company."
+msgstr "Glavna valuta družbe."
+
+msgctxt "help:company.company,employees:"
+msgid "Add employees to the company."
+msgstr "Dodaj družbi zaposlence."
+
+msgctxt "help:company.company,footer:"
+msgid "The text to display on report footers."
+msgstr "Besedilo za prikaz v nogi poročil."
+
+msgctxt "help:company.company,header:"
+msgid "The text to display on report headers."
+msgstr "Besedilo za prikaz v glavi poročil."
+
+msgctxt "help:company.company,parent:"
+msgid "Add the company below the parent."
+msgstr "Dodajanje družbe matični družbi."
+
+msgctxt "help:company.company,timezone:"
+msgid "Used to compute the today date."
+msgstr "Se uporablja za izračun današnjega datuma."
+
+msgctxt "help:company.employee,company:"
+msgid "The company to which the employee belongs."
+msgstr "Družba, ki ji pripada zaposlenec."
+
+msgctxt "help:company.employee,end_date:"
+msgid "When the employee leaves the company."
+msgstr "Datum, ko zaposlenec zapusti družbo."
+
+msgctxt "help:company.employee,party:"
+msgid "The party which represents the employee."
+msgstr "Partner, ki predstavlja zaposlenca."
+
+msgctxt "help:company.employee,start_date:"
+msgid "When the employee joins the company."
+msgstr "Datum, ko zaposlenec vstopi v družbo."
+
msgctxt "help:ir.cron,companies:"
msgid "Companies registered for this cron"
msgstr "Družbe, registrirana na ta razporejevalnik"
+msgctxt "help:ir.sequence,company:"
+msgid "Restrict the sequence usage to the company."
+msgstr "Omeji uporabo šifranta na družbo."
+
+msgctxt "help:ir.sequence.strict,company:"
+msgid "Restrict the sequence usage to the company."
+msgstr "Omeji uporabo šifranta na družbo."
+
+msgctxt "help:res.user,company:"
+msgid "Select the company to work for."
+msgstr "Izberite družbo za delo."
+
+msgctxt "help:res.user,employee:"
+msgid "Select the employee to make the user behave as such."
+msgstr "Poveži uporabniško ime z zaposlencem."
+
+msgctxt "help:res.user,employees:"
+msgid "Add employees to grant the user access to them."
+msgstr "Dodeli dostop preko uporabniškega imena izbranim zaposlencem."
+
+msgctxt "help:res.user,main_company:"
+msgid "Grant access to the company and its children."
+msgstr "Odobrite dostop do družbe in hčerinskih podjetij."
+
msgctxt "model:company.company,name:"
msgid "Company"
msgstr "Družba"
diff --git a/locale/zh_CN.po b/locale/zh_CN.po
index 4e84d33..21d444c 100644
--- a/locale/zh_CN.po
+++ b/locale/zh_CN.po
@@ -160,20 +160,24 @@ msgctxt "field:ir.cron-company.company,write_uid:"
msgid "Write User"
msgstr "写入帐号"
-msgctxt "field:ir.property,company:"
+msgctxt "field:ir.sequence,company:"
msgid "Company"
msgstr ""
-msgctxt "field:ir.sequence,company:"
+msgctxt "field:ir.sequence.strict,company:"
msgid "Company"
msgstr ""
-msgctxt "field:ir.sequence.strict,company:"
+msgctxt "field:party.configuration.party_lang,company:"
+msgid "Company"
+msgstr ""
+
+msgctxt "field:party.party.lang,company:"
msgid "Company"
msgstr ""
msgctxt "field:res.user,companies:"
-msgid "Current Companies"
+msgid "Companies"
msgstr ""
msgctxt "field:res.user,company:"
@@ -231,10 +235,78 @@ msgctxt "field:res.user-company.employee,write_uid:"
msgid "Write User"
msgstr "写入帐号"
+msgctxt "help:company.company,childs:"
+msgid "Add children below the company."
+msgstr ""
+
+msgctxt "help:company.company,currency:"
+msgid "The main currency for the company."
+msgstr ""
+
+msgctxt "help:company.company,employees:"
+msgid "Add employees to the company."
+msgstr ""
+
+msgctxt "help:company.company,footer:"
+msgid "The text to display on report footers."
+msgstr ""
+
+msgctxt "help:company.company,header:"
+msgid "The text to display on report headers."
+msgstr ""
+
+msgctxt "help:company.company,parent:"
+msgid "Add the company below the parent."
+msgstr ""
+
+msgctxt "help:company.company,timezone:"
+msgid "Used to compute the today date."
+msgstr ""
+
+msgctxt "help:company.employee,company:"
+msgid "The company to which the employee belongs."
+msgstr ""
+
+msgctxt "help:company.employee,end_date:"
+msgid "When the employee leaves the company."
+msgstr ""
+
+msgctxt "help:company.employee,party:"
+msgid "The party which represents the employee."
+msgstr ""
+
+msgctxt "help:company.employee,start_date:"
+msgid "When the employee joins the company."
+msgstr ""
+
msgctxt "help:ir.cron,companies:"
msgid "Companies registered for this cron"
msgstr ""
+msgctxt "help:ir.sequence,company:"
+msgid "Restrict the sequence usage to the company."
+msgstr ""
+
+msgctxt "help:ir.sequence.strict,company:"
+msgid "Restrict the sequence usage to the company."
+msgstr ""
+
+msgctxt "help:res.user,company:"
+msgid "Select the company to work for."
+msgstr ""
+
+msgctxt "help:res.user,employee:"
+msgid "Select the employee to make the user behave as such."
+msgstr ""
+
+msgctxt "help:res.user,employees:"
+msgid "Add employees to grant the user access to them."
+msgstr ""
+
+msgctxt "help:res.user,main_company:"
+msgid "Grant access to the company and its children."
+msgstr ""
+
msgctxt "model:company.company,name:"
msgid "Company"
msgstr ""
diff --git a/model.py b/model.py
new file mode 100644
index 0000000..df7ae74
--- /dev/null
+++ b/model.py
@@ -0,0 +1,37 @@
+# This file is part of Tryton. The COPYRIGHT file at the toplevel of this
+# repository contains the full copyright notices and license terms.
+from trytond.model import MultiValueMixin, ValueMixin, fields
+from trytond.transaction import Transaction
+
+__all__ = ['CompanyMultiValueMixin', 'CompanyValueMixin']
+
+
+class CompanyMultiValueMixin(MultiValueMixin):
+
+ def multivalue_records(self, field):
+ Value = self.multivalue_model(field)
+ records = super(CompanyMultiValueMixin, self).multivalue_records(field)
+ if issubclass(Value, CompanyValueMixin):
+ # Sort to get record with empty company at the end
+ # and so give priority to record with company filled.
+ records = sorted(records, key=lambda r: r.company is None)
+ return records
+
+ def get_multivalue(self, name, **pattern):
+ Value = self.multivalue_model(name)
+ if issubclass(Value, CompanyValueMixin):
+ pattern.setdefault('company', Transaction().context.get('company'))
+ return super(CompanyMultiValueMixin, self).get_multivalue(
+ name, **pattern)
+
+ def set_multivalue(self, name, value, **pattern):
+ Value = self.multivalue_model(name)
+ if issubclass(Value, CompanyValueMixin):
+ pattern.setdefault('company', Transaction().context.get('company'))
+ return super(CompanyMultiValueMixin, self).set_multivalue(
+ name, value, **pattern)
+
+
+class CompanyValueMixin(ValueMixin):
+ company = fields.Many2One(
+ 'company.company', "Company", select=True, ondelete='CASCADE')
diff --git a/party.py b/party.py
index ff84423..2af8083 100644
--- a/party.py
+++ b/party.py
@@ -1,23 +1,69 @@
# This file is part of Tryton. The COPYRIGHT file at the top level of
# this repository contains the full copyright notices and license terms.
-from trytond.pyson import Eval
+from trytond import backend
from trytond.pool import PoolMeta
+from trytond.tools.multivalue import migrate_property
-__all__ = ['PartyConfiguration', 'PartyReplace']
+from .model import CompanyMultiValueMixin, CompanyValueMixin
+__all__ = ['Configuration', 'PartyConfigurationLang', 'Party', 'PartyLang',
+ 'PartyReplace']
-class PartyConfiguration:
+
+class Configuration(CompanyMultiValueMixin):
__metaclass__ = PoolMeta
__name__ = 'party.configuration'
+
+class PartyConfigurationLang(CompanyValueMixin):
+ __metaclass__ = PoolMeta
+ __name__ = 'party.configuration.party_lang'
+
@classmethod
- def __setup__(cls):
- super(PartyConfiguration, cls).__setup__()
+ def __register__(cls, module_name):
+ TableHandler = backend.get('TableHandler')
+ exist = TableHandler.table_exist(cls._table)
+ if exist:
+ table = TableHandler(cls, module_name)
+ exist &= table.column_exist('company')
- cls.party_sequence.domain = [
- cls.party_sequence.domain,
- ('company', 'in', [Eval('context', {}).get('company'), None]),
- ]
+ super(PartyConfigurationLang, cls).__register__(module_name)
+
+ if not exist:
+ # Re-migrate with company
+ migrate_property(
+ 'party.configuration', cls._configuration_value_field,
+ cls, cls._configuration_value_field, fields=['company'])
+
+
+class Party(CompanyMultiValueMixin):
+ __metaclass__ = PoolMeta
+ __name__ = 'party.party'
+
+
+class PartyLang(CompanyValueMixin):
+ __metaclass__ = PoolMeta
+ __name__ = 'party.party.lang'
+
+ @classmethod
+ def __register__(cls, module_name):
+ TableHandler = backend.get('TableHandler')
+ exist = TableHandler.table_exist(cls._table)
+ if exist:
+ table = TableHandler(cls, module_name)
+ exist &= table.column_exist('company')
+
+ super(PartyLang, cls).__register__(module_name)
+
+ if not exist:
+ # Re-migrate with company
+ cls._migrate_property([], [], [])
+
+ @classmethod
+ def _migrate_property(cls, field_names, value_names, fields):
+ fields.append('company')
+ super(PartyLang, cls)._migrate_property(
+ field_names, value_names, fields)
class PartyReplace:
diff --git a/setup.py b/setup.py
index 96a6a8b..495afc7 100644
--- a/setup.py
+++ b/setup.py
@@ -79,7 +79,7 @@ setup(name=name,
'Intended Audience :: Financial and Insurance Industry',
'Intended Audience :: Legal Industry',
'Intended Audience :: Manufacturing',
- 'License :: OSI Approved :: GNU General Public License (GPL)',
+ 'License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)',
'Natural Language :: Bulgarian',
'Natural Language :: Catalan',
'Natural Language :: Chinese (Simplified)',
diff --git a/tryton.cfg b/tryton.cfg
index 1500066..74483fa 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=4.2.0
+version=4.4.0
depends:
currency
ir
diff --git a/trytond_company.egg-info/PKG-INFO b/trytond_company.egg-info/PKG-INFO
index 29f2880..7256bcb 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: 4.2.0
+Version: 4.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/4.2/
+Download-URL: http://downloads.tryton.org/4.4/
Description: trytond_company
===============
@@ -52,7 +52,7 @@ Classifier: Intended Audience :: Developers
Classifier: Intended Audience :: Financial and Insurance Industry
Classifier: Intended Audience :: Legal Industry
Classifier: Intended Audience :: Manufacturing
-Classifier: License :: OSI Approved :: GNU General Public License (GPL)
+Classifier: License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)
Classifier: Natural Language :: Bulgarian
Classifier: Natural Language :: Catalan
Classifier: Natural Language :: Chinese (Simplified)
diff --git a/trytond_company.egg-info/SOURCES.txt b/trytond_company.egg-info/SOURCES.txt
index d5c8949..d37007e 100644
--- a/trytond_company.egg-info/SOURCES.txt
+++ b/trytond_company.egg-info/SOURCES.txt
@@ -15,6 +15,7 @@ tryton.cfg
./cron.py
./cron.xml
./letter.odt
+./model.py
./party.py
./tryton.cfg
./locale/bg.po
@@ -45,8 +46,6 @@ tryton.cfg
./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
@@ -84,8 +83,6 @@ 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
diff --git a/trytond_company.egg-info/requires.txt b/trytond_company.egg-info/requires.txt
index dbc6320..e18fb76 100644
--- a/trytond_company.egg-info/requires.txt
+++ b/trytond_company.egg-info/requires.txt
@@ -1,6 +1,6 @@
-trytond_currency >= 4.2, < 4.3
-trytond_party >= 4.2, < 4.3
-trytond >= 4.2, < 4.3
+trytond_currency >= 4.4, < 4.5
+trytond_party >= 4.4, < 4.5
+trytond >= 4.4, < 4.5
[timezone]
pytz
diff --git a/view/property_form.xml b/view/property_form.xml
deleted file mode 100644
index 474ad2f..0000000
--- a/view/property_form.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?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. -->
-<data>
- <xpath expr="/form/field[@name='field']" position="after">
- <label name="company"/>
- <field name="company" colspan="3"/>
- </xpath>
-</data>
diff --git a/view/property_tree.xml b/view/property_tree.xml
deleted file mode 100644
index fb3f503..0000000
--- a/view/property_tree.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?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. -->
-<data>
- <xpath expr="/tree/field[@name='field']" position="after">
- <field name="company"/>
- </xpath>
-</data>
--
tryton-modules-company
More information about the tryton-debian-vcs
mailing list