diff --git a/addons/account/__init__.py b/addons/account/__init__.py
index 98f7a7d5134..90fbdb83980 100644
--- a/addons/account/__init__.py
+++ b/addons/account/__init__.py
@@ -37,4 +37,6 @@ import ir_sequence
import company
import res_currency
import edi
+import res_config
+
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/__openerp__.py b/addons/account/__openerp__.py
index 850a8f49842..fba1bd8736f 100644
--- a/addons/account/__openerp__.py
+++ b/addons/account/__openerp__.py
@@ -125,6 +125,7 @@ module named account_voucher.
'board_account_view.xml',
"edi/invoice_action_data.xml",
"account_bank_view.xml",
+ "res_config_view.xml",
"account_pre_install.yml"
],
'demo_xml': [
diff --git a/addons/account/account_bank_view.xml b/addons/account/account_bank_view.xml
index 8d0b1aa5db3..df754da7f90 100644
--- a/addons/account/account_bank_view.xml
+++ b/addons/account/account_bank_view.xml
@@ -50,13 +50,5 @@
id="menu_action_bank_tree"
action="action_bank_tree"/>
-
-
-
-
- 4
-
-
-
diff --git a/addons/account/account_installer.xml b/addons/account/account_installer.xml
index 430d65e0bf9..8c2865ea9b9 100644
--- a/addons/account/account_installer.xml
+++ b/addons/account/account_installer.xml
@@ -62,48 +62,5 @@
automatic
-
- Review your Financial Accounts
- ir.actions.act_window
- account.account
- form
- tree,form
- {'config_invisible': False}
-
-
-
-
-
-
-
-
-
- Review your Financial Journals
- ir.actions.act_window
- account.journal
- form
- tree,form
- Setup your accounting journals. For bank accounts, it's better to use the 'Setup Your Bank Accounts' tool that will automatically create the accounts and journals for you.
-
-
-
-
-
-
-
-
- Review your Payment Terms
- ir.actions.act_window
- account.payment.term
- form
- tree,form
- Payment terms define the conditions to pay a customer or supplier invoice in one or several payments. Customers periodic reminders will use the payment terms for each letter. Each customer or supplier can be assigned to one of these payment terms.
-
-
-
-
-
-
-
diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 6d499b4d3ad..ef6c2510c54 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -303,7 +303,7 @@
-
+
@@ -350,7 +350,7 @@
-
+
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index b096ce7c0f6..66e5201e214 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -2505,15 +2505,6 @@ action = pool.get('res.config').next(cr, uid, [], context)
New Company Financial Setting
-
-
-
account.account.graph
account.account
diff --git a/addons/account/company.py b/addons/account/company.py
index 4ad4d1226d7..e961fa563e4 100644
--- a/addons/account/company.py
+++ b/addons/account/company.py
@@ -24,6 +24,7 @@ from osv import fields, osv
class res_company(osv.osv):
_inherit = "res.company"
_columns = {
+ 'expects_chart_of_accounts': fields.boolean('Expects a Chart of Accounts'),
'paypal_account': fields.char("Paypal Account", size=128, help="Paypal username (usually email) for receiving online payments."),
'overdue_msg': fields.text('Overdue Payments Message', translate=True),
'property_reserve_and_surplus_account': fields.property(
@@ -37,6 +38,7 @@ class res_company(osv.osv):
}
_defaults = {
+ 'expects_chart_of_accounts': True,
'overdue_msg': '''Our records indicate that the following payments are still due. If the amount
has already been paid, please disregard this notice. However, if you have any
queries regarding your account, please contact us.
diff --git a/addons/account/i18n/hi.po b/addons/account/i18n/hi.po
index d4672f43932..41be2943728 100644
--- a/addons/account/i18n/hi.po
+++ b/addons/account/i18n/hi.po
@@ -8,20 +8,20 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2010-12-21 08:18+0000\n"
-"Last-Translator: Sanjay Kumar \n"
+"PO-Revision-Date: 2012-04-03 07:14+0000\n"
+"Last-Translator: Vibhav Pant \n"
"Language-Team: Hindi \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:19+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-04-04 04:41+0000\n"
+"X-Generator: Launchpad (build 15055)\n"
#. module: account
#: view:account.invoice.report:0
#: view:analytic.entries.report:0
msgid "last month"
-msgstr ""
+msgstr "पहले का महिना"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -165,18 +165,18 @@ msgstr "चेतावनी!"
#: code:addons/account/account.py:3112
#, python-format
msgid "Miscellaneous Journal"
-msgstr ""
+msgstr "विविध जर्नल"
#. module: account
#: field:account.fiscal.position.account,account_src_id:0
#: field:account.fiscal.position.account.template,account_src_id:0
msgid "Account Source"
-msgstr ""
+msgstr "खाता श्रोत"
#. module: account
#: model:ir.actions.act_window,name:account.act_acc_analytic_acc_5_report_hr_timesheet_invoice_journal
msgid "All Analytic Entries"
-msgstr ""
+msgstr "सभी विश्लेषणात्मक प्रविष्टियाँ"
#. module: account
#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
@@ -186,7 +186,7 @@ msgstr ""
#. module: account
#: field:accounting.report,label_filter:0
msgid "Column Label"
-msgstr ""
+msgstr "स्तंभ लेबल"
#. module: account
#: code:addons/account/wizard/account_move_journal.py:95
@@ -206,7 +206,7 @@ msgstr ""
#: model:ir.actions.act_window,name:account.action_account_tax_template_form
#: model:ir.ui.menu,name:account.menu_action_account_tax_template_form
msgid "Tax Templates"
-msgstr ""
+msgstr "टैक्स टेम्पलेट्स"
#. module: account
#: model:ir.model,name:account.model_account_tax
diff --git a/addons/account/res_config.py b/addons/account/res_config.py
new file mode 100644
index 00000000000..ebdf84be35e
--- /dev/null
+++ b/addons/account/res_config.py
@@ -0,0 +1,282 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# OpenERP, Open Source Business Applications
+# Copyright (C) 2004-2012 OpenERP S.A. ().
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see .
+#
+##############################################################################
+
+import time
+import datetime
+from dateutil.relativedelta import relativedelta
+from operator import itemgetter
+from os.path import join as opj
+
+from tools.translate import _
+from osv import osv, fields
+import tools
+
+class account_config_settings(osv.osv_memory):
+ _name = 'account.config.settings'
+ _inherit = 'res.config.settings'
+
+ _columns = {
+ 'company_id': fields.many2one('res.company', 'Company', required=True),
+ 'has_default_company': fields.boolean('Has default company', readonly=True),
+
+ 'expects_chart_of_accounts': fields.related('company_id', 'expects_chart_of_accounts', type='boolean',
+ string='Chart of Accounts for this Company'),
+ 'currency_id': fields.related('company_id', 'currency_id', type='many2one', relation='res.currency', required=True,
+ string='Main currency', help="Main currency of the company."),
+ 'paypal_account': fields.related('company_id', 'paypal_account', type='char', size=128,
+ string='Paypal account', help="Paypal account (email) for receiving online payments (credit card, etc.)"),
+ 'company_footer': fields.related('company_id', 'rml_footer2', type='char', size=250, readonly=True,
+ string='Bank Accounts on Reports', help="Bank accounts as printed on footer of reports."),
+
+ 'has_chart_of_accounts': fields.boolean('Company has a chart of accounts'),
+ 'chart_template_id': fields.many2one('account.chart.template', 'Chart Template', domain="[('visible','=', True)]"),
+ 'code_digits': fields.integer('# of Digits', help="No. of Digits to use for account code"),
+ 'seq_journal': fields.boolean('Separated Journal Sequences', help="Check this box if you want to use a different sequence for each created journal. Otherwise, all will use the same sequence."),
+ 'sale_tax': fields.many2one("account.tax.template", "Default Sale Tax"),
+ 'purchase_tax': fields.many2one("account.tax.template", "Default Purchase Tax"),
+ 'sale_tax_rate': fields.float('Sales Tax (%)'),
+ 'purchase_tax_rate': fields.float('Purchase Tax (%)'),
+ 'complete_tax_set': fields.boolean('Complete Set of Taxes', help='This boolean helps you to choose if you want to propose to the user to encode the sales and purchase rates or use the usual m2o fields. This last choice assumes that the set of tax defined for the chosen template is complete'),
+
+ 'has_fiscal_year': fields.boolean('Company has a fiscal year'),
+ 'date_start': fields.date('Start Date', required=True),
+ 'date_stop': fields.date('End Date', required=True),
+ 'period': fields.selection([('month', 'Monthly'), ('3months','3 Monthly')], 'Periods', required=True),
+
+ 'sale_journal_id': fields.many2one('account.journal', 'Sale Journal'),
+ 'sale_sequence_prefix': fields.related('sale_journal_id', 'sequence_id', 'prefix', type='char', string='Invoice Sequence'),
+ 'sale_sequence_next': fields.related('sale_journal_id', 'sequence_id', 'number_next', type='integer', string='Next Invoice Number'),
+ 'sale_refund_journal_id': fields.many2one('account.journal', 'Sale Refund Journal'),
+ 'sale_refund_sequence_prefix': fields.related('sale_refund_journal_id', 'sequence_id', 'prefix', type='char', string='Refund Sequence'),
+ 'sale_refund_sequence_next': fields.related('sale_refund_journal_id', 'sequence_id', 'number_next', type='integer', string='Next Refund Number'),
+ 'purchase_journal_id': fields.many2one('account.journal', 'Purchase Journal'),
+ 'purchase_sequence_prefix': fields.related('purchase_journal_id', 'sequence_id', 'prefix', type='char', string='Supplier Invoice Sequence'),
+ 'purchase_sequence_next': fields.related('purchase_journal_id', 'sequence_id', 'number_next', type='integer', string='Next Supplier Invoice Number'),
+ 'purchase_refund_journal_id': fields.many2one('account.journal', 'Purchase Refund Journal'),
+ 'purchase_refund_sequence_prefix': fields.related('purchase_refund_journal_id', 'sequence_id', 'prefix', type='char', string='Supplier Refund Sequence'),
+ 'purchase_refund_sequence_next': fields.related('purchase_refund_journal_id', 'sequence_id', 'number_next', type='integer', string='Next Supplier Refund Number'),
+
+ 'module_account_check_writing': fields.boolean('Support check writings',
+ help="""This allows you to check writing and printing.
+ This installs the module account_check_writing."""),
+ 'module_account_accountant': fields.boolean('Accountant Features',
+ help="""This allows you to access all the accounting features, like the journal items and the chart of accounts.
+ This installs the module account_accountant."""),
+ 'module_account_asset': fields.boolean('Assets Management',
+ help="""This allows you to manage the assets owned by a company or a person.
+ It keeps track of the depreciation occurred on those assets, and creates account move for those depreciation lines.
+ This installs the module account_asset."""),
+ 'module_account_budget': fields.boolean('Budgets Management',
+ help="""This allows accountants to manage analytic and crossovered budgets.
+ Once the master budgets and the budgets are defined,
+ the project managers can set the planned amount on each analytic account.
+ This installs the module account_budget."""),
+ 'module_account_payment': fields.boolean('Supplier Payment Orders',
+ help="""This allows you to create and manage your payment orders, with purposes to
+ * serve as base for an easy plug-in of various automated payment mechanisms, and
+ * provide a more efficient way to manage invoice payments.
+ This installs the module account_payment."""),
+ 'module_account_voucher': fields.boolean('Manage Customer Payments',
+ help="""This includes all the basic requirements of voucher entries for bank, cash, sales, purchase, expense, contra, etc.
+ This installs the module account_voucher."""),
+ 'module_account_followup': fields.boolean('Customer Follow-Ups',
+ help="""This allows to automate letters for unpaid invoices, with multi-level recalls.
+ This installs the module account_followup."""),
+ 'module_account_analytic_plans': fields.boolean('Support Multiple Analytic Plans',
+ help="""This allows to use several analytic plans, according to the general journal.
+ This installs the module account_analytic_plans."""),
+ 'module_account_analytic_default': fields.boolean('Rules for Analytic Assignation',
+ help="""Set default values for your analytic accounts.
+ Allows to automatically select analytic accounts based on criteria like product, partner, user, company, date.
+ This installs the module account_analytic_default."""),
+ 'module_account_invoice_layout': fields.boolean('Allow notes and subtotals',
+ help="""This provides some features to improve the layout of invoices.
+ It gives you the possibility to:
+ * order all the lines of an invoice
+ * add titles, comment lines, sub total lines
+ * draw horizontal lines and put page breaks.
+ This installs the module account_invoice_layout."""),
+
+ 'group_proforma_invoices': fields.boolean('Allow Pro-forma Invoices',
+ implied_group='account.group_proforma_invoices',
+ help="Allows you to put invoices in pro-forma state."),
+
+ 'default_sale_tax': fields.many2one('account.tax', 'Default Sale Tax'),
+ 'default_purchase_tax': fields.many2one('account.tax', 'Default Purchase Tax'),
+ }
+
+ def _default_company(self, cr, uid, context=None):
+ user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
+ return user.company_id.id
+
+ def _default_has_default_company(self, cr, uid, context=None):
+ count = self.pool.get('res.company').search_count(cr, uid, [], context=context)
+ return bool(count == 1)
+
+ _defaults = {
+ 'company_id': _default_company,
+ 'has_default_company': _default_has_default_company,
+ 'seq_journal': True,
+ 'date_start': lambda *a: time.strftime('%Y-01-01'),
+ 'date_stop': lambda *a: time.strftime('%Y-12-31'),
+ 'period': 'month',
+ }
+
+ def create(self, cr, uid, values, context=None):
+ id = super(account_config_settings, self).create(cr, uid, values, context)
+ # Hack: to avoid some nasty bug, related fields are not written upon record creation.
+ # Hence we write on those fields here.
+ vals = {}
+ for fname, field in self._columns.iteritems():
+ if isinstance(field, fields.related) and fname in values:
+ vals[fname] = values[fname]
+ self.write(cr, uid, [id], vals, context)
+ return id
+
+ def onchange_company_id(self, cr, uid, ids, company_id):
+ # update related fields
+ company = self.pool.get('res.company').browse(cr, uid, company_id)
+ has_chart_of_accounts = company_id not in self.pool.get('account.installer').get_unconfigured_cmp(cr, uid)
+ fiscalyear_count = self.pool.get('account.fiscalyear').search_count(cr, uid,
+ [('date_start', '<=', time.strftime('%Y-%m-%d')), ('date_stop', '>=', time.strftime('%Y-%m-%d')),
+ ('company_id', '=', company_id)])
+ values = {
+ 'expects_chart_of_accounts': company.expects_chart_of_accounts,
+ 'currency_id': company.currency_id.id,
+ 'paypal_account': company.paypal_account,
+ 'company_footer': company.rml_footer2,
+ 'has_chart_of_accounts': has_chart_of_accounts,
+ 'has_fiscal_year': bool(fiscalyear_count),
+ 'chart_template_id': False,
+ }
+ # update journals and sequences
+ for journal_type in ('sale', 'sale_refund', 'purchase', 'purchase_refund'):
+ for suffix in ('_journal_id', '_sequence_prefix', '_sequence_next'):
+ values[journal_type + suffix] = False
+ journal_obj = self.pool.get('account.journal')
+ journal_ids = journal_obj.search(cr, uid, [('company_id', '=', company_id)])
+ for journal in journal_obj.browse(cr, uid, journal_ids):
+ if journal.type in ('sale', 'sale_refund', 'purchase', 'purchase_refund'):
+ values.update({
+ journal.type + '_journal_id': journal.id,
+ journal.type + '_sequence_prefix': journal.sequence_id.prefix,
+ journal.type + '_sequence_next': journal.sequence_id.number_next,
+ })
+ # update taxes
+ ir_values = self.pool.get('ir.values')
+ taxes_id = ir_values.get_default(cr, uid, 'product.product', 'taxes_id', company_id=company_id)
+ supplier_taxes_id = ir_values.get_default(cr, uid, 'product.product', 'supplier_taxes_id', company_id=company_id)
+ values.update({
+ 'default_sale_tax': isinstance(taxes_id, list) and taxes_id[0] or taxes_id,
+ 'default_purchase_tax': isinstance(supplier_taxes_id, list) and supplier_taxes_id[0] or supplier_taxes_id,
+ })
+ return {'value': values}
+
+ def onchange_chart_template_id(self, cr, uid, ids, chart_template_id, context=None):
+ tax_templ_obj = self.pool.get('account.tax.template')
+ res = {'value': {
+ 'complete_tax_set': False, 'sale_tax': False, 'purchase_tax': False,
+ 'sale_tax_rate': 15, 'purchase_tax_rate': 15,
+ }}
+ if chart_template_id:
+ # update complete_tax_set, sale_tax and purchase_tax
+ chart_template = self.pool.get('account.chart.template').browse(cr, uid, chart_template_id, context=context)
+ res['value'].update({'complete_tax_set': chart_template.complete_tax_set})
+ if chart_template.complete_tax_set:
+ # default tax is given by the lowest sequence. For same sequence we will take the latest created as it will be the case for tax created while isntalling the generic chart of account
+ sale_tax_ids = tax_templ_obj.search(cr, uid,
+ [("chart_template_id", "=", chart_template_id), ('type_tax_use', 'in', ('sale','all'))],
+ order="sequence, id desc")
+ purchase_tax_ids = tax_templ_obj.search(cr, uid,
+ [("chart_template_id", "=", chart_template_id), ('type_tax_use', 'in', ('purchase','all'))],
+ order="sequence, id desc")
+ res['value']['sale_tax'] = sale_tax_ids and sale_tax_ids[0] or False
+ res['value']['purchase_tax'] = purchase_tax_ids and purchase_tax_ids[0] or False
+ if chart_template.code_digits:
+ res['value']['code_digits'] = chart_template.code_digits
+ return res
+
+ def onchange_tax_rate(self, cr, uid, ids, rate, context=None):
+ return {'value': {'purchase_tax_rate': rate or False}}
+
+ def onchange_start_date(self, cr, uid, id, start_date):
+ if start_date:
+ start_date = datetime.datetime.strptime(start_date, "%Y-%m-%d")
+ end_date = (start_date + relativedelta(months=12)) - relativedelta(days=1)
+ return {'value': {'date_stop': end_date.strftime('%Y-%m-%d')}}
+ return {}
+
+ def set_default_taxes(self, cr, uid, ids, context=None):
+ """ set default sale and purchase taxes for products """
+ ir_values = self.pool.get('ir.values')
+ config = self.browse(cr, uid, ids[0], context)
+ ir_values.set_default(cr, uid, 'product.product', 'taxes_id',
+ config.default_sale_tax and [config.default_sale_tax.id] or False, company_id=config.company_id.id)
+ ir_values.set_default(cr, uid, 'product.product', 'supplier_taxes_id',
+ config.default_purchase_tax and [config.default_purchase_tax.id] or False, company_id=config.company_id.id)
+
+ def set_chart_of_accounts(self, cr, uid, ids, context=None):
+ """ install a chart of accounts for the given company (if required) """
+ config = self.browse(cr, uid, ids[0], context)
+ if config.chart_template_id:
+ assert config.expects_chart_of_accounts and not config.has_chart_of_accounts
+ wizard = self.pool.get('wizard.multi.charts.accounts')
+ wizard_id = wizard.create(cr, uid, {
+ 'company_id': config.company_id.id,
+ 'chart_template_id': config.chart_template_id.id,
+ 'code_digits': config.code_digits or 6,
+ 'seq_journal': config.seq_journal,
+ 'sale_tax': config.sale_tax.id,
+ 'purchase_tax': config.purchase_tax.id,
+ 'sale_tax_rate': config.sale_tax_rate,
+ 'purchase_tax_rate': config.purchase_tax_rate,
+ 'complete_tax_set': config.complete_tax_set,
+ }, context)
+ wizard.execute(cr, uid, [wizard_id], context)
+
+ def set_fiscalyear(self, cr, uid, ids, context=None):
+ """ create a fiscal year for the given company (if necessary) """
+ config = self.browse(cr, uid, ids[0], context)
+ if config.has_chart_of_accounts or config.chart_template_id:
+ fiscalyear = self.pool.get('account.fiscalyear')
+ fiscalyear_count = fiscalyear.search_count(cr, uid,
+ [('date_start', '<=', config.date_start), ('date_stop', '>=', config.date_stop),
+ ('company_id', '=', config.company_id.id)],
+ context=context)
+ if not fiscalyear_count:
+ name = code = config.date_start[:4]
+ if int(name) != int(config.date_stop[:4]):
+ name = config.date_start[:4] +'-'+ config.date_stop[:4]
+ code = config.date_start[2:4] +'-'+ config.date_stop[2:4]
+ vals = {
+ 'name': name,
+ 'code': code,
+ 'date_start': config.date_start,
+ 'date_stop': config.date_stop,
+ 'company_id': config.company_id.id,
+ }
+ fiscalyear_id = fiscalyear.create(cr, uid, vals, context=context)
+ if config.period == 'month':
+ fiscalyear.create_period(cr, uid, [fiscalyear_id])
+ elif config.period == '3months':
+ fiscalyear.create_period3(cr, uid, [fiscalyear_id])
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/res_config_view.xml b/addons/account/res_config_view.xml
new file mode 100644
index 00000000000..742b842684a
--- /dev/null
+++ b/addons/account/res_config_view.xml
@@ -0,0 +1,120 @@
+
+
+
+
+
+ Chart Templates
+ ir.module.module
+ kanban,tree,form
+
+
+
+
+
+ account settings
+ account.config.settings
+ form
+
+
+
+
+
+
+ Configure Accounting
+ ir.actions.act_window
+ account.config.settings
+ form
+ inline
+
+
+
+
+
+
diff --git a/addons/account/security/account_security.xml b/addons/account/security/account_security.xml
index 64498127dc5..e1a29a6edfb 100644
--- a/addons/account/security/account_security.xml
+++ b/addons/account/security/account_security.xml
@@ -4,18 +4,24 @@
Invoicing & Payments
+
-
+
Accountant
-
+
Manager
+
+ Pro-forma Invoices
+
+
+
Account Entry
diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
index 60d30f9fff0..3391e9ea2fd 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
@@ -3,15 +3,15 @@
- account.analytic.account.invoice.stat.form.inherit
- account.analytic.account
- form
+ account.analytic.account.invoice.stat.form.inherit
+ account.analytic.account
+ form
@@ -30,9 +30,9 @@
- account.analytic.account.invoice.form.inherit
- account.analytic.account
- form
+ account.analytic.account.invoice.form.inherit
+ account.analytic.account
+ form
@@ -69,7 +69,7 @@
-
+
@@ -97,14 +97,14 @@
-
-
- account.analytic.account.tree
- account.analytic.account
+
+
+ account.analytic.account.tree
+ account.analytic.account
- tree
-
-
+ tree
+
+
diff --git a/addons/account_analytic_plans/__openerp__.py b/addons/account_analytic_plans/__openerp__.py
index 82739587d4e..1669bd277d3 100644
--- a/addons/account_analytic_plans/__openerp__.py
+++ b/addons/account_analytic_plans/__openerp__.py
@@ -71,7 +71,6 @@ of distribution models.
'account_analytic_plans_report.xml',
'wizard/analytic_plan_create_model_view.xml',
'wizard/account_crossovered_analytic_view.xml',
- 'account_analytic_plans_installer_view.xml'
],
'demo_xml': [],
'test': ['test/acount_analytic_plans_report.yml'],
diff --git a/addons/account_analytic_plans/account_analytic_plans_installer_view.xml b/addons/account_analytic_plans/account_analytic_plans_installer_view.xml
deleted file mode 100644
index c6879774078..00000000000
--- a/addons/account_analytic_plans/account_analytic_plans_installer_view.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-
- Define your Analytic Plans
- ir.actions.act_window
- account.analytic.plan
- form
- tree,form
-
- To setup a multiple analytic plans environment, you must define the root analytic accounts for each plan set. Then, you must attach a plan set to your account journals.
-
-
-
-
-
- 15
-
-
-
-
diff --git a/addons/account_asset/account_asset_view.xml b/addons/account_asset/account_asset_view.xml
index 590e7b76aad..1b1df80a5e8 100644
--- a/addons/account_asset/account_asset_view.xml
+++ b/addons/account_asset/account_asset_view.xml
@@ -316,18 +316,5 @@
-
- Review Asset Categories
- account.asset.category
- form
- tree,form
-
-
-
-
-
- 3
-
-
diff --git a/addons/account_bank_statement_extensions/i18n/es_EC.po b/addons/account_bank_statement_extensions/i18n/es_EC.po
new file mode 100644
index 00000000000..ff96580afa1
--- /dev/null
+++ b/addons/account_bank_statement_extensions/i18n/es_EC.po
@@ -0,0 +1,374 @@
+# Spanish (Ecuador) translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR , 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2012-02-08 00:35+0000\n"
+"PO-Revision-Date: 2012-04-03 19:17+0000\n"
+"Last-Translator: FULL NAME \n"
+"Language-Team: Spanish (Ecuador) \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-04-04 04:41+0000\n"
+"X-Generator: Launchpad (build 15055)\n"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Search Bank Transactions"
+msgstr "Buscar Transacciones Bancarias"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+#: selection:account.bank.statement.line,state:0
+msgid "Confirmed"
+msgstr "Confirmado"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement:0
+#: view:account.bank.statement.line:0
+msgid "Glob. Id"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: selection:account.bank.statement.line.global,type:0
+msgid "CODA"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,parent_id:0
+msgid "Parent Code"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Debit"
+msgstr "Débito"
+
+#. module: account_bank_statement_extensions
+#: view:cancel.statement.line:0
+#: model:ir.actions.act_window,name:account_bank_statement_extensions.action_cancel_statement_line
+#: model:ir.model,name:account_bank_statement_extensions.model_cancel_statement_line
+msgid "Cancel selected statement lines"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: constraint:res.partner.bank:0
+msgid "The RIB and/or IBAN is not valid"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Group By..."
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,state:0
+msgid "State"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+#: selection:account.bank.statement.line,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Statement"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: view:confirm.statement.line:0
+#: model:ir.actions.act_window,name:account_bank_statement_extensions.action_confirm_statement_line
+#: model:ir.model,name:account_bank_statement_extensions.model_confirm_statement_line
+msgid "Confirm selected statement lines"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: report:bank.statement.balance.report:0
+#: model:ir.actions.report.xml,name:account_bank_statement_extensions.bank_statement_balance_report
+msgid "Bank Statement Balances Report"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: view:cancel.statement.line:0
+msgid "Cancel Lines"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line.global:0
+#: model:ir.model,name:account_bank_statement_extensions.model_account_bank_statement_line_global
+msgid "Batch Payment Info"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: view:confirm.statement.line:0
+msgid "Confirm Lines"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: code:addons/account_bank_statement_extensions/account_bank_statement.py:130
+#, python-format
+msgid ""
+"Delete operation not allowed ! Please go to the associated bank "
+"statement in order to delete and/or modify this bank statement line"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,type:0
+msgid "Type"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+#: field:account.bank.statement.line,journal_id:0
+#: report:bank.statement.balance.report:0
+msgid "Journal"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Confirmed Statement Lines."
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Credit Transactions."
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: model:ir.actions.act_window,help:account_bank_statement_extensions.action_cancel_statement_line
+msgid "cancel selected statement lines."
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,counterparty_number:0
+msgid "Counterparty Number"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line.global:0
+msgid "Transactions"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: code:addons/account_bank_statement_extensions/account_bank_statement.py:130
+#, python-format
+msgid "Warning"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: report:bank.statement.balance.report:0
+msgid "Closing Balance"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: report:bank.statement.balance.report:0
+msgid "Date"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+#: field:account.bank.statement.line,globalisation_amount:0
+msgid "Glob. Amount"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Debit Transactions."
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: view:confirm.statement.line:0
+msgid "Confirmed lines cannot be changed anymore."
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: constraint:res.partner.bank:0
+msgid ""
+"\n"
+"Please define BIC/Swift code on bank for bank type IBAN Account to make "
+"valid payments"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,val_date:0
+msgid "Valuta Date"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: model:ir.actions.act_window,help:account_bank_statement_extensions.action_confirm_statement_line
+msgid "Confirm selected statement lines."
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: view:cancel.statement.line:0
+msgid "Are you sure you want to cancel the selected Bank Statement lines ?"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: report:bank.statement.balance.report:0
+msgid "Name"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: selection:account.bank.statement.line.global,type:0
+msgid "ISO 20022"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Notes"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: selection:account.bank.statement.line.global,type:0
+msgid "Manual"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Credit"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,amount:0
+msgid "Amount"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Fin.Account"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,counterparty_currency:0
+msgid "Counterparty Currency"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,counterparty_bic:0
+msgid "Counterparty BIC"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,child_ids:0
+msgid "Child Codes"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: view:confirm.statement.line:0
+msgid "Are you sure you want to confirm the selected Bank Statement lines ?"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: constraint:account.bank.statement.line:0
+msgid ""
+"The amount of the voucher must be the same amount as the one on the "
+"statement line"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: help:account.bank.statement.line,globalisation_id:0
+msgid ""
+"Code to identify transactions belonging to the same globalisation level "
+"within a batch payment"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Draft Statement Lines."
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Glob. Am."
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: model:ir.model,name:account_bank_statement_extensions.model_account_bank_statement_line
+msgid "Bank Statement Line"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,code:0
+msgid "Code"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,counterparty_name:0
+msgid "Counterparty Name"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,name:0
+msgid "Communication"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: model:ir.model,name:account_bank_statement_extensions.model_res_partner_bank
+msgid "Bank Accounts"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: constraint:account.bank.statement:0
+msgid "The journal and period chosen have to belong to the same company."
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: model:ir.model,name:account_bank_statement_extensions.model_account_bank_statement
+msgid "Bank Statement"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Statement Line"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: sql_constraint:account.bank.statement.line.global:0
+msgid "The code must be unique !"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,bank_statement_line_ids:0
+#: model:ir.actions.act_window,name:account_bank_statement_extensions.action_bank_statement_line
+#: model:ir.ui.menu,name:account_bank_statement_extensions.bank_statement_line
+msgid "Bank Statement Lines"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line.global:0
+msgid "Child Batch Payments"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: view:cancel.statement.line:0
+#: view:confirm.statement.line:0
+msgid "Cancel"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Statement Lines"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Total Amount"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,globalisation_id:0
+msgid "Globalisation ID"
+msgstr ""
diff --git a/addons/account_check_writing/i18n/ar.po b/addons/account_check_writing/i18n/ar.po
new file mode 100644
index 00000000000..f1f12f7bea0
--- /dev/null
+++ b/addons/account_check_writing/i18n/ar.po
@@ -0,0 +1,199 @@
+# Arabic translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR , 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2012-02-08 00:35+0000\n"
+"PO-Revision-Date: 2012-04-06 00:34+0000\n"
+"Last-Translator: FULL NAME \n"
+"Language-Team: Arabic \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-04-06 04:37+0000\n"
+"X-Generator: Launchpad (build 15060)\n"
+
+#. module: account_check_writing
+#: selection:res.company,check_layout:0
+msgid "Check on Top"
+msgstr ""
+
+#. module: account_check_writing
+#: model:ir.actions.act_window,help:account_check_writing.action_write_check
+msgid ""
+"The check payment form allows you to track the payment you do to your "
+"suppliers specially by check. When you select a supplier, the payment method "
+"and an amount for the payment, OpenERP will propose to reconcile your "
+"payment with the open supplier invoices or bills.You can print the check"
+msgstr ""
+
+#. module: account_check_writing
+#: view:account.voucher:0
+#: model:ir.actions.report.xml,name:account_check_writing.account_print_check_bottom
+#: model:ir.actions.report.xml,name:account_check_writing.account_print_check_middle
+#: model:ir.actions.report.xml,name:account_check_writing.account_print_check_top
+msgid "Print Check"
+msgstr ""
+
+#. module: account_check_writing
+#: selection:res.company,check_layout:0
+msgid "Check in middle"
+msgstr ""
+
+#. module: account_check_writing
+#: help:res.company,check_layout:0
+msgid ""
+"Check on top is compatible with Quicken, QuickBooks and Microsoft Money. "
+"Check in middle is compatible with Peachtree, ACCPAC and DacEasy. Check on "
+"bottom is compatible with Peachtree, ACCPAC and DacEasy only"
+msgstr ""
+
+#. module: account_check_writing
+#: selection:res.company,check_layout:0
+msgid "Check on bottom"
+msgstr ""
+
+#. module: account_check_writing
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "خطأ! لا يمكنك إنشاء شركات متداخلة (شركات تستخدم نفسها)."
+
+#. module: account_check_writing
+#: help:account.journal,allow_check_writing:0
+msgid "Check this if the journal is to be used for writing checks."
+msgstr ""
+
+#. module: account_check_writing
+#: field:account.journal,allow_check_writing:0
+msgid "Allow Check writing"
+msgstr ""
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+#: report:account.print.check.top:0
+msgid "Description"
+msgstr "الوصف"
+
+#. module: account_check_writing
+#: model:ir.model,name:account_check_writing.model_account_journal
+msgid "Journal"
+msgstr "اليومية"
+
+#. module: account_check_writing
+#: model:ir.actions.act_window,name:account_check_writing.action_write_check
+#: model:ir.ui.menu,name:account_check_writing.menu_action_write_check
+msgid "Write Checks"
+msgstr "كتابة شيك"
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+#: report:account.print.check.top:0
+msgid "Discount"
+msgstr "الخصم"
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+#: report:account.print.check.top:0
+msgid "Original Amount"
+msgstr "المبلغ الأصلي"
+
+#. module: account_check_writing
+#: view:res.company:0
+msgid "Configuration"
+msgstr "إعدادات"
+
+#. module: account_check_writing
+#: field:account.voucher,allow_check:0
+msgid "Allow Check Writing"
+msgstr "سماح بكتابة شيك"
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+#: report:account.print.check.top:0
+msgid "Payment"
+msgstr "الدفع"
+
+#. module: account_check_writing
+#: field:account.journal,use_preprint_check:0
+msgid "Use Preprinted Check"
+msgstr ""
+
+#. module: account_check_writing
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr "اسم الشركة يجب أن يكون فريداً !"
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+#: report:account.print.check.top:0
+msgid "Due Date"
+msgstr "تاريخ الإستحقاق"
+
+#. module: account_check_writing
+#: model:ir.model,name:account_check_writing.model_res_company
+msgid "Companies"
+msgstr "الشركات"
+
+#. module: account_check_writing
+#: view:res.company:0
+msgid "Default Check layout"
+msgstr ""
+
+#. module: account_check_writing
+#: constraint:account.journal:0
+msgid ""
+"Configuration error! The currency chosen should be shared by the default "
+"accounts too."
+msgstr ""
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+msgid "Balance Due"
+msgstr ""
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+#: report:account.print.check.top:0
+msgid "Check Amount"
+msgstr ""
+
+#. module: account_check_writing
+#: model:ir.model,name:account_check_writing.model_account_voucher
+msgid "Accounting Voucher"
+msgstr "القسيمة المحاسبية"
+
+#. module: account_check_writing
+#: sql_constraint:account.journal:0
+msgid "The name of the journal must be unique per company !"
+msgstr "يجب ان يكون الاسم لليومية فريد لكل شركة!"
+
+#. module: account_check_writing
+#: sql_constraint:account.journal:0
+msgid "The code of the journal must be unique per company !"
+msgstr "يجب ان يكون الكود لليومية فريد لكل شركة !"
+
+#. module: account_check_writing
+#: field:account.voucher,amount_in_word:0
+msgid "Amount in Word"
+msgstr ""
+
+#. module: account_check_writing
+#: report:account.print.check.top:0
+msgid "Open Balance"
+msgstr "فتح رصيد"
+
+#. module: account_check_writing
+#: field:res.company,check_layout:0
+msgid "Choose Check layout"
+msgstr ""
diff --git a/addons/account_followup/account_followup_view.xml b/addons/account_followup/account_followup_view.xml
index 764ab81d81a..fe4613d6720 100644
--- a/addons/account_followup/account_followup_view.xml
+++ b/addons/account_followup/account_followup_view.xml
@@ -157,25 +157,5 @@
-
-
-
- Review Invoicing Follow-Ups
- ir.actions.act_window
- account_followup.followup
- form
- form,tree
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/addons/account_payment/security/account_payment_security.xml b/addons/account_payment/security/account_payment_security.xml
index 4bae0c30ce6..135059c79d5 100644
--- a/addons/account_payment/security/account_payment_security.xml
+++ b/addons/account_payment/security/account_payment_security.xml
@@ -4,6 +4,7 @@
Accounting / Payments
+
diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py
index 54226166508..fbbf66c0360 100644
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@ -202,12 +202,19 @@ class account_voucher(osv.osv):
line_dr_ids = resolve_o2m_operations(cr, uid, line_osv, line_dr_ids, ['amount'], context)
line_cr_ids = resolve_o2m_operations(cr, uid, line_osv, line_cr_ids, ['amount'], context)
- #loop into the lines to see if there is an amount allocated on a voucher line with a currency different than the voucher currency
+ #compute the field is_multi_currency that is used to hide/display options linked to secondary currency on the voucher
is_multi_currency = False
- for voucher_line in line_dr_ids+line_cr_ids:
- if voucher_line.get('currency_id',False) != voucher_currency:
- is_multi_currency = True
- break
+ if voucher_currency:
+ # if the voucher currency is not False, it means it is different than the company currency and we need to display the options
+ is_multi_currency = True
+ else:
+ #loop on the voucher lines to see if one of these has a secondary currency. If yes, we need to define the options
+ for voucher_line in line_dr_ids+line_cr_ids:
+ company_currency = False
+ company_currency = voucher_line.get('move_line_id', False) and self.pool.get('account.move.line').browse(cr, uid, voucher_line.get('move_line_id'), context=context).company_id.currency_id.id
+ if voucher_line.get('currency_id', company_currency) != company_currency:
+ is_multi_currency = True
+ break
return {'value': {'writeoff_amount': self._compute_writeoff_amount(cr, uid, line_dr_ids, line_cr_ids, amount), 'is_multi_currency': is_multi_currency}}
def _get_writeoff_amount(self, cr, uid, ids, name, args, context=None):
diff --git a/addons/analytic/security/analytic_security.xml b/addons/analytic/security/analytic_security.xml
index 3f8ec1036be..69c1a069502 100644
--- a/addons/analytic/security/analytic_security.xml
+++ b/addons/analytic/security/analytic_security.xml
@@ -15,7 +15,7 @@
['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]
-
+
Analytic Accounting
diff --git a/addons/auction/security/auction_security.xml b/addons/auction/security/auction_security.xml
index 087151cb6ea..d71254dd3c2 100644
--- a/addons/auction/security/auction_security.xml
+++ b/addons/auction/security/auction_security.xml
@@ -16,6 +16,7 @@
Manager
+
diff --git a/addons/auth_openid/i18n/ar.po b/addons/auth_openid/i18n/ar.po
new file mode 100644
index 00000000000..7887f023e14
--- /dev/null
+++ b/addons/auth_openid/i18n/ar.po
@@ -0,0 +1,113 @@
+# Arabic translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR , 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2012-02-08 01:37+0100\n"
+"PO-Revision-Date: 2012-04-06 00:53+0000\n"
+"Last-Translator: FULL NAME \n"
+"Language-Team: Arabic \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-04-06 04:37+0000\n"
+"X-Generator: Launchpad (build 15060)\n"
+
+#. #-#-#-#-# auth_openid.pot (OpenERP Server 6.1rc1) #-#-#-#-#
+#. module: auth_openid
+#. #-#-#-#-# auth_openid.pot.web (PROJECT VERSION) #-#-#-#-#
+#. openerp-web
+#: view:res.users:0
+#: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:12
+msgid "OpenID"
+msgstr "معرف OpenID"
+
+#. #-#-#-#-# auth_openid.pot (OpenERP Server 6.1rc1) #-#-#-#-#
+#. module: auth_openid
+#. #-#-#-#-# auth_openid.pot.web (PROJECT VERSION) #-#-#-#-#
+#. openerp-web
+#: field:res.users,openid_url:0
+#: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:47
+msgid "OpenID URL"
+msgstr "رابط OpenID"
+
+#. module: auth_openid
+#: help:res.users,openid_email:0
+msgid "Used for disambiguation in case of a shared OpenID URL"
+msgstr "تستخدم للتفرقة في حالة إستخدام معرف OpenID مشترك"
+
+#. module: auth_openid
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr "لا يمكن ان يكون هناك مستخدمان بنفس اسم الدخول!"
+
+#. module: auth_openid
+#: field:res.users,openid_email:0
+msgid "OpenID Email"
+msgstr "بريد OpenID"
+
+#. module: auth_openid
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+"الشركة المختارة غير مدرجة ضمن قائمة الشركات المسموح بها لهذا المستخدم"
+
+#. module: auth_openid
+#: field:res.users,openid_key:0
+msgid "OpenID Key"
+msgstr "مفتاح OpenID"
+
+#. module: auth_openid
+#: model:ir.model,name:auth_openid.model_res_users
+msgid "res.users"
+msgstr "res.users"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:8
+msgid "Password"
+msgstr "كلمة المرور"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:9
+#: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:10
+msgid "Google"
+msgstr "جوجل"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:10
+msgid "Google Apps"
+msgstr "برامج جوجل"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:11
+msgid "Launchpad"
+msgstr "لانشباد (Launchpad)"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:20
+msgid "Google Apps Domain:"
+msgstr "نطاق برامج جوجل:"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:24
+msgid "Username:"
+msgstr "اسم المستخدم:"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:28
+msgid "OpenID URL:"
+msgstr "رابط OpenID:"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:35
+msgid "Google Apps Domain"
+msgstr "نطاق برامج جوجل"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:41
+msgid "Username"
+msgstr "اسم المستخدم"
diff --git a/addons/auth_openid/i18n/sr@latin.po b/addons/auth_openid/i18n/sr@latin.po
new file mode 100644
index 00000000000..e1b4ca7b911
--- /dev/null
+++ b/addons/auth_openid/i18n/sr@latin.po
@@ -0,0 +1,112 @@
+# Serbian Latin translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR , 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2012-02-08 01:37+0100\n"
+"PO-Revision-Date: 2012-04-05 15:20+0000\n"
+"Last-Translator: Milan Milosevic \n"
+"Language-Team: Serbian Latin \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-04-06 04:37+0000\n"
+"X-Generator: Launchpad (build 15060)\n"
+
+#. #-#-#-#-# auth_openid.pot (OpenERP Server 6.1rc1) #-#-#-#-#
+#. module: auth_openid
+#. #-#-#-#-# auth_openid.pot.web (PROJECT VERSION) #-#-#-#-#
+#. openerp-web
+#: view:res.users:0
+#: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:12
+msgid "OpenID"
+msgstr "OpenID"
+
+#. #-#-#-#-# auth_openid.pot (OpenERP Server 6.1rc1) #-#-#-#-#
+#. module: auth_openid
+#. #-#-#-#-# auth_openid.pot.web (PROJECT VERSION) #-#-#-#-#
+#. openerp-web
+#: field:res.users,openid_url:0
+#: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:47
+msgid "OpenID URL"
+msgstr "OpenID URL"
+
+#. module: auth_openid
+#: help:res.users,openid_email:0
+msgid "Used for disambiguation in case of a shared OpenID URL"
+msgstr "Koristi se za razlikovanje u slučaju deljenog OpenID URL-a"
+
+#. module: auth_openid
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr "Ne možete imati dva korisnika sa istom prijavom!"
+
+#. module: auth_openid
+#: field:res.users,openid_email:0
+msgid "OpenID Email"
+msgstr "OpenID Email"
+
+#. module: auth_openid
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr "Odabrano preduzeće nije u dozvoljenim preduzećima za ovog korisnioka"
+
+#. module: auth_openid
+#: field:res.users,openid_key:0
+msgid "OpenID Key"
+msgstr "OpenID Ključ"
+
+#. module: auth_openid
+#: model:ir.model,name:auth_openid.model_res_users
+msgid "res.users"
+msgstr "res.users"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:8
+msgid "Password"
+msgstr "Lozinka"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:9
+#: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:10
+msgid "Google"
+msgstr "Google"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:10
+msgid "Google Apps"
+msgstr "Google-ove aplikacije"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:11
+msgid "Launchpad"
+msgstr "Launchpad"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:20
+msgid "Google Apps Domain:"
+msgstr "Domen Google-ovih aplikacija"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:24
+msgid "Username:"
+msgstr "Korisničko ime:"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:28
+msgid "OpenID URL:"
+msgstr "OpenID URL"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:35
+msgid "Google Apps Domain"
+msgstr "Domen Google-ovih aplikacija"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:41
+msgid "Username"
+msgstr "Korisničko ime"
diff --git a/addons/base_calendar/security/calendar_security.xml b/addons/base_calendar/security/calendar_security.xml
index dd736e11714..5fe8918e05b 100644
--- a/addons/base_calendar/security/calendar_security.xml
+++ b/addons/base_calendar/security/calendar_security.xml
@@ -3,6 +3,7 @@
Survey / User
+
diff --git a/addons/base_iban/i18n/sr@latin.po b/addons/base_iban/i18n/sr@latin.po
index fa0c4aa20f1..34f2852fb17 100644
--- a/addons/base_iban/i18n/sr@latin.po
+++ b/addons/base_iban/i18n/sr@latin.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-01-20 15:40+0000\n"
+"PO-Revision-Date: 2012-04-05 15:22+0000\n"
"Last-Translator: Milan Milosevic \n"
"Language-Team: Serbian latin \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:02+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-04-06 04:37+0000\n"
+"X-Generator: Launchpad (build 15060)\n"
#. module: base_iban
#: constraint:res.partner.bank:0
@@ -32,7 +32,7 @@ msgstr ""
#: code:addons/base_iban/base_iban.py:139
#, python-format
msgid "This IBAN does not pass the validation check, please verify it"
-msgstr ""
+msgstr "Ovaj IBAN ne prolazi proveru validacije, molimo proverite ga"
#. module: base_iban
#: model:res.partner.bank.type,format_layout:base_iban.bank_iban
@@ -91,7 +91,7 @@ msgstr "IBAN račun"
#. module: base_iban
#: constraint:res.partner.bank:0
msgid "The RIB and/or IBAN is not valid"
-msgstr ""
+msgstr "RIB i / ili IBAN nije validan"
#~ msgid "Invalid XML for View Architecture!"
#~ msgstr "Nevažeći XML za pregled arhitekture"
diff --git a/addons/base_setup/base_setup.py b/addons/base_setup/base_setup.py
index c10dee7b14b..a3effd98148 100644
--- a/addons/base_setup/base_setup.py
+++ b/addons/base_setup/base_setup.py
@@ -201,4 +201,30 @@ class specify_partner_terminology(osv.osv_memory):
self.make_translations(cr, uid, ids, act_ref, 'model', act_id.help, _case_insensitive_replace(act_id.help,'Customer',o.partner), res_id=act_id.id, context=context)
return {}
+
+
+# Preferences wizard for Sales & CRM.
+# It is defined here because it is inherited independently in modules sale, crm,
+# plugin_outlook and plugin_thunderbird.
+#
+class sale_config_settings(osv.osv_memory):
+ _name = 'sale.config.settings'
+ _inherit = 'res.config.settings'
+ _columns = {
+ 'module_crm': fields.boolean('CRM'),
+ 'module_plugin_thunderbird': fields.boolean('Thunderbird plugin',
+ help="""The plugin allows you archive email and its attachments to the selected
+ OpenERP objects. You can select a partner, a task, a project, an analytical
+ account, or any other object and attach the selected mail as a .eml file in
+ the attachment of a selected record. You can create documents for CRM Lead,
+ HR Applicant and Project Issue from the selected emails.
+ This installs the module plugin_thunderbird."""),
+ 'module_plugin_outlook': fields.boolean('Outlook plugin',
+ help="""The Outlook plugin allows you to select an object that you would like to add
+ to your email and its attachments from MS Outlook. You can select a partner, a task,
+ a project, an analytical account, or any other object and archive a selected
+ email into an OpenERP mail message with attachments.
+ This installs the module plugin_outlook."""),
+ }
+
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_setup/base_setup_views.xml b/addons/base_setup/base_setup_views.xml
index 4155c7e9957..453d4b167c0 100644
--- a/addons/base_setup/base_setup_views.xml
+++ b/addons/base_setup/base_setup_views.xml
@@ -1,21 +1,6 @@
-
-
- Create or Import Customers
- ir.actions.act_window
- res.partner
- form
- tree,form
-
- Create or Import Customers and their contacts manually from this form or you can import your existing partners by CSV spreadsheet from "Import Data" wizard
-
-
-
-
-
-
Set default users preferences
@@ -117,7 +102,7 @@
form
new
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Configure Sales
+ ir.actions.act_window
+ sale.config.settings
+
+ form
+ inline
+
+
diff --git a/addons/board/board_data_home.xml b/addons/board/board_data_home.xml
index 8a0f150d5be..8a75a3ad496 100644
--- a/addons/board/board_data_home.xml
+++ b/addons/board/board_data_home.xml
@@ -61,7 +61,7 @@
-
+
diff --git a/addons/board/i18n/ja.po b/addons/board/i18n/ja.po
new file mode 100644
index 00000000000..1114a624c53
--- /dev/null
+++ b/addons/board/i18n/ja.po
@@ -0,0 +1,348 @@
+# Japanese translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR , 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-04-04 01:20+0000\n"
+"Last-Translator: Masaki Yamaya \n"
+"Language-Team: Japanese \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-04-05 04:43+0000\n"
+"X-Generator: Launchpad (build 15060)\n"
+
+#. module: board
+#: view:res.log.report:0
+msgid " Year "
+msgstr " 年 "
+
+#. module: board
+#: model:ir.model,name:board.model_board_menu_create
+msgid "Menu Create"
+msgstr "メニュー作成"
+
+#. module: board
+#: view:board.menu.create:0
+msgid "Menu Information"
+msgstr ""
+
+#. module: board
+#: view:res.users:0
+msgid "Latest Connections"
+msgstr "最近の接続"
+
+#. module: board
+#: view:res.log.report:0
+msgid "Log created in last month"
+msgstr "先月、作成されたログ"
+
+#. module: board
+#: view:board.board:0
+#: model:ir.actions.act_window,name:board.open_board_administration_form
+msgid "Administration Dashboard"
+msgstr "アドミニストレーションダッシュボード"
+
+#. module: board
+#: view:res.log.report:0
+msgid "Group By..."
+msgstr "グループ化…"
+
+#. module: board
+#: view:res.log.report:0
+msgid "Log created in current year"
+msgstr "今年、作成されたログ"
+
+#. module: board
+#: model:ir.model,name:board.model_board_board
+msgid "Board"
+msgstr "ボード"
+
+#. module: board
+#: field:board.menu.create,menu_name:0
+msgid "Menu Name"
+msgstr "メニュー名"
+
+#. module: board
+#: model:ir.actions.act_window,name:board.board_weekly_res_log_report_action
+#: view:res.log.report:0
+msgid "Weekly Global Activity"
+msgstr "今週のグローバルな活動"
+
+#. module: board
+#: field:board.board.line,name:0
+msgid "Title"
+msgstr "タイトル"
+
+#. module: board
+#: field:res.log.report,nbr:0
+msgid "# of Entries"
+msgstr "項目数"
+
+#. module: board
+#: view:res.log.report:0
+#: field:res.log.report,month:0
+msgid "Month"
+msgstr "月"
+
+#. module: board
+#: view:res.log.report:0
+msgid "Log created in current month"
+msgstr "今月、作成したログ"
+
+#. module: board
+#: model:ir.actions.act_window,name:board.board_monthly_res_log_report_action
+#: view:res.log.report:0
+msgid "Monthly Activity per Document"
+msgstr "ドキュメントごとの月間の活動"
+
+#. module: board
+#: view:board.board:0
+msgid "Configuration Overview"
+msgstr "設定の概要"
+
+#. module: board
+#: model:ir.actions.act_window,name:board.action_view_board_list_form
+#: model:ir.ui.menu,name:board.menu_view_board_form
+msgid "Dashboard Definition"
+msgstr "ダッシュボードの定義"
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "March"
+msgstr "３月"
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "August"
+msgstr "８月"
+
+#. module: board
+#: model:ir.actions.act_window,name:board.action_user_connection_tree
+msgid "User Connections"
+msgstr "ユーザコネクション"
+
+#. module: board
+#: field:res.log.report,creation_date:0
+msgid "Creation Date"
+msgstr "作成日"
+
+#. module: board
+#: view:res.log.report:0
+msgid "Log Analysis"
+msgstr "ログ分析"
+
+#. module: board
+#: field:res.log.report,res_model:0
+msgid "Object"
+msgstr "オブジェクト"
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "June"
+msgstr "６月"
+
+#. module: board
+#: field:board.board,line_ids:0
+msgid "Action Views"
+msgstr "アクションビュー"
+
+#. module: board
+#: model:ir.model,name:board.model_res_log_report
+msgid "Log Report"
+msgstr "ログレポート"
+
+#. module: board
+#: code:addons/board/wizard/board_menu_create.py:46
+#, python-format
+msgid "Please Insert Dashboard View(s) !"
+msgstr "ダッシュボードビューを挿入してください"
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "July"
+msgstr "７月"
+
+#. module: board
+#: view:res.log.report:0
+#: field:res.log.report,day:0
+msgid "Day"
+msgstr "日"
+
+#. module: board
+#: view:board.menu.create:0
+msgid "Create Menu For Dashboard"
+msgstr ""
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "February"
+msgstr ""
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "October"
+msgstr ""
+
+#. module: board
+#: model:ir.model,name:board.model_board_board_line
+msgid "Board Line"
+msgstr ""
+
+#. module: board
+#: field:board.menu.create,menu_parent_id:0
+msgid "Parent Menu"
+msgstr ""
+
+#. module: board
+#: view:res.log.report:0
+msgid " Month-1 "
+msgstr ""
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: board
+#: view:board.board:0
+msgid "Users"
+msgstr ""
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "November"
+msgstr ""
+
+#. module: board
+#: help:board.board.line,sequence:0
+msgid ""
+"Gives the sequence order when displaying a list of "
+"board lines."
+msgstr ""
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "April"
+msgstr ""
+
+#. module: board
+#: view:board.board:0
+#: field:board.board,name:0
+#: field:board.board.line,board_id:0
+#: model:ir.ui.menu,name:board.menu_dasboard
+msgid "Dashboard"
+msgstr ""
+
+#. module: board
+#: code:addons/board/wizard/board_menu_create.py:45
+#, python-format
+msgid "User Error!"
+msgstr ""
+
+#. module: board
+#: field:board.board.line,action_id:0
+msgid "Action"
+msgstr ""
+
+#. module: board
+#: field:board.board.line,position:0
+msgid "Position"
+msgstr ""
+
+#. module: board
+#: view:res.log.report:0
+msgid "Model"
+msgstr ""
+
+#. module: board
+#: model:ir.actions.act_window,name:board.board_homepage_action
+msgid "Home Page"
+msgstr ""
+
+#. module: board
+#: model:ir.actions.act_window,name:board.action_latest_activities_tree
+msgid "Latest Activities"
+msgstr ""
+
+#. module: board
+#: selection:board.board.line,position:0
+msgid "Left"
+msgstr ""
+
+#. module: board
+#: field:board.board,view_id:0
+msgid "Board View"
+msgstr ""
+
+#. module: board
+#: selection:board.board.line,position:0
+msgid "Right"
+msgstr ""
+
+#. module: board
+#: field:board.board.line,width:0
+msgid "Width"
+msgstr ""
+
+#. module: board
+#: view:res.log.report:0
+msgid " Month "
+msgstr ""
+
+#. module: board
+#: field:board.board.line,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "September"
+msgstr ""
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "December"
+msgstr ""
+
+#. module: board
+#: view:board.board:0
+#: view:board.menu.create:0
+msgid "Create Menu"
+msgstr ""
+
+#. module: board
+#: field:board.board.line,height:0
+msgid "Height"
+msgstr ""
+
+#. module: board
+#: model:ir.actions.act_window,name:board.action_board_menu_create
+msgid "Create Board Menu"
+msgstr ""
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "May"
+msgstr ""
+
+#. module: board
+#: view:res.log.report:0
+#: field:res.log.report,name:0
+msgid "Year"
+msgstr ""
+
+#. module: board
+#: view:board.menu.create:0
+msgid "Cancel"
+msgstr ""
+
+#. module: board
+#: view:board.board:0
+msgid "Dashboard View"
+msgstr ""
diff --git a/addons/crm/__init__.py b/addons/crm/__init__.py
index 214c5c3d450..95cf8b53f27 100644
--- a/addons/crm/__init__.py
+++ b/addons/crm/__init__.py
@@ -28,6 +28,7 @@ import crm_phonecall
import report
import wizard
import res_partner
+import res_config
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py
index 4968176e826..447645f615c 100644
--- a/addons/crm/__openerp__.py
+++ b/addons/crm/__openerp__.py
@@ -106,11 +106,12 @@ Creates a dashboard for CRM that includes:
'report/crm_phonecall_report_view.xml',
'process/crm_configuration_process.xml',
- 'crm_installer_view.xml',
'res_partner_view.xml',
'board_crm_statistical_view.xml',
'board_crm_view.xml',
+
+ 'res_config_view.xml',
],
'demo_xml': [
diff --git a/addons/crm/crm_installer_view.xml b/addons/crm/crm_installer_view.xml
deleted file mode 100644
index 5e871a99659..00000000000
--- a/addons/crm/crm_installer_view.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-
-
-
-
- Define Sales Team
- ir.actions.act_window
- crm.case.section
- form
- tree,form
-
- Define sales teams to structure your sales organization and assign users to each team. You should also define the sales stage to each team. As an example, if you use Solutions Selling techniques to track your opportunities, you can assign the following stage to the team: Territory, Qualified, Qualified Sponsors, Proposition, Negociaton, Won/Lost.
-
-
-
-
-
- 10
-
-
-
-
- Review Sales Stages
- ir.actions.act_window
- crm.case.stage
- form
- tree,form
- {'default_case_default': 1}
-
- Stages will allow salesmen to easily track how a specific opportunity is positioned in the sales cycle. In order to efficiently manage your sales pipeline, it's important to define conditions to go to the next step. Example: to set an opportunity as 'Qualified', you must set the "Expected Revenue" and the "Expected Closing Date." You should also have a look at the tooltip of the field "Change Probability Automatically".
-
-
-
-
-
- 9
-
-
-
diff --git a/addons/crm/res_config.py b/addons/crm/res_config.py
new file mode 100644
index 00000000000..b4a9e368d4c
--- /dev/null
+++ b/addons/crm/res_config.py
@@ -0,0 +1,64 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# OpenERP, Open Source Business Applications
+# Copyright (C) 2004-2012 OpenERP S.A. ().
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see .
+#
+##############################################################################
+
+from osv import fields, osv
+
+class crm_configuration(osv.osv_memory):
+ _name = 'sale.config.settings'
+ _inherit = ['sale.config.settings', 'fetchmail.config.settings']
+
+ _columns = {
+ 'module_crm_caldav': fields.boolean("Caldav Synchronization",
+ help="""Use protocol caldav to synchronize meetings with other calendar applications (like Sunbird).
+ This installs the module crm_caldav."""),
+ 'fetchmail_lead': fields.boolean("Create leads from an email account",
+ fetchmail_model='crm.lead', fetchmail_name='Incoming leads',
+ help="""Allows you to configure your incoming mail server, and create leads from incoming emails."""),
+ 'lead_server': fields.char('Server', size=256),
+ 'lead_port': fields.integer('Port'),
+ 'lead_type': fields.selection([
+ ('pop', 'POP Server'),
+ ('imap', 'IMAP Server'),
+ ('local', 'Local Server'),
+ ], 'Type'),
+ 'lead_is_ssl': fields.boolean('SSL/TLS',
+ help="Connections are encrypted with SSL/TLS through a dedicated port (default: IMAPS=993, POP=995)"),
+ 'lead_user': fields.char('Username', size=256),
+ 'lead_password': fields.char('Password', size=1024),
+ 'module_import_sugarcrm': fields.boolean("SugarCRM Import",
+ help="""Import SugarCRM leads, opportunities, users, accounts, contacts, employees, meetings, phonecalls, emails, project and project tasks data.
+ This installs the module import_sugarcrm."""),
+ 'module_import_google': fields.boolean("Google Import",
+ help="""Import google contact in partner address and add google calendar events details in Meeting.
+ This installs the module import_google."""),
+ 'module_wiki_sale_faq': fields.boolean("Install a sales FAQ",
+ help="""This provides demo data, thereby creating a Wiki Group and a Wiki Page for Wiki Sale FAQ.
+ This installs the module wiki_sale_faq."""),
+ 'module_google_map': fields.boolean("Google maps on customer",
+ help="""Locate customers on Google Map.
+ This installs the module google_map."""),
+ }
+
+ _defaults = {
+ 'lead_type': 'pop',
+ }
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm/res_config_view.xml b/addons/crm/res_config_view.xml
new file mode 100644
index 00000000000..c908125a2bf
--- /dev/null
+++ b/addons/crm/res_config_view.xml
@@ -0,0 +1,42 @@
+
+
+
+
+
+ crm settings
+ sale.config.settings
+ form
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/crm/security/crm_security.xml b/addons/crm/security/crm_security.xml
index ed3d86bf9b8..949cd5d4e73 100644
--- a/addons/crm/security/crm_security.xml
+++ b/addons/crm/security/crm_security.xml
@@ -17,9 +17,10 @@
Manager
+
-
+
diff --git a/addons/crm_claim/__init__.py b/addons/crm_claim/__init__.py
index 7395ea83fe5..2012c227adf 100644
--- a/addons/crm_claim/__init__.py
+++ b/addons/crm_claim/__init__.py
@@ -21,6 +21,7 @@
import crm_claim
import report
+import res_config
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm_claim/__openerp__.py b/addons/crm_claim/__openerp__.py
index cd1053137b6..2423bdcea7a 100644
--- a/addons/crm_claim/__openerp__.py
+++ b/addons/crm_claim/__openerp__.py
@@ -44,6 +44,7 @@ automatically new claims based on incoming emails.
'crm_claim_menu.xml',
'security/ir.model.access.csv',
'report/crm_claim_report_view.xml',
+ 'res_config_view.xml',
],
'demo_xml': [
'crm_claim_demo.xml',
diff --git a/addons/crm_claim/res_config.py b/addons/crm_claim/res_config.py
new file mode 100644
index 00000000000..73a6680663d
--- /dev/null
+++ b/addons/crm_claim/res_config.py
@@ -0,0 +1,46 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# OpenERP, Open Source Business Applications
+# Copyright (C) 2004-2012 OpenERP S.A. ().
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see .
+#
+##############################################################################
+
+from osv import osv, fields
+
+class crm_claim_settings(osv.osv_memory):
+ _name = 'sale.config.settings'
+ _inherit = ['sale.config.settings', 'fetchmail.config.settings']
+
+ _columns = {
+ 'fetchmail_claim': fields.boolean("Create claims from an email account",
+ fetchmail_model='crm.claim', fetchmail_name='Incoming claims',
+ help="""Allows you to configure your incoming mail server, and create claims from incoming emails."""),
+ 'claim_server' : fields.char('Server', size=256),
+ 'claim_port' : fields.integer('Port'),
+ 'claim_type': fields.selection([
+ ('pop', 'POP Server'),
+ ('imap', 'IMAP Server'),
+ ('local', 'Local Server'),
+ ], 'Type'),
+ 'claim_is_ssl': fields.boolean('SSL/TLS', help="Connections are encrypted with SSL/TLS through a dedicated port (default: IMAPS=993, POP=995)"),
+ 'claim_user' : fields.char('Username', size=256),
+ 'claim_password' : fields.char('Password', size=1024),
+ }
+
+ _defaults = {
+ 'claim_type': 'pop',
+ }
diff --git a/addons/crm_claim/res_config_view.xml b/addons/crm_claim/res_config_view.xml
new file mode 100644
index 00000000000..c6c66290303
--- /dev/null
+++ b/addons/crm_claim/res_config_view.xml
@@ -0,0 +1,28 @@
+
+
+
+
+
+ crm_claim settings
+ sale.config.settings
+ form
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/crm_todo/i18n/ar.po b/addons/crm_todo/i18n/ar.po
new file mode 100644
index 00000000000..402439a0f84
--- /dev/null
+++ b/addons/crm_todo/i18n/ar.po
@@ -0,0 +1,95 @@
+# Arabic translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR , 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-04-06 01:03+0000\n"
+"Last-Translator: FULL NAME \n"
+"Language-Team: Arabic \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-04-06 04:37+0000\n"
+"X-Generator: Launchpad (build 15060)\n"
+
+#. module: crm_todo
+#: model:ir.model,name:crm_todo.model_project_task
+msgid "Task"
+msgstr "مهمة"
+
+#. module: crm_todo
+#: view:crm.lead:0
+msgid "Timebox"
+msgstr "الوقت الزمني"
+
+#. module: crm_todo
+#: view:crm.lead:0
+msgid "For cancelling the task"
+msgstr ""
+
+#. module: crm_todo
+#: constraint:project.task:0
+msgid "Error ! Task end-date must be greater then task start-date"
+msgstr "خطأ ! يجب ان يكون تاريخ نهاية المهمة اكبر من تاريخ البداية"
+
+#. module: crm_todo
+#: model:ir.model,name:crm_todo.model_crm_lead
+msgid "crm.lead"
+msgstr "crm.lead"
+
+#. module: crm_todo
+#: view:crm.lead:0
+msgid "Next"
+msgstr "التالي"
+
+#. module: crm_todo
+#: model:ir.actions.act_window,name:crm_todo.crm_todo_action
+#: model:ir.ui.menu,name:crm_todo.menu_crm_todo
+msgid "My Tasks"
+msgstr "مهامي"
+
+#. module: crm_todo
+#: view:crm.lead:0
+#: field:crm.lead,task_ids:0
+msgid "Tasks"
+msgstr "المهام"
+
+#. module: crm_todo
+#: view:crm.lead:0
+msgid "Done"
+msgstr "تمّ"
+
+#. module: crm_todo
+#: constraint:project.task:0
+msgid "Error ! You cannot create recursive tasks."
+msgstr "خطأ ! لا يمكنك انشاء مهام متداخلة."
+
+#. module: crm_todo
+#: view:crm.lead:0
+msgid "Cancel"
+msgstr "إلغاء"
+
+#. module: crm_todo
+#: view:crm.lead:0
+msgid "Extra Info"
+msgstr "معلومات إضافية"
+
+#. module: crm_todo
+#: field:project.task,lead_id:0
+msgid "Lead / Opportunity"
+msgstr ""
+
+#. module: crm_todo
+#: view:crm.lead:0
+msgid "For changing to done state"
+msgstr ""
+
+#. module: crm_todo
+#: view:crm.lead:0
+msgid "Previous"
+msgstr "السابق"
diff --git a/addons/delivery/delivery.py b/addons/delivery/delivery.py
index d7b02f2f106..75eb766f011 100644
--- a/addons/delivery/delivery.py
+++ b/addons/delivery/delivery.py
@@ -250,23 +250,4 @@ class delivery_grid_line(osv.osv):
delivery_grid_line()
-class define_delivery_steps(osv.osv_memory):
- _name = 'delivery.define.delivery.steps.wizard'
-
- _columns = {
- 'picking_policy' : fields.selection([('direct', 'Deliver each product when available'), ('one', 'Deliver all products at once')], 'Picking Policy'),
- }
- _defaults = {
- 'picking_policy': lambda s,c,u,ctx: s.pool.get('sale.order').default_get(c,u,['picking_policy'],context=ctx)['picking_policy']
- }
-
- def apply_cb(self, cr, uid, ids, context=None):
- ir_values_obj = self.pool.get('ir.values')
- wizard = self.browse(cr, uid, ids, context=context)[0]
- ir_values_obj.set(cr, uid, 'default', False, 'picking_policy', ['sale.order'], wizard.picking_policy)
- return {'type' : 'ir.actions.act_window_close'}
-
-define_delivery_steps()
-
-
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml
index 047db1fea1d..9f3d1516ede 100644
--- a/addons/delivery/delivery_view.xml
+++ b/addons/delivery/delivery_view.xml
@@ -72,15 +72,6 @@
Define the delivery methods you are using and their pricing in order to reinvoice the delivery costs when you are doing invoicing based on delivery orders
-
- Define Delivery Methods
- ir.actions.act_window
- delivery.carrier
- form
- tree,form
- Define your delivery methods and their pricing. The delivery costs can be added on the sale order form or in the invoice, based on the delivery orders.
-
-
@@ -331,41 +322,5 @@
-
-
-
- 10
-
-
-
- delivery.define_delivery_steps
- delivery.define.delivery.steps.wizard
- form
-
-
-
-
-
-
- Setup Your Picking Policy
- delivery.define.delivery.steps.wizard
- form
- form
- new
-
-
-
-
-
- once
-
diff --git a/addons/delivery/test/delivery_cost.yml b/addons/delivery/test/delivery_cost.yml
index f8d6787a0c5..521f260e136 100644
--- a/addons/delivery/test/delivery_cost.yml
+++ b/addons/delivery/test/delivery_cost.yml
@@ -67,9 +67,9 @@
-
I set default delivery policy.
-
- !record {model: delivery.define.delivery.steps.wizard, id: default_delivery_policy}:
+ !record {model: sale.config.settings, id: default_delivery_policy}:
{}
-
- !python {model: delivery.define.delivery.steps.wizard}: |
- self.apply_cb(cr, uid, [ref('default_delivery_policy')], context=context)
+ !python {model: sale.config.settings}: |
+ self.execute(cr, uid, [ref('default_delivery_policy')], context=context)
diff --git a/addons/document/custom_view.xml b/addons/document/custom_view.xml
index 894e5bac77f..45c4b337d99 100644
--- a/addons/document/custom_view.xml
+++ b/addons/document/custom_view.xml
@@ -2,9 +2,11 @@
grcompta
+
grcomptaadmin
+
diff --git a/addons/document/security/document_security.xml b/addons/document/security/document_security.xml
index 9fba954aa0e..cacde50c36e 100644
--- a/addons/document/security/document_security.xml
+++ b/addons/document/security/document_security.xml
@@ -5,6 +5,7 @@
User
+
diff --git a/addons/document_ftp/i18n/sr@latin.po b/addons/document_ftp/i18n/sr@latin.po
index 8355ba1a83c..a28e9bc02ef 100644
--- a/addons/document_ftp/i18n/sr@latin.po
+++ b/addons/document_ftp/i18n/sr@latin.po
@@ -8,19 +8,19 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2010-12-23 14:06+0000\n"
-"Last-Translator: Olivier Dony (OpenERP) \n"
+"PO-Revision-Date: 2012-04-05 15:29+0000\n"
+"Last-Translator: Milan Milosevic \n"
"Language-Team: Serbian latin \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 07:07+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-04-06 04:37+0000\n"
+"X-Generator: Launchpad (build 15060)\n"
#. module: document_ftp
#: model:ir.model,name:document_ftp.model_document_ftp_configuration
msgid "Auto Directory Configuration"
-msgstr "Auto Podesavanje dIrektorijuma"
+msgstr "Auto-podešavanje direktorijuma"
#. module: document_ftp
#: view:document.ftp.configuration:0
@@ -31,11 +31,16 @@ msgid ""
"format is HOST:PORT and the default host (localhost) is only suitable for "
"access from the server machine itself.."
msgstr ""
+"Odredite adresu mreže na koju bi Vaši OpenERP server trebalo da bude "
+"dostupan za konačne korisnike. Ovo zavisi od Vaše mrežne toplogije i "
+"podešavanja, i neće imati uticaja na linkove prikazane korisnicima. Format "
+"je HOST:PORT i domaćin po defaultu (localhost) je jedino prikladan za "
+"pristup na server sa same mašine."
#. module: document_ftp
#: model:ir.actions.url,name:document_ftp.action_document_browse
msgid "Browse Files"
-msgstr "Pretrazi fajlove"
+msgstr "Pretraži datoteke"
#. module: document_ftp
#: field:document.ftp.configuration,config_logo:0
@@ -45,7 +50,7 @@ msgstr "Slika"
#. module: document_ftp
#: field:document.ftp.configuration,host:0
msgid "Address"
-msgstr ""
+msgstr "Adresa"
#. module: document_ftp
#: field:document.ftp.browse,url:0
@@ -55,12 +60,12 @@ msgstr "FTP Server"
#. module: document_ftp
#: model:ir.actions.act_window,name:document_ftp.action_config_auto_directory
msgid "FTP Server Configuration"
-msgstr "KOnfiguracija FTP Servera"
+msgstr "Podešavanje FTP servera"
#. module: document_ftp
#: view:document.ftp.browse:0
msgid "_Browse"
-msgstr "_Browse"
+msgstr "_Pretraži"
#. module: document_ftp
#: help:document.ftp.configuration,host:0
@@ -73,32 +78,32 @@ msgstr ""
#. module: document_ftp
#: model:ir.ui.menu,name:document_ftp.menu_document_browse
msgid "Shared Repository (FTP)"
-msgstr "Deljeno skladiste (FTP)"
+msgstr "Deljeno skladište"
#. module: document_ftp
#: view:document.ftp.browse:0
msgid "_Cancel"
-msgstr "_Cancel"
+msgstr "_Otkaži"
#. module: document_ftp
#: view:document.ftp.configuration:0
msgid "Configure FTP Server"
-msgstr ""
+msgstr "Podesi FTP server"
#. module: document_ftp
#: view:document.ftp.configuration:0
msgid "title"
-msgstr "Naslov"
+msgstr "naslov"
#. module: document_ftp
#: model:ir.model,name:document_ftp.model_document_ftp_browse
msgid "Document FTP Browse"
-msgstr "FTP pretrazi Dokumente"
+msgstr "Pretraži FTP dokumente"
#. module: document_ftp
#: view:document.ftp.configuration:0
msgid "Knowledge Application Configuration"
-msgstr ""
+msgstr "Podešavanje aplikacije znanja"
#. module: document_ftp
#: model:ir.actions.act_window,name:document_ftp.action_ftp_browse
@@ -108,7 +113,7 @@ msgstr "Pretrazi Dokumente"
#. module: document_ftp
#: view:document.ftp.browse:0
msgid "Browse Document"
-msgstr "Pretrazi Dokument"
+msgstr "Pretraži dokumenta"
#. module: document_ftp
#: view:document.ftp.configuration:0
diff --git a/addons/edi/i18n/ar.po b/addons/edi/i18n/ar.po
new file mode 100644
index 00000000000..5704dc7b782
--- /dev/null
+++ b/addons/edi/i18n/ar.po
@@ -0,0 +1,386 @@
+# Arabic translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR , 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2012-02-08 01:37+0100\n"
+"PO-Revision-Date: 2012-04-06 00:12+0000\n"
+"Last-Translator: FULL NAME \n"
+"Language-Team: Arabic \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-04-06 04:37+0000\n"
+"X-Generator: Launchpad (build 15060)\n"
+
+#. module: edi
+#: sql_constraint:res.currency:0
+msgid "The currency code must be unique per company!"
+msgstr ""
+
+#. module: edi
+#: model:ir.model,name:edi.model_res_partner_address
+msgid "Partner Addresses"
+msgstr "عناوين الشريك"
+
+#. module: edi
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr "اسم الشركة يجب أن يكون فريداً !"
+
+#. module: edi
+#: constraint:res.partner:0
+msgid "Error ! You cannot create recursive associated members."
+msgstr ""
+
+#. module: edi
+#: field:edi.document,name:0
+msgid "EDI token"
+msgstr ""
+
+#. module: edi
+#: help:edi.document,name:0
+msgid "Unique identifier for retrieving an EDI document."
+msgstr ""
+
+#. module: edi
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "خطأ! لا يمكنك إنشاء شركات متداخلة (شركات تستخدم نفسها)."
+
+#. module: edi
+#: model:ir.model,name:edi.model_res_company
+msgid "Companies"
+msgstr "الشركات"
+
+#. module: edi
+#: sql_constraint:edi.document:0
+msgid "EDI Tokens must be unique!"
+msgstr ""
+
+#. module: edi
+#: model:ir.model,name:edi.model_res_currency
+msgid "Currency"
+msgstr "العملة"
+
+#. module: edi
+#: code:addons/edi/models/edi.py:153
+#, python-format
+msgid ""
+"The document you are trying to import requires the OpenERP `%s` application. "
+"You can install it by connecting as the administrator and opening the "
+"configuration assistant."
+msgstr ""
+
+#. module: edi
+#: help:edi.document,document:0
+msgid "EDI document content"
+msgstr ""
+
+#. module: edi
+#: model:ir.model,name:edi.model_edi_document
+msgid "EDI Document"
+msgstr ""
+
+#. module: edi
+#: code:addons/edi/models/edi.py:48
+#, python-format
+msgid "'%s' is an invalid external ID"
+msgstr ""
+
+#. module: edi
+#: model:ir.model,name:edi.model_res_partner
+msgid "Partner"
+msgstr "الشريك"
+
+#. module: edi
+#: code:addons/edi/models/edi.py:152
+#, python-format
+msgid "Missing Application"
+msgstr ""
+
+#. module: edi
+#: field:edi.document,document:0
+msgid "Document"
+msgstr "مستند"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:23
+msgid "View/Print"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:28
+msgid "Import this document"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:33
+msgid "Import it into an existing OpenERP instance"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:36
+msgid "OpenERP instance address:"
+msgstr "عنوان مثال أوبنيرب:"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:39
+msgid "Import"
+msgstr "إستيراد"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:44
+msgid "Import it into a new OpenERP Online instance"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:47
+msgid "Create my new OpenERP instance"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:52
+msgid "Import into another application"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:54
+msgid ""
+"OpenERP's Electronic Data Interchange documents are based on a generic and "
+"language\n"
+" independent"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:56
+msgid "JSON"
+msgstr "JSON"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:56
+msgid ""
+"serialization of the document's attribute.\n"
+" It is usually very quick and straightforward to "
+"create a small plug-in for your preferred\n"
+" application that will be capable of importing "
+"any OpenERP EDI document.\n"
+" You can find out more details about how to do "
+"this and what the content of OpenERP EDI documents\n"
+" is like in the"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:60
+msgid "OpenERP documentation"
+msgstr "وثائق أوبنيرب"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:61
+msgid "To get started immediately,"
+msgstr "للبدء خالاً"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:62
+msgid "see is all it takes to use this EDI document in Python"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:70
+msgid "You can download the raw EDI document here:"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:73
+msgid "Download"
+msgstr "تحميل"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:87
+msgid "Powered by"
+msgstr "مدعوم من kifcaliph و"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:87
+msgid "OpenERP"
+msgstr "أوبنيرب"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:34
+msgid "Invoice"
+msgstr "فاتورة"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:37
+msgid "Description"
+msgstr "الوصف"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:38
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:41
+msgid "Date"
+msgstr "التاريخ"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:39
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:40
+msgid "Your Reference"
+msgstr "مرجعك"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:50
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:57
+msgid "Product Description"
+msgstr "وصف المنتج"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:51
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:58
+msgid "Quantity"
+msgstr "الكمية"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:52
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:59
+msgid "Unit Price"
+msgstr "سعر الوحدة"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:53
+msgid "Discount"
+msgstr "الخصم"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:54
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:61
+msgid "Price"
+msgstr "السعر"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:72
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:81
+msgid "Net Total:"
+msgstr "صافي الإجمالي:"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:83
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:92
+msgid "Taxes:"
+msgstr "ضرائب:"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:94
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:103
+msgid "Total:"
+msgstr "الإجمالي:"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:106
+msgid "Tax"
+msgstr "ضريبة"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:107
+msgid "Base Amount"
+msgstr "المبلغ الأساسي"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:108
+msgid "Amount"
+msgstr "المقدار"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:121
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:113
+msgid "Notes:"
+msgstr "ملاحظات:"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:129
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:121
+msgid "Pay Online"
+msgstr "الدفع أونلاين"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:133
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:125
+msgid "Paypal"
+msgstr "باي بال (Paypal)"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:135
+msgid ""
+"You may directly pay this invoice online via Paypal's secure payment gateway:"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:145
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:137
+msgid "Bank Wire Transfer"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:147
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:139
+msgid "Please transfer"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:148
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:140
+msgid "to"
+msgstr "إلى"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:149
+msgid ""
+"(postal address on the invoice header)\n"
+" using one of the following bank accounts. Be sure to "
+"mention the invoice\n"
+" reference"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:151
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:143
+msgid "on the transfer:"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:36
+msgid "Order"
+msgstr "الترتيب"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:42
+msgid "Salesman"
+msgstr "مندوب المبيعات"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:43
+msgid "Payment terms"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:60
+msgid "Discount(%)"
+msgstr "الخصم (%)"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:127
+msgid ""
+"You may directly pay this order online via Paypal's secure payment gateway:"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:141
+msgid ""
+"(postal address on the order header)\n"
+" using one of the following bank accounts. Be sure to "
+"mention the document\n"
+" reference"
+msgstr ""
diff --git a/addons/edi/static/src/js/edi.js b/addons/edi/static/src/js/edi.js
index a93086bdcaa..995012cb3c5 100644
--- a/addons/edi/static/src/js/edi.js
+++ b/addons/edi/static/src/js/edi.js
@@ -108,7 +108,7 @@ openerp.edi.EdiView = openerp.web.OldWidget.extend({
});
openerp.edi.edi_view = function (db, token) {
- openerp.connection.bind().then(function () {
+ openerp.connection.session_bind().then(function () {
new openerp.edi.EdiView(null,db,token).appendTo($("body").addClass('openerp'));
});
}
@@ -188,7 +188,7 @@ openerp.edi.EdiImport = openerp.web.OldWidget.extend({
});
openerp.edi.edi_import = function (url) {
- openerp.connection.bind().then(function () {
+ openerp.connection.session_bind().then(function () {
new openerp.edi.EdiImport(null,url).appendTo($("body").addClass('openerp'));
});
}
diff --git a/addons/event/security/event_security.xml b/addons/event/security/event_security.xml
index fb29fffcca9..5055d517bd5 100644
--- a/addons/event/security/event_security.xml
+++ b/addons/event/security/event_security.xml
@@ -17,10 +17,7 @@
Manager
-
-
-
-
+
diff --git a/addons/fetchmail/__init__.py b/addons/fetchmail/__init__.py
index 934df9846dd..7703c4d2f5b 100644
--- a/addons/fetchmail/__init__.py
+++ b/addons/fetchmail/__init__.py
@@ -1,7 +1,7 @@
#-*- coding:utf-8 -*-
##############################################################################
#
-# OpenERP, Open Source Management Solution
+# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2009 Tiny SPRL (). All Rights Reserved
# mga@tinyerp.com
#
@@ -21,5 +21,6 @@
##############################################################################
import fetchmail
+import res_config
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/fetchmail/res_config.py b/addons/fetchmail/res_config.py
new file mode 100644
index 00000000000..2b4072a63c3
--- /dev/null
+++ b/addons/fetchmail/res_config.py
@@ -0,0 +1,123 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# OpenERP, Open Source Business Applications
+# Copyright (C) 2004-2012 OpenERP S.A. ().
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see .
+#
+##############################################################################
+
+from osv import fields, osv
+
+class fetchmail_config_settings(osv.osv_memory):
+ """ This wizard can be inherited in conjunction with 'res.config.settings', in order to
+ define fields that configure a fetchmail server.
+
+ It relies on the following convention on a set of fields::
+
+ class my_config_wizard(osv.osv_memory):
+ _name = 'my.settings'
+ _inherits = ['res.config.settings', 'fetchmail.config.settings']
+
+ _columns = {
+ 'fetchmail_X': fields.boolean(..., fetchmail_model='my.model', fetchmail_name='Blah'),
+ 'X_server': fields.char('Server Name', size=256),
+ 'X_port': fields.integer('Port'),
+ 'X_type': fields.selection(
+ [('pop', 'POP Server'), ('imap', 'IMAP Server'), ('local', 'Local Server')],
+ 'Server Type'),
+ 'X_is_ssl': fields.boolean('SSL/TLS'),
+ 'X_user': fields.char('Username', size=256),
+ 'X_password': fields.char('Password', size=1024),
+ }
+
+ The method ``get_default_fetchmail_servers`` retrieves the current fetchmail configuration
+ for all fields that start with 'fetchmail_'. It looks up configurations that match the
+ given model name (``fetchmail_model``). The method ``set_fetchmail_servers`` updates the
+ fetchmail configurations by following the same conventions. Both methods are called
+ automatically by the methods of the model 'res.config.settings'.
+
+ The onchange method ``onchange_fetchmail`` can be used to react on changes on the fields
+ 'X_type' and 'X_is_ssl'. Its first parameter is the fields' prefix (here 'X').
+ """
+ _name = 'fetchmail.config.settings'
+
+ def get_default_fetchmail_servers(self, cr, uid, fields, context=None):
+ ir_model = self.pool.get('ir.model')
+ fetchmail_server = self.pool.get('fetchmail.server')
+ fetchmail_fields = [f for f in self._columns if f.startswith('fetchmail_')]
+ res = {}
+ for field in fetchmail_fields:
+ model_name = self._columns[field].fetchmail_model
+ model_id = ir_model.search(cr, uid, [('model', '=', model_name)])[0]
+ server_ids = fetchmail_server.search(cr, uid, [('object_id', '=', model_id), ('state', '=', 'done')])
+ if server_ids:
+ server = fetchmail_server.browse(cr, uid, server_ids[0], context)
+ prefix = field[10:]
+ res.update({
+ field: True,
+ prefix + '_server': server.server,
+ prefix + '_port': server.port,
+ prefix + '_type': server.type,
+ prefix + '_is_ssl': server.is_ssl,
+ prefix + '_user': server.user,
+ prefix + '_password': server.password,
+ })
+ return res
+
+ def set_fetchmail_servers(self, cr, uid, ids, context):
+ ir_model = self.pool.get('ir.model')
+ fetchmail_server = self.pool.get('fetchmail.server')
+ fetchmail_fields = [f for f in self._columns if f.startswith('fetchmail_')]
+ config = self.browse(cr, uid, ids[0], context)
+ for field in fetchmail_fields:
+ model_name = self._columns[field].fetchmail_model
+ model_id = ir_model.search(cr, uid, [('model', '=', model_name)])[0]
+ server_ids = fetchmail_server.search(cr, uid, [('object_id', '=', model_id), ('state', '=', 'done')])
+ if config[field]:
+ prefix = field[10:]
+ values = {
+ 'server': config[prefix + '_server'],
+ 'port': config[prefix + '_port'],
+ 'type': config[prefix + '_type'],
+ 'is_ssl': config[prefix + '_is_ssl'],
+ 'user': config[prefix + '_user'],
+ 'password': config[prefix + '_password'],
+ }
+ if not server_ids:
+ values.update({
+ 'name': getattr(self._columns[field], 'fetchmail_name', model_name),
+ 'object_id': model_id,
+ })
+ server_ids = [fetchmail_server.create(cr, uid, values, context=context)]
+ else:
+ server_ids = fetchmail_server.search(cr, uid, [('object_id', '=', model_id)], context=context)
+ fetchmail_server.write(cr, uid, server_ids, values, context=context)
+ fetchmail_server.button_confirm_login(cr, uid, server_ids, context)
+ else:
+ fetchmail_server.set_draft(cr, uid, server_ids, context)
+
+ def onchange_fetchmail(self, cr, uid, ids, prefix, server_type, ssl, context=None):
+ values = {}
+ if server_type == 'pop':
+ values[prefix + '_port'] = ssl and 995 or 110
+ elif server_type == 'imap':
+ values[prefix + '_port'] = ssl and 993 or 143
+ else:
+ values[prefix + '_server'] = False
+ values[prefix + '_port'] = 0
+ return {'value': values}
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/fetchmail_crm/__init__.py b/addons/fetchmail_crm/__init__.py
deleted file mode 100644
index b5b36afb7e9..00000000000
--- a/addons/fetchmail_crm/__init__.py
+++ /dev/null
@@ -1,22 +0,0 @@
-#-*- coding:utf-8 -*-
-##############################################################################
-#
-# OpenERP, Open Source Management Solution
-# Copyright (C) 2011 OpenERP S.A. (). All Rights Reserved
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see .
-#
-##############################################################################
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/fetchmail_crm/__openerp__.py b/addons/fetchmail_crm/__openerp__.py
deleted file mode 100644
index 108cc5f4d59..00000000000
--- a/addons/fetchmail_crm/__openerp__.py
+++ /dev/null
@@ -1,41 +0,0 @@
-#-*- coding:utf-8 -*-
-##############################################################################
-#
-# OpenERP, Open Source Management Solution
-# Copyright (C) 2011 OpenERP S.A. (). All Rights Reserved
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see .
-#
-##############################################################################
-
-{
- "name" : "eMail Gateway for Leads",
- "version" : "1.0",
- "depends" : ["fetchmail", "crm"],
- "author" : "OpenERP SA",
- "category": 'Hidden',
- "description": """
- """,
- 'website': 'http://www.openerp.com',
- 'init_xml': [],
- 'update_xml': [
- "installer.xml",
- ],
- 'demo_xml': [
- ],
- 'installable': True,
- 'auto_install': True,
-}
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/fetchmail_crm/i18n/de.po b/addons/fetchmail_crm/i18n/de.po
deleted file mode 100644
index e82e8d68de8..00000000000
--- a/addons/fetchmail_crm/i18n/de.po
+++ /dev/null
@@ -1,36 +0,0 @@
-# German translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR , 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME \n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-02-09 15:11+0000\n"
-"Last-Translator: Ferdinand @ Camptocamp \n"
-"Language-Team: German \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-10 04:50+0000\n"
-"X-Generator: Launchpad (build 14771)\n"
-
-#. module: fetchmail_crm
-#: model:ir.actions.act_window,name:fetchmail_crm.action_create_crm_leads_from_email_account
-msgid "Create Leads from Email Account"
-msgstr "Erzeuge Kontakte vom Email Konto"
-
-#. module: fetchmail_crm
-#: model:ir.actions.act_window,help:fetchmail_crm.action_create_crm_leads_from_email_account
-msgid ""
-"You can connect your email account with leads in OpenERP. A new email sent "
-"to this account (example: info@mycompany.com) will automatically create a "
-"lead in OpenERP. The whole communication with the salesman will be attached "
-"to the lead automatically."
-msgstr ""
-"Sie können Ihre E-Mails mit Verkaufs-Kontakten in OpenERP verbinden. Ein "
-"Email das an dieses Konto gesendet wird, erzeugt dann automatische einen "
-"Verkaufskontakt in OpenERP. Die gesamte Kommunikation mit dem Verkäufer wird "
-"dann diesem Verkaufskontakt zugeordnet."
diff --git a/addons/fetchmail_crm/i18n/es.po b/addons/fetchmail_crm/i18n/es.po
deleted file mode 100644
index ef1a0cd6485..00000000000
--- a/addons/fetchmail_crm/i18n/es.po
+++ /dev/null
@@ -1,36 +0,0 @@
-# Spanish translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR , 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME \n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-02-10 08:32+0000\n"
-"Last-Translator: Carlos @ smile-iberia \n"
-"Language-Team: Spanish \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-11 05:09+0000\n"
-"X-Generator: Launchpad (build 14771)\n"
-
-#. module: fetchmail_crm
-#: model:ir.actions.act_window,name:fetchmail_crm.action_create_crm_leads_from_email_account
-msgid "Create Leads from Email Account"
-msgstr ""
-
-#. module: fetchmail_crm
-#: model:ir.actions.act_window,help:fetchmail_crm.action_create_crm_leads_from_email_account
-msgid ""
-"You can connect your email account with leads in OpenERP. A new email sent "
-"to this account (example: info@mycompany.com) will automatically create a "
-"lead in OpenERP. The whole communication with the salesman will be attached "
-"to the lead automatically."
-msgstr ""
-"No puede conectar su cuenta de email con iniciativas en OpenERP. Un nuevo "
-"email enviado a esta cuenta (por ejemplo: info@miempresa.com) creará "
-"automáticamente una iniciativa en OpenERP. Toda la comunicación con el "
-"comercial será adjuntada a la iniciativa automáticamente."
diff --git a/addons/fetchmail_crm/i18n/es_CR.po b/addons/fetchmail_crm/i18n/es_CR.po
deleted file mode 100644
index 6eae3fdc708..00000000000
--- a/addons/fetchmail_crm/i18n/es_CR.po
+++ /dev/null
@@ -1,36 +0,0 @@
-# Spanish (Costa Rica) translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR , 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME \n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-02-15 21:55+0000\n"
-"Last-Translator: Freddy Gonzalez \n"
-"Language-Team: Spanish (Costa Rica) \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-16 05:07+0000\n"
-"X-Generator: Launchpad (build 14781)\n"
-
-#. module: fetchmail_crm
-#: model:ir.actions.act_window,name:fetchmail_crm.action_create_crm_leads_from_email_account
-msgid "Create Leads from Email Account"
-msgstr "Crear clientes potenciales de cuentas de correo electrónico"
-
-#. module: fetchmail_crm
-#: model:ir.actions.act_window,help:fetchmail_crm.action_create_crm_leads_from_email_account
-msgid ""
-"You can connect your email account with leads in OpenERP. A new email sent "
-"to this account (example: info@mycompany.com) will automatically create a "
-"lead in OpenERP. The whole communication with the salesman will be attached "
-"to the lead automatically."
-msgstr ""
-"No puede conectar su cuenta de email con iniciativas en OpenERP. Un nuevo "
-"email enviado a esta cuenta (por ejemplo: info@miempresa.com) creará "
-"automáticamente una iniciativa en OpenERP. Toda la comunicación con el "
-"comercial será adjuntada a la iniciativa automáticamente."
diff --git a/addons/fetchmail_crm/i18n/fetchmail_crm.pot b/addons/fetchmail_crm/i18n/fetchmail_crm.pot
deleted file mode 100644
index d614b85fda6..00000000000
--- a/addons/fetchmail_crm/i18n/fetchmail_crm.pot
+++ /dev/null
@@ -1,27 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-# * fetchmail_crm
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.1rc1\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-02-08 00:36+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
-
-#. module: fetchmail_crm
-#: model:ir.actions.act_window,name:fetchmail_crm.action_create_crm_leads_from_email_account
-msgid "Create Leads from Email Account"
-msgstr ""
-
-#. module: fetchmail_crm
-#: model:ir.actions.act_window,help:fetchmail_crm.action_create_crm_leads_from_email_account
-msgid "You can connect your email account with leads in OpenERP. A new email sent to this account (example: info@mycompany.com) will automatically create a lead in OpenERP. The whole communication with the salesman will be attached to the lead automatically."
-msgstr ""
-
diff --git a/addons/fetchmail_crm/i18n/fr.po b/addons/fetchmail_crm/i18n/fr.po
deleted file mode 100644
index f1f71379a4d..00000000000
--- a/addons/fetchmail_crm/i18n/fr.po
+++ /dev/null
@@ -1,32 +0,0 @@
-# French translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR , 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME \n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-02-10 10:36+0000\n"
-"Last-Translator: FULL NAME \n"
-"Language-Team: French \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-11 05:09+0000\n"
-"X-Generator: Launchpad (build 14771)\n"
-
-#. module: fetchmail_crm
-#: model:ir.actions.act_window,name:fetchmail_crm.action_create_crm_leads_from_email_account
-msgid "Create Leads from Email Account"
-msgstr ""
-
-#. module: fetchmail_crm
-#: model:ir.actions.act_window,help:fetchmail_crm.action_create_crm_leads_from_email_account
-msgid ""
-"You can connect your email account with leads in OpenERP. A new email sent "
-"to this account (example: info@mycompany.com) will automatically create a "
-"lead in OpenERP. The whole communication with the salesman will be attached "
-"to the lead automatically."
-msgstr ""
diff --git a/addons/fetchmail_crm/i18n/ja.po b/addons/fetchmail_crm/i18n/ja.po
deleted file mode 100644
index a8de0fd0bf9..00000000000
--- a/addons/fetchmail_crm/i18n/ja.po
+++ /dev/null
@@ -1,34 +0,0 @@
-# Japanese translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR , 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME \n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-04-01 05:43+0000\n"
-"Last-Translator: Masaki Yamaya \n"
-"Language-Team: Japanese \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-04-02 04:37+0000\n"
-"X-Generator: Launchpad (build 15032)\n"
-
-#. module: fetchmail_crm
-#: model:ir.actions.act_window,name:fetchmail_crm.action_create_crm_leads_from_email_account
-msgid "Create Leads from Email Account"
-msgstr "Ｅメールアカウントからリードを作成"
-
-#. module: fetchmail_crm
-#: model:ir.actions.act_window,help:fetchmail_crm.action_create_crm_leads_from_email_account
-msgid ""
-"You can connect your email account with leads in OpenERP. A new email sent "
-"to this account (example: info@mycompany.com) will automatically create a "
-"lead in OpenERP. The whole communication with the salesman will be attached "
-"to the lead automatically."
-msgstr ""
-"あなたのＥメールアカウントをリードに結び付けることができます。このアカウントへ送られて来たメールは自動的にリードを作成します。セールス担当者との全ての交信"
-"は自動的にリードに添付されます。"
diff --git a/addons/fetchmail_crm/i18n/nl.po b/addons/fetchmail_crm/i18n/nl.po
deleted file mode 100644
index 58c3ff52e77..00000000000
--- a/addons/fetchmail_crm/i18n/nl.po
+++ /dev/null
@@ -1,36 +0,0 @@
-# Dutch translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR , 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME \n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-02-09 12:03+0000\n"
-"Last-Translator: Erwin \n"
-"Language-Team: Dutch \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-10 04:50+0000\n"
-"X-Generator: Launchpad (build 14771)\n"
-
-#. module: fetchmail_crm
-#: model:ir.actions.act_window,name:fetchmail_crm.action_create_crm_leads_from_email_account
-msgid "Create Leads from Email Account"
-msgstr "Maakt leads van een E-mail"
-
-#. module: fetchmail_crm
-#: model:ir.actions.act_window,help:fetchmail_crm.action_create_crm_leads_from_email_account
-msgid ""
-"You can connect your email account with leads in OpenERP. A new email sent "
-"to this account (example: info@mycompany.com) will automatically create a "
-"lead in OpenERP. The whole communication with the salesman will be attached "
-"to the lead automatically."
-msgstr ""
-"Het is mogelijk om uw e-mail adres te koppelen aan leads in OpenERP. Van een "
-"nieuwe e-mail, welke naar dit adres (bijvoorbeeld: info@mijnbedrijf.com) "
-"wordt gestuurd, wordt automatisch een lead gemaakt in OPenERP. De gehele "
-"communicatie met de verkoper wordt automatisch gekoppeld aan de lead."
diff --git a/addons/fetchmail_crm/i18n/sr@latin.po b/addons/fetchmail_crm/i18n/sr@latin.po
deleted file mode 100644
index 0d7509139a6..00000000000
--- a/addons/fetchmail_crm/i18n/sr@latin.po
+++ /dev/null
@@ -1,36 +0,0 @@
-# Serbian Latin translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR , 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME \n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-03-19 11:45+0000\n"
-"Last-Translator: Milan Milosevic \n"
-"Language-Team: Serbian Latin \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-20 04:56+0000\n"
-"X-Generator: Launchpad (build 14969)\n"
-
-#. module: fetchmail_crm
-#: model:ir.actions.act_window,name:fetchmail_crm.action_create_crm_leads_from_email_account
-msgid "Create Leads from Email Account"
-msgstr "Napravi ovlašćenja preko email naloga"
-
-#. module: fetchmail_crm
-#: model:ir.actions.act_window,help:fetchmail_crm.action_create_crm_leads_from_email_account
-msgid ""
-"You can connect your email account with leads in OpenERP. A new email sent "
-"to this account (example: info@mycompany.com) will automatically create a "
-"lead in OpenERP. The whole communication with the salesman will be attached "
-"to the lead automatically."
-msgstr ""
-"Možete povezati svoj email nalog sa ovlašćenjima u OpenERP-u. Novi email će "
-"biti poslat na taj nalog (npr: info@mycompany.com) i on će automatski "
-"napraviti ovlašćenje u OpenERP-u. Celokupna komunikacija sa prodavcem biće "
-"povezana s vodećom strankom automatski"
diff --git a/addons/fetchmail_crm/i18n/tr.po b/addons/fetchmail_crm/i18n/tr.po
deleted file mode 100644
index a52dcf088c3..00000000000
--- a/addons/fetchmail_crm/i18n/tr.po
+++ /dev/null
@@ -1,36 +0,0 @@
-# Turkish translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR , 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME \n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-02-09 23:08+0000\n"
-"Last-Translator: Ahmet Altınışık \n"
-"Language-Team: Turkish \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-11 05:09+0000\n"
-"X-Generator: Launchpad (build 14771)\n"
-
-#. module: fetchmail_crm
-#: model:ir.actions.act_window,name:fetchmail_crm.action_create_crm_leads_from_email_account
-msgid "Create Leads from Email Account"
-msgstr "E-posta hesabından fırsatlar oluştur"
-
-#. module: fetchmail_crm
-#: model:ir.actions.act_window,help:fetchmail_crm.action_create_crm_leads_from_email_account
-msgid ""
-"You can connect your email account with leads in OpenERP. A new email sent "
-"to this account (example: info@mycompany.com) will automatically create a "
-"lead in OpenERP. The whole communication with the salesman will be attached "
-"to the lead automatically."
-msgstr ""
-"E-posta hesabınız ile OpenERP fırsatlarını birbirine bağlayabilirsiniz. Bu "
-"hesaba gönderilen yeni bir e-posta (mesela: satis@mycompany.com) için "
-"otomatik olarak bir fırsat oluşturulacak ve satış temsilcisiyle yapılan "
-"bütün mesaj trafiği fırsata otomatik olarak eklenecek."
diff --git a/addons/fetchmail_crm/i18n/zh_CN.po b/addons/fetchmail_crm/i18n/zh_CN.po
deleted file mode 100644
index 6c006483a94..00000000000
--- a/addons/fetchmail_crm/i18n/zh_CN.po
+++ /dev/null
@@ -1,34 +0,0 @@
-# Chinese (Simplified) translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR , 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME \n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-02-16 04:42+0000\n"
-"Last-Translator: wangsy \n"
-"Language-Team: Chinese (Simplified) \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-17 05:01+0000\n"
-"X-Generator: Launchpad (build 14814)\n"
-
-#. module: fetchmail_crm
-#: model:ir.actions.act_window,name:fetchmail_crm.action_create_crm_leads_from_email_account
-msgid "Create Leads from Email Account"
-msgstr "从邮件获取商机"
-
-#. module: fetchmail_crm
-#: model:ir.actions.act_window,help:fetchmail_crm.action_create_crm_leads_from_email_account
-msgid ""
-"You can connect your email account with leads in OpenERP. A new email sent "
-"to this account (example: info@mycompany.com) will automatically create a "
-"lead in OpenERP. The whole communication with the salesman will be attached "
-"to the lead automatically."
-msgstr ""
-"你可以在OpenERP中连接包含商机的电子邮件账户，一封发往该账号的邮件(例如：info@mycompany.com)会自动创建一条商机。所有与该销售员的"
-"沟通会自动附加到此商机中。"
diff --git a/addons/fetchmail_crm/installer.xml b/addons/fetchmail_crm/installer.xml
deleted file mode 100644
index 5223367eb29..00000000000
--- a/addons/fetchmail_crm/installer.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-
- Create Leads from Email Account
- ir.actions.act_window
- fetchmail.server
- form
- tree,form
-
- You can connect your email account with leads in OpenERP. A new email sent to this account (example: info@mycompany.com) will automatically create a lead in OpenERP. The whole communication with the salesman will be attached to the lead automatically.
-
-
-
-
-
-
-
-
diff --git a/addons/fetchmail_crm_claim/__init__.py b/addons/fetchmail_crm_claim/__init__.py
deleted file mode 100644
index b5b36afb7e9..00000000000
--- a/addons/fetchmail_crm_claim/__init__.py
+++ /dev/null
@@ -1,22 +0,0 @@
-#-*- coding:utf-8 -*-
-##############################################################################
-#
-# OpenERP, Open Source Management Solution
-# Copyright (C) 2011 OpenERP S.A. (). All Rights Reserved
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see .
-#
-##############################################################################
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/fetchmail_crm_claim/__openerp__.py b/addons/fetchmail_crm_claim/__openerp__.py
deleted file mode 100644
index 2a515205f9e..00000000000
--- a/addons/fetchmail_crm_claim/__openerp__.py
+++ /dev/null
@@ -1,41 +0,0 @@
-#-*- coding:utf-8 -*-
-##############################################################################
-#
-# OpenERP, Open Source Management Solution
-# Copyright (C) 2011 OpenERP S.A. (). All Rights Reserved
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see .
-#
-##############################################################################
-
-{
- "name" : "eMail Gateway for CRM Claim",
- "version" : "1.0",
- "depends" : ["fetchmail", "crm_claim"],
- "author" : "OpenERP SA",
- 'category': 'Hidden',
- "description": """
- """,
- 'website': 'http://www.openerp.com',
- 'init_xml': [],
- 'update_xml': [
- "installer.xml",
- ],
- 'demo_xml': [
- ],
- 'installable': True,
- 'auto_install': True,
-}
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/fetchmail_crm_claim/i18n/de.po b/addons/fetchmail_crm_claim/i18n/de.po
deleted file mode 100644
index f70948419f1..00000000000
--- a/addons/fetchmail_crm_claim/i18n/de.po
+++ /dev/null
@@ -1,36 +0,0 @@
-# German translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR , 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME \n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-02-09 15:10+0000\n"
-"Last-Translator: Ferdinand @ Camptocamp \n"
-"Language-Team: German \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-10 04:50+0000\n"
-"X-Generator: Launchpad (build 14771)\n"
-
-#. module: fetchmail_crm_claim
-#: model:ir.actions.act_window,help:fetchmail_crm_claim.action_create_crm_claims_from_email_account
-msgid ""
-"You can connect your email account with claims in OpenERP. A new email sent "
-"to this account (example: support@mycompany.com) will automatically create a "
-"claim for the followup in OpenERP. The whole communication by email will be "
-"attached to the claim automatically to keep track of the history."
-msgstr ""
-"Sie können Ihre E-Mails mit Reklamationen in OpenERP verbinden. Ein Email "
-"das an dieses Konto gesendet wird, erzeugt dann automatische eine "
-"Reklamation in OpenERP. Die gesamte Kommunikation wird dann dieser "
-"Reklamation zugeordnet."
-
-#. module: fetchmail_crm_claim
-#: model:ir.actions.act_window,name:fetchmail_crm_claim.action_create_crm_claims_from_email_account
-msgid "Create Claims from Email Account"
-msgstr "Erzeuge Reklamationen von diesem Mail Konto"
diff --git a/addons/fetchmail_crm_claim/i18n/es.po b/addons/fetchmail_crm_claim/i18n/es.po
deleted file mode 100644
index 8844c84fec5..00000000000
--- a/addons/fetchmail_crm_claim/i18n/es.po
+++ /dev/null
@@ -1,32 +0,0 @@
-# Spanish translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR , 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME \n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-02-10 08:35+0000\n"
-"Last-Translator: Carlos @ smile-iberia \n"
-"Language-Team: Spanish \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-11 05:09+0000\n"
-"X-Generator: Launchpad (build 14771)\n"
-
-#. module: fetchmail_crm_claim
-#: model:ir.actions.act_window,help:fetchmail_crm_claim.action_create_crm_claims_from_email_account
-msgid ""
-"You can connect your email account with claims in OpenERP. A new email sent "
-"to this account (example: support@mycompany.com) will automatically create a "
-"claim for the followup in OpenERP. The whole communication by email will be "
-"attached to the claim automatically to keep track of the history."
-msgstr ""
-
-#. module: fetchmail_crm_claim
-#: model:ir.actions.act_window,name:fetchmail_crm_claim.action_create_crm_claims_from_email_account
-msgid "Create Claims from Email Account"
-msgstr "Crear reclamaciones a partir de cuentas de email"
diff --git a/addons/fetchmail_crm_claim/i18n/es_CR.po b/addons/fetchmail_crm_claim/i18n/es_CR.po
deleted file mode 100644
index 8e9a1e171bf..00000000000
--- a/addons/fetchmail_crm_claim/i18n/es_CR.po
+++ /dev/null
@@ -1,37 +0,0 @@
-# Spanish (Costa Rica) translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR , 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME \n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-02-15 21:58+0000\n"
-"Last-Translator: Freddy Gonzalez \n"
-"Language-Team: Spanish (Costa Rica) \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-16 05:07+0000\n"
-"X-Generator: Launchpad (build 14781)\n"
-
-#. module: fetchmail_crm_claim
-#: model:ir.actions.act_window,help:fetchmail_crm_claim.action_create_crm_claims_from_email_account
-msgid ""
-"You can connect your email account with claims in OpenERP. A new email sent "
-"to this account (example: support@mycompany.com) will automatically create a "
-"claim for the followup in OpenERP. The whole communication by email will be "
-"attached to the claim automatically to keep track of the history."
-msgstr ""
-"Puedes conectar tu cuenta de correo electrónico con derechos en OpenERP. Un "
-"nuevo correo enviado a esta cuenta (por ejemplo: support@mycompany.com) "
-"creará automáticamente un reclamo para el seguimiento en OpenERP. Toda la "
-"comunicación por correo electrónico se adjuntará a la solicitud de forma "
-"automática para realizar un seguimiento de la historia."
-
-#. module: fetchmail_crm_claim
-#: model:ir.actions.act_window,name:fetchmail_crm_claim.action_create_crm_claims_from_email_account
-msgid "Create Claims from Email Account"
-msgstr "Crear reclamaciones a partir de cuentas de email"
diff --git a/addons/fetchmail_crm_claim/i18n/fetchmail_crm_claim.pot b/addons/fetchmail_crm_claim/i18n/fetchmail_crm_claim.pot
deleted file mode 100644
index f4b85a56470..00000000000
--- a/addons/fetchmail_crm_claim/i18n/fetchmail_crm_claim.pot
+++ /dev/null
@@ -1,27 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-# * fetchmail_crm_claim
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.1rc1\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-02-08 00:36+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
-
-#. module: fetchmail_crm_claim
-#: model:ir.actions.act_window,help:fetchmail_crm_claim.action_create_crm_claims_from_email_account
-msgid "You can connect your email account with claims in OpenERP. A new email sent to this account (example: support@mycompany.com) will automatically create a claim for the followup in OpenERP. The whole communication by email will be attached to the claim automatically to keep track of the history."
-msgstr ""
-
-#. module: fetchmail_crm_claim
-#: model:ir.actions.act_window,name:fetchmail_crm_claim.action_create_crm_claims_from_email_account
-msgid "Create Claims from Email Account"
-msgstr ""
-
diff --git a/addons/fetchmail_crm_claim/i18n/fr.po b/addons/fetchmail_crm_claim/i18n/fr.po
deleted file mode 100644
index 50a31809630..00000000000
--- a/addons/fetchmail_crm_claim/i18n/fr.po
+++ /dev/null
@@ -1,32 +0,0 @@
-# French translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR , 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME \n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-02-15 19:09+0000\n"
-"Last-Translator: FULL NAME \n"
-"Language-Team: French \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-16 05:07+0000\n"
-"X-Generator: Launchpad (build 14781)\n"
-
-#. module: fetchmail_crm_claim
-#: model:ir.actions.act_window,help:fetchmail_crm_claim.action_create_crm_claims_from_email_account
-msgid ""
-"You can connect your email account with claims in OpenERP. A new email sent "
-"to this account (example: support@mycompany.com) will automatically create a "
-"claim for the followup in OpenERP. The whole communication by email will be "
-"attached to the claim automatically to keep track of the history."
-msgstr ""
-
-#. module: fetchmail_crm_claim
-#: model:ir.actions.act_window,name:fetchmail_crm_claim.action_create_crm_claims_from_email_account
-msgid "Create Claims from Email Account"
-msgstr ""
diff --git a/addons/fetchmail_crm_claim/i18n/ja.po b/addons/fetchmail_crm_claim/i18n/ja.po
deleted file mode 100644
index 1d17a5fd162..00000000000
--- a/addons/fetchmail_crm_claim/i18n/ja.po
+++ /dev/null
@@ -1,32 +0,0 @@
-# Japanese translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR , 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME \n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-04-01 06:29+0000\n"
-"Last-Translator: Masaki Yamaya \n"
-"Language-Team: Japanese \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-04-02 04:37+0000\n"
-"X-Generator: Launchpad (build 15032)\n"
-
-#. module: fetchmail_crm_claim
-#: model:ir.actions.act_window,help:fetchmail_crm_claim.action_create_crm_claims_from_email_account
-msgid ""
-"You can connect your email account with claims in OpenERP. A new email sent "
-"to this account (example: support@mycompany.com) will automatically create a "
-"claim for the followup in OpenERP. The whole communication by email will be "
-"attached to the claim automatically to keep track of the history."
-msgstr ""
-
-#. module: fetchmail_crm_claim
-#: model:ir.actions.act_window,name:fetchmail_crm_claim.action_create_crm_claims_from_email_account
-msgid "Create Claims from Email Account"
-msgstr "Ｅメールアカウントからクレームを作成"
diff --git a/addons/fetchmail_crm_claim/i18n/nl.po b/addons/fetchmail_crm_claim/i18n/nl.po
deleted file mode 100644
index 15c9812f502..00000000000
--- a/addons/fetchmail_crm_claim/i18n/nl.po
+++ /dev/null
@@ -1,37 +0,0 @@
-# Dutch translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR , 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME \n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-02-12 15:20+0000\n"
-"Last-Translator: Erwin \n"
-"Language-Team: Dutch \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-13 04:50+0000\n"
-"X-Generator: Launchpad (build 14781)\n"
-
-#. module: fetchmail_crm_claim
-#: model:ir.actions.act_window,help:fetchmail_crm_claim.action_create_crm_claims_from_email_account
-msgid ""
-"You can connect your email account with claims in OpenERP. A new email sent "
-"to this account (example: support@mycompany.com) will automatically create a "
-"claim for the followup in OpenERP. The whole communication by email will be "
-"attached to the claim automatically to keep track of the history."
-msgstr ""
-"Het is mogelijk uw e-mail account te koppelen aan claims in OpenERP. Een "
-"nieuwe e-mail, welke wordt verzonden naar dit account (bijvoorbeeld: "
-"support@mijnbedrijf.com), zal automatisch een claim aanmaken welke kan "
-"worden opgevolgd in OpenERP. De gehele communicatie van de e-mail wordt "
-"automatisch gekoppeld aan de claim, zodat de historie getraceerd kan worden."
-
-#. module: fetchmail_crm_claim
-#: model:ir.actions.act_window,name:fetchmail_crm_claim.action_create_crm_claims_from_email_account
-msgid "Create Claims from Email Account"
-msgstr "Maak claims van e-mail account"
diff --git a/addons/fetchmail_crm_claim/i18n/sr@latin.po b/addons/fetchmail_crm_claim/i18n/sr@latin.po
deleted file mode 100644
index d6db86d1d9e..00000000000
--- a/addons/fetchmail_crm_claim/i18n/sr@latin.po
+++ /dev/null
@@ -1,36 +0,0 @@
-# Serbian Latin translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR , 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME \n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-03-19 11:51+0000\n"
-"Last-Translator: Milan Milosevic \n"
-"Language-Team: Serbian Latin \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-20 04:56+0000\n"
-"X-Generator: Launchpad (build 14969)\n"
-
-#. module: fetchmail_crm_claim
-#: model:ir.actions.act_window,help:fetchmail_crm_claim.action_create_crm_claims_from_email_account
-msgid ""
-"You can connect your email account with claims in OpenERP. A new email sent "
-"to this account (example: support@mycompany.com) will automatically create a "
-"claim for the followup in OpenERP. The whole communication by email will be "
-"attached to the claim automatically to keep track of the history."
-msgstr ""
-"Možete povezati svoj nalog sa potraživanjima u OpenERP-u. Novi email biće "
-"poslat na taj nalog (npr:support@mycompany.com), i on će automatski "
-"napraviti potraživanje. Celokupna komunikacija biće povezana s potraživanjem "
-"automatski da bi se sačuvao pregled istorije komunikacije."
-
-#. module: fetchmail_crm_claim
-#: model:ir.actions.act_window,name:fetchmail_crm_claim.action_create_crm_claims_from_email_account
-msgid "Create Claims from Email Account"
-msgstr "Napravi potraživanje preko email naloga"
diff --git a/addons/fetchmail_crm_claim/i18n/tr.po b/addons/fetchmail_crm_claim/i18n/tr.po
deleted file mode 100644
index 3d758e1713f..00000000000
--- a/addons/fetchmail_crm_claim/i18n/tr.po
+++ /dev/null
@@ -1,35 +0,0 @@
-# Turkish translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR , 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME \n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-02-09 23:11+0000\n"
-"Last-Translator: Ahmet Altınışık \n"
-"Language-Team: Turkish \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-11 05:09+0000\n"
-"X-Generator: Launchpad (build 14771)\n"
-
-#. module: fetchmail_crm_claim
-#: model:ir.actions.act_window,help:fetchmail_crm_claim.action_create_crm_claims_from_email_account
-msgid ""
-"You can connect your email account with claims in OpenERP. A new email sent "
-"to this account (example: support@mycompany.com) will automatically create a "
-"claim for the followup in OpenERP. The whole communication by email will be "
-"attached to the claim automatically to keep track of the history."
-msgstr ""
-"E-posta hesabınızla OpenERP şikayetlerini bağlayabilirsiniz. Bu e-posta "
-"hesabına (örnek: sikayet@sirketim.com) gönderilen her e-posta için bir "
-"şikayet otomatik olarak oluşturulacak."
-
-#. module: fetchmail_crm_claim
-#: model:ir.actions.act_window,name:fetchmail_crm_claim.action_create_crm_claims_from_email_account
-msgid "Create Claims from Email Account"
-msgstr "E-posta hesabından sikayet oluştur"
diff --git a/addons/fetchmail_crm_claim/i18n/zh_CN.po b/addons/fetchmail_crm_claim/i18n/zh_CN.po
deleted file mode 100644
index 1b4e3aacfcc..00000000000
--- a/addons/fetchmail_crm_claim/i18n/zh_CN.po
+++ /dev/null
@@ -1,34 +0,0 @@
-# Chinese (Simplified) translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR , 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME \n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-02-16 04:39+0000\n"
-"Last-Translator: wangsy \n"
-"Language-Team: Chinese (Simplified) \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-17 05:01+0000\n"
-"X-Generator: Launchpad (build 14814)\n"
-
-#. module: fetchmail_crm_claim
-#: model:ir.actions.act_window,help:fetchmail_crm_claim.action_create_crm_claims_from_email_account
-msgid ""
-"You can connect your email account with claims in OpenERP. A new email sent "
-"to this account (example: support@mycompany.com) will automatically create a "
-"claim for the followup in OpenERP. The whole communication by email will be "
-"attached to the claim automatically to keep track of the history."
-msgstr ""
-"你可以在OpenERP中连接包含支持服务的电子邮件账户，一封发往该账号的邮件(例如：support@mycompany.com)会自动创建一条跟踪服务的记"
-"录。所有电子邮件沟通将自动附加在该支持服务记录上以保留所有跟踪的过程。"
-
-#. module: fetchmail_crm_claim
-#: model:ir.actions.act_window,name:fetchmail_crm_claim.action_create_crm_claims_from_email_account
-msgid "Create Claims from Email Account"
-msgstr "从电子邮件创建支持服务"
diff --git a/addons/fetchmail_crm_claim/installer.xml b/addons/fetchmail_crm_claim/installer.xml
deleted file mode 100644
index b3652a72938..00000000000
--- a/addons/fetchmail_crm_claim/installer.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-
- Create Claims from Email Account
- ir.actions.act_window
- fetchmail.server
- form
- tree,form
-
- You can connect your email account with claims in OpenERP. A new email sent to this account (example: support@mycompany.com) will automatically create a claim for the followup in OpenERP. The whole communication by email will be attached to the claim automatically to keep track of the history.
-
-
-
-
-
-
-
-
diff --git a/addons/fetchmail_project_issue/__init__.py b/addons/fetchmail_project_issue/__init__.py
deleted file mode 100644
index b5b36afb7e9..00000000000
--- a/addons/fetchmail_project_issue/__init__.py
+++ /dev/null
@@ -1,22 +0,0 @@
-#-*- coding:utf-8 -*-
-##############################################################################
-#
-# OpenERP, Open Source Management Solution
-# Copyright (C) 2011 OpenERP S.A. (). All Rights Reserved
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see .
-#
-##############################################################################
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/fetchmail_project_issue/__openerp__.py b/addons/fetchmail_project_issue/__openerp__.py
deleted file mode 100644
index 4d50a87bac8..00000000000
--- a/addons/fetchmail_project_issue/__openerp__.py
+++ /dev/null
@@ -1,41 +0,0 @@
-#-*- coding:utf-8 -*-
-##############################################################################
-#
-# OpenERP, Open Source Management Solution
-# Copyright (C) 2011 OpenERP S.A. (). All Rights Reserved
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see .
-#
-##############################################################################
-
-{
- "name" : "eMail Gateway for Project Issues",
- "version" : "1.0",
- "depends" : ["fetchmail", "project_issue"],
- "author" : "OpenERP SA",
- "category": "Hidden",
- "description": """
- """,
- 'website': 'http://www.openerp.com',
- 'init_xml': [],
- 'update_xml': [
- "installer.xml",
- ],
- 'demo_xml': [
- ],
- 'installable': True,
- 'auto_install': True,
-}
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/fetchmail_project_issue/i18n/de.po b/addons/fetchmail_project_issue/i18n/de.po
deleted file mode 100644
index 7f11791d711..00000000000
--- a/addons/fetchmail_project_issue/i18n/de.po
+++ /dev/null
@@ -1,35 +0,0 @@
-# German translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR , 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME \n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-02-09 15:15+0000\n"
-"Last-Translator: Ferdinand @ Camptocamp \n"
-"Language-Team: German \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-10 04:50+0000\n"
-"X-Generator: Launchpad (build 14771)\n"
-
-#. module: fetchmail_project_issue
-#: model:ir.actions.act_window,name:fetchmail_project_issue.action_link_issue_to_email_account
-msgid "Create Issues from Email Account"
-msgstr "Erzeuge Fälle von Email Konto"
-
-#. module: fetchmail_project_issue
-#: model:ir.actions.act_window,help:fetchmail_project_issue.action_link_issue_to_email_account
-msgid ""
-"You can connect your email account with issues in OpenERP. A new email sent "
-"to this account (example: support@mycompany.com) will automatically create "
-"an issue. The whole communication will be attached to the issue "
-"automatically."
-msgstr ""
-"Sie können Fälle von diesem Konto mit OpenERP verbinden. Ein Email das an "
-"dieses Konto gesendet wird, erzeugt dann automatische einen Fall in "
-"OpenERP. Die gesamte Kommunikation wird dann diese Fall zugeordnet."
diff --git a/addons/fetchmail_project_issue/i18n/es_CR.po b/addons/fetchmail_project_issue/i18n/es_CR.po
deleted file mode 100644
index 0a5273af5d3..00000000000
--- a/addons/fetchmail_project_issue/i18n/es_CR.po
+++ /dev/null
@@ -1,36 +0,0 @@
-# Spanish (Costa Rica) translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR , 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME \n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-02-15 22:03+0000\n"
-"Last-Translator: Freddy Gonzalez \n"
-"Language-Team: Spanish (Costa Rica) \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-16 05:07+0000\n"
-"X-Generator: Launchpad (build 14781)\n"
-
-#. module: fetchmail_project_issue
-#: model:ir.actions.act_window,name:fetchmail_project_issue.action_link_issue_to_email_account
-msgid "Create Issues from Email Account"
-msgstr "Crear problemas de la cuenta de correo electrónico"
-
-#. module: fetchmail_project_issue
-#: model:ir.actions.act_window,help:fetchmail_project_issue.action_link_issue_to_email_account
-msgid ""
-"You can connect your email account with issues in OpenERP. A new email sent "
-"to this account (example: support@mycompany.com) will automatically create "
-"an issue. The whole communication will be attached to the issue "
-"automatically."
-msgstr ""
-"Puedes conectar tu cuenta de correo electrónico con asuntos en OpenERP. Un "
-"nuevo correo enviado a esta cuenta (por ejemplo: support@mycompany.com) "
-"creará automáticamente un problema. Toda la comunicación se concede a la "
-"cuestión de forma automática."
diff --git a/addons/fetchmail_project_issue/i18n/fetchmail_project_issue.pot b/addons/fetchmail_project_issue/i18n/fetchmail_project_issue.pot
deleted file mode 100644
index 1b0f11ca105..00000000000
--- a/addons/fetchmail_project_issue/i18n/fetchmail_project_issue.pot
+++ /dev/null
@@ -1,27 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-# * fetchmail_project_issue
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.1rc1\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-02-08 00:36+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
-
-#. module: fetchmail_project_issue
-#: model:ir.actions.act_window,name:fetchmail_project_issue.action_link_issue_to_email_account
-msgid "Create Issues from Email Account"
-msgstr ""
-
-#. module: fetchmail_project_issue
-#: model:ir.actions.act_window,help:fetchmail_project_issue.action_link_issue_to_email_account
-msgid "You can connect your email account with issues in OpenERP. A new email sent to this account (example: support@mycompany.com) will automatically create an issue. The whole communication will be attached to the issue automatically."
-msgstr ""
-
diff --git a/addons/fetchmail_project_issue/i18n/fr.po b/addons/fetchmail_project_issue/i18n/fr.po
deleted file mode 100644
index 3738cef0f2a..00000000000
--- a/addons/fetchmail_project_issue/i18n/fr.po
+++ /dev/null
@@ -1,32 +0,0 @@
-# French translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR , 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME \n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-02-24 22:39+0000\n"
-"Last-Translator: FULL NAME \n"
-"Language-Team: French \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-25 05:13+0000\n"
-"X-Generator: Launchpad (build 14860)\n"
-
-#. module: fetchmail_project_issue
-#: model:ir.actions.act_window,name:fetchmail_project_issue.action_link_issue_to_email_account
-msgid "Create Issues from Email Account"
-msgstr ""
-
-#. module: fetchmail_project_issue
-#: model:ir.actions.act_window,help:fetchmail_project_issue.action_link_issue_to_email_account
-msgid ""
-"You can connect your email account with issues in OpenERP. A new email sent "
-"to this account (example: support@mycompany.com) will automatically create "
-"an issue. The whole communication will be attached to the issue "
-"automatically."
-msgstr ""
diff --git a/addons/fetchmail_project_issue/i18n/ja.po b/addons/fetchmail_project_issue/i18n/ja.po
deleted file mode 100644
index 2f8d5710325..00000000000
--- a/addons/fetchmail_project_issue/i18n/ja.po
+++ /dev/null
@@ -1,34 +0,0 @@
-# Japanese translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR , 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME \n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-04-01 05:57+0000\n"
-"Last-Translator: Masaki Yamaya \n"
-"Language-Team: Japanese \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-04-02 04:37+0000\n"
-"X-Generator: Launchpad (build 15032)\n"
-
-#. module: fetchmail_project_issue
-#: model:ir.actions.act_window,name:fetchmail_project_issue.action_link_issue_to_email_account
-msgid "Create Issues from Email Account"
-msgstr "Ｅメールアカウントから課題を作成"
-
-#. module: fetchmail_project_issue
-#: model:ir.actions.act_window,help:fetchmail_project_issue.action_link_issue_to_email_account
-msgid ""
-"You can connect your email account with issues in OpenERP. A new email sent "
-"to this account (example: support@mycompany.com) will automatically create "
-"an issue. The whole communication will be attached to the issue "
-"automatically."
-msgstr ""
-"あなたのＥメールアカウントを課題に結び付けることができます。このアカウントへ送られて来る新しいＥメールは自動的に課題を作成します。全てのコミュニケーション"
-"は自動的にこの課題に帰属されます。"
diff --git a/addons/fetchmail_project_issue/i18n/nl.po b/addons/fetchmail_project_issue/i18n/nl.po
deleted file mode 100644
index df0eacc3177..00000000000
--- a/addons/fetchmail_project_issue/i18n/nl.po
+++ /dev/null
@@ -1,36 +0,0 @@
-# Dutch translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR , 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME \n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-02-13 14:21+0000\n"
-"Last-Translator: Erwin \n"
-"Language-Team: Dutch \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-14 05:46+0000\n"
-"X-Generator: Launchpad (build 14781)\n"
-
-#. module: fetchmail_project_issue
-#: model:ir.actions.act_window,name:fetchmail_project_issue.action_link_issue_to_email_account
-msgid "Create Issues from Email Account"
-msgstr "Maak vraagstukken van een e-mail"
-
-#. module: fetchmail_project_issue
-#: model:ir.actions.act_window,help:fetchmail_project_issue.action_link_issue_to_email_account
-msgid ""
-"You can connect your email account with issues in OpenERP. A new email sent "
-"to this account (example: support@mycompany.com) will automatically create "
-"an issue. The whole communication will be attached to the issue "
-"automatically."
-msgstr ""
-"Het is mogelijk het vraagstukken e-mail account (bijvoorbeeld: "
-"vragen@mijnbedrijf.nl) te synchroniseren met OpenERP zo dat nieuwe "
-"vraagstukken automatisch worden aangemaakt in OpenERP. De gehele "
-"communicatie wordt als bijlage toegevoegd aan het vraagstuk."
diff --git a/addons/fetchmail_project_issue/i18n/sr@latin.po b/addons/fetchmail_project_issue/i18n/sr@latin.po
deleted file mode 100644
index 0a7d16b006a..00000000000
--- a/addons/fetchmail_project_issue/i18n/sr@latin.po
+++ /dev/null
@@ -1,35 +0,0 @@
-# Serbian Latin translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR , 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME \n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-03-19 11:50+0000\n"
-"Last-Translator: Milan Milosevic \n"
-"Language-Team: Serbian Latin \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-20 04:56+0000\n"
-"X-Generator: Launchpad (build 14969)\n"
-
-#. module: fetchmail_project_issue
-#: model:ir.actions.act_window,name:fetchmail_project_issue.action_link_issue_to_email_account
-msgid "Create Issues from Email Account"
-msgstr "Napravi izdanja preko email naloga"
-
-#. module: fetchmail_project_issue
-#: model:ir.actions.act_window,help:fetchmail_project_issue.action_link_issue_to_email_account
-msgid ""
-"You can connect your email account with issues in OpenERP. A new email sent "
-"to this account (example: support@mycompany.com) will automatically create "
-"an issue. The whole communication will be attached to the issue "
-"automatically."
-msgstr ""
-"Možete povezati svoj nalog sa izdanjima u OpenERP-u. Novi email biće poslat "
-"na taj nalog (npr:support@mycompany.com), i on će automatski napraviti "
-"izdanje. Celokupna komunikacija biće povezana s izdanjem automatski."
diff --git a/addons/fetchmail_project_issue/i18n/zh_CN.po b/addons/fetchmail_project_issue/i18n/zh_CN.po
deleted file mode 100644
index c705ff0c111..00000000000
--- a/addons/fetchmail_project_issue/i18n/zh_CN.po
+++ /dev/null
@@ -1,34 +0,0 @@
-# Chinese (Simplified) translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR , 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME \n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-02-16 04:36+0000\n"
-"Last-Translator: Jeff Wang \n"
-"Language-Team: Chinese (Simplified) \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-17 05:01+0000\n"
-"X-Generator: Launchpad (build 14814)\n"
-
-#. module: fetchmail_project_issue
-#: model:ir.actions.act_window,name:fetchmail_project_issue.action_link_issue_to_email_account
-msgid "Create Issues from Email Account"
-msgstr "从邮件账号创建问题"
-
-#. module: fetchmail_project_issue
-#: model:ir.actions.act_window,help:fetchmail_project_issue.action_link_issue_to_email_account
-msgid ""
-"You can connect your email account with issues in OpenERP. A new email sent "
-"to this account (example: support@mycompany.com) will automatically create "
-"an issue. The whole communication will be attached to the issue "
-"automatically."
-msgstr ""
-"你可以把你的邮件帐号与OpenERP中的问题关联。发送到这个帐号（例如：support@mycompany.com）的新邮件会自动创建一个问题。整个沟通过"
-"程会自动附加在这个问题上。"
diff --git a/addons/fetchmail_project_issue/installer.xml b/addons/fetchmail_project_issue/installer.xml
deleted file mode 100644
index 75554b2de29..00000000000
--- a/addons/fetchmail_project_issue/installer.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-
- Create Issues from Email Account
- ir.actions.act_window
- fetchmail.server
- form
- tree,form
-
- You can connect your email account with issues in OpenERP. A new email sent to this account (example: support@mycompany.com) will automatically create an issue. The whole communication will be attached to the issue automatically.
-
-
-
-
-
-
-
-
diff --git a/addons/google_base_account/i18n/ar.po b/addons/google_base_account/i18n/ar.po
new file mode 100644
index 00000000000..77bf2da268d
--- /dev/null
+++ b/addons/google_base_account/i18n/ar.po
@@ -0,0 +1,120 @@
+# Arabic translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR , 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-04-06 00:46+0000\n"
+"Last-Translator: FULL NAME \n"
+"Language-Team: Arabic \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-04-06 04:37+0000\n"
+"X-Generator: Launchpad (build 15060)\n"
+
+#. module: google_base_account
+#: field:res.users,gmail_user:0
+msgid "Username"
+msgstr "اسم المستخدم"
+
+#. module: google_base_account
+#: model:ir.actions.act_window,name:google_base_account.act_google_login_form
+msgid "Google Login"
+msgstr "حساب جوجل"
+
+#. module: google_base_account
+#: code:addons/google_base_account/wizard/google_login.py:29
+#, python-format
+msgid "Google Contacts Import Error!"
+msgstr "خطأ في إستيراد جهات الإتصال من جوجل!"
+
+#. module: google_base_account
+#: view:res.users:0
+msgid " Synchronization "
+msgstr " تزامن البيانات "
+
+#. module: google_base_account
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr "لا يمكن ان يكون هناك مستخدمان بنفس اسم الدخول!"
+
+#. module: google_base_account
+#: code:addons/google_base_account/wizard/google_login.py:75
+#, python-format
+msgid "Error"
+msgstr "خطأ"
+
+#. module: google_base_account
+#: view:google.login:0
+msgid "Google login"
+msgstr "دخول بجوجل"
+
+#. module: google_base_account
+#: model:ir.model,name:google_base_account.model_res_users
+msgid "res.users"
+msgstr "res.users"
+
+#. module: google_base_account
+#: field:google.login,password:0
+msgid "Google Password"
+msgstr "كلمة مرور جوجل"
+
+#. module: google_base_account
+#: view:google.login:0
+msgid "_Cancel"
+msgstr "إل_غاء"
+
+#. module: google_base_account
+#: view:res.users:0
+msgid "Google Account"
+msgstr "حساب جوجل"
+
+#. module: google_base_account
+#: field:google.login,user:0
+msgid "Google Username"
+msgstr "اسم مستخدم جوجل"
+
+#. module: google_base_account
+#: code:addons/google_base_account/wizard/google_login.py:29
+#, python-format
+msgid ""
+"Please install gdata-python-client from http://code.google.com/p/gdata-"
+"python-client/downloads/list"
+msgstr ""
+
+#. module: google_base_account
+#: model:ir.model,name:google_base_account.model_google_login
+msgid "Google Contact"
+msgstr "جهات إتصال جوجل"
+
+#. module: google_base_account
+#: view:google.login:0
+msgid "_Login"
+msgstr "تسج_يل دخول"
+
+#. module: google_base_account
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+"الشركة المختارة غير مدرجة ضمن قائمة الشركات المسموح بها لهذا المستخدم"
+
+#. module: google_base_account
+#: field:res.users,gmail_password:0
+msgid "Password"
+msgstr "كلمة المرور"
+
+#. module: google_base_account
+#: code:addons/google_base_account/wizard/google_login.py:75
+#, python-format
+msgid "Authentication fail check the user and password !"
+msgstr ""
+
+#. module: google_base_account
+#: view:google.login:0
+msgid "ex: user@gmail.com"
+msgstr "مثال: user@gmail.com"
diff --git a/addons/google_base_account/i18n/sr@latin.po b/addons/google_base_account/i18n/sr@latin.po
new file mode 100644
index 00000000000..e5530045b7d
--- /dev/null
+++ b/addons/google_base_account/i18n/sr@latin.po
@@ -0,0 +1,121 @@
+# Serbian Latin translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR , 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-04-05 15:32+0000\n"
+"Last-Translator: Milan Milosevic \n"
+"Language-Team: Serbian Latin \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-04-06 04:37+0000\n"
+"X-Generator: Launchpad (build 15060)\n"
+
+#. module: google_base_account
+#: field:res.users,gmail_user:0
+msgid "Username"
+msgstr "Korisničko ime"
+
+#. module: google_base_account
+#: model:ir.actions.act_window,name:google_base_account.act_google_login_form
+msgid "Google Login"
+msgstr "Google prijava"
+
+#. module: google_base_account
+#: code:addons/google_base_account/wizard/google_login.py:29
+#, python-format
+msgid "Google Contacts Import Error!"
+msgstr "Greška u uvozu kontakata s Google-a"
+
+#. module: google_base_account
+#: view:res.users:0
+msgid " Synchronization "
+msgstr " Sinhronizacija "
+
+#. module: google_base_account
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr "Ne možete imati dva korisnika sa istom prijavom!"
+
+#. module: google_base_account
+#: code:addons/google_base_account/wizard/google_login.py:75
+#, python-format
+msgid "Error"
+msgstr "Greška"
+
+#. module: google_base_account
+#: view:google.login:0
+msgid "Google login"
+msgstr "Google prijava"
+
+#. module: google_base_account
+#: model:ir.model,name:google_base_account.model_res_users
+msgid "res.users"
+msgstr "res.users"
+
+#. module: google_base_account
+#: field:google.login,password:0
+msgid "Google Password"
+msgstr "Google lozinka"
+
+#. module: google_base_account
+#: view:google.login:0
+msgid "_Cancel"
+msgstr "_Otkaži"
+
+#. module: google_base_account
+#: view:res.users:0
+msgid "Google Account"
+msgstr "Google nalog"
+
+#. module: google_base_account
+#: field:google.login,user:0
+msgid "Google Username"
+msgstr "Google korisničko ime"
+
+#. module: google_base_account
+#: code:addons/google_base_account/wizard/google_login.py:29
+#, python-format
+msgid ""
+"Please install gdata-python-client from http://code.google.com/p/gdata-"
+"python-client/downloads/list"
+msgstr ""
+"Molimo instalirajte gdata-python-client from http://code.google.com/p/gdata-"
+"python-client/downloads/list"
+
+#. module: google_base_account
+#: model:ir.model,name:google_base_account.model_google_login
+msgid "Google Contact"
+msgstr "Google kontakt"
+
+#. module: google_base_account
+#: view:google.login:0
+msgid "_Login"
+msgstr "_Prijava"
+
+#. module: google_base_account
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr "Odabrano preduzeće nije u dozvoljenim preduzećima za ovog korisnioka"
+
+#. module: google_base_account
+#: field:res.users,gmail_password:0
+msgid "Password"
+msgstr "Lozinka"
+
+#. module: google_base_account
+#: code:addons/google_base_account/wizard/google_login.py:75
+#, python-format
+msgid "Authentication fail check the user and password !"
+msgstr "Neuspešna autentifikacija, proverite korisnika i lozinku !"
+
+#. module: google_base_account
+#: view:google.login:0
+msgid "ex: user@gmail.com"
+msgstr "pr: user@gmail.com"
diff --git a/addons/hr/security/hr_security.xml b/addons/hr/security/hr_security.xml
index e8d1edd3712..0f72d37f32f 100644
--- a/addons/hr/security/hr_security.xml
+++ b/addons/hr/security/hr_security.xml
@@ -11,6 +11,7 @@
HR Manager
+
Department multi company rule
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 2fc3f99bdd3..e57da182f73 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -51,6 +51,7 @@
calendar
+
@@ -86,9 +87,8 @@
-
-
-
+
+
@@ -129,9 +129,8 @@
-
-
-
+
+
@@ -258,7 +257,7 @@
hr.holidays
form
- {"search_default_department_id": department_id, "search_default_my_leaves": 1}
+ {"search_default_department_id": department_id}
[('type','=','remove')]
Leave requests can be recorded by employees and validated by their managers. Once a leave request is validated, it appears automatically in the agenda of the employee. You can define several allowance types (paid holidays, sickness, etc.) and manage allowances per type.
diff --git a/addons/hr_payroll/i18n/lv.po b/addons/hr_payroll/i18n/lv.po
new file mode 100644
index 00000000000..dcf468d7235
--- /dev/null
+++ b/addons/hr_payroll/i18n/lv.po
@@ -0,0 +1,1119 @@
+# Latvian translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR , 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2012-02-08 01:37+0100\n"
+"PO-Revision-Date: 2012-04-04 14:06+0000\n"
+"Last-Translator: FULL NAME \n"
+"Language-Team: Latvian \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-04-05 04:43+0000\n"
+"X-Generator: Launchpad (build 15060)\n"
+
+#. module: hr_payroll
+#: field:hr.payslip.line,condition_select:0
+#: field:hr.salary.rule,condition_select:0
+msgid "Condition Based on"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.contract,schedule_pay:0
+msgid "Monthly"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0 field:hr.payslip,line_ids:0
+#: model:ir.actions.act_window,name:hr_payroll.act_contribution_reg_payslip_lines
+msgid "Payslip Lines"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip.line:0
+#: model:ir.model,name:hr_payroll.model_hr_salary_rule_category
+#: report:paylip.details:0
+msgid "Salary Rule Category"
+msgstr ""
+
+#. module: hr_payroll
+#: help:hr.salary.rule.category,parent_id:0
+msgid ""
+"Linking a salary category to its parent is used only for the reporting "
+"purpose."
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0 view:hr.payslip.line:0 view:hr.salary.rule:0
+msgid "Group By..."
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "States"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.line,input_ids:0 view:hr.salary.rule:0
+#: field:hr.salary.rule,input_ids:0
+msgid "Inputs"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.line,parent_rule_id:0
+#: field:hr.salary.rule,parent_rule_id:0
+msgid "Parent Salary Rule"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.employee,slip_ids:0 view:hr.payslip:0 view:hr.payslip.run:0
+#: field:hr.payslip.run,slip_ids:0
+#: model:ir.actions.act_window,name:hr_payroll.act_hr_employee_payslip_list
+msgid "Payslips"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payroll.structure,parent_id:0
+#: field:hr.salary.rule.category,parent_id:0
+msgid "Parent"
+msgstr ""
+
+#. module: hr_payroll
+#: report:paylip.details:0 report:payslip:0
+msgid "("
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.contribution.register,company_id:0
+#: field:hr.payroll.structure,company_id:0 field:hr.payslip,company_id:0
+#: field:hr.payslip.line,company_id:0 field:hr.salary.rule,company_id:0
+#: field:hr.salary.rule.category,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Done Slip"
+msgstr ""
+
+#. module: hr_payroll
+#: report:paylip.details:0 report:payslip:0
+msgid ","
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0 view:hr.payslip.run:0
+msgid "Set to Draft"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.model,name:hr_payroll.model_hr_salary_rule
+msgid "hr.salary.rule"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip,payslip_run_id:0
+#: model:ir.model,name:hr_payroll.model_hr_payslip_run
+msgid "Payslip Batches"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip.employees:0
+msgid ""
+"This wizard will generate payslips for all selected employee(s) based on the "
+"dates and credit note specified on Payslips Run."
+msgstr ""
+
+#. module: hr_payroll
+#: report:contribution.register.lines:0 report:paylip.details:0
+#: report:payslip:0
+msgid "Quantity/Rate"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.input,payslip_id:0 field:hr.payslip.line,slip_id:0
+#: field:hr.payslip.worked_days,payslip_id:0
+#: model:ir.model,name:hr_payroll.model_hr_payslip report:payslip:0
+msgid "Pay Slip"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip.employees:0
+msgid "Generate"
+msgstr ""
+
+#. module: hr_payroll
+#: help:hr.payslip.line,amount_percentage_base:0
+#: help:hr.salary.rule,amount_percentage_base:0
+msgid "result will be affected to a variable"
+msgstr ""
+
+#. module: hr_payroll
+#: report:contribution.register.lines:0
+msgid "Total:"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.actions.act_window,name:hr_payroll.act_children_salary_rules
+msgid "All Children Rules"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0 view:hr.salary.rule:0
+msgid "Input Data"
+msgstr ""
+
+#. module: hr_payroll
+#: constraint:hr.payslip:0
+msgid "Payslip 'Date From' must be before 'Date To'."
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0 view:hr.salary.rule.category:0
+msgid "Notes"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Salary Computation"
+msgstr ""
+
+#. module: hr_payroll
+#: report:contribution.register.lines:0 field:hr.payslip.input,amount:0
+#: field:hr.payslip.line,amount:0 report:paylip.details:0 report:payslip:0
+msgid "Amount"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0 view:hr.payslip.line:0
+#: model:ir.model,name:hr_payroll.model_hr_payslip_line
+msgid "Payslip Line"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Other Information"
+msgstr ""
+
+#. module: hr_payroll
+#: help:hr.payslip.line,amount_select:0 help:hr.salary.rule,amount_select:0
+msgid "The computation method for the rule amount."
+msgstr ""
+
+#. module: hr_payroll
+#: view:payslip.lines.contribution.register:0
+msgid "Contribution Register's Payslip Lines"
+msgstr ""
+
+#. module: hr_payroll
+#: code:addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.py:52
+#, python-format
+msgid "Warning !"
+msgstr ""
+
+#. module: hr_payroll
+#: report:paylip.details:0
+msgid "Details by Salary Rule Category:"
+msgstr ""
+
+#. module: hr_payroll
+#: report:paylip.details:0 report:payslip:0
+msgid "Note"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payroll.structure,code:0 field:hr.payslip,number:0
+#: report:paylip.details:0 report:payslip:0
+msgid "Reference"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Draft Slip"
+msgstr ""
+
+#. module: hr_payroll
+#: code:addons/hr_payroll/hr_payroll.py:422
+#, python-format
+msgid "Normal Working Days paid at 100%"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.line,condition_range_max:0
+#: field:hr.salary.rule,condition_range_max:0
+msgid "Maximum Range"
+msgstr ""
+
+#. module: hr_payroll
+#: report:paylip.details:0 report:payslip:0
+msgid "Identification No"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip,struct_id:0
+msgid "Structure"
+msgstr ""
+
+#. module: hr_payroll
+#: help:hr.employee,total_wage:0
+msgid "Sum of all current contract's wage of employee."
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Total Working Days"
+msgstr ""
+
+#. module: hr_payroll
+#: help:hr.payslip.line,code:0 help:hr.salary.rule,code:0
+msgid ""
+"The code of salary rules can be used as reference in computation of other "
+"rules. In that case, it is case sensitive."
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.contract,schedule_pay:0
+msgid "Weekly"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.line,rate:0
+msgid "Rate (%)"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Confirm"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.actions.report.xml,name:hr_payroll.payslip_report
+msgid "Employee PaySlip"
+msgstr ""
+
+#. module: hr_payroll
+#: help:hr.payslip.line,condition_range_max:0
+#: help:hr.salary.rule,condition_range_max:0
+msgid "The maximum amount, applied for this rule."
+msgstr ""
+
+#. module: hr_payroll
+#: help:hr.payslip.line,condition_python:0
+#: help:hr.salary.rule,condition_python:0
+msgid ""
+"Applied this rule for calculation if condition is true. You can specify "
+"condition like basic > 1000."
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip.employees:0
+msgid "Payslips by Employees"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.contract,schedule_pay:0
+msgid "Quarterly"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip,state:0 field:hr.payslip.run,state:0
+msgid "State"
+msgstr ""
+
+#. module: hr_payroll
+#: help:hr.salary.rule,quantity:0
+msgid ""
+"It is used in computation for percentage and fixed amount.For e.g. A rule "
+"for Meal Voucher having fixed amount of 1€ per worked day can have its "
+"quantity defined in expression like worked_days.WORK100.number_of_days."
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.salary.rule:0
+msgid "Search Salary Rule"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip,employee_id:0 field:hr.payslip.line,employee_id:0
+#: model:ir.model,name:hr_payroll.model_hr_employee
+msgid "Employee"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.contract,schedule_pay:0
+msgid "Semi-annually"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.salary.rule:0
+msgid "Children definition"
+msgstr ""
+
+#. module: hr_payroll
+#: report:paylip.details:0 report:payslip:0
+msgid "Email"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip.run:0
+msgid "Search Payslip Batches"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.line,amount_percentage_base:0
+#: field:hr.salary.rule,amount_percentage_base:0
+msgid "Percentage based on"
+msgstr ""
+
+#. module: hr_payroll
+#: help:hr.payslip.line,amount_percentage:0
+#: help:hr.salary.rule,amount_percentage:0
+msgid "For example, enter 50.0 to apply a percentage of 50%"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip,paid:0
+msgid "Made Payment Order ? "
+msgstr ""
+
+#. module: hr_payroll
+#: report:contribution.register.lines:0
+msgid "PaySlip Lines by Contribution Register"
+msgstr ""
+
+#. module: hr_payroll
+#: help:hr.payslip,state:0
+msgid ""
+"* When the payslip is created the state is 'Draft'. \n"
+"* If the payslip is under verification, the state is 'Waiting'. "
+"\n"
+"* If the payslip is confirmed then state is set to 'Done'. \n"
+"* When user cancel payslip the state is 'Rejected'."
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.worked_days,number_of_days:0
+msgid "Number of Days"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.payslip,state:0
+msgid "Rejected"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.structure:0 field:hr.payroll.structure,rule_ids:0
+#: view:hr.salary.rule:0
+#: model:ir.actions.act_window,name:hr_payroll.action_salary_rule_form
+#: model:ir.ui.menu,name:hr_payroll.menu_action_hr_salary_rule_form
+msgid "Salary Rules"
+msgstr ""
+
+#. module: hr_payroll
+#: code:addons/hr_payroll/hr_payroll.py:337
+#, python-format
+msgid "Refund: "
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.model,name:hr_payroll.model_payslip_lines_contribution_register
+msgid "PaySlip Lines by Contribution Registers"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0 selection:hr.payslip,state:0 view:hr.payslip.run:0
+msgid "Done"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.line,appears_on_payslip:0
+#: field:hr.salary.rule,appears_on_payslip:0
+msgid "Appears on Payslip"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.line,amount_fix:0
+#: selection:hr.payslip.line,amount_select:0 field:hr.salary.rule,amount_fix:0
+#: selection:hr.salary.rule,amount_select:0
+msgid "Fixed Amount"
+msgstr ""
+
+#. module: hr_payroll
+#: help:hr.payslip.line,active:0 help:hr.salary.rule,active:0
+msgid ""
+"If the active field is set to false, it will allow you to hide the salary "
+"rule without removing it."
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Worked Days & Inputs"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip,details_by_salary_rule_category:0
+msgid "Details by Salary Rule Category"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.actions.act_window,name:hr_payroll.action_payslip_lines_contribution_register
+msgid "PaySlip Lines"
+msgstr ""
+
+#. module: hr_payroll
+#: help:hr.payslip.line,register_id:0 help:hr.salary.rule,register_id:0
+msgid "Eventual third party involved in the salary payment of the employees."
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.worked_days,number_of_hours:0
+msgid "Number of Hours"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "PaySlip Batch"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.line,condition_range_min:0
+#: field:hr.salary.rule,condition_range_min:0
+msgid "Minimum Range"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.line,child_ids:0 field:hr.salary.rule,child_ids:0
+msgid "Child Salary Rule"
+msgstr ""
+
+#. module: hr_payroll
+#: report:contribution.register.lines:0 field:hr.payslip,date_to:0
+#: field:hr.payslip.run,date_end:0 report:paylip.details:0 report:payslip:0
+#: field:payslip.lines.contribution.register,date_to:0
+msgid "Date To"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.payslip.line,condition_select:0
+#: selection:hr.salary.rule,condition_select:0
+msgid "Range"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payroll_structure_tree
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_structure_tree
+msgid "Salary Structures Hierarchy"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Payslip"
+msgstr ""
+
+#. module: hr_payroll
+#: constraint:hr.contract:0
+msgid "Error! contract start-date must be lower then contract end-date."
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.contract:0
+msgid "Payslip Info"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.actions.act_window,name:hr_payroll.act_payslip_lines
+msgid "Payslip Computation Details"
+msgstr ""
+
+#. module: hr_payroll
+#: code:addons/hr_payroll/hr_payroll.py:872
+#, python-format
+msgid "Wrong python code defined for salary rule %s (%s) "
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.model,name:hr_payroll.model_hr_payslip_input
+msgid "Payslip Input"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.salary.rule.category:0
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_salary_rule_category
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_salary_rule_category
+msgid "Salary Rule Categories"
+msgstr ""
+
+#. module: hr_payroll
+#: help:hr.payslip.input,contract_id:0
+#: help:hr.payslip.worked_days,contract_id:0
+msgid "The contract for which applied this input"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.salary.rule:0
+msgid "Computation"
+msgstr ""
+
+#. module: hr_payroll
+#: help:hr.payslip.input,amount:0
+msgid ""
+"It is used in computation. For e.g. A rule for sales having 1% commission of "
+"basic salary for per product can defined in expression like result = "
+"inputs.SALEURO.amount * contract.wage*0.01."
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip.line:0 field:hr.payslip.line,amount_select:0
+#: field:hr.salary.rule,amount_select:0
+msgid "Amount Type"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.line,category_id:0 view:hr.salary.rule:0
+#: field:hr.salary.rule,category_id:0
+msgid "Category"
+msgstr ""
+
+#. module: hr_payroll
+#: help:hr.payslip.run,credit_note:0
+msgid ""
+"If its checked, indicates that all payslips generated from here are refund "
+"payslips."
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payroll_structure_list_form
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_structure_view
+msgid "Salary Structures"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip.run:0
+msgid "Draft Payslip Batches"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0 selection:hr.payslip,state:0 view:hr.payslip.run:0
+#: selection:hr.payslip.run,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: hr_payroll
+#: report:contribution.register.lines:0 field:hr.payslip,date_from:0
+#: field:hr.payslip.run,date_start:0 report:paylip.details:0 report:payslip:0
+#: field:payslip.lines.contribution.register,date_from:0
+msgid "Date From"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip.run:0
+msgid "Done Payslip Batches"
+msgstr ""
+
+#. module: hr_payroll
+#: report:paylip.details:0
+msgid "Payslip Lines by Contribution Register:"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.salary.rule:0
+msgid "Conditions"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.line,amount_percentage:0
+#: selection:hr.payslip.line,amount_select:0
+#: field:hr.salary.rule,amount_percentage:0
+#: selection:hr.salary.rule,amount_select:0
+msgid "Percentage (%)"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Worked Day"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.structure:0
+msgid "Employee Function"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip,credit_note:0 field:hr.payslip.run,credit_note:0
+msgid "Credit Note"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Compute Sheet"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.line,active:0 field:hr.salary.rule,active:0
+msgid "Active"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.salary.rule:0
+msgid "Child Rules"
+msgstr ""
+
+#. module: hr_payroll
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.actions.report.xml,name:hr_payroll.payslip_details_report
+msgid "PaySlip Details"
+msgstr ""
+
+#. module: hr_payroll
+#: help:hr.payslip.line,condition_range_min:0
+#: help:hr.salary.rule,condition_range_min:0
+msgid "The minimum amount, applied for this rule."
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.payslip.line,condition_select:0
+#: selection:hr.salary.rule,condition_select:0
+msgid "Python Expression"
+msgstr ""
+
+#. module: hr_payroll
+#: report:paylip.details:0 report:payslip:0
+msgid "Designation"
+msgstr ""
+
+#. module: hr_payroll
+#: code:addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.py:52
+#, python-format
+msgid "You must select employee(s) to generate payslip(s)"
+msgstr ""
+
+#. module: hr_payroll
+#: code:addons/hr_payroll/hr_payroll.py:861
+#, python-format
+msgid "Wrong quantity defined for salary rule %s (%s)"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Companies"
+msgstr ""
+
+#. module: hr_payroll
+#: report:paylip.details:0 report:payslip:0
+msgid "Authorized Signature"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip,contract_id:0 field:hr.payslip.input,contract_id:0
+#: field:hr.payslip.line,contract_id:0
+#: field:hr.payslip.worked_days,contract_id:0
+#: model:ir.model,name:hr_payroll.model_hr_contract
+msgid "Contract"
+msgstr ""
+
+#. module: hr_payroll
+#: report:paylip.details:0 report:payslip:0
+msgid "Credit"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.contract,schedule_pay:0
+msgid "Scheduled Pay"
+msgstr ""
+
+#. module: hr_payroll
+#: code:addons/hr_payroll/hr_payroll.py:861
+#: code:addons/hr_payroll/hr_payroll.py:866
+#: code:addons/hr_payroll/hr_payroll.py:872
+#: code:addons/hr_payroll/hr_payroll.py:889
+#: code:addons/hr_payroll/hr_payroll.py:895
+#, python-format
+msgid "Error"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.line,condition_python:0
+#: field:hr.salary.rule,condition_python:0
+msgid "Python Condition"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.contribution.register:0
+msgid "Contribution"
+msgstr ""
+
+#. module: hr_payroll
+#: code:addons/hr_payroll/hr_payroll.py:347
+#, python-format
+msgid "Refund Payslip"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.rule.input,input_id:0
+#: model:ir.model,name:hr_payroll.model_hr_rule_input
+msgid "Salary Rule Input"
+msgstr ""
+
+#. module: hr_payroll
+#: code:addons/hr_payroll/hr_payroll.py:895
+#, python-format
+msgid "Wrong python condition defined for salary rule %s (%s)"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.line,quantity:0 field:hr.salary.rule,quantity:0
+msgid "Quantity"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Refund"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.salary.rule:0
+msgid "Company contribution"
+msgstr ""
+
+#. module: hr_payroll
+#: report:contribution.register.lines:0 field:hr.payslip.input,code:0
+#: field:hr.payslip.line,code:0 field:hr.payslip.worked_days,code:0
+#: field:hr.rule.input,code:0 field:hr.salary.rule,code:0
+#: field:hr.salary.rule.category,code:0 report:paylip.details:0
+#: report:payslip:0
+msgid "Code"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.line,amount_python_compute:0
+#: selection:hr.payslip.line,amount_select:0
+#: field:hr.salary.rule,amount_python_compute:0
+#: selection:hr.salary.rule,amount_select:0
+msgid "Python Code"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.input,sequence:0 field:hr.payslip.line,sequence:0
+#: field:hr.payslip.worked_days,sequence:0 field:hr.salary.rule,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: hr_payroll
+#: report:contribution.register.lines:0 report:paylip.details:0
+msgid "Register Name"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.salary.rule:0
+msgid "General"
+msgstr ""
+
+#. module: hr_payroll
+#: code:addons/hr_payroll/hr_payroll.py:664
+#, python-format
+msgid "Salary Slip of %s for %s"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.model,name:hr_payroll.model_hr_payslip_employees
+msgid "Generate payslips for all selected employees"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.contract,struct_id:0 view:hr.payroll.structure:0 view:hr.payslip:0
+#: view:hr.payslip.line:0
+#: model:ir.model,name:hr_payroll.model_hr_payroll_structure
+msgid "Salary Structure"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.contribution.register,register_line_ids:0
+msgid "Register Line"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0 view:hr.payslip.employees:0
+#: view:payslip.lines.contribution.register:0
+msgid "Cancel"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip.run:0 selection:hr.payslip.run,state:0
+msgid "Close"
+msgstr ""
+
+#. module: hr_payroll
+#: help:hr.payslip,struct_id:0
+msgid ""
+"Defines the rules that have to be applied to this payslip, accordingly to "
+"the contract chosen. If you let empty the field contract, this field isn't "
+"mandatory anymore and thus the rules applied will be all the rules set on "
+"the structure of all contracts of the employee valid for the chosen period"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payroll.structure,children_ids:0
+#: field:hr.salary.rule.category,children_ids:0
+msgid "Children"
+msgstr ""
+
+#. module: hr_payroll
+#: help:hr.payslip,credit_note:0
+msgid "Indicates this payslip has a refund of another"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.contract,schedule_pay:0
+msgid "Bi-monthly"
+msgstr ""
+
+#. module: hr_payroll
+#: report:paylip.details:0
+msgid "Pay Slip Details"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payslip_form
+#: model:ir.ui.menu,name:hr_payroll.menu_department_tree
+msgid "Employee Payslips"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip.line:0 field:hr.payslip.line,register_id:0
+#: field:hr.salary.rule,register_id:0
+#: model:ir.model,name:hr_payroll.model_hr_contribution_register
+msgid "Contribution Register"
+msgstr ""
+
+#. module: hr_payroll
+#: view:payslip.lines.contribution.register:0
+msgid "Print"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.actions.act_window,help:hr_payroll.action_contribution_register_form
+msgid ""
+"A contribution register is a third party involved in the salary payment of "
+"the employees. It can be the social security, the estate or anyone that "
+"collect or inject money on payslips."
+msgstr ""
+
+#. module: hr_payroll
+#: code:addons/hr_payroll/hr_payroll.py:889
+#, python-format
+msgid "Wrong range condition defined for salary rule %s (%s)"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip.line:0
+msgid "Calculations"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Worked Days"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Search Payslips"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip.run:0
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_payslip_run_tree
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_payslip_run
+msgid "Payslips Batches"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.contribution.register:0 field:hr.contribution.register,note:0
+#: field:hr.payroll.structure,note:0 field:hr.payslip,name:0
+#: field:hr.payslip,note:0 field:hr.payslip.input,name:0
+#: view:hr.payslip.line:0 field:hr.payslip.line,note:0
+#: field:hr.payslip.worked_days,name:0 field:hr.rule.input,name:0
+#: view:hr.salary.rule:0 field:hr.salary.rule,note:0
+#: field:hr.salary.rule.category,note:0
+msgid "Description"
+msgstr ""
+
+#. module: hr_payroll
+#: report:paylip.details:0 report:payslip:0
+msgid ")"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.contribution.register:0
+#: model:ir.actions.act_window,name:hr_payroll.action_contribution_register_form
+#: model:ir.ui.menu,name:hr_payroll.menu_action_hr_contribution_register_form
+msgid "Contribution Registers"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_reporting
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_root_payroll
+#: model:ir.ui.menu,name:hr_payroll.payroll_configure
+msgid "Payroll"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.actions.report.xml,name:hr_payroll.contribution_register
+msgid "PaySlip Lines By Conribution Register"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.payslip,state:0
+msgid "Waiting"
+msgstr ""
+
+#. module: hr_payroll
+#: report:paylip.details:0 report:payslip:0
+msgid "Address"
+msgstr ""
+
+#. module: hr_payroll
+#: code:addons/hr_payroll/hr_payroll.py:866
+#, python-format
+msgid "Wrong percentage base or quantity defined for salary rule %s (%s)"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip,worked_days_line_ids:0
+#: model:ir.model,name:hr_payroll.model_hr_payslip_worked_days
+msgid "Payslip Worked Days"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.salary.rule.category:0
+msgid "Salary Categories"
+msgstr ""
+
+#. module: hr_payroll
+#: report:contribution.register.lines:0 field:hr.contribution.register,name:0
+#: field:hr.payroll.structure,name:0 field:hr.payslip.line,name:0
+#: field:hr.payslip.run,name:0 field:hr.salary.rule,name:0
+#: field:hr.salary.rule.category,name:0 report:paylip.details:0
+#: report:payslip:0
+msgid "Name"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.structure:0
+msgid "Payroll Structures"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0 view:hr.payslip.employees:0
+#: field:hr.payslip.employees,employee_ids:0 view:hr.payslip.line:0
+msgid "Employees"
+msgstr ""
+
+#. module: hr_payroll
+#: report:paylip.details:0 report:payslip:0
+msgid "Bank Account"
+msgstr ""
+
+#. module: hr_payroll
+#: help:hr.payslip.line,sequence:0 help:hr.salary.rule,sequence:0
+msgid "Use to arrange calculation sequence"
+msgstr ""
+
+#. module: hr_payroll
+#: help:hr.payslip.line,condition_range:0
+#: help:hr.salary.rule,condition_range:0
+msgid ""
+"This will be used to compute the % fields values; in general it is on basic, "
+"but you can also use categories code fields in lowercase as a variable names "
+"(hra, ma, lta, etc.) and the variable basic."
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.contract,schedule_pay:0
+msgid "Annually"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip,input_line_ids:0
+msgid "Payslip Inputs"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.line,salary_rule_id:0
+msgid "Rule"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_salary_rule_category_tree_view
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_salary_rule_category_tree_view
+msgid "Salary Rule Categories Hierarchy"
+msgstr ""
+
+#. module: hr_payroll
+#: report:contribution.register.lines:0 field:hr.payslip.line,total:0
+#: report:paylip.details:0 report:payslip:0
+msgid "Total"
+msgstr ""
+
+#. module: hr_payroll
+#: help:hr.payslip.line,appears_on_payslip:0
+#: help:hr.salary.rule,appears_on_payslip:0
+msgid "Used for the display of rule on payslip"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip.line:0
+msgid "Search Payslip Lines"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Details By Salary Rule Category"
+msgstr ""
+
+#. module: hr_payroll
+#: help:hr.payslip.input,code:0 help:hr.payslip.worked_days,code:0
+#: help:hr.rule.input,code:0
+msgid "The code that can be used in the salary rules"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip.run:0
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_payslip_by_employees
+msgid "Generate Payslips"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.contract,schedule_pay:0
+msgid "Bi-weekly"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.employee,total_wage:0
+msgid "Total Basic Salary"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.payslip.line,condition_select:0
+#: selection:hr.salary.rule,condition_select:0
+msgid "Always True"
+msgstr ""
+
+#. module: hr_payroll
+#: report:contribution.register.lines:0
+msgid "PaySlip Name"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.line,condition_range:0
+#: field:hr.salary.rule,condition_range:0
+msgid "Range Based on"
+msgstr ""
diff --git a/addons/hr_payroll_account/i18n/sr@latin.po b/addons/hr_payroll_account/i18n/sr@latin.po
index 033ab00bc14..7bf908d344c 100644
--- a/addons/hr_payroll_account/i18n/sr@latin.po
+++ b/addons/hr_payroll_account/i18n/sr@latin.po
@@ -8,136 +8,137 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2010-12-10 16:53+0000\n"
+"PO-Revision-Date: 2012-04-05 16:13+0000\n"
"Last-Translator: Milan Milosevic \n"
"Language-Team: Serbian latin \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:59+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-04-06 04:37+0000\n"
+"X-Generator: Launchpad (build 15060)\n"
#. module: hr_payroll_account
#: field:hr.payslip,move_id:0
msgid "Accounting Entry"
-msgstr ""
+msgstr "Stavka naloga"
#. module: hr_payroll_account
#: field:hr.salary.rule,account_tax_id:0
msgid "Tax Code"
-msgstr ""
+msgstr "Šifra poreza"
#. module: hr_payroll_account
#: field:hr.payslip,journal_id:0
#: field:hr.payslip.run,journal_id:0
msgid "Expense Journal"
-msgstr ""
+msgstr "Dnevnik troškova"
#. module: hr_payroll_account
#: code:addons/hr_payroll_account/hr_payroll_account.py:157
#: code:addons/hr_payroll_account/hr_payroll_account.py:173
#, python-format
msgid "Adjustment Entry"
-msgstr ""
+msgstr "Stavka podešavanja"
#. module: hr_payroll_account
#: field:hr.contract,analytic_account_id:0
#: field:hr.salary.rule,analytic_account_id:0
msgid "Analytic Account"
-msgstr ""
+msgstr "Analitički konto"
#. module: hr_payroll_account
#: model:ir.model,name:hr_payroll_account.model_hr_salary_rule
msgid "hr.salary.rule"
-msgstr ""
+msgstr "hr.salary.rule"
#. module: hr_payroll_account
#: model:ir.model,name:hr_payroll_account.model_hr_payslip_run
msgid "Payslip Batches"
-msgstr ""
+msgstr "Serije obračunskih listova plate"
#. module: hr_payroll_account
#: field:hr.contract,journal_id:0
msgid "Salary Journal"
-msgstr ""
+msgstr "Dnevnika plata"
#. module: hr_payroll_account
#: model:ir.model,name:hr_payroll_account.model_hr_payslip
msgid "Pay Slip"
-msgstr ""
+msgstr "Obračunski list"
#. module: hr_payroll_account
#: constraint:hr.payslip:0
msgid "Payslip 'Date From' must be before 'Date To'."
-msgstr ""
+msgstr "'Datum od' mora biti pre 'Datum do' na obračunskom listu"
#. module: hr_payroll_account
#: help:hr.payslip,period_id:0
msgid "Keep empty to use the period of the validation(Payslip) date."
msgstr ""
+"Sačuvajte prazno mesto radi korišćenja datum validacije (obračuski list)"
#. module: hr_payroll_account
#: code:addons/hr_payroll_account/hr_payroll_account.py:171
#, python-format
msgid ""
"The Expense Journal \"%s\" has not properly configured the Debit Account!"
-msgstr ""
+msgstr "Dnevnik troškova \"%s\" nije tačno podesio dužnički nalog!"
#. module: hr_payroll_account
#: code:addons/hr_payroll_account/hr_payroll_account.py:155
#, python-format
msgid ""
"The Expense Journal \"%s\" has not properly configured the Credit Account!"
-msgstr ""
+msgstr "Dnevnik troškova \"%s\" nije tačno podesio platni nalog!"
#. module: hr_payroll_account
#: field:hr.salary.rule,account_debit:0
msgid "Debit Account"
-msgstr ""
+msgstr "Platni nalog"
#. module: hr_payroll_account
#: code:addons/hr_payroll_account/hr_payroll_account.py:102
#, python-format
msgid "Payslip of %s"
-msgstr ""
+msgstr "Obračunski list %s"
#. module: hr_payroll_account
#: model:ir.model,name:hr_payroll_account.model_hr_contract
msgid "Contract"
-msgstr ""
+msgstr "Ugovor"
#. module: hr_payroll_account
#: constraint:hr.contract:0
msgid "Error! contract start-date must be lower then contract end-date."
-msgstr ""
+msgstr "Greška! datum početka ugovora mora da bude pre datuma završetka."
#. module: hr_payroll_account
#: field:hr.payslip,period_id:0
msgid "Force Period"
-msgstr ""
+msgstr "Forsirani period"
#. module: hr_payroll_account
#: field:hr.salary.rule,account_credit:0
msgid "Credit Account"
-msgstr ""
+msgstr "Platni nalog"
#. module: hr_payroll_account
#: model:ir.model,name:hr_payroll_account.model_hr_payslip_employees
msgid "Generate payslips for all selected employees"
-msgstr ""
+msgstr "Napravi obračunski list za sve izabrane zaposlene"
#. module: hr_payroll_account
#: code:addons/hr_payroll_account/hr_payroll_account.py:155
#: code:addons/hr_payroll_account/hr_payroll_account.py:171
#, python-format
msgid "Configuration Error!"
-msgstr ""
+msgstr "Greška podešavanja!"
#. module: hr_payroll_account
#: view:hr.contract:0
#: view:hr.salary.rule:0
msgid "Accounting"
-msgstr ""
+msgstr "Računovodstvo"
#~ msgid "Bank Journal"
#~ msgstr "Dnevnik Banke"
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
index 65a983de1e4..2f5c8d24d79 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
@@ -14,7 +14,7 @@
-
+
diff --git a/addons/idea/security/idea_security.xml b/addons/idea/security/idea_security.xml
index 02a3cbdbdd8..b26bd2af0a9 100644
--- a/addons/idea/security/idea_security.xml
+++ b/addons/idea/security/idea_security.xml
@@ -10,6 +10,7 @@
Manager
+
diff --git a/addons/knowledge/security/knowledge_security.xml b/addons/knowledge/security/knowledge_security.xml
index 560fdce0506..4871541b4c9 100644
--- a/addons/knowledge/security/knowledge_security.xml
+++ b/addons/knowledge/security/knowledge_security.xml
@@ -5,6 +5,7 @@
User
+
diff --git a/addons/l10n_at/static/src/img/icon.png b/addons/l10n_at/static/src/img/icon.png
new file mode 100644
index 00000000000..cac568e4224
Binary files /dev/null and b/addons/l10n_at/static/src/img/icon.png differ
diff --git a/addons/l10n_be/static/src/img/icon.png b/addons/l10n_be/static/src/img/icon.png
new file mode 100644
index 00000000000..2ee49b8c1a2
Binary files /dev/null and b/addons/l10n_be/static/src/img/icon.png differ
diff --git a/addons/l10n_br/static/src/img/icon.png b/addons/l10n_br/static/src/img/icon.png
new file mode 100644
index 00000000000..d00cbc2de18
Binary files /dev/null and b/addons/l10n_br/static/src/img/icon.png differ
diff --git a/addons/l10n_ca/static/src/img/icon.png b/addons/l10n_ca/static/src/img/icon.png
new file mode 100644
index 00000000000..ab85ec08cad
Binary files /dev/null and b/addons/l10n_ca/static/src/img/icon.png differ
diff --git a/addons/l10n_ch/static/src/img/icon.png b/addons/l10n_ch/static/src/img/icon.png
new file mode 100644
index 00000000000..c59e295f733
Binary files /dev/null and b/addons/l10n_ch/static/src/img/icon.png differ
diff --git a/addons/l10n_cn/static/src/img/icon.png b/addons/l10n_cn/static/src/img/icon.png
new file mode 100644
index 00000000000..9f8b4655632
Binary files /dev/null and b/addons/l10n_cn/static/src/img/icon.png differ
diff --git a/addons/l10n_cr/static/src/img/icon.png b/addons/l10n_cr/static/src/img/icon.png
new file mode 100644
index 00000000000..832f576e77e
Binary files /dev/null and b/addons/l10n_cr/static/src/img/icon.png differ
diff --git a/addons/l10n_de/static/src/img/icon.png b/addons/l10n_de/static/src/img/icon.png
new file mode 100644
index 00000000000..e5814496231
Binary files /dev/null and b/addons/l10n_de/static/src/img/icon.png differ
diff --git a/addons/l10n_ec/static/src/img/icon.png b/addons/l10n_ec/static/src/img/icon.png
new file mode 100644
index 00000000000..ae49151db1e
Binary files /dev/null and b/addons/l10n_ec/static/src/img/icon.png differ
diff --git a/addons/l10n_es/static/src/img/icon.png b/addons/l10n_es/static/src/img/icon.png
new file mode 100644
index 00000000000..d7f101e8ca3
Binary files /dev/null and b/addons/l10n_es/static/src/img/icon.png differ
diff --git a/addons/l10n_fr/static/src/img/icon.png b/addons/l10n_fr/static/src/img/icon.png
new file mode 100644
index 00000000000..bbcaa4fcce7
Binary files /dev/null and b/addons/l10n_fr/static/src/img/icon.png differ
diff --git a/addons/l10n_gr/static/src/img/icon.png b/addons/l10n_gr/static/src/img/icon.png
new file mode 100644
index 00000000000..3267e7c6f39
Binary files /dev/null and b/addons/l10n_gr/static/src/img/icon.png differ
diff --git a/addons/l10n_gt/static/src/img/icon.png b/addons/l10n_gt/static/src/img/icon.png
new file mode 100644
index 00000000000..94edcd1eabe
Binary files /dev/null and b/addons/l10n_gt/static/src/img/icon.png differ
diff --git a/addons/l10n_hn/static/src/img/icon.png b/addons/l10n_hn/static/src/img/icon.png
new file mode 100644
index 00000000000..cd2e26ad427
Binary files /dev/null and b/addons/l10n_hn/static/src/img/icon.png differ
diff --git a/addons/l10n_in/static/src/img/icon.png b/addons/l10n_in/static/src/img/icon.png
new file mode 100644
index 00000000000..ddaf38f8b6d
Binary files /dev/null and b/addons/l10n_in/static/src/img/icon.png differ
diff --git a/addons/l10n_it/static/src/img/icon.png b/addons/l10n_it/static/src/img/icon.png
new file mode 100644
index 00000000000..2aa4dd28bdc
Binary files /dev/null and b/addons/l10n_it/static/src/img/icon.png differ
diff --git a/addons/l10n_lu/static/src/img/icon.png b/addons/l10n_lu/static/src/img/icon.png
new file mode 100644
index 00000000000..b656d945be1
Binary files /dev/null and b/addons/l10n_lu/static/src/img/icon.png differ
diff --git a/addons/l10n_ma/security/compta_security.xml b/addons/l10n_ma/security/compta_security.xml
index bcde4d188b2..8d511ae7154 100644
--- a/addons/l10n_ma/security/compta_security.xml
+++ b/addons/l10n_ma/security/compta_security.xml
@@ -2,6 +2,7 @@
Finance / Expert Comptable
+
diff --git a/addons/l10n_ma/static/src/img/icon.png b/addons/l10n_ma/static/src/img/icon.png
new file mode 100644
index 00000000000..6bd7c5362b6
Binary files /dev/null and b/addons/l10n_ma/static/src/img/icon.png differ
diff --git a/addons/l10n_mx/static/src/img/icon.png b/addons/l10n_mx/static/src/img/icon.png
new file mode 100644
index 00000000000..531a78ed9d8
Binary files /dev/null and b/addons/l10n_mx/static/src/img/icon.png differ
diff --git a/addons/l10n_nl/static/src/img/icon.png b/addons/l10n_nl/static/src/img/icon.png
new file mode 100644
index 00000000000..48485f76ec0
Binary files /dev/null and b/addons/l10n_nl/static/src/img/icon.png differ
diff --git a/addons/l10n_pe/static/src/img/icon.png b/addons/l10n_pe/static/src/img/icon.png
new file mode 100644
index 00000000000..e71af2a4566
Binary files /dev/null and b/addons/l10n_pe/static/src/img/icon.png differ
diff --git a/addons/l10n_pl/static/src/img/icon.png b/addons/l10n_pl/static/src/img/icon.png
new file mode 100644
index 00000000000..7be06bbe532
Binary files /dev/null and b/addons/l10n_pl/static/src/img/icon.png differ
diff --git a/addons/l10n_ro/static/src/img/icon.png b/addons/l10n_ro/static/src/img/icon.png
new file mode 100644
index 00000000000..7ba9c1019cd
Binary files /dev/null and b/addons/l10n_ro/static/src/img/icon.png differ
diff --git a/addons/l10n_th/static/src/img/icon.png b/addons/l10n_th/static/src/img/icon.png
new file mode 100644
index 00000000000..2b00b9b9109
Binary files /dev/null and b/addons/l10n_th/static/src/img/icon.png differ
diff --git a/addons/l10n_uk/static/src/img/icon.png b/addons/l10n_uk/static/src/img/icon.png
new file mode 100644
index 00000000000..7842d579341
Binary files /dev/null and b/addons/l10n_uk/static/src/img/icon.png differ
diff --git a/addons/l10n_us/static/src/img/icon.png b/addons/l10n_us/static/src/img/icon.png
new file mode 100644
index 00000000000..8b7fd408ac3
Binary files /dev/null and b/addons/l10n_us/static/src/img/icon.png differ
diff --git a/addons/l10n_uy/static/src/img/icon.png b/addons/l10n_uy/static/src/img/icon.png
new file mode 100644
index 00000000000..090d65271b7
Binary files /dev/null and b/addons/l10n_uy/static/src/img/icon.png differ
diff --git a/addons/l10n_ve/static/src/img/icon.png b/addons/l10n_ve/static/src/img/icon.png
new file mode 100644
index 00000000000..e102f5381de
Binary files /dev/null and b/addons/l10n_ve/static/src/img/icon.png differ
diff --git a/addons/lunch/security/lunch_security.xml b/addons/lunch/security/lunch_security.xml
index 7d665c96435..46293a97561 100644
--- a/addons/lunch/security/lunch_security.xml
+++ b/addons/lunch/security/lunch_security.xml
@@ -10,6 +10,7 @@
Manager
+
diff --git a/addons/marketing/security/marketing_security.xml b/addons/marketing/security/marketing_security.xml
index d04473da8bf..2afc0ab3a8b 100644
--- a/addons/marketing/security/marketing_security.xml
+++ b/addons/marketing/security/marketing_security.xml
@@ -10,6 +10,7 @@
Manager
+
diff --git a/addons/mrp/__init__.py b/addons/mrp/__init__.py
index 52a5bdda77b..e0bdc06d3e3 100644
--- a/addons/mrp/__init__.py
+++ b/addons/mrp/__init__.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
##############################################################################
-#
+#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2010 Tiny SPRL ().
#
@@ -15,7 +15,7 @@
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
#
##############################################################################
@@ -26,5 +26,6 @@ import wizard
import report
import company
import procurement
+import res_config
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mrp/__openerp__.py b/addons/mrp/__openerp__.py
index c205b58b547..bdf6f63b755 100644
--- a/addons/mrp/__openerp__.py
+++ b/addons/mrp/__openerp__.py
@@ -82,19 +82,17 @@ Dashboard provided by this module:
'process/stockable_product_process.xml',
'process/service_product_process.xml',
'process/procurement_process.xml',
- 'mrp_installer.xml',
'report/mrp_report_view.xml',
'report/mrp_production_order_view.xml',
'board_manufacturing_view.xml',
-
-
+ 'res_config_view.xml',
],
'demo_xml': [
'mrp_demo.xml',
],
'test': [
'test/order_demo.yml',
- 'test/order_process.yml',
+ 'test/order_process.yml',
'test/cancel_order.yml',
],
'installable': True,
diff --git a/addons/mrp/mrp_installer.xml b/addons/mrp/mrp_installer.xml
deleted file mode 100644
index b4d4551bda8..00000000000
--- a/addons/mrp/mrp_installer.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-
-
-
- MRP Management
- 6
-
-
-
- Configure your work centers
- ir.actions.act_window
- mrp.workcenter
- form,tree
- form
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Create or Import Products
- ir.actions.act_window
- product.product
- form
- tree,form
-
- Create a product form for everything you buy or sell. Specify a supplier if the product can be purchased.
-
-
-
-
-
- 20
-
-
-
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index f96147e9344..961d42cee2b 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -105,16 +105,18 @@
+ groups="product.group_mrp_properties"
+ parent="menu_mrp_property"/>
+ groups="product.group_mrp_properties"
+ id="menu_mrp_property_group_action"/>
diff --git a/addons/mrp_repair/mrp_repair_view.xml b/addons/mrp_repair/mrp_repair_view.xml
index fa0ff192f17..dd29de20f9b 100644
--- a/addons/mrp_repair/mrp_repair_view.xml
+++ b/addons/mrp_repair/mrp_repair_view.xml
@@ -118,7 +118,7 @@
diff --git a/addons/plugin_outlook/plugin_outlook.xml b/addons/plugin_outlook/plugin_outlook.xml
index a267dc24e8f..2d65a09a0f9 100644
--- a/addons/plugin_outlook/plugin_outlook.xml
+++ b/addons/plugin_outlook/plugin_outlook.xml
@@ -48,11 +48,20 @@
new
-
-
-
- 4
- automatic
+
+
+ Sales Application
+ sale.config.settings
+ form
+
+
+
+
+
+
+
+
diff --git a/addons/plugin_thunderbird/plugin_thunderbird.xml b/addons/plugin_thunderbird/plugin_thunderbird.xml
index f7971f1f981..233628d5fd5 100644
--- a/addons/plugin_thunderbird/plugin_thunderbird.xml
+++ b/addons/plugin_thunderbird/plugin_thunderbird.xml
@@ -54,11 +54,21 @@
form
new
-
-
-
- 3
- automatic
+
+
+
+ Sales Application
+ sale.config.settings
+ form
+
+
+
+
+
+
+
+
diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml
index adb05fec578..b397bd826cc 100644
--- a/addons/point_of_sale/point_of_sale_view.xml
+++ b/addons/point_of_sale/point_of_sale_view.xml
@@ -80,7 +80,7 @@
-
+
diff --git a/addons/point_of_sale/security/point_of_sale_security.xml b/addons/point_of_sale/security/point_of_sale_security.xml
index 640a33d325b..7f2e91f1b48 100644
--- a/addons/point_of_sale/security/point_of_sale_security.xml
+++ b/addons/point_of_sale/security/point_of_sale_security.xml
@@ -10,6 +10,7 @@
Manager
+
diff --git a/addons/portal/security/portal_security.xml b/addons/portal/security/portal_security.xml
index 4b73db5cdcc..0c0213ec56a 100644
--- a/addons/portal/security/portal_security.xml
+++ b/addons/portal/security/portal_security.xml
@@ -17,6 +17,7 @@
Portal managers have access to the portal definitions, and can easily configure the users, access rights and menus of portal users.
+
diff --git a/addons/product/__init__.py b/addons/product/__init__.py
index 4247b49d41b..3e2fc0c8be4 100644
--- a/addons/product/__init__.py
+++ b/addons/product/__init__.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
##############################################################################
-#
+#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2010 Tiny SPRL ().
#
@@ -15,7 +15,7 @@
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
#
##############################################################################
import product
diff --git a/addons/product/__openerp__.py b/addons/product/__openerp__.py
index 117d559ddec..9b4d2cadee1 100644
--- a/addons/product/__openerp__.py
+++ b/addons/product/__openerp__.py
@@ -55,7 +55,6 @@ Print product labels with barcode.
'product_data.xml',
'product_report.xml',
'product_view.xml',
- 'wizard/product_installer.xml',
'product_shortcut_data.xml',
'pricelist_view.xml',
'partner_view.xml',
diff --git a/addons/product/partner_view.xml b/addons/product/partner_view.xml
index 51d012b8577..4d917230acc 100644
--- a/addons/product/partner_view.xml
+++ b/addons/product/partner_view.xml
@@ -9,7 +9,7 @@
-
+
diff --git a/addons/product/pricelist_view.xml b/addons/product/pricelist_view.xml
index 3b8eeb750cf..0388b2a4aa3 100644
--- a/addons/product/pricelist_view.xml
+++ b/addons/product/pricelist_view.xml
@@ -4,7 +4,8 @@
-
+
product.pricelist.version.form
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index e751edc0ae2..c99de86c5da 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -20,7 +20,7 @@
-
+
@@ -50,7 +50,7 @@
-
+
@@ -123,10 +123,10 @@
-
+
-
+
@@ -169,7 +169,7 @@
-
+
@@ -30,7 +30,7 @@
-
+
@@ -112,10 +112,10 @@
-
-
-
-
+
+
+
+
-
+
@@ -178,12 +179,12 @@
-
+
-
+
-
+
@@ -235,8 +236,8 @@
-
-
+
+
@@ -360,9 +361,9 @@
-
+
-
+
@@ -381,7 +382,8 @@
-
+
+
@@ -389,11 +391,11 @@
-
-
+
+
-
-
+
+
@@ -497,70 +499,8 @@
src_model="product.product"
groups="base.group_sale_salesman"/>
-
-
-
-
-
-
- Setup Your Invoicing Method
- sale.config.picking_policy
- form
-
-
-
-
-
-
- Setup your Invoicing Method
-
-
- This tool will help you to install the right module and configure the system according to the method you use to invoice your customers.
-
-
-
- 12
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Setup your Invoicing Method
- ir.actions.act_window
- sale.config.picking_policy
-
- form
- form
- new
-
-
-
-
-
-
- once
-
+
+
diff --git a/addons/sale/security/sale_security.xml b/addons/sale/security/sale_security.xml
index ae8c8bf62e3..0cb55fb0d30 100644
--- a/addons/sale/security/sale_security.xml
+++ b/addons/sale/security/sale_security.xml
@@ -20,7 +20,33 @@
-
+
+ Enable Invoicing Sale order lines
+
+
+
+
+ Enable Invoicing Delivery orders
+
+
+
+
+ Addresses in Sale Orders
+
+
+
+
+ Discount on lines
+
+
+
+
+ Analytic Accounting for Sales
+
+
+
+
+
-
+
diff --git a/addons/sale/test/manual_order_policy.yml b/addons/sale/test/manual_order_policy.yml
index d997e792696..bb197763486 100644
--- a/addons/sale/test/manual_order_policy.yml
+++ b/addons/sale/test/manual_order_policy.yml
@@ -82,8 +82,8 @@
-
I set order policy "Deliver & invoice on demand" as default policy.
-
- !record {model: sale.config.picking_policy, id: sale.config.picking_policy_0}:
- order_policy: 'manual'
+ !record {model: sale.config.settings, id: sale_configuration_0}:
+ default_order_policy: 'manual'
-
- !python {model: sale.config.picking_policy}: |
- self.execute(cr, uid, [ref("sale.config.picking_policy_0")])
+ !python {model: sale.config.settings}: |
+ self.execute(cr, uid, [ref("sale_configuration_0")], context=context)
diff --git a/addons/sale_crm/i18n/nb.po b/addons/sale_crm/i18n/nb.po
new file mode 100644
index 00000000000..844a80bbf78
--- /dev/null
+++ b/addons/sale_crm/i18n/nb.po
@@ -0,0 +1,135 @@
+# Norwegian Bokmal translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR , 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2012-02-08 00:37+0000\n"
+"PO-Revision-Date: 2012-04-02 11:19+0000\n"
+"Last-Translator: FULL NAME \n"
+"Language-Team: Norwegian Bokmal \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-04-03 04:53+0000\n"
+"X-Generator: Launchpad (build 15052)\n"
+
+#. module: sale_crm
+#: field:sale.order,categ_id:0
+msgid "Category"
+msgstr "Kategori"
+
+#. module: sale_crm
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale_crm
+#: code:addons/sale_crm/wizard/crm_make_sale.py:112
+#, python-format
+msgid "Converted to Sales Quotation(%s)."
+msgstr ""
+
+#. module: sale_crm
+#: view:crm.make.sale:0
+msgid "Convert to Quotation"
+msgstr ""
+
+#. module: sale_crm
+#: code:addons/sale_crm/wizard/crm_make_sale.py:89
+#, python-format
+msgid "Data Insufficient!"
+msgstr "Utilstrekkelig data!"
+
+#. module: sale_crm
+#: code:addons/sale_crm/wizard/crm_make_sale.py:89
+#, python-format
+msgid "Customer has no addresses defined!"
+msgstr "Kunden har ikke definert en adresse!"
+
+#. module: sale_crm
+#: model:ir.model,name:sale_crm.model_crm_make_sale
+msgid "Make sales"
+msgstr ""
+
+#. module: sale_crm
+#: view:crm.make.sale:0
+msgid "_Create"
+msgstr "_Opprett"
+
+#. module: sale_crm
+#: view:sale.order:0
+msgid "My Sales Team(s)"
+msgstr "Mine salgsteam"
+
+#. module: sale_crm
+#: help:crm.make.sale,close:0
+msgid ""
+"Check this to close the opportunity after having created the sale order."
+msgstr ""
+
+#. module: sale_crm
+#: view:board.board:0
+msgid "My Opportunities"
+msgstr ""
+
+#. module: sale_crm
+#: view:crm.lead:0
+msgid "Convert to Quote"
+msgstr ""
+
+#. module: sale_crm
+#: field:crm.make.sale,shop_id:0
+msgid "Shop"
+msgstr "Butikk"
+
+#. module: sale_crm
+#: field:crm.make.sale,partner_id:0
+msgid "Customer"
+msgstr "Kunde"
+
+#. module: sale_crm
+#: code:addons/sale_crm/wizard/crm_make_sale.py:92
+#, python-format
+msgid "Opportunity: %s"
+msgstr ""
+
+#. module: sale_crm
+#: field:crm.make.sale,close:0
+msgid "Close Opportunity"
+msgstr ""
+
+#. module: sale_crm
+#: view:board.board:0
+msgid "My Planned Revenues by Stage"
+msgstr ""
+
+#. module: sale_crm
+#: code:addons/sale_crm/wizard/crm_make_sale.py:110
+#, python-format
+msgid "Opportunity '%s' is converted to Quotation."
+msgstr ""
+
+#. module: sale_crm
+#: view:sale.order:0
+#: field:sale.order,section_id:0
+msgid "Sales Team"
+msgstr "Salgsteam"
+
+#. module: sale_crm
+#: model:ir.actions.act_window,name:sale_crm.action_crm_make_sale
+msgid "Make Quotation"
+msgstr "Lag tilbud"
+
+#. module: sale_crm
+#: view:crm.make.sale:0
+msgid "Cancel"
+msgstr ""
+
+#. module: sale_crm
+#: model:ir.model,name:sale_crm.model_sale_order
+msgid "Sales Order"
+msgstr "Salgsordre"
diff --git a/addons/sale_layout/sale_layout_view.xml b/addons/sale_layout/sale_layout_view.xml
index 78f98d3002f..146ca8aa006 100644
--- a/addons/sale_layout/sale_layout_view.xml
+++ b/addons/sale_layout/sale_layout_view.xml
@@ -37,6 +37,7 @@
on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, False, False, parent.date_order, product_packaging, parent.fiscal_position, True, context)"/>
@@ -99,7 +100,7 @@
-
+
diff --git a/addons/share/security/share_security.xml b/addons/share/security/share_security.xml
index 1e92ac44a53..29971077a2c 100644
--- a/addons/share/security/share_security.xml
+++ b/addons/share/security/share_security.xml
@@ -12,6 +12,7 @@
Members of this groups have access to the sharing wizard, which allows them to invite external users to view or edit some of their documents.
+
diff --git a/addons/stock/__init__.py b/addons/stock/__init__.py
index 0a241209593..0f1e96a9c67 100644
--- a/addons/stock/__init__.py
+++ b/addons/stock/__init__.py
@@ -24,5 +24,6 @@ import partner
import product
import report
import wizard
+import res_config
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock/__openerp__.py b/addons/stock/__openerp__.py
index 8bca2dc82f0..88ddead6645 100644
--- a/addons/stock/__openerp__.py
+++ b/addons/stock/__openerp__.py
@@ -81,6 +81,7 @@ Thanks to the double entry management, the inventory controlling is powerful and
"report/report_stock_move_view.xml",
"report/report_stock_view.xml",
"board_warehouse_view.xml",
+ "res_config_view.xml",
],
'test': [
'test/opening_stock.yml',
diff --git a/addons/stock/partner_view.xml b/addons/stock/partner_view.xml
index 04cd0207dd3..5a90c20aa81 100644
--- a/addons/stock/partner_view.xml
+++ b/addons/stock/partner_view.xml
@@ -6,20 +6,20 @@
-->
- res.partner.stock.property.form.inherit
- res.partner
- form
-
-
-
-
-
-
-
-
-
-
+ res.partner.stock.property.form.inherit
+ res.partner
+ form
+
+
+
+
+
+
+
+
+
+
-
\ No newline at end of file
+
diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml
index bded802dfe6..19533933002 100644
--- a/addons/stock/product_view.xml
+++ b/addons/stock/product_view.xml
@@ -40,9 +40,9 @@
form
-
+
-
+
@@ -79,7 +79,7 @@
26
-
+
@@ -116,11 +116,11 @@
-
+
-
-
-
+
+
+
@@ -169,7 +169,7 @@
-
+
diff --git a/addons/stock/res_config.py b/addons/stock/res_config.py
new file mode 100644
index 00000000000..0113149278c
--- /dev/null
+++ b/addons/stock/res_config.py
@@ -0,0 +1,81 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# OpenERP, Open Source Business Applications
+# Copyright (C) 2004-2012 OpenERP S.A. ().
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see .
+#
+##############################################################################
+
+from osv import fields, osv
+
+class stock_config_settings(osv.osv_memory):
+ _name = 'stock.config.settings'
+ _inherit = 'res.config.settings'
+
+ _columns = {
+ 'module_stock_no_autopicking': fields.boolean("Force Picking before Manufactoring Orders",
+ help="""This module allows an intermediate picking process to provide raw materials to production orders.
+ For example to manage production made by your suppliers (sub-contracting).
+ To achieve this, set the assembled product which is sub-contracted to "No Auto-Picking"
+ and put the location of the supplier in the routing of the assembly operation.
+ This installs the module stock_no_autopicking."""),
+ 'module_claim_from_delivery': fields.boolean("Track Claims from Delivery",
+ help="""Adds a Claim link to the delivery order.
+ This installs the module claim_from_delivery."""),
+ 'module_stock_invoice_directly': fields.boolean("Invoice Picking on Delivery",
+ help="""This allows to automatically launch the invoicing wizard if the delivery is
+ to be invoiced when you send or deliver goods.
+ This installs the module stock_invoice_directly."""),
+ 'module_product_expiry': fields.boolean("Expiry Date on Lots",
+ help="""Track different dates on products and production lots.
+ The following dates can be tracked:
+ - end of life
+ - best before date
+ - removal date
+ - alert date.
+ This installs the module product_expiry."""),
+ 'module_stock_location': fields.boolean("Push/Pull Logistic Rules",
+ help="""Provide push and pull inventory flows. Typical uses of this feature are:
+ manage product manufacturing chains, manage default locations per product,
+ define routes within your warehouse according to business needs, etc.
+ This installs the module stock_location."""),
+ 'group_uom': fields.boolean("Manage Different UoM for Products",
+ implied_group='product.group_uom',
+ help="""Allows you to select and maintain different units of measure for products."""),
+ 'group_uos': fields.boolean("Manage Secondary UoM (for Sale)",
+ implied_group='product.group_uos',
+ help="""Allows you to sell units of a product, but invoice based on a different unit of measure.
+ For instance, you can sell pieces of meat that you invoice based on their weight."""),
+ 'group_stock_packaging': fields.boolean("Manage Product Packaging",
+ implied_group='product.group_stock_packaging',
+ help="""Allows you to create and manage your packaging dimensions and types you want to be maintained in your system."""),
+ 'group_stock_production_lot': fields.boolean("Serial Numbers on Products",
+ implied_group='stock.group_production_lot',
+ help="""This allows you to manage products by using serial numbers.
+ When you select a lot, you can get the upstream or downstream traceability of the products contained in lot."""),
+ 'group_stock_tracking_lot': fields.boolean("Serial Numbers on Pallets (Logistic Units)",
+ implied_group='stock.group_tracking_lot',
+ help="""Allows you to get the upstream or downstream traceability of the products contained in lot."""),
+ 'group_stock_inventory_valuation': fields.boolean("Accounting Entries per Stock Movement",
+ implied_group='stock.group_inventory_valuation',
+ help="""This allows to split stock inventory lines according to production lots."""),
+ 'group_stock_multiple_locations': fields.boolean("Manage Multiple Locations and Warehouses",
+ implied_group='stock.group_locations',
+ help="""This allows to configure and use multiple stock locations and warehouses,
+ instead of having a single default one."""),
+ }
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock/res_config_view.xml b/addons/stock/res_config_view.xml
new file mode 100644
index 00000000000..aa31c4adf9d
--- /dev/null
+++ b/addons/stock/res_config_view.xml
@@ -0,0 +1,53 @@
+
+
+
+
+
+ stock settings
+ stock.config.settings
+ form
+
+
+
+
+
+
+ Configure Warehouse
+ ir.actions.act_window
+ stock.config.settings
+ form
+ inline
+
+
+
+
+
+
diff --git a/addons/stock/security/stock_security.xml b/addons/stock/security/stock_security.xml
index f83a5d362ab..a9653ffa81e 100644
--- a/addons/stock/security/stock_security.xml
+++ b/addons/stock/security/stock_security.xml
@@ -10,6 +10,27 @@
Manager
+
+
+
+
+ Manage Production Lots
+
+
+
+
+ Manage Tracking lots
+
+
+
+
+ Manage Inventory valuation
+
+
+
+
+ Manage Multiple Locations and Warehouses
+
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 592cb180d22..1d8f7e04fe4 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -22,11 +22,11 @@
action="product.product_category_action_form" id="menu_product_category_config_stock"
parent="stock.menu_product_in_config_stock" sequence="0" />
+ parent="stock.menu_product_in_config_stock" sequence="35" groups="product.group_uom"/>
@@ -42,10 +42,10 @@
-
-
+
+
@@ -59,11 +59,11 @@
@@ -119,10 +119,10 @@
-
-
+
+
@@ -131,11 +131,11 @@
-
+
-
+
@@ -145,17 +145,17 @@
-
-
+
+
-
+ groups="stock.group_production_lot"/>
+
@@ -206,14 +206,14 @@
form
@@ -1589,7 +1591,7 @@
-
+
-
-
-
+
+
+
-
diff --git a/addons/subscription/security/subcription_security.xml b/addons/subscription/security/subcription_security.xml
index 7d665c96435..46293a97561 100644
--- a/addons/subscription/security/subcription_security.xml
+++ b/addons/subscription/security/subcription_security.xml
@@ -10,6 +10,7 @@
Manager
+
diff --git a/addons/survey/security/survey_security.xml b/addons/survey/security/survey_security.xml
index c44a35e3ee9..3b0cf5844ce 100644
--- a/addons/survey/security/survey_security.xml
+++ b/addons/survey/security/survey_security.xml
@@ -9,9 +9,11 @@
Manager
+
Survey / User
+
diff --git a/addons/wiki/security/wiki_security.xml b/addons/wiki/security/wiki_security.xml
index 16bd30c151f..ca9d34ae99c 100644
--- a/addons/wiki/security/wiki_security.xml
+++ b/addons/wiki/security/wiki_security.xml
@@ -5,6 +5,7 @@
User
+
diff --git a/addons/wiki_sale_faq/wiki_sale_faq_data.xml b/addons/wiki_sale_faq/wiki_sale_faq_data.xml
index a349f77404f..d9bd8de43ff 100644
--- a/addons/wiki_sale_faq/wiki_sale_faq_data.xml
+++ b/addons/wiki_sale_faq/wiki_sale_faq_data.xml
@@ -3,7 +3,7 @@
Sales Document
-
+
0