diff --git a/addons/account/__openerp__.py b/addons/account/__openerp__.py
index 1a222b2f83c..59d86351cd6 100644
--- a/addons/account/__openerp__.py
+++ b/addons/account/__openerp__.py
@@ -49,7 +49,7 @@ for a particular financial year and for preparation of vouchers there is a modul
""",
'website': 'http://www.openerp.com',
'images' : ['images/accounts.jpeg','images/bank_statement.jpeg','images/cash_register.jpeg','images/chart_of_accounts.jpeg','images/customer_invoice.jpeg','images/journal_entries.jpeg'],
- 'depends' : ['base_setup', 'product', 'analytic', 'process', 'board', 'edi', 'report'],
+ 'depends' : ['base_setup', 'product', 'analytic', 'board', 'edi', 'report'],
'data': [
'security/account_security.xml',
'security/ir.model.access.csv',
@@ -114,17 +114,12 @@ for a particular financial year and for preparation of vouchers there is a modul
'partner_view.xml',
'product_view.xml',
'account_assert_test.xml',
- 'process/statement_process.xml',
- 'process/customer_invoice_process.xml',
- 'process/supplier_invoice_process.xml',
'ir_sequence_view.xml',
'company_view.xml',
- 'board_account_view.xml',
'edi/invoice_action_data.xml',
'account_bank_view.xml',
'res_config_view.xml',
'account_pre_install.yml',
-
'views/report_vat.xml',
'views/report_invoice.xml',
'views/report_trialbalance.xml',
@@ -144,20 +139,12 @@ for a particular financial year and for preparation of vouchers there is a modul
'project/views/report_analyticcostledgerquantity.xml',
'project/views/report_analyticcostledger.xml',
'project/views/report_invertedanalyticbalance.xml',
- ],
- 'js': [
- 'static/src/js/account_move_reconciliation.js',
- 'static/src/js/account_move_line_quickadd.js',
+ 'views/account.xml',
],
'qweb' : [
"static/src/xml/account_move_reconciliation.xml",
"static/src/xml/account_move_line_quickadd.xml",
],
- 'css':[
- 'static/src/css/account_move_reconciliation.css',
- 'static/src/css/account_move_line_quickadd.css',
- 'static/src/css/account_bank_and_cash.css',
- ],
'demo': [
'demo/account_demo.xml',
'project/project_demo.xml',
diff --git a/addons/account/account.py b/addons/account/account.py
index b87caf547ab..aa5d507b3d2 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -1944,15 +1944,17 @@ class account_tax(osv.osv):
return super(account_tax, self).write(cr, uid, ids, vals, context=context)
def search(self, cr, uid, args, offset=0, limit=None, order=None, context=None, count=False):
+ if context is None:
+ context = {}
journal_pool = self.pool.get('account.journal')
- if context and context.has_key('type'):
+ if context.get('type'):
if context.get('type') in ('out_invoice','out_refund'):
args += [('type_tax_use','in',['sale','all'])]
elif context.get('type') in ('in_invoice','in_refund'):
args += [('type_tax_use','in',['purchase','all'])]
- if context and context.has_key('journal_id'):
+ if context.get('journal_id'):
journal = journal_pool.browse(cr, uid, context.get('journal_id'))
if journal.type in ('sale', 'purchase'):
args += [('type_tax_use','in',[journal.type,'all'])]
diff --git a/addons/account/account_invoice.py b/addons/account/account_invoice.py
index f7e561c8e24..c23f0c37115 100644
--- a/addons/account/account_invoice.py
+++ b/addons/account/account_invoice.py
@@ -409,9 +409,7 @@ class account_invoice(osv.osv):
'''
assert len(ids) == 1, 'This option should only be used for a single id at a time.'
self.write(cr, uid, ids, {'sent': True}, context=context)
- context2 = context.copy()
- context2['active_ids'] = ids
- return self.pool['report'].get_action(cr, uid, [], 'account.report_invoice', context=context2)
+ return self.pool['report'].get_action(cr, uid, [], 'account.report_invoice', context=context)
def action_invoice_sent(self, cr, uid, ids, context=None):
'''
diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index b521f3ff48c..61c397364b9 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -457,7 +457,7 @@
-
+
diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index a79aff58c20..729c9d16b7a 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -642,7 +642,7 @@ class account_move_line(osv.osv):
(_check_date, 'The date of your Journal Entry is not in the defined period! You should change the date or remove this constraint from the journal.', ['date']),
(_check_currency, 'The selected account of your Journal Entry forces to provide a secondary currency. You should remove the secondary currency on the account or select a multi-currency view on the journal.', ['currency_id']),
(_check_currency_and_amount, "You cannot create journal items with a secondary currency without recording both 'currency' and 'amount currency' field.", ['currency_id','amount_currency']),
- (_check_currency_amount, 'The amount expressed in the secondary currency must be positive when the journal item is a debit and negative when if it is a credit.', ['amount_currency']),
+ (_check_currency_amount, 'The amount expressed in the secondary currency must be positive when account is debited and negative when account is credited.', ['amount_currency']),
(_check_currency_company, "You cannot provide a secondary currency if it is the same than the company one." , ['currency_id']),
]
@@ -1034,10 +1034,14 @@ class account_move_line(osv.osv):
part_rec_ids = [rec['reconcile_partial_id'][0] for rec in part_recs]
unlink_ids += rec_ids
unlink_ids += part_rec_ids
+ all_moves = obj_move_line.search(cr, uid, ['|',('reconcile_id', 'in', unlink_ids),('reconcile_partial_id', 'in', unlink_ids)])
+ all_moves = list(set(all_moves) - set(move_ids))
if unlink_ids:
if opening_reconciliation:
obj_move_rec.write(cr, uid, unlink_ids, {'opening_reconciliation': False})
obj_move_rec.unlink(cr, uid, unlink_ids)
+ if all_moves:
+ obj_move_line.reconcile_partial(cr, uid, all_moves, 'auto',context=context)
return True
def unlink(self, cr, uid, ids, context=None, check=True):
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index c29371e4c44..8e2cc6452c0 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -384,6 +384,7 @@
+
@@ -881,6 +882,7 @@
+
@@ -891,6 +893,12 @@
+
+
+
+
+
+
diff --git a/addons/account/board_account_view.xml b/addons/account/board_account_view.xml
deleted file mode 100644
index abbc81ade2b..00000000000
--- a/addons/account/board_account_view.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-
-
-
-
-
- Company Analysis
- account.entries.report
- form
- tree,graph
- {'group_by':['user_type'], 'group_by_no_leaf':1}
-
- [('year','=',time.strftime('%Y'))]
-
-
-
- board.account.form
- board.board
-
-
-
-
-
-
- Accounting
- board.board
- form
- form
- menu
-
-
-
-
-
-
-
diff --git a/addons/account/partner_view.xml b/addons/account/partner_view.xml
index 6a58bc7f77e..829ce8dc0f0 100644
--- a/addons/account/partner_view.xml
+++ b/addons/account/partner_view.xml
@@ -65,7 +65,8 @@
-
+
@@ -127,7 +128,7 @@
-
+
diff --git a/addons/account/static/description/index.html b/addons/account/static/description/index.html
index d9b26f11d16..362a33b4ae2 100644
--- a/addons/account/static/description/index.html
+++ b/addons/account/static/description/index.html
@@ -35,7 +35,7 @@ in one place. OpenERP's user interface is designed with productivity in mind.
-
+
@@ -60,7 +60,7 @@ Share access to your latest business numbers with your team and your accountant
Import your bank statements and reconcile them in just a few clicks. Prepare payment orders based on your supplier invoices and payment terms.
-
+
@@ -90,7 +90,7 @@ Create and send professional invoices & get paid online. Get rid of the stre
Automatically create invoices from sales orders, delivery orders or base them on time and material. Re-invoice expenses on projects to your customer in just a few clicks.
-
+
@@ -119,7 +119,7 @@ Control supplier invocies based on purchase orders. Get real-time inventory valu
Integrate your analytic accounting operations with timesheets, projects, invoices, expenses, etc. No need to record transactions, all analytic entries are posted automatically following your business rules.
-
+
@@ -133,7 +133,7 @@ Integrate your analytic accounting operations with timesheets, projects, invoice
-
+
Manage your assets, track expenses, control budgets, multi-level analytic accounting; OpenERP has all the features you need to sustain all your business activities.
@@ -143,34 +143,21 @@ Manage your assets, track expenses, control budgets, multi-level analytic accoun
-
+
Scale With Your Organization
Used by very small to very large organizations
OpenERP supports multiple currencies, multiple users with different access rights, multiple companies with real time consolidation and unlimited analytic plans.
-
+
-
+
-
-
Dashboard & KPIs
-
-
-
-
-
-Get direct access to key information with dynamic and customizable dashboards. Analyse your financial activities with the drill-up, drill-down, drill-across and filter features.
-
-
-
-
-
Many companies already enjoy it
diff --git a/addons/account/views/account.xml b/addons/account/views/account.xml
new file mode 100644
index 00000000000..15df140c75e
--- /dev/null
+++ b/addons/account/views/account.xml
@@ -0,0 +1,16 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/account_analytic_analysis/__openerp__.py b/addons/account_analytic_analysis/__openerp__.py
index 61a92490c47..70a21692804 100644
--- a/addons/account_analytic_analysis/__openerp__.py
+++ b/addons/account_analytic_analysis/__openerp__.py
@@ -40,9 +40,7 @@ Adds menu to show relevant information to each manager.You can also view the rep
'account_analytic_analysis_view.xml',
'account_analytic_analysis_cron.xml',
'res_config_view.xml',
- ],
- 'css': [
- 'static/src/css/analytic.css'
+ 'views/account_analytic_analysis.xml',
],
'demo': ['analytic_account_demo.xml'],
'test': ['test/account_analytic_analysis.yml'],
diff --git a/addons/account_analytic_analysis/account_analytic_analysis.py b/addons/account_analytic_analysis/account_analytic_analysis.py
index 99890a5f239..5aa4b5a49db 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis.py
+++ b/addons/account_analytic_analysis/account_analytic_analysis.py
@@ -22,6 +22,7 @@ from dateutil.relativedelta import relativedelta
import datetime
import logging
import time
+import traceback
from openerp.osv import osv, fields
from openerp.osv.orm import intersect, except_orm
@@ -72,9 +73,7 @@ class account_analytic_invoice_line(osv.osv):
result = {}
res = self.pool.get('product.product').browse(cr, uid, product, context=context)
- result.update({'name':res.partner_ref or False,'uom_id': uom_id or res.uom_id.id or False, 'price_unit': res.list_price or 0.0})
- if res.description:
- result['name'] += '\n'+res.description
+ result.update({'name': name or res.description or False,'uom_id': uom_id or res.uom_id.id or False, 'price_unit': price_unit or res.list_price or 0.0})
res_final = {'value':result}
if result['uom_id'] != res.uom_id.id:
@@ -721,23 +720,40 @@ class account_analytic_account(osv.osv):
inv_obj.button_compute(cr, uid, [invoice_id], context=context)
return invoice_id
- def recurring_create_invoice(self, cr, uid, automatic=False, context=None):
+ def recurring_create_invoice(self, cr, uid, ids, context=None):
+ return self._recurring_create_invoice(cr, uid, ids, context=context)
+
+ def _cron_recurring_create_invoice(self, cr, uid, context=None):
+ return self._recurring_create_invoice(cr, uid, [], automatic=True, context=context)
+
+ def _recurring_create_invoice(self, cr, uid, ids, automatic=False, context=None):
context = context or {}
current_date = time.strftime('%Y-%m-%d')
-
- contract_ids = self.search(cr, uid, [('recurring_next_date','<=', current_date), ('state','=', 'open'), ('recurring_invoices','=', True)])
+ if ids:
+ contract_ids = ids
+ else:
+ contract_ids = self.search(cr, uid, [('recurring_next_date','<=', current_date), ('state','=', 'open'), ('recurring_invoices','=', True), ('type', '=', 'contract')])
for contract in self.browse(cr, uid, contract_ids, context=context):
- invoice_id = self._prepare_invoice(cr, uid, contract, context=context)
+ try:
+ invoice_id = self._prepare_invoice(cr, uid, contract, context=context)
- next_date = datetime.datetime.strptime(contract.recurring_next_date or current_date, "%Y-%m-%d")
- interval = contract.recurring_interval
- if contract.recurring_rule_type == 'daily':
- new_date = next_date+relativedelta(days=+interval)
- elif contract.recurring_rule_type == 'weekly':
- new_date = next_date+relativedelta(weeks=+interval)
- else:
- new_date = next_date+relativedelta(months=+interval)
- self.write(cr, uid, [contract.id], {'recurring_next_date': new_date.strftime('%Y-%m-%d')}, context=context)
+ next_date = datetime.datetime.strptime(contract.recurring_next_date or current_date, "%Y-%m-%d")
+ interval = contract.recurring_interval
+ if contract.recurring_rule_type == 'daily':
+ new_date = next_date+relativedelta(days=+interval)
+ elif contract.recurring_rule_type == 'weekly':
+ new_date = next_date+relativedelta(weeks=+interval)
+ else:
+ new_date = next_date+relativedelta(months=+interval)
+ self.write(cr, uid, [contract.id], {'recurring_next_date': new_date.strftime('%Y-%m-%d')}, context=context)
+ if automatic:
+ cr.commit()
+ except Exception:
+ if automatic:
+ cr.rollback()
+ _logger.error(traceback.format_exc())
+ else:
+ raise
return True
class account_analytic_account_summary_user(osv.osv):
diff --git a/addons/account_analytic_analysis/account_analytic_analysis_cron.xml b/addons/account_analytic_analysis/account_analytic_analysis_cron.xml
index 492278a87b5..0637c2ad276 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_cron.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_cron.xml
@@ -93,7 +93,7 @@ OpenERP Automatic Email
days-1
-
+
diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
index d99be3db355..97fb15e9290 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
@@ -151,8 +151,10 @@
-
-
+
+
+
+
diff --git a/addons/account_analytic_analysis/test/account_analytic_analysis.yml b/addons/account_analytic_analysis/test/account_analytic_analysis.yml
index 49668a2b781..4f594b6bed3 100644
--- a/addons/account_analytic_analysis/test/account_analytic_analysis.yml
+++ b/addons/account_analytic_analysis/test/account_analytic_analysis.yml
@@ -20,6 +20,7 @@
!record {model: account.analytic.account, id: contract_main}:
partner_id: base.main_partner
template_id: account_analytic_analysis.contract_template
+ type: contract
-
I check that the contract inherited from data of the template
-
@@ -32,7 +33,7 @@
I generate all invoices from contracts having recurring invoicing
-
!python {model: account.analytic.account}: |
- self.recurring_create_invoice(cr, uid)
+ self.recurring_create_invoice(cr, uid, [])
-
I test the generated invoice
-
diff --git a/addons/account_analytic_analysis/views/account_analytic_analysis.xml b/addons/account_analytic_analysis/views/account_analytic_analysis.xml
new file mode 100644
index 00000000000..dced07310d8
--- /dev/null
+++ b/addons/account_analytic_analysis/views/account_analytic_analysis.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/account_analytic_plans/account_analytic_plans.py b/addons/account_analytic_plans/account_analytic_plans.py
index 4cf12098fff..23a309c1dda 100644
--- a/addons/account_analytic_plans/account_analytic_plans.py
+++ b/addons/account_analytic_plans/account_analytic_plans.py
@@ -454,15 +454,10 @@ class account_bank_statement(osv.osv):
_inherit = "account.bank.statement"
_name = "account.bank.statement"
- def create_move_from_st_line(self, cr, uid, st_line_id, company_currency_id, st_line_number, context=None):
- account_move_line_pool = self.pool.get('account.move.line')
- account_bank_statement_line_pool = self.pool.get('account.bank.statement.line')
- st_line = account_bank_statement_line_pool.browse(cr, uid, st_line_id, context=context)
- result = super(account_bank_statement,self).create_move_from_st_line(cr, uid, st_line_id, company_currency_id, st_line_number, context=context)
- move = st_line.move_ids and st_line.move_ids[0] or False
- if move:
- for line in move.line_id:
- account_move_line_pool.write(cr, uid, [line.id], {'analytics_id':st_line.analytics_id.id}, context=context)
+ def _prepare_bank_move_line(self, cr, uid, st_line, move_id, amount, company_currency_id, context=None):
+ result = super(account_bank_statement,self)._prepare_bank_move_line(cr, uid, st_line,
+ move_id, amount, company_currency_id, context=context)
+ result['analytics_id'] = st_line.analytics_id.id
return result
def button_confirm_bank(self, cr, uid, ids, context=None):
diff --git a/addons/account_anglo_saxon/i18n/sk.po b/addons/account_anglo_saxon/i18n/sk.po
new file mode 100644
index 00000000000..ff14bd7feb4
--- /dev/null
+++ b/addons/account_anglo_saxon/i18n/sk.po
@@ -0,0 +1,62 @@
+# Slovak translation for openobject-addons
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR , 2014.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2014-04-26 16:04+0000\n"
+"Last-Translator: FULL NAME \n"
+"Language-Team: Slovak \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2014-04-27 05:58+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+
+#. module: account_anglo_saxon
+#: model:ir.model,name:account_anglo_saxon.model_product_category
+msgid "Product Category"
+msgstr ""
+
+#. module: account_anglo_saxon
+#: model:ir.model,name:account_anglo_saxon.model_account_invoice_line
+msgid "Invoice Line"
+msgstr ""
+
+#. module: account_anglo_saxon
+#: model:ir.model,name:account_anglo_saxon.model_purchase_order
+msgid "Purchase Order"
+msgstr ""
+
+#. module: account_anglo_saxon
+#: model:ir.model,name:account_anglo_saxon.model_product_template
+msgid "Product Template"
+msgstr ""
+
+#. module: account_anglo_saxon
+#: field:product.category,property_account_creditor_price_difference_categ:0
+#: field:product.template,property_account_creditor_price_difference:0
+msgid "Price Difference Account"
+msgstr ""
+
+#. module: account_anglo_saxon
+#: model:ir.model,name:account_anglo_saxon.model_account_invoice
+msgid "Invoice"
+msgstr ""
+
+#. module: account_anglo_saxon
+#: model:ir.model,name:account_anglo_saxon.model_stock_picking
+msgid "Picking List"
+msgstr ""
+
+#. module: account_anglo_saxon
+#: help:product.category,property_account_creditor_price_difference_categ:0
+#: help:product.template,property_account_creditor_price_difference:0
+msgid ""
+"This account will be used to value price difference between purchase price "
+"and cost price."
+msgstr ""
diff --git a/addons/account_anglo_saxon/invoice.py b/addons/account_anglo_saxon/invoice.py
index 81394bc926e..8ef17fa886c 100644
--- a/addons/account_anglo_saxon/invoice.py
+++ b/addons/account_anglo_saxon/invoice.py
@@ -123,6 +123,8 @@ class account_invoice_line(osv.osv):
if a == line['account_id'] and i_line.product_id.id == line['product_id']:
uom = i_line.product_id.uos_id or i_line.product_id.uom_id
valuation_price_unit = self.pool.get('product.uom')._compute_price(cr, uid, uom.id, i_line.product_id.standard_price, i_line.uos_id.id)
+ if inv.currency_id.id != company_currency:
+ standard_price = self.pool.get('res.currency').compute(cr, uid, company_currency, inv.currency_id.id, standard_price, context={'date': inv.date_invoice})
if i_line.product_id.cost_method != 'standard' and i_line.purchase_line_id:
#for average/fifo/lifo costing method, fetch real cost price from incomming moves
stock_move_obj = self.pool.get('stock.move')
diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py
index 771c6e15bd8..c1424079542 100644
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@ -189,7 +189,7 @@ class account_voucher(osv.osv):
if not ids:
return []
if context is None: context = {}
- return [(r['id'], (str("%.2f" % r['amount']) or '')) for r in self.read(cr, uid, ids, ['amount'], context, load='_classic_write')]
+ return [(r['id'], (r['number'] or _('Voucher'))) for r in self.read(cr, uid, ids, ['number'], context, load='_classic_write')]
def fields_view_get(self, cr, uid, view_id=None, view_type=False, context=None, toolbar=False, submenu=False):
mod_obj = self.pool.get('ir.model.data')
@@ -783,6 +783,7 @@ class account_voucher(osv.osv):
total_credit += line.credit and line.amount_currency or 0.0
total_debit += line.debit and line.amount_currency or 0.0
+ remaining_amount = price
#voucher line creation
for line in account_move_lines:
@@ -803,13 +804,13 @@ class account_voucher(osv.osv):
'move_line_id':line.id,
'account_id':line.account_id.id,
'amount_original': amount_original,
- 'amount': (line.id in move_lines_found) and min(abs(price), amount_unreconciled) or 0.0,
+ 'amount': (line.id in move_lines_found) and min(abs(remaining_amount), amount_unreconciled) or 0.0,
'date_original':line.date,
'date_due':line.date_maturity,
'amount_unreconciled': amount_unreconciled,
'currency_id': line_currency_id,
}
- price -= rs['amount']
+ remaining_amount -= rs['amount']
#in case a corresponding move_line hasn't been found, we now try to assign the voucher amount
#on existing invoices: we split voucher amount by most old first, but only for lines in the same currency
if not move_lines_found:
@@ -937,19 +938,17 @@ class account_voucher(osv.osv):
def cancel_voucher(self, cr, uid, ids, context=None):
reconcile_pool = self.pool.get('account.move.reconcile')
move_pool = self.pool.get('account.move')
-
+ move_line_pool = self.pool.get('account.move.line')
for voucher in self.browse(cr, uid, ids, context=context):
# refresh to make sure you don't unlink an already removed move
voucher.refresh()
- recs = []
for line in voucher.move_ids:
if line.reconcile_id:
- recs += [line.reconcile_id.id]
- if line.reconcile_partial_id:
- recs += [line.reconcile_partial_id.id]
-
- reconcile_pool.unlink(cr, uid, recs)
-
+ move_lines = [move_line.id for move_line in line.reconcile_id.line_id]
+ move_lines.remove(line.id)
+ reconcile_pool.unlink(cr, uid, [line.reconcile_id.id])
+ if len(move_lines) >= 2:
+ move_line_pool.reconcile_partial(cr, uid, move_lines, 'auto',context=context)
if voucher.move_id:
move_pool.button_cancel(cr, uid, [voucher.move_id.id])
move_pool.unlink(cr, uid, [voucher.move_id.id])
diff --git a/addons/account_voucher/test/sales_payment.yml b/addons/account_voucher/test/sales_payment.yml
index 3679c34dc52..ed9305a320c 100644
--- a/addons/account_voucher/test/sales_payment.yml
+++ b/addons/account_voucher/test/sales_payment.yml
@@ -44,6 +44,8 @@
!python {model: account.voucher}: |
vals = {}
journal_id = self.default_get(cr, uid, ['journal_id']).get('journal_id',None)
+ voucher = self.recompute_voucher_lines(cr, uid, [], ref("base.res_partner_19"), journal_id, 450.0, ref('base.EUR'), 'receipt', False)
+ assert (voucher['value'].get('writeoff_amount') == 0.0), "Writeoff amount calculated by recompute_voucher_lines() is not 0.0"
res = self.onchange_partner_id(cr, uid, [], ref("base.res_partner_19"), journal_id, 0.0, 1, ttype='receipt', date=False)
vals = {
'account_id': ref('account.cash'),
@@ -64,6 +66,7 @@
vals['line_cr_ids'] = [(0,0,i) for i in res['value']['line_cr_ids']]
id = self.create(cr, uid, vals)
voucher_id = self.browse(cr, uid, id)
+ assert (voucher_id.writeoff_amount == 0.0), "Writeoff amount is not 0.0"
assert (voucher_id.state=='draft'), "Voucher is not in draft state"
self.signal_proforma_voucher(cr, uid, [voucher_id.id])
diff --git a/addons/analytic_contract_hr_expense/__openerp__.py b/addons/analytic_contract_hr_expense/__openerp__.py
index 8e807923550..9689154e613 100644
--- a/addons/analytic_contract_hr_expense/__openerp__.py
+++ b/addons/analytic_contract_hr_expense/__openerp__.py
@@ -33,7 +33,6 @@ This module is for modifying account analytic view to show some data related to
'depends': ['hr_expense','account_analytic_analysis'],
'data': ['analytic_contract_hr_expense_view.xml'],
'demo': [],
- 'css' : [],
'installable': True,
'auto_install': True,
}
diff --git a/addons/association/i18n/sk.po b/addons/association/i18n/sk.po
new file mode 100644
index 00000000000..c1c16d88cd8
--- /dev/null
+++ b/addons/association/i18n/sk.po
@@ -0,0 +1,135 @@
+# Slovak translation for openobject-addons
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR , 2014.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2014-04-26 16:22+0000\n"
+"Last-Translator: FULL NAME \n"
+"Language-Team: Slovak \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2014-04-27 05:58+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,wiki:0
+msgid "Wiki"
+msgstr ""
+
+#. module: association
+#: view:profile.association.config.install_modules_wizard:0
+msgid "Event Management"
+msgstr ""
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,project_gtd:0
+msgid "Getting Things Done"
+msgstr ""
+
+#. module: association
+#: model:ir.module.module,description:association.module_meta_information
+msgid "This module is to create Profile for Associates"
+msgstr ""
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,progress:0
+msgid "Configuration Progress"
+msgstr ""
+
+#. module: association
+#: view:profile.association.config.install_modules_wizard:0
+msgid ""
+"Here are specific applications related to the Association Profile you "
+"selected."
+msgstr ""
+
+#. module: association
+#: view:profile.association.config.install_modules_wizard:0
+msgid "title"
+msgstr ""
+
+#. module: association
+#: help:profile.association.config.install_modules_wizard,event_project:0
+msgid "Helps you to manage and organize your events."
+msgstr ""
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,config_logo:0
+msgid "Image"
+msgstr ""
+
+#. module: association
+#: help:profile.association.config.install_modules_wizard,hr_expense:0
+msgid ""
+"Tracks and manages employee expenses, and can automatically re-invoice "
+"clients if the expenses are project-related."
+msgstr ""
+
+#. module: association
+#: help:profile.association.config.install_modules_wizard,project_gtd:0
+msgid ""
+"GTD is a methodology to efficiently organise yourself and your tasks. This "
+"module fully integrates GTD principle with OpenERP's project management."
+msgstr ""
+
+#. module: association
+#: view:profile.association.config.install_modules_wizard:0
+msgid "Resources Management"
+msgstr ""
+
+#. module: association
+#: model:ir.module.module,shortdesc:association.module_meta_information
+msgid "Association profile"
+msgstr ""
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,hr_expense:0
+msgid "Expenses Tracking"
+msgstr ""
+
+#. module: association
+#: model:ir.actions.act_window,name:association.action_config_install_module
+#: view:profile.association.config.install_modules_wizard:0
+msgid "Association Application Configuration"
+msgstr ""
+
+#. module: association
+#: help:profile.association.config.install_modules_wizard,wiki:0
+msgid ""
+"Lets you create wiki pages and page groups in order to keep track of "
+"business knowledge and share it with and between your employees."
+msgstr ""
+
+#. module: association
+#: help:profile.association.config.install_modules_wizard,project:0
+msgid ""
+"Helps you manage your projects and tasks by tracking them, generating "
+"plannings, etc..."
+msgstr ""
+
+#. module: association
+#: model:ir.model,name:association.model_profile_association_config_install_modules_wizard
+msgid "profile.association.config.install_modules_wizard"
+msgstr ""
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,event_project:0
+msgid "Events"
+msgstr ""
+
+#. module: association
+#: view:profile.association.config.install_modules_wizard:0
+#: field:profile.association.config.install_modules_wizard,project:0
+msgid "Project Management"
+msgstr ""
+
+#. module: association
+#: view:profile.association.config.install_modules_wizard:0
+msgid "Configure"
+msgstr ""
diff --git a/addons/auth_oauth_signup/i18n/ar.po b/addons/auth_oauth_signup/i18n/ar.po
deleted file mode 100644
index ba8b3403dde..00000000000
--- a/addons/auth_oauth_signup/i18n/ar.po
+++ /dev/null
@@ -1,23 +0,0 @@
-# Arabic translation for openobject-addons
-# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR , 2013.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME \n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2013-11-26 18:16+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: 2014-04-22 07:52+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
-
-#. module: auth_oauth_signup
-#: model:ir.model,name:auth_oauth_signup.model_res_users
-msgid "Users"
-msgstr "المستخدمين"
diff --git a/addons/auth_oauth_signup/i18n/cs.po b/addons/auth_oauth_signup/i18n/cs.po
deleted file mode 100644
index fbc3ab09f61..00000000000
--- a/addons/auth_oauth_signup/i18n/cs.po
+++ /dev/null
@@ -1,23 +0,0 @@
-# Czech translation for openobject-addons
-# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR , 2013.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME \n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2014-02-03 16:54+0000\n"
-"Last-Translator: Jakub Drozd \n"
-"Language-Team: Czech \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-22 07:52+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
-
-#. module: auth_oauth_signup
-#: model:ir.model,name:auth_oauth_signup.model_res_users
-msgid "Users"
-msgstr "Uživatelé"
diff --git a/addons/auth_oauth_signup/i18n/da.po b/addons/auth_oauth_signup/i18n/da.po
deleted file mode 100644
index 488b063a165..00000000000
--- a/addons/auth_oauth_signup/i18n/da.po
+++ /dev/null
@@ -1,23 +0,0 @@
-# Danish translation for openobject-addons
-# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR , 2013.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME \n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2013-09-15 20:08+0000\n"
-"Last-Translator: FULL NAME \n"
-"Language-Team: Danish \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-22 07:52+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
-
-#. module: auth_oauth_signup
-#: model:ir.model,name:auth_oauth_signup.model_res_users
-msgid "Users"
-msgstr "Bruger"
diff --git a/addons/auth_oauth_signup/i18n/de.po b/addons/auth_oauth_signup/i18n/de.po
deleted file mode 100644
index 60e0c74816a..00000000000
--- a/addons/auth_oauth_signup/i18n/de.po
+++ /dev/null
@@ -1,23 +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-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-12-27 22:22+0000\n"
-"Last-Translator: FULL NAME \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: 2014-04-22 07:52+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
-
-#. module: auth_oauth_signup
-#: model:ir.model,name:auth_oauth_signup.model_res_users
-msgid "Users"
-msgstr "Benutzer"
diff --git a/addons/auth_oauth_signup/i18n/en_GB.po b/addons/auth_oauth_signup/i18n/en_GB.po
deleted file mode 100644
index 6448f405c6f..00000000000
--- a/addons/auth_oauth_signup/i18n/en_GB.po
+++ /dev/null
@@ -1,23 +0,0 @@
-# English (United Kingdom) translation for openobject-addons
-# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR , 2013.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME \n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2013-02-06 14:33+0000\n"
-"Last-Translator: FULL NAME \n"
-"Language-Team: English (United Kingdom) \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-22 07:52+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
-
-#. module: auth_oauth_signup
-#: model:ir.model,name:auth_oauth_signup.model_res_users
-msgid "Users"
-msgstr "Users"
diff --git a/addons/auth_oauth_signup/i18n/es.po b/addons/auth_oauth_signup/i18n/es.po
deleted file mode 100644
index c73d5e53a90..00000000000
--- a/addons/auth_oauth_signup/i18n/es.po
+++ /dev/null
@@ -1,23 +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-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-12-27 11:38+0000\n"
-"Last-Translator: Pedro Manuel Baeza \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: 2014-04-22 07:52+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
-
-#. module: auth_oauth_signup
-#: model:ir.model,name:auth_oauth_signup.model_res_users
-msgid "Users"
-msgstr "Usuarios"
diff --git a/addons/auth_oauth_signup/i18n/et.po b/addons/auth_oauth_signup/i18n/et.po
deleted file mode 100644
index e6c9494329e..00000000000
--- a/addons/auth_oauth_signup/i18n/et.po
+++ /dev/null
@@ -1,23 +0,0 @@
-# Estonian translation for openobject-addons
-# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR , 2013.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME \n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2013-10-09 14:34+0000\n"
-"Last-Translator: FULL NAME \n"
-"Language-Team: Estonian \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-22 07:52+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
-
-#. module: auth_oauth_signup
-#: model:ir.model,name:auth_oauth_signup.model_res_users
-msgid "Users"
-msgstr "Kasutajad"
diff --git a/addons/auth_oauth_signup/i18n/fr.po b/addons/auth_oauth_signup/i18n/fr.po
deleted file mode 100644
index bc02d858b79..00000000000
--- a/addons/auth_oauth_signup/i18n/fr.po
+++ /dev/null
@@ -1,23 +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-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-12-29 16:08+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: 2014-04-22 07:52+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
-
-#. module: auth_oauth_signup
-#: model:ir.model,name:auth_oauth_signup.model_res_users
-msgid "Users"
-msgstr "Utilisateurs"
diff --git a/addons/auth_oauth_signup/i18n/gl.po b/addons/auth_oauth_signup/i18n/gl.po
deleted file mode 100644
index 12615b8b241..00000000000
--- a/addons/auth_oauth_signup/i18n/gl.po
+++ /dev/null
@@ -1,23 +0,0 @@
-# Galician translation for openobject-addons
-# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR , 2014.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME \n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2014-02-05 16:37+0000\n"
-"Last-Translator: FULL NAME \n"
-"Language-Team: Galician \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-22 07:52+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
-
-#. module: auth_oauth_signup
-#: model:ir.model,name:auth_oauth_signup.model_res_users
-msgid "Users"
-msgstr "Usuarios"
diff --git a/addons/auth_oauth_signup/i18n/hr.po b/addons/auth_oauth_signup/i18n/hr.po
deleted file mode 100644
index 4d772addad1..00000000000
--- a/addons/auth_oauth_signup/i18n/hr.po
+++ /dev/null
@@ -1,23 +0,0 @@
-# Croatian translation for openobject-addons
-# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR , 2013.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME \n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2013-01-24 12:30+0000\n"
-"Last-Translator: FULL NAME \n"
-"Language-Team: Croatian \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-22 07:52+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
-
-#. module: auth_oauth_signup
-#: model:ir.model,name:auth_oauth_signup.model_res_users
-msgid "Users"
-msgstr "Korisnici"
diff --git a/addons/auth_oauth_signup/i18n/hu.po b/addons/auth_oauth_signup/i18n/hu.po
deleted file mode 100644
index 173069cba8b..00000000000
--- a/addons/auth_oauth_signup/i18n/hu.po
+++ /dev/null
@@ -1,23 +0,0 @@
-# Hungarian translation for openobject-addons
-# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR , 2013.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME \n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2013-03-19 18:13+0000\n"
-"Last-Translator: FULL NAME \n"
-"Language-Team: Hungarian \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-22 07:52+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
-
-#. module: auth_oauth_signup
-#: model:ir.model,name:auth_oauth_signup.model_res_users
-msgid "Users"
-msgstr "Felhasználók"
diff --git a/addons/auth_oauth_signup/i18n/it.po b/addons/auth_oauth_signup/i18n/it.po
deleted file mode 100644
index 315b62a612b..00000000000
--- a/addons/auth_oauth_signup/i18n/it.po
+++ /dev/null
@@ -1,23 +0,0 @@
-# Italian 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-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-12-27 09:12+0000\n"
-"Last-Translator: FULL NAME \n"
-"Language-Team: Italian \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-22 07:52+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
-
-#. module: auth_oauth_signup
-#: model:ir.model,name:auth_oauth_signup.model_res_users
-msgid "Users"
-msgstr "Utenti"
diff --git a/addons/auth_oauth_signup/i18n/lt.po b/addons/auth_oauth_signup/i18n/lt.po
deleted file mode 100644
index 04b8caf0339..00000000000
--- a/addons/auth_oauth_signup/i18n/lt.po
+++ /dev/null
@@ -1,23 +0,0 @@
-# Lithuanian translation for openobject-addons
-# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR , 2013.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME \n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2013-04-24 18:21+0000\n"
-"Last-Translator: FULL NAME \n"
-"Language-Team: Lithuanian \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-22 07:52+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
-
-#. module: auth_oauth_signup
-#: model:ir.model,name:auth_oauth_signup.model_res_users
-msgid "Users"
-msgstr "Naudotojai"
diff --git a/addons/auth_oauth_signup/i18n/mk.po b/addons/auth_oauth_signup/i18n/mk.po
deleted file mode 100644
index 7415badc994..00000000000
--- a/addons/auth_oauth_signup/i18n/mk.po
+++ /dev/null
@@ -1,23 +0,0 @@
-# Macedonian translation for openobject-addons
-# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR , 2013.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME \n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2013-02-28 14:54+0000\n"
-"Last-Translator: FULL NAME \n"
-"Language-Team: Macedonian \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-22 07:52+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
-
-#. module: auth_oauth_signup
-#: model:ir.model,name:auth_oauth_signup.model_res_users
-msgid "Users"
-msgstr "Корисници"
diff --git a/addons/auth_oauth_signup/i18n/mn.po b/addons/auth_oauth_signup/i18n/mn.po
deleted file mode 100644
index 6ba3945b1d6..00000000000
--- a/addons/auth_oauth_signup/i18n/mn.po
+++ /dev/null
@@ -1,23 +0,0 @@
-# Mongolian translation for openobject-addons
-# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR , 2013.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME \n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2013-02-06 07:44+0000\n"
-"Last-Translator: FULL NAME \n"
-"Language-Team: Mongolian \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-22 07:52+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
-
-#. module: auth_oauth_signup
-#: model:ir.model,name:auth_oauth_signup.model_res_users
-msgid "Users"
-msgstr "Хэрэглэгчид"
diff --git a/addons/auth_oauth_signup/i18n/nl.po b/addons/auth_oauth_signup/i18n/nl.po
deleted file mode 100644
index cdc4f536e57..00000000000
--- a/addons/auth_oauth_signup/i18n/nl.po
+++ /dev/null
@@ -1,23 +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-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-12-27 09:12+0000\n"
-"Last-Translator: FULL NAME \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: 2014-04-22 07:52+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
-
-#. module: auth_oauth_signup
-#: model:ir.model,name:auth_oauth_signup.model_res_users
-msgid "Users"
-msgstr "Gebruikers"
diff --git a/addons/auth_oauth_signup/i18n/nl_BE.po b/addons/auth_oauth_signup/i18n/nl_BE.po
deleted file mode 100644
index 5bba08fd34d..00000000000
--- a/addons/auth_oauth_signup/i18n/nl_BE.po
+++ /dev/null
@@ -1,23 +0,0 @@
-# Dutch (Belgium) translation for openobject-addons
-# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR , 2013.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME \n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2013-04-15 16:01+0000\n"
-"Last-Translator: Els Van Vossel (Foxy) \n"
-"Language-Team: Dutch (Belgium) \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-22 07:52+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
-
-#. module: auth_oauth_signup
-#: model:ir.model,name:auth_oauth_signup.model_res_users
-msgid "Users"
-msgstr "Gebruikers"
diff --git a/addons/auth_oauth_signup/i18n/pl.po b/addons/auth_oauth_signup/i18n/pl.po
deleted file mode 100644
index 5d0a529efdb..00000000000
--- a/addons/auth_oauth_signup/i18n/pl.po
+++ /dev/null
@@ -1,23 +0,0 @@
-# Polish translation for openobject-addons
-# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR , 2013.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME \n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2013-11-14 12:00+0000\n"
-"Last-Translator: FULL NAME \n"
-"Language-Team: Polish \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-22 07:52+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
-
-#. module: auth_oauth_signup
-#: model:ir.model,name:auth_oauth_signup.model_res_users
-msgid "Users"
-msgstr "Użytkownicy"
diff --git a/addons/auth_oauth_signup/i18n/pt.po b/addons/auth_oauth_signup/i18n/pt.po
deleted file mode 100644
index 4d3503d2974..00000000000
--- a/addons/auth_oauth_signup/i18n/pt.po
+++ /dev/null
@@ -1,23 +0,0 @@
-# Portuguese translation for openobject-addons
-# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR , 2013.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME \n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2013-01-08 17:56+0000\n"
-"Last-Translator: FULL NAME \n"
-"Language-Team: Portuguese \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-22 07:52+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
-
-#. module: auth_oauth_signup
-#: model:ir.model,name:auth_oauth_signup.model_res_users
-msgid "Users"
-msgstr "Utilizadores"
diff --git a/addons/auth_oauth_signup/i18n/pt_BR.po b/addons/auth_oauth_signup/i18n/pt_BR.po
deleted file mode 100644
index 149f9a39468..00000000000
--- a/addons/auth_oauth_signup/i18n/pt_BR.po
+++ /dev/null
@@ -1,23 +0,0 @@
-# Brazilian Portuguese translation for openobject-addons
-# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR , 2013.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME \n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2013-01-02 11:56+0000\n"
-"Last-Translator: FULL NAME \n"
-"Language-Team: Brazilian Portuguese \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-22 07:52+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
-
-#. module: auth_oauth_signup
-#: model:ir.model,name:auth_oauth_signup.model_res_users
-msgid "Users"
-msgstr "Usuários"
diff --git a/addons/auth_oauth_signup/i18n/ro.po b/addons/auth_oauth_signup/i18n/ro.po
deleted file mode 100644
index 67dab54dce9..00000000000
--- a/addons/auth_oauth_signup/i18n/ro.po
+++ /dev/null
@@ -1,23 +0,0 @@
-# Romanian translation for openobject-addons
-# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR , 2013.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME \n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2013-01-14 19:07+0000\n"
-"Last-Translator: FULL NAME \n"
-"Language-Team: Romanian \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-22 07:52+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
-
-#. module: auth_oauth_signup
-#: model:ir.model,name:auth_oauth_signup.model_res_users
-msgid "Users"
-msgstr "Utilizatori"
diff --git a/addons/auth_oauth_signup/i18n/ru.po b/addons/auth_oauth_signup/i18n/ru.po
deleted file mode 100644
index d7b691dccac..00000000000
--- a/addons/auth_oauth_signup/i18n/ru.po
+++ /dev/null
@@ -1,23 +0,0 @@
-# Russian translation for openobject-addons
-# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR , 2013.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME \n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2013-02-13 09:46+0000\n"
-"Last-Translator: FULL NAME \n"
-"Language-Team: Russian \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-22 07:52+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
-
-#. module: auth_oauth_signup
-#: model:ir.model,name:auth_oauth_signup.model_res_users
-msgid "Users"
-msgstr "Пользователи"
diff --git a/addons/auth_oauth_signup/i18n/sl.po b/addons/auth_oauth_signup/i18n/sl.po
deleted file mode 100644
index 5dd6827a279..00000000000
--- a/addons/auth_oauth_signup/i18n/sl.po
+++ /dev/null
@@ -1,23 +0,0 @@
-# Slovenian 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-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-12-30 09:36+0000\n"
-"Last-Translator: FULL NAME \n"
-"Language-Team: Slovenian \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-22 07:52+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
-
-#. module: auth_oauth_signup
-#: model:ir.model,name:auth_oauth_signup.model_res_users
-msgid "Users"
-msgstr "Uporabniki"
diff --git a/addons/auth_oauth_signup/i18n/sv.po b/addons/auth_oauth_signup/i18n/sv.po
deleted file mode 100644
index 529332425a2..00000000000
--- a/addons/auth_oauth_signup/i18n/sv.po
+++ /dev/null
@@ -1,23 +0,0 @@
-# Swedish translation for openobject-addons
-# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR , 2013.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME \n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2013-01-17 23:47+0000\n"
-"Last-Translator: FULL NAME \n"
-"Language-Team: Swedish \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-22 07:52+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
-
-#. module: auth_oauth_signup
-#: model:ir.model,name:auth_oauth_signup.model_res_users
-msgid "Users"
-msgstr "Användare"
diff --git a/addons/auth_oauth_signup/i18n/tr.po b/addons/auth_oauth_signup/i18n/tr.po
deleted file mode 100644
index 016efeab8df..00000000000
--- a/addons/auth_oauth_signup/i18n/tr.po
+++ /dev/null
@@ -1,23 +0,0 @@
-# Turkish translation for openobject-addons
-# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR , 2013.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME \n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2013-02-03 12:07+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: 2014-04-22 07:52+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
-
-#. module: auth_oauth_signup
-#: model:ir.model,name:auth_oauth_signup.model_res_users
-msgid "Users"
-msgstr "Kullanıcılar"
diff --git a/addons/auth_oauth_signup/i18n/vi.po b/addons/auth_oauth_signup/i18n/vi.po
deleted file mode 100644
index 5db34d709ce..00000000000
--- a/addons/auth_oauth_signup/i18n/vi.po
+++ /dev/null
@@ -1,23 +0,0 @@
-# Vietnamese translation for openobject-addons
-# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR , 2013.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME \n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2013-06-27 06:49+0000\n"
-"Last-Translator: FULL NAME \n"
-"Language-Team: Vietnamese \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-22 07:52+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
-
-#. module: auth_oauth_signup
-#: model:ir.model,name:auth_oauth_signup.model_res_users
-msgid "Users"
-msgstr "Người dùng"
diff --git a/addons/auth_oauth_signup/i18n/zh_CN.po b/addons/auth_oauth_signup/i18n/zh_CN.po
deleted file mode 100644
index e7fad750805..00000000000
--- a/addons/auth_oauth_signup/i18n/zh_CN.po
+++ /dev/null
@@ -1,23 +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-12-21 17:05+0000\n"
-"PO-Revision-Date: 2013-01-02 10:59+0000\n"
-"Last-Translator: Oliver Yuan \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: 2014-04-22 07:52+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
-
-#. module: auth_oauth_signup
-#: model:ir.model,name:auth_oauth_signup.model_res_users
-msgid "Users"
-msgstr "用户"
diff --git a/addons/auth_oauth_signup/i18n/zh_TW.po b/addons/auth_oauth_signup/i18n/zh_TW.po
deleted file mode 100644
index 7234fb5289a..00000000000
--- a/addons/auth_oauth_signup/i18n/zh_TW.po
+++ /dev/null
@@ -1,23 +0,0 @@
-# Chinese (Traditional) translation for openobject-addons
-# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR , 2013.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME \n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2013-01-30 13:18+0000\n"
-"Last-Translator: FULL NAME \n"
-"Language-Team: Chinese (Traditional) \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-22 07:52+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
-
-#. module: auth_oauth_signup
-#: model:ir.model,name:auth_oauth_signup.model_res_users
-msgid "Users"
-msgstr "使用者"
diff --git a/addons/auth_openid/__openerp__.py b/addons/auth_openid/__openerp__.py
index 10c77f29965..f0d70f52fc2 100644
--- a/addons/auth_openid/__openerp__.py
+++ b/addons/auth_openid/__openerp__.py
@@ -32,9 +32,10 @@ Allow users to login through OpenID.
'maintainer': 'OpenERP s.a.',
'website': 'http://www.openerp.com',
'depends': ['base', 'web'],
- 'data': ['res_users.xml'],
- 'js': ['static/src/js/auth_openid.js'],
- 'css': ['static/src/css/openid.css'],
+ 'data': [
+ 'res_users.xml',
+ 'views/auth_openid.xml',
+ ],
'qweb': ['static/src/xml/auth_openid.xml'],
'external_dependencies': {
'python' : ['openid'],
diff --git a/addons/auth_openid/views/auth_openid.xml b/addons/auth_openid/views/auth_openid.xml
new file mode 100644
index 00000000000..52187446c32
--- /dev/null
+++ b/addons/auth_openid/views/auth_openid.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/auth_signup/__openerp__.py b/addons/auth_signup/__openerp__.py
index 2aaaf61d3dd..141bff5a0c1 100644
--- a/addons/auth_signup/__openerp__.py
+++ b/addons/auth_signup/__openerp__.py
@@ -42,6 +42,5 @@ Allow users to sign up and reset their password
'res_users_view.xml',
'views/auth_signup_login.xml',
],
- 'js': [],
'bootstrap': True,
}
diff --git a/addons/auth_signup/views/auth_signup_login.xml b/addons/auth_signup/views/auth_signup_login.xml
index 727adbfd3de..27d80dfb5bf 100644
--- a/addons/auth_signup/views/auth_signup_login.xml
+++ b/addons/auth_signup/views/auth_signup_login.xml
@@ -5,8 +5,8 @@
- Sign up
- Reset Password
+ Sign up
+ Reset Password
@@ -22,12 +22,13 @@
+ required="required" t-att-readonly="'readonly' if only_passwords else None"
+ t-att-autofocus="'autofocus' if login and not only_passwords else None" />