diff --git a/addons/account/__openerp__.py b/addons/account/__openerp__.py
index c538614fd0f..019af2cdef5 100644
--- a/addons/account/__openerp__.py
+++ b/addons/account/__openerp__.py
@@ -73,7 +73,6 @@ for a particular financial year and for preparation of vouchers there is a modul
'wizard/account_fiscalyear_close_state.xml',
'wizard/account_chart_view.xml',
'wizard/account_tax_chart_view.xml',
- 'wizard/account_move_journal_view.xml',
'wizard/account_move_line_reconcile_select_view.xml',
'wizard/account_open_closed_fiscalyear_view.xml',
'wizard/account_move_line_unreconcile_select_view.xml',
@@ -128,9 +127,11 @@ for a particular financial year and for preparation of vouchers there is a modul
],
'js': [
'static/src/js/account_move_reconciliation.js',
+ 'static/src/js/account_move_line_quickadd.js',
],
'qweb' : [
"static/src/xml/account_move_reconciliation.xml",
+ "static/src/xml/account_move_line_quickadd.xml",
],
'css':['static/src/css/account_move_reconciliation.css'
],
diff --git a/addons/account/account.py b/addons/account/account.py
index cfba30856a9..438dff47aae 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -641,8 +641,7 @@ class account_account(osv.osv):
return True
def _check_allow_type_change(self, cr, uid, ids, new_type, context=None):
- group1 = ['payable', 'receivable', 'other']
- group2 = ['consolidation','view']
+ restricted_groups = ['consolidation','view']
line_obj = self.pool.get('account.move.line')
for account in self.browse(cr, uid, ids, context=context):
old_type = account.type
@@ -650,14 +649,25 @@ class account_account(osv.osv):
if line_obj.search(cr, uid, [('account_id', 'in', account_ids)]):
#Check for 'Closed' type
if old_type == 'closed' and new_type !='closed':
- raise osv.except_osv(_('Warning!'), _("You cannot change the type of account from 'Closed' to any other type which contains journal items!"))
- #Check for change From group1 to group2 and vice versa
- if (old_type in group1 and new_type in group2) or (old_type in group2 and new_type in group1):
- raise osv.except_osv(_('Warning!'), _("You cannot change the type of account from '%s' to '%s' type as it contains journal items!") % (old_type,new_type,))
+ raise osv.except_osv(_('Warning !'), _("You cannot change the type of account from 'Closed' to any other type as it contains journal items!"))
+ # Forbid to change an account type for restricted_groups as it contains journal items (or if one of its children does)
+ if (new_type in restricted_groups):
+ raise osv.except_osv(_('Warning !'), _("You cannot change the type of account to '%s' type as it contains journal items!") % (new_type,))
+
+ return True
+
+ # For legal reason (forbiden to modify journal entries which belongs to a closed fy or period), Forbid to modify
+ # the code of an account if journal entries have been already posted on this account. This cannot be simply
+ # 'configurable' since it can lead to a lack of confidence in OpenERP and this is what we want to change.
+ def _check_allow_code_change(self, cr, uid, ids, context=None):
+ line_obj = self.pool.get('account.move.line')
+ for account in self.browse(cr, uid, ids, context=context):
+ account_ids = self.search(cr, uid, [('id', 'child_of', [account.id])], context=context)
+ if line_obj.search(cr, uid, [('account_id', 'in', account_ids)], context=context):
+ raise osv.except_osv(_('Warning !'), _("You cannot change the code of account which contains journal items!"))
return True
def write(self, cr, uid, ids, vals, context=None):
-
if context is None:
context = {}
if not ids:
@@ -677,6 +687,8 @@ class account_account(osv.osv):
self._check_moves(cr, uid, ids, "write", context=context)
if 'type' in vals.keys():
self._check_allow_type_change(cr, uid, ids, vals['type'], context=context)
+ if 'code' in vals.keys():
+ self._check_allow_code_change(cr, uid, ids, context=context)
return super(account_account, self).write(cr, uid, ids, vals, context=context)
def unlink(self, cr, uid, ids, context=None):
@@ -685,44 +697,6 @@ class account_account(osv.osv):
account_account()
-class account_journal_view(osv.osv):
- _name = "account.journal.view"
- _description = "Journal View"
- _columns = {
- 'name': fields.char('Journal View', size=64, required=True, translate=True),
- 'columns_id': fields.one2many('account.journal.column', 'view_id', 'Columns')
- }
- _order = "name"
-
-account_journal_view()
-
-
-class account_journal_column(osv.osv):
-
- def _col_get(self, cr, user, context=None):
- result = []
- cols = self.pool.get('account.move.line')._columns
- for col in cols:
- if col in ('period_id', 'journal_id'):
- continue
- result.append( (col, cols[col].string) )
- result.sort()
- return result
-
- _name = "account.journal.column"
- _description = "Journal Column"
- _columns = {
- 'name': fields.char('Column Name', size=64, required=True),
- 'field': fields.selection(_col_get, 'Field Name', required=True, size=32),
- 'view_id': fields.many2one('account.journal.view', 'Journal View', select=True),
- 'sequence': fields.integer('Sequence', help="Gives the sequence order to journal column.", readonly=True),
- 'required': fields.boolean('Required'),
- 'readonly': fields.boolean('Readonly'),
- }
- _order = "view_id, sequence"
-
-account_journal_column()
-
class account_journal(osv.osv):
_name = "account.journal"
_description = "Journal"
@@ -738,7 +712,6 @@ class account_journal(osv.osv):
" Select 'Opening/Closing Situation' for entries generated for new fiscal years."),
'type_control_ids': fields.many2many('account.account.type', 'account_journal_type_rel', 'journal_id','type_id', 'Type Controls', domain=[('code','<>','view'), ('code', '<>', 'closed')]),
'account_control_ids': fields.many2many('account.account', 'account_account_type_rel', 'journal_id','account_id', 'Account', domain=[('type','<>','view'), ('type', '<>', 'closed')]),
- 'view_id': fields.many2one('account.journal.view', 'Display Mode', required=True, help="Gives the view used when writing or browsing entries in this journal. The view tells OpenERP which fields should be visible, required or readonly and in which order. You can create your own view for a faster encoding in each journal."),
'default_credit_account_id': fields.many2one('account.account', 'Default Credit Account', domain="[('type','!=','view')]", help="It acts as a default account for credit amount"),
'default_debit_account_id': fields.many2one('account.account', 'Default Debit Account', domain="[('type','!=','view')]", help="It acts as a default account for debit amount"),
'centralisation': fields.boolean('Centralised Counterpart', help="Check this box to determine that each entry of this journal won't create a new counterpart but will share the same counterpart. This is used in fiscal year closing."),
@@ -874,37 +847,6 @@ class account_journal(osv.osv):
return self.name_get(cr, user, ids, context=context)
- def onchange_type(self, cr, uid, ids, type, currency, context=None):
- obj_data = self.pool.get('ir.model.data')
- user_pool = self.pool.get('res.users')
-
- type_map = {
- 'sale':'account_sp_journal_view',
- 'sale_refund':'account_sp_refund_journal_view',
- 'purchase':'account_sp_journal_view',
- 'purchase_refund':'account_sp_refund_journal_view',
- 'cash':'account_journal_bank_view',
- 'bank':'account_journal_bank_view',
- 'general':'account_journal_view',
- 'situation':'account_journal_view'
- }
-
- res = {}
- view_id = type_map.get(type, 'account_journal_view')
- user = user_pool.browse(cr, uid, uid)
- if type in ('cash', 'bank') and currency and user.company_id.currency_id.id != currency:
- view_id = 'account_journal_bank_view_multi'
- data_id = obj_data.search(cr, uid, [('model','=','account.journal.view'), ('name','=',view_id)])
- data = obj_data.browse(cr, uid, data_id[0], context=context)
-
- res.update({
- 'centralisation':type == 'situation',
- 'view_id':data.res_id,
- })
- return {
- 'value':res
- }
-
account_journal()
class account_fiscalyear(osv.osv):
@@ -1384,13 +1326,6 @@ class account_move(osv.osv):
'WHERE id IN %s', ('draft', tuple(ids),))
return True
- def onchange_line_id(self, cr, uid, ids, line_ids, context=None):
- balance = 0.0
- for line in line_ids:
- if line[2]:
- balance += (line[2].get('debit',0.00)- (line[2].get('credit',0.00)))
- return {'value': {'balance': balance}}
-
def write(self, cr, uid, ids, vals, context=None):
if context is None:
context = {}
@@ -1470,6 +1405,11 @@ class account_move(osv.osv):
raise osv.except_osv(_('User Error!'),
_('You cannot delete a posted journal entry "%s".') % \
move['name'])
+ for line in move.line_id:
+ if line.invoice:
+ raise osv.except_osv(_('User Error!'),
+ _("Move cannot be deleted if linked to an invoice. (Invoice: %s - Move ID:%s)") % \
+ (line.invoice.number,move.name))
line_ids = map(lambda x: x.id, move.line_id)
context['journal_id'] = move.journal_id.id
context['period_id'] = move.period_id.id
@@ -1678,11 +1618,41 @@ class account_move_reconcile(osv.osv):
'line_id': fields.one2many('account.move.line', 'reconcile_id', 'Entry Lines'),
'line_partial_ids': fields.one2many('account.move.line', 'reconcile_partial_id', 'Partial Entry lines'),
'create_date': fields.date('Creation date', readonly=True),
+ 'opening_reconciliation': fields.boolean('Opening Entries Reconciliation', help="Is this reconciliation produced by the opening of a new fiscal year ?."),
}
_defaults = {
'name': lambda self,cr,uid,ctx=None: self.pool.get('ir.sequence').get(cr, uid, 'account.reconcile', context=ctx) or '/',
}
+
+ # You cannot unlink a reconciliation if it is a opening_reconciliation one,
+ # you should use the generate opening entries wizard for that
+ def unlink(self, cr, uid, ids, context=None):
+ for move_rec in self.browse(cr, uid, ids, context=context):
+ if move_rec.opening_reconciliation:
+ raise osv.except_osv(_('Error!'), _('You cannot unreconcile journal items if they has been generated by the \
+ opening/closing fiscal year process.'))
+ return super(account_move_reconcile, self).unlink(cr, uid, ids, context=context)
+
+ # Look in the line_id and line_partial_ids to ensure the partner is the same or empty
+ # on all lines. We allow that only for opening/closing period
+ def _check_same_partner(self, cr, uid, ids, context=None):
+ for reconcile in self.browse(cr, uid, ids, context=context):
+ move_lines = []
+ if not reconcile.opening_reconciliation:
+ if reconcile.line_id:
+ first_partner = reconcile.line_id[0].partner_id.id
+ move_lines = reconcile.line_id
+ elif reconcile.line_partial_ids:
+ first_partner = reconcile.line_partial_ids[0].partner_id.id
+ move_lines = reconcile.line_partial_ids
+ if any([line.partner_id.id != first_partner for line in move_lines]):
+ return False
+ return True
+ _constraints = [
+ (_check_same_partner, 'You can only reconcile journal items with the same partner.', ['line_id']),
+ ]
+
def reconcile_partial_check(self, cr, uid, ids, type='auto', context=None):
total = 0.0
for rec in self.browse(cr, uid, ids, context=context):
@@ -3161,16 +3131,6 @@ class wizard_multi_charts_accounts(osv.osv_memory):
default_account = acc_template_ref.get(template.property_account_income_opening.id)
return default_account
- def _get_view_id(journal_type):
- # Get the journal views
- if journal_type in ('general', 'situation'):
- data = obj_data.get_object_reference(cr, uid, 'account', 'account_journal_view')
- elif journal_type in ('sale_refund', 'purchase_refund'):
- data = obj_data.get_object_reference(cr, uid, 'account', 'account_sp_refund_journal_view')
- else:
- data = obj_data.get_object_reference(cr, uid, 'account', 'account_sp_journal_view')
- return data and data[1] or False
-
journal_names = {
'sale': _('Sales Journal'),
'purchase': _('Purchase Journal'),
@@ -3200,7 +3160,6 @@ class wizard_multi_charts_accounts(osv.osv_memory):
'code': journal_codes[journal_type],
'company_id': company_id,
'centralisation': journal_type == 'situation',
- 'view_id': _get_view_id(journal_type),
'analytic_journal_id': _get_analytic_journal(journal_type),
'default_credit_account_id': _get_default_account(journal_type, 'credit'),
'default_debit_account_id': _get_default_account(journal_type, 'debit'),
@@ -3417,11 +3376,7 @@ class wizard_multi_charts_accounts(osv.osv_memory):
'''
obj_data = self.pool.get('ir.model.data')
obj_journal = self.pool.get('account.journal')
- # Get the id of journal views
- tmp = obj_data.get_object_reference(cr, uid, 'account', 'account_journal_bank_view_multi')
- view_id_cur = tmp and tmp[1] or False
- tmp = obj_data.get_object_reference(cr, uid, 'account', 'account_journal_bank_view')
- view_id_cash = tmp and tmp[1] or False
+
# we need to loop again to find next number for journal code
# because we can't rely on the value current_num as,
@@ -3447,10 +3402,8 @@ class wizard_multi_charts_accounts(osv.osv_memory):
'default_debit_account_id': default_account_id,
}
if line['currency_id']:
- vals['view_id'] = view_id_cur
vals['currency'] = line['currency_id']
- else:
- vals['view_id'] = view_id_cash
+
return vals
def _prepare_bank_account(self, cr, uid, line, new_code, acc_template_ref, ref_acc_bank, company_id, context=None):
diff --git a/addons/account/account_bank.py b/addons/account/account_bank.py
index c836600d866..f0da630ec1d 100644
--- a/addons/account/account_bank.py
+++ b/addons/account/account_bank.py
@@ -89,11 +89,6 @@ class bank(osv.osv):
}
acc_bank_id = obj_acc.create(cr,uid,acc,context=context)
- # Get the journal view id
- data_id = obj_data.search(cr, uid, [('model','=','account.journal.view'), ('name','=','account_journal_bank_view')])
- data = obj_data.browse(cr, uid, data_id[0], context=context)
- view_id_cash = data.res_id
-
jour_obj = self.pool.get('account.journal')
new_code = 1
while True:
@@ -112,7 +107,6 @@ class bank(osv.osv):
'analytic_journal_id': False,
'default_credit_account_id': acc_bank_id,
'default_debit_account_id': acc_bank_id,
- 'view_id': view_id_cash
}
journal_id = jour_obj.create(cr, uid, vals_journal, context=context)
diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py
index 4422537007f..e7e3f740067 100644
--- a/addons/account/account_bank_statement.py
+++ b/addons/account/account_bank_statement.py
@@ -311,7 +311,7 @@ class account_bank_statement(osv.osv):
'statement_id': st_line.statement_id.id,
'journal_id': st_line.statement_id.journal_id.id,
'period_id': st_line.statement_id.period_id.id,
- 'currency_id': cur_id,
+ 'currency_id': amount_currency and cur_id,
'amount_currency': amount_currency,
'analytic_account_id': analytic_id,
}
diff --git a/addons/account/account_invoice.py b/addons/account/account_invoice.py
index 80a406bb0b7..8d13ec9dc8f 100644
--- a/addons/account/account_invoice.py
+++ b/addons/account/account_invoice.py
@@ -1073,8 +1073,9 @@ class account_invoice(osv.osv):
self.message_post(cr, uid, [inv_id], body=message, context=context)
return True
- def action_cancel(self, cr, uid, ids, *args):
- context = {} # TODO: Use context from arguments
+ def action_cancel(self, cr, uid, ids, context=None):
+ if context is None:
+ context = {}
account_move_obj = self.pool.get('account.move')
invoices = self.read(cr, uid, ids, ['move_id', 'payment_ids'])
move_ids = [] # ones that we will need to remove
@@ -1244,12 +1245,15 @@ class account_invoice(osv.osv):
ref = invoice.reference
else:
ref = self._convert_ref(cr, uid, invoice.number)
+ partner = invoice.partner_id
+ if partner.parent_id and not partner.is_company:
+ partner = partner.parent_id
# Pay attention to the sign for both debit/credit AND amount_currency
l1 = {
'debit': direction * pay_amount>0 and direction * pay_amount,
'credit': direction * pay_amount<0 and - direction * pay_amount,
'account_id': src_account_id,
- 'partner_id': invoice.partner_id.id,
+ 'partner_id': partner.id,
'ref':ref,
'date': date,
'currency_id':currency_id,
@@ -1260,7 +1264,7 @@ class account_invoice(osv.osv):
'debit': direction * pay_amount<0 and - direction * pay_amount,
'credit': direction * pay_amount>0 and direction * pay_amount,
'account_id': pay_account_id,
- 'partner_id': invoice.partner_id.id,
+ 'partner_id': partner.id,
'ref':ref,
'date': date,
'currency_id':currency_id,
@@ -1377,8 +1381,8 @@ class account_invoice_line(osv.osv):
'origin': fields.char('Source Document', size=256, help="Reference of the document that produced this invoice."),
'sequence': fields.integer('Sequence', help="Gives the sequence of this line when displaying the invoice."),
'invoice_id': fields.many2one('account.invoice', 'Invoice Reference', ondelete='cascade', select=True),
- 'uos_id': fields.many2one('product.uom', 'Unit of Measure', ondelete='set null'),
- 'product_id': fields.many2one('product.product', 'Product', ondelete='set null'),
+ 'uos_id': fields.many2one('product.uom', 'Unit of Measure', ondelete='set null', select=True),
+ 'product_id': fields.many2one('product.product', 'Product', ondelete='set null', select=True),
'account_id': fields.many2one('account.account', 'Account', required=True, domain=[('type','<>','view'), ('type', '<>', 'closed')], help="The income or expense account related to the selected product."),
'price_unit': fields.float('Unit Price', required=True, digits_compute= dp.get_precision('Product Price')),
'price_subtotal': fields.function(_amount_line, string='Subtotal', type="float",
diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 5c5a25880cb..48fec608195 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -435,7 +435,7 @@
-
+
diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index 00fad390282..7cc9768f00e 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -220,12 +220,11 @@ class account_move_line(osv.osv):
return context
def _default_get(self, cr, uid, fields, context=None):
+ #default_get should only do the following:
+ # -propose the next amount in debit/credit in order to balance the move
+ # -propose the next account from the journal (default debit/credit account) accordingly
if context is None:
context = {}
- if not context.get('journal_id', False):
- context['journal_id'] = context.get('search_default_journal_id')
- if not context.get('period_id', False):
- context['period_id'] = context.get('search_default_period_id')
account_obj = self.pool.get('account.account')
period_obj = self.pool.get('account.period')
journal_obj = self.pool.get('account.journal')
@@ -234,134 +233,71 @@ class account_move_line(osv.osv):
fiscal_pos_obj = self.pool.get('account.fiscal.position')
partner_obj = self.pool.get('res.partner')
currency_obj = self.pool.get('res.currency')
+
+ if not context.get('journal_id', False):
+ context['journal_id'] = context.get('search_default_journal_id', False)
+ if not context.get('period_id', False):
+ context['period_id'] = context.get('search_default_period_id', False)
context = self.convert_to_period(cr, uid, context)
- #pass the right context when search_defaul_journal_id
- if context.get('search_default_journal_id',False):
- context['journal_id'] = context.get('search_default_journal_id')
+
# Compute simple values
data = super(account_move_line, self).default_get(cr, uid, fields, context=context)
- # Starts: Manual entry from account.move form
- if context.get('lines'):
- total_new = context.get('balance', 0.00)
- if context['journal']:
- journal_data = journal_obj.browse(cr, uid, context['journal'], context=context)
- if journal_data.type == 'purchase':
- if total_new > 0:
- account = journal_data.default_credit_account_id
- else:
- account = journal_data.default_debit_account_id
- else:
- if total_new > 0:
- account = journal_data.default_credit_account_id
- else:
- account = journal_data.default_debit_account_id
- if account and ((not fields) or ('debit' in fields) or ('credit' in fields)) and 'partner_id' in data and (data['partner_id']):
- part = partner_obj.browse(cr, uid, data['partner_id'], context=context)
- account = fiscal_pos_obj.map_account(cr, uid, part and part.property_account_position or False, account.id)
- account = account_obj.browse(cr, uid, account, context=context)
- data['account_id'] = account.id
-
- s = -total_new
- data['debit'] = s > 0 and s or 0.0
- data['credit'] = s < 0 and -s or 0.0
- data = self._default_get_move_form_hook(cr, uid, data)
- return data
- # Ends: Manual entry from account.move form
- if not 'move_id' in fields: #we are not in manual entry
- return data
- # Compute the current move
- move_id = False
- partner_id = False
- if context.get('journal_id', False) and context.get('period_id', False):
- if 'move_id' in fields:
- cr.execute('SELECT move_id \
- FROM \
- account_move_line \
- WHERE \
- journal_id = %s and period_id = %s AND create_uid = %s AND state = %s \
- ORDER BY id DESC limit 1',
- (context['journal_id'], context['period_id'], uid, 'draft'))
+ if context.get('journal_id'):
+ total = 0.0
+ #in account.move form view, it is not possible to compute total debit and credit using
+ #a browse record. So we must use the context to pass the whole one2many field and compute the total
+ if context.get('line_id'):
+ for move_line_dict in move_obj.resolve_2many_commands(cr, uid, 'line_id', context.get('line_id'), context=context):
+ data['name'] = data.get('name') or move_line_dict.get('name')
+ data['partner_id'] = data.get('partner_id') or move_line_dict.get('partner_id')
+ total += move_line_dict.get('debit', 0.0) - move_line_dict.get('credit', 0.0)
+ elif context.get('period_id'):
+ #find the date and the ID of the last unbalanced account.move encoded by the current user in that journal and period
+ move_id = False
+ cr.execute('''SELECT move_id, date FROM account_move_line
+ WHERE journal_id = %s AND period_id = %s AND create_uid = %s AND state = %s
+ ORDER BY id DESC limit 1''', (context['journal_id'], context['period_id'], uid, 'draft'))
res = cr.fetchone()
- move_id = (res and res[0]) or False
- if not move_id:
- return data
- else:
- data['move_id'] = move_id
- if 'date' in fields:
- cr.execute('SELECT date \
- FROM \
- account_move_line \
- WHERE \
- journal_id = %s AND period_id = %s AND create_uid = %s \
- ORDER BY id DESC',
- (context['journal_id'], context['period_id'], uid))
- res = cr.fetchone()
- if res:
- data['date'] = res[0]
- else:
- period = period_obj.browse(cr, uid, context['period_id'],
- context=context)
- data['date'] = period.date_start
- if not move_id:
- return data
- total = 0
- ref_id = False
- move = move_obj.browse(cr, uid, move_id, context=context)
- if 'name' in fields:
- data.setdefault('name', move.line_id[-1].name)
- acc1 = False
- for l in move.line_id:
- acc1 = l.account_id
- partner_id = partner_id or l.partner_id.id
- ref_id = ref_id or l.ref
- total += (l.debit or 0.0) - (l.credit or 0.0)
+ move_id = res and res[0] or False
+ data['date'] = res and res[1] or period_obj.browse(cr, uid, context['period_id'], context=context).date_start
+ data['move_id'] = move_id
+ if move_id:
+ #if there exist some unbalanced accounting entries that match the journal and the period,
+ #we propose to continue the same move by copying the ref, the name, the partner...
+ move = move_obj.browse(cr, uid, move_id, context=context)
+ data.setdefault('name', move.line_id[-1].name)
+ for l in move.line_id:
+ data['partner_id'] = data.get('partner_id') or l.partner_id.id
+ data['ref'] = data.get('ref') or l.ref
+ total += (l.debit or 0.0) - (l.credit or 0.0)
- if 'ref' in fields:
- data['ref'] = ref_id
- if 'partner_id' in fields:
- data['partner_id'] = partner_id
-
- if move.journal_id.type == 'purchase':
- if total > 0:
- account = move.journal_id.default_credit_account_id
- else:
- account = move.journal_id.default_debit_account_id
- else:
- if total > 0:
- account = move.journal_id.default_credit_account_id
- else:
- account = move.journal_id.default_debit_account_id
- part = partner_id and partner_obj.browse(cr, uid, partner_id) or False
- # part = False is acceptable for fiscal position.
- account = fiscal_pos_obj.map_account(cr, uid, part and part.property_account_position or False, account.id)
- if account:
- account = account_obj.browse(cr, uid, account, context=context)
-
- if account and ((not fields) or ('debit' in fields) or ('credit' in fields)):
- data['account_id'] = account.id
- # Propose the price Tax excluded, the Tax will be added when confirming line
- if account.tax_ids:
- taxes = fiscal_pos_obj.map_tax(cr, uid, part and part.property_account_position or False, account.tax_ids)
- tax = tax_obj.browse(cr, uid, taxes)
- for t in tax_obj.compute_inv(cr, uid, tax, total, 1):
- total -= t['amount']
-
- s = -total
- data['debit'] = s > 0 and s or 0.0
- data['credit'] = s < 0 and -s or 0.0
-
- if account and account.currency_id:
- data['currency_id'] = account.currency_id.id
- acc = account
- if s>0:
- acc = acc1
- compute_ctx = context.copy()
- compute_ctx.update({
- 'res.currency.compute.account': acc,
- 'res.currency.compute.account_invert': True,
- })
- v = currency_obj.compute(cr, uid, account.company_id.currency_id.id, data['currency_id'], s, context=compute_ctx)
- data['amount_currency'] = v
+ #compute the total of current move
+ data['debit'] = total < 0 and -total or 0.0
+ data['credit'] = total > 0 and total or 0.0
+ #pick the good account on the journal accordingly if the next proposed line will be a debit or a credit
+ journal_data = journal_obj.browse(cr, uid, context['journal_id'], context=context)
+ account = total > 0 and journal_data.default_credit_account_id or journal_data.default_debit_account_id
+ #map the account using the fiscal position of the partner, if needed
+ part = data.get('partner_id') and partner_obj.browse(cr, uid, data['partner_id'], context=context) or False
+ if account and data.get('partner_id'):
+ account = fiscal_pos_obj.map_account(cr, uid, part and part.property_account_position or False, account.id)
+ account = account_obj.browse(cr, uid, account, context=context)
+ data['account_id'] = account and account.id or False
+ #compute the amount in secondary currency of the account, if needed
+ if account and account.currency_id:
+ data['currency_id'] = account.currency_id.id
+ #set the context for the multi currency change
+ compute_ctx = context.copy()
+ compute_ctx.update({
+ #the following 2 parameters are used to choose the currency rate, in case where the account
+ #doesn't work with an outgoing currency rate method 'at date' but 'average'
+ 'res.currency.compute.account': account,
+ 'res.currency.compute.account_invert': True,
+ })
+ if data.get('date'):
+ compute_ctx.update({'date': data['date']})
+ data['amount_currency'] = currency_obj.compute(cr, uid, account.company_id.currency_id.id, data['currency_id'], -total, context=compute_ctx)
+ data = self._default_get_move_form_hook(cr, uid, data)
return data
def on_create_write(self, cr, uid, id, context=None):
@@ -484,6 +420,15 @@ class account_move_line(osv.osv):
result.append(line.id)
return result
+ def _get_reconcile(self, cr, uid, ids,name, unknow_none, context=None):
+ res = dict.fromkeys(ids, False)
+ for line in self.browse(cr, uid, ids, context=context):
+ if line.reconcile_id:
+ res[line.id] = str(line.reconcile_id.name)
+ elif line.reconcile_partial_id:
+ res[line.id] = str(line.reconcile_partial_id.name)
+ return res
+
_columns = {
'name': fields.char('Name', size=64, required=True),
'quantity': fields.float('Quantity', digits=(16,2), help="The optional quantity expressed by this line, eg: number of product sold. The quantity is not a legal requirement but is very useful for some reports."),
@@ -498,15 +443,16 @@ class account_move_line(osv.osv):
'statement_id': fields.many2one('account.bank.statement', 'Statement', help="The bank statement used for bank reconciliation", select=1),
'reconcile_id': fields.many2one('account.move.reconcile', 'Reconcile', readonly=True, ondelete='set null', select=2),
'reconcile_partial_id': fields.many2one('account.move.reconcile', 'Partial Reconcile', readonly=True, ondelete='set null', select=2),
+ 'reconcile': fields.function(_get_reconcile, type='char', string='Reconcile'),
'amount_currency': fields.float('Amount Currency', help="The amount expressed in an optional other currency if it is a multi-currency entry.", digits_compute=dp.get_precision('Account')),
'amount_residual_currency': fields.function(_amount_residual, string='Residual Amount', multi="residual", help="The residual amount on a receivable or payable of a journal entry expressed in its currency (maybe different of the company currency)."),
'amount_residual': fields.function(_amount_residual, string='Residual Amount', multi="residual", help="The residual amount on a receivable or payable of a journal entry expressed in the company currency."),
'currency_id': fields.many2one('res.currency', 'Currency', help="The optional other currency if it is a multi-currency entry."),
- 'journal_id': fields.related('move_id', 'journal_id', string='Journal', type='many2one', relation='account.journal', required=True, select=True, readonly=True,
+ 'journal_id': fields.related('move_id', 'journal_id', string='Journal', type='many2one', relation='account.journal', required=True, select=True,
store = {
'account.move': (_get_move_lines, ['journal_id'], 20)
}),
- 'period_id': fields.related('move_id', 'period_id', string='Period', type='many2one', relation='account.period', required=True, select=True, readonly=True,
+ 'period_id': fields.related('move_id', 'period_id', string='Period', type='many2one', relation='account.period', required=True, select=True,
store = {
'account.move': (_get_move_lines, ['period_id'], 20)
}),
@@ -537,7 +483,7 @@ class account_move_line(osv.osv):
context or {}
period_obj = self.pool.get('account.period')
dt = time.strftime('%Y-%m-%d')
- if ('journal_id' in context) and ('period_id' in context):
+ if context.get('journal_id') and context.get('period_id'):
cr.execute('SELECT date FROM account_move_line ' \
'WHERE journal_id = %s AND period_id = %s ' \
'ORDER BY id DESC limit 1',
@@ -558,6 +504,38 @@ class account_move_line(osv.osv):
cur = self.pool.get('account.journal').browse(cr, uid, context['journal_id']).currency
return cur and cur.id or False
+ def _get_period(self, cr, uid, context=None):
+ """
+ Return default account period value
+ """
+ context = context or {}
+ if context.get('period_id', False):
+ return context['period_id']
+ account_period_obj = self.pool.get('account.period')
+ ids = account_period_obj.find(cr, uid, context=context)
+ period_id = False
+ if ids:
+ period_id = ids[0]
+ return period_id
+
+ def _get_journal(self, cr, uid, context=None):
+ """
+ Return journal based on the journal type
+ """
+ context = context or {}
+ if context.get('journal_id', False):
+ return context['journal_id']
+ journal_id = False
+
+ journal_pool = self.pool.get('account.journal')
+ if context.get('journal_type', False):
+ jids = journal_pool.search(cr, uid, [('type','=', context.get('journal_type'))])
+ if not jids:
+ raise osv.except_osv(_('Configuration Error!'), _('Cannot find any account journal of %s type for this company.\n\nYou can create one in the menu: \nConfiguration/Journals/Journals.') % context.get('journal_type'))
+ journal_id = jids[0]
+ return journal_id
+
+
_defaults = {
'blocked': False,
'centralisation': 'normal',
@@ -565,12 +543,12 @@ class account_move_line(osv.osv):
'date_created': fields.date.context_today,
'state': 'draft',
'currency_id': _get_currency,
- 'journal_id': lambda self, cr, uid, c: c.get('journal_id', False),
+ 'journal_id': _get_journal,
'credit': 0.0,
'debit': 0.0,
'amount_currency': 0.0,
'account_id': lambda self, cr, uid, c: c.get('account_id', False),
- 'period_id': lambda self, cr, uid, c: c.get('period_id', False),
+ 'period_id': _get_period,
'company_id': lambda self, cr, uid, c: self.pool.get('res.company')._company_default_get(cr, uid, 'account.move.line', context=c)
}
_order = "date desc, id desc"
@@ -620,12 +598,34 @@ class account_move_line(osv.osv):
return False
return True
+ def _check_currency_and_amount(self, cr, uid, ids, context=None):
+ for l in self.browse(cr, uid, ids, context=context):
+ if (l.amount_currency and not l.currency_id):
+ return False
+ return True
+
+ def _check_currency_amount(self, cr, uid, ids, context=None):
+ for l in self.browse(cr, uid, ids, context=context):
+ if l.amount_currency:
+ if (l.amount_currency > 0.0 and l.credit > 0.0) or (l.amount_currency < 0.0 and l.debit > 0.0):
+ return False
+ return True
+
+ def _check_currency_company(self, cr, uid, ids, context=None):
+ for l in self.browse(cr, uid, ids, context=context):
+ if l.currency_id.id == l.company_id.currency_id.id:
+ return False
+ return True
+
_constraints = [
(_check_no_view, 'You cannot create journal items on an account of type view.', ['account_id']),
(_check_no_closed, 'You cannot create journal items on closed account.', ['account_id']),
(_check_company_id, 'Account and Period must belong to the same company.', ['company_id']),
(_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 positif when journal item are debit and negatif when journal item are credit.', ['amount_currency']),
+ (_check_currency_company, "You cannot provide a secondary currency if it is the same than the company one." , ['currency_id']),
]
#TODO: ONCHANGE_ACCOUNT_ID: set account_tax_id
@@ -653,6 +653,12 @@ class account_move_line(osv.osv):
}
return result
+ def onchange_account_id(self, cr, uid, ids, account_id, context=None):
+ res = {'value': {}}
+ if account_id:
+ res['value']['account_tax_id'] = [x.id for x in self.pool.get('account.account').browse(cr, uid, account_id, context=context).tax_ids]
+ return res
+
def onchange_partner_id(self, cr, uid, ids, move_id, partner_id, account_id=None, debit=0, credit=0, date=False, journal=False):
partner_obj = self.pool.get('res.partner')
payment_term_obj = self.pool.get('account.payment.term')
@@ -977,127 +983,6 @@ class account_move_line(osv.osv):
'context':context,
}
- def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
- journal_pool = self.pool.get('account.journal')
- if context is None:
- context = {}
- result = super(account_move_line, self).fields_view_get(cr, uid, view_id, view_type, context=context, toolbar=toolbar, submenu=submenu)
- if (view_type != 'tree') or view_id:
- #Remove the toolbar from the form view
- if view_type == 'form':
- if result.get('toolbar', False):
- result['toolbar']['action'] = []
- #Restrict the list of journal view in search view
- if view_type == 'search' and result['fields'].get('journal_id', False):
- result['fields']['journal_id']['selection'] = journal_pool.name_search(cr, uid, '', [], context=context)
- ctx = context.copy()
- #we add the refunds journal in the selection field of journal
- if context.get('journal_type', False) == 'sale':
- ctx.update({'journal_type': 'sale_refund'})
- result['fields']['journal_id']['selection'] += journal_pool.name_search(cr, uid, '', [], context=ctx)
- elif context.get('journal_type', False) == 'purchase':
- ctx.update({'journal_type': 'purchase_refund'})
- result['fields']['journal_id']['selection'] += journal_pool.name_search(cr, uid, '', [], context=ctx)
- return result
- if context.get('view_mode', False):
- return result
- fld = []
- flds = []
- title = _("Accounting Entries") # self.view_header_get(cr, uid, view_id, view_type, context)
-
- ids = journal_pool.search(cr, uid, [], context=context)
- journals = journal_pool.browse(cr, uid, ids, context=context)
- for journal in journals:
- for field in journal.view_id.columns_id:
- # sometimes, it's possible that a defined column is not loaded (the module containing
- # this field is not loaded) when we make an update.
- if field.field not in self._columns:
- continue
-
- if not field.field in flds:
- fld.append((field.field, field.sequence))
- flds.append(field.field)
-
- default_columns = {
- 'period_id': 3,
- 'journal_id': 10,
- 'state': sys.maxint,
- }
- for d in default_columns:
- if d not in flds:
- fld.append((d, default_columns[d]))
- flds.append(d)
-
- fld = sorted(fld, key=itemgetter(1))
- widths = {
- 'statement_id': 50,
- 'state': 60,
- 'tax_code_id': 50,
- 'move_id': 40,
- }
-
- document = etree.Element('tree', string=title, editable="top",
- on_write="on_create_write",
- colors="red:state=='draft';black:state=='valid'")
- fields_get = self.fields_get(cr, uid, flds, context)
- for field, _seq in fld:
- # TODO add string to element
- f = etree.SubElement(document, 'field', name=field)
-
- if field == 'debit':
- f.set('sum', _("Total debit"))
-
- elif field == 'credit':
- f.set('sum', _("Total credit"))
-
- elif field == 'move_id':
- f.set('required', 'False')
-
- elif field == 'account_tax_id':
- f.set('domain', "[('parent_id', '=' ,False)]")
- f.set('context', "{'journal_id': journal_id}")
-
- elif field == 'account_id' and journal.id:
- f.set('domain', "[('journal_id', '=', journal_id),('type','!=','view'), ('type','!=','closed')]")
- f.set('on_change', 'onchange_account_id(account_id, partner_id)')
-
- elif field == 'partner_id':
- f.set('on_change', 'onchange_partner_id(move_id, partner_id, account_id, debit, credit, date, journal_id)')
-
- elif field == 'journal_id':
- f.set('context', "{'journal_id': journal_id}")
-
- elif field == 'statement_id':
- f.set('domain', "[('state', '!=', 'confirm'),('journal_id.type', '=', 'bank')]")
- f.set('invisible', 'True')
-
- elif field == 'date':
- f.set('on_change', 'onchange_date(date)')
-
- elif field == 'analytic_account_id':
- # Currently it is not working due to being executed by superclass's fields_view_get
- # f.set('groups', 'analytic.group_analytic_accounting')
- pass
-
- if field in ('amount_currency', 'currency_id'):
- f.set('on_change', 'onchange_currency(account_id, amount_currency, currency_id, date, journal_id)')
- f.set('attrs', "{'readonly': [('state', '=', 'valid')]}")
-
- if field in widths:
- f.set('width', str(widths[field]))
-
- if field in ('journal_id',):
- f.set("invisible", "context.get('journal_id', False)")
- elif field in ('period_id',):
- f.set("invisible", "context.get('period_id', False)")
-
- orm.setup_modifiers(f, fields_get[field], context=context,
- in_tree_view=True)
-
- result['arch'] = etree.tostring(document, pretty_print=True)
- result['fields'] = fields_get
- return result
-
def _check_moves(self, cr, uid, context=None):
# use the first move ever created for this journal and period
if context is None:
@@ -1111,7 +996,7 @@ class account_move_line(osv.osv):
'has been confirmed.') % res[2])
return res
- def _remove_move_reconcile(self, cr, uid, move_ids=None, context=None):
+ def _remove_move_reconcile(self, cr, uid, move_ids=None, opening_reconciliation=False, context=None):
# Function remove move rencocile ids related with moves
obj_move_line = self.pool.get('account.move.line')
obj_move_rec = self.pool.get('account.move.reconcile')
@@ -1126,6 +1011,8 @@ class account_move_line(osv.osv):
unlink_ids += rec_ids
unlink_ids += part_rec_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)
return True
@@ -1390,6 +1277,19 @@ class account_move_line(osv.osv):
move_obj.button_validate(cr,uid, [vals['move_id']], context)
return result
+ def list_periods(self, cr, uid, context=None):
+ ids = self.pool.get('account.period').search(cr,uid,[])
+ return self.pool.get('account.period').name_get(cr, uid, ids, context=context)
+
+ def list_journals(self, cr, uid, context=None):
+ ng = dict(self.pool.get('account.journal').name_search(cr,uid,'',[]))
+ ids = ng.keys()
+ result = []
+ for journal in self.pool.get('account.journal').browse(cr, uid, ids, context=context):
+ result.append((journal.id,ng[journal.id],journal.type,
+ bool(journal.currency),bool(journal.analytic_journal_id)))
+ return result
+
account_move_line()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 7732d8d8cb0..e2c45af8cba 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -2,10 +2,7 @@
-
-
+
account.fiscalyear.formaccount.fiscalyear
@@ -70,7 +67,7 @@
-
+ Fiscal Yearsaccount.fiscalyearform
@@ -90,12 +87,9 @@
-
-
-
+
+
account.period.formaccount.period
@@ -142,7 +136,6 @@
-
account.period.searchaccount.period
@@ -153,8 +146,7 @@
-
-
+ Periodsaccount.periodform
@@ -169,12 +161,9 @@
-
+
-
-
+
account.account.formaccount.account
@@ -215,25 +204,6 @@
-
-
- account.account.search
- account.account
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
account.account.listaccount.account
@@ -253,6 +223,23 @@
+
+ account.account.search
+ account.account
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Accountsaccount.account
@@ -276,6 +263,13 @@
+
+
account.account.treeaccount.account
@@ -301,7 +295,6 @@
[('parent_id','=',False)]
-
Unrealized Gain or Lossaccount.account
@@ -321,7 +314,6 @@
-
Unrealized Gain or Lossaccount.account
@@ -341,7 +333,6 @@
-
-
-
-
- account.journal.column.form
- account.journal.column
-
-
-
-
-
- account.journal.column.tree
- account.journal.column
-
-
-
-
-
-
-
-
-
- account.journal.view.search
- account.journal.view
-
-
-
-
-
-
-
- account.journal.view.tree
- account.journal.view
-
-
-
-
-
-
-
- account.journal.view.form
- account.journal.view
-
-
-
-
-
- Journal Views
- account.journal.view
- form
- tree,form
-
-
-
- Click to specify lists of columns to display for a type of journal.
-
- Journal views determine the way you can record entries in
- your journal. Select the fields you want to appear in a journal
- and determine the sequence in which they will appear.
-
- On the journal definition form, you can select the view you
- want to use to display journal items related to this journal.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
account.journal.period.treeaccount.journal.period
@@ -1620,10 +1455,7 @@
tree
-
-
+
account.model.line.treeaccount.model.line
@@ -1640,8 +1472,6 @@
-
-
account.model.line.formaccount.model.line
@@ -1661,7 +1491,6 @@
-
account.model.formaccount.model
@@ -1680,7 +1509,6 @@
-
account.model.treeaccount.model
@@ -1692,7 +1520,6 @@
-
account.model.searchaccount.model
@@ -1721,10 +1548,7 @@
action="action_model_form" name="Models" id="menu_action_model_form" sequence="5"
parent="account.menu_finance_recurrent_entries"/>
-
-
+
account.payment.term.line.treeaccount.payment.term.line
@@ -1739,8 +1563,6 @@
-
-
account.payment.term.line.formaccount.payment.term.line
@@ -1780,7 +1602,6 @@
-
account.payment.term.searchaccount.payment.term
@@ -1791,7 +1612,6 @@
-
account.payment.term.formaccount.payment.term
@@ -1807,7 +1627,6 @@
-
Payment Termsaccount.payment.term
@@ -1818,10 +1637,7 @@
-
-
+
account.subscription.line.formaccount.subscription.line
@@ -1834,7 +1650,6 @@
-
account.subscription.line.treeaccount.subscription.line
@@ -1845,7 +1660,6 @@
-
account.subscription.treeaccount.subscription
@@ -1859,7 +1673,6 @@
-
account.subscription.searchaccount.subscription
@@ -1877,7 +1690,6 @@
-
account.subscription.formaccount.subscription
@@ -1963,72 +1775,7 @@
-
- Journal Items
- account.move.line
- form
- tree,form
- [('account_id','child_of', [active_id]),('state','<>','draft')]
- {'account_id':active_id}
-
-
-
- account.move.line.tax.tree
- account.move.line
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Journal Items
- account.move.line
- form
- tree,form
-
- [('tax_code_id','child_of',active_id),('state','<>','draft')]
-
-
- tree_but_open
- account.tax.code
- Tax Details
-
-
-
-
-
-
-
-
-
-
+
-
-
-
- Create Account
- account.addtmpl.wizard
-
-
-
-
-
-
+
-
account.account.template.formaccount.account.template
@@ -2104,7 +1834,6 @@
-
account.account.template.treeaccount.account.template
@@ -2117,7 +1846,6 @@
-
account.account.template.searchaccount.account.template
@@ -2136,7 +1864,6 @@
-
Account Templatesaccount.account.template
@@ -2144,11 +1871,32 @@
tree,form
-
-
+
+ Create Account
+ account.addtmpl.wizard
+
+
+
+
+
+
+
+
account.chart.template.formaccount.chart.template
@@ -2221,11 +1969,9 @@
formtree,form
-
-
account.tax.template.formaccount.tax.template
@@ -2304,7 +2050,6 @@
-
Tax Templatesaccount.tax.template
@@ -2312,7 +2057,6 @@
tree,form
-
@@ -2328,7 +2072,6 @@
-
account.tax.code.template.searchaccount.tax.code.template
@@ -2342,7 +2085,6 @@
-
account.tax.code.template.formaccount.tax.code.template
@@ -2359,7 +2101,6 @@
-
Tax Code Templatesaccount.tax.code.template
@@ -2371,7 +2112,6 @@
-
Set Your Accounting Optionswizard.multi.charts.accounts
@@ -2410,7 +2150,6 @@
-
Set Your Accounting Optionsir.actions.act_window
@@ -2516,7 +2255,6 @@
-
account.bank.statement.formaccount.bank.statement
@@ -2649,6 +2387,7 @@
+
tree
@@ -2678,10 +2417,7 @@
parent="menu_finance_payables"
action="base.action_partner_supplier_form" sequence="100"/>
-
-
+
account.financial.report.formaccount.financial.report
@@ -2708,7 +2444,6 @@
-
account.financial.report.treeaccount.financial.report
@@ -2721,7 +2456,6 @@
-
account.financial.report.searchaccount.financial.report
@@ -2737,7 +2471,6 @@
-
Financial Reportsir.actions.act_window
@@ -2747,7 +2480,6 @@
-
@@ -2770,7 +2502,6 @@
[('parent_id','=',False)]
-
diff --git a/addons/account/data/account_data.xml b/addons/account/data/account_data.xml
index dd27cfbab4e..97bea14c1f2 100644
--- a/addons/account/data/account_data.xml
+++ b/addons/account/data/account_data.xml
@@ -59,412 +59,6 @@
-
-
- Bank/Cash Journal View
-
-
-
- Date
- date
-
-
-
-
-
- Journal Entry
- move_id
-
-
-
-
-
- Name
- name
-
-
-
-
-
- Statement
- statement_id
-
-
-
-
- Partner
- partner_id
-
-
-
-
- Account
- account_id
-
-
-
-
-
- Debit
- debit
-
-
-
-
- Credit
- credit
-
-
-
-
- Ref
- ref
-
-
-
-
- Status
- state
-
-
-
-
- Reconcile
- reconcile_id
-
-
-
-
-
- Bank/Cash Journal (Multi-Currency) View
-
-
-
- Date
- date
-
-
-
-
-
- Journal Entry
- move_id
-
-
-
-
-
- Name
- name
-
-
-
-
-
- Statement
- statement_id
-
-
-
-
- Partner
- partner_id
-
-
-
-
- Account
- account_id
-
-
-
-
-
- Currency Amt.
- amount_currency
-
-
-
-
- Currency
- currency_id
-
-
-
-
- Debit
- debit
-
-
-
-
- Credit
- credit
-
-
-
-
- Ref
- ref
-
-
-
-
- Status
- state
-
-
-
-
- Reconcile
- reconcile_id
-
-
-
-
-
- Journal View
-
-
-
- Date
- date
-
-
-
-
-
- Journal Entry
- move_id
-
-
-
-
-
- Ref
- ref
-
-
-
-
- Partner
- partner_id
-
-
-
-
- Account
- account_id
-
-
-
-
-
- Name
- name
-
-
-
-
-
- Debit
- debit
-
-
-
-
- Credit
- credit
-
-
-
-
- Analytic Account
- analytic_account_id
-
-
-
-
- Status
- state
-
-
-
-
-
- Sale/Purchase Journal View
-
-
-
- Date
- date
-
-
-
-
-
- Journal Entry
- move_id
-
-
-
-
-
- Ref
- ref
-
-
-
-
- Account
- account_id
-
-
-
-
-
- Partner
- partner_id
-
-
-
-
- Name
- name
-
-
-
-
-
- Due Date
- date_maturity
-
-
-
-
- Debit
- debit
-
-
-
-
- Credit
- credit
-
-
-
-
- Tax
- account_tax_id
-
-
-
-
- Analytic Account
- analytic_account_id
-
-
-
-
- Status
- state
-
-
-
-
- Reconcile
- reconcile_id
-
-
-
-
- Sale/Purchase Refund Journal View
-
-
-
- Date
- date
-
-
-
-
-
- Journal Entry
- move_id
-
-
-
-
-
- Ref
- ref
-
-
-
-
- Account
- account_id
-
-
-
-
-
- Partner
- partner_id
-
-
-
-
- Name
- name
-
-
-
-
-
- Due Date
- date_maturity
-
-
-
-
- Debit
- debit
-
-
-
-
- Credit
- credit
-
-
-
-
- Tax
- account_tax_id
-
-
-
-
- Analytic Account
- analytic_account_id
-
-
-
-
- Status
- state
-
-
-
-
- Reconcile
- reconcile_id
-
-
-
diff --git a/addons/account/demo/account_minimal.xml b/addons/account/demo/account_minimal.xml
index 984711eceef..ce9a09def08 100644
--- a/addons/account/demo/account_minimal.xml
+++ b/addons/account/demo/account_minimal.xml
@@ -312,7 +312,6 @@
Sales Journal - (test)TSAJsale
-
@@ -323,7 +322,6 @@
Sales Credit Note Journal - (test)TSCNJsale_refund
-
@@ -335,7 +333,6 @@
Expenses Journal - (test)TEXJpurchase
-
@@ -346,7 +343,6 @@
Expenses Credit Notes Journal - (test)TECNJpurchase_refund
-
@@ -358,7 +354,6 @@
Bank Journal - (test)TBNKbank
-
@@ -369,7 +364,6 @@
Checks Journal - (test)TCHKbank
-
@@ -390,7 +384,6 @@
that test OpenERP arrive directly in the touchscreen UI.
-->
-
@@ -401,7 +394,6 @@
Miscellaneous Journal - (test)TMISgeneral
-
@@ -410,7 +402,6 @@
Opening Entries Journal - (test)TOEJsituation
-
@@ -422,7 +413,6 @@
USD Bank Journal - (test)TUBKbank
-
diff --git a/addons/account/i18n/es_DO.po b/addons/account/i18n/es_DO.po
index d83e259ca9d..d7f826f9459 100644
--- a/addons/account/i18n/es_DO.po
+++ b/addons/account/i18n/es_DO.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-07-02 15:07+0000\n"
-"Last-Translator: FULL NAME \n"
+"PO-Revision-Date: 2012-11-29 20:54+0000\n"
+"Last-Translator: Jose Ernesto Mendez \n"
"Language-Team: Spanish (Dominican Republic) \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:00+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-30 05:07+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -3736,7 +3736,7 @@ msgstr ""
#. module: account
#: report:account.overdue:0
msgid "VAT:"
-msgstr ""
+msgstr "ITBIS:"
#. module: account
#: constraint:account.invoice:0
@@ -3979,7 +3979,7 @@ msgstr ""
#. module: account
#: report:account.invoice:0
msgid "VAT :"
-msgstr ""
+msgstr "ITBIS:"
#. module: account
#: report:account.central.journal:0
@@ -5349,7 +5349,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_vat_declaration
msgid "Account Vat Declaration"
-msgstr ""
+msgstr "Cuenta Declaración de ITBIS"
#. module: account
#: help:account.config.settings,module_account_accountant:0
diff --git a/addons/account/i18n/fr.po b/addons/account/i18n/fr.po
index 66a866c2e40..82b0d21bae0 100644
--- a/addons/account/i18n/fr.po
+++ b/addons/account/i18n/fr.po
@@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-11-26 11:52+0000\n"
+"PO-Revision-Date: 2012-11-29 15:44+0000\n"
"Last-Translator: Numérigraphe \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-27 05:23+0000\n"
-"X-Generator: Launchpad (build 16309)\n"
+"X-Launchpad-Export-Date: 2012-11-30 05:07+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
#. module: account
#: code:addons/account/wizard/account_fiscalyear_close.py:41
@@ -2428,7 +2428,7 @@ msgstr "Impression de journal comptable"
#. module: account
#: model:ir.model,name:account.model_product_category
msgid "Product Category"
-msgstr "Catégorie de produits"
+msgstr "Catégorie d'articles"
#. module: account
#: model:ir.model,name:account.model_account_aged_trial_balance
@@ -2719,12 +2719,12 @@ msgstr "Changer en"
#. module: account
#: view:account.entries.report:0
msgid "# of Products Qty "
-msgstr "Qté de produits "
+msgstr "Nb de qté. d'articles "
#. module: account
#: model:ir.model,name:account.model_product_template
msgid "Product Template"
-msgstr "Modèle de produit"
+msgstr "Modèle d'article"
#. module: account
#: report:account.account.balance:0
@@ -4096,7 +4096,7 @@ msgstr "Continuer"
#: view:account.invoice.report:0
#: field:account.invoice.report,categ_id:0
msgid "Category of Product"
-msgstr "Catégorie de produits"
+msgstr "Catégorie d'article"
#. module: account
#: code:addons/account/account.py:987
@@ -4142,7 +4142,7 @@ msgstr "Détail"
#: help:account.config.settings,default_purchase_tax:0
msgid "This purchase tax will be assigned by default on new products."
msgstr ""
-"Cette taxe d'achat sera attribuée par défaut à tous les nouveaux produits."
+"Cette taxe d'achat sera attribuée par défaut à tous les nouveaux articles."
#. module: account
#: report:account.invoice:0
diff --git a/addons/account/i18n/it.po b/addons/account/i18n/it.po
index 449810103b2..f2ab301b7a8 100644
--- a/addons/account/i18n/it.po
+++ b/addons/account/i18n/it.po
@@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-11-25 23:52+0000\n"
+"PO-Revision-Date: 2012-11-29 23:20+0000\n"
"Last-Translator: Sergio Corato \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-27 05:24+0000\n"
-"X-Generator: Launchpad (build 16309)\n"
+"X-Launchpad-Export-Date: 2012-11-30 05:07+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -26,6 +26,7 @@ msgstr "Sistema di pagamento"
msgid ""
"An account fiscal position could be defined only once time on same accounts."
msgstr ""
+"Una posizione fiscale può essere definita una sola volta per lo stesso conto."
#. module: account
#: view:account.unreconcile:0
@@ -85,7 +86,7 @@ msgstr "Importa da fatture o pagamenti"
#: code:addons/account/account_move_line.py:1303
#, python-format
msgid "Bad Account!"
-msgstr ""
+msgstr "Conto Errato!"
#. module: account
#: view:account.move:0
@@ -242,7 +243,7 @@ msgstr "Sezionale: %s"
#. module: account
#: help:account.config.settings,code_digits:0
msgid "No. of digits to use for account code"
-msgstr ""
+msgstr "N. di cifre da usare per il codice conto"
#. module: account
#: help:account.analytic.journal,type:0
@@ -262,6 +263,9 @@ msgid ""
"lines for invoices. Leave empty if you don't want to use an analytic account "
"on the invoice tax lines by default."
msgstr ""
+"Imposta il conto analitico che sarà usato di default sulle righe imposta "
+"delle fatture. Lasciare vuoto per non usare un conto analitico sulle righe "
+"imposta delle fatture per default."
#. module: account
#: model:ir.actions.act_window,name:account.action_account_tax_template_form
@@ -297,7 +301,7 @@ msgstr "Reports belgi"
#. module: account
#: model:account.account.type,name:account.account_type_income_view1
msgid "Income View"
-msgstr ""
+msgstr "Vista Ricavi"
#. module: account
#: help:account.account,user_type:0
@@ -394,7 +398,7 @@ msgstr "Annulla Riconciliazione"
#. module: account
#: field:account.config.settings,module_account_budget:0
msgid "Budget management"
-msgstr ""
+msgstr "Gestione Budget"
#. module: account
#: view:product.template:0
@@ -416,7 +420,7 @@ msgstr ""
#. module: account
#: field:account.config.settings,group_multi_currency:0
msgid "Allow multi currencies"
-msgstr ""
+msgstr "Consenti valute multiple"
#. module: account
#: code:addons/account/account_invoice.py:73
@@ -437,12 +441,12 @@ msgstr "Giugno"
#: code:addons/account/wizard/account_automatic_reconcile.py:148
#, python-format
msgid "You must select accounts to reconcile."
-msgstr ""
+msgstr "E' necessario selezionare i conti da riconciliare."
#. module: account
#: help:account.config.settings,group_analytic_accounting:0
msgid "Allows you to use the analytic accounting."
-msgstr ""
+msgstr "Abilita la contabilità analitica."
#. module: account
#: model:ir.actions.act_window,help:account.action_account_moves_bank
@@ -462,7 +466,7 @@ msgstr ""
#: view:account.invoice.report:0
#: field:account.invoice.report,user_id:0
msgid "Salesperson"
-msgstr ""
+msgstr "Commerciale"
#. module: account
#: model:ir.model,name:account.model_account_tax_template
@@ -685,12 +689,12 @@ msgstr "Il contabile conferma la registrazione"
#: code:addons/account/static/src/xml/account_move_reconciliation.xml:31
#, python-format
msgid "Nothing to reconcile"
-msgstr ""
+msgstr "Nulla da riconciliare"
#. module: account
#: field:account.config.settings,decimal_precision:0
msgid "Decimal precision on journal entries"
-msgstr ""
+msgstr "Accuratezza decimale nelle registrazioni sezionale"
#. module: account
#: selection:account.config.settings,period:0
@@ -725,6 +729,8 @@ msgid ""
"Specified journal does not have any account move entries in draft state for "
"this period."
msgstr ""
+"Il sezionale specificato non ha registrazioni in stato bozza per questo "
+"periodo."
#. module: account
#: view:account.fiscal.position:0
@@ -1671,6 +1677,9 @@ msgid ""
"There is nothing to reconcile. All invoices and payments\n"
" have been reconciled, your partner balance is clean."
msgstr ""
+"Non c'è nulla da riconciliare. Tutte le fatture e i pagamenti\n"
+" sono stati riconciliati, il saldo dei clienti/fornitori "
+"è a zero."
#. module: account
#: field:account.chart.template,code_digits:0
@@ -2106,7 +2115,7 @@ msgstr ""
#: view:account.bank.statement:0
#: field:account.bank.statement,last_closing_balance:0
msgid "Last Closing Balance"
-msgstr ""
+msgstr "Ultima Chiusura di Bilancio"
#. module: account
#: model:ir.model,name:account.model_account_common_journal_report
@@ -3474,7 +3483,7 @@ msgstr "Bilancino"
#: code:addons/account/account.py:430
#, python-format
msgid "Unable to adapt the initial balance (negative value)."
-msgstr ""
+msgstr "Non è possibile adattare il saldo iniziale (importo negativo)."
#. module: account
#: selection:account.invoice,type:0
@@ -4881,7 +4890,7 @@ msgstr "Modalità di visualizzazione"
#. module: account
#: selection:account.move.line,state:0
msgid "Balanced"
-msgstr ""
+msgstr "Saldato"
#. module: account
#: model:process.node,note:account.process_node_importinvoice0
@@ -5731,14 +5740,14 @@ msgstr "Conto imposta"
#: model:ir.actions.act_window,name:account.action_account_report_bs
#: model:ir.ui.menu,name:account.menu_account_report_bs
msgid "Balance Sheet"
-msgstr "Bilancio"
+msgstr "Stato Patrimoniale"
#. module: account
#: selection:account.account.type,report_type:0
#: code:addons/account/account.py:187
#, python-format
msgid "Profit & Loss (Income account)"
-msgstr "Utili & Perdite (Conto di Ricavo)"
+msgstr "Conto economico"
#. module: account
#: field:account.journal,allow_date:0
@@ -5983,6 +5992,9 @@ msgid ""
"that you should have your last line with the type 'Balance' to ensure that "
"the whole amount will be treated."
msgstr ""
+"Selezionare qui il tipo di riga del pagamento. Notare che l'ultima riga "
+"dovrebbe essere di tipo 'Saldo' per assicurarsi che l'intero importo sia "
+"saldato."
#. module: account
#: field:account.partner.ledger,initial_balance:0
@@ -6327,7 +6339,7 @@ msgstr "Totale debito"
#: model:account.account.type,name:account.data_account_type_income
#: model:account.financial.report,name:account.account_financial_report_income0
msgid "Income"
-msgstr "Entrata"
+msgstr "Ricavi"
#. module: account
#: selection:account.bank.statement.line,type:0
@@ -6569,7 +6581,7 @@ msgstr "Note di Credito"
#. module: account
#: field:account.account,foreign_balance:0
msgid "Foreign Balance"
-msgstr "Salso valuta estera"
+msgstr "Saldo valuta estera"
#. module: account
#: field:account.journal.period,name:0
@@ -6988,6 +7000,8 @@ msgid ""
"There is no opening/closing period defined, please create one to set the "
"initial balance."
msgstr ""
+"Non ci sono periodi di apertura/chiusura definiti, crearne uno per impostare "
+"il saldo iniziale."
#. module: account
#: help:account.tax.template,sequence:0
@@ -7208,7 +7222,7 @@ msgstr "Nome Modello"
#. module: account
#: field:account.chart.template,property_account_expense_categ:0
msgid "Expense Category Account"
-msgstr "Conto categoria spesa"
+msgstr "Conto Categoria Costi"
#. module: account
#: sql_constraint:account.tax:0
@@ -7666,6 +7680,11 @@ msgid ""
"Make sure you have configured payment terms properly.\n"
"The latest payment term line should be of the \"Balance\" type."
msgstr ""
+"Non è possibile validare una voce senza saldo.\n"
+"Assicurarsi che siano stati configurati correttamente i termini di "
+"pagamento.\n"
+"L'ultima riga della condizione di pagamento dovrebbe essere di tipo "
+"\"Saldo\"."
#. module: account
#: model:process.transition,note:account.process_transition_invoicemanually0
@@ -8107,7 +8126,7 @@ msgstr "Pro-Forma"
#: view:account.move.line:0
#: selection:account.move.line,state:0
msgid "Unbalanced"
-msgstr "Squadrato"
+msgstr "Zoppe"
#. module: account
#: selection:account.move.line,centralisation:0
@@ -8844,7 +8863,7 @@ msgstr ""
#. module: account
#: field:account.chart.template,property_account_income_categ:0
msgid "Income Category Account"
-msgstr "Income Category Account"
+msgstr "Conto Categoria Ricavi"
#. module: account
#: field:account.account,adjusted_balance:0
@@ -8885,6 +8904,8 @@ msgid ""
"Error: The default Unit of Measure and the purchase Unit of Measure must be "
"in the same category."
msgstr ""
+"Errore: L'unità di misura di default e l'unità di misura di acquisto devono "
+"essere nella stessa categoria."
#. module: account
#: report:account.invoice:0
@@ -9831,7 +9852,7 @@ msgstr "Documento: Scheda Conto Cliente"
#. module: account
#: field:account.account.type,report_type:0
msgid "P&L / BS Category"
-msgstr "Categoria Utili & Perdite / Bilancio"
+msgstr "Categoria CE / SP"
#. module: account
#: view:account.account.template:0
@@ -11099,6 +11120,7 @@ msgstr "Raggruppa per mese Data Fattura"
#, python-format
msgid "There is no income account defined for this product: \"%s\" (id:%d)."
msgstr ""
+"Non c'è un conto di ricavo definito per questo prodotto: \"%s\" (id:%d)."
#. module: account
#: model:ir.actions.act_window,name:account.action_aged_receivable_graph
diff --git a/addons/account/i18n/lt.po b/addons/account/i18n/lt.po
index 9671fce77c3..6552391bd16 100644
--- a/addons/account/i18n/lt.po
+++ b/addons/account/i18n/lt.po
@@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-05-10 17:52+0000\n"
-"Last-Translator: Raphael Collet (OpenERP) \n"
+"PO-Revision-Date: 2012-11-29 13:22+0000\n"
+"Last-Translator: Andrius Preimantas \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 05:56+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-30 05:07+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -1750,7 +1750,7 @@ msgstr "Kreditorių sąskaita"
#: field:account.tax,account_paid_id:0
#: field:account.tax.template,account_paid_id:0
msgid "Refund Tax Account"
-msgstr "Grąžintino mokesčio sąskaita"
+msgstr "Grąžinimų mokesčio sąskaita"
#. module: account
#: model:ir.model,name:account.model_ir_sequence
@@ -5832,7 +5832,7 @@ msgstr ""
#: field:account.bank.statement.line,name:0
#: field:account.invoice,reference:0
msgid "Communication"
-msgstr ""
+msgstr "Komunikacija"
#. module: account
#: view:account.config.settings:0
@@ -6356,7 +6356,7 @@ msgstr ""
#: field:account.tax,account_collected_id:0
#: field:account.tax.template,account_collected_id:0
msgid "Invoice Tax Account"
-msgstr "Mokėtino mokesčio sąskaita"
+msgstr "Sąsk. fakt. mokesčių sąskaitą"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_general_journal
diff --git a/addons/account/i18n/nb.po b/addons/account/i18n/nb.po
index 38502ad287f..0a8b6e23ad5 100644
--- a/addons/account/i18n/nb.po
+++ b/addons/account/i18n/nb.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-11-26 15:09+0000\n"
+"PO-Revision-Date: 2012-11-28 13:31+0000\n"
"Last-Translator: Kaare Pettersen \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-11-27 05:24+0000\n"
-"X-Generator: Launchpad (build 16309)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:14+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -2399,7 +2399,7 @@ msgstr "Avgiftsdefinisjon"
#: view:account.config.settings:0
#: model:ir.actions.act_window,name:account.action_account_config
msgid "Configure Accounting"
-msgstr ""
+msgstr "konfigurere regnskap."
#. module: account
#: field:account.invoice.report,uom_name:0
@@ -2420,7 +2420,7 @@ msgstr ""
#: code:addons/account/static/src/xml/account_move_reconciliation.xml:8
#, python-format
msgid "Good job!"
-msgstr ""
+msgstr "Bra jobba!"
#. module: account
#: field:account.config.settings,module_account_asset:0
@@ -2515,7 +2515,7 @@ msgstr "Åpne poster"
#. module: account
#: field:account.config.settings,purchase_refund_sequence_next:0
msgid "Next supplier credit note number"
-msgstr ""
+msgstr "Neste leverandør kredit notat nummer."
#. module: account
#: field:account.automatic.reconcile,account_ids:0
@@ -2555,12 +2555,12 @@ msgstr "Konto for avgifter"
#: code:addons/account/account_cash_statement.py:256
#, python-format
msgid "You do not have rights to open this %s journal !"
-msgstr ""
+msgstr "Du har ikke rett til å åpne denne %s journalen !"
#. module: account
#: model:res.groups,name:account.group_supplier_inv_check_total
msgid "Check Total on supplier invoices"
-msgstr ""
+msgstr "Sjekk total på leverandør fakturaer."
#. module: account
#: selection:account.invoice,state:0
@@ -2781,7 +2781,7 @@ msgstr "skattemessige posisjoner"
#: code:addons/account/account_move_line.py:592
#, python-format
msgid "You cannot create journal items on a closed account %s %s."
-msgstr ""
+msgstr "Du kan ikke opprette journal elementer på en lukket konto% s% s."
#. module: account
#: field:account.period.close,sure:0
@@ -2816,7 +2816,7 @@ msgstr "Kunde fakturakladd"
#. module: account
#: view:product.category:0
msgid "Account Properties"
-msgstr ""
+msgstr "Konto egenskaper."
#. module: account
#: view:account.partner.reconcile.process:0
@@ -2826,7 +2826,7 @@ msgstr "Avstemming av partner"
#. module: account
#: view:account.analytic.line:0
msgid "Fin. Account"
-msgstr ""
+msgstr "Fin. Konto."
#. module: account
#: field:account.tax,tax_code_id:0
@@ -2903,7 +2903,7 @@ msgstr "EXJ"
#. module: account
#: view:account.invoice.refund:0
msgid "Create Credit Note"
-msgstr ""
+msgstr "Opprett kredit notat."
#. module: account
#: field:product.template,supplier_taxes_id:0
@@ -3001,7 +3001,7 @@ msgstr "Kontodimensjon"
#: field:account.config.settings,default_purchase_tax:0
#: field:account.config.settings,purchase_tax:0
msgid "Default purchase tax"
-msgstr ""
+msgstr "Standard omsetnings skatt."
#. module: account
#: view:account.account:0
@@ -3175,7 +3175,7 @@ msgstr "Kommuniksjonstype"
#. module: account
#: constraint:account.move.line:0
msgid "Account and Period must belong to the same company."
-msgstr ""
+msgstr "Konto og periode må tilhøre samme selskap."
#. module: account
#: constraint:res.currency:0
@@ -3213,7 +3213,7 @@ msgstr "Avskrivningsbeløp"
#: field:account.bank.statement,message_unread:0
#: field:account.invoice,message_unread:0
msgid "Unread Messages"
-msgstr ""
+msgstr "Uleste meldinger."
#. module: account
#: code:addons/account/wizard/account_invoice_state.py:44
@@ -3222,12 +3222,14 @@ msgid ""
"Selected invoice(s) cannot be confirmed as they are not in 'Draft' or 'Pro-"
"Forma' state."
msgstr ""
+"Valgt faktura (e) kan ikke bekreftes som de ikke er i \"Kladd\" eller \"pro-"
+"forma 'tilstand."
#. module: account
#: code:addons/account/account.py:1114
#, python-format
msgid "You should choose the periods that belong to the same company."
-msgstr ""
+msgstr "Du bør velge de periodene som tilhører samme selskap."
#. module: account
#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
@@ -3240,17 +3242,17 @@ msgstr "Salg pr. konto"
#: code:addons/account/account.py:1471
#, python-format
msgid "You cannot delete a posted journal entry \"%s\"."
-msgstr ""
+msgstr "Du kan ikke slette en publisert bilagsregistrering \"% s\"."
#. module: account
#: view:account.invoice:0
msgid "Accounting Period"
-msgstr ""
+msgstr "Regnskaps periode."
#. module: account
#: field:account.config.settings,sale_journal_id:0
msgid "Sale journal"
-msgstr ""
+msgstr "Salgs journal."
#. module: account
#: code:addons/account/account.py:2323
@@ -3346,7 +3348,7 @@ msgstr "Obligatorisk"
#. module: account
#: field:wizard.multi.charts.accounts,only_one_chart_template:0
msgid "Only One Chart Template Available"
-msgstr ""
+msgstr "Bare en diagram mal tilgjengelig."
#. module: account
#: view:account.chart.template:0
@@ -3359,7 +3361,7 @@ msgstr "Kostnadskonto"
#: field:account.bank.statement,message_summary:0
#: field:account.invoice,message_summary:0
msgid "Summary"
-msgstr ""
+msgstr "Oppsummering."
#. module: account
#: help:account.invoice,period_id:0
@@ -3481,7 +3483,7 @@ msgstr "Velg regnskapsår"
#: view:account.config.settings:0
#: view:account.installer:0
msgid "Date Range"
-msgstr ""
+msgstr "Dato område."
#. module: account
#: view:account.period:0
@@ -3533,7 +3535,7 @@ msgstr ""
#: code:addons/account/account.py:2650
#, python-format
msgid "There is no parent code for the template account."
-msgstr ""
+msgstr "Det er ingen overordnede kode for denne malen kontoen."
#. module: account
#: help:account.chart.template,code_digits:0
@@ -3617,12 +3619,12 @@ msgstr "Elektonisk fil"
#. module: account
#: constraint:res.partner:0
msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "Feil: Ugyldig ean kode."
#. module: account
#: field:account.config.settings,has_chart_of_accounts:0
msgid "Company has a chart of accounts"
-msgstr ""
+msgstr "Selskapet har en konto plan."
#. module: account
#: view:account.payment.term.line:0
@@ -3638,7 +3640,7 @@ msgstr "Konto Partner ledger"
#: code:addons/account/account_invoice.py:1321
#, python-format
msgid "%s created."
-msgstr ""
+msgstr "%s Opprettet."
#. module: account
#: help:account.journal.column,sequence:0
@@ -3648,7 +3650,7 @@ msgstr "Gir sekvensen for å merke kolonne."
#. module: account
#: view:account.period:0
msgid "Account Period"
-msgstr ""
+msgstr "Konto periode."
#. module: account
#: help:account.account,currency_id:0
@@ -3676,7 +3678,7 @@ msgstr "Kontoplanmal"
#. module: account
#: view:account.bank.statement:0
msgid "Transactions"
-msgstr ""
+msgstr "Transaksjoner."
#. module: account
#: model:ir.model,name:account.model_account_unreconcile_reconcile
@@ -3851,6 +3853,10 @@ msgid ""
"You can create one in the menu: \n"
"Configuration/Journals/Journals."
msgstr ""
+"Kan ikke finne noen konto journal of% s for denne bedriften.\n"
+"\n"
+"Du kan opprette en i menyen:\n"
+"Konfigurasjon / Tidsskrifter / tidsskrifter."
#. module: account
#: model:ir.actions.act_window,name:account.action_account_unreconcile
@@ -3890,7 +3896,7 @@ msgstr "år"
#. module: account
#: field:account.config.settings,date_start:0
msgid "Start date"
-msgstr ""
+msgstr "Starts dato."
#. module: account
#: view:account.invoice.refund:0
@@ -3938,7 +3944,7 @@ msgstr "Kontoplan"
#: view:cash.box.out:0
#: model:ir.actions.act_window,name:account.action_cash_box_out
msgid "Take Money Out"
-msgstr ""
+msgstr "Ta ut penger."
#. module: account
#: report:account.vat.declaration:0
@@ -4059,7 +4065,7 @@ msgstr "Detaljert"
#. module: account
#: help:account.config.settings,default_purchase_tax:0
msgid "This purchase tax will be assigned by default on new products."
-msgstr ""
+msgstr "Kjøpet skatt vil bli tildelt som standard på nye produkter."
#. module: account
#: report:account.invoice:0
@@ -4087,7 +4093,7 @@ msgstr "(Hvis du ikke velger periode vil alle åpne perioder bli valgt)"
#. module: account
#: model:ir.model,name:account.model_account_journal_cashbox_line
msgid "account.journal.cashbox.line"
-msgstr ""
+msgstr "konto.journal.Pengeboks.linje."
#. module: account
#: model:ir.model,name:account.model_account_partner_reconcile_process
@@ -4227,7 +4233,7 @@ msgstr ""
#. module: account
#: field:account.config.settings,group_check_supplier_invoice_total:0
msgid "Check the total of supplier invoices"
-msgstr ""
+msgstr "Sjekk totalen av leverandør fakturaer."
#. module: account
#: view:account.tax:0
@@ -4314,7 +4320,7 @@ msgstr "Multiplikasjonsfaktor Skatt kode"
#. module: account
#: field:account.config.settings,complete_tax_set:0
msgid "Complete set of taxes"
-msgstr ""
+msgstr "Fullfør sett av skatter."
#. module: account
#: field:account.account,name:0
@@ -4342,7 +4348,7 @@ msgstr ""
#. module: account
#: model:mail.message.subtype,name:account.mt_invoice_paid
msgid "paid"
-msgstr ""
+msgstr "Betalt."
#. module: account
#: field:account.move.line,date:0
@@ -4376,7 +4382,7 @@ msgstr "Standardkoder"
#: help:account.bank.statement,message_ids:0
#: help:account.invoice,message_ids:0
msgid "Messages and communication history"
-msgstr ""
+msgstr "Meldinger og kommunikasjon historie."
#. module: account
#: help:account.journal,analytic_journal_id:0
@@ -4417,7 +4423,7 @@ msgstr ""
#: code:addons/account/account_move_line.py:1236
#, python-format
msgid "You cannot use an inactive account."
-msgstr ""
+msgstr "Du kan ikke bruke en inaktiv konto."
#. module: account
#: model:ir.actions.act_window,name:account.open_board_account
@@ -4485,7 +4491,7 @@ msgstr "tittel"
#. module: account
#: selection:account.invoice.refund,filter_refund:0
msgid "Create a draft credit note"
-msgstr ""
+msgstr "Opprett en kladd kredit notat."
#. module: account
#: view:account.invoice:0
@@ -4517,7 +4523,7 @@ msgstr "Eiendeler"
#. module: account
#: view:account.config.settings:0
msgid "Accounting & Finance"
-msgstr ""
+msgstr "Regnskap & Finans."
#. module: account
#: view:account.invoice.confirm:0
@@ -4544,7 +4550,7 @@ msgstr "(Faktura må settes ikke-avstemt før den kan åpnes)"
#. module: account
#: field:account.tax,account_analytic_collected_id:0
msgid "Invoice Tax Analytic Account"
-msgstr ""
+msgstr "Faktura skatt analytisk konto."
#. module: account
#: field:account.chart,period_from:0
@@ -4705,6 +4711,8 @@ msgid ""
"Error!\n"
"You cannot create recursive Tax Codes."
msgstr ""
+"Feil!\n"
+"Du kan ikke opprette rekursive skatte koder."
#. module: account
#: constraint:account.period:0
@@ -4712,6 +4720,8 @@ msgid ""
"Error!\n"
"The duration of the Period(s) is/are invalid."
msgstr ""
+"Feil!\n"
+"Varigheten av perioden (e) er / er ugyldig."
#. module: account
#: field:account.entries.report,month:0
@@ -4727,7 +4737,7 @@ msgstr "Måned"
#. module: account
#: field:account.config.settings,purchase_sequence_prefix:0
msgid "Supplier invoice sequence"
-msgstr ""
+msgstr "Leverandør faktura sekvens."
#. module: account
#: code:addons/account/account_invoice.py:571
@@ -4859,7 +4869,7 @@ msgstr "Vis modus"
#. module: account
#: selection:account.move.line,state:0
msgid "Balanced"
-msgstr ""
+msgstr "Balansert."
#. module: account
#: model:process.node,note:account.process_node_importinvoice0
@@ -4877,7 +4887,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_wizard_multi_chart
msgid "Set Your Accounting Options"
-msgstr ""
+msgstr "Sett dine regnskaps tillegg."
#. module: account
#: model:ir.model,name:account.model_account_chart
@@ -4968,7 +4978,7 @@ msgstr "Navnet på perioden må være unikt per selskap!"
#. module: account
#: help:wizard.multi.charts.accounts,currency_id:0
msgid "Currency as per company's country."
-msgstr ""
+msgstr "Valuta som per selskapets land."
#. module: account
#: view:account.tax:0
@@ -5009,6 +5019,8 @@ msgid ""
"Error!\n"
"You cannot create an account which has parent account of different company."
msgstr ""
+"Feil!\n"
+"Du kan ikke opprette en konto som har overordnede hensyn til ulike selskap."
#. module: account
#: code:addons/account/account_invoice.py:615
@@ -5140,7 +5152,7 @@ msgstr "Annulert faktura"
#. module: account
#: view:account.invoice:0
msgid "My Invoices"
-msgstr ""
+msgstr "Mine fakturaer."
#. module: account
#: selection:account.bank.statement,state:0
@@ -5150,7 +5162,7 @@ msgstr "Ny"
#. module: account
#: view:wizard.multi.charts.accounts:0
msgid "Sale Tax"
-msgstr ""
+msgstr "Selg skatt."
#. module: account
#: field:account.tax,ref_tax_code_id:0
@@ -5208,7 +5220,7 @@ msgstr "Fakturaer"
#. module: account
#: help:account.config.settings,expects_chart_of_accounts:0
msgid "Check this box if this company is a legal entity."
-msgstr ""
+msgstr "Kryss av denne boksen hvis dette selskapet er en juridisk enhet."
#. module: account
#: model:account.account.type,name:account.conf_account_type_chk
@@ -5225,7 +5237,7 @@ msgstr "SAJ"
#. module: account
#: constraint:account.analytic.line:0
msgid "You cannot create analytic line on view account."
-msgstr ""
+msgstr "Du kan ikke opprette en analytisk linje på vis konto."
#. module: account
#: view:account.aged.trial.balance:0
@@ -5265,7 +5277,7 @@ msgstr ""
#: view:validate.account.move:0
#: view:validate.account.move.lines:0
msgid "or"
-msgstr ""
+msgstr "Eller."
#. module: account
#: view:account.invoice.report:0
@@ -5358,7 +5370,7 @@ msgstr ""
#: field:account.invoice,message_comment_ids:0
#: help:account.invoice,message_comment_ids:0
msgid "Comments and emails"
-msgstr ""
+msgstr "Kommentarer og E-poster."
#. module: account
#: view:account.bank.statement:0
@@ -5393,7 +5405,7 @@ msgstr "Aktiv"
#: view:account.bank.statement:0
#: field:account.journal,cash_control:0
msgid "Cash Control"
-msgstr ""
+msgstr "Kontant kontroll."
#. module: account
#: field:account.analytic.balance,date2:0
@@ -5441,7 +5453,7 @@ msgstr ""
#. module: account
#: model:res.groups,name:account.group_account_manager
msgid "Financial Manager"
-msgstr ""
+msgstr "Finansiell ledelse."
#. module: account
#: field:account.journal,group_invoice_lines:0
@@ -5457,7 +5469,7 @@ msgstr "Bevegelser"
#: field:account.bank.statement,details_ids:0
#: view:account.journal:0
msgid "CashBox Lines"
-msgstr ""
+msgstr "Kontontboks linjer."
#. module: account
#: model:ir.model,name:account.model_account_vat_declaration
@@ -5503,6 +5515,8 @@ msgid ""
"There is no period defined for this date: %s.\n"
"Please create one."
msgstr ""
+"Det er ingen periode definert for denne datoen:% s.\n"
+"Vennligst opprette en."
#. module: account
#: help:account.tax,price_include:0
@@ -5604,7 +5618,7 @@ msgstr ""
#: code:addons/account/account_invoice.py:1326
#, python-format
msgid "%s paid."
-msgstr ""
+msgstr "%s Betalt."
#. module: account
#: view:account.financial.report:0
@@ -5747,7 +5761,7 @@ msgstr "Beregningskode (dersom type=kode)"
#, python-format
msgid ""
"Cannot find a chart of accounts for this company, you should create one."
-msgstr ""
+msgstr "Kan ikke finne en kontoplan for dette selskapet, du bør opprette en."
#. module: account
#: selection:account.analytic.journal,type:0
@@ -5882,7 +5896,7 @@ msgstr "Inkludert i basisbeløpet"
#. module: account
#: field:account.invoice,supplier_invoice_number:0
msgid "Supplier Invoice Number"
-msgstr ""
+msgstr "Leverandør faktura nummer."
#. module: account
#: help:account.payment.term.line,days:0
@@ -5903,6 +5917,8 @@ msgstr "Beregning"
#, python-format
msgid "You can not add/modify entries in a closed period %s of journal %s."
msgstr ""
+"Du kan ikke legge til / endre oppføringer i en lukket periode% s av "
+"tidsskriftet% s."
#. module: account
#: view:account.journal:0
@@ -5927,7 +5943,7 @@ msgstr "Periodestart"
#. module: account
#: model:account.account.type,name:account.account_type_asset_view1
msgid "Asset View"
-msgstr ""
+msgstr "Eiendel Vis."
#. module: account
#: model:ir.model,name:account.model_account_common_account_report
@@ -6000,12 +6016,12 @@ msgstr "Årsavslutningsjournal"
#. module: account
#: view:account.invoice:0
msgid "Draft Refund "
-msgstr ""
+msgstr "Utkast refusjon. "
#. module: account
#: view:cash.box.in:0
msgid "Fill in this form if you put money in the cash register:"
-msgstr ""
+msgstr "Fyll ut dette skjemaet hvis du setter penger i kasse apparatet:"
#. module: account
#: field:account.payment.term.line,value_amount:0
@@ -6082,7 +6098,7 @@ msgstr "Kundefakturaer og kreditnotaer"
#: code:addons/account/wizard/account_move_journal.py:161
#, python-format
msgid "This period is already closed."
-msgstr ""
+msgstr "Denne perioden er allerede lukket."
#. module: account
#: field:account.analytic.line,amount_currency:0
@@ -6095,7 +6111,7 @@ msgstr "Valutabeløp"
#. module: account
#: selection:res.company,tax_calculation_rounding_method:0
msgid "Round per Line"
-msgstr ""
+msgstr "Runde per. linje."
#. module: account
#: model:ir.actions.act_window,name:account.action_view_move_line
@@ -6156,7 +6172,7 @@ msgstr ""
#: code:addons/account/wizard/account_report_aged_partner_balance.py:56
#, python-format
msgid "You must set a period length greater than 0."
-msgstr ""
+msgstr "Du må angi en periode lengde større enn 0."
#. module: account
#: view:account.fiscal.position.template:0
@@ -6167,7 +6183,7 @@ msgstr "Regnskapsstatus Mal"
#. module: account
#: view:account.invoice:0
msgid "Draft Refund"
-msgstr ""
+msgstr "Utkast refusjon."
#. module: account
#: view:account.analytic.chart:0
@@ -6204,7 +6220,7 @@ msgstr "Avstem med nedskriving"
#. module: account
#: constraint:account.move.line:0
msgid "You cannot create journal items on an account of type view."
-msgstr ""
+msgstr "Du kan ikke opprette journal elementer på en konto av typen visning."
#. module: account
#: selection:account.payment.term.line,value:0
@@ -6279,7 +6295,7 @@ msgstr "Flytt navn (id): %s (%s)"
#. module: account
#: view:account.move.journal:0
msgid "Standard Entries"
-msgstr ""
+msgstr "Standard oppføringer."
#. module: account
#: view:account.move.line.reconcile:0
@@ -6352,7 +6368,7 @@ msgstr "Avgiftskartlegging"
#. module: account
#: view:account.config.settings:0
msgid "Select Company"
-msgstr ""
+msgstr "Velg Firma."
#. module: account
#: model:ir.actions.act_window,name:account.action_account_state_open
@@ -6426,7 +6442,7 @@ msgstr "Antall linjer"
#. module: account
#: view:account.invoice:0
msgid "(update)"
-msgstr ""
+msgstr "(Oppdatering)"
#. module: account
#: field:account.aged.trial.balance,filter:0
@@ -6468,7 +6484,7 @@ msgstr ""
#. module: account
#: field:account.journal,loss_account_id:0
msgid "Loss Account"
-msgstr ""
+msgstr "Tap konto."
#. module: account
#: field:account.tax,account_collected_id:0
@@ -6730,7 +6746,7 @@ msgstr ""
#. module: account
#: view:account.config.settings:0
msgid "Bank & Cash"
-msgstr ""
+msgstr "Bank og kontant."
#. module: account
#: help:account.fiscalyear.close.state,fy_id:0
@@ -6816,7 +6832,7 @@ msgstr "Fordring"
#. module: account
#: constraint:account.move.line:0
msgid "You cannot create journal items on closed account."
-msgstr ""
+msgstr "Du kan ikke opprette journal enmer i en lukker konto."
#. module: account
#: code:addons/account/account_invoice.py:594
diff --git a/addons/account/i18n/nl.po b/addons/account/i18n/nl.po
index 51633c9e660..eed659d7d18 100644
--- a/addons/account/i18n/nl.po
+++ b/addons/account/i18n/nl.po
@@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-11-25 13:43+0000\n"
+"PO-Revision-Date: 2012-11-29 15:05+0000\n"
"Last-Translator: Erwin van der Ploeg (Endian Solutions) \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-26 04:41+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-30 05:06+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
#, python-format
#~ msgid "Integrity Error !"
@@ -114,6 +114,7 @@ msgid ""
"Error!\n"
"You cannot create recursive account templates."
msgstr ""
+"Fout! Het is niet toegestaan on een recursief grootboekschema aan te maken."
#. module: account
#. openerp-web
@@ -155,6 +156,19 @@ msgid ""
" \n"
" "
msgstr ""
+"
\n"
+" Klik om de zichtbare kolommen van een dagboek te "
+"specificeren.\n"
+"
\n"
+" Dagboekweergaves bepalen de manier waarop boekingen \n"
+" ingevoerd kunnen worden. Selecteer de velden welke zichtbaar "
+"\n"
+" moeten zijn en bepaald de volgorde daarvan.\n"
+"
\n"
+" In de dagboekinstellingen kan bepaald worden welke gegevens\n"
+" zichtbaar zijn bij boekingen in het betreffende dagboek.\n"
+"
\n"
+" "
#. module: account
#: help:account.payment.term,active:0
@@ -205,6 +219,8 @@ msgid ""
"which is set after generating opening entries from 'Generate Opening "
"Entries'."
msgstr ""
+"U dient het 'Jaarafsluiting dagboek' te definiëren voor het fiscale jaar, "
+"nadat u een openingsbalans heeft gemaakt"
#. module: account
#: field:account.fiscal.position.account,account_src_id:0
@@ -223,6 +239,15 @@ msgid ""
" \n"
" "
msgstr ""
+"
\n"
+" klik hier om een fiscale periode toe te voegen.\n"
+"
\n"
+" Een fiscale periode is vaak een maand of een kwartaal. "
+"Normaal\n"
+" zal dit gelijk zijn met de periode van uw Belasting "
+"aangifte.\n"
+"
\n"
+" "
#. module: account
#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
@@ -243,7 +268,7 @@ msgstr "Dagboek: %s"
#. module: account
#: help:account.config.settings,code_digits:0
msgid "No. of digits to use for account code"
-msgstr ""
+msgstr "Aantal cijfers voor de rekening code"
#. module: account
#: help:account.analytic.journal,type:0
@@ -263,6 +288,9 @@ msgid ""
"lines for invoices. Leave empty if you don't want to use an analytic account "
"on the invoice tax lines by default."
msgstr ""
+"Geef de kostenplaats welke standaard gebruikt moet worden bij BTW factuur "
+"regels. Als u dit veld niet invuld, wordt er standaard geen kostenplaats "
+"gebruikt."
#. module: account
#: model:ir.actions.act_window,name:account.action_account_tax_template_form
@@ -298,7 +326,7 @@ msgstr "Belgische overzichten"
#. module: account
#: model:account.account.type,name:account.account_type_income_view1
msgid "Income View"
-msgstr ""
+msgstr "View opbrengsten"
#. module: account
#: help:account.account,user_type:0
@@ -314,7 +342,7 @@ msgstr ""
#. module: account
#: field:account.config.settings,sale_refund_sequence_next:0
msgid "Next credit note number"
-msgstr ""
+msgstr "Volgend nummer creditnota"
#. module: account
#: help:account.config.settings,module_account_voucher:0
@@ -323,6 +351,10 @@ msgid ""
"sales, purchase, expense, contra, etc.\n"
" This installs the module account_voucher."
msgstr ""
+"Deze module bevat alle voorzieningen voor registratie van "
+"(bank)afschriften.\n"
+" "
+"hiermee installeert u de module 'account_voucher'"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_use_model_create_entry
@@ -361,6 +393,18 @@ msgid ""
" \n"
" "
msgstr ""
+"
\n"
+" Klik hier om een creditnota te maken. \n"
+"
\n"
+" Een creditnota is een factuur, waarbij u een bestaande "
+"factuur volledig of gedeeltelijk \n"
+" crediteert.\n"
+"
\n"
+" In plaats van handmatig kunt u hiermee een creditnota maken "
+"\n"
+" direct vanaf de originele factuur.\n"
+"
\n"
+" "
#. module: account
#: field:account.journal.column,field:0
@@ -426,12 +470,12 @@ msgstr "Juni"
#: code:addons/account/wizard/account_automatic_reconcile.py:148
#, python-format
msgid "You must select accounts to reconcile."
-msgstr ""
+msgstr "Selecteer de grootboekrekeningen die afgeletterd moeten worden."
#. module: account
#: help:account.config.settings,group_analytic_accounting:0
msgid "Allows you to use the analytic accounting."
-msgstr ""
+msgstr "stelt u in staat kostenplaatsen te gebruiken"
#. module: account
#: model:ir.actions.act_window,help:account.action_account_moves_bank
@@ -531,6 +575,18 @@ msgid ""
"should choose 'Round per line' because you certainly want the sum of your "
"tax-included line subtotals to be equal to the total amount with taxes."
msgstr ""
+"Als u 'afronden per regel' selecteert: voor elke BTW rekening , wordt het "
+"BTW bedrag eerst berekend en afgerond voor elke factuur regel en vervolgens "
+"worden deze afgeronde bedragen opgeteld, wat leidt tot het totale bedrag "
+"voor deze belasting. \r\n"
+"\r\n"
+"Als u 'afronden globaal' selecteert: voor elke BTW rekening wordt het BTW "
+"bedrag berekend voor elke factuur regel. vervolgens zullen deze bedragen "
+"worden opgeteld en uiteindelijk wordt dit totale BTW bedrag afgerond. \r\n"
+"\r\n"
+"Als u verkoopt met BTW inbegrepen, moet u kiezen voor 'afronden per regel', "
+"omdat U zeker wil zijn dat de subtotalen van \r\n"
+"uw (BTW inbegrepen) regels gelijk zijn aan het totale bedrag met BTW."
#. module: account
#: model:ir.model,name:account.model_wizard_multi_charts_accounts
@@ -600,7 +656,7 @@ msgstr "Bovenliggend doel"
#. module: account
#: help:account.invoice.line,sequence:0
msgid "Gives the sequence of this line when displaying the invoice."
-msgstr ""
+msgstr "Geeft de volgorde van de factuur regel bij het tonen van de factuur"
#. module: account
#: field:account.bank.statement,account_id:0
@@ -679,7 +735,7 @@ msgstr "Niets af te letteren"
#. module: account
#: field:account.config.settings,decimal_precision:0
msgid "Decimal precision on journal entries"
-msgstr ""
+msgstr "Aantal decimalen van journaalposten"
#. module: account
#: selection:account.config.settings,period:0
@@ -713,7 +769,7 @@ msgstr "Rapport waarde"
msgid ""
"Specified journal does not have any account move entries in draft state for "
"this period."
-msgstr ""
+msgstr "Geselecteerd dagboek heeft geen 'concept'boekingen"
#. module: account
#: view:account.fiscal.position:0
@@ -768,12 +824,16 @@ msgid ""
" \n"
" "
msgstr ""
+"
\n"
+" Geen journaalposten gevonden.\n"
+"
\n"
+" "
#. module: account
#: code:addons/account/account.py:1606
#, python-format
msgid "Cannot create move with currency different from .."
-msgstr ""
+msgstr "U kunt geen boeking doen met een andere valuta dan ..."
#. module: account
#: model:email.template,report_name:account.email_template_edi_invoice
@@ -807,7 +867,7 @@ msgstr "Dagboek periode"
#: constraint:account.move:0
msgid ""
"You cannot create more than one move per period on a centralized journal."
-msgstr ""
+msgstr "U kunt niet meerdere boekingen doen bij een centraal journaal"
#. module: account
#: help:account.tax,account_analytic_paid_id:0
diff --git a/addons/account/i18n/zh_CN.po b/addons/account/i18n/zh_CN.po
index 55d61f5c611..c95e3919012 100644
--- a/addons/account/i18n/zh_CN.po
+++ b/addons/account/i18n/zh_CN.po
@@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-11-01 08:44+0000\n"
+"PO-Revision-Date: 2012-11-28 07:22+0000\n"
"Last-Translator: ccdos \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:01+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:14+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -776,7 +776,7 @@ msgstr "账簿的会计期间"
#: constraint:account.move:0
msgid ""
"You cannot create more than one move per period on a centralized journal."
-msgstr ""
+msgstr "在每个会计期间，你不可以创建1个以上的总分类凭证"
#. module: account
#: help:account.tax,account_analytic_paid_id:0
@@ -784,7 +784,7 @@ msgid ""
"Set the analytic account that will be used by default on the invoice tax "
"lines for refunds. Leave empty if you don't want to use an analytic account "
"on the invoice tax lines by default."
-msgstr ""
+msgstr "设置辅助核算项，用于退款时发票上默认税科目。如果默认不要在发票的税上 使用辅助核算项，留空。"
#. module: account
#: view:account.account:0
@@ -6098,7 +6098,7 @@ msgstr "固定金额"
#: code:addons/account/account_move_line.py:1151
#, python-format
msgid "You cannot change the tax, you should remove and recreate lines."
-msgstr ""
+msgstr "你不能修改税，你需要删去并且重建这一行"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_automatic_reconcile
diff --git a/addons/account/product_view.xml b/addons/account/product_view.xml
index 9b54647e726..a70fdf38f3c 100644
--- a/addons/account/product_view.xml
+++ b/addons/account/product_view.xml
@@ -7,14 +7,14 @@
-
+
-
+
-
+
diff --git a/addons/account/report/account_invoice_report.py b/addons/account/report/account_invoice_report.py
index 68eaedb20a6..a001b6b4f52 100644
--- a/addons/account/report/account_invoice_report.py
+++ b/addons/account/report/account_invoice_report.py
@@ -98,150 +98,124 @@ class account_invoice_report(osv.osv):
'partner_bank_id': fields.many2one('res.partner.bank', 'Bank Account',readonly=True),
'residual': fields.float('Total Residual', readonly=True),
'user_currency_residual': fields.function(_compute_amounts_in_user_currency, string="Total Residual", type='float', digits_compute=dp.get_precision('Account'), multi="_compute_amounts"),
- 'delay_to_pay': fields.float('Avg. Delay To Pay', readonly=True, group_operator="avg"),
- 'due_delay': fields.float('Avg. Due Delay', readonly=True, group_operator="avg"),
}
_order = 'date desc'
-
def _select(self):
select_str = """
- SELECT min(ail.id) as id,
- ai.date_invoice as date,
- to_char(ai.date_invoice, 'YYYY') as year,
- to_char(ai.date_invoice, 'MM') as month,
- to_char(ai.date_invoice, 'YYYY-MM-DD') as day,
- ail.product_id,
- ai.partner_id as partner_id,
- ai.payment_term as payment_term,
- ai.period_id as period_id,
- (case when u.uom_type not in ('reference') then
- (select name from product_uom where uom_type='reference' and active and category_id=u.category_id LIMIT 1)
- else
- u.name
- end) as uom_name,
- ai.currency_id as currency_id,
- ai.journal_id as journal_id,
- ai.fiscal_position as fiscal_position,
- ai.user_id as user_id,
- ai.company_id as company_id,
- count(ail.*) as nbr,
- ai.type as type,
- ai.state,
- pt.categ_id,
- ai.date_due as date_due,
- ai.account_id as account_id,
- ail.account_id as account_line_id,
- ai.partner_bank_id as partner_bank_id,
- sum(case when ai.type in ('out_refund','in_invoice') then
- -ail.quantity / u.factor
- else
- ail.quantity / u.factor
- end) as product_qty,
-
- sum(case when ai.type in ('out_refund','in_invoice') then
- -ail.price_subtotal
- else
- ail.price_subtotal
- end) / cr.rate as price_total,
-
- (case when ai.type in ('out_refund','in_invoice') then
- sum(-ail.price_subtotal)
- else
- sum(ail.price_subtotal)
- end) / (CASE WHEN sum(ail.quantity/u.factor) <> 0
- THEN
- (case when ai.type in ('out_refund','in_invoice')
- then sum(-ail.quantity/u.factor)
- else sum(ail.quantity/u.factor) end)
- ELSE 1
- END)
- / cr.rate as price_average,
-
- cr.rate as currency_rate,
- sum((select extract(epoch from avg(date_trunc('day',aml.date_created)-date_trunc('day',l.create_date)))/(24*60*60)::decimal(16,2)
- from account_move_line as aml
- left join account_invoice as a ON (a.move_id=aml.move_id)
- left join account_invoice_line as l ON (a.id=l.invoice_id)
- where a.id=ai.id)) as delay_to_pay,
- sum((select extract(epoch from avg(date_trunc('day',a.date_due)-date_trunc('day',a.date_invoice)))/(24*60*60)::decimal(16,2)
- from account_move_line as aml
- left join account_invoice as a ON (a.move_id=aml.move_id)
- left join account_invoice_line as l ON (a.id=l.invoice_id)
- where a.id=ai.id)) as due_delay,
- (case when ai.type in ('out_refund','in_invoice') then
- -ai.residual
- else
- ai.residual
- end)/ (CASE WHEN
- (select count(l.id) from account_invoice_line as l
- left join account_invoice as a ON (a.id=l.invoice_id)
- where a.id=ai.id) <> 0
- THEN
- (select count(l.id) from account_invoice_line as l
- left join account_invoice as a ON (a.id=l.invoice_id)
- where a.id=ai.id)
- ELSE 1
- END) / cr.rate as residual
+ SELECT sub.id, sub.date, sub.year, sub.month, sub.day, sub.product_id, sub.partner_id,
+ sub.payment_term, sub.period_id, sub.uom_name, sub.currency_id, sub.journal_id,
+ sub.fiscal_position, sub.user_id, sub.company_id, sub.nbr, sub.type, sub.state,
+ sub.categ_id, sub.date_due, sub.account_id, sub.account_line_id, sub.partner_bank_id,
+ sub.product_qty, sub.price_total / cr.rate as price_total, sub.price_average /cr.rate as price_average,
+ cr.rate as currency_rate, sub.residual / cr.rate as residual
"""
return select_str
- def _where(self):
- where_str = """
- WHERE cr.id in (select id from res_currency_rate cr2 where (cr2.currency_id = ai.currency_id)
- and ((ai.date_invoice is not null and cr.name <= ai.date_invoice) or (ai.date_invoice is null and cr.name <= NOW())) order by name desc limit 1)
+ def _sub_select(self):
+ select_str = """
+ SELECT min(ail.id) AS id,
+ ai.date_invoice AS date,
+ to_char(ai.date_invoice::timestamp with time zone, 'YYYY'::text) AS year,
+ to_char(ai.date_invoice::timestamp with time zone, 'MM'::text) AS month,
+ to_char(ai.date_invoice::timestamp with time zone, 'YYYY-MM-DD'::text) AS day,
+ ail.product_id, ai.partner_id, ai.payment_term, ai.period_id,
+ CASE
+ WHEN u.uom_type::text <> 'reference'::text
+ THEN ( SELECT product_uom.name
+ FROM product_uom
+ WHERE product_uom.uom_type::text = 'reference'::text
+ AND product_uom.active
+ AND product_uom.category_id = u.category_id LIMIT 1)
+ ELSE u.name
+ END AS uom_name,
+ ai.currency_id, ai.journal_id, ai.fiscal_position, ai.user_id, ai.company_id,
+ count(ail.*) AS nbr,
+ ai.type, ai.state, pt.categ_id, ai.date_due, ai.account_id, ail.account_id AS account_line_id,
+ ai.partner_bank_id,
+ SUM(CASE
+ WHEN ai.type::text = ANY (ARRAY['out_refund'::character varying::text, 'in_invoice'::character varying::text])
+ THEN (- ail.quantity) / u.factor
+ ELSE ail.quantity / u.factor
+ END) AS product_qty,
+ SUM(CASE
+ WHEN ai.type::text = ANY (ARRAY['out_refund'::character varying::text, 'in_invoice'::character varying::text])
+ THEN - ail.price_subtotal
+ ELSE ail.price_subtotal
+ END) AS price_total,
+ CASE
+ WHEN ai.type::text = ANY (ARRAY['out_refund'::character varying::text, 'in_invoice'::character varying::text])
+ THEN SUM(- ail.price_subtotal)
+ ELSE SUM(ail.price_subtotal)
+ END / CASE
+ WHEN SUM(ail.quantity / u.factor) <> 0::numeric
+ THEN CASE
+ WHEN ai.type::text = ANY (ARRAY['out_refund'::character varying::text, 'in_invoice'::character varying::text])
+ THEN SUM((- ail.quantity) / u.factor)
+ ELSE SUM(ail.quantity / u.factor)
+ END
+ ELSE 1::numeric
+ END AS price_average,
+ CASE
+ WHEN ai.type::text = ANY (ARRAY['out_refund'::character varying::text, 'in_invoice'::character varying::text])
+ THEN - ai.residual
+ ELSE ai.residual
+ END / CASE
+ WHEN (( SELECT count(l.id) AS count
+ FROM account_invoice_line l
+ LEFT JOIN account_invoice a ON a.id = l.invoice_id
+ WHERE a.id = ai.id)) <> 0
+ THEN ( SELECT count(l.id) AS count
+ FROM account_invoice_line l
+ LEFT JOIN account_invoice a ON a.id = l.invoice_id
+ WHERE a.id = ai.id)
+ ELSE 1::bigint
+ END::numeric AS residual
"""
- return where_str
+ return select_str
def _from(self):
from_str = """
- FROM account_invoice_line as ail
- left join account_invoice as ai ON (ai.id=ail.invoice_id)
- left join product_product pr on (pr.id=ail.product_id)
- left join product_template pt on (pt.id=pr.product_tmpl_id)
- left join product_uom u on (u.id=ail.uos_id),
- res_currency_rate cr
+ FROM account_invoice_line ail
+ JOIN account_invoice ai ON ai.id = ail.invoice_id
+ LEFT JOIN product_product pr ON pr.id = ail.product_id
+ left JOIN product_template pt ON pt.id = pr.product_tmpl_id
+ LEFT JOIN product_uom u ON u.id = ail.uos_id
"""
return from_str
def _group_by(self):
group_by_str = """
- GROUP BY ail.product_id,
- ai.date_invoice,
- ai.id,
- cr.rate,
- to_char(ai.date_invoice, 'YYYY'),
- to_char(ai.date_invoice, 'MM'),
- to_char(ai.date_invoice, 'YYYY-MM-DD'),
- ai.partner_id,
- ai.payment_term,
- ai.period_id,
- u.name,
- ai.currency_id,
- ai.journal_id,
- ai.fiscal_position,
- ai.user_id,
- ai.company_id,
- ai.type,
- ai.state,
- pt.categ_id,
- ai.date_due,
- ai.account_id,
- ail.account_id,
- ai.partner_bank_id,
- ai.residual,
- ai.amount_total,
- u.uom_type,
- u.category_id
+ GROUP BY ail.product_id, ai.date_invoice, ai.id,
+ to_char(ai.date_invoice::timestamp with time zone, 'YYYY'::text),
+ to_char(ai.date_invoice::timestamp with time zone, 'MM'::text),
+ to_char(ai.date_invoice::timestamp with time zone, 'YYYY-MM-DD'::text),
+ ai.partner_id, ai.payment_term, ai.period_id, u.name, ai.currency_id, ai.journal_id,
+ ai.fiscal_position, ai.user_id, ai.company_id, ai.type, ai.state, pt.categ_id,
+ ai.date_due, ai.account_id, ail.account_id, ai.partner_bank_id, ai.residual,
+ ai.amount_total, u.uom_type, u.category_id
"""
return group_by_str
def init(self, cr):
# self._table = account_invoice_report
tools.drop_view_if_exists(cr, self._table)
- cr.execute("CREATE or REPLACE VIEW %s as (%s %s %s %s)" % (
+ cr.execute("""CREATE or REPLACE VIEW %s as (
+ %s
+ FROM (
+ %s %s %s
+ ) AS sub
+ JOIN res_currency_rate cr ON (cr.currency_id = sub.currency_id)
+ WHERE
+ cr.id IN (SELECT id
+ FROM res_currency_rate cr2
+ WHERE (cr2.currency_id = sub.currency_id)
+ AND ((sub.date IS NOT NULL AND cr.name <= sub.date)
+ OR (sub.date IS NULL AND cr.name <= NOW()))
+ ORDER BY name DESC LIMIT 1)
+ )""" % (
self._table,
- self._select(), self._from(), self._where(), self._group_by()))
+ self._select(), self._sub_select(), self._from(), self._group_by()))
account_invoice_report()
diff --git a/addons/account/report/account_invoice_report_view.xml b/addons/account/report/account_invoice_report_view.xml
index 289db376e5d..66e17560bde 100644
--- a/addons/account/report/account_invoice_report_view.xml
+++ b/addons/account/report/account_invoice_report_view.xml
@@ -30,8 +30,6 @@
-
-
@@ -93,7 +91,7 @@
tree,graph{'search_default_period':1,'search_default_current':1, 'search_default_year': 1, 'search_default_category_product':1, 'search_default_customer':1, 'group_by':[], 'group_by_no_leaf':1,}
- From this report, you can have an overview of the amount invoiced to your customer as well as payment delays. The tool search can also be used to personalise your Invoices reports and so, match this analysis to your needs.
+ From this report, you can have an overview of the amount invoiced to your customer. The tool search can also be used to personalise your Invoices reports and so, match this analysis to your needs.
diff --git a/addons/account/res_currency.py b/addons/account/res_currency.py
index ce781a1e11a..60bb6152a9b 100644
--- a/addons/account/res_currency.py
+++ b/addons/account/res_currency.py
@@ -29,6 +29,7 @@ class res_currency_account(osv.osv):
if context is None:
context = {}
rate = super(res_currency_account, self)._get_conversion_rate(cr, uid, from_currency, to_currency, context=context)
+ #process the case where the account doesn't work with an outgoing currency rate method 'at date' but 'average'
account = context.get('res.currency.compute.account')
account_invert = context.get('res.currency.compute.account_invert')
if account and account.currency_mode == 'average' and account.currency_id:
diff --git a/addons/account/security/ir.model.access.csv b/addons/account/security/ir.model.access.csv
index 28bedbf65a1..d1f0bbab6b5 100644
--- a/addons/account/security/ir.model.access.csv
+++ b/addons/account/security/ir.model.access.csv
@@ -7,8 +7,6 @@ access_account_tax_internal_user,account.tax internal user,model_account_tax,bas
access_account_account,account.account,model_account_account,account.group_account_user,1,0,0,0
access_account_account_user,account.account user,model_account_account,base.group_user,1,0,0,0
access_account_account_partner_manager,account.account partner manager,model_account_account,base.group_partner_manager,1,0,0,0
-access_account_journal_view,account.journal.view,model_account_journal_view,account.group_account_user,1,0,0,0
-access_account_journal_column,account.journal.column,model_account_journal_column,account.group_account_user,1,0,0,0
access_account_journal_period_manager,account.journal.period manager,model_account_journal_period,account.group_account_manager,1,0,0,0
access_account_tax_code,account.tax.code,model_account_tax_code,account.group_account_invoice,1,0,0,0
access_account_tax,account.tax,model_account_tax,account.group_account_invoice,1,0,0,0
@@ -83,8 +81,6 @@ access_account_entries_report_employee,account.entries.report employee,model_acc
access_analytic_entries_report_manager,analytic.entries.report,model_analytic_entries_report,account.group_account_manager,1,0,0,0
access_account_cashbox_line,account.cashbox.line,model_account_cashbox_line,account.group_account_user,1,1,1,1
access_account_journal_cashbox_line,account.journal.cashbox.line,model_account_journal_cashbox_line,account.group_account_user,1,1,1,0
-access_account_journal_view_invoice,account.journal.view invoice,model_account_journal_view,account.group_account_invoice,1,1,1,1
-access_account_journal_column_invoice,account.journal.column invoice,model_account_journal_column,account.group_account_invoice,1,1,1,1
access_account_invoice_tax_accountant,account.invoice.tax accountant,model_account_invoice_tax,account.group_account_user,1,0,0,0
access_account_move_reconcile_manager,account.move.reconcile manager,model_account_move_reconcile,account.group_account_manager,1,0,0,0
access_account_analytic_line_invoice,account.analytic.line invoice,model_account_analytic_line,account.group_account_invoice,1,1,1,1
diff --git a/addons/account/static/src/js/account_move_line_quickadd.js b/addons/account/static/src/js/account_move_line_quickadd.js
new file mode 100644
index 00000000000..997b2b03bb6
--- /dev/null
+++ b/addons/account/static/src/js/account_move_line_quickadd.js
@@ -0,0 +1,99 @@
+openerp.account.quickadd = function (instance) {
+ var _t = instance.web._t,
+ _lt = instance.web._lt;
+ var QWeb = instance.web.qweb;
+
+ instance.web.account = instance.web.account || {};
+
+ instance.web.views.add('tree_account_move_line_quickadd', 'instance.web.account.QuickAddListView');
+ instance.web.account.QuickAddListView = instance.web.ListView.extend({
+ init: function() {
+ this._super.apply(this, arguments);
+ this.journals = [];
+ this.periods = [];
+ this.current_journal = null;
+ this.current_period = null;
+ this.default_period = null;
+ this.default_journal = null;
+ this.current_journal_type = null;
+ this.current_journal_currency = null;
+ this.current_journal_analytic = null;
+ },
+ start:function(){
+ var tmp = this._super.apply(this, arguments);
+ var self = this;
+ this.$el.parent().prepend(QWeb.render("AccountMoveLineQuickAdd", {widget: this}));
+
+ this.$el.parent().find('.oe_account_select_journal').change(function() {
+ self.current_journal = this.value === '' ? null : parseInt(this.value);
+ self.do_search(self.last_domain, self.last_context, self.last_group_by);
+ });
+ this.$el.parent().find('.oe_account_select_period').change(function() {
+ self.current_period = this.value === '' ? null : parseInt(this.value);
+ self.do_search(self.last_domain, self.last_context, self.last_group_by);
+ });
+ this.on('edit:after', this, function () {
+ self.$el.parent().find('.oe_account_select_journal').attr('disabled', 'disabled');
+ self.$el.parent().find('.oe_account_select_period').attr('disabled', 'disabled');
+ });
+ this.on('save:after cancel:after', this, function () {
+ self.$el.parent().find('.oe_account_select_journal').removeAttr('disabled');
+ self.$el.parent().find('.oe_account_select_period').removeAttr('disabled');
+ });
+ var mod = new instance.web.Model("account.move.line", self.dataset.context, self.dataset.domain);
+ mod.call("default_get", [['journal_id','period_id'],self.dataset.context]).then(function(result) {
+ self.current_period = result['period_id'];
+ self.current_journal = result['journal_id'];
+ });
+ return tmp;
+ },
+ do_search: function(domain, context, group_by) {
+ var self = this;
+ this.last_domain = domain;
+ this.last_context = context;
+ this.last_group_by = group_by;
+ this.old_search = _.bind(this._super, this);
+ var mod = new instance.web.Model("account.move.line", context, domain);
+ return $.when(mod.call("list_journals", []).then(function(result) {
+ self.journals = result;
+ }),mod.call("list_periods", []).then(function(result) {
+ self.periods = result;
+ })).then(function () {
+ var o;
+ self.$el.parent().find('.oe_account_select_journal').children().remove().end();
+ self.$el.parent().find('.oe_account_select_journal').append(new Option('', ''));
+ for (var i = 0;i < self.journals.length;i++){
+ o = new Option(self.journals[i][1], self.journals[i][0]);
+ if (self.journals[i][0] === self.current_journal){
+ self.current_journal_type = self.journals[i][2];
+ self.current_journal_currency = self.journals[i][3];
+ self.current_journal_analytic = self.journals[i][4];
+ $(o).attr('selected',true);
+ }
+ self.$el.parent().find('.oe_account_select_journal').append(o);
+ }
+ self.$el.parent().find('.oe_account_select_period').children().remove().end();
+ self.$el.parent().find('.oe_account_select_period').append(new Option('', ''));
+ for (var i = 0;i < self.periods.length;i++){
+ o = new Option(self.periods[i][1], self.periods[i][0]);
+ self.$el.parent().find('.oe_account_select_period').append(o);
+ }
+ self.$el.parent().find('.oe_account_select_period').val(self.current_period).attr('selected',true);
+ return self.search_by_journal_period();
+ });
+ },
+ search_by_journal_period: function() {
+ var self = this;
+ var domain = [];
+ if (self.current_journal !== null) domain.push(["journal_id", "=", self.current_journal]);
+ if (self.current_period !== null) domain.push(["period_id", "=", self.current_period]);
+ self.last_context["journal_id"] = self.current_journal === null ? false : self.current_journal;
+ if (self.current_period === null) delete self.last_context["period_id"];
+ else self.last_context["period_id"] = self.current_period;
+ self.last_context["journal_type"] = self.current_journal_type;
+ self.last_context["currency"] = self.current_journal_currency;
+ self.last_context["analytic_journal_id"] = self.current_journal_analytic;
+ return self.old_search(new instance.web.CompoundDomain(self.last_domain, domain), self.last_context, self.last_group_by);
+ },
+ });
+};
diff --git a/addons/account/static/src/js/account_move_reconciliation.js b/addons/account/static/src/js/account_move_reconciliation.js
index 22fe9b7b392..19c194166e2 100644
--- a/addons/account/static/src/js/account_move_reconciliation.js
+++ b/addons/account/static/src/js/account_move_reconciliation.js
@@ -1,9 +1,10 @@
openerp.account = function (instance) {
+ openerp.account.quickadd(instance);
var _t = instance.web._t,
_lt = instance.web._lt;
var QWeb = instance.web.qweb;
- instance.web.account = {};
+ instance.web.account = instance.web.account || {};
instance.web.views.add('tree_account_reconciliation', 'instance.web.account.ReconciliationListView');
instance.web.account.ReconciliationListView = instance.web.ListView.extend({
diff --git a/addons/account/static/src/xml/account_move_line_quickadd.xml b/addons/account/static/src/xml/account_move_line_quickadd.xml
new file mode 100644
index 00000000000..3ed66eec917
--- /dev/null
+++ b/addons/account/static/src/xml/account_move_line_quickadd.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
+
Period :
+
+
+
+
Journal :
+
+
+
+
+
+
diff --git a/addons/account/test/account_fiscalyear_close.yml b/addons/account/test/account_fiscalyear_close.yml
index 1e24d2ca0e7..1c3547ccefd 100644
--- a/addons/account/test/account_fiscalyear_close.yml
+++ b/addons/account/test/account_fiscalyear_close.yml
@@ -29,7 +29,6 @@
default_debit_account_id: cash
default_credit_account_id: cash
company_id: base.main_company
- view_id: account_journal_bank_view
centralisation: 1
-
I called the Generate Fiscalyear Opening Entries wizard
@@ -47,47 +46,4 @@
!python {model: account.fiscalyear.close}: |
self.data_save(cr, uid, [ref("account_fiscalyear_close_0")], {"lang": 'en_US',
"active_model": "ir.ui.menu", "active_ids": [ref("account.menu_wizard_fy_close")],
- "tz": False, "active_id": ref("account.menu_wizard_fy_close"), })
-
--
- I check the opening entries By using "Entries by Line wizard"
--
- !record {model: account.move.journal, id: account_move_journal_0}:
- {}
--
- I clicked on Open Journal Button to check the entries
-
--
- !python {model: account.move.journal}: |
- self.action_open_window(cr, uid, [ref("account_move_journal_0")], {"lang": 'en_US',
- "active_model": "ir.ui.menu", "active_ids": [ref("account.menu_action_move_journal_line_form")],
- "tz": False, "active_id": ref("account.menu_action_move_journal_line_form"),
- })
-
-#-
-# In order to test Cancel Opening Entries I cancelled the opening entries created for "Fiscal Year 2011"
-#-
-# !record {model: account.open.closed.fiscalyear, id: account_open_closed_fiscalyear_1}:
-# fyear_id: account.data_fiscalyear
-#-
-# I clicked on Open button
-#-
-# !python {model: account.open.closed.fiscalyear}: |
-# self.remove_entries(cr, uid, [ref("account_open_closed_fiscalyear_1")], {"lang":
-# 'en_US', "active_model": "ir.ui.menu", "active_ids": [ref("account.menu_wizard_open_closed_fy")],
-# "tz": False, "active_id": ref("account.menu_wizard_open_closed_fy"), })
-#-
-# I check the opening entries By using "Entries by Line wizard"
-#-
-# !record {model: account.move.journal, id: account_move_journal_2}:
-# journal_id: account.sales_journal
-# period_id: account_period_jan11
-#
-#-
-# I checked the Opening entries are cancelled successfully
-#-
-# !python {model: account.move.journal}: |
-# self.action_open_window(cr, uid, [ref("account_move_journal_2")], {"lang": 'en_US',
-# "active_model": "ir.ui.menu", "active_ids": [ref("account.menu_action_move_journal_line_form")],
-# "tz": False, "active_id": ref("account.menu_action_move_journal_line_form"),
-# })
+ "tz": False, "active_id": ref("account.menu_wizard_fy_close"), })
\ No newline at end of file
diff --git a/addons/account/test/account_validate_account_move.yml b/addons/account/test/account_validate_account_move.yml
index 188df14c234..d47ee564019 100644
--- a/addons/account/test/account_validate_account_move.yml
+++ b/addons/account/test/account_validate_account_move.yml
@@ -30,10 +30,9 @@
-
!python {model: account.move.line}: |
import time
- date = self._get_date(cr, uid, {'lang': u'en_US', 'normal_view': False, 'active_model': 'ir.ui.menu',
- 'search_default_journal_id': 1, 'journal_type': 'sale', 'search_default_period_id': 6, 'journal_id': 1, 'view_mode': False,
- 'visible_id': 1, 'period_id': 6, 'tz': False, 'active_ids': [ref('menu_action_account_moves_all')],
- 'search_default_posted': 0, 'active_id': ref('menu_action_account_moves_all')})
+ date = self._get_date(cr, uid, {
+ 'journal_id': 1,
+ 'period_id': 6,})
partner = self.onchange_partner_id(cr, uid, [], False, ref('base.res_partner_12'), ref('account.cash'), debit=0, credit=2000, date=date, journal=False)
account = self.onchange_account_id(cr, uid, [], account_id=ref('account.a_recv'), partner_id= ref('base.res_partner_12'))
vals = {
@@ -62,11 +61,10 @@
!python {model: account.move.line}: |
ids = self._balance_search(cr, uid, self, 'balance', [('balance', '=', 2000.0)], None, {'lang': u'en_US', 'tz': False, 'active_model': 'ir.ui.menu',
'search_default_journal_id': 1, 'journal_type': 'sale', 'search_default_period_id': 6, 'view_mode': False, 'visible_id': 1,
- 'active_ids': [ref('menu_action_account_moves_all')], 'search_default_posted': 0, 'active_id': ref('menu_action_account_moves_all')})
+ 'search_default_posted': 0})
bal = self._balance(cr, uid, ids[0][2], 'balance', None,{'lang': u'en_US', 'tz': False, 'active_model': 'ir.ui.menu',
'search_default_journal_id': 1, 'journal_type': 'sale', 'search_default_period_id': 6, 'view_mode': False,
- 'visible_id': 1, 'active_ids': [ref('menu_action_account_moves_all')], 'search_default_posted': 0,
- 'active_id': ref('menu_action_account_moves_all')})
+ 'visible_id': 1, 'search_default_posted': 0})
assert bal, 'Balance has not been computed correctly'
-
I check that Initially account move state is "Draft"
diff --git a/addons/account/wizard/__init__.py b/addons/account/wizard/__init__.py
index 87a053d558c..839e490ca66 100644
--- a/addons/account/wizard/__init__.py
+++ b/addons/account/wizard/__init__.py
@@ -31,7 +31,6 @@ import account_reconcile_partner_process
import account_reconcile
import account_unreconcile
import account_invoice_refund
-import account_move_journal
import account_journal_select
import account_move_bank_reconcile
import account_subscription_generate
diff --git a/addons/account/wizard/account_fiscalyear_close.py b/addons/account/wizard/account_fiscalyear_close.py
index dbf815d5218..e11b4dcd34b 100644
--- a/addons/account/wizard/account_fiscalyear_close.py
+++ b/addons/account/wizard/account_fiscalyear_close.py
@@ -60,7 +60,7 @@ class account_fiscalyear_close(osv.osv_memory):
cr.execute('select distinct(company_id) from account_move_line where id in %s',(tuple(ids),))
if len(cr.fetchall()) > 1:
raise osv.except_osv(_('Warning!'), _('The entries to reconcile should belong to the same company.'))
- r_id = self.pool.get('account.move.reconcile').create(cr, uid, {'type': 'auto'})
+ r_id = self.pool.get('account.move.reconcile').create(cr, uid, {'type': 'auto', 'opening_reconciliation': True})
cr.execute('update account_move_line set reconcile_id = %s where id in %s',(r_id, tuple(ids),))
return r_id
@@ -107,7 +107,7 @@ class account_fiscalyear_close(osv.osv_memory):
('journal_id', '=', new_journal.id), ('period_id', '=', period.id)])
if move_ids:
move_line_ids = obj_acc_move_line.search(cr, uid, [('move_id', 'in', move_ids)])
- obj_acc_move_line._remove_move_reconcile(cr, uid, move_line_ids, context=context)
+ obj_acc_move_line._remove_move_reconcile(cr, uid, move_line_ids, opening_reconciliation=True, context=context)
obj_acc_move_line.unlink(cr, uid, move_line_ids, context=context)
obj_acc_move.unlink(cr, uid, move_ids, context=context)
diff --git a/addons/account/wizard/account_move_journal.py b/addons/account/wizard/account_move_journal.py
deleted file mode 100644
index 246532d38d7..00000000000
--- a/addons/account/wizard/account_move_journal.py
+++ /dev/null
@@ -1,194 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-# OpenERP, Open Source Management Solution
-# Copyright (C) 2004-2010 Tiny SPRL ().
-#
-# 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 lxml import etree
-
-from osv import osv, fields
-from tools.translate import _
-import tools
-
-class account_move_journal(osv.osv_memory):
- _name = "account.move.journal"
- _description = "Move journal"
-
- _columns = {
- 'target_move': fields.selection([('posted', 'All Posted Entries'),
- ('all', 'All Entries'),
- ], 'Target Moves', required=True),
- }
-
- _defaults = {
- 'target_move': 'all'
- }
- def _get_period(self, cr, uid, context=None):
- """
- Return default account period value
- """
- account_period_obj = self.pool.get('account.period')
- ids = account_period_obj.find(cr, uid, context=context)
- period_id = False
- if ids:
- period_id = ids[0]
- return period_id
-
- def _get_journal(self, cr, uid, context=None):
- """
- Return journal based on the journal type
- """
-
- journal_id = False
-
- journal_pool = self.pool.get('account.journal')
- if context.get('journal_type', False):
- jids = journal_pool.search(cr, uid, [('type','=', context.get('journal_type'))])
- if not jids:
- raise osv.except_osv(_('Configuration Error!'), _('Cannot find any account journal of %s type for this company.\n\nYou can create one in the menu: \nConfiguration/Journals/Journals.') % context.get('journal_type'))
- journal_id = jids[0]
-
- return journal_id
-
- def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
- """
- Returns views and fields for current model where view will depend on {view_type}.
- @param cr: A database cursor
- @param user: ID of the user currently logged in
- @param view_id: list of fields, which required to read signatures
- @param view_type: defines a view type. it can be one of (form, tree, graph, calender, gantt, search, mdx)
- @param context: context arguments, like lang, time zone
- @param toolbar: contains a list of reports, wizards, and links related to current model
-
- @return: Returns a dict that contains definition for fields, views, and toolbars
- """
- if context is None:context = {}
- res = super(account_move_journal, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar,submenu=False)
-
- if context:
- if not view_id:
- return res
-
- period_pool = self.pool.get('account.period')
- journal_pool = self.pool.get('account.journal')
-
- journal_id = self._get_journal(cr, uid, context)
- period_id = self._get_period(cr, uid, context)
-
- journal = False
- if journal_id:
- journal = journal_pool.read(cr, uid, journal_id, ['name'], context=context).get('name',False)
- journal_string = _("Journal: %s") % tools.ustr(journal)
- else:
- journal_string = _("Journal: All")
-
- period = False
- if period_id:
- period = period_pool.browse(cr, uid, period_id, context=context).name
- period_string = _("Period: %s") % tools.ustr(period)
-
- open_string = _("Open")
- view = """
- """ % (_('Journal'), journal_string, _('Period'), period_string, open_string)
-
- view = etree.fromstring(view.encode('utf8'))
- xarch, xfields = self._view_look_dom_arch(cr, uid, view, view_id, context=context)
- view = xarch
- res.update({
- 'arch': view
- })
- return res
-
- def action_open_window(self, cr, uid, ids, context=None):
- """
- This function Open action move line window on given period and Journal/Payment Mode
- @param cr: the current row, from the database cursor,
- @param uid: the current user’s ID for security checks,
- @param ids: account move journal’s ID or list of IDs
- @return: dictionary of Open action move line window on given period and Journal/Payment Mode
- """
-
- period_pool = self.pool.get('account.journal.period')
- data_pool = self.pool.get('ir.model.data')
- journal_pool = self.pool.get('account.journal')
- account_period_obj = self.pool.get('account.period')
-
- if context is None:
- context = {}
-
- journal_id = self._get_journal(cr, uid, context)
- period_id = self._get_period(cr, uid, context)
- target_move = self.read(cr, uid, ids, ['target_move'], context=context)[0]['target_move']
-
- name = _("Journal Items")
- if journal_id:
- ids = period_pool.search(cr, uid, [('journal_id', '=', journal_id), ('period_id', '=', period_id)], context=context)
-
- if not ids:
- journal = journal_pool.browse(cr, uid, journal_id, context=context)
- period = account_period_obj.browse(cr, uid, period_id, context=context)
-
- name = journal.name
- state = period.state
-
- if state == 'done':
- raise osv.except_osv(_('User Error!'), _('This period is already closed.'))
-
- company = period.company_id.id
- res = {
- 'name': name,
- 'period_id': period_id,
- 'journal_id': journal_id,
- 'company_id': company
- }
- period_pool.create(cr, uid, res,context=context)
-
- ids = period_pool.search(cr, uid, [('journal_id', '=', journal_id), ('period_id', '=', period_id)], context=context)
- period = period_pool.browse(cr, uid, ids[0], context=context)
- name = (period.journal_id.code or '') + ':' + (period.period_id.code or '')
-
- result = data_pool.get_object_reference(cr, uid, 'account', 'view_account_move_line_filter')
- res_id = result and result[1] or False
- move = 0
- if target_move == 'posted':
- move = 1
- return {
- 'name': name,
- 'view_type': 'form',
- 'view_mode': 'tree,graph,form',
- 'res_model': 'account.move.line',
- 'view_id': False,
- 'context': "{'search_default_posted': %d, 'search_default_journal_id':%d, 'search_default_period_id':%d}" % (move, journal_id, period_id),
- 'type': 'ir.actions.act_window',
- 'search_view_id': res_id
- }
-
-account_move_journal()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/wizard/account_move_journal_view.xml b/addons/account/wizard/account_move_journal_view.xml
deleted file mode 100644
index 5d80cf319c5..00000000000
--- a/addons/account/wizard/account_move_journal_view.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-
-
- account.move.journal.form
- account.move.journal
-
-
-
-
-
-
-
diff --git a/addons/account_accountant/i18n/es_DO.po b/addons/account_accountant/i18n/es_DO.po
new file mode 100644
index 00000000000..bfe70bac2ab
--- /dev/null
+++ b/addons/account_accountant/i18n/es_DO.po
@@ -0,0 +1,23 @@
+# Spanish (Dominican Republic) 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-11-24 02:51+0000\n"
+"PO-Revision-Date: 2012-11-29 20:23+0000\n"
+"Last-Translator: Jose Ernesto Mendez \n"
+"Language-Team: Spanish (Dominican Republic) \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-11-30 05:08+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
+
+#. module: account_accountant
+#: model:ir.actions.client,name:account_accountant.action_client_account_menu
+msgid "Open Accounting Menu"
+msgstr "Abrir Menú de Contabilidad"
diff --git a/addons/account_accountant/i18n/it.po b/addons/account_accountant/i18n/it.po
index db12ba122d0..2436e754e50 100644
--- a/addons/account_accountant/i18n/it.po
+++ b/addons/account_accountant/i18n/it.po
@@ -8,19 +8,19 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2012-11-24 02:51+0000\n"
-"PO-Revision-Date: 2011-01-17 07:34+0000\n"
-"Last-Translator: Nicola Riolini - Micronaet \n"
+"PO-Revision-Date: 2012-11-28 19:50+0000\n"
+"Last-Translator: Davide Corio - agilebg.com \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: 2012-11-25 06:28+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
#. module: account_accountant
#: model:ir.actions.client,name:account_accountant.action_client_account_menu
msgid "Open Accounting Menu"
-msgstr ""
+msgstr "Apri Menù Contabilità"
#~ msgid "Accountant"
#~ msgstr "Contabile"
diff --git a/addons/account_accountant/i18n/nl_BE.po b/addons/account_accountant/i18n/nl_BE.po
index 7240f08569a..2a5ef937b6e 100644
--- a/addons/account_accountant/i18n/nl_BE.po
+++ b/addons/account_accountant/i18n/nl_BE.po
@@ -8,19 +8,19 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2012-11-24 02:51+0000\n"
-"PO-Revision-Date: 2010-12-17 09:40+0000\n"
-"Last-Translator: Niels Huylebroeck \n"
+"PO-Revision-Date: 2012-11-27 13:16+0000\n"
+"Last-Translator: Els Van Vossel (Agaplan) \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: 2012-11-25 06:28+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
#. module: account_accountant
#: model:ir.actions.client,name:account_accountant.action_client_account_menu
msgid "Open Accounting Menu"
-msgstr ""
+msgstr "Menu Boekhouding openen"
#~ msgid "Accountant"
#~ msgstr "Accountant"
diff --git a/addons/account_analytic_analysis/__init__.py b/addons/account_analytic_analysis/__init__.py
index 429aa011f31..9aae723c5cf 100644
--- a/addons/account_analytic_analysis/__init__.py
+++ b/addons/account_analytic_analysis/__init__.py
@@ -21,6 +21,7 @@
import account_analytic_analysis
import cron_account_analytic_account
+import res_config
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_analytic_analysis/__openerp__.py b/addons/account_analytic_analysis/__openerp__.py
index 7675ef9f38e..53ebf225de1 100644
--- a/addons/account_analytic_analysis/__openerp__.py
+++ b/addons/account_analytic_analysis/__openerp__.py
@@ -40,6 +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_menu.xml',
'account_analytic_analysis_cron.xml',
+ 'res_config_view.xml',
],
'css': [
'static/src/css/analytic.css'
diff --git a/addons/account_analytic_analysis/account_analytic_analysis.py b/addons/account_analytic_analysis/account_analytic_analysis.py
index 06e2fd2bb18..466db63e61e 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis.py
+++ b/addons/account_analytic_analysis/account_analytic_analysis.py
@@ -75,15 +75,21 @@ class account_analytic_account(osv.osv):
res[id][f] = 0.0
res2 = {}
for account in accounts:
- cr.execute("SELECT product_id, user_id, to_invoice, sum(unit_amount), product_uom_id, name " \
- "FROM account_analytic_line as line " \
- "WHERE account_id = %s " \
- "AND invoice_id is NULL AND to_invoice IS NOT NULL " \
- "GROUP BY product_id, user_id, to_invoice, product_uom_id, name", (account.id,))
+ cr.execute("""
+ SELECT product_id, sum(amount), user_id, to_invoice, sum(unit_amount), product_uom_id, line.name
+ FROM account_analytic_line line
+ LEFT JOIN account_analytic_journal journal ON (journal.id = line.journal_id)
+ WHERE account_id = %s
+ AND journal.type != 'purchase'
+ AND invoice_id IS NULL
+ AND to_invoice IS NOT NULL
+ GROUP BY product_id, user_id, to_invoice, product_uom_id, line.name""", (account.id,))
res[account.id][f] = 0.0
- for product_id, user_id, factor_id, qty, uom, line_name in cr.fetchall():
- price = self.pool.get('account.analytic.line')._get_invoice_price(cr, uid, account, product_id, user_id, qty, context)
+ for product_id, price, user_id, factor_id, qty, uom, line_name in cr.fetchall():
+ price = -price
+ if product_id:
+ price = self.pool.get('account.analytic.line')._get_invoice_price(cr, uid, account, product_id, user_id, qty, context)
factor = self.pool.get('hr_timesheet_invoice.factor').browse(cr, uid, factor_id, context=context)
res[account.id][f] += price * qty * (100-factor.factor or 0.0) / 100.0
diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
index fd32edba0a1..2ece3a38652 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
@@ -60,14 +60,13 @@
or view
-
+
No order to invoice, create
-
+ />
@@ -148,6 +147,18 @@
+
+ account.analytic.account.form.template.required
+ account.analytic.account
+
+
+
+
+ {'required': [('type','=','contract')], 'invisible': [('type','in',['view', 'normal','template'])]}
+
+
+
+
Template of Contractir.actions.act_window
diff --git a/addons/account_analytic_analysis/i18n/es_MX.po b/addons/account_analytic_analysis/i18n/es_MX.po
index ba7a0cc051d..4c6bde2bcf6 100644
--- a/addons/account_analytic_analysis/i18n/es_MX.po
+++ b/addons/account_analytic_analysis/i18n/es_MX.po
@@ -1,91 +1,46 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-# * account_analytic_analysis
+# Spanish (Mexico) 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: OpenERP Server 6.0dev_rc3\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-01-13 09:42+0000\n"
-"Last-Translator: Alberto Luengo Cabanillas (Pexego) \n"
-"Language-Team: \n"
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"PO-Revision-Date: 2012-11-27 23:22+0000\n"
+"Last-Translator: OscarAlca \n"
+"Language-Team: Spanish (Mexico) \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-05 05:25+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:14+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
#. module: account_analytic_analysis
-#: help:account.analytic.account,hours_qtt_invoiced:0
-msgid ""
-"Number of hours that can be invoiced plus those that already have been "
-"invoiced."
-msgstr ""
-"Número de horas que pueden ser facturadas más aquellas que ya han sido "
-"facturadas."
+#: view:account.analytic.account:0
+msgid "No order to invoice, create"
+msgstr "No existe orden a facturar"
#. module: account_analytic_analysis
-#: help:account.analytic.account,remaining_ca:0
-msgid "Computed using the formula: Max Invoice Price - Invoiced Amount."
-msgstr ""
-"Calculado usando la fórmula: Precio máx. factura - Importe facturado."
+#: view:account.analytic.account:0
+msgid "Group By..."
+msgstr "Agrupar por..."
#. module: account_analytic_analysis
-#: help:account.analytic.account,remaining_hours:0
-msgid "Computed using the formula: Maximum Quantity - Hours Tot."
-msgstr "Calculado utilizando la fórmula: Cantidad máxima - Horas totales."
+#: view:account.analytic.account:0
+msgid "To Invoice"
+msgstr "Para facturar"
#. module: account_analytic_analysis
-#: code:addons/account_analytic_analysis/account_analytic_analysis.py:532
-#: code:addons/account_analytic_analysis/account_analytic_analysis.py:703
-#, python-format
-msgid "AccessError"
-msgstr "Error de acceso"
+#: view:account.analytic.account:0
+msgid "Remaining"
+msgstr "Restante"
#. module: account_analytic_analysis
-#: help:account.analytic.account,last_invoice_date:0
-msgid "Date of the last invoice created for this analytic account."
-msgstr "Fecha de la última factura creada para esta cuenta analítica."
-
-#. module: account_analytic_analysis
-#: model:ir.module.module,description:account_analytic_analysis.module_meta_information
-msgid ""
-"\n"
-"This module is for modifying account analytic view to show\n"
-"important data to project manager of services companies.\n"
-"Adds menu to show relevant information to each manager..\n"
-"\n"
-"You can also view the report of account analytic summary\n"
-"user-wise as well as month wise.\n"
-msgstr ""
-"\n"
-"Este módulo modifica la vista de cuenta analítica para mostrar\n"
-"datos importantes para el director de proyectos en empresas de servicios.\n"
-"Añade menú para mostrar información relevante para cada director.\n"
-"\n"
-"También puede ver el informe del resumen contable analítico\n"
-"a nivel de usuario, así como a nivel mensual.\n"
-
-#. module: account_analytic_analysis
-#: field:account.analytic.account,last_invoice_date:0
-msgid "Last Invoice Date"
-msgstr "Fecha última factura"
-
-#. module: account_analytic_analysis
-#: help:account.analytic.account,theorical_margin:0
-msgid "Computed using the formula: Theorial Revenue - Total Costs"
-msgstr "Calculado usando la fórmula: Ingresos teóricos - Costes totales"
-
-#. module: account_analytic_analysis
-#: field:account.analytic.account,real_margin_rate:0
-msgid "Real Margin Rate (%)"
-msgstr "Tasa de margen real (%)"
-
-#. module: account_analytic_analysis
-#: field:account.analytic.account,ca_theorical:0
-msgid "Theoretical Revenue"
-msgstr "Ingresos teóricos"
+#: view:account.analytic.account:0
+msgid "Contracts in progress"
+msgstr "Contratos en progreso"
#. module: account_analytic_analysis
#: help:account.analytic.account,last_worked_invoiced_date:0
@@ -93,59 +48,13 @@ msgid ""
"If invoice from the costs, this is the date of the latest work or cost that "
"have been invoiced."
msgstr ""
-"Si factura a partir de los costes, ésta es la fecha del último trabajo o "
-"coste que se ha facturado."
-
-#. module: account_analytic_analysis
-#: model:ir.ui.menu,name:account_analytic_analysis.menu_invoicing
-msgid "Billing"
-msgstr "Facturación"
+"Si factura a partir de los costos, ésta es la fecha del último trabajo o "
+"costo que se ha facturado."
#. module: account_analytic_analysis
#: field:account.analytic.account,last_worked_date:0
msgid "Date of Last Cost/Work"
-msgstr "Fecha del último coste/trabajo"
-
-#. module: account_analytic_analysis
-#: field:account.analytic.account,total_cost:0
-msgid "Total Costs"
-msgstr "Costes totales"
-
-#. module: account_analytic_analysis
-#: help:account.analytic.account,hours_quantity:0
-msgid ""
-"Number of hours you spent on the analytic account (from timesheet). It "
-"computes on all journal of type 'general'."
-msgstr ""
-"Cantidad de horas que dedica a la cuenta analítica (desde horarios). Calcula "
-"en todos los diarios del tipo 'general'."
-
-#. module: account_analytic_analysis
-#: field:account.analytic.account,remaining_hours:0
-msgid "Remaining Hours"
-msgstr "Horas restantes"
-
-#. module: account_analytic_analysis
-#: field:account.analytic.account,theorical_margin:0
-msgid "Theoretical Margin"
-msgstr "Márgen teórico"
-
-#. module: account_analytic_analysis
-#: help:account.analytic.account,ca_theorical:0
-msgid ""
-"Based on the costs you had on the project, what would have been the revenue "
-"if all these costs have been invoiced at the normal sale price provided by "
-"the pricelist."
-msgstr ""
-"Basado en los costes que tenía en el proyecto, lo que habría sido el "
-"ingreso si todos estos costes se hubieran facturado con el precio de venta "
-"normal proporcionado por la tarifa."
-
-#. module: account_analytic_analysis
-#: field:account.analytic.account,user_ids:0
-#: field:account_analytic_analysis.summary.user,user:0
-msgid "User"
-msgstr "Usuario"
+msgstr "Fecha del último costo/trabajo"
#. module: account_analytic_analysis
#: field:account.analytic.account,ca_to_invoice:0
@@ -153,71 +62,194 @@ msgid "Uninvoiced Amount"
msgstr "Importe no facturado"
#. module: account_analytic_analysis
-#: help:account.analytic.account,real_margin:0
-msgid "Computed using the formula: Invoiced Amount - Total Costs."
-msgstr "Calculado utilizando la fórmula: Importe facturado - Costes totales."
+#: view:account.analytic.account:0
+msgid ""
+"When invoicing on timesheet, OpenERP uses the\n"
+" pricelist of the contract which uses the price\n"
+" defined on the product related to each employee "
+"to\n"
+" define the customer invoice price rate."
+msgstr ""
+"Cuando se factura la Hoja de trabajo, OpenERP usa la\n"
+" lista de precios del contracto que a su vez usa "
+"el precio\n"
+" definido en el producto relacionado a cada "
+"empleado para\n"
+" definir el precio de la factura del cliente."
#. module: account_analytic_analysis
-#: field:account.analytic.account,hours_qtt_non_invoiced:0
-msgid "Uninvoiced Hours"
-msgstr "Horas no facturadas"
-
-#. module: account_analytic_analysis
-#: help:account.analytic.account,last_worked_date:0
-msgid "Date of the latest work done on this account."
-msgstr "Fecha del último trabajo realizado en esta cuenta."
-
-#. module: account_analytic_analysis
-#: model:ir.module.module,shortdesc:account_analytic_analysis.module_meta_information
-msgid "report_account_analytic"
-msgstr "Informes contabilidad analítica"
-
-#. module: account_analytic_analysis
-#: model:ir.model,name:account_analytic_analysis.model_account_analytic_analysis_summary_user
-msgid "Hours Summary by User"
-msgstr "Resumen de horas por usuario"
+#: view:account.analytic.account:0
+msgid "⇒ Invoice"
+msgstr "Facturar"
#. module: account_analytic_analysis
#: field:account.analytic.account,ca_invoiced:0
msgid "Invoiced Amount"
msgstr "Importe facturado"
-#. module: account_analytic_analysis
-#: code:addons/account_analytic_analysis/account_analytic_analysis.py:533
-#: code:addons/account_analytic_analysis/account_analytic_analysis.py:704
-#, python-format
-msgid "You try to bypass an access rule (Document type: %s)."
-msgstr "Ha intentado saltarse una regla de acceso (tipo de documento: %s)."
-
#. module: account_analytic_analysis
#: field:account.analytic.account,last_worked_invoiced_date:0
msgid "Date of Last Invoiced Cost"
-msgstr "Fecha del último coste facturado"
+msgstr "Fecha del último costo facturado"
#. module: account_analytic_analysis
-#: field:account.analytic.account,hours_qtt_invoiced:0
-msgid "Invoiced Hours"
-msgstr "Horas facturadas"
-
-#. module: account_analytic_analysis
-#: field:account.analytic.account,real_margin:0
-msgid "Real Margin"
-msgstr "Margen real"
-
-#. module: account_analytic_analysis
-#: constraint:account.analytic.account:0
-msgid ""
-"Error! The currency has to be the same as the currency of the selected "
-"company"
-msgstr ""
-"¡Error! La divisa tiene que ser la misma que la establecida en la compañía "
-"seleccionada"
+#: help:account.analytic.account,fix_price_to_invoice:0
+msgid "Sum of quotations for this contract."
+msgstr "Suma de las cotizaciones para este contrato"
#. module: account_analytic_analysis
#: help:account.analytic.account,ca_invoiced:0
msgid "Total customer invoiced amount for this account."
msgstr "Importe total facturado al cliente para esta cuenta."
+#. module: account_analytic_analysis
+#: help:account.analytic.account,timesheet_ca_invoiced:0
+msgid "Sum of timesheet lines invoiced for this contract."
+msgstr ""
+"Suma de las lineas de la hoja de trabajo facturadas para este contrato."
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,revenue_per_hour:0
+msgid "Computed using the formula: Invoiced Amount / Total Time"
+msgstr "Calculado utilizando la fórmula: Importe facturado / Tiempo total"
+
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Contracts not assigned"
+msgstr "No tiene contratos asignados"
+
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Partner"
+msgstr "Empresa"
+
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Contracts that are not assigned to an account manager."
+msgstr "Contratos que no han sido asignados a un gerente de cuenta"
+
+#. module: account_analytic_analysis
+#: model:ir.actions.act_window,help:account_analytic_analysis.action_account_analytic_overdue
+msgid ""
+"
\n"
+" Click to define a new contract.\n"
+"
\n"
+" You will find here the contracts to be renewed because the\n"
+" end date is passed or the working effort is higher than the\n"
+" maximum authorized one.\n"
+"
\n"
+" OpenERP automatically sets contracts to be renewed in a "
+"pending\n"
+" state. After the negociation, the salesman should close or "
+"renew\n"
+" pending contracts.\n"
+"
\n"
+" "
+msgstr ""
+"
\n"
+" Click para definir un nuevo contrato.\n"
+"
\n"
+" Aquí encontrará los contratos que serán renovados a los que "
+"\n"
+" la fecha ha expirado o la cantidad de trabajo es mayor que "
+"el \n"
+" máximo autorizado.\n"
+"
\n"
+" OpenERP cambia automaticamente los contratos a ser renovados "
+"a estado pendiente.\n"
+" Despues de negociar, el vendedor deve cerrar o renovar "
+"contratos pendientes.\n"
+"
\n"
+" "
+
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "End Date"
+msgstr "Fecha de término"
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,hours_qtt_non_invoiced:0
+msgid ""
+"Number of time (hours/days) (from journal of type 'general') that can be "
+"invoiced if you invoice based on analytic account."
+msgstr ""
+"Número de tiempo(horas/días) (desde diario de tipo 'general') que pueden ser "
+"facturados si su factura está basada en cuentas analíticas"
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,remaining_hours_to_invoice:0
+msgid "Computed using the formula: Maximum Time - Total Invoiced Time"
+msgstr "Calculado usando la formula: Tiempo Máximo - Tiempo total facturado"
+
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Expected"
+msgstr "Esperado"
+
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+#: field:account_analytic_analysis.summary.month,account_id:0
+#: field:account_analytic_analysis.summary.user,account_id:0
+#: model:ir.model,name:account_analytic_analysis.model_account_analytic_account
+msgid "Analytic Account"
+msgstr "Cuenta Analítica"
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,theorical_margin:0
+msgid "Computed using the formula: Theoretical Revenue - Total Costs"
+msgstr "Calculado utilizando la formula: Ingresos Teóricos - Costos totales"
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,hours_qtt_invoiced:0
+msgid "Invoiced Time"
+msgstr "Tiempo facturado"
+
+#. module: account_analytic_analysis
+#: constraint:account.analytic.account:0
+msgid "Error! You cannot create recursive analytic accounts."
+msgstr "Error! No es posible crear cuentas analíticas recursivas."
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,real_margin_rate:0
+msgid "Real Margin Rate (%)"
+msgstr "Tasa de margen real (%)"
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,remaining_hours:0
+msgid "Computed using the formula: Maximum Time - Total Worked Time"
+msgstr ""
+"Calculado utilizando la formula: Tiempo Maximo - Tiempo Total Trabajado"
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,hours_quantity:0
+msgid ""
+"Number of time you spent on the analytic account (from timesheet). It "
+"computes quantities on all journal of type 'general'."
+msgstr ""
+"Cantidad de tiempo que utilizaste en la cuenta analítica (Hoja de trabajo). "
+"Calcula cantidades en todos los diarios de tipo 'General'."
+
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Nothing to invoice, create"
+msgstr "Nada por facturar"
+
+#. module: account_analytic_analysis
+#: model:ir.actions.act_window,name:account_analytic_analysis.template_of_contract_action
+#: model:ir.ui.menu,name:account_analytic_analysis.menu_template_of_contract_action
+msgid "Template of Contract"
+msgstr "Plantilla de contrato"
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,hours_quantity:0
+msgid "Total Worked Time"
+msgstr "Tiempo total trabajado"
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,real_margin:0
+msgid "Real Margin"
+msgstr "Margen real"
+
#. module: account_analytic_analysis
#: model:ir.model,name:account_analytic_analysis.model_account_analytic_analysis_summary_month
msgid "Hours summary by month"
@@ -229,18 +261,346 @@ msgid "Computes using the formula: (Real Margin / Total Costs) * 100."
msgstr "Calcula utilizando la fórmula: (Margen real / Costes totales) * 100."
#. module: account_analytic_analysis
-#: help:account.analytic.account,hours_qtt_non_invoiced:0
-msgid ""
-"Number of hours (from journal of type 'general') that can be invoiced if you "
-"invoice based on analytic account."
-msgstr ""
-"Número de horas (desde diario de tipo 'general') que pueden ser facturadas "
-"si factura basado en contabilidad analítica."
+#: view:account.analytic.account:0
+msgid "or view"
+msgstr "o vista"
#. module: account_analytic_analysis
#: view:account.analytic.account:0
-msgid "Analytic accounts"
-msgstr "Cuentas analíticas"
+msgid "Parent"
+msgstr "Padre"
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,month_ids:0
+#: field:account_analytic_analysis.summary.month,month:0
+msgid "Month"
+msgstr "Mes"
+
+#. module: account_analytic_analysis
+#: model:ir.actions.act_window,name:account_analytic_analysis.action_hr_tree_invoiced_all
+#: model:ir.ui.menu,name:account_analytic_analysis.menu_action_hr_tree_invoiced_all
+msgid "Time & Materials to Invoice"
+msgstr "Tiempo y materiales a facturar."
+
+#. module: account_analytic_analysis
+#: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_overdue_all
+#: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_overdue_all
+msgid "Contracts"
+msgstr "Contratos"
+
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Start Date"
+msgstr "Fecha inicial"
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,total_cost:0
+msgid ""
+"Total of costs for this account. It includes real costs (from invoices) and "
+"indirect costs, like time spent on timesheets."
+msgstr ""
+"Costos totales para esta cuenta. Incluye costos reales (desde facturas) y "
+"costos indirectos, como el tiempo empleado en hojas de trabajo (horarios)."
+
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid ""
+"The contracts to be renewed because the deadline is passed or the working "
+"hours are higher than the allocated hours"
+msgstr ""
+"El contrato necesita ser renovado porque la fecha de finalización ha "
+"terminado o las horas trabajadas son más que las asignadas"
+
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Pending contracts to renew with your customer"
+msgstr "Contratos pendientes para renovar con el cliente"
+
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Timesheets"
+msgstr "Hojas de trabajo"
+
+#. module: account_analytic_analysis
+#: code:addons/account_analytic_analysis/account_analytic_analysis.py:452
+#, python-format
+msgid "Sale Order Lines of %s"
+msgstr "Lineas de venta para %s"
+
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Pending"
+msgstr "Pendiente"
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,is_overdue_quantity:0
+msgid "Overdue Quantity"
+msgstr "Cantidad sobrepasada"
+
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Status"
+msgstr "Estado"
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,ca_theorical:0
+msgid "Theoretical Revenue"
+msgstr "Ingresos teóricos"
+
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "To Renew"
+msgstr "Para renovar"
+
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid ""
+"A contract in OpenERP is an analytic account having a partner set on it."
+msgstr ""
+"Un contrato en OpenERP es una cuenta analítica que tiene un cliente asignado."
+
+#. module: account_analytic_analysis
+#: model:ir.actions.act_window,name:account_analytic_analysis.action_sales_order
+msgid "Sales Orders"
+msgstr "Orden de Venta"
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,last_invoice_date:0
+msgid "If invoice from the costs, this is the date of the latest invoiced."
+msgstr "Si factura desde costos, esta es la fecha de lo último facturado"
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,ca_theorical:0
+msgid ""
+"Based on the costs you had on the project, what would have been the revenue "
+"if all these costs have been invoiced at the normal sale price provided by "
+"the pricelist."
+msgstr ""
+"Basado en los costes que tenía en el proyecto, lo que habría sido el "
+"ingreso si todos estos costes se hubieran facturado con el precio de venta "
+"normal proporcionado por la lista de precios."
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,user_ids:0
+#: field:account_analytic_analysis.summary.user,user:0
+msgid "User"
+msgstr "Usuario"
+
+#. module: account_analytic_analysis
+#: model:ir.actions.act_window,help:account_analytic_analysis.template_of_contract_action
+msgid ""
+"
\n"
+" Click here to create a template of contract.\n"
+"
\n"
+" Templates are used to prefigure contract/project that \n"
+" can be selected by the salespeople to quickly configure "
+"the\n"
+" terms and conditions of the contract.\n"
+"
\n"
+" "
+msgstr ""
+"
\n"
+" Click aquí para crear una plantilla de contrato.\n"
+"
\n"
+" Las plantillas son utilizadas para pre-configurar "
+"contratos/proyectos que \n"
+" que pueden ser seleccionados por los agentes de ventas "
+"para configurar rápidamente los\n"
+" términos y condiciones del contrato.\n"
+"
\n"
+" "
+
+#. module: account_analytic_analysis
+#: model:ir.model,name:account_analytic_analysis.model_account_analytic_analysis_summary_user
+msgid "Hours Summary by User"
+msgstr "Resumen de horas por usuario"
+
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Contract"
+msgstr "Contrato"
+
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Invoiced"
+msgstr "Facturado"
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,hours_qtt_invoiced:0
+msgid ""
+"Number of time (hours/days) that can be invoiced plus those that already "
+"have been invoiced."
+msgstr ""
+"Cantidad de tiempo(horas/días) que pueden ser facturadas más las que ya han "
+"sido facturadas."
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,revenue_per_hour:0
+msgid "Revenue per Time (real)"
+msgstr "Beneficio por tiempo(real)"
+
+#. module: account_analytic_analysis
+#: model:ir.actions.act_window,help:account_analytic_analysis.action_account_analytic_overdue_all
+msgid ""
+"
\n"
+" Click to create a new contract.\n"
+"
\n"
+" Use contracts to follow tasks, issues, timesheets or "
+"invoicing based on\n"
+" work done, expenses and/or sales orders. OpenERP will "
+"automatically manage\n"
+" the alerts for the renewal of the contracts to the right "
+"salesperson.\n"
+"
\n"
+" "
+msgstr ""
+"
\n"
+" Click aquí para crear un nuevo contrato.\n"
+"
\n"
+" Use contratos para dar seguimiento a tareas, problemas, "
+"hojas de trabajo o facturacion basada en \n"
+" trabajos realizados, gastos y/o ordenes de venta. "
+"OpenERP maneja automáticamente alertas\n"
+" para la renovación de contratos a la persona de ventas "
+"indicada.\n"
+"
\n"
+" You will find here timesheets and purchases you did for\n"
+" contracts that can be reinvoiced to the customer. If you "
+"want\n"
+" to record new activities to invoice, you should use the "
+"timesheet\n"
+" menu instead.\n"
+"
\n"
+" "
+msgstr ""
+"
\n"
+" Encontrara aqui las hojas de trabajo y compras que ha "
+"realizado para\n"
+" contratos que pueden ser refacturados al cliente. Si desea "
+"agregar \n"
+" nuevas lineas para facturar, debe utilizar el menú de hoja "
+"de trabajo.\n"
+"
\n"
+" "
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,hours_qtt_non_invoiced:0
+msgid "Uninvoiced Time"
+msgstr "Tiempo sin facturar"
+
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Invoicing"
+msgstr "Facturación"
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,total_cost:0
+msgid "Total Costs"
+msgstr "Costos totales"
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,remaining_total:0
+msgid ""
+"Expectation of remaining income for this contract. Computed as the sum of "
+"remaining subtotals which, in turn, are computed as the maximum between "
+"'(Estimation - Invoiced)' and 'To Invoice' amounts"
+msgstr ""
+"Expectativa de ingresos restantes para este contrato. Calculado como la suma "
+"de los subtotales restantes que, a su vez, se calculan como el máximo entre "
+"'(Estimación - facturado)' y cantidades 'a facturar'"
+
+#. module: account_analytic_analysis
+#: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_overdue
+#: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_overdue
+msgid "Contracts to Renew"
+msgstr "Contratos a renovar"
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,toinvoice_total:0
+msgid " Sum of everything that could be invoiced for this contract."
+msgstr " Suma de todo lo que puede ser facturado en este contrato."
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,theorical_margin:0
+msgid "Theoretical Margin"
+msgstr "Márgen teórico"
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,remaining_total:0
+msgid "Total Remaining"
+msgstr "Total restante"
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,real_margin:0
+msgid "Computed using the formula: Invoiced Amount - Total Costs."
+msgstr "Calculado utilizando la fórmula: Importe facturado - Costos totales."
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,hours_qtt_est:0
+msgid "Estimation of Hours to Invoice"
+msgstr "Estimacion de horas a facturar."
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,fix_price_invoices:0
+msgid "Fixed Price"
+msgstr "Precio fijo"
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,last_worked_date:0
+msgid "Date of the latest work done on this account."
+msgstr "Fecha del último trabajo realizado en esta cuenta."
+
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Contracts Having a Partner"
+msgstr "Contratos que tiene una empresa"
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,est_total:0
+msgid "Total Estimation"
+msgstr "Estimación Total"
#. module: account_analytic_analysis
#: field:account.analytic.account,remaining_ca:0
@@ -253,128 +613,29 @@ msgid ""
"If invoice from analytic account, the remaining amount you can invoice to "
"the customer based on the total costs."
msgstr ""
-"Si factura basado en contabilidad analítica, el importe restante que puede "
-"facturar al cliente basado en los costes totales."
-
-#. module: account_analytic_analysis
-#: help:account.analytic.account,revenue_per_hour:0
-msgid "Computed using the formula: Invoiced Amount / Hours Tot."
-msgstr "Calculado utilizando la fórmula: Importe facturado / Horas totales."
-
-#. module: account_analytic_analysis
-#: field:account.analytic.account,revenue_per_hour:0
-msgid "Revenue per Hours (real)"
-msgstr "Ingresos por horas (real)"
+"Si factura desde contabilidad analítica, el importe restante que puede "
+"facturar al cliente basado en los costos totales."
#. module: account_analytic_analysis
#: field:account_analytic_analysis.summary.month,unit_amount:0
#: field:account_analytic_analysis.summary.user,unit_amount:0
msgid "Total Time"
-msgstr "Tiempo total"
+msgstr "Tiempo Total"
#. module: account_analytic_analysis
-#: field:account.analytic.account,month_ids:0
-#: field:account_analytic_analysis.summary.month,month:0
-msgid "Month"
-msgstr "Mes"
+#: field:account.analytic.account,invoice_on_timesheets:0
+msgid "On Timesheets"
+msgstr "En hojas de trabajo"
#. module: account_analytic_analysis
-#: field:account_analytic_analysis.summary.month,account_id:0
-#: field:account_analytic_analysis.summary.user,account_id:0
-#: model:ir.model,name:account_analytic_analysis.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "Cuenta analítica"
+#: field:account.analytic.account,fix_price_to_invoice:0
+#: field:account.analytic.account,remaining_hours:0
+#: field:account.analytic.account,remaining_hours_to_invoice:0
+#: field:account.analytic.account,timesheet_ca_invoiced:0
+msgid "Remaining Time"
+msgstr "Tiempo restante"
#. module: account_analytic_analysis
-#: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_managed_overpassed
-#: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_managed_overpassed
-msgid "Overpassed Accounts"
-msgstr "Cuentas caducadas"
-
-#. module: account_analytic_analysis
-#: model:ir.actions.act_window,name:account_analytic_analysis.action_hr_tree_invoiced_all
-#: model:ir.ui.menu,name:account_analytic_analysis.menu_action_hr_tree_invoiced_all
-msgid "All Uninvoiced Entries"
-msgstr "Todas las entradas no facturadas"
-
-#. module: account_analytic_analysis
-#: field:account.analytic.account,hours_quantity:0
-msgid "Hours Tot"
-msgstr "Horas totales"
-
-#. module: account_analytic_analysis
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr "¡Error! No puede crear cuentas analíticas recursivas."
-
-#. module: account_analytic_analysis
-#: help:account.analytic.account,total_cost:0
-msgid ""
-"Total of costs for this account. It includes real costs (from invoices) and "
-"indirect costs, like time spent on timesheets."
-msgstr ""
-"Costes totales para esta cuenta. Incluye costes reales (desde facturas) y "
-"costes indirectos, como el tiempo empleado en hojas de servicio (horarios)."
-
-#~ msgid "Hours summary by user"
-#~ msgstr "Resumen de horas por usuario"
-
-#~ msgid "All Analytic Accounts"
-#~ msgstr "Todas las cuentas analíticas"
-
-#~ msgid "My Current Accounts"
-#~ msgstr "Mis cuentas actuales"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "¡XML inválido para la definición de la vista!"
-
-#~ msgid "Theorical Revenue"
-#~ msgstr "Ingresos teóricos"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-#~ "especial!"
-
-#~ msgid "New Analytic Account"
-#~ msgstr "Nueva cuenta analítica"
-
-#~ msgid "Theorical Margin"
-#~ msgstr "Margen teórico"
-
-#~ msgid "Current Analytic Accounts"
-#~ msgstr "Cuentas analíticas actuales"
-
-#~ msgid "Invoicing"
-#~ msgstr "Facturación"
-
-#~ msgid "My Pending Accounts"
-#~ msgstr "Mis cuentas pendientes"
-
-#~ msgid "My Uninvoiced Entries"
-#~ msgstr "Mis entradas no facturadas"
-
-#~ msgid "My Accounts"
-#~ msgstr "Mis cuentas"
-
-#~ msgid "Analytic Accounts"
-#~ msgstr "Cuentas analíticas"
-
-#~ msgid "Financial Project Management"
-#~ msgstr "Gestión de proyectos financieros"
-
-#~ msgid "Pending Analytic Accounts"
-#~ msgstr "Cuentas analíticas pendientes"
-
-#~ msgid ""
-#~ "Modify account analytic view to show\n"
-#~ "important data for project manager of services companies.\n"
-#~ "Add menu to show relevant information for each manager."
-#~ msgstr ""
-#~ "Modifica la vista de cuenta analítica para mostrar\n"
-#~ "datos importantes para el director de proyectos en empresas de servicios.\n"
-#~ "Añade menú para mostrar información relevante para cada director."
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nombre de modelo no válido en la definición de acción."
+#: view:account.analytic.account:0
+msgid "Total"
+msgstr "Total"
diff --git a/addons/account_analytic_analysis/i18n/nb.po b/addons/account_analytic_analysis/i18n/nb.po
index fef85e92608..4a446cf3fb7 100644
--- a/addons/account_analytic_analysis/i18n/nb.po
+++ b/addons/account_analytic_analysis/i18n/nb.po
@@ -8,19 +8,19 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2011-08-23 11:12+0000\n"
-"Last-Translator: Rolv Råen \n"
+"PO-Revision-Date: 2012-11-28 13:42+0000\n"
+"Last-Translator: Kaare Pettersen \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-11-25 06:06+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:14+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
#. module: account_analytic_analysis
#: view:account.analytic.account:0
msgid "No order to invoice, create"
-msgstr ""
+msgstr "Ingen ordre til å fakturere, opprett."
#. module: account_analytic_analysis
#: view:account.analytic.account:0
@@ -30,12 +30,12 @@ msgstr "Grupper etter ..."
#. module: account_analytic_analysis
#: view:account.analytic.account:0
msgid "To Invoice"
-msgstr ""
+msgstr "Å fakturere."
#. module: account_analytic_analysis
#: view:account.analytic.account:0
msgid "Remaining"
-msgstr ""
+msgstr "Gjenstår."
#. module: account_analytic_analysis
#: view:account.analytic.account:0
@@ -74,7 +74,7 @@ msgstr ""
#. module: account_analytic_analysis
#: view:account.analytic.account:0
msgid "⇒ Invoice"
-msgstr ""
+msgstr "⇒ Faktura."
#. module: account_analytic_analysis
#: field:account.analytic.account,ca_invoiced:0
@@ -109,12 +109,12 @@ msgstr "Beregnet ved hjelp av formelen: Fakturert beløp / Total tid"
#. module: account_analytic_analysis
#: view:account.analytic.account:0
msgid "Contracts not assigned"
-msgstr ""
+msgstr "Kontrakter som ikke er tilordnet."
#. module: account_analytic_analysis
#: view:account.analytic.account:0
msgid "Partner"
-msgstr ""
+msgstr "Partner."
#. module: account_analytic_analysis
#: view:account.analytic.account:0
@@ -162,7 +162,7 @@ msgstr ""
#. module: account_analytic_analysis
#: view:account.analytic.account:0
msgid "Expected"
-msgstr ""
+msgstr "Forventet."
#. module: account_analytic_analysis
#: view:account.analytic.account:0
@@ -185,7 +185,7 @@ msgstr "Fakturert tid"
#. module: account_analytic_analysis
#: constraint:account.analytic.account:0
msgid "Error! You cannot create recursive analytic accounts."
-msgstr ""
+msgstr "Feil! Du kan ikke opprette rekursive analytiske kontoer."
#. module: account_analytic_analysis
#: field:account.analytic.account,real_margin_rate:0
@@ -209,18 +209,18 @@ msgstr ""
#. module: account_analytic_analysis
#: view:account.analytic.account:0
msgid "Nothing to invoice, create"
-msgstr ""
+msgstr "Ikke noe å fakturere, opprett."
#. module: account_analytic_analysis
#: model:ir.actions.act_window,name:account_analytic_analysis.template_of_contract_action
#: model:ir.ui.menu,name:account_analytic_analysis.menu_template_of_contract_action
msgid "Template of Contract"
-msgstr ""
+msgstr "Mal av kontrakt."
#. module: account_analytic_analysis
#: field:account.analytic.account,hours_quantity:0
msgid "Total Worked Time"
-msgstr ""
+msgstr "Totalt arbeids tid."
#. module: account_analytic_analysis
#: field:account.analytic.account,real_margin:0
@@ -240,7 +240,7 @@ msgstr "Beregnet etter formelen: (Virkelig margin / Totale kostnader) * 100"
#. module: account_analytic_analysis
#: view:account.analytic.account:0
msgid "or view"
-msgstr ""
+msgstr "Eller vis."
#. module: account_analytic_analysis
#: view:account.analytic.account:0
@@ -257,7 +257,7 @@ msgstr "Måned"
#: model:ir.actions.act_window,name:account_analytic_analysis.action_hr_tree_invoiced_all
#: model:ir.ui.menu,name:account_analytic_analysis.menu_action_hr_tree_invoiced_all
msgid "Time & Materials to Invoice"
-msgstr ""
+msgstr "Tid og materialer til å fakturere."
#. module: account_analytic_analysis
#: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_overdue_all
@@ -268,7 +268,7 @@ msgstr "Kontrakter"
#. module: account_analytic_analysis
#: view:account.analytic.account:0
msgid "Start Date"
-msgstr ""
+msgstr "Startdato."
#. module: account_analytic_analysis
#: help:account.analytic.account,total_cost:0
@@ -296,13 +296,13 @@ msgstr "Ventende kontrakter til å fornye med dine kunder"
#. module: account_analytic_analysis
#: view:account.analytic.account:0
msgid "Timesheets"
-msgstr ""
+msgstr "Timelister."
#. module: account_analytic_analysis
#: code:addons/account_analytic_analysis/account_analytic_analysis.py:452
#, python-format
msgid "Sale Order Lines of %s"
-msgstr ""
+msgstr "Salgs ordre linjer av %s."
#. module: account_analytic_analysis
#: view:account.analytic.account:0
@@ -317,7 +317,7 @@ msgstr "Forfalt Antall"
#. module: account_analytic_analysis
#: view:account.analytic.account:0
msgid "Status"
-msgstr ""
+msgstr "Status."
#. module: account_analytic_analysis
#: field:account.analytic.account,ca_theorical:0
@@ -339,7 +339,7 @@ msgstr ""
#. module: account_analytic_analysis
#: model:ir.actions.act_window,name:account_analytic_analysis.action_sales_order
msgid "Sales Orders"
-msgstr ""
+msgstr "Salgsordre."
#. module: account_analytic_analysis
#: help:account.analytic.account,last_invoice_date:0
@@ -391,7 +391,7 @@ msgstr "Kontrakt"
#. module: account_analytic_analysis
#: view:account.analytic.account:0
msgid "Invoiced"
-msgstr ""
+msgstr "Fakturert."
#. module: account_analytic_analysis
#: help:account.analytic.account,hours_qtt_invoiced:0
@@ -426,12 +426,12 @@ msgstr ""
#. module: account_analytic_analysis
#: field:account.analytic.account,toinvoice_total:0
msgid "Total to Invoice"
-msgstr ""
+msgstr "Totalt å fakturere."
#. module: account_analytic_analysis
#: view:account.analytic.account:0
msgid "Sale Orders"
-msgstr ""
+msgstr "Salgs ordre."
#. module: account_analytic_analysis
#: view:account.analytic.account:0
@@ -441,7 +441,7 @@ msgstr "Åpen"
#. module: account_analytic_analysis
#: field:account.analytic.account,invoiced_total:0
msgid "Total Invoiced"
-msgstr ""
+msgstr "Totalt fakturert."
#. module: account_analytic_analysis
#: help:account.analytic.account,remaining_ca:0
@@ -451,7 +451,7 @@ msgstr "Beregnet med formelen: Maks. fakturapris - fakturert beløp"
#. module: account_analytic_analysis
#: view:account.analytic.account:0
msgid "Responsible"
-msgstr ""
+msgstr "Ansvarlig."
#. module: account_analytic_analysis
#: field:account.analytic.account,last_invoice_date:0
@@ -504,7 +504,7 @@ msgstr "Kontrakter til å fornye"
#. module: account_analytic_analysis
#: help:account.analytic.account,toinvoice_total:0
msgid " Sum of everything that could be invoiced for this contract."
-msgstr ""
+msgstr " Summen av alt som kunne blitt fakturert for denne kontrakten."
#. module: account_analytic_analysis
#: field:account.analytic.account,theorical_margin:0
@@ -514,7 +514,7 @@ msgstr "Teoretisk margin"
#. module: account_analytic_analysis
#: field:account.analytic.account,remaining_total:0
msgid "Total Remaining"
-msgstr ""
+msgstr "Totalt gjenværende."
#. module: account_analytic_analysis
#: help:account.analytic.account,real_margin:0
@@ -529,7 +529,7 @@ msgstr ""
#. module: account_analytic_analysis
#: field:account.analytic.account,fix_price_invoices:0
msgid "Fixed Price"
-msgstr ""
+msgstr "Fikset pris."
#. module: account_analytic_analysis
#: help:account.analytic.account,last_worked_date:0
diff --git a/addons/account_analytic_analysis/i18n/zh_CN.po b/addons/account_analytic_analysis/i18n/zh_CN.po
index a331655d94c..136ec39ec05 100644
--- a/addons/account_analytic_analysis/i18n/zh_CN.po
+++ b/addons/account_analytic_analysis/i18n/zh_CN.po
@@ -7,19 +7,19 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-02-09 02:53+0000\n"
-"Last-Translator: 开阖软件 Jeff Wang \n"
+"PO-Revision-Date: 2012-11-29 10:29+0000\n"
+"Last-Translator: ccdos \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:06+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-30 05:07+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
#. module: account_analytic_analysis
#: view:account.analytic.account:0
msgid "No order to invoice, create"
-msgstr ""
+msgstr "没有订单被开票，创建"
#. module: account_analytic_analysis
#: view:account.analytic.account:0
@@ -29,12 +29,12 @@ msgstr "分组..."
#. module: account_analytic_analysis
#: view:account.analytic.account:0
msgid "To Invoice"
-msgstr ""
+msgstr "开票"
#. module: account_analytic_analysis
#: view:account.analytic.account:0
msgid "Remaining"
-msgstr ""
+msgstr "剩余"
#. module: account_analytic_analysis
#: view:account.analytic.account:0
@@ -71,7 +71,7 @@ msgstr ""
#. module: account_analytic_analysis
#: view:account.analytic.account:0
msgid "⇒ Invoice"
-msgstr ""
+msgstr "=> 开票"
#. module: account_analytic_analysis
#: field:account.analytic.account,ca_invoiced:0
@@ -86,7 +86,7 @@ msgstr "最近的已发票日期"
#. module: account_analytic_analysis
#: help:account.analytic.account,fix_price_to_invoice:0
msgid "Sum of quotations for this contract."
-msgstr ""
+msgstr "合同的报价单汇总"
#. module: account_analytic_analysis
#: help:account.analytic.account,ca_invoiced:0
@@ -96,7 +96,7 @@ msgstr "这科目的客户发票合计"
#. module: account_analytic_analysis
#: help:account.analytic.account,timesheet_ca_invoiced:0
msgid "Sum of timesheet lines invoiced for this contract."
-msgstr ""
+msgstr "合同已开票的计工单行的汇总"
#. module: account_analytic_analysis
#: help:account.analytic.account,revenue_per_hour:0
@@ -106,12 +106,12 @@ msgstr "计算公式：已开票金额 / 总时数"
#. module: account_analytic_analysis
#: view:account.analytic.account:0
msgid "Contracts not assigned"
-msgstr ""
+msgstr "合同没指定"
#. module: account_analytic_analysis
#: view:account.analytic.account:0
msgid "Partner"
-msgstr ""
+msgstr "业务伙伴"
#. module: account_analytic_analysis
#: view:account.analytic.account:0
@@ -157,7 +157,7 @@ msgstr ""
#. module: account_analytic_analysis
#: view:account.analytic.account:0
msgid "Expected"
-msgstr ""
+msgstr "预期"
#. module: account_analytic_analysis
#: view:account.analytic.account:0
@@ -170,7 +170,7 @@ msgstr "辅助核算项"
#. module: account_analytic_analysis
#: help:account.analytic.account,theorical_margin:0
msgid "Computed using the formula: Theoretical Revenue - Total Costs"
-msgstr ""
+msgstr "用此公式计算：理论收入 - 总成本"
#. module: account_analytic_analysis
#: field:account.analytic.account,hours_qtt_invoiced:0
@@ -180,7 +180,7 @@ msgstr "已开票的工时"
#. module: account_analytic_analysis
#: constraint:account.analytic.account:0
msgid "Error! You cannot create recursive analytic accounts."
-msgstr ""
+msgstr "错误！你不能循环创建辅助核算项"
#. module: account_analytic_analysis
#: field:account.analytic.account,real_margin_rate:0
@@ -190,7 +190,7 @@ msgstr "实际利润(%)"
#. module: account_analytic_analysis
#: help:account.analytic.account,remaining_hours:0
msgid "Computed using the formula: Maximum Time - Total Worked Time"
-msgstr ""
+msgstr "用下列公式计算：最大工时 - 总工作时间"
#. module: account_analytic_analysis
#: help:account.analytic.account,hours_quantity:0
@@ -202,7 +202,7 @@ msgstr "你在这个成本科目上花费的时间总数（数据来自计工单
#. module: account_analytic_analysis
#: view:account.analytic.account:0
msgid "Nothing to invoice, create"
-msgstr ""
+msgstr "尚未开票，创建"
#. module: account_analytic_analysis
#: model:ir.actions.act_window,name:account_analytic_analysis.template_of_contract_action
@@ -213,7 +213,7 @@ msgstr ""
#. module: account_analytic_analysis
#: field:account.analytic.account,hours_quantity:0
msgid "Total Worked Time"
-msgstr ""
+msgstr "总工作时间"
#. module: account_analytic_analysis
#: field:account.analytic.account,real_margin:0
@@ -233,7 +233,7 @@ msgstr "计算公式为:(实际利润/总成本×100)"
#. module: account_analytic_analysis
#: view:account.analytic.account:0
msgid "or view"
-msgstr ""
+msgstr "或 视图"
#. module: account_analytic_analysis
#: view:account.analytic.account:0
@@ -250,7 +250,7 @@ msgstr "月"
#: model:ir.actions.act_window,name:account_analytic_analysis.action_hr_tree_invoiced_all
#: model:ir.ui.menu,name:account_analytic_analysis.menu_action_hr_tree_invoiced_all
msgid "Time & Materials to Invoice"
-msgstr ""
+msgstr "要开票的工时和材料"
#. module: account_analytic_analysis
#: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_overdue_all
@@ -261,7 +261,7 @@ msgstr "合同"
#. module: account_analytic_analysis
#: view:account.analytic.account:0
msgid "Start Date"
-msgstr ""
+msgstr "开始日期"
#. module: account_analytic_analysis
#: help:account.analytic.account,total_cost:0
@@ -285,13 +285,13 @@ msgstr "需要与客户续签的合同"
#. module: account_analytic_analysis
#: view:account.analytic.account:0
msgid "Timesheets"
-msgstr ""
+msgstr "计工单"
#. module: account_analytic_analysis
#: code:addons/account_analytic_analysis/account_analytic_analysis.py:452
#, python-format
msgid "Sale Order Lines of %s"
-msgstr ""
+msgstr "销售单行 %s"
#. module: account_analytic_analysis
#: view:account.analytic.account:0
@@ -306,7 +306,7 @@ msgstr "超期数量"
#. module: account_analytic_analysis
#: view:account.analytic.account:0
msgid "Status"
-msgstr ""
+msgstr "状态"
#. module: account_analytic_analysis
#: field:account.analytic.account,ca_theorical:0
@@ -327,7 +327,7 @@ msgstr "OpenERP中的合同是指一个被指定了业务伙伴的成本科目
#. module: account_analytic_analysis
#: model:ir.actions.act_window,name:account_analytic_analysis.action_sales_order
msgid "Sales Orders"
-msgstr ""
+msgstr "销售订单"
#. module: account_analytic_analysis
#: help:account.analytic.account,last_invoice_date:0
@@ -375,7 +375,7 @@ msgstr "合同"
#. module: account_analytic_analysis
#: view:account.analytic.account:0
msgid "Invoiced"
-msgstr ""
+msgstr "已开票"
#. module: account_analytic_analysis
#: help:account.analytic.account,hours_qtt_invoiced:0
@@ -413,7 +413,7 @@ msgstr ""
#. module: account_analytic_analysis
#: view:account.analytic.account:0
msgid "Sale Orders"
-msgstr ""
+msgstr "销售订单"
#. module: account_analytic_analysis
#: view:account.analytic.account:0
@@ -423,7 +423,7 @@ msgstr "使用中"
#. module: account_analytic_analysis
#: field:account.analytic.account,invoiced_total:0
msgid "Total Invoiced"
-msgstr ""
+msgstr "已开发票数量"
#. module: account_analytic_analysis
#: help:account.analytic.account,remaining_ca:0
@@ -433,7 +433,7 @@ msgstr "计算公式为:最大发票价格 - 已开票金额"
#. module: account_analytic_analysis
#: view:account.analytic.account:0
msgid "Responsible"
-msgstr ""
+msgstr "负责人"
#. module: account_analytic_analysis
#: field:account.analytic.account,last_invoice_date:0
@@ -511,7 +511,7 @@ msgstr ""
#. module: account_analytic_analysis
#: field:account.analytic.account,fix_price_invoices:0
msgid "Fixed Price"
-msgstr ""
+msgstr "固定价格"
#. module: account_analytic_analysis
#: help:account.analytic.account,last_worked_date:0
@@ -526,7 +526,7 @@ msgstr ""
#. module: account_analytic_analysis
#: field:account.analytic.account,est_total:0
msgid "Total Estimation"
-msgstr ""
+msgstr "总的估值"
#. module: account_analytic_analysis
#: field:account.analytic.account,remaining_ca:0
@@ -549,7 +549,7 @@ msgstr "总时间"
#. module: account_analytic_analysis
#: field:account.analytic.account,invoice_on_timesheets:0
msgid "On Timesheets"
-msgstr ""
+msgstr "在计工单上"
#. module: account_analytic_analysis
#: field:account.analytic.account,fix_price_to_invoice:0
@@ -562,7 +562,7 @@ msgstr "剩余时间"
#. module: account_analytic_analysis
#: view:account.analytic.account:0
msgid "Total"
-msgstr ""
+msgstr "合计"
#~ msgid "Invalid model name in the action definition."
#~ msgstr "在动作定义中输入的对象名称错误"
diff --git a/addons/account_analytic_analysis/res_config.py b/addons/account_analytic_analysis/res_config.py
new file mode 100644
index 00000000000..94fe769fdd4
--- /dev/null
+++ b/addons/account_analytic_analysis/res_config.py
@@ -0,0 +1,31 @@
+# -*- 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 sale_configuration(osv.osv_memory):
+ _inherit = 'sale.config.settings'
+
+ _columns = {
+ 'group_template_required': fields.boolean("Mandatory use of templates.",
+ implied_group='account_analytic_analysis.group_template_required',
+ help="Allows you to set the template field as required when creating an analytic account or a contract."),
+ }
diff --git a/addons/account_analytic_analysis/res_config_view.xml b/addons/account_analytic_analysis/res_config_view.xml
new file mode 100644
index 00000000000..9c7881f2a9e
--- /dev/null
+++ b/addons/account_analytic_analysis/res_config_view.xml
@@ -0,0 +1,21 @@
+
+
+
+
+
+ sale settings
+ sale.config.settings
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/account_analytic_analysis/security/account_analytic_analysis_security.xml b/addons/account_analytic_analysis/security/account_analytic_analysis_security.xml
index 8bcc7f2d7f0..948c390e039 100644
--- a/addons/account_analytic_analysis/security/account_analytic_analysis_security.xml
+++ b/addons/account_analytic_analysis/security/account_analytic_analysis_security.xml
@@ -6,5 +6,12 @@
+
+ Mandatory use of templates in contracts
+
+ the field template of the analytic accounts and contracts will be required.
+
+
+
-
\ No newline at end of file
+
diff --git a/addons/account_analytic_default/i18n/es_MX.po b/addons/account_analytic_default/i18n/es_MX.po
index 2de02ed6c80..3e6c5ce6837 100644
--- a/addons/account_analytic_default/i18n/es_MX.po
+++ b/addons/account_analytic_default/i18n/es_MX.po
@@ -1,38 +1,21 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-# * account_analytic_default
+# Spanish (Mexico) 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: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2010-12-26 08:03+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"\n"
-"Language-Team: \n"
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"PO-Revision-Date: 2012-11-27 23:44+0000\n"
+"Last-Translator: OscarAlca \n"
+"Language-Team: Spanish (Mexico) \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-05 05:29+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
-
-#. module: account_analytic_default
-#: model:ir.module.module,shortdesc:account_analytic_default.module_meta_information
-msgid "Account Analytic Default"
-msgstr "Cuenta analítica por defecto"
-
-#. module: account_analytic_default
-#: help:account.analytic.default,partner_id:0
-msgid ""
-"select a partner which will use analytical account specified in analytic "
-"default (eg. create new cutomer invoice or Sale order if we select this "
-"partner, it will automatically take this as an analytical account)"
-msgstr ""
-"Seleccione una empresa que utilizará esta cuenta analítica como la cuenta "
-"analítica por defecto (por ejemplo, al crear nuevas facturas de cliente o "
-"pedidos de venta, si se selecciona esta empresa, automáticamente se "
-"utilizará esta cuenta analítica)."
+"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
#. module: account_analytic_default
#: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_partner
@@ -41,16 +24,6 @@ msgstr ""
msgid "Analytic Rules"
msgstr "Reglas analíticas"
-#. module: account_analytic_default
-#: help:account.analytic.default,analytic_id:0
-msgid "Analytical Account"
-msgstr "Cuenta analítica"
-
-#. module: account_analytic_default
-#: view:account.analytic.default:0
-msgid "Current"
-msgstr "Actual"
-
#. module: account_analytic_default
#: view:account.analytic.default:0
msgid "Group By..."
@@ -58,13 +31,13 @@ msgstr "Agrupar por..."
#. module: account_analytic_default
#: help:account.analytic.default,date_stop:0
-msgid "Default end date for this Analytical Account"
-msgstr "Fecha final por defecto para esta cuenta analítica."
+msgid "Default end date for this Analytic Account."
+msgstr "Fecha final default para esta Cuenta Analítica."
#. module: account_analytic_default
#: model:ir.model,name:account_analytic_default.model_stock_picking
msgid "Picking List"
-msgstr "Albarán"
+msgstr "Lista de Movimientos."
#. module: account_analytic_default
#: view:account.analytic.default:0
@@ -72,21 +45,15 @@ msgid "Conditions"
msgstr "Condiciones"
#. module: account_analytic_default
-#: help:account.analytic.default,company_id:0
+#: help:account.analytic.default,partner_id:0
msgid ""
-"select a company which will use analytical account specified in analytic "
-"default (eg. create new cutomer invoice or Sale order if we select this "
-"company, it will automatically take this as an analytical account)"
+"Select a partner which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sale order if we select this "
+"partner, it will automatically take this as an analytic account)"
msgstr ""
-"Seleccione una compañía que utilizará esta cuenta analítica como la cuenta "
-"analítica por defecto (por ejemplo, al crear nuevas facturas de cliente o "
-"pedidos de venta, si se selecciona esta compañía, automáticamente se "
-"utilizará esta cuenta analítica)."
-
-#. module: account_analytic_default
-#: help:account.analytic.default,date_start:0
-msgid "Default start date for this Analytical Account"
-msgstr "Fecha inicial por defecto para esta cuenta analítica."
+"Seleccione la empresa que utilizara la cuenta analítica especificada por "
+"defecto.(ej. crea una nueva factura de cliente u Orden de venta si "
+"seleccionamos esta empresa, este automáticamente toma esta cuenta analítica)"
#. module: account_analytic_default
#: view:account.analytic.default:0
@@ -116,65 +83,57 @@ msgstr "Usuario"
msgid "Entries"
msgstr "Asientos"
+#. module: account_analytic_default
+#: help:account.analytic.default,product_id:0
+msgid ""
+"Select a product which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sale order if we select this "
+"product, it will automatically take this as an analytic account)"
+msgstr ""
+"Seleccione el producto que utilizara la cuenta espeficifcada por defecto "
+"(ej. crea una nueva factura de cliente u orden de venta si seleccionamos "
+"este producto, este, automáticamente tomara esto como una cuenta analítica)"
+
#. module: account_analytic_default
#: field:account.analytic.default,date_stop:0
msgid "End Date"
msgstr "Fecha final"
-#. module: account_analytic_default
-#: help:account.analytic.default,user_id:0
-msgid ""
-"select a user which will use analytical account specified in analytic default"
-msgstr ""
-"Seleccione un usuario que utilizará esta cuenta analítica como la cuenta "
-"analítica por defecto."
-
#. module: account_analytic_default
#: view:account.analytic.default:0
#: model:ir.actions.act_window,name:account_analytic_default.action_analytic_default_list
#: model:ir.ui.menu,name:account_analytic_default.menu_analytic_default_list
msgid "Analytic Defaults"
-msgstr "Análisis: Valores por defecto"
+msgstr "Valores analíticos por defecto"
#. module: account_analytic_default
-#: model:ir.module.module,description:account_analytic_default.module_meta_information
-msgid ""
-"\n"
-"Allows to automatically select analytic accounts based on criterions:\n"
-"* Product\n"
-"* Partner\n"
-"* User\n"
-"* Company\n"
-"* Date\n"
-" "
-msgstr ""
-"\n"
-"Permite seleccionar automáticamente cuentas analíticas según estos "
-"criterios:\n"
-"* Producto\n"
-"* Empresa\n"
-"* Usuario\n"
-"* Compañía\n"
-"* Fecha\n"
-" "
-
-#. module: account_analytic_default
-#: help:account.analytic.default,product_id:0
-msgid ""
-"select a product which will use analytical account specified in analytic "
-"default (eg. create new cutomer invoice or Sale order if we select this "
-"product, it will automatically take this as an analytical account)"
-msgstr ""
-"Seleccione un producto que utilizará esta cuenta analítica como la cuenta "
-"analítica por defecto (por ejemplo, al crear nuevas facturas de cliente o "
-"pedidos de venta, si se selecciona este producto, automáticamente se "
-"utilizará esta cuenta analítica)."
+#: sql_constraint:stock.picking:0
+msgid "Reference must be unique per Company!"
+msgstr "Referencia debe ser única por compañía!"
#. module: account_analytic_default
#: field:account.analytic.default,sequence:0
msgid "Sequence"
msgstr "Secuencia"
+#. module: account_analytic_default
+#: help:account.analytic.default,company_id:0
+msgid ""
+"Select a company which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sale order if we select this "
+"company, it will automatically take this as an analytic account)"
+msgstr ""
+"Seleccione una compañía que utilizara la cuenta analítica espeficificada por "
+"defecto (ej. crea una nueva factura de cliente u orden de venta si "
+"selecciona esta compañía, este, automáticamente la toma como una cuenta "
+"analítica)"
+
+#. module: account_analytic_default
+#: help:account.analytic.default,user_id:0
+msgid ""
+"Select a user which will use analytic account specified in analytic default."
+msgstr "Seleccione un usuario que utilizara la cuenta analítica por defecto."
+
#. module: account_analytic_default
#: model:ir.model,name:account_analytic_default.model_account_invoice_line
msgid "Invoice Line"
@@ -184,7 +143,12 @@ msgstr "Línea de factura"
#: view:account.analytic.default:0
#: field:account.analytic.default,analytic_id:0
msgid "Analytic Account"
-msgstr "Cuenta analítica"
+msgstr "Cuenta Analítica"
+
+#. module: account_analytic_default
+#: help:account.analytic.default,date_start:0
+msgid "Default start date for this Analytic Account."
+msgstr "Fecha inicial por defecto para esta Cuenta Analítica."
#. module: account_analytic_default
#: view:account.analytic.default:0
@@ -213,22 +177,4 @@ msgstr ""
#. module: account_analytic_default
#: model:ir.model,name:account_analytic_default.model_sale_order_line
msgid "Sales Order Line"
-msgstr "Línea pedido de venta"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "¡XML inválido para la definición de la vista!"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-#~ "especial!"
-
-#~ msgid "Seq"
-#~ msgstr "Secuencia"
-
-#~ msgid "Analytic Distributions"
-#~ msgstr "Distribuciones analíticas"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nombre de modelo no válido en la definición de acción."
+msgstr "Línea de Orden de venta"
diff --git a/addons/account_analytic_default/i18n/fr.po b/addons/account_analytic_default/i18n/fr.po
index d698e526fa1..1244c61a3b3 100644
--- a/addons/account_analytic_default/i18n/fr.po
+++ b/addons/account_analytic_default/i18n/fr.po
@@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-02-18 23:16+0000\n"
-"Last-Translator: Pierre Burnier \n"
+"PO-Revision-Date: 2012-11-29 15:09+0000\n"
+"Last-Translator: Numérigraphe \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:10+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-30 05:07+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
#. module: account_analytic_default
#: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_partner
@@ -55,7 +55,7 @@ msgstr ""
#: view:account.analytic.default:0
#: field:account.analytic.default,product_id:0
msgid "Product"
-msgstr "Produit"
+msgstr "Article"
#. module: account_analytic_default
#: model:ir.model,name:account_analytic_default.model_account_analytic_default
diff --git a/addons/account_analytic_default/i18n/nl_BE.po b/addons/account_analytic_default/i18n/nl_BE.po
index 0c9fa6be3e2..6dab7d0e1ed 100644
--- a/addons/account_analytic_default/i18n/nl_BE.po
+++ b/addons/account_analytic_default/i18n/nl_BE.po
@@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-07-27 12:58+0000\n"
+"PO-Revision-Date: 2012-11-27 13:19+0000\n"
"Last-Translator: Els Van Vossel (Agaplan) \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:10+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
#. module: account_analytic_default
#: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_partner
@@ -31,7 +31,7 @@ msgstr "Groeperen op..."
#. module: account_analytic_default
#: help:account.analytic.default,date_stop:0
msgid "Default end date for this Analytic Account."
-msgstr ""
+msgstr "Standaard einddatum voor deze analytische rekening"
#. module: account_analytic_default
#: model:ir.model,name:account_analytic_default.model_stock_picking
@@ -50,6 +50,9 @@ msgid ""
"default (e.g. create new customer invoice or Sale order if we select this "
"partner, it will automatically take this as an analytic account)"
msgstr ""
+"Kies een relatie voor wie de standaard analytische rekening van toepassing "
+"is (vb. maak een nieuwe verkoopfactuur of -order, en kies deze relatie; de "
+"analytische rekening wordt automatisch voorgesteld)"
#. module: account_analytic_default
#: view:account.analytic.default:0
@@ -86,6 +89,9 @@ msgid ""
"default (e.g. create new customer invoice or Sale order if we select this "
"product, it will automatically take this as an analytic account)"
msgstr ""
+"Kies een product waarvoor de standaard analytische rekening van toepassing "
+"is (vb. maak een nieuwe verkoopfactuur of -order, en kies dit product; de "
+"analytische rekening wordt automatisch voorgesteld)"
#. module: account_analytic_default
#: field:account.analytic.default,date_stop:0
@@ -116,12 +122,16 @@ msgid ""
"default (e.g. create new customer invoice or Sale order if we select this "
"company, it will automatically take this as an analytic account)"
msgstr ""
+"Kies een bedrijf waarvoor de standaard analytische rekening van toepassing "
+"is (vb. maak een nieuwe verkoopfactuur of -order, en kies dit bedrijf; de "
+"analytische rekening wordt automatisch voorgesteld)"
#. module: account_analytic_default
#: help:account.analytic.default,user_id:0
msgid ""
"Select a user which will use analytic account specified in analytic default."
msgstr ""
+"Kies een gebruiker die de analytische standaardrekening zal gebruiken."
#. module: account_analytic_default
#: model:ir.model,name:account_analytic_default.model_account_invoice_line
@@ -137,7 +147,7 @@ msgstr "Analytische rekening"
#. module: account_analytic_default
#: help:account.analytic.default,date_start:0
msgid "Default start date for this Analytic Account."
-msgstr ""
+msgstr "Standaard begindatum voor deze analytische rekening."
#. module: account_analytic_default
#: view:account.analytic.default:0
diff --git a/addons/account_analytic_default/i18n/zh_CN.po b/addons/account_analytic_default/i18n/zh_CN.po
index 9113d020291..185508ddcab 100644
--- a/addons/account_analytic_default/i18n/zh_CN.po
+++ b/addons/account_analytic_default/i18n/zh_CN.po
@@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-02-08 03:53+0000\n"
-"Last-Translator: 开阖软件 Jeff Wang \n"
+"PO-Revision-Date: 2012-11-27 16:42+0000\n"
+"Last-Translator: ccdos \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:10+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
#. module: account_analytic_default
#: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_partner
@@ -31,7 +31,7 @@ msgstr "分组..."
#. module: account_analytic_default
#: help:account.analytic.default,date_stop:0
msgid "Default end date for this Analytic Account."
-msgstr ""
+msgstr "辅助核算项的默认结束日期"
#. module: account_analytic_default
#: model:ir.model,name:account_analytic_default.model_stock_picking
@@ -137,7 +137,7 @@ msgstr "辅助核算项"
#. module: account_analytic_default
#: help:account.analytic.default,date_start:0
msgid "Default start date for this Analytic Account."
-msgstr ""
+msgstr "辅助核算项的默认开始日期"
#. module: account_analytic_default
#: view:account.analytic.default:0
diff --git a/addons/account_analytic_plans/account_analytic_plans_view.xml b/addons/account_analytic_plans/account_analytic_plans_view.xml
index e5c02c8640e..3dcbcda6952 100644
--- a/addons/account_analytic_plans/account_analytic_plans_view.xml
+++ b/addons/account_analytic_plans/account_analytic_plans_view.xml
@@ -29,15 +29,6 @@
-
-
-
-
-
-
-
-
-
account.move.line.form.inheritaccount.move.line
diff --git a/addons/account_analytic_plans/i18n/es_MX.po b/addons/account_analytic_plans/i18n/es_MX.po
index 2838f67fb03..0e6ac25281b 100644
--- a/addons/account_analytic_plans/i18n/es_MX.po
+++ b/addons/account_analytic_plans/i18n/es_MX.po
@@ -1,32 +1,33 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-# * account_analytic_plans
+# Spanish (Mexico) 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: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-03 16:56+0000\n"
-"PO-Revision-Date: 2011-01-12 18:12+0000\n"
-"Last-Translator: Alberto Luengo Cabanillas (Pexego) \n"
-"Language-Team: \n"
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"PO-Revision-Date: 2012-11-28 00:35+0000\n"
+"Last-Translator: OscarAlca \n"
+"Language-Team: Spanish (Mexico) \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-05 05:25+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
#. module: account_analytic_plans
#: view:analytic.plan.create.model:0
msgid ""
"This distribution model has been saved.You will be able to reuse it later."
msgstr ""
-"Este modelo de distribución ha sido guardado. Lo podrá reutilizar más tarde."
+"Este modelo de distribución ha sido guardado. Podrá utilizarlo después."
#. module: account_analytic_plans
#: field:account.analytic.plan.instance.line,plan_id:0
msgid "Plan Id"
-msgstr "Id plan"
+msgstr "Id del plan"
#. module: account_analytic_plans
#: report:account.analytic.account.crossovered.analytic:0
@@ -51,11 +52,6 @@ msgstr "Analítica cruzada"
msgid "Analytic Plan"
msgstr "Plan analítico"
-#. module: account_analytic_plans
-#: model:ir.module.module,shortdesc:account_analytic_plans.module_meta_information
-msgid "Multiple-plans management in Analytic Accounting"
-msgstr "Gestión de múltiples planes en contabilidad analítica"
-
#. module: account_analytic_plans
#: field:account.analytic.plan.instance,journal_id:0
#: view:account.crossovered.analytic:0
@@ -69,12 +65,6 @@ msgstr "Diario analítico"
msgid "Analytic Plan Line"
msgstr "Línea de plan analítico"
-#. module: account_analytic_plans
-#: code:addons/account_analytic_plans/wizard/account_crossovered_analytic.py:60
-#, python-format
-msgid "User Error"
-msgstr "Error de usuario"
-
#. module: account_analytic_plans
#: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_instance
msgid "Analytic Plan Instance"
@@ -85,11 +75,6 @@ msgstr "Instancia de plan analítico"
msgid "Ok"
msgstr "Aceptar"
-#. module: account_analytic_plans
-#: constraint:account.move.line:0
-msgid "You can not create move line on closed account."
-msgstr "No puede crear una línea de movimiento en una cuenta cerrada."
-
#. module: account_analytic_plans
#: field:account.analytic.plan.instance,plan_id:0
msgid "Model's Plan"
@@ -98,17 +83,26 @@ msgstr "Plan del modelo"
#. module: account_analytic_plans
#: field:account.analytic.plan.instance,account2_ids:0
msgid "Account2 Id"
-msgstr "Id cuenta2"
+msgstr "Id de cuenta2"
#. module: account_analytic_plans
#: field:account.analytic.plan.instance,account_ids:0
msgid "Account Id"
-msgstr "Id cuenta"
+msgstr "Id de cuenta"
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/account_analytic_plans.py:221
+#: code:addons/account_analytic_plans/account_analytic_plans.py:234
+#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:38
+#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:41
+#, python-format
+msgid "Error!"
+msgstr "¡Error!"
#. module: account_analytic_plans
#: report:account.analytic.account.crossovered.analytic:0
msgid "Amount"
-msgstr "Importe"
+msgstr "Monto"
#. module: account_analytic_plans
#: report:account.analytic.account.crossovered.analytic:0
@@ -123,7 +117,7 @@ msgstr "¡Valor haber o debe erróneo en el asiento contable!"
#. module: account_analytic_plans
#: field:account.analytic.plan.instance,account6_ids:0
msgid "Account6 Id"
-msgstr "Id cuenta6"
+msgstr "Id de cuenta6"
#. module: account_analytic_plans
#: model:ir.ui.menu,name:account_analytic_plans.menu_account_analytic_multi_plan_action
@@ -136,9 +130,24 @@ msgid "Bank Statement Line"
msgstr "Línea extracto bancario"
#. module: account_analytic_plans
-#: field:account.analytic.plan.instance.line,analytic_account_id:0
-msgid "Analytic Account"
-msgstr "Cuenta analítica"
+#: constraint:account.invoice:0
+msgid "Invalid BBA Structured Communication !"
+msgstr "¡Estructura de comunicación BBA no válida!"
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:41
+#, python-format
+msgid "There is no analytic plan defined."
+msgstr "No hay plan analítico definido."
+
+#. module: account_analytic_plans
+#: constraint:account.move.line:0
+msgid ""
+"The date of your Journal Entry is not in the defined period! You should "
+"change the date or remove this constraint from the journal."
+msgstr ""
+"¡La fecha de su asiento no está en el periodo definido! Usted debería "
+"cambiar la fecha o borrar esta restricción del diario."
#. module: account_analytic_plans
#: sql_constraint:account.journal:0
@@ -148,20 +157,12 @@ msgstr "¡El código del diario debe ser único por compañía!"
#. module: account_analytic_plans
#: field:account.crossovered.analytic,ref:0
msgid "Analytic Account Reference"
-msgstr "Referencia cuenta analítica"
-
-#. module: account_analytic_plans
-#: constraint:account.move.line:0
-msgid ""
-"You can not create move line on receivable/payable account without partner"
-msgstr ""
-"No puede crear una línea de movimiento en una cuenta a cobrar/a pagar sin "
-"una empresa."
+msgstr "Referencia de cuenta analítica"
#. module: account_analytic_plans
#: model:ir.model,name:account_analytic_plans.model_sale_order_line
msgid "Sales Order Line"
-msgstr "Línea pedido de venta"
+msgstr "Línea de Orden de venta"
#. module: account_analytic_plans
#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:47
@@ -182,20 +183,20 @@ msgstr "Imprimir"
#. module: account_analytic_plans
#: report:account.analytic.account.crossovered.analytic:0
+#: field:account.analytic.line,percentage:0
msgid "Percentage"
msgstr "Porcentaje"
#. module: account_analytic_plans
-#: code:addons/account_analytic_plans/account_analytic_plans.py:201
+#: code:addons/account_analytic_plans/wizard/account_crossovered_analytic.py:61
#, python-format
-msgid "A model having this name and code already exists !"
-msgstr "¡Ya existe un modelo con este nombre y código!"
+msgid "There are no analytic lines related to account %s."
+msgstr "No hay lineas analíticas relacionadas a la cuenta %s"
#. module: account_analytic_plans
-#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:41
-#, python-format
-msgid "No analytic plan defined !"
-msgstr "¡No se ha definido un plan analítico!"
+#: field:account.analytic.plan.instance.line,analytic_account_id:0
+msgid "Analytic Account"
+msgstr "Cuenta Analítica"
#. module: account_analytic_plans
#: field:account.analytic.plan.instance.line,rate:0
@@ -230,18 +231,31 @@ msgid "Analytic Plan Lines"
msgstr "Líneas de plan analítico"
#. module: account_analytic_plans
-#: constraint:account.bank.statement.line:0
-msgid ""
-"The amount of the voucher must be the same amount as the one on the "
-"statement line"
+#: constraint:account.move.line:0
+msgid "Account and Period must belong to the same company."
+msgstr "La cuenta y el periodo deben pertenecer a la misma compañía."
+
+#. module: account_analytic_plans
+#: constraint:account.bank.statement:0
+msgid "The journal and period chosen have to belong to the same company."
msgstr ""
-"El importe del recibo debe ser el mismo importe que el de la línea del "
-"extracto"
+"El diario y periodo seleccionados tienen que pertenecer a la misma compañía"
#. module: account_analytic_plans
#: model:ir.model,name:account_analytic_plans.model_account_invoice_line
msgid "Invoice Line"
-msgstr "Línea factura"
+msgstr "Línea de factura"
+
+#. module: account_analytic_plans
+#: constraint:account.move.line:0
+msgid ""
+"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."
+msgstr ""
+"La cuenta seleccionada en su asiento fuerza a tener una moneda secundaria. "
+"Debería eliminar la moneda secundaria de la cuenta o asignar al diario una "
+"vista multi-moneda"
#. module: account_analytic_plans
#: report:account.analytic.account.crossovered.analytic:0
@@ -249,9 +263,9 @@ msgid "Currency"
msgstr "Moneda"
#. module: account_analytic_plans
-#: field:account.crossovered.analytic,date1:0
-msgid "Start Date"
-msgstr "Fecha inicial"
+#: constraint:account.analytic.line:0
+msgid "You cannot create analytic line on view account."
+msgstr "No puede crear una linea analitica a una cuenta de vista."
#. module: account_analytic_plans
#: report:account.analytic.account.crossovered.analytic:0
@@ -261,7 +275,12 @@ msgstr "Compañía"
#. module: account_analytic_plans
#: field:account.analytic.plan.instance,account5_ids:0
msgid "Account5 Id"
-msgstr "Id cuenta5"
+msgstr "Id de cuenta5"
+
+#. module: account_analytic_plans
+#: constraint:account.move.line:0
+msgid "You cannot create journal items on closed account."
+msgstr "No puedes crear elementos de diario en cuentas cerradas."
#. module: account_analytic_plans
#: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_instance_line
@@ -276,14 +295,14 @@ msgstr "Cuenta principal"
#. module: account_analytic_plans
#: report:account.analytic.account.crossovered.analytic:0
msgid "To Date"
-msgstr "Hasta fecha"
+msgstr "Hasta la Fecha"
#. module: account_analytic_plans
-#: code:addons/account_analytic_plans/account_analytic_plans.py:321
-#: code:addons/account_analytic_plans/account_analytic_plans.py:462
+#: code:addons/account_analytic_plans/account_analytic_plans.py:342
+#: code:addons/account_analytic_plans/account_analytic_plans.py:486
#, python-format
-msgid "You have to define an analytic journal on the '%s' journal!"
-msgstr "¡Debe definir un diario analítico en el diario '%s'!"
+msgid "You have to define an analytic journal on the '%s' journal."
+msgstr "Tiene que definir un diario analitico en el diario '%s'"
#. module: account_analytic_plans
#: field:account.crossovered.analytic,empty_line:0
@@ -295,82 +314,16 @@ msgstr "No mostrar líneas vacías"
msgid "analytic.plan.create.model.action"
msgstr "analitica.plan.crear.modelo.accion"
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_analytic_line
+msgid "Analytic Line"
+msgstr "Línea analítica"
+
#. module: account_analytic_plans
#: report:account.analytic.account.crossovered.analytic:0
msgid "Analytic Account :"
msgstr "Cuenta analítica:"
-#. module: account_analytic_plans
-#: model:ir.module.module,description:account_analytic_plans.module_meta_information
-msgid ""
-"This module allows to use several analytic plans, according to the general "
-"journal,\n"
-"so that multiple analytic lines are created when the invoice or the entries\n"
-"are confirmed.\n"
-"\n"
-"For example, you can define the following analytic structure:\n"
-" Projects\n"
-" Project 1\n"
-" SubProj 1.1\n"
-" SubProj 1.2\n"
-" Project 2\n"
-" Salesman\n"
-" Eric\n"
-" Fabien\n"
-"\n"
-"Here, we have two plans: Projects and Salesman. An invoice line must\n"
-"be able to write analytic entries in the 2 plans: SubProj 1.1 and\n"
-"Fabien. The amount can also be split. The following example is for\n"
-"an invoice that touches the two subproject and assigned to one salesman:\n"
-"\n"
-"Plan1:\n"
-" SubProject 1.1 : 50%\n"
-" SubProject 1.2 : 50%\n"
-"Plan2:\n"
-" Eric: 100%\n"
-"\n"
-"So when this line of invoice will be confirmed, it will generate 3 analytic "
-"lines,\n"
-"for one account entry.\n"
-"The analytic plan validates the minimum and maximum percentage at the time "
-"of creation\n"
-"of distribution models.\n"
-" "
-msgstr ""
-"Este módulo permite utilizar varios planes analíticos, de acuerdo con el "
-"diario general,\n"
-"para crear múltiples líneas analíticas cuando la factura o los asientos\n"
-"sean confirmados.\n"
-"\n"
-"Por ejemplo, puede definir la siguiente estructura de analítica:\n"
-" Proyectos\n"
-" Proyecto 1\n"
-" Subproyecto 1,1\n"
-" Subproyecto 1,2\n"
-" Proyecto 2\n"
-" Comerciales\n"
-" Eduardo\n"
-" Marta\n"
-"\n"
-"Aquí, tenemos dos planes: Proyectos y Comerciales. Una línea de factura "
-"debe\n"
-"ser capaz de escribir las entradas analíticas en los 2 planes: Subproyecto "
-"1.1 y\n"
-"Eduardo. La cantidad también se puede dividir. El siguiente ejemplo es para\n"
-"una factura que implica a los dos subproyectos y asignada a un comercial:\n"
-"\n"
-"Plan1:\n"
-" Subproyecto 1.1: 50%\n"
-" Subproyecto 1.2: 50%\n"
-"Plan2:\n"
-" Eduardo: 100%\n"
-"\n"
-"Así, cuando esta línea de la factura sea confirmada, generará 3 líneas "
-"analíticas para un asiento contable.\n"
-"El plan analítico valida el porcentaje mínimo y máximo en el momento de "
-"creación de los modelos de distribución.\n"
-" "
-
#. module: account_analytic_plans
#: report:account.analytic.account.crossovered.analytic:0
msgid "Analytic Account Reference:"
@@ -379,7 +332,7 @@ msgstr "Referencia cuenta analítica:"
#. module: account_analytic_plans
#: field:account.analytic.plan.line,name:0
msgid "Plan Name"
-msgstr "Nombre de plan"
+msgstr "Nombre del plan"
#. module: account_analytic_plans
#: field:account.analytic.plan,default_instance_id:0
@@ -394,12 +347,7 @@ msgstr "Elementos diario"
#. module: account_analytic_plans
#: field:account.analytic.plan.instance,account1_ids:0
msgid "Account1 Id"
-msgstr "Id cuenta1"
-
-#. module: account_analytic_plans
-#: constraint:account.move.line:0
-msgid "Company must be same for its related account and period."
-msgstr "La compañía debe ser la misma para la cuenta y periodo relacionados."
+msgstr "Id de cuenta1"
#. module: account_analytic_plans
#: field:account.analytic.plan.line,min_required:0
@@ -411,14 +359,6 @@ msgstr "Mínimo permitido (%)"
msgid "Root account of this plan."
msgstr "Cuenta principal de este plan."
-#. module: account_analytic_plans
-#: code:addons/account_analytic_plans/account_analytic_plans.py:201
-#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:38
-#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:41
-#, python-format
-msgid "Error"
-msgstr "Error"
-
#. module: account_analytic_plans
#: view:analytic.plan.create.model:0
msgid "Save This Distribution as a Model"
@@ -430,10 +370,9 @@ msgid "Quantity"
msgstr "Cantidad"
#. module: account_analytic_plans
-#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:38
-#, python-format
-msgid "Please put a name and a code before saving the model !"
-msgstr "¡Introduzca un nombre y un código antes de guardar el modelo!"
+#: sql_constraint:account.invoice:0
+msgid "Invoice Number must be unique per Company!"
+msgstr "¡El número de factura debe ser único por compañía!"
#. module: account_analytic_plans
#: model:ir.model,name:account_analytic_plans.model_account_crossovered_analytic
@@ -441,11 +380,11 @@ msgid "Print Crossovered Analytic"
msgstr "Imprimir analítica cruzada"
#. module: account_analytic_plans
-#: code:addons/account_analytic_plans/account_analytic_plans.py:321
-#: code:addons/account_analytic_plans/account_analytic_plans.py:462
+#: code:addons/account_analytic_plans/account_analytic_plans.py:342
+#: code:addons/account_analytic_plans/account_analytic_plans.py:486
#, python-format
msgid "No Analytic Journal !"
-msgstr "¡No diario analítico!"
+msgstr "¡No hay diario analítico!"
#. module: account_analytic_plans
#: model:ir.model,name:account_analytic_plans.model_account_bank_statement
@@ -455,7 +394,7 @@ msgstr "Extracto bancario"
#. module: account_analytic_plans
#: field:account.analytic.plan.instance,account3_ids:0
msgid "Account3 Id"
-msgstr "Id cuenta3"
+msgstr "Id de cuenta3"
#. module: account_analytic_plans
#: model:ir.model,name:account_analytic_plans.model_account_invoice
@@ -471,28 +410,28 @@ msgstr "Cancelar"
#. module: account_analytic_plans
#: field:account.analytic.plan.instance,account4_ids:0
msgid "Account4 Id"
-msgstr "Id cuenta4"
+msgstr "Id de cuenta4"
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/account_analytic_plans.py:234
+#, python-format
+msgid "The total should be between %s and %s."
+msgstr "El total debe estar entre %s y %s"
#. module: account_analytic_plans
#: view:account.analytic.plan.instance.line:0
msgid "Analytic Distribution Lines"
msgstr "Líneas de distribución analítica"
-#. module: account_analytic_plans
-#: code:addons/account_analytic_plans/account_analytic_plans.py:214
-#, python-format
-msgid "The Total Should be Between %s and %s"
-msgstr "El total debería estar entre %s y %s"
-
#. module: account_analytic_plans
#: report:account.analytic.account.crossovered.analytic:0
msgid "at"
-msgstr "a las"
+msgstr "en"
#. module: account_analytic_plans
#: report:account.analytic.account.crossovered.analytic:0
msgid "Account Name"
-msgstr "Nombre de cuenta"
+msgstr "Nombre de la cuenta"
#. module: account_analytic_plans
#: view:account.analytic.plan.instance.line:0
@@ -504,11 +443,6 @@ msgstr "Línea de distribución analítica"
msgid "Distribution Code"
msgstr "Código de distribución"
-#. module: account_analytic_plans
-#: report:account.analytic.account.crossovered.analytic:0
-msgid "%"
-msgstr "%"
-
#. module: account_analytic_plans
#: report:account.analytic.account.crossovered.analytic:0
msgid "100.00%"
@@ -530,6 +464,16 @@ msgstr "Distribución analítica"
msgid "Journal"
msgstr "Diario"
+#. module: account_analytic_plans
+#: constraint:account.journal:0
+msgid ""
+"Configuration error!\n"
+"The currency chosen should be shared by the default accounts too."
+msgstr ""
+"¡Error de confuguración!\n"
+"La moneda seleccionada también tiene que ser la que está en las cuentas por "
+"defecto."
+
#. module: account_analytic_plans
#: model:ir.model,name:account_analytic_plans.model_analytic_plan_create_model
msgid "analytic.plan.create.model"
@@ -543,7 +487,37 @@ msgstr "Fecha final"
#. module: account_analytic_plans
#: model:ir.actions.act_window,name:account_analytic_plans.account_analytic_instance_model_open
msgid "Distribution Models"
-msgstr "Modelos distribución"
+msgstr "Modelos de distribución"
+
+#. module: account_analytic_plans
+#: constraint:account.move.line:0
+msgid "You cannot create journal items on an account of type view."
+msgstr "No puede crear elementos de diario en una cuenta de tipo vista."
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/wizard/account_crossovered_analytic.py:61
+#, python-format
+msgid "User Error!"
+msgstr "¡Error de usuario!"
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:38
+#, python-format
+msgid "Please put a name and a code before saving the model."
+msgstr "Por favor ponga un nombre y código antes de guardar el modelo."
+
+#. module: account_analytic_plans
+#: field:account.crossovered.analytic,date1:0
+msgid "Start Date"
+msgstr "Fecha inicial"
+
+#. module: account_analytic_plans
+#: 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 ""
+"El monto del comprobante debe ser el mismo que esta en la linea de asiento."
#. module: account_analytic_plans
#: field:account.analytic.plan.line,sequence:0
@@ -556,120 +530,13 @@ msgid "The name of the journal must be unique per company !"
msgstr "¡El nombre del diaro debe ser único por compañía!"
#. module: account_analytic_plans
-#: code:addons/account_analytic_plans/account_analytic_plans.py:214
-#, python-format
-msgid "Value Error"
-msgstr "Valor erróneo"
+#: view:account.crossovered.analytic:0
+#: view:analytic.plan.create.model:0
+msgid "or"
+msgstr "ó"
#. module: account_analytic_plans
-#: constraint:account.move.line:0
-msgid "You can not create move line on view account."
-msgstr "No puede crear una línea de movimiento en una cuenta de tipo vista."
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-#~ "especial!"
-
-#~ msgid "Currency:"
-#~ msgstr "Moneda:"
-
-#~ msgid "Select Information"
-#~ msgstr "Seleccionar información"
-
-#~ msgid "Analytic Account Ref."
-#~ msgstr "Ref. cuenta analítica"
-
-#~ msgid "Create Model"
-#~ msgstr "Crear modelo"
-
-#~ msgid "to"
-#~ msgstr "hasta"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "¡XML inválido para la definición de la vista!"
-
-#~ msgid "OK"
-#~ msgstr "Aceptar"
-
-#~ msgid "Period from"
-#~ msgstr "Período desde"
-
-#~ msgid "Printing date:"
-#~ msgstr "Fecha impresión:"
-
-#~ msgid "Analytic Distribution's models"
-#~ msgstr "Modelos de distribución analítica"
-
-#~ msgid ""
-#~ "This distribution model has been saved. You will be able to reuse it later."
-#~ msgstr ""
-#~ "Este modelo de distribución ha sido guardado. Más tarde podrá reutilizarlo."
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nombre de modelo no válido en la definición de acción."
-
-#~ msgid ""
-#~ "This module allows to use several analytic plans, according to the general "
-#~ "journal,\n"
-#~ "so that multiple analytic lines are created when the invoice or the entries\n"
-#~ "are confirmed.\n"
-#~ "\n"
-#~ "For example, you can define the following analytic structure:\n"
-#~ " Projects\n"
-#~ " Project 1\n"
-#~ " SubProj 1.1\n"
-#~ " SubProj 1.2\n"
-#~ " Project 2\n"
-#~ " Salesman\n"
-#~ " Eric\n"
-#~ " Fabien\n"
-#~ "\n"
-#~ "Here, we have two plans: Projects and Salesman. An invoice line must\n"
-#~ "be able to write analytic entries in the 2 plans: SubProj 1.1 and\n"
-#~ "Fabien. The amount can also be split. The following example is for\n"
-#~ "an invoice that touches the two subproject and assigned to one salesman:\n"
-#~ "\n"
-#~ "Plan1:\n"
-#~ " SubProject 1.1 : 50%\n"
-#~ " SubProject 1.2 : 50%\n"
-#~ "Plan2:\n"
-#~ " Eric: 100%\n"
-#~ "\n"
-#~ "So when this line of invoice will be confirmed, it will generate 3 analytic "
-#~ "lines,\n"
-#~ "for one account entry.\n"
-#~ " "
-#~ msgstr ""
-#~ "Este módulo permite utilizar varios planes analíticos, de acuerdo con el "
-#~ "diario general,\n"
-#~ "para que crea múltiples líneas analíticas cuando la factura o los asientos\n"
-#~ "sean confirmados.\n"
-#~ "\n"
-#~ "Por ejemplo, puede definir la siguiente estructura de analítica:\n"
-#~ " Proyectos\n"
-#~ " Proyecto 1\n"
-#~ " Subproyecto 1,1\n"
-#~ " Subproyecto 1,2\n"
-#~ " Proyecto 2\n"
-#~ " Comerciales\n"
-#~ " Eduardo\n"
-#~ " Marta\n"
-#~ "\n"
-#~ "Aquí, tenemos dos planes: Proyectos y Comerciales. Una línea de factura "
-#~ "debe\n"
-#~ "ser capaz de escribir las entradas analíticas en los 2 planes: Subproyecto "
-#~ "1.1 y\n"
-#~ "Eduardo. La cantidad también se puede dividir. El siguiente ejemplo es para\n"
-#~ "una factura que implica a los dos subproyectos y asignada a un comercial:\n"
-#~ "\n"
-#~ "Plan1:\n"
-#~ " Subproyecto 1.1: 50%\n"
-#~ " Subproyecto 1.2: 50%\n"
-#~ "Plan2:\n"
-#~ " Eduardo: 100%\n"
-#~ "\n"
-#~ "Así, cuando esta línea de la factura sea confirmada, generará 3 líneas "
-#~ "analíticas para un asiento contable.\n"
-#~ " "
+#: code:addons/account_analytic_plans/account_analytic_plans.py:221
+#, python-format
+msgid "A model with this name and code already exists."
+msgstr "Un modelo con este código y nombre ya existe."
diff --git a/addons/account_analytic_plans/i18n/zh_CN.po b/addons/account_analytic_plans/i18n/zh_CN.po
index 3b59a5409be..80ab2d4a4c8 100644
--- a/addons/account_analytic_plans/i18n/zh_CN.po
+++ b/addons/account_analytic_plans/i18n/zh_CN.po
@@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-02-08 04:10+0000\n"
-"Last-Translator: 开阖软件 Jeff Wang \n"
+"PO-Revision-Date: 2012-11-28 07:38+0000\n"
+"Last-Translator: ccdos \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:07+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:14+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
#. module: account_analytic_plans
#: view:analytic.plan.create.model:0
@@ -95,7 +95,7 @@ msgstr "项 ID"
#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:41
#, python-format
msgid "Error!"
-msgstr ""
+msgstr "错误!"
#. module: account_analytic_plans
#: report:account.analytic.account.crossovered.analytic:0
@@ -136,7 +136,7 @@ msgstr "BBA传输结构有误！"
#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:41
#, python-format
msgid "There is no analytic plan defined."
-msgstr ""
+msgstr "没有辅助核算计划定义"
#. module: account_analytic_plans
#: constraint:account.move.line:0
@@ -187,7 +187,7 @@ msgstr "百分比"
#: code:addons/account_analytic_plans/wizard/account_crossovered_analytic.py:61
#, python-format
msgid "There are no analytic lines related to account %s."
-msgstr ""
+msgstr "没有辅助核算行关联到科目%s."
#. module: account_analytic_plans
#: field:account.analytic.plan.instance.line,analytic_account_id:0
@@ -229,7 +229,7 @@ msgstr "辅助核算方案明细"
#. module: account_analytic_plans
#: constraint:account.move.line:0
msgid "Account and Period must belong to the same company."
-msgstr ""
+msgstr "科目和会计周期必须属于同一个公司"
#. module: account_analytic_plans
#: constraint:account.bank.statement:0
@@ -257,7 +257,7 @@ msgstr "币别"
#. module: account_analytic_plans
#: constraint:account.analytic.line:0
msgid "You cannot create analytic line on view account."
-msgstr ""
+msgstr "你不能视图科目上面创建辅助核算行。"
#. module: account_analytic_plans
#: report:account.analytic.account.crossovered.analytic:0
@@ -272,7 +272,7 @@ msgstr "项5 ID"
#. module: account_analytic_plans
#: constraint:account.move.line:0
msgid "You cannot create journal items on closed account."
-msgstr ""
+msgstr "你不能在关闭的科目创建账目项目"
#. module: account_analytic_plans
#: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_instance_line
@@ -294,7 +294,7 @@ msgstr "日期到"
#: code:addons/account_analytic_plans/account_analytic_plans.py:486
#, python-format
msgid "You have to define an analytic journal on the '%s' journal."
-msgstr ""
+msgstr "你必须在'%s' 分类账定义一个辅助核算分类账"
#. module: account_analytic_plans
#: field:account.crossovered.analytic,empty_line:0
@@ -408,7 +408,7 @@ msgstr "项4 ID"
#: code:addons/account_analytic_plans/account_analytic_plans.py:234
#, python-format
msgid "The total should be between %s and %s."
-msgstr ""
+msgstr "总计在 %s 和 %s 之间。"
#. module: account_analytic_plans
#: view:account.analytic.plan.instance.line:0
@@ -461,7 +461,7 @@ msgstr "账簿"
msgid ""
"Configuration error!\n"
"The currency chosen should be shared by the default accounts too."
-msgstr ""
+msgstr "配置错误"
#. module: account_analytic_plans
#: model:ir.model,name:account_analytic_plans.model_analytic_plan_create_model
@@ -481,19 +481,19 @@ msgstr "分摊模型"
#. module: account_analytic_plans
#: constraint:account.move.line:0
msgid "You cannot create journal items on an account of type view."
-msgstr ""
+msgstr "你不能在视图类型的科目创建账目项目"
#. module: account_analytic_plans
#: code:addons/account_analytic_plans/wizard/account_crossovered_analytic.py:61
#, python-format
msgid "User Error!"
-msgstr ""
+msgstr "用户错误！"
#. module: account_analytic_plans
#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:38
#, python-format
msgid "Please put a name and a code before saving the model."
-msgstr ""
+msgstr "保存模型前请输入名称和代码"
#. module: account_analytic_plans
#: field:account.crossovered.analytic,date1:0
@@ -505,7 +505,7 @@ msgstr "开始日期"
msgid ""
"The amount of the voucher must be the same amount as the one on the "
"statement line."
-msgstr ""
+msgstr "单据的金额必须跟对账单其中一行金额相同。"
#. module: account_analytic_plans
#: field:account.analytic.plan.line,sequence:0
@@ -521,13 +521,13 @@ msgstr "每个公司的账簿名称必须唯一！"
#: view:account.crossovered.analytic:0
#: view:analytic.plan.create.model:0
msgid "or"
-msgstr ""
+msgstr "or"
#. module: account_analytic_plans
#: code:addons/account_analytic_plans/account_analytic_plans.py:221
#, python-format
msgid "A model with this name and code already exists."
-msgstr ""
+msgstr "这个名称和代码的模型已经存在。"
#~ msgid "Select Information"
#~ msgstr "选择信息"
diff --git a/addons/account_anglo_saxon/i18n/es_MX.po b/addons/account_anglo_saxon/i18n/es_MX.po
index def75b4c77c..48ca0408128 100644
--- a/addons/account_anglo_saxon/i18n/es_MX.po
+++ b/addons/account_anglo_saxon/i18n/es_MX.po
@@ -1,44 +1,60 @@
-# Spanish translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# Spanish (Mexico) 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 , 2010.
+# FIRST AUTHOR , 2012.
#
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: 2011-01-12 11:29+0000\n"
-"Last-Translator: Alberto Luengo Cabanillas (Pexego) \n"
-"Language-Team: Spanish \n"
+"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"PO-Revision-Date: 2012-11-28 00:37+0000\n"
+"Last-Translator: OscarAlca \n"
+"Language-Team: Spanish (Mexico) \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-05 05:45+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
-
-#. module: account_anglo_saxon
-#: view:product.category:0
-msgid " Accounting Property"
-msgstr " Propiedades de contabilidad"
+"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
#. module: account_anglo_saxon
#: sql_constraint:purchase.order:0
-msgid "Order Reference must be unique !"
-msgstr "¡La referencia del pedido debe ser única!"
+msgid "Order Reference must be unique per Company!"
+msgstr "¡La referencia del pedido debe ser única por compañía!"
+
+#. module: account_anglo_saxon
+#: sql_constraint:account.invoice:0
+msgid "Invoice Number must be unique per Company!"
+msgstr "¡El número de factura debe ser único por compañía!"
+
+#. module: account_anglo_saxon
+#: model:ir.model,name:account_anglo_saxon.model_product_category
+msgid "Product Category"
+msgstr "Categoría de producto"
+
+#. module: account_anglo_saxon
+#: sql_constraint:stock.picking:0
+msgid "Reference must be unique per Company!"
+msgstr "¡La referencia debe ser única por compañía!"
#. module: account_anglo_saxon
#: constraint:product.category:0
-msgid "Error ! You can not create recursive categories."
-msgstr "¡Error! No puede crear categorías recursivas."
+msgid "Error ! You cannot create recursive categories."
+msgstr "¡Error! No puede crear categorías recursivas"
+
+#. module: account_anglo_saxon
+#: constraint:account.invoice:0
+msgid "Invalid BBA Structured Communication !"
+msgstr "¡Estructura de comunicación BBA no válida!"
#. module: account_anglo_saxon
#: constraint:product.template:0
msgid ""
-"Error: The default UOM and the purchase UOM must be in the same category."
+"Error: The default Unit of Measure and the purchase Unit of Measure must be "
+"in the same category."
msgstr ""
-"Error: La UdM por defecto y la UdM de compra deben estar en la misma "
-"categoría."
+"Error: La unidad de medida por defecto y la unidad de medida de compra "
+"deben ser de la misma categoría."
#. module: account_anglo_saxon
#: model:ir.model,name:account_anglo_saxon.model_account_invoice_line
@@ -48,23 +64,13 @@ msgstr "Línea de factura"
#. module: account_anglo_saxon
#: model:ir.model,name:account_anglo_saxon.model_purchase_order
msgid "Purchase Order"
-msgstr "Pedido de compra"
+msgstr "Orden de Compra"
#. module: account_anglo_saxon
#: model:ir.model,name:account_anglo_saxon.model_product_template
msgid "Product Template"
msgstr "Plantilla de producto"
-#. module: account_anglo_saxon
-#: model:ir.model,name:account_anglo_saxon.model_product_category
-msgid "Product Category"
-msgstr "Categoría de producto"
-
-#. module: account_anglo_saxon
-#: model:ir.module.module,shortdesc:account_anglo_saxon.module_meta_information
-msgid "Stock Accounting for Anglo Saxon countries"
-msgstr "Contabilidad de stocks para países anglo-sajones"
-
#. module: account_anglo_saxon
#: field:product.category,property_account_creditor_price_difference_categ:0
#: field:product.template,property_account_creditor_price_difference:0
@@ -79,43 +85,7 @@ msgstr "Factura"
#. module: account_anglo_saxon
#: model:ir.model,name:account_anglo_saxon.model_stock_picking
msgid "Picking List"
-msgstr "Albarán"
-
-#. module: account_anglo_saxon
-#: model:ir.module.module,description:account_anglo_saxon.module_meta_information
-msgid ""
-"This module will support the Anglo-Saxons accounting methodology by\n"
-" changing the accounting logic with stock transactions. The difference "
-"between the Anglo-Saxon accounting countries\n"
-" and the Rhine or also called Continental accounting countries is the "
-"moment of taking the Cost of Goods Sold versus Cost of Sales.\n"
-" Anglo-Saxons accounting does take the cost when sales invoice is "
-"created, Continental accounting will take the cost at the moment the goods "
-"are shipped.\n"
-" This module will add this functionality by using a interim account, to "
-"store the value of shipped goods and will contra book this interim account\n"
-" when the invoice is created to transfer this amount to the debtor or "
-"creditor account.\n"
-" Secondly, price differences between actual purchase price and fixed "
-"product standard price are booked on a separate account"
-msgstr ""
-"Este módulo soporta la metodología de la contabilidad anglo-sajona mediante\n"
-" el cambio de la lógica contable con las transacciones de inventario. La "
-"diferencia entre contabilidad de países anglo-sajones\n"
-" y el RHINE o también llamada contabilidad de países continentales es el "
-"momento de considerar los costes de las mercancías vendidas respecto al "
-"coste de las ventas.\n"
-" La contabilidad anglosajona tiene en cuenta el coste cuando se crea la "
-"factura de venta, la contabilidad continental tiene en cuenta ese coste en "
-"el momento de que las mercancías son enviadas.\n"
-" Este modulo añade esta funcionalidad usando una cuenta provisional, para "
-"guardar el valor de la mercancía enviada y anota un contra asiento a esta "
-"cuenta provisional\n"
-" cuando se crea la factura para transferir este importe a la cuenta "
-"deudora o acreedora.\n"
-" Secundariamente, las diferencias de precios entre el actual precio de "
-"compra y el precio estándar fijo del producto son registrados en cuentas "
-"separadas."
+msgstr "Lista de Movimientos."
#. module: account_anglo_saxon
#: help:product.category,property_account_creditor_price_difference_categ:0
@@ -125,38 +95,4 @@ msgid ""
"and cost price."
msgstr ""
"Esta cuenta se utilizará para valorar la diferencia de precios entre el "
-"precio de compra y precio de coste."
-
-#~ msgid "Stock Account"
-#~ msgstr "Cuenta de Valores"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "¡XML Inválido para la Arquitectura de la Vista!"
-
-#~ msgid ""
-#~ "This module will support the Anglo-Saxons accounting methodology by \n"
-#~ " changing the accounting logic with stock transactions. The difference "
-#~ "between the Anglo-Saxon accounting countries \n"
-#~ " and the Rhine or also called Continental accounting countries is the "
-#~ "moment of taking the Cost of Goods Sold versus Cost of Sales. \n"
-#~ " Anglo-Saxons accounting does take the cost when sales invoice is "
-#~ "created, Continental accounting will take the cost at he moment the goods "
-#~ "are shipped.\n"
-#~ " This module will add this functionality by using a interim account, to "
-#~ "store the value of shipped goods and will contra book this interim account \n"
-#~ " when the invoice is created to transfer this amount to the debtor or "
-#~ "creditor account."
-#~ msgstr ""
-#~ "Éste módulo soportará la metodología de contabilización Anglosajona \n"
-#~ " cambiando la lógica de contabilización con transacciones de acciones. La "
-#~ "diferencia entre los países de contabilización Anglosajona \n"
-#~ " y el Rin o también llamados países de contabilización Continental es el "
-#~ "momento de tomar el Costo de Bienes Vendidos contra el Costo de Ventas. \n"
-#~ " La contabilización Anglosajona toma el costo cuando la factura de ventas "
-#~ "es creada, la contabilización Continental tomará el costo en el momento en "
-#~ "que los bienes son enviados.\n"
-#~ " Éste módulo agregará esta funcionalidad usando una cuenta provisional, "
-#~ "para almacenar el valor de los bienes enviados y devolverá esta cuenta "
-#~ "provisional \n"
-#~ " cuando la factura sea creada para transferir esta cantidad al deudor o "
-#~ "acreedor de la cuenta."
+"precio de compra y precio de costo."
diff --git a/addons/account_anglo_saxon/i18n/fr.po b/addons/account_anglo_saxon/i18n/fr.po
index 43acf7f7da8..e675aff8bcb 100644
--- a/addons/account_anglo_saxon/i18n/fr.po
+++ b/addons/account_anglo_saxon/i18n/fr.po
@@ -8,15 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2011-01-13 19:32+0000\n"
-"Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
-"\n"
+"PO-Revision-Date: 2012-11-29 15:33+0000\n"
+"Last-Translator: Numérigraphe \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-11-25 06:19+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-30 05:08+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
#. module: account_anglo_saxon
#: sql_constraint:purchase.order:0
@@ -31,7 +30,7 @@ msgstr "Le numéro de facture doit être unique par société !"
#. module: account_anglo_saxon
#: model:ir.model,name:account_anglo_saxon.model_product_category
msgid "Product Category"
-msgstr "Catégorie de produit"
+msgstr "Catégorie d'articles"
#. module: account_anglo_saxon
#: sql_constraint:stock.picking:0
@@ -68,7 +67,7 @@ msgstr "Bon de commande"
#. module: account_anglo_saxon
#: model:ir.model,name:account_anglo_saxon.model_product_template
msgid "Product Template"
-msgstr "Modèle de produit"
+msgstr "Modèle d'article"
#. module: account_anglo_saxon
#: field:product.category,property_account_creditor_price_difference_categ:0
diff --git a/addons/account_anglo_saxon/i18n/nl_BE.po b/addons/account_anglo_saxon/i18n/nl_BE.po
index dfb2e1cd7b0..99f28458554 100644
--- a/addons/account_anglo_saxon/i18n/nl_BE.po
+++ b/addons/account_anglo_saxon/i18n/nl_BE.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-03-01 17:37+0000\n"
-"Last-Translator: FULL NAME \n"
+"PO-Revision-Date: 2012-11-27 13:28+0000\n"
+"Last-Translator: Els Van Vossel (Agaplan) \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: 2012-11-25 06:19+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
#. module: account_anglo_saxon
#: sql_constraint:purchase.order:0
@@ -53,6 +53,8 @@ msgid ""
"Error: The default Unit of Measure and the purchase Unit of Measure must be "
"in the same category."
msgstr ""
+"Fout: de standaardmaateenheid moet tot dezelfde categorie behoren als de "
+"aankoopmaateenheid."
#. module: account_anglo_saxon
#: model:ir.model,name:account_anglo_saxon.model_account_invoice_line
diff --git a/addons/account_anglo_saxon/i18n/zh_CN.po b/addons/account_anglo_saxon/i18n/zh_CN.po
index 101c89f7956..155f6e9099e 100644
--- a/addons/account_anglo_saxon/i18n/zh_CN.po
+++ b/addons/account_anglo_saxon/i18n/zh_CN.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-02-08 14:34+0000\n"
-"Last-Translator: 开阖软件 Jeff Wang \n"
+"PO-Revision-Date: 2012-11-27 16:41+0000\n"
+"Last-Translator: ccdos \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-11-25 06:19+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
#. module: account_anglo_saxon
#: sql_constraint:purchase.order:0
@@ -52,7 +52,7 @@ msgstr "BBA传输结构有误！"
msgid ""
"Error: The default Unit of Measure and the purchase Unit of Measure must be "
"in the same category."
-msgstr ""
+msgstr "错误：默认的计量单位和采购计量单位必须是相同的类别"
#. module: account_anglo_saxon
#: model:ir.model,name:account_anglo_saxon.model_account_invoice_line
diff --git a/addons/account_asset/i18n/es_MX.po b/addons/account_asset/i18n/es_MX.po
index 66cedb8b82c..5caeb5db1b1 100644
--- a/addons/account_asset/i18n/es_MX.po
+++ b/addons/account_asset/i18n/es_MX.po
@@ -1,332 +1,274 @@
-# Spanish translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# Spanish (Mexico) 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 , 2010.
+# FIRST AUTHOR , 2012.
#
msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
-"POT-Creation-Date: 2009-11-24 12:54+0000\n"
-"PO-Revision-Date: 2011-07-12 12:04+0000\n"
-"Last-Translator: OpenERP Administrators \n"
-"Language-Team: Spanish \n"
+"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"PO-Revision-Date: 2012-11-28 00:58+0000\n"
+"Last-Translator: OscarAlca \n"
+"Language-Team: Spanish (Mexico) \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-05 05:59+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
#. module: account_asset
-#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_list_normal
-#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_list_normal
-msgid "Open Assets"
-msgstr "Activos abiertos"
+#: view:account.asset.asset:0
+msgid "Assets in draft and open states"
+msgstr "Activos en estado borrador y abierto"
#. module: account_asset
-#: field:account.asset.property,method_end:0
-#: field:account.asset.property.history,method_end:0
+#: field:account.asset.category,method_end:0
+#: field:account.asset.history,method_end:0
+#: field:asset.modify,method_end:0
msgid "Ending date"
msgstr "Fecha final"
#. module: account_asset
-#: view:account.asset.asset:0
-msgid "Depreciation board"
-msgstr "cuadro de drepeciación"
+#: field:account.asset.asset,value_residual:0
+msgid "Residual Value"
+msgstr "Valor residual"
+
+#. module: account_asset
+#: field:account.asset.category,account_expense_depreciation_id:0
+msgid "Depr. Expense Account"
+msgstr "Cuenta gastos amortización"
+
+#. module: account_asset
+#: view:asset.depreciation.confirmation.wizard:0
+msgid "Compute Asset"
+msgstr "Calcular activo"
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: account_asset
+#: field:asset.asset.report,gross_value:0
+msgid "Gross Amount"
+msgstr "Importe bruto"
#. module: account_asset
#: view:account.asset.asset:0
-#: field:account.asset.asset,name:0
-#: field:account.asset.board,asset_id:0
-#: field:account.asset.property,asset_id:0
-#: field:account.invoice.line,asset_id:0
+#: field:account.asset.depreciation.line,asset_id:0
+#: field:account.asset.history,asset_id:0
#: field:account.move.line,asset_id:0
-#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_form
+#: view:asset.asset.report:0
+#: field:asset.asset.report,asset_id:0
#: model:ir.model,name:account_asset.model_account_asset_asset
-#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_form
msgid "Asset"
msgstr "Activo"
#. module: account_asset
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nombre de modelo inválido en la definición de acción."
+#: help:account.asset.asset,prorata:0
+#: help:account.asset.category,prorata:0
+msgid ""
+"Indicates that the first depreciation entry for this asset have to be done "
+"from the purchase date instead of the first January"
+msgstr ""
+"Indica que el primer asiento de depreciación para este activo tiene que ser "
+"hecho desde la fecha de compra en vez de desde el 1 de enero"
#. module: account_asset
-#: selection:account.asset.property,method:0
+#: selection:account.asset.asset,method:0
+#: selection:account.asset.category,method:0
msgid "Linear"
msgstr "Lineal"
#. module: account_asset
-#: view:account.asset.asset:0
-msgid "Change duration"
-msgstr "Cambiar duración"
+#: field:account.asset.asset,company_id:0
+#: field:account.asset.category,company_id:0
+#: view:asset.asset.report:0
+#: field:asset.asset.report,company_id:0
+msgid "Company"
+msgstr "Compañía"
#. module: account_asset
-#: field:account.asset.asset,child_ids:0
-msgid "Child assets"
-msgstr "Activos hijos"
+#: view:asset.modify:0
+msgid "Modify"
+msgstr "Modificar"
#. module: account_asset
-#: field:account.asset.board,value_asset:0
-msgid "Asset Value"
-msgstr "valor de activos"
+#: selection:account.asset.asset,state:0
+#: view:asset.asset.report:0
+#: selection:asset.asset.report,state:0
+msgid "Running"
+msgstr "En ejecución"
#. module: account_asset
-#: wizard_field:account.asset.modify,init,name:0
+#: field:account.asset.depreciation.line,amount:0
+msgid "Depreciation Amount"
+msgstr "Importe de depreciación"
+
+#. module: account_asset
+#: view:asset.asset.report:0
+#: model:ir.actions.act_window,name:account_asset.action_asset_asset_report
+#: model:ir.model,name:account_asset.model_asset_asset_report
+#: model:ir.ui.menu,name:account_asset.menu_action_asset_asset_report
+msgid "Assets Analysis"
+msgstr "Análisis activos"
+
+#. module: account_asset
+#: field:asset.modify,name:0
msgid "Reason"
msgstr "Razón"
+#. module: account_asset
+#: field:account.asset.asset,method_progress_factor:0
+#: field:account.asset.category,method_progress_factor:0
+msgid "Degressive Factor"
+msgstr "Factor degresivo"
+
+#. module: account_asset
+#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_list_normal
+#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_list_normal
+msgid "Asset Categories"
+msgstr "Categorías de activo"
+
#. module: account_asset
#: view:account.asset.asset:0
-#: field:account.asset.asset,entry_ids:0
-#: wizard_field:account.asset.compute,asset_compute,move_ids:0
+#: field:account.asset.asset,account_move_line_ids:0
+#: field:account.move.line,entry_ids:0
+#: model:ir.actions.act_window,name:account_asset.act_entries_open
msgid "Entries"
msgstr "Asientos"
#. module: account_asset
-#: wizard_view:account.asset.compute,asset_compute:0
-msgid "Generated entries"
-msgstr "Asientos generados"
+#: view:account.asset.asset:0
+#: field:account.asset.asset,depreciation_line_ids:0
+msgid "Depreciation Lines"
+msgstr "Líneas de depreciación"
#. module: account_asset
-#: wizard_field:account.asset.modify,init,method_delay:0
-#: field:account.asset.property,method_delay:0
-#: field:account.asset.property.history,method_delay:0
-msgid "Number of interval"
-msgstr "Numero de intervalo"
+#: help:account.asset.asset,salvage_value:0
+msgid "It is the amount you plan to have that you cannot depreciate."
+msgstr "Es el importe que prevee tener que no puede depreciar"
#. module: account_asset
-#: wizard_button:account.asset.compute,asset_compute,asset_open:0
-msgid "Open entries"
-msgstr "Abrir asientos"
+#: field:account.asset.depreciation.line,depreciation_date:0
+#: view:asset.asset.report:0
+#: field:asset.asset.report,depreciation_date:0
+msgid "Depreciation Date"
+msgstr "Fecha de depreciación"
+
+#. module: account_asset
+#: constraint:account.asset.asset:0
+msgid "Error ! You cannot create recursive assets."
+msgstr "¡Error! No puede crear activos recursivos."
+
+#. module: account_asset
+#: field:asset.asset.report,posted_value:0
+msgid "Posted Amount"
+msgstr "Importe asentado"
#. module: account_asset
#: view:account.asset.asset:0
-#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_list
-#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_list
-#: model:ir.ui.menu,name:account_asset.menu_finance_Assets
-#: model:ir.ui.menu,name:account_asset.menu_finance_config_Assets
+#: view:asset.asset.report:0
+#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_form
+#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_form
+#: model:ir.ui.menu,name:account_asset.menu_finance_assets
+#: model:ir.ui.menu,name:account_asset.menu_finance_config_assets
msgid "Assets"
msgstr "Activos"
#. module: account_asset
-#: selection:account.asset.property,method:0
-msgid "Progressive"
-msgstr "Progresivo"
+#: field:account.asset.category,account_depreciation_id:0
+msgid "Depreciation Account"
+msgstr "Cuenta de amortización"
#. module: account_asset
-#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_list_draft
-#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_list_draft
-msgid "Draft Assets"
-msgstr "Activos en estado borrador"
-
-#. module: account_asset
-#: wizard_view:account.asset.modify,init:0
-#: wizard_field:account.asset.modify,init,note:0
-#: view:account.asset.property.history:0
+#: view:account.asset.asset:0
+#: view:account.asset.category:0
+#: view:account.asset.history:0
+#: view:asset.modify:0
+#: field:asset.modify,note:0
msgid "Notes"
msgstr "Notas"
#. module: account_asset
-#: view:account.asset.asset:0
-msgid "Change history"
-msgstr "Cambio histórico"
+#: field:account.asset.depreciation.line,move_id:0
+msgid "Depreciation Entry"
+msgstr "Asiento de amortización"
+
+#. module: account_asset
+#: sql_constraint:account.move.line:0
+msgid "Wrong credit or debit value in accounting entry !"
+msgstr "¡Valor haber o debe erróneo en el asiento contable!"
+
+#. module: account_asset
+#: view:asset.asset.report:0
+#: field:asset.asset.report,nbr:0
+msgid "# of Depreciation Lines"
+msgstr "# de líneas de amortización"
+
+#. module: account_asset
+#: field:account.asset.asset,method_period:0
+msgid "Number of Months in a Period"
+msgstr "Numero de meses en un periodo."
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Assets in draft state"
+msgstr "Activos en estado borrador"
+
+#. module: account_asset
+#: field:account.asset.asset,method_end:0
+#: selection:account.asset.asset,method_time:0
+#: selection:account.asset.category,method_time:0
+#: selection:account.asset.history,method_time:0
+msgid "Ending Date"
+msgstr "Fecha final"
+
+#. module: account_asset
+#: field:account.asset.asset,code:0
+msgid "Reference"
+msgstr "Referencia"
+
+#. module: account_asset
+#: constraint:account.invoice:0
+msgid "Invalid BBA Structured Communication !"
+msgstr "¡Estructura de comunicación BBA no válida!"
#. module: account_asset
#: view:account.asset.asset:0
-msgid "Depreciation entries"
-msgstr "Asiento de dotación a la amortización"
+msgid "Account Asset"
+msgstr "Cuenta de activo"
#. module: account_asset
-#: view:account.asset.asset:0
-msgid "Methods"
-msgstr "Métodos"
+#: model:ir.actions.act_window,name:account_asset.action_asset_depreciation_confirmation_wizard
+#: model:ir.ui.menu,name:account_asset.menu_asset_depreciation_confirmation_wizard
+msgid "Compute Assets"
+msgstr "Calcular amortizaciones"
#. module: account_asset
-#: wizard_view:account.asset.modify,init:0
-msgid "Asset properties to modify"
-msgstr "Propiedades de activos para modificar"
-
-#. module: account_asset
-#: field:account.asset.asset,partner_id:0
-msgid "Partner"
-msgstr "Empresa"
-
-#. module: account_asset
-#: wizard_field:account.asset.modify,init,method_period:0
-#: field:account.asset.property,method_period:0
-#: field:account.asset.property.history,method_period:0
-msgid "Period per interval"
-msgstr "Período por intervalo"
-
-#. module: account_asset
-#: view:account.asset.asset:0
-msgid "Depreciation duration"
-msgstr "Plazo de amortización"
-
-#. module: account_asset
-#: field:account.asset.property,account_analytic_id:0
-msgid "Analytic account"
-msgstr "Cuenta analítica"
-
-#. module: account_asset
-#: field:account.asset.property,state:0
-msgid "State"
-msgstr "Provincia"
-
-#. module: account_asset
-#: view:account.asset.asset:0
-msgid "Depreciation methods"
-msgstr "Metodos de drepreciación"
-
-#. module: account_asset
-#: view:account.asset.asset:0
-msgid "Other information"
-msgstr "Otra información"
-
-#. module: account_asset
-#: field:account.asset.board,value_asset_cumul:0
-msgid "Cumul. value"
-msgstr "Valor acumulado"
-
-#. module: account_asset
-#: view:account.asset.property:0
-msgid "Assets methods"
-msgstr "metodos activos"
-
-#. module: account_asset
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "¡XML no válido para la estructura de la vista!"
-
-#. module: account_asset
-#: model:ir.model,name:account_asset.model_account_asset_property
-msgid "Asset property"
-msgstr "Propiedad del activo"
-
-#. module: account_asset
-#: wizard_view:account.asset.compute,asset_compute:0
-#: wizard_view:account.asset.compute,init:0
-#: wizard_button:account.asset.compute,init,asset_compute:0
-#: model:ir.actions.wizard,name:account_asset.wizard_asset_compute
-#: model:ir.ui.menu,name:account_asset.menu_wizard_asset_compute
-msgid "Compute assets"
-msgstr "Calcular activos"
-
-#. module: account_asset
-#: wizard_view:account.asset.modify,init:0
-#: wizard_button:account.asset.modify,init,asset_modify:0
-#: model:ir.actions.wizard,name:account_asset.wizard_asset_modify
-msgid "Modify asset"
-msgstr "Modificar activo"
-
-#. module: account_asset
-#: view:account.asset.asset:0
-msgid "Confirm asset"
-msgstr "Confirmar activo"
-
-#. module: account_asset
-#: view:account.asset.property.history:0
-#: model:ir.model,name:account_asset.model_account_asset_property_history
-msgid "Asset history"
-msgstr "Histórico del activo"
-
-#. module: account_asset
-#: field:account.asset.property,date:0
-msgid "Date created"
-msgstr "Fecha de creación"
-
-#. module: account_asset
-#: model:ir.module.module,description:account_asset.module_meta_information
-msgid ""
-"Financial and accounting asset management.\n"
-" Allows to define\n"
-" * Asset category. \n"
-" * Assets.\n"
-" *Asset usage period and property.\n"
-" "
-msgstr ""
-"Gestión financiera y contable de activos.\n"
-" Permite definir\n"
-" * Categorías de activo. \n"
-" * Activos.\n"
-" * Período y propiedades del activo usado.\n"
-" "
-
-#. module: account_asset
-#: field:account.asset.board,value_gross:0
-#: field:account.asset.property,value_total:0
-msgid "Gross value"
-msgstr "Valor bruto"
-
-#. module: account_asset
-#: selection:account.asset.property,method_time:0
-msgid "Ending period"
-msgstr "Período final"
-
-#. module: account_asset
-#: field:account.asset.board,name:0
-msgid "Asset name"
-msgstr "nombre de activos"
-
-#. module: account_asset
-#: view:account.asset.asset:0
-msgid "Accounts information"
-msgstr "información de cuentas"
-
-#. module: account_asset
-#: field:account.asset.asset,note:0
-#: field:account.asset.category,note:0
-#: field:account.asset.property.history,note:0
-msgid "Note"
-msgstr "Nota"
+#: field:account.asset.category,method_period:0
+#: field:account.asset.history,method_period:0
+#: field:asset.modify,method_period:0
+msgid "Period Length"
+msgstr "Longitud de periodo"
#. module: account_asset
#: selection:account.asset.asset,state:0
-#: selection:account.asset.property,state:0
+#: view:asset.asset.report:0
+#: selection:asset.asset.report,state:0
msgid "Draft"
msgstr "Borrador"
#. module: account_asset
-#: field:account.asset.property,type:0
-msgid "Depr. method type"
-msgstr "Tipo de método de amortización"
+#: view:asset.asset.report:0
+msgid "Date of asset purchase"
+msgstr "Fecha de compra del activo"
#. module: account_asset
-#: field:account.asset.property,account_asset_id:0
-msgid "Asset account"
-msgstr "cuenta de activos"
-
-#. module: account_asset
-#: field:account.asset.property.history,asset_property_id:0
-msgid "Method"
-msgstr "Método"
-
-#. module: account_asset
-#: selection:account.asset.asset,state:0
-msgid "Normal"
-msgstr "Normal"
-
-#. module: account_asset
-#: field:account.asset.property,method_progress_factor:0
-msgid "Progressif factor"
-msgstr "Factor de progresión"
-
-#. module: account_asset
-#: field:account.asset.asset,localisation:0
-msgid "Localisation"
-msgstr "Localización"
-
-#. module: account_asset
-#: field:account.asset.property,method:0
-msgid "Computation method"
-msgstr "metodo de computación"
-
-#. module: account_asset
-#: field:account.asset.property,method_time:0
-msgid "Time method"
-msgstr "Método temporal"
+#: help:account.asset.asset,method_number:0
+msgid "Calculates Depreciation within specified interval"
+msgstr "Calcula la amortización en el periodo especificado"
#. module: account_asset
#: field:account.asset.asset,active:0
@@ -334,201 +276,543 @@ msgid "Active"
msgstr "Activo"
#. module: account_asset
-#: field:account.asset.property.history,user_id:0
-msgid "User"
-msgstr "Usuario"
+#: view:account.asset.asset:0
+msgid "Change Duration"
+msgstr "Cambiar duración"
#. module: account_asset
-#: field:account.asset.asset,property_ids:0
-msgid "Asset method name"
-msgstr "Nombre de método de asiento"
+#: view:account.asset.category:0
+msgid "Analytic Information"
+msgstr "Información analítica"
#. module: account_asset
-#: field:account.asset.asset,date:0
-#: field:account.asset.property.history,date:0
-msgid "Date"
-msgstr "Fecha"
+#: field:account.asset.category,account_analytic_id:0
+msgid "Analytic account"
+msgstr "Cuenta analítica"
#. module: account_asset
-#: field:account.asset.board,value_net:0
-msgid "Net value"
-msgstr "Valor neto"
+#: field:account.asset.asset,method:0
+#: field:account.asset.category,method:0
+msgid "Computation Method"
+msgstr "Método de cálculo"
#. module: account_asset
-#: wizard_view:account.asset.close,init:0
-#: model:ir.actions.wizard,name:account_asset.wizard_asset_close
-msgid "Close asset"
-msgstr "Activo cerrado"
+#: help:account.asset.asset,method_period:0
+msgid "State here the time during 2 depreciations, in months"
+msgstr "Ponga aquí el tiempo entre 2 amortizaciones, en meses"
#. module: account_asset
-#: field:account.asset.property,history_ids:0
-msgid "History"
-msgstr "Historia"
+#: constraint:account.asset.asset:0
+msgid ""
+"Prorata temporis can be applied only for time method \"number of "
+"depreciations\"."
+msgstr ""
+"Prorata temporis puede ser aplicado solo para método de tiempo \"numero de "
+"amortizaciones\""
#. module: account_asset
-#: field:account.asset.property,account_actif_id:0
-msgid "Depreciation account"
-msgstr "Cuenta de amortización"
+#: help:account.asset.history,method_time:0
+msgid ""
+"The method to use to compute the dates and number of depreciation lines.\n"
+"Number of Depreciations: Fix the number of depreciation lines and the time "
+"between 2 depreciations.\n"
+"Ending Date: Choose the time between 2 depreciations and the date the "
+"depreciations won't go beyond."
+msgstr ""
+"El método usado para calcular las fechas número de líneas de depreciación\n"
+"Número de depreciaciones: Ajusta el número de líneas de depreciación y el "
+"tiempo entre 2 depreciaciones\n"
+"Fecha de fin: Escoja un tiempo entre 2 amortizaciones y la fecha de "
+"depreciación no irá más allá."
#. module: account_asset
-#: field:account.asset.asset,period_id:0
-#: wizard_field:account.asset.compute,init,period_id:0
-msgid "Period"
-msgstr "Período"
+#: constraint:account.move.line:0
+msgid ""
+"The date of your Journal Entry is not in the defined period! You should "
+"change the date or remove this constraint from the journal."
+msgstr ""
+"¡La fecha de su asiento no está en el periodo definido! Usted debería "
+"cambiar la fecha o borrar esta restricción del diario."
#. module: account_asset
-#: model:ir.actions.act_window,name:account_asset.action_account_asset_category_form
-#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_category_form
+#: help:account.asset.history,method_period:0
+msgid "Time in month between two depreciations"
+msgstr "Tiempo en meses entre 2 depreciaciones"
+
+#. module: account_asset
+#: view:asset.modify:0
+#: model:ir.actions.act_window,name:account_asset.action_asset_modify
+#: model:ir.model,name:account_asset.model_asset_modify
+msgid "Modify Asset"
+msgstr "Modificar activo"
+
+#. module: account_asset
+#: field:account.asset.asset,salvage_value:0
+msgid "Salvage Value"
+msgstr "Valor de salvaguarda"
+
+#. module: account_asset
+#: field:account.asset.asset,category_id:0
+#: view:account.asset.category:0
+#: field:account.invoice.line,asset_category_id:0
+#: view:asset.asset.report:0
msgid "Asset Category"
msgstr "Categoría de activo"
#. module: account_asset
-#: wizard_button:account.asset.close,init,end:0
-#: wizard_button:account.asset.compute,init,end:0
-#: wizard_button:account.asset.modify,init,end:0
+#: view:account.asset.asset:0
+msgid "Assets in closed state"
+msgstr "Activos en estado cerrado"
+
+#. module: account_asset
+#: constraint:account.move.line:0
+msgid "Account and Period must belong to the same company."
+msgstr "La cuenta y el periodo deben pertenecer a la misma compañía."
+
+#. module: account_asset
+#: field:account.asset.asset,parent_id:0
+msgid "Parent Asset"
+msgstr "Activo padre"
+
+#. module: account_asset
+#: view:account.asset.history:0
+#: model:ir.model,name:account_asset.model_account_asset_history
+msgid "Asset history"
+msgstr "Histórico del activo"
+
+#. module: account_asset
+#: view:account.asset.category:0
+msgid "Search Asset Category"
+msgstr "Buscar categoría de activo"
+
+#. module: account_asset
+#: model:ir.model,name:account_asset.model_account_invoice_line
+msgid "Invoice Line"
+msgstr "Línea de factura"
+
+#. module: account_asset
+#: constraint:account.move.line:0
+msgid ""
+"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."
+msgstr ""
+"La cuenta seleccionada en su asiento fuerza a tener una moneda secundaria. "
+"Debería eliminar la moneda secundaria de la cuenta o asignar al diario una "
+"vista multi-moneda"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Depreciation Board"
+msgstr "Tabla de amortización"
+
+#. module: account_asset
+#: model:ir.model,name:account_asset.model_account_move_line
+msgid "Journal Items"
+msgstr "Elementos diario"
+
+#. module: account_asset
+#: field:asset.asset.report,unposted_value:0
+msgid "Unposted Amount"
+msgstr "Importe no asentado"
+
+#. module: account_asset
+#: field:account.asset.asset,method_time:0
+#: field:account.asset.category,method_time:0
+#: field:account.asset.history,method_time:0
+msgid "Time Method"
+msgstr "Método de tiempo"
+
+#. module: account_asset
+#: view:asset.depreciation.confirmation.wizard:0
+#: view:asset.modify:0
+msgid "or"
+msgstr "ó"
+
+#. module: account_asset
+#: constraint:account.move.line:0
+msgid "You cannot create journal items on closed account."
+msgstr "No puedes crear elementos de diario en cuentas cerradas."
+
+#. module: account_asset
+#: field:account.asset.asset,note:0
+#: field:account.asset.category,note:0
+#: field:account.asset.history,note:0
+msgid "Note"
+msgstr "Nota"
+
+#. module: account_asset
+#: help:account.asset.asset,method:0
+#: help:account.asset.category,method:0
+msgid ""
+"Choose the method to use to compute the amount of depreciation lines.\n"
+" * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n"
+" * Degressive: Calculated on basis of: Remaining Value * Degressive Factor"
+msgstr ""
+"Escoja el método a usar en el cálculo del importe de las líneas de "
+"amortización\n"
+" * Lineal: calculado en base a: valor bruto / número de depreciaciones\n"
+" * Regresivo: calculado en base a: valor remanente/ factor de regresión"
+
+#. module: account_asset
+#: help:account.asset.asset,method_time:0
+#: help:account.asset.category,method_time:0
+msgid ""
+"Choose the method to use to compute the dates and number of depreciation "
+"lines.\n"
+" * Number of Depreciations: Fix the number of depreciation lines and the "
+"time between 2 depreciations.\n"
+" * Ending Date: Choose the time between 2 depreciations and the date the "
+"depreciations won't go beyond."
+msgstr ""
+"Escoja el método a utilizar para calcular las fechas y número de las líneas "
+"de depreciación\n"
+" * Número de depreciaciones: Establece el número de líneas de depreciación "
+"y el tiempo entre dos depreciaciones.\n"
+" * Fecha fin: Seleccione el tiempo entre 2 depreciaciones y la fecha de la "
+"depreciación no irá más allá."
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Assets in running state"
+msgstr "Activos en ejecución"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Closed"
+msgstr "Cerrado"
+
+#. module: account_asset
+#: help:account.asset.asset,state:0
+msgid ""
+"When an asset is created, the status is 'Draft'.\n"
+"If the asset is confirmed, the status goes in 'Running' and the depreciation "
+"lines can be posted in the accounting.\n"
+"You can manually close an asset when the depreciation is over. If the last "
+"line of depreciation is posted, the asset automatically goes in that status."
+msgstr ""
+"Cuando un activo es creado, el estado es 'Borrador'\n"
+"Si el activo es confirmado, el estado cambia a 'En ejecucion' y las lineas "
+"de depreciacion pueden ser asentadas en la contabilidad.\n"
+"Puede cerrar manualmente un activo cuando la depreciacion ha terminado. Si "
+"la ultima linea de depreciacion es asentade, el activo automaticamente "
+"cambia de estado."
+
+#. module: account_asset
+#: field:account.asset.asset,state:0
+#: field:asset.asset.report,state:0
+msgid "Status"
+msgstr "Estado"
+
+#. module: account_asset
+#: field:account.asset.asset,partner_id:0
+#: field:asset.asset.report,partner_id:0
+msgid "Partner"
+msgstr "Empresa"
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Posted depreciation lines"
+msgstr "Líneas de amortización asentadas"
+
+#. module: account_asset
+#: field:account.asset.asset,child_ids:0
+msgid "Children Assets"
+msgstr "Activos hijos"
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Date of depreciation"
+msgstr "Fecha de depreciación"
+
+#. module: account_asset
+#: field:account.asset.history,user_id:0
+msgid "User"
+msgstr "Usuario"
+
+#. module: account_asset
+#: field:account.asset.history,date:0
+msgid "Date"
+msgstr "Fecha"
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Extended Filters..."
+msgstr "Filtros extendidos..."
+
+#. module: account_asset
+#: view:account.asset.asset:0
+#: view:asset.depreciation.confirmation.wizard:0
+msgid "Compute"
+msgstr "Calcular"
+
+#. module: account_asset
+#: view:account.asset.history:0
+msgid "Asset History"
+msgstr "Histórico del activo"
+
+#. module: account_asset
+#: field:asset.asset.report,name:0
+msgid "Year"
+msgstr "Año"
+
+#. module: account_asset
+#: model:ir.model,name:account_asset.model_asset_depreciation_confirmation_wizard
+msgid "asset.depreciation.confirmation.wizard"
+msgstr "Asistente de confirmación de depreciación de activo"
+
+#. module: account_asset
+#: field:account.asset.category,account_asset_id:0
+msgid "Asset Account"
+msgstr "Cuenta de activo"
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,parent_state:0
+msgid "State of Asset"
+msgstr "Estado del activo"
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,name:0
+msgid "Depreciation Name"
+msgstr "Nombre depreciación"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+#: field:account.asset.asset,history_ids:0
+msgid "History"
+msgstr "Histórico"
+
+#. module: account_asset
+#: sql_constraint:account.invoice:0
+msgid "Invoice Number must be unique per Company!"
+msgstr "¡El número de factura debe ser único por compañía!"
+
+#. module: account_asset
+#: field:asset.depreciation.confirmation.wizard,period_id:0
+msgid "Period"
+msgstr "Período"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "General"
+msgstr "General"
+
+#. module: account_asset
+#: field:account.asset.asset,prorata:0
+#: field:account.asset.category,prorata:0
+msgid "Prorata Temporis"
+msgstr "Tiempo prorateado"
+
+#. module: account_asset
+#: model:ir.model,name:account_asset.model_account_invoice
+msgid "Invoice"
+msgstr "Factura"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Set to Close"
+msgstr "Marcar como cerrado"
+
+#. module: account_asset
+#: view:asset.depreciation.confirmation.wizard:0
+#: view:asset.modify:0
msgid "Cancel"
msgstr "Cancelar"
#. module: account_asset
#: selection:account.asset.asset,state:0
-#: wizard_button:account.asset.compute,asset_compute,end:0
-#: selection:account.asset.property,state:0
+#: selection:asset.asset.report,state:0
msgid "Close"
msgstr "Cerrar"
#. module: account_asset
-#: selection:account.asset.property,state:0
-msgid "Open"
-msgstr "Abrir"
+#: view:account.asset.category:0
+msgid "Depreciation Method"
+msgstr "Método de depreciación"
#. module: account_asset
-#: constraint:ir.model:0
+#: view:asset.modify:0
+msgid "Asset Durations to Modify"
+msgstr "Duraciones de activo para modificar"
+
+#. module: account_asset
+#: field:account.asset.asset,purchase_date:0
+#: view:asset.asset.report:0
+#: field:asset.asset.report,purchase_date:0
+msgid "Purchase Date"
+msgstr "Fecha de compra"
+
+#. module: account_asset
+#: selection:account.asset.asset,method:0
+#: selection:account.asset.category,method:0
+msgid "Degressive"
+msgstr "Regresivo"
+
+#. module: account_asset
+#: help:asset.depreciation.confirmation.wizard,period_id:0
msgid ""
-"The Object name must start with x_ and not contain any special character !"
+"Choose the period for which you want to automatically post the depreciation "
+"lines of running assets"
msgstr ""
-"¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-"especial!"
+"Escoja el periodo para el que desea asentar automáticamente las líneas de "
+"depreciación para los activos en ejecución"
#. module: account_asset
-#: model:ir.module.module,shortdesc:account_asset.module_meta_information
-msgid "Asset management"
-msgstr "Gestión del activo"
+#: view:account.asset.asset:0
+msgid "Current"
+msgstr "Actual"
#. module: account_asset
-#: view:account.asset.board:0
-#: field:account.asset.property,board_ids:0
-#: model:ir.model,name:account_asset.model_account_asset_board
-msgid "Asset board"
-msgstr "Tablero de activos"
+#: field:account.asset.depreciation.line,remaining_value:0
+msgid "Amount to Depreciate"
+msgstr "Importe a depreciar"
#. module: account_asset
-#: field:account.asset.asset,state:0
-msgid "Global state"
-msgstr "Estado global"
+#: field:account.asset.asset,name:0
+msgid "Asset Name"
+msgstr "Nombre del activo."
#. module: account_asset
-#: selection:account.asset.property,method_time:0
-msgid "Delay"
-msgstr "Retrasar"
+#: field:account.asset.category,open_asset:0
+msgid "Skip Draft State"
+msgstr "Omitir estado borrador"
#. module: account_asset
-#: wizard_view:account.asset.close,init:0
-msgid "General information"
-msgstr "Información general"
+#: view:account.asset.category:0
+msgid "Depreciation Dates"
+msgstr "Fechas de depreciación"
#. module: account_asset
-#: field:account.asset.property,journal_analytic_id:0
-msgid "Analytic journal"
-msgstr "Diario analítico"
+#: field:account.asset.asset,currency_id:0
+msgid "Currency"
+msgstr "Moneda"
#. module: account_asset
-#: field:account.asset.property,name:0
-msgid "Method name"
-msgstr "Nombre del método"
-
-#. module: account_asset
-#: field:account.asset.property,journal_id:0
+#: field:account.asset.category,journal_id:0
msgid "Journal"
msgstr "Diario"
#. module: account_asset
-#: field:account.asset.property.history,name:0
+#: field:account.asset.history,name:0
msgid "History name"
-msgstr "Nombre histórico"
+msgstr "Nombre del histórico"
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,depreciated_value:0
+msgid "Amount Already Depreciated"
+msgstr "el importe ya ha sido depreciado"
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,move_check:0
+#: view:asset.asset.report:0
+#: field:asset.asset.report,move_check:0
+msgid "Posted"
+msgstr "Asentado"
+
+#. module: account_asset
+#: model:ir.actions.act_window,help:account_asset.action_asset_asset_report
+msgid ""
+"
\n"
+" From this report, you can have an overview on all depreciation. "
+"The\n"
+" tool search can also be used to personalise your Assets reports "
+"and\n"
+" so, match this analysis to your needs;\n"
+"
\n"
+" "
+msgstr ""
+"
\n"
+" Desde este reporte, puede tener un panorama de toda la "
+"depreciación, la \n"
+" herramienta búsqueda puede ser utilizada para personalizar sus "
+"reportes de activos, asi\n"
+" que utilice esta herramienta de acuerdo a sus necesidades.\n"
+"
\n"
+" "
+
+#. module: account_asset
+#: field:account.asset.asset,purchase_value:0
+msgid "Gross Value"
+msgstr "Valor bruto"
+
+#. module: account_asset
+#: field:account.asset.category,name:0
+msgid "Name"
+msgstr "Nombre"
+
+#. module: account_asset
+#: constraint:account.move.line:0
+msgid "You cannot create journal items on an account of type view."
+msgstr "No puede crear elementos de diario en una cuenta de tipo vista."
+
+#. module: account_asset
+#: help:account.asset.category,open_asset:0
+msgid ""
+"Check this if you want to automatically confirm the assets of this category "
+"when created by invoices."
+msgstr ""
+"Valide si desea confirmar automáticamente el activo de esta categoría cuando "
+"es creado desde una factura."
#. module: account_asset
#: view:account.asset.asset:0
-msgid "Close method"
-msgstr "Método cerrado"
+msgid "Set to Draft"
+msgstr "Cambiar a borrador"
#. module: account_asset
-#: field:account.asset.property,entry_asset_ids:0
-msgid "Asset Entries"
-msgstr "Asientos de activo"
+#: model:ir.model,name:account_asset.model_account_asset_depreciation_line
+msgid "Asset depreciation line"
+msgstr "Línea de depreciación del activo"
#. module: account_asset
-#: field:account.asset.asset,category_id:0
#: view:account.asset.category:0
-#: field:account.asset.category,name:0
+#: field:asset.asset.report,asset_category_id:0
#: model:ir.model,name:account_asset.model_account_asset_category
msgid "Asset category"
msgstr "Categoría de activo"
#. module: account_asset
-#: view:account.asset.asset:0
-msgid "Depreciation"
-msgstr "Amortización"
+#: view:asset.asset.report:0
+#: field:asset.asset.report,depreciation_value:0
+msgid "Amount of Depreciation Lines"
+msgstr "Importe de las líneas de amortización"
#. module: account_asset
-#: field:account.asset.asset,code:0
-#: field:account.asset.category,code:0
-msgid "Asset code"
-msgstr "Código de activo"
+#: code:addons/account_asset/wizard/wizard_asset_compute.py:49
+#, python-format
+msgid "Created Asset Moves"
+msgstr "Movimientos de activos creados"
#. module: account_asset
-#: field:account.asset.asset,value_total:0
-msgid "Total value"
-msgstr "Valor total"
-
-#. module: account_asset
-#: selection:account.asset.asset,state:0
-msgid "View"
-msgstr "Vista"
-
-#. module: account_asset
-#: view:account.asset.asset:0
-msgid "General info"
-msgstr "Información general"
-
-#. module: account_asset
-#: field:account.asset.asset,sequence:0
+#: field:account.asset.depreciation.line,sequence:0
msgid "Sequence"
msgstr "Secuencia"
#. module: account_asset
-#: field:account.asset.property,value_residual:0
-msgid "Residual value"
-msgstr "Valor residual"
+#: help:account.asset.category,method_period:0
+msgid "State here the time between 2 depreciations, in months"
+msgstr "Establezca aquí el tiempo entre 2 depreciaciones, en meses"
#. module: account_asset
-#: wizard_button:account.asset.close,init,asset_close:0
-msgid "End of asset"
-msgstr "Final de activo"
+#: field:account.asset.asset,method_number:0
+#: selection:account.asset.asset,method_time:0
+#: field:account.asset.category,method_number:0
+#: selection:account.asset.category,method_time:0
+#: field:account.asset.history,method_number:0
+#: selection:account.asset.history,method_time:0
+#: field:asset.modify,method_number:0
+msgid "Number of Depreciations"
+msgstr "Número de depreciaciones"
#. module: account_asset
-#: selection:account.asset.property,type:0
-msgid "Direct"
-msgstr "Directo"
+#: view:account.asset.asset:0
+msgid "Create Move"
+msgstr "Crear asiento"
#. module: account_asset
-#: selection:account.asset.property,type:0
-msgid "Indirect"
-msgstr "Indirecto"
-
-#. module: account_asset
-#: field:account.asset.asset,parent_id:0
-msgid "Parent asset"
-msgstr "Activo padre"
+#: view:account.asset.asset:0
+msgid "Confirm Asset"
+msgstr "Confirmar activo"
#. module: account_asset
#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_tree
diff --git a/addons/account_asset/i18n/it.po b/addons/account_asset/i18n/it.po
new file mode 100644
index 00000000000..2f1fe108905
--- /dev/null
+++ b/addons/account_asset/i18n/it.po
@@ -0,0 +1,781 @@
+# 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-11-24 02:52+0000\n"
+"PO-Revision-Date: 2012-11-30 00:08+0000\n"
+"Last-Translator: Sergio Corato \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: 2012-11-30 05:08+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Assets in draft and open states"
+msgstr "Immobili in stato bozza e aperto"
+
+#. module: account_asset
+#: field:account.asset.category,method_end:0
+#: field:account.asset.history,method_end:0
+#: field:asset.modify,method_end:0
+msgid "Ending date"
+msgstr "Data finale"
+
+#. module: account_asset
+#: field:account.asset.asset,value_residual:0
+msgid "Residual Value"
+msgstr "Valore residuo"
+
+#. module: account_asset
+#: field:account.asset.category,account_expense_depreciation_id:0
+msgid "Depr. Expense Account"
+msgstr "Conto Ammortamento"
+
+#. module: account_asset
+#: view:asset.depreciation.confirmation.wizard:0
+msgid "Compute Asset"
+msgstr "Calcola Ammortamenti"
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Group By..."
+msgstr "Raggruppa per..."
+
+#. module: account_asset
+#: field:asset.asset.report,gross_value:0
+msgid "Gross Amount"
+msgstr "Valore Iniziale"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+#: field:account.asset.depreciation.line,asset_id:0
+#: field:account.asset.history,asset_id:0
+#: field:account.move.line,asset_id:0
+#: view:asset.asset.report:0
+#: field:asset.asset.report,asset_id:0
+#: model:ir.model,name:account_asset.model_account_asset_asset
+msgid "Asset"
+msgstr "Immobilizzazione"
+
+#. module: account_asset
+#: help:account.asset.asset,prorata:0
+#: help:account.asset.category,prorata:0
+msgid ""
+"Indicates that the first depreciation entry for this asset have to be done "
+"from the purchase date instead of the first January"
+msgstr ""
+"Indica che il primo ammortamento di questo immobile sarà calcolato dalla "
+"data di acquisto invece che dal primo Gennaio."
+
+#. module: account_asset
+#: selection:account.asset.asset,method:0
+#: selection:account.asset.category,method:0
+msgid "Linear"
+msgstr "Costante"
+
+#. module: account_asset
+#: field:account.asset.asset,company_id:0
+#: field:account.asset.category,company_id:0
+#: view:asset.asset.report:0
+#: field:asset.asset.report,company_id:0
+msgid "Company"
+msgstr "Azienda"
+
+#. module: account_asset
+#: view:asset.modify:0
+msgid "Modify"
+msgstr ""
+
+#. module: account_asset
+#: selection:account.asset.asset,state:0
+#: view:asset.asset.report:0
+#: selection:asset.asset.report,state:0
+msgid "Running"
+msgstr "In esecuzione"
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,amount:0
+msgid "Depreciation Amount"
+msgstr "Importo Ammortamento"
+
+#. module: account_asset
+#: view:asset.asset.report:0
+#: model:ir.actions.act_window,name:account_asset.action_asset_asset_report
+#: model:ir.model,name:account_asset.model_asset_asset_report
+#: model:ir.ui.menu,name:account_asset.menu_action_asset_asset_report
+msgid "Assets Analysis"
+msgstr "Analisi Immobilizzazioni"
+
+#. module: account_asset
+#: field:asset.modify,name:0
+msgid "Reason"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,method_progress_factor:0
+#: field:account.asset.category,method_progress_factor:0
+msgid "Degressive Factor"
+msgstr "Tasso Degressivo"
+
+#. module: account_asset
+#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_list_normal
+#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_list_normal
+msgid "Asset Categories"
+msgstr "Categorie Immobilizzazioni"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+#: field:account.asset.asset,account_move_line_ids:0
+#: field:account.move.line,entry_ids:0
+#: model:ir.actions.act_window,name:account_asset.act_entries_open
+msgid "Entries"
+msgstr "Registrazioni"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+#: field:account.asset.asset,depreciation_line_ids:0
+msgid "Depreciation Lines"
+msgstr "Righe Ammortamento"
+
+#. module: account_asset
+#: help:account.asset.asset,salvage_value:0
+msgid "It is the amount you plan to have that you cannot depreciate."
+msgstr "E' l'ammontare che si prevede di non poter ammortizzare."
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,depreciation_date:0
+#: view:asset.asset.report:0
+#: field:asset.asset.report,depreciation_date:0
+msgid "Depreciation Date"
+msgstr "Data Ammortamento"
+
+#. module: account_asset
+#: constraint:account.asset.asset:0
+msgid "Error ! You cannot create recursive assets."
+msgstr "Errore ! Non è possibile creare immobilizzazioni ricorsive."
+
+#. module: account_asset
+#: field:asset.asset.report,posted_value:0
+msgid "Posted Amount"
+msgstr "Importo Contabilizzato"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+#: view:asset.asset.report:0
+#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_form
+#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_form
+#: model:ir.ui.menu,name:account_asset.menu_finance_assets
+#: model:ir.ui.menu,name:account_asset.menu_finance_config_assets
+msgid "Assets"
+msgstr "Immobilizzazioni"
+
+#. module: account_asset
+#: field:account.asset.category,account_depreciation_id:0
+msgid "Depreciation Account"
+msgstr "F.do Ammortamento"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+#: view:account.asset.category:0
+#: view:account.asset.history:0
+#: view:asset.modify:0
+#: field:asset.modify,note:0
+msgid "Notes"
+msgstr "Note"
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,move_id:0
+msgid "Depreciation Entry"
+msgstr ""
+
+#. module: account_asset
+#: sql_constraint:account.move.line:0
+msgid "Wrong credit or debit value in accounting entry !"
+msgstr "Valore di credito o debito errato nella registrazione contabile !"
+
+#. module: account_asset
+#: view:asset.asset.report:0
+#: field:asset.asset.report,nbr:0
+msgid "# of Depreciation Lines"
+msgstr "# di Righe Ammortamento"
+
+#. module: account_asset
+#: field:account.asset.asset,method_period:0
+msgid "Number of Months in a Period"
+msgstr "Numero di Mesi in un Periodo"
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Assets in draft state"
+msgstr "Immobilizzazioni in stato \"bozza\""
+
+#. module: account_asset
+#: field:account.asset.asset,method_end:0
+#: selection:account.asset.asset,method_time:0
+#: selection:account.asset.category,method_time:0
+#: selection:account.asset.history,method_time:0
+msgid "Ending Date"
+msgstr "Data finale"
+
+#. module: account_asset
+#: field:account.asset.asset,code:0
+msgid "Reference"
+msgstr "Riferimento"
+
+#. module: account_asset
+#: constraint:account.invoice:0
+msgid "Invalid BBA Structured Communication !"
+msgstr "Comunicazione strutturata BBA non valida !"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Account Asset"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.actions.act_window,name:account_asset.action_asset_depreciation_confirmation_wizard
+#: model:ir.ui.menu,name:account_asset.menu_asset_depreciation_confirmation_wizard
+msgid "Compute Assets"
+msgstr "Calcola Ammortamenti"
+
+#. module: account_asset
+#: field:account.asset.category,method_period:0
+#: field:account.asset.history,method_period:0
+#: field:asset.modify,method_period:0
+msgid "Period Length"
+msgstr "Durata del Periodo"
+
+#. module: account_asset
+#: selection:account.asset.asset,state:0
+#: view:asset.asset.report:0
+#: selection:asset.asset.report,state:0
+msgid "Draft"
+msgstr "Bozza"
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Date of asset purchase"
+msgstr "Data di acquisto dell'immobilizzazione"
+
+#. module: account_asset
+#: help:account.asset.asset,method_number:0
+msgid "Calculates Depreciation within specified interval"
+msgstr "Calcola l'Ammortamento all'interno del periodo indicato"
+
+#. module: account_asset
+#: field:account.asset.asset,active:0
+msgid "Active"
+msgstr "Attivo"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Change Duration"
+msgstr "Modifica Durata"
+
+#. module: account_asset
+#: view:account.asset.category:0
+msgid "Analytic Information"
+msgstr "Informazioni Analitiche"
+
+#. module: account_asset
+#: field:account.asset.category,account_analytic_id:0
+msgid "Analytic account"
+msgstr "Conto analitico"
+
+#. module: account_asset
+#: field:account.asset.asset,method:0
+#: field:account.asset.category,method:0
+msgid "Computation Method"
+msgstr "Metodo di calcolo"
+
+#. module: account_asset
+#: help:account.asset.asset,method_period:0
+msgid "State here the time during 2 depreciations, in months"
+msgstr "Indicare l'intervallo tra 2 ammortamenti, in mesi"
+
+#. module: account_asset
+#: constraint:account.asset.asset:0
+msgid ""
+"Prorata temporis can be applied only for time method \"number of "
+"depreciations\"."
+msgstr ""
+
+#. module: account_asset
+#: help:account.asset.history,method_time:0
+msgid ""
+"The method to use to compute the dates and number of depreciation lines.\n"
+"Number of Depreciations: Fix the number of depreciation lines and the time "
+"between 2 depreciations.\n"
+"Ending Date: Choose the time between 2 depreciations and the date the "
+"depreciations won't go beyond."
+msgstr ""
+
+#. module: account_asset
+#: constraint:account.move.line:0
+msgid ""
+"The date of your Journal Entry is not in the defined period! You should "
+"change the date or remove this constraint from the journal."
+msgstr ""
+
+#. module: account_asset
+#: help:account.asset.history,method_period:0
+msgid "Time in month between two depreciations"
+msgstr "Tempo in mesi tra due ammortamenti"
+
+#. module: account_asset
+#: view:asset.modify:0
+#: model:ir.actions.act_window,name:account_asset.action_asset_modify
+#: model:ir.model,name:account_asset.model_asset_modify
+msgid "Modify Asset"
+msgstr "Modifica Immobilizzazione"
+
+#. module: account_asset
+#: field:account.asset.asset,salvage_value:0
+msgid "Salvage Value"
+msgstr "Valore di Realizzo"
+
+#. module: account_asset
+#: field:account.asset.asset,category_id:0
+#: view:account.asset.category:0
+#: field:account.invoice.line,asset_category_id:0
+#: view:asset.asset.report:0
+msgid "Asset Category"
+msgstr "Categoria Immobilizzazione"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Assets in closed state"
+msgstr "Immobilizzazioni in stato \"chiuso\""
+
+#. module: account_asset
+#: constraint:account.move.line:0
+msgid "Account and Period must belong to the same company."
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,parent_id:0
+msgid "Parent Asset"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.history:0
+#: model:ir.model,name:account_asset.model_account_asset_history
+msgid "Asset history"
+msgstr "Storico immobilizzazione"
+
+#. module: account_asset
+#: view:account.asset.category:0
+msgid "Search Asset Category"
+msgstr "Ricerca Categoria Immobilizzazioni"
+
+#. module: account_asset
+#: model:ir.model,name:account_asset.model_account_invoice_line
+msgid "Invoice Line"
+msgstr "Riga fattura"
+
+#. module: account_asset
+#: constraint:account.move.line:0
+msgid ""
+"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."
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Depreciation Board"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.model,name:account_asset.model_account_move_line
+msgid "Journal Items"
+msgstr ""
+
+#. module: account_asset
+#: field:asset.asset.report,unposted_value:0
+msgid "Unposted Amount"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,method_time:0
+#: field:account.asset.category,method_time:0
+#: field:account.asset.history,method_time:0
+msgid "Time Method"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.depreciation.confirmation.wizard:0
+#: view:asset.modify:0
+msgid "or"
+msgstr ""
+
+#. module: account_asset
+#: constraint:account.move.line:0
+msgid "You cannot create journal items on closed account."
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,note:0
+#: field:account.asset.category,note:0
+#: field:account.asset.history,note:0
+msgid "Note"
+msgstr ""
+
+#. module: account_asset
+#: help:account.asset.asset,method:0
+#: help:account.asset.category,method:0
+msgid ""
+"Choose the method to use to compute the amount of depreciation lines.\n"
+" * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n"
+" * Degressive: Calculated on basis of: Remaining Value * Degressive Factor"
+msgstr ""
+
+#. module: account_asset
+#: help:account.asset.asset,method_time:0
+#: help:account.asset.category,method_time:0
+msgid ""
+"Choose the method to use to compute the dates and number of depreciation "
+"lines.\n"
+" * Number of Depreciations: Fix the number of depreciation lines and the "
+"time between 2 depreciations.\n"
+" * Ending Date: Choose the time between 2 depreciations and the date the "
+"depreciations won't go beyond."
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Assets in running state"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Closed"
+msgstr ""
+
+#. module: account_asset
+#: help:account.asset.asset,state:0
+msgid ""
+"When an asset is created, the status is 'Draft'.\n"
+"If the asset is confirmed, the status goes in 'Running' and the depreciation "
+"lines can be posted in the accounting.\n"
+"You can manually close an asset when the depreciation is over. If the last "
+"line of depreciation is posted, the asset automatically goes in that status."
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,state:0
+#: field:asset.asset.report,state:0
+msgid "Status"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,partner_id:0
+#: field:asset.asset.report,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Posted depreciation lines"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,child_ids:0
+msgid "Children Assets"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Date of depreciation"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.history,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.history,date:0
+msgid "Date"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+#: view:asset.depreciation.confirmation.wizard:0
+msgid "Compute"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.history:0
+msgid "Asset History"
+msgstr ""
+
+#. module: account_asset
+#: field:asset.asset.report,name:0
+msgid "Year"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.model,name:account_asset.model_asset_depreciation_confirmation_wizard
+msgid "asset.depreciation.confirmation.wizard"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.category,account_asset_id:0
+msgid "Asset Account"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,parent_state:0
+msgid "State of Asset"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,name:0
+msgid "Depreciation Name"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+#: field:account.asset.asset,history_ids:0
+msgid "History"
+msgstr ""
+
+#. module: account_asset
+#: sql_constraint:account.invoice:0
+msgid "Invoice Number must be unique per Company!"
+msgstr ""
+
+#. module: account_asset
+#: field:asset.depreciation.confirmation.wizard,period_id:0
+msgid "Period"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "General"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,prorata:0
+#: field:account.asset.category,prorata:0
+msgid "Prorata Temporis"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.model,name:account_asset.model_account_invoice
+msgid "Invoice"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Set to Close"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.depreciation.confirmation.wizard:0
+#: view:asset.modify:0
+msgid "Cancel"
+msgstr ""
+
+#. module: account_asset
+#: selection:account.asset.asset,state:0
+#: selection:asset.asset.report,state:0
+msgid "Close"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.category:0
+msgid "Depreciation Method"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.modify:0
+msgid "Asset Durations to Modify"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,purchase_date:0
+#: view:asset.asset.report:0
+#: field:asset.asset.report,purchase_date:0
+msgid "Purchase Date"
+msgstr ""
+
+#. module: account_asset
+#: selection:account.asset.asset,method:0
+#: selection:account.asset.category,method:0
+msgid "Degressive"
+msgstr ""
+
+#. module: account_asset
+#: help:asset.depreciation.confirmation.wizard,period_id:0
+msgid ""
+"Choose the period for which you want to automatically post the depreciation "
+"lines of running assets"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Current"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,remaining_value:0
+msgid "Amount to Depreciate"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,name:0
+msgid "Asset Name"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.category,open_asset:0
+msgid "Skip Draft State"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.category:0
+msgid "Depreciation Dates"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,currency_id:0
+msgid "Currency"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.category,journal_id:0
+msgid "Journal"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.history,name:0
+msgid "History name"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,depreciated_value:0
+msgid "Amount Already Depreciated"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,move_check:0
+#: view:asset.asset.report:0
+#: field:asset.asset.report,move_check:0
+msgid "Posted"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.actions.act_window,help:account_asset.action_asset_asset_report
+msgid ""
+"
\n"
+" From this report, you can have an overview on all depreciation. "
+"The\n"
+" tool search can also be used to personalise your Assets reports "
+"and\n"
+" so, match this analysis to your needs;\n"
+"
\n"
+" "
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,purchase_value:0
+msgid "Gross Value"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.category,name:0
+msgid "Name"
+msgstr ""
+
+#. module: account_asset
+#: constraint:account.move.line:0
+msgid "You cannot create journal items on an account of type view."
+msgstr ""
+
+#. module: account_asset
+#: help:account.asset.category,open_asset:0
+msgid ""
+"Check this if you want to automatically confirm the assets of this category "
+"when created by invoices."
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Set to Draft"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.model,name:account_asset.model_account_asset_depreciation_line
+msgid "Asset depreciation line"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.category:0
+#: field:asset.asset.report,asset_category_id:0
+#: model:ir.model,name:account_asset.model_account_asset_category
+msgid "Asset category"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0
+#: field:asset.asset.report,depreciation_value:0
+msgid "Amount of Depreciation Lines"
+msgstr ""
+
+#. module: account_asset
+#: code:addons/account_asset/wizard/wizard_asset_compute.py:49
+#, python-format
+msgid "Created Asset Moves"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: account_asset
+#: help:account.asset.category,method_period:0
+msgid "State here the time between 2 depreciations, in months"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,method_number:0
+#: selection:account.asset.asset,method_time:0
+#: field:account.asset.category,method_number:0
+#: selection:account.asset.category,method_time:0
+#: field:account.asset.history,method_number:0
+#: selection:account.asset.history,method_time:0
+#: field:asset.modify,method_number:0
+msgid "Number of Depreciations"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Create Move"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Confirm Asset"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_tree
+#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_tree
+msgid "Asset Hierarchy"
+msgstr ""
diff --git a/addons/account_asset/i18n/nl_BE.po b/addons/account_asset/i18n/nl_BE.po
index ca2ee6748ae..7736ca427f0 100644
--- a/addons/account_asset/i18n/nl_BE.po
+++ b/addons/account_asset/i18n/nl_BE.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-07-27 13:02+0000\n"
+"PO-Revision-Date: 2012-11-27 13:35+0000\n"
"Last-Translator: Els Van Vossel (Agaplan) \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: 2012-11-25 06:32+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
#. module: account_asset
#: view:account.asset.asset:0
@@ -160,7 +160,7 @@ msgstr "Afschrijvingsdatum"
#. module: account_asset
#: constraint:account.asset.asset:0
msgid "Error ! You cannot create recursive assets."
-msgstr ""
+msgstr "U kunt niet dezelfde investeringen maken."
#. module: account_asset
#: field:asset.asset.report,posted_value:0
@@ -210,7 +210,7 @@ msgstr "# afschrijvingslijnen"
#. module: account_asset
#: field:account.asset.asset,method_period:0
msgid "Number of Months in a Period"
-msgstr ""
+msgstr "Aantal maanden in een periode"
#. module: account_asset
#: view:asset.asset.report:0
@@ -367,7 +367,7 @@ msgstr "Afschrijvingen in status gesloten"
#. module: account_asset
#: constraint:account.move.line:0
msgid "Account and Period must belong to the same company."
-msgstr ""
+msgstr "De rekening en de periode moeten tot dezelfde firma behoren."
#. module: account_asset
#: field:account.asset.asset,parent_id:0
@@ -427,12 +427,12 @@ msgstr "Tijdmethode"
#: view:asset.depreciation.confirmation.wizard:0
#: view:asset.modify:0
msgid "or"
-msgstr ""
+msgstr "of"
#. module: account_asset
#: constraint:account.move.line:0
msgid "You cannot create journal items on closed account."
-msgstr ""
+msgstr "U kunt geen boekingen doen op een afgesloten rekening."
#. module: account_asset
#: field:account.asset.asset,note:0
@@ -489,12 +489,18 @@ msgid ""
"You can manually close an asset when the depreciation is over. If the last "
"line of depreciation is posted, the asset automatically goes in that status."
msgstr ""
+"Als een investering wordt gemaakt, is de status 'Concept'.\n"
+"Als de investering wordt bevestigd, verandert de status in 'Lopend'; de "
+"afschrijvingslijnen kunnen worden geboekt.\n"
+"U kunt een investering manueel afsluiten als deze volledig is afgeschreven. "
+"Als de laatste lijn van de afschrijving is geboekt, gaat een investering "
+"automatisch in deze status."
#. module: account_asset
#: field:account.asset.asset,state:0
#: field:asset.asset.report,state:0
msgid "Status"
-msgstr ""
+msgstr "Status"
#. module: account_asset
#: field:account.asset.asset,partner_id:0
@@ -541,7 +547,7 @@ msgstr "Berekenen"
#. module: account_asset
#: view:account.asset.history:0
msgid "Asset History"
-msgstr ""
+msgstr "Activahistoriek"
#. module: account_asset
#: field:asset.asset.report,name:0
@@ -662,7 +668,7 @@ msgstr "Af te schrijven bedrag"
#. module: account_asset
#: field:account.asset.asset,name:0
msgid "Asset Name"
-msgstr ""
+msgstr "Activanaam"
#. module: account_asset
#: field:account.asset.category,open_asset:0
@@ -713,11 +719,15 @@ msgid ""
" \n"
" "
msgstr ""
+"Dit rapport biedt een overzicht van alle afschrijvingen. De zoekfunctie kan "
+"worden aangepast om het overzicht van uw investeringen te personaliseren, "
+"zodat u de gewenste analyse krijgt.\n"
+" "
#. module: account_asset
#: field:account.asset.asset,purchase_value:0
msgid "Gross Value"
-msgstr ""
+msgstr "Brutowaarde"
#. module: account_asset
#: field:account.asset.category,name:0
@@ -727,7 +737,7 @@ msgstr "Naam"
#. module: account_asset
#: constraint:account.move.line:0
msgid "You cannot create journal items on an account of type view."
-msgstr ""
+msgstr "U kunt geen boekingen doen op een rekening van het type Weergave."
#. module: account_asset
#: help:account.asset.category,open_asset:0
@@ -770,7 +780,7 @@ msgstr "Gemaakte investeringsboekingen"
#. module: account_asset
#: field:account.asset.depreciation.line,sequence:0
msgid "Sequence"
-msgstr ""
+msgstr "Volgnummer"
#. module: account_asset
#: help:account.asset.category,method_period:0
diff --git a/addons/account_bank_statement_extensions/account_bank_statement_view.xml b/addons/account_bank_statement_extensions/account_bank_statement_view.xml
index adc2963c803..d64eb68bc99 100644
--- a/addons/account_bank_statement_extensions/account_bank_statement_view.xml
+++ b/addons/account_bank_statement_extensions/account_bank_statement_view.xml
@@ -43,10 +43,10 @@
-
-
+
+
-
+
diff --git a/addons/account_bank_statement_extensions/i18n/es_MX.po b/addons/account_bank_statement_extensions/i18n/es_MX.po
new file mode 100644
index 00000000000..20e10de3af1
--- /dev/null
+++ b/addons/account_bank_statement_extensions/i18n/es_MX.po
@@ -0,0 +1,390 @@
+# Spanish (Mexico) 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-11-24 02:52+0000\n"
+"PO-Revision-Date: 2012-11-28 01:06+0000\n"
+"Last-Translator: OscarAlca \n"
+"Language-Team: Spanish (Mexico) \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
+"X-Generator: Launchpad (build 16319)\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 "Id global"
+
+#. module: account_bank_statement_extensions
+#: selection:account.bank.statement.line.global,type:0
+msgid "CODA"
+msgstr "CODA"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,parent_id:0
+msgid "Parent Code"
+msgstr "Código padre"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Debit"
+msgstr "Debe"
+
+#. 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 "Cancelar las líneas seleccionadas"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,val_date:0
+msgid "Value Date"
+msgstr "Fecha valor"
+
+#. module: account_bank_statement_extensions
+#: constraint:res.partner.bank:0
+msgid "The RIB and/or IBAN is not valid"
+msgstr "La CC y/o IBAN no es válido"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+#: selection:account.bank.statement.line,state:0
+msgid "Draft"
+msgstr "Borrador"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Statement"
+msgstr "Extracto"
+
+#. 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 "Confirma las lineas seleccionadas"
+
+#. 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 "Informe de balances de extractos bancarios"
+
+#. module: account_bank_statement_extensions
+#: view:cancel.statement.line:0
+msgid "Cancel Lines"
+msgstr "Cancelación de las líneas"
+
+#. 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 "Información del pago por lote"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,state:0
+msgid "Status"
+msgstr "Estado"
+
+#. module: account_bank_statement_extensions
+#: code:addons/account_bank_statement_extensions/account_bank_statement.py:129
+#, python-format
+msgid ""
+"Delete operation not allowed. Please go to the associated bank "
+"statement in order to delete and/or modify bank statement line."
+msgstr ""
+"Operacion de borrado no permitida. Por favor vaya a el asiento bancario "
+"asociado para poder eliminar y/o modificar lineas de asientos bancarios."
+
+#. module: account_bank_statement_extensions
+#: view:confirm.statement.line:0
+msgid "or"
+msgstr "ó"
+
+#. module: account_bank_statement_extensions
+#: view:confirm.statement.line:0
+msgid "Confirm Lines"
+msgstr "Confirmar líneas"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line.global:0
+msgid "Transactions"
+msgstr "Transacciones"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,type:0
+msgid "Type"
+msgstr "Tipo:"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+#: report:bank.statement.balance.report:0
+msgid "Journal"
+msgstr "Diario"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Confirmed Statement Lines."
+msgstr "Lineas de extracto confirmadas"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Credit Transactions."
+msgstr "Transacciones de crédito"
+
+#. 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 "Eliminar las lineas de extracto seleccionadas"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,counterparty_number:0
+msgid "Counterparty Number"
+msgstr "Numero de contrapartida"
+
+#. module: account_bank_statement_extensions
+#: report:bank.statement.balance.report:0
+msgid "Closing Balance"
+msgstr "Saldo de cierre"
+
+#. module: account_bank_statement_extensions
+#: report:bank.statement.balance.report:0
+msgid "Date"
+msgstr "Fecha"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+#: field:account.bank.statement.line,globalisation_amount:0
+msgid "Glob. Amount"
+msgstr "Importe global"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Debit Transactions."
+msgstr "Transacciones de débito"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Extended Filters..."
+msgstr "Filtros extendidos..."
+
+#. module: account_bank_statement_extensions
+#: view:confirm.statement.line:0
+msgid "Confirmed lines cannot be changed anymore."
+msgstr "Las líneas confirmadas no pueden ser modificadas."
+
+#. 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 ""
+"\n"
+"Por favor defina el código BIC/Swift del banco para una cuenta de tipo IBAN "
+"para realizar pagos válidos"
+
+#. module: account_bank_statement_extensions
+#: view:cancel.statement.line:0
+msgid "Are you sure you want to cancel the selected Bank Statement lines ?"
+msgstr ""
+"¿Estás seguro que quiere cancelar las líneas del extracto bancario "
+"seleccionadas?"
+
+#. module: account_bank_statement_extensions
+#: report:bank.statement.balance.report:0
+msgid "Name"
+msgstr "Nombre"
+
+#. module: account_bank_statement_extensions
+#: selection:account.bank.statement.line.global,type:0
+msgid "ISO 20022"
+msgstr "ISO 20022"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Notes"
+msgstr "Notas"
+
+#. module: account_bank_statement_extensions
+#: selection:account.bank.statement.line.global,type:0
+msgid "Manual"
+msgstr "Manual"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Bank Transaction"
+msgstr "Transacción bancaria"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Credit"
+msgstr "Haber"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,amount:0
+msgid "Amount"
+msgstr "Monto"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Fin.Account"
+msgstr "Cuenta fin."
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,counterparty_currency:0
+msgid "Counterparty Currency"
+msgstr "Moneda de la contrapartida"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,counterparty_bic:0
+msgid "Counterparty BIC"
+msgstr "BIC de la contrapartida"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,child_ids:0
+msgid "Child Codes"
+msgstr "Códigos hijos"
+
+#. module: account_bank_statement_extensions
+#: view:confirm.statement.line:0
+msgid "Are you sure you want to confirm the selected Bank Statement lines ?"
+msgstr ""
+"¿Está seguro que desea confirmar las líneas del extracto bancario "
+"seleccionadas?"
+
+#. 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 ""
+"Código para identificar las transacciones pertenecientes al mismo nivel "
+"global en un pago por lotes"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Draft Statement Lines."
+msgstr "Líneas de extracto en borrador."
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Glob. Am."
+msgstr "Imp. global"
+
+#. module: account_bank_statement_extensions
+#: model:ir.model,name:account_bank_statement_extensions.model_account_bank_statement_line
+msgid "Bank Statement Line"
+msgstr "Línea extracto bancario"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,code:0
+msgid "Code"
+msgstr "Código"
+
+#. 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 ""
+"El monto del comprobante debe ser el mismo que esta en la linea de asiento."
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,counterparty_name:0
+msgid "Counterparty Name"
+msgstr "Nombre de la contrapartida"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,name:0
+msgid "Communication"
+msgstr "Comunicación"
+
+#. module: account_bank_statement_extensions
+#: model:ir.model,name:account_bank_statement_extensions.model_res_partner_bank
+msgid "Bank Accounts"
+msgstr "Cuentas bancarias"
+
+#. module: account_bank_statement_extensions
+#: constraint:account.bank.statement:0
+msgid "The journal and period chosen have to belong to the same company."
+msgstr ""
+"El diario y periodo seleccionados tienen que pertenecer a la misma compañía"
+
+#. module: account_bank_statement_extensions
+#: model:ir.model,name:account_bank_statement_extensions.model_account_bank_statement
+msgid "Bank Statement"
+msgstr "Extracto bancario"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Statement Line"
+msgstr "Línea de extracto"
+
+#. module: account_bank_statement_extensions
+#: sql_constraint:account.bank.statement.line.global:0
+msgid "The code must be unique !"
+msgstr "¡El código debe ser único!"
+
+#. 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 "Líneas de extracto bancario"
+
+#. module: account_bank_statement_extensions
+#: code:addons/account_bank_statement_extensions/account_bank_statement.py:129
+#, python-format
+msgid "Warning!"
+msgstr "¡Advertencia!"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line.global:0
+msgid "Child Batch Payments"
+msgstr "Pagos por lote hijos"
+
+#. module: account_bank_statement_extensions
+#: view:confirm.statement.line:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Statement Lines"
+msgstr "Líneas de extracto"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Total Amount"
+msgstr "Importe total"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,globalisation_id:0
+msgid "Globalisation ID"
+msgstr "ID global"
diff --git a/addons/account_bank_statement_extensions/i18n/zh_CN.po b/addons/account_bank_statement_extensions/i18n/zh_CN.po
index cff59afe339..9ff4a317ead 100644
--- a/addons/account_bank_statement_extensions/i18n/zh_CN.po
+++ b/addons/account_bank_statement_extensions/i18n/zh_CN.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-02-09 14:55+0000\n"
-"Last-Translator: 开阖软件 Jeff Wang \n"
+"PO-Revision-Date: 2012-11-28 06:46+0000\n"
+"Last-Translator: ccdos \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-11-25 06:32+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
#. module: account_bank_statement_extensions
#: view:account.bank.statement.line:0
@@ -59,7 +59,7 @@ msgstr "取消所选的表行"
#. module: account_bank_statement_extensions
#: field:account.bank.statement.line,val_date:0
msgid "Value Date"
-msgstr ""
+msgstr "起息日"
#. module: account_bank_statement_extensions
#: constraint:res.partner.bank:0
@@ -109,7 +109,7 @@ msgstr "批量付款信息"
#. module: account_bank_statement_extensions
#: field:account.bank.statement.line,state:0
msgid "Status"
-msgstr ""
+msgstr "状态"
#. module: account_bank_statement_extensions
#: code:addons/account_bank_statement_extensions/account_bank_statement.py:129
@@ -117,12 +117,12 @@ msgstr ""
msgid ""
"Delete operation not allowed. Please go to the associated bank "
"statement in order to delete and/or modify bank statement line."
-msgstr ""
+msgstr "不允许删除。为了删除和(或)修改银行对账单行，请到关联的银行对账单操作。"
#. module: account_bank_statement_extensions
#: view:confirm.statement.line:0
msgid "or"
-msgstr ""
+msgstr "or"
#. module: account_bank_statement_extensions
#: view:confirm.statement.line:0
@@ -234,7 +234,7 @@ msgstr "手工"
#. module: account_bank_statement_extensions
#: view:account.bank.statement.line:0
msgid "Bank Transaction"
-msgstr ""
+msgstr "银行交易"
#. module: account_bank_statement_extensions
#: view:account.bank.statement.line:0
@@ -303,7 +303,7 @@ msgstr "编号"
msgid ""
"The amount of the voucher must be the same amount as the one on the "
"statement line."
-msgstr ""
+msgstr "单据的金额必须跟对账单其中一行金额相同。"
#. module: account_bank_statement_extensions
#: field:account.bank.statement.line,counterparty_name:0
@@ -351,7 +351,7 @@ msgstr "银行单据行"
#: code:addons/account_bank_statement_extensions/account_bank_statement.py:129
#, python-format
msgid "Warning!"
-msgstr ""
+msgstr "警告！"
#. module: account_bank_statement_extensions
#: view:account.bank.statement.line.global:0
diff --git a/addons/account_budget/i18n/es_MX.po b/addons/account_budget/i18n/es_MX.po
index 46c361de1ea..a8db4b573ea 100644
--- a/addons/account_budget/i18n/es_MX.po
+++ b/addons/account_budget/i18n/es_MX.po
@@ -1,20 +1,29 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-# * account_budget
+# Spanish (Mexico) 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: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-01-13 20:28+0000\n"
-"Last-Translator: Alberto Luengo Cabanillas (Pexego) \n"
-"Language-Team: \n"
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"PO-Revision-Date: 2012-11-28 01:18+0000\n"
+"Last-Translator: OscarAlca \n"
+"Language-Team: Spanish (Mexico) \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-05 05:40+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
+
+#. module: account_budget
+#: view:account.budget.analytic:0
+#: view:account.budget.crossvered.report:0
+#: view:account.budget.crossvered.summary.report:0
+#: view:account.budget.report:0
+msgid "Select Dates Period"
+msgstr "Seleccione fechas del período"
#. module: account_budget
#: field:crossovered.budget,creating_user_id:0
@@ -32,12 +41,6 @@ msgstr "Confirmado"
msgid "Budgetary Positions"
msgstr "Posiciones presupuestarias"
-#. module: account_budget
-#: code:addons/account_budget/account_budget.py:119
-#, python-format
-msgid "The General Budget '%s' has no Accounts!"
-msgstr "¡El presupuesto general '%s' no tiene cuentas!"
-
#. module: account_budget
#: report:account.budget:0
msgid "Printed at:"
@@ -80,7 +83,7 @@ msgstr "Borrador"
#. module: account_budget
#: report:account.budget:0
msgid "at"
-msgstr "a las"
+msgstr "en"
#. module: account_budget
#: view:account.budget.report:0
@@ -109,55 +112,22 @@ msgstr "Validado"
msgid "Percentage"
msgstr "Porcentaje"
-#. module: account_budget
-#: report:crossovered.budget.report:0
-msgid "to"
-msgstr "hasta"
-
#. module: account_budget
#: field:crossovered.budget,state:0
msgid "Status"
msgstr "Estado"
#. module: account_budget
-#: model:ir.actions.act_window,help:account_budget.act_crossovered_budget_view
-msgid ""
-"A budget is a forecast of your company's income and expenses expected for a "
-"period in the future. With a budget, a company is able to carefully look at "
-"how much money they are taking in during a given period, and figure out the "
-"best way to divide it among various categories. By keeping track of where "
-"your money goes, you may be less likely to overspend, and more likely to "
-"meet your financial goals. Forecast a budget by detailing the expected "
-"revenue per analytic account and monitor its evolution based on the actuals "
-"realised during that period."
-msgstr ""
-"Un presupuesto es una previsión de los ingresos y gastos esperados por su "
-"compañía en un periodo futuro. Con un presupuesto, una compañía es capaz de "
-"observar minuciosamente cuánto dinero están ingresando en un período "
-"determinado, y pensar en la mejor manera de dividirlo entre varias "
-"categorías. Haciendo el seguimiento de los movimientos de su dinero, tendrá "
-"menos tendencia a un sobregasto, y se aproximará más a sus metas "
-"financieras. Haga una previsión de un presupuesto detallando el ingreso "
-"esperado por cuenta analítica y monitorice su evaluación basándose en los "
-"valores actuales durante ese período."
-
-#. module: account_budget
-#: view:account.budget.crossvered.summary.report:0
-msgid "This wizard is used to print summary of budgets"
-msgstr ""
-"Este asistente es utilizado para imprimir el resúmen de los presupuestos"
-
-#. module: account_budget
-#: report:account.budget:0
-#: report:crossovered.budget.report:0
-msgid "%"
-msgstr "%"
+#: code:addons/account_budget/account_budget.py:119
+#, python-format
+msgid "The Budget '%s' has no accounts!"
+msgstr "¡El presupuesto '%s' no tiene cuentas!"
#. module: account_budget
#: report:account.budget:0
#: report:crossovered.budget.report:0
msgid "Description"
-msgstr "Descripción"
+msgstr "Descripción"
#. module: account_budget
#: report:crossovered.budget.report:0
@@ -169,6 +139,11 @@ msgstr "Moneda"
msgid "Total :"
msgstr "Total :"
+#. module: account_budget
+#: constraint:account.analytic.account:0
+msgid "Error! You cannot create recursive analytic accounts."
+msgstr "Error! No es posible crear cuentas analíticas recursivas."
+
#. module: account_budget
#: field:account.budget.post,company_id:0
#: field:crossovered.budget,company_id:0
@@ -177,9 +152,9 @@ msgid "Company"
msgstr "Compañía"
#. module: account_budget
-#: view:crossovered.budget:0
-msgid "To Approve"
-msgstr "Para aprobar"
+#: report:crossovered.budget.report:0
+msgid "to"
+msgstr "hasta"
#. module: account_budget
#: view:crossovered.budget:0
@@ -229,7 +204,7 @@ msgstr "Fecha final"
#: model:ir.model,name:account_budget.model_account_budget_analytic
#: model:ir.model,name:account_budget.model_account_budget_report
msgid "Account Budget report for analytic account"
-msgstr "Informe presupuesto contable para contabilidad analítica"
+msgstr "Informe de presupuesto contable para contabilidad analítica"
#. module: account_budget
#: view:account.analytic.account:0
@@ -247,12 +222,6 @@ msgstr "Nombre"
msgid "Budget Line"
msgstr "Línea de presupuesto"
-#. module: account_budget
-#: view:account.analytic.account:0
-#: view:account.budget.post:0
-msgid "Lines"
-msgstr "Líneas"
-
#. module: account_budget
#: report:account.budget:0
#: view:crossovered.budget:0
@@ -264,10 +233,14 @@ msgid "Budget"
msgstr "Presupuesto"
#. module: account_budget
-#: code:addons/account_budget/account_budget.py:119
-#, python-format
-msgid "Error!"
-msgstr "¡Error!"
+#: view:crossovered.budget:0
+msgid "To Approve Budgets"
+msgstr "Presupuestos por aprobar"
+
+#. module: account_budget
+#: view:crossovered.budget:0
+msgid "Duration"
+msgstr "Duración"
#. module: account_budget
#: field:account.budget.post,code:0
@@ -283,7 +256,6 @@ msgstr "Este asistente es utilizado para imprimir el presupuesto"
#. module: account_budget
#: model:ir.actions.act_window,name:account_budget.act_crossovered_budget_view
-#: model:ir.actions.act_window,name:account_budget.action_account_budget_post_tree
#: model:ir.actions.act_window,name:account_budget.action_account_budget_report
#: model:ir.actions.report.xml,name:account_budget.report_crossovered_budget
#: model:ir.ui.menu,name:account_budget.menu_act_crossovered_budget_view
@@ -294,18 +266,15 @@ msgid "Budgets"
msgstr "Presupuestos"
#. module: account_budget
-#: constraint:account.analytic.account:0
-msgid ""
-"Error! The currency has to be the same as the currency of the selected "
-"company"
+#: view:account.budget.crossvered.summary.report:0
+msgid "This wizard is used to print summary of budgets"
msgstr ""
-"¡Error! La divisa tiene que ser la misma que la establecida en la compañía "
-"seleccionada"
+"Este asistente es utilizado para imprimir el resúmen de los presupuestos"
#. module: account_budget
#: selection:crossovered.budget,state:0
msgid "Cancelled"
-msgstr "Cancelado"
+msgstr "Cancelado/a"
#. module: account_budget
#: view:crossovered.budget:0
@@ -313,10 +282,9 @@ msgid "Approve"
msgstr "Aprobar"
#. module: account_budget
-#: field:crossovered.budget,date_from:0
-#: field:crossovered.budget.lines,date_from:0
-msgid "Start Date"
-msgstr "Fecha de inicio"
+#: view:crossovered.budget:0
+msgid "To Approve"
+msgstr "Para aprobar"
#. module: account_budget
#: view:account.budget.post:0
@@ -345,12 +313,10 @@ msgid "Theoretical Amt"
msgstr "Importe teórico"
#. module: account_budget
-#: view:account.budget.analytic:0
-#: view:account.budget.crossvered.report:0
-#: view:account.budget.crossvered.summary.report:0
-#: view:account.budget.report:0
-msgid "Select Dates Period"
-msgstr "Seleccione fechas del período"
+#: code:addons/account_budget/account_budget.py:119
+#, python-format
+msgid "Error!"
+msgstr "¡Error!"
#. module: account_budget
#: view:account.budget.analytic:0
@@ -361,74 +327,54 @@ msgid "Print"
msgstr "Imprimir"
#. module: account_budget
-#: model:ir.module.module,description:account_budget.module_meta_information
-msgid ""
-"This module allows accountants to manage analytic and crossovered budgets.\n"
-"\n"
-"Once the Master Budgets and the Budgets are defined (in "
-"Accounting/Budgets/),\n"
-"the Project Managers can set the planned amount on each Analytic Account.\n"
-"\n"
-"The accountant has the possibility to see the total of amount planned for "
-"each\n"
-"Budget and Master Budget in order to ensure the total planned is not\n"
-"greater/lower than what he planned for this Budget/Master Budget. Each list "
-"of\n"
-"record can also be switched to a graphical view of it.\n"
-"\n"
-"Three reports are available:\n"
-" 1. The first is available from a list of Budgets. It gives the "
-"spreading, for these Budgets, of the Analytic Accounts per Master Budgets.\n"
-"\n"
-" 2. The second is a summary of the previous one, it only gives the "
-"spreading, for the selected Budgets, of the Analytic Accounts.\n"
-"\n"
-" 3. The last one is available from the Analytic Chart of Accounts. It "
-"gives the spreading, for the selected Analytic Accounts, of the Master "
-"Budgets per Budgets.\n"
-"\n"
-msgstr ""
-"Este módulo permite a los contables gestionar presupuestos analíticos "
-"(costes) y cruzados.\n"
-"\n"
-"Una vez que se han definido los presupuestos principales y los presupuestos "
-"(en Contabilidad/Presupuestos/),\n"
-"los gestores de proyectos pueden establecer el importe previsto en cada "
-"cuenta analítica.\n"
-"\n"
-"El contable tiene la posibilidad de ver el total del importe previsto para "
-"cada\n"
-"presupuesto y presupuesto principal a fin de garantizar el total previsto no "
-"es\n"
-"mayor/menor que lo que había previsto para este presupuesto / presupuesto "
-"principal.\n"
-"Cada lista de datos también puede cambiarse a una vista gráfica de la "
-"misma.\n"
-"\n"
-"Están disponibles tres informes:\n"
-" 1. El primero está disponible desde una lista de presupuestos. "
-"Proporciona la difusión, para estos presupuestos, de las cuentas analíticas "
-"por presupuestos principales.\n"
-"\n"
-" 2. El segundo es un resumen del anterior. Sólo indica la difusión, para "
-"los presupuestos seleccionados, de las cuentas analíticas.\n"
-"\n"
-" 3. El último está disponible desde el plan de cuentas analítico. Indica "
-"la difusión, para las cuentas analíticas seleccionadas, de los presupuestos "
-"principales por presupuestos.\n"
-"\n"
+#: view:account.budget.post:0
+#: view:crossovered.budget:0
+#: field:crossovered.budget.lines,theoritical_amount:0
+msgid "Theoretical Amount"
+msgstr "Importe teórico"
+
+#. module: account_budget
+#: view:account.budget.analytic:0
+#: view:account.budget.crossvered.report:0
+#: view:account.budget.crossvered.summary.report:0
+#: view:account.budget.report:0
+msgid "or"
+msgstr "ó"
#. module: account_budget
#: field:crossovered.budget.lines,analytic_account_id:0
#: model:ir.model,name:account_budget.model_account_analytic_account
msgid "Analytic Account"
-msgstr "Cuenta analítica"
+msgstr "Cuenta Analítica"
#. module: account_budget
#: report:account.budget:0
msgid "Budget :"
msgstr "Presupuesto :"
+#. module: account_budget
+#: model:ir.actions.act_window,help:account_budget.act_crossovered_budget_view
+msgid ""
+"
\n"
+" A budget is a forecast of your company's income and/or "
+"expenses\n"
+" expected for a period in the future. A budget is defined on "
+"some\n"
+" financial accounts and/or analytic accounts (that may "
+"represent\n"
+" projects, departments, categories of products, etc.)\n"
+"
\n"
+" By keeping track of where your money goes, you may be less\n"
+" likely to overspend, and more likely to meet your financial\n"
+" goals. Forecast a budget by detailing the expected revenue "
+"per\n"
+" analytic account and monitor its evolution based on the "
+"actuals\n"
+" realised during that period.\n"
+"
\n"
+" "
+msgstr ""
+
#. module: account_budget
#: report:account.budget:0
#: report:crossovered.budget.report:0
@@ -465,14 +411,10 @@ msgid "Cancel"
msgstr "Cancelar"
#. module: account_budget
-#: model:ir.module.module,shortdesc:account_budget.module_meta_information
-msgid "Budget Management"
-msgstr "Gestión presupuestaria"
-
-#. module: account_budget
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr "¡Error! No puede crear cuentas analíticas recursivas."
+#: field:crossovered.budget,date_from:0
+#: field:crossovered.budget.lines,date_from:0
+msgid "Start Date"
+msgstr "Fecha inicial"
#. module: account_budget
#: report:account.budget:0
@@ -480,163 +422,7 @@ msgstr "¡Error! No puede crear cuentas analíticas recursivas."
msgid "Analysis from"
msgstr "Análisis desde"
-#~ msgid "% performance"
-#~ msgstr "% rendimiento"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-#~ "especial!"
-
-#~ msgid "Period"
-#~ msgstr "Período"
-
-#~ msgid "Printing date:"
-#~ msgstr "Fecha impresión:"
-
-#~ msgid "Dotations"
-#~ msgstr "Dotaciones"
-
-#~ msgid "Performance"
-#~ msgstr "Rendimiento"
-
-#~ msgid "From"
-#~ msgstr "Desde"
-
-#~ msgid "Results"
-#~ msgstr "Resultados"
-
-#~ msgid "A/c No."
-#~ msgstr "Núm. de cuenta"
-
-#~ msgid "Period Budget"
-#~ msgstr "Período del presupuesto"
-
-#~ msgid "Budget Analysis"
-#~ msgstr "Análisis presupuestario"
-
-#~ msgid "Validate"
-#~ msgstr "Validar"
-
-#~ msgid "Select Options"
-#~ msgstr "Seleccionar opciones"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "¡XML inválido para la definición de la vista!"
-
-#~ msgid "Print Summary of Budgets"
-#~ msgstr "Imprimir resumen de presupuestos"
-
-#~ msgid "Spread amount"
-#~ msgstr "Cantidad Extendida"
-
-#~ msgid "Amount"
-#~ msgstr "Importe"
-
-#~ msgid "Total Planned Amount"
-#~ msgstr "Importe total previsto"
-
-#~ msgid "Item"
-#~ msgstr "Item"
-
-#~ msgid "Theoretical Amount"
-#~ msgstr "Importe teórico"
-
-#~ msgid "Fiscal Year"
-#~ msgstr "Ejercicio fiscal"
-
-#~ msgid "Spread"
-#~ msgstr "Extensión"
-
-#~ msgid "Select period"
-#~ msgstr "Seleccionar período"
-
-#~ msgid "Analytic Account :"
-#~ msgstr "Cuenta analítica:"
-
-#, python-format
-#~ msgid "Insufficient Data!"
-#~ msgstr "¡Datos Insuficientes!"
-
-#~ msgid "Print Budget"
-#~ msgstr "Imprimir presupuestos"
-
-#~ msgid "Spreading"
-#~ msgstr "Difusión"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nombre de modelo no válido en la definición de acción."
-
-#~ msgid "Budget Dotation"
-#~ msgstr "Dotación presupuestaria"
-
-#~ msgid "Budget Dotations"
-#~ msgstr "Dotaciones presupuestarias"
-
-#~ msgid "Budget Item Detail"
-#~ msgstr "Detalle de elemento presupuestario"
-
-#, python-format
-#~ msgid "No Dotations or Master Budget Expenses Found on Budget %s!"
-#~ msgstr ""
-#~ "¡No se han encontrado dotaciones o presupuestos principales de gasto en el "
-#~ "presupuesto %s!"
-
-#~ msgid ""
-#~ "This module allows accountants to manage analytic and crossovered budgets.\n"
-#~ "\n"
-#~ "Once the Master Budgets and the Budgets defined (in Financial\n"
-#~ "Management/Budgets/), the Project Managers can set the planned amount on "
-#~ "each\n"
-#~ "Analytic Account.\n"
-#~ "\n"
-#~ "The accountant has the possibility to see the total of amount planned for "
-#~ "each\n"
-#~ "Budget and Master Budget in order to ensure the total planned is not\n"
-#~ "greater/lower than what he planned for this Budget/Master Budget. Each list "
-#~ "of\n"
-#~ "record can also be switched to a graphical view of it.\n"
-#~ "\n"
-#~ "Three reports are available:\n"
-#~ " 1. The first is available from a list of Budgets. It gives the "
-#~ "spreading, for these Budgets, of the Analytic Accounts per Master Budgets.\n"
-#~ "\n"
-#~ " 2. The second is a summary of the previous one, it only gives the "
-#~ "spreading, for the selected Budgets, of the Analytic Accounts.\n"
-#~ "\n"
-#~ " 3. The last one is available from the Analytic Chart of Accounts. It "
-#~ "gives the spreading, for the selected Analytic Accounts, of the Master "
-#~ "Budgets per Budgets.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Este módulo permite a los contables gestionar presupuestos analíticos "
-#~ "(costes) y cruzados.\n"
-#~ "\n"
-#~ "Una vez que se han definido los presupuestos principales y los presupuestos "
-#~ "(en Gestión\n"
-#~ "financiera/Presupuestos/), los gestores de proyecto pueden establecer el "
-#~ "importe previsto en\n"
-#~ "cada cuenta analítica.\n"
-#~ "\n"
-#~ "El contable tiene la posibilidad de ver el total del importe previsto para "
-#~ "cada\n"
-#~ "presupuesto y presupuesto principal a fin de garantizar el total previsto no "
-#~ "es\n"
-#~ "mayor/menor que lo que había previsto para este presupuesto / presupuesto "
-#~ "principal.\n"
-#~ "Cada lista de datos también puede cambiarse a una vista gráfica de la "
-#~ "misma.\n"
-#~ "\n"
-#~ "Están disponibles tres informes:\n"
-#~ " 1. El primero está disponible desde una lista de presupuestos. "
-#~ "Proporciona la difusión, para estos presupuestos, de las cuentas analíticas "
-#~ "por presupuestos principales.\n"
-#~ "\n"
-#~ " 2. El segundo es un resumen del anterior. Sólo indica la difusión, para "
-#~ "los presupuestos seleccionados, de las cuentas analíticas.\n"
-#~ "\n"
-#~ " 3. El último está disponible desde un plan de cuentas analítico. Indica "
-#~ "la difusión, para las cuentas analíticas seleccionadas, de los presupuestos "
-#~ "principales por presupuestos.\n"
-#~ "\n"
+#. module: account_budget
+#: view:crossovered.budget:0
+msgid "Draft Budgets"
+msgstr "Presupuestos borrador"
diff --git a/addons/account_budget/i18n/fr.po b/addons/account_budget/i18n/fr.po
index add3f9c12a9..4deed11bc39 100644
--- a/addons/account_budget/i18n/fr.po
+++ b/addons/account_budget/i18n/fr.po
@@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-02-13 21:08+0000\n"
-"Last-Translator: t.o \n"
+"PO-Revision-Date: 2012-11-29 16:58+0000\n"
+"Last-Translator: Christophe Chauvet - http://www.syleam.fr/ \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:16+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-30 05:07+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
#. module: account_budget
#: view:account.budget.analytic:0
@@ -141,7 +141,7 @@ msgstr "Total :"
#. module: account_budget
#: constraint:account.analytic.account:0
msgid "Error! You cannot create recursive analytic accounts."
-msgstr ""
+msgstr "Erreur! Vous ne pouvez pas créer de comptes analytiques récursifs."
#. module: account_budget
#: field:account.budget.post,company_id:0
@@ -239,7 +239,7 @@ msgstr "Budgets à approuver"
#. module: account_budget
#: view:crossovered.budget:0
msgid "Duration"
-msgstr ""
+msgstr "Durée"
#. module: account_budget
#: field:account.budget.post,code:0
@@ -337,7 +337,7 @@ msgstr "Montant Théorique"
#: view:account.budget.crossvered.summary.report:0
#: view:account.budget.report:0
msgid "or"
-msgstr ""
+msgstr "ou"
#. module: account_budget
#: field:crossovered.budget.lines,analytic_account_id:0
diff --git a/addons/account_budget/i18n/lt.po b/addons/account_budget/i18n/lt.po
index a3a3d2c11fc..3b90c1fdf50 100644
--- a/addons/account_budget/i18n/lt.po
+++ b/addons/account_budget/i18n/lt.po
@@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2010-09-09 07:05+0000\n"
-"Last-Translator: Fabien (Open ERP) \n"
+"PO-Revision-Date: 2012-11-28 16:01+0000\n"
+"Last-Translator: Andrius Preimantas \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:16+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
#. module: account_budget
#: view:account.budget.analytic:0
@@ -27,7 +27,7 @@ msgstr ""
#. module: account_budget
#: field:crossovered.budget,creating_user_id:0
msgid "Responsible User"
-msgstr ""
+msgstr "Atsakingas naudotojas"
#. module: account_budget
#: selection:crossovered.budget,state:0
@@ -38,12 +38,12 @@ msgstr "Patvirtinta"
#: model:ir.actions.act_window,name:account_budget.open_budget_post_form
#: model:ir.ui.menu,name:account_budget.menu_budget_post_form
msgid "Budgetary Positions"
-msgstr ""
+msgstr "Biudžeto pozicija"
#. module: account_budget
#: report:account.budget:0
msgid "Printed at:"
-msgstr ""
+msgstr "Atspausdinta:"
#. module: account_budget
#: view:crossovered.budget:0
@@ -53,17 +53,17 @@ msgstr "Patvirtinti"
#. module: account_budget
#: field:crossovered.budget,validating_user_id:0
msgid "Validate User"
-msgstr ""
+msgstr "Patvirtinti vartotoją"
#. module: account_budget
#: model:ir.actions.act_window,name:account_budget.action_account_budget_crossvered_summary_report
msgid "Print Summary"
-msgstr ""
+msgstr "Spausdinti suvestinę"
#. module: account_budget
#: field:crossovered.budget.lines,paid_date:0
msgid "Paid Date"
-msgstr ""
+msgstr "Apmokėjimo data"
#. module: account_budget
#: field:account.budget.analytic,date_to:0
@@ -82,7 +82,7 @@ msgstr "Juodraštis"
#. module: account_budget
#: report:account.budget:0
msgid "at"
-msgstr ""
+msgstr "ties"
#. module: account_budget
#: view:account.budget.report:0
@@ -104,12 +104,12 @@ msgstr ""
#. module: account_budget
#: selection:crossovered.budget,state:0
msgid "Validated"
-msgstr ""
+msgstr "Patvirtintas"
#. module: account_budget
#: field:crossovered.budget.lines,percentage:0
msgid "Percentage"
-msgstr ""
+msgstr "Procentai"
#. module: account_budget
#: field:crossovered.budget,state:0
@@ -120,7 +120,7 @@ msgstr "Būsena"
#: code:addons/account_budget/account_budget.py:119
#, python-format
msgid "The Budget '%s' has no accounts!"
-msgstr ""
+msgstr "Biudžetui '%s' nepriskirtos sąskaitos!"
#. module: account_budget
#: report:account.budget:0
@@ -131,24 +131,24 @@ msgstr "Aprašas"
#. module: account_budget
#: report:crossovered.budget.report:0
msgid "Currency"
-msgstr ""
+msgstr "Valiuta"
#. module: account_budget
#: report:crossovered.budget.report:0
msgid "Total :"
-msgstr ""
+msgstr "Iš viso:"
#. module: account_budget
#: constraint:account.analytic.account:0
msgid "Error! You cannot create recursive analytic accounts."
-msgstr ""
+msgstr "Klaida! Negalima kurti rekursivių analitinių sąskaitų"
#. module: account_budget
#: field:account.budget.post,company_id:0
#: field:crossovered.budget,company_id:0
#: field:crossovered.budget.lines,company_id:0
msgid "Company"
-msgstr ""
+msgstr "Įmonė"
#. module: account_budget
#: report:crossovered.budget.report:0
@@ -158,20 +158,20 @@ msgstr "iki"
#. module: account_budget
#: view:crossovered.budget:0
msgid "Reset to Draft"
-msgstr ""
+msgstr "Atstatyti į juodraštį"
#. module: account_budget
#: view:account.budget.post:0
#: view:crossovered.budget:0
#: field:crossovered.budget.lines,planned_amount:0
msgid "Planned Amount"
-msgstr ""
+msgstr "Suplanuota suma"
#. module: account_budget
#: report:account.budget:0
#: report:crossovered.budget.report:0
msgid "Perc(%)"
-msgstr ""
+msgstr "Procentai (%)"
#. module: account_budget
#: view:crossovered.budget:0
@@ -183,7 +183,7 @@ msgstr "Atlikta"
#: report:account.budget:0
#: report:crossovered.budget.report:0
msgid "Practical Amt"
-msgstr ""
+msgstr "Praktinė suma"
#. module: account_budget
#: view:account.analytic.account:0
@@ -191,7 +191,7 @@ msgstr ""
#: view:crossovered.budget:0
#: field:crossovered.budget.lines,practical_amount:0
msgid "Practical Amount"
-msgstr ""
+msgstr "Praktinė suma"
#. module: account_budget
#: field:crossovered.budget,date_to:0
@@ -203,12 +203,12 @@ msgstr "Pabaigos data"
#: model:ir.model,name:account_budget.model_account_budget_analytic
#: model:ir.model,name:account_budget.model_account_budget_report
msgid "Account Budget report for analytic account"
-msgstr ""
+msgstr "Biudžeto ataskaita analitinei sąskaitai"
#. module: account_budget
#: view:account.analytic.account:0
msgid "Theoritical Amount"
-msgstr ""
+msgstr "Teorinė suma"
#. module: account_budget
#: field:account.budget.post,name:0
@@ -219,7 +219,7 @@ msgstr "Pavadinimas"
#. module: account_budget
#: model:ir.model,name:account_budget.model_crossovered_budget_lines
msgid "Budget Line"
-msgstr ""
+msgstr "Biudžeto eilutė"
#. module: account_budget
#: report:account.budget:0
@@ -234,12 +234,12 @@ msgstr "Biudžetas"
#. module: account_budget
#: view:crossovered.budget:0
msgid "To Approve Budgets"
-msgstr ""
+msgstr "Patvirtinti biudžetą"
#. module: account_budget
#: view:crossovered.budget:0
msgid "Duration"
-msgstr ""
+msgstr "Trukmė"
#. module: account_budget
#: field:account.budget.post,code:0
@@ -251,7 +251,7 @@ msgstr "Kodas"
#: view:account.budget.analytic:0
#: view:account.budget.crossvered.report:0
msgid "This wizard is used to print budget"
-msgstr ""
+msgstr "Šis vedlys naudojamas atspausdinti biudžetui"
#. module: account_budget
#: model:ir.actions.act_window,name:account_budget.act_crossovered_budget_view
@@ -267,7 +267,7 @@ msgstr "Biudžetai"
#. module: account_budget
#: view:account.budget.crossvered.summary.report:0
msgid "This wizard is used to print summary of budgets"
-msgstr ""
+msgstr "Šis vedlys naudojamas atspausdinti biudžetų suvestinei"
#. module: account_budget
#: selection:crossovered.budget,state:0
@@ -277,19 +277,19 @@ msgstr "Nutrauktas"
#. module: account_budget
#: view:crossovered.budget:0
msgid "Approve"
-msgstr ""
+msgstr "Patvirtinti"
#. module: account_budget
#: view:crossovered.budget:0
msgid "To Approve"
-msgstr ""
+msgstr "Patvirtinti"
#. module: account_budget
#: view:account.budget.post:0
#: field:crossovered.budget.lines,general_budget_id:0
#: model:ir.model,name:account_budget.model_account_budget_post
msgid "Budgetary Position"
-msgstr ""
+msgstr "Biudžeto pozicija"
#. module: account_budget
#: field:account.budget.analytic,date_from:0
@@ -308,13 +308,13 @@ msgstr ""
#: report:account.budget:0
#: report:crossovered.budget.report:0
msgid "Theoretical Amt"
-msgstr ""
+msgstr "Teorinė suma"
#. module: account_budget
#: code:addons/account_budget/account_budget.py:119
#, python-format
msgid "Error!"
-msgstr ""
+msgstr "Klaida!"
#. module: account_budget
#: view:account.budget.analytic:0
@@ -329,7 +329,7 @@ msgstr "Spausdinti"
#: view:crossovered.budget:0
#: field:crossovered.budget.lines,theoritical_amount:0
msgid "Theoretical Amount"
-msgstr ""
+msgstr "Teorinė suma"
#. module: account_budget
#: view:account.budget.analytic:0
@@ -337,7 +337,7 @@ msgstr ""
#: view:account.budget.crossvered.summary.report:0
#: view:account.budget.report:0
msgid "or"
-msgstr ""
+msgstr "arba"
#. module: account_budget
#: field:crossovered.budget.lines,analytic_account_id:0
@@ -348,7 +348,7 @@ msgstr "Analitinė sąskaita"
#. module: account_budget
#: report:account.budget:0
msgid "Budget :"
-msgstr ""
+msgstr "Biudžetas:"
#. module: account_budget
#: model:ir.actions.act_window,help:account_budget.act_crossovered_budget_view
@@ -377,7 +377,7 @@ msgstr ""
#: report:account.budget:0
#: report:crossovered.budget.report:0
msgid "Planned Amt"
-msgstr ""
+msgstr "Planuojama suma"
#. module: account_budget
#: view:account.budget.post:0
@@ -397,7 +397,7 @@ msgstr "Sąskaitos"
#: model:ir.actions.act_window,name:account_budget.act_crossovered_budget_lines_view
#: model:ir.ui.menu,name:account_budget.menu_act_crossovered_budget_lines_view
msgid "Budget Lines"
-msgstr ""
+msgstr "Biudžeto eilutės"
#. module: account_budget
#: view:account.budget.analytic:0
@@ -418,12 +418,12 @@ msgstr "Pradžios data"
#: report:account.budget:0
#: report:crossovered.budget.report:0
msgid "Analysis from"
-msgstr ""
+msgstr "Analizė nuo"
#. module: account_budget
#: view:crossovered.budget:0
msgid "Draft Budgets"
-msgstr ""
+msgstr "Nepatvirtinti biudžetai"
#~ msgid "% performance"
#~ msgstr "% vykdymas"
diff --git a/addons/account_budget/i18n/tr.po b/addons/account_budget/i18n/tr.po
index 0e28897fdf9..b0831fd0495 100644
--- a/addons/account_budget/i18n/tr.po
+++ b/addons/account_budget/i18n/tr.po
@@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-01-10 23:08+0000\n"
+"PO-Revision-Date: 2012-11-27 22:05+0000\n"
"Last-Translator: Ahmet Altınışık \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:16+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
#. module: account_budget
#: view:account.budget.analytic:0
@@ -141,7 +141,7 @@ msgstr "Toplam :"
#. module: account_budget
#: constraint:account.analytic.account:0
msgid "Error! You cannot create recursive analytic accounts."
-msgstr ""
+msgstr "Hata! Birbirini çağıran analitik hesaplar oluşturamazsın."
#. module: account_budget
#: field:account.budget.post,company_id:0
@@ -239,7 +239,7 @@ msgstr "Bütçeleri Onaylama"
#. module: account_budget
#: view:crossovered.budget:0
msgid "Duration"
-msgstr ""
+msgstr "Süre"
#. module: account_budget
#: field:account.budget.post,code:0
@@ -337,7 +337,7 @@ msgstr "Teorik Tutar"
#: view:account.budget.crossvered.summary.report:0
#: view:account.budget.report:0
msgid "or"
-msgstr ""
+msgstr "veya"
#. module: account_budget
#: field:crossovered.budget.lines,analytic_account_id:0
diff --git a/addons/account_budget/i18n/zh_CN.po b/addons/account_budget/i18n/zh_CN.po
index 34c4352185f..e8c99e31e4c 100644
--- a/addons/account_budget/i18n/zh_CN.po
+++ b/addons/account_budget/i18n/zh_CN.po
@@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-02-08 03:50+0000\n"
-"Last-Translator: 开阖软件 Jeff Wang \n"
+"PO-Revision-Date: 2012-11-28 06:47+0000\n"
+"Last-Translator: ccdos \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:16+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
#. module: account_budget
#: view:account.budget.analytic:0
@@ -141,7 +141,7 @@ msgstr "合计:"
#. module: account_budget
#: constraint:account.analytic.account:0
msgid "Error! You cannot create recursive analytic accounts."
-msgstr ""
+msgstr "错误！你不能递归创建辅助核算项"
#. module: account_budget
#: field:account.budget.post,company_id:0
@@ -239,7 +239,7 @@ msgstr "待审核的预算"
#. module: account_budget
#: view:crossovered.budget:0
msgid "Duration"
-msgstr ""
+msgstr "持续时间"
#. module: account_budget
#: field:account.budget.post,code:0
@@ -337,7 +337,7 @@ msgstr "理论金额"
#: view:account.budget.crossvered.summary.report:0
#: view:account.budget.report:0
msgid "or"
-msgstr ""
+msgstr "or"
#. module: account_budget
#: field:crossovered.budget.lines,analytic_account_id:0
diff --git a/addons/account_cancel/i18n/it.po b/addons/account_cancel/i18n/it.po
index 153dc063447..fcd3aecdb5b 100644
--- a/addons/account_cancel/i18n/it.po
+++ b/addons/account_cancel/i18n/it.po
@@ -8,19 +8,19 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2010-11-21 07:53+0000\n"
-"Last-Translator: OpenERP Administrators \n"
+"PO-Revision-Date: 2012-11-28 19:46+0000\n"
+"Last-Translator: Davide Corio - agilebg.com \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: 2012-11-25 06:24+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
#. module: account_cancel
#: view:account.invoice:0
msgid "Cancel"
-msgstr "Cancella"
+msgstr "Annulla"
#~ msgid "Account Cancel"
#~ msgstr "Account Cancel"
diff --git a/addons/account_check_writing/account_view.xml b/addons/account_check_writing/account_view.xml
index 53dd1cb1c93..df8d1461a3f 100644
--- a/addons/account_check_writing/account_view.xml
+++ b/addons/account_check_writing/account_view.xml
@@ -11,7 +11,7 @@
account.journal
-
+
diff --git a/addons/account_check_writing/i18n/es_MX.po b/addons/account_check_writing/i18n/es_MX.po
new file mode 100644
index 00000000000..14a5a17f279
--- /dev/null
+++ b/addons/account_check_writing/i18n/es_MX.po
@@ -0,0 +1,228 @@
+# Spanish (Mexico) 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-11-24 02:52+0000\n"
+"PO-Revision-Date: 2012-11-29 18:20+0000\n"
+"Last-Translator: OscarAlca \n"
+"Language-Team: Spanish (Mexico) \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-11-30 05:08+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
+
+#. module: account_check_writing
+#: selection:res.company,check_layout:0
+msgid "Check on Top"
+msgstr "Cheque en la parte de arriba"
+
+#. module: account_check_writing
+#: view:account.voucher:0
+msgid "Print Check"
+msgstr "Imprimir cheque"
+
+#. module: account_check_writing
+#: selection:res.company,check_layout:0
+msgid "Check in middle"
+msgstr "Cheque en el centro"
+
+#. 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 ""
+"Cheque en la parte de arriba es compatible con Quicken, Quickbooks y "
+"Microsoft Money. Cheque en el medio es compatible con PeachTree, ACCPAC y "
+"DacEasy. Cheque en la parte de abajo es compatible con Peachtree, ACCPAC y "
+"DacEasy exclusivamente"
+
+#. module: account_check_writing
+#: selection:res.company,check_layout:0
+msgid "Check on bottom"
+msgstr "Cheque en la parte de abajo"
+
+#. module: account_check_writing
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "¡Error! No puede crear compañías recursivas."
+
+#. 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 "Revise si el diario es usado para registrar cheques."
+
+#. module: account_check_writing
+#: field:account.journal,allow_check_writing:0
+msgid "Allow Check writing"
+msgstr "Permitir escribir cheques"
+
+#. 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 "Descripción"
+
+#. module: account_check_writing
+#: model:ir.model,name:account_check_writing.model_account_journal
+msgid "Journal"
+msgstr "Diário"
+
+#. 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 "Escribir cheques"
+
+#. 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 "Descuento"
+
+#. 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 "Importe original"
+
+#. module: account_check_writing
+#: model:ir.actions.act_window,help:account_check_writing.action_write_check
+msgid ""
+"
\n"
+" Click to create a new check. \n"
+"
\n"
+" The check payment form allows you to track the payment you "
+"do\n"
+" to your suppliers using checks. When you select a supplier, "
+"the\n"
+" payment method and an amount for the payment, OpenERP will\n"
+" propose to reconcile your payment with the open supplier\n"
+" invoices or bills.\n"
+"
\n"
+" "
+msgstr ""
+"
\n"
+" Click para crear un nuevo cheque.\n"
+"
\n"
+" El formulario de pago de cheques le permite dar seguimiento "
+"al pago que \n"
+" emite a sus proveedores usando cheques. Cuando selecciona un "
+"proveedor, el\n"
+" metodo de pago y un monto para el pago, OpenERP propondrá \n"
+" conciliar su pago con las facturas abiertas o cuentas "
+"abiertas del proveedor.\n"
+"
\n"
+" "
+
+#. module: account_check_writing
+#: field:account.voucher,allow_check:0
+msgid "Allow Check Writing"
+msgstr "Permitir escribir cheques"
+
+#. 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 "Pago"
+
+#. module: account_check_writing
+#: field:account.journal,use_preprint_check:0
+msgid "Use Preprinted Check"
+msgstr "Usar cheque preimpreso"
+
+#. module: account_check_writing
+#: model:ir.actions.report.xml,name:account_check_writing.account_print_check_bottom
+msgid "Print Check (Bottom)"
+msgstr "Imprimir cheque (Abajo)"
+
+#. module: account_check_writing
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr "¡El nombre de la compañía debe ser único!"
+
+#. 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 "Fecha de vencimiento"
+
+#. module: account_check_writing
+#: model:ir.actions.report.xml,name:account_check_writing.account_print_check_middle
+msgid "Print Check (Middle)"
+msgstr "Imprimir Cheque (Al Centro)"
+
+#. module: account_check_writing
+#: constraint:account.journal:0
+msgid ""
+"Configuration error!\n"
+"The currency chosen should be shared by the default accounts too."
+msgstr ""
+"¡Error de confuguración!\n"
+"La moneda seleccionada también tiene que ser la que está en las cuentas por "
+"defecto."
+
+#. module: account_check_writing
+#: model:ir.model,name:account_check_writing.model_res_company
+msgid "Companies"
+msgstr "Compañías"
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+msgid "Balance Due"
+msgstr "Saldo pendiente"
+
+#. module: account_check_writing
+#: model:ir.actions.report.xml,name:account_check_writing.account_print_check_top
+msgid "Print Check (Top)"
+msgstr "Imprimir Cheque (Arriba)"
+
+#. 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 "Importe del cheque"
+
+#. module: account_check_writing
+#: model:ir.model,name:account_check_writing.model_account_voucher
+msgid "Accounting Voucher"
+msgstr "Comprobante contable"
+
+#. module: account_check_writing
+#: sql_constraint:account.journal:0
+msgid "The name of the journal must be unique per company !"
+msgstr "¡El nombre del diaro debe ser único por compañía!"
+
+#. module: account_check_writing
+#: sql_constraint:account.journal:0
+msgid "The code of the journal must be unique per company !"
+msgstr "¡El código del diario debe ser único por compañía!"
+
+#. module: account_check_writing
+#: field:account.voucher,amount_in_word:0
+msgid "Amount in Word"
+msgstr "Cantidad en letra"
+
+#. module: account_check_writing
+#: report:account.print.check.top:0
+msgid "Open Balance"
+msgstr "Saldo Inicial"
+
+#. module: account_check_writing
+#: field:res.company,check_layout:0
+msgid "Choose Check layout"
+msgstr "Elija el formato del cheque."
diff --git a/addons/account_check_writing/i18n/zh_CN.po b/addons/account_check_writing/i18n/zh_CN.po
index b91e5204fbc..9f0ab53eca6 100644
--- a/addons/account_check_writing/i18n/zh_CN.po
+++ b/addons/account_check_writing/i18n/zh_CN.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-05-10 18:06+0000\n"
-"Last-Translator: 开阖软件 Jeff Wang \n"
+"PO-Revision-Date: 2012-11-28 06:58+0000\n"
+"Last-Translator: ccdos \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-11-25 06:32+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
#. module: account_check_writing
#: selection:res.company,check_layout:0
@@ -110,6 +110,15 @@ msgid ""
" \n"
" "
msgstr ""
+"
\n"
+" When the sale receipt is confirmed, you can record the "
+"customer\n"
+" payment related to this sales receipt.\n"
+"
\n"
+" "
+msgstr ""
+
+#. module: account_voucher
+#: help:account.voucher,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.model,name:account_voucher.model_account_bank_statement_line
+msgid "Bank Statement Line"
+msgstr "Kontoutskrift linje."
+
+#. module: account_voucher
+#: view:sale.receipt.report:0
+#: field:sale.receipt.report,day:0
+msgid "Day"
+msgstr "Dag."
+
+#. module: account_voucher
+#: constraint:account.invoice:0
+msgid "Invalid BBA Structured Communication !"
+msgstr "Ugyldig BBA Strukturert Kommunikasjon!"
+
+#. module: account_voucher
+#: field:account.voucher,tax_id:0
+msgid "Tax"
+msgstr "Skatt."
+
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:864
+#, python-format
+msgid "Invalid Action!"
+msgstr "Ugyldig handling!"
+
+#. module: account_voucher
+#: constraint:account.bank.statement:0
+msgid "The journal and period chosen have to belong to the same company."
+msgstr "Tidsskriftet og perioden er valgt å tilhøre samme selskap."
+
+#. module: account_voucher
+#: field:account.voucher,comment:0
+msgid "Counterpart Comment"
+msgstr ""
+
+#. module: account_voucher
+#: field:account.voucher.line,account_analytic_id:0
+msgid "Analytic Account"
+msgstr "Analytisk konto."
+
+#. module: account_voucher
+#: help:account.voucher,message_summary:0
+msgid ""
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Payment Information"
+msgstr "Betalings informasjon."
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "(update)"
+msgstr "(Oppdatering)"
+
+#. module: account_voucher
+#: view:account.voucher:0
+#: selection:account.voucher,state:0
+#: view:sale.receipt.report:0
+#: selection:sale.receipt.report,state:0
+msgid "Draft"
+msgstr "Kladd."
+
+#. module: account_voucher
+#: view:account.bank.statement:0
+msgid "Import Invoices"
+msgstr "Importer fakturaer."
+
+#. module: account_voucher
+#: selection:account.voucher,pay_now:0
+#: selection:sale.receipt.report,pay_now:0
+msgid "Pay Later or Group Funds"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+#: selection:account.voucher,type:0
+#: selection:sale.receipt.report,type:0
+msgid "Receipt"
+msgstr "Kvittering."
+
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1001
+#, python-format
+msgid ""
+"You should configure the 'Gain Exchange Rate Account' in the accounting "
+"settings, to manage automatically the booking of accounting entries related "
+"to differences between exchange rates."
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Sales Lines"
+msgstr "Salgs linjer."
+
+#. module: account_voucher
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Feil ! Du kan ikke lage rekursive firmaer."
+
+#. module: account_voucher
+#: view:account.voucher:0
+#: field:account.voucher,period_id:0
+msgid "Period"
+msgstr "Periode."
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Supplier"
+msgstr "Leverandør"
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Supplier Voucher"
+msgstr ""
+
+#. module: account_voucher
+#: field:account.voucher,message_follower_ids:0
+msgid "Followers"
+msgstr "Følgere."
+
+#. module: account_voucher
+#: selection:account.voucher.line,type:0
+msgid "Debit"
+msgstr "Debet."
+
+#. module: account_voucher
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr "Firmanavn må være unikt !"
+
+#. module: account_voucher
+#: view:sale.receipt.report:0
+#: field:sale.receipt.report,nbr:0
+msgid "# of Voucher Lines"
+msgstr ""
+
+#. module: account_voucher
+#: view:sale.receipt.report:0
+#: field:sale.receipt.report,type:0
+msgid "Type"
+msgstr "Type."
+
+#. module: account_voucher
+#: view:sale.receipt.report:0
+msgid "Pro-forma Vouchers"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+#: model:ir.actions.act_window,name:account_voucher.act_journal_voucher_open
+msgid "Voucher Entries"
+msgstr "Kupong oppføringer."
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Open Supplier Journal Entries"
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_review_voucher_list
+msgid "Vouchers Entries"
+msgstr "Kuponger oppføringer."
+
+#. module: account_voucher
+#: field:account.voucher,name:0
+msgid "Memo"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Are you sure to unreconcile and cancel this record ?"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt
+msgid "Sales Receipt"
+msgstr "Salgs kvittering."
+
+#. module: account_voucher
+#: field:account.voucher,is_multi_currency:0
+msgid "Multi Currency Voucher"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Bill Information"
+msgstr "Regning informasjon."
+
+#. module: account_voucher
+#: selection:sale.receipt.report,month:0
+msgid "July"
+msgstr "juli."
+
+#. module: account_voucher
+#: help:account.voucher,state:0
+msgid ""
+" * The 'Draft' status is used when a user is encoding a new and unconfirmed "
+"Voucher. \n"
+"* The 'Pro-forma' when voucher is in Pro-forma status,voucher does not have "
+"an voucher number. \n"
+"* The 'Posted' status is used when user create voucher,a voucher number is "
+"generated and voucher entries are created in account "
+"\n"
+"* The 'Cancelled' status is used when user cancel voucher."
+msgstr ""
+
+#. module: account_voucher
+#: field:account.voucher,writeoff_amount:0
+msgid "Difference Amount"
+msgstr ""
+
+#. module: account_voucher
+#: view:sale.receipt.report:0
+#: field:sale.receipt.report,due_delay:0
+msgid "Avg. Due Delay"
+msgstr ""
+
+#. module: account_voucher
+#: code:addons/account_voucher/invoice.py:33
+#, python-format
+msgid "Pay Invoice"
+msgstr "Betal faktura."
+
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1134
+#, python-format
+msgid "No Account Base Code and Account Tax Code!"
+msgstr "Ingen konto base kode og konto skatt kode."
+
+#. module: account_voucher
+#: field:account.voucher,tax_amount:0
+msgid "Tax Amount"
+msgstr "Skatt beløp."
+
+#. module: account_voucher
+#: view:sale.receipt.report:0
+msgid "Validated Vouchers"
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.actions.act_window,help:account_voucher.action_vendor_receipt
+msgid ""
+"
\n"
+" Click to register a new payment. \n"
+"
\n"
+" Enter the customer and the payment method and then, either\n"
+" create manually a payment record or OpenERP will propose to "
+"you\n"
+" automatically the reconciliation of this payment with the "
+"open\n"
+" invoices or sales receipts.\n"
+"
\n"
+" From this report, you can have an overview of the amount "
+"invoiced\n"
+" to your customer as well as payment delays. The tool search can\n"
+" also be used to personalise your Invoices reports and so, match\n"
+" this analysis to your needs.\n"
+"
\n"
+" "
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Posted Vouchers"
+msgstr "Lagt ut kuponger."
+
+#. module: account_voucher
+#: field:account.voucher,payment_rate:0
+msgid "Exchange Rate"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Payment Method"
+msgstr "Betalings metode."
+
+#. module: account_voucher
+#: field:account.voucher.line,name:0
+msgid "Description"
+msgstr "Beskrivelse."
+
+#. module: account_voucher
+#: selection:sale.receipt.report,month:0
+msgid "May"
+msgstr "Mai."
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Sale Receipt"
+msgstr "Salgs kvittering."
+
+#. module: account_voucher
+#: view:account.voucher:0
+#: field:account.voucher,journal_id:0
+#: view:sale.receipt.report:0
+#: field:sale.receipt.report,journal_id:0
+msgid "Journal"
+msgstr "Journal."
+
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
+#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
+msgid "Supplier Payment"
+msgstr "Leverandør betaling."
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Internal Notes"
+msgstr "Interne notater."
+
+#. module: account_voucher
+#: view:account.voucher:0
+#: field:account.voucher,line_cr_ids:0
+msgid "Credits"
+msgstr ""
+
+#. module: account_voucher
+#: field:account.voucher.line,amount_original:0
+msgid "Original Amount"
+msgstr "Opprinnelig beløp."
+
+#. module: account_voucher
+#: view:account.voucher:0
+#: model:ir.actions.act_window,name:account_voucher.action_purchase_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_purchase_receipt
+msgid "Purchase Receipt"
+msgstr "Kjøps kvitteringen."
+
+#. module: account_voucher
+#: help:account.voucher,payment_rate:0
+msgid ""
+"The specific rate that will be used, in this voucher, between the selected "
+"currency (in 'Payment Rate Currency' field) and the voucher currency."
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+#: field:account.voucher,pay_now:0
+#: selection:account.voucher,type:0
+#: field:sale.receipt.report,pay_now:0
+#: selection:sale.receipt.report,type:0
+msgid "Payment"
+msgstr "Betaling."
+
+#. module: account_voucher
+#: view:account.voucher:0
+#: selection:account.voucher,state:0
+#: view:sale.receipt.report:0
+#: selection:sale.receipt.report,state:0
+msgid "Posted"
+msgstr "Lagt inn."
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Customer"
+msgstr "Kunde."
+
+#. module: account_voucher
+#: selection:sale.receipt.report,month:0
+msgid "February"
+msgstr "Februar."
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Supplier Invoices and Outstanding transactions"
+msgstr "Leverandør fakturaer og utestående transaksjoner."
+
+#. module: account_voucher
+#: field:account.voucher,reference:0
+msgid "Ref #"
+msgstr "Referanse #"
+
+#. module: account_voucher
+#: view:sale.receipt.report:0
+#: field:sale.receipt.report,year:0
+msgid "Year"
+msgstr "År."
+
+#. module: account_voucher
+#: field:account.config.settings,income_currency_exchange_account_id:0
+#: field:res.company,income_currency_exchange_account_id:0
+msgid "Gain Exchange Rate Account"
+msgstr ""
+
+#. module: account_voucher
+#: selection:sale.receipt.report,month:0
+msgid "April"
+msgstr "April."
+
+#. module: account_voucher
+#: help:account.voucher,tax_id:0
+msgid "Only for tax excluded from price"
+msgstr ""
+
+#. module: account_voucher
+#: field:account.voucher,type:0
+msgid "Default Type"
+msgstr "Standard type."
+
+#. module: account_voucher
+#: help:account.voucher,message_ids:0
+msgid "Messages and communication history"
+msgstr "Meldinger og kommunikasjon historie."
+
+#. module: account_voucher
+#: model:ir.model,name:account_voucher.model_account_statement_from_invoice_lines
+msgid "Entries by Statement from Invoices"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+#: field:account.voucher,amount:0
+msgid "Total"
+msgstr "Totalt."
+
+#. module: account_voucher
+#: field:account.voucher,move_id:0
+msgid "Account Entry"
+msgstr "Konto Inngang."
+
+#. module: account_voucher
+#: 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_voucher
+#: code:addons/account_voucher/account_voucher.py:864
+#, python-format
+msgid "Cannot delete voucher(s) which are already opened or paid."
+msgstr "Kan ikke slette kupong(er) som allerede er åpnet eller betalt."
+
+#. module: account_voucher
+#: help:account.voucher,date:0
+msgid "Effective date for accounting entries"
+msgstr ""
+
+#. module: account_voucher
+#: model:mail.message.subtype,name:account_voucher.mt_voucher
+msgid "Status Change"
+msgstr "Statusendring."
+
+#. module: account_voucher
+#: selection:account.voucher,payment_option:0
+msgid "Keep Open"
+msgstr "Hold åpen."
+
+#. module: account_voucher
+#: field:account.voucher,line_ids:0
+#: view:account.voucher.line:0
+#: model:ir.model,name:account_voucher.model_account_voucher_line
+msgid "Voucher Lines"
+msgstr "Kupong linjer."
+
+#. module: account_voucher
+#: view:sale.receipt.report:0
+#: field:sale.receipt.report,delay_to_pay:0
+msgid "Avg. Delay To Pay"
+msgstr ""
+
+#. module: account_voucher
+#: field:account.voucher.line,untax_amount:0
+msgid "Untax Amount"
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.model,name:account_voucher.model_sale_receipt_report
+msgid "Sales Receipt Statistics"
+msgstr "Salgs kvittering statistikker."
+
+#. module: account_voucher
+#: view:account.voucher:0
+#: field:account.voucher,partner_id:0
+#: field:account.voucher.line,partner_id:0
+#: view:sale.receipt.report:0
+#: field:sale.receipt.report,partner_id:0
+msgid "Partner"
+msgstr "Partner."
+
+#. module: account_voucher
+#: field:account.voucher.line,amount_unreconciled:0
+msgid "Open Balance"
+msgstr ""
+
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:997
+#: code:addons/account_voucher/account_voucher.py:1001
+#, python-format
+msgid "Insufficient Configuration!"
+msgstr ""
+
+#. module: account_voucher
+#: help:account.voucher,active:0
+msgid ""
+"By default, reconciliation vouchers made on draft bank statements are set as "
+"inactive, which allow to hide the customer/supplier payment while the bank "
+"statement isn't confirmed."
+msgstr ""
diff --git a/addons/account_voucher/i18n/nl_BE.po b/addons/account_voucher/i18n/nl_BE.po
index da353da82ae..3524e48d1fc 100644
--- a/addons/account_voucher/i18n/nl_BE.po
+++ b/addons/account_voucher/i18n/nl_BE.po
@@ -7,51 +7,51 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-11-24 02:51+0000\n"
-"PO-Revision-Date: 2009-04-10 09:54+0000\n"
-"Last-Translator: Fabien (Open ERP) \n"
+"PO-Revision-Date: 2012-11-27 13:39+0000\n"
+"Last-Translator: Els Van Vossel (Agaplan) \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:15+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
#. module: account_voucher
#: field:account.bank.statement.line,voucher_id:0
msgid "Reconciliation"
-msgstr ""
+msgstr "Afpunting"
#. module: account_voucher
#: model:ir.model,name:account_voucher.model_account_config_settings
msgid "account.config.settings"
-msgstr ""
+msgstr "account.config.settings"
#. module: account_voucher
#: code:addons/account_voucher/account_voucher.py:348
#, python-format
msgid "Write-Off"
-msgstr ""
+msgstr "Afschrijving"
#. module: account_voucher
#: view:account.voucher:0
msgid "Payment Ref"
-msgstr ""
+msgstr "Betalingsreferentie"
#. module: account_voucher
#: view:account.voucher:0
msgid "Total Amount"
-msgstr ""
+msgstr "Totaalbedrag"
#. module: account_voucher
#: view:account.voucher:0
msgid "Open Customer Journal Entries"
-msgstr ""
+msgstr "Openstaande boekingen klanten"
#. module: account_voucher
#: view:account.voucher:0
#: view:sale.receipt.report:0
msgid "Group By..."
-msgstr ""
+msgstr "Groeperen op..."
#. module: account_voucher
#: help:account.voucher,writeoff_amount:0
diff --git a/addons/account_voucher/i18n/zh_CN.po b/addons/account_voucher/i18n/zh_CN.po
index 30278b0a5d7..f174f76940c 100644
--- a/addons/account_voucher/i18n/zh_CN.po
+++ b/addons/account_voucher/i18n/zh_CN.po
@@ -7,24 +7,24 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-11-24 02:51+0000\n"
-"PO-Revision-Date: 2012-05-10 17:47+0000\n"
-"Last-Translator: 开阖软件 Jeff Wang \n"
+"PO-Revision-Date: 2012-11-29 10:48+0000\n"
+"Last-Translator: ccdos \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:15+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-30 05:07+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
#. module: account_voucher
#: field:account.bank.statement.line,voucher_id:0
msgid "Reconciliation"
-msgstr ""
+msgstr "核销"
#. module: account_voucher
#: model:ir.model,name:account_voucher.model_account_config_settings
msgid "account.config.settings"
-msgstr ""
+msgstr "account.config.settings"
#. module: account_voucher
#: code:addons/account_voucher/account_voucher.py:348
@@ -63,7 +63,7 @@ msgstr "计算公式 ： 凭证上输入的金额 - 凭证行的金额合计"
#. module: account_voucher
#: view:account.voucher:0
msgid "(Update)"
-msgstr ""
+msgstr "（更新）"
#. module: account_voucher
#: code:addons/account_voucher/account_voucher.py:1093
@@ -98,7 +98,7 @@ msgstr "3月"
#. module: account_voucher
#: field:account.voucher,message_unread:0
msgid "Unread Messages"
-msgstr ""
+msgstr "未读消息"
#. module: account_voucher
#: view:account.voucher:0
@@ -108,7 +108,7 @@ msgstr "付款"
#. module: account_voucher
#: view:account.voucher:0
msgid "Are you sure you want to cancel this receipt?"
-msgstr ""
+msgstr "你确信要取消这个收据？"
#. module: account_voucher
#: view:account.voucher:0
@@ -129,7 +129,7 @@ msgstr "按发票年度分组"
#: view:sale.receipt.report:0
#: field:sale.receipt.report,user_id:0
msgid "Salesperson"
-msgstr ""
+msgstr "销售员"
#. module: account_voucher
#: view:account.voucher:0
@@ -201,7 +201,7 @@ msgstr "备注"
#. module: account_voucher
#: field:account.voucher,message_ids:0
msgid "Messages"
-msgstr ""
+msgstr "消息"
#. module: account_voucher
#: selection:account.voucher,type:0
@@ -219,7 +219,7 @@ msgstr "会计凭证行"
#: code:addons/account_voucher/account_voucher.py:964
#, python-format
msgid "Error!"
-msgstr ""
+msgstr "错误!"
#. module: account_voucher
#: field:account.voucher.line,amount:0
@@ -265,7 +265,7 @@ msgstr ""
#. module: account_voucher
#: help:account.voucher,message_unread:0
msgid "If checked new messages require your attention."
-msgstr ""
+msgstr "如果要求你关注新消息，勾选此项"
#. module: account_voucher
#: model:ir.model,name:account_voucher.model_account_bank_statement_line
@@ -292,7 +292,7 @@ msgstr "税"
#: code:addons/account_voucher/account_voucher.py:864
#, python-format
msgid "Invalid Action!"
-msgstr ""
+msgstr "非法的动作"
#. module: account_voucher
#: constraint:account.bank.statement:0
@@ -314,7 +314,7 @@ msgstr "辅助核算项"
msgid ""
"Holds the Chatter summary (number of messages, ...). This summary is "
"directly in html format in order to be inserted in kanban views."
-msgstr ""
+msgstr "保存复杂的摘要(消息数量,……等)。为了插入到看板视图，这一摘要直接是是HTML格式。"
#. module: account_voucher
#: view:account.voucher:0
@@ -324,7 +324,7 @@ msgstr "付款信息"
#. module: account_voucher
#: view:account.voucher:0
msgid "(update)"
-msgstr ""
+msgstr "（更新）"
#. module: account_voucher
#: view:account.voucher:0
@@ -390,7 +390,7 @@ msgstr "供应商手工凭证"
#. module: account_voucher
#: field:account.voucher,message_follower_ids:0
msgid "Followers"
-msgstr ""
+msgstr "关注者"
#. module: account_voucher
#: selection:account.voucher.line,type:0
@@ -533,7 +533,7 @@ msgstr ""
#: field:account.config.settings,expense_currency_exchange_account_id:0
#: field:res.company,expense_currency_exchange_account_id:0
msgid "Loss Exchange Rate Account"
-msgstr ""
+msgstr "丢失了汇率账目"
#. module: account_voucher
#: view:account.voucher:0
@@ -576,7 +576,7 @@ msgstr "费用明细"
#. module: account_voucher
#: view:account.voucher:0
msgid "Sale voucher"
-msgstr ""
+msgstr "销售凭据"
#. module: account_voucher
#: help:account.voucher,is_multi_currency:0
@@ -588,7 +588,7 @@ msgstr "此字段由系统内部使用，区分该凭证是否涉及外币"
#. module: account_voucher
#: view:account.invoice:0
msgid "Register Payment"
-msgstr ""
+msgstr "登记付款"
#. module: account_voucher
#: field:account.statement.from.invoice.lines,line_ids:0
@@ -626,17 +626,17 @@ msgstr "应收应付"
#. module: account_voucher
#: view:account.voucher:0
msgid "Voucher Payment"
-msgstr ""
+msgstr "付款收据"
#. module: account_voucher
#: field:sale.receipt.report,state:0
msgid "Voucher Status"
-msgstr ""
+msgstr "收据状态"
#. module: account_voucher
#: view:account.voucher:0
msgid "Are you sure to unreconcile this record?"
-msgstr ""
+msgstr "你确定要反核销这条记录？"
#. module: account_voucher
#: field:account.voucher,company_id:0
@@ -660,7 +660,7 @@ msgstr "核销付款余额"
#: code:addons/account_voucher/account_voucher.py:960
#, python-format
msgid "Configuration Error !"
-msgstr ""
+msgstr "设置错误!"
#. module: account_voucher
#: view:account.voucher:0
@@ -677,14 +677,14 @@ msgstr "含税总计"
#. module: account_voucher
#: view:account.voucher:0
msgid "Purchase Voucher"
-msgstr ""
+msgstr "采购凭证"
#. module: account_voucher
#: view:account.voucher:0
#: field:account.voucher,state:0
#: view:sale.receipt.report:0
msgid "Status"
-msgstr ""
+msgstr "状态"
#. module: account_voucher
#: view:account.voucher:0
@@ -695,7 +695,7 @@ msgstr "分配"
#: view:account.statement.from.invoice.lines:0
#: view:account.voucher:0
msgid "or"
-msgstr ""
+msgstr "or"
#. module: account_voucher
#: selection:sale.receipt.report,month:0
@@ -718,7 +718,7 @@ msgstr "10月"
#: code:addons/account_voucher/account_voucher.py:961
#, python-format
msgid "Please activate the sequence of selected journal !"
-msgstr ""
+msgstr "请激活选中分类账的 序列（ sequence ）。"
#. module: account_voucher
#: selection:sale.receipt.report,month:0
@@ -738,7 +738,7 @@ msgstr "已付款"
#. module: account_voucher
#: field:account.voucher,message_is_follower:0
msgid "Is a Follower"
-msgstr ""
+msgstr "是一个关注者"
#. module: account_voucher
#: field:account.voucher,analytic_id:0
@@ -776,7 +776,7 @@ msgstr "已对账金额"
#: field:account.voucher,message_comment_ids:0
#: help:account.voucher,message_comment_ids:0
msgid "Comments and emails"
-msgstr ""
+msgstr "评论和电子邮件"
#. module: account_voucher
#: model:ir.actions.act_window,help:account_voucher.action_vendor_payment
@@ -825,18 +825,18 @@ msgstr "公司"
#. module: account_voucher
#: field:account.voucher,message_summary:0
msgid "Summary"
-msgstr ""
+msgstr "摘要"
#. module: account_voucher
#: field:account.voucher,active:0
msgid "Active"
-msgstr ""
+msgstr "启用"
#. module: account_voucher
#: code:addons/account_voucher/account_voucher.py:965
#, python-format
msgid "Please define a sequence on the journal."
-msgstr ""
+msgstr "请在分类账上定义一个序列（ sequence ）。"
#. module: account_voucher
#: view:account.voucher:0
@@ -852,7 +852,7 @@ msgstr "按发票日期分组"
#: code:addons/account_voucher/account_voucher.py:1093
#, python-format
msgid "Wrong bank statement line"
-msgstr ""
+msgstr "错误的银行对账单行"
#. module: account_voucher
#: view:account.voucher:0
@@ -909,7 +909,7 @@ msgstr "银行单据"
#. module: account_voucher
#: view:account.bank.statement:0
msgid "onchange_amount(amount)"
-msgstr ""
+msgstr "onchange_amount(amount)"
#. module: account_voucher
#: selection:sale.receipt.report,month:0
@@ -954,7 +954,7 @@ msgstr "取消"
#. module: account_voucher
#: model:ir.actions.client,name:account_voucher.action_client_invoice_menu
msgid "Open Invoicing Menu"
-msgstr ""
+msgstr "打开开票菜单"
#. module: account_voucher
#: selection:account.voucher,state:0
@@ -973,7 +973,7 @@ msgstr "账簿明细"
#: code:addons/account_voucher/account_voucher.py:492
#, python-format
msgid "Please define default credit/debit accounts on the journal \"%s\"."
-msgstr ""
+msgstr "定义分类账 \"%s\" 的默认借方/贷方科目"
#. module: account_voucher
#: model:ir.actions.act_window,name:account_voucher.act_pay_voucher
@@ -1049,7 +1049,7 @@ msgstr "5月"
#. module: account_voucher
#: view:account.voucher:0
msgid "Sale Receipt"
-msgstr ""
+msgstr "销售收据"
#. module: account_voucher
#: view:account.voucher:0
@@ -1162,7 +1162,7 @@ msgstr "默认类型"
#. module: account_voucher
#: help:account.voucher,message_ids:0
msgid "Messages and communication history"
-msgstr ""
+msgstr "消息和通信历史"
#. module: account_voucher
#: model:ir.model,name:account_voucher.model_account_statement_from_invoice_lines
@@ -1185,13 +1185,13 @@ msgstr "分录"
msgid ""
"The amount of the voucher must be the same amount as the one on the "
"statement line."
-msgstr ""
+msgstr "单据的金额必须跟对账单其中一行金额相同。"
#. module: account_voucher
#: code:addons/account_voucher/account_voucher.py:864
#, python-format
msgid "Cannot delete voucher(s) which are already opened or paid."
-msgstr ""
+msgstr "不能删除已经开启或者支付的单据。"
#. module: account_voucher
#: help:account.voucher,date:0
@@ -1201,7 +1201,7 @@ msgstr "会计分录的生效日期"
#. module: account_voucher
#: model:mail.message.subtype,name:account_voucher.mt_voucher
msgid "Status Change"
-msgstr ""
+msgstr "状态更改"
#. module: account_voucher
#: selection:account.voucher,payment_option:0
diff --git a/addons/account_voucher/test/case1_usd_usd.yml b/addons/account_voucher/test/case1_usd_usd.yml
index 300d565f229..0f4c2058fc7 100644
--- a/addons/account_voucher/test/case1_usd_usd.yml
+++ b/addons/account_voucher/test/case1_usd_usd.yml
@@ -66,7 +66,6 @@
default_credit_account_id: account_cash_usd_id
currency: base.USD
company_id: base.main_company
- view_id: account.account_journal_bank_view
-
I create the first invoice on 1st January for 200 USD
diff --git a/addons/account_voucher/test/case2_suppl_usd_eur.yml b/addons/account_voucher/test/case2_suppl_usd_eur.yml
index 1a0c250395e..b32228032d3 100644
--- a/addons/account_voucher/test/case2_suppl_usd_eur.yml
+++ b/addons/account_voucher/test/case2_suppl_usd_eur.yml
@@ -23,7 +23,6 @@
default_credit_account_id: account.cash
currency: base.EUR
company_id: base.main_company
- view_id: account.account_journal_bank_view
-
I create a bank journal with USD as currency
-
@@ -37,7 +36,6 @@
default_credit_account_id: account.cash
currency: base.USD
company_id: base.main_company
- view_id: account.account_journal_bank_view
-
I create the first invoice on 1st January for 200 USD
-
diff --git a/addons/account_voucher/test/case2_usd_eur_debtor_in_eur.yml b/addons/account_voucher/test/case2_usd_eur_debtor_in_eur.yml
index 91f8a629cbb..275e4c58835 100644
--- a/addons/account_voucher/test/case2_usd_eur_debtor_in_eur.yml
+++ b/addons/account_voucher/test/case2_usd_eur_debtor_in_eur.yml
@@ -59,7 +59,6 @@
default_debit_account_id: account.cash
default_credit_account_id: account.cash
company_id: base.main_company
- view_id: account.account_journal_bank_view
-
I create a bank journal with USD as currency
-
@@ -73,7 +72,6 @@
default_credit_account_id: account_cash_usd_id
currency: base.USD
company_id: base.main_company
- view_id: account.account_journal_bank_view
-
I create the first invoice on 1st January for 200 USD
-
diff --git a/addons/account_voucher/test/case2_usd_eur_debtor_in_usd.yml b/addons/account_voucher/test/case2_usd_eur_debtor_in_usd.yml
index cc5e819af30..667882e3a32 100644
--- a/addons/account_voucher/test/case2_usd_eur_debtor_in_usd.yml
+++ b/addons/account_voucher/test/case2_usd_eur_debtor_in_usd.yml
@@ -59,7 +59,6 @@
default_debit_account_id: account.cash
default_credit_account_id: account.cash
company_id: base.main_company
- view_id: account.account_journal_bank_view
-
I create a bank journal with USD as currency
-
@@ -73,7 +72,6 @@
default_credit_account_id: account_cash_usd_id
currency: base.USD
company_id: base.main_company
- view_id: account.account_journal_bank_view
-
I create the first invoice on 1st January for 200 USD
-
diff --git a/addons/account_voucher/test/case3_eur_eur.yml b/addons/account_voucher/test/case3_eur_eur.yml
index 37ea7ea981a..f2f9461c31e 100644
--- a/addons/account_voucher/test/case3_eur_eur.yml
+++ b/addons/account_voucher/test/case3_eur_eur.yml
@@ -27,7 +27,6 @@
default_debit_account_id: account.cash
default_credit_account_id: account.cash
company_id: base.main_company
- view_id: account.account_journal_bank_view
-
I create the first invoice on 1st January for 150 EUR
-
diff --git a/addons/account_voucher/test/case4_cad_chf.yml b/addons/account_voucher/test/case4_cad_chf.yml
index a2b252497cd..bc33e387a85 100644
--- a/addons/account_voucher/test/case4_cad_chf.yml
+++ b/addons/account_voucher/test/case4_cad_chf.yml
@@ -61,7 +61,6 @@
default_credit_account_id: account_cash_chf_id
currency: base.CHF
company_id: base.main_company
- view_id: account.account_journal_bank_view
-
I create the first invoice on 1st January for 200 CAD
-
diff --git a/addons/account_voucher/test/case5_suppl_usd_usd.yml b/addons/account_voucher/test/case5_suppl_usd_usd.yml
index 3cae9667d84..3ef6d1269b7 100644
--- a/addons/account_voucher/test/case5_suppl_usd_usd.yml
+++ b/addons/account_voucher/test/case5_suppl_usd_usd.yml
@@ -4,10 +4,10 @@
-
I create a cash account with currency USD
-
- !record {model: account.account, id: account_cash_usd_id}:
+ !record {model: account.account, id: account_cash_usd_id2}:
currency_id: base.USD
name: "cash account in usd"
- code: "Xcash usd"
+ code: "Xcash usd2"
type: 'liquidity'
user_type: "account.data_account_type_cash"
@@ -46,7 +46,6 @@
default_debit_account_id: account.cash
default_credit_account_id: account.cash
company_id: base.main_company
- view_id: account.account_journal_bank_view
-
I create a bank journal with USD as currency
-
@@ -56,11 +55,10 @@
type: bank
analytic_journal_id: account.sit
sequence_id: account.sequence_bank_journal
- default_debit_account_id: account_cash_usd_id
- default_credit_account_id: account_cash_usd_id
+ default_debit_account_id: account_cash_usd_id2
+ default_credit_account_id: account_cash_usd_id2
currency: base.USD
company_id: base.main_company
- view_id: account.account_journal_bank_view
-
I set the context as would do the action in supplier invoice menuitem
-
diff --git a/addons/account_voucher/test/case_eur_usd.yml b/addons/account_voucher/test/case_eur_usd.yml
index 125277191cb..94f0c718980 100644
--- a/addons/account_voucher/test/case_eur_usd.yml
+++ b/addons/account_voucher/test/case_eur_usd.yml
@@ -40,7 +40,6 @@
default_credit_account_id: account_eur_usd_id
currency: base.USD
company_id: base.main_company
- view_id: account.account_journal_bank_view
-
I create an invoice
-
diff --git a/addons/analytic/analytic.py b/addons/analytic/analytic.py
index 708f9b3b196..542acb1e88c 100644
--- a/addons/analytic/analytic.py
+++ b/addons/analytic/analytic.py
@@ -20,8 +20,10 @@
##############################################################################
import time
+from datetime import datetime
from osv import fields, osv
+import tools
from tools.translate import _
import decimal_precision as dp
@@ -199,9 +201,14 @@ class account_analytic_account(osv.osv):
return {}
res = {'value':{}}
template = self.browse(cr, uid, template_id, context=context)
- res['value']['date_start'] = template.date_start
- res['value']['date'] = template.date
+ if template.date_start and template.date:
+ from_dt = datetime.strptime(template.date_start, tools.DEFAULT_SERVER_DATE_FORMAT)
+ to_dt = datetime.strptime(template.date, tools.DEFAULT_SERVER_DATE_FORMAT)
+ timedelta = to_dt - from_dt
+ res['value']['date'] = datetime.strftime(datetime.now() + timedelta, tools.DEFAULT_SERVER_DATE_FORMAT)
+ res['value']['date_start'] = fields.date.today()
res['value']['quantity_max'] = template.quantity_max
+ res['value']['parent_id'] = template.parent_id and template.parent_id.id or False
res['value']['description'] = template.description
return res
diff --git a/addons/analytic/analytic_view.xml b/addons/analytic/analytic_view.xml
index 1277d25de71..0faca841a0f 100644
--- a/addons/analytic/analytic_view.xml
+++ b/addons/analytic/analytic_view.xml
@@ -26,10 +26,10 @@
-
-
+
+
diff --git a/addons/analytic/i18n/fr.po b/addons/analytic/i18n/fr.po
index 7e95607dcd7..57224ea0164 100644
--- a/addons/analytic/i18n/fr.po
+++ b/addons/analytic/i18n/fr.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2011-01-12 13:04+0000\n"
-"Last-Translator: Quentin THEURET \n"
+"PO-Revision-Date: 2012-11-29 15:37+0000\n"
+"Last-Translator: Numérigraphe \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-11-25 06:22+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-30 05:08+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
#. module: analytic
#: field:account.analytic.account,child_ids:0
@@ -380,7 +380,7 @@ msgid ""
"Calculated by multiplying the quantity and the price given in the Product's "
"cost price. Always expressed in the company main currency."
msgstr ""
-"Calculé en multipliant la quantité par le prix de revient du produit. "
+"Calculé en multipliant la quantité par le prix de revient de l'article. "
"Toujours exprimé dans la devise principale de la société."
#. module: analytic
diff --git a/addons/analytic/i18n/nb.po b/addons/analytic/i18n/nb.po
index d5eb3b42d90..0813deb9233 100644
--- a/addons/analytic/i18n/nb.po
+++ b/addons/analytic/i18n/nb.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2011-04-07 06:36+0000\n"
-"Last-Translator: FULL NAME \n"
+"PO-Revision-Date: 2012-11-29 13:08+0000\n"
+"Last-Translator: Kaare Pettersen \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-11-25 06:22+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-30 05:08+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
#. module: analytic
#: field:account.analytic.account,child_ids:0
@@ -25,12 +25,12 @@ msgstr "underordnede kontoer"
#. module: analytic
#: selection:account.analytic.account,state:0
msgid "In Progress"
-msgstr ""
+msgstr "I arbeid."
#. module: analytic
#: model:mail.message.subtype,name:analytic.mt_account_status
msgid "Status Change"
-msgstr ""
+msgstr "Statusendring."
#. module: analytic
#: selection:account.analytic.account,state:0
@@ -40,7 +40,7 @@ msgstr "Mal"
#. module: analytic
#: view:account.analytic.account:0
msgid "End Date"
-msgstr ""
+msgstr "Sluttdato."
#. module: analytic
#: help:account.analytic.line,unit_amount:0
@@ -65,7 +65,7 @@ msgstr ""
#: code:addons/analytic/analytic.py:215
#, python-format
msgid "Contract: "
-msgstr ""
+msgstr "Kontrakt. "
#. module: analytic
#: field:account.analytic.account,manager_id:0
@@ -75,13 +75,13 @@ msgstr "kontofører"
#. module: analytic
#: field:account.analytic.account,message_follower_ids:0
msgid "Followers"
-msgstr ""
+msgstr "Følgere."
#. module: analytic
#: code:addons/analytic/analytic.py:312
#, python-format
msgid "Contract created."
-msgstr ""
+msgstr "Kontrakt Opprett ."
#. module: analytic
#: selection:account.analytic.account,state:0
@@ -101,18 +101,18 @@ msgstr "Ny"
#. module: analytic
#: field:account.analytic.account,user_id:0
msgid "Project Manager"
-msgstr ""
+msgstr "Prosjektleder."
#. module: analytic
#: field:account.analytic.account,state:0
msgid "Status"
-msgstr ""
+msgstr "Status."
#. module: analytic
#: code:addons/analytic/analytic.py:254
#, python-format
msgid "%s (copy)"
-msgstr ""
+msgstr "%s (kopi)"
#. module: analytic
#: model:ir.model,name:analytic.model_account_analytic_line
@@ -128,17 +128,17 @@ msgstr "Beskrivelse"
#. module: analytic
#: field:account.analytic.account,name:0
msgid "Account/Contract Name"
-msgstr ""
+msgstr "Konto/kontrakt navn."
#. module: analytic
#: field:account.analytic.account,message_unread:0
msgid "Unread Messages"
-msgstr ""
+msgstr "Uleste meldinger."
#. module: analytic
#: constraint:account.analytic.account:0
msgid "Error! You cannot create recursive analytic accounts."
-msgstr ""
+msgstr "Feil! Du kan ikke opprette rekursive analytiske kontoer."
#. module: analytic
#: field:account.analytic.account,company_id:0
@@ -154,7 +154,7 @@ msgstr ""
#. module: analytic
#: help:account.analytic.account,message_ids:0
msgid "Messages and communication history"
-msgstr ""
+msgstr "Meldinger og kommunikasjon historie."
#. module: analytic
#: help:account.analytic.account,quantity_max:0
@@ -184,7 +184,7 @@ msgstr ""
#. module: analytic
#: field:account.analytic.account,message_is_follower:0
msgid "Is a Follower"
-msgstr ""
+msgstr "Er en følger."
#. module: analytic
#: field:account.analytic.line,user_id:0
@@ -218,12 +218,12 @@ msgstr ""
#: field:account.analytic.account,message_comment_ids:0
#: help:account.analytic.account,message_comment_ids:0
msgid "Comments and emails"
-msgstr ""
+msgstr "Kommentarer og E-poster."
#. module: analytic
#: field:account.analytic.account,partner_id:0
msgid "Customer"
-msgstr ""
+msgstr "Kunde."
#. module: analytic
#: field:account.analytic.account,child_complete_ids:0
@@ -233,33 +233,33 @@ msgstr "konto hierarkiet"
#. module: analytic
#: field:account.analytic.account,message_ids:0
msgid "Messages"
-msgstr ""
+msgstr "Meldinger."
#. module: analytic
#: constraint:account.analytic.line:0
msgid "You cannot create analytic line on view account."
-msgstr ""
+msgstr "Du kan ikke opprette en analytisk linje på vis konto."
#. module: analytic
#: view:account.analytic.account:0
msgid "Contract Information"
-msgstr ""
+msgstr "Kontrakt informasjon."
#. module: analytic
#: field:account.analytic.account,template_id:0
#: selection:account.analytic.account,type:0
msgid "Template of Contract"
-msgstr ""
+msgstr "Mal av kontrakt."
#. module: analytic
#: field:account.analytic.account,message_summary:0
msgid "Summary"
-msgstr ""
+msgstr "Oppsummering."
#. module: analytic
#: field:account.analytic.account,quantity_max:0
msgid "Prepaid Service Units"
-msgstr ""
+msgstr "Forhåndsbetalte tjeneste enheter."
#. module: analytic
#: field:account.analytic.account,credit:0
@@ -275,12 +275,12 @@ msgstr "Beløp"
#: code:addons/analytic/analytic.py:314
#, python-format
msgid "Contract for %s has been created."
-msgstr ""
+msgstr "Kontrakt for %s har vært Opprett ."
#. module: analytic
#: view:account.analytic.account:0
msgid "Terms and Conditions"
-msgstr ""
+msgstr "Vilkår og betingelser."
#. module: analytic
#: selection:account.analytic.account,state:0
@@ -290,7 +290,7 @@ msgstr "Annulert"
#. module: analytic
#: selection:account.analytic.account,type:0
msgid "Analytic View"
-msgstr ""
+msgstr "Analytisk vis."
#. module: analytic
#: field:account.analytic.account,balance:0
@@ -305,7 +305,7 @@ msgstr ""
#. module: analytic
#: selection:account.analytic.account,state:0
msgid "To Renew"
-msgstr ""
+msgstr "Å fornye."
#. module: analytic
#: field:account.analytic.account,quantity:0
@@ -321,13 +321,13 @@ msgstr "Sluttdato"
#. module: analytic
#: field:account.analytic.account,code:0
msgid "Reference"
-msgstr ""
+msgstr "Referanse."
#. module: analytic
#: code:addons/analytic/analytic.py:151
#, python-format
msgid "Error!"
-msgstr ""
+msgstr "Feil!"
#. module: analytic
#: model:res.groups,name:analytic.group_analytic_accounting
@@ -337,7 +337,7 @@ msgstr "Analytisk bokføring"
#. module: analytic
#: selection:account.analytic.account,type:0
msgid "Contract or Project"
-msgstr ""
+msgstr "Kontrakt eller prosjekt."
#. module: analytic
#: field:account.analytic.account,complete_name:0
@@ -367,12 +367,12 @@ msgstr ""
#. module: analytic
#: field:account.analytic.account,type:0
msgid "Type of Account"
-msgstr ""
+msgstr "Konto type."
#. module: analytic
#: field:account.analytic.account,date_start:0
msgid "Start Date"
-msgstr ""
+msgstr "Startdato."
#. module: analytic
#: help:account.analytic.line,amount:0
diff --git a/addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py b/addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py
index 35177ee3a66..ee92b469744 100644
--- a/addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py
+++ b/addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py
@@ -65,39 +65,25 @@ class account_analytic_account(osv.osv):
def _expense_to_invoice_calc(self, cr, uid, ids, name, arg, context=None):
res = {}
- res_final = {}
- child_ids = tuple(ids) #We don't want consolidation for each of these fields because those complex computation is resource-greedy.
- for i in child_ids:
- res[i] = 0.0
- if not child_ids:
- return res
+ #We don't want consolidation for each of these fields because those complex computation is resource-greedy.
+ for account in self.pool.get('account.analytic.account').browse(cr, uid, ids, context=context):
+ cr.execute("""
+ SELECT product_id, sum(amount), user_id, to_invoice, sum(unit_amount), product_uom_id, line.name
+ FROM account_analytic_line line
+ LEFT JOIN account_analytic_journal journal ON (journal.id = line.journal_id)
+ WHERE account_id = %s
+ AND journal.type = 'purchase'
+ AND invoice_id IS NULL
+ AND to_invoice IS NOT NULL
+ GROUP BY product_id, user_id, to_invoice, product_uom_id, line.name""", (account.id,))
- if child_ids:
- cr.execute("""SELECT account_analytic_account.id, \
- COALESCE(SUM (product_template.list_price * \
- account_analytic_line.unit_amount * \
- ((100-hr_timesheet_invoice_factor.factor)/100)), 0.0) \
- AS ca_to_invoice \
- FROM product_template \
- JOIN product_product \
- ON product_template.id = product_product.product_tmpl_id \
- JOIN account_analytic_line \
- ON account_analytic_line.product_id = product_product.id \
- JOIN account_analytic_journal \
- ON account_analytic_line.journal_id = account_analytic_journal.id \
- JOIN account_analytic_account \
- ON account_analytic_account.id = account_analytic_line.account_id \
- JOIN hr_timesheet_invoice_factor \
- ON hr_timesheet_invoice_factor.id = account_analytic_account.to_invoice \
- WHERE account_analytic_account.id IN %s \
- AND account_analytic_line.invoice_id IS NULL \
- AND account_analytic_line.to_invoice IS NOT NULL \
- AND account_analytic_journal.type = 'purchase' \
- GROUP BY account_analytic_account.id;""",(child_ids,))
- for account_id, sum in cr.fetchall():
- res[account_id] = sum
- res_final = res
- return res_final
+ res[account.id] = 0.0
+ for product_id, price, user_id, factor_id, qty, uom, line_name in cr.fetchall():
+ #the amount to reinvoice is the real cost. We don't use the pricelist
+ price = -price
+ factor = self.pool.get('hr_timesheet_invoice.factor').browse(cr, uid, factor_id, context=context)
+ res[account.id] += price * qty * (100 - factor.factor or 0.0) / 100.0
+ return res
def _expense_invoiced_calc(self, cr, uid, ids, name, arg, context=None):
lines_obj = self.pool.get('account.analytic.line')
diff --git a/addons/analytic_contract_hr_expense/i18n/nb.po b/addons/analytic_contract_hr_expense/i18n/nb.po
new file mode 100644
index 00000000000..8c3077c3ca7
--- /dev/null
+++ b/addons/analytic_contract_hr_expense/i18n/nb.po
@@ -0,0 +1,77 @@
+# 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-11-24 02:52+0000\n"
+"PO-Revision-Date: 2012-11-29 13:13+0000\n"
+"Last-Translator: Kaare Pettersen \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-11-30 05:08+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
+
+#. module: analytic_contract_hr_expense
+#: view:account.analytic.account:0
+msgid "or view"
+msgstr "Eller vis."
+
+#. module: analytic_contract_hr_expense
+#: constraint:account.analytic.account:0
+msgid "Error! You cannot create recursive analytic accounts."
+msgstr "Feil! Du kan ikke opprette rekursive analytiske kontoer."
+
+#. module: analytic_contract_hr_expense
+#: field:account.analytic.account,expense_invoiced:0
+#: field:account.analytic.account,expense_to_invoice:0
+#: field:account.analytic.account,remaining_expense:0
+msgid "unknown"
+msgstr "Ukjent."
+
+#. module: analytic_contract_hr_expense
+#: view:account.analytic.account:0
+msgid "expenses"
+msgstr "Kostnader."
+
+#. module: analytic_contract_hr_expense
+#: model:ir.model,name:analytic_contract_hr_expense.model_account_analytic_account
+msgid "Analytic Account"
+msgstr "Analytisk konto."
+
+#. module: analytic_contract_hr_expense
+#: code:addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py:147
+#, python-format
+msgid "Expenses to Invoice of %s"
+msgstr "Utgifter til Faktura av% s"
+
+#. module: analytic_contract_hr_expense
+#: code:addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py:133
+#, python-format
+msgid "Expenses of %s"
+msgstr "Utgifter av %s."
+
+#. module: analytic_contract_hr_expense
+#: view:account.analytic.account:0
+msgid "Nothing to invoice, create"
+msgstr "Ikke noe å fakturere, opprett."
+
+#. module: analytic_contract_hr_expense
+#: field:account.analytic.account,est_expenses:0
+msgid "Estimation of Expenses to Invoice"
+msgstr ""
+
+#. module: analytic_contract_hr_expense
+#: field:account.analytic.account,charge_expenses:0
+msgid "Charge Expenses"
+msgstr "Belast utgifter."
+
+#. module: analytic_contract_hr_expense
+#: view:account.analytic.account:0
+msgid "⇒ Invoice"
+msgstr "⇒ Faktura."
diff --git a/addons/analytic_contract_hr_expense/i18n/nl.po b/addons/analytic_contract_hr_expense/i18n/nl.po
new file mode 100644
index 00000000000..44ec2e927e1
--- /dev/null
+++ b/addons/analytic_contract_hr_expense/i18n/nl.po
@@ -0,0 +1,77 @@
+# 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-11-24 02:52+0000\n"
+"PO-Revision-Date: 2012-11-29 15:10+0000\n"
+"Last-Translator: Erwin van der Ploeg (Endian Solutions) \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-11-30 05:08+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
+
+#. module: analytic_contract_hr_expense
+#: view:account.analytic.account:0
+msgid "or view"
+msgstr "of bekijk"
+
+#. module: analytic_contract_hr_expense
+#: constraint:account.analytic.account:0
+msgid "Error! You cannot create recursive analytic accounts."
+msgstr "Fout! Het is niet toegestaan om recursieve kostenplaatsen te maken."
+
+#. module: analytic_contract_hr_expense
+#: field:account.analytic.account,expense_invoiced:0
+#: field:account.analytic.account,expense_to_invoice:0
+#: field:account.analytic.account,remaining_expense:0
+msgid "unknown"
+msgstr "onbekend"
+
+#. module: analytic_contract_hr_expense
+#: view:account.analytic.account:0
+msgid "expenses"
+msgstr "uitgaven"
+
+#. module: analytic_contract_hr_expense
+#: model:ir.model,name:analytic_contract_hr_expense.model_account_analytic_account
+msgid "Analytic Account"
+msgstr "Kostenplaats"
+
+#. module: analytic_contract_hr_expense
+#: code:addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py:147
+#, python-format
+msgid "Expenses to Invoice of %s"
+msgstr "Uitgave te factureren van %s"
+
+#. module: analytic_contract_hr_expense
+#: code:addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py:133
+#, python-format
+msgid "Expenses of %s"
+msgstr "Uitgaven van %s"
+
+#. module: analytic_contract_hr_expense
+#: view:account.analytic.account:0
+msgid "Nothing to invoice, create"
+msgstr "Niets te factureren, aanmaken"
+
+#. module: analytic_contract_hr_expense
+#: field:account.analytic.account,est_expenses:0
+msgid "Estimation of Expenses to Invoice"
+msgstr "Te verwachten uitgaven te factureren"
+
+#. module: analytic_contract_hr_expense
+#: field:account.analytic.account,charge_expenses:0
+msgid "Charge Expenses"
+msgstr "Uitgaven doorberekenen"
+
+#. module: analytic_contract_hr_expense
+#: view:account.analytic.account:0
+msgid "⇒ Invoice"
+msgstr "⇒ Factuur"
diff --git a/addons/analytic_user_function/i18n/fr.po b/addons/analytic_user_function/i18n/fr.po
index c87c9f56da9..9084292a240 100644
--- a/addons/analytic_user_function/i18n/fr.po
+++ b/addons/analytic_user_function/i18n/fr.po
@@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.4\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2011-01-18 16:43+0000\n"
-"Last-Translator: Fabien (Open ERP) \n"
+"PO-Revision-Date: 2012-11-29 15:23+0000\n"
+"Last-Translator: Numérigraphe \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:15+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-30 05:07+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
#. module: analytic_user_function
#: model:ir.model,name:analytic_user_function.model_account_analytic_line
@@ -72,7 +72,7 @@ msgstr ""
#. module: analytic_user_function
#: field:account.analytic.account,user_product_ids:0
msgid "Users/Products Rel."
-msgstr "Relation Utilisateurs/Produits"
+msgstr "Relations utilisateurs/articles"
#. module: analytic_user_function
#: view:account.analytic.account:0
@@ -100,7 +100,7 @@ msgstr ""
#, python-format
msgid "There is no expense account define for this product: \"%s\" (id:%d)"
msgstr ""
-"Il n'y a pas de compte de frais défini pour ce produit : \"%s\" (id:%d)"
+"Il n'y a pas de compte de frais défini pour cet article : \"%s\" (id:%d)"
#. module: analytic_user_function
#: constraint:account.analytic.line:0
diff --git a/addons/analytic_user_function/i18n/nb.po b/addons/analytic_user_function/i18n/nb.po
index b17974113e4..21a25ee3985 100644
--- a/addons/analytic_user_function/i18n/nb.po
+++ b/addons/analytic_user_function/i18n/nb.po
@@ -8,49 +8,49 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-08-27 16:17+0000\n"
-"Last-Translator: FULL NAME \n"
+"PO-Revision-Date: 2012-11-29 13:16+0000\n"
+"Last-Translator: Kaare Pettersen \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-11-25 06:16+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-30 05:07+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
#. module: analytic_user_function
#: model:ir.model,name:analytic_user_function.model_account_analytic_line
msgid "Analytic Line"
-msgstr ""
+msgstr "Analytisk linje."
#. module: analytic_user_function
#: view:account.analytic.account:0
msgid "Invoice Price Rate per User"
-msgstr ""
+msgstr "Faktura pris, vurder per bruker."
#. module: analytic_user_function
#: field:analytic.user.funct.grid,product_id:0
msgid "Service"
-msgstr ""
+msgstr "Tjeneste."
#. module: analytic_user_function
#: constraint:account.analytic.account:0
msgid "Error! You cannot create recursive analytic accounts."
-msgstr ""
+msgstr "Feil! Du kan ikke opprette rekursive analytiske kontoer."
#. module: analytic_user_function
#: field:analytic.user.funct.grid,price:0
msgid "Price"
-msgstr ""
+msgstr "Pris."
#. module: analytic_user_function
#: help:analytic.user.funct.grid,price:0
msgid "Price per hour for this user."
-msgstr ""
+msgstr "Pris per time for denne brukeren."
#. module: analytic_user_function
#: constraint:hr.analytic.timesheet:0
msgid "You cannot modify an entry in a Confirmed/Done timesheet !"
-msgstr ""
+msgstr "Du kan ikke endre en oppføring i en Bekreftet / Ferdig timeliste!"
#. module: analytic_user_function
#: field:analytic.user.funct.grid,account_id:0
@@ -63,12 +63,12 @@ msgstr "Analytisk konto"
#: code:addons/analytic_user_function/analytic_user_function.py:135
#, python-format
msgid "Error!"
-msgstr ""
+msgstr "Feil!"
#. module: analytic_user_function
#: view:analytic.user.funct.grid:0
msgid "Invoicing Data"
-msgstr ""
+msgstr "Faktura data."
#. module: analytic_user_function
#: field:account.analytic.account,user_product_ids:0
@@ -88,12 +88,12 @@ msgstr ""
#. module: analytic_user_function
#: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
msgid "Price per User"
-msgstr ""
+msgstr "Pris per bruker."
#. module: analytic_user_function
#: field:analytic.user.funct.grid,uom_id:0
msgid "Unit of Measure"
-msgstr ""
+msgstr "Måleenhet."
#. module: analytic_user_function
#: code:addons/analytic_user_function/analytic_user_function.py:107
@@ -105,7 +105,7 @@ msgstr "Det er ingen regning definert for dette produktet: \"% s\" (id:% d)"
#. module: analytic_user_function
#: constraint:account.analytic.line:0
msgid "You cannot create analytic line on view account."
-msgstr ""
+msgstr "Du kan ikke opprette en analytisk linje på vis konto."
#. module: analytic_user_function
#: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
diff --git a/addons/analytic_user_function/i18n/zh_CN.po b/addons/analytic_user_function/i18n/zh_CN.po
index 127d8ed10ee..3583ad57a2d 100644
--- a/addons/analytic_user_function/i18n/zh_CN.po
+++ b/addons/analytic_user_function/i18n/zh_CN.po
@@ -7,49 +7,49 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-02-08 03:46+0000\n"
-"Last-Translator: 开阖软件 Jeff Wang \n"
+"PO-Revision-Date: 2012-11-29 14:18+0000\n"
+"Last-Translator: ccdos \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:16+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-30 05:07+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
#. module: analytic_user_function
#: model:ir.model,name:analytic_user_function.model_account_analytic_line
msgid "Analytic Line"
-msgstr ""
+msgstr "辅助核算明细"
#. module: analytic_user_function
#: view:account.analytic.account:0
msgid "Invoice Price Rate per User"
-msgstr ""
+msgstr "每用户的开票单价"
#. module: analytic_user_function
#: field:analytic.user.funct.grid,product_id:0
msgid "Service"
-msgstr ""
+msgstr "服务"
#. module: analytic_user_function
#: constraint:account.analytic.account:0
msgid "Error! You cannot create recursive analytic accounts."
-msgstr ""
+msgstr "错误！你不能循环创建辅助核算项"
#. module: analytic_user_function
#: field:analytic.user.funct.grid,price:0
msgid "Price"
-msgstr ""
+msgstr "价格"
#. module: analytic_user_function
#: help:analytic.user.funct.grid,price:0
msgid "Price per hour for this user."
-msgstr ""
+msgstr "用户每小时价格"
#. module: analytic_user_function
#: constraint:hr.analytic.timesheet:0
msgid "You cannot modify an entry in a Confirmed/Done timesheet !"
-msgstr ""
+msgstr "你不能修改在已经确认/完成的计工单的分录。"
#. module: analytic_user_function
#: field:analytic.user.funct.grid,account_id:0
@@ -62,12 +62,12 @@ msgstr "辅助核算项"
#: code:addons/analytic_user_function/analytic_user_function.py:135
#, python-format
msgid "Error!"
-msgstr ""
+msgstr "错误!"
#. module: analytic_user_function
#: view:analytic.user.funct.grid:0
msgid "Invoicing Data"
-msgstr ""
+msgstr "发票数据"
#. module: analytic_user_function
#: field:account.analytic.account,user_product_ids:0
@@ -87,12 +87,12 @@ msgstr ""
#. module: analytic_user_function
#: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
msgid "Price per User"
-msgstr ""
+msgstr "每用户价格"
#. module: analytic_user_function
#: field:analytic.user.funct.grid,uom_id:0
msgid "Unit of Measure"
-msgstr ""
+msgstr "计量单位"
#. module: analytic_user_function
#: code:addons/analytic_user_function/analytic_user_function.py:107
@@ -104,7 +104,7 @@ msgstr "此产品 \"%s\" （id：%d）没有定义辅助核算项"
#. module: analytic_user_function
#: constraint:account.analytic.line:0
msgid "You cannot create analytic line on view account."
-msgstr ""
+msgstr "你不能视图科目上面创建辅助核算行。"
#. module: analytic_user_function
#: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
diff --git a/addons/anonymization/i18n/zh_CN.po b/addons/anonymization/i18n/zh_CN.po
index 6ad6b0c1016..0ba47de11c4 100644
--- a/addons/anonymization/i18n/zh_CN.po
+++ b/addons/anonymization/i18n/zh_CN.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-02-02 09:55+0000\n"
-"Last-Translator: 开阖软件 Jeff Wang \n"
+"PO-Revision-Date: 2012-11-28 06:50+0000\n"
+"Last-Translator: ccdos \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-11-25 06:31+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
#. module: anonymization
#: model:ir.model,name:anonymization.model_ir_model_fields_anonymize_wizard
@@ -25,17 +25,17 @@ msgstr "ir.model.fields.anonymize.wizard"
#. module: anonymization
#: model:ir.model,name:anonymization.model_ir_model_fields_anonymization_migration_fix
msgid "ir.model.fields.anonymization.migration.fix"
-msgstr ""
+msgstr "ir.model.fields.anonymization.migration.fix"
#. module: anonymization
#: field:ir.model.fields.anonymization.migration.fix,target_version:0
msgid "Target Version"
-msgstr ""
+msgstr "目标版本"
#. module: anonymization
#: selection:ir.model.fields.anonymization.migration.fix,query_type:0
msgid "sql"
-msgstr ""
+msgstr "sql"
#. module: anonymization
#: field:ir.model.fields.anonymization,field_name:0
@@ -62,7 +62,7 @@ msgstr "ir.model.fields.anonymization"
#: field:ir.model.fields.anonymization.history,state:0
#: field:ir.model.fields.anonymize.wizard,state:0
msgid "Status"
-msgstr ""
+msgstr "状态"
#. module: anonymization
#: field:ir.model.fields.anonymization.history,direction:0
@@ -135,7 +135,7 @@ msgstr "隐藏数据库"
#. module: anonymization
#: selection:ir.model.fields.anonymization.migration.fix,query_type:0
msgid "python"
-msgstr ""
+msgstr "python"
#. module: anonymization
#: view:ir.model.fields.anonymization.history:0
@@ -189,7 +189,7 @@ msgstr "隐藏日志"
#. module: anonymization
#: field:ir.model.fields.anonymization.migration.fix,model_name:0
msgid "Model"
-msgstr ""
+msgstr "模型"
#. module: anonymization
#: model:ir.model,name:anonymization.model_ir_model_fields_anonymization_history
@@ -201,7 +201,7 @@ msgstr "ir.model.fields.anonymization.history"
msgid ""
"This is the file created by the anonymization process. It should have the "
"'.pickle' extention."
-msgstr ""
+msgstr "这个文件有匿名进程创建，他没有 '.pickle' 扩展名"
#. module: anonymization
#: model:ir.actions.act_window,name:anonymization.action_ir_model_fields_anonymize_wizard
@@ -217,7 +217,7 @@ msgstr "文件名"
#. module: anonymization
#: field:ir.model.fields.anonymization.migration.fix,sequence:0
msgid "Sequence"
-msgstr ""
+msgstr "编号"
#. module: anonymization
#: selection:ir.model.fields.anonymization.history,direction:0
@@ -238,7 +238,7 @@ msgstr "完成"
#: field:ir.model.fields.anonymization.migration.fix,query:0
#: field:ir.model.fields.anonymization.migration.fix,query_type:0
msgid "Query"
-msgstr ""
+msgstr "查询"
#. module: anonymization
#: view:ir.model.fields.anonymization.history:0
diff --git a/addons/audittrail/i18n/zh_CN.po b/addons/audittrail/i18n/zh_CN.po
index 79468fdf936..344c8a6bdd9 100644
--- a/addons/audittrail/i18n/zh_CN.po
+++ b/addons/audittrail/i18n/zh_CN.po
@@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-01-26 05:10+0000\n"
-"Last-Translator: Wei \"oldrev\" Li \n"
+"PO-Revision-Date: 2012-11-28 06:31+0000\n"
+"Last-Translator: ccdos \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:14+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
#. module: audittrail
#: view:audittrail.log:0
@@ -44,7 +44,7 @@ msgstr "已订阅"
#: code:addons/audittrail/audittrail.py:408
#, python-format
msgid "'%s' Model does not exist..."
-msgstr ""
+msgstr "'%s' 模型不存在..."
#. module: audittrail
#: view:audittrail.rule:0
@@ -61,7 +61,7 @@ msgstr "审计跟踪规则"
#: view:audittrail.rule:0
#: field:audittrail.rule,state:0
msgid "Status"
-msgstr ""
+msgstr "状态"
#. module: audittrail
#: view:audittrail.view.log:0
@@ -215,7 +215,7 @@ msgstr "选择您要生成审计日志的对象"
#. module: audittrail
#: model:ir.ui.menu,name:audittrail.menu_audit
msgid "Audit"
-msgstr ""
+msgstr "审核"
#. module: audittrail
#: field:audittrail.rule,log_workflow:0
@@ -294,7 +294,7 @@ msgstr "记录删除操作"
#: view:audittrail.log:0
#: view:audittrail.rule:0
msgid "Model"
-msgstr ""
+msgstr "模型"
#. module: audittrail
#: field:audittrail.log.line,field_description:0
@@ -335,7 +335,7 @@ msgstr "新值"
#: code:addons/audittrail/audittrail.py:223
#, python-format
msgid "'%s' field does not exist in '%s' model"
-msgstr ""
+msgstr "字段 '%s' 不存在于模型 '%s'"
#. module: audittrail
#: view:audittrail.log:0
@@ -387,7 +387,7 @@ msgstr "日志明细"
#. module: audittrail
#: view:audittrail.view.log:0
msgid "or"
-msgstr ""
+msgstr "or"
#. module: audittrail
#: field:audittrail.rule,log_action:0
diff --git a/addons/auth_anonymous/i18n/it.po b/addons/auth_anonymous/i18n/it.po
new file mode 100644
index 00000000000..519b3bd8318
--- /dev/null
+++ b/addons/auth_anonymous/i18n/it.po
@@ -0,0 +1,30 @@
+# 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-11-24 02:52+0000\n"
+"PO-Revision-Date: 2012-11-30 00:10+0000\n"
+"Last-Translator: Sergio Corato \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: 2012-11-30 05:08+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
+
+#. module: auth_anonymous
+#. openerp-web
+#: code:addons/auth_anonymous/static/src/xml/auth_anonymous.xml:9
+#, python-format
+msgid "Login"
+msgstr "Login"
+
+#. module: auth_anonymous
+#: model:res.groups,name:auth_anonymous.group_anonymous
+msgid "Anonymous Group"
+msgstr "Gruppo Anonimo"
diff --git a/addons/auth_anonymous/i18n/nl.po b/addons/auth_anonymous/i18n/nl.po
new file mode 100644
index 00000000000..41d1a276d56
--- /dev/null
+++ b/addons/auth_anonymous/i18n/nl.po
@@ -0,0 +1,30 @@
+# 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-11-24 02:52+0000\n"
+"PO-Revision-Date: 2012-11-29 15:11+0000\n"
+"Last-Translator: Erwin van der Ploeg (Endian Solutions) \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-11-30 05:08+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
+
+#. module: auth_anonymous
+#. openerp-web
+#: code:addons/auth_anonymous/static/src/xml/auth_anonymous.xml:9
+#, python-format
+msgid "Login"
+msgstr "Inloggen"
+
+#. module: auth_anonymous
+#: model:res.groups,name:auth_anonymous.group_anonymous
+msgid "Anonymous Group"
+msgstr "Anonieme groep"
diff --git a/addons/auth_anonymous/i18n/nl_BE.po b/addons/auth_anonymous/i18n/nl_BE.po
new file mode 100644
index 00000000000..52400d66436
--- /dev/null
+++ b/addons/auth_anonymous/i18n/nl_BE.po
@@ -0,0 +1,30 @@
+# Dutch (Belgium) 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-11-24 02:52+0000\n"
+"PO-Revision-Date: 2012-11-27 13:37+0000\n"
+"Last-Translator: Els Van Vossel (Agaplan) \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: 2012-11-28 04:41+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
+
+#. module: auth_anonymous
+#. openerp-web
+#: code:addons/auth_anonymous/static/src/xml/auth_anonymous.xml:9
+#, python-format
+msgid "Login"
+msgstr "Aanmelden"
+
+#. module: auth_anonymous
+#: model:res.groups,name:auth_anonymous.group_anonymous
+msgid "Anonymous Group"
+msgstr "Anonieme groep"
diff --git a/addons/auth_anonymous/i18n/zh_CN.po b/addons/auth_anonymous/i18n/zh_CN.po
new file mode 100644
index 00000000000..95afb2638c6
--- /dev/null
+++ b/addons/auth_anonymous/i18n/zh_CN.po
@@ -0,0 +1,30 @@
+# 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-11-24 02:52+0000\n"
+"PO-Revision-Date: 2012-11-27 16:43+0000\n"
+"Last-Translator: ccdos \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-11-28 04:41+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
+
+#. module: auth_anonymous
+#. openerp-web
+#: code:addons/auth_anonymous/static/src/xml/auth_anonymous.xml:9
+#, python-format
+msgid "Login"
+msgstr "登录"
+
+#. module: auth_anonymous
+#: model:res.groups,name:auth_anonymous.group_anonymous
+msgid "Anonymous Group"
+msgstr "匿名组"
diff --git a/addons/auth_ldap/i18n/fr.po b/addons/auth_ldap/i18n/fr.po
index 82d40b4e9ef..058c315780a 100644
--- a/addons/auth_ldap/i18n/fr.po
+++ b/addons/auth_ldap/i18n/fr.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2011-01-13 12:55+0000\n"
-"Last-Translator: Quentin THEURET \n"
+"PO-Revision-Date: 2012-11-29 17:08+0000\n"
+"Last-Translator: Christophe Chauvet - http://www.syleam.fr/ \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-11-25 06:30+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-30 05:08+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
#. module: auth_ldap
#: constraint:res.company:0
@@ -32,7 +32,7 @@ msgstr ""
#. module: auth_ldap
#: field:res.company.ldap,user:0
msgid "Template User"
-msgstr ""
+msgstr "Utilisateur modèle"
#. module: auth_ldap
#: help:res.company.ldap,ldap_tls:0
@@ -77,6 +77,8 @@ msgid ""
"Automatically create local user accounts for new users authenticating via "
"LDAP"
msgstr ""
+"Création automatique des comptes utilisateur locaux pour les nouveaux "
+"utilisateurs authentifiés par LDAP."
#. module: auth_ldap
#: field:res.company.ldap,ldap_base:0
@@ -101,7 +103,7 @@ msgstr "Mot de passe LDAP"
#. module: auth_ldap
#: sql_constraint:res.users:0
msgid "OAuth UID must be unique per provider"
-msgstr ""
+msgstr "l'UID OAuth doit être unique par fournisseur"
#. module: auth_ldap
#: model:ir.model,name:auth_ldap.model_res_company
@@ -121,7 +123,7 @@ msgstr "res.company.ldap"
#. module: auth_ldap
#: help:res.company.ldap,user:0
msgid "User to copy when creating new users"
-msgstr ""
+msgstr "Utilisateur à copier lors de la création des nouveaux utilisateurs"
#. module: auth_ldap
#: field:res.company.ldap,ldap_tls:0
@@ -171,12 +173,12 @@ msgstr ""
#. module: auth_ldap
#: constraint:res.users:0
msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "Erreur : Code EAN non valide"
#. module: auth_ldap
#: model:ir.model,name:auth_ldap.model_res_users
msgid "Users"
-msgstr ""
+msgstr "Utilisateurs"
#. module: auth_ldap
#: help:res.company.ldap,ldap_binddn:0
diff --git a/addons/auth_ldap/i18n/zh_CN.po b/addons/auth_ldap/i18n/zh_CN.po
index ae4574e298f..3cd6d465fa5 100644
--- a/addons/auth_ldap/i18n/zh_CN.po
+++ b/addons/auth_ldap/i18n/zh_CN.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-02-08 03:35+0000\n"
-"Last-Translator: Wei \"oldrev\" Li \n"
+"PO-Revision-Date: 2012-11-28 07:07+0000\n"
+"Last-Translator: ccdos \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-11-25 06:30+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
#. module: auth_ldap
#: constraint:res.company:0
@@ -30,7 +30,7 @@ msgstr "选择的用户组不在这用允许的用户组"
#. module: auth_ldap
#: field:res.company.ldap,user:0
msgid "Template User"
-msgstr ""
+msgstr "用户模版"
#. module: auth_ldap
#: help:res.company.ldap,ldap_tls:0
@@ -71,7 +71,7 @@ msgstr "LDAP 服务器端口"
msgid ""
"Automatically create local user accounts for new users authenticating via "
"LDAP"
-msgstr ""
+msgstr "通过LDAP，为新用户自动创建本地用户账户。"
#. module: auth_ldap
#: field:res.company.ldap,ldap_base:0
@@ -96,7 +96,7 @@ msgstr "LDAP 密码"
#. module: auth_ldap
#: sql_constraint:res.users:0
msgid "OAuth UID must be unique per provider"
-msgstr ""
+msgstr "OAuth UID必须是每个提供者唯一的"
#. module: auth_ldap
#: model:ir.model,name:auth_ldap.model_res_company
@@ -116,7 +116,7 @@ msgstr "res.company.ldap"
#. module: auth_ldap
#: help:res.company.ldap,user:0
msgid "User to copy when creating new users"
-msgstr ""
+msgstr "当创建新用户时，复制用户"
#. module: auth_ldap
#: field:res.company.ldap,ldap_tls:0
@@ -164,12 +164,12 @@ msgstr "LDAP 服务器上的用户帐号密码，用于查询该目录服务。"
#. module: auth_ldap
#: constraint:res.users:0
msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "错误：无效的(EAN)条码"
#. module: auth_ldap
#: model:ir.model,name:auth_ldap.model_res_users
msgid "Users"
-msgstr ""
+msgstr "用户"
#. module: auth_ldap
#: help:res.company.ldap,ldap_binddn:0
diff --git a/addons/auth_oauth/auth_oauth_data.xml b/addons/auth_oauth/auth_oauth_data.xml
index c07359a062c..983549f9378 100644
--- a/addons/auth_oauth/auth_oauth_data.xml
+++ b/addons/auth_oauth/auth_oauth_data.xml
@@ -1,15 +1,15 @@
-
- OpenERP Accounts
+ OpenERP.com Accountshttps://accounts.openerp.com/oauth2/authuserinfohttps://accounts.openerp.com/oauth2/tokeninfozocial openerp
- Sign in with OpenERP account
+ Log in with OpenERP.com
+ Facebook Graph
@@ -18,7 +18,7 @@
https://graph.facebook.com/me/permissionszocial facebook
- Sign in with facebook
+ Log in with facebookGoogle OAuth2
@@ -27,9 +27,10 @@
https://www.googleapis.com/oauth2/v1/tokeninfohttps://www.googleapis.com/oauth2/v1/userinfozocial google
- Sign in with google
+ Log in with google
-
-
+
+ -->
diff --git a/addons/auth_oauth/i18n/zh_CN.po b/addons/auth_oauth/i18n/zh_CN.po
new file mode 100644
index 00000000000..f8c15e694f9
--- /dev/null
+++ b/addons/auth_oauth/i18n/zh_CN.po
@@ -0,0 +1,150 @@
+# 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-11-24 02:52+0000\n"
+"PO-Revision-Date: 2012-11-28 14:27+0000\n"
+"Last-Translator: ccdos \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-11-29 05:15+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
+
+#. module: auth_oauth
+#: field:auth.oauth.provider,validation_endpoint:0
+msgid "Validation URL"
+msgstr "验证 URL"
+
+#. module: auth_oauth
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr "两个用户不能使用相同的用户名！"
+
+#. module: auth_oauth
+#: field:auth.oauth.provider,auth_endpoint:0
+msgid "Authentication URL"
+msgstr "身份验证URL"
+
+#. module: auth_oauth
+#: model:ir.model,name:auth_oauth.model_base_config_settings
+msgid "base.config.settings"
+msgstr "base.config.settings"
+
+#. module: auth_oauth
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr "选择的公司不属于此用户允许访问的公司。"
+
+#. module: auth_oauth
+#: field:auth.oauth.provider,scope:0
+msgid "Scope"
+msgstr "作用域"
+
+#. module: auth_oauth
+#: field:res.users,oauth_provider_id:0
+msgid "OAuth Provider"
+msgstr "OAuth Provider"
+
+#. module: auth_oauth
+#: field:auth.oauth.provider,css_class:0
+msgid "CSS class"
+msgstr "CSS class"
+
+#. module: auth_oauth
+#: field:auth.oauth.provider,body:0
+msgid "Body"
+msgstr "正文"
+
+#. module: auth_oauth
+#: model:ir.model,name:auth_oauth.model_res_users
+msgid "Users"
+msgstr "用户"
+
+#. module: auth_oauth
+#: field:auth.oauth.provider,sequence:0
+msgid "unknown"
+msgstr "未知"
+
+#. module: auth_oauth
+#: field:res.users,oauth_access_token:0
+msgid "OAuth Access Token"
+msgstr "OAuth 访问令牌"
+
+#. module: auth_oauth
+#: field:auth.oauth.provider,client_id:0
+#: field:base.config.settings,auth_oauth_facebook_client_id:0
+#: field:base.config.settings,auth_oauth_google_client_id:0
+msgid "Client ID"
+msgstr "Client ID"
+
+#. module: auth_oauth
+#: model:ir.ui.menu,name:auth_oauth.menu_oauth_providers
+msgid "OAuth Providers"
+msgstr "OAuth Providers"
+
+#. module: auth_oauth
+#: model:ir.model,name:auth_oauth.model_auth_oauth_provider
+msgid "OAuth2 provider"
+msgstr "OAuth2 provider"
+
+#. module: auth_oauth
+#: field:res.users,oauth_uid:0
+msgid "OAuth User ID"
+msgstr "OAuth User ID"
+
+#. module: auth_oauth
+#: field:base.config.settings,auth_oauth_facebook_enabled:0
+msgid "Allow users to sign in with Facebook"
+msgstr "允许用户用Facebook登录"
+
+#. module: auth_oauth
+#: sql_constraint:res.users:0
+msgid "OAuth UID must be unique per provider"
+msgstr "OAuth UID必须是每个提供者（ provider ）唯一的"
+
+#. module: auth_oauth
+#: help:res.users,oauth_uid:0
+msgid "Oauth Provider user_id"
+msgstr "Oauth Provider user_id"
+
+#. module: auth_oauth
+#: field:auth.oauth.provider,data_endpoint:0
+msgid "Data URL"
+msgstr "数据URL"
+
+#. module: auth_oauth
+#: view:auth.oauth.provider:0
+msgid "arch"
+msgstr "arch"
+
+#. module: auth_oauth
+#: field:auth.oauth.provider,name:0
+msgid "Provider name"
+msgstr "Provider 名称"
+
+#. module: auth_oauth
+#: model:ir.actions.act_window,name:auth_oauth.action_oauth_provider
+msgid "Providers"
+msgstr "Providers"
+
+#. module: auth_oauth
+#: field:base.config.settings,auth_oauth_google_enabled:0
+msgid "Allow users to sign in with Google"
+msgstr "允许用户通过google登录"
+
+#. module: auth_oauth
+#: constraint:res.users:0
+msgid "Error: Invalid ean code"
+msgstr "错误：无效的(EAN)条码"
+
+#. module: auth_oauth
+#: field:auth.oauth.provider,enabled:0
+msgid "Allowed"
+msgstr "允许"
diff --git a/addons/auth_oauth/res_users.py b/addons/auth_oauth/res_users.py
index 7e7b3753a4e..b1c7e214f12 100644
--- a/addons/auth_oauth/res_users.py
+++ b/addons/auth_oauth/res_users.py
@@ -45,6 +45,25 @@ class res_users(osv.Model):
validation.update(data)
return validation
+ def _auth_oauth_signin(self, cr, uid, provider, validation, params, context=None):
+ """ retrieve and sign in the user corresponding to provider and validated access token
+ :param provider: oauth provider id (int)
+ :param validation: result of validation of access token (dict)
+ :param params: oauth parameters (dict)
+ :return: user login (str)
+ :raise: openerp.exceptions.AccessDenied if signin failed
+
+ This method can be overridden to add alternative signin methods.
+ """
+ oauth_uid = validation['user_id']
+ user_ids = self.search(cr, uid, [("oauth_uid", "=", oauth_uid), ('oauth_provider_id', '=', provider)])
+ if not user_ids:
+ raise openerp.exceptions.AccessDenied()
+ assert len(user_ids) == 1
+ user = self.browse(cr, uid, user_ids[0], context=context)
+ user.write({'oauth_access_token': params['access_token']})
+ return user.login
+
def auth_oauth(self, cr, uid, provider, params, context=None):
# Advice by Google (to avoid Confused Deputy Problem)
# if validation.audience != OUR_CLIENT_ID:
@@ -53,39 +72,15 @@ class res_users(osv.Model):
# continue with the process
access_token = params.get('access_token')
validation = self._auth_oauth_validate(cr, uid, provider, access_token)
- # required
- oauth_uid = validation['user_id']
- if not oauth_uid:
+ # required check
+ if not validation.get('user_id'):
raise openerp.exceptions.AccessDenied()
- email = validation.get('email', 'provider_%d_user_%d' % (provider, oauth_uid))
- login = email
- # optional
- name = validation.get('name', email)
- res = self.search(cr, uid, [("oauth_uid", "=", oauth_uid), ('oauth_provider_id', '=', provider)])
- if res:
- assert len(res) == 1
- user = self.browse(cr, uid, res[0], context=context)
- login = user.login
- user.write({'oauth_access_token': access_token})
- else:
- # New user if signup module available
- if not hasattr(self, '_signup_create_user'):
- raise openerp.exceptions.AccessDenied()
-
- new_user = {
- 'name': name,
- 'login': login,
- 'user_email': email,
- 'oauth_provider_id': provider,
- 'oauth_uid': oauth_uid,
- 'oauth_access_token': access_token,
- 'active': True,
- }
- # TODO pass signup token to allow attach new user to right partner
- self._signup_create_user(cr, uid, new_user)
-
- credentials = (cr.dbname, login, access_token)
- return credentials
+ # retrieve and sign in user
+ login = self._auth_oauth_signin(cr, uid, provider, validation, params, context=context)
+ if not login:
+ raise openerp.exceptions.AccessDenied()
+ # return user credentials
+ return (cr.dbname, login, access_token)
def check_credentials(self, cr, uid, password):
try:
diff --git a/addons/auth_oauth/static/src/css/auth_oauth.css b/addons/auth_oauth/static/src/css/auth_oauth.css
index ed6130e3123..0489229042a 100644
--- a/addons/auth_oauth/static/src/css/auth_oauth.css
+++ b/addons/auth_oauth/static/src/css/auth_oauth.css
@@ -9,7 +9,6 @@
}
.openerp a.zocial.openerp {
- float: right;
border: 1px solid #222222;
color: white;
margin: 0;
diff --git a/addons/auth_oauth/static/src/js/auth_oauth.js b/addons/auth_oauth/static/src/js/auth_oauth.js
index 2aa66877d42..c24dab3d55a 100644
--- a/addons/auth_oauth/static/src/js/auth_oauth.js
+++ b/addons/auth_oauth/static/src/js/auth_oauth.js
@@ -35,27 +35,33 @@ openerp.auth_oauth = function(instance) {
on_oauth_sign_in: function(ev) {
ev.preventDefault();
var index = $(ev.target).data('index');
- var p = this.oauth_providers[index];
- var ret = _.str.sprintf('%s//%s/auth_oauth/signin', location.protocol, location.host);
+ var provider = this.oauth_providers[index];
+ return this.do_oauth_sign_in(provider);
+ },
+ do_oauth_sign_in: function(provider) {
+ var return_url = _.str.sprintf('%s//%s/auth_oauth/signin', location.protocol, location.host);
if (instance.session.debug) {
- ret += '?debug';
+ return_url += '?debug';
}
- var dbname = self.$("form [name=db]").val();
- var state_object = {
- d: dbname,
- p: p.id
- };
- var state = JSON.stringify(state_object);
+ var state = this._oauth_state(provider);
var params = {
response_type: 'token',
- client_id: p.client_id,
- redirect_uri: ret,
- scope: p.scope,
- state: state,
+ client_id: provider.client_id,
+ redirect_uri: return_url,
+ scope: provider.scope,
+ state: JSON.stringify(state),
};
- var url = p.auth_endpoint + '?' + $.param(params);
+ var url = provider.auth_endpoint + '?' + $.param(params);
window.location = url;
},
+ _oauth_state: function(provider) {
+ // return the state object sent back with the redirected uri
+ var dbname = this.$("form [name=db]").val();
+ return {
+ d: dbname,
+ p: provider.id,
+ };
+ },
});
};
diff --git a/addons/portal_crm/wizard/__init__.py b/addons/auth_oauth_signup/__init__.py
similarity index 79%
rename from addons/portal_crm/wizard/__init__.py
rename to addons/auth_oauth_signup/__init__.py
index 92b3ac62321..bc40c87d118 100644
--- a/addons/portal_crm/wizard/__init__.py
+++ b/addons/auth_oauth_signup/__init__.py
@@ -2,21 +2,21 @@
##############################################################################
#
# OpenERP, Open Source Management Solution
-# Copyright (C) 2004-2011 OpenERP S.A ().
+# Copyright (C) 2012-today OpenERP SA ()
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
+# 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.
+# 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 contact
+import res_users
diff --git a/addons/auth_oauth_signup/__openerp__.py b/addons/auth_oauth_signup/__openerp__.py
new file mode 100644
index 00000000000..1e5767065a4
--- /dev/null
+++ b/addons/auth_oauth_signup/__openerp__.py
@@ -0,0 +1,39 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# OpenERP, Open Source Management Solution
+# Copyright (C) 2010-2012 OpenERP SA ().
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# 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': 'Signup with OAuth2 Authentication',
+ 'version': '1.0',
+ 'category': 'Hidden',
+ 'description': """
+Allow users to sign up through OAuth2 Provider.
+===============================================
+""",
+ 'author': 'OpenERP SA',
+ 'website': 'http://www.openerp.com',
+ 'depends': ['auth_oauth', 'auth_signup'],
+ 'data': [],
+ 'js': ['static/src/js/auth_oauth_signup.js'],
+ 'css': [],
+ 'qweb': [],
+ 'installable': True,
+ 'auto_install': True,
+}
diff --git a/addons/auth_oauth_signup/res_users.py b/addons/auth_oauth_signup/res_users.py
new file mode 100644
index 00000000000..83400f7c008
--- /dev/null
+++ b/addons/auth_oauth_signup/res_users.py
@@ -0,0 +1,55 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# OpenERP, Open Source Management Solution
+# Copyright (C) 2010-2012 OpenERP SA ().
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# 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 logging
+import simplejson
+
+import openerp
+from openerp.osv import osv, fields
+
+_logger = logging.getLogger(__name__)
+
+class res_users(osv.Model):
+ _inherit = 'res.users'
+
+ def _auth_oauth_signin(self, cr, uid, provider, validation, params, context=None):
+ # overridden to use signup method if regular oauth signin fails
+ try:
+ login = super(res_users, self)._auth_oauth_signin(cr, uid, provider, validation, params, context=context)
+
+ except openerp.exceptions.AccessDenied:
+ state = simplejson.loads(params['state'])
+ token = state.get('t')
+ oauth_uid = validation['user_id']
+ email = validation.get('email', 'provider_%d_user_%d' % (provider, oauth_uid))
+ name = validation.get('name', email)
+ values = {
+ 'name': name,
+ 'login': email,
+ 'email': email,
+ 'oauth_provider_id': provider,
+ 'oauth_uid': oauth_uid,
+ 'oauth_access_token': params['access_token'],
+ 'active': True,
+ }
+ _, login, _ = self.signup(cr, uid, values, token, context=context)
+
+ return login
diff --git a/addons/auth_oauth_signup/static/src/js/auth_oauth_signup.js b/addons/auth_oauth_signup/static/src/js/auth_oauth_signup.js
new file mode 100644
index 00000000000..6715943af9b
--- /dev/null
+++ b/addons/auth_oauth_signup/static/src/js/auth_oauth_signup.js
@@ -0,0 +1,14 @@
+openerp.auth_oauth_signup = function(instance) {
+
+ // override Login._oauth_state to add the signup token in the state
+ instance.web.Login.include({
+ _oauth_state: function(provider) {
+ var state = this._super.apply(this, arguments);
+ if (this.params.token) {
+ state.t = this.params.token;
+ }
+ return state;
+ },
+ });
+
+};
diff --git a/addons/auth_openid/i18n/tr.po b/addons/auth_openid/i18n/tr.po
index 819e2c90be6..4388e70ee46 100644
--- a/addons/auth_openid/i18n/tr.po
+++ b/addons/auth_openid/i18n/tr.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-02-09 22:49+0000\n"
+"PO-Revision-Date: 2012-11-27 22: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: 2012-11-25 06:32+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
#. module: auth_openid
#. openerp-web
@@ -69,7 +69,7 @@ msgstr ""
#. module: auth_openid
#: sql_constraint:res.users:0
msgid "OAuth UID must be unique per provider"
-msgstr ""
+msgstr "OAuth UID her sağlayıcı için tekil olmalı"
#. module: auth_openid
#: field:res.users,openid_key:0
@@ -79,7 +79,7 @@ msgstr "OpenID Anahtarı"
#. module: auth_openid
#: constraint:res.users:0
msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "Hata: Geçersiz EAN barkodu"
#. module: auth_openid
#: constraint:res.users:0
@@ -94,7 +94,7 @@ msgstr "OpenID E-posta"
#. module: auth_openid
#: model:ir.model,name:auth_openid.model_res_users
msgid "Users"
-msgstr ""
+msgstr "Kullanıcılar"
#. module: auth_openid
#. openerp-web
diff --git a/addons/auth_reset_password/i18n/it.po b/addons/auth_reset_password/i18n/it.po
new file mode 100644
index 00000000000..c330056fe66
--- /dev/null
+++ b/addons/auth_reset_password/i18n/it.po
@@ -0,0 +1,74 @@
+# 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-11-24 02:52+0000\n"
+"PO-Revision-Date: 2012-11-28 19:58+0000\n"
+"Last-Translator: Davide Corio - agilebg.com \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: 2012-11-29 05:15+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
+
+#. module: auth_reset_password
+#: model:email.template,body_html:auth_reset_password.reset_password_email
+msgid ""
+"\n"
+"
A password reset was requested for the OpenERP account linked to this "
+"email.
Note: If you did not ask for a password reset, you can safely ignore this "
+"email.
"
+msgstr ""
+
+#. module: auth_reset_password
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr "Non è possibile avere due utenti con lo stesso login!"
+
+#. module: auth_reset_password
+#: model:ir.model,name:auth_reset_password.model_res_users
+msgid "Users"
+msgstr "Utenti"
+
+#. module: auth_reset_password
+#: sql_constraint:res.users:0
+msgid "OAuth UID must be unique per provider"
+msgstr "il UID OAuth deve essere unico per provider"
+
+#. module: auth_reset_password
+#: view:res.users:0
+msgid "Reset Password"
+msgstr "Reimposta Password"
+
+#. module: auth_reset_password
+#: model:email.template,subject:auth_reset_password.reset_password_email
+msgid "Password reset"
+msgstr "Ripristino password"
+
+#. module: auth_reset_password
+#: constraint:res.users:0
+msgid "Error: Invalid ean code"
+msgstr "Errore: codice EAN non valido"
+
+#. module: auth_reset_password
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr "L'azienda scelta non è fra le aziende abilitate per questo utente"
+
+#. module: auth_reset_password
+#. openerp-web
+#: code:addons/auth_reset_password/static/src/xml/reset_password.xml:7
+#, python-format
+msgid "Reset password"
+msgstr "Reimposta password"
diff --git a/addons/auth_reset_password/i18n/nl.po b/addons/auth_reset_password/i18n/nl.po
new file mode 100644
index 00000000000..501b9abae97
--- /dev/null
+++ b/addons/auth_reset_password/i18n/nl.po
@@ -0,0 +1,74 @@
+# 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-11-24 02:52+0000\n"
+"PO-Revision-Date: 2012-11-29 15:12+0000\n"
+"Last-Translator: Erwin van der Ploeg (Endian Solutions) \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-11-30 05:08+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
+
+#. module: auth_reset_password
+#: model:email.template,body_html:auth_reset_password.reset_password_email
+msgid ""
+"\n"
+"
A password reset was requested for the OpenERP account linked to this "
+"email.
diff --git a/addons/base_action_rule/i18n/zh_CN.po b/addons/base_action_rule/i18n/zh_CN.po
index 3d3f67ffb75..a50f39dcf0d 100644
--- a/addons/base_action_rule/i18n/zh_CN.po
+++ b/addons/base_action_rule/i18n/zh_CN.po
@@ -8,26 +8,26 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-10-25 16:32+0000\n"
+"PO-Revision-Date: 2012-11-30 04:40+0000\n"
"Last-Translator: ccdos \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-11-25 06:28+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-30 05:08+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
#. module: base_action_rule
#: field:base.action.rule,act_followers:0
msgid "Set Followers"
-msgstr ""
+msgstr "设置关注者"
#. module: base_action_rule
#: view:base.action.rule:0
msgid ""
"The rule uses the AND operator. The model must match all non-empty fields so "
"that the rule executes the action described in the 'Actions' tab."
-msgstr ""
+msgstr "这条规则用了AND 操作符。这个模型必须匹配所有非空字段，这样这条规则执行在“动作”便签里说明的动作"
#. module: base_action_rule
#: model:ir.model,name:base_action_rule.model_base_action_rule
@@ -42,7 +42,7 @@ msgstr "负责人"
#. module: base_action_rule
#: model:ir.model,name:base_action_rule.model_ir_actions_server
msgid "ir.actions.server"
-msgstr ""
+msgstr "ir.actions.server"
#. module: base_action_rule
#: view:base.action.rule:0
@@ -71,7 +71,7 @@ msgstr "触发日期后的延迟"
msgid ""
"If the active field is set to False, it will allow you to hide the rule "
"without removing it."
-msgstr "如果有效不勾选，你可以不需删除这个规则而隐藏它"
+msgstr "如果有效字段不选择，你可以隐藏它而无需删除。"
#. module: base_action_rule
#: view:base.action.rule:0
@@ -125,6 +125,8 @@ msgid ""
"Define Server actions.\n"
"eg:Email Reminders, Call Object Service, etc.."
msgstr ""
+"定义服务器动作。\n"
+"例如：Emaik 提醒，调用Object Service，等"
#. module: base_action_rule
#: help:base.action.rule,trg_date_range:0
diff --git a/addons/base_calendar/crm_meeting_view.xml b/addons/base_calendar/crm_meeting_view.xml
index 8590bcb8b49..84c03d68dbd 100644
--- a/addons/base_calendar/crm_meeting_view.xml
+++ b/addons/base_calendar/crm_meeting_view.xml
@@ -5,7 +5,7 @@
- Mark read
+ CRM Meeting: Mark readTrueir.actions.server
@@ -23,7 +23,7 @@
- Mark unread
+ CRM Meeting: Mark unreadTrueir.actions.server
diff --git a/addons/base_calendar/i18n/zh_CN.po b/addons/base_calendar/i18n/zh_CN.po
index 4fb5c3afbca..8d5d3f545f1 100644
--- a/addons/base_calendar/i18n/zh_CN.po
+++ b/addons/base_calendar/i18n/zh_CN.po
@@ -8,25 +8,25 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-05-10 17:39+0000\n"
-"Last-Translator: 开阖软件 Jeff Wang \n"
+"PO-Revision-Date: 2012-11-28 16:50+0000\n"
+"Last-Translator: Joshua Jan(SHINEIT) \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-11-25 06:27+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
#. module: base_calendar
#: selection:calendar.alarm,trigger_related:0
#: selection:res.alarm,trigger_related:0
msgid "The event starts"
-msgstr "事件开始时"
+msgstr "活动开始"
#. module: base_calendar
#: view:calendar.event:0
msgid "My Events"
-msgstr "我的事件"
+msgstr "我的活动"
#. module: base_calendar
#: help:calendar.event,exdate:0
@@ -40,14 +40,14 @@ msgstr "这属性定义循环日程的日期/时间异常列表。"
#. module: base_calendar
#: constraint:res.users:0
msgid "The chosen company is not in the allowed companies for this user"
-msgstr "用户无权操作所选择公司数据"
+msgstr "选择的公司不属于此用户允许访问的公司。"
#. module: base_calendar
#: field:calendar.event,we:0
#: field:calendar.todo,we:0
#: field:crm.meeting,we:0
msgid "Wed"
-msgstr "周三"
+msgstr "星期三"
#. module: base_calendar
#: selection:calendar.attendee,cutype:0
@@ -64,13 +64,13 @@ msgstr "定期会议"
#. module: base_calendar
#: model:crm.meeting.type,name:base_calendar.categ_meet5
msgid "Feedback Meeting"
-msgstr ""
+msgstr "会议反馈"
#. module: base_calendar
#: code:addons/base_calendar/crm_meeting.py:117
#, python-format
msgid "Meeting completed."
-msgstr ""
+msgstr "会议完成."
#. module: base_calendar
#: model:ir.actions.act_window,name:base_calendar.action_res_alarm_view
@@ -83,7 +83,7 @@ msgstr "提醒"
#: selection:calendar.todo,week_list:0
#: selection:crm.meeting,week_list:0
msgid "Sunday"
-msgstr "周日"
+msgstr "星期天"
#. module: base_calendar
#: field:calendar.attendee,role:0
@@ -147,14 +147,14 @@ msgstr "指定类型的邀请"
#: view:crm.meeting:0
#: field:crm.meeting,message_unread:0
msgid "Unread Messages"
-msgstr ""
+msgstr "未读信息"
#. module: base_calendar
#: selection:calendar.event,week_list:0
#: selection:calendar.todo,week_list:0
#: selection:crm.meeting,week_list:0
msgid "Friday"
-msgstr "周五"
+msgstr "星期五"
#. module: base_calendar
#: field:calendar.event,allday:0
@@ -182,12 +182,12 @@ msgstr "空闲"
#. module: base_calendar
#: help:crm.meeting,message_unread:0
msgid "If checked new messages require your attention."
-msgstr ""
+msgstr "如果要求你关注新消息，勾选此项"
#. module: base_calendar
#: help:calendar.attendee,rsvp:0
msgid "Indicats whether the favor of a reply is requested"
-msgstr "标明是否要求答复赞成"
+msgstr "标明是否要求答复"
#. module: base_calendar
#: field:calendar.alarm,alarm_id:0
@@ -209,7 +209,7 @@ msgstr "事件"
#: field:calendar.todo,tu:0
#: field:crm.meeting,tu:0
msgid "Tue"
-msgstr "周二"
+msgstr "星期二"
#. module: base_calendar
#: selection:calendar.event,byday:0
@@ -222,7 +222,7 @@ msgstr "第三个"
#: selection:calendar.alarm,trigger_related:0
#: selection:res.alarm,trigger_related:0
msgid "The event ends"
-msgstr "这事件结束时"
+msgstr "这活动结束时"
#. module: base_calendar
#: selection:calendar.event,byday:0
@@ -234,12 +234,12 @@ msgstr "最近"
#. module: base_calendar
#: help:crm.meeting,message_ids:0
msgid "Messages and communication history"
-msgstr ""
+msgstr "消息和通信历史"
#. module: base_calendar
#: field:crm.meeting,message_ids:0
msgid "Messages"
-msgstr ""
+msgstr "消息"
#. module: base_calendar
#: selection:calendar.alarm,trigger_interval:0
@@ -266,7 +266,7 @@ msgstr "主席"
#. module: base_calendar
#: view:crm.meeting:0
msgid "My Meetings"
-msgstr ""
+msgstr "我的会议"
#. module: base_calendar
#: selection:calendar.alarm,action:0
@@ -303,12 +303,12 @@ msgstr ""
#. module: base_calendar
#: field:crm.meeting,name:0
msgid "Meeting Subject"
-msgstr ""
+msgstr "会议主题"
#. module: base_calendar
#: view:calendar.event:0
msgid "End of Recurrence"
-msgstr ""
+msgstr "循环结束"
#. module: base_calendar
#: view:calendar.event:0
@@ -329,7 +329,7 @@ msgstr "选择重复会议的日子"
#: view:crm.meeting:0
#: model:ir.actions.act_window,name:base_calendar.action_crm_meeting
msgid "Meetings"
-msgstr ""
+msgstr "会议"
#. module: base_calendar
#: field:calendar.event,recurrent_id:0
@@ -342,19 +342,19 @@ msgstr "循环日期"
#: field:calendar.alarm,event_end_date:0
#: field:calendar.attendee,event_end_date:0
msgid "Event End Date"
-msgstr "事件结束日期"
+msgstr "活动结束日期"
#. module: base_calendar
#: selection:calendar.attendee,role:0
msgid "Optional Participation"
-msgstr "可参与"
+msgstr "可选择参与"
#. module: base_calendar
#: help:crm.meeting,message_summary:0
msgid ""
"Holds the Chatter summary (number of messages, ...). This summary is "
"directly in html format in order to be inserted in kanban views."
-msgstr ""
+msgstr "保存复杂的摘要(消息数量,……等)。为了插入到看板视图，这一摘要直接是是HTML格式。"
#. module: base_calendar
#: code:addons/base_calendar/base_calendar.py:388
diff --git a/addons/base_crypt/i18n/it.po b/addons/base_crypt/i18n/it.po
index 1425a8c7924..e82a13db711 100644
--- a/addons/base_crypt/i18n/it.po
+++ b/addons/base_crypt/i18n/it.po
@@ -8,19 +8,19 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2011-02-15 15:37+0000\n"
-"Last-Translator: FULL NAME \n"
+"PO-Revision-Date: 2012-11-28 19:47+0000\n"
+"Last-Translator: Davide Corio - agilebg.com \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: 2012-11-25 06:31+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
#. module: base_crypt
#: constraint:res.users:0
msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "Errore: codice EAN non valido"
#. module: base_crypt
#: constraint:res.users:0
@@ -30,12 +30,12 @@ msgstr "L'azienda scelta non è fra le aziende abilitate per questo utente"
#. module: base_crypt
#: model:ir.model,name:base_crypt.model_res_users
msgid "Users"
-msgstr ""
+msgstr "Utenti"
#. module: base_crypt
#: sql_constraint:res.users:0
msgid "OAuth UID must be unique per provider"
-msgstr ""
+msgstr "il UID OAuth deve essere unico per provider"
#. module: base_crypt
#: sql_constraint:res.users:0
diff --git a/addons/base_crypt/i18n/tr.po b/addons/base_crypt/i18n/tr.po
index 6a0590cfbbe..24ea4a9da7c 100644
--- a/addons/base_crypt/i18n/tr.po
+++ b/addons/base_crypt/i18n/tr.po
@@ -8,19 +8,19 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2011-02-15 15:37+0000\n"
-"Last-Translator: FULL NAME \n"
+"PO-Revision-Date: 2012-11-27 21:53+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-11-25 06:31+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
#. module: base_crypt
#: constraint:res.users:0
msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "Hata: Geçersiz EAN barkodu"
#. module: base_crypt
#: constraint:res.users:0
@@ -30,12 +30,12 @@ msgstr "Seçilen firma bu kullanıcı için izin verilen firmalar arasında yok"
#. module: base_crypt
#: model:ir.model,name:base_crypt.model_res_users
msgid "Users"
-msgstr ""
+msgstr "Kullanıcılar"
#. module: base_crypt
#: sql_constraint:res.users:0
msgid "OAuth UID must be unique per provider"
-msgstr ""
+msgstr "OAuth UID her sağlayıcı için tekil olmalı"
#. module: base_crypt
#: sql_constraint:res.users:0
diff --git a/addons/base_crypt/i18n/zh_CN.po b/addons/base_crypt/i18n/zh_CN.po
index 200f04f2971..25cb55361b9 100644
--- a/addons/base_crypt/i18n/zh_CN.po
+++ b/addons/base_crypt/i18n/zh_CN.po
@@ -8,19 +8,19 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2011-06-22 08:19+0000\n"
-"Last-Translator: FULL NAME \n"
+"PO-Revision-Date: 2012-11-28 06:30+0000\n"
+"Last-Translator: mrshelly \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-11-25 06:31+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
#. module: base_crypt
#: constraint:res.users:0
msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "错误：无效的(EAN)条码"
#. module: base_crypt
#: constraint:res.users:0
@@ -30,17 +30,17 @@ msgstr "用户无权操作所选择公司数据"
#. module: base_crypt
#: model:ir.model,name:base_crypt.model_res_users
msgid "Users"
-msgstr ""
+msgstr "用户"
#. module: base_crypt
#: sql_constraint:res.users:0
msgid "OAuth UID must be unique per provider"
-msgstr ""
+msgstr "OAuth UID必须是每个提供者唯一的"
#. module: base_crypt
#: sql_constraint:res.users:0
msgid "You can not have two users with the same login !"
-msgstr "你不能同时登录两个用户！"
+msgstr "两个用户不能使用相同的用户名！"
#, python-format
#~ msgid "Error"
diff --git a/addons/base_import/controllers.py b/addons/base_import/controllers.py
index c831ffd229d..b926c6b2782 100644
--- a/addons/base_import/controllers.py
+++ b/addons/base_import/controllers.py
@@ -14,7 +14,7 @@ class ImportController(openerp.addons.web.http.Controller):
'file': file.read(),
'file_name': file.filename,
'file_type': file.content_type,
- }, req.session.eval_context(req.context))
+ }, req.context)
return 'window.top.%s(%s)' % (
jsonp, simplejson.dumps({'result': written}))
diff --git a/addons/base_import/i18n/fr.po b/addons/base_import/i18n/fr.po
new file mode 100644
index 00000000000..520af932a87
--- /dev/null
+++ b/addons/base_import/i18n/fr.po
@@ -0,0 +1,1164 @@
+# 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-11-24 02:52+0000\n"
+"PO-Revision-Date: 2012-11-29 15:28+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-11-30 05:08+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import.js:420
+#, python-format
+msgid "Get all possible values"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:71
+#, python-format
+msgid "Need to import data from an other application?"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:163
+#, python-format
+msgid ""
+"When you use External IDs, you can import CSV files \n"
+" with the \"External ID\" column to define the "
+"External \n"
+" ID of each record you import. Then, you will be able "
+"\n"
+" to make a reference to that record with columns like "
+"\n"
+" \"Field/External ID\". The following two CSV files "
+"give \n"
+" you an example for Products and their Categories."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:271
+#, python-format
+msgid ""
+"How to export/import different tables from an SQL \n"
+" application to OpenERP?"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import.js:310
+#, python-format
+msgid "Relation Fields"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:142
+#, python-format
+msgid ""
+"Country/Database ID: the unique OpenERP ID for a \n"
+" record, defined by the ID postgresql column"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:155
+#, python-format
+msgid ""
+"Use \n"
+" Country/Database ID: You should rarely use this \n"
+" notation. It's mostly used by developers as it's "
+"main \n"
+" advantage is to never have conflicts (you may have \n"
+" several records with the same name, but they always "
+"\n"
+" have a unique Database ID)"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:146
+#, python-format
+msgid ""
+"For the country \n"
+" Belgium, you can use one of these 3 ways to import:"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:303
+#, python-format
+msgid "company_1,Bigees,True"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_m2o
+msgid "base_import.tests.models.m2o"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:297
+#, python-format
+msgid ""
+"copy \n"
+" (select 'company_'||id as \"External "
+"ID\",company_name \n"
+" as \"Name\",'True' as \"Is a Company\" from "
+"companies) TO \n"
+" '/tmp/company.csv' with CSV HEADER;"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:206
+#, python-format
+msgid "CSV file for Manufacturer, Retailer"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:160
+#, python-format
+msgid ""
+"Use \n"
+" Country/External ID: Use External ID when you import "
+"\n"
+" data from a third party application."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:316
+#, python-format
+msgid "person_1,Fabien,False,company_1"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:80
+#, python-format
+msgid "XXX/External ID"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:351
+#, python-format
+msgid "Don't Import"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:24
+#, python-format
+msgid "Select the"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:100
+#, python-format
+msgid ""
+"Note that if your CSV file \n"
+" has a tabulation as separator, OpenERP will not \n"
+" detect the separations. You will need to change the "
+"\n"
+" file format options in your spreadsheet application. "
+"\n"
+" See the following question."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:141
+#, python-format
+msgid "Country: the name or code of the country"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_o2m_child
+msgid "base_import.tests.models.o2m.child"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:239
+#, python-format
+msgid "Can I import several times the same record?"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:15
+#, python-format
+msgid "Validate"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:55
+#, python-format
+msgid "Map your data to OpenERP"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:153
+#, python-format
+msgid ""
+"Use Country: This is \n"
+" the easiest way when your data come from CSV files \n"
+" that have been created manually."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:127
+#, python-format
+msgid ""
+"What's the difference between Database ID and \n"
+" External ID?"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:138
+#, python-format
+msgid ""
+"For example, to \n"
+" reference the country of a contact, OpenERP proposes "
+"\n"
+" you 3 different fields to import:"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:175
+#, python-format
+msgid "What can I do if I have multiple matches for a field?"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:302
+#, python-format
+msgid "External ID,Name,Is a Company"
+msgstr ""
+
+#. module: base_import
+#: field:base_import.tests.models.preview,somevalue:0
+msgid "Some Value"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:231
+#, python-format
+msgid ""
+"The following CSV file shows how to import \n"
+" suppliers and their respective contacts"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:109
+#, python-format
+msgid ""
+"How can I change the CSV file format options when \n"
+" saving in my spreadsheet application?"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:320
+#, python-format
+msgid ""
+"As you can see in this file, Fabien and Laurence \n"
+" are working for the Bigees company (company_1) and \n"
+" Eric is working for the Organi company. The relation "
+"\n"
+" between persons and companies is done using the \n"
+" External ID of the companies. We had to prefix the \n"
+" \"External ID\" by the name of the table to avoid a "
+"\n"
+" conflict of ID between persons and companies "
+"(person_1 \n"
+" and company_1 who shared the same ID 1 in the "
+"orignial \n"
+" database)."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:308
+#, python-format
+msgid ""
+"copy (select \n"
+" 'person_'||id as \"External ID\",person_name as \n"
+" \"Name\",'False' as \"Is a "
+"Company\",'company_'||company_id\n"
+" as \"Related Company/External ID\" from persons) TO "
+"\n"
+" '/tmp/person.csv' with CSV"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:148
+#, python-format
+msgid "Country: Belgium"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_char_stillreadonly
+msgid "base_import.tests.models.char.stillreadonly"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:314
+#, python-format
+msgid ""
+"External ID,Name,Is a \n"
+" Company,Related Company/External ID"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:233
+#, python-format
+msgid "Suppliers and their respective contacts"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:179
+#, python-format
+msgid ""
+"If for example you have two product categories \n"
+" with the child name \"Sellable\" (ie. \"Misc. \n"
+" Products/Sellable\" & \"Other Products/Sellable\"),\n"
+" your validation is halted but you may still import \n"
+" your data. However, we recommend you do not import "
+"the \n"
+" data because they will all be linked to the first \n"
+" 'Sellable' category found in the Product Category "
+"list \n"
+" (\"Misc. Products/Sellable\"). We recommend you "
+"modify \n"
+" one of the duplicates' values or your product "
+"category \n"
+" hierarchy."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:306
+#, python-format
+msgid ""
+"To create the CSV file for persons, linked to \n"
+" companies, we will use the following SQL command in "
+"\n"
+" PSQL:"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:119
+#, python-format
+msgid ""
+"Microsoft Excel will allow \n"
+" you to modify only the encoding when saving \n"
+" (in 'Save As' dialog box > click 'Tools' dropdown \n"
+" list > Encoding tab)."
+msgstr ""
+
+#. module: base_import
+#: field:base_import.tests.models.preview,othervalue:0
+msgid "Other Variable"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:82
+#, python-format
+msgid ""
+"will also be used to update the original\n"
+" import if you need to re-import modified data\n"
+" later, it's thus good practice to specify it\n"
+" whenever possible"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:26
+#, python-format
+msgid ""
+"file to import. If you need a sample importable file, you\n"
+" can use the export tool to generate one."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:148
+#, python-format
+msgid ""
+"Country/Database \n"
+" ID: 21"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_char
+msgid "base_import.tests.models.char"
+msgstr ""
+
+#. module: base_import
+#: help:base_import.import,file:0
+msgid "File to check and/or import, raw binary (not base64)"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:230
+#, python-format
+msgid "Purchase orders with their respective purchase order lines"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:60
+#, python-format
+msgid ""
+"If the file contains\n"
+" the column names, OpenERP can try auto-detecting the\n"
+" field corresponding to the column. This makes imports\n"
+" simpler especially when the file has many columns."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:26
+#, python-format
+msgid ".CSV"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:360
+#, python-format
+msgid ""
+". The issue is\n"
+" usually an incorrect file encoding."
+msgstr ""
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_m2o_required
+msgid "base_import.tests.models.m2o.required"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:212
+#, python-format
+msgid ""
+"How can I import a one2many relationship (e.g. several \n"
+" Order Lines of a Sale Order)?"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_char_noreadonly
+msgid "base_import.tests.models.char.noreadonly"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:113
+#, python-format
+msgid ""
+"If you edit and save CSV files in speadsheet \n"
+" applications, your computer's regional settings will "
+"\n"
+" be applied for the separator and delimiter. \n"
+" We suggest you use OpenOffice or LibreOffice Calc \n"
+" as they will allow you to modify all three options \n"
+" (in 'Save As' dialog box > Check the box 'Edit "
+"filter \n"
+" settings' > Save)."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:30
+#, python-format
+msgid "CSV File:"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_preview
+msgid "base_import.tests.models.preview"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_char_required
+msgid "base_import.tests.models.char.required"
+msgstr ""
+
+#. module: base_import
+#: code:addons/base_import/models.py:112
+#, python-format
+msgid "Database ID"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:313
+#, python-format
+msgid "It will produce the following CSV file:"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:362
+#, python-format
+msgid "Here is the start of the file we could not import:"
+msgstr ""
+
+#. module: base_import
+#: field:base_import.import,file_type:0
+msgid "File Type"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_import
+msgid "base_import.import"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_o2m
+msgid "base_import.tests.models.o2m"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:360
+#, python-format
+msgid "Import preview failed due to:"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:144
+#, python-format
+msgid ""
+"Country/External ID: the ID of this record \n"
+" referenced in another application (or the .XML file "
+"\n"
+" that imported it)"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:35
+#, python-format
+msgid "Reload data to check changes."
+msgstr ""
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_char_readonly
+msgid "base_import.tests.models.char.readonly"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:131
+#, python-format
+msgid ""
+"Some fields define a relationship with another \n"
+" object. For example, the country of a contact is a \n"
+" link to a record of the 'Country' object. When you \n"
+" want to import such fields, OpenERP will have to \n"
+" recreate links between the different records. \n"
+" To help you import such fields, OpenERP provides 3 \n"
+" mechanisms. You must use one and only one mechanism "
+"\n"
+" per field you want to import."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:201
+#, python-format
+msgid ""
+"The tags should be separated by a comma without any \n"
+" spacing. For example, if you want you customer to be "
+"\n"
+" lined to both tags 'Manufacturer' and 'Retailer' \n"
+" then you will encode it as follow \"Manufacturer,\n"
+" Retailer\" in the same column of your CSV file."
+msgstr ""
+
+#. module: base_import
+#: code:addons/base_import/models.py:264
+#, python-format
+msgid "You must configure at least one field to import"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:304
+#, python-format
+msgid "company_2,Organi,True"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:58
+#, python-format
+msgid ""
+"The first row of the\n"
+" file contains the label of the column"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_char_states
+msgid "base_import.tests.models.char.states"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:7
+#, python-format
+msgid "Import a CSV File"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import.js:74
+#, python-format
+msgid "Quoting:"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_m2o_required_related
+msgid "base_import.tests.models.m2o.required.related"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:293
+#, python-format
+msgid ")."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:18
+#: code:addons/base_import/static/src/xml/import.xml:396
+#, python-format
+msgid "Import"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import.js:407
+#, python-format
+msgid "Here are the possible values:"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:82
+#, python-format
+msgid "The"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import.js:227
+#, python-format
+msgid ""
+"A single column was found in the file, this often means the file separator "
+"is incorrect"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:293
+#, python-format
+msgid "dump of such a PostgreSQL database"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:301
+#, python-format
+msgid "This SQL command will create the following CSV file:"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:228
+#, python-format
+msgid ""
+"The following CSV file shows how to import purchase \n"
+" orders with their respective purchase order lines:"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:91
+#, python-format
+msgid ""
+"What can I do when the Import preview table isn't \n"
+" displayed correctly?"
+msgstr ""
+
+#. module: base_import
+#: field:base_import.tests.models.char,value:0
+#: field:base_import.tests.models.char.noreadonly,value:0
+#: field:base_import.tests.models.char.readonly,value:0
+#: field:base_import.tests.models.char.required,value:0
+#: field:base_import.tests.models.char.states,value:0
+#: field:base_import.tests.models.char.stillreadonly,value:0
+#: field:base_import.tests.models.m2o,value:0
+#: field:base_import.tests.models.m2o.related,value:0
+#: field:base_import.tests.models.m2o.required,value:0
+#: field:base_import.tests.models.m2o.required.related,value:0
+#: field:base_import.tests.models.o2m,value:0
+#: field:base_import.tests.models.o2m.child,parent_id:0
+#: field:base_import.tests.models.o2m.child,value:0
+msgid "unknown"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:317
+#, python-format
+msgid "person_2,Laurence,False,company_1"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:149
+#, python-format
+msgid "Country/External ID: base.be"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:288
+#, python-format
+msgid ""
+"As an example, suppose you have a SQL database \n"
+" with two tables you want to import: companies and \n"
+" persons. Each person belong to one company, so you \n"
+" will have to recreate the link between a person and "
+"\n"
+" the company he work for. (If you want to test this \n"
+" example, here is a"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import.js:396
+#, python-format
+msgid "(%d more)"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:227
+#, python-format
+msgid "File for some Quotations"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import.js:72
+#, python-format
+msgid "Encoding:"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:280
+#, python-format
+msgid ""
+"To manage relations between tables, \n"
+" you can use the \"External ID\" facilities of "
+"OpenERP. \n"
+" The \"External ID\" of a record is the unique "
+"identifier \n"
+" of this record in another application. This "
+"\"External \n"
+" ID\" must be unique accoss all the records of all \n"
+" objects, so it's a good practice to prefix this \n"
+" \"External ID\" with the name of the application or "
+"\n"
+" table. (like 'company_1', 'person_1' instead of '1')"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:295
+#, python-format
+msgid ""
+"We will first export all companies and their \n"
+" \"External ID\". In PSQL, write the following "
+"command:"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import.js:373
+#, python-format
+msgid "Everything seems valid."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:188
+#, python-format
+msgid ""
+"However if you do not wish to change your \n"
+" configuration of product categories, we recommend "
+"you \n"
+" use make use of the external ID for this field \n"
+" 'Category'."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import.js:390
+#, python-format
+msgid "at row %d"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:197
+#, python-format
+msgid ""
+"How can I import a many2many relationship field \n"
+" (e.g. a customer that has multiple tags)?"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:80
+#, python-format
+msgid "XXX/ID"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:275
+#, python-format
+msgid ""
+"If you need to import data from different tables, \n"
+" you will have to recreate relations between records "
+"\n"
+" belonging to different tables. (e.g. if you import \n"
+" companies and persons, you will have to recreate the "
+"\n"
+" link between each person and the company they work \n"
+" for)."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:150
+#, python-format
+msgid ""
+"According to your need, you should use \n"
+" one of these 3 ways to reference records in "
+"relations. \n"
+" Here is when you should use one or the other, \n"
+" according to your need:"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:319
+#, python-format
+msgid "person_4,Ramsy,False,company_3"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:261
+#, python-format
+msgid ""
+"If you do not set all fields in your CSV file, \n"
+" OpenERP will assign the default value for every non "
+"\n"
+" defined fields. But if you\n"
+" set fields with empty values in your CSV file, "
+"OpenERP \n"
+" will set the EMPTY value in the field, instead of \n"
+" assigning the default value."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:20
+#, python-format
+msgid "Cancel"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:257
+#, python-format
+msgid ""
+"What happens if I do not provide a value for a \n"
+" specific field?"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:68
+#, python-format
+msgid "Frequently Asked Questions"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:305
+#, python-format
+msgid "company_3,Boum,True"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:249
+#, python-format
+msgid ""
+"This feature \n"
+" allows you to use the Import/Export tool of OpenERP "
+"to \n"
+" modify a batch of records in your favorite "
+"spreadsheet \n"
+" application."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:77
+#, python-format
+msgid ""
+"column in OpenERP. When you\n"
+" import an other record that links to the first\n"
+" one, use"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:242
+#, python-format
+msgid ""
+"If you import a file that contains one of the \n"
+" column \"External ID\" or \"Database ID\", records "
+"that \n"
+" have already been imported will be modified instead "
+"of \n"
+" being created. This is very usefull as it allows you "
+"\n"
+" to import several times the same CSV file while "
+"having \n"
+" made some changes in between two imports. OpenERP "
+"will \n"
+" take care of creating or modifying each record \n"
+" depending if it's new or not."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:169
+#, python-format
+msgid "CSV file for categories"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import.js:309
+#, python-format
+msgid "Normal Fields"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:74
+#, python-format
+msgid ""
+"In order to re-create relationships between\n"
+" different records, you should use the unique\n"
+" identifier from the original application and\n"
+" map it to the"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:170
+#, python-format
+msgid "CSV file for Products"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:216
+#, python-format
+msgid ""
+"If you want to import sales order having several \n"
+" order lines; for each order line, you need to "
+"reserve \n"
+" a specific row in the CSV file. The first order line "
+"\n"
+" will be imported on the same row as the information "
+"\n"
+" relative to order. Any additional lines will need an "
+"\n"
+" addtional row that does not have any information in "
+"\n"
+" the fields relative to the order."
+msgstr ""
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_m2o_related
+msgid "base_import.tests.models.m2o.related"
+msgstr ""
+
+#. module: base_import
+#: field:base_import.tests.models.preview,name:0
+msgid "Name"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:80
+#, python-format
+msgid "to the original unique identifier."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:318
+#, python-format
+msgid "person_3,Eric,False,company_2"
+msgstr ""
+
+#. module: base_import
+#: field:base_import.import,res_model:0
+msgid "Model"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:77
+#: code:addons/base_import/static/src/xml/import.xml:82
+#, python-format
+msgid "ID"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:329
+#, python-format
+msgid ""
+"The two files produced are ready to be imported in \n"
+" OpenERP without any modifications. After having \n"
+" imported these two CSV files, you will have 4 "
+"contacts \n"
+" and 3 companies. (the firsts two contacts are linked "
+"\n"
+" to the first company). You must first import the \n"
+" companies and then the persons."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:95
+#, python-format
+msgid ""
+"By default the Import preview is set on commas as \n"
+" field separators and quotation marks as text \n"
+" delimiters. If your csv file does not have these \n"
+" settings, you can modify the File Format Options \n"
+" (displayed under the Browse CSV file bar after you \n"
+" select your file)."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import.js:73
+#, python-format
+msgid "Separator:"
+msgstr ""
+
+#. module: base_import
+#: field:base_import.import,file_name:0
+msgid "File Name"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/models.py:80
+#: code:addons/base_import/models.py:111
+#: code:addons/base_import/static/src/xml/import.xml:77
+#: code:addons/base_import/static/src/xml/import.xml:82
+#, python-format
+msgid "External ID"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:39
+#, python-format
+msgid "File Format Options…"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import.js:392
+#, python-format
+msgid "between rows %d and %d"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:19
+#, python-format
+msgid "or"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:223
+#, python-format
+msgid ""
+"As an example, here is \n"
+" purchase.order_functional_error_line_cant_adpat.CSV "
+"\n"
+" file of some quotations you can import, based on "
+"demo \n"
+" data."
+msgstr ""
+
+#. module: base_import
+#: field:base_import.import,file:0
+msgid "File"
+msgstr ""
diff --git a/addons/base_report_designer/i18n/it.po b/addons/base_report_designer/i18n/it.po
index 981a8d63301..514223d74e0 100644
--- a/addons/base_report_designer/i18n/it.po
+++ b/addons/base_report_designer/i18n/it.po
@@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-05-10 18:17+0000\n"
-"Last-Translator: Raphael Collet (OpenERP) \n"
+"PO-Revision-Date: 2012-11-28 19:53+0000\n"
+"Last-Translator: Davide Corio - agilebg.com \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:09+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
#. module: base_report_designer
#: model:ir.model,name:base_report_designer.model_base_report_sxw
@@ -180,7 +180,7 @@ msgstr "Annulla"
#. module: base_report_designer
#: view:base.report.sxw:0
msgid "or"
-msgstr ""
+msgstr "o"
#. module: base_report_designer
#: model:ir.model,name:base_report_designer.model_ir_actions_report_xml
diff --git a/addons/base_report_designer/i18n/tr.po b/addons/base_report_designer/i18n/tr.po
index cab3828f12d..143b96d3c0f 100644
--- a/addons/base_report_designer/i18n/tr.po
+++ b/addons/base_report_designer/i18n/tr.po
@@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-05-10 18:06+0000\n"
-"Last-Translator: Raphael Collet (OpenERP) \n"
+"PO-Revision-Date: 2012-11-27 20:20+0000\n"
+"Last-Translator: Ahmet Altınışık \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:09+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
#. module: base_report_designer
#: model:ir.model,name:base_report_designer.model_base_report_sxw
@@ -180,7 +180,7 @@ msgstr "İptal"
#. module: base_report_designer
#: view:base.report.sxw:0
msgid "or"
-msgstr ""
+msgstr "veya"
#. module: base_report_designer
#: model:ir.model,name:base_report_designer.model_ir_actions_report_xml
diff --git a/addons/base_report_designer/i18n/zh_CN.po b/addons/base_report_designer/i18n/zh_CN.po
index 431a39bfe02..abee97593ac 100644
--- a/addons/base_report_designer/i18n/zh_CN.po
+++ b/addons/base_report_designer/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-27 05:24+0000\n"
+"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
"X-Generator: Launchpad (build 16309)\n"
#. module: base_report_designer
diff --git a/addons/base_setup/i18n/pt_BR.po b/addons/base_setup/i18n/pt_BR.po
index c834e408d1d..3bca1c04209 100644
--- a/addons/base_setup/i18n/pt_BR.po
+++ b/addons/base_setup/i18n/pt_BR.po
@@ -7,20 +7,19 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-07-28 19:07+0000\n"
-"Last-Translator: Fábio Martinelli - http://zupy.com.br "
-"\n"
+"PO-Revision-Date: 2012-11-29 20:10+0000\n"
+"Last-Translator: Luiz Fernando M.França \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 05:52+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-30 05:06+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
#. module: base_setup
#: view:sale.config.settings:0
msgid "Emails Integration"
-msgstr ""
+msgstr "Integração de Emails"
#. module: base_setup
#: selection:base.setup.terminology,partner:0
@@ -30,18 +29,18 @@ msgstr "Convidado"
#. module: base_setup
#: view:sale.config.settings:0
msgid "Contacts"
-msgstr ""
+msgstr "Contatos"
#. module: base_setup
#: model:ir.model,name:base_setup.model_base_config_settings
msgid "base.config.settings"
-msgstr ""
+msgstr "base.config.settings"
#. module: base_setup
#: field:base.config.settings,module_auth_oauth:0
msgid ""
"Use external authentication providers, sign in with google, facebook, ..."
-msgstr ""
+msgstr "Use provedores de autenticação externos, como google, facebook, ..."
#. module: base_setup
#: view:sale.config.settings:0
@@ -64,12 +63,12 @@ msgstr "Membro"
#. module: base_setup
#: view:base.config.settings:0
msgid "Portal access"
-msgstr ""
+msgstr "Acesso ao Portal"
#. module: base_setup
#: view:base.config.settings:0
msgid "Authentication"
-msgstr ""
+msgstr "Autenticação"
#. module: base_setup
#: view:sale.config.settings:0
@@ -81,7 +80,7 @@ msgstr ""
#: model:ir.actions.act_window,name:base_setup.action_general_configuration
#: model:ir.ui.menu,name:base_setup.menu_general_configuration
msgid "General Settings"
-msgstr ""
+msgstr "Configurações Gerais"
#. module: base_setup
#: selection:base.setup.terminology,partner:0
@@ -91,12 +90,12 @@ msgstr "Doador"
#. module: base_setup
#: view:base.config.settings:0
msgid "Email"
-msgstr ""
+msgstr "Email"
#. module: base_setup
#: field:sale.config.settings,module_crm:0
msgid "CRM"
-msgstr ""
+msgstr "CRM"
#. module: base_setup
#: selection:base.setup.terminology,partner:0
@@ -106,17 +105,17 @@ msgstr "Paciente"
#. module: base_setup
#: field:base.config.settings,module_base_import:0
msgid "Allow users to import data from CSV files"
-msgstr ""
+msgstr "Permite a usuários importar dados de arquivos CSV"
#. module: base_setup
#: field:base.config.settings,module_multi_company:0
msgid "Manage multiple companies"
-msgstr ""
+msgstr "Gerir múltiplas empresas"
#. module: base_setup
#: help:base.config.settings,module_portal:0
msgid "Give access your customers and suppliers to their documents."
-msgstr ""
+msgstr "Dar acesso a seus clientes e fornecedores aos seus documentos."
#. module: base_setup
#: view:sale.config.settings:0
@@ -126,12 +125,12 @@ msgstr ""
#. module: base_setup
#: field:sale.config.settings,module_web_linkedin:0
msgid "Get contacts automatically from linkedIn"
-msgstr ""
+msgstr "Pegar contatos automaticamente do linkedIn"
#. module: base_setup
#: field:sale.config.settings,module_plugin_thunderbird:0
msgid "Enable Thunderbird plug-in"
-msgstr ""
+msgstr "Habilitar pluguin Thunderbird"
#. module: base_setup
#: view:base.setup.terminology:0
@@ -141,22 +140,22 @@ msgstr "res_config_contents"
#. module: base_setup
#: view:sale.config.settings:0
msgid "Customer Features"
-msgstr ""
+msgstr "Características dos clientes"
#. module: base_setup
#: view:base.config.settings:0
msgid "Import / Export"
-msgstr ""
+msgstr "Importar / Exportar"
#. module: base_setup
#: view:sale.config.settings:0
msgid "Sale Features"
-msgstr ""
+msgstr "Características de venda"
#. module: base_setup
#: field:sale.config.settings,module_plugin_outlook:0
msgid "Enable Outlook plug-in"
-msgstr ""
+msgstr "Habilita plug-in Outlook"
#. module: base_setup
#: view:base.setup.terminology:0
@@ -175,7 +174,7 @@ msgstr "Locatário"
#. module: base_setup
#: help:base.config.settings,module_share:0
msgid "Share or embbed any screen of openerp."
-msgstr ""
+msgstr "Compartilhar ou incorporar qualquer tela do OpenERP."
#. module: base_setup
#: selection:base.setup.terminology,partner:0
@@ -188,6 +187,8 @@ msgid ""
"When you create a new contact (person or company), you will be able to load "
"all the data from LinkedIn (photos, address, etc)."
msgstr ""
+"Quando você cria um novo contato (pessoa ou empresa), você será capaz de "
+"carregar todos os dados do LinkedIn (fotos, endereço, etc.)"
#. module: base_setup
#: help:base.config.settings,module_multi_company:0
@@ -196,6 +197,9 @@ msgid ""
"companies.\n"
" This installs the module multi_company."
msgstr ""
+"Trabalhar em ambientes multi-empresa, com acesso de segurança apropriado "
+"entre as empresas.\n"
+" Isso instala o módulo multi_company."
#. module: base_setup
#: view:base.config.settings:0
@@ -203,11 +207,13 @@ msgid ""
"You will find more options in your company details: address for the header "
"and footer, overdue payments texts, etc."
msgstr ""
+"Você vai encontrar mais opções em detalhes da sua empresa: endereço para o "
+"cabeçalho e rodapé, textos atraso de pagamentos, etc"
#. module: base_setup
#: model:ir.model,name:base_setup.model_sale_config_settings
msgid "sale.config.settings"
-msgstr ""
+msgstr "sale.config.settings"
#. module: base_setup
#: field:base.setup.terminology,partner:0
@@ -228,6 +234,7 @@ msgstr "Cliente"
#: help:base.config.settings,module_auth_anonymous:0
msgid "Enable the public part of openerp, openerp becomes a public website."
msgstr ""
+"Habilita a parte pública do OpenERP, OpenERP torna-se um site público."
#. module: base_setup
#: help:sale.config.settings,module_plugin_thunderbird:0
@@ -255,7 +262,7 @@ msgstr "Use uma outra palavra para dizer \"Cliente\""
#: model:ir.actions.act_window,name:base_setup.action_sale_config
#: view:sale.config.settings:0
msgid "Configure Sales"
-msgstr ""
+msgstr "Configurar Vendas"
#. module: base_setup
#: help:sale.config.settings,module_plugin_outlook:0
@@ -272,32 +279,32 @@ msgstr ""
#. module: base_setup
#: view:base.config.settings:0
msgid "Options"
-msgstr ""
+msgstr "Opções"
#. module: base_setup
#: field:base.config.settings,module_portal:0
msgid "Activate the customer/supplier portal"
-msgstr ""
+msgstr "Ativar o portal do cliente / fornecedor"
#. module: base_setup
#: field:base.config.settings,module_share:0
msgid "Allow documents sharing"
-msgstr ""
+msgstr "Permite compartilhar documentos"
#. module: base_setup
#: field:base.config.settings,module_auth_anonymous:0
msgid "Activate the public portal"
-msgstr ""
+msgstr "Ativar o portal público"
#. module: base_setup
#: view:base.config.settings:0
msgid "Configure outgoing email servers"
-msgstr ""
+msgstr "Configurar servidor de email para saida"
#. module: base_setup
#: view:sale.config.settings:0
msgid "Social Network Integration"
-msgstr ""
+msgstr "Integração com redes sociais"
#. module: base_setup
#: view:base.config.settings:0
@@ -309,7 +316,7 @@ msgstr "Cancelar"
#: view:base.config.settings:0
#: view:sale.config.settings:0
msgid "Apply"
-msgstr ""
+msgstr "Aplicar"
#. module: base_setup
#: view:base.setup.terminology:0
@@ -320,12 +327,12 @@ msgstr "Especifique a sua Trminologia"
#: view:base.config.settings:0
#: view:sale.config.settings:0
msgid "or"
-msgstr ""
+msgstr "ou"
#. module: base_setup
#: view:base.config.settings:0
msgid "Configure your company data"
-msgstr ""
+msgstr "Configurar dados de sua empresa"
#~ msgid "City"
#~ msgstr "Cidade"
diff --git a/addons/base_setup/i18n/zh_CN.po b/addons/base_setup/i18n/zh_CN.po
index 85494807d9c..7fa74452b03 100644
--- a/addons/base_setup/i18n/zh_CN.po
+++ b/addons/base_setup/i18n/zh_CN.po
@@ -7,19 +7,19 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-02-10 03:32+0000\n"
+"PO-Revision-Date: 2012-11-28 16:54+0000\n"
"Last-Translator: ccdos \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 05:52+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:14+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
#. module: base_setup
#: view:sale.config.settings:0
msgid "Emails Integration"
-msgstr ""
+msgstr "Email 集成"
#. module: base_setup
#: selection:base.setup.terminology,partner:0
@@ -29,18 +29,18 @@ msgstr "访客"
#. module: base_setup
#: view:sale.config.settings:0
msgid "Contacts"
-msgstr ""
+msgstr "联系人"
#. module: base_setup
#: model:ir.model,name:base_setup.model_base_config_settings
msgid "base.config.settings"
-msgstr ""
+msgstr "base.config.settings"
#. module: base_setup
#: field:base.config.settings,module_auth_oauth:0
msgid ""
"Use external authentication providers, sign in with google, facebook, ..."
-msgstr ""
+msgstr "使用OpenID登陆(Google, Facebook...)"
#. module: base_setup
#: view:sale.config.settings:0
@@ -63,24 +63,24 @@ msgstr "会员"
#. module: base_setup
#: view:base.config.settings:0
msgid "Portal access"
-msgstr ""
+msgstr "门户访问"
#. module: base_setup
#: view:base.config.settings:0
msgid "Authentication"
-msgstr ""
+msgstr "身份验证"
#. module: base_setup
#: view:sale.config.settings:0
msgid "Quotations and Sales Orders"
-msgstr ""
+msgstr "报价和销售订单"
#. module: base_setup
#: view:base.config.settings:0
#: model:ir.actions.act_window,name:base_setup.action_general_configuration
#: model:ir.ui.menu,name:base_setup.menu_general_configuration
msgid "General Settings"
-msgstr ""
+msgstr "常规设置"
#. module: base_setup
#: selection:base.setup.terminology,partner:0
@@ -90,12 +90,12 @@ msgstr "捐助者"
#. module: base_setup
#: view:base.config.settings:0
msgid "Email"
-msgstr ""
+msgstr "Email"
#. module: base_setup
#: field:sale.config.settings,module_crm:0
msgid "CRM"
-msgstr ""
+msgstr "CRM"
#. module: base_setup
#: selection:base.setup.terminology,partner:0
@@ -105,12 +105,12 @@ msgstr "病人"
#. module: base_setup
#: field:base.config.settings,module_base_import:0
msgid "Allow users to import data from CSV files"
-msgstr ""
+msgstr "允许导入CSV数据"
#. module: base_setup
#: field:base.config.settings,module_multi_company:0
msgid "Manage multiple companies"
-msgstr ""
+msgstr "允许多公司操作"
#. module: base_setup
#: help:base.config.settings,module_portal:0
@@ -120,17 +120,17 @@ msgstr ""
#. module: base_setup
#: view:sale.config.settings:0
msgid "On Mail Client"
-msgstr ""
+msgstr "在邮件客户端"
#. module: base_setup
#: field:sale.config.settings,module_web_linkedin:0
msgid "Get contacts automatically from linkedIn"
-msgstr ""
+msgstr "自动获取LinkedIn联系人"
#. module: base_setup
#: field:sale.config.settings,module_plugin_thunderbird:0
msgid "Enable Thunderbird plug-in"
-msgstr ""
+msgstr "允许 Thunderbird 插件"
#. module: base_setup
#: view:base.setup.terminology:0
@@ -140,22 +140,22 @@ msgstr "res_config_contents"
#. module: base_setup
#: view:sale.config.settings:0
msgid "Customer Features"
-msgstr ""
+msgstr "客户特性"
#. module: base_setup
#: view:base.config.settings:0
msgid "Import / Export"
-msgstr ""
+msgstr "导入/导出"
#. module: base_setup
#: view:sale.config.settings:0
msgid "Sale Features"
-msgstr ""
+msgstr "销售特性"
#. module: base_setup
#: field:sale.config.settings,module_plugin_outlook:0
msgid "Enable Outlook plug-in"
-msgstr ""
+msgstr "允许 Outlook 插件"
#. module: base_setup
#: view:base.setup.terminology:0
@@ -172,7 +172,7 @@ msgstr "承租人"
#. module: base_setup
#: help:base.config.settings,module_share:0
msgid "Share or embbed any screen of openerp."
-msgstr ""
+msgstr "分享或者嵌入任意Openerp屏幕"
#. module: base_setup
#: selection:base.setup.terminology,partner:0
@@ -193,6 +193,8 @@ msgid ""
"companies.\n"
" This installs the module multi_company."
msgstr ""
+"工作在多公司环境，公司之间适当地安全访问\n"
+" 为此安装模块multi_company。"
#. module: base_setup
#: view:base.config.settings:0
@@ -204,7 +206,7 @@ msgstr ""
#. module: base_setup
#: model:ir.model,name:base_setup.model_sale_config_settings
msgid "sale.config.settings"
-msgstr ""
+msgstr "sale.config.settings"
#. module: base_setup
#: field:base.setup.terminology,partner:0
@@ -224,7 +226,7 @@ msgstr "客户"
#. module: base_setup
#: help:base.config.settings,module_auth_anonymous:0
msgid "Enable the public part of openerp, openerp becomes a public website."
-msgstr ""
+msgstr "启用Openerp的公共部分，Openerp成为一个公共的web站点"
#. module: base_setup
#: help:sale.config.settings,module_plugin_thunderbird:0
@@ -237,6 +239,9 @@ msgid ""
" Partner from the selected emails.\n"
" This installs the module plugin_thunderbird."
msgstr ""
+"插件允许把你的email和附件存档到Openerp对象。你能选择一个业务伙伴、或者线索，并 选择邮件存为 .eml 文件 附加到在选中记录的附件中。\n"
+"\n"
+"为此要安装模块 plugin_thunderbird."
#. module: base_setup
#: selection:base.setup.terminology,partner:0
@@ -252,7 +257,7 @@ msgstr "称呼客户的另一种方式"
#: model:ir.actions.act_window,name:base_setup.action_sale_config
#: view:sale.config.settings:0
msgid "Configure Sales"
-msgstr ""
+msgstr "销售模块配置"
#. module: base_setup
#: help:sale.config.settings,module_plugin_outlook:0
@@ -265,36 +270,39 @@ msgid ""
" email into an OpenERP mail message with attachments.\n"
" This installs the module plugin_outlook."
msgstr ""
+"Outlook 插件允许你把 邮件和它附件添加到你选择对象里。 你能选择一个业务伙伴或者线索 对象，并且把选择的邮件存档到一个带附件的 Openerp "
+"邮件消息中。\n"
+"为此要安装模块plugin_outlook."
#. module: base_setup
#: view:base.config.settings:0
msgid "Options"
-msgstr ""
+msgstr "选项"
#. module: base_setup
#: field:base.config.settings,module_portal:0
msgid "Activate the customer/supplier portal"
-msgstr ""
+msgstr "开启合作伙伴Portal"
#. module: base_setup
#: field:base.config.settings,module_share:0
msgid "Allow documents sharing"
-msgstr ""
+msgstr "允许分享单据"
#. module: base_setup
#: field:base.config.settings,module_auth_anonymous:0
msgid "Activate the public portal"
-msgstr ""
+msgstr "启用公共门户"
#. module: base_setup
#: view:base.config.settings:0
msgid "Configure outgoing email servers"
-msgstr ""
+msgstr "配置邮箱发件服务器"
#. module: base_setup
#: view:sale.config.settings:0
msgid "Social Network Integration"
-msgstr ""
+msgstr "集成社交网络"
#. module: base_setup
#: view:base.config.settings:0
@@ -306,7 +314,7 @@ msgstr "取消"
#: view:base.config.settings:0
#: view:sale.config.settings:0
msgid "Apply"
-msgstr ""
+msgstr "应用"
#. module: base_setup
#: view:base.setup.terminology:0
@@ -317,12 +325,12 @@ msgstr "指定贵公司所用的术语"
#: view:base.config.settings:0
#: view:sale.config.settings:0
msgid "or"
-msgstr ""
+msgstr "or"
#. module: base_setup
#: view:base.config.settings:0
msgid "Configure your company data"
-msgstr ""
+msgstr "配置公司信息"
#~ msgid "Report Header"
#~ msgstr "报表页眉"
diff --git a/addons/base_status/base_stage.py b/addons/base_status/base_stage.py
index 67c6354fd3b..9858a7fe0cc 100644
--- a/addons/base_status/base_stage.py
+++ b/addons/base_status/base_stage.py
@@ -41,12 +41,10 @@ class base_stage(object):
"""
if context is None:
context = {}
- if not context or not context.get('portal'):
- return False
- user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
- if hasattr(user, 'partner_address_id') and user.partner_address_id:
- return user.partner_address_id
- return user.company_id.partner_id.id
+ if context.get('portal'):
+ user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
+ return user.partner_id.id
+ return False
def _get_default_email(self, cr, uid, context=None):
""" Gives default email address for current user
@@ -54,10 +52,10 @@ class base_stage(object):
"""
if context is None:
context = {}
- if not context or not context.get('portal'):
- return False
- user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
- return user.email
+ if context.get('portal'):
+ user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
+ return user.email
+ return False
def _get_default_user(self, cr, uid, context=None):
""" Gives current user id
@@ -65,7 +63,7 @@ class base_stage(object):
"""
if context is None:
context = {}
- if not context or not context.get('portal'):
+ if not context or context.get('portal'):
return False
return uid
diff --git a/addons/base_status/i18n/fr.po b/addons/base_status/i18n/fr.po
new file mode 100644
index 00000000000..5ec55b0c43d
--- /dev/null
+++ b/addons/base_status/i18n/fr.po
@@ -0,0 +1,91 @@
+# 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-11-24 02:52+0000\n"
+"PO-Revision-Date: 2012-11-29 17:43+0000\n"
+"Last-Translator: Christophe Chauvet - http://www.syleam.fr/ \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-11-30 05:08+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
+
+#. module: base_status
+#: code:addons/base_status/base_state.py:107
+#, python-format
+msgid "Error !"
+msgstr "Erreur!"
+
+#. module: base_status
+#: code:addons/base_status/base_stage.py:333
+#: code:addons/base_status/base_state.py:187
+#, python-format
+msgid "%s has been opened."
+msgstr "%s a été ouverte."
+
+#. module: base_status
+#: code:addons/base_status/base_stage.py:357
+#: code:addons/base_status/base_state.py:220
+#, python-format
+msgid "%s has been renewed."
+msgstr "%s a été renouvelée."
+
+#. module: base_status
+#: code:addons/base_status/base_stage.py:215
+#, python-format
+msgid "Error!"
+msgstr "Erreur!"
+
+#. module: base_status
+#: code:addons/base_status/base_state.py:107
+#, python-format
+msgid ""
+"You can not escalate, you are already at the top level regarding your sales-"
+"team category."
+msgstr ""
+"Vous ne pouvez pas escalader, vous êtes déjà au niveau le plus haut selon la "
+"catégorie de votre équipe de ventes."
+
+#. module: base_status
+#: code:addons/base_status/base_stage.py:351
+#: code:addons/base_status/base_state.py:214
+#, python-format
+msgid "%s is now pending."
+msgstr "%s est mainetant en attente."
+
+#. module: base_status
+#: code:addons/base_status/base_stage.py:345
+#, python-format
+msgid "%s has been cancelled."
+msgstr "%s à été annulée."
+
+#. module: base_status
+#: code:addons/base_status/base_state.py:208
+#, python-format
+msgid "%s has been canceled."
+msgstr "%s à été annulée."
+
+#. module: base_status
+#: code:addons/base_status/base_stage.py:215
+#, python-format
+msgid ""
+"You are already at the top level of your sales-team category.\n"
+"Therefore you cannot escalate furthermore."
+msgstr ""
+"vous êtes déjà au niveau le plus haut selon la catégorie de votre équipe de "
+"ventes.\n"
+"Par conséquent vous ne pouvez pas escalder plus haut."
+
+#. module: base_status
+#: code:addons/base_status/base_stage.py:339
+#: code:addons/base_status/base_state.py:202
+#, python-format
+msgid "%s has been closed."
+msgstr "%s à été fermée."
diff --git a/addons/base_status/i18n/zh_CN.po b/addons/base_status/i18n/zh_CN.po
new file mode 100644
index 00000000000..bfb2e6fcebf
--- /dev/null
+++ b/addons/base_status/i18n/zh_CN.po
@@ -0,0 +1,88 @@
+# 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-11-24 02:52+0000\n"
+"PO-Revision-Date: 2012-11-28 07:43+0000\n"
+"Last-Translator: ccdos \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-11-29 05:15+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
+
+#. module: base_status
+#: code:addons/base_status/base_state.py:107
+#, python-format
+msgid "Error !"
+msgstr "错误！"
+
+#. module: base_status
+#: code:addons/base_status/base_stage.py:333
+#: code:addons/base_status/base_state.py:187
+#, python-format
+msgid "%s has been opened."
+msgstr "%s 已经被 打开."
+
+#. module: base_status
+#: code:addons/base_status/base_stage.py:357
+#: code:addons/base_status/base_state.py:220
+#, python-format
+msgid "%s has been renewed."
+msgstr "%s 已经被 更新."
+
+#. module: base_status
+#: code:addons/base_status/base_stage.py:215
+#, python-format
+msgid "Error!"
+msgstr "错误!"
+
+#. module: base_status
+#: code:addons/base_status/base_state.py:107
+#, python-format
+msgid ""
+"You can not escalate, you are already at the top level regarding your sales-"
+"team category."
+msgstr "不能上报，你已经在您销售团队类别中的最高级了。"
+
+#. module: base_status
+#: code:addons/base_status/base_stage.py:351
+#: code:addons/base_status/base_state.py:214
+#, python-format
+msgid "%s is now pending."
+msgstr "%s 现在 待定."
+
+#. module: base_status
+#: code:addons/base_status/base_stage.py:345
+#, python-format
+msgid "%s has been cancelled."
+msgstr "%s 已经被 取消."
+
+#. module: base_status
+#: code:addons/base_status/base_state.py:208
+#, python-format
+msgid "%s has been canceled."
+msgstr "%s 已经被 取消."
+
+#. module: base_status
+#: code:addons/base_status/base_stage.py:215
+#, python-format
+msgid ""
+"You are already at the top level of your sales-team category.\n"
+"Therefore you cannot escalate furthermore."
+msgstr ""
+"你已经在您销售团队类别中的最高级了。\n"
+"因此，你不能再上报了。"
+
+#. module: base_status
+#: code:addons/base_status/base_stage.py:339
+#: code:addons/base_status/base_state.py:202
+#, python-format
+msgid "%s has been closed."
+msgstr "%s 已经被 关闭."
diff --git a/addons/base_vat/i18n/tr.po b/addons/base_vat/i18n/tr.po
index 39aed5e32b3..209639474fc 100644
--- a/addons/base_vat/i18n/tr.po
+++ b/addons/base_vat/i18n/tr.po
@@ -7,19 +7,19 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-01-23 22:01+0000\n"
+"PO-Revision-Date: 2012-11-27 21:48+0000\n"
"Last-Translator: Ahmet Altınışık \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 05:51+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-28 04:40+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
#. module: base_vat
#: view:res.partner:0
msgid "Check Validity"
-msgstr ""
+msgstr "Geçerliliğini Kontrol et"
#. module: base_vat
#: code:addons/base_vat/base_vat.py:147
@@ -60,12 +60,12 @@ msgstr "Hata! Özyinelemeli firmalar oluşturamazsınız."
#: code:addons/base_vat/base_vat.py:111
#, python-format
msgid "Error!"
-msgstr ""
+msgstr "Hata!"
#. module: base_vat
#: constraint:res.partner:0
msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "Hata: Geçersiz EAN barkodu"
#. module: base_vat
#: help:res.partner,vat_subjected:0
diff --git a/addons/board/controllers.py b/addons/board/controllers.py
index 81557f64fa3..3bdebe1ef26 100644
--- a/addons/board/controllers.py
+++ b/addons/board/controllers.py
@@ -2,7 +2,6 @@
from xml.etree import ElementTree
import openerp
-from openerp.addons.web import nonliterals
from openerp.addons.web.controllers.main import load_actions_from_ir_values
class Board(openerp.addons.web.http.Controller):
@@ -11,16 +10,8 @@ class Board(openerp.addons.web.http.Controller):
@openerp.addons.web.http.jsonrequest
def add_to_dashboard(self, req, menu_id, action_id, context_to_save, domain, view_mode, name=''):
# FIXME move this method to board.board model
- to_eval = nonliterals.CompoundContext(context_to_save)
- to_eval.session = req.session
- ctx = dict((k, v) for k, v in to_eval.evaluate().iteritems()
- if not k.startswith('search_default_'))
- ctx['dashboard_merge_domains_contexts'] = False # TODO: replace this 6.1 workaround by attribute on
- domain = nonliterals.CompoundDomain(domain)
- domain.session = req.session
- domain = domain.evaluate()
-
- dashboard_action = load_actions_from_ir_values(req, 'action', 'tree_but_open', [('ir.ui.menu', menu_id)], False)
+ dashboard_action = load_actions_from_ir_values(
+ req, 'action', 'tree_but_open', [('ir.ui.menu', menu_id)], False)
if dashboard_action:
action = dashboard_action[0][2]
@@ -36,7 +27,7 @@ class Board(openerp.addons.web.http.Controller):
'name': str(action_id),
'string': name,
'view_mode': view_mode,
- 'context': str(ctx),
+ 'context': str(context_to_save),
'domain': str(domain)
})
column.insert(0, new_action)
@@ -45,6 +36,6 @@ class Board(openerp.addons.web.http.Controller):
'user_id': req.session._uid,
'ref_id': view_id,
'arch': arch
- }, req.session.eval_context(req.context))
+ }, req.context)
return False
diff --git a/addons/board/static/src/js/dashboard.js b/addons/board/static/src/js/dashboard.js
index eb835c43e22..13a51cc663e 100644
--- a/addons/board/static/src/js/dashboard.js
+++ b/addons/board/static/src/js/dashboard.js
@@ -375,11 +375,22 @@ instance.board.AddToDashboard = instance.web.search.Input.extend({
var domain = new instance.web.CompoundDomain(getParent.dataset.get_domain() || []);
_.each(data.contexts, context.add, context);
_.each(data.domains, domain.add, domain);
+
+ var c = instance.web.pyeval.eval('context', context);
+ for(var k in c) {
+ if (c.hasOwnProperty(k) && /^search_default_/.test(k)) {
+ delete c[k];
+ }
+ }
+ // TODO: replace this 6.1 workaround by attribute on
+ c.dashboard_merge_domains_contexts = false;
+ var d = instance.web.pyeval.eval('domain', domain);
+
this.rpc('/board/add_to_dashboard', {
menu_id: this.$el.find("select").val(),
action_id: view_parent.action.id,
- context_to_save: context,
- domain: domain,
+ context_to_save: c,
+ domain: d,
view_mode: view_parent.active_view,
name: this.$el.find("input").val()
}).done(function(r) {
diff --git a/addons/claim_from_delivery/i18n/it.po b/addons/claim_from_delivery/i18n/it.po
index 539e0a1c8b4..da5e8074e9c 100644
--- a/addons/claim_from_delivery/i18n/it.po
+++ b/addons/claim_from_delivery/i18n/it.po
@@ -8,29 +8,29 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2010-12-29 12:12+0000\n"
-"Last-Translator: OpenERP Administrators \n"
+"PO-Revision-Date: 2012-11-30 00:12+0000\n"
+"Last-Translator: Sergio Corato \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: 2012-11-25 06:23+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-30 05:08+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
#. module: claim_from_delivery
#: view:stock.picking.out:0
msgid "Claims"
-msgstr ""
+msgstr "Reclami"
#. module: claim_from_delivery
#: model:res.request.link,name:claim_from_delivery.request_link_claim_from_delivery
msgid "Delivery Order"
-msgstr ""
+msgstr "Ordine di consegna"
#. module: claim_from_delivery
#: model:ir.actions.act_window,name:claim_from_delivery.action_claim_from_delivery
msgid "Claim From Delivery"
-msgstr ""
+msgstr "Reclami Da Consegne"
#~ msgid "Claim from delivery"
#~ msgstr "Reclamo da consegna"
diff --git a/addons/contacts/i18n/es.po b/addons/contacts/i18n/es.po
index c4f38f1f584..f4b3a345289 100644
--- a/addons/contacts/i18n/es.po
+++ b/addons/contacts/i18n/es.po
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-27 05:24+0000\n"
+"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
"X-Generator: Launchpad (build 16309)\n"
#. module: contacts
diff --git a/addons/contacts/i18n/hu.po b/addons/contacts/i18n/hu.po
new file mode 100644
index 00000000000..eacc9b22406
--- /dev/null
+++ b/addons/contacts/i18n/hu.po
@@ -0,0 +1,37 @@
+# Hungarian 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-11-24 02:52+0000\n"
+"PO-Revision-Date: 2012-11-27 23:56+0000\n"
+"Last-Translator: Krisztian Eyssen \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: 2012-11-29 05:15+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
+
+#. module: contacts
+#: model:ir.actions.act_window,help:contacts.action_contacts
+msgid ""
+"
\n"
+" Click to add a contact in your address book.\n"
+"
\n"
+" OpenERP helps you easily track all activities related to\n"
+" a customer; discussions, history of business opportunities,\n"
+" documents, etc.\n"
+"
\n"
+" "
+msgstr ""
+
+#. module: contacts
+#: model:ir.actions.act_window,name:contacts.action_contacts
+#: model:ir.ui.menu,name:contacts.menu_contacts
+msgid "Contacts"
+msgstr "Kapcsolatok"
diff --git a/addons/contacts/i18n/it.po b/addons/contacts/i18n/it.po
new file mode 100644
index 00000000000..e0d4d816737
--- /dev/null
+++ b/addons/contacts/i18n/it.po
@@ -0,0 +1,46 @@
+# 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-11-24 02:52+0000\n"
+"PO-Revision-Date: 2012-11-28 19:52+0000\n"
+"Last-Translator: Davide Corio - agilebg.com \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: 2012-11-29 05:15+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
+
+#. module: contacts
+#: model:ir.actions.act_window,help:contacts.action_contacts
+msgid ""
+"
\n"
+" Click to add a contact in your address book.\n"
+"
\n"
+" OpenERP helps you easily track all activities related to\n"
+" a customer; discussions, history of business opportunities,\n"
+" documents, etc.\n"
+"
\n"
+" "
+msgstr ""
+"
\n"
+" Premere per creare un contatto in rubrica.\n"
+"
\n"
+" OpenERP ti aiuta a tenere traccia delle attività legate\n"
+" a clienti, discussioni, storia delle opportunità,\n"
+" document, etc.\n"
+"\n"
+"
\n"
+" "
+
+#. module: contacts
+#: model:ir.actions.act_window,name:contacts.action_contacts
+#: model:ir.ui.menu,name:contacts.menu_contacts
+msgid "Contacts"
+msgstr "Contatti"
diff --git a/addons/contacts/i18n/tr.po b/addons/contacts/i18n/tr.po
new file mode 100644
index 00000000000..9b68dbf5ddc
--- /dev/null
+++ b/addons/contacts/i18n/tr.po
@@ -0,0 +1,44 @@
+# 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-11-24 02:52+0000\n"
+"PO-Revision-Date: 2012-11-27 21:52+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-11-28 04:41+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
+
+#. module: contacts
+#: model:ir.actions.act_window,help:contacts.action_contacts
+msgid ""
+"
\n"
+" Click to add a contact in your address book.\n"
+"
\n"
+" OpenERP helps you easily track all activities related to\n"
+" a customer; discussions, history of business opportunities,\n"
+" documents, etc.\n"
+"
\n"
+" "
+msgstr ""
+"
\n"
+" Adres defterinizden bir carinin üzerine tıklayın.\n"
+"
\n"
+" OpenERP bir müşteriye ait bütün aktiviteleri takip etmenize\n"
+" yardım eder; mesela iş fırsatlarını, dökümanları, vs.\n"
+"
\n"
+" "
+
+#. module: contacts
+#: model:ir.actions.act_window,name:contacts.action_contacts
+#: model:ir.ui.menu,name:contacts.menu_contacts
+msgid "Contacts"
+msgstr "Cariler"
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 88b2edcd665..c552b1835f2 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -4,7 +4,7 @@
- Mark unread
+ CRM Lead: Mark unreadTrueir.actions.server
@@ -22,7 +22,7 @@
- Mark read
+ CRM Lead: Mark readTrueir.actions.server
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index 9cb09e71be2..a6e8dbe397a 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -4,7 +4,7 @@
- Mark unread
+ CRM Phonecall: Mark unreadTrueir.actions.server
@@ -22,7 +22,7 @@
- Mark read
+ CRM Phonecall: Mark readTrueir.actions.server
diff --git a/addons/crm/i18n/fr.po b/addons/crm/i18n/fr.po
index 075cfe8fdb0..f172aaa663e 100644
--- a/addons/crm/i18n/fr.po
+++ b/addons/crm/i18n/fr.po
@@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-11-24 02:51+0000\n"
-"PO-Revision-Date: 2012-02-27 10:26+0000\n"
-"Last-Translator: Fabrice (OpenERP) \n"
+"PO-Revision-Date: 2012-11-29 15:18+0000\n"
+"Last-Translator: Numérigraphe \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 05:48+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-30 05:06+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
#. module: crm
#: view:crm.lead.report:0
@@ -2201,7 +2201,7 @@ msgstr ""
#. module: crm
#: model:crm.case.categ,name:crm.categ_oppor1
msgid "Product"
-msgstr ""
+msgstr "Article"
#. module: crm
#: code:addons/crm/crm_phonecall.py:282
diff --git a/addons/crm/report/crm_lead_report.py b/addons/crm/report/crm_lead_report.py
index da5167da1e6..25598abc3ea 100644
--- a/addons/crm/report/crm_lead_report.py
+++ b/addons/crm/report/crm_lead_report.py
@@ -81,7 +81,6 @@ class crm_lead_report(osv.osv):
'type_id':fields.many2one('crm.case.resource.type', 'Campaign', readonly=True),
'state': fields.selection(AVAILABLE_STATES, 'Status', size=16, readonly=True),
'company_id': fields.many2one('res.company', 'Company', readonly=True),
- 'email': fields.integer('# Emails', size=128, readonly=True),
'probability': fields.float('Probability',digits=(16,2),readonly=True, group_operator="avg"),
'planned_revenue': fields.float('Planned Revenue',digits=(16,2),readonly=True),
'probable_revenue': fields.float('Probable Revenue', digits=(16,2),readonly=True),
@@ -137,7 +136,6 @@ class crm_lead_report(osv.osv):
c.planned_revenue,
c.planned_revenue*(c.probability/100) as probable_revenue,
1 as nbr,
- (SELECT count(id) FROM mail_message WHERE model='crm.lead' AND res_id=c.id AND email_from is not null) AS email,
date_trunc('day',c.create_date) as create_date,
extract('epoch' from (c.date_closed-c.create_date))/(3600*24) as delay_close,
abs(extract('epoch' from (c.date_deadline - c.date_closed))/(3600*24)) as delay_expected,
diff --git a/addons/crm/report/crm_lead_report_view.xml b/addons/crm/report/crm_lead_report_view.xml
index a17633d0ef6..0e5df8837f1 100644
--- a/addons/crm/report/crm_lead_report_view.xml
+++ b/addons/crm/report/crm_lead_report_view.xml
@@ -25,7 +25,6 @@
-
@@ -148,7 +147,6 @@
-
@@ -167,7 +165,7 @@
{'search_default_year': 1,'search_default_lead': 1, "search_default_user":1, "search_default_this_month":1, 'group_by_no_leaf':1, 'group_by':[]}tree,graph[]
- Leads Analysis allows you to check different CRM related information. Check for treatment delays, number of responses given and emails sent. You can sort out your leads analysis by different groups to get accurate grained analysis.
+ Leads Analysis allows you to check different CRM related information like the treatment delays or number of leads per state. You can sort out your leads analysis by different groups to get accurate grained analysis.
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index 85507a32c0f..8b6217b97e1 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -104,7 +104,7 @@
-
@@ -113,9 +113,9 @@
-
+
-
+
@@ -130,17 +130,17 @@
-
+
-
+
-
+
@@ -167,7 +167,7 @@
-
+
diff --git a/addons/crm_todo/i18n/zh_CN.po b/addons/crm_todo/i18n/zh_CN.po
index 68a2aeeccbc..40c9d42e153 100644
--- a/addons/crm_todo/i18n/zh_CN.po
+++ b/addons/crm_todo/i18n/zh_CN.po
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-27 05:24+0000\n"
+"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
"X-Generator: Launchpad (build 16309)\n"
#. module: crm_todo
diff --git a/addons/decimal_precision/i18n/it.po b/addons/decimal_precision/i18n/it.po
index 0880c6e8394..53f4da9eaad 100644
--- a/addons/decimal_precision/i18n/it.po
+++ b/addons/decimal_precision/i18n/it.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2011-01-12 19:11+0000\n"
-"Last-Translator: OpenERP Administrators \n"
+"PO-Revision-Date: 2012-11-28 19:56+0000\n"
+"Last-Translator: Davide Corio - agilebg.com \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: 2012-11-25 06:23+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
#. module: decimal_precision
#: field:decimal.precision,digits:0
@@ -28,6 +28,8 @@ msgid ""
"Error! You cannot define the decimal precision of 'Account' as greater than "
"the rounding factor of the company's main currency"
msgstr ""
+"Errore! La precisione decimale di 'Contabilità' non può essere più grande "
+"del fattore di arrotondamento della valuta principale dell'azienda"
#. module: decimal_precision
#: model:ir.actions.act_window,name:decimal_precision.action_decimal_precision_form
diff --git a/addons/decimal_precision/i18n/nl_BE.po b/addons/decimal_precision/i18n/nl_BE.po
index 95078305c13..1da382b14d0 100644
--- a/addons/decimal_precision/i18n/nl_BE.po
+++ b/addons/decimal_precision/i18n/nl_BE.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-03-01 17:22+0000\n"
-"Last-Translator: FULL NAME \n"
+"PO-Revision-Date: 2012-11-27 13:41+0000\n"
+"Last-Translator: Els Van Vossel (Agaplan) \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: 2012-11-25 06:23+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
#. module: decimal_precision
#: field:decimal.precision,digits:0
@@ -28,6 +28,8 @@ msgid ""
"Error! You cannot define the decimal precision of 'Account' as greater than "
"the rounding factor of the company's main currency"
msgstr ""
+"U kunt de decimale precisie voor Rekening niet groter zetten dan de "
+"afrondingsfactor van de standaardmunt van uw bedrijf."
#. module: decimal_precision
#: model:ir.actions.act_window,name:decimal_precision.action_decimal_precision_form
diff --git a/addons/delivery/i18n/fr.po b/addons/delivery/i18n/fr.po
index 91d233219a7..e2886841fc1 100644
--- a/addons/delivery/i18n/fr.po
+++ b/addons/delivery/i18n/fr.po
@@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2011-01-18 13:05+0000\n"
-"Last-Translator: Aline (OpenERP) \n"
+"PO-Revision-Date: 2012-11-29 14:54+0000\n"
+"Last-Translator: Numérigraphe \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 05:42+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-30 05:06+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
#~ msgid "Invalid XML for View Architecture!"
#~ msgstr "XML non valide pour l'architecture de la vue !"
@@ -416,7 +416,7 @@ msgstr "Date d'expédition"
#. module: delivery
#: field:delivery.carrier,product_id:0
msgid "Delivery Product"
-msgstr "Produit de livraison"
+msgstr "Article de livraison"
#. module: delivery
#: view:delivery.grid.line:0
@@ -426,7 +426,7 @@ msgstr "Condition"
#. module: delivery
#: constraint:stock.move:0
msgid "You must assign a serial number for this product."
-msgstr ""
+msgstr "Vous devez attribuer un numéro de série pour cet article."
#. module: delivery
#: field:delivery.grid.line,standard_price:0
@@ -437,6 +437,8 @@ msgstr "Prix de revient"
#: constraint:stock.move:0
msgid "You cannot move products from or to a location of the type view."
msgstr ""
+"Il est impossible de déplacer des articles depuis ou vers un emplacement de "
+"type \"vue\"."
#. module: delivery
#: selection:delivery.grid.line,price_type:0
@@ -505,7 +507,7 @@ msgstr "<="
#. module: delivery
#: constraint:stock.move:0
msgid "You try to assign a lot which is not from the same product."
-msgstr ""
+msgstr "Vous tentez d'assigner un lot qui n'appartient pas au même article."
#. module: delivery
#: report:sale.shipping:0
diff --git a/addons/delivery/i18n/zh_CN.po b/addons/delivery/i18n/zh_CN.po
index c028b40ab6e..2920c8bd9ce 100644
--- a/addons/delivery/i18n/zh_CN.po
+++ b/addons/delivery/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-27 05:23+0000\n"
+"X-Launchpad-Export-Date: 2012-11-28 04:40+0000\n"
"X-Generator: Launchpad (build 16309)\n"
#. module: delivery
diff --git a/addons/document_webdav/i18n/zh_CN.po b/addons/document_webdav/i18n/zh_CN.po
index 86a4e7ea912..0c7c6a448d5 100644
--- a/addons/document_webdav/i18n/zh_CN.po
+++ b/addons/document_webdav/i18n/zh_CN.po
@@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-02-10 07:02+0000\n"
-"Last-Translator: 开阖软件 Jeff Wang \n"
+"PO-Revision-Date: 2012-11-27 16:44+0000\n"
+"Last-Translator: ccdos \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:18+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
#. module: document_webdav
#: field:document.webdav.dir.property,create_date:0
@@ -30,7 +30,7 @@ msgstr "文档"
#. module: document_webdav
#: view:document.webdav.dir.property:0
msgid "Document property"
-msgstr ""
+msgstr "单据属性"
#. module: document_webdav
#: view:document.webdav.dir.property:0
@@ -41,7 +41,7 @@ msgstr "文档属性列表"
#. module: document_webdav
#: sql_constraint:document.directory:0
msgid "Directory must have a parent or a storage."
-msgstr ""
+msgstr "目录必须有个上级或者是存储"
#. module: document_webdav
#: view:document.webdav.dir.property:0
@@ -182,7 +182,7 @@ msgstr "创建人"
#. module: document_webdav
#: view:document.webdav.file.property:0
msgid "Document Property"
-msgstr ""
+msgstr "单据属性"
#. module: document_webdav
#: model:ir.ui.menu,name:document_webdav.menu_properties
@@ -192,7 +192,7 @@ msgstr "DAV属性"
#. module: document_webdav
#: constraint:document.directory:0
msgid "Error! You cannot create recursive directories."
-msgstr ""
+msgstr "错误！你不能创建循环目录"
#. module: document_webdav
#: field:document.webdav.dir.property,do_subst:0
diff --git a/addons/edi/controllers/main.py b/addons/edi/controllers/main.py
index 10bf214d921..14cd97b3e62 100644
--- a/addons/edi/controllers/main.py
+++ b/addons/edi/controllers/main.py
@@ -23,10 +23,9 @@ class EDI(openerpweb.Controller):
@openerpweb.jsonrequest
def import_edi_url(self, req, url):
- context = req.session.eval_context(req.context)
result = req.session.proxy('edi').import_edi_url(req.session._db, req.session._uid, req.session._password, url)
if len(result) == 1:
- return {"action": webmain.clean_action(req, result[0][2], context)}
+ return {"action": webmain.clean_action(req, result[0][2])}
return True
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/edi/i18n/tr.po b/addons/edi/i18n/tr.po
index aea467b0a0f..26e12724682 100644
--- a/addons/edi/i18n/tr.po
+++ b/addons/edi/i18n/tr.po
@@ -8,28 +8,28 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-02-09 22:33+0000\n"
+"PO-Revision-Date: 2012-11-27 22:29+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-11-25 06:32+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
#. module: edi
#. openerp-web
#: code:addons/edi/static/src/js/edi.js:67
#, python-format
msgid "Reason:"
-msgstr ""
+msgstr "Neden:"
#. module: edi
#. openerp-web
#: code:addons/edi/static/src/js/edi.js:60
#, python-format
msgid "The document has been successfully imported!"
-msgstr ""
+msgstr "öküman başarılı bir şekilde içeri alındı!"
#. module: edi
#: sql_constraint:res.company:0
@@ -46,7 +46,7 @@ msgstr "Hata ! kendini çağıran ilişkili üyeler oluşturamazsınız."
#: code:addons/edi/static/src/js/edi.js:65
#, python-format
msgid "Sorry, the document could not be imported."
-msgstr ""
+msgstr "Üzgünüm, Döküman içeri alınamadı."
#. module: edi
#: constraint:res.company:0
@@ -61,7 +61,7 @@ msgstr "Şirketler"
#. module: edi
#: constraint:res.partner:0
msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "Hata: Geçersiz EAN barkodu"
#. module: edi
#: sql_constraint:res.currency:0
@@ -78,13 +78,13 @@ msgstr "Döviz"
#: code:addons/edi/static/src/js/edi.js:71
#, python-format
msgid "Document Import Notification"
-msgstr ""
+msgstr "Döküman içeri alma Uyarısı"
#. module: edi
#: code:addons/edi/models/edi.py:130
#, python-format
msgid "Missing application."
-msgstr ""
+msgstr "Kayıp Uygulama"
#. module: edi
#: code:addons/edi/models/edi.py:131
@@ -114,11 +114,13 @@ msgid ""
"Error! You cannot define a rounding factor for the company's main currency "
"that is smaller than the decimal precision of 'Account'."
msgstr ""
+"Hata! Şirketin ana hesap dövizi için Muhasebe ondalık hassasiyetinden daha "
+"küçük bir yuvarlama çarpanı seçemezsiniz."
#. module: edi
#: model:ir.model,name:edi.model_edi_edi
msgid "EDI Subsystem"
-msgstr ""
+msgstr "EDI altsistemi"
#~ msgid "Partner Addresses"
#~ msgstr "Cari Adresleri"
diff --git a/addons/edi/i18n/zh_CN.po b/addons/edi/i18n/zh_CN.po
index 5f9d159b7b3..4a71e45fa8e 100644
--- a/addons/edi/i18n/zh_CN.po
+++ b/addons/edi/i18n/zh_CN.po
@@ -8,28 +8,28 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-02-17 03:29+0000\n"
-"Last-Translator: 开阖软件 Jeff Wang \n"
+"PO-Revision-Date: 2012-11-28 07:46+0000\n"
+"Last-Translator: ccdos \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-11-25 06:32+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
#. module: edi
#. openerp-web
#: code:addons/edi/static/src/js/edi.js:67
#, python-format
msgid "Reason:"
-msgstr ""
+msgstr "原因："
#. module: edi
#. openerp-web
#: code:addons/edi/static/src/js/edi.js:60
#, python-format
msgid "The document has been successfully imported!"
-msgstr ""
+msgstr "这个单据已经被成功导入！"
#. module: edi
#: sql_constraint:res.company:0
@@ -46,7 +46,7 @@ msgstr "错误，您不能创建循环引用的会员用户"
#: code:addons/edi/static/src/js/edi.js:65
#, python-format
msgid "Sorry, the document could not be imported."
-msgstr ""
+msgstr "对不起，这个单据不能导入！"
#. module: edi
#: constraint:res.company:0
@@ -61,7 +61,7 @@ msgstr "公司"
#. module: edi
#: constraint:res.partner:0
msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "错误：无效的(EAN)条码"
#. module: edi
#: sql_constraint:res.currency:0
@@ -78,13 +78,13 @@ msgstr "货币"
#: code:addons/edi/static/src/js/edi.js:71
#, python-format
msgid "Document Import Notification"
-msgstr ""
+msgstr "单据导入通知"
#. module: edi
#: code:addons/edi/models/edi.py:130
#, python-format
msgid "Missing application."
-msgstr ""
+msgstr "找不到的应用。"
#. module: edi
#: code:addons/edi/models/edi.py:131
@@ -111,12 +111,12 @@ msgstr "业务伙伴"
msgid ""
"Error! You cannot define a rounding factor for the company's main currency "
"that is smaller than the decimal precision of 'Account'."
-msgstr ""
+msgstr "错误！公司本位币的舍入系数不能定义得小于”科目“的小数位数"
#. module: edi
#: model:ir.model,name:edi.model_edi_edi
msgid "EDI Subsystem"
-msgstr ""
+msgstr "EDI 子系统"
#~ msgid "Partner Addresses"
#~ msgstr "业务伙伴地址"
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 14895f2a1a7..a9a60570735 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -59,7 +59,7 @@
- Mark unread
+ Event: Mark unreadTrueir.actions.server
@@ -77,7 +77,7 @@
- Mark read
+ Event: Mark readTrueir.actions.server
@@ -107,7 +107,7 @@
-
+
@@ -204,7 +204,7 @@
-
+
@@ -377,7 +377,7 @@
- Mark unread
+ Event registration : Mark unreadTrueir.actions.server
@@ -395,7 +395,7 @@
- Mark read
+ Event registration : Mark readTrueir.actions.server
@@ -538,7 +538,7 @@
tree,form,calendar,graph{}
- view_
+
\n"
+" Manage all your contracts (leasing, insurances, etc.) with\n"
+" their related services, costs. OpenERP will automatically "
+"warn\n"
+" you when some contracts have to be renewed.\n"
+"
\n"
+" Each contract (e.g.: leasing) may include several services\n"
+" (reparation, insurances, periodic maintenance).\n"
+"
\n"
+" OpenERP helps you managing the costs for your different\n"
+" vehicles. Costs are created automatically from services,\n"
+" contracts (fixed or recurring) and fuel logs.\n"
+"
\n"
+" Here you can add refuelling entries for all vehicles. You "
+"can\n"
+" also filter logs of a particular vehicle using the search\n"
+" field.\n"
+"
\n"
+" You will be able to manage your fleet by keeping track of "
+"the\n"
+" contracts, services, fixed and recurring costs, odometers "
+"and\n"
+" fuel logs associated to each vehicle.\n"
+"
\n"
+" OpenERP will warn you when services or contract have to be\n"
+" renewed.\n"
+"
\n"
+" To add your first report into this dashboard, go to any\n"
+" menu, switch to list or graph view, and click 'Add "
+"to\n"
+" Dashboard' in the extended search options.\n"
+"
\n"
+" You can filter and group data before inserting into the\n"
+" dashboard using the search options.\n"
+"
\n"
+" OpenERP helps you managing the costs for your different vehicles\n"
+" Costs are generally created from services and contract and appears "
+"here.\n"
+"
\n"
+"
\n"
+" Thanks to the different filters, OpenERP can only print the "
+"effective\n"
+" costs, sort them by type and by vehicle.\n"
+"
\n"
+" Here you can add various odometer entries for all vehicles.\n"
+" You can also show odometer value for a particular vehicle "
+"using\n"
+" the search field.\n"
+"
\n"
+" Here are displayed vehicles for which one or more contracts need "
+"to be renewed. If you see this message, then there is no contracts to "
+"renew.\n"
+"
\n"
+" Click to create a new service entry. \n"
+"
\n"
+" OpenERP helps you keeping track of all the services done\n"
+" on your vehicle. Services can be of many type: occasional\n"
+" repair, fixed maintenance, etc.\n"
+"
\n"
+" "
+"Kliknite da bi definirali novo radno mjesto.\n"
+"
\n"
+" "
+"Radna mjesta se koriste da bi definirali funkciju i zahtjeve za taj posao.\n"
+" "
+"Možete voditi evidenciju broja radnika po radnom mjestu i pratit planirani \n"
+" "
+"razvoj.\n"
+"
\n"
+" "
+"Možete dodati anketu za radno mjesto, koja će se koristiti za ispitivanje \n"
+" "
+"kandidata u procesu zapošljavanja.\n"
+"
\n"
+" "
+"Kliknite da bi dodali novog radnika.\n"
+"
\n"
+" "
+"Sa samo brzim pogledom na OpenERP karticu s radnikom, možete\n"
+" "
+"lako sazanti sve potrebne informacije za svaku osobu;\n"
+" "
+"kontakt podaci, radno mjesto, dostupnost, itd.\n"
+"
\n"
+" "
+"Kliknite da bi kreirali odjel.\n"
+" "
+"
\n"
+" "
+"OpenERP odjelska struktura se koristi za upravljanje svim dokumentima \n"
+" "
+"vezanih za radnika prema odjelima: troškovi, kontrolne kartice, \n"
+" "
+"godišnji i odsustva, zapošljavanja, itd.\n"
+"
\n"
+" "
+"Kliknite da bi definirali novi odjel.\n"
+"
\n"
+" "
+"Vaša odjelska struktura se koristi kako bi upravljali svim dokumentima\n"
+" "
+"vezanim za radnike po odjelima: troškovi i kontrolne kartice, odsustva i "
+"godišnji,\n"
+" "
+"zapošljavanje, itd.\n"
+"
\n"
+" "
+" Ploča ljudskih resursa je prazna.\n"
+" "
+"
\n"
+" "
+" Da bi dodali Vaš prvi izvještaj na ploču, idite na bilo "
+"koji meni, promijenite\n"
+" "
+" pogled na listu ili graf, i kliknite 'Dodaj na "
+"ploču' u proširenim\n"
+" "
+" opcijama pretraživanja.\n"
+" "
+"
\n"
+" "
+" Možete filtrirati i grupirati podatke prije nego ih "
+"ubacite u ploču koristeći\n"
+" "
+" opcije za pretraživanje.\n"
+" "
+"
\n"
+" "
+"
\n"
+" "
#. module: hr
#: view:hr.employee:0
@@ -981,7 +1067,7 @@ msgstr "Naziv radnog mjesta mora biti jedinstven po tvrtki"
#. module: hr
#: help:hr.config.settings,module_hr_expense:0
msgid "This installs the module hr_expense."
-msgstr ""
+msgstr "Ovo instalira modul hr_expense."
#. module: hr
#: model:ir.model,name:hr.model_hr_config_settings
@@ -998,7 +1084,7 @@ msgstr "Voditelj"
#. module: hr
#: constraint:res.users:0
msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "Greška: Neispravan barkod!"
#. module: hr
#: selection:hr.employee,marital:0
@@ -1013,7 +1099,7 @@ msgstr "Podređeni djelatnici"
#. module: hr
#: view:hr.config.settings:0
msgid "Apply"
-msgstr ""
+msgstr "Primjeni"
#~ msgid ""
#~ "The Object name must start with x_ and not contain any special character !"
diff --git a/addons/hr/i18n/it.po b/addons/hr/i18n/it.po
index 9db2e181c8e..3678d669560 100644
--- a/addons/hr/i18n/it.po
+++ b/addons/hr/i18n/it.po
@@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-11-24 02:51+0000\n"
-"PO-Revision-Date: 2012-05-10 17:47+0000\n"
-"Last-Translator: Raphael Collet (OpenERP) \n"
+"PO-Revision-Date: 2012-11-30 00:11+0000\n"
+"Last-Translator: Fabio Graziosi \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:12+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-30 05:07+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
#. module: hr
#: model:process.node,name:hr.process_node_openerpuser0
@@ -597,7 +597,7 @@ msgstr ""
#. module: hr
#: field:hr.employee,bank_account_id:0
msgid "Bank Account Number"
-msgstr ""
+msgstr "Numero C/C Bancario"
#. module: hr
#: view:hr.department:0
diff --git a/addons/hr/i18n/nl.po b/addons/hr/i18n/nl.po
index 658d6c6b71d..95a375ccd0f 100644
--- a/addons/hr/i18n/nl.po
+++ b/addons/hr/i18n/nl.po
@@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-11-24 02:51+0000\n"
-"PO-Revision-Date: 2012-09-03 17:10+0000\n"
+"PO-Revision-Date: 2012-11-29 15:03+0000\n"
"Last-Translator: Erwin van der Ploeg (Endian Solutions) \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:12+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-30 05:07+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
#. module: hr
#: model:process.node,name:hr.process_node_openerpuser0
@@ -24,7 +24,7 @@ msgstr "OpenERP gebruiker"
#. module: hr
#: field:hr.config.settings,module_hr_timesheet_sheet:0
msgid "Allow timesheets validation by managers"
-msgstr ""
+msgstr "Urenstaaat controle door managers"
#. module: hr
#: field:hr.job,requirements:0
@@ -59,11 +59,14 @@ msgid ""
"128x128px image, with aspect ratio preserved. Use this field in form views "
"or some kanban views."
msgstr ""
+"Foto van gemiddeld formaat van de werknemer. Deze afbeelding wordt, in "
+"verhouding, geschaald naar 128x128px. Gebruik dit veld in de formulier "
+"weergave of sommige kanban weergaven."
#. module: hr
#: view:hr.config.settings:0
msgid "Time Tracking"
-msgstr ""
+msgstr "Tijdregistratie"
#. module: hr
#: view:hr.employee:0
@@ -84,7 +87,7 @@ msgstr "Huidige aantal werknemers welke deze functie bekleden ."
#. module: hr
#: field:hr.config.settings,module_hr_evaluation:0
msgid "Organize employees periodic evaluation"
-msgstr ""
+msgstr "Organiseer periodieke werknemer beoordelingen"
#. module: hr
#: view:hr.department:0
@@ -106,11 +109,13 @@ msgid ""
"This field holds the image used as photo for the employee, limited to "
"1024x1024px."
msgstr ""
+"Dit veld bevat de afbeelding, welke wordt gebruikt als foto voor de "
+"werknemer. Maximale grootte 1024x1024px."
#. module: hr
#: help:hr.config.settings,module_hr_holidays:0
msgid "This installs the module hr_holidays."
-msgstr ""
+msgstr "Dit installeert de module hr_holidays."
#. module: hr
#: view:hr.job:0
@@ -125,7 +130,7 @@ msgstr "Wordt geworven"
#. module: hr
#: field:hr.job,message_unread:0
msgid "Unread Messages"
-msgstr ""
+msgstr "Ongelezen berichten"
#. module: hr
#: field:hr.department,company_id:0
@@ -143,32 +148,32 @@ msgstr "Werving verwacht"
#. module: hr
#: field:res.users,employee_ids:0
msgid "Related employees"
-msgstr ""
+msgstr "Betreffende werknemers"
#. module: hr
#: constraint:hr.employee.category:0
msgid "Error! You cannot create recursive Categories."
-msgstr ""
+msgstr "Fout! het is niet toegestaan om recursieve categorieën te maken."
#. module: hr
#: help:hr.config.settings,module_hr_recruitment:0
msgid "This installs the module hr_recruitment."
-msgstr ""
+msgstr "Dit installeert de module hr_recruitment."
#. module: hr
#: view:hr.employee:0
msgid "Birth"
-msgstr ""
+msgstr "Geboortedatum"
#. module: hr
#: field:hr.employee,last_login:0
msgid "Latest Connection"
-msgstr ""
+msgstr "Laatste verbinding"
#. module: hr
#: view:hr.job:0
msgid "Launch Recruitement"
-msgstr ""
+msgstr "Start werving en selectie"
#. module: hr
#: model:process.transition,name:hr.process_transition_employeeuser0
@@ -193,22 +198,22 @@ msgstr "Getrouwd"
#. module: hr
#: field:hr.job,message_ids:0
msgid "Messages"
-msgstr ""
+msgstr "Berichten"
#. module: hr
#: view:hr.config.settings:0
msgid "Talent Management"
-msgstr ""
+msgstr "Kwaliteiten beheer"
#. module: hr
#: help:hr.config.settings,module_hr_timesheet_sheet:0
msgid "This installs the module hr_timesheet_sheet."
-msgstr ""
+msgstr "Dit installeert de module hr_timesheet_sheet."
#. module: hr
#: view:hr.employee:0
msgid "Mobile:"
-msgstr ""
+msgstr "Mobiel:"
#. module: hr
#: view:hr.employee:0
@@ -218,7 +223,7 @@ msgstr "Baan"
#. module: hr
#: help:hr.job,message_unread:0
msgid "If checked new messages require your attention."
-msgstr ""
+msgstr "Indien aangevinkt zullen nieuwe berichten uw aandacht vragen."
#. module: hr
#: field:hr.employee,color:0
@@ -237,7 +242,7 @@ msgstr ""
#. module: hr
#: field:hr.employee,image_medium:0
msgid "Medium-sized photo"
-msgstr ""
+msgstr "Foto van gemiddelde grootte"
#. module: hr
#: field:hr.employee,identification_id:0
@@ -253,7 +258,7 @@ msgstr "Vrouw"
#: model:ir.actions.act_window,name:hr.open_view_categ_form
#: model:ir.ui.menu,name:hr.menu_view_employee_category_form
msgid "Categories of Employees"
-msgstr ""
+msgstr "Werknemer categorieën"
#. module: hr
#: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_new_config
@@ -284,7 +289,7 @@ msgstr "Locatie kantoor"
#. module: hr
#: field:hr.job,message_follower_ids:0
msgid "Followers"
-msgstr ""
+msgstr "Volgers"
#. module: hr
#: view:hr.employee:0
@@ -305,6 +310,9 @@ msgid ""
"image, with aspect ratio preserved. Use this field anywhere a small image is "
"required."
msgstr ""
+"Kleinen foto van de werknemer. Deze foto wordt automatisch, in verhouding, "
+"geschaald naar 64x64px. Gebruik dit veld, overal waar een kleine afbeelding "
+"nodig is."
#. module: hr
#: field:hr.employee,birthday:0
@@ -319,7 +327,7 @@ msgstr "Verwachte aantal te werven nieuwe werknemers."
#. module: hr
#: model:ir.actions.client,name:hr.action_client_hr_menu
msgid "Open HR Menu"
-msgstr ""
+msgstr "Personeelsbeheer menu openen"
#. module: hr
#: help:hr.job,message_summary:0
@@ -327,6 +335,9 @@ msgid ""
"Holds the Chatter summary (number of messages, ...). This summary is "
"directly in html format in order to be inserted in kanban views."
msgstr ""
+"Bevat de samenvatting van de chatter (aantal berichten,...). Deze "
+"samenvatting is direct in html formaat om zo in de kanban weergave te worden "
+"ingevoegd."
#. module: hr
#: help:hr.config.settings,module_account_analytic_analysis:0
@@ -334,11 +345,13 @@ msgid ""
"This installs the module account_analytic_analysis, which will install sales "
"management too."
msgstr ""
+"Dit installeert de module account_analytic_analysis, welke tevens de "
+"verkoopbeheer modules zal installeren."
#. module: hr
#: view:board.board:0
msgid "Human Resources Dashboard"
-msgstr "Personeel dashboard"
+msgstr "Personeelsbeheer dashboard"
#. module: hr
#: view:hr.employee:0
@@ -350,7 +363,7 @@ msgstr "Functie"
#. module: hr
#: field:hr.job,no_of_employee:0
msgid "Current Number of Employees"
-msgstr ""
+msgstr "Huidig aantal werknemers"
#. module: hr
#: field:hr.department,member_ids:0
@@ -365,7 +378,7 @@ msgstr "Instellingen"
#. module: hr
#: field:hr.config.settings,module_hr_expense:0
msgid "Manage employees expenses"
-msgstr ""
+msgstr "Beheers werknemers declaraties"
#. module: hr
#: help:hr.job,expected_employees:0
@@ -376,7 +389,7 @@ msgstr "Verwachte aantal werknemers voor deze functie na de nieuwe werving."
#. module: hr
#: view:hr.employee:0
msgid "Tel:"
-msgstr ""
+msgstr "Tel:"
#. module: hr
#: selection:hr.employee,marital:0
@@ -391,7 +404,7 @@ msgstr "Bovenliggende categorie"
#. module: hr
#: sql_constraint:res.users:0
msgid "OAuth UID must be unique per provider"
-msgstr ""
+msgstr "OAuth UID moet uniek zijn per provider"
#. module: hr
#: view:hr.department:0
@@ -439,26 +452,30 @@ msgid ""
"$('.oe_employee_picture').load(function() { if($(this).width() > "
"$(this).height()) { $(this).addClass('oe_employee_picture_wide') } });"
msgstr ""
+"$('.oe_employee_picture').load(function() { if($(this).width() > "
+"$(this).height()) { $(this).addClass('oe_employee_picture_wide') } });"
#. module: hr
#: help:hr.config.settings,module_hr_evaluation:0
msgid "This installs the module hr_evaluation."
-msgstr ""
+msgstr "Dit installeert de module hr_evaluation."
#. module: hr
#: constraint:hr.employee:0
msgid "Error! You cannot create recursive hierarchy of Employee(s)."
msgstr ""
+"Fout! Het is niet toegestaan om een recursieve werknemer hiërarchie aan te "
+"maken."
#. module: hr
#: help:hr.config.settings,module_hr_attendance:0
msgid "This installs the module hr_attendance."
-msgstr ""
+msgstr "Dit installeert de module hr_attendance."
#. module: hr
#: field:hr.employee,image_small:0
msgid "Smal-sized photo"
-msgstr ""
+msgstr "Kleine foto"
#. module: hr
#: view:hr.employee.category:0
@@ -469,12 +486,12 @@ msgstr "Categorie werknemer"
#. module: hr
#: field:hr.employee,category_ids:0
msgid "Tags"
-msgstr ""
+msgstr "Labels"
#. module: hr
#: help:hr.config.settings,module_hr_contract:0
msgid "This installs the module hr_contract."
-msgstr ""
+msgstr "Dit installeert de module hr_contact."
#. module: hr
#: view:hr.employee:0
@@ -484,7 +501,7 @@ msgstr "Gekoppelde gebruiker"
#. module: hr
#: view:hr.config.settings:0
msgid "or"
-msgstr ""
+msgstr "of"
#. module: hr
#: field:hr.employee.category,name:0
@@ -494,12 +511,12 @@ msgstr "Categorie"
#. module: hr
#: view:hr.job:0
msgid "Stop Recruitment"
-msgstr ""
+msgstr "Werving en selectie stoppen"
#. module: hr
#: field:hr.config.settings,module_hr_attendance:0
msgid "Install attendances feature"
-msgstr ""
+msgstr "Installeer aanwezigheids opties"
#. module: hr
#: help:hr.employee,bank_account_id:0
@@ -529,7 +546,7 @@ msgstr "Contactgegevens"
#. module: hr
#: field:hr.config.settings,module_hr_holidays:0
msgid "Manage holidays, leaves and allocation requests"
-msgstr ""
+msgstr "Beheer vakanties, verlof en wijs aanvragen toe."
#. module: hr
#: field:hr.department,child_ids:0
@@ -556,12 +573,12 @@ msgstr "Arbeidsovereenkomst"
#. module: hr
#: view:hr.config.settings:0
msgid "Contracts"
-msgstr ""
+msgstr "Contracten"
#. module: hr
#: help:hr.job,message_ids:0
msgid "Messages and communication history"
-msgstr ""
+msgstr "Berichten en communicatie historie"
#. module: hr
#: field:hr.employee,ssnid:0
@@ -571,12 +588,12 @@ msgstr "BSN nummer"
#. module: hr
#: field:hr.job,message_is_follower:0
msgid "Is a Follower"
-msgstr ""
+msgstr "Is een volger"
#. module: hr
#: field:hr.config.settings,module_hr_recruitment:0
msgid "Manage the recruitment process"
-msgstr ""
+msgstr "Beheers het werving en selectie proces"
#. module: hr
#: view:hr.employee:0
@@ -586,17 +603,17 @@ msgstr "Actief"
#. module: hr
#: view:hr.config.settings:0
msgid "Human Resources Management"
-msgstr ""
+msgstr "Personeelsbeheer"
#. module: hr
#: view:hr.config.settings:0
msgid "Install your country's payroll"
-msgstr ""
+msgstr "Installeer uw land specifieke salarisadministratie"
#. module: hr
#: field:hr.employee,bank_account_id:0
msgid "Bank Account Number"
-msgstr "Nummer bankrekening"
+msgstr "Bankrekeningnummer"
#. module: hr
#: view:hr.department:0
@@ -606,7 +623,7 @@ msgstr "Bedrijven"
#. module: hr
#: field:hr.job,message_summary:0
msgid "Summary"
-msgstr ""
+msgstr "Samenvatting"
#. module: hr
#: model:process.transition,note:hr.process_transition_contactofemployee0
@@ -635,17 +652,17 @@ msgstr ""
#. module: hr
#: view:hr.employee:0
msgid "HR Settings"
-msgstr ""
+msgstr "Personeelsbeheer instellingen"
#. module: hr
#: view:hr.employee:0
msgid "Citizenship & Other Info"
-msgstr ""
+msgstr "Nationaliteit & andere informatie"
#. module: hr
#: constraint:hr.department:0
msgid "Error! You cannot create recursive departments."
-msgstr ""
+msgstr "Fout! het is niet toegestaan recursieve afdelingen aan te maken."
#. module: hr
#: sql_constraint:res.users:0
@@ -660,7 +677,7 @@ msgstr "Werkadres"
#. module: hr
#: view:hr.employee:0
msgid "Public Information"
-msgstr ""
+msgstr "Publieke informatie"
#. module: hr
#: field:hr.employee,marital:0
@@ -685,7 +702,7 @@ msgstr "Foto"
#. module: hr
#: view:hr.config.settings:0
msgid "Cancel"
-msgstr ""
+msgstr "Annuleren"
#. module: hr
#: model:ir.actions.act_window,help:hr.open_module_tree_department
@@ -704,13 +721,13 @@ msgstr ""
#. module: hr
#: help:hr.config.settings,module_hr_timesheet:0
msgid "This installs the module hr_timesheet."
-msgstr ""
+msgstr "Dit installeert de module hr_timesheet."
#. module: hr
#: field:hr.job,message_comment_ids:0
#: help:hr.job,message_comment_ids:0
msgid "Comments and emails"
-msgstr ""
+msgstr "Opmerkingen en e-mails."
#. module: hr
#: model:ir.actions.act_window,help:hr.view_department_form_installer
@@ -749,13 +766,15 @@ msgstr "Mobiel nummer werk"
#. module: hr
#: selection:hr.job,state:0
msgid "Recruitement in Progress"
-msgstr ""
+msgstr "Werving en selectie in behandeling"
#. module: hr
#: field:hr.config.settings,module_account_analytic_analysis:0
msgid ""
"Allow invoicing based on timesheets (the sale application will be installed)"
msgstr ""
+"Sta facturering op basis van urenstaten (de verkoopbeheer module wordt "
+"geinstalleerd)"
#. module: hr
#: view:hr.employee.category:0
@@ -775,7 +794,7 @@ msgstr "Privé-adres"
#. module: hr
#: field:hr.config.settings,module_hr_timesheet:0
msgid "Manage timesheets"
-msgstr ""
+msgstr "Urenstaten beheren"
#. module: hr
#: model:ir.actions.act_window,name:hr.open_view_categ_tree
@@ -806,7 +825,7 @@ msgstr "Is vervuld"
#. module: hr
#: help:hr.config.settings,module_hr_payroll:0
msgid "This installs the module hr_payroll."
-msgstr ""
+msgstr "Dit installeert de module hr_payroll."
#. module: hr
#: field:hr.config.settings,module_hr_contract:0
@@ -826,7 +845,7 @@ msgstr "Nationaliteit"
#. module: hr
#: view:hr.config.settings:0
msgid "Additional Features"
-msgstr ""
+msgstr "Extra opties"
#. module: hr
#: field:hr.employee,notes:0
@@ -879,23 +898,23 @@ msgstr "Naam afdeling"
#. module: hr
#: model:ir.ui.menu,name:hr.menu_hr_reporting_timesheet
msgid "Reports"
-msgstr ""
+msgstr "Rapportages"
#. module: hr
#: field:hr.config.settings,module_hr_payroll:0
msgid "Manage payroll"
-msgstr ""
+msgstr "Loonadministratie"
#. module: hr
#: view:hr.config.settings:0
#: model:ir.actions.act_window,name:hr.action_human_resources_configuration
msgid "Configure Human Resources"
-msgstr ""
+msgstr "Personeelsbeheer instellen"
#. module: hr
#: selection:hr.job,state:0
msgid "No Recruitment"
-msgstr ""
+msgstr "Geen werving en selectie"
#. module: hr
#: help:hr.employee,ssnid:0
@@ -915,7 +934,7 @@ msgstr "Login"
#. module: hr
#: field:hr.job,expected_employees:0
msgid "Total Forecasted Employees"
-msgstr ""
+msgstr "Totaal aantal verwachte werknmers"
#. module: hr
#: help:hr.job,state:0
@@ -927,7 +946,7 @@ msgstr ""
#. module: hr
#: model:ir.model,name:hr.model_res_users
msgid "Users"
-msgstr ""
+msgstr "Gebruikers"
#. module: hr
#: model:ir.actions.act_window,name:hr.action_hr_job
@@ -968,12 +987,12 @@ msgstr "De naam van de functie moet uniek zijn per bedrijf!"
#. module: hr
#: help:hr.config.settings,module_hr_expense:0
msgid "This installs the module hr_expense."
-msgstr ""
+msgstr "Dit installeert de module hr_expense."
#. module: hr
#: model:ir.model,name:hr.model_hr_config_settings
msgid "hr.config.settings"
-msgstr ""
+msgstr "hr.config.settings"
#. module: hr
#: field:hr.department,manager_id:0
@@ -985,7 +1004,7 @@ msgstr "Manager"
#. module: hr
#: constraint:res.users:0
msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "Fout: Ongeldige EAN-code"
#. module: hr
#: selection:hr.employee,marital:0
@@ -1000,7 +1019,7 @@ msgstr "Ondergeschikten"
#. module: hr
#: view:hr.config.settings:0
msgid "Apply"
-msgstr ""
+msgstr "Toepassen"
#~ msgid "Error! You can not create recursive departments."
#~ msgstr "Fout! U kunt geen recursieve afdelingen aanmaken."
diff --git a/addons/hr/i18n/zh_CN.po b/addons/hr/i18n/zh_CN.po
index 939270dbaf6..1d55acccbac 100644
--- a/addons/hr/i18n/zh_CN.po
+++ b/addons/hr/i18n/zh_CN.po
@@ -7,14 +7,19 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-11-24 02:51+0000\n"
-"PO-Revision-Date: 2012-11-27 04:57+0000\n"
+"PO-Revision-Date: 2012-11-28 16:54+0000\n"
"Last-Translator: ccdos \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-27 05:24+0000\n"
-"X-Generator: Launchpad (build 16309)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
+
+#. module: hr
+#: constraint:hr.employee:0
+msgid "Error! You cannot create recursive hierarchy of Employee(s)."
+msgstr "错误！，你不能创建循环的员工等级"
#. module: hr
#: model:process.node,name:hr.process_node_openerpuser0
@@ -39,7 +44,7 @@ msgstr "员工信息链接"
#. module: hr
#: field:hr.employee,sinid:0
msgid "SIN No"
-msgstr "社保号"
+msgstr "社会保险号SIN"
#. module: hr
#: model:ir.actions.act_window,name:hr.open_board_hr
@@ -148,7 +153,7 @@ msgstr "相关的员工"
#. module: hr
#: constraint:hr.employee.category:0
msgid "Error! You cannot create recursive Categories."
-msgstr "错误！你不能创建递归的分类。"
+msgstr "错误！你不能创建循环的分类。"
#. module: hr
#: help:hr.config.settings,module_hr_recruitment:0
@@ -454,11 +459,6 @@ msgstr ""
msgid "This installs the module hr_evaluation."
msgstr "为此要安装模块 hr_evaluation."
-#. module: hr
-#: constraint:hr.employee:0
-msgid "Error! You cannot create recursive hierarchy of Employee(s)."
-msgstr "错误！，你不能创建递归的员工层次"
-
#. module: hr
#: help:hr.config.settings,module_hr_attendance:0
msgid "This installs the module hr_attendance."
@@ -575,7 +575,7 @@ msgstr "消息和通信历史"
#. module: hr
#: field:hr.employee,ssnid:0
msgid "SSN No"
-msgstr "员工号"
+msgstr "社会保险号SSN"
#. module: hr
#: field:hr.job,message_is_follower:0
@@ -660,7 +660,7 @@ msgstr "国籍和其他信息"
#. module: hr
#: constraint:hr.department:0
msgid "Error! You cannot create recursive departments."
-msgstr "错误！你不能创建递归的部门"
+msgstr "错误！你不能创建循环的部门"
#. module: hr
#: sql_constraint:res.users:0
@@ -715,6 +715,14 @@ msgid ""
" \n"
" "
msgstr ""
+"
- [[ format(order_line.notes or removeParentNode('tr')) ]]
-
-
diff --git a/addons/purchase/res_config.py b/addons/purchase/res_config.py
index b5bc12c3376..f14c6b23fbc 100644
--- a/addons/purchase/res_config.py
+++ b/addons/purchase/res_config.py
@@ -43,9 +43,6 @@ Example: 10% for retailers, promotion of 5 EUR on this product, etc."""),
'group_costing_method':fields.boolean("Compute product cost price based on average cost",
implied_group='product.group_costing_method',
help="""Allows you to compute product cost price based on average cost."""),
- 'group_purchase_delivery_address': fields.boolean("Allow a different address for incoming products and invoicing",
- implied_group='purchase.group_delivery_invoice_address',
- help="Allows you to specify different delivery and invoice addresses on a purchase order."),
'module_warning': fields.boolean("Alerts by products or supplier",
help="""Allow to configure notification on products and trigger them when a user wants to purchase a given product or a given supplier.
Example: Product: this product is deprecated, do not purchase more than 5.
diff --git a/addons/purchase/res_config_view.xml b/addons/purchase/res_config_view.xml
index f659d7b437f..7f1cfc64f39 100644
--- a/addons/purchase/res_config_view.xml
+++ b/addons/purchase/res_config_view.xml
@@ -54,10 +54,6 @@
-
\n"
+" Нажмите для создания запроса на закупку.\n"
+"
\n"
+" Запрос на закупку это шаг перед запросом цен.\n"
+" В запросе на закупку (или тендере) вы вводите необходимые\n"
+" товары и запускаете создание запросов цен у поставщиков.\n"
+" После переговоров и рассмотрения всех предложений\n"
+" вы можете утвердить одни и отменить другие.\n"
+"
\n"
+" "
#. module: purchase_requisition
#: report:purchase.requisition:0
#: view:purchase.requisition:0
msgid "Source"
-msgstr ""
+msgstr "Источник"
#. module: purchase_requisition
#: field:purchase.requisition,message_follower_ids:0
msgid "Followers"
-msgstr ""
+msgstr "Подписчики"
#. module: purchase_requisition
#: field:purchase.requisition,warehouse_id:0
@@ -205,7 +217,7 @@ msgstr "Запрос на закупку"
#: view:purchase.requisition:0
#: selection:purchase.requisition,state:0
msgid "Sent to Suppliers"
-msgstr ""
+msgstr "Отправлено поставщикам"
#. module: purchase_requisition
#: help:purchase.requisition,message_summary:0
@@ -213,6 +225,8 @@ msgid ""
"Holds the Chatter summary (number of messages, ...). This summary is "
"directly in html format in order to be inserted in kanban views."
msgstr ""
+"Содержит сводку по Чаттеру (количество сообщений,...). Эта сводка в формате "
+"html для возможности использования в канбан виде"
#. module: purchase_requisition
#: view:purchase.requisition:0
@@ -222,7 +236,7 @@ msgstr "Утверждено поставщиком"
#. module: purchase_requisition
#: view:purchase.requisition:0
msgid "Send to Suppliers"
-msgstr ""
+msgstr "Послать поставщикам"
#. module: purchase_requisition
#: report:purchase.requisition:0
@@ -248,7 +262,7 @@ msgstr "Запрос"
#: code:addons/purchase_requisition/purchase_requisition.py:186
#, python-format
msgid "Purchase Requisition has been created."
-msgstr ""
+msgstr "Запрос на закупку был создан."
#. module: purchase_requisition
#: model:ir.model,name:purchase_requisition.model_purchase_requisition_partner
@@ -278,28 +292,28 @@ msgstr "Дата начала"
#. module: purchase_requisition
#: view:purchase.requisition.partner:0
msgid "or"
-msgstr ""
+msgstr "или"
#. module: purchase_requisition
#: field:purchase.requisition.line,product_uom_id:0
msgid "Product Unit of Measure"
-msgstr ""
+msgstr "Ед. изм. продукции"
#. module: purchase_requisition
#: view:purchase.requisition:0
#: field:purchase.requisition,state:0
msgid "Status"
-msgstr ""
+msgstr "Статус"
#. module: purchase_requisition
#: view:purchase.requisition:0
msgid "Terms and Conditions"
-msgstr ""
+msgstr "Условия"
#. module: purchase_requisition
#: sql_constraint:product.product:0
msgid "Error ! Ending Date cannot be set before Beginning Date."
-msgstr ""
+msgstr "Ошибка! Конечная дата не может быть установлена ранее даты начала."
#. module: purchase_requisition
#: view:purchase.order:0
@@ -319,13 +333,13 @@ msgstr "Пользователь"
#. module: purchase_requisition
#: field:purchase.requisition,message_is_follower:0
msgid "Is a Follower"
-msgstr ""
+msgstr "Подписан"
#. module: purchase_requisition
#: field:purchase.requisition,message_comment_ids:0
#: help:purchase.requisition,message_comment_ids:0
msgid "Comments and emails"
-msgstr ""
+msgstr "Комментарии и эл. письма"
#. module: purchase_requisition
#: view:purchase.requisition:0
@@ -336,7 +350,7 @@ msgstr "Искать запрос на закупку"
#: code:addons/purchase_requisition/wizard/purchase_requisition_partner.py:41
#, python-format
msgid "No Product in Tender."
-msgstr ""
+msgstr "Нет товаров в тендере."
#. module: purchase_requisition
#: view:purchase.requisition:0
@@ -346,7 +360,7 @@ msgstr "Отменить заказ на закупку"
#. module: purchase_requisition
#: field:purchase.requisition,message_summary:0
msgid "Summary"
-msgstr ""
+msgstr "Итого"
#. module: purchase_requisition
#: view:purchase.requisition:0
@@ -367,7 +381,7 @@ msgstr "Запрос цен"
#: code:addons/purchase_requisition/purchase_requisition.py:103
#, python-format
msgid "Purchase Requisition has been cancelled."
-msgstr ""
+msgstr "Запрос на закупку был отменен."
#. module: purchase_requisition
#: field:procurement.order,requisition_id:0
@@ -383,7 +397,7 @@ msgstr "Кол-во"
#: code:addons/purchase_requisition/purchase_requisition.py:94
#, python-format
msgid "Draft Requisition has been sent to suppliers."
-msgstr ""
+msgstr "Черновик запроса был отправлен поставщику."
#. module: purchase_requisition
#: view:purchase.requisition.partner:0
@@ -407,6 +421,7 @@ msgid ""
"Check this box to generates purchase requisition instead of generating "
"requests for quotation from procurement."
msgstr ""
+"Отметьте для создания запроса на закупку вместо запроса цен при снабжении."
#. module: purchase_requisition
#: field:purchase.requisition,purchase_ids:0
@@ -421,7 +436,7 @@ msgstr "Ссылка на заказ должны быть уникальной
#. module: purchase_requisition
#: field:purchase.requisition,origin:0
msgid "Source Document"
-msgstr ""
+msgstr "Документ-источник"
#. module: purchase_requisition
#: view:purchase.requisition:0
@@ -433,7 +448,7 @@ msgstr "Ответственный"
#: view:purchase.requisition:0
#: selection:purchase.requisition,state:0
msgid "Purchase Done"
-msgstr ""
+msgstr "Закупка сделана"
#. module: purchase_requisition
#: view:purchase.requisition:0
@@ -461,7 +476,7 @@ msgstr "Описание"
#: code:addons/purchase_requisition/purchase_requisition.py:97
#, python-format
msgid "Purchase Requisition has been set to draft."
-msgstr ""
+msgstr "Запрос на закупку был установлен в черновик."
#. module: purchase_requisition
#: view:purchase.requisition:0
@@ -509,7 +524,7 @@ msgstr "Дата запроса"
#. module: purchase_requisition
#: help:purchase.requisition,message_ids:0
msgid "Messages and communication history"
-msgstr ""
+msgstr "Сообщения и история общения"
#. module: purchase_requisition
#: report:purchase.requisition:0
@@ -525,7 +540,7 @@ msgstr "Срок запроса"
#: code:addons/purchase_requisition/purchase_requisition.py:100
#, python-format
msgid "Purchase Requisition has been done."
-msgstr ""
+msgstr "Запрос на закупку был сделан."
#. module: purchase_requisition
#: model:res.groups,name:purchase_requisition.group_purchase_requisition_manager
diff --git a/addons/purchase_requisition/i18n/zh_CN.po b/addons/purchase_requisition/i18n/zh_CN.po
index 7b827d29521..3d94b02eff2 100644
--- a/addons/purchase_requisition/i18n/zh_CN.po
+++ b/addons/purchase_requisition/i18n/zh_CN.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2012-11-24 02:54+0000\n"
-"PO-Revision-Date: 2012-10-25 17:29+0000\n"
+"PO-Revision-Date: 2012-11-28 08:28+0000\n"
"Last-Translator: ccdos \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-11-25 06:30+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
#. module: purchase_requisition
#: view:purchase.requisition:0
@@ -48,7 +48,7 @@ msgstr ""
#. module: purchase_requisition
#: field:purchase.requisition,message_unread:0
msgid "Unread Messages"
-msgstr ""
+msgstr "未读信息"
#. module: purchase_requisition
#: field:purchase.requisition,company_id:0
@@ -59,7 +59,7 @@ msgstr "公司"
#. module: purchase_requisition
#: help:purchase.requisition,message_unread:0
msgid "If checked new messages require your attention."
-msgstr ""
+msgstr "如果要求你关注新消息，勾选此项"
#. module: purchase_requisition
#: code:addons/purchase_requisition/purchase_requisition.py:153
@@ -67,7 +67,7 @@ msgstr ""
msgid ""
"You have already one %s purchase order for this partner, you must cancel "
"this purchase order to create a new quotation."
-msgstr ""
+msgstr "你对这个供应商已经有个一个 %s 采购单 , 你必须取消采购订单再创建新的请购单."
#. module: purchase_requisition
#: field:purchase.requisition.line,product_qty:0
@@ -77,7 +77,7 @@ msgstr "数量"
#. module: purchase_requisition
#: field:purchase.requisition,message_ids:0
msgid "Messages"
-msgstr ""
+msgstr "消息"
#. module: purchase_requisition
#: model:ir.model,name:purchase_requisition.model_purchase_order
@@ -121,7 +121,7 @@ msgstr "单号"
msgid ""
"You provided an invalid \"EAN13 Barcode\" reference. You may use the "
"\"Internal Reference\" field instead."
-msgstr ""
+msgstr "你提供了一个错误的 \"EAN13 条码\" 编号。你可能要用 “编号”字段替代。"
#. module: purchase_requisition
#: selection:purchase.requisition,exclusive:0
@@ -137,7 +137,7 @@ msgstr "重置为草稿"
#: code:addons/purchase_requisition/purchase_requisition.py:153
#, python-format
msgid "Warning!"
-msgstr ""
+msgstr "警告！"
#. module: purchase_requisition
#: model:ir.actions.act_window,help:purchase_requisition.action_purchase_requisition
@@ -156,17 +156,26 @@ msgid ""
" \n"
" "
msgstr ""
+"