diff --git a/addons/account/account.py b/addons/account/account.py
index 2fbc32b1bfd..4d9baf36a17 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -729,8 +729,7 @@ class account_journal(osv.osv):
'currency': fields.many2one('res.currency', 'Currency', help='The currency used to enter statement'),
'entry_posted': fields.boolean('Autopost Created Moves', help='Check this box to automatically post entries of this journal. Note that legally, some entries may be automatically posted when the source document is validated (Invoices), whatever the status of this field.'),
'company_id': fields.many2one('res.company', 'Company', required=True, select=1, help="Company related to this journal"),
- 'allow_date':fields.boolean('Check Date in Period', help= 'If set to True then do not accept the entry if the entry date is not into the period dates'),
-
+ 'allow_date':fields.boolean('Check Date in Period', help= 'If checked, the entry won\'t be created if the entry date is not included into the selected period'),
'profit_account_id' : fields.many2one('account.account', 'Profit Account'),
'loss_account_id' : fields.many2one('account.account', 'Loss Account'),
'internal_account_id' : fields.many2one('account.account', 'Internal Transfers Account', select=1),
diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py
index d437074023a..cf8bb5133fd 100644
--- a/addons/account/account_bank_statement.py
+++ b/addons/account/account_bank_statement.py
@@ -495,6 +495,7 @@ class account_bank_statement(osv.osv):
ctx = (context or {}).copy()
ctx['journal_id'] = self.browse(cr, uid, ids[0], context=context).journal_id.id
return {
+ 'name': _('Journal Items'),
'view_type':'form',
'view_mode':'tree',
'res_model':'account.move.line',
diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 3cf10f477e2..faa2aaee3be 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -125,7 +125,7 @@
-
+
@@ -251,7 +251,7 @@
-
+
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 790f34a4f7f..7cbf0b27036 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -1270,12 +1270,11 @@
account.move
@@ -1601,7 +1599,6 @@
diff --git a/addons/account_analytic_analysis/account_analytic_analysis.py b/addons/account_analytic_analysis/account_analytic_analysis.py
index a0d14e889cb..faf4e29c93c 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis.py
+++ b/addons/account_analytic_analysis/account_analytic_analysis.py
@@ -622,7 +622,7 @@ class account_analytic_account(osv.osv):
def onchange_invoice_on_timesheets(self, cr, uid, ids, invoice_on_timesheets, context=None):
if not invoice_on_timesheets:
- return {}
+ return {'value': {'to_invoice': False}}
result = {'value': {'use_timesheets': True}}
try:
to_invoice = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'hr_timesheet_invoice', 'timesheet_invoice_factor1')
diff --git a/addons/account_analytic_plans/account_analytic_plans_view.xml b/addons/account_analytic_plans/account_analytic_plans_view.xml
index 05955d6f5cd..69646faf8a0 100644
--- a/addons/account_analytic_plans/account_analytic_plans_view.xml
+++ b/addons/account_analytic_plans/account_analytic_plans_view.xml
@@ -20,10 +20,10 @@
account.move
-
+
-
+
diff --git a/addons/account_asset/account_asset.py b/addons/account_asset/account_asset.py
index 6792682fdbe..f4e5d17a8e0 100644
--- a/addons/account_asset/account_asset.py
+++ b/addons/account_asset/account_asset.py
@@ -352,6 +352,7 @@ class account_asset_asset(osv.osv):
context = {}
context.update({'search_default_asset_id': ids, 'default_asset_id': ids})
return {
+ 'name': _('Journal Items'),
'view_type': 'form',
'view_mode': 'tree,form',
'res_model': 'account.move.line',
diff --git a/addons/account_check_writing/account.py b/addons/account_check_writing/account.py
index 035e3a710b0..2bdb0dc734d 100644
--- a/addons/account_check_writing/account.py
+++ b/addons/account_check_writing/account.py
@@ -26,7 +26,7 @@ class account_journal(osv.osv):
_columns = {
'allow_check_writing': fields.boolean('Allow Check writing', help='Check this if the journal is to be used for writing checks.'),
- 'use_preprint_check': fields.boolean('Use Preprinted Check'),
+ 'use_preprint_check': fields.boolean('Use Preprinted Check', help='Check if you use a preformated sheet for check'),
}
diff --git a/addons/account_payment/wizard/account_payment_populate_statement_view.xml b/addons/account_payment/wizard/account_payment_populate_statement_view.xml
index acc85d661c2..2133f3bece9 100644
--- a/addons/account_payment/wizard/account_payment_populate_statement_view.xml
+++ b/addons/account_payment/wizard/account_payment_populate_statement_view.xml
@@ -8,10 +8,10 @@
diff --git a/addons/analytic/analytic.py b/addons/analytic/analytic.py
index 4f1de653ae1..894a2a2d6c5 100644
--- a/addons/analytic/analytic.py
+++ b/addons/analytic/analytic.py
@@ -253,7 +253,7 @@ class account_analytic_account(osv.osv):
def check_recursion(self, cr, uid, ids, context=None, parent=None):
return super(account_analytic_account, self)._check_recursion(cr, uid, ids, context=context, parent=parent)
- _order = 'name asc'
+ _order = 'code, name asc'
_constraints = [
(check_recursion, 'Error! You cannot create recursive analytic accounts.', ['parent_id']),
]
diff --git a/addons/auth_crypt/i18n/gl.po b/addons/auth_crypt/i18n/gl.po
index 1152694462b..023baec6142 100644
--- a/addons/auth_crypt/i18n/gl.po
+++ b/addons/auth_crypt/i18n/gl.po
@@ -1,78 +1,28 @@
# Galician translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR , 2011.
+# FIRST AUTHOR , 2014.
#
msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
-"PO-Revision-Date: 2011-02-15 15:37+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2014-02-05 16:38+0000\n"
"Last-Translator: FULL NAME \n"
"Language-Team: Galician \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2014-02-06 05:33+0000\n"
+"X-Generator: Launchpad (build 16916)\n"
-#. module: base_crypt
-#: model:ir.model,name:base_crypt.model_res_users
+#. module: auth_crypt
+#: field:res.users,password_crypt:0
+msgid "Encrypted Password"
+msgstr "Contrasinal encriptado"
+
+#. module: auth_crypt
+#: model:ir.model,name:auth_crypt.model_res_users
msgid "Users"
-msgstr ""
-
-#~ msgid ""
-#~ "This module replaces the cleartext password in the database with a password "
-#~ "hash,\n"
-#~ "preventing anyone from reading the original password.\n"
-#~ "For your existing user base, the removal of the cleartext passwords occurs "
-#~ "the first time\n"
-#~ "a user logs into the database, after installing base_crypt.\n"
-#~ "After installing this module it won't be possible to recover a forgotten "
-#~ "password for your\n"
-#~ "users, the only solution is for an admin to set a new password.\n"
-#~ "\n"
-#~ "Note: installing this module does not mean you can ignore basic security "
-#~ "measures,\n"
-#~ "as the password is still transmitted unencrypted on the network (by the "
-#~ "client),\n"
-#~ "unless you are using a secure protocol such as XML-RPCS.\n"
-#~ " "
-#~ msgstr ""
-#~ "Este módulo substitúe os contrasinais en texto normal na base de datos a un "
-#~ "hash de contrasinal,\n"
-#~ "impedindo que calquera persoa lea o contrasinal orixinal.\n"
-#~ "Para a súa base de usuarios existentes, a eliminación das contrasinais en "
-#~ "texto plano ocorre a primeira vez que\n"
-#~ "un usuario se conecta á base de datos, trala instalación de base_crypt.\n"
-#~ "Despois de instalar este módulo non será posible recuperar un contrasinal "
-#~ "esquecido para o seu\n"
-#~ "usuario, a única solución é que un administrador estableza un novo "
-#~ "contrasinal.\n"
-#~ "\n"
-#~ "Nota: A instalación deste módulo non significa que pode ignorar as medidas "
-#~ "básicas de seguridade,\n"
-#~ "como o contrasinal aínda se transmite sen cifrado na rede (polo cliente),\n"
-#~ "a menos que vostede esté a usar un protocolo seguro, como XML-RPCs.\n"
-#~ " "
-
-#, python-format
-#~ msgid "Error"
-#~ msgstr "Erro"
-
-#~ msgid "Base - Password Encryption"
-#~ msgstr "Base - Encriptación da contrasinal"
-
-#~ msgid "The chosen company is not in the allowed companies for this user"
-#~ msgstr "A compañía escollida non é unha compañía permitida para este usuario"
-
-#~ msgid "res.users"
-#~ msgstr "res.users"
-
-#, python-format
-#~ msgid "Please specify the password !"
-#~ msgstr "¡Por favor especifica a contrasinal!"
-
-#~ msgid "You can not have two users with the same login !"
-#~ msgstr "¡Non pode ter dous usuarios co mesmo login!"
+msgstr "Usuarios"
diff --git a/addons/auth_oauth_signup/__openerp__.py b/addons/auth_oauth_signup/__openerp__.py
index 8fc93f6c920..d3660f7c052 100644
--- a/addons/auth_oauth_signup/__openerp__.py
+++ b/addons/auth_oauth_signup/__openerp__.py
@@ -2,7 +2,7 @@
##############################################################################
#
# OpenERP, Open Source Management Solution
-# Copyright (C) 2010-2012 OpenERP SA ().
+# Copyright (C) 2010-2014 OpenERP SA ().
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
@@ -30,7 +30,9 @@ Allow users to sign up through OAuth2 Provider.
'author': 'OpenERP SA',
'website': 'http://www.openerp.com',
'depends': ['auth_oauth', 'auth_signup'],
- 'data': [],
+ 'data': [
+ 'views/auth_oauth_signup.xml',
+ ],
'js': [],
'css': [],
'qweb': [],
diff --git a/addons/auth_oauth_signup/i18n/cs.po b/addons/auth_oauth_signup/i18n/cs.po
index ecedebe8f1f..bf6f59f24fa 100644
--- a/addons/auth_oauth_signup/i18n/cs.po
+++ b/addons/auth_oauth_signup/i18n/cs.po
@@ -8,16 +8,16 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2013-03-31 16:45+0000\n"
-"Last-Translator: FULL NAME \n"
+"PO-Revision-Date: 2014-02-03 16:54+0000\n"
+"Last-Translator: Jakub Drozd \n"
"Language-Team: Czech \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-01-28 06:41+0000\n"
-"X-Generator: Launchpad (build 16914)\n"
+"X-Launchpad-Export-Date: 2014-02-04 05:51+0000\n"
+"X-Generator: Launchpad (build 16916)\n"
#. module: auth_oauth_signup
#: model:ir.model,name:auth_oauth_signup.model_res_users
msgid "Users"
-msgstr ""
+msgstr "Uživatelé"
diff --git a/addons/auth_oauth_signup/i18n/gl.po b/addons/auth_oauth_signup/i18n/gl.po
new file mode 100644
index 00000000000..463caea11c3
--- /dev/null
+++ b/addons/auth_oauth_signup/i18n/gl.po
@@ -0,0 +1,23 @@
+# Galician translation for openobject-addons
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR , 2014.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2014-02-05 16:37+0000\n"
+"Last-Translator: FULL NAME \n"
+"Language-Team: Galician \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2014-02-06 05:33+0000\n"
+"X-Generator: Launchpad (build 16916)\n"
+
+#. module: auth_oauth_signup
+#: model:ir.model,name:auth_oauth_signup.model_res_users
+msgid "Users"
+msgstr "Usuarios"
diff --git a/addons/auth_oauth_signup/views/auth_oauth_signup.xml b/addons/auth_oauth_signup/views/auth_oauth_signup.xml
new file mode 100644
index 00000000000..139f36a4c0f
--- /dev/null
+++ b/addons/auth_oauth_signup/views/auth_oauth_signup.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
+
+