openerp-chinese-team team mailing list archive
-
openerp-chinese-team team
-
Mailing list archive
-
Message #00110
lp:~openerp-chinese-team/openobject-addons/fix-inefficient-mrp-scheduler into lp:openobject-addons
digitalsatori has proposed merging lp:~openerp-chinese-team/openobject-addons/fix-inefficient-mrp-scheduler into lp:openobject-addons.
Requested reviews:
Core devs (core)
Related bugs:
Bug #963031 in OpenERP Addons: "mrp scheduler running very slow when there exists a lot of procurement orders"
https://bugs.launchpad.net/openobject-addons/+bug/963031
For more details, see:
https://code.launchpad.net/~openerp-chinese-team/openobject-addons/fix-inefficient-mrp-scheduler/+merge/99201
When there exists thousands of procurements, sorting by planed_date is extremely time consuming, and it is not necessary. removed sorting, added a domain filter, commit for every 500 procurments processed
--
The attached diff has been truncated due to its size.
https://code.launchpad.net/~openerp-chinese-team/openobject-addons/fix-inefficient-mrp-scheduler/+merge/99201
Your team Open ERP Chinese is subscribed to branch lp:~openerp-chinese-team/openobject-addons/fix-inefficient-mrp-scheduler.
=== modified file 'account/account.py'
--- account/account.py 2012-03-22 14:36:54 +0000
+++ account/account.py 2012-03-25 07:09:26 +0000
@@ -284,8 +284,12 @@
children_and_consolidated = self._get_children_and_consol(cr, uid, ids, context=context)
#compute for each account the balance/debit/credit from the move lines
accounts = {}
+<<<<<<< TREE
res = {}
null_result = dict((fn, 0.0) for fn in field_names)
+=======
+ sums = {}
+>>>>>>> MERGE-SOURCE
if children_and_consolidated:
aml_query = self.pool.get('account.move.line')._query_get(cr, uid, context=context)
@@ -321,7 +325,6 @@
# consolidate accounts with direct children
children_and_consolidated.reverse()
brs = list(self.browse(cr, uid, children_and_consolidated, context=context))
- sums = {}
currency_obj = self.pool.get('res.currency')
while brs:
current = brs.pop(0)
@@ -341,6 +344,7 @@
sums[current.id][fn] += sums[child.id][fn]
else:
sums[current.id][fn] += currency_obj.compute(cr, uid, child.company_id.currency_id.id, current.company_id.currency_id.id, sums[child.id][fn], context=context)
+<<<<<<< TREE
# as we have to relay on values computed before this is calculated separately than previous fields
if current.currency_id and current.exchange_rate and \
@@ -357,6 +361,13 @@
for id in ids:
res[id] = null_result
return res
+=======
+ res = {}
+ null_result = dict((fn, 0.0) for fn in field_names)
+ for id in ids:
+ res[id] = sums.get(id, null_result)
+ return res
+>>>>>>> MERGE-SOURCE
def _get_company_currency(self, cr, uid, ids, field_name, arg, context=None):
result = {}
@@ -490,10 +501,18 @@
'manage this. So if you import from another software system you may have to use the rate at date. ' \
'Incoming transactions always use the rate at date.', \
required=True),
+<<<<<<< TREE
'level': fields.function(_get_level, string='Level', method=True, type='integer',
store={
'account.account': (_get_children_and_consol, ['level', 'parent_id'], 10),
}),
+=======
+ 'level': fields.function(_get_level, string='Level', method=True, type='integer',
+ store={
+ 'account.account': (_get_children_and_consol, ['level', 'parent_id'], 10),
+ }),
+
+>>>>>>> MERGE-SOURCE
}
_defaults = {
@@ -788,11 +807,28 @@
return super(account_journal, self).write(cr, uid, ids, vals, context=context)
def create_sequence(self, cr, uid, vals, context=None):
+<<<<<<< TREE
""" Create new no_gap entry sequence for every new Joural
"""
# in account.journal code is actually the prefix of the sequence
# whereas ir.sequence code is a key to lookup global sequences.
prefix = vals['code'].upper()
+=======
+ """
+ Create new entry sequence for every new Joural
+ """
+ seq_pool = self.pool.get('ir.sequence')
+ seq_typ_pool = self.pool.get('ir.sequence.type')
+
+ name = vals['name']
+ code = vals['code'].lower()
+
+ types = {
+ 'name': name,
+ 'code': code
+ }
+ seq_typ_pool.create(cr, uid, types)
+>>>>>>> MERGE-SOURCE
seq = {
'name': vals['name'],
@@ -801,15 +837,25 @@
'padding': 4,
'number_increment': 1
}
+<<<<<<< TREE
if 'company_id' in vals:
seq['company_id'] = vals['company_id']
return self.pool.get('ir.sequence').create(cr, uid, seq)
+=======
+ if 'company_id' in vals:
+ seq['company_id'] = vals['company_id']
+ return seq_pool.create(cr, uid, seq)
+>>>>>>> MERGE-SOURCE
def create(self, cr, uid, vals, context=None):
if not 'sequence_id' in vals or not vals['sequence_id']:
+<<<<<<< TREE
# if we have the right to create a journal, we should be able to
# create it's sequence.
vals.update({'sequence_id': self.create_sequence(cr, 1, vals, context)})
+=======
+ vals.update({'sequence_id': self.create_sequence(cr, 1, vals, context)})
+>>>>>>> MERGE-SOURCE
return super(account_journal, self).create(cr, uid, vals, context)
def name_get(self, cr, user, ids, context=None):
@@ -846,7 +892,7 @@
if name:
ids = self.search(cr, user, [('code', 'ilike', name)]+ args, limit=limit, context=context)
if not ids:
- ids = self.search(cr, user, [('name', 'ilike', name)]+ args, limit=limit, context=context)#fix it ilike should be replace with operator
+ ids = self.search(cr, user, [('name', operator, name)]+ args, limit=limit, context=context)
return self.name_get(cr, user, ids, context=context)
@@ -1295,10 +1341,38 @@
return False
return True
+<<<<<<< TREE
+=======
+ def _check_period_journal(self, cursor, user, ids, context=None):
+ for move in self.browse(cursor, user, ids, context=context):
+ for line in move.line_id:
+ if line.period_id.id != move.period_id.id:
+ return False
+ if line.journal_id.id != move.journal_id.id:
+ return False
+ return True
+
+ def _check_date(self, cursor, user, ids, context=None):
+ for move in self.browse(cursor, user, ids, context=context):
+ if move.journal_id.allow_date:
+ if not time.strptime(move.date[:10],'%Y-%m-%d') >= time.strptime(move.period_id.date_start, '%Y-%m-%d') or not time.strptime(move.date[:10], '%Y-%m-%d') <= time.strptime(move.period_id.date_stop, '%Y-%m-%d'):
+ return False
+ return True
+
+>>>>>>> MERGE-SOURCE
_constraints = [
(_check_centralisation,
'You can not create more than one move per period on centralized journal',
['journal_id']),
+<<<<<<< TREE
+=======
+ (_check_period_journal,
+ 'You cannot create entries on different periods/journals in the same move',
+ ['line_id']),
+ (_check_date,
+ 'The date of your Journal Entry is not in the defined period!',
+ ['journal_id'])
+>>>>>>> MERGE-SOURCE
]
def post(self, cr, uid, ids, context=None):
@@ -1410,8 +1484,7 @@
if not l[0]:
l[2]['period_id'] = default_period
context['period_id'] = default_period
-
- if 'line_id' in vals:
+ if vals.get('line_id'):
c = context.copy()
c['novalidate'] = True
result = super(account_move, self).create(cr, uid, vals, c)
@@ -1460,7 +1533,12 @@
def _centralise(self, cr, uid, move, mode, context=None):
assert mode in ('debit', 'credit'), 'Invalid Mode' #to prevent sql injection
- currency_obj = self.pool.get('res.currency')
+<<<<<<< TREE
+ currency_obj = self.pool.get('res.currency')
+=======
+ currency_obj = self.pool.get('res.currency')
+ move_line_obj = self.pool.get('account.move.line')
+>>>>>>> MERGE-SOURCE
if context is None:
context = {}
@@ -1487,7 +1565,7 @@
line_id = res[0]
else:
context.update({'journal_id': move.journal_id.id, 'period_id': move.period_id.id})
- line_id = self.pool.get('account.move.line').create(cr, uid, {
+ line_id = move_line_obj.create(cr, uid, {
'name': _(mode.capitalize()+' Centralisation'),
'centralisation': mode,
'account_id': account_id,
@@ -1497,7 +1575,8 @@
'date': move.period_id.date_stop,
'debit': 0.0,
'credit': 0.0,
- }, context)
+ 'state': 'valid',
+ }, context, check=False)
# find the first line of this move with the other mode
# so that we can exclude it from our calculation
@@ -1511,6 +1590,7 @@
cr.execute('SELECT SUM(%s) FROM account_move_line WHERE move_id=%%s AND id!=%%s' % (mode,), (move.id, line_id2))
result = cr.fetchone()[0] or 0.0
cr.execute('update account_move_line set '+mode2+'=%s where id=%s', (result, line_id))
+<<<<<<< TREE
#adjust also the amount in currency if needed
cr.execute("select currency_id, sum(amount_currency) as amount_currency from account_move_line where move_id = %s and currency_id is not null group by currency_id", (move.id,))
@@ -1539,20 +1619,55 @@
'amount_currency': amount_currency,
}, context)
+=======
+
+ #adjust also the amount in currency if needed
+ cr.execute("select currency_id, COALESCE(sum(amount_currency),0.0) as amount_currency from account_move_line where move_id = %s and currency_id is not null group by currency_id", (move.id,))
+ for row in cr.dictfetchall():
+ currency_id = currency_obj.browse(cr, uid, row['currency_id'], context=context)
+ if not currency_obj.is_zero(cr, uid, currency_id, row['amount_currency']):
+ amount_currency = row['amount_currency'] * -1
+ account_id = amount_currency > 0 and move.journal_id.default_debit_account_id.id or move.journal_id.default_credit_account_id.id
+ cr.execute('select id from account_move_line where move_id=%s and centralisation=\'currency\' and currency_id = %s limit 1', (move.id, row['currency_id']))
+ res = cr.fetchone()
+ if res:
+ cr.execute('update account_move_line set amount_currency=%s , account_id=%s where id=%s', (amount_currency, account_id, res[0]))
+ else:
+ context.update({'journal_id': move.journal_id.id, 'period_id': move.period_id.id})
+ line_id = move_line_obj.create(cr, uid, {
+ 'name': _('Currency Adjustment'),
+ 'centralisation': 'currency',
+ 'account_id': account_id,
+ 'move_id': move.id,
+ 'journal_id': move.journal_id.id,
+ 'period_id': move.period_id.id,
+ 'date': move.period_id.date_stop,
+ 'debit': 0.0,
+ 'credit': 0.0,
+ 'currency_id': row['currency_id'],
+ 'amount_currency': amount_currency,
+ }, context)
+
+>>>>>>> MERGE-SOURCE
return True
#
# Validate a balanced move. If it is a centralised journal, create a move.
#
def validate(self, cr, uid, ids, context=None):
+ if context is None:
+ context = {}
if context and ('__last_update' in context):
del context['__last_update']
valid_moves = [] #Maintains a list of moves which can be responsible to create analytic entries
obj_analytic_line = self.pool.get('account.analytic.line')
obj_move_line = self.pool.get('account.move.line')
+
for move in self.browse(cr, uid, ids, context):
# Unlink old analytic lines on move_lines
+ if not move.line_id and not context.get('lines_cancel'):
+ raise osv.except_osv(_('No Move Lines !'), _('Please create some move lines.'))
for obj_line in move.line_id:
for obj in obj_line.analytic_lines:
obj_analytic_line.unlink(cr,uid,obj.id)
@@ -1720,7 +1835,8 @@
AND move.id = line.move_id \
GROUP BY line.tax_code_id',
(parent_ids,) + where_params)
- res=dict(cr.fetchall())
+ res = dict(cr.fetchall())
+ res2 = {}
obj_precision = self.pool.get('decimal.precision')
res2 = {}
for record in self.browse(cr, uid, ids, context=context):
@@ -2140,6 +2256,7 @@
cur_price_unit -= tax.amount
for tax in taxes:
+ amount = 0.0
if tax.type=='percent':
if tax.include_base_amount:
amount = cur_price_unit - (cur_price_unit / (1 + tax.amount))
@@ -3047,12 +3164,21 @@
configured_cmp = [r[0] for r in cr.fetchall()]
unconfigured_cmp = list(set(company_ids)-set(configured_cmp))
for field in res['fields']:
+<<<<<<< TREE
if field == 'company_id':
res['fields'][field]['domain'] = [('id','in',unconfigured_cmp)]
res['fields'][field]['selection'] = [('', '')]
if unconfigured_cmp:
cmp_select = [(line.id, line.name) for line in company_obj.browse(cr, uid, unconfigured_cmp)]
res['fields'][field]['selection'] = cmp_select
+=======
+ if field == 'company_id':
+ res['fields'][field]['domain'] = [('id','in',unconfigured_cmp)]
+ res['fields'][field]['selection'] = [('', '')]
+ if unconfigured_cmp:
+ cmp_select = [(line.id, line.name) for line in self.pool.get('res.company').browse(cr, uid, unconfigured_cmp)]
+ res['fields'][field]['selection'] = cmp_select
+>>>>>>> MERGE-SOURCE
return res
def check_created_journals(self, cr, uid, vals_journal, company_id, context=None):
@@ -3149,6 +3275,7 @@
'default_credit_account_id': _get_default_account(journal_type, 'credit'),
'default_debit_account_id': _get_default_account(journal_type, 'debit'),
}
+<<<<<<< TREE
journal_data.append(vals)
return journal_data
@@ -3161,6 +3288,40 @@
:param company_id: company_id selected from wizard.multi.charts.accounts.
:returns: True
"""
+=======
+ acc_cash_id = obj_acc.create(cr,uid,vals)
+
+ if obj_multi.seq_journal:
+ vals_seq={
+ 'name': _('Bank Journal ') + vals['name'],
+ 'code': 'account.journal',
+ }
+ seq_id = obj_sequence.create(cr,uid,vals_seq)
+
+ #create the bank journal
+ analitical_bank_ids = analytic_journal_obj.search(cr,uid,[('type','=','situation')])
+ analitical_journal_bank = analitical_bank_ids and analitical_bank_ids[0] or False
+
+ vals_journal = {}
+ vals_journal['name']= vals['name']
+ vals_journal['code']= _('BNK') + str(current_num)
+ vals_journal['sequence_id'] = seq_id
+ vals_journal['type'] = line.account_type == 'cash' and 'cash' or 'bank'
+ vals_journal['company_id'] = company_id
+ vals_journal['analytic_journal_id'] = analitical_journal_bank
+
+ if line.currency_id:
+ vals_journal['view_id'] = view_id_cur
+ vals_journal['currency'] = line.currency_id.id
+ else:
+ vals_journal['view_id'] = view_id_cash
+ vals_journal['default_credit_account_id'] = acc_cash_id
+ vals_journal['default_debit_account_id'] = acc_cash_id
+ obj_journal.create(cr, uid, vals_journal)
+ current_num += 1
+
+ #create the properties
+>>>>>>> MERGE-SOURCE
property_obj = self.pool.get('ir.property')
field_obj = self.pool.get('ir.model.fields')
todo_list = [
=== modified file 'account/account_analytic_line.py'
--- account/account_analytic_line.py 2012-02-13 18:07:41 +0000
+++ account/account_analytic_line.py 2012-03-25 07:09:26 +0000
@@ -65,13 +65,13 @@
# property_valuation_price_type property
def on_change_unit_amount(self, cr, uid, id, prod_id, quantity, company_id,
unit=False, journal_id=False, context=None):
- if context==None:
- context={}
+ if context is None:
+ context = {}
if not journal_id:
j_ids = self.pool.get('account.analytic.journal').search(cr, uid, [('type','=','purchase')])
journal_id = j_ids and j_ids[0] or False
if not journal_id or not prod_id:
- return {}
+ return {'value': {}}
product_obj = self.pool.get('product.product')
analytic_journal_obj =self.pool.get('account.analytic.journal')
product_price_type_obj = self.pool.get('product.price.type')
=== modified file 'account/account_assert_test.xml'
--- account/account_assert_test.xml 2011-01-14 00:11:01 +0000
+++ account/account_assert_test.xml 2012-03-25 07:09:26 +0000
@@ -2,7 +2,7 @@
<openerp>
<data>
<assert model="account.move" search="[]" string="For all Journal Items, the state is valid implies that the sum of credits equals the sum of debits">
- <test expr="not len(line_id) or line_id[0].state != 'valid' or (sum([l.debit - l.credit for l in line_id]) <= 0.00001)"/>
+ <test expr="not len(line_id) or line_id[0].state != 'valid' or abs(sum([l.debit - l.credit for l in line_id]) <= 0.00001)"/>
</assert>
</data>
</openerp>
=== modified file 'account/account_bank_statement.py'
--- account/account_bank_statement.py 2012-03-22 14:36:54 +0000
+++ account/account_bank_statement.py 2012-03-25 07:09:26 +0000
@@ -301,8 +301,8 @@
raise osv.except_osv(_('Error !'),
_('Journal item "%s" is not valid.') % line.name)
- # Bank statements will not consider boolean on journal entry_posted
- account_move_obj.post(cr, uid, [move_id], context=context)
+ if st.journal_id.entry_posted:
+ account_move_obj.post(cr, uid, [move_id], context=context)
return move_id
def get_next_st_line_number(self, cr, uid, st_number, st_line, context=None):
@@ -484,7 +484,11 @@
}
_defaults = {
'name': lambda self,cr,uid,context={}: self.pool.get('ir.sequence').get(cr, uid, 'account.bank.statement.line'),
+<<<<<<< TREE
'date': lambda self,cr,uid,context={}: context.get('date', fields.date.context_today(self,cr,uid,context=context)),
+=======
+ 'date': lambda self, cr, uid, context, *a: context.get('date') or time.strftime('%Y-%m-%d'),
+>>>>>>> MERGE-SOURCE
'type': 'general',
}
=== modified file 'account/account_invoice.py'
--- account/account_invoice.py 2012-02-28 14:08:16 +0000
+++ account/account_invoice.py 2012-03-25 07:09:26 +0000
@@ -80,8 +80,11 @@
def _reconciled(self, cr, uid, ids, name, args, context=None):
res = {}
- for id in ids:
- res[id] = self.test_paid(cr, uid, [id])
+ wf_service = netsvc.LocalService("workflow")
+ for inv in self.browse(cr, uid, ids, context=context):
+ res[inv.id] = self.test_paid(cr, uid, [inv.id])
+ if not res[inv.id] and inv.state == 'paid':
+ wf_service.trg_validate(uid, 'account.invoice', inv.id, 'open_test', cr)
return res
def _get_reference_type(self, cr, uid, context=None):
@@ -253,8 +256,13 @@
'currency_id': fields.many2one('res.currency', 'Currency', required=True, readonly=True, states={'draft':[('readonly',False)]}),
'journal_id': fields.many2one('account.journal', 'Journal', required=True, readonly=True, states={'draft':[('readonly',False)]}),
'company_id': fields.many2one('res.company', 'Company', required=True, change_default=True, readonly=True, states={'draft':[('readonly',False)]}),
+<<<<<<< TREE
'check_total': fields.float('Verification Total', digits_compute=dp.get_precision('Account'), states={'open':[('readonly',True)],'close':[('readonly',True)]}),
'reconciled': fields.function(_reconciled, string='Paid/Reconciled', type='boolean',
+=======
+ 'check_total': fields.float('Total', digits_compute=dp.get_precision('Account'), states={'open':[('readonly',True)],'close':[('readonly',True)],'paid':[('readonly',True)]}),
+ 'reconciled': fields.function(_reconciled, method=True, string='Paid/Reconciled', type='boolean',
+>>>>>>> MERGE-SOURCE
store={
'account.invoice': (lambda self, cr, uid, ids, c={}: ids, None, 50), # Check if we can remove ?
'account.move.line': (_get_invoice_from_line, None, 50),
@@ -617,7 +625,11 @@
'move_id':False,
'move_name':False,
'internal_number': False,
+<<<<<<< TREE
'period_id': False,
+=======
+ 'period_id': False
+>>>>>>> MERGE-SOURCE
})
if 'date_invoice' not in default:
default.update({
@@ -1092,7 +1104,7 @@
return map(lambda x: (0,0,x), lines)
def refund(self, cr, uid, ids, date=None, period_id=None, description=None, journal_id=None):
- invoices = self.read(cr, uid, ids, ['name', 'type', 'number', 'reference', 'comment', 'date_due', 'partner_id', 'address_contact_id', 'address_invoice_id', 'partner_contact', 'partner_insite', 'partner_ref', 'payment_term', 'account_id', 'currency_id', 'invoice_line', 'tax_line', 'journal_id'])
+ invoices = self.read(cr, uid, ids, ['name', 'type', 'number', 'reference', 'comment', 'date_due', 'partner_id', 'address_contact_id', 'address_invoice_id', 'partner_contact', 'partner_insite', 'partner_ref', 'payment_term', 'account_id', 'currency_id', 'invoice_line', 'tax_line', 'journal_id', 'user_id', 'fiscal_position'])
obj_invoice_line = self.pool.get('account.invoice.line')
obj_invoice_tax = self.pool.get('account.invoice.tax')
obj_journal = self.pool.get('account.journal')
@@ -1141,7 +1153,8 @@
})
# take the id part of the tuple returned for many2one fields
for field in ('address_contact_id', 'address_invoice_id', 'partner_id',
- 'account_id', 'currency_id', 'payment_term', 'journal_id'):
+ 'account_id', 'currency_id', 'payment_term', 'journal_id',
+ 'user_id', 'fiscal_position'):
invoice[field] = invoice[field] and invoice[field][0]
# create the new invoice
new_ids.append(self.create(cr, uid, invoice))
@@ -1331,10 +1344,14 @@
if not partner_id:
raise osv.except_osv(_('No Partner Defined !'),_("You must first select a partner !") )
if not product:
+<<<<<<< TREE
if type in ('in_invoice', 'in_refund'):
return {'value': {}, 'domain':{'product_uom':[]}}
else:
return {'value': {'price_unit': 0.0}, 'domain':{'product_uom':[]}}
+=======
+ return {'value': {'price_unit': 0.0, 'categ_id': False}, 'domain':{'product_uom':[]}}
+>>>>>>> MERGE-SOURCE
part = self.pool.get('res.partner').browse(cr, uid, partner_id, context=context)
fpos_obj = self.pool.get('account.fiscal.position')
fpos = fposition_id and fpos_obj.browse(cr, uid, fposition_id, context=context) or False
=== modified file 'account/account_invoice_view.xml'
--- account/account_invoice_view.xml 2012-02-28 14:08:16 +0000
+++ account/account_invoice_view.xml 2012-03-25 07:09:26 +0000
@@ -508,7 +508,11 @@
<act_window
id="act_account_journal_2_account_invoice_opened"
name="Unpaid Invoices"
+<<<<<<< TREE
context="{'search_default_journal_id': [active_id], 'search_default_unpaid':1, 'default_journal_id': active_id}"
+=======
+ context="{'search_default_journal_id': active_id, 'search_default_unpaid':1, 'default_journal_id': active_id}"
+>>>>>>> MERGE-SOURCE
res_model="account.invoice"
src_model="account.journal"/>
=== modified file 'account/account_move_line.py'
--- account/account_move_line.py 2012-02-13 18:07:41 +0000
+++ account/account_move_line.py 2012-03-25 07:09:26 +0000
@@ -228,8 +228,21 @@
# Compute simple values
data = super(account_move_line, self).default_get(cr, uid, fields, context=context)
# Starts: Manual entry from account.move form
+<<<<<<< TREE
if context.get('lines'):
total_new = context.get('balance', 0.00)
+=======
+ if context.get('lines',[]):
+ total_new = 0.00
+ for line_record in context['lines']:
+ if not isinstance(line_record, (tuple, list)):
+ line_record_detail = self.read(cr, uid, line_record, ['analytic_account_id','debit','credit','name','reconcile_id','tax_code_id','tax_amount','account_id','ref','currency_id','date_maturity','amount_currency','partner_id', 'reconcile_partial_id'])
+ else:
+ line_record_detail = line_record[2]
+ total_new += (line_record_detail['debit'] or 0.00)- (line_record_detail['credit'] or 0.00)
+ for item in line_record_detail.keys():
+ data[item] = line_record_detail[item]
+>>>>>>> MERGE-SOURCE
if context['journal']:
journal_data = journal_obj.browse(cr, uid, context['journal'], context=context)
if journal_data.type == 'purchase':
@@ -506,8 +519,13 @@
}),
'date_created': fields.date('Creation date', select=True),
'analytic_lines': fields.one2many('account.analytic.line', 'move_id', 'Analytic lines'),
+<<<<<<< TREE
'centralisation': fields.selection([('normal','Normal'),('credit','Credit Centralisation'),('debit','Debit Centralisation'),('currency','Currency Adjustment')], 'Centralisation', size=8),
'balance': fields.function(_balance, fnct_search=_balance_search, string='Balance'),
+=======
+ 'centralisation': fields.selection([('normal','Normal'),('credit','Credit Centralisation'),('debit','Debit Centralisation'),('currency','Currency Adjustment')], 'Centralisation', size=8),
+ 'balance': fields.function(_balance, fnct_search=_balance_search, method=True, string='Balance'),
+>>>>>>> MERGE-SOURCE
'state': fields.selection([('draft','Unbalanced'), ('valid','Valid')], 'State', readonly=True,
help='When new move line is created the state will be \'Draft\'.\n* When all the payments are done it will be in \'Valid\' state.'),
'tax_code_id': fields.many2one('account.tax.code', 'Tax Account', help="The Account can either be a base tax code or a tax code account."),
@@ -553,9 +571,13 @@
'date_created': fields.date.context_today,
'state': 'draft',
'currency_id': _get_currency,
+<<<<<<< TREE
'journal_id': lambda self, cr, uid, c: c.get('journal_id', False),
'credit': 0.0,
'debit': 0.0,
+=======
+ 'journal_id': lambda self, cr, uid, c: c.get('journal_id', c.get('journal',False)),
+>>>>>>> MERGE-SOURCE
'account_id': lambda self, cr, uid, c: c.get('account_id', False),
'period_id': lambda self, cr, uid, c: c.get('period_id', False),
'company_id': lambda self, cr, uid, c: self.pool.get('res.company')._company_default_get(cr, uid, 'account.move.line', context=c)
@@ -592,6 +614,13 @@
if l.company_id != l.account_id.company_id or l.company_id != l.period_id.company_id:
return False
return True
+
+ def _check_date(self, cr, uid, ids, context=None):
+ for line in self.browse(cr, uid, ids, context=context):
+ if line.journal_id.allow_date:
+ if not time.strptime(line.date[:10],'%Y-%m-%d') >= time.strptime(line.period_id.date_start, '%Y-%m-%d') or not time.strptime(line.date[:10], '%Y-%m-%d') <= time.strptime(line.period_id.date_stop, '%Y-%m-%d'):
+ return False
+ return True
def _check_date(self, cr, uid, ids, context=None):
for l in self.browse(cr, uid, ids, context=context):
@@ -608,11 +637,18 @@
return True
_constraints = [
+<<<<<<< TREE
(_check_no_view, 'You can not create journal items on an account of type view.', ['account_id']),
(_check_no_closed, 'You can not create journal items on closed account.', ['account_id']),
(_check_company_id, 'Company must be the same for its related account and period.', ['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_no_view, 'You can not create move line on view account.', ['account_id']),
+ (_check_no_closed, 'You can not create move line on closed account.', ['account_id']),
+ (_check_company_id, 'Company must be same for its related account and period.',['company_id'] ),
+ (_check_date, 'The date of your Journal Entry is not in the defined period!', ['date']),
+>>>>>>> MERGE-SOURCE
]
#TODO: ONCHANGE_ACCOUNT_ID: set account_tax_id
@@ -700,6 +736,12 @@
def search(self, cr, uid, args, offset=0, limit=None, order=None, context=None, count=False):
if context is None:
context = {}
+ if context and context.get('fiscalyear', False):
+ periods = self.pool.get('account.fiscalyear').browse(cr, uid, context.get('fiscalyear'), context=context).period_ids
+ period_ids = [period.id for period in periods]
+ args.append(('period_id', 'in', period_ids))
+ if context and context.get('periods', False):
+ args.append(('period_id', 'in', context.get('periods')))
if context and context.get('next_partner_only', False):
if not context.get('partner_id', False):
partner = self.get_next_partner_only(cr, uid, offset, context)
@@ -751,7 +793,7 @@
else:
currency_id = line.company_id.currency_id
if line.reconcile_id:
- raise osv.except_osv(_('Warning'), _('Already Reconciled!'))
+ raise osv.except_osv(_('Warning'), _("Journal Item '%s' (id: %s), Move '%s' is already reconciled!") % (line.name, line.id, line.move_id.name))
if line.reconcile_partial_id:
for line2 in line.reconcile_partial_id.line_partial_ids:
if not line2.reconcile_id:
@@ -828,7 +870,7 @@
raise osv.except_osv(_('Error'), _('Some entries are already reconciled !'))
if (not currency_obj.is_zero(cr, uid, account.company_id.currency_id, writeoff)) or \
- (account.currency_id and (not currency_obj.is_zero(cr, uid, account.currency_id, currency))):
+ (not context.get('fy_closing', False) and account.currency_id and (not currency_obj.is_zero(cr, uid, account.currency_id, currency))):
if not writeoff_acc_id:
raise osv.except_osv(_('Warning'), _('You have to provide an account for the write off/exchange difference entry !'))
if writeoff > 0:
@@ -1044,8 +1086,12 @@
f.set('context', "{'journal_id': journal_id}")
elif field == 'account_id' and journal.id:
+<<<<<<< TREE
f.set('domain', "[('journal_id', '=', journal_id),('type','!=','view'), ('type','!=','closed')]")
f.set('on_change', 'onchange_account_id(account_id, partner_id)')
+=======
+ attrs.append('domain="[(\'journal_id\', \'=\', journal_id),(\'type\',\'<>\',\'view\'), (\'type\',\'<>\',\'closed\')]" on_change="onchange_account_id(account_id, partner_id)"')
+>>>>>>> MERGE-SOURCE
elif field == 'partner_id':
f.set('on_change', 'onchange_partner_id(move_id, partner_id, account_id, debit, credit, date, journal_id)')
@@ -1127,9 +1173,15 @@
context['journal_id'] = line.journal_id.id
context['period_id'] = line.period_id.id
result = super(account_move_line, self).unlink(cr, uid, [line.id], context=context)
+<<<<<<< TREE
move_ids = list(move_ids)
if check and move_ids:
move_obj.validate(cr, uid, move_ids, context=context)
+=======
+ if check:
+ context.update({'lines_cancel': 'cancel'})
+ move_obj.validate(cr, uid, [line.move_id.id], context=context)
+>>>>>>> MERGE-SOURCE
return result
def write(self, cr, uid, ids, vals, context=None, check=True, update_check=True):
=== modified file 'account/account_report.xml'
--- account/account_report.xml 2012-02-03 14:53:20 +0000
+++ account/account_report.xml 2012-03-25 07:09:26 +0000
@@ -48,5 +48,21 @@
auto="False"
menu="False"/>
+ <report id="account_balance_sheet"
+ string="Balance Sheet"
+ model="account.account"
+ name="account.balancesheet"
+ rml="account/report/account_balance_sheet.rml"
+ auto="False"
+ menu="False"/>
+
+ <report id="account_balance_sheet_horizontal"
+ string="Balance Sheet Horizontal"
+ model="account.account"
+ name="account.balancesheet.horizontal"
+ rml="account/report/account_balance_sheet_horizontal.rml"
+ auto="False"
+ menu="False"/>
+
</data>
</openerp>
=== modified file 'account/account_view.xml'
--- account/account_view.xml 2012-03-05 09:43:00 +0000
+++ account/account_view.xml 2012-03-25 07:09:26 +0000
@@ -229,7 +229,7 @@
<field name="name">account.account.list</field>
<field name="model">account.account</field>
<field name="type">tree</field>
- <field name="field_parent">child_id</field>
+ <field name="priority" eval="1"/>
<field name="arch" type="xml">
<tree colors="blue:type == 'view';black:type in ('other','receivable','payable','consolidation');gray:type == 'closed'" string="Chart of accounts" toolbar="1" >
<field name="code"/>
@@ -464,7 +464,7 @@
<group col="2" colspan="2">
<group colspan="2" col="2">
<separator string="Accounts" colspan="4"/>
- <field name="default_debit_account_id" attrs="{'required':[('type','in', ('cash', 'bank'))]}" domain="[('type','<>','view'),('type','<>','consolidation')]"/>
+ <field name="default_debit_account_id" attrs="{'required':[('type','in',('cash', 'bank'))]}" domain="[('type','<>','view'),('type','<>','consolidation')]"/>
<field name="default_credit_account_id" attrs="{'required':[('type','in',('cash', 'bank'))]}" domain="[('type','<>','view'),('type','<>','consolidation')]"/>
</group>
<group colspan="2" col="2">
@@ -634,7 +634,23 @@
</field>
</page>
<page string="Journal Entries" name="move_live_ids">
- <field colspan="4" name="move_line_ids" nolabel="1"/>
+ <field colspan="4" name="move_line_ids" nolabel="1" mode="tree,form">
+ <tree string="Journal Items" editable="top" on_write="on_create_write">
+ <field name="move_id"/>
+ <field name="ref"/>
+ <field name="date"/>
+ <field name="period_id"/>
+ <field name="partner_id" on_change="onchange_partner_id(move_id, partner_id, account_id, debit, credit, date, journal_id)"/>
+ <field name="account_id"/>
+ <field name="name"/>
+ <field name="journal_id" invisible="1"/>
+ <field name="debit" sum="Total debit"/>
+ <field name="credit" sum="Total credit"/>
+ <field name="reconcile_partial_id" groups="base.group_extended"/>
+ <field name="reconcile_id"/>
+ <field name="state"/>
+ </tree>
+ </field>
</page>
</notebook>
<group col="8" colspan="4">
@@ -1356,10 +1372,14 @@
</group>
<notebook colspan="4">
<page string="Journal Items">
+<<<<<<< TREE
<field name="balance" invisible="1"/>
<field colspan="4" name="line_id" nolabel="1" height="250" widget="one2many_list"
on_change="onchange_line_id(line_id)"
context="{'balance': balance , 'journal': journal_id }">
+=======
+ <field colspan="4" name="line_id" nolabel="1" height="250" widget="one2many_list" default_get="{'lines':line_id , 'journal':journal_id, 'period_id':period_id}">
+>>>>>>> MERGE-SOURCE
<form string="Journal Item">
<group col="6" colspan="4">
<field name="name"/>
@@ -2041,6 +2061,7 @@
res_model="account.move.line"
src_model="account.journal"/>
+<<<<<<< TREE
<act_window
context="{'search_default_reconcile_id':False, 'search_default_partner_id':[active_id], 'default_partner_id': active_id}"
domain="[('account_id.reconcile', '=', True),('account_id.type', 'in', ['receivable', 'payable'])]"
@@ -2049,6 +2070,9 @@
res_model="account.move.line"
src_model="res.partner"
groups="base.group_extended"/>
+=======
+ <act_window context="{'search_default_reconcile_id':False, 'search_default_partner_id':[active_id], 'default_partner_id': active_id}" domain="[('account_id.reconcile', '=', True),('account_id.type', 'in', ['receivable', 'payable'])]" id="act_account_partner_account_move_all" name="Receivables & Payables" res_model="account.move.line" src_model="res.partner" groups="base.group_extended"/>
+>>>>>>> MERGE-SOURCE
<act_window context="{'search_default_partner_id':[active_id], 'default_partner_id': active_id}" id="act_account_partner_account_move" name="Journal Items" res_model="account.move.line" src_model="res.partner" groups="account.group_account_user"/>
=== modified file 'account/board_account_view.xml'
--- account/board_account_view.xml 2012-03-05 09:47:32 +0000
+++ account/board_account_view.xml 2012-03-25 07:09:26 +0000
@@ -1,6 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
+<<<<<<< TREE
+=======
+
+ <record id="note_account_type" model="board.note.type">
+ <field name="name">Accountants</field>
+ </record>
+
+>>>>>>> MERGE-SOURCE
<record id="action_aged_receivable" model="ir.actions.act_window">
<field name="name">Receivable Accounts</field>
<field name="res_model">report.account.receivable</field>
@@ -15,6 +23,7 @@
<field name="view_mode">graph,tree</field>
<field name="domain">[('type','=','income')]</field>
</record>
+<<<<<<< TREE
<record id="action_company_analysis_tree" model="ir.actions.act_window">
<field name="name">Company Analysis</field>
<field name="res_model">account.entries.report</field>
@@ -33,12 +42,46 @@
<field name="context">{'default_type': 'liquidity'}</field>
<field name="view_id" ref="account.view_treasory_graph"/>
</record>
+=======
+
+ <record id="action_company_analysis_tree" model="ir.actions.act_window">
+ <field name="name">Company Analysis</field>
+ <field name="res_model">account.entries.report</field>
+ <field name="view_type">form</field>
+ <field name="view_mode">tree,graph</field>
+ <field name="context">{'group_by':['user_type'], 'group_by_no_leaf':1}</field>
+ <field name="view_id" ref="account.view_account_entries_report_tree"/>
+ <field name="domain">[('year','=',time.strftime('%Y'))]</field>
+ </record>
+
+ <record id="action_treasory_graph" model="ir.actions.act_window">
+ <field name="name">Treasury</field>
+ <field name="res_model">account.account</field>
+ <field name="view_type">form</field>
+ <field name="view_mode">graph,tree</field>
+ <field name="domain">[('type','=','liquidity')]</field>
+ <field name="view_id" ref="account.view_treasory_graph"/>
+ </record>
+
+ <record id="action_draft_customer_invoices_dashboard" model="ir.actions.act_window">
+ <field name="name">Customer Invoices to Approve</field>
+ <field name="res_model">account.invoice</field>
+ <field name="view_type">form</field>
+ <field name="view_mode">tree,form,calendar,graph</field>
+ <field eval="False" name="view_id"/>
+ <field name="domain">[('state','=','draft'),('type','=','out_invoice')]</field>
+ <field name="context">{'type':'out_invoice', 'journal_type': 'sale'}</field>
+ <field name="search_view_id" ref="account.view_account_invoice_filter"/>
+ </record>
+
+>>>>>>> MERGE-SOURCE
<record id="board_account_form" model="ir.ui.view">
<field name="name">board.account.form</field>
<field name="model">board.board</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Account Board">
+<<<<<<< TREE
<board style="2-1">
<column>
<action name="%(account.action_invoice_tree1)d" creatable="true" string="Draft Customer Invoices" domain="[('state','in',('draft','proforma2')), ('type','=','out_invoice')]"/>
@@ -48,6 +91,19 @@
<action name="%(action_treasory_graph)d" string="Treasury"/> <!--groups="account.group_account_manager,account.group_account_user"-->
</column>
</board>
+=======
+ <hpaned>
+ <child1>
+ <action colspan="4" height="160" width="400" name="%(action_draft_customer_invoices_dashboard)d" string="Customer Invoices to Approve" />
+ <action colspan="4" height="160" width="400" name="%(action_company_analysis_tree)d" string="Company Analysis" groups="account.group_account_manager"/>
+ </child1>
+ <child2>
+ <action colspan="4" height="220" name="%(action_treasory_graph)d" string="Treasury" groups="account.group_account_manager,account.group_account_user"/>
+ <action colspan="4" height="220" name="%(action_aged_receivable)d" string="Aged Receivables" groups="account.group_account_manager,account.group_account_user"/>
+ <!-- <action colspan="4" height="220" name="%(action_aged_income)d" string="Aged income"/> -->
+ </child2>
+ </hpaned>
+>>>>>>> MERGE-SOURCE
</form>
</field>
</record>
=== modified file 'account/configurable_account_chart.xml'
--- account/configurable_account_chart.xml 2011-12-30 11:06:04 +0000
+++ account/configurable_account_chart.xml 2012-03-25 07:09:26 +0000
@@ -30,10 +30,24 @@
<record model="account.account.type" id="conf_account_type_equity">
<field name="name">Equity</field>
<field name="code">equity</field>
+<<<<<<< TREE
<field name="close_method">balance</field>
<field name="report_type">liability</field>
</record>
<record model="account.account.type" id="conf_account_type_chk">
+=======
+ <field name="report_type">liability</field>
+ <field name="close_method">balance</field>
+ </record>
+
+ <record model="account.account.type" id="conf_account_type_bnk">
+ <field name="name">Bank</field>
+ <field name="code">bank</field>
+ <field name="report_type">asset</field>
+ <field name="close_method">balance</field>
+ </record>
+ <record model="account.account.type" id="conf_account_type_chk">
+>>>>>>> MERGE-SOURCE
<field name="name">Check</field>
<field name="code">check</field>
<field name="close_method">balance</field>
=== modified file 'account/demo/account_minimal.xml'
--- account/demo/account_minimal.xml 2011-12-19 16:54:40 +0000
+++ account/demo/account_minimal.xml 2012-03-25 07:09:26 +0000
@@ -8,8 +8,19 @@
<record id="account_type_cash_equity" model="account.account.type">
<field name="name">Equity</field>
<field name="code">equity</field>
- <field name="close_method">balance</field>
- <field name="report_type">liability</field>
+<<<<<<< TREE
+ <field name="close_method">balance</field>
+ <field name="report_type">liability</field>
+=======
+ <field name="report_type">liability</field>
+ <field name="close_method">balance</field>
+ </record>
+ <record id="account_type_cash_moves" model="account.account.type">
+ <field name="name">Cash</field>
+ <field name="code">cash</field>
+ <field name="report_type">asset</field>
+ <field name="close_method">balance</field>
+>>>>>>> MERGE-SOURCE
</record>
<!--
=== modified file 'account/i18n/account.pot'
--- account/i18n/account.pot 2012-02-08 01:08:30 +0000
+++ account/i18n/account.pot 2012-03-25 07:09:26 +0000
@@ -4,10 +4,17 @@
#
msgid ""
msgstr ""
+<<<<<<< TREE
"Project-Id-Version: OpenERP Server 6.1rc1\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2012-02-08 00:35+0000\n"
"PO-Revision-Date: 2012-02-08 00:35+0000\n"
+=======
+"Project-Id-Version: OpenERP Server 6.0.2\n"
+"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
+"POT-Creation-Date: 2011-05-09 10:18+0000\n"
+"PO-Revision-Date: 2011-05-09 10:18+0000\n"
+>>>>>>> MERGE-SOURCE
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -32,8 +39,14 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: help:account.tax.code,sequence:0
msgid "Determine the display order in the report 'Accounting \\ Reporting \\ Generic Reporting \\ Taxes \\ Taxes Report'"
+=======
+#: code:addons/account/account.py:516
+#, python-format
+msgid "You cannot remove/deactivate an account which is set as a property to any Partner."
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -60,6 +73,15 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/invoice.py:793
+#, python-format
+msgid "Please define sequence on invoice journal"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: constraint:account.period:0
msgid "Error ! The duration of the Period(s) is/are invalid. "
msgstr ""
@@ -106,8 +128,19 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: constraint:account.journal:0
msgid "Configuration error! The currency chosen should be shared by the default accounts too."
+=======
+#: report:account.tax.code.entries:0
+msgid "Accounting Entries-"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1305
+#, python-format
+msgid "You can not delete posted movement: \"%s\"!"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -146,7 +179,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:1428
+=======
+#: code:addons/account/invoice.py:1436
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Warning!"
msgstr ""
@@ -201,6 +238,16 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account.py:915
+#, python-format
+msgid "No period defined for this date: %s !\n"
+"Please create a fiscal year."
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: model:ir.model,name:account.model_account_move_line_reconcile_select
msgid "Move line reconcile select"
msgstr ""
@@ -212,7 +259,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:1241
+=======
+#: code:addons/account/invoice.py:1224
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
msgstr ""
@@ -228,7 +279,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_move_line.py:1200
+=======
+#: code:addons/account/account_move_line.py:1182
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "You can not add/modify entries in a closed journal."
msgstr ""
@@ -271,7 +326,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:551
+=======
+#: code:addons/account/invoice.py:532
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Invoice line account company does not match with invoice company."
msgstr ""
@@ -503,9 +562,15 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: report:account.general.ledger:0
#: report:account.general.ledger_landscape:0
msgid "Counterpart"
+=======
+#: code:addons/account/account_cash_statement.py:349
+#, python-format
+msgid "CashBox Balance is not matching with Calculated Balance !"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -593,7 +658,12 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:3116
+=======
+#: code:addons/account/account.py:2823
+#: code:addons/account/installer.py:434
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "SAJ"
msgstr ""
@@ -620,8 +690,13 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_move_line.py:750
#: code:addons/account/account_move_line.py:803
+=======
+#: code:addons/account/account_move_line.py:723
+#: code:addons/account/account_move_line.py:767
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "To reconcile the entries company should be the same for all entries"
msgstr ""
@@ -697,12 +772,16 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: field:account.invoice.refund,filter_refund:0
msgid "Refund Method"
msgstr ""
#. module: account
#: code:addons/account/wizard/account_change_currency.py:38
+=======
+#: code:addons/account/wizard/account_change_currency.py:38
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "You can only change currency for Draft Invoice !"
msgstr ""
@@ -823,8 +902,14 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: field:account.cashbox.line,pieces:0
msgid "Values"
+=======
+#: code:addons/account/account_move_line.py:1197
+#, python-format
+msgid "You can not do this modification on a confirmed entry ! Please note that you can just change some non important fields !"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -847,6 +932,7 @@
#. module: account
#: report:account.overdue:0
+#: report:account.aged_trial_balance:0
msgid "Due"
msgstr ""
@@ -951,15 +1037,28 @@
#: field:account.journal,code:0
#: report:account.partner.balance:0
#: field:account.period,code:0
+#: report:account.balancesheet.horizontal:0
+#: report:account.balancesheet:0
+#: report:pl.account.horizontal:0
+#: report:pl.account:0
msgid "Code"
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:2268
#: code:addons/account/account_bank_statement.py:357
#: code:addons/account/account_invoice.py:73
#: code:addons/account/account_invoice.py:688
#: code:addons/account/account_move_line.py:173
+=======
+#: code:addons/account/account.py:2097
+#: code:addons/account/account_bank_statement.py:350
+#: code:addons/account/account_move_line.py:169
+#: code:addons/account/invoice.py:73
+#: code:addons/account/invoice.py:678
+#: code:addons/account/wizard/account_use_model.py:81
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "No Analytic Journal !"
msgstr ""
@@ -1161,14 +1260,23 @@
#. module: account
#: report:account.general.ledger:0
-#: report:account.general.ledger_landscape:0
+<<<<<<< TREE
+#: report:account.general.ledger_landscape:0
+=======
+#: report:account.general.ledger_landscape:0
+#: report:account.tax.code.entries:0
+>>>>>>> MERGE-SOURCE
#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
msgid "Entry Label"
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:1129
+=======
+#: code:addons/account/account.py:990
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "You can not modify/delete a journal with entries for this period !"
msgstr ""
@@ -1316,6 +1424,7 @@
#. module: account
#: model:ir.ui.menu,name:account.next_id_22
+#: report:account.aged_trial_balance:0
msgid "Partners"
msgstr ""
@@ -1339,6 +1448,15 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account_move_line.py:1277
+#, python-format
+msgid "You can not use this general account in this journal !"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: selection:account.balance.report,display_account:0
#: selection:account.common.account.report,display_account:0
#: selection:account.partner.balance,display_partner:0
@@ -1420,6 +1538,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: selection:account.account,type:0
#: selection:account.account.template,type:0
#: selection:account.bank.statement,state:0
@@ -1428,6 +1547,28 @@
#: selection:account.fiscalyear,state:0
#: selection:account.period,state:0
msgid "Closed"
+=======
+#: view:account.payment.term.line:0
+msgid "Example: at 14 net days 2 percents, remaining amount at 30 days end of month."
+msgstr ""
+
+#. module: account
+#: code:addons/account/invoice.py:823
+#, python-format
+msgid "Cannot create the invoice !\n"
+"The payment term defined gives a computed amount greater than the total invoiced amount."
+msgstr ""
+
+#. module: account
+#: field:account.installer.modules,account_anglo_saxon:0
+msgid "Anglo-Saxon Accounting"
+msgstr ""
+
+#. module: account
+#: view:account.automatic.reconcile:0
+#: view:account.move.line.reconcile.writeoff:0
+msgid "Write-Off Move"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -1584,12 +1725,15 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:1429
#, python-format
msgid "You selected an Unit of Measure which is not compatible with the product."
msgstr ""
#. module: account
+=======
+>>>>>>> MERGE-SOURCE
#: view:account.change.currency:0
msgid "This wizard will change the currency of the invoice"
msgstr ""
@@ -1600,6 +1744,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: view:account.analytic.account:0
msgid "Pending Accounts"
msgstr ""
@@ -1607,6 +1752,21 @@
#. module: account
#: view:account.tax.template:0
msgid "Tax Declaration"
+=======
+#: constraint:account.fiscalyear:0
+msgid "Error! You cannot define overlapping fiscal years"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:799
+#, python-format
+msgid "The account is not defined to be reconciled !"
+msgstr ""
+
+#. module: account
+#: field:account.cashbox.line,pieces:0
+msgid "Values"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -1625,6 +1785,15 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account_move_line.py:806
+#, python-format
+msgid "You have to provide an account for the write off entry !"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: model:ir.model,name:account.model_account_common_journal_report
msgid "Account Common Journal Report"
msgstr ""
@@ -1651,7 +1820,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_cash_statement.py:292
+=======
+#: code:addons/account/account_cash_statement.py:329
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "User %s does not have rights to access %s journal !"
msgstr ""
@@ -1672,14 +1845,32 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account.py:509
+#, python-format
+msgid "You cannot deactivate an account that contains account moves."
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: field:account.move.line.reconcile,credit:0
msgid "Credit amount"
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:407
#: code:addons/account/account.py:412
#: code:addons/account/account.py:429
+=======
+#: constraint:account.move.line:0
+msgid "You can not create move line on closed account."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:529
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Error!"
msgstr ""
@@ -1830,6 +2021,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: 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 ""
@@ -1840,6 +2032,8 @@
msgstr ""
#. module: account
+=======
+>>>>>>> MERGE-SOURCE
#: view:account.invoice:0
#: view:report.invoice.created:0
msgid "Untaxed Amount"
@@ -1954,7 +2148,17 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:1461
+=======
+#: code:addons/account/installer.py:348
+#, python-format
+msgid " Journal"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1333
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "There is no default default debit account defined \n"
"on journal \"%s\""
@@ -2014,7 +2218,12 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:3119
+=======
+#: code:addons/account/account.py:2888
+#: code:addons/account/installer.py:498
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "ECNJ"
msgstr ""
@@ -2033,7 +2242,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:370
+=======
+#: code:addons/account/invoice.py:351
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "There is no Accounting Journal of type Sale/Purchase defined!"
msgstr ""
@@ -2104,6 +2317,11 @@
#: field:accounting.report,fiscalyear_id:0
#: field:accounting.report,fiscalyear_id_cmp:0
#: model:ir.model,name:account.model_account_fiscalyear
+#: report:account.balancesheet.horizontal:0
+#: report:account.balancesheet:0
+#: report:pl.account.horizontal:0
+#: report:pl.account:0
+#: report:account.aged_trial_balance:0
msgid "Fiscal Year"
msgstr ""
@@ -2231,7 +2449,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:572
+=======
+#: code:addons/account/invoice.py:552
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Can't find any account journal of %s type for this company.\n"
"\n"
@@ -2305,7 +2527,12 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:3117
+=======
+#: code:addons/account/account.py:2840
+#: code:addons/account/installer.py:454
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "EXJ"
msgstr ""
@@ -2389,7 +2616,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:369
+=======
+#: code:addons/account/invoice.py:350
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Configuration Error!"
msgstr ""
@@ -2405,6 +2636,15 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account.py:654
+#, python-format
+msgid "You cannot modify company of this journal as its related record exist in Entry Lines"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: report:account.journal.period.print:0
#: report:account.journal.period.print.sale.purchase:0
msgid "Label"
@@ -2435,7 +2675,12 @@
#. module: account
#: report:account.general.ledger:0
-#: report:account.general.ledger_landscape:0
+<<<<<<< TREE
+#: report:account.general.ledger_landscape:0
+=======
+#: report:account.general.ledger_landscape:0
+#: report:account.journal.period.print:0
+>>>>>>> MERGE-SOURCE
#: report:account.overdue:0
#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
@@ -2557,15 +2802,27 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:1321
+=======
+#: code:addons/account/account.py:1195
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "No sequence defined on the journal !"
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:2268
#: code:addons/account/account_invoice.py:688
#: code:addons/account/account_move_line.py:173
+=======
+#: code:addons/account/account.py:2097
+#: code:addons/account/account_bank_statement.py:350
+#: code:addons/account/account_move_line.py:169
+#: code:addons/account/invoice.py:678
+#: code:addons/account/wizard/account_use_model.py:81
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "You have to define an analytic journal on the '%s' journal!"
msgstr ""
@@ -2616,6 +2873,14 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: selection:account.print.journal,sort_selection:0
+msgid "Reference Number"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: selection:account.entries.report,month:0
#: selection:account.invoice.report,month:0
#: selection:analytic.entries.report,month:0
@@ -2708,7 +2973,23 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:735
+=======
+#: help:account.partner.ledger,initial_balance:0
+#: help:account.report.general.ledger,initial_balance:0
+msgid "It adds initial balance row on report which display previous sum amount of debit/credit/balance"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+#: model:ir.actions.act_window,name:account.action_account_analytic_line_form
+msgid "Analytic Entries"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:836
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Tax base different!\n"
"Click on compute to update the tax base."
@@ -2847,8 +3128,13 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:3363
#: code:addons/account/account_bank.py:90
+=======
+#: code:addons/account/account.py:2950
+#: code:addons/account/installer.py:296
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "BNK"
msgstr ""
@@ -2942,12 +3228,21 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
#, python-format
msgid "No End of year journal defined for the fiscal year"
msgstr ""
#. module: account
+=======
+#: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
+#, python-format
+msgid "No End of year journal defined for the fiscal year"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: view:account.tax:0
#: view:account.tax.template:0
msgid "Keep empty to use the expense account"
@@ -2965,8 +3260,12 @@
#: field:account.common.report,journal_ids:0
#: report:account.general.journal:0
#: field:account.general.journal,journal_ids:0
+<<<<<<< TREE
#: report:account.general.ledger:0
#: report:account.general.ledger_landscape:0
+=======
+#: report:account.general.ledger_landscape:0
+>>>>>>> MERGE-SOURCE
#: view:account.journal.period:0
#: report:account.partner.balance:0
#: field:account.partner.balance,journal_ids:0
@@ -3033,7 +3332,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:1332
+=======
+#: code:addons/account/invoice.py:1298
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "No Partner Defined !"
msgstr ""
@@ -3066,10 +3369,29 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: model:ir.actions.act_window,name:account.action_account_unreconcile
#: model:ir.actions.act_window,name:account.action_account_unreconcile_reconcile
#: model:ir.actions.act_window,name:account.action_account_unreconcile_select
msgid "Unreconcile Entries"
+=======
+#: view:account.bank.statement:0
+#: selection:account.bank.statement,state:0
+#: view:account.invoice:0
+#: selection:account.invoice,state:0
+#: view:account.invoice.report:0
+#: selection:account.invoice.report,state:0
+#: selection:account.journal.period,state:0
+#: view:account.subscription:0
+#: selection:account.subscription,state:0
+#: selection:report.invoice.created,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_configuration_installer
+msgid "Accounting Chart Configuration"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -3108,21 +3430,48 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: view:product.product:0
msgid "Purchase Taxes"
msgstr ""
#. module: account
+=======
+>>>>>>> MERGE-SOURCE
#: view:validate.account.move.lines:0
msgid "All selected journal entries will be validated and posted. It means you won't be able to modify their accounting fields anymore."
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/invoice.py:373
+#, python-format
+msgid "Cannot delete invoice(s) that are already opened or paid !"
+msgstr ""
+
+#. module: account
+#: report:account.account.balance.landscape:0
+msgid "Total :"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: model:ir.actions.report.xml,name:account.account_transfers
msgid "Transfers"
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: selection:account.entries.report,move_line_state:0
+#: view:account.move.line:0
+#: selection:account.move.line,state:0
+msgid "Unbalanced"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: view:account.chart:0
msgid "Account charts"
msgstr ""
@@ -3156,6 +3505,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: view:account.invoice.line:0
msgid "Quantity :"
msgstr ""
@@ -3168,6 +3518,22 @@
#. module: account
#: model:ir.actions.act_window,name:account.action_account_print_sale_purchase_journal
msgid "Print Sale/Purchase Journal"
+=======
+#: code:addons/account/account.py:532
+#, python-format
+msgid "You cannot change the type of account from '%s' to '%s' type as it contains account entries!"
+msgstr ""
+
+#. module: account
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+msgid "Counterpart"
+msgstr ""
+
+#. module: account
+#: view:account.journal:0
+msgid "Invoicing Data"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -3329,19 +3695,36 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:2280
+=======
+#: code:addons/account/account.py:2109
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Maturity date of entry line generated by model line '%s' of model '%s' is based on partner payment term!\n"
"Please define partner on it!"
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_move_line.py:837
+=======
+#: code:addons/account/account_move_line.py:801
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Some entries are already reconciled !"
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account.py:1218
+#, python-format
+msgid "You cannot validate a Journal Entry unless all journal items are in same chart of accounts !"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: view:account.tax:0
msgid "Account Tax"
msgstr ""
@@ -3445,7 +3828,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_move_line.py:1153
+=======
+#: code:addons/account/account_move_line.py:1134
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Unable to change tax !"
msgstr ""
@@ -3456,8 +3843,20 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: selection:account.invoice.refund,filter_refund:0
msgid "Create a draft Refund"
+=======
+#: code:addons/account/invoice.py:1437
+#, python-format
+msgid "You selected an Unit of Measure which is not compatible with the product."
+msgstr ""
+
+#. module: account
+#: code:addons/account/invoice.py:476
+#, python-format
+msgid "The Payment Term of Supplier does not have Payment Term Lines(Computation) defined !"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -3791,6 +4190,15 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/invoice.py:722
+#, python-format
+msgid "Global taxes defined, but are not in invoice lines !"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: field:account.entries.report,month:0
#: view:account.invoice.report:0
#: field:account.invoice.report,month:0
@@ -3857,7 +4265,16 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_analytic_line.py:93
+=======
+#: help:account.move,state:0
+msgid "All manually created new journal entry are usually in the state 'Unposted', but you can set the option to skip that state on the related journal. In that case, they will be behave as journal entries automatically created by the system on document validation (invoices, bank statements...) and will be created in 'Posted' state."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_analytic_line.py:90
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
msgstr ""
@@ -4028,8 +4445,20 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: sql_constraint:account.period:0
msgid "The name of the period must be unique per company!"
+=======
+#: code:addons/account/account.py:2081
+#: code:addons/account/wizard/account_use_model.py:69
+#, python-format
+msgid "Unable to find a valid period !"
+msgstr ""
+
+#. module: account
+#: report:account.tax.code.entries:0
+msgid "Voucher No"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -4081,6 +4510,13 @@
msgstr ""
#. module: account
+#: constraint:account.account:0
+#: constraint:account.account.template:0
+msgid "Configuration Error! \n"
+"You cannot define children to an account with internal type different of \"View\"! "
+msgstr ""
+
+#. module: account
#: model:ir.model,name:account.model_account_analytic_cost_ledger_journal_report
msgid "Account Analytic Cost Ledger For Journal Report"
msgstr ""
@@ -4108,8 +4544,24 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: selection:account.journal,type:0
msgid "Bank and Cheques"
+=======
+#: code:addons/account/account.py:1304
+#: code:addons/account/account.py:1332
+#: code:addons/account/account.py:1339
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/invoice.py:904
+#: code:addons/account/wizard/account_automatic_reconcile.py:152
+#: code:addons/account/wizard/account_fiscalyear_close.py:78
+#: code:addons/account/wizard/account_fiscalyear_close.py:81
+#: code:addons/account/wizard/account_move_journal.py:165
+#: code:addons/account/wizard/account_report_aged_partner_balance.py:55
+#: code:addons/account/wizard/account_report_aged_partner_balance.py:57
+#, python-format
+msgid "UserError"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -4143,6 +4595,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: view:account.payment.term.line:0
msgid "Example"
msgstr ""
@@ -4167,6 +4620,14 @@
msgstr ""
#. module: account
+=======
+#: constraint:account.account:0
+#: constraint:account.tax.code:0
+msgid "Error ! You can not create recursive accounts."
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: view:account.subscription.generate:0
#: model:ir.actions.act_window,name:account.action_account_subscription_generate
#: model:ir.ui.menu,name:account.menu_generate_subscription
@@ -4205,7 +4666,17 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:1567
+=======
+#: code:addons/account/invoice.py:73
+#, python-format
+msgid "You must define an analytic journal of type '%s' !"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1411
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Couldn't create move with currency different from the secondary currency of the account \"%s - %s\". Clear the secondary currency field of the account definition if you want to accept all currencies."
msgstr ""
@@ -4237,8 +4708,19 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: model:ir.ui.menu,name:account.menu_finance_configuration
msgid "Configuration"
+=======
+#: report:account.account.balance.landscape:0
+msgid "Account Balance -"
+msgstr ""
+
+#. module: account
+#: code:addons/account/invoice.py:997
+#, python-format
+msgid "Invoice "
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -4285,6 +4767,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: view:account.invoice:0
msgid "My invoices"
msgstr ""
@@ -4292,6 +4775,12 @@
#. module: account
#: selection:account.bank.accounts.wizard,account_type:0
msgid "Check"
+=======
+#: code:addons/account/invoice.py:812
+#, python-format
+msgid "Please verify the price of the invoice !\n"
+"The real total does not match the computed total."
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -4412,6 +4901,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:1088
#: code:addons/account/account.py:1090
#: code:addons/account/account.py:1321
@@ -4434,6 +4924,20 @@
#: code:addons/account/wizard/account_report_common.py:150
#, python-format
msgid "Error"
+=======
+#: selection:account.account.type,report_type:0
+msgid "Balance Sheet (Assets Accounts)"
+msgstr ""
+
+#. module: account
+#: report:account.tax.code.entries:0
+msgid "Third Party (Country)"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_invoice_tree4
+msgid "With Supplier Refunds you can manage the credit notes you receive from your suppliers. A refund is a document that credits an invoice completely or partially. You can easily generate refunds and reconcile them directly from the invoice form."
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -4451,8 +4955,14 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: model:ir.actions.act_window,help:account.action_account_partner_balance
msgid "This report is analysis by partner. It is a PDF report containing one line per partner representing the cumulative credit balance."
+=======
+#: code:addons/account/invoice.py:728
+#, python-format
+msgid "Taxes missing !"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -4528,7 +5038,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:1351
+=======
+#: code:addons/account/account.py:1224
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "You can not modify a posted entry of this journal !\n"
"You should set the journal to allow cancelling entries if you want to do that."
@@ -4550,7 +5064,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:1090
+=======
+#: code:addons/account/account.py:954
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Start period should be smaller then End period"
msgstr ""
@@ -4593,7 +5111,15 @@
#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
#: field:account.vat.declaration,target_move:0
+<<<<<<< TREE
#: field:accounting.report,target_move:0
+=======
+#: report:account.balancesheet.horizontal:0
+#: report:account.balancesheet:0
+#: report:pl.account.horizontal:0
+#: report:pl.account:0
+#: report:account.aged_trial_balance:0
+>>>>>>> MERGE-SOURCE
msgid "Target Moves"
msgstr ""
@@ -4681,7 +5207,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:1307
+=======
+#: code:addons/account/account.py:1181
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Integrity Error !"
msgstr ""
@@ -4713,8 +5243,16 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: model:account.financial.report,name:account.account_financial_report_balancesheet0
#: model:ir.ui.menu,name:account.menu_account_report_bs
+=======
+#: view:account.bs.report:0
+#: model:ir.actions.act_window,name:account.action_account_bs_report
+#: model:ir.ui.menu,name:account.menu_account_bs_report
+#: report:account.balancesheet.horizontal:0
+#: report:account.balancesheet:0
+>>>>>>> MERGE-SOURCE
msgid "Balance Sheet"
msgstr ""
@@ -4812,8 +5350,15 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: model:ir.model,name:account.model_account_fiscal_position_tax_template
msgid "Template Tax Fiscal Position"
+=======
+#: code:addons/account/account.py:2081
+#: code:addons/account/wizard/account_use_model.py:69
+#, python-format
+msgid "No period found !"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -4884,8 +5429,16 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: view:account.payment.term.line:0
msgid "Amount Computation"
+=======
+#: code:addons/account/account.py:2940
+#: code:addons/account/installer.py:283
+#: code:addons/account/installer.py:295
+#, python-format
+msgid "Bank Journal "
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -4909,6 +5462,15 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account_move_line.py:1199
+#, python-format
+msgid "You can not do this modification on a reconciled entry ! Please note that you can just change some non important fields !"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: model:ir.model,name:account.model_account_common_account_report
msgid "Account Common Account Report"
msgstr ""
@@ -4966,6 +5528,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:3446
#: code:addons/account/account_bank_statement.py:338
#: code:addons/account/account_invoice.py:427
@@ -4973,6 +5536,15 @@
#: code:addons/account/account_invoice.py:542
#: code:addons/account/account_invoice.py:550
#: code:addons/account/account_invoice.py:572
+=======
+#: code:addons/account/account_bank_statement.py:331
+#: code:addons/account/invoice.py:408
+#: code:addons/account/invoice.py:508
+#: code:addons/account/invoice.py:523
+#: code:addons/account/invoice.py:531
+#: code:addons/account/invoice.py:552
+#: code:addons/account/invoice.py:1361
+>>>>>>> MERGE-SOURCE
#: code:addons/account/wizard/account_move_journal.py:63
#, python-format
msgid "Configuration Error !"
@@ -5038,12 +5610,32 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: view:account.invoice.report:0
msgid "Customer Invoices And Refunds"
msgstr ""
#. module: account
#: field:account.analytic.line,amount_currency:0
+=======
+#: help:account.account.type,report_type:0
+msgid "According value related accounts will be display on respective reports (Balance Sheet Profit & Loss Account)"
+msgstr ""
+
+#. module: account
+#: field:account.report.general.ledger,sortby:0
+msgid "Sort By"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1340
+#, python-format
+msgid "There is no default default credit account defined \n"
+"on journal \"%s\""
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: field:account.entries.report,amount_currency:0
#: field:account.model.line,amount_currency:0
#: field:account.move.line,amount_currency:0
@@ -5195,7 +5787,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_move_line.py:759
+=======
+#: code:addons/account/account_move_line.py:729
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Already Reconciled!"
msgstr ""
@@ -5235,7 +5831,11 @@
#. module: account
#: view:account.move.line.reconcile:0
+<<<<<<< TREE
#: code:addons/account/account_move_line.py:857
+=======
+#: code:addons/account/account_move_line.py:821
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Write-Off"
msgstr ""
@@ -5367,6 +5967,15 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/wizard/account_change_currency.py:59
+#, python-format
+msgid "New currency is not confirured properly !"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: field:account.aged.trial.balance,filter:0
#: field:account.balance.report,filter:0
#: field:account.central.journal,filter:0
@@ -5386,6 +5995,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:2256
#, python-format
msgid "You have a wrong expression \"%(...)s\" in your model !"
@@ -5399,12 +6009,20 @@
#. module: account
#: code:addons/account/account_move_line.py:1155
#: code:addons/account/account_move_line.py:1238
+=======
+#: code:addons/account/account_move_line.py:1137
+#: code:addons/account/account_move_line.py:1220
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "You can not use an inactive account!"
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_move_line.py:830
+=======
+#: code:addons/account/account_move_line.py:794
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Entries are not of the same account or already reconciled ! "
msgstr ""
@@ -5439,9 +6057,19 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_bank_statement.py:402
#: code:addons/account/account_invoice.py:392
#: code:addons/account/wizard/account_period_close.py:51
+=======
+#: selection:account.automatic.reconcile,power:0
+msgid "7"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_bank_statement.py:391
+#: code:addons/account/invoice.py:373
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Invalid action !"
msgstr ""
@@ -5588,6 +6216,15 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/invoice.py:997
+#, python-format
+msgid "is validated."
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: view:account.chart.template:0
#: field:account.chart.template,account_root_id:0
msgid "Root Account"
@@ -5657,6 +6294,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: view:account.invoice.report:0
msgid "Open and Paid Invoices"
msgstr ""
@@ -5668,6 +6306,9 @@
#. module: account
#: code:addons/account/account.py:629
+=======
+#: code:addons/account/account.py:546
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "You can not remove/desactivate an account which is set on a customer or supplier."
msgstr ""
@@ -5889,7 +6530,13 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:664
+=======
+#: code:addons/account/invoice.py:409
+#: code:addons/account/invoice.py:509
+#: code:addons/account/invoice.py:1362
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "You cannot change the owner company of an account that already contains journal items."
msgstr ""
@@ -6044,6 +6691,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:624
#, python-format
msgid "You can not remove an account containing journal items."
@@ -6052,6 +6700,10 @@
#. module: account
#: code:addons/account/account_analytic_line.py:145
#: code:addons/account/account_move_line.py:933
+=======
+#: code:addons/account/account_analytic_line.py:141
+#: code:addons/account/account_move_line.py:897
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Entries: "
msgstr ""
@@ -6062,12 +6714,16 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: help:res.partner.bank,currency_id:0
msgid "Currency of the related account journal."
msgstr ""
#. module: account
#: code:addons/account/account.py:1563
+=======
+#: code:addons/account/account.py:1407
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Couldn't create move between different companies"
msgstr ""
@@ -6102,7 +6758,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_move_line.py:808
+=======
+#: code:addons/account/account_move_line.py:772
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Entry \"%s\" is not valid !"
msgstr ""
@@ -6161,6 +6821,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:622
#: code:addons/account/account.py:624
#: code:addons/account/account.py:963
@@ -6186,6 +6847,33 @@
#: code:addons/account/wizard/account_invoice_refund.py:108
#: code:addons/account/wizard/account_invoice_refund.py:110
#: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
+=======
+#: code:addons/account/account.py:509
+#: code:addons/account/account.py:511
+#: code:addons/account/account.py:836
+#: code:addons/account/account.py:915
+#: code:addons/account/account.py:990
+#: code:addons/account/account.py:1218
+#: code:addons/account/account.py:1224
+#: code:addons/account/account.py:2109
+#: code:addons/account/account.py:2357
+#: code:addons/account/account_analytic_line.py:89
+#: code:addons/account/account_analytic_line.py:98
+#: code:addons/account/account_bank_statement.py:292
+#: code:addons/account/account_bank_statement.py:305
+#: code:addons/account/account_bank_statement.py:345
+#: code:addons/account/account_cash_statement.py:329
+#: code:addons/account/account_cash_statement.py:349
+#: code:addons/account/account_move_line.py:1182
+#: code:addons/account/account_move_line.py:1197
+#: code:addons/account/account_move_line.py:1199
+#: code:addons/account/invoice.py:793
+#: code:addons/account/invoice.py:823
+#: code:addons/account/invoice.py:1014
+#: code:addons/account/wizard/account_invoice_refund.py:100
+#: code:addons/account/wizard/account_invoice_refund.py:102
+#: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
+>>>>>>> MERGE-SOURCE
#: code:addons/account/wizard/account_use_model.py:44
#, python-format
msgid "Error !"
@@ -6262,6 +6950,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_move_line.py:1218
#, python-format
msgid "You can not do this modification on a reconciled entry! You can just change some non legal fields or you must unreconcile first!\n"
@@ -6277,6 +6966,13 @@
msgstr ""
#. module: account
+=======
+#: report:account.general.ledger_landscape:0
+msgid "JRNL"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: view:account.partner.balance:0
#: view:account.partner.ledger:0
msgid "This report is an analysis done by a partner. It is a PDF report containing one line per partner representing the cumulative credit balance"
@@ -6322,9 +7018,13 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: view:account.bank.statement:0
#: code:addons/account/account.py:420
#: code:addons/account/account.py:432
+=======
+#: code:addons/account/wizard/account_change_currency.py:64
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Opening Balance"
msgstr ""
@@ -6396,11 +7096,17 @@
#: report:account.journal.period.print:0
#: report:account.journal.period.print.sale.purchase:0
#: report:account.partner.balance:0
+#: report:pl.account.horizontal:0
+#: report:pl.account:0
msgid "Total:"
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:2229
+=======
+#: code:addons/account/account.py:2064
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "You can specify year, month and date in the name of the model using the following labels:\n"
"\n"
@@ -6428,6 +7134,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: view:account.tax.template:0
msgid "Taxes used in Sales"
msgstr ""
@@ -6435,6 +7142,10 @@
#. module: account
#: code:addons/account/account_invoice.py:495
#: code:addons/account/wizard/account_invoice_refund.py:145
+=======
+#: code:addons/account/invoice.py:476
+#: code:addons/account/wizard/account_invoice_refund.py:137
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Data Insufficient !"
msgstr ""
@@ -6569,6 +7280,15 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/invoice.py:524
+#, python-format
+msgid "Can not find account chart for this company in invoice line account, Please Create account."
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: view:account.tax.template:0
msgid "Account Tax Template"
msgstr ""
@@ -6720,7 +7440,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:1088
+=======
+#: code:addons/account/account.py:952
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "You should have chosen periods that belongs to the same company"
msgstr ""
@@ -6834,6 +7558,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/wizard/account_fiscalyear_close.py:73
#, python-format
msgid "The periods to generate opening entries were not found"
@@ -6848,6 +7573,26 @@
#: code:addons/account/account.py:3121
#, python-format
msgid "OPEJ"
+=======
+#: code:addons/account/account_cash_statement.py:250
+#, python-format
+msgid "You can not have two open register for the same journal"
+msgstr ""
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid " day of the month= -1"
+msgstr ""
+
+#. module: account
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr ""
+
+#. module: account
+#: help:account.journal,type:0
+msgid "Select 'Sale' for Sale journal to be used at the time of making invoice. Select 'Purchase' for Purchase Journal to be used at the time of approving purchase order. Select 'Cash' to be used at the time of making payment. Select 'General' for miscellaneous operations. Select 'Opening/Closing Situation' to be used at the time of new fiscal year creation or end of year entries generation."
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -6857,10 +7602,20 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: selection:account.entries.report,move_line_state:0
#: view:account.move.line:0
#: selection:account.move.line,state:0
msgid "Unbalanced"
+=======
+#: help:account.installer.modules,account_followup:0
+msgid "Helps you generate reminder letters for unpaid invoices, including multiple levels of reminding and customized per-partner policies."
+msgstr ""
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid " value amount: n.a"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -6880,9 +7635,19 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/wizard/account_fiscalyear_close.py:84
#, python-format
msgid "The journal must have default credit and debit account"
+=======
+#: view:account.analytic.line:0
+#: field:account.bank.statement,user_id:0
+#: view:account.journal:0
+#: field:account.journal,user_id:0
+#: view:analytic.entries.report:0
+#: field:analytic.entries.report,user_id:0
+msgid "User"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -6901,6 +7666,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: model:ir.ui.menu,name:account.menu_multi_currency
msgid "Multi-Currencies"
msgstr ""
@@ -6912,12 +7678,20 @@
#. module: account
#: code:addons/account/account_move_line.py:1302
+=======
+#: code:addons/account/account_move_line.py:1277
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Bad account !"
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:3108
+=======
+#: code:addons/account/account.py:2821
+#: code:addons/account/installer.py:432
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Sales Journal"
msgstr ""
@@ -6934,7 +7708,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_move_line.py:1277
+=======
+#: code:addons/account/account_move_line.py:1252
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "No piece number !"
msgstr ""
@@ -7220,6 +7998,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:629
#: code:addons/account/account.py:642
#: code:addons/account/account.py:645
@@ -7232,6 +8011,19 @@
#: code:addons/account/account_move_line.py:97
#: code:addons/account/account_move_line.py:750
#: code:addons/account/account_move_line.py:803
+=======
+#: code:addons/account/account.py:516
+#: code:addons/account/account.py:529
+#: code:addons/account/account.py:532
+#: code:addons/account/account.py:546
+#: code:addons/account/account.py:654
+#: code:addons/account/account.py:941
+#: code:addons/account/account_move_line.py:723
+#: code:addons/account/account_move_line.py:767
+#: code:addons/account/invoice.py:722
+#: code:addons/account/invoice.py:725
+#: code:addons/account/invoice.py:728
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Warning !"
msgstr ""
@@ -7295,7 +8087,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:810
+=======
+#: code:addons/account/invoice.py:795
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "No Invoice Lines !"
msgstr ""
@@ -7360,7 +8156,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:379
+=======
+#: code:addons/account/invoice.py:360
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Invoice '%s' is paid."
msgstr ""
@@ -7417,7 +8217,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:1332
+=======
+#: code:addons/account/invoice.py:1298
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "You must first select a partner !"
msgstr ""
@@ -7476,7 +8280,12 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:3111
+=======
+#: code:addons/account/account.py:2885
+#: code:addons/account/installer.py:495
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Purchase Refund Journal"
msgstr ""
@@ -7614,6 +8423,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: field:account.aged.trial.balance,chart_account_id:0
#: field:account.balance.report,chart_account_id:0
#: field:account.central.journal,chart_account_id:0
@@ -7628,6 +8438,17 @@
#: field:account.report.general.ledger,chart_account_id:0
#: field:account.vat.declaration,chart_account_id:0
#: field:accounting.report,chart_account_id:0
+=======
+#: report:account.general.ledger:0
+#: report:account.partner.balance:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+#: report:account.balancesheet.horizontal:0
+#: report:account.balancesheet:0
+#: report:pl.account.horizontal:0
+#: report:pl.account:0
+#: report:account.aged_trial_balance:0
+>>>>>>> MERGE-SOURCE
msgid "Chart of Account"
msgstr ""
@@ -7701,8 +8522,19 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: view:account.payment.term.line:0
msgid " Value amount: n.a"
+=======
+#: code:addons/account/invoice.py:905
+#, python-format
+msgid "Cannot create invoice move on centralised journal"
+msgstr ""
+
+#. module: account
+#: field:account.account.type,report_type:0
+msgid "P&L / BS Category"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -7744,9 +8576,17 @@
#: report:account.account.balance:0
#: report:account.central.journal:0
#: report:account.general.journal:0
+<<<<<<< TREE
#: report:account.general.ledger:0
#: report:account.general.ledger_landscape:0
+=======
+#: report:account.general.ledger_landscape:0
+>>>>>>> MERGE-SOURCE
#: report:account.partner.balance:0
+#: report:account.balancesheet.horizontal:0
+#: report:account.balancesheet:0
+#: report:pl.account.horizontal:0
+#: report:pl.account:0
msgid "Filter By"
msgstr ""
@@ -7797,7 +8637,12 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:3109
+=======
+#: code:addons/account/account.py:2838
+#: code:addons/account/installer.py:452
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Purchase Journal"
msgstr ""
@@ -7971,9 +8816,16 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: model:account.account.type,name:account.data_account_type_expense
#: model:account.financial.report,name:account.account_financial_report_expense0
msgid "Expense"
+=======
+#: code:addons/account/account_move_line.py:1137
+#: code:addons/account/account_move_line.py:1220
+#, python-format
+msgid "Bad account!"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -7982,7 +8834,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_move_line.py:1105
+=======
+#: code:addons/account/account_move_line.py:1062
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "The account move (%s) for centralisation has been confirmed!"
msgstr ""
@@ -8189,12 +9045,26 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:3110
+=======
+#: code:addons/account/account.py:2861
+#: code:addons/account/installer.py:476
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Sales Refund Journal"
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account.py:941
+#, python-format
+msgid "You cannot modify company of this period as its related record exist in Entry Lines"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: view:account.move:0
#: view:account.move.line:0
#: view:account.payment.term:0
@@ -8236,7 +9106,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:810
+=======
+#: code:addons/account/invoice.py:795
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Please create some invoice lines."
msgstr ""
@@ -8252,7 +9126,12 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:3118
+=======
+#: code:addons/account/account.py:2864
+#: code:addons/account/installer.py:479
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "SCNJ"
msgstr ""
@@ -8297,7 +9176,12 @@
#: report:account.general.journal:0
#: field:account.general.journal,period_from:0
#: report:account.general.ledger:0
-#: report:account.general.ledger_landscape:0
+<<<<<<< TREE
+#: report:account.general.ledger_landscape:0
+=======
+#: report:account.general.ledger_landscape:0
+#: report:account.journal.period.print:0
+>>>>>>> MERGE-SOURCE
#: report:account.partner.balance:0
#: field:account.partner.balance,period_from:0
#: field:account.partner.ledger,period_from:0
@@ -8313,7 +9197,17 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account.py:2357
+#, python-format
+msgid "Cannot locate parent code for template account!"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: field:account.aged.trial.balance,direction_selection:0
+#: report:account.aged_trial_balance:0
msgid "Analysis Direction"
msgstr ""
@@ -8344,6 +9238,15 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/invoice.py:1014
+#, python-format
+msgid "You cannot cancel the Invoice which is Partially Paid! You need to unreconcile concerned payment entries!"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: report:account.overdue:0
msgid "Best regards."
msgstr ""
@@ -8364,13 +9267,44 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: field:account.account.type,report_type:0
msgid "P&L / BS Category"
-msgstr ""
-
-#. module: account
-#: model:ir.actions.act_window,help:account.action_invoice_tree4
-msgid "With Supplier Refunds you can manage the credit notes you receive from your suppliers. A refund is a document that credits an invoice completely or partially. You can easily generate refunds and reconcile them directly from the invoice form."
+=======
+#: constraint:account.move.line:0
+msgid "You can not create move line on view account."
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_change_currency.py:70
+#, python-format
+msgid "Current currency is not confirured properly !"
+>>>>>>> MERGE-SOURCE
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:952
+#: code:addons/account/account.py:954
+#: code:addons/account/account.py:1195
+#: code:addons/account/account.py:1407
+#: code:addons/account/account.py:1411
+#: code:addons/account/account_cash_statement.py:250
+#: code:addons/account/account_move_line.py:771
+#: code:addons/account/account_move_line.py:794
+#: code:addons/account/account_move_line.py:796
+#: code:addons/account/account_move_line.py:799
+#: code:addons/account/account_move_line.py:801
+#: code:addons/account/account_move_line.py:1123
+#: code:addons/account/report/common_report_header.py:92
+#: code:addons/account/wizard/account_change_currency.py:38
+#: code:addons/account/wizard/account_change_currency.py:59
+#: code:addons/account/wizard/account_change_currency.py:64
+#: code:addons/account/wizard/account_change_currency.py:70
+#: code:addons/account/wizard/account_move_bank_reconcile.py:49
+#: code:addons/account/wizard/account_report_common.py:120
+#: code:addons/account/wizard/account_report_common.py:126
+#, python-format
+msgid "Error"
msgstr ""
#. module: account
@@ -8379,10 +9313,21 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: model:ir.actions.act_window,name:account.action_bank_statement_periodic_tree
#: model:ir.actions.act_window,name:account.action_bank_statement_tree
#: model:ir.ui.menu,name:account.menu_bank_statement_tree
msgid "Bank Statements"
+=======
+#: selection:account.account.type,report_type:0
+msgid "Profit & Loss (Income Accounts)"
+msgstr ""
+
+#. module: account
+#: view:account.tax:0
+#: view:account.tax.template:0
+msgid "Keep empty to use the income account"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -8396,8 +9341,12 @@
#: field:account.entries.report,balance:0
#: report:account.general.journal:0
#: report:account.general.ledger:0
+<<<<<<< TREE
#: report:account.general.ledger_landscape:0
#: field:account.invoice,residual:0
+=======
+#: report:account.general.ledger_landscape:0
+>>>>>>> MERGE-SOURCE
#: field:account.move.line,balance:0
#: report:account.partner.balance:0
#: selection:account.payment.term.line,value:0
@@ -8408,6 +9357,10 @@
#: field:account.treasury.report,balance:0
#: field:report.account.receivable,balance:0
#: field:report.aged.receivable,balance:0
+#: report:account.balancesheet.horizontal:0
+#: report:account.balancesheet:0
+#: report:pl.account.horizontal:0
+#: report:pl.account:0
msgid "Balance"
msgstr ""
@@ -8418,7 +9371,15 @@
#. module: account
#: report:account.account.balance:0
-#: report:account.general.ledger_landscape:0
+<<<<<<< TREE
+#: report:account.general.ledger_landscape:0
+=======
+#: report:account.general.ledger_landscape:0
+#: report:account.balancesheet.horizontal:0
+#: report:account.balancesheet:0
+#: report:pl.account.horizontal:0
+#: report:pl.account:0
+>>>>>>> MERGE-SOURCE
msgid "Display Account"
msgstr ""
@@ -8480,6 +9441,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: report:account.general.ledger:0
+#: report:account.journal.period.print:0
+>>>>>>> MERGE-SOURCE
#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
msgid "Filters By"
@@ -8502,7 +9468,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_move_line.py:1153
+=======
+#: code:addons/account/account_move_line.py:1134
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "You can not change the tax, you should remove and recreate lines !"
msgstr ""
@@ -8616,7 +9586,12 @@
#: report:account.general.journal:0
#: field:account.general.journal,period_to:0
#: report:account.general.ledger:0
-#: report:account.general.ledger_landscape:0
+<<<<<<< TREE
+#: report:account.general.ledger_landscape:0
+=======
+#: report:account.general.ledger_landscape:0
+#: report:account.journal.period.print:0
+>>>>>>> MERGE-SOURCE
#: report:account.partner.balance:0
#: field:account.partner.balance,period_to:0
#: field:account.partner.ledger,period_to:0
@@ -8652,8 +9627,15 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: report:account.overdue:0
msgid "Maturity date"
+=======
+#: code:addons/account/invoice.py:725
+#, python-format
+msgid "Tax base different !\n"
+"Click on compute to update tax base"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -8686,8 +9668,12 @@
#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
#: field:account.vat.declaration,date_from:0
+<<<<<<< TREE
#: field:accounting.report,date_from:0
#: field:accounting.report,date_from_cmp:0
+=======
+#: report:account.aged_trial_balance:0
+>>>>>>> MERGE-SOURCE
msgid "Start Date"
msgstr ""
@@ -8711,7 +9697,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:828
+=======
+#: code:addons/account/invoice.py:812
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Bad total !"
msgstr ""
@@ -8758,17 +9748,32 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: view:accounting.report:0
msgid "Comparison"
msgstr ""
#. module: account
#: code:addons/account/account_invoice.py:372
+=======
+#: code:addons/account/invoice.py:353
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Unknown Error"
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account.py:1181
+#, python-format
+msgid "You cannot validate a non-balanced entry !\n"
+"Make sure you have configured Payment Term properly !\n"
+"It should contain atleast one Payment Term Line with type \"Balance\" !"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: help:res.partner,property_account_payable:0
msgid "This account will be used instead of the default one as the payable account for the current partner"
msgstr ""
@@ -8820,6 +9825,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: selection:account.account.type,report_type:0
#: code:addons/account/account.py:181
#, python-format
@@ -8830,6 +9836,11 @@
#: constraint:account.account:0
msgid "Configuration Error! \n"
"You can not select an account type with a deferral method different of \"Unreconciled\" for accounts with internal type \"Payable/Receivable\"! "
+=======
+#: view:account.general.journal:0
+#: model:ir.ui.menu,name:account.menu_account_general_journal
+msgid "General Journals"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -9092,7 +10103,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_analytic_line.py:102
+=======
+#: code:addons/account/account_analytic_line.py:99
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "There is no income account defined for this product: \"%s\" (id:%d)"
msgstr ""
@@ -9137,6 +10152,7 @@
#: field:report.account.sales,amount_total:0
#: field:report.account_type.sales,amount_total:0
#: field:report.invoice.created,amount_total:0
+#: report:account.aged_trial_balance:0
msgid "Total"
msgstr ""
@@ -9257,8 +10273,21 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: sql_constraint:account.journal:0
msgid "The code of the journal must be unique per company !"
+=======
+#: code:addons/account/account_move_line.py:729
+#: code:addons/account/account_move_line.py:806
+#: code:addons/account/wizard/account_invoice_state.py:44
+#: code:addons/account/wizard/account_invoice_state.py:68
+#: code:addons/account/wizard/account_report_balance_sheet.py:70
+#: code:addons/account/wizard/account_state_open.py:37
+#: code:addons/account/wizard/account_validate_account_move.py:39
+#: code:addons/account/wizard/account_validate_account_move.py:61
+#, python-format
+msgid "Warning"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -9268,6 +10297,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: view:wizard.multi.charts.accounts:0
msgid "Generate Your Chart of Accounts from a Chart Template"
msgstr ""
@@ -9281,6 +10311,16 @@
#: view:account.automatic.reconcile:0
#: view:account.move.line.reconcile.writeoff:0
msgid "Write-Off Move"
+=======
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
+#: selection:account.bank.statement,state:0
+#: selection:account.entries.report,type:0
+#: view:account.fiscalyear:0
+#: selection:account.fiscalyear,state:0
+#: selection:account.period,state:0
+msgid "Closed"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -9348,16 +10388,20 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: selection:account.print.journal,sort_selection:0
msgid "Journal Entry Number"
msgstr ""
#. module: account
+=======
+>>>>>>> MERGE-SOURCE
#: view:account.subscription:0
msgid "Recurring"
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:642
#, python-format
msgid "You cannot change the type of account from 'Closed' to any other type which contains journal items!"
@@ -9365,6 +10409,9 @@
#. module: account
#: code:addons/account/account_move_line.py:832
+=======
+#: code:addons/account/account_move_line.py:796
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Entry is already reconciled"
msgstr ""
@@ -9385,6 +10432,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: view:account.analytic.line:0
msgid "Analytic Journal Items related to a purchase journal."
msgstr ""
@@ -9392,6 +10440,13 @@
#. module: account
#: help:account.account,type:0
msgid "The 'Internal Type' is used for features available on different types of accounts: view can not have journal items, consolidation are accounts that can have children accounts for multi-company consolidations, payable/receivable are for partners accounts (for debit/credit computations), closed for depreciated accounts."
+=======
+#: code:addons/account/account_move_line.py:1252
+#, python-format
+msgid "Can not create an automatic sequence for this piece !\n"
+"\n"
+"Put a sequence in the journal definition for automatic numbering or create a sequence manually for this piece."
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -9527,7 +10582,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:364
+=======
+#: code:addons/account/invoice.py:345
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Invoice '%s' is waiting for validation."
msgstr ""
@@ -9552,6 +10611,15 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account_move_line.py:1123
+#, python-format
+msgid "The date of your Journal Entry is not in the defined period!"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: field:account.subscription,period_total:0
msgid "Number of Periods"
msgstr ""
@@ -9711,6 +10779,7 @@
#: field:account.partner.ledger,result_selection:0
#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
+#: report:account.aged_trial_balance:0
msgid "Partner's"
msgstr ""
@@ -9817,6 +10886,15 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account.py:511
+#, python-format
+msgid "You cannot remove an account which has account entries!. "
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: model:ir.actions.act_window,help:account.action_account_form
msgid "Create and manage the accounts you need to record journal entries. An account is part of a ledger allowing your company to register all kinds of debit and credit transactions. Companies present their annual accounts in two main parts: the balance sheet and the income statement (profit and loss account). The annual accounts of a company are required by law to disclose a certain amount of information. They have to be certified by an external auditor annually."
msgstr ""
@@ -9826,3 +10904,48 @@
msgid "The residual amount on a receivable or payable of a journal entry expressed in its currency (maybe different of the company currency)."
msgstr ""
+#. module: account
+#: report:account.balancesheet.horizontal:0
+#: report:account.balancesheet:0
+msgid "Assets"
+msgstr ""
+
+#. module: account
+#: report:account.balancesheet.horizontal:0
+#: report:account.balancesheet:0
+msgid "Liabilities"
+msgstr ""
+
+#. module: account
+#: report:account.balancesheet.horizontal:0
+#: report:account.balancesheet:0
+#: report:pl.account.horizontal:0
+#: report:pl.account:0
+msgid "Balance:"
+msgstr ""
+
+#. module: account
+#: report:pl.account.horizontal:0
+#: report:pl.account:0
+msgid "Particular"
+msgstr ""
+
+#. module: account
+#: report:account.aged_trial_balance:0
+msgid "Aged Trial Balance"
+msgstr ""
+
+#. module: account
+#: report:account.aged_trial_balance:0
+msgid "Period Length(days)"
+msgstr ""
+
+#. module: account
+#: report:account.aged_trial_balance:0
+msgid "Account Total"
+msgstr ""
+
+#. module: account
+#: report:account.aged_trial_balance:0
+msgid "Not due"
+msgstr ""
=== modified file 'account/i18n/ar.po'
--- account/i18n/ar.po 2012-02-29 11:07:30 +0000
+++ account/i18n/ar.po 2012-03-25 07:09:26 +0000
@@ -6,13 +6,20 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
+<<<<<<< TREE
"POT-Creation-Date: 2012-02-08 00:35+0000\n"
"PO-Revision-Date: 2012-02-13 13:33+0000\n"
"Last-Translator: kifcaliph <Unknown>\n"
+=======
+"POT-Creation-Date: 2011-05-09 10:18+0000\n"
+"PO-Revision-Date: 2012-02-27 19:08+0000\n"
+"Last-Translator: amani ali <applepie9911@xxxxxxxxx>\n"
+>>>>>>> MERGE-SOURCE
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2012-02-14 05:43+0000\n"
"X-Generator: Launchpad (build 14781)\n"
@@ -21,6 +28,10 @@
#: view:analytic.entries.report:0
msgid "last month"
msgstr "الشهر الماضي"
+=======
+"X-Launchpad-Export-Date: 2012-02-28 06:07+0000\n"
+"X-Generator: Launchpad (build 14874)\n"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -30,6 +41,7 @@
#. module: account
#: view:account.journal:0
msgid "Other Configuration"
+<<<<<<< TREE
msgstr "إعدادات أخرى"
#. module: account
@@ -40,9 +52,31 @@
msgstr ""
#. module: account
+=======
+msgstr "إعدادات أخرى"
+
+#. module: account
+#: code:addons/account/account.py:506
+#, python-format
+msgid ""
+"You cannot remove/deactivate an account which is set as a property to any "
+"Partner."
+msgstr "لايمكن الغاء/تعطيل حساب معد كخاص بأي طرف."
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: view:account.move.reconcile:0
msgid "Journal Entry Reconcile"
-msgstr "تسوية اليومية"
+<<<<<<< TREE
+msgstr "تسوية اليومية"
+=======
+msgstr "تسوية اليومية"
+
+#. module: account
+#: field:account.installer.modules,account_voucher:0
+msgid "Voucher Management"
+msgstr "إدارة القسائم"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.account:0
@@ -53,16 +87,28 @@
msgstr "إحصائيات الحساب"
#. module: account
+<<<<<<< TREE
#: view:account.invoice:0
msgid "Proforma/Open/Paid Invoices"
msgstr ""
#. module: account
+=======
+>>>>>>> MERGE-SOURCE
#: field:report.invoice.created,residual:0
msgid "Residual"
msgstr "متبقي"
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account_invoice.py:805
+#, python-format
+msgid "Please define sequence on invoice journal"
+msgstr "يرجى تحديد تسلسل على الفاتورة"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: constraint:account.period:0
msgid "Error ! The duration of the Period(s) is/are invalid. "
msgstr "خظأ! إن مدة الفترة أو الفترات غير صالحة "
@@ -75,6 +121,7 @@
#. module: account
#: view:account.tax:0
msgid "Children Definition"
+<<<<<<< TREE
msgstr "تعريف فروع"
#. module: account
@@ -82,11 +129,31 @@
#, python-format
msgid "Journal item \"%s\" is not valid."
msgstr "عنصر يومية غير صحيح \"%s\"."
+=======
+msgstr "تعريف فروع"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:ir.model,name:account.model_report_aged_receivable
msgid "Aged Receivable Till Today"
-msgstr "فترة المقبوضات حتى اليوم"
+<<<<<<< TREE
+msgstr "فترة المقبوضات حتى اليوم"
+=======
+msgstr "فترة المقبوضات حتى اليوم"
+
+#. module: account
+#: field:account.partner.ledger,reconcil:0
+msgid "Include Reconciled Entries"
+msgstr "إضافة السجلات المسواه"
+
+#. module: account
+#: view:account.pl.report:0
+msgid ""
+"The Profit and Loss report gives you an overview of your company profit and "
+"loss in a single document"
+msgstr ""
+"تقرير المكسب و الخسارة يعطيك فكرة عامة عن مكسب و خسارة شركتك في ملف واحد"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:process.transition,name:account.process_transition_invoiceimport0
@@ -109,6 +176,7 @@
"If you unreconciliate transactions, you must also verify all the actions "
"that are linked to those transactions because they will not be disabled"
msgstr ""
+<<<<<<< TREE
"إذا كنت توافق على المعاملات ، يجب عليك أيضا التحقق من كافة الإجراءات التي "
"ترتبط بتلك المعاملات لأنه لن يكونوا غير مفعّلين"
@@ -118,6 +186,21 @@
"Configuration error! The currency chosen should be shared by the default "
"accounts too."
msgstr ""
+=======
+"إذا كنت توافق على المعاملات ، يجب عليك أيضا التحقق من كافة الإجراءات التي "
+"ترتبط بتلك المعاملات لأنه لن يكونوا غير مفعّلين"
+
+#. module: account
+#: report:account.tax.code.entries:0
+msgid "Accounting Entries-"
+msgstr "المدخلات المحاسبية -"
+
+#. module: account
+#: code:addons/account/account.py:1291
+#, python-format
+msgid "You can not delete posted movement: \"%s\"!"
+msgstr "لا يمكنك حذف حركة تم ترحيلها: \"%s\"!"
+>>>>>>> MERGE-SOURCE
#. module: account
#: report:account.invoice:0
@@ -216,12 +299,38 @@
#. module: account
#: model:ir.model,name:account.model_account_tax
msgid "account.tax"
-msgstr "account.tax"
+<<<<<<< TREE
+msgstr "account.tax"
+=======
+msgstr "account.tax"
+
+#. module: account
+#: code:addons/account/account.py:901
+#, python-format
+msgid ""
+"No period defined for this date: %s !\n"
+"Please create a fiscal year."
+msgstr ""
+"لا توجد مدة معرّفة لهذا التاريخ: %s\n"
+"يرجى إنشاء سنة مالية."
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:ir.model,name:account.model_account_move_line_reconcile_select
msgid "Move line reconcile select"
-msgstr "انقل السطر و اختر الموازنة"
+<<<<<<< TREE
+msgstr "انقل السطر و اختر الموازنة"
+=======
+msgstr "انقل السطر و اختر الموازنة"
+
+#. module: account
+#: help:account.model.line,sequence:0
+msgid ""
+"The sequence field is used to order the resources from lower sequences to "
+"higher ones"
+msgstr ""
+"يستخدم حقل التسلسل بترتيب الموارد من التسلسل الأقل الى التسلسل الأعلى."
+>>>>>>> MERGE-SOURCE
#. module: account
#: help:account.tax.code,notprintable:0
@@ -253,6 +362,7 @@
#: code:addons/account/account_move_line.py:1200
#, python-format
msgid "You can not add/modify entries in a closed journal."
+<<<<<<< TREE
msgstr "لايمكن اضافة/تعديل البيانات في سجل مقفل"
#. module: account
@@ -267,6 +377,14 @@
#: report:account.overdue:0
msgid "Sub-Total :"
msgstr "جزئي:"
+=======
+msgstr "لايمكن اضافة/تعديل البيانات في سجل مقفل"
+
+#. module: account
+#: view:account.bank.statement:0
+msgid "Calculated Balance"
+msgstr "الرصيد الحسابي"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:ir.actions.act_window,name:account.action_account_use_model_create_entry
@@ -338,6 +456,7 @@
#: view:product.product:0
#: view:product.template:0
msgid "Purchase Properties"
+<<<<<<< TREE
msgstr "خصائص الشراء"
#. module: account
@@ -347,6 +466,9 @@
"leave the automatic formatting, it will be computed based on the financial "
"reports hierarchy (auto-computed field 'level')."
msgstr ""
+=======
+msgstr "خصائص الشراء"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.installer:0
@@ -369,6 +491,7 @@
"OpenERP. Journal items are created by OpenERP if you use Bank Statements, "
"Cash Registers, or Customer/Supplier payments."
msgstr ""
+<<<<<<< TREE
"طريقة العرض هذه يتم استخدامها بواسطة المحاسبين لإدخال مجموعة بيانات دفعة "
"واحدة. أما بنود الدفتر يتم إنشاءها في حالة استخدام كشف حساف، تسجيل نقدية أو "
"مدفوعات مورد/عميل."
@@ -377,6 +500,11 @@
#: constraint:account.move.line:0
msgid "You can not create journal items on an account of type view."
msgstr ""
+=======
+"طريقة العرض هذه يتم استخدامها بواسطة المحاسبين لإدخال مجموعة بيانات دفعة "
+"واحدة. أما بنود الدفتر يتم إنشاءها في حالة استخدام كشف حساف، تسجيل نقدية أو "
+"مدفوعات مورد/عميل."
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:ir.model,name:account.model_account_tax_template
@@ -447,12 +575,16 @@
#. module: account
#: help:account.model.line,amount_currency:0
msgid "The amount expressed in an optional other currency."
+<<<<<<< TREE
msgstr "أعرب الكمية بعملات اخرى اختيارية."
#. module: account
#: field:accounting.report,enable_filter:0
msgid "Enable Comparison"
msgstr "إتاحة المقارنة"
+=======
+msgstr "أعرب الكمية بعملات اخرى اختيارية."
+>>>>>>> MERGE-SOURCE
#. module: account
#: help:account.journal.period,state:0
@@ -541,9 +673,15 @@
msgstr "اختر مخططات الحسابات"
#. module: account
+<<<<<<< TREE
#: sql_constraint:res.company:0
msgid "The company name must be unique !"
msgstr ""
+=======
+#: view:product.product:0
+msgid "Purchase Taxes"
+msgstr "ضرائب الشراء"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:ir.model,name:account.model_account_invoice_refund
@@ -561,10 +699,17 @@
msgstr "حركات لم تسوى"
#. module: account
+<<<<<<< TREE
#: report:account.general.ledger:0
#: report:account.general.ledger_landscape:0
msgid "Counterpart"
msgstr "نظير"
+=======
+#: code:addons/account/account_cash_statement.py:348
+#, python-format
+msgid "CashBox Balance is not matching with Calculated Balance !"
+msgstr "رصيد النقدية لايساوي الرصيد الحسابي"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.fiscal.position:0
@@ -620,6 +765,7 @@
#. module: account
#: field:ir.sequence,fiscal_ids:0
msgid "Sequences"
+<<<<<<< TREE
msgstr "المتواليات"
#. module: account
@@ -627,6 +773,9 @@
#: selection:account.financial.report,type:0
msgid "Report Value"
msgstr "قيمة التقرير"
+=======
+msgstr "المتواليات"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.fiscal.position.template:0
@@ -641,6 +790,7 @@
#. module: account
#: sql_constraint:account.sequence.fiscalyear:0
msgid "Main Sequence must be different from current !"
+<<<<<<< TREE
msgstr "المسلسل الرئيسي لابد أن يختلف من الحالي !"
#. module: account
@@ -648,6 +798,9 @@
#, python-format
msgid "No period found or more than one period found for the given date."
msgstr ""
+=======
+msgstr "المسلسل الرئيسي لابد أن يختلف من الحالي !"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.invoice.tax,tax_amount:0
@@ -658,7 +811,16 @@
#: code:addons/account/account.py:3116
#, python-format
msgid "SAJ"
-msgstr "شباب العمال الاشتراكي."
+<<<<<<< TREE
+msgstr "شباب العمال الاشتراكي."
+=======
+msgstr "شباب العمال الاشتراكي."
+
+#. module: account
+#: help:account.bank.statement,balance_end_real:0
+msgid "closing balance entered by the cashbox verifier"
+msgstr "رصيد الإغلاق من محقق النقدية"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.period:0
@@ -698,6 +860,7 @@
#: model:ir.actions.act_window,name:account.action_aged_receivable
#, python-format
msgid "Receivable Accounts"
+<<<<<<< TREE
msgstr "حسابات مدينة"
#. module: account
@@ -706,6 +869,9 @@
"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 ""
+=======
+msgstr "حسابات مدينة"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:ir.model,name:account.model_account_report_general_ledger
@@ -723,24 +889,41 @@
msgstr "هل أنت متأكد من إنشاء القيد؟"
#. module: account
+<<<<<<< TREE
#: view:account.invoice:0
msgid "Print Invoice"
msgstr "طباعة الفاتورة"
+=======
+#: selection:account.bank.accounts.wizard,account_type:0
+msgid "Check"
+msgstr "تأكيد"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.partner.reconcile.process,today_reconciled:0
msgid "Partners Reconciled Today"
+<<<<<<< TREE
msgstr "شركاء تم تسويتهم اليوم"
#. module: account
#: view:report.hr.timesheet.invoice.journal:0
msgid "Sale journal in this year"
msgstr ""
+=======
+msgstr "شركاء تم تسويتهم اليوم"
+>>>>>>> MERGE-SOURCE
#. module: account
+<<<<<<< TREE
#: selection:account.financial.report,display_detail:0
msgid "Display children with hierarchy"
msgstr ""
+=======
+#: code:addons/account/account_bank_statement.py:306
+#, python-format
+msgid "The statement balance is incorrect !\n"
+msgstr "رصيد الكشف خاطئ !\n"
+>>>>>>> MERGE-SOURCE
#. module: account
#: selection:account.payment.term.line,value:0
@@ -758,23 +941,31 @@
#: model:ir.model,name:account.model_project_account_analytic_line
#, python-format
msgid "Analytic Entries by line"
+<<<<<<< TREE
msgstr "قيود تحليلية في سطور"
#. module: account
#: field:account.invoice.refund,filter_refund:0
msgid "Refund Method"
msgstr ""
+=======
+msgstr "قيود تحليلية في سطور"
+>>>>>>> MERGE-SOURCE
#. module: account
#: code:addons/account/wizard/account_change_currency.py:38
#, python-format
msgid "You can only change currency for Draft Invoice !"
+<<<<<<< TREE
msgstr "يمكن تغيير العملة في مسودة الفتورة"
#. module: account
#: model:ir.ui.menu,name:account.menu_account_report
msgid "Financial Report"
msgstr ""
+=======
+msgstr "يمكن تغيير العملة في مسودة الفتورة"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.analytic.journal:0
@@ -789,6 +980,7 @@
#: field:account.move.reconcile,type:0
#: field:report.invoice.created,type:0
msgid "Type"
+<<<<<<< TREE
msgstr "نوع"
#. module: account
@@ -798,6 +990,9 @@
"Taxes are missing!\n"
"Click on compute button."
msgstr ""
+=======
+msgstr "نوع"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:ir.model,name:account.model_account_subscription_line
@@ -807,12 +1002,16 @@
#. module: account
#: help:account.invoice,reference:0
msgid "The partner reference of this invoice."
+<<<<<<< TREE
msgstr "مرجع الشريك لهذه الفاتورة"
#. module: account
#: view:account.invoice.report:0
msgid "Supplier Invoices And Refunds"
msgstr ""
+=======
+msgstr "مرجع الشريك لهذه الفاتورة"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.move.line.unreconcile.select:0
@@ -820,12 +1019,16 @@
#: view:account.unreconcile.reconcile:0
#: model:ir.model,name:account.model_account_move_line_unreconcile_select
msgid "Unreconciliation"
+<<<<<<< TREE
msgstr "عكس التسوية"
#. module: account
#: view:account.payment.term.line:0
msgid "At 14 net days 2 percent, remaining amount at 30 days end of month."
msgstr ""
+=======
+msgstr "عكس التسوية"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:ir.model,name:account.model_account_analytic_journal_report
@@ -835,11 +1038,21 @@
#. module: account
#: model:ir.model,name:account.model_account_automatic_reconcile
msgid "Automatic Reconcile"
-msgstr "تسوية آلية"
+<<<<<<< TREE
+msgstr "تسوية آلية"
+=======
+msgstr "تسوية آلية"
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid "Due date Computation"
+msgstr "تاريخ استحقاق الحساب"
+>>>>>>> MERGE-SOURCE
#. module: account
#: report:account.analytic.account.quantity_cost_ledger:0
msgid "J.C./Move name"
+<<<<<<< TREE
msgstr "نقل اسم/ j.c."
#. module: account
@@ -850,6 +1063,9 @@
"or Loss you'd realized if those transactions were ended today. Only for "
"accounts having a secondary currency set."
msgstr ""
+=======
+msgstr "نقل اسم/ j.c."
+>>>>>>> MERGE-SOURCE
#. module: account
#: selection:account.entries.report,month:0
@@ -889,6 +1105,7 @@
#. module: account
#: view:account.payment.term:0
msgid "Computation"
+<<<<<<< TREE
msgstr "أحسب/حساب"
#. module: account
@@ -900,6 +1117,22 @@
#: field:account.cashbox.line,pieces:0
msgid "Values"
msgstr "قيم"
+=======
+msgstr "أحسب/حساب"
+
+#. module: account
+#: view:account.move.line:0
+msgid "Next Partner to reconcile"
+msgstr "الشريك التالي للموازنة"
+
+#. module: account
+#: code:addons/account/account_move_line.py:1191
+#, python-format
+msgid ""
+"You can not do this modification on a confirmed entry ! Please note that you "
+"can just change some non important fields !"
+msgstr "لا يمكنك التعديلات لقيد مؤكد ! يمكنك تحرير بعض الحقول غير المهمة فقط"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.invoice.report:0
@@ -922,6 +1155,7 @@
#. module: account
#: report:account.overdue:0
msgid "Due"
+<<<<<<< TREE
msgstr "مستحق"
#. module: account
@@ -931,14 +1165,24 @@
"You cannot validate this journal entry because account \"%s\" does not "
"belong to chart of accounts \"%s\"!"
msgstr ""
+=======
+msgstr "مستحق"
+>>>>>>> MERGE-SOURCE
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_move_line.py:835
#, python-format
msgid ""
"This account does not allow reconciliation! You should update the account "
"definition to change this."
msgstr ""
+=======
+#: view:account.invoice.report:0
+#: field:account.invoice.report,price_total_tax:0
+msgid "Total With Tax"
+msgstr "إجمالي مع الضرائب"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.invoice:0
@@ -960,6 +1204,7 @@
#: selection:account.account.template,type:0
#: selection:account.entries.report,type:0
msgid "Consolidation"
+<<<<<<< TREE
msgstr "تجميع"
#. module: account
@@ -970,6 +1215,11 @@
msgstr "الخصوم"
#. module: account
+=======
+msgstr "تجميع"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: view:account.entries.report:0
msgid "Extended Filters..."
msgstr "مرشحات مفصلة..."
@@ -1001,6 +1251,7 @@
"amount.If the tax account is base tax code, this field will contain the "
"basic amount(without tax)."
msgstr ""
+<<<<<<< TREE
"إذا كان حساب الضريبة هو حساب رمز الضريبة، فهذا الحقل سيحتوي علي قيمة "
"الضريبة. إذا كان حساب الضريبة رمز الضريبة الرئيسي، فهذا الحقل سيحتوي علي "
"المبلغ الرئيسي (دون الضريبة)."
@@ -1010,6 +1261,11 @@
#, python-format
msgid "I can not locate a parent code for the template account!"
msgstr ""
+=======
+"إذا كان حساب الضريبة هو حساب رمز الضريبة، فهذا الحقل سيحتوي علي قيمة "
+"الضريبة. إذا كان حساب الضريبة رمز الضريبة الرئيسي، فهذا الحقل سيحتوي علي "
+"المبلغ الرئيسي (دون الضريبة)."
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.analytic.line:0
@@ -1076,6 +1332,7 @@
#. module: account
#: field:account.report.general.ledger,landscape:0
msgid "Landscape Mode"
+<<<<<<< TREE
msgstr "وضع أفقي"
#. module: account
@@ -1090,6 +1347,14 @@
#: field:account.report.general.ledger,sortby:0
msgid "Sort by"
msgstr "ترتيب حسب"
+=======
+msgstr "وضع أفقي"
+
+#. module: account
+#: view:board.board:0
+msgid "Customer Invoices to Approve"
+msgstr "فاتورة الزبون للموافقة"
+>>>>>>> MERGE-SOURCE
#. module: account
#: help:account.fiscalyear.close,fy_id:0
@@ -1102,6 +1367,7 @@
"These types are defined according to your country. The type contains more "
"information about the account and its specificities."
msgstr ""
+<<<<<<< TREE
"وتعرف هذه الأنواع طبقًا لبلدك. النوع يحتوي على مزيد من المعلومات عن الحساب "
"وخصوصياتها."
@@ -1111,6 +1377,10 @@
msgid ""
"You have to provide an account for the write off/exchange difference entry !"
msgstr ""
+=======
+"وتعرف هذه الأنواع طبقًا لبلدك. النوع يحتوي على مزيد من المعلومات عن الحساب "
+"وخصوصياتها."
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.tax:0
@@ -1126,7 +1396,16 @@
#: model:ir.actions.act_window,name:account.action_view_bank_statement_tree
#: model:ir.ui.menu,name:account.journal_cash_move_lines
msgid "Cash Registers"
-msgstr "سجلات النقدية"
+<<<<<<< TREE
+msgstr "سجلات النقدية"
+=======
+msgstr "سجلات النقدية"
+
+#. module: account
+#: selection:account.account.type,report_type:0
+msgid "Profit & Loss (Expense Accounts)"
+msgstr "الربح و الخسارة (حسابات النفقة)"
+>>>>>>> MERGE-SOURCE
#. module: account
#: report:account.analytic.account.journal:0
@@ -1144,12 +1423,16 @@
#. module: account
#: view:account.subscription.generate:0
msgid "Generate Entries before:"
+<<<<<<< TREE
msgstr "تكوين المدخلات قبل:"
#. module: account
#: view:account.move.line:0
msgid "Unbalanced Journal Items"
msgstr ""
+=======
+msgstr "تكوين المدخلات قبل:"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:account.account.type,name:account.data_account_type_bank
@@ -1167,6 +1450,7 @@
#. module: account
#: model:process.transition,name:account.process_transition_confirmstatementfromdraft0
msgid "Confirm statement"
+<<<<<<< TREE
msgstr "تأكيد الكشف"
#. module: account
@@ -1175,6 +1459,9 @@
"Total amount (in Secondary currency) for transactions held in secondary "
"currency for this account."
msgstr ""
+=======
+msgstr "تأكيد الكشف"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.fiscal.position.tax,tax_dest_id:0
@@ -1185,12 +1472,16 @@
#. module: account
#: selection:account.move.line,centralisation:0
msgid "Credit Centralisation"
+<<<<<<< TREE
msgstr "مركزية الدين"
#. module: account
#: view:report.account_type.sales:0
msgid "All Months Sales by type"
msgstr ""
+=======
+msgstr "مركزية الدين"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:ir.actions.act_window,help:account.action_invoice_tree2
@@ -1200,6 +1491,7 @@
"purchase orders or receipts. This way, you can control the invoice from your "
"supplier according to what you purchased or received."
msgstr ""
+<<<<<<< TREE
"يمكنك مع المزود ان اتدخل وتدير الفواتير المصدرة من مزوداتك. يمكن انتاج "
"فواتير مسودة بفتح erp تلقائيًا من اوامر المشترى او الاستلامات. بتلك الطريقة, "
"يمكنك التحكم في الفاتورة من مزودك طبقًا لما اشتريته او استقبلته."
@@ -1209,21 +1501,36 @@
#: model:ir.ui.menu,name:account.menu_action_account_tax_code_template_form
msgid "Tax Code Templates"
msgstr "قوالب رمز الضريبة"
+=======
+"يمكنك مع المزود ان اتدخل وتدير الفواتير المصدرة من مزوداتك. يمكن انتاج "
+"فواتير مسودة بفتح erp تلقائيًا من اوامر المشترى او الاستلامات. بتلك الطريقة, "
+"يمكنك التحكم في الفاتورة من مزودك طبقًا لما اشتريته او استقبلته."
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.invoice.cancel:0
msgid "Cancel Invoices"
+<<<<<<< TREE
msgstr "الغاء الفواتير"
#. module: account
#: help:account.journal,code:0
msgid "The code will be displayed on reports."
msgstr ""
+=======
+msgstr "الغاء الفواتير"
+>>>>>>> MERGE-SOURCE
#. module: account
+<<<<<<< TREE
#: view:account.tax.template:0
msgid "Taxes used in Purchases"
msgstr ""
+=======
+#: view:account.unreconcile.reconcile:0
+msgid "Unreconciliation transactions"
+msgstr "إلغاء تسوية المعاملات"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.invoice.tax,tax_code_id:0
@@ -1236,16 +1543,21 @@
#. module: account
#: field:account.account,currency_mode:0
msgid "Outgoing Currencies Rate"
+<<<<<<< TREE
msgstr "معدل العملات الصادرة"
#. module: account
#: selection:account.analytic.journal,type:0
msgid "Situation"
msgstr "الحالة"
+=======
+msgstr "معدل العملات الصادرة"
+>>>>>>> MERGE-SOURCE
#. module: account
#: help:account.move.line,move_id:0
msgid "The move of this entry line."
+<<<<<<< TREE
msgstr "الحركة لخط هذا القيد"
#. module: account
@@ -1255,6 +1567,9 @@
"You can not use this general account in this journal, check the tab 'Entry "
"Controls' on the related journal !"
msgstr ""
+=======
+msgstr "الحركة لخط هذا القيد"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.move.line.reconcile,trans_nbr:0
@@ -1285,12 +1600,16 @@
#: view:account.analytic.line:0
#: view:account.journal:0
msgid "Others"
+<<<<<<< TREE
msgstr "أخرى"
#. module: account
#: view:account.subscription:0
msgid "Draft Subscription"
msgstr ""
+=======
+msgstr "أخرى"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.account:0
@@ -1359,12 +1678,16 @@
#: code:addons/account/wizard/account_report_common.py:144
#, python-format
msgid "Select a starting and an ending period"
+<<<<<<< TREE
msgstr "اختر بداية و نهاية للفترة"
#. module: account
#: model:account.financial.report,name:account.account_financial_report_profitandloss0
msgid "Profit and Loss"
msgstr ""
+=======
+msgstr "اختر بداية و نهاية للفترة"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:ir.model,name:account.model_account_account_template
@@ -1374,7 +1697,16 @@
#. module: account
#: view:account.tax.code.template:0
msgid "Search tax template"
-msgstr "بحث قوالب الضريبة"
+<<<<<<< TREE
+msgstr "بحث قوالب الضريبة"
+=======
+msgstr "بحث قوالب الضريبة"
+
+#. module: account
+#: report:account.invoice:0
+msgid "Your Reference"
+msgstr "مرجعك"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.move.reconcile:0
@@ -1428,7 +1760,16 @@
#: model:process.node,name:account.process_node_bankstatement0
#: model:process.node,name:account.process_node_supplierbankstatement0
msgid "Bank Statement"
-msgstr "كشف حساب بنك"
+<<<<<<< TREE
+msgstr "كشف حساب بنك"
+=======
+msgstr "كشف حساب بنك"
+
+#. module: account
+#: view:res.partner:0
+msgid "Bank account owner"
+msgstr "كشف حساب البنك"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:res.partner,property_account_receivable:0
@@ -1438,7 +1779,17 @@
#. module: account
#: model:ir.actions.report.xml,name:account.account_central_journal
msgid "Central Journal"
-msgstr "اليومية العامة"
+<<<<<<< TREE
+msgstr "اليومية العامة"
+=======
+msgstr "اليومية العامة"
+
+#. module: account
+#: code:addons/account/account_move_line.py:1271
+#, python-format
+msgid "You can not use this general account in this journal !"
+msgstr "لا يمكنك إستخدام هذا الحساب العام في هذه اليومية !"
+>>>>>>> MERGE-SOURCE
#. module: account
#: selection:account.balance.report,display_account:0
@@ -1510,6 +1861,7 @@
#. module: account
#: view:account.entries.report:0
msgid "# of Entries "
+<<<<<<< TREE
msgstr "عدد القيود "
#. module: account
@@ -1518,6 +1870,9 @@
"By unchecking the active field, you may hide a fiscal position without "
"deleting it."
msgstr ""
+=======
+msgstr "عدد القيود "
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:ir.model,name:account.model_temp_range
@@ -1528,9 +1883,37 @@
#: model:ir.actions.act_window,name:account.action_invoice_tree4
#: model:ir.ui.menu,name:account.menu_action_invoice_tree4
msgid "Supplier Refunds"
-msgstr "رد مال للمورد"
-
-#. module: account
+<<<<<<< TREE
+msgstr "رد مال للمورد"
+=======
+msgstr "رد مال للمورد"
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid ""
+"Example: at 14 net days 2 percents, remaining amount at 30 days end of month."
+msgstr ""
+"مثال: عند صافي 14 يوم 2 في المائة, مبلغ متبقي عند نهاية 30 يومًا من الشهر."
+
+#. module: account
+#: code:addons/account/invoice.py:815
+#, python-format
+msgid ""
+"Cannot create the invoice !\n"
+"The payment term defined gives a computed amount greater than the total "
+"invoiced amount."
+msgstr ""
+"لا يمكنك من إنشاء الفاتورة !\n"
+"طريقة السداد المحددة تعطي قيمة حسابية أكبر من إجمالي قيمة الفاتورة."
+
+#. module: account
+#: field:account.installer.modules,account_anglo_saxon:0
+msgid "Anglo-Saxon Accounting"
+msgstr "المحاسبة الإنجليزية"
+>>>>>>> MERGE-SOURCE
+
+#. module: account
+<<<<<<< TREE
#: selection:account.account,type:0
#: selection:account.account.template,type:0
#: selection:account.bank.statement,state:0
@@ -1540,6 +1923,12 @@
#: selection:account.period,state:0
msgid "Closed"
msgstr "مغلق"
+=======
+#: view:account.automatic.reconcile:0
+#: view:account.move.line.reconcile.writeoff:0
+msgid "Write-Off Move"
+msgstr "حركة الإعدام"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:ir.ui.menu,name:account.menu_finance_recurrent_entries
@@ -1549,7 +1938,16 @@
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_template
msgid "Template for Fiscal Position"
-msgstr "قوالب للمركز المالي"
+<<<<<<< TREE
+msgstr "قوالب للمركز المالي"
+=======
+msgstr "قوالب للمركز المالي"
+
+#. module: account
+#: model:account.tax.code,name:account.account_tax_code_0
+msgid "Tax Code Test"
+msgstr "اختبار رمز الضريبة"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.automatic.reconcile,reconciled:0
@@ -1596,6 +1994,7 @@
#: view:account.move.line:0
msgid "Unposted Journal Items"
msgstr ""
+"قيمة دائنة أو مدينة خاطئة في النموذج (دائن + مدين يجب أن يكون أكبر من صفر)!"
#. module: account
#: view:account.chart.template:0
@@ -1676,7 +2075,16 @@
#. module: account
#: view:account.invoice:0
msgid "Responsible"
-msgstr "مسئول"
+<<<<<<< TREE
+msgstr "مسئول"
+=======
+msgstr "مسئول"
+
+#. module: account
+#: report:account.overdue:0
+msgid "Sub-Total :"
+msgstr "جزئي:"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
@@ -1694,6 +2102,7 @@
#. module: account
#: model:ir.ui.menu,name:account.periodical_processing_invoicing
msgid "Invoicing"
+<<<<<<< TREE
msgstr "الفواتير"
#. module: account
@@ -1701,10 +2110,25 @@
#, python-format
msgid "Unknown Partner"
msgstr "شريك مجهول"
+=======
+msgstr "الفواتير"
+
+#. module: account
+#: field:account.chart.template,tax_code_root_id:0
+msgid "Root Tax Code"
+msgstr "رمز الضريبة الرئيسي"
+
+#. module: account
+#: field:account.partner.ledger,initial_balance:0
+#: field:account.report.general.ledger,initial_balance:0
+msgid "Include initial balances"
+msgstr "ضم الأرصدة المبدئية"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.tax.code,sum:0
msgid "Year Sum"
+<<<<<<< TREE
msgstr "جمع السنة"
#. module: account
@@ -1713,6 +2137,9 @@
msgid ""
"You selected an Unit of Measure which is not compatible with the product."
msgstr "لقد اخترت وحدة مقياس غير ملائمة للمنتج."
+=======
+msgstr "جمع السنة"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.change.currency:0
@@ -1726,6 +2153,7 @@
"Have a complete tree view of all journal items per account code by clicking "
"on an account."
msgstr ""
+<<<<<<< TREE
"اعرض لائحة بأسماء حسابات السنة المالية لشركتك وصنف بالمدة. لديك لائحة "
"كاملة لكل قيود دفتر الأستاذ على حسب رقم الحساب عن طريق الضغط على الحساب"
@@ -1738,6 +2166,26 @@
#: view:account.tax.template:0
msgid "Tax Declaration"
msgstr "الإعلان الضريبي"
+=======
+"اعرض لائحة بأسماء حسابات السنة المالية لشركتك وصنف بالمدة. لديك لائحة "
+"كاملة لكل قيود دفتر الأستاذ على حسب رقم الحساب عن طريق الضغط على الحساب"
+
+#. module: account
+#: constraint:account.fiscalyear:0
+msgid "Error! You cannot define overlapping fiscal years"
+msgstr "خطأ! لا يمكنك تعريف سنوات مالية متداخلة"
+
+#. module: account
+#: code:addons/account/account_move_line.py:835
+#, python-format
+msgid "The account is not defined to be reconciled !"
+msgstr "لم يعرف الحساب لتسويته !"
+
+#. module: account
+#: field:account.cashbox.line,pieces:0
+msgid "Values"
+msgstr "قيم"
+>>>>>>> MERGE-SOURCE
#. module: account
#: help:account.journal.period,active:0
@@ -1749,12 +2197,31 @@
#. module: account
#: view:res.partner:0
msgid "Supplier Debit"
-msgstr "مورد مدين"
+<<<<<<< TREE
+msgstr "مورد مدين"
+=======
+msgstr "مورد مدين"
+
+#. module: account
+#: help:account.model.line,quantity:0
+msgid "The optional quantity on entries"
+msgstr "الكمية الإختيارية علي القيود"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:ir.actions.act_window,name:account.act_account_partner_account_move_all
msgid "Receivables & Payables"
-msgstr "المدينون و الدائنون"
+<<<<<<< TREE
+msgstr "المدينون و الدائنون"
+=======
+msgstr "المدينون و الدائنون"
+
+#. module: account
+#: code:addons/account/account_move_line.py:815
+#, python-format
+msgid "You have to provide an account for the write off entry !"
+msgstr "يجب إعطاء حساب لقيود الإعدام !"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:ir.model,name:account.model_account_common_journal_report
@@ -1801,20 +2268,55 @@
#. module: account
#: view:account.tax:0
msgid "Tax Declaration: Credit Notes"
-msgstr "الإعلان الضريبي: الأوراق الدائنة"
+<<<<<<< TREE
+msgstr "الإعلان الضريبي: الأوراق الدائنة"
+=======
+msgstr "الإعلان الضريبي: الأوراق الدائنة"
+
+#. module: account
+#: code:addons/account/account.py:499
+#, python-format
+msgid "You cannot deactivate an account that contains account moves."
+msgstr "لا يمكنك إلغاء نشاط حساب إذا كان يحتوي علي حركات حساب."
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.move.line.reconcile,credit:0
msgid "Credit amount"
+<<<<<<< TREE
msgstr "مبلغ الدائنون"
#. module: account
#: code:addons/account/account.py:407
#: code:addons/account/account.py:412
#: code:addons/account/account.py:429
+=======
+msgstr "مبلغ الدائنون"
+
+#. module: account
+#: constraint:account.move.line:0
+msgid "You can not create move line on closed account."
+msgstr "لا يمكنك إنشاء حركة سطر علي حساب مغلق."
+
+#. module: account
+#: code:addons/account/account.py:519
+>>>>>>> MERGE-SOURCE
#, python-format
+<<<<<<< TREE
msgid "Error!"
msgstr "خطأ!"
+=======
+msgid ""
+"You cannot change the type of account from 'Closed' to any other type which "
+"contains account entries!"
+msgstr ""
+"لا يمكنك تغيير نوع الحساب من \"مغلق\" إلي أي نوع آخر يحتوي علي قيود يومية!"
+
+#. module: account
+#: view:res.company:0
+msgid "Reserve And Profit/Loss Account"
+msgstr "حساب الإحتياطي و الأرباح و الخسائر"
+>>>>>>> MERGE-SOURCE
#. module: account
#: sql_constraint:account.move.line:0
@@ -1844,9 +2346,15 @@
msgstr "القيود في سطر"
#. module: account
+<<<<<<< TREE
#: field:account.vat.declaration,based_on:0
msgid "Based on"
msgstr "بالاستناد الى"
+=======
+#: report:account.tax.code.entries:0
+msgid "A/c Code"
+msgstr "كود c/a"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.invoice,move_id:0
@@ -1876,12 +2384,16 @@
#. module: account
#: constraint:res.company:0
msgid "Error! You can not create recursive companies."
+<<<<<<< TREE
msgstr "خطأ! لا يمكنك إنشاء شركات متداخلة (شركات تستخدم نفسها)."
#. module: account
#: model:ir.actions.report.xml,name:account.account_journal_sale_purchase
msgid "Sale/Purchase Journal"
msgstr ""
+=======
+msgstr "خطأ! لا يمكنك إنشاء شركات متداخلة (شركات تستخدم نفسها)."
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.analytic.account:0
@@ -1914,6 +2426,7 @@
#. module: account
#: selection:account.account.type,report_type:0
msgid "/"
+<<<<<<< TREE
msgstr "/"
#. module: account
@@ -1923,6 +2436,19 @@
"will be added, Loss : Amount will be deducted.), as calculated in Profit & "
"Loss Report"
msgstr ""
+=======
+msgstr "/"
+
+#. module: account
+#: field:account.bs.report,reserve_account_id:0
+msgid "Reserve & Profit/Loss Account"
+msgstr "حساب الإحتياطي و الأرباح و الخسائر"
+
+#. module: account
+#: help:account.bank.statement,balance_end:0
+msgid "Closing balance based on Starting Balance and Cash Transactions"
+msgstr "رصيد الإغلاق بناءاً علي رصيد أول المدة و معاملات النقدية"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:process.node,note:account.process_node_reconciliation0
@@ -1962,15 +2488,22 @@
msgstr "إذا تم إختيار \"صحيح\" فلن تقبل قيد بتاريخ خارج الفترة المعرفة"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:73
#, python-format
msgid "You must define an analytic journal of type '%s'!"
msgstr ""
+=======
+#: model:ir.actions.act_window,name:account.action_account_pl_report
+msgid "Account Profit And Loss"
+msgstr "حساب الإربح و الخسائر"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.installer,config_logo:0
#: field:wizard.multi.charts.accounts,config_logo:0
msgid "Image"
+<<<<<<< TREE
msgstr "صورة"
#. module: account
@@ -1985,6 +2518,9 @@
#: model:ir.actions.act_window,help:account.action_account_financial_report_tree
msgid "Makes a generic system to draw financial reports easily."
msgstr ""
+=======
+msgstr "صورة"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.invoice:0
@@ -1998,6 +2534,7 @@
"If the active field is set to False, it will allow you to hide the tax "
"without removing it."
msgstr ""
+<<<<<<< TREE
"إذا كان الحقل النشط به لا أو (False) سيسمح لك بإخفاء الضريبة دون إزالتها"
#. module: account
@@ -2027,6 +2564,26 @@
#: report:account.journal.period.print.sale.purchase:0
msgid "VAT Declaration"
msgstr ""
+=======
+"إذا كان الحقل النشط به لا أو (False) سيسمح لك بإخفاء الضريبة دون إزالتها"
+
+#. module: account
+#: help:account.bank.statement,name:0
+msgid ""
+"if you give the Name other then /, its created Accounting Entries Move will "
+"be with same name as statement name. This allows the statement entries to "
+"have the same references than the statement itself"
+msgstr ""
+"اذا اعطيت اسم لاخر بعد / , فهي تنشأ تحرك مدخلات محاسبية ستكون مع نفس الاسم "
+"كإسم البيان. وهي تسمح لمدخلات البيان ان يكون لها نفس المراجع عن البيان نفسه."
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_unreconcile
+#: model:ir.actions.act_window,name:account.action_account_unreconcile_reconcile
+#: model:ir.actions.act_window,name:account.action_account_unreconcile_select
+msgid "Unreconcile Entries"
+msgstr "إلغاء تسوية القيود"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.move.reconcile,line_partial_ids:0
@@ -2090,6 +2647,7 @@
"Invalid period ! Some periods overlap or the date period is not in the scope "
"of the fiscal year. "
msgstr ""
+<<<<<<< TREE
"فترة خاطئة ! بعض الفترات تتداخل أو أن التاريخ ليس موجود داخل الفترة المالية. "
#. module: account
@@ -2097,6 +2655,9 @@
#, python-format
msgid "You have to assign an analytic journal on the '%s' journal!"
msgstr ""
+=======
+"فترة خاطئة ! بعض الفترات تتداخل أو أن التاريخ ليس موجود داخل الفترة المالية. "
+>>>>>>> MERGE-SOURCE
#. module: account
#: selection:account.invoice,state:0
@@ -2104,10 +2665,23 @@
#: selection:account.invoice.report,state:0
#: selection:report.invoice.created,state:0
msgid "Pro-forma"
-msgstr "كمسألة شكلية"
-
-#. module: account
-#: code:addons/account/account.py:1461
+<<<<<<< TREE
+msgstr "كمسألة شكلية"
+
+#. module: account
+#: code:addons/account/account.py:1461
+=======
+msgstr "كمسألة شكلية"
+
+#. module: account
+#: code:addons/account/installer.py:348
+#, python-format
+msgid " Journal"
+msgstr " يومية"
+
+#. module: account
+#: code:addons/account/account.py:1461
+>>>>>>> MERGE-SOURCE
#, python-format
msgid ""
"There is no default default debit account defined \n"
@@ -2126,10 +2700,15 @@
"partners accounts (for debit/credit computations), closed for depreciated "
"accounts."
msgstr ""
+"استخدم هذا النموذج ليميز العلامات بتأثيرات خاصة في OpenERP: لا يمكن للعرض ان "
+"يحتوي على مدخلات, التدعيم هو حسابات يمكن ان تشمل على حسابات فرعية لتدعيمات "
+"الشركة المتعددة, الدفع/الاستقبال لكل حسابات الشركاء (دين/حسابية الائتمان), "
+"مغلق للحاسبات المنخفضة القيمة."
#. module: account
#: view:account.chart.template:0
msgid "Search Chart of Account Templates"
+<<<<<<< TREE
msgstr "بحث قوالب دليل الحسابات"
#. module: account
@@ -2153,6 +2732,9 @@
#: report:account.invoice:0
msgid "Customer Code"
msgstr ""
+=======
+msgstr "بحث قوالب دليل الحسابات"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.installer:0
@@ -2187,7 +2769,7 @@
#: code:addons/account/account.py:3119
#, python-format
msgid "ECNJ"
-msgstr ""
+msgstr "ECNJ"
#. module: account
#: view:account.subscription:0
@@ -2206,12 +2788,16 @@
#: code:addons/account/account_invoice.py:370
#, python-format
msgid "There is no Accounting Journal of type Sale/Purchase defined!"
+<<<<<<< TREE
msgstr "لا يوجد دفتر يومية للمبيعات أو المشتريات معرف!"
#. module: account
#: constraint:res.partner.bank:0
msgid "The RIB and/or IBAN is not valid"
msgstr ""
+=======
+msgstr "لا يوجد دفتر يومية للمبيعات أو المشتريات معرف!"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:product.category:0
@@ -2294,6 +2880,7 @@
#: help:accounting.report,fiscalyear_id:0
#: help:accounting.report,fiscalyear_id_cmp:0
msgid "Keep empty for all open fiscal year"
+<<<<<<< TREE
msgstr "اتركه فارغ لجميع السنوات المالية المفتوحة"
#. module: account
@@ -2316,20 +2903,28 @@
"'Setup Your Bank Accounts' tool that will automatically create the accounts "
"and journals for you."
msgstr ""
+=======
+msgstr "اتركه فارغ لجميع السنوات المالية المفتوحة"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:ir.model,name:account.model_account_move
msgid "Account Entry"
+<<<<<<< TREE
msgstr "قيد الحساب"
#. module: account
#: constraint:res.partner:0
msgid "Error ! You cannot create recursive associated members."
msgstr ""
+=======
+msgstr "قيد الحساب"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.sequence.fiscalyear,sequence_main_id:0
msgid "Main Sequence"
+<<<<<<< TREE
msgstr "المسلسل الرئيسي"
#. module: account
@@ -2339,6 +2934,9 @@
"In order to delete a bank statement, you must first cancel it to delete "
"related journal items."
msgstr ""
+=======
+msgstr "المسلسل الرئيسي"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.invoice,payment_term:0
@@ -2356,6 +2954,7 @@
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
msgid "Fiscal Positions"
+<<<<<<< TREE
msgstr "الأوضاع المالية"
#. module: account
@@ -2363,6 +2962,9 @@
#: constraint:account.tax.code:0
msgid "Error ! You can not create recursive accounts."
msgstr "خطأ ! لا يمكن إنشاء حسابات تكرارية."
+=======
+msgstr "الأوضاع المالية"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.period.close,sure:0
@@ -2393,7 +2995,17 @@
#: model:process.node,note:account.process_node_draftinvoices0
#: model:process.node,note:account.process_node_supplierdraftinvoices0
msgid "Draft state of an invoice"
-msgstr "حالة مسودة من الفاتورة"
+<<<<<<< TREE
+msgstr "حالة مسودة من الفاتورة"
+=======
+msgstr "حالة مسودة من الفاتورة"
+
+#. module: account
+#: help:account.account,reconcile:0
+msgid ""
+"Check this if the user is allowed to reconcile entries in this account."
+msgstr "علم علي هذه لو أن هذا المستخدم لتسوية قيود هذا الحساب."
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.partner.reconcile.process:0
@@ -2415,6 +3027,7 @@
"You can create one in the menu: \n"
"Configuration\\Financial Accounting\\Accounts\\Journals."
msgstr ""
+<<<<<<< TREE
"لم يتمكن من إيجاد حساب يومية لنوع %s لهذه الشركة.\n"
"\n"
"يمكنك إنشاء واحد من القائمة: \n"
@@ -2430,6 +3043,12 @@
#: view:account.entries.report:0
msgid "Unreconciled entries"
msgstr "إدخالات لم يتم تسويتها"
+=======
+"لم يتمكن من إيجاد حساب يومية لنوع %s لهذه الشركة.\n"
+"\n"
+"يمكنك إنشاء واحد من القائمة: \n"
+"Configuration\\Financial Accounting\\Accounts\\Journals."
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.invoice.tax,base_code_id:0
@@ -2460,6 +3079,12 @@
"useful because it enables you to preview at any time the tax that you owe at "
"the start and end of the month or quarter."
msgstr ""
+"تطبع هذه القائمة إعلان ضريبة القيمة المضافة على أساس الفواتير أو المدفوعات. "
+"حدد واحد أو عدة فترات من السنة المالية. يتم إنشاء المعلومات المطلوبة "
+"تلقائيًا للحصول على الإقرار الضريبي من قبل OpenERP من الفواتير (أو دفعات، في "
+"بعض البلدان). ويتم تحديث هذه البيانات في الوقت الحقيقي. وهذا مفيد جدا لأنه "
+"يتيح لك المعاينة في أي وقت للضرائب التي مدينون لكم في بداية ونهاية الشهر "
+"الجاري أو الربع."
#. module: account
#: selection:account.move.line,centralisation:0
@@ -2495,7 +3120,7 @@
#: code:addons/account/account.py:3117
#, python-format
msgid "EXJ"
-msgstr ""
+msgstr "EXJ"
#. module: account
#: field:product.template,supplier_taxes_id:0
@@ -2547,6 +3172,7 @@
#: view:account.print.journal:0
msgid ""
"This report gives you an overview of the situation of a specific journal"
+<<<<<<< TREE
msgstr "هذا التقرير يعطي لمحة عامة عن وضع يومية محددة"
#. module: account
@@ -2556,6 +3182,17 @@
#. module: account
#: model:account.account.type,name:account.account_type_tax
+=======
+msgstr "هذا التقرير يعطي لمحة عامة عن وضع يومية محددة"
+
+#. module: account
+#: constraint:product.category:0
+msgid "Error ! You can not create recursive categories."
+msgstr "خطأ! لا يمكنك إنشاء فئات متداخلة."
+
+#. module: account
+#: model:account.account.type,name:account.account_type_tax
+>>>>>>> MERGE-SOURCE
#: report:account.invoice:0
#: field:account.invoice,amount_tax:0
#: field:account.move.line,account_tax_id:0
@@ -2600,7 +3237,20 @@
#. module: account
#: report:account.overdue:0
msgid "Date:"
-msgstr "تاريخ:"
+<<<<<<< TREE
+msgstr "تاريخ:"
+=======
+msgstr "تاريخ:"
+
+#. module: account
+#: code:addons/account/account.py:640
+#, python-format
+msgid ""
+"You cannot modify company of this journal as its related record exist in "
+"Entry Lines"
+msgstr ""
+"ﻻ يمكنك تعديل الشركة لهذه اليومية حيث أن له إرتباطات أخري في سطور القيد"
+>>>>>>> MERGE-SOURCE
#. module: account
#: report:account.journal.period.print:0
@@ -2643,12 +3293,16 @@
#. module: account
#: help:account.move.line,tax_code_id:0
msgid "The Account can either be a base tax code or a tax code account."
+<<<<<<< TREE
msgstr "يمكن للحساب أن يكون رمز رئيسي للضريبة أو حساب رمز الضريبة."
#. module: account
#: sql_constraint:account.model.line:0
msgid "Wrong credit or debit value in model, they must be positive!"
msgstr ""
+=======
+msgstr "يمكن للحساب أن يكون رمز رئيسي للضريبة أو حساب رمز الضريبة."
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:ir.ui.menu,name:account.menu_automatic_reconcile
@@ -2664,7 +3318,18 @@
#: field:account.tax,ref_base_code_id:0
#: field:account.tax.template,ref_base_code_id:0
msgid "Refund Base Code"
-msgstr "الرمز الرئيسي للرد"
+<<<<<<< TREE
+msgstr "الرمز الرئيسي للرد"
+=======
+msgstr "الرمز الرئيسي للرد"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_bank_statement_periodic_tree
+#: model:ir.actions.act_window,name:account.action_bank_statement_tree
+#: model:ir.ui.menu,name:account.menu_bank_statement_tree
+msgid "Bank Statements"
+msgstr "كشوف حساب البنك"
+>>>>>>> MERGE-SOURCE
#. module: account
#: selection:account.tax.template,applicable_type:0
@@ -2678,17 +3343,22 @@
#: view:account.move.line:0
#: view:accounting.report:0
msgid "Dates"
+<<<<<<< TREE
msgstr "تواريخ"
#. module: account
#: field:account.chart.template,parent_id:0
msgid "Parent Chart Template"
msgstr ""
+=======
+msgstr "تواريخ"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.tax,parent_id:0
#: field:account.tax.template,parent_id:0
msgid "Parent Tax Account"
+<<<<<<< TREE
msgstr "حساب الضرائب الرئيسي"
#. module: account
@@ -2696,6 +3366,9 @@
#, python-format
msgid "New currency is not configured properly !"
msgstr ""
+=======
+msgstr "حساب الضرائب الرئيسي"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.subscription.generate:0
@@ -2717,12 +3390,16 @@
#: model:process.transition,name:account.process_transition_entriesreconcile0
#: model:process.transition,name:account.process_transition_supplierentriesreconcile0
msgid "Accounting entries"
+<<<<<<< TREE
msgstr "قيود المحاسبة"
#. module: account
#: field:account.invoice,reference_type:0
msgid "Communication Type"
msgstr ""
+=======
+msgstr "قيود المحاسبة"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.invoice.line,discount:0
@@ -2747,12 +3424,16 @@
#: model:ir.actions.server,name:account.ir_actions_server_action_wizard_multi_chart
#: model:ir.ui.menu,name:account.menu_act_ir_actions_bleble
msgid "New Company Financial Setting"
+<<<<<<< TREE
msgstr "الإعدادات المالية للشركة الجديدة"
#. module: account
#: view:account.installer:0
msgid "Configure Your Chart of Accounts"
msgstr ""
+=======
+msgstr "الإعدادات المالية للشركة الجديدة"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
@@ -2778,6 +3459,7 @@
#: code:addons/account/account_move_line.py:173
#, python-format
msgid "You have to define an analytic journal on the '%s' journal!"
+<<<<<<< TREE
msgstr "عليك بتعريف يومية تحليلية في يومية '%s' !"
#. module: account
@@ -2787,18 +3469,25 @@
"You need an Opening journal with centralisation checked to set the initial "
"balance!"
msgstr ""
+=======
+msgstr "عليك بتعريف يومية تحليلية في يومية '%s' !"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.invoice.tax:0
#: model:ir.actions.act_window,name:account.action_tax_code_list
#: model:ir.ui.menu,name:account.menu_action_tax_code_list
msgid "Tax codes"
+<<<<<<< TREE
msgstr "رموز الضريبة"
#. module: account
#: view:account.account:0
msgid "Unrealized Gains and losses"
msgstr ""
+=======
+msgstr "رموز الضريبة"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:ir.ui.menu,name:account.menu_account_customer
@@ -2820,12 +3509,32 @@
#: selection:report.account.sales,month:0
#: selection:report.account_type.sales,month:0
msgid "August"
-msgstr "أغسطس"
+<<<<<<< TREE
+msgstr "أغسطس"
+=======
+msgstr "أغسطس"
+
+#. module: account
+#: code:addons/account/account_bank_statement.py:307
+#, python-format
+msgid ""
+"The expected balance (%.2f) is different than the computed one. (%.2f)"
+msgstr "الرصيد المتوقع(%.2f) مختلف عن الرصيد المحسوب (%.2f)."
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:process.transition,note:account.process_transition_paymentreconcile0
msgid "Payment entries are the second input of the reconciliation."
-msgstr "قيود المدفوعات هي الإدخل الثاني للتسوية."
+<<<<<<< TREE
+msgstr "قيود المدفوعات هي الإدخل الثاني للتسوية."
+=======
+msgstr "قيود المدفوعات هي الإدخل الثاني للتسوية."
+
+#. module: account
+#: selection:account.print.journal,sort_selection:0
+msgid "Reference Number"
+msgstr "رقم المرجع"
+>>>>>>> MERGE-SOURCE
#. module: account
#: selection:account.entries.report,month:0
@@ -2876,6 +3585,7 @@
#. module: account
#: field:account.invoice.tax,base_amount:0
msgid "Base Code Amount"
+<<<<<<< TREE
msgstr "مبلغ الرمز الرئيسي"
#. module: account
@@ -2885,10 +3595,14 @@
"You can not delete an invoice which is open or paid. We suggest you to "
"refund it instead."
msgstr ""
+=======
+msgstr "مبلغ الرمز الرئيسي"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:wizard.multi.charts.accounts,sale_tax:0
msgid "Default Sale Tax"
+<<<<<<< TREE
msgstr "ضريبة البيع الإفتراضية"
#. module: account
@@ -2896,6 +3610,9 @@
#, python-format
msgid "Invoice '%s' is validated."
msgstr ""
+=======
+msgstr "ضريبة البيع الإفتراضية"
+>>>>>>> MERGE-SOURCE
#. module: account
#: help:account.model.line,date_maturity:0
@@ -2929,15 +3646,40 @@
#: model:ir.model,name:account.model_account_fiscal_position
#: field:res.partner,property_account_position:0
msgid "Fiscal Position"
+<<<<<<< TREE
msgstr "الوضع المالي"
#. module: account
#: code:addons/account/account_invoice.py:735
+=======
+msgstr "الوضع المالي"
+
+#. module: account
+#: help:account.partner.ledger,initial_balance:0
+#: help:account.report.general.ledger,initial_balance:0
+msgid ""
+"It adds initial balance row on report which display previous sum amount of "
+"debit/credit/balance"
+msgstr ""
+"وهي تضيف سهم توازن بدئي للتقرير الذي يعرض مبلغ المجموع السابق لـلخصم/بطاقة "
+"الائتمان/التوازن"
+
+#. module: account
+#: view:account.analytic.line:0
+#: model:ir.actions.act_window,name:account.action_account_analytic_line_form
+msgid "Analytic Entries"
+msgstr "قيود تحليلية"
+
+#. module: account
+#: code:addons/account/account.py:962
+>>>>>>> MERGE-SOURCE
#, python-format
msgid ""
"Tax base different!\n"
"Click on compute to update the tax base."
msgstr ""
+"لا يوجد سنة مالية معرفة لهذا التاريخ !\n"
+"قم بإنشائها."
#. module: account
#: field:account.partner.ledger,page_split:0
@@ -2980,6 +3722,7 @@
#. module: account
#: view:account.change.currency:0
msgid "Invoice Currency"
+<<<<<<< TREE
msgstr "عملة الفاتورة"
#. module: account
@@ -2987,6 +3730,9 @@
#: model:ir.ui.menu,name:account.menu_account_financial_reports_tree
msgid "Account Reports"
msgstr ""
+=======
+msgstr "عملة الفاتورة"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.payment.term,line_ids:0
@@ -3006,12 +3752,16 @@
#. module: account
#: field:account.chart.template,tax_template_ids:0
msgid "Tax Template List"
+<<<<<<< TREE
msgstr "قائمة قالب الضريبة"
#. module: account
#: model:ir.ui.menu,name:account.menu_account_print_sale_purchase_journal
msgid "Sale/Purchase Journals"
msgstr ""
+=======
+msgstr "قائمة قالب الضريبة"
+>>>>>>> MERGE-SOURCE
#. module: account
#: help:account.account,currency_mode:0
@@ -3022,6 +3772,11 @@
"software system you may have to use the rate at date. Incoming transactions "
"always use the rate at date."
msgstr ""
+"سيحدد هذا كيف تم حساب معدل العملة الحالية للمعاملات الخارجة. في معظم البلاد "
+"المنهج القانوني هو \"متوسط\" لكن قليل من أنظمة البرنامج فقط قادة "
+"لادارتها.\r\n"
+"فلذلك اذا قمت بلبتوريد من نظام برنامج اخر قد تستخدم المعدل عند التاريخ. "
+"تستخدم المعاملات القادمة المعدل عند التاريخ."
#. module: account
#: help:account.chart.template,code_digits:0
@@ -3042,6 +3797,7 @@
#. module: account
#: selection:account.tax,applicable_type:0
msgid "Always"
+<<<<<<< TREE
msgstr "دائماً"
#. module: account
@@ -3049,6 +3805,9 @@
#: view:analytic.entries.report:0
msgid "Month-1"
msgstr ""
+=======
+msgstr "دائماً"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.analytic.line:0
@@ -3085,17 +3844,21 @@
#: code:addons/account/account_bank.py:90
#, python-format
msgid "BNK"
-msgstr ""
+msgstr "بنك"
#. module: account
#: field:account.move.line,analytic_lines:0
msgid "Analytic lines"
+<<<<<<< TREE
msgstr "سطور تحليلية"
#. module: account
#: view:account.invoice:0
msgid "Proforma Invoices"
msgstr ""
+=======
+msgstr "سطور تحليلية"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:process.node,name:account.process_node_electronicfile0
@@ -3108,9 +3871,15 @@
msgstr "دين العميل"
#. module: account
+<<<<<<< TREE
#: view:account.payment.term.line:0
msgid " Day of the Month: 0"
msgstr ""
+=======
+#: model:ir.model,name:account.model_account_tax_code_template
+msgid "Tax Code Template"
+msgstr "قالب رمز الضريبة"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.subscription:0
@@ -3125,7 +3894,16 @@
#. module: account
#: help:account.journal.column,sequence:0
msgid "Gives the sequence order to journal column."
-msgstr "إعطاء التسلسل لعمود اليومية."
+<<<<<<< TREE
+msgstr "إعطاء التسلسل لعمود اليومية."
+=======
+msgstr "إعطاء التسلسل لعمود اليومية."
+
+#. module: account
+#: view:account.tax.template:0
+msgid "Tax Declaration"
+msgstr "الإعلان الضريبي"
+>>>>>>> MERGE-SOURCE
#. module: account
#: help:account.account,currency_id:0
@@ -3152,22 +3930,30 @@
#. module: account
#: model:ir.actions.act_window,name:account.action_wizard_multi_chart
msgid "Generate Chart of Accounts from a Chart Template"
+<<<<<<< TREE
msgstr "إنشاء شجرة حسابات من قالب"
#. module: account
#: view:report.account.sales:0
msgid "This months' Sales by type"
msgstr ""
+=======
+msgstr "إنشاء شجرة حسابات من قالب"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:ir.model,name:account.model_account_unreconcile_reconcile
msgid "Account Unreconcile Reconcile"
+<<<<<<< TREE
msgstr "حساب التسوية / إلغاءها"
#. module: account
#: sql_constraint:account.tax:0
msgid "The description must be unique per company!"
msgstr ""
+=======
+msgstr "حساب التسوية / إلغاءها"
+>>>>>>> MERGE-SOURCE
#. module: account
#: help:account.account.type,close_method:0
@@ -3182,6 +3968,21 @@
" 'Unreconciled' will copy only the journal items that were unreconciled on "
"the first day of the new fiscal year."
msgstr ""
+"عيين هنا الطريقة التي سيتم استخدامها لإنشاء نهاية إدخالات دفتر اليومية "
+"للسنة لكل الحسابات من هذا النوع.\n"
+"\n"
+"'لا شيء' يعني لا يوجد شيئًا لتفعله.\n"
+"\"الرصيد\"سيستخدم بشكل عام لحسابات النقدية.\n"
+"\"تفاصيل\"ستنسخ كل بند من بنود اليومية القائمة من العام السابق، حتى ذلك "
+"التوفيق.\n"
+"\"عدم مساواة\" ستنسخ فقط بنود اليومية التي لم تتم تسويتها في اليوم الأول من "
+"السنة المالية الجديدة."
+
+#. module: account
+#: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
+#, python-format
+msgid "No End of year journal defined for the fiscal year"
+msgstr "لايوجد نهاية لسجل السنة للعام المحاسبي"
#. module: account
#: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
@@ -3255,12 +4056,16 @@
#: view:account.installer:0
#: view:wizard.multi.charts.accounts:0
msgid "Accounting Application Configuration"
+<<<<<<< TREE
msgstr "إعداد برنامج المحاسبة"
#. module: account
#: view:account.payment.term.line:0
msgid " Value amount: 0.02"
msgstr ""
+=======
+msgstr "إعداد برنامج المحاسبة"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:ir.actions.act_window,name:account.open_board_account
@@ -3288,25 +4093,36 @@
msgstr "إغلاق الفترة"
#. module: account
+<<<<<<< TREE
#: field:account.financial.report,display_detail:0
msgid "Display details"
msgstr ""
+=======
+#: field:account.analytic.balance,empty_acc:0
+msgid "Empty Accounts ? "
+msgstr "حسابات فارغة؟ "
+>>>>>>> MERGE-SOURCE
#. module: account
#: report:account.overdue:0
msgid "VAT:"
+<<<<<<< TREE
msgstr "ضريبة القيمة المضافة:"
#. module: account
#: constraint:account.invoice:0
msgid "Invalid BBA Structured Communication !"
msgstr ""
+=======
+msgstr "ضريبة القيمة المضافة:"
+>>>>>>> MERGE-SOURCE
#. module: account
#: help:account.analytic.line,amount_currency:0
msgid ""
"The amount expressed in the related account currency if not equal to the "
"company one."
+<<<<<<< TREE
msgstr "أُعربت الكمية في عملة الحساب المتعلق اذا لم تساوي لعملة الشركة."
#. module: account
@@ -3315,6 +4131,27 @@
#: model:ir.actions.act_window,name:account.action_account_unreconcile_select
msgid "Unreconcile Entries"
msgstr "إلغاء تسوية القيود"
+=======
+msgstr "أُعربت الكمية في عملة الحساب المتعلق اذا لم تساوي لعملة الشركة."
+
+#. module: account
+#: view:account.bank.statement:0
+#: view:account.invoice:0
+#: selection:account.invoice,state:0
+#: view:account.invoice.report:0
+#: selection:account.invoice.report,state:0
+#: selection:account.journal.period,state:0
+#: view:account.subscription:0
+#: selection:account.subscription,state:0
+#: selection:report.invoice.created,state:0
+msgid "Draft"
+msgstr "مسودّة"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_configuration_installer
+msgid "Accounting Chart Configuration"
+msgstr "إعدادات شجرة الحسابات"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.tax.code,notprintable:0
@@ -3326,6 +4163,7 @@
#: report:account.vat.declaration:0
#: field:account.vat.declaration,chart_tax_id:0
msgid "Chart of Tax"
+<<<<<<< TREE
msgstr "خريطة الضريبة"
#. module: account
@@ -3333,6 +4171,9 @@
#, python-format
msgid "The closing balance should be the same than the computed balance!"
msgstr ""
+=======
+msgstr "خريطة الضريبة"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.journal:0
@@ -3349,12 +4190,16 @@
#: selection:account.subscription,period_type:0
#: view:analytic.entries.report:0
msgid "year"
+<<<<<<< TREE
msgstr "سنة"
#. module: account
#: view:product.product:0
msgid "Purchase Taxes"
msgstr "ضرائب الشراء"
+=======
+msgstr "سنة"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:validate.account.move.lines:0
@@ -3362,13 +4207,40 @@
"All selected journal entries will be validated and posted. It means you "
"won't be able to modify their accounting fields anymore."
msgstr ""
-"كل قيود اليومية المختارة سيتم التحقق منها و ترحيلها. و هو ما يعني لأنك لن "
-"تستطيع تعديل أي منها."
+<<<<<<< TREE
+"كل قيود اليومية المختارة سيتم التحقق منها و ترحيلها. و هو ما يعني لأنك لن "
+"تستطيع تعديل أي منها."
+=======
+"كل قيود اليومية المختارة سيتم التحقق منها و ترحيلها. و هو ما يعني لأنك لن "
+"تستطيع تعديل أي منها."
+
+#. module: account
+#: code:addons/account/invoice.py:370
+#, python-format
+msgid "Cannot delete invoice(s) that are already opened or paid !"
+msgstr "لا يمكن حذف فاتورة إذا كانت مفتوحة أو مدفوعة!"
+
+#. module: account
+#: report:account.account.balance.landscape:0
+msgid "Total :"
+msgstr "المجموع:"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:ir.actions.report.xml,name:account.account_transfers
msgid "Transfers"
-msgstr "تحويلات"
+<<<<<<< TREE
+msgstr "تحويلات"
+=======
+msgstr "تحويلات"
+
+#. module: account
+#: selection:account.entries.report,move_line_state:0
+#: view:account.move.line:0
+#: selection:account.move.line,state:0
+msgid "Unbalanced"
+msgstr "غير متوازن"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.chart:0
@@ -3378,7 +4250,16 @@
#. module: account
#: report:account.vat.declaration:0
msgid "Tax Amount"
-msgstr "قيمة الضريبة"
+<<<<<<< TREE
+msgstr "قيمة الضريبة"
+=======
+msgstr "قيمة الضريبة"
+
+#. module: account
+#: view:account.installer:0
+msgid "Your bank and cash accounts"
+msgstr "حسابك البنكي و النقدية"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.move:0
@@ -3404,6 +4285,7 @@
"Selected Invoice(s) cannot be cancelled as they are already in 'Cancelled' "
"or 'Done' state!"
msgstr ""
+<<<<<<< TREE
"الفواتير المختارة لا يمكن إلغاءها حيث أنها ملغاة أو تمت من حيث الحالة!"
#. module: account
@@ -3420,6 +4302,28 @@
#: model:ir.actions.act_window,name:account.action_account_print_sale_purchase_journal
msgid "Print Sale/Purchase Journal"
msgstr ""
+=======
+"الفواتير المختارة لا يمكن إلغاءها حيث أنها ملغاة أو تمت من حيث الحالة!"
+
+#. module: account
+#: code:addons/account/account.py:522
+#, python-format
+msgid ""
+"You cannot change the type of account from '%s' to '%s' type as it contains "
+"account entries!"
+msgstr "لا يمكنك تغيير نوع الحساب من '%s' إلي '%s' ما دام يشمل علي قيود!"
+
+#. module: account
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+msgid "Counterpart"
+msgstr "نظير"
+
+#. module: account
+#: view:account.journal:0
+msgid "Invoicing Data"
+msgstr "بيانات الفواتير"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.invoice.report,state:0
@@ -3430,7 +4334,19 @@
#: view:account.invoice.report:0
#: field:account.invoice.report,categ_id:0
msgid "Category of Product"
-msgstr "فئة المنتج"
+<<<<<<< TREE
+msgstr "فئة المنتج"
+=======
+msgstr "فئة المنتج"
+
+#. module: account
+#: view:account.move:0
+#: field:account.move,narration:0
+#: view:account.move.line:0
+#: field:account.move.line,narration:0
+msgid "Narration"
+msgstr "سرد"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.addtmpl.wizard:0
@@ -3441,6 +4357,7 @@
#. module: account
#: model:ir.model,name:account.model_report_account_type_sales
msgid "Report of the Sales by Account Type"
+<<<<<<< TREE
msgstr "تقرير المبيعات حسب نوع الحساب"
#. module: account
@@ -3452,6 +4369,9 @@
#: sql_constraint:res.currency:0
msgid "The currency code must be unique per company!"
msgstr ""
+=======
+msgstr "تقرير المبيعات حسب نوع الحساب"
+>>>>>>> MERGE-SOURCE
#. module: account
#: selection:account.account.type,close_method:0
@@ -3459,6 +4379,7 @@
msgstr "تفاصيل"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:839
#, python-format
msgid ""
@@ -3467,6 +4388,11 @@
"amount greater than the total invoiced amount. The latest line of your "
"payment term must be of type 'balance' to avoid rounding issues."
msgstr ""
+=======
+#: field:account.installer,bank_accounts_id:0
+msgid "Your Bank and Cash Accounts"
+msgstr "حساب البنك و حساب النقدية"
+>>>>>>> MERGE-SOURCE
#. module: account
#: report:account.invoice:0
@@ -3494,6 +4420,7 @@
#. module: account
#: field:account.journal,centralisation:0
msgid "Centralised counterpart"
+<<<<<<< TREE
msgstr "النظير المركزي"
#. module: account
@@ -3501,6 +4428,9 @@
#, python-format
msgid "You can not create journal items on a \"view\" account %s %s"
msgstr ""
+=======
+msgstr "النظير المركزي"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:ir.model,name:account.model_account_partner_reconcile_process
@@ -3554,12 +4484,16 @@
#: selection:accounting.report,filter_cmp:0
#: field:analytic.entries.report,date:0
msgid "Date"
+<<<<<<< TREE
msgstr "تاريخ"
#. module: account
#: view:account.move:0
msgid "Post"
msgstr "ترحيل"
+=======
+msgstr "تاريخ"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.unreconcile:0
@@ -3568,6 +4502,7 @@
msgstr "إلغاء التسوية"
#. module: account
+<<<<<<< TREE
#: view:account.analytic.line:0
#: field:account.bank.statement,user_id:0
#: view:account.journal:0
@@ -3576,6 +4511,12 @@
#: field:analytic.entries.report,user_id:0
msgid "User"
msgstr "مستخدم"
+=======
+#: code:addons/account/wizard/account_fiscalyear_close.py:84
+#, python-format
+msgid "The journal must have default credit and debit account"
+msgstr "دفتر اليومية يجب أن يتضمن حساب إفتراضي دائن و أخر مدين"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.chart.template:0
@@ -3590,12 +4531,29 @@
"based on partner payment term!\n"
"Please define partner on it!"
msgstr ""
+"تم انشاء تاريخ الاستحقاق لخط المدخل بواسطة خط النموذج ‘%s‘ للنموذج ‘%s‘ "
+"بناءًا على شرط الدفع للشريك !\n"
+"الرجاء حدد شريك عليها!"
#. module: account
#: code:addons/account/account_move_line.py:837
#, python-format
msgid "Some entries are already reconciled !"
-msgstr "بعض القيود تمت تسويتها من قبل !"
+<<<<<<< TREE
+msgstr "بعض القيود تمت تسويتها من قبل !"
+=======
+msgstr "بعض القيود تمت تسويتها من قبل !"
+
+#. module: account
+#: code:addons/account/account.py:1204
+#, python-format
+msgid ""
+"You cannot validate a Journal Entry unless all journal items are in same "
+"chart of accounts !"
+msgstr ""
+"لا يمكنك التحقق من قيد يومية إذا لم تكن عناصر اليومية تابعة لشجرة حسابات "
+"واحدة !"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.tax:0
@@ -3627,9 +4585,15 @@
msgstr "لا مرشحات"
#. module: account
+<<<<<<< TREE
#: view:account.invoice.report:0
msgid "Pro-forma Invoices"
msgstr ""
+=======
+#: selection:account.analytic.journal,type:0
+msgid "Situation"
+msgstr "الحالة"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:res.partner:0
@@ -3676,7 +4640,17 @@
#. module: account
#: field:res.partner,property_account_payable:0
msgid "Account Payable"
-msgstr "دائن"
+<<<<<<< TREE
+msgstr "دائن"
+=======
+msgstr "دائن"
+
+#. module: account
+#: constraint:account.move:0
+msgid ""
+"You cannot create entries on different periods/journals in the same move"
+msgstr "لايمكنك انشاء مدخلات على فترات مختلفة/اليوميات في نفس التحرك"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:process.node,name:account.process_node_supplierpaymentorder0
@@ -3714,12 +4688,31 @@
#. module: account
#: field:analytic.entries.report,nbr:0
msgid "#Entries"
+<<<<<<< TREE
msgstr "#القيود"
#. module: account
#: selection:account.invoice.refund,filter_refund:0
msgid "Create a draft Refund"
msgstr ""
+=======
+msgstr "#القيود"
+
+#. module: account
+#: code:addons/account/account_invoice.py:1429
+#, python-format
+msgid ""
+"You selected an Unit of Measure which is not compatible with the product."
+msgstr "لقد اخترت وحدة مقياس غير ملائمة للمنتج."
+
+#. module: account
+#: code:addons/account/account_invoice.py:484
+#, python-format
+msgid ""
+"The Payment Term of Supplier does not have Payment Term Lines(Computation) "
+"defined !"
+msgstr "لا يملك مصطلح الدفع خطوط مصطلح الدفع(حساب) معرّف) !"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.state.open:0
@@ -3734,6 +4727,7 @@
#. module: account
#: view:account.fiscal.position:0
msgid "Mapping"
+<<<<<<< TREE
msgstr "مقابلة"
#. module: account
@@ -3744,6 +4738,9 @@
"centralised counterpart box in the related journal from the configuration "
"menu."
msgstr ""
+=======
+msgstr "مقابلة"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.account,name:0
@@ -3761,6 +4758,7 @@
#. module: account
#: model:ir.model,name:account.model_account_aged_trial_balance
msgid "Account Aged Trial balance Report"
+<<<<<<< TREE
msgstr "ميزان المراجعة للحسابات المعمرة"
#. module: account
@@ -3768,10 +4766,14 @@
#, python-format
msgid "You can not create journal items on a closed account %s %s"
msgstr ""
+=======
+msgstr "ميزان المراجعة للحسابات المعمرة"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.move.line,date:0
msgid "Effective date"
+<<<<<<< TREE
msgstr "التاريخ الفعلي"
#. module: account
@@ -3779,6 +4781,9 @@
#: model:ir.ui.menu,name:account.menu_action_bank_tree
msgid "Setup your Bank Accounts"
msgstr ""
+=======
+msgstr "التاريخ الفعلي"
+>>>>>>> MERGE-SOURCE
#. module: account
#: code:addons/account/wizard/account_move_bank_reconcile.py:53
@@ -3789,6 +4794,7 @@
#. module: account
#: help:account.journal,analytic_journal_id:0
msgid "Journal for analytic entries"
+<<<<<<< TREE
msgstr "دفتر اليومية للقيود التحليلية"
#. module: account
@@ -3810,6 +4816,9 @@
"The fiscalyear, periods or chart of account chosen have to belong to the "
"same company."
msgstr ""
+=======
+msgstr "دفتر اليومية للقيود التحليلية"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:ir.actions.todo.category,name:account.category_accounting_configuration
@@ -3820,12 +4829,16 @@
#: view:product.template:0
#: view:res.partner:0
msgid "Accounting"
+<<<<<<< TREE
msgstr "المحاسبة"
#. module: account
#: view:account.entries.report:0
msgid "Journal Entries with period in current year"
msgstr ""
+=======
+msgstr "المحاسبة"
+>>>>>>> MERGE-SOURCE
#. module: account
#: help:account.central.journal,amount_currency:0
@@ -3835,6 +4848,7 @@
msgid ""
"Print Report with the currency column if the currency is different then the "
"company currency"
+<<<<<<< TREE
msgstr "طباعة التقرير مع عمود العملة إذا كانت العملة مختلفة ثم عملة شركة"
#. module: account
@@ -3843,6 +4857,9 @@
"Value of Loss or Gain due to changes in exchange rate when doing multi-"
"currency transactions."
msgstr ""
+=======
+msgstr "طباعة التقرير مع عمود العملة إذا كانت العملة مختلفة ثم عملة شركة"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.analytic.line:0
@@ -3892,6 +4909,7 @@
#. module: account
#: view:account.invoice:0
msgid "Validate"
+<<<<<<< TREE
msgstr "تحقق"
#. module: account
@@ -3906,6 +4924,26 @@
#: model:account.financial.report,name:account.account_financial_report_assets0
msgid "Assets"
msgstr "أصول"
+=======
+msgstr "تحقق"
+
+#. module: account
+#: sql_constraint:account.model.line:0
+msgid "Wrong credit or debit value in model (Credit Or Debit Must Be \"0\")!"
+msgstr ""
+"خطأ دائن أو مدين كقيمة في النموذج (قيمة الدائن أو المدين يجب أن تكون \"0\")!"
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_invoice_report_all
+msgid ""
+"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."
+msgstr ""
+"من هذا التقرير, يمكن ان يكون لك لمحة عامة للمبلغ الذي تم عمل له فاتورة "
+"لعميلك بالإضافة الى المؤخرات. يمكن استخدام اداة البحث لتشخص تقارير فواتيرك "
+"وكذلك, مطابقة تلك التحليلات لاحتياجاتك."
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.invoice.confirm:0
@@ -3915,6 +4953,7 @@
#. module: account
#: selection:account.account,currency_mode:0
msgid "Average Rate"
+<<<<<<< TREE
msgstr "متوسط النسبة"
#. module: account
@@ -3923,6 +4962,9 @@
#: field:account.report.general.ledger,display_account:0
msgid "Display Accounts"
msgstr ""
+=======
+msgstr "متوسط النسبة"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.state.open:0
@@ -3939,7 +4981,16 @@
#: field:account.tax.template,name:0
#: report:account.vat.declaration:0
msgid "Tax Name"
-msgstr "اسم الضريبة"
+<<<<<<< TREE
+msgstr "اسم الضريبة"
+=======
+msgstr "اسم الضريبة"
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_configuration
+msgid "Configuration"
+msgstr "إعدادات"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:account.payment.term,name:account.account_payment_term
@@ -3951,19 +5002,35 @@
#: model:ir.actions.act_window,name:account.action_account_analytic_balance
#: model:ir.actions.report.xml,name:account.account_analytic_account_balance
msgid "Analytic Balance"
-msgstr "رصيد تحليلي"
+<<<<<<< TREE
+msgstr "رصيد تحليلي"
+=======
+msgstr "رصيد تحليلي"
+
+#. module: account
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
+msgid "Net Loss"
+msgstr "صافي الخسارة"
+>>>>>>> MERGE-SOURCE
#. module: account
#: help:account.account,active:0
msgid ""
"If the active field is set to False, it will allow you to hide the account "
"without removing it."
+<<<<<<< TREE
msgstr "اذا تم وضع الحقل النشط لخطأ, ستسمح لك بإخفاء الحساب بدون ازالتها."
#. module: account
#: view:account.move.line:0
msgid "Posted Journal Items"
msgstr ""
+=======
+msgstr "اذا تم وضع الحقل النشط لخطأ, ستسمح لك بإخفاء الحساب بدون ازالتها."
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.tax.template:0
@@ -3973,6 +5040,7 @@
#. module: account
#: model:ir.ui.menu,name:account.periodical_processing_journal_entries_validation
msgid "Draft Entries"
+<<<<<<< TREE
msgstr "مسودة المدخلات"
#. module: account
@@ -3984,17 +5052,24 @@
#: view:account.payment.term.line:0
msgid " Number of Days: 30"
msgstr ""
+=======
+msgstr "مسودة المدخلات"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.account,shortcut:0
#: field:account.account.template,shortcut:0
msgid "Shortcut"
+<<<<<<< TREE
msgstr "إختصار"
#. module: account
#: constraint:account.fiscalyear:0
msgid "Error! The start date of the fiscal year must be before his end date."
msgstr ""
+=======
+msgstr "إختصار"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.account:0
@@ -4010,12 +5085,16 @@
#: field:report.account.receivable,type:0
#: field:report.account_type.sales,user_type:0
msgid "Account Type"
+<<<<<<< TREE
msgstr "نوع الحساب"
#. module: account
#: view:res.partner:0
msgid "Bank Account Owner"
msgstr "مالِك الحساب المصرفي"
+=======
+msgstr "نوع الحساب"
+>>>>>>> MERGE-SOURCE
#. module: account
#: report:account.account.balance:0
@@ -4044,6 +5123,7 @@
#. module: account
#: selection:account.automatic.reconcile,power:0
msgid "3"
+<<<<<<< TREE
msgstr "٣"
#. module: account
@@ -4053,6 +5133,9 @@
"You haven't supplied enough argument to compute the initial balance, please "
"select a period and journal in the context."
msgstr ""
+=======
+msgstr "٣"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:process.transition,note:account.process_transition_supplieranalyticcost0
@@ -4077,7 +5160,17 @@
#. module: account
#: view:account.entries.report:0
msgid "Acc.Type"
-msgstr "نوع الحساب"
+<<<<<<< TREE
+msgstr "نوع الحساب"
+=======
+msgstr "نوع الحساب"
+
+#. module: account
+#: code:addons/account/account_invoice.py:733
+#, python-format
+msgid "Global taxes defined, but are not in invoice lines !"
+msgstr "تم تحديد الضرائب العالمية, ولكن ليست في خطوط الفاتورة !"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.entries.report,month:0
@@ -4088,6 +5181,7 @@
#: field:report.account.sales,month:0
#: field:report.account_type.sales,month:0
msgid "Month"
+<<<<<<< TREE
msgstr "شهر"
#. module: account
@@ -4103,6 +5197,9 @@
#: field:res.company,paypal_account:0
msgid "Paypal Account"
msgstr ""
+=======
+msgstr "شهر"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.invoice.report,uom_name:0
@@ -4113,16 +5210,21 @@
#: field:account.account,note:0
#: field:account.account.template,note:0
msgid "Note"
+<<<<<<< TREE
msgstr "ملحوظة"
#. module: account
#: selection:account.financial.report,sign:0
msgid "Reverse balance sign"
msgstr ""
+=======
+msgstr "ملحوظة"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.analytic.account:0
msgid "Overdue Account"
+<<<<<<< TREE
msgstr "حساب المتأخرات"
#. module: account
@@ -4136,6 +5238,15 @@
#: help:account.invoice,date_invoice:0
msgid "Keep empty to use the current date"
msgstr "اتركه فارغ لإستخدام التاريخ الحالي"
+=======
+msgstr "حساب المتأخرات"
+
+#. module: account
+#: selection:account.invoice,state:0
+#: report:account.overdue:0
+msgid "Paid"
+msgstr "مدفوع"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.invoice,tax_line:0
@@ -4145,10 +5256,31 @@
#. module: account
#: field:account.tax,base_code_id:0
msgid "Account Base Code"
-msgstr "رمز حساب الأساس"
-
-#. module: account
-#: code:addons/account/account_analytic_line.py:93
+<<<<<<< TREE
+msgstr "رمز حساب الأساس"
+
+#. module: account
+#: code:addons/account/account_analytic_line.py:93
+=======
+msgstr "رمز حساب الأساس"
+
+#. module: account
+#: help:account.move,state:0
+msgid ""
+"All manually created new journal entry are usually in the state 'Unposted', "
+"but you can set the option to skip that state on the related journal. In "
+"that case, they will be behave as journal entries automatically created by "
+"the system on document validation (invoices, bank statements...) and will be "
+"created in 'Posted' state."
+msgstr ""
+"كل ما انشيء يدويًا لمخل اليومية الجديدة عادةً في حالة‘غير مسجل‘, لكن يمكنك "
+"وضع اختيار لتخطي تلك الحالة على اليومية المتعلقة. في حالة, سيكون كمدخلات "
+"يومية تلقائية أُنشأت بواسطة النظام في التحقق من الوثيقة (الفواتير, نصاريح "
+"البنك...) وستُنشأ في حالة ‘مسجل‘."
+
+#. module: account
+#: code:addons/account/account_analytic_line.py:93
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
msgstr "لا يوجد حساب مصروف معرف لهذا المنتج: \"%s\" (id:%d)"
@@ -4159,9 +5291,15 @@
msgstr "خصائص المحاسبة للعملاء"
#. module: account
+<<<<<<< TREE
#: help:res.company,paypal_account:0
msgid "Paypal username (usually email) for receiving online payments."
msgstr ""
+=======
+#: field:account.invoice.tax,name:0
+msgid "Tax Description"
+msgstr "وصف الضريبة"
+>>>>>>> MERGE-SOURCE
#. module: account
#: selection:account.aged.trial.balance,target_move:0
@@ -4190,7 +5328,16 @@
#: code:addons/account/account_bank_statement.py:367
#, python-format
msgid "Statement %s is confirmed, journal items are created."
-msgstr "القائمة %s غير مؤكدة، تم إنشاء عناصر القائمة."
+<<<<<<< TREE
+msgstr "القائمة %s غير مؤكدة، تم إنشاء عناصر القائمة."
+=======
+msgstr "القائمة %s غير مؤكدة، تم إنشاء عناصر القائمة."
+
+#. module: account
+#: constraint:account.fiscalyear:0
+msgid "Error! The duration of the Fiscal Year is invalid. "
+msgstr "خطأ! مدة السنة المالية غير صالحة. "
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:report.aged.receivable,name:0
@@ -4213,20 +5360,33 @@
msgstr "الضرائب الإفتراضية"
#. module: account
+<<<<<<< TREE
#: code:addons/account/wizard/account_fiscalyear_close.py:41
+=======
+#: code:addons/account/account_invoice.py:88
+>>>>>>> MERGE-SOURCE
#, python-format
+<<<<<<< TREE
msgid "End of Fiscal Year Entry"
msgstr "قيد نهاية السنة المالية"
+=======
+msgid "Free Reference"
+msgstr "مرجع حر"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
msgid "Periodical Processing"
+<<<<<<< TREE
msgstr "المعالجة الدورية"
#. module: account
#: constraint:account.analytic.line:0
msgid "You can not create analytic line on view account."
msgstr ""
+=======
+msgstr "المعالجة الدورية"
+>>>>>>> MERGE-SOURCE
#. module: account
#: help:account.move.line,state:0
@@ -4245,17 +5405,30 @@
#. module: account
#: model:process.node,note:account.process_node_importinvoice0
msgid "Statement from invoice or payment"
-msgstr "بيان من الفاتورة أو الدفع"
+<<<<<<< TREE
+msgstr "بيان من الفاتورة أو الدفع"
+=======
+msgstr "بيان من الفاتورة أو الدفع"
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid " day of the month: 0"
+msgstr " يوم من الشهر : ٠"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:ir.model,name:account.model_account_chart
msgid "Account chart"
+<<<<<<< TREE
msgstr "خريطة الحساب"
#. module: account
#: selection:account.financial.report,style_overwrite:0
msgid "Main Title 1 (bold, underlined)"
msgstr ""
+=======
+msgstr "خريطة الحساب"
+>>>>>>> MERGE-SOURCE
#. module: account
#: report:account.analytic.account.balance:0
@@ -4271,12 +5444,16 @@
#. module: account
#: model:ir.model,name:account.model_account_invoice_report
msgid "Invoices Statistics"
+<<<<<<< TREE
msgstr "إحصائيات الفواتير"
#. module: account
#: field:account.account,exchange_rate:0
msgid "Exchange Rate"
msgstr ""
+=======
+msgstr "إحصائيات الفواتير"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:process.transition,note:account.process_transition_paymentorderreconcilation0
@@ -4287,7 +5464,16 @@
#: code:addons/account/wizard/account_reconcile.py:133
#, python-format
msgid "Reconcile Writeoff"
-msgstr "تسوية المبالغ المعدومة"
+<<<<<<< TREE
+msgstr "تسوية المبالغ المعدومة"
+=======
+msgstr "تسوية المبالغ المعدومة"
+
+#. module: account
+#: report:account.overdue:0
+msgid "Maturity date"
+msgstr "تاريخ الإستحقاق"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:report.account.receivable:0
@@ -4304,27 +5490,56 @@
#: code:addons/account/report/common_report_header.py:92
#, python-format
msgid "Not implemented"
+<<<<<<< TREE
msgstr "غير مطبق"
#. module: account
#: field:account.chart.template,visible:0
msgid "Can be Visible?"
msgstr ""
+=======
+msgstr "غير مطبق"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:ir.model,name:account.model_account_journal_select
msgid "Account Journal Select"
-msgstr "أختر اليومية المحاسبية"
+<<<<<<< TREE
+msgstr "أختر اليومية المحاسبية"
+=======
+msgstr "أختر اليومية المحاسبية"
+
+#. module: account
+#: view:account.invoice:0
+msgid "Print Invoice"
+msgstr "طباعة الفاتورة"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.tax.template:0
msgid "Credit Notes"
+<<<<<<< TREE
msgstr "أوراق دائنة"
#. module: account
#: sql_constraint:account.period:0
msgid "The name of the period must be unique per company!"
msgstr ""
+=======
+msgstr "أوراق دائنة"
+
+#. module: account
+#: code:addons/account/account.py:2067
+#: code:addons/account/wizard/account_use_model.py:69
+#, python-format
+msgid "Unable to find a valid period !"
+msgstr "غير قادر على العثور على فترة صالحة!"
+
+#. module: account
+#: report:account.tax.code.entries:0
+msgid "Voucher No"
+msgstr "رقم المستند"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:wizard.multi.charts.accounts:0
@@ -4334,6 +5549,7 @@
#. module: account
#: view:account.unreconcile:0
msgid "Unreconciliate transactions"
+<<<<<<< TREE
msgstr "إلغاء تسوية المعاملات"
#. module: account
@@ -4344,6 +5560,9 @@
"you want to generate accounts of this template only when loading its child "
"template."
msgstr ""
+=======
+msgstr "إلغاء تسوية المعاملات"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.use.model:0
@@ -4354,6 +5573,7 @@
#: field:account.account,reconcile:0
#: field:account.account.template,reconcile:0
msgid "Allow Reconciliation"
+<<<<<<< TREE
msgstr "سماح بالتسوية"
#. module: account
@@ -4362,6 +5582,9 @@
msgid ""
"You can not modify company of this period as some journal items exists."
msgstr ""
+=======
+msgstr "سماح بالتسوية"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.analytic.account:0
@@ -4369,25 +5592,51 @@
msgstr "إحصائيات الحساب التحليلي"
#. module: account
+<<<<<<< TREE
#: report:account.vat.declaration:0
msgid "Based On"
msgstr "بناءًا على"
+=======
+#: view:wizard.multi.charts.accounts:0
+msgid ""
+"This will automatically configure your chart of accounts, bank accounts, "
+"taxes and journals according to the selected template"
+msgstr ""
+"ستقوم بتكوين مخطط لحساباتك, حسابات المصرف, ضرائب ويوميات تلقائيًا طبقًا "
+"للقالب المختار"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.tax,price_include:0
#: field:account.tax.template,price_include:0
msgid "Tax Included in Price"
-msgstr "السعر شامل الضريبة"
+<<<<<<< TREE
+msgstr "السعر شامل الضريبة"
+=======
+msgstr "السعر شامل الضريبة"
+
+#. module: account
+#: constraint:account.account:0
+#: constraint:account.account.template:0
+msgid ""
+"Configuration Error! \n"
+"You cannot define children to an account with internal type different of "
+"\"View\"! "
+msgstr ""
+"إعداد خطأ! \n"
+"لا يمكنك تعريف الفرعي على حساب من نوع داخلي مختلف من حيث \"عرض\"! "
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:ir.model,name:account.model_account_analytic_cost_ledger_journal_report
msgid "Account Analytic Cost Ledger For Journal Report"
-msgstr ""
+msgstr "يقدردفتر حساب للتكلفة التحليلية للحساب للتقرير اليومي"
#. module: account
#: model:ir.actions.act_window,name:account.action_model_form
#: model:ir.ui.menu,name:account.menu_action_model_form
msgid "Recurring Models"
+<<<<<<< TREE
msgstr "نماذج التكرارات"
#. module: account
@@ -4395,6 +5644,9 @@
#, python-format
msgid "Encoding error"
msgstr ""
+=======
+msgstr "نماذج التكرارات"
+>>>>>>> MERGE-SOURCE
#. module: account
#: selection:account.automatic.reconcile,power:0
@@ -4407,9 +5659,27 @@
msgstr "تغيير"
#. module: account
+<<<<<<< TREE
#: selection:account.journal,type:0
msgid "Bank and Cheques"
msgstr "البنك و الشيكات المصرفية"
+=======
+#: code:addons/account/account.py:1431
+#: code:addons/account/account.py:1460
+#: code:addons/account/account.py:1467
+#: code:addons/account/account_invoice.py:920
+#: code:addons/account/account_move_line.py:1104
+#: code:addons/account/wizard/account_automatic_reconcile.py:152
+#: code:addons/account/wizard/account_fiscalyear_close.py:73
+#: code:addons/account/wizard/account_fiscalyear_close.py:83
+#: code:addons/account/wizard/account_fiscalyear_close.py:86
+#: code:addons/account/wizard/account_move_journal.py:165
+#: code:addons/account/wizard/account_report_aged_partner_balance.py:56
+#: code:addons/account/wizard/account_report_aged_partner_balance.py:58
+#, python-format
+msgid "UserError"
+msgstr "خطأ مستخدم"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.journal,type_control_ids:0
@@ -4419,7 +5689,16 @@
#. module: account
#: help:account.journal,default_credit_account_id:0
msgid "It acts as a default account for credit amount"
-msgstr "وهي تعمل كحساب افتراضي لكمية بطاقة الائتمان"
+<<<<<<< TREE
+msgstr "وهي تعمل كحساب افتراضي لكمية بطاقة الائتمان"
+=======
+msgstr "وهي تعمل كحساب افتراضي لكمية بطاقة الائتمان"
+
+#. module: account
+#: help:account.partner.ledger,reconcil:0
+msgid "Consider reconciled entries"
+msgstr "نظر القيود المسواه"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:ir.actions.act_window,name:account.action_validate_account_move_line
@@ -4439,6 +5718,7 @@
#. module: account
#: help:account.bank.statement,balance_end_cash:0
msgid "Closing balance based on cashBox"
+<<<<<<< TREE
msgstr "توازن الغلق بناءًا على خانة النقد"
#. module: account
@@ -4467,6 +5747,15 @@
#, python-format
msgid "Purchase Tax %.2f%%"
msgstr ""
+=======
+msgstr "توازن الغلق بناءًا على خانة النقد"
+
+#. module: account
+#: constraint:account.account:0
+#: constraint:account.tax.code:0
+msgid "Error ! You can not create recursive accounts."
+msgstr "خطأ ! لا يمكن إنشاء حسابات تكرارية."
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.subscription.generate:0
@@ -4504,16 +5793,31 @@
#. module: account
#: report:account.invoice:0
msgid "Cancelled Invoice"
-msgstr "فاتورة ملغاة"
-
-#. module: account
-#: code:addons/account/account.py:1567
+<<<<<<< TREE
+msgstr "فاتورة ملغاة"
+
+#. module: account
+#: code:addons/account/account.py:1567
+=======
+msgstr "فاتورة ملغاة"
+
+#. module: account
+#: code:addons/account/account_invoice.py:71
+#, python-format
+msgid "You must define an analytic journal of type '%s' !"
+msgstr "عليك بتعريف يومية تحليلية في يومية '%s' !"
+
+#. module: account
+#: code:addons/account/account.py:1567
+>>>>>>> MERGE-SOURCE
#, python-format
msgid ""
"Couldn't create move with currency different from the secondary currency of "
"the account \"%s - %s\". Clear the secondary currency field of the account "
"definition if you want to accept all currencies."
msgstr ""
+"لا يمكن أن تنشأ هذه الخطوة مع عملة مختلفة عن العملة الثانوية من حساب \"%s - "
+"%s\". مسح حقل العملة الثانوية للتعريف حساب إذا كنت ترغب في قبول جميع العملات."
#. module: account
#: selection:account.bank.statement,state:0
@@ -4523,12 +5827,16 @@
#. module: account
#: field:account.invoice.refund,date:0
msgid "Operation date"
+<<<<<<< TREE
msgstr "تاريخ العملية"
#. module: account
#: view:account.unreconcile.reconcile:0
msgid "Unreconciliation transactions"
msgstr "إلغاء تسوية المعاملات"
+=======
+msgstr "تاريخ العملية"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.tax,ref_tax_code_id:0
@@ -4542,6 +5850,7 @@
"All draft account entries in this journal and period will be validated. It "
"means you won't be able to modify their accounting fields anymore."
msgstr ""
+<<<<<<< TREE
"سيتم التحقق من صلاحية كل مدخلات حساب السجل في هذه اليومية والفترة. يعني ذلك "
"انك غير قادر على تعديل حقول محاسبتها بعد الآن."
@@ -4549,6 +5858,21 @@
#: model:ir.ui.menu,name:account.menu_finance_configuration
msgid "Configuration"
msgstr "إعدادات"
+=======
+"سيتم التحقق من صلاحية كل مدخلات حساب السجل في هذه اليومية والفترة. يعني ذلك "
+"انك غير قادر على تعديل حقول محاسبتها بعد الآن."
+
+#. module: account
+#: report:account.account.balance.landscape:0
+msgid "Account Balance -"
+msgstr "رصيد الحساب -"
+
+#. module: account
+#: code:addons/account/invoice.py:997
+#, python-format
+msgid "Invoice "
+msgstr "فاتورة "
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.automatic.reconcile,date1:0
@@ -4558,6 +5882,7 @@
#. module: account
#: field:account.chart.template,property_account_income:0
msgid "Income Account on Product Template"
+<<<<<<< TREE
msgstr "الحساب الوارد على القالب المنتج"
#. module: account
@@ -4570,6 +5895,9 @@
#: model:email.template,subject:account.email_template_edi_invoice
msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })"
msgstr ""
+=======
+msgstr "الحساب الوارد على القالب المنتج"
+>>>>>>> MERGE-SOURCE
#. module: account
#: help:res.partner,last_reconciliation_date:0
@@ -4592,6 +5920,7 @@
#: view:report.invoice.created:0
#: field:res.partner,invoice_ids:0
msgid "Invoices"
+<<<<<<< TREE
msgstr "الفواتير"
#. module: account
@@ -4603,6 +5932,19 @@
#: selection:account.bank.accounts.wizard,account_type:0
msgid "Check"
msgstr "تأكيد"
+=======
+msgstr "الفواتير"
+
+#. module: account
+#: code:addons/account/account_invoice.py:828
+#, python-format
+msgid ""
+"Please verify the price of the invoice !\n"
+"The real total does not match the computed total."
+msgstr ""
+"الرجاء تعريف قيمة الفاتورة !\n"
+"الإجمالي الحقيقي غير متوافق مع الإجمالي المحسوب."
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.invoice:0
@@ -4615,16 +5957,21 @@
#. module: account
#: view:account.invoice.report:0
msgid "Invoiced"
+<<<<<<< TREE
msgstr "مفوتر"
#. module: account
#: view:account.move:0
msgid "Posted Journal Entries"
msgstr ""
+=======
+msgstr "مفوتر"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.use.model:0
msgid "Use Model"
+<<<<<<< TREE
msgstr "إستخدام نموذج"
#. module: account
@@ -4634,6 +5981,9 @@
"account if this is a Customer Invoice or Supplier Refund, otherwise a "
"Partner bank account number."
msgstr ""
+=======
+msgstr "إستخدام نموذج"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.state.open:0
@@ -4648,6 +5998,7 @@
#. module: account
#: view:account.addtmpl.wizard:0
msgid "Add"
+<<<<<<< TREE
msgstr "إضافة"
#. module: account
@@ -4655,6 +6006,19 @@
#: report:account.overdue:0
msgid "Paid"
msgstr "مدفوع"
+=======
+msgstr "إضافة"
+
+#. module: account
+#: help:account.invoice,date_invoice:0
+msgid "Keep empty to use the current date"
+msgstr "اتركه فارغ لإستخدام التاريخ الحالي"
+
+#. module: account
+#: selection:account.journal,type:0
+msgid "Bank and Cheques"
+msgstr "البنك و الشيكات المصرفية"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.period.close:0
@@ -4669,6 +6033,7 @@
#. module: account
#: model:process.transition,note:account.process_transition_suppliercustomerinvoice0
msgid "Draft invoices are validated. "
+<<<<<<< TREE
msgstr "تم التحقق للفواتير المؤقتة. "
#. module: account
@@ -4689,6 +6054,9 @@
#: view:account.move:0
msgid "Journal Entries to Review"
msgstr ""
+=======
+msgstr "تم التحقق للفواتير المؤقتة. "
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.bank.statement:0
@@ -4724,6 +6092,7 @@
#: model:ir.ui.menu,name:account.menu_eaction_account_moves_sale
#, python-format
msgid "Journal Items"
+<<<<<<< TREE
msgstr "عناصر اليومية"
#. module: account
@@ -4752,6 +6121,33 @@
msgstr "خطأ"
#. module: account
+=======
+msgstr "عناصر اليومية"
+
+#. module: account
+#: selection:account.account.type,report_type:0
+msgid "Balance Sheet (Assets Accounts)"
+msgstr "الميزانية العمومية (حسابات الأصول)"
+
+#. module: account
+#: report:account.tax.code.entries:0
+msgid "Third Party (Country)"
+msgstr "الطرف الثالث (البلد)"
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_invoice_tree4
+msgid ""
+"With Supplier Refunds you can manage the credit notes you receive from your "
+"suppliers. A refund is a document that credits an invoice completely or "
+"partially. You can easily generate refunds and reconcile them directly from "
+"the invoice form."
+msgstr ""
+"مع المسترد من المورد يمكنك إدارة مذكرات الائتمان التي تتلقاها من الموردين "
+"الخاصين بك. والمبلغ عبارة عن وثيقة التي تعتمد الفاتورة كليا أو جزئيا. يمكنك "
+"انشاء المبالغ المستردة بسهولة والتوفيق بينهما مباشرة من شكل فاتورة."
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: field:account.analytic.balance,date2:0
#: field:account.analytic.cost.ledger,date2:0
#: field:account.analytic.cost.ledger.journal.report,date2:0
@@ -4766,6 +6162,7 @@
msgstr "تفاصيل البنك"
#. module: account
+<<<<<<< TREE
#: model:ir.actions.act_window,help:account.action_account_partner_balance
msgid ""
"This report is analysis by partner. It is a PDF report containing one line "
@@ -4773,6 +6170,12 @@
msgstr ""
"قد تم تحليل هذا التقرير بواسطة الشريك. وهي تقرير تنسيق وثيقة محمولة تشتمل "
"على خط واحد لكل شريك يمثل توازن الدين التراكمي."
+=======
+#: code:addons/account/account_invoice.py:739
+#, python-format
+msgid "Taxes missing !"
+msgstr "الضرائب مفقودة !"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:ir.actions.act_window,help:account.action_account_analytic_journal_tree
@@ -4780,11 +6183,19 @@
"To print an analytics (or costs) journal for a given period. The report give "
"code, move name, account number, general amount and analytic amount."
msgstr ""
+"لطباعةيومية التحليلات (أو التكاليف) لفترة معينة. يعطي التقرير كود واسم هذه "
+"الخطوة، ورقم الحساب، مبلغ عامة والكمية التحليلية."
#. module: account
+<<<<<<< TREE
#: sql_constraint:account.invoice:0
msgid "Invoice Number must be unique per Company!"
msgstr ""
+=======
+#: help:account.journal,refund_journal:0
+msgid "Fill this if the journal is to be used for refunds of invoices."
+msgstr "إذا كانت اليومية تُستخدم لتسديد الفواتير فامليء هذا."
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:ir.actions.act_window,name:account.action_account_receivable_graph
@@ -4794,6 +6205,7 @@
#. module: account
#: view:account.fiscalyear.close:0
msgid "Generate Fiscal Year Opening Entries"
+<<<<<<< TREE
msgstr "إنشاء القيود الإفتتاحية للسنة المالية"
#. module: account
@@ -4807,6 +6219,9 @@
"From this view, have an analysis of your treasury. It sums the balance of "
"every accounting entries made on liquidity accounts per period."
msgstr ""
+=======
+msgstr "إنشاء القيود الإفتتاحية للسنة المالية"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.journal,group_invoice_lines:0
@@ -4822,27 +6237,36 @@
#. module: account
#: field:account.bank.statement.line,move_ids:0
msgid "Moves"
+<<<<<<< TREE
msgstr "حركات"
#. module: account
#: view:report.hr.timesheet.invoice.journal:0
msgid "Sale journal in this month"
msgstr ""
+=======
+msgstr "حركات"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:ir.actions.act_window,name:account.action_account_vat_declaration
#: model:ir.model,name:account.model_account_vat_declaration
msgid "Account Vat Declaration"
+<<<<<<< TREE
msgstr "بيان ضريبة الحساب"
#. module: account
#: report:account.invoice:0
msgid "Price"
msgstr "السعر"
+=======
+msgstr "بيان ضريبة الحساب"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.period:0
msgid "To Close"
+<<<<<<< TREE
msgstr "للغلق"
#. module: account
@@ -4852,6 +6276,17 @@
#. module: account
#: code:addons/account/account.py:1351
+=======
+msgstr "للغلق"
+
+#. module: account
+#: field:account.journal,allow_date:0
+msgid "Check Date not in the Period"
+msgstr "التحقق من تاريخ في غير الفترة"
+
+#. module: account
+#: code:addons/account/account.py:1351
+>>>>>>> MERGE-SOURCE
#, python-format
msgid ""
"You can not modify a posted entry of this journal !\n"
@@ -4864,12 +6299,16 @@
#. module: account
#: model:ir.ui.menu,name:account.account_template_folder
msgid "Templates"
+<<<<<<< TREE
msgstr "قوالب"
#. module: account
#: field:account.invoice.tax,name:0
msgid "Tax Description"
msgstr "وصف الضريبة"
+=======
+msgstr "قوالب"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.tax,child_ids:0
@@ -4883,6 +6322,7 @@
msgstr "بداية الفترة يجب أن تكون أقل من نهاية الفترة"
#. module: account
+<<<<<<< TREE
#: help:account.tax,price_include:0
#: help:account.tax.template,price_include:0
msgid ""
@@ -4891,6 +6331,11 @@
msgstr ""
"تحقق من هذا اذا كان السعر الذي تستخدمه على المنتج والفواتير يحتوي على هذه "
"الضريبة."
+=======
+#: selection:account.automatic.reconcile,power:0
+msgid "5"
+msgstr "٥"
+>>>>>>> MERGE-SOURCE
#. module: account
#: report:account.analytic.account.balance:0
@@ -4926,6 +6371,7 @@
#: field:account.vat.declaration,target_move:0
#: field:accounting.report,target_move:0
msgid "Target Moves"
+<<<<<<< TREE
msgstr "تحركات الهدف"
#. module: account
@@ -4933,6 +6379,9 @@
#: model:account.payment.term,note:account.account_payment_term_net
msgid "30 Net Days"
msgstr ""
+=======
+msgstr "تحركات الهدف"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.subscription,period_type:0
@@ -4966,6 +6415,7 @@
#: model:ir.actions.act_window,name:account.action_payment_term_form
#: model:ir.ui.menu,name:account.menu_action_payment_term_form
msgid "Payment Terms"
+<<<<<<< TREE
msgstr "شروط السداد"
#. module: account
@@ -4982,6 +6432,9 @@
#: model:ir.model,name:account.model_account_financial_report
msgid "Account Report"
msgstr ""
+=======
+msgstr "شروط السداد"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.journal.column,name:0
@@ -5029,7 +6482,22 @@
#. module: account
#: selection:account.subscription,period_type:0
msgid "month"
-msgstr "شهر"
+<<<<<<< TREE
+msgstr "شهر"
+=======
+msgstr "شهر"
+
+#. module: account
+#: code:addons/account/account_bank_statement.py:300
+#, python-format
+msgid "Journal Item \"%s\" is not valid"
+msgstr "عنصر اليومية \"%s\" غير صحيح"
+
+#. module: account
+#: view:account.payment.term:0
+msgid "Description on invoices"
+msgstr "الوصف على الفواتير"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.partner.reconcile.process,next_partner_id:0
@@ -5051,6 +6519,7 @@
#: model:account.financial.report,name:account.account_financial_report_balancesheet0
#: model:ir.ui.menu,name:account.menu_account_report_bs
msgid "Balance Sheet"
+<<<<<<< TREE
msgstr "الميزانية العمومية"
#. module: account
@@ -5063,6 +6532,9 @@
#: field:account.journal,allow_date:0
msgid "Check Date in Period"
msgstr ""
+=======
+msgstr "الميزانية العمومية"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:ir.ui.menu,name:account.final_accounting_reports
@@ -5108,12 +6580,16 @@
#: view:account.tax.template:0
#: selection:account.tax.template,type_tax_use:0
msgid "Sale"
+<<<<<<< TREE
msgstr "بيع"
#. module: account
#: view:account.financial.report:0
msgid "Report"
msgstr "تقرير"
+=======
+msgstr "بيع"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.analytic.line:0
@@ -5131,6 +6607,15 @@
msgstr "المبلغ"
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/wizard/account_fiscalyear_close.py:41
+#, python-format
+msgid "End of Fiscal Year Entry"
+msgstr "قيد نهاية السنة المالية"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: model:process.transition,name:account.process_transition_customerinvoice0
#: model:process.transition,name:account.process_transition_paymentorderreconcilation0
#: model:process.transition,name:account.process_transition_statemententries0
@@ -5138,18 +6623,42 @@
#: model:process.transition,name:account.process_transition_suppliervalidentries0
#: model:process.transition,name:account.process_transition_validentries0
msgid "Validation"
-msgstr "التحقّق"
+<<<<<<< TREE
+msgstr "التحقّق"
+=======
+msgstr "التحقّق"
+
+#. module: account
+#: help:account.invoice,reconciled:0
+msgid ""
+"The Journal Entry of the invoice have been totally reconciled with one or "
+"several Journal Entries of payment."
+msgstr ""
+"توافقت المدخل اليومي للفاتورة كليًا مع واحد او اكثر من المدخلات اليومية "
+"للدفع."
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.tax,child_depend:0
#: field:account.tax.template,child_depend:0
msgid "Tax on Children"
+<<<<<<< TREE
msgstr "الضرايب على الأطفال"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax_template
msgid "Template Tax Fiscal Position"
msgstr "الوضع المالي للقالب الضريبي"
+=======
+msgstr "الضرايب على الأطفال"
+
+#. module: account
+#: code:addons/account/account.py:2067
+#: code:addons/account/wizard/account_use_model.py:69
+#, python-format
+msgid "No period found !"
+msgstr "لم يتمكن من إيجاد فترة !"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.journal,update_posted:0
@@ -5159,12 +6668,16 @@
#. module: account
#: field:account.tax.code,sign:0
msgid "Coefficent for parent"
+<<<<<<< TREE
msgstr "مسمى للأم"
#. module: account
#: view:account.analytic.account:0
msgid "Analytic Accounts with a past deadline."
msgstr ""
+=======
+msgstr "مسمى للأم"
+>>>>>>> MERGE-SOURCE
#. module: account
#: report:account.partner.balance:0
@@ -5189,9 +6702,15 @@
msgstr "استخدم هذا الكود للبيان الضريبي."
#. module: account
+<<<<<<< TREE
#: field:account.partner.reconcile.process,progress:0
msgid "Progress"
msgstr "تقدّم"
+=======
+#: view:account.move.line:0
+msgid "Debit/Credit"
+msgstr "مدين / دائن"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:report.hr.timesheet.invoice.journal:0
@@ -5199,9 +6718,16 @@
msgstr "إحصائيات القيود التحليلية"
#. module: account
+<<<<<<< TREE
#: field:wizard.multi.charts.accounts,bank_accounts_id:0
msgid "Cash and Banks"
msgstr ""
+=======
+#: model:ir.actions.act_window,name:account.action_account_tax_code_template_form
+#: model:ir.ui.menu,name:account.menu_action_account_tax_code_template_form
+msgid "Tax Code Templates"
+msgstr "قوالب رمز الضريبة"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:ir.model,name:account.model_account_installer
@@ -5219,11 +6745,22 @@
"Number of days to add before computation of the day of month.If Date=15/01, "
"Number of Days=22, Day of Month=-1, then the due date is 28/02."
msgstr ""
+"عدد الأيام لإضافتها قبل حساب يوم من الشهر، اذا كان التاريخ =01/15,وعدد "
+"الأيام = 22، يوم من شهر = -1، ثم تاريخ الاستحقاق هو 28/02."
#. module: account
+<<<<<<< TREE
#: view:account.payment.term.line:0
msgid "Amount Computation"
msgstr "حساب المبلغ"
+=======
+#: code:addons/account/account.py:2896
+#: code:addons/account/installer.py:283
+#: code:addons/account/installer.py:295
+#, python-format
+msgid "Bank Journal "
+msgstr "دفتر يومية البنك "
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.journal:0
@@ -5243,7 +6780,21 @@
#: field:account.analytic.inverted.balance,date1:0
#: field:account.analytic.journal.report,date1:0
msgid "Start of period"
-msgstr "بداية الفترة"
+<<<<<<< TREE
+msgstr "بداية الفترة"
+=======
+msgstr "بداية الفترة"
+
+#. module: account
+#: code:addons/account/account_move_line.py:1193
+#, python-format
+msgid ""
+"You can not do this modification on a reconciled entry ! Please note that "
+"you can just change some non important fields !"
+msgstr ""
+"لايمكنك القيام بهذا التعديل للمدخل المتفق ! الرجاء ملاحظة انه يمكنك فقط "
+"تغيير بعض الحقول الغير هامة !"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:ir.model,name:account.model_account_common_account_report
@@ -5259,6 +6810,7 @@
#. module: account
#: model:ir.ui.menu,name:account.menu_analytic_accounting
msgid "Analytic Accounting"
+<<<<<<< TREE
msgstr "محاسبة تحليلية"
#. module: account
@@ -5266,6 +6818,9 @@
#: field:account.report.general.ledger,initial_balance:0
msgid "Include Initial Balances"
msgstr ""
+=======
+msgstr "محاسبة تحليلية"
+>>>>>>> MERGE-SOURCE
#. module: account
#: selection:account.invoice,type:0
@@ -5275,10 +6830,18 @@
msgstr "رد مال للعميل"
#. module: account
+<<<<<<< TREE
#: constraint:account.move:0
msgid ""
"You can not create more than one move per period on centralized journal"
msgstr ""
+=======
+#: view:account.account:0
+#: field:account.account,tax_ids:0
+#: field:account.account.template,tax_ids:0
+msgid "Default Taxes"
+msgstr "ضرائب إفتراضية"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.tax,ref_tax_sign:0
@@ -5291,12 +6854,16 @@
#. module: account
#: model:ir.model,name:account.model_report_invoice_created
msgid "Report of Invoices Created within Last 15 days"
+<<<<<<< TREE
msgstr "أُنشأ تقرير الفواتير في خلال اخر 15 يومًا"
#. module: account
#: view:account.payment.term.line:0
msgid " Number of Days: 14"
msgstr ""
+=======
+msgstr "أُنشأ تقرير الفواتير في خلال اخر 15 يومًا"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.fiscalyear,end_journal_period_id:0
@@ -5314,12 +6881,16 @@
#: code:addons/account/wizard/account_move_journal.py:63
#, python-format
msgid "Configuration Error !"
+<<<<<<< TREE
msgstr "خطأ في الإعدادات!"
#. module: account
#: field:account.payment.term.line,value_amount:0
msgid "Amount To Pay"
msgstr ""
+=======
+msgstr "خطأ في الإعدادات!"
+>>>>>>> MERGE-SOURCE
#. module: account
#: help:account.partner.reconcile.process,to_reconcile:0
@@ -5355,12 +6926,16 @@
#: model:ir.actions.act_window,name:account.action_account_change_currency
#: model:ir.model,name:account.model_account_change_currency
msgid "Change Currency"
+<<<<<<< TREE
msgstr "تغيير العملة"
#. module: account
#: view:account.invoice:0
msgid "This action will erase taxes"
msgstr ""
+=======
+msgstr "تغيير العملة"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:process.node,note:account.process_node_accountingentries0
@@ -5371,13 +6946,23 @@
#. module: account
#: view:account.invoice:0
msgid "Payment Date"
-msgstr "تاريخ الدفع"
+<<<<<<< TREE
+msgstr "تاريخ الدفع"
+=======
+msgstr "تاريخ الدفع"
+
+#. module: account
+#: selection:account.automatic.reconcile,power:0
+msgid "6"
+msgstr "٦"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.analytic.account:0
#: model:ir.actions.act_window,name:account.action_account_analytic_account_form
#: model:ir.ui.menu,name:account.account_analytic_def_account
msgid "Analytic Accounts"
+<<<<<<< TREE
msgstr "حسابات تحليلية"
#. module: account
@@ -5387,6 +6972,34 @@
#. module: account
#: field:account.analytic.line,amount_currency:0
+=======
+msgstr "حسابات تحليلية"
+
+#. module: account
+#: help:account.account.type,report_type:0
+msgid ""
+"According value related accounts will be display on respective reports "
+"(Balance Sheet Profit & Loss Account)"
+msgstr ""
+"سيتم العرض على حسب القيمة المرتبطة بالحسابات على جميع التقارير المختصة (رصيد "
+"حساب الربح والخسارة)"
+
+#. module: account
+#: field:account.report.general.ledger,sortby:0
+msgid "Sort By"
+msgstr "فرز بحسب"
+
+#. module: account
+#: code:addons/account/account.py:1468
+#, python-format
+msgid ""
+"There is no default default credit account defined \n"
+"on journal \"%s\""
+msgstr "لا يوجد هناك حساب رصيد افتراضي محدد في اليومية \"%s\""
+
+#. module: account
+#: field:account.analytic.line,amount_currency:0
+>>>>>>> MERGE-SOURCE
#: field:account.entries.report,amount_currency:0
#: field:account.model.line,amount_currency:0
#: field:account.move.line,amount_currency:0
@@ -5424,6 +7037,7 @@
#. module: account
#: view:account.move.line:0
msgid "Number (Move)"
+<<<<<<< TREE
msgstr "رقم (حركة)"
#. module: account
@@ -5435,6 +7049,9 @@
#: selection:account.financial.report,style_overwrite:0
msgid "Normal Text"
msgstr ""
+=======
+msgstr "رقم (حركة)"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.invoice.refund:0
@@ -5480,6 +7097,10 @@
"impossible any new entry record. Close a fiscal year when you need to "
"finalize your end of year results definitive "
msgstr ""
+"إذا توجب تسجيل أية إدخالات إضافية في السنة المالية، يمكنك إغلاقه من هنا. "
+"فإنه سيتم اغلاق جميع الفترات المفتوحة في هذا العام من شأنها أن تجعل من "
+"المستحيل تسجيل اي دخول جديد. اغلق السنة المالية عند الحاجة لوضع اللمسات "
+"الأخيرة لنتائج العام النهائي الخاص بك. "
#. module: account
#: field:account.central.journal,amount_currency:0
@@ -5494,6 +7115,7 @@
#. module: account
#: view:account.bank.statement:0
msgid "Open CashBox"
+<<<<<<< TREE
msgstr "فتح صندو النقدية"
#. module: account
@@ -5508,6 +7130,9 @@
"No fiscal year defined for this date !\n"
"Please create one from the configuration of the accounting menu."
msgstr ""
+=======
+msgstr "فتح صندو النقدية"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.move.line.reconcile:0
@@ -5526,9 +7151,15 @@
msgstr "صالحة حتى"
#. module: account
+<<<<<<< TREE
#: view:account.journal:0
msgid "Invoicing Data"
msgstr "بيانات الفواتير"
+=======
+#: view:board.board:0
+msgid "Aged Receivables"
+msgstr "الديون المشكوك في تحصيلها"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:ir.actions.act_window,name:account.action_account_automatic_reconcile
@@ -5567,6 +7198,8 @@
#: view:account.payment.term.line:0
msgid "Due Date Computation"
msgstr ""
+"وسوف تدعم هذه الوحدة منهجية المحاسبة الأنغلو ساكسون عن طريق تغيير منطق "
+"المحاسبة مع معاملات الأوراق المالية."
#. module: account
#: field:report.invoice.created,create_date:0
@@ -5583,6 +7216,7 @@
#. module: account
#: field:account.account,child_id:0
msgid "Child Accounts"
+<<<<<<< TREE
msgstr "حسابات فرعية"
#. module: account
@@ -5590,6 +7224,9 @@
#, python-format
msgid "Move name (id): %s (%s)"
msgstr ""
+=======
+msgstr "حسابات فرعية"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.move.line.reconcile:0
@@ -5604,10 +7241,16 @@
msgstr "إجمالي مستحق الدفع"
#. module: account
+<<<<<<< TREE
#: model:account.account.type,name:account.data_account_type_income
#: model:account.financial.report,name:account.account_financial_report_income0
msgid "Income"
msgstr "الدخل"
+=======
+#: model:ir.actions.act_window,name:account.action_account_analytic_account_line_extended_form
+msgid "account.analytic.line.extended"
+msgstr "account.analytic.line.extended"
+>>>>>>> MERGE-SOURCE
#. module: account
#: selection:account.bank.statement.line,type:0
@@ -5630,12 +7273,16 @@
#. module: account
#: view:account.account.template:0
msgid "Account Template"
+<<<<<<< TREE
msgstr "قالب حساب"
#. module: account
#: report:account.journal.period.print.sale.purchase:0
msgid "VAT"
msgstr "ضريبة القيمة المضافة"
+=======
+msgstr "قالب حساب"
+>>>>>>> MERGE-SOURCE
#. module: account
#: report:account.analytic.account.journal:0
@@ -5643,10 +7290,18 @@
msgstr "الحساب"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:88
#, python-format
msgid "Free Reference"
msgstr "مرجع حر"
+=======
+#: help:account.installer.modules,account_payment:0
+msgid ""
+"Streamlines invoice payment and creates hooks to plug automated payment "
+"systems in."
+msgstr "يبسط دفع فاتورة ويخلق روابط لتوصيل أنظمة الدفع الآلي فيها."
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.payment.term.line,value:0
@@ -5742,7 +7397,17 @@
#: view:account.invoice.report:0
#: field:account.invoice.report,nbr:0
msgid "# of Lines"
-msgstr "عدد السطور"
+<<<<<<< TREE
+msgstr "عدد السطور"
+=======
+msgstr "عدد السطور"
+
+#. module: account
+#: code:addons/account/wizard/account_change_currency.py:60
+#, python-format
+msgid "New currency is not confirured properly !"
+msgstr "العملة الجديدة لم يتم ضبطها بشكل صحيح !"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.aged.trial.balance,filter:0
@@ -5761,6 +7426,7 @@
#: field:accounting.report,filter:0
#: field:accounting.report,filter_cmp:0
msgid "Filter by"
+<<<<<<< TREE
msgstr "ترشيح بـ"
#. module: account
@@ -5777,6 +7443,13 @@
#. module: account
#: code:addons/account/account_move_line.py:1155
#: code:addons/account/account_move_line.py:1238
+=======
+msgstr "ترشيح بـ"
+
+#. module: account
+#: code:addons/account/account_move_line.py:1155
+#: code:addons/account/account_move_line.py:1238
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "You can not use an inactive account!"
msgstr "لا يمكنك إستخدام حساب غير نشط!"
@@ -5785,6 +7458,7 @@
#: code:addons/account/account_move_line.py:830
#, python-format
msgid "Entries are not of the same account or already reconciled ! "
+<<<<<<< TREE
msgstr "المدخلات ليست من نفس الحساب او تم تسويتها بالفعل ! "
#. module: account
@@ -5798,6 +7472,9 @@
#, python-format
msgid "Current currency is not configured properly !"
msgstr ""
+=======
+msgstr "المدخلات ليست من نفس الحساب او تم تسويتها بالفعل ! "
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.tax,account_collected_id:0
@@ -5809,17 +7486,54 @@
#: model:ir.actions.act_window,name:account.action_account_general_journal
#: model:ir.model,name:account.model_account_general_journal
msgid "Account General Journal"
-msgstr "حساب اليومية العامة"
+<<<<<<< TREE
+msgstr "حساب اليومية العامة"
+=======
+msgstr "حساب اليومية العامة"
+
+#. module: account
+#: code:addons/account/report/common_report_header.py:100
+#: report:account.account.balance:0
+#: report:account.central.journal:0
+#: report:account.partner.balance:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:account.general.journal:0
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
+#: report:account.vat.declaration:0
+#, python-format
+msgid "No Filter"
+msgstr "لا يوجد مرشح"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.payment.term.line,days:0
msgid "Number of Days"
-msgstr "عدد الأيام"
-
-#. module: account
-#: code:addons/account/account_bank_statement.py:402
-#: code:addons/account/account_invoice.py:392
-#: code:addons/account/wizard/account_period_close.py:51
+<<<<<<< TREE
+msgstr "عدد الأيام"
+
+#. module: account
+#: code:addons/account/account_bank_statement.py:402
+#: code:addons/account/account_invoice.py:392
+#: code:addons/account/wizard/account_period_close.py:51
+=======
+msgstr "عدد الأيام"
+
+#. module: account
+#: selection:account.automatic.reconcile,power:0
+msgid "7"
+msgstr "٧"
+
+#. module: account
+#: code:addons/account/account_bank_statement.py:402
+#: code:addons/account/account_invoice.py:392
+#: code:addons/account/wizard/account_period_close.py:51
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Invalid action !"
msgstr "إجراء خاطئ!"
@@ -5831,9 +7545,15 @@
msgstr "فترة : %s"
#. module: account
+<<<<<<< TREE
#: model:ir.actions.act_window,name:account.action_review_financial_journals_installer
msgid "Review your Financial Journals"
msgstr ""
+=======
+#: model:ir.model,name:account.model_account_fiscal_position_tax_template
+msgid "Template Tax Fiscal Position"
+msgstr "الوضع المالي للقالب الضريبي"
+>>>>>>> MERGE-SOURCE
#. module: account
#: help:account.tax,name:0
@@ -5865,9 +7585,15 @@
msgstr "رد للعملاء"
#. module: account
+<<<<<<< TREE
#: field:account.account,foreign_balance:0
msgid "Foreign Balance"
msgstr ""
+=======
+#: view:account.payment.term.line:0
+msgid "Amount Computation"
+msgstr "حساب المبلغ"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.journal.period,name:0
@@ -5897,6 +7623,7 @@
"Selected Invoice(s) cannot be confirmed as they are not in 'Draft' or 'Pro-"
"Forma' state!"
msgstr ""
+<<<<<<< TREE
"لا يمكن تأكيد الفواتير المختارة كما انها غير موجودة في حالة ‘السحب‘ او "
"‘الشكلية المؤيدة‘!"
@@ -5904,6 +7631,10 @@
#: view:account.subscription:0
msgid "Running Subscription"
msgstr ""
+=======
+"لا يمكن تأكيد الفواتير المختارة كما انها غير موجودة في حالة ‘السحب‘ او "
+"‘الشكلية المؤيدة‘!"
+>>>>>>> MERGE-SOURCE
#. module: account
#: report:account.invoice:0
@@ -5920,6 +7651,7 @@
#. module: account
#: selection:account.aged.trial.balance,direction_selection:0
msgid "Past"
+<<<<<<< TREE
msgstr "سابق"
#. module: account
@@ -5936,6 +7668,9 @@
"This journal will be created automatically for this bank account when you "
"save the record"
msgstr ""
+=======
+msgstr "سابق"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.analytic.line:0
@@ -5956,16 +7691,36 @@
"line of the expense account. OpenERP will propose to you automatically the "
"Tax related to this account and the counterpart \"Account Payable\"."
msgstr ""
+"ويمكن استخدام هذا العرض من قبل المحاسبين من أجل تسجيلالقيود سريعًا في "
+"OpenERP. إذا كنت تريد تسجيل فاتورة المورد، ابدأ من خلال تسجيل خط لحساب "
+"المصاريف. وسيقترح OpenERPعليكم تلقائيا الضريبة المتعلقة بهذا الحساب ونظيره "
+"\"حساب المدفوعات\"."
#. module: account
#: field:account.entries.report,date_created:0
msgid "Date Created"
+<<<<<<< TREE
msgstr "تاريخ الإنشاء"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_analytic_account_line_extended_form
msgid "account.analytic.line.extended"
msgstr "account.analytic.line.extended"
+=======
+msgstr "تاريخ الإنشاء"
+
+#. module: account
+#: field:account.payment.term.line,value_amount:0
+msgid "Value Amount"
+msgstr "قيمة المبلغ"
+
+#. module: account
+#: help:account.journal,code:0
+msgid ""
+"The code will be used to generate the numbers of the journal entries of this "
+"journal."
+msgstr "سيستخدم الكود لإيجاد عدد من المدخلات اليومية لهذه اليومية."
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.invoice:0
@@ -5978,7 +7733,17 @@
"As soon as the reconciliation is done, the invoice's state turns to “done” "
"(i.e. paid) in the system."
msgstr ""
-"حالما اتمام التسوية, حالة الفاتورة تُحول إلى \"تم\" (مثال: مدفوع) في النظام."
+<<<<<<< TREE
+"حالما اتمام التسوية, حالة الفاتورة تُحول إلى \"تم\" (مثال: مدفوع) في النظام."
+=======
+"حالما اتمام التسوية, حالة الفاتورة تُحول إلى \"تم\" (مثال: مدفوع) في النظام."
+
+#. module: account
+#: code:addons/account/invoice.py:997
+#, python-format
+msgid "is validated."
+msgstr "محققة."
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.chart.template:0
@@ -5999,6 +7764,7 @@
#. module: account
#: field:product.template,taxes_id:0
msgid "Customer Taxes"
+<<<<<<< TREE
msgstr "ضرائب العميل"
#. module: account
@@ -6010,6 +7776,9 @@
#: field:wizard.multi.charts.accounts,sale_tax_rate:0
msgid "Sales Tax(%)"
msgstr ""
+=======
+msgstr "ضرائب العميل"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.addtmpl.wizard:0
@@ -6020,7 +7789,16 @@
#: view:account.account.type:0
#: view:account.tax.code:0
msgid "Reporting Configuration"
-msgstr "إعدادات التقارير"
+<<<<<<< TREE
+msgstr "إعدادات التقارير"
+=======
+msgstr "إعدادات التقارير"
+
+#. module: account
+#: constraint:account.move.line:0
+msgid "Company must be same for its related account and period."
+msgstr "يجب ان تكون الشركة نفس الفترة والحساب المرتبط."
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.tax,type:0
@@ -6032,6 +7810,7 @@
#: model:ir.actions.act_window,name:account.action_account_template_form
#: model:ir.ui.menu,name:account.menu_action_account_template_form
msgid "Account Templates"
+<<<<<<< TREE
msgstr "قوالب الحساب"
#. module: account
@@ -6042,6 +7821,9 @@
"choice assumes that the set of tax defined for the chosen template is "
"complete"
msgstr ""
+=======
+msgstr "قوالب الحساب"
+>>>>>>> MERGE-SOURCE
#. module: account
#: report:account.vat.declaration:0
@@ -6051,6 +7833,7 @@
#. module: account
#: model:ir.model,name:account.model_res_company
msgid "Companies"
+<<<<<<< TREE
msgstr "الشركات"
#. module: account
@@ -6065,11 +7848,23 @@
#. module: account
#: code:addons/account/account.py:629
+=======
+msgstr "الشركات"
+
+#. module: account
+#: code:addons/account/account.py:663
+>>>>>>> MERGE-SOURCE
#, python-format
msgid ""
+<<<<<<< TREE
"You can not remove/desactivate an account which is set on a customer or "
"supplier."
msgstr ""
+=======
+"You cannot modify Company of account as its related record exist in Entry "
+"Lines"
+msgstr "لا يمكنك تعديل الشركة للحساب كتسجيل مرتبط بها الموجود في خطوط المدخل"
+>>>>>>> MERGE-SOURCE
#. module: account
#: help:account.fiscalyear.close.state,fy_id:0
@@ -6141,7 +7936,16 @@
#: view:validate.account.move.lines:0
#, python-format
msgid "Cancel"
-msgstr "إلغاء"
+<<<<<<< TREE
+msgstr "إلغاء"
+=======
+msgstr "إلغاء"
+
+#. module: account
+#: field:account.account.type,name:0
+msgid "Acc. Type Name"
+msgstr "اسم نوع الحساب"
+>>>>>>> MERGE-SOURCE
#. module: account
#: selection:account.account,type:0
@@ -6149,12 +7953,16 @@
#: model:account.account.type,name:account.data_account_type_receivable
#: selection:account.entries.report,type:0
msgid "Receivable"
+<<<<<<< TREE
msgstr "المدينون"
#. module: account
#: constraint:account.move.line:0
msgid "Company must be the same for its related account and period."
msgstr ""
+=======
+msgstr "المدينون"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.invoice:0
@@ -6164,7 +7972,21 @@
#. module: account
#: field:account.journal,default_credit_account_id:0
msgid "Default Credit Account"
-msgstr "حساب الدائنون الإفتراضي"
+<<<<<<< TREE
+msgstr "حساب الدائنون الإفتراضي"
+=======
+msgstr "حساب الدائنون الإفتراضي"
+
+#. module: account
+#: view:account.installer:0
+msgid "Configure Your Accounting Chart"
+msgstr "قم بتكوين جدول المحاسبة الخاصة بك"
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid " number of days: 30"
+msgstr " عدد الأيام: 30"
+>>>>>>> MERGE-SOURCE
#. module: account
#: help:account.analytic.line,currency_id:0
@@ -6179,12 +8001,16 @@
#. module: account
#: view:account.bank.statement:0
msgid "CashBox"
+<<<<<<< TREE
msgstr "صندوق نقدية"
#. module: account
#: model:account.account.type,name:account.account_type_cash_equity
msgid "Equity"
msgstr ""
+=======
+msgstr "صندوق نقدية"
+>>>>>>> MERGE-SOURCE
#. module: account
#: selection:account.tax,type:0
@@ -6199,6 +8025,7 @@
#. module: account
#: field:account.automatic.reconcile,power:0
msgid "Power"
+<<<<<<< TREE
msgstr "طاقة"
#. module: account
@@ -6206,11 +8033,33 @@
#, python-format
msgid "Cannot generate an unused journal code."
msgstr ""
+=======
+msgstr "طاقة"
+
+#. module: account
+#: field:account.invoice.refund,filter_refund:0
+msgid "Refund Type"
+msgstr "نوع المردود"
+
+#. module: account
+#: report:account.invoice:0
+msgid "Price"
+msgstr "السعر"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:project.account.analytic.line:0
msgid "View Account Analytic Lines"
-msgstr "عرض خطوط الحساب التحليلي"
+<<<<<<< TREE
+msgstr "عرض خطوط الحساب التحليلي"
+=======
+msgstr "عرض خطوط الحساب التحليلي"
+
+#. module: account
+#: selection:account.account.type,report_type:0
+msgid "Balance Sheet (Liability Accounts)"
+msgstr "الميزانية (لحسابات الأصول)"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.invoice,internal_number:0
@@ -6296,6 +8145,9 @@
"the tool search to analyse information about analytic entries generated in "
"the system."
msgstr ""
+"من العرض هذا، يكون تحليلا للقيود التحليلية المختلفة الخاص بعد حساب تحليلي "
+"قمت بتعريفه مطابق لحاجة عملك. استخدام أداة البحث لتحليل المعلومات عن القيود "
+"التحليلية الموجودة في النظام."
#. module: account
#: sql_constraint:account.journal:0
@@ -6308,12 +8160,22 @@
msgstr "إنشاء إختياري"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:664
+=======
+#: code:addons/account/account_invoice.py:417
+#: code:addons/account/account_invoice.py:517
+>>>>>>> MERGE-SOURCE
#, python-format
+<<<<<<< TREE
msgid ""
"You cannot change the owner company of an account that already contains "
"journal items."
msgstr ""
+=======
+msgid "Can not find account chart for this company, Please Create account."
+msgstr "لا يمكن ايجاد جدول الحاسب لهذه الشركة, يرجى انشاء الحساب."
+>>>>>>> MERGE-SOURCE
#. module: account
#: code:addons/account/wizard/account_report_aged_partner_balance.py:58
@@ -6342,7 +8204,16 @@
#. module: account
#: field:account.move.line,centralisation:0
msgid "Centralisation"
-msgstr "التمركز"
+<<<<<<< TREE
+msgstr "التمركز"
+=======
+msgstr "التمركز"
+
+#. module: account
+#: view:wizard.multi.charts.accounts:0
+msgid "Generate Your Accounting Chart from a Chart Template"
+msgstr "انشأ جدول المحاسبة الخاصة بك من قالب الجدول"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.account:0
@@ -6373,9 +8244,15 @@
msgstr "للقراءة فقط"
#. module: account
+<<<<<<< TREE
#: view:account.payment.term.line:0
msgid " Valuation: Balance"
msgstr ""
+=======
+#: model:ir.model,name:account.model_account_pl_report
+msgid "Account Profit And Loss Report"
+msgstr "تقرير حساب الأرباح و الخسائر"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.invoice.line,uos_id:0
@@ -6387,12 +8264,16 @@
msgid ""
"Percentages for Payment Term Line must be between 0 and 1, Example: 0.02 for "
"2% "
+<<<<<<< TREE
msgstr "يجب ان تكون النسبة المئوية لأجل الدفع مابين 0 و 1, مثال:0.02 لـ %2 "
#. module: account
#: field:account.installer,has_default_company:0
msgid "Has Default Company"
msgstr ""
+=======
+msgstr "يجب ان تكون النسبة المئوية لأجل الدفع مابين 0 و 1, مثال:0.02 لـ %2 "
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:ir.model,name:account.model_account_sequence_fiscalyear
@@ -6408,6 +8289,7 @@
#: model:ir.actions.report.xml,name:account.analytic_journal_print
#: model:ir.model,name:account.model_account_analytic_journal
msgid "Analytic Journal"
+<<<<<<< TREE
msgstr "يومية تحليلية"
#. module: account
@@ -6415,6 +8297,9 @@
#, python-format
msgid "You can not desactivate an account that contains some journal items."
msgstr ""
+=======
+msgstr "يومية تحليلية"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.entries.report:0
@@ -6464,6 +8349,7 @@
#. module: account
#: model:ir.model,name:account.model_analytic_entries_report
msgid "Analytic Entries Statistics"
+<<<<<<< TREE
msgstr "إحصائيات القيود التحليلية"
#. module: account
@@ -6471,6 +8357,9 @@
#, python-format
msgid "You can not remove an account containing journal items."
msgstr ""
+=======
+msgstr "إحصائيات القيود التحليلية"
+>>>>>>> MERGE-SOURCE
#. module: account
#: code:addons/account/account_analytic_line.py:145
@@ -6482,12 +8371,16 @@
#. module: account
#: view:account.use.model:0
msgid "Create manual recurring entries in a chosen journal."
+<<<<<<< TREE
msgstr "إنشاء قيد يومية تكرارية يدوياً في يومية مختارة."
#. module: account
#: help:res.partner.bank,currency_id:0
msgid "Currency of the related account journal."
msgstr ""
+=======
+msgstr "إنشاء قيد يومية تكرارية يدوياً في يومية مختارة."
+>>>>>>> MERGE-SOURCE
#. module: account
#: code:addons/account/account.py:1563
@@ -6506,6 +8399,11 @@
"account. From this view, you can create and manage the account types you "
"need for your company."
msgstr ""
+"يتم استخدام نوع حساب لتحديد كيفية استخدام حساب في كل مجلة. أسلوب التأجيل من "
+"نوع حساب يحدد عملية لإغلاق سنوي. تقارير مثل الميزانية العمومية وتقرير "
+"الأرباح والخسائر استخدام فئة (ربح / خسارة أو الميزانية العمومية). على سبيل "
+"المثال، يمكن ربط نوع الحساب إلى حساب الأصول، وحساب المصروفات أو حساب الدفع. "
+"من وجهة النظر هذه، يمكنك إنشاء وإدارة أنواع الحسابات التي تحتاجها لشركتك."
#. module: account
#: selection:account.account.type,report_type:0
@@ -6548,6 +8446,7 @@
msgstr "الفاكس:"
#. module: account
+<<<<<<< TREE
#: view:wizard.multi.charts.accounts:0
msgid ""
"This will automatically configure your chart of accounts, bank accounts, "
@@ -6555,6 +8454,11 @@
msgstr ""
"ستقوم بتكوين مخطط لحساباتك, حسابات المصرف, ضرائب ويوميات تلقائيًا طبقًا "
"للقالب المختار"
+=======
+#: report:account.vat.declaration:0
+msgid "Based On"
+msgstr "بناءًا على"
+>>>>>>> MERGE-SOURCE
#. module: account
#: help:res.partner,property_account_receivable:0
@@ -6577,9 +8481,17 @@
msgstr "كود بايثون"
#. module: account
+<<<<<<< TREE
#: view:account.entries.report:0
msgid "Journal Entries with period in current period"
msgstr ""
+=======
+#: code:addons/account/wizard/account_report_balance_sheet.py:70
+#, python-format
+msgid ""
+"Please define the Reserve and Profit/Loss account for current user company !"
+msgstr "يرجى تحديد الاحتياطي، وحساب الربح / الخسارة لشركة المستخدم الحالي!"
+>>>>>>> MERGE-SOURCE
#. module: account
#: help:account.journal,update_posted:0
@@ -6598,6 +8510,7 @@
#. module: account
#: model:process.transition.action,name:account.process_transition_action_createentries0
msgid "Create entry"
+<<<<<<< TREE
msgstr "إنشاء قيد"
#. module: account
@@ -6633,9 +8546,45 @@
#: code:addons/account/wizard/account_invoice_refund.py:108
#: code:addons/account/wizard/account_invoice_refund.py:110
#: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
+=======
+msgstr "إنشاء قيد"
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid " valuation: percent"
+msgstr " التقييم: بالمئة"
+
+#. module: account
+#: code:addons/account/account.py:622
+#: code:addons/account/account.py:624
+#: code:addons/account/account.py:963
+#: code:addons/account/account.py:1052
+#: code:addons/account/account.py:1129
+#: code:addons/account/account.py:1344
+#: code:addons/account/account.py:1351
+#: code:addons/account/account.py:2280
+#: code:addons/account/account.py:2596
+#: code:addons/account/account_analytic_line.py:92
+#: code:addons/account/account_analytic_line.py:101
+#: code:addons/account/account_bank_statement.py:301
+#: code:addons/account/account_bank_statement.py:314
+#: code:addons/account/account_bank_statement.py:352
+#: code:addons/account/account_cash_statement.py:292
+#: code:addons/account/account_cash_statement.py:314
+#: code:addons/account/account_invoice.py:808
+#: code:addons/account/account_invoice.py:839
+#: code:addons/account/account_invoice.py:1030
+#: code:addons/account/account_move_line.py:1200
+#: code:addons/account/account_move_line.py:1216
+#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/wizard/account_invoice_refund.py:108
+#: code:addons/account/wizard/account_invoice_refund.py:110
+#: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
+>>>>>>> MERGE-SOURCE
#: code:addons/account/wizard/account_use_model.py:44
#, python-format
msgid "Error !"
+<<<<<<< TREE
msgstr "خطأ !"
#. module: account
@@ -6647,6 +8596,9 @@
#: selection:account.financial.report,sign:0
msgid "Preserve balance sign"
msgstr ""
+=======
+msgstr "خطأ !"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.vat.declaration:0
@@ -6658,6 +8610,7 @@
#. module: account
#: selection:account.journal.period,state:0
msgid "Printed"
+<<<<<<< TREE
msgstr "مطبوع"
#. module: account
@@ -6666,6 +8619,9 @@
#, python-format
msgid "Error :"
msgstr ""
+=======
+msgstr "مطبوع"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.analytic.line:0
@@ -6686,11 +8642,16 @@
"reconcile in a series of accounts. It finds entries for each partner where "
"the amounts correspond."
msgstr ""
+"للحصول على فاتورة باعتبارها مدفوعة، لا بد من التوفيق بين إدخالات الفاتورة مع "
+"نظرائهم، وعادة ما المدفوعات. مع وظيفة المصالحة التلقائي، OpenERP يجعل البحث "
+"الخاصة بها لمقالات التوفيق في سلسلة من الحسابات. وجدت مقالات لكل شريك حيث "
+"المبالغ تتوافق."
#. module: account
#: view:account.move:0
#: field:account.move,to_check:0
msgid "To Review"
+<<<<<<< TREE
msgstr "للمراجعة"
#. module: account
@@ -6701,6 +8662,9 @@
"row to display the amount of debit/credit/balance that precedes the filter "
"you've set."
msgstr ""
+=======
+msgstr "للمراجعة"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.bank.statement:0
@@ -6714,6 +8678,7 @@
#. module: account
#: help:account.partner.ledger,page_split:0
msgid "Display Ledger Report with One partner per page"
+<<<<<<< TREE
msgstr "إعرض تقرير ليدجر مع شريك واحد لكل صفحة"
#. module: account
@@ -6724,6 +8689,17 @@
"some non legal fields or you must unreconcile first!\n"
"%s"
msgstr ""
+=======
+msgstr "إعرض تقرير ليدجر مع شريك واحد لكل صفحة"
+
+#. module: account
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+msgid "JRNL"
+msgstr "اليومية"
+>>>>>>> MERGE-SOURCE
#. module: account
#: report:account.general.ledger:0
@@ -6740,6 +8716,8 @@
"This report is an analysis done by a partner. It is a PDF report containing "
"one line per partner representing the cumulative credit balance"
msgstr ""
+"هذا التقرير هو تحليل قامت به الشريك. وهو تقرير PDF التي تحتوي على سطر واحد "
+"لكل شريك يمثل رصيد تراكمي"
#. module: account
#: code:addons/account/wizard/account_validate_account_move.py:61
@@ -6789,8 +8767,13 @@
#: code:addons/account/account.py:420
#: code:addons/account/account.py:432
#, python-format
+<<<<<<< TREE
msgid "Opening Balance"
msgstr "رصيد أول المدة"
+=======
+msgid "Currnt currency is not confirured properly !"
+msgstr "العملة الجديدة لم يتم ضبطها بشكل صحيح !"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:ir.model,name:account.model_account_move_reconcile
@@ -6825,6 +8808,8 @@
"allowing you to quickly check the balance of each of your accounts in a "
"single report"
msgstr ""
+"هذا التقرير يسمح لك طباعة أو إنشاء pdf من ميزان المراجعة الخاص بك مما يسمح "
+"لك لتتحقق من الموازنة سريعًا لكل من حساباتك في تقرير واحد"
#. module: account
#: help:account.move,to_check:0
@@ -6840,6 +8825,8 @@
#: field:wizard.multi.charts.accounts,complete_tax_set:0
msgid "Complete Set of Taxes"
msgstr ""
+"وحدة قسيمة الحساب تشمل جميع المتطلبات الأساسية لمدخلات القسيمة للنقد، بنك، "
+"المبيعات، المشتريات، والمصروفات، كونترا، الخ ... "
#. module: account
#: view:account.chart.template:0
@@ -6849,6 +8836,7 @@
#. module: account
#: model:ir.model,name:account.model_account_tax_chart
msgid "Account tax chart"
+<<<<<<< TREE
msgstr "الجدول الضريبي للحساب"
#. module: account
@@ -6858,6 +8846,9 @@
"Please define BIC/Swift code on bank for bank type IBAN Account to make "
"valid payments"
msgstr ""
+=======
+msgstr "الجدول الضريبي للحساب"
+>>>>>>> MERGE-SOURCE
#. module: account
#: report:account.analytic.account.cost_ledger:0
@@ -6899,12 +8890,16 @@
#: field:account.tax.code,child_ids:0
#: field:account.tax.code.template,child_ids:0
msgid "Child Codes"
+<<<<<<< TREE
msgstr "رموز الفرعي"
#. module: account
#: view:account.tax.template:0
msgid "Taxes used in Sales"
msgstr ""
+=======
+msgstr "رموز الفرعي"
+>>>>>>> MERGE-SOURCE
#. module: account
#: code:addons/account/account_invoice.py:495
@@ -6941,6 +8936,7 @@
#: selection:account.subscription,state:0
#: selection:report.invoice.created,state:0
msgid "Done"
+<<<<<<< TREE
msgstr "تم"
#. module: account
@@ -6951,6 +8947,9 @@
"accounting application of OpenERP, journals and accounts will be created "
"automatically based on these data."
msgstr ""
+=======
+msgstr "تم"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:process.transition,note:account.process_transition_invoicemanually0
@@ -6967,11 +8966,17 @@
"you request an interval of 30 days OpenERP generates an analysis of "
"creditors for the past month, past two months, and so on. "
msgstr ""
+"الذين تتراوح أعمارهم بين الرصيد الشريك هو تقرير أكثر تفصيلا من المستحقات "
+"الخاصة بك عن طريق فترات. عند فتح هذا التقرير، OpenERP يسأل عن اسم الشركة، "
+"للفترة المالية وحجم الفاصل الزمني ليتم تحليلها (بالأيام). OpenERP ثم يحسب "
+"جدول رصيد دائن من قبل فترة. حتى إذا طلبت فاصل لمدة 30 يوما OpenERP يولد "
+"تحليلا للدائنين خلال الشهر الماضي، خلال الشهرين الماضيين، وهكذا. "
#. module: account
#: field:account.invoice,origin:0
#: field:report.invoice.created,origin:0
msgid "Source Document"
+<<<<<<< TREE
msgstr "مستند المصدر"
#. module: account
@@ -6983,6 +8988,23 @@
#. module: account
#: selection:account.partner.ledger,filter:0
#: code:addons/account/report/account_partner_ledger.py:59
+=======
+msgstr "مستند المصدر"
+
+#. module: account
+#: help:account.account.type,sign:0
+msgid ""
+"Allows you to change the sign of the balance amount displayed in the "
+"reports, so that you can see positive figures instead of negative ones in "
+"expenses accounts."
+msgstr ""
+"يسمح لك بتغيير علامة المبلغ المتوازن المعروض في التقارير، وذلك حتى تتمكن من "
+"رؤية الأرقام الإيجابية بدلا من السلبية في حسابات المصروفات."
+
+#. module: account
+#: selection:account.partner.ledger,filter:0
+#: code:addons/account/report/account_partner_ledger.py:59
+>>>>>>> MERGE-SOURCE
#: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
#, python-format
msgid "Unreconciled Entries"
@@ -6991,12 +9013,16 @@
#. module: account
#: model:ir.ui.menu,name:account.menu_menu_Bank_process
msgid "Statements Reconciliation"
+<<<<<<< TREE
msgstr "تسوية القوائم"
#. module: account
#: model:ir.model,name:account.model_accounting_report
msgid "Accounting Report"
msgstr ""
+=======
+msgstr "تسوية القوائم"
+>>>>>>> MERGE-SOURCE
#. module: account
#: report:account.invoice:0
@@ -7016,6 +9042,9 @@
"an agreement with a customer or a supplier. With Define Recurring Entries, "
"you can create such entries to automate the postings in the system."
msgstr ""
+"إدخال متكرر هو دخول المتنوعة التي تحدث على أساس متكرر من تاريخ محدد، أي "
+"المقابلة على توقيع عقد أو اتفاق مع عميل أو مورد. مع تحديد مدخلات متكررة، "
+"يمكنك إنشاء مداخل للتسجيل آليًا في هذا النظام."
#. module: account
#: model:ir.actions.act_window,name:account.action_account_report_tree_hierarchy
@@ -7037,15 +9066,37 @@
"basis. You can enter the coins that are in your cash box, and then post "
"entries when money comes in or goes out of the cash box."
msgstr ""
-
-#. module: account
+"يسمح لك سجل النقد لإدارة مدخلات النقدية في اليوميات النقدية الخاصة بك. توفر "
+"هذه الميزة وسيلة سهلة لمتابعة المدفوعات النقدية على أساس يومي. يمكنك إدخال "
+"القطع النقدية التي هي في صندوق النقد، ثم تسجيل المدخلات عندما يأتي المال أو "
+"يذهب في الخروج من مربع النقدية."
+
+#. module: account
+<<<<<<< TREE
+=======
+#: selection:account.automatic.reconcile,power:0
+msgid "9"
+msgstr "٩"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: help:account.invoice.refund,date:0
msgid ""
"This date will be used as the invoice date for Refund Invoice and Period "
"will be chosen accordingly!"
msgstr ""
-"وسيتم استخدام هذا التاريخ كموعدا للفاتورة لاسترداد الفاتورة وسوف يتم اختيار "
-"المدة وفقا لذلك!"
+<<<<<<< TREE
+"وسيتم استخدام هذا التاريخ كموعدا للفاتورة لاسترداد الفاتورة وسوف يتم اختيار "
+"المدة وفقا لذلك!"
+=======
+"وسيتم استخدام هذا التاريخ كموعدا للفاتورة لاسترداد الفاتورة وسوف يتم اختيار "
+"المدة وفقا لذلك!"
+
+#. module: account
+#: field:account.aged.trial.balance,period_length:0
+msgid "Period length (days)"
+msgstr "مدة الفتر (أيام)"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:ir.actions.act_window,name:account.act_account_invoice_partner_relation
@@ -7056,13 +9107,47 @@
#: view:account.move:0
#: view:account.move.line:0
msgid "Analytic Lines"
-msgstr "سطور تحليلية"
+<<<<<<< TREE
+msgstr "سطور تحليلية"
+=======
+msgstr "سطور تحليلية"
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_analytic_account_tree2
+msgid ""
+"The normal chart of accounts has a structure defined by the legal "
+"requirement of the country. The analytic chart of account structure should "
+"reflect your own business needs in term of costs/revenues reporting. They "
+"are usually structured by contracts, projects, products or departements. "
+"Most of the OpenERP operations (invoices, timesheets, expenses, etc) "
+"generate analytic entries on the related account."
+msgstr ""
+"على الرسم البياني العادي للحسابات لديها هيكل المعرَفة من قبل الشرط القانوني "
+"للبلد. وينبغي على الرسم البياني التحليلي لهيكل الحساب تعكس احتياجات العمل "
+"الخاصة بك في فترة من التكاليف / الإيرادات التقارير. وتنظم عادة من قبل، وعقود "
+"المنتجات والمشاريع أو المقاطعات. معظم العمليات OpenERP (الفواتير، والجداول "
+"الزمنية، والنفقات، وغيرها) توليد مدخلات تحليلية على حساب ذات الصلة."
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.analytic.journal,line_ids:0
#: field:account.tax.code,line_ids:0
msgid "Lines"
-msgstr "سطور"
+<<<<<<< TREE
+msgstr "سطور"
+=======
+msgstr "سطور"
+
+#. module: account
+#: code:addons/account/account_invoice.py:532
+#, python-format
+msgid ""
+"Can not find account chart for this company in invoice line account, Please "
+"Create account."
+msgstr ""
+"لا يمكن العثور على الرسم البياني للحساب لهذه الشركة في حساب خط فاتورة، "
+"الرجاء إنشاء حساب."
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.tax.template:0
@@ -7077,6 +9162,7 @@
#. module: account
#: view:account.state.open:0
msgid "Are you sure you want to open this invoice ?"
+<<<<<<< TREE
msgstr "هل انت متأكد أنك تريد فتح هذه الفاتورة ؟"
#. module: account
@@ -7095,6 +9181,12 @@
#. module: account
#: code:addons/account/account_move_line.py:999
+=======
+msgstr "هل انت متأكد أنك تريد فتح هذه الفاتورة ؟"
+
+#. module: account
+#: code:addons/account/account_move_line.py:999
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Accounting Entries"
msgstr "مدخلات المحاسبة"
@@ -7102,12 +9194,16 @@
#. module: account
#: field:account.account.template,parent_id:0
msgid "Parent Account Template"
+<<<<<<< TREE
msgstr "قالب حساب رئيسي"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_configuration_installer
msgid "Install your Chart of Accounts"
msgstr ""
+=======
+msgstr "قالب حساب رئيسي"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.bank.statement:0
@@ -7120,7 +9216,56 @@
#. module: account
#: help:account.journal,default_debit_account_id:0
msgid "It acts as a default account for debit amount"
-msgstr "وهي تمثل الحساب الافتراضي لكمية الخصم"
+<<<<<<< TREE
+msgstr "وهي تمثل الحساب الافتراضي لكمية الخصم"
+=======
+msgstr "وهي تمثل الحساب الافتراضي لكمية الخصم"
+
+#. module: account
+#: model:ir.module.module,description:account.module_meta_information
+msgid ""
+"Financial and accounting module that covers:\n"
+" General accountings\n"
+" Cost / Analytic accounting\n"
+" Third party accounting\n"
+" Taxes management\n"
+" Budgets\n"
+" Customer and Supplier Invoices\n"
+" Bank statements\n"
+" Reconciliation process by partner\n"
+" Creates a dashboard for accountants that includes:\n"
+" * List of uninvoiced quotations\n"
+" * Graph of aged receivables\n"
+" * Graph of aged incomes\n"
+"\n"
+"The processes like maintaining of general ledger is done through the defined "
+"financial Journals (entry move line or\n"
+"grouping is maintained through journal) for a particular financial year and "
+"for preparation of vouchers there is a\n"
+"module named account_voucher.\n"
+" "
+msgstr ""
+"وحدة المالية والمحاسبية التي تغطي:\n"
+"عام المحاسبيات\n"
+"التكلفة / المحاسبة التحليلية\n"
+"طرف ثالث المحاسبة\n"
+"إدارة الضرائب\n"
+"الميزانيات\n"
+"العملاء والموردين الفواتير\n"
+"البيانات المصرفية\n"
+"عملية المصالحة من قبل شريك\n"
+"ينشيء لوحة أجهزة القياس للمحاسبين تشمل ما يلي:\n"
+"* لائحة الأسعار لما دون الفواتير\n"
+"* الرسم البياني لمستحقات المسنين\n"
+"* الرسم البياني لدخل المسنين\n"
+"\n"
+"تتم عمليات مثل الحفاظ على دفتر الأستاذ العام من خلال اليومية المالية المحددة "
+"(دخول خط التحرك أو\n"
+"يتم الاحتفاظ بالتجميع من خلال اليومية) لسنة مالية معينة وإعداد القسائم هل "
+"هناك\n"
+"وحدة اسمها حساب_قسيمة.\n"
+" "
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:ir.actions.act_window,help:account.action_account_journal_period_tree
@@ -7128,6 +9273,7 @@
"You can search for individual account entries through useful information. To "
"search for account entries, open a journal, then select a record line."
msgstr ""
+<<<<<<< TREE
"يمكنك البحث عن مدخلات للحساب الفردي من خلال المعلومات المفيدة. للبحث عن "
"المدخلات, افتح دفتر اليومية, ثم اختار خط التسجيل."
@@ -7140,6 +9286,10 @@
#: help:account.payment.term.line,value_amount:0
msgid "For percent enter a ratio between 0-1."
msgstr ""
+=======
+"يمكنك البحث عن مدخلات للحساب الفردي من خلال المعلومات المفيدة. للبحث عن "
+"المدخلات, افتح دفتر اليومية, ثم اختار خط التسجيل."
+>>>>>>> MERGE-SOURCE
#. module: account
#: report:account.invoice:0
@@ -7147,12 +9297,16 @@
#: field:account.invoice,date_invoice:0
#: field:report.invoice.created,date_invoice:0
msgid "Invoice Date"
+<<<<<<< TREE
msgstr "تاريخ الفاتورة"
#. module: account
#: view:account.invoice.report:0
msgid "Group by year of Invoice Date"
msgstr ""
+=======
+msgstr "تاريخ الفاتورة"
+>>>>>>> MERGE-SOURCE
#. module: account
#: help:res.partner,credit:0
@@ -7173,12 +9327,30 @@
#: view:account.automatic.reconcile:0
#: view:account.use.model:0
msgid "Ok"
+<<<<<<< TREE
msgstr "تم"
#. module: account
#: field:account.chart.template,tax_code_root_id:0
msgid "Root Tax Code"
msgstr "رمز الضريبة الرئيسي"
+=======
+msgstr "تم"
+
+#. module: account
+#: code:addons/account/report/account_partner_balance.py:115
+#, python-format
+msgid "Unknown Partner"
+msgstr "شريك مجهول"
+
+#. module: account
+#: view:account.bank.statement:0
+#: code:addons/account/account.py:420
+#: code:addons/account/account.py:432
+#, python-format
+msgid "Opening Balance"
+msgstr "رصيد أول المدة"
+>>>>>>> MERGE-SOURCE
#. module: account
#: help:account.journal,centralisation:0
@@ -7208,17 +9380,34 @@
#. module: account
#: field:wizard.multi.charts.accounts,purchase_tax:0
msgid "Default Purchase Tax"
+<<<<<<< TREE
msgstr "ضريبة المشتريات الإفتراضية"
#. module: account
#: field:account.chart.template,property_account_income_opening:0
msgid "Opening Entries Income Account"
msgstr ""
+=======
+msgstr "ضريبة المشتريات الإفتراضية"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.bank.statement:0
msgid "Confirm"
-msgstr "تأكيد"
+<<<<<<< TREE
+msgstr "تأكيد"
+=======
+msgstr "تأكيد"
+
+#. module: account
+#: help:account.invoice,partner_bank_id:0
+msgid ""
+"Bank Account Number, Company bank account if Invoice is customer or supplier "
+"refund, otherwise Partner bank account number."
+msgstr ""
+"عدد حساب البنك, حساب بنك الشركة اذا كانت الفاتورة استرداد للعميل او للمورد, "
+"على جانب اخر عدد حساب البنك للشريك."
+>>>>>>> MERGE-SOURCE
#. module: account
#: help:account.tax,domain:0
@@ -7234,12 +9423,16 @@
#: code:addons/account/account.py:1088
#, python-format
msgid "You should have chosen periods that belongs to the same company"
+<<<<<<< TREE
msgstr "ينبغي عليك اختيار الفترات التي تمتد الى نفس الشركة"
#. module: account
#: model:ir.actions.act_window,name:account.action_review_payment_terms_installer
msgid "Review your Payment Terms"
msgstr ""
+=======
+msgstr "ينبغي عليك اختيار الفترات التي تمتد الى نفس الشركة"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.fiscalyear.close,report_name:0
@@ -7249,16 +9442,21 @@
#. module: account
#: view:account.use.model:0
msgid "Create Entries"
+<<<<<<< TREE
msgstr "إنشاء قيود"
#. module: account
#: view:res.partner:0
msgid "Information About the Bank"
msgstr ""
+=======
+msgstr "إنشاء قيود"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:ir.ui.menu,name:account.menu_finance_reporting
msgid "Reporting"
+<<<<<<< TREE
msgstr "التقارير"
#. module: account
@@ -7277,6 +9475,14 @@
#: model:ir.actions.act_window,name:account.action_analytic_open
msgid "Contracts/Analytic Accounts"
msgstr ""
+=======
+msgstr "التقارير"
+
+#. module: account
+#: sql_constraint:account.journal:0
+msgid "The code of the journal must be unique per company !"
+msgstr "يجب ان يكون الكود لليومية فريد لكل شركة !"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.bank.statement,ending_details_ids:0
@@ -7319,6 +9525,7 @@
#. module: account
#: model:ir.model,name:account.model_account_use_model
msgid "Use model"
+<<<<<<< TREE
msgstr "استخدم النموذج"
#. module: account
@@ -7326,6 +9533,9 @@
#, python-format
msgid "Unable to adapt the initial balance (negative value)!"
msgstr ""
+=======
+msgstr "استخدم النموذج"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:ir.actions.act_window,help:account.action_account_moves_purchase
@@ -7335,12 +9545,30 @@
"line of the expense account, OpenERP will propose to you automatically the "
"Tax related to this account and the counter-part \"Account Payable\"."
msgstr ""
-
-#. module: account
+"ويستخدم هذا العرض من قبل المحاسبين من أجل تسجيل المدخلات على نطاق واسع في "
+"OpenERP. إذا كنت تريد تسجيل فاتورة المورد، ابدأ من خلال تسجيل خط لحساب "
+"النفقات، وسوف يقترح OpenERP عليكم تلقائيا الضريبة المتعلقة بهذا الحساب حساب "
+"جزء \"حساب المدفوعات\"."
+
+#. module: account
+<<<<<<< TREE
+=======
+#: help:res.company,property_reserve_and_surplus_account:0
+msgid ""
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
+"will be added, Loss : Amount will be deducted.), Which is calculated from "
+"Profit & Loss Report"
+msgstr ""
+"ويستخدم هذا الحساب لتحويل الربح / الخسارة (إذا كان الربح: سيتم إضافة المبلغ، "
+"الخسارة: سيتم خصم المبلغ.)، والذي يحسب من تقرير الربح والخسارة"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: view:account.invoice.line:0
#: field:account.invoice.tax,invoice_id:0
#: model:ir.model,name:account.model_account_invoice_line
msgid "Invoice Line"
+<<<<<<< TREE
msgstr "خط الفاتورة"
#. module: account
@@ -7350,7 +9578,23 @@
#. module: account
#: field:account.financial.report,sign:0
+=======
+msgstr "خط الفاتورة"
+
+#. module: account
+#: field:account.balance.report,display_account:0
+#: field:account.bs.report,display_account:0
+#: field:account.common.account.report,display_account:0
+#: field:account.pl.report,display_account:0
+#: field:account.report.general.ledger,display_account:0
+msgid "Display accounts"
+msgstr "عرض الحسابات"
+
+#. module: account
+#: field:account.financial.report,sign:0
+>>>>>>> MERGE-SOURCE
msgid "Sign on Reports"
+<<<<<<< TREE
msgstr "إمضاء التقرير"
#. module: account
@@ -7368,24 +9612,78 @@
#: code:addons/account/account.py:3121
#, python-format
msgid "OPEJ"
+=======
+msgstr "إمضاء التقرير"
+
+#. module: account
+#: code:addons/account/account_cash_statement.py:249
+#, python-format
+msgid "You can not have two open register for the same journal"
+msgstr "لا يمكنك تسجيلين مفتوحين لنفس اليومية"
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid " day of the month= -1"
+msgstr " يوم من الشهر= -١"
+
+#. module: account
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr "خطأ! لا يمكنك إنشاء أعضاء ذوي ارتباطات متداخلة."
+
+#. module: account
+#: help:account.journal,type:0
+msgid ""
+"Select 'Sale' for Sale journal to be used at the time of making invoice. "
+"Select 'Purchase' for Purchase Journal to be used at the time of approving "
+"purchase order. Select 'Cash' to be used at the time of making payment. "
+"Select 'General' for miscellaneous operations. Select 'Opening/Closing "
+"Situation' to be used at the time of new fiscal year creation or end of year "
+"entries generation."
+>>>>>>> MERGE-SOURCE
msgstr ""
+"لاستخدامها حدد 'بيع' ليومية البيع في وقت عمل الفاتورة. حدد \"شراء\" لشراء "
+"يومية لاستخدامها في وقت الموافقة على طلب الشراء. حدد \"النقدية\" لاستخدامها "
+"في وقت القيام بالدفع. حدد \"عام\" لعمليات متنوعة. حدد \"فتح / إغلاق الحالة\" "
+"ليتم استخدامها في ذلك الوقت من انشاء او نهاية السنة المالية الجديدة لمنشأ "
+"مدخلات السنة."
#. module: account
#: report:account.invoice:0
#: view:account.invoice:0
msgid "PRO-FORMA"
-msgstr "شكلي"
-
-#. module: account
+<<<<<<< TREE
+msgstr "شكلي"
+=======
+msgstr "شكلي"
+
+#. module: account
+#: help:account.installer.modules,account_followup:0
+msgid ""
+"Helps you generate reminder letters for unpaid invoices, including multiple "
+"levels of reminding and customized per-partner policies."
+msgstr ""
+"ويساعدك على انشاء خطابات تذكير عن الفواتير الغير المسددة، بما في ذلك مستويات "
+"متعددة من التذكير وتفصيلها لكل سياسة من سياسات الشيك."
+>>>>>>> MERGE-SOURCE
+
+#. module: account
+<<<<<<< TREE
#: selection:account.entries.report,move_line_state:0
#: view:account.move.line:0
#: selection:account.move.line,state:0
msgid "Unbalanced"
msgstr "غير متوازن"
+=======
+#: view:account.payment.term.line:0
+msgid " value amount: n.a"
+msgstr " قيمة المبلغ: غير متاحة"
+>>>>>>> MERGE-SOURCE
#. module: account
#: selection:account.move.line,centralisation:0
msgid "Normal"
+<<<<<<< TREE
msgstr "عادي"
#. module: account
@@ -7393,6 +9691,9 @@
#: model:ir.ui.menu,name:account.menu_email_templates
msgid "Email Templates"
msgstr ""
+=======
+msgstr "عادي"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.move.line:0
@@ -7400,10 +9701,21 @@
msgstr "معلومات خيارية"
#. module: account
+<<<<<<< TREE
#: code:addons/account/wizard/account_fiscalyear_close.py:84
#, python-format
msgid "The journal must have default credit and debit account"
msgstr "دفتر اليومية يجب أن يتضمن حساب إفتراضي دائن و أخر مدين"
+=======
+#: view:account.analytic.line:0
+#: field:account.bank.statement,user_id:0
+#: view:account.journal:0
+#: field:account.journal,user_id:0
+#: view:analytic.entries.report:0
+#: field:analytic.entries.report,user_id:0
+msgid "User"
+msgstr "مستخدم"
+>>>>>>> MERGE-SOURCE
#. module: account
#: report:account.general.journal:0
@@ -7421,6 +9733,7 @@
"This field is used for payable and receivable journal entries. You can put "
"the limit date for the payment of this line."
msgstr ""
+<<<<<<< TREE
"يُستخدم هذا الحقل لمدخلات اليومية للدائنين والمدينون. يمكنك ان تضع موعد محدد "
"للدفع لهذا الخط"
@@ -7436,6 +9749,13 @@
#. module: account
#: code:addons/account/account_move_line.py:1302
+=======
+"يُستخدم هذا الحقل لمدخلات اليومية للدائنين والمدينون. يمكنك ان تضع موعد محدد "
+"للدفع لهذا الخط"
+
+#. module: account
+#: code:addons/account/account_move_line.py:1302
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Bad account !"
msgstr "حساب سئ !"
@@ -7461,6 +9781,7 @@
#: code:addons/account/account_move_line.py:1277
#, python-format
msgid "No piece number !"
+<<<<<<< TREE
msgstr "لا يوجد رقم للقطعة !"
#. module: account
@@ -7483,6 +9804,9 @@
#: view:account.move:0
msgid "Unposted Journal Entries"
msgstr ""
+=======
+msgstr "لا يوجد رقم للقطعة !"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:product.product:0
@@ -7504,6 +9828,7 @@
#: field:account.analytic.chart,to_date:0
#: field:project.account.analytic.line,to_date:0
msgid "To"
+<<<<<<< TREE
msgstr "إلى"
#. module: account
@@ -7512,6 +9837,9 @@
#, python-format
msgid "Currency Adjustment"
msgstr ""
+=======
+msgstr "إلى"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.fiscalyear.close,fy_id:0
@@ -7523,6 +9851,7 @@
#: view:account.invoice.cancel:0
#: model:ir.actions.act_window,name:account.action_account_invoice_cancel
msgid "Cancel Selected Invoices"
+<<<<<<< TREE
msgstr "إلغاء الفواتير المختارة"
#. module: account
@@ -7539,6 +9868,9 @@
"terms for each letter. Each customer or supplier can be assigned to one of "
"these payment terms."
msgstr ""
+=======
+msgstr "إلغاء الفواتير المختارة"
+>>>>>>> MERGE-SOURCE
#. module: account
#: selection:account.entries.report,month:0
@@ -7559,6 +9891,7 @@
#: code:addons/account/report/account_partner_balance.py:299
#, python-format
msgid "Payable Accounts"
+<<<<<<< TREE
msgstr "حسابات الدائنون"
#. module: account
@@ -7566,10 +9899,14 @@
#, python-format
msgid "Global taxes defined, but they are not in invoice lines !"
msgstr ""
+=======
+msgstr "حسابات الدائنون"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:ir.model,name:account.model_account_chart_template
msgid "Templates for Account Chart"
+<<<<<<< TREE
msgstr "القوالب لجدول الحساب"
#. module: account
@@ -7578,6 +9915,9 @@
"The sequence field is used to order the resources from lower sequences to "
"higher ones."
msgstr ""
+=======
+msgstr "القوالب لجدول الحساب"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.tax.code,code:0
@@ -7593,6 +9933,7 @@
#. module: account
#: view:product.product:0
msgid "Sale Taxes"
+<<<<<<< TREE
msgstr "ضرائب المبيعات"
#. module: account
@@ -7602,6 +9943,12 @@
#. module: account
#: model:account.account.type,name:account.data_account_type_cash
+=======
+msgstr "ضرائب المبيعات"
+
+#. module: account
+#: model:account.account.type,name:account.data_account_type_cash
+>>>>>>> MERGE-SOURCE
#: selection:account.analytic.journal,type:0
#: selection:account.bank.accounts.wizard,account_type:0
#: selection:account.entries.report,type:0
@@ -7615,6 +9962,7 @@
#: field:account.fiscal.position.account,account_dest_id:0
#: field:account.fiscal.position.account.template,account_dest_id:0
msgid "Account Destination"
+<<<<<<< TREE
msgstr "وجهة الحساب"
#. module: account
@@ -7633,6 +9981,9 @@
#, python-format
msgid "UserError"
msgstr "خطأ مستخدم"
+=======
+msgstr "وجهة الحساب"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:process.node,note:account.process_node_supplierpaymentorder0
@@ -7652,6 +10003,7 @@
#: field:account.tax.code,sequence:0
#: field:account.tax.template,sequence:0
msgid "Sequence"
+<<<<<<< TREE
msgstr "مسلسل"
#. module: account
@@ -7667,7 +10019,24 @@
#. module: account
#: view:account.financial.report:0
msgid "Parent Report"
+=======
+msgstr "مسلسل"
+
+#. module: account
+#: model:ir.model,name:account.model_account_bs_report
+msgid "Account Balance Sheet Report"
+msgstr "تقرير الميزانية للحسابات"
+
+#. module: account
+#: help:account.tax,price_include:0
+#: help:account.tax.template,price_include:0
+msgid ""
+"Check this if the price you use on the product and invoices includes this "
+"tax."
+>>>>>>> MERGE-SOURCE
msgstr ""
+"تحقق من هذا اذا كان السعر الذي تستخدمه على المنتج والفواتير يحتوي على هذه "
+"الضريبة."
#. module: account
#: view:account.state.open:0
@@ -7698,11 +10067,21 @@
"in which they will appear. Then you can create a new journal and link your "
"view to it."
msgstr ""
+"هنا يمكنك تخصيص عرض يومية قائمة أو إنشاء طريقة عرض جديدة. تعلاض اليومية "
+"تحديد الطريقة التي يمكن أن تسجل المدخلات في اليومية الخاصة بك. حدد الحقول "
+"التي تريدها أن تظهر في اليومية وتحديد التسلسل التي سوف تظهر. ثم يمكنك إنشاء "
+"يومية جديدة وربط العرض الخاص بك إليه."
#. module: account
+<<<<<<< TREE
#: model:account.account.type,name:account.data_account_type_asset
msgid "Asset"
msgstr "أصل"
+=======
+#: view:account.payment.term.line:0
+msgid " number of days: 14"
+msgstr " عدد الأيام: 14"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:analytic.entries.report:0
@@ -7710,9 +10089,15 @@
msgstr " ٧ أيام "
#. module: account
+<<<<<<< TREE
#: field:account.bank.statement,balance_end:0
msgid "Computed Balance"
msgstr ""
+=======
+#: field:account.partner.reconcile.process,progress:0
+msgid "Progress"
+msgstr "تقدّم"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.account,parent_id:0
@@ -7721,6 +10106,14 @@
msgstr "أصل"
#. module: account
+<<<<<<< TREE
+=======
+#: field:account.installer.modules,account_analytic_plans:0
+msgid "Multiple Analytic Plans"
+msgstr "خطط تحليلية متعددة"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: help:account.payment.term.line,days2:0
msgid ""
"Day of the month, set -1 for the last day of the current month. If it's "
@@ -7748,6 +10141,9 @@
"to the higher ones. The order is important if you have a tax with several "
"tax children. In this case, the evaluation order is important."
msgstr ""
+"يتم استخدام حقل التسلسل لترتيب خطوط الضرائب من أدنى المتواليات إلى أعلى. "
+"الترتيب مهم إذا كان لديك ضريبة من الضرائب التي لديها اساس عدة. في هذه "
+"الحالة، من المهم ترتيب التقييم."
#. module: account
#: model:ir.model,name:account.model_account_cashbox_line
@@ -7765,6 +10161,14 @@
msgstr "دفتر الشركاء"
#. module: account
+<<<<<<< TREE
+=======
+#: report:account.account.balance.landscape:0
+msgid "Year :"
+msgstr "سنة:"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: selection:account.tax.template,type:0
msgid "Fixed"
msgstr "ثابت"
@@ -7830,6 +10234,7 @@
#. module: account
#: help:account.change.currency,currency_id:0
msgid "Select a currency to apply on the invoice"
+<<<<<<< TREE
msgstr "اختر عملة للفاتورة"
#. module: account
@@ -7838,6 +10243,9 @@
msgid ""
"The bank account defined on the selected chart of accounts hasn't a code."
msgstr ""
+=======
+msgstr "اختر عملة للفاتورة"
+>>>>>>> MERGE-SOURCE
#. module: account
#: code:addons/account/wizard/account_invoice_refund.py:108
@@ -7849,6 +10257,7 @@
#: code:addons/account/account_invoice.py:810
#, python-format
msgid "No Invoice Lines !"
+<<<<<<< TREE
msgstr "لا سطور للفاتورة !"
#. module: account
@@ -7858,6 +10267,12 @@
#. module: account
#: view:account.analytic.account:0
+=======
+msgstr "لا سطور للفاتورة !"
+
+#. module: account
+#: view:account.analytic.account:0
+>>>>>>> MERGE-SOURCE
#: view:account.bank.statement:0
#: field:account.bank.statement,state:0
#: field:account.entries.report,move_state:0
@@ -7888,6 +10303,7 @@
#. module: account
#: field:account.tax.template,type_tax_use:0
msgid "Tax Use In"
+<<<<<<< TREE
msgstr "استخدام الضرائب في"
#. module: account
@@ -7897,11 +10313,15 @@
"The statement balance is incorrect !\n"
"The expected balance (%.2f) is different than the computed one. (%.2f)"
msgstr ""
+=======
+msgstr "استخدام الضرائب في"
+>>>>>>> MERGE-SOURCE
#. module: account
#: code:addons/account/account_bank_statement.py:353
#, python-format
msgid "The account entries lines are not in valid state."
+<<<<<<< TREE
msgstr "حالة خطوط المدخلات للحاسب غير صالحة."
#. module: account
@@ -7914,6 +10334,9 @@
"Most of the OpenERP operations (invoices, timesheets, expenses, etc) "
"generate analytic entries on the related account."
msgstr ""
+=======
+msgstr "حالة خطوط المدخلات للحاسب غير صالحة."
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.account.type,close_method:0
@@ -7934,7 +10357,16 @@
#. module: account
#: constraint:account.tax.code.template:0
msgid "Error ! You can not create recursive Tax Codes."
-msgstr "خطأ ! لايمكنك انشاء اكواد ضريبية عودية."
+<<<<<<< TREE
+msgstr "خطأ ! لايمكنك انشاء اكواد ضريبية عودية."
+=======
+msgstr "خطأ ! لايمكنك انشاء اكواد ضريبية عودية."
+
+#. module: account
+#: view:account.invoice.line:0
+msgid "Line"
+msgstr "سطر"
+>>>>>>> MERGE-SOURCE
#. module: account
#: help:account.journal,group_invoice_lines:0
@@ -7942,6 +10374,7 @@
"If this box is checked, the system will try to group the accounting lines "
"when generating them from invoices."
msgstr ""
+<<<<<<< TREE
"اذا تم تحديد هذه الخانة, سيحاول النظام بتجميع خطوط المحاسبة عند انشائهم من "
"الفواتير."
@@ -7950,6 +10383,10 @@
msgid ""
"Check this box if this account allows reconciliation of journal items."
msgstr ""
+=======
+"اذا تم تحديد هذه الخانة, سيحاول النظام بتجميع خطوط المحاسبة عند انشائهم من "
+"الفواتير."
+>>>>>>> MERGE-SOURCE
#. module: account
#: help:account.period,state:0
@@ -7968,6 +10405,7 @@
#. module: account
#: view:account.move.bank.reconcile:0
msgid "Open for bank reconciliation"
+<<<<<<< TREE
msgstr "فتح للتسوية البنكية"
#. module: account
@@ -7980,6 +10418,20 @@
#: view:report.account_type.sales:0
msgid "This Months Sales by type"
msgstr ""
+=======
+msgstr "فتح للتسوية البنكية"
+
+#. module: account
+#: field:account.partner.ledger,page_split:0
+msgid "One Partner Per Page"
+msgstr "شريك واحد لكل صفحة"
+
+#. module: account
+#: field:account.account,child_parent_ids:0
+#: field:account.account.template,child_parent_ids:0
+msgid "Children"
+msgstr "فرعي"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.analytic.account:0
@@ -7999,6 +10451,7 @@
msgstr "معلومات أضافية"
#. module: account
+<<<<<<< TREE
#: help:account.invoice,state:0
msgid ""
" * The 'Draft' state is used when a user is encoding a new and unconfirmed "
@@ -8011,6 +10464,11 @@
"related journal entries may or may not be reconciled. \n"
"* The 'Cancelled' state is used when user cancel invoice."
msgstr ""
+=======
+#: view:account.installer:0
+msgid "Bank and Cash Accounts"
+msgstr "حسابات النقدية و البنك"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.invoice.report:0
@@ -8031,13 +10489,29 @@
"will see the taxes with codes related to your legal statement according to "
"your country."
msgstr ""
+"ويستخدم الرسم البياني للضرائب لإنشاء البيان الضريبي الدوري الخاص بك. سترى "
+"الضرائب مع اكواد تتعلق بالبيان القانوني وفقاً لبلدكم."
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:428
#, python-format
msgid ""
"Can not find a chart of accounts for this company, you should create one."
msgstr ""
+=======
+#: view:account.installer.modules:0
+msgid "Add extra Accounting functionalities to the ones already installed."
+msgstr "إضافة وظائف المحاسبة اضافية لتلك المثبتة مسبقا."
+
+#. module: account
+#: report:account.analytic.account.cost_ledger:0
+#: report:account.analytic.account.quantity_cost_ledger:0
+#: model:ir.actions.act_window,name:account.action_account_analytic_cost
+#: model:ir.actions.report.xml,name:account.account_analytic_account_cost_ledger
+msgid "Cost Ledger"
+msgstr "دفتر حسابات التكلفة"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.invoice:0
@@ -8066,6 +10540,7 @@
msgstr "للضرائب ادخل النسبة % بين 0 و 1."
#. module: account
+<<<<<<< TREE
#: view:account.analytic.account:0
msgid "Current Accounts"
msgstr ""
@@ -8074,6 +10549,11 @@
#: view:account.invoice.report:0
msgid "Group by Invoice Date"
msgstr ""
+=======
+#: selection:account.automatic.reconcile,power:0
+msgid "8"
+msgstr "٨"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.invoice.refund:0
@@ -8081,7 +10561,16 @@
"Modify Invoice: Cancels the current invoice and creates a new copy of it "
"ready for editing."
msgstr ""
-"عدّل الفاتورة: الغي الفاتورة الحالية وانشأ نسخة جديدة منها جاهزة للتعديل."
+<<<<<<< TREE
+"عدّل الفاتورة: الغي الفاتورة الحالية وانشأ نسخة جديدة منها جاهزة للتعديل."
+=======
+"عدّل الفاتورة: الغي الفاتورة الحالية وانشأ نسخة جديدة منها جاهزة للتعديل."
+
+#. module: account
+#: model:ir.module.module,shortdesc:account.module_meta_information
+msgid "Accounting and Financial Management"
+msgstr "إدارة الملية والمحاسبة"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.automatic.reconcile,period_id:0
@@ -8106,6 +10595,7 @@
#: field:account.treasury.report,period_id:0
#: field:validate.account.move,period_id:0
msgid "Period"
+<<<<<<< TREE
msgstr "فترة"
#. module: account
@@ -8114,6 +10604,9 @@
"Total amount (in Company currency) for transactions held in secondary "
"currency for this account."
msgstr ""
+=======
+msgstr "فترة"
+>>>>>>> MERGE-SOURCE
#. module: account
#: report:account.invoice:0
@@ -8140,6 +10633,7 @@
#. module: account
#: view:account.tax.template:0
msgid "Compute Code for Taxes included prices"
+<<<<<<< TREE
msgstr "احسب الكود للضرائب مشتملة على القيم"
#. module: account
@@ -8149,16 +10643,23 @@
"You can not cancel an invoice which is partially paid! You need to "
"unreconcile related payment entries first!"
msgstr ""
+=======
+msgstr "احسب الكود للضرائب مشتملة على القيم"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.chart.template,property_account_income_categ:0
msgid "Income Category Account"
+<<<<<<< TREE
msgstr "حساب التصنيف الوارد"
#. module: account
#: field:account.account,adjusted_balance:0
msgid "Adjusted Balance"
msgstr ""
+=======
+msgstr "حساب التصنيف الوارد"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
@@ -8174,12 +10675,16 @@
#. module: account
#: field:account.move.line,tax_amount:0
msgid "Tax/Base Amount"
+<<<<<<< TREE
msgstr "المبلغ الاساسي/الضريبة"
#. module: account
#: view:account.payment.term.line:0
msgid " Valuation: Percent"
msgstr ""
+=======
+msgstr "المبلغ الاساسي/الضريبة"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:ir.actions.act_window,help:account.action_invoice_tree3
@@ -8189,6 +10694,9 @@
"can easily generate refunds and reconcile them directly from the invoice "
"form."
msgstr ""
+"مع المسترد من العملاء يمكنك إدارة ملاحظات الائتمان للعملاء. والمبلغ المسترد "
+"عبارة عن وثيقة تُعتمد الفاتورة كليا أو جزئيا. يمكنك بسهولة انشاء المبالغ "
+"المستردة والتوفيق بينهما مباشرة من نموذج فاتورة."
#. module: account
#: model:ir.actions.act_window,help:account.action_account_vat_declaration
@@ -8200,6 +10708,12 @@
"useful because it enables you to preview at any time the tax that you owe at "
"the start and end of the month or quarter."
msgstr ""
+"تطبع هذه القائمة إعلان ضريبة القيمة المضافة على أساس الفواتير أو المدفوعات. "
+"يمكنك اختيار واحد أو عدة فترات من السنة المالية. يتم إنشاؤها تلقائيا "
+"المعلومات المطلوبة للحصول على الإقرار الضريبي من قبل OpenERP من الفواتير (أو "
+"دفعات، في بعض البلدان). ويتم تحديث هذه البيانات في الوقت الحقيقي. وهذا مفيد "
+"جدا لأنه يتيح لك معاينة في أي وقت من الضرائب التي مدينون لكم في بداية ونهاية "
+"الشهر الجاري أو الربع."
#. module: account
#: report:account.invoice:0
@@ -8240,6 +10754,8 @@
#: field:account.treasury.report,ending_balance:0
msgid "Ending Balance"
msgstr ""
+"ويستخدم هذا الحساب لنقل الربح / الخسارة (الربح: سيتم إضافة المبلغ، الخسارة: "
+"سيتم خصم المبلغ)، والذي يحسب من تقرير الربح والخسارة"
#. module: account
#: help:account.move.line,blocked:0
@@ -8264,6 +10780,7 @@
#. module: account
#: model:ir.model,name:account.model_account_common_report
msgid "Account Common Report"
+<<<<<<< TREE
msgstr "تقرير مشترك للحساب"
#. module: account
@@ -8279,6 +10796,9 @@
"No period defined for this date: %s !\n"
"Please create one."
msgstr ""
+=======
+msgstr "تقرير مشترك للحساب"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:process.transition,name:account.process_transition_filestatement0
@@ -8301,12 +10821,27 @@
#: model:ir.actions.act_window,name:account.action_account_type_form
#: model:ir.ui.menu,name:account.menu_action_account_type_form
msgid "Account Types"
+<<<<<<< TREE
msgstr "أنواع الحساب"
#. module: account
#: view:account.payment.term.line:0
msgid " Value amount: n.a"
msgstr ""
+=======
+msgstr "أنواع الحساب"
+
+#. module: account
+#: code:addons/account/invoice.py:897
+#, python-format
+msgid "Cannot create invoice move on centralised journal"
+msgstr "لا يمكن إنشاء حركة فاتورة حيث اليومية مركزية"
+
+#. module: account
+#: field:account.account.type,report_type:0
+msgid "P&L / BS Category"
+msgstr "فئة P&L / BS"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.automatic.reconcile:0
@@ -8329,6 +10864,7 @@
msgstr "حساب المدينون"
#. module: account
+<<<<<<< TREE
#: view:account.invoice:0
msgid ""
"This button only appears when the state of the invoice is 'paid' (showing "
@@ -8338,6 +10874,11 @@
"You should press this button to re-open it and let it continue its normal "
"process after having resolved the eventual exceptions it may have created."
msgstr ""
+=======
+#: view:account.bank.statement:0
+msgid "CashBox Balance"
+msgstr "رصيد صندوق النقدية"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:ir.model,name:account.model_account_fiscalyear_close_state
@@ -8367,6 +10908,9 @@
"sales orders or deliveries. You should only confirm them before sending them "
"to your customers."
msgstr ""
+"مع فواتير العملاء يمكنك إنشاء وإدارة المبيعات الفواتير الصادرة للعملاء. "
+"ويمكن أيضا لـOpenERP انشاء فواتير مشروع تلقائيا من أوامر البيع أو التسليم. "
+"يجب أن تؤكد فقط لهم قبل ارسالهم الى الزبائن."
#. module: account
#: code:addons/account/wizard/account_period_close.py:51
@@ -8385,6 +10929,7 @@
#. module: account
#: help:account.invoice,account_id:0
msgid "The partner account used for this invoice."
+<<<<<<< TREE
msgstr "يستخدم حساب الشريك لهذه الفاتورة."
#. module: account
@@ -8392,6 +10937,9 @@
#, python-format
msgid "Tax %.2f%%"
msgstr ""
+=======
+msgstr "يستخدم حساب الشريك لهذه الفاتورة."
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.analytic.account:0
@@ -8449,7 +10997,17 @@
#: model:ir.ui.menu,name:account.menu_account_supplier
#: model:ir.ui.menu,name:account.menu_finance_payables
msgid "Suppliers"
-msgstr "المورّدون"
+<<<<<<< TREE
+msgstr "المورّدون"
+=======
+msgstr "المورّدون"
+
+#. module: account
+#: constraint:account.move:0
+msgid ""
+"You cannot create more than one move per period on centralized journal"
+msgstr "لايمكنك انشاء اكثر من تحرك واحد كل فترة في اليومية المركزية"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.journal:0
@@ -8467,7 +11025,16 @@
"The residual amount on a receivable or payable of a journal entry expressed "
"in the company currency."
msgstr ""
-"عُبر عن المبلغ المتبقي لمدخل اليومية للدائنون والمدينون في عملة الشركة."
+<<<<<<< TREE
+"عُبر عن المبلغ المتبقي لمدخل اليومية للدائنون والمدينون في عملة الشركة."
+=======
+"عُبر عن المبلغ المتبقي لمدخل اليومية للدائنون والمدينون في عملة الشركة."
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid " valuation: balance"
+msgstr " التقييم: رصيد"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.tax.code:0
@@ -8494,6 +11061,7 @@
#: view:account.invoice:0
#: model:ir.actions.act_window,name:account.act_account_journal_2_account_invoice_opened
msgid "Unpaid Invoices"
+<<<<<<< TREE
msgstr "فواتير غير مدفوعة"
#. module: account
@@ -8501,6 +11069,9 @@
#, python-format
msgid "The payment term of supplier does not have a payment term line!"
msgstr ""
+=======
+msgstr "فواتير غير مدفوعة"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.move.line.reconcile,debit:0
@@ -8527,6 +11098,7 @@
#. module: account
#: view:account.journal:0
msgid "Accounts Allowed (empty for no control)"
+<<<<<<< TREE
msgstr "سمحت الحسابات (فارغة لأية سيطرة)"
#. module: account
@@ -8538,6 +11110,16 @@
#: view:board.board:0
msgid "Draft Customer Invoices"
msgstr ""
+=======
+msgstr "سمحت الحسابات (فارغة لأية سيطرة)"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_analytic_account_tree2
+#: model:ir.actions.act_window,name:account.action_account_analytic_chart
+#: model:ir.ui.menu,name:account.menu_action_analytic_account_tree2
+msgid "Chart of Analytic Accounts"
+msgstr "شجرة الحسابات التحليلية"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:ir.ui.menu,name:account.menu_configuration_misc
@@ -8560,6 +11142,7 @@
#: report:account.general.journal:0
#: field:account.journal,name:0
msgid "Journal Name"
+<<<<<<< TREE
msgstr "اسم اليومية"
#. module: account
@@ -8576,6 +11159,9 @@
#: model:res.groups,name:account.group_account_invoice
msgid "Invoicing & Payments"
msgstr ""
+=======
+msgstr "اسم اليومية"
+>>>>>>> MERGE-SOURCE
#. module: account
#: help:account.invoice,internal_number:0
@@ -8592,10 +11178,18 @@
msgstr "يجب ان تكون كمية الايصال نفس كمية الايصال في خط البيان"
#. module: account
+<<<<<<< TREE
#: model:account.account.type,name:account.data_account_type_expense
#: model:account.financial.report,name:account.account_financial_report_expense0
msgid "Expense"
msgstr "مصروف"
+=======
+#: code:addons/account/account_move_line.py:1155
+#: code:addons/account/account_move_line.py:1238
+#, python-format
+msgid "Bad account!"
+msgstr "حساب سئ!"
+>>>>>>> MERGE-SOURCE
#. module: account
#: help:account.chart,fiscalyear:0
@@ -8613,6 +11207,7 @@
msgid ""
"The amount expressed in an optional other currency if it is a multi-currency "
"entry."
+<<<<<<< TREE
msgstr "تم التعبير عن المبلغ في عملة اخرى اختيارية اذا كانت مدخل عملة متعدد."
#. module: account
@@ -8623,6 +11218,9 @@
"Make sure you have configured payment terms properly !\n"
"The latest payment term line should be of the type \"Balance\" !"
msgstr ""
+=======
+msgstr "تم التعبير عن المبلغ في عملة اخرى اختيارية اذا كانت مدخل عملة متعدد."
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.account:0
@@ -8676,6 +11274,11 @@
"would be referred to as FY 2011. You are not obliged to follow the actual "
"calendar year."
msgstr ""
+"عرف السنه المالية للشركة وفقا لاحتياجاتك. السنة المالية هي فترة في النهاية "
+"التي تتم حسابات الشركة عن (عادة 12 شهرا). ويشار عادة إلى السنة المالية في "
+"الموعد الذي تنتهي. على سبيل المثال، إذا كان في السنة المالية للشركة تنتهي 30 "
+"نوفمبر 2011، ثم كل شيء بين 1 ديسمبر 2010 و 30 نوفمبر، سوف يحال 2011 إلى "
+"السنة المالية 2011. ليست ملزمة لمتابعة السنة الميلادية الفعلية."
#. module: account
#: view:account.entries.report:0
@@ -8693,6 +11296,14 @@
#, python-format
msgid "Wrong model !"
msgstr ""
+" * وتستخدم الحالة \"السحب\" عندما يقوم المستخدم بترميز فاتورة جديدة وغير "
+"مؤكدة.\n"
+"* إن \"الشكلية\" عندما الفاتورة في حالة الفاتورة الشكلية، والفاتورة ليس لها "
+"رقم فاتورة..\n"
+"* يتم استخدام حالة 'فتح' عند انشاء فاتورة المستخدم، ورقم الفاتورة أُنشيء. "
+"وهي في حالة فتح حتى لا يدفع المستخدم الفاتورة.\n"
+"* تم تعيين الحالة \"مدفوعة\" تلقائيا عندما يتم دفع الفاتورة.\n"
+"* يتم استخدام الحالة \"ملغاة\" عندما يقوم المستخدم بإلغاء الفاتورة."
#. module: account
#: field:account.invoice.refund,period:0
@@ -8702,6 +11313,7 @@
#. module: account
#: model:ir.model,name:account.model_account_partner_balance
msgid "Print Account Partner Balance"
+<<<<<<< TREE
msgstr "طباعة رصيد حساب الشريك"
#. module: account
@@ -8713,6 +11325,9 @@
"accounts that are typically more credited than debited and that you would "
"like to print as positive amounts in your reports; e.g.: Income account."
msgstr ""
+=======
+msgstr "طباعة رصيد حساب الشريك"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:res.partner,contract_ids:0
@@ -8746,8 +11361,11 @@
"will be added, Loss: Amount will be deducted.), Which is calculated from "
"Profilt & Loss Report"
msgstr ""
+"ويستخدم هذا الحساب لتحويل الربح / الخسارة (إذا كان الربح: سيتم إضافة المبلغ، "
+"الخسارة: سيتم خصم المبلغ.)، والذي يحسب من تقرير الربح والخسارة"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:808
#, python-format
msgid "Please define sequence on the journal related to this invoice."
@@ -8765,6 +11383,11 @@
#: view:report.account.sales:0
msgid "This year's Sales by type"
msgstr ""
+=======
+#: field:account.invoice,reference_type:0
+msgid "Reference Type"
+msgstr "نوع المرجع"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.analytic.cost.ledger.journal.report:0
@@ -8798,6 +11421,8 @@
"the amount of this case into its parent. For example, set 1/-1 if you want "
"to add/substract it."
msgstr ""
+"هنا يمكنك تحديد المعامل التي سيتم استخدامها عند توطيد كمية من هذه الحالة في "
+"الأصل. على سبيل المثال، وضع 1/-1 إذا كنت ترغب في إضافة / طرح ذلك."
#. module: account
#: view:account.invoice:0
@@ -8810,12 +11435,16 @@
#: field:account.invoice,move_lines:0
#: field:account.move.reconcile,line_id:0
msgid "Entry Lines"
+<<<<<<< TREE
msgstr "سطور القيود"
#. module: account
#: model:ir.actions.act_window,name:account.action_view_financial_accounts_installer
msgid "Review your Financial Accounts"
msgstr ""
+=======
+msgstr "سطور القيود"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:ir.actions.act_window,name:account.action_open_journal_button
@@ -8839,7 +11468,19 @@
#: code:addons/account/account.py:3110
#, python-format
msgid "Sales Refund Journal"
-msgstr "يومية رد المبيعات"
+<<<<<<< TREE
+msgstr "يومية رد المبيعات"
+=======
+msgstr "يومية رد المبيعات"
+
+#. module: account
+#: code:addons/account/account.py:927
+#, python-format
+msgid ""
+"You cannot modify company of this period as its related record exist in "
+"Entry Lines"
+msgstr "لا يمكنك تعديل الشركة لهذه الفترة كتسجيلها المرتبط في خطوط المدخل"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.move:0
@@ -8891,6 +11532,7 @@
#. module: account
#: report:account.overdue:0
msgid "Dear Sir/Madam,"
+<<<<<<< TREE
msgstr "عزيزي سيدي / سيدتي،"
#. module: account
@@ -8900,9 +11542,20 @@
#. module: account
#: code:addons/account/account.py:3118
+=======
+msgstr "عزيزي سيدي / سيدتي،"
+
+#. module: account
+#: view:account.installer.modules:0
+msgid "Configure Your Accounting Application"
+msgstr "إعداد التطبيق المحاسبي الخاص بك"
+
+#. module: account
+#: code:addons/account/account.py:3118
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "SCNJ"
-msgstr ""
+msgstr "SCNJ"
#. module: account
#: model:process.transition,note:account.process_transition_analyticinvoice0
@@ -8921,6 +11574,9 @@
"in which order. You can create your own view for a faster encoding in each "
"journal."
msgstr ""
+"يعطي العرض المستخدم عند كتابة أو تصفح مدخلات في هذه اليومية. يبين العرض "
+"OpenERP الحقول التي يجب أن يكون مرئيا، المطلوب أو للقراءة فقط، والتي في "
+"النظام. يمكنك انشاء وجهة نظرك الخاصة لأسرع ترميز في كل يومية."
#. module: account
#: field:account.period,date_stop:0
@@ -8929,6 +11585,7 @@
msgstr "نهاية الفترة"
#. module: account
+<<<<<<< TREE
#: field:account.account,financial_report_ids:0
#: field:account.account.template,financial_report_ids:0
#: model:ir.actions.act_window,name:account.action_account_financial_report_tree
@@ -8938,6 +11595,11 @@
#: model:ir.ui.menu,name:account.menu_account_reports
msgid "Financial Reports"
msgstr ""
+=======
+#: field:account.installer.modules,account_followup:0
+msgid "Followups Management"
+msgstr "إدارة المتابعة"
+>>>>>>> MERGE-SOURCE
#. module: account
#: report:account.account.balance:0
@@ -8965,7 +11627,17 @@
#: field:accounting.report,period_from:0
#: field:accounting.report,period_from_cmp:0
msgid "Start Period"
-msgstr "بداية الفترة"
+<<<<<<< TREE
+msgstr "بداية الفترة"
+=======
+msgstr "بداية الفترة"
+
+#. module: account
+#: code:addons/account/account.py:2333
+#, python-format
+msgid "Cannot locate parent code for template account!"
+msgstr "لا يمكن وضع كود الاصل لحاسب القالب!"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.aged.trial.balance,direction_selection:0
@@ -8996,7 +11668,21 @@
#. module: account
#: model:process.transition,note:account.process_transition_suppliervalidentries0
msgid "Accountant validates the accounting entries coming from the invoice. "
-msgstr "يتحقق المحاسب من صلاحية المدخلات المحاسبية الآتية من الفاتورة. "
+<<<<<<< TREE
+msgstr "يتحقق المحاسب من صلاحية المدخلات المحاسبية الآتية من الفاتورة. "
+=======
+msgstr "يتحقق المحاسب من صلاحية المدخلات المحاسبية الآتية من الفاتورة. "
+
+#. module: account
+#: code:addons/account/invoice.py:1008
+#, python-format
+msgid ""
+"You cannot cancel the Invoice which is Partially Paid! You need to "
+"unreconcile concerned payment entries!"
+msgstr ""
+"لا يمكنك الغاء الفاتورة المدفوعة جزئياً! انت تحتاج الى عدم تسوية مدخلات "
+"الدفع المعنية!"
+>>>>>>> MERGE-SOURCE
#. module: account
#: report:account.overdue:0
@@ -9006,35 +11692,71 @@
#. module: account
#: view:account.invoice:0
msgid "Unpaid"
+<<<<<<< TREE
msgstr "غير مدفوعة"
#. module: account
#: model:ir.model,name:account.model_account_tax_code_template
msgid "Tax Code Template"
msgstr "قالب رمز الضريبة"
+=======
+msgstr "غير مدفوعة"
+>>>>>>> MERGE-SOURCE
#. module: account
#: report:account.overdue:0
msgid "Document: Customer account statement"
+<<<<<<< TREE
msgstr "مستند: كشف حساب عميل"
#. module: account
#: field:account.account.type,report_type:0
msgid "P&L / BS Category"
msgstr ""
-
-#. module: account
-#: model:ir.actions.act_window,help:account.action_invoice_tree4
-msgid ""
-"With Supplier Refunds you can manage the credit notes you receive from your "
-"suppliers. A refund is a document that credits an invoice completely or "
-"partially. You can easily generate refunds and reconcile them directly from "
-"the invoice form."
-msgstr ""
+=======
+msgstr "مستند: كشف حساب عميل"
+
+#. module: account
+#: constraint:account.move.line:0
+msgid "You can not create move line on view account."
+msgstr "لايمكنك انشاء خط تحرك في حساب العرض."
+
+#. module: account
+#: code:addons/account/wizard/account_change_currency.py:71
+#, python-format
+msgid "Current currency is not confirured properly !"
+msgstr "العملة الجديدة لم يتم ضبطها بشكل صحيح !"
+>>>>>>> MERGE-SOURCE
+
+#. module: account
+#: code:addons/account/account.py:1088
+#: code:addons/account/account.py:1090
+#: code:addons/account/account.py:1321
+#: code:addons/account/account.py:1563
+#: code:addons/account/account.py:1567
+#: code:addons/account/account.py:3368
+#: code:addons/account/account_move_line.py:807
+#: code:addons/account/account_move_line.py:830
+#: code:addons/account/account_move_line.py:832
+#: code:addons/account/account_move_line.py:835
+#: code:addons/account/account_move_line.py:837
+#: code:addons/account/report/common_report_header.py:92
+#: code:addons/account/wizard/account_change_currency.py:38
+#: code:addons/account/wizard/account_change_currency.py:59
+#: code:addons/account/wizard/account_change_currency.py:64
+#: code:addons/account/wizard/account_change_currency.py:70
+#: code:addons/account/wizard/account_financial_report.py:69
+#: code:addons/account/wizard/account_move_bank_reconcile.py:49
+#: code:addons/account/wizard/account_report_common.py:144
+#: code:addons/account/wizard/account_report_common.py:150
+#, python-format
+msgid "Error"
+msgstr "خطأ"
#. module: account
#: view:account.account.template:0
msgid "Receivale Accounts"
+<<<<<<< TREE
msgstr "حسابات المدينون"
#. module: account
@@ -9043,6 +11765,20 @@
#: model:ir.ui.menu,name:account.menu_bank_statement_tree
msgid "Bank Statements"
msgstr "كشوف حساب البنك"
+=======
+msgstr "حسابات المدينون"
+
+#. module: account
+#: selection:account.account.type,report_type:0
+msgid "Profit & Loss (Income Accounts)"
+msgstr "الأرباح و الخسائر (حسابات الدخل)"
+
+#. module: account
+#: view:account.tax:0
+#: view:account.tax.template:0
+msgid "Keep empty to use the income account"
+msgstr "لإستخدام حساب الدخل اتركه فارغ"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.account,balance:0
@@ -9079,12 +11815,39 @@
#: report:account.account.balance:0
#: report:account.general.ledger_landscape:0
msgid "Display Account"
-msgstr "عرض الحساب"
+<<<<<<< TREE
+msgstr "عرض الحساب"
+=======
+msgstr "عرض الحساب"
+
+#. module: account
+#: report:account.tax.code.entries:0
+msgid "("
+msgstr "("
+
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Modify"
+msgstr "تعديل"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.account.type:0
msgid "Closing Method"
-msgstr "إسلوب الإغلاق"
+<<<<<<< TREE
+msgstr "إسلوب الإغلاق"
+=======
+msgstr "إسلوب الإغلاق"
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_partner_balance
+msgid ""
+"This report is analysis by partner. It is a PDF report containing one line "
+"per partner representing the cumulative credit balance."
+msgstr ""
+"قد تم تحليل هذا التقرير بواسطة الشريك. وهي تقرير تنسيق وثيقة محمولة تشتمل "
+"على خط واحد لكل شريك يمثل توازن الدين التراكمي."
+>>>>>>> MERGE-SOURCE
#. module: account
#: selection:account.account,type:0
@@ -9110,12 +11873,16 @@
#: view:account.model:0
#: field:account.model,legend:0
msgid "Legend"
+<<<<<<< TREE
msgstr "الدليل"
#. module: account
#: view:account.analytic.account:0
msgid "Contract Data"
msgstr ""
+=======
+msgstr "الدليل"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:ir.actions.act_window,help:account.action_account_moves_sale
@@ -9126,12 +11893,35 @@
"the income account. OpenERP will propose to you automatically the Tax "
"related to this account and the counter-part \"Account receivable\"."
msgstr ""
-
-#. module: account
+"ويستخدم هذا العرض من قبل المحاسبين من أجل تسجيل المدخلات على نطاق واسع في "
+"OpenERP. إذا كنت تريد أن تسجل فاتورة العملاء، واختيار يومية وفترة في شريط "
+"أدوات البحث. ثم، تبدأ من خلال تسجيل دخول خط لحساب الإيرادات. سيقترح OpenERP "
+" عليكم تلقائيا الضريبة المتعلقة بهذا الحساب وحساب جزء \"المستحق من "
+"الحسابات\"."
+
+#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account_bank_statement.py:391
+#, python-format
+msgid "Cannot delete bank statement(s) which are already confirmed !"
+msgstr "لا يمكن حذف هذا كشف / كشوف حساب البنك التي تم تأكيدها"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: code:addons/account/wizard/account_automatic_reconcile.py:152
#, python-format
msgid "You must select accounts to reconcile"
-msgstr "يجب إختيار الحسابات للتسوية"
+<<<<<<< TREE
+msgstr "يجب إختيار الحسابات للتسوية"
+=======
+msgstr "يجب إختيار الحسابات للتسوية"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_receivable_graph
+msgid "Balance by Type of Account"
+msgstr "الرصيد حسب نوع الحساب"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:process.transition,note:account.process_transition_entriesreconcile0
@@ -9148,8 +11938,17 @@
"closed or left open depending on your company's activities over a specific "
"period."
msgstr ""
-
-#. module: account
+<<<<<<< TREE
+
+#. module: account
+=======
+"يمكنك هنا تحديد فترة مالية، فترة من الزمن في السنة المالية للشركة. الفترة "
+"المحاسبية عادة هي الشهر أو ربع. وهو يقابل عادة إلى فترات من الاقرار الضريبي. "
+"إنشاء وإدارة فترات من هنا ويقرر ما إذا كان يجب إغلاق الفترة أو ترك الباب "
+"مفتوحا تبعا لأنشطة الشركة خلال فترة محددة."
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
msgid "Filters By"
@@ -9175,12 +11974,16 @@
#: code:addons/account/account_move_line.py:1153
#, python-format
msgid "You can not change the tax, you should remove and recreate lines !"
+<<<<<<< TREE
msgstr "لا يمكنك تغيير الضريبة, يجب عليك ازالة واعادة انشاء الخطوط !"
#. module: account
#: view:analytic.entries.report:0
msgid "Analytic Entries of last 365 days"
msgstr ""
+=======
+msgstr "لا يمكنك تغيير الضريبة, يجب عليك ازالة واعادة انشاء الخطوط !"
+>>>>>>> MERGE-SOURCE
#. module: account
#: report:account.central.journal:0
@@ -9233,12 +12036,16 @@
msgid ""
"The journal must have centralised counterpart without the Skipping draft "
"state option checked!"
+<<<<<<< TREE
msgstr "يجب ان يكون لليومية نظير مركزي بدون تخطي خيار الحالة للسحب المتحقق!"
#. module: account
#: view:account.invoice.report:0
msgid "Customer And Supplier Invoices"
msgstr ""
+=======
+msgstr "يجب ان يكون لليومية نظير مركزي بدون تخطي خيار الحالة للسحب المتحقق!"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:process.node,note:account.process_node_paymententries0
@@ -9269,6 +12076,7 @@
#. module: account
#: model:ir.model,name:account.model_account_analytic_balance
msgid "Account Analytic Balance"
+<<<<<<< TREE
msgstr "رصيد الحساب التحليلي"
#. module: account
@@ -9278,6 +12086,9 @@
"No opening/closing period defined, please create one to set the initial "
"balance!"
msgstr ""
+=======
+msgstr "رصيد الحساب التحليلي"
+>>>>>>> MERGE-SOURCE
#. module: account
#: report:account.account.balance:0
@@ -9305,7 +12116,30 @@
#: field:accounting.report,period_to:0
#: field:accounting.report,period_to_cmp:0
msgid "End Period"
-msgstr "نهاية الفترة"
+<<<<<<< TREE
+msgstr "نهاية الفترة"
+=======
+msgstr "نهاية الفترة"
+
+#. module: account
+#: field:account.aged.trial.balance,chart_account_id:0
+#: field:account.balance.report,chart_account_id:0
+#: field:account.bs.report,chart_account_id:0
+#: field:account.central.journal,chart_account_id:0
+#: field:account.common.account.report,chart_account_id:0
+#: field:account.common.journal.report,chart_account_id:0
+#: field:account.common.partner.report,chart_account_id:0
+#: field:account.common.report,chart_account_id:0
+#: field:account.general.journal,chart_account_id:0
+#: field:account.partner.balance,chart_account_id:0
+#: field:account.partner.ledger,chart_account_id:0
+#: field:account.pl.report,chart_account_id:0
+#: field:account.print.journal,chart_account_id:0
+#: field:account.report.general.ledger,chart_account_id:0
+#: field:account.vat.declaration,chart_account_id:0
+msgid "Chart of account"
+msgstr "شجرة الحساب"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.move.line,date_maturity:0
@@ -9315,6 +12149,7 @@
#. module: account
#: view:account.move.journal:0
msgid "Standard entries"
+<<<<<<< TREE
msgstr "القيود المعيارية"
#. module: account
@@ -9326,6 +12161,9 @@
"journals. Select 'Opening/Closing Situation' for entries generated for new "
"fiscal years."
msgstr ""
+=======
+msgstr "القيود المعيارية"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:ir.model,name:account.model_account_subscription
@@ -9333,9 +12171,20 @@
msgstr "إشتراك الحساب"
#. module: account
+<<<<<<< TREE
#: report:account.overdue:0
msgid "Maturity date"
msgstr "تاريخ الإستحقاق"
+=======
+#: code:addons/account/account_invoice.py:736
+#, python-format
+msgid ""
+"Tax base different !\n"
+"Click on compute to update tax base"
+msgstr ""
+"أساس الضريبة مختلف !\n"
+"اضغط على احسب لتحديث الاساس الضريبي"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.subscription:0
@@ -9370,6 +12219,7 @@
#: field:accounting.report,date_from:0
#: field:accounting.report,date_from_cmp:0
msgid "Start Date"
+<<<<<<< TREE
msgstr "تاريخ البدء"
#. module: account
@@ -9378,6 +12228,9 @@
"It indicates that the invoice has been paid and the journal entry of the "
"invoice has been reconciled with one or several journal entries of payment."
msgstr ""
+=======
+msgstr "تاريخ البدء"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.invoice:0
@@ -9415,6 +12268,12 @@
"open period. Close a period when you do not want to record new entries and "
"want to lock this period for tax related calculation."
msgstr ""
+"والفترة هي الفترة المالية من الوقت خلال السنة المالية التي يجب أن تسجل "
+"القيود المحاسبية للمحاسبة الأنشطة ذات الصلة. الفترة الشهرية هي القاعدة ولكن "
+"اعتمادا على بلدانكم أو احتياجات الشركة، يجب أيضا ان يكون هناك فترات ربع "
+"سنوية. إغلاق فترة سيجعل من المستحيل تسجيل القيود المحاسبية الجديدة ينبغي، "
+"كل القيود الجديدة تتم في الفترة التالية المفتوحة. إغلاق الفترة عندما لا تريد "
+"تسجيل قيود جديدة ونريد ان قفل هذه الفترة لحساب الضريبية ذات الصلة."
#. module: account
#: view:account.analytic.account:0
@@ -9425,7 +12284,16 @@
#: model:process.transition,name:account.process_transition_analyticinvoice0
#: model:process.transition,name:account.process_transition_supplieranalyticcost0
msgid "From analytic accounts"
-msgstr "من الحسابات التحليلية"
+<<<<<<< TREE
+msgstr "من الحسابات التحليلية"
+=======
+msgstr "من الحسابات التحليلية"
+
+#. module: account
+#: field:account.installer.modules,account_payment:0
+msgid "Suppliers Payment Management"
+msgstr "إدارة مدفوعات الموردين"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.period,name:0
@@ -9445,6 +12313,7 @@
#: field:account.payment.term,active:0
#: field:account.tax,active:0
msgid "Active"
+<<<<<<< TREE
msgstr "نشِط"
#. module: account
@@ -9454,9 +12323,31 @@
#. module: account
#: code:addons/account/account_invoice.py:372
+=======
+msgstr "نشِط"
+
+#. module: account
+#: code:addons/account/account_invoice.py:372
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Unknown Error"
-msgstr "خطأ غير معروف"
+<<<<<<< TREE
+msgstr "خطأ غير معروف"
+=======
+msgstr "خطأ غير معروف"
+
+#. module: account
+#: code:addons/account/account.py:1167
+#, python-format
+msgid ""
+"You cannot validate a non-balanced entry !\n"
+"Make sure you have configured Payment Term properly !\n"
+"It should contain atleast one Payment Term Line with type \"Balance\" !"
+msgstr ""
+"لا يمكنك التحقق من صحة الدخول الغير متوازن!\n"
+"تأكد بأنك قمت بتكوين الدفع الآجل بشكل صحيح!\n"
+"يجب أن تحتوي على الاقل الدفع الآجل خط واحد مع علامة \"توازن\"!"
+>>>>>>> MERGE-SOURCE
#. module: account
#: help:res.partner,property_account_payable:0
@@ -9514,6 +12405,7 @@
"created. If you leave that field empty, it will use the same journal as the "
"current invoice."
msgstr ""
+<<<<<<< TREE
"يمكنك هنا اختيار اليومية لتستخدمها في تسديد الفاتورة التي ستُنشأ. اذا تركت "
"هذا الحقل فارغاً, سيستخدم اليومية نفسها كفاتورة حالية."
@@ -9523,14 +12415,25 @@
#, python-format
msgid "Profit & Loss (Income account)"
msgstr ""
+=======
+"يمكنك هنا اختيار اليومية لتستخدمها في تسديد الفاتورة التي ستُنشأ. اذا تركت "
+"هذا الحقل فارغاً, سيستخدم اليومية نفسها كفاتورة حالية."
+>>>>>>> MERGE-SOURCE
#. module: account
+<<<<<<< TREE
#: constraint:account.account:0
msgid ""
"Configuration Error! \n"
"You can not select an account type with a deferral method different of "
"\"Unreconciled\" for accounts with internal type \"Payable/Receivable\"! "
msgstr ""
+=======
+#: view:account.general.journal:0
+#: model:ir.ui.menu,name:account.menu_account_general_journal
+msgid "General Journals"
+msgstr "اليوميات العامة"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.model:0
@@ -9545,6 +12448,9 @@
"payment term!\n"
"Please define partner on it!"
msgstr ""
+"وأنشأ تاريخ الاستحقاق من خط الدخول المُنتجة بواسطة خط نموذج ‘%s‘ بناءًا على "
+"مدى الدفع للشريك!\n"
+"يرجى تحديد الشريك على ذلك!"
#. module: account
#: field:account.cashbox.line,number:0
@@ -9559,12 +12465,16 @@
#: selection:account.bank.statement.line,type:0
#: selection:account.journal,type:0
msgid "General"
+<<<<<<< TREE
msgstr "عام"
#. module: account
#: view:analytic.entries.report:0
msgid "Analytic Entries of last 30 days"
msgstr ""
+=======
+msgstr "عام"
+>>>>>>> MERGE-SOURCE
#. module: account
#: selection:account.aged.trial.balance,filter:0
@@ -9603,11 +12513,17 @@
msgstr "معدل العملة"
#. module: account
+<<<<<<< TREE
#: view:account.account:0
#: field:account.account,tax_ids:0
#: field:account.account.template,tax_ids:0
msgid "Default Taxes"
msgstr "ضرائب إفتراضية"
+=======
+#: help:account.payment.term.line,value_amount:0
+msgid "For Value percent enter % ratio between 0-1."
+msgstr "لتحديد النسبةاختر قيمة بين 0 إلي 1."
+>>>>>>> MERGE-SOURCE
#. module: account
#: selection:account.entries.report,month:0
@@ -9616,12 +12532,16 @@
#: selection:report.account.sales,month:0
#: selection:report.account_type.sales,month:0
msgid "April"
+<<<<<<< TREE
msgstr "أبريل/ نيسان"
#. module: account
#: model:account.financial.report,name:account.account_financial_report_profitloss_toreport0
msgid "Profit (Loss) to report"
msgstr ""
+=======
+msgstr "أبريل/ نيسان"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.move.line.reconcile.select:0
@@ -9639,6 +12559,7 @@
"Refund invoice base on this type. You can not Modify and Cancel if the "
"invoice is already reconciled"
msgstr ""
+<<<<<<< TREE
"سدد الفاتورة استناداً الى هذا النوع. لا يمكنك التعديل او الالغاء اذا تم "
"تسوية الفاتورة بالفعل"
@@ -9646,6 +12567,22 @@
#: selection:account.financial.report,style_overwrite:0
msgid "Title 2 (bold)"
msgstr ""
+=======
+"سدد الفاتورة استناداً الى هذا النوع. لا يمكنك التعديل او الالغاء اذا تم "
+"تسوية الفاتورة بالفعل"
+
+#. module: account
+#: help:account.installer.modules,account_analytic_plans:0
+msgid ""
+"Allows invoice lines to impact multiple analytic accounts simultaneously."
+msgstr ""
+"وتسمح خطوط الفاتورة لتؤثر على الحسابات التحليلية المتعددة في وقت واحد."
+
+#. module: account
+#: field:account.installer,sale_tax:0
+msgid "Sale Tax(%)"
+msgstr "ضريبة المبيعات (%)"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:ir.actions.act_window,name:account.action_invoice_tree2
@@ -9676,13 +12613,21 @@
"and is the process of transferring debit and credit amounts from a journal "
"of original entry to a ledger book."
msgstr ""
+"ويسمى أيضا التحقق من صحة عملية إدخالات دفتر اليومية \"دفتر نشر\" و هي عملية "
+"تحويل مبالغ الخصم والائتمان من اليومية من الدخول الأصلي لكتاب الأستاذ."
#. module: account
+<<<<<<< TREE
#: help:account.bank.statement,state:0
msgid ""
"When new statement is created the state will be 'Draft'.\n"
"And after getting confirmation from the bank it will be in 'Confirmed' state."
msgstr ""
+=======
+#: report:account.tax.code.entries:0
+msgid ")"
+msgstr ")"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:ir.model,name:account.model_account_period
@@ -9793,11 +12738,24 @@
#: field:account.fiscal.position.tax,tax_src_id:0
#: field:account.fiscal.position.tax.template,tax_src_id:0
msgid "Tax Source"
-msgstr "مصدر الضريبة"
+<<<<<<< TREE
+msgstr "مصدر الضريبة"
+=======
+msgstr "مصدر الضريبة"
+
+#. module: account
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
+msgid "Net Profit"
+msgstr "صافي الربح"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:ir.sequence:0
msgid "Fiscal Year Sequences"
+<<<<<<< TREE
msgstr "مسلسل السنوات المالية"
#. module: account
@@ -9807,8 +12765,20 @@
#. module: account
#: code:addons/account/account_analytic_line.py:102
+=======
+msgstr "مسلسل السنوات المالية"
+
+#. module: account
+#: help:account.model,name:0
+msgid "This is a model for recurring accounting entries"
+msgstr "هذا نموذج لقيود حسابات تكرارية"
+
+#. module: account
+#: code:addons/account/account_analytic_line.py:102
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "There is no income account defined for this product: \"%s\" (id:%d)"
+<<<<<<< TREE
msgstr "لا يوجد حساب دخل معرّف لهذا المنتج: \"%s\" (id:%d)"
#. module: account
@@ -9822,6 +12792,21 @@
#: model:ir.ui.menu,name:account.menu_unrealized_gains_losses
msgid "Unrealized Gain or Loss"
msgstr ""
+=======
+msgstr "لا يوجد حساب دخل معرّف لهذا المنتج: \"%s\" (id:%d)"
+
+#. module: account
+#: report:account.general.ledger:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+msgid "JNRL"
+msgstr "اليومية"
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid " value amount: 0.02"
+msgstr " قيمة المبلغ: 0.02"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.fiscalyear:0
@@ -9829,6 +12814,7 @@
#: view:account.move.line:0
#: view:account.period:0
msgid "States"
+<<<<<<< TREE
msgstr "حالات"
#. module: account
@@ -9840,6 +12826,9 @@
#: field:account.invoice,check_total:0
msgid "Verification Total"
msgstr ""
+=======
+msgstr "حالات"
+>>>>>>> MERGE-SOURCE
#. module: account
#: report:account.analytic.account.balance:0
@@ -9927,6 +12916,8 @@
"reconciliation process today. The current partner is counted as already "
"processed."
msgstr ""
+"يصور هذا الرقم العدد الإجمالي للشركاء التي ذهبت خلال عملية المصالحة اليوم. "
+"يتم حساب الشريك الحالي كما هو مجهز مسبقا."
#. module: account
#: view:account.fiscalyear:0
@@ -9952,6 +12943,7 @@
#: model:process.transition,note:account.process_transition_statemententries0
msgid ""
"Manual or automatic creation of payment entries according to the statements"
+<<<<<<< TREE
msgstr "انشاء يدوي او تلقائي لمدخلات الدفع طبقاً للبيانات"
#. module: account
@@ -9963,6 +12955,9 @@
#: constraint:account.bank.statement:0
msgid "The journal and period chosen have to belong to the same company."
msgstr ""
+=======
+msgstr "انشاء يدوي او تلقائي لمدخلات الدفع طبقاً للبيانات"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.invoice:0
@@ -9975,9 +12970,22 @@
msgstr "نهاية الفترة"
#. module: account
+<<<<<<< TREE
#: sql_constraint:account.journal:0
msgid "The code of the journal must be unique per company !"
msgstr "يجب ان يكون الكود لليومية فريد لكل شركة !"
+=======
+#: code:addons/account/account_move_line.py:759
+#: code:addons/account/account_move_line.py:842
+#: code:addons/account/wizard/account_invoice_state.py:44
+#: code:addons/account/wizard/account_invoice_state.py:68
+#: code:addons/account/wizard/account_state_open.py:37
+#: code:addons/account/wizard/account_validate_account_move.py:39
+#: code:addons/account/wizard/account_validate_account_move.py:61
+#, python-format
+msgid "Warning"
+msgstr "تحذير"
+>>>>>>> MERGE-SOURCE
#. module: account
#: help:product.category,property_account_expense_categ:0
@@ -9986,6 +12994,7 @@
"This account will be used to value outgoing stock for the current product "
"category using cost price"
msgstr ""
+<<<<<<< TREE
#. module: account
#: view:wizard.multi.charts.accounts:0
@@ -10008,6 +13017,21 @@
#: view:account.move.line.reconcile.writeoff:0
msgid "Write-Off Move"
msgstr "حركة الإعدام"
+=======
+"وسيتم استخدام هذا الحساب لقيمة الأسهم الصادرة لفئة من فئات المنتجات الحالية "
+"باستخدام سعر التكلفة"
+
+#. module: account
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
+#: selection:account.bank.statement,state:0
+#: selection:account.entries.report,type:0
+#: view:account.fiscalyear:0
+#: selection:account.fiscalyear,state:0
+#: selection:account.period,state:0
+msgid "Closed"
+msgstr "مغلق"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:process.node,note:account.process_node_paidinvoice0
@@ -10056,12 +13080,16 @@
#: report:account.vat.declaration:0
#: field:report.account.receivable,debit:0
msgid "Debit"
+<<<<<<< TREE
msgstr "مدين"
#. module: account
#: selection:account.financial.report,style_overwrite:0
msgid "Title 3 (bold, smaller)"
msgstr ""
+=======
+msgstr "مدين"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.invoice,invoice_line:0
@@ -10071,16 +13099,21 @@
#. module: account
#: constraint:account.account.template:0
msgid "Error ! You can not create recursive account templates."
+<<<<<<< TREE
msgstr "خطأ ! لا يمكنك انشاء قوالب الحاسب العودية."
#. module: account
#: selection:account.print.journal,sort_selection:0
msgid "Journal Entry Number"
msgstr ""
+=======
+msgstr "خطأ ! لا يمكنك انشاء قوالب الحاسب العودية."
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.subscription:0
msgid "Recurring"
+<<<<<<< TREE
msgstr "متكرّر"
#. module: account
@@ -10090,6 +13123,9 @@
"You cannot change the type of account from 'Closed' to any other type which "
"contains journal items!"
msgstr ""
+=======
+msgstr "متكرّر"
+>>>>>>> MERGE-SOURCE
#. module: account
#: code:addons/account/account_move_line.py:832
@@ -10110,12 +13146,16 @@
#. module: account
#: field:temp.range,name:0
msgid "Range"
+<<<<<<< TREE
msgstr "مدى"
#. module: account
#: view:account.analytic.line:0
msgid "Analytic Journal Items related to a purchase journal."
msgstr ""
+=======
+msgstr "مدى"
+>>>>>>> MERGE-SOURCE
#. module: account
#: help:account.account,type:0
@@ -10126,6 +13166,9 @@
"payable/receivable are for partners accounts (for debit/credit "
"computations), closed for depreciated accounts."
msgstr ""
+"لا يمكن إنشاء تسلسل تلقائي لهذه الجزئية!\n"
+"\n"
+"ضع تسلسل في تعريف اليومية للترقيم التلقائي أو خلق سلسلة يدويا لهذه الجزئية."
#. module: account
#: selection:account.balance.report,display_account:0
@@ -10162,12 +13205,16 @@
#: model:ir.actions.act_window,name:account.action_account_analytic_journal_tree
#: model:ir.ui.menu,name:account.account_analytic_journal_print
msgid "Print Analytic Journals"
+<<<<<<< TREE
msgstr "طباعة اليوميات التحليلية"
#. module: account
#: view:account.invoice.report:0
msgid "Group by month of Invoice Date"
msgstr ""
+=======
+msgstr "طباعة اليوميات التحليلية"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.analytic.line:0
@@ -10223,6 +13270,7 @@
"may keep several types of specialized journals such as a cash journal, "
"purchase journal, sales journal..."
msgstr ""
+<<<<<<< TREE
"إنشاء و إدارة يوميات الشركة من هذه القائمة. قيد اليومية يستخدم لتسجيل "
"المعاملات اليومية لجميع البيانات المحاسبية ذات الصلة للأعمال اليومية للشركة "
"باستخدام نظام القيد المزدوج. إعتمادا على طبيعة أنشطتها وعدد المعاملات "
@@ -10233,6 +13281,13 @@
#: view:account.payment.term:0
msgid "Description On Invoices"
msgstr ""
+=======
+"إنشاء و إدارة يوميات الشركة من هذه القائمة. قيد اليومية يستخدم لتسجيل "
+"المعاملات اليومية لجميع البيانات المحاسبية ذات الصلة للأعمال اليومية للشركة "
+"باستخدام نظام القيد المزدوج. إعتمادا على طبيعة أنشطتها وعدد المعاملات "
+"اليومية، يمكن للشركة الحفاظ على أنواع عدة من دفاتر اليومية المتخصصة مثل "
+"يومية النقدية ، و يومية المشتريات، و يومية المبيعات..."
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:ir.model,name:account.model_account_analytic_chart
@@ -10247,6 +13302,7 @@
#. module: account
#: model:ir.ui.menu,name:account.menu_finance_statistic_report_statement
msgid "Statistic Reports"
+<<<<<<< TREE
msgstr "تقارير إحصائية"
#. module: account
@@ -10260,8 +13316,12 @@
#: field:account.print.journal,sort_selection:0
msgid "Entries Sorted by"
msgstr ""
+=======
+msgstr "تقارير إحصائية"
+>>>>>>> MERGE-SOURCE
#. module: account
+<<<<<<< TREE
#: help:account.move,state:0
msgid ""
"All manually created new journal entries are usually in the state "
@@ -10270,6 +13330,13 @@
"created by the system on document validation (invoices, bank statements...) "
"and will be created in 'Posted' state."
msgstr ""
+=======
+#: field:account.installer,progress:0
+#: field:account.installer.modules,progress:0
+#: field:wizard.multi.charts.accounts,progress:0
+msgid "Configuration Progress"
+msgstr "سير الإعدادات"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.fiscal.position.template:0
@@ -10292,14 +13359,29 @@
msgstr "نوفمبر/تشرين الثاني"
#. module: account
+<<<<<<< TREE
#: selection:account.invoice.refund,filter_refund:0
msgid "Modify: refund invoice, reconcile and create a new draft invoice"
msgstr ""
+=======
+#: model:ir.model,name:account.model_account_installer_modules
+msgid "account.installer.modules"
+msgstr "account.installer.modules"
+>>>>>>> MERGE-SOURCE
#. module: account
#: help:account.invoice.line,account_id:0
msgid "The income or expense account related to the selected product."
-msgstr "الدخل أو المصروف المرتبط للمنتج المختار."
+<<<<<<< TREE
+msgstr "الدخل أو المصروف المرتبط للمنتج المختار."
+=======
+msgstr "الدخل أو المصروف المرتبط للمنتج المختار."
+
+#. module: account
+#: constraint:account.move.line:0
+msgid "The date of your Journal Entry is not in the defined period!"
+msgstr "تاريخ قيد اليومية غير موجود بالفترة المعرفة!"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.subscription,period_total:0
@@ -10324,6 +13406,7 @@
#: view:account.invoice.report:0
#: model:ir.actions.act_window,name:account.action_account_invoice_refund
msgid "Refund"
+<<<<<<< TREE
msgstr "رد"
#. module: account
@@ -10399,6 +13482,9 @@
"% endif\n"
" "
msgstr ""
+=======
+msgstr "رد"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:ir.model,name:account.model_res_partner_bank
@@ -10510,6 +13596,7 @@
#: selection:report.account.sales,month:0
#: selection:report.account_type.sales,month:0
msgid "February"
+<<<<<<< TREE
msgstr "فبراير"
#. module: account
@@ -10521,6 +13608,9 @@
msgstr ""
"اذا اعطيت اسم لاخر بعد / , فهي تنشأ تحرك مدخلات محاسبية ستكون مع نفس الاسم "
"كإسم البيان. وهي تسمح لمدخلات البيان ان يكون لها نفس المراجع عن البيان نفسه."
+=======
+msgstr "فبراير"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.bank.accounts.wizard,bank_account_id:0
@@ -10565,15 +13655,22 @@
msgstr "دائماً 1 أو -1"
#. module: account
+<<<<<<< TREE
#: model:ir.actions.act_window,name:account.action_account_analytic_account_tree2
#: model:ir.actions.act_window,name:account.action_account_analytic_chart
#: model:ir.ui.menu,name:account.menu_action_analytic_account_tree2
msgid "Chart of Analytic Accounts"
msgstr "شجرة الحسابات التحليلية"
+=======
+#: model:ir.model,name:account.model_account_fiscal_position_account_template
+msgid "Template Account Fiscal Mapping"
+msgstr "حساب تعيين المالية"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.chart.template,property_account_expense:0
msgid "Expense Account on Product Template"
+<<<<<<< TREE
msgstr "حساب المصروفات من قالب المنتجات"
#. module: account
@@ -10585,9 +13682,30 @@
#. module: account
#: code:addons/account/wizard/account_report_aged_partner_balance.py:56
+=======
+msgstr "حساب المصروفات من قالب المنتجات"
+
+#. module: account
+#: field:account.analytic.line,amount_currency:0
+msgid "Amount currency"
+msgstr "مبلغ العملة"
+
+#. module: account
+#: code:addons/account/wizard/account_report_aged_partner_balance.py:56
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "You must enter a period length that cannot be 0 or below !"
-msgstr "لابد من إدخال الفترة علي ألا تكون صفر أو أقل"
+<<<<<<< TREE
+msgstr "لابد من إدخال الفترة علي ألا تكون صفر أو أقل"
+=======
+msgstr "لابد من إدخال الفترة علي ألا تكون صفر أو أقل"
+
+#. module: account
+#: code:addons/account/account.py:501
+#, python-format
+msgid "You cannot remove an account which has account entries!. "
+msgstr "لا يمكنك حذف حساب مستدخدم في قيود يومية!. "
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:ir.actions.act_window,help:account.action_account_form
@@ -10612,6 +13730,7 @@
"The residual amount on a receivable or payable of a journal entry expressed "
"in its currency (maybe different of the company currency)."
msgstr ""
+<<<<<<< TREE
"المبلغ المتبقي على الدائن أو المدين لقيد اليومية معبر عنها بعملتها (ربما "
"تكون مختلفة لعملة الشركة)."
@@ -11367,3 +14486,51 @@
#, python-format
#~ msgid "Cannot locate parent code for template account!"
#~ msgstr "لا يمكن وضع كود الاصل لحاسب القالب!"
+=======
+"المبلغ المتبقي على الدائن أو المدين لقيد اليومية معبر عنها بعملتها (ربما "
+"تكون مختلفة لعملة الشركة)."
+
+#. module: account
+#: model:account.financial.report,name:account.account_financial_report_assets0
+msgid "Assets"
+msgstr "أصول"
+
+#. module: account
+#: model:account.account.template,name:0
+msgid "Liabilities"
+msgstr "خصوم"
+
+#. module: account
+#: report:account.balancesheet.horizontal:0
+#: report:account.balancesheet:0
+#: report:pl.account.horizontal:0
+#: report:pl.account:0
+msgid "Balance:"
+msgstr "الرصيد:"
+
+#. module: account
+#: report:pl.account.horizontal:0
+#: report:pl.account:0
+msgid "Particular"
+msgstr "خاص"
+
+#. module: account
+#: report:account.aged_trial_balance:0
+msgid "Aged Trial Balance"
+msgstr "ميزان المراجعة القديم"
+
+#. module: account
+#: report:account.aged_trial_balance:0
+msgid "Period Length(days)"
+msgstr "مدة الفترة (بالأيام)"
+
+#. module: account
+#: report:account.aged_trial_balance:0
+msgid "Account Total"
+msgstr "حساب إجمالي"
+
+#. module: account
+#: report:account.aged_trial_balance:0
+msgid "Not due"
+msgstr "غير مستحق"
+>>>>>>> MERGE-SOURCE
=== modified file 'account/i18n/bg.po'
--- account/i18n/bg.po 2012-02-29 09:45:02 +0000
+++ account/i18n/bg.po 2012-03-25 07:09:26 +0000
@@ -6,13 +6,20 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
+<<<<<<< TREE
"POT-Creation-Date: 2012-02-08 00:35+0000\n"
"PO-Revision-Date: 2011-03-02 06:18+0000\n"
"Last-Translator: Dimitar Markov <dimitar.markov@xxxxxxxxx>\n"
+=======
+"POT-Creation-Date: 2011-05-09 10:18+0000\n"
+"PO-Revision-Date: 2012-01-15 12:35+0000\n"
+"Last-Translator: Luk <Unknown>\n"
+>>>>>>> MERGE-SOURCE
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2012-02-09 06:17+0000\n"
"X-Generator: Launchpad (build 14763)\n"
@@ -21,6 +28,10 @@
#: view:analytic.entries.report:0
msgid "last month"
msgstr ""
+=======
+"X-Launchpad-Export-Date: 2012-02-22 05:11+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -33,7 +44,12 @@
msgstr "Други настройки"
#. module: account
+<<<<<<< TREE
#: help:account.tax.code,sequence:0
+=======
+#: code:addons/account/account.py:506
+#, python-format
+>>>>>>> MERGE-SOURCE
msgid ""
"Determine the display order in the report 'Accounting \\ Reporting \\ "
"Generic Reporting \\ Taxes \\ Taxes Report'"
@@ -53,16 +69,28 @@
msgstr "Статистики за сметка"
#. module: account
+<<<<<<< TREE
#: view:account.invoice:0
msgid "Proforma/Open/Paid Invoices"
msgstr ""
#. module: account
+=======
+>>>>>>> MERGE-SOURCE
#: field:report.invoice.created,residual:0
msgid "Residual"
msgstr "Остатък"
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account_invoice.py:805
+#, python-format
+msgid "Please define sequence on invoice journal"
+msgstr "Моля зядайте последователност за дневник фактури"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: constraint:account.period:0
msgid "Error ! The duration of the Period(s) is/are invalid. "
msgstr "Грешка ! Продължителността на периода(те) е(са) невалиден(и). "
@@ -752,12 +780,16 @@
msgstr "Аналитични записи по редове"
#. module: account
+<<<<<<< TREE
#: field:account.invoice.refund,filter_refund:0
msgid "Refund Method"
msgstr ""
#. module: account
#: code:addons/account/wizard/account_change_currency.py:38
+=======
+#: code:addons/account/wizard/account_change_currency.py:38
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "You can only change currency for Draft Invoice !"
msgstr "Можете да сменяте валутите само на фактури в проект"
@@ -814,12 +846,16 @@
msgstr "Връщане приравняване"
#. module: account
+<<<<<<< TREE
#: view:account.payment.term.line:0
msgid "At 14 net days 2 percent, remaining amount at 30 days end of month."
msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_analytic_journal_report
+=======
+#: model:ir.model,name:account.model_account_analytic_journal_report
+>>>>>>> MERGE-SOURCE
msgid "Account Analytic Journal"
msgstr "Аналитичен дневник на сметка"
@@ -955,6 +991,7 @@
msgstr "Консолидация"
#. module: account
+<<<<<<< TREE
#: model:account.account.type,name:account.data_account_type_liability
#: model:account.financial.report,name:account.account_financial_report_liability0
#: model:account.financial.report,name:account.account_financial_report_liabilitysum0
@@ -962,6 +999,8 @@
msgstr ""
#. module: account
+=======
+>>>>>>> MERGE-SOURCE
#: view:account.entries.report:0
msgid "Extended Filters..."
msgstr "Разширени филтри"
@@ -1136,12 +1175,16 @@
msgstr "Генериране на записи преди:"
#. module: account
+<<<<<<< TREE
#: view:account.move.line:0
msgid "Unbalanced Journal Items"
msgstr ""
#. module: account
#: model:account.account.type,name:account.data_account_type_bank
+=======
+#: model:account.account.type,name:account.data_account_type_bank
+>>>>>>> MERGE-SOURCE
#: selection:account.bank.accounts.wizard,account_type:0
#: code:addons/account/account.py:3003
#, python-format
@@ -1514,6 +1557,7 @@
msgstr "Обезщетения на доставчик"
#. module: account
+<<<<<<< TREE
#: selection:account.account,type:0
#: selection:account.account.template,type:0
#: selection:account.bank.statement,state:0
@@ -1523,6 +1567,35 @@
#: selection:account.period,state:0
msgid "Closed"
msgstr "Приключен"
+=======
+#: view:account.payment.term.line:0
+msgid ""
+"Example: at 14 net days 2 percents, remaining amount at 30 days end of month."
+msgstr ""
+
+#. module: account
+#: code:addons/account/invoice.py:815
+#, python-format
+msgid ""
+"Cannot create the invoice !\n"
+"The payment term defined gives a computed amount greater than the total "
+"invoiced amount."
+msgstr ""
+"Не може да се създаде фактурата!\n"
+"Определените условия на плащане връщат по-голямо изчислено количество от "
+"общото фактурираната сума."
+
+#. module: account
+#: field:account.installer.modules,account_anglo_saxon:0
+msgid "Anglo-Saxon Accounting"
+msgstr "Англо-Саксонско счетоводство"
+
+#. module: account
+#: view:account.automatic.reconcile:0
+#: view:account.move.line.reconcile.writeoff:0
+msgid "Write-Off Move"
+msgstr "Движение на отписване"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:ir.ui.menu,name:account.menu_finance_recurrent_entries
@@ -1694,6 +1767,7 @@
msgstr "Годишна сума"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:1429
#, python-format
msgid ""
@@ -1701,6 +1775,8 @@
msgstr ""
#. module: account
+=======
+>>>>>>> MERGE-SOURCE
#: view:account.change.currency:0
msgid "This wizard will change the currency of the invoice"
msgstr "Този помощник ще промени валутата на фактурата"
@@ -1717,6 +1793,7 @@
"кликане върху сметката."
#. module: account
+<<<<<<< TREE
#: view:account.analytic.account:0
msgid "Pending Accounts"
msgstr ""
@@ -1725,6 +1802,22 @@
#: view:account.tax.template:0
msgid "Tax Declaration"
msgstr "Данъчна декларация"
+=======
+#: constraint:account.fiscalyear:0
+msgid "Error! You cannot define overlapping fiscal years"
+msgstr "Грешка! Не можете да дефинирате застъпващи се финансови години."
+
+#. module: account
+#: code:addons/account/account_move_line.py:835
+#, python-format
+msgid "The account is not defined to be reconciled !"
+msgstr "Сметката не е посочена за равняване!"
+
+#. module: account
+#: field:account.cashbox.line,pieces:0
+msgid "Values"
+msgstr "Стойности"
+>>>>>>> MERGE-SOURCE
#. module: account
#: help:account.journal.period,active:0
@@ -1960,6 +2053,7 @@
msgstr "Изображение"
#. module: account
+<<<<<<< TREE
#: constraint:account.move.line:0
msgid ""
"The selected account of your Journal Entry forces to provide a secondary "
@@ -1973,6 +2067,8 @@
msgstr ""
#. module: account
+=======
+>>>>>>> MERGE-SOURCE
#: view:account.invoice:0
#: view:report.invoice.created:0
msgid "Untaxed Amount"
@@ -2093,7 +2189,17 @@
msgstr "Про-форма"
#. module: account
-#: code:addons/account/account.py:1461
+<<<<<<< TREE
+#: code:addons/account/account.py:1461
+=======
+#: code:addons/account/installer.py:348
+#, python-format
+msgid " Journal"
+msgstr " Дневник"
+
+#. module: account
+#: code:addons/account/account.py:1461
+>>>>>>> MERGE-SOURCE
#, python-format
msgid ""
"There is no default default debit account defined \n"
@@ -2804,6 +2910,14 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: selection:account.print.journal,sort_selection:0
+msgid "Reference Number"
+msgstr "Референтен номер"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: selection:account.entries.report,month:0
#: selection:account.invoice.report,month:0
#: selection:analytic.entries.report,month:0
@@ -2907,7 +3021,25 @@
msgstr "Фискална позиция"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:735
+=======
+#: help:account.partner.ledger,initial_balance:0
+#: help:account.report.general.ledger,initial_balance:0
+msgid ""
+"It adds initial balance row on report which display previous sum amount of "
+"debit/credit/balance"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+#: model:ir.actions.act_window,name:account.action_account_analytic_line_form
+msgid "Analytic Entries"
+msgstr "Аналитични записи"
+
+#. module: account
+#: code:addons/account/account.py:962
+>>>>>>> MERGE-SOURCE
#, python-format
msgid ""
"Tax base different!\n"
@@ -3288,11 +3420,30 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: model:ir.actions.act_window,name:account.action_account_unreconcile
#: model:ir.actions.act_window,name:account.action_account_unreconcile_reconcile
#: model:ir.actions.act_window,name:account.action_account_unreconcile_select
msgid "Unreconcile Entries"
msgstr "Връщане приравняване на записи"
+=======
+#: view:account.bank.statement:0
+#: view:account.invoice:0
+#: selection:account.invoice,state:0
+#: view:account.invoice.report:0
+#: selection:account.invoice.report,state:0
+#: selection:account.journal.period,state:0
+#: view:account.subscription:0
+#: selection:account.subscription,state:0
+#: selection:report.invoice.created,state:0
+msgid "Draft"
+msgstr "Проект"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_configuration_installer
+msgid "Accounting Chart Configuration"
+msgstr "Настройки на Сметкоплан"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.tax.code,notprintable:0
@@ -3330,11 +3481,14 @@
msgstr "година"
#. module: account
+<<<<<<< TREE
#: view:product.product:0
msgid "Purchase Taxes"
msgstr "Данъци на поръчка"
#. module: account
+=======
+>>>>>>> MERGE-SOURCE
#: view:validate.account.move.lines:0
msgid ""
"All selected journal entries will be validated and posted. It means you "
@@ -3347,6 +3501,16 @@
msgstr "Трансфери"
#. module: account
+<<<<<<< TREE
+=======
+#: selection:account.entries.report,move_line_state:0
+#: view:account.move.line:0
+#: selection:account.move.line,state:0
+msgid "Unbalanced"
+msgstr "Небалансиран"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: view:account.chart:0
msgid "Account charts"
msgstr "Диаграми на сметки"
@@ -3384,6 +3548,7 @@
"състояние \"Отменени\" или \"Готови\"!"
#. module: account
+<<<<<<< TREE
#: view:account.invoice.line:0
msgid "Quantity :"
msgstr ""
@@ -3397,6 +3562,27 @@
#: model:ir.actions.act_window,name:account.action_account_print_sale_purchase_journal
msgid "Print Sale/Purchase Journal"
msgstr ""
+=======
+#: code:addons/account/account.py:522
+#, python-format
+msgid ""
+"You cannot change the type of account from '%s' to '%s' type as it contains "
+"account entries!"
+msgstr ""
+"Не може да бъде променян вида на сметката, от'%s' на '%s', тъй като съдържа "
+"записи!"
+
+#. module: account
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+msgid "Counterpart"
+msgstr "Съконтрагент"
+
+#. module: account
+#: view:account.journal:0
+msgid "Invoicing Data"
+msgstr "Данни за факуриране"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.invoice.report,state:0
@@ -3547,6 +3733,7 @@
msgstr "Връщане приравняване"
#. module: account
+<<<<<<< TREE
#: view:account.analytic.line:0
#: field:account.bank.statement,user_id:0
#: view:account.journal:0
@@ -3555,6 +3742,12 @@
#: field:analytic.entries.report,user_id:0
msgid "User"
msgstr "Потребител"
+=======
+#: code:addons/account/wizard/account_fiscalyear_close.py:84
+#, python-format
+msgid "The journal must have default credit and debit account"
+msgstr "Дневника трябва да има сметки по подрабиране за кредит и дебит"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.chart.template:0
@@ -3697,9 +3890,27 @@
msgstr "#Записи"
#. module: account
+<<<<<<< TREE
#: selection:account.invoice.refund,filter_refund:0
msgid "Create a draft Refund"
msgstr ""
+=======
+#: code:addons/account/account_invoice.py:1429
+#, python-format
+msgid ""
+"You selected an Unit of Measure which is not compatible with the product."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:484
+#, python-format
+msgid ""
+"The Payment Term of Supplier does not have Payment Term Lines(Computation) "
+"defined !"
+msgstr ""
+"Условията за плащане на доставчика нямат зададени редове за условия за "
+"плащане (изчисление) !"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.state.open:0
@@ -3772,6 +3983,7 @@
msgstr "Дневник за аналитични записи"
#. module: account
+<<<<<<< TREE
#: constraint:account.aged.trial.balance:0
#: constraint:account.balance.report:0
#: constraint:account.central.journal:0
@@ -3793,6 +4005,9 @@
#. module: account
#: model:ir.actions.todo.category,name:account.category_accounting_configuration
+=======
+#: model:ir.actions.todo.category,name:account.category_accounting_configuration
+>>>>>>> MERGE-SOURCE
#: model:ir.ui.menu,name:account.menu_finance
#: model:process.node,name:account.process_node_accountingentries0
#: model:process.node,name:account.process_node_supplieraccountingentries0
@@ -3919,6 +4134,14 @@
msgstr "Име на данък"
#. module: account
+<<<<<<< TREE
+=======
+#: model:ir.ui.menu,name:account.menu_finance_configuration
+msgid "Configuration"
+msgstr "Настройка"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: model:account.payment.term,name:account.account_payment_term
#: model:account.payment.term,note:account.account_payment_term
msgid "30 Days End of Month"
@@ -3931,6 +4154,17 @@
msgstr "Аналитичен баланс"
#. module: account
+<<<<<<< TREE
+=======
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
+msgid "Net Loss"
+msgstr "Нетна загуба"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: help:account.account,active:0
msgid ""
"If the active field is set to False, it will allow you to hide the account "
@@ -4053,6 +4287,15 @@
msgstr "Вид сметка"
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account_invoice.py:733
+#, python-format
+msgid "Global taxes defined, but are not in invoice lines !"
+msgstr "Общите данъци са зададени, но не са в редовете на фактурата !"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: field:account.entries.report,month:0
#: view:account.invoice.report:0
#: field:account.invoice.report,month:0
@@ -4121,7 +4364,21 @@
msgstr ""
#. module: account
-#: code:addons/account/account_analytic_line.py:93
+<<<<<<< TREE
+#: code:addons/account/account_analytic_line.py:93
+=======
+#: help:account.move,state:0
+msgid ""
+"All manually created new journal entry are usually in the state 'Unposted', "
+"but you can set the option to skip that state on the related journal. In "
+"that case, they will be behave as journal entries automatically created by "
+"the system on document validation (invoices, bank statements...) and will be "
+"created in 'Posted' state."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_analytic_line.py:93
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
msgstr "Няма зададена сметка разходи за този продукт: \"%s\" (id:%d)"
@@ -4186,7 +4443,11 @@
msgstr "Данъци по подразбиране"
#. module: account
+<<<<<<< TREE
#: code:addons/account/wizard/account_fiscalyear_close.py:41
+=======
+#: code:addons/account/account_invoice.py:88
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "End of Fiscal Year Entry"
msgstr "Запис за край на финансова година"
@@ -4224,11 +4485,14 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: selection:account.financial.report,style_overwrite:0
msgid "Main Title 1 (bold, underlined)"
msgstr ""
#. module: account
+=======
+>>>>>>> MERGE-SOURCE
#: report:account.analytic.account.balance:0
#: report:account.central.journal:0
msgid "Account Name"
@@ -4261,6 +4525,14 @@
msgstr "Равняване на отписване"
#. module: account
+<<<<<<< TREE
+=======
+#: report:account.overdue:0
+msgid "Maturity date"
+msgstr "Дата на падеж"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: view:report.account.receivable:0
msgid "Accounts by type"
msgstr "Сметки по вид"
@@ -4351,6 +4623,15 @@
msgstr "Данъци включени в цената"
#. module: account
+#: constraint:account.account:0
+#: constraint:account.account.template:0
+msgid ""
+"Configuration Error! \n"
+"You cannot define children to an account with internal type different of "
+"\"View\"! "
+msgstr ""
+
+#. module: account
#: model:ir.model,name:account.model_account_analytic_cost_ledger_journal_report
msgid "Account Analytic Cost Ledger For Journal Report"
msgstr ""
@@ -4378,9 +4659,27 @@
msgstr "Промяна"
#. module: account
+<<<<<<< TREE
#: selection:account.journal,type:0
msgid "Bank and Cheques"
msgstr ""
+=======
+#: code:addons/account/account.py:1431
+#: code:addons/account/account.py:1460
+#: code:addons/account/account.py:1467
+#: code:addons/account/account_invoice.py:920
+#: code:addons/account/account_move_line.py:1104
+#: code:addons/account/wizard/account_automatic_reconcile.py:152
+#: code:addons/account/wizard/account_fiscalyear_close.py:73
+#: code:addons/account/wizard/account_fiscalyear_close.py:83
+#: code:addons/account/wizard/account_fiscalyear_close.py:86
+#: code:addons/account/wizard/account_move_journal.py:165
+#: code:addons/account/wizard/account_report_aged_partner_balance.py:56
+#: code:addons/account/wizard/account_report_aged_partner_balance.py:58
+#, python-format
+msgid "UserError"
+msgstr "Потребителска грешка"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.journal,type_control_ids:0
@@ -4418,6 +4717,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:828
#, python-format
msgid ""
@@ -4440,6 +4740,8 @@
msgstr ""
#. module: account
+=======
+>>>>>>> MERGE-SOURCE
#: view:account.subscription.generate:0
#: model:ir.actions.act_window,name:account.action_account_subscription_generate
#: model:ir.ui.menu,name:account.menu_generate_subscription
@@ -4478,7 +4780,17 @@
msgstr "Отменена фактура"
#. module: account
-#: code:addons/account/account.py:1567
+<<<<<<< TREE
+#: code:addons/account/account.py:1567
+=======
+#: code:addons/account/account_invoice.py:71
+#, python-format
+msgid "You must define an analytic journal of type '%s' !"
+msgstr "Трябва да зададете аналитичен дневник от вид '%s' !"
+
+#. module: account
+#: code:addons/account/account.py:1567
+>>>>>>> MERGE-SOURCE
#, python-format
msgid ""
"Couldn't create move with currency different from the secondary currency of "
@@ -4515,9 +4827,21 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: model:ir.ui.menu,name:account.menu_finance_configuration
msgid "Configuration"
msgstr "Настройка"
+=======
+#: report:account.account.balance.landscape:0
+msgid "Account Balance -"
+msgstr "Баланс по сметка -"
+
+#. module: account
+#: code:addons/account/invoice.py:997
+#, python-format
+msgid "Invoice "
+msgstr "Фактура "
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.automatic.reconcile,date1:0
@@ -4564,8 +4888,16 @@
msgstr "Фактури"
#. module: account
+<<<<<<< TREE
#: view:account.invoice:0
msgid "My invoices"
+=======
+#: code:addons/account/account_invoice.py:828
+#, python-format
+msgid ""
+"Please verify the price of the invoice !\n"
+"The real total does not match the computed total."
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -4696,6 +5028,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:1088
#: code:addons/account/account.py:1090
#: code:addons/account/account.py:1321
@@ -4719,6 +5052,25 @@
#, python-format
msgid "Error"
msgstr "Грешка"
+=======
+#: selection:account.account.type,report_type:0
+msgid "Balance Sheet (Assets Accounts)"
+msgstr ""
+
+#. module: account
+#: report:account.tax.code.entries:0
+msgid "Third Party (Country)"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_invoice_tree4
+msgid ""
+"With Supplier Refunds you can manage the credit notes you receive from your "
+"suppliers. A refund is a document that credits an invoice completely or "
+"partially. You can easily generate refunds and reconcile them directly from "
+"the invoice form."
+msgstr ""
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.analytic.balance,date2:0
@@ -4735,11 +5087,18 @@
msgstr "Детайли за банката"
#. module: account
+<<<<<<< TREE
#: model:ir.actions.act_window,help:account.action_account_partner_balance
msgid ""
"This report is analysis by partner. It is a PDF report containing one line "
"per partner representing the cumulative credit balance."
msgstr ""
+=======
+#: code:addons/account/account_invoice.py:739
+#, python-format
+msgid "Taxes missing !"
+msgstr "Липсват данъци !"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:ir.actions.act_window,help:account.action_account_analytic_journal_tree
@@ -5000,6 +5359,20 @@
msgstr "месец"
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account_bank_statement.py:300
+#, python-format
+msgid "Journal Item \"%s\" is not valid"
+msgstr "Артикул на дневник\"%s\" не е валиден"
+
+#. module: account
+#: view:account.payment.term:0
+msgid "Description on invoices"
+msgstr "Описание на фактура"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: field:account.partner.reconcile.process,next_partner_id:0
msgid "Next Partner to Reconcile"
msgstr "Следващ партньр за равняване"
@@ -5115,11 +5488,21 @@
msgstr "Данък върху подчинени"
#. module: account
+<<<<<<< TREE
#: model:ir.model,name:account.model_account_fiscal_position_tax_template
msgid "Template Tax Fiscal Position"
msgstr ""
#. module: account
+=======
+#: code:addons/account/account.py:2067
+#: code:addons/account/wizard/account_use_model.py:69
+#, python-format
+msgid "No period found !"
+msgstr "Не е намерен период !"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: field:account.journal,update_posted:0
msgid "Allow Cancelling Entries"
msgstr "Позволи отказване от записи"
@@ -5349,12 +5732,36 @@
msgstr "Аналитични сметки"
#. module: account
+<<<<<<< TREE
#: view:account.invoice.report:0
msgid "Customer Invoices And Refunds"
msgstr ""
#. module: account
#: field:account.analytic.line,amount_currency:0
+=======
+#: help:account.account.type,report_type:0
+msgid ""
+"According value related accounts will be display on respective reports "
+"(Balance Sheet Profit & Loss Account)"
+msgstr ""
+
+#. module: account
+#: field:account.report.general.ledger,sortby:0
+msgid "Sort By"
+msgstr "Сортиране по"
+
+#. module: account
+#: code:addons/account/account.py:1468
+#, python-format
+msgid ""
+"There is no default default credit account defined \n"
+"on journal \"%s\""
+msgstr ""
+
+#. module: account
+#: field:account.analytic.line,amount_currency:0
+>>>>>>> MERGE-SOURCE
#: field:account.entries.report,amount_currency:0
#: field:account.model.line,amount_currency:0
#: field:account.move.line,amount_currency:0
@@ -5721,6 +6128,7 @@
msgstr "Подреждане по"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:2256
#, python-format
msgid "You have a wrong expression \"%(...)s\" in your model !"
@@ -5734,6 +6142,10 @@
#. module: account
#: code:addons/account/account_move_line.py:1155
#: code:addons/account/account_move_line.py:1238
+=======
+#: code:addons/account/account_move_line.py:1155
+#: code:addons/account/account_move_line.py:1238
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "You can not use an inactive account!"
msgstr "Не може да използвате неактивна сметка!"
@@ -5769,14 +6181,47 @@
msgstr "Главен дневник на сметка"
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/report/common_report_header.py:100
+#: report:account.account.balance:0
+#: report:account.central.journal:0
+#: report:account.partner.balance:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:account.general.journal:0
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
+#: report:account.vat.declaration:0
+#, python-format
+msgid "No Filter"
+msgstr "Без филтър"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: field:account.payment.term.line,days:0
msgid "Number of Days"
msgstr "Брой дни"
#. module: account
-#: code:addons/account/account_bank_statement.py:402
-#: code:addons/account/account_invoice.py:392
-#: code:addons/account/wizard/account_period_close.py:51
+<<<<<<< TREE
+#: code:addons/account/account_bank_statement.py:402
+#: code:addons/account/account_invoice.py:392
+#: code:addons/account/wizard/account_period_close.py:51
+=======
+#: selection:account.automatic.reconcile,power:0
+msgid "7"
+msgstr "7"
+
+#. module: account
+#: code:addons/account/account_bank_statement.py:402
+#: code:addons/account/account_invoice.py:392
+#: code:addons/account/wizard/account_period_close.py:51
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Invalid action !"
msgstr "Невалидно действие !"
@@ -5935,6 +6380,15 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/invoice.py:997
+#, python-format
+msgid "is validated."
+msgstr "е валидирано."
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: view:account.chart.template:0
#: field:account.chart.template,account_root_id:0
msgid "Root Account"
@@ -6008,6 +6462,7 @@
msgstr "Предприятия"
#. module: account
+<<<<<<< TREE
#: view:account.invoice.report:0
msgid "Open and Paid Invoices"
msgstr ""
@@ -6019,6 +6474,9 @@
#. module: account
#: code:addons/account/account.py:629
+=======
+#: code:addons/account/account.py:663
+>>>>>>> MERGE-SOURCE
#, python-format
msgid ""
"You can not remove/desactivate an account which is set on a customer or "
@@ -6260,7 +6718,12 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:664
+=======
+#: code:addons/account/account_invoice.py:417
+#: code:addons/account/account_invoice.py:517
+>>>>>>> MERGE-SOURCE
#, python-format
msgid ""
"You cannot change the owner company of an account that already contains "
@@ -6421,6 +6884,7 @@
msgstr "Статистика на аналитични записи"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:624
#, python-format
msgid "You can not remove an account containing journal items."
@@ -6429,6 +6893,10 @@
#. module: account
#: code:addons/account/account_analytic_line.py:145
#: code:addons/account/account_move_line.py:933
+=======
+#: code:addons/account/account_analytic_line.py:145
+#: code:addons/account/account_move_line.py:933
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Entries: "
msgstr "Записи: "
@@ -6439,12 +6907,16 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: help:res.partner.bank,currency_id:0
msgid "Currency of the related account journal."
msgstr ""
#. module: account
#: code:addons/account/account.py:1563
+=======
+#: code:addons/account/account.py:1563
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Couldn't create move between different companies"
msgstr "Не може да създаде движение между различни фирми"
@@ -6500,6 +6972,7 @@
msgstr "Факс:"
#. module: account
+<<<<<<< TREE
#: view:wizard.multi.charts.accounts:0
msgid ""
"This will automatically configure your chart of accounts, bank accounts, "
@@ -6507,6 +6980,11 @@
msgstr ""
"Това автоматично ще конфигурира вашите сметки, банкови сметки, данъци и "
"дневници според избрания шаблон"
+=======
+#: report:account.vat.declaration:0
+msgid "Based On"
+msgstr "Базирано на"
+>>>>>>> MERGE-SOURCE
#. module: account
#: help:res.partner,property_account_receivable:0
@@ -6667,6 +7145,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_move_line.py:1218
#, python-format
msgid ""
@@ -6684,6 +7163,16 @@
msgstr ""
#. module: account
+=======
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+msgid "JRNL"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: view:account.partner.balance:0
#: view:account.partner.ledger:0
msgid ""
@@ -6859,6 +7348,7 @@
msgstr "Подчинени кодове"
#. module: account
+<<<<<<< TREE
#: view:account.tax.template:0
msgid "Taxes used in Sales"
msgstr ""
@@ -6866,6 +7356,10 @@
#. module: account
#: code:addons/account/account_invoice.py:495
#: code:addons/account/wizard/account_invoice_refund.py:145
+=======
+#: code:addons/account/account_invoice.py:495
+#: code:addons/account/wizard/account_invoice_refund.py:145
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Data Insufficient !"
msgstr "Недостатъчни данни !"
@@ -7020,6 +7514,17 @@
msgstr "Редове"
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account_invoice.py:532
+#, python-format
+msgid ""
+"Can not find account chart for this company in invoice line account, Please "
+"Create account."
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: view:account.tax.template:0
msgid "Account Tax Template"
msgstr "Шаблон за сметка за данък"
@@ -7035,6 +7540,7 @@
msgstr "Сигурни ли сте че искате да отворите тази фактура?"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:528
#: code:addons/account/account_invoice.py:543
#, python-format
@@ -7050,6 +7556,9 @@
#. module: account
#: code:addons/account/account_move_line.py:999
+=======
+#: code:addons/account/account_move_line.py:999
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Accounting Entries"
msgstr "Записи на сметка"
@@ -7129,9 +7638,24 @@
msgstr "Добре"
#. module: account
+<<<<<<< TREE
#: field:account.chart.template,tax_code_root_id:0
msgid "Root Tax Code"
msgstr "Код на основен данък"
+=======
+#: code:addons/account/report/account_partner_balance.py:115
+#, python-format
+msgid "Unknown Partner"
+msgstr "Непознат партньор"
+
+#. module: account
+#: view:account.bank.statement:0
+#: code:addons/account/account.py:420
+#: code:addons/account/account.py:432
+#, python-format
+msgid "Opening Balance"
+msgstr "Начален баланс"
+>>>>>>> MERGE-SOURCE
#. module: account
#: help:account.journal,centralisation:0
@@ -7329,11 +7853,24 @@
msgstr "Проформа"
#. module: account
+<<<<<<< TREE
#: selection:account.entries.report,move_line_state:0
#: view:account.move.line:0
#: selection:account.move.line,state:0
msgid "Unbalanced"
msgstr "Небалансиран"
+=======
+#: help:account.installer.modules,account_followup:0
+msgid ""
+"Helps you generate reminder letters for unpaid invoices, including multiple "
+"levels of reminding and customized per-partner policies."
+msgstr ""
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid " value amount: n.a"
+msgstr ""
+>>>>>>> MERGE-SOURCE
#. module: account
#: selection:account.move.line,centralisation:0
@@ -7352,10 +7889,21 @@
msgstr "Допълнителна информация"
#. module: account
+<<<<<<< TREE
#: code:addons/account/wizard/account_fiscalyear_close.py:84
#, python-format
msgid "The journal must have default credit and debit account"
msgstr "Дневника трябва да има сметки по подрабиране за кредит и дебит"
+=======
+#: view:account.analytic.line:0
+#: field:account.bank.statement,user_id:0
+#: view:account.journal:0
+#: field:account.journal,user_id:0
+#: view:analytic.entries.report:0
+#: field:analytic.entries.report,user_id:0
+msgid "User"
+msgstr "Потребител"
+>>>>>>> MERGE-SOURCE
#. module: account
#: report:account.general.journal:0
@@ -7377,6 +7925,7 @@
"крайна дата за плащането на този ред."
#. module: account
+<<<<<<< TREE
#: model:ir.ui.menu,name:account.menu_multi_currency
msgid "Multi-Currencies"
msgstr ""
@@ -7388,6 +7937,9 @@
#. module: account
#: code:addons/account/account_move_line.py:1302
+=======
+#: code:addons/account/account_move_line.py:1302
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Bad account !"
msgstr "Грешна сметка !"
@@ -7548,12 +8100,16 @@
msgstr "Данъци на продажба"
#. module: account
+<<<<<<< TREE
#: field:account.financial.report,name:0
msgid "Report Name"
msgstr ""
#. module: account
#: model:account.account.type,name:account.data_account_type_cash
+=======
+#: model:account.account.type,name:account.data_account_type_cash
+>>>>>>> MERGE-SOURCE
#: selection:account.analytic.journal,type:0
#: selection:account.bank.accounts.wizard,account_type:0
#: selection:account.entries.report,type:0
@@ -7788,6 +8344,7 @@
msgstr "Изберете валута за фактурата"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:3446
#, python-format
msgid ""
@@ -7796,6 +8353,9 @@
#. module: account
#: code:addons/account/wizard/account_invoice_refund.py:108
+=======
+#: code:addons/account/wizard/account_invoice_refund.py:108
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Can not %s draft/proforma/cancel invoice."
msgstr "Не може да %s проект/проформа/отказ на фактура"
@@ -7807,12 +8367,16 @@
msgstr "Няма фактурни редове!"
#. module: account
+<<<<<<< TREE
#: view:account.financial.report:0
msgid "Report Type"
msgstr ""
#. module: account
#: view:account.analytic.account:0
+=======
+#: view:account.analytic.account:0
+>>>>>>> MERGE-SOURCE
#: view:account.bank.statement:0
#: field:account.bank.statement,state:0
#: field:account.entries.report,move_state:0
@@ -7845,6 +8409,7 @@
msgstr "Използван данък"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_bank_statement.py:315
#, python-format
msgid ""
@@ -7854,6 +8419,9 @@
#. module: account
#: code:addons/account/account_bank_statement.py:353
+=======
+#: code:addons/account/account_bank_statement.py:353
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "The account entries lines are not in valid state."
msgstr "Редовете на записите на сметката не са във валидно състояние."
@@ -8545,10 +9113,18 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: model:account.account.type,name:account.data_account_type_expense
#: model:account.financial.report,name:account.account_financial_report_expense0
msgid "Expense"
msgstr "Разход"
+=======
+#: code:addons/account/account_move_line.py:1155
+#: code:addons/account/account_move_line.py:1238
+#, python-format
+msgid "Bad account!"
+msgstr "Грешна сметка!"
+>>>>>>> MERGE-SOURCE
#. module: account
#: help:account.chart,fiscalyear:0
@@ -8980,6 +9556,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: model:ir.actions.act_window,help:account.action_invoice_tree4
msgid ""
"With Supplier Refunds you can manage the credit notes you receive from your "
@@ -8987,6 +9564,37 @@
"partially. You can easily generate refunds and reconcile them directly from "
"the invoice form."
msgstr ""
+=======
+#: code:addons/account/wizard/account_change_currency.py:71
+#, python-format
+msgid "Current currency is not confirured properly !"
+msgstr "Текущата валута не настроена правилно!"
+
+#. module: account
+#: code:addons/account/account.py:1088
+#: code:addons/account/account.py:1090
+#: code:addons/account/account.py:1321
+#: code:addons/account/account.py:1563
+#: code:addons/account/account.py:1567
+#: code:addons/account/account.py:3368
+#: code:addons/account/account_move_line.py:807
+#: code:addons/account/account_move_line.py:830
+#: code:addons/account/account_move_line.py:832
+#: code:addons/account/account_move_line.py:835
+#: code:addons/account/account_move_line.py:837
+#: code:addons/account/report/common_report_header.py:92
+#: code:addons/account/wizard/account_change_currency.py:38
+#: code:addons/account/wizard/account_change_currency.py:59
+#: code:addons/account/wizard/account_change_currency.py:64
+#: code:addons/account/wizard/account_change_currency.py:70
+#: code:addons/account/wizard/account_financial_report.py:69
+#: code:addons/account/wizard/account_move_bank_reconcile.py:49
+#: code:addons/account/wizard/account_report_common.py:144
+#: code:addons/account/wizard/account_report_common.py:150
+#, python-format
+msgid "Error"
+msgstr "Грешка"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.account.template:0
@@ -8994,11 +9602,23 @@
msgstr "Сметки вземания"
#. module: account
+<<<<<<< TREE
#: model:ir.actions.act_window,name:account.action_bank_statement_periodic_tree
#: model:ir.actions.act_window,name:account.action_bank_statement_tree
#: model:ir.ui.menu,name:account.menu_bank_statement_tree
msgid "Bank Statements"
msgstr "Банкови извлечения"
+=======
+#: selection:account.account.type,report_type:0
+msgid "Profit & Loss (Income Accounts)"
+msgstr "Печалба и загуби (приходни сметки)"
+
+#. module: account
+#: view:account.tax:0
+#: view:account.tax.template:0
+msgid "Keep empty to use the income account"
+msgstr "Запазете празно за да изпозвате сметката за приходи"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.account,balance:0
@@ -9292,9 +9912,20 @@
msgstr "Абонамент за сметка"
#. module: account
+<<<<<<< TREE
#: report:account.overdue:0
msgid "Maturity date"
msgstr "Дата на падеж"
+=======
+#: code:addons/account/account_invoice.py:736
+#, python-format
+msgid ""
+"Tax base different !\n"
+"Click on compute to update tax base"
+msgstr ""
+"Различна база на данък !\n"
+"Натиснета на Изчисляване за обновяване на базата на данъка"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.subscription:0
@@ -9332,6 +9963,7 @@
msgstr "Начална дата"
#. module: account
+<<<<<<< TREE
#: help:account.invoice,reconciled:0
msgid ""
"It indicates that the invoice has been paid and the journal entry of the "
@@ -9341,6 +9973,10 @@
#. module: account
#: view:account.invoice:0
#: view:account.invoice.report:0
+=======
+#: view:account.invoice:0
+#: view:account.invoice.report:0
+>>>>>>> MERGE-SOURCE
#: model:process.node,name:account.process_node_supplierdraftinvoices0
msgid "Draft Invoices"
msgstr "Проек на фактури"
@@ -9407,12 +10043,16 @@
msgstr "Активен"
#. module: account
+<<<<<<< TREE
#: view:accounting.report:0
msgid "Comparison"
msgstr ""
#. module: account
#: code:addons/account/account_invoice.py:372
+=======
+#: code:addons/account/account_invoice.py:372
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Unknown Error"
msgstr "Непозната грешка"
@@ -9476,6 +10116,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: selection:account.account.type,report_type:0
#: code:addons/account/account.py:181
#, python-format
@@ -9488,6 +10129,11 @@
"Configuration Error! \n"
"You can not select an account type with a deferral method different of "
"\"Unreconciled\" for accounts with internal type \"Payable/Receivable\"! "
+=======
+#: view:account.general.journal:0
+#: model:ir.ui.menu,name:account.menu_account_general_journal
+msgid "General Journals"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -9750,6 +10396,17 @@
msgstr "Източник на данък"
#. module: account
+<<<<<<< TREE
+=======
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
+msgid "Net Profit"
+msgstr "Нетна печалба"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: view:ir.sequence:0
msgid "Fiscal Year Sequences"
msgstr "Последователност за финансови години"
@@ -9929,9 +10586,22 @@
msgstr "Край на периода"
#. module: account
+<<<<<<< TREE
#: sql_constraint:account.journal:0
msgid "The code of the journal must be unique per company !"
msgstr "Кодът на дневника трябва да бъде уникален за всяко предприятие!"
+=======
+#: code:addons/account/account_move_line.py:759
+#: code:addons/account/account_move_line.py:842
+#: code:addons/account/wizard/account_invoice_state.py:44
+#: code:addons/account/wizard/account_invoice_state.py:68
+#: code:addons/account/wizard/account_state_open.py:37
+#: code:addons/account/wizard/account_validate_account_move.py:39
+#: code:addons/account/wizard/account_validate_account_move.py:61
+#, python-format
+msgid "Warning"
+msgstr "Предупреждение"
+>>>>>>> MERGE-SOURCE
#. module: account
#: help:product.category,property_account_expense_categ:0
@@ -9942,6 +10612,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: view:wizard.multi.charts.accounts:0
msgid "Generate Your Chart of Accounts from a Chart Template"
msgstr ""
@@ -9959,6 +10630,17 @@
#: view:account.move.line.reconcile.writeoff:0
msgid "Write-Off Move"
msgstr "Движение на отписване"
+=======
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
+#: selection:account.bank.statement,state:0
+#: selection:account.entries.report,type:0
+#: view:account.fiscalyear:0
+#: selection:account.fiscalyear,state:0
+#: selection:account.period,state:0
+msgid "Closed"
+msgstr "Приключен"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:process.node,note:account.process_node_paidinvoice0
@@ -10025,16 +10707,20 @@
msgstr "Грешка! Не може да създавате рекурсивни шаблони за сметки."
#. module: account
+<<<<<<< TREE
#: selection:account.print.journal,sort_selection:0
msgid "Journal Entry Number"
msgstr ""
#. module: account
+=======
+>>>>>>> MERGE-SOURCE
#: view:account.subscription:0
msgid "Recurring"
msgstr "Повтарящо се"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:642
#, python-format
msgid ""
@@ -10044,6 +10730,9 @@
#. module: account
#: code:addons/account/account_move_line.py:832
+=======
+#: code:addons/account/account_move_line.py:832
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Entry is already reconciled"
msgstr "Записа вече е приравнен"
@@ -10248,6 +10937,14 @@
msgstr "Сметката за приходи или разходи свързана с избрания продукт."
#. module: account
+<<<<<<< TREE
+=======
+#: constraint:account.move.line:0
+msgid "The date of your Journal Entry is not in the defined period!"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: field:account.subscription,period_total:0
msgid "Number of Periods"
msgstr "Брой периоди"
@@ -10273,6 +10970,7 @@
msgstr "Обезщетение"
#. module: account
+<<<<<<< TREE
#: model:email.template,body_text:account.email_template_edi_invoice
msgid ""
"\n"
@@ -10348,6 +11046,9 @@
#. module: account
#: model:ir.model,name:account.model_res_partner_bank
+=======
+#: model:ir.model,name:account.model_res_partner_bank
+>>>>>>> MERGE-SOURCE
msgid "Bank Accounts"
msgstr "Банкови сметки"
@@ -10550,6 +11251,7 @@
"The residual amount on a receivable or payable of a journal entry expressed "
"in its currency (maybe different of the company currency)."
msgstr ""
+<<<<<<< TREE
#, python-format
#~ msgid "Account move line \"%s\" is not valid"
@@ -11607,3 +12309,49 @@
#~ msgid "A/c Code"
#~ msgstr "Код на сметка"
+=======
+
+#. module: account
+#: model:account.financial.report,name:account.account_financial_report_assets0
+msgid "Assets"
+msgstr ""
+
+#. module: account
+#: model:account.account.template,name:0
+msgid "Liabilities"
+msgstr ""
+
+#. module: account
+#: report:account.balancesheet.horizontal:0
+#: report:account.balancesheet:0
+#: report:pl.account.horizontal:0
+#: report:pl.account:0
+msgid "Balance:"
+msgstr ""
+
+#. module: account
+#: report:pl.account.horizontal:0
+#: report:pl.account:0
+msgid "Particular"
+msgstr ""
+
+#. module: account
+#: report:account.aged_trial_balance:0
+msgid "Aged Trial Balance"
+msgstr "Стар пробен баланс"
+
+#. module: account
+#: report:account.aged_trial_balance:0
+msgid "Period Length(days)"
+msgstr ""
+
+#. module: account
+#: report:account.aged_trial_balance:0
+msgid "Account Total"
+msgstr ""
+
+#. module: account
+#: report:account.aged_trial_balance:0
+msgid "Not due"
+msgstr ""
+>>>>>>> MERGE-SOURCE
=== modified file 'account/i18n/br.po'
--- account/i18n/br.po 2012-02-29 09:45:02 +0000
+++ account/i18n/br.po 2012-03-25 07:09:26 +0000
@@ -7,13 +7,19 @@
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+<<<<<<< TREE
"POT-Creation-Date: 2012-02-08 00:35+0000\n"
"PO-Revision-Date: 2010-12-12 09:25+0000\n"
+=======
+"POT-Creation-Date: 2011-05-09 10:18+0000\n"
+"PO-Revision-Date: 2011-01-19 12:00+0000\n"
+>>>>>>> MERGE-SOURCE
"Last-Translator: OpenERP Administrators <Unknown>\n"
"Language-Team: Breton <br@xxxxxx>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2012-02-09 06:17+0000\n"
"X-Generator: Launchpad (build 14763)\n"
@@ -22,6 +28,10 @@
#: view:analytic.entries.report:0
msgid "last month"
msgstr ""
+=======
+"X-Launchpad-Export-Date: 2012-02-22 05:11+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -34,7 +44,12 @@
msgstr "Kefluniadur all"
#. module: account
+<<<<<<< TREE
#: help:account.tax.code,sequence:0
+=======
+#: code:addons/account/account.py:506
+#, python-format
+>>>>>>> MERGE-SOURCE
msgid ""
"Determine the display order in the report 'Accounting \\ Reporting \\ "
"Generic Reporting \\ Taxes \\ Taxes Report'"
@@ -54,16 +69,28 @@
msgstr "Stadegoù ar gont"
#. module: account
+<<<<<<< TREE
#: view:account.invoice:0
msgid "Proforma/Open/Paid Invoices"
msgstr ""
#. module: account
+=======
+>>>>>>> MERGE-SOURCE
#: field:report.invoice.created,residual:0
msgid "Residual"
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account_invoice.py:805
+#, python-format
+msgid "Please define sequence on invoice journal"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: constraint:account.period:0
msgid "Error ! The duration of the Period(s) is/are invalid. "
msgstr ""
@@ -737,12 +764,16 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: field:account.invoice.refund,filter_refund:0
msgid "Refund Method"
msgstr ""
#. module: account
#: code:addons/account/wizard/account_change_currency.py:38
+=======
+#: code:addons/account/wizard/account_change_currency.py:38
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "You can only change currency for Draft Invoice !"
msgstr ""
@@ -799,12 +830,16 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: view:account.payment.term.line:0
msgid "At 14 net days 2 percent, remaining amount at 30 days end of month."
msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_analytic_journal_report
+=======
+#: model:ir.model,name:account.model_account_analytic_journal_report
+>>>>>>> MERGE-SOURCE
msgid "Account Analytic Journal"
msgstr ""
@@ -937,6 +972,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: model:account.account.type,name:account.data_account_type_liability
#: model:account.financial.report,name:account.account_financial_report_liability0
#: model:account.financial.report,name:account.account_financial_report_liabilitysum0
@@ -944,6 +980,8 @@
msgstr ""
#. module: account
+=======
+>>>>>>> MERGE-SOURCE
#: view:account.entries.report:0
msgid "Extended Filters..."
msgstr ""
@@ -1116,12 +1154,16 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: view:account.move.line:0
msgid "Unbalanced Journal Items"
msgstr ""
#. module: account
#: model:account.account.type,name:account.data_account_type_bank
+=======
+#: model:account.account.type,name:account.data_account_type_bank
+>>>>>>> MERGE-SOURCE
#: selection:account.bank.accounts.wizard,account_type:0
#: code:addons/account/account.py:3003
#, python-format
@@ -1494,6 +1536,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: selection:account.account,type:0
#: selection:account.account.template,type:0
#: selection:account.bank.statement,state:0
@@ -1502,6 +1545,31 @@
#: selection:account.fiscalyear,state:0
#: selection:account.period,state:0
msgid "Closed"
+=======
+#: view:account.payment.term.line:0
+msgid ""
+"Example: at 14 net days 2 percents, remaining amount at 30 days end of month."
+msgstr ""
+
+#. module: account
+#: code:addons/account/invoice.py:815
+#, python-format
+msgid ""
+"Cannot create the invoice !\n"
+"The payment term defined gives a computed amount greater than the total "
+"invoiced amount."
+msgstr ""
+
+#. module: account
+#: field:account.installer.modules,account_anglo_saxon:0
+msgid "Anglo-Saxon Accounting"
+msgstr ""
+
+#. module: account
+#: view:account.automatic.reconcile:0
+#: view:account.move.line.reconcile.writeoff:0
+msgid "Write-Off Move"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -1666,6 +1734,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:1429
#, python-format
msgid ""
@@ -1673,6 +1742,8 @@
msgstr ""
#. module: account
+=======
+>>>>>>> MERGE-SOURCE
#: view:account.change.currency:0
msgid "This wizard will change the currency of the invoice"
msgstr ""
@@ -1686,6 +1757,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: view:account.analytic.account:0
msgid "Pending Accounts"
msgstr ""
@@ -1693,6 +1765,21 @@
#. module: account
#: view:account.tax.template:0
msgid "Tax Declaration"
+=======
+#: constraint:account.fiscalyear:0
+msgid "Error! You cannot define overlapping fiscal years"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:835
+#, python-format
+msgid "The account is not defined to be reconciled !"
+msgstr ""
+
+#. module: account
+#: field:account.cashbox.line,pieces:0
+msgid "Values"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -1927,6 +2014,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: constraint:account.move.line:0
msgid ""
"The selected account of your Journal Entry forces to provide a secondary "
@@ -1940,6 +2028,8 @@
msgstr ""
#. module: account
+=======
+>>>>>>> MERGE-SOURCE
#: view:account.invoice:0
#: view:report.invoice.created:0
msgid "Untaxed Amount"
@@ -2058,7 +2148,17 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:1461
+<<<<<<< TREE
+#: code:addons/account/account.py:1461
+=======
+#: code:addons/account/installer.py:348
+#, python-format
+msgid " Journal"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1461
+>>>>>>> MERGE-SOURCE
#, python-format
msgid ""
"There is no default default debit account defined \n"
@@ -2761,6 +2861,14 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: selection:account.print.journal,sort_selection:0
+msgid "Reference Number"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: selection:account.entries.report,month:0
#: selection:account.invoice.report,month:0
#: selection:analytic.entries.report,month:0
@@ -2861,7 +2969,25 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:735
+=======
+#: help:account.partner.ledger,initial_balance:0
+#: help:account.report.general.ledger,initial_balance:0
+msgid ""
+"It adds initial balance row on report which display previous sum amount of "
+"debit/credit/balance"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+#: model:ir.actions.act_window,name:account.action_account_analytic_line_form
+msgid "Analytic Entries"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:962
+>>>>>>> MERGE-SOURCE
#, python-format
msgid ""
"Tax base different!\n"
@@ -3235,10 +3361,28 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: model:ir.actions.act_window,name:account.action_account_unreconcile
#: model:ir.actions.act_window,name:account.action_account_unreconcile_reconcile
#: model:ir.actions.act_window,name:account.action_account_unreconcile_select
msgid "Unreconcile Entries"
+=======
+#: view:account.bank.statement:0
+#: view:account.invoice:0
+#: selection:account.invoice,state:0
+#: view:account.invoice.report:0
+#: selection:account.invoice.report,state:0
+#: selection:account.journal.period,state:0
+#: view:account.subscription:0
+#: selection:account.subscription,state:0
+#: selection:report.invoice.created,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_configuration_installer
+msgid "Accounting Chart Configuration"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -3277,11 +3421,14 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: view:product.product:0
msgid "Purchase Taxes"
msgstr ""
#. module: account
+=======
+>>>>>>> MERGE-SOURCE
#: view:validate.account.move.lines:0
msgid ""
"All selected journal entries will be validated and posted. It means you "
@@ -3294,6 +3441,16 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: selection:account.entries.report,move_line_state:0
+#: view:account.move.line:0
+#: selection:account.move.line,state:0
+msgid "Unbalanced"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: view:account.chart:0
msgid "Account charts"
msgstr ""
@@ -3329,6 +3486,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: view:account.invoice.line:0
msgid "Quantity :"
msgstr ""
@@ -3341,6 +3499,24 @@
#. module: account
#: model:ir.actions.act_window,name:account.action_account_print_sale_purchase_journal
msgid "Print Sale/Purchase Journal"
+=======
+#: code:addons/account/account.py:522
+#, python-format
+msgid ""
+"You cannot change the type of account from '%s' to '%s' type as it contains "
+"account entries!"
+msgstr ""
+
+#. module: account
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+msgid "Counterpart"
+msgstr ""
+
+#. module: account
+#: view:account.journal:0
+msgid "Invoicing Data"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -3490,6 +3666,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: view:account.analytic.line:0
#: field:account.bank.statement,user_id:0
#: view:account.journal:0
@@ -3497,6 +3674,11 @@
#: view:analytic.entries.report:0
#: field:analytic.entries.report,user_id:0
msgid "User"
+=======
+#: code:addons/account/wizard/account_fiscalyear_close.py:84
+#, python-format
+msgid "The journal must have default credit and debit account"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -3637,8 +3819,23 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: selection:account.invoice.refund,filter_refund:0
msgid "Create a draft Refund"
+=======
+#: code:addons/account/account_invoice.py:1429
+#, python-format
+msgid ""
+"You selected an Unit of Measure which is not compatible with the product."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:484
+#, python-format
+msgid ""
+"The Payment Term of Supplier does not have Payment Term Lines(Computation) "
+"defined !"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -3712,6 +3909,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: constraint:account.aged.trial.balance:0
#: constraint:account.balance.report:0
#: constraint:account.central.journal:0
@@ -3733,6 +3931,9 @@
#. module: account
#: model:ir.actions.todo.category,name:account.category_accounting_configuration
+=======
+#: model:ir.actions.todo.category,name:account.category_accounting_configuration
+>>>>>>> MERGE-SOURCE
#: model:ir.ui.menu,name:account.menu_finance
#: model:process.node,name:account.process_node_accountingentries0
#: model:process.node,name:account.process_node_supplieraccountingentries0
@@ -3859,6 +4060,14 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: model:ir.ui.menu,name:account.menu_finance_configuration
+msgid "Configuration"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: model:account.payment.term,name:account.account_payment_term
#: model:account.payment.term,note:account.account_payment_term
msgid "30 Days End of Month"
@@ -3871,6 +4080,17 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
+msgid "Net Loss"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: help:account.account,active:0
msgid ""
"If the active field is set to False, it will allow you to hide the account "
@@ -3993,6 +4213,15 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account_invoice.py:733
+#, python-format
+msgid "Global taxes defined, but are not in invoice lines !"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: field:account.entries.report,month:0
#: view:account.invoice.report:0
#: field:account.invoice.report,month:0
@@ -4061,7 +4290,21 @@
msgstr ""
#. module: account
-#: code:addons/account/account_analytic_line.py:93
+<<<<<<< TREE
+#: code:addons/account/account_analytic_line.py:93
+=======
+#: help:account.move,state:0
+msgid ""
+"All manually created new journal entry are usually in the state 'Unposted', "
+"but you can set the option to skip that state on the related journal. In "
+"that case, they will be behave as journal entries automatically created by "
+"the system on document validation (invoices, bank statements...) and will be "
+"created in 'Posted' state."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_analytic_line.py:93
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
msgstr ""
@@ -4126,7 +4369,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/wizard/account_fiscalyear_close.py:41
+=======
+#: code:addons/account/account_invoice.py:88
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "End of Fiscal Year Entry"
msgstr ""
@@ -4164,11 +4411,14 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: selection:account.financial.report,style_overwrite:0
msgid "Main Title 1 (bold, underlined)"
msgstr ""
#. module: account
+=======
+>>>>>>> MERGE-SOURCE
#: report:account.analytic.account.balance:0
#: report:account.central.journal:0
msgid "Account Name"
@@ -4201,6 +4451,14 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: report:account.overdue:0
+msgid "Maturity date"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: view:report.account.receivable:0
msgid "Accounts by type"
msgstr ""
@@ -4291,6 +4549,15 @@
msgstr ""
#. module: account
+#: constraint:account.account:0
+#: constraint:account.account.template:0
+msgid ""
+"Configuration Error! \n"
+"You cannot define children to an account with internal type different of "
+"\"View\"! "
+msgstr ""
+
+#. module: account
#: model:ir.model,name:account.model_account_analytic_cost_ledger_journal_report
msgid "Account Analytic Cost Ledger For Journal Report"
msgstr ""
@@ -4318,8 +4585,25 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: selection:account.journal,type:0
msgid "Bank and Cheques"
+=======
+#: code:addons/account/account.py:1431
+#: code:addons/account/account.py:1460
+#: code:addons/account/account.py:1467
+#: code:addons/account/account_invoice.py:920
+#: code:addons/account/account_move_line.py:1104
+#: code:addons/account/wizard/account_automatic_reconcile.py:152
+#: code:addons/account/wizard/account_fiscalyear_close.py:73
+#: code:addons/account/wizard/account_fiscalyear_close.py:83
+#: code:addons/account/wizard/account_fiscalyear_close.py:86
+#: code:addons/account/wizard/account_move_journal.py:165
+#: code:addons/account/wizard/account_report_aged_partner_balance.py:56
+#: code:addons/account/wizard/account_report_aged_partner_balance.py:58
+#, python-format
+msgid "UserError"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -4358,6 +4642,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:828
#, python-format
msgid ""
@@ -4378,6 +4663,8 @@
msgstr ""
#. module: account
+=======
+>>>>>>> MERGE-SOURCE
#: view:account.subscription.generate:0
#: model:ir.actions.act_window,name:account.action_account_subscription_generate
#: model:ir.ui.menu,name:account.menu_generate_subscription
@@ -4416,7 +4703,17 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:1567
+<<<<<<< TREE
+#: code:addons/account/account.py:1567
+=======
+#: code:addons/account/account_invoice.py:71
+#, python-format
+msgid "You must define an analytic journal of type '%s' !"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1567
+>>>>>>> MERGE-SOURCE
#, python-format
msgid ""
"Couldn't create move with currency different from the secondary currency of "
@@ -4453,8 +4750,19 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: model:ir.ui.menu,name:account.menu_finance_configuration
msgid "Configuration"
+=======
+#: report:account.account.balance.landscape:0
+msgid "Account Balance -"
+msgstr ""
+
+#. module: account
+#: code:addons/account/invoice.py:997
+#, python-format
+msgid "Invoice "
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -4502,6 +4810,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: view:account.invoice:0
msgid "My invoices"
msgstr ""
@@ -4509,6 +4818,13 @@
#. module: account
#: selection:account.bank.accounts.wizard,account_type:0
msgid "Check"
+=======
+#: code:addons/account/account_invoice.py:828
+#, python-format
+msgid ""
+"Please verify the price of the invoice !\n"
+"The real total does not match the computed total."
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -4634,6 +4950,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:1088
#: code:addons/account/account.py:1090
#: code:addons/account/account.py:1321
@@ -4656,6 +4973,24 @@
#: code:addons/account/wizard/account_report_common.py:150
#, python-format
msgid "Error"
+=======
+#: selection:account.account.type,report_type:0
+msgid "Balance Sheet (Assets Accounts)"
+msgstr ""
+
+#. module: account
+#: report:account.tax.code.entries:0
+msgid "Third Party (Country)"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_invoice_tree4
+msgid ""
+"With Supplier Refunds you can manage the credit notes you receive from your "
+"suppliers. A refund is a document that credits an invoice completely or "
+"partially. You can easily generate refunds and reconcile them directly from "
+"the invoice form."
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -4673,10 +5008,16 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: model:ir.actions.act_window,help:account.action_account_partner_balance
msgid ""
"This report is analysis by partner. It is a PDF report containing one line "
"per partner representing the cumulative credit balance."
+=======
+#: code:addons/account/account_invoice.py:739
+#, python-format
+msgid "Taxes missing !"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -4933,6 +5274,20 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account_bank_statement.py:300
+#, python-format
+msgid "Journal Item \"%s\" is not valid"
+msgstr ""
+
+#. module: account
+#: view:account.payment.term:0
+msgid "Description on invoices"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: field:account.partner.reconcile.process,next_partner_id:0
msgid "Next Partner to Reconcile"
msgstr ""
@@ -5048,8 +5403,15 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: model:ir.model,name:account.model_account_fiscal_position_tax_template
msgid "Template Tax Fiscal Position"
+=======
+#: code:addons/account/account.py:2067
+#: code:addons/account/wizard/account_use_model.py:69
+#, python-format
+msgid "No period found !"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -5280,12 +5642,36 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: view:account.invoice.report:0
msgid "Customer Invoices And Refunds"
msgstr ""
#. module: account
#: field:account.analytic.line,amount_currency:0
+=======
+#: help:account.account.type,report_type:0
+msgid ""
+"According value related accounts will be display on respective reports "
+"(Balance Sheet Profit & Loss Account)"
+msgstr ""
+
+#. module: account
+#: field:account.report.general.ledger,sortby:0
+msgid "Sort By"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1468
+#, python-format
+msgid ""
+"There is no default default credit account defined \n"
+"on journal \"%s\""
+msgstr ""
+
+#. module: account
+#: field:account.analytic.line,amount_currency:0
+>>>>>>> MERGE-SOURCE
#: field:account.entries.report,amount_currency:0
#: field:account.model.line,amount_currency:0
#: field:account.move.line,amount_currency:0
@@ -5649,6 +6035,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:2256
#, python-format
msgid "You have a wrong expression \"%(...)s\" in your model !"
@@ -5662,6 +6049,10 @@
#. module: account
#: code:addons/account/account_move_line.py:1155
#: code:addons/account/account_move_line.py:1238
+=======
+#: code:addons/account/account_move_line.py:1155
+#: code:addons/account/account_move_line.py:1238
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "You can not use an inactive account!"
msgstr ""
@@ -5697,14 +6088,47 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/report/common_report_header.py:100
+#: report:account.account.balance:0
+#: report:account.central.journal:0
+#: report:account.partner.balance:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:account.general.journal:0
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
+#: report:account.vat.declaration:0
+#, python-format
+msgid "No Filter"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: field:account.payment.term.line,days:0
msgid "Number of Days"
msgstr ""
#. module: account
-#: code:addons/account/account_bank_statement.py:402
-#: code:addons/account/account_invoice.py:392
-#: code:addons/account/wizard/account_period_close.py:51
+<<<<<<< TREE
+#: code:addons/account/account_bank_statement.py:402
+#: code:addons/account/account_invoice.py:392
+#: code:addons/account/wizard/account_period_close.py:51
+=======
+#: selection:account.automatic.reconcile,power:0
+msgid "7"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_bank_statement.py:402
+#: code:addons/account/account_invoice.py:392
+#: code:addons/account/wizard/account_period_close.py:51
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Invalid action !"
msgstr ""
@@ -5863,6 +6287,15 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/invoice.py:997
+#, python-format
+msgid "is validated."
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: view:account.chart.template:0
#: field:account.chart.template,account_root_id:0
msgid "Root Account"
@@ -5936,6 +6369,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: view:account.invoice.report:0
msgid "Open and Paid Invoices"
msgstr ""
@@ -5947,6 +6381,9 @@
#. module: account
#: code:addons/account/account.py:629
+=======
+#: code:addons/account/account.py:663
+>>>>>>> MERGE-SOURCE
#, python-format
msgid ""
"You can not remove/desactivate an account which is set on a customer or "
@@ -6182,7 +6619,12 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:664
+=======
+#: code:addons/account/account_invoice.py:417
+#: code:addons/account/account_invoice.py:517
+>>>>>>> MERGE-SOURCE
#, python-format
msgid ""
"You cannot change the owner company of an account that already contains "
@@ -6341,6 +6783,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:624
#, python-format
msgid "You can not remove an account containing journal items."
@@ -6349,6 +6792,10 @@
#. module: account
#: code:addons/account/account_analytic_line.py:145
#: code:addons/account/account_move_line.py:933
+=======
+#: code:addons/account/account_analytic_line.py:145
+#: code:addons/account/account_move_line.py:933
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Entries: "
msgstr ""
@@ -6359,12 +6806,16 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: help:res.partner.bank,currency_id:0
msgid "Currency of the related account journal."
msgstr ""
#. module: account
#: code:addons/account/account.py:1563
+=======
+#: code:addons/account/account.py:1563
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Couldn't create move between different companies"
msgstr ""
@@ -6420,10 +6871,15 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: view:wizard.multi.charts.accounts:0
msgid ""
"This will automatically configure your chart of accounts, bank accounts, "
"taxes and journals according to the selected template"
+=======
+#: report:account.vat.declaration:0
+msgid "Based On"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -6583,6 +7039,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_move_line.py:1218
#, python-format
msgid ""
@@ -6600,6 +7057,16 @@
msgstr ""
#. module: account
+=======
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+msgid "JRNL"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: view:account.partner.balance:0
#: view:account.partner.ledger:0
msgid ""
@@ -6764,6 +7231,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: view:account.tax.template:0
msgid "Taxes used in Sales"
msgstr ""
@@ -6771,6 +7239,10 @@
#. module: account
#: code:addons/account/account_invoice.py:495
#: code:addons/account/wizard/account_invoice_refund.py:145
+=======
+#: code:addons/account/account_invoice.py:495
+#: code:addons/account/wizard/account_invoice_refund.py:145
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Data Insufficient !"
msgstr ""
@@ -6925,6 +7397,17 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account_invoice.py:532
+#, python-format
+msgid ""
+"Can not find account chart for this company in invoice line account, Please "
+"Create account."
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: view:account.tax.template:0
msgid "Account Tax Template"
msgstr ""
@@ -6940,6 +7423,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:528
#: code:addons/account/account_invoice.py:543
#, python-format
@@ -6955,6 +7439,9 @@
#. module: account
#: code:addons/account/account_move_line.py:999
+=======
+#: code:addons/account/account_move_line.py:999
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Accounting Entries"
msgstr ""
@@ -7034,8 +7521,22 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: field:account.chart.template,tax_code_root_id:0
msgid "Root Tax Code"
+=======
+#: code:addons/account/report/account_partner_balance.py:115
+#, python-format
+msgid "Unknown Partner"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+#: code:addons/account/account.py:420
+#: code:addons/account/account.py:432
+#, python-format
+msgid "Opening Balance"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -7229,10 +7730,22 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: selection:account.entries.report,move_line_state:0
#: view:account.move.line:0
#: selection:account.move.line,state:0
msgid "Unbalanced"
+=======
+#: help:account.installer.modules,account_followup:0
+msgid ""
+"Helps you generate reminder letters for unpaid invoices, including multiple "
+"levels of reminding and customized per-partner policies."
+msgstr ""
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid " value amount: n.a"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -7252,9 +7765,19 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/wizard/account_fiscalyear_close.py:84
#, python-format
msgid "The journal must have default credit and debit account"
+=======
+#: view:account.analytic.line:0
+#: field:account.bank.statement,user_id:0
+#: view:account.journal:0
+#: field:account.journal,user_id:0
+#: view:analytic.entries.report:0
+#: field:analytic.entries.report,user_id:0
+msgid "User"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -7275,6 +7798,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: model:ir.ui.menu,name:account.menu_multi_currency
msgid "Multi-Currencies"
msgstr ""
@@ -7286,6 +7810,9 @@
#. module: account
#: code:addons/account/account_move_line.py:1302
+=======
+#: code:addons/account/account_move_line.py:1302
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Bad account !"
msgstr ""
@@ -7446,12 +7973,16 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: field:account.financial.report,name:0
msgid "Report Name"
msgstr ""
#. module: account
#: model:account.account.type,name:account.data_account_type_cash
+=======
+#: model:account.account.type,name:account.data_account_type_cash
+>>>>>>> MERGE-SOURCE
#: selection:account.analytic.journal,type:0
#: selection:account.bank.accounts.wizard,account_type:0
#: selection:account.entries.report,type:0
@@ -7680,6 +8211,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:3446
#, python-format
msgid ""
@@ -7688,6 +8220,9 @@
#. module: account
#: code:addons/account/wizard/account_invoice_refund.py:108
+=======
+#: code:addons/account/wizard/account_invoice_refund.py:108
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Can not %s draft/proforma/cancel invoice."
msgstr ""
@@ -7699,12 +8234,16 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: view:account.financial.report:0
msgid "Report Type"
msgstr ""
#. module: account
#: view:account.analytic.account:0
+=======
+#: view:account.analytic.account:0
+>>>>>>> MERGE-SOURCE
#: view:account.bank.statement:0
#: field:account.bank.statement,state:0
#: field:account.entries.report,move_state:0
@@ -7737,6 +8276,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_bank_statement.py:315
#, python-format
msgid ""
@@ -7746,6 +8286,9 @@
#. module: account
#: code:addons/account/account_bank_statement.py:353
+=======
+#: code:addons/account/account_bank_statement.py:353
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "The account entries lines are not in valid state."
msgstr ""
@@ -8430,9 +8973,16 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: model:account.account.type,name:account.data_account_type_expense
#: model:account.financial.report,name:account.account_financial_report_expense0
msgid "Expense"
+=======
+#: code:addons/account/account_move_line.py:1155
+#: code:addons/account/account_move_line.py:1238
+#, python-format
+msgid "Bad account!"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -8858,12 +9408,28 @@
msgstr ""
#. module: account
-#: model:ir.actions.act_window,help:account.action_invoice_tree4
-msgid ""
-"With Supplier Refunds you can manage the credit notes you receive from your "
-"suppliers. A refund is a document that credits an invoice completely or "
-"partially. You can easily generate refunds and reconcile them directly from "
-"the invoice form."
+#: code:addons/account/account.py:1088
+#: code:addons/account/account.py:1090
+#: code:addons/account/account.py:1321
+#: code:addons/account/account.py:1563
+#: code:addons/account/account.py:1567
+#: code:addons/account/account.py:3368
+#: code:addons/account/account_move_line.py:807
+#: code:addons/account/account_move_line.py:830
+#: code:addons/account/account_move_line.py:832
+#: code:addons/account/account_move_line.py:835
+#: code:addons/account/account_move_line.py:837
+#: code:addons/account/report/common_report_header.py:92
+#: code:addons/account/wizard/account_change_currency.py:38
+#: code:addons/account/wizard/account_change_currency.py:59
+#: code:addons/account/wizard/account_change_currency.py:64
+#: code:addons/account/wizard/account_change_currency.py:70
+#: code:addons/account/wizard/account_financial_report.py:69
+#: code:addons/account/wizard/account_move_bank_reconcile.py:49
+#: code:addons/account/wizard/account_report_common.py:144
+#: code:addons/account/wizard/account_report_common.py:150
+#, python-format
+msgid "Error"
msgstr ""
#. module: account
@@ -8872,10 +9438,21 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: model:ir.actions.act_window,name:account.action_bank_statement_periodic_tree
#: model:ir.actions.act_window,name:account.action_bank_statement_tree
#: model:ir.ui.menu,name:account.menu_bank_statement_tree
msgid "Bank Statements"
+=======
+#: selection:account.account.type,report_type:0
+msgid "Profit & Loss (Income Accounts)"
+msgstr ""
+
+#. module: account
+#: view:account.tax:0
+#: view:account.tax.template:0
+msgid "Keep empty to use the income account"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -9167,8 +9744,16 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: report:account.overdue:0
msgid "Maturity date"
+=======
+#: code:addons/account/account_invoice.py:736
+#, python-format
+msgid ""
+"Tax base different !\n"
+"Click on compute to update tax base"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -9207,6 +9792,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: help:account.invoice,reconciled:0
msgid ""
"It indicates that the invoice has been paid and the journal entry of the "
@@ -9216,6 +9802,10 @@
#. module: account
#: view:account.invoice:0
#: view:account.invoice.report:0
+=======
+#: view:account.invoice:0
+#: view:account.invoice.report:0
+>>>>>>> MERGE-SOURCE
#: model:process.node,name:account.process_node_supplierdraftinvoices0
msgid "Draft Invoices"
msgstr ""
@@ -9282,12 +9872,16 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: view:accounting.report:0
msgid "Comparison"
msgstr ""
#. module: account
#: code:addons/account/account_invoice.py:372
+=======
+#: code:addons/account/account_invoice.py:372
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Unknown Error"
msgstr ""
@@ -9349,6 +9943,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: selection:account.account.type,report_type:0
#: code:addons/account/account.py:181
#, python-format
@@ -9361,6 +9956,11 @@
"Configuration Error! \n"
"You can not select an account type with a deferral method different of "
"\"Unreconciled\" for accounts with internal type \"Payable/Receivable\"! "
+=======
+#: view:account.general.journal:0
+#: model:ir.ui.menu,name:account.menu_account_general_journal
+msgid "General Journals"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -9623,6 +10223,17 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
+msgid "Net Profit"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: view:ir.sequence:0
msgid "Fiscal Year Sequences"
msgstr ""
@@ -9802,8 +10413,20 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: sql_constraint:account.journal:0
msgid "The code of the journal must be unique per company !"
+=======
+#: code:addons/account/account_move_line.py:759
+#: code:addons/account/account_move_line.py:842
+#: code:addons/account/wizard/account_invoice_state.py:44
+#: code:addons/account/wizard/account_invoice_state.py:68
+#: code:addons/account/wizard/account_state_open.py:37
+#: code:addons/account/wizard/account_validate_account_move.py:39
+#: code:addons/account/wizard/account_validate_account_move.py:61
+#, python-format
+msgid "Warning"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -9815,6 +10438,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: view:wizard.multi.charts.accounts:0
msgid "Generate Your Chart of Accounts from a Chart Template"
msgstr ""
@@ -9831,6 +10455,16 @@
#: view:account.automatic.reconcile:0
#: view:account.move.line.reconcile.writeoff:0
msgid "Write-Off Move"
+=======
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
+#: selection:account.bank.statement,state:0
+#: selection:account.entries.report,type:0
+#: view:account.fiscalyear:0
+#: selection:account.fiscalyear,state:0
+#: selection:account.period,state:0
+msgid "Closed"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -9898,16 +10532,20 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: selection:account.print.journal,sort_selection:0
msgid "Journal Entry Number"
msgstr ""
#. module: account
+=======
+>>>>>>> MERGE-SOURCE
#: view:account.subscription:0
msgid "Recurring"
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:642
#, python-format
msgid ""
@@ -9917,6 +10555,9 @@
#. module: account
#: code:addons/account/account_move_line.py:832
+=======
+#: code:addons/account/account_move_line.py:832
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Entry is already reconciled"
msgstr ""
@@ -10121,6 +10762,14 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: constraint:account.move.line:0
+msgid "The date of your Journal Entry is not in the defined period!"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: field:account.subscription,period_total:0
msgid "Number of Periods"
msgstr ""
@@ -10146,6 +10795,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: model:email.template,body_text:account.email_template_edi_invoice
msgid ""
"\n"
@@ -10221,6 +10871,9 @@
#. module: account
#: model:ir.model,name:account.model_res_partner_bank
+=======
+#: model:ir.model,name:account.model_res_partner_bank
+>>>>>>> MERGE-SOURCE
msgid "Bank Accounts"
msgstr ""
@@ -10422,6 +11075,53 @@
"The residual amount on a receivable or payable of a journal entry expressed "
"in its currency (maybe different of the company currency)."
msgstr ""
+<<<<<<< TREE
#~ msgid "Negative"
#~ msgstr "Negativel"
+=======
+
+#. module: account
+#: model:account.financial.report,name:account.account_financial_report_assets0
+msgid "Assets"
+msgstr ""
+
+#. module: account
+#: model:account.account.template,name:0
+msgid "Liabilities"
+msgstr ""
+
+#. module: account
+#: report:account.balancesheet.horizontal:0
+#: report:account.balancesheet:0
+#: report:pl.account.horizontal:0
+#: report:pl.account:0
+msgid "Balance:"
+msgstr ""
+
+#. module: account
+#: report:pl.account.horizontal:0
+#: report:pl.account:0
+msgid "Particular"
+msgstr ""
+
+#. module: account
+#: report:account.aged_trial_balance:0
+msgid "Aged Trial Balance"
+msgstr ""
+
+#. module: account
+#: report:account.aged_trial_balance:0
+msgid "Period Length(days)"
+msgstr ""
+
+#. module: account
+#: report:account.aged_trial_balance:0
+msgid "Account Total"
+msgstr ""
+
+#. module: account
+#: report:account.aged_trial_balance:0
+msgid "Not due"
+msgstr ""
+>>>>>>> MERGE-SOURCE
=== modified file 'account/i18n/bs.po'
--- account/i18n/bs.po 2012-02-29 09:45:02 +0000
+++ account/i18n/bs.po 2012-03-25 07:09:26 +0000
@@ -6,13 +6,19 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
+<<<<<<< TREE
"POT-Creation-Date: 2012-02-08 00:35+0000\n"
"PO-Revision-Date: 2010-12-11 15:12+0000\n"
+=======
+"POT-Creation-Date: 2011-05-09 10:18+0000\n"
+"PO-Revision-Date: 2011-01-19 12:00+0000\n"
+>>>>>>> MERGE-SOURCE
"Last-Translator: Fabien (Open ERP) <fp@xxxxxxxxxxx>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2012-02-09 06:17+0000\n"
"X-Generator: Launchpad (build 14763)\n"
@@ -21,6 +27,10 @@
#: view:analytic.entries.report:0
msgid "last month"
msgstr ""
+=======
+"X-Launchpad-Export-Date: 2012-02-22 05:11+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -33,7 +43,12 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: help:account.tax.code,sequence:0
+=======
+#: code:addons/account/account.py:506
+#, python-format
+>>>>>>> MERGE-SOURCE
msgid ""
"Determine the display order in the report 'Accounting \\ Reporting \\ "
"Generic Reporting \\ Taxes \\ Taxes Report'"
@@ -53,16 +68,28 @@
msgstr "Statistike konta"
#. module: account
+<<<<<<< TREE
#: view:account.invoice:0
msgid "Proforma/Open/Paid Invoices"
msgstr ""
#. module: account
+=======
+>>>>>>> MERGE-SOURCE
#: field:report.invoice.created,residual:0
msgid "Residual"
msgstr "Ostatak"
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account_invoice.py:805
+#, python-format
+msgid "Please define sequence on invoice journal"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: constraint:account.period:0
msgid "Error ! The duration of the Period(s) is/are invalid. "
msgstr "Greška ! Trajanje razdoblja je pogrešno. "
@@ -740,12 +767,16 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: field:account.invoice.refund,filter_refund:0
msgid "Refund Method"
msgstr ""
#. module: account
#: code:addons/account/wizard/account_change_currency.py:38
+=======
+#: code:addons/account/wizard/account_change_currency.py:38
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "You can only change currency for Draft Invoice !"
msgstr ""
@@ -802,12 +833,16 @@
msgstr "Poništavanje usklađivanja"
#. module: account
+<<<<<<< TREE
#: view:account.payment.term.line:0
msgid "At 14 net days 2 percent, remaining amount at 30 days end of month."
msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_analytic_journal_report
+=======
+#: model:ir.model,name:account.model_account_analytic_journal_report
+>>>>>>> MERGE-SOURCE
msgid "Account Analytic Journal"
msgstr ""
@@ -940,6 +975,7 @@
msgstr "Konsolidacija"
#. module: account
+<<<<<<< TREE
#: model:account.account.type,name:account.data_account_type_liability
#: model:account.financial.report,name:account.account_financial_report_liability0
#: model:account.financial.report,name:account.account_financial_report_liabilitysum0
@@ -947,6 +983,8 @@
msgstr "Obveza"
#. module: account
+=======
+>>>>>>> MERGE-SOURCE
#: view:account.entries.report:0
msgid "Extended Filters..."
msgstr ""
@@ -1119,12 +1157,16 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: view:account.move.line:0
msgid "Unbalanced Journal Items"
msgstr ""
#. module: account
#: model:account.account.type,name:account.data_account_type_bank
+=======
+#: model:account.account.type,name:account.data_account_type_bank
+>>>>>>> MERGE-SOURCE
#: selection:account.bank.accounts.wizard,account_type:0
#: code:addons/account/account.py:3003
#, python-format
@@ -1497,6 +1539,7 @@
msgstr "Povrat dobavljaču"
#. module: account
+<<<<<<< TREE
#: selection:account.account,type:0
#: selection:account.account.template,type:0
#: selection:account.bank.statement,state:0
@@ -1506,6 +1549,32 @@
#: selection:account.period,state:0
msgid "Closed"
msgstr "Zatvoreno"
+=======
+#: view:account.payment.term.line:0
+msgid ""
+"Example: at 14 net days 2 percents, remaining amount at 30 days end of month."
+msgstr ""
+
+#. module: account
+#: code:addons/account/invoice.py:815
+#, python-format
+msgid ""
+"Cannot create the invoice !\n"
+"The payment term defined gives a computed amount greater than the total "
+"invoiced amount."
+msgstr ""
+
+#. module: account
+#: field:account.installer.modules,account_anglo_saxon:0
+msgid "Anglo-Saxon Accounting"
+msgstr ""
+
+#. module: account
+#: view:account.automatic.reconcile:0
+#: view:account.move.line.reconcile.writeoff:0
+msgid "Write-Off Move"
+msgstr "Otpiši prijenos"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:ir.ui.menu,name:account.menu_finance_recurrent_entries
@@ -1669,6 +1738,7 @@
msgstr "Godišnja suma"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:1429
#, python-format
msgid ""
@@ -1676,6 +1746,8 @@
msgstr ""
#. module: account
+=======
+>>>>>>> MERGE-SOURCE
#: view:account.change.currency:0
msgid "This wizard will change the currency of the invoice"
msgstr ""
@@ -1689,6 +1761,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: view:account.analytic.account:0
msgid "Pending Accounts"
msgstr ""
@@ -1697,6 +1770,22 @@
#: view:account.tax.template:0
msgid "Tax Declaration"
msgstr "Porezni iskaz"
+=======
+#: constraint:account.fiscalyear:0
+msgid "Error! You cannot define overlapping fiscal years"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:835
+#, python-format
+msgid "The account is not defined to be reconciled !"
+msgstr ""
+
+#. module: account
+#: field:account.cashbox.line,pieces:0
+msgid "Values"
+msgstr ""
+>>>>>>> MERGE-SOURCE
#. module: account
#: help:account.journal.period,active:0
@@ -1932,6 +2021,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: constraint:account.move.line:0
msgid ""
"The selected account of your Journal Entry forces to provide a secondary "
@@ -1945,6 +2035,8 @@
msgstr ""
#. module: account
+=======
+>>>>>>> MERGE-SOURCE
#: view:account.invoice:0
#: view:report.invoice.created:0
msgid "Untaxed Amount"
@@ -2065,7 +2157,17 @@
msgstr "Predračun"
#. module: account
-#: code:addons/account/account.py:1461
+<<<<<<< TREE
+#: code:addons/account/account.py:1461
+=======
+#: code:addons/account/installer.py:348
+#, python-format
+msgid " Journal"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1461
+>>>>>>> MERGE-SOURCE
#, python-format
msgid ""
"There is no default default debit account defined \n"
@@ -2773,6 +2875,14 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: selection:account.print.journal,sort_selection:0
+msgid "Reference Number"
+msgstr "Broj reference"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: selection:account.entries.report,month:0
#: selection:account.invoice.report,month:0
#: selection:analytic.entries.report,month:0
@@ -2873,7 +2983,25 @@
msgstr "Fiskalna pozicija"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:735
+=======
+#: help:account.partner.ledger,initial_balance:0
+#: help:account.report.general.ledger,initial_balance:0
+msgid ""
+"It adds initial balance row on report which display previous sum amount of "
+"debit/credit/balance"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+#: model:ir.actions.act_window,name:account.action_account_analytic_line_form
+msgid "Analytic Entries"
+msgstr "Analitičke stavke"
+
+#. module: account
+#: code:addons/account/account.py:962
+>>>>>>> MERGE-SOURCE
#, python-format
msgid ""
"Tax base different!\n"
@@ -3254,11 +3382,30 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: model:ir.actions.act_window,name:account.action_account_unreconcile
#: model:ir.actions.act_window,name:account.action_account_unreconcile_reconcile
#: model:ir.actions.act_window,name:account.action_account_unreconcile_select
msgid "Unreconcile Entries"
msgstr "Poništi usklađivanje stavki"
+=======
+#: view:account.bank.statement:0
+#: view:account.invoice:0
+#: selection:account.invoice,state:0
+#: view:account.invoice.report:0
+#: selection:account.invoice.report,state:0
+#: selection:account.journal.period,state:0
+#: view:account.subscription:0
+#: selection:account.subscription,state:0
+#: selection:report.invoice.created,state:0
+msgid "Draft"
+msgstr "U pripremi"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_configuration_installer
+msgid "Accounting Chart Configuration"
+msgstr ""
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.tax.code,notprintable:0
@@ -3296,11 +3443,14 @@
msgstr "Godina"
#. module: account
+<<<<<<< TREE
#: view:product.product:0
msgid "Purchase Taxes"
msgstr "Porezi nabave"
#. module: account
+=======
+>>>>>>> MERGE-SOURCE
#: view:validate.account.move.lines:0
msgid ""
"All selected journal entries will be validated and posted. It means you "
@@ -3313,6 +3463,16 @@
msgstr "Prijenosi"
#. module: account
+<<<<<<< TREE
+=======
+#: selection:account.entries.report,move_line_state:0
+#: view:account.move.line:0
+#: selection:account.move.line,state:0
+msgid "Unbalanced"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: view:account.chart:0
msgid "Account charts"
msgstr "Kontni plan"
@@ -3348,6 +3508,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: view:account.invoice.line:0
msgid "Quantity :"
msgstr ""
@@ -3360,6 +3521,24 @@
#. module: account
#: model:ir.actions.act_window,name:account.action_account_print_sale_purchase_journal
msgid "Print Sale/Purchase Journal"
+=======
+#: code:addons/account/account.py:522
+#, python-format
+msgid ""
+"You cannot change the type of account from '%s' to '%s' type as it contains "
+"account entries!"
+msgstr ""
+
+#. module: account
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+msgid "Counterpart"
+msgstr ""
+
+#. module: account
+#: view:account.journal:0
+msgid "Invoicing Data"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -3510,6 +3689,7 @@
msgstr "Poništi usklađivanje"
#. module: account
+<<<<<<< TREE
#: view:account.analytic.line:0
#: field:account.bank.statement,user_id:0
#: view:account.journal:0
@@ -3518,6 +3698,12 @@
#: field:analytic.entries.report,user_id:0
msgid "User"
msgstr "Korisnik"
+=======
+#: code:addons/account/wizard/account_fiscalyear_close.py:84
+#, python-format
+msgid "The journal must have default credit and debit account"
+msgstr ""
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.chart.template:0
@@ -3660,8 +3846,23 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: selection:account.invoice.refund,filter_refund:0
msgid "Create a draft Refund"
+=======
+#: code:addons/account/account_invoice.py:1429
+#, python-format
+msgid ""
+"You selected an Unit of Measure which is not compatible with the product."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:484
+#, python-format
+msgid ""
+"The Payment Term of Supplier does not have Payment Term Lines(Computation) "
+"defined !"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -3735,6 +3936,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: constraint:account.aged.trial.balance:0
#: constraint:account.balance.report:0
#: constraint:account.central.journal:0
@@ -3756,6 +3958,9 @@
#. module: account
#: model:ir.actions.todo.category,name:account.category_accounting_configuration
+=======
+#: model:ir.actions.todo.category,name:account.category_accounting_configuration
+>>>>>>> MERGE-SOURCE
#: model:ir.ui.menu,name:account.menu_finance
#: model:process.node,name:account.process_node_accountingentries0
#: model:process.node,name:account.process_node_supplieraccountingentries0
@@ -3882,6 +4087,14 @@
msgstr "Naziv poreza"
#. module: account
+<<<<<<< TREE
+=======
+#: model:ir.ui.menu,name:account.menu_finance_configuration
+msgid "Configuration"
+msgstr "Postavke"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: model:account.payment.term,name:account.account_payment_term
#: model:account.payment.term,note:account.account_payment_term
msgid "30 Days End of Month"
@@ -3894,6 +4107,17 @@
msgstr "Saldo analitike"
#. module: account
+<<<<<<< TREE
+=======
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
+msgid "Net Loss"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: help:account.account,active:0
msgid ""
"If the active field is set to False, it will allow you to hide the account "
@@ -4016,6 +4240,15 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account_invoice.py:733
+#, python-format
+msgid "Global taxes defined, but are not in invoice lines !"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: field:account.entries.report,month:0
#: view:account.invoice.report:0
#: field:account.invoice.report,month:0
@@ -4084,7 +4317,21 @@
msgstr ""
#. module: account
-#: code:addons/account/account_analytic_line.py:93
+<<<<<<< TREE
+#: code:addons/account/account_analytic_line.py:93
+=======
+#: help:account.move,state:0
+msgid ""
+"All manually created new journal entry are usually in the state 'Unposted', "
+"but you can set the option to skip that state on the related journal. In "
+"that case, they will be behave as journal entries automatically created by "
+"the system on document validation (invoices, bank statements...) and will be "
+"created in 'Posted' state."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_analytic_line.py:93
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
msgstr ""
@@ -4149,7 +4396,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/wizard/account_fiscalyear_close.py:41
+=======
+#: code:addons/account/account_invoice.py:88
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "End of Fiscal Year Entry"
msgstr ""
@@ -4187,11 +4438,14 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: selection:account.financial.report,style_overwrite:0
msgid "Main Title 1 (bold, underlined)"
msgstr ""
#. module: account
+=======
+>>>>>>> MERGE-SOURCE
#: report:account.analytic.account.balance:0
#: report:account.central.journal:0
msgid "Account Name"
@@ -4224,6 +4478,14 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: report:account.overdue:0
+msgid "Maturity date"
+msgstr "Datum dospijeća"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: view:report.account.receivable:0
msgid "Accounts by type"
msgstr "Konta po vrstama"
@@ -4314,6 +4576,15 @@
msgstr "Porez uključen u cijenu"
#. module: account
+#: constraint:account.account:0
+#: constraint:account.account.template:0
+msgid ""
+"Configuration Error! \n"
+"You cannot define children to an account with internal type different of "
+"\"View\"! "
+msgstr ""
+
+#. module: account
#: model:ir.model,name:account.model_account_analytic_cost_ledger_journal_report
msgid "Account Analytic Cost Ledger For Journal Report"
msgstr ""
@@ -4341,8 +4612,25 @@
msgstr "Promjeni"
#. module: account
+<<<<<<< TREE
#: selection:account.journal,type:0
msgid "Bank and Cheques"
+=======
+#: code:addons/account/account.py:1431
+#: code:addons/account/account.py:1460
+#: code:addons/account/account.py:1467
+#: code:addons/account/account_invoice.py:920
+#: code:addons/account/account_move_line.py:1104
+#: code:addons/account/wizard/account_automatic_reconcile.py:152
+#: code:addons/account/wizard/account_fiscalyear_close.py:73
+#: code:addons/account/wizard/account_fiscalyear_close.py:83
+#: code:addons/account/wizard/account_fiscalyear_close.py:86
+#: code:addons/account/wizard/account_move_journal.py:165
+#: code:addons/account/wizard/account_report_aged_partner_balance.py:56
+#: code:addons/account/wizard/account_report_aged_partner_balance.py:58
+#, python-format
+msgid "UserError"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -4381,6 +4669,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:828
#, python-format
msgid ""
@@ -4401,6 +4690,8 @@
msgstr ""
#. module: account
+=======
+>>>>>>> MERGE-SOURCE
#: view:account.subscription.generate:0
#: model:ir.actions.act_window,name:account.action_account_subscription_generate
#: model:ir.ui.menu,name:account.menu_generate_subscription
@@ -4439,7 +4730,17 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:1567
+<<<<<<< TREE
+#: code:addons/account/account.py:1567
+=======
+#: code:addons/account/account_invoice.py:71
+#, python-format
+msgid "You must define an analytic journal of type '%s' !"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1567
+>>>>>>> MERGE-SOURCE
#, python-format
msgid ""
"Couldn't create move with currency different from the secondary currency of "
@@ -4476,9 +4777,21 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: model:ir.ui.menu,name:account.menu_finance_configuration
msgid "Configuration"
msgstr "Postavke"
+=======
+#: report:account.account.balance.landscape:0
+msgid "Account Balance -"
+msgstr "Saldo računa -"
+
+#. module: account
+#: code:addons/account/invoice.py:997
+#, python-format
+msgid "Invoice "
+msgstr ""
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.automatic.reconcile,date1:0
@@ -4525,6 +4838,7 @@
msgstr "Fakture"
#. module: account
+<<<<<<< TREE
#: view:account.invoice:0
msgid "My invoices"
msgstr ""
@@ -4532,6 +4846,13 @@
#. module: account
#: selection:account.bank.accounts.wizard,account_type:0
msgid "Check"
+=======
+#: code:addons/account/account_invoice.py:828
+#, python-format
+msgid ""
+"Please verify the price of the invoice !\n"
+"The real total does not match the computed total."
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -4657,6 +4978,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:1088
#: code:addons/account/account.py:1090
#: code:addons/account/account.py:1321
@@ -4679,6 +5001,24 @@
#: code:addons/account/wizard/account_report_common.py:150
#, python-format
msgid "Error"
+=======
+#: selection:account.account.type,report_type:0
+msgid "Balance Sheet (Assets Accounts)"
+msgstr ""
+
+#. module: account
+#: report:account.tax.code.entries:0
+msgid "Third Party (Country)"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_invoice_tree4
+msgid ""
+"With Supplier Refunds you can manage the credit notes you receive from your "
+"suppliers. A refund is a document that credits an invoice completely or "
+"partially. You can easily generate refunds and reconcile them directly from "
+"the invoice form."
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -4696,10 +5036,16 @@
msgstr "Detalji banke"
#. module: account
+<<<<<<< TREE
#: model:ir.actions.act_window,help:account.action_account_partner_balance
msgid ""
"This report is analysis by partner. It is a PDF report containing one line "
"per partner representing the cumulative credit balance."
+=======
+#: code:addons/account/account_invoice.py:739
+#, python-format
+msgid "Taxes missing !"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -4958,6 +5304,20 @@
msgstr "Mjesec"
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account_bank_statement.py:300
+#, python-format
+msgid "Journal Item \"%s\" is not valid"
+msgstr ""
+
+#. module: account
+#: view:account.payment.term:0
+msgid "Description on invoices"
+msgstr "Opis na fakturama"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: field:account.partner.reconcile.process,next_partner_id:0
msgid "Next Partner to Reconcile"
msgstr ""
@@ -5073,8 +5433,15 @@
msgstr "Dječiji porez"
#. module: account
+<<<<<<< TREE
#: model:ir.model,name:account.model_account_fiscal_position_tax_template
msgid "Template Tax Fiscal Position"
+=======
+#: code:addons/account/account.py:2067
+#: code:addons/account/wizard/account_use_model.py:69
+#, python-format
+msgid "No period found !"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -5307,12 +5674,36 @@
msgstr "Analitički računi"
#. module: account
+<<<<<<< TREE
#: view:account.invoice.report:0
msgid "Customer Invoices And Refunds"
msgstr ""
#. module: account
#: field:account.analytic.line,amount_currency:0
+=======
+#: help:account.account.type,report_type:0
+msgid ""
+"According value related accounts will be display on respective reports "
+"(Balance Sheet Profit & Loss Account)"
+msgstr ""
+
+#. module: account
+#: field:account.report.general.ledger,sortby:0
+msgid "Sort By"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1468
+#, python-format
+msgid ""
+"There is no default default credit account defined \n"
+"on journal \"%s\""
+msgstr ""
+
+#. module: account
+#: field:account.analytic.line,amount_currency:0
+>>>>>>> MERGE-SOURCE
#: field:account.entries.report,amount_currency:0
#: field:account.model.line,amount_currency:0
#: field:account.move.line,amount_currency:0
@@ -5678,6 +6069,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:2256
#, python-format
msgid "You have a wrong expression \"%(...)s\" in your model !"
@@ -5691,6 +6083,10 @@
#. module: account
#: code:addons/account/account_move_line.py:1155
#: code:addons/account/account_move_line.py:1238
+=======
+#: code:addons/account/account_move_line.py:1155
+#: code:addons/account/account_move_line.py:1238
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "You can not use an inactive account!"
msgstr ""
@@ -5726,14 +6122,47 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/report/common_report_header.py:100
+#: report:account.account.balance:0
+#: report:account.central.journal:0
+#: report:account.partner.balance:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:account.general.journal:0
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
+#: report:account.vat.declaration:0
+#, python-format
+msgid "No Filter"
+msgstr "Bez filtera"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: field:account.payment.term.line,days:0
msgid "Number of Days"
msgstr "Broj dana"
#. module: account
-#: code:addons/account/account_bank_statement.py:402
-#: code:addons/account/account_invoice.py:392
-#: code:addons/account/wizard/account_period_close.py:51
+<<<<<<< TREE
+#: code:addons/account/account_bank_statement.py:402
+#: code:addons/account/account_invoice.py:392
+#: code:addons/account/wizard/account_period_close.py:51
+=======
+#: selection:account.automatic.reconcile,power:0
+msgid "7"
+msgstr "7"
+
+#. module: account
+#: code:addons/account/account_bank_statement.py:402
+#: code:addons/account/account_invoice.py:392
+#: code:addons/account/wizard/account_period_close.py:51
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Invalid action !"
msgstr ""
@@ -5892,6 +6321,15 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/invoice.py:997
+#, python-format
+msgid "is validated."
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: view:account.chart.template:0
#: field:account.chart.template,account_root_id:0
msgid "Root Account"
@@ -5965,6 +6403,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: view:account.invoice.report:0
msgid "Open and Paid Invoices"
msgstr ""
@@ -5976,6 +6415,9 @@
#. module: account
#: code:addons/account/account.py:629
+=======
+#: code:addons/account/account.py:663
+>>>>>>> MERGE-SOURCE
#, python-format
msgid ""
"You can not remove/desactivate an account which is set on a customer or "
@@ -6215,7 +6657,12 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:664
+=======
+#: code:addons/account/account_invoice.py:417
+#: code:addons/account/account_invoice.py:517
+>>>>>>> MERGE-SOURCE
#, python-format
msgid ""
"You cannot change the owner company of an account that already contains "
@@ -6374,6 +6821,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:624
#, python-format
msgid "You can not remove an account containing journal items."
@@ -6382,6 +6830,10 @@
#. module: account
#: code:addons/account/account_analytic_line.py:145
#: code:addons/account/account_move_line.py:933
+=======
+#: code:addons/account/account_analytic_line.py:145
+#: code:addons/account/account_move_line.py:933
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Entries: "
msgstr ""
@@ -6392,12 +6844,16 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: help:res.partner.bank,currency_id:0
msgid "Currency of the related account journal."
msgstr ""
#. module: account
#: code:addons/account/account.py:1563
+=======
+#: code:addons/account/account.py:1563
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Couldn't create move between different companies"
msgstr ""
@@ -6453,10 +6909,15 @@
msgstr "Fax:"
#. module: account
+<<<<<<< TREE
#: view:wizard.multi.charts.accounts:0
msgid ""
"This will automatically configure your chart of accounts, bank accounts, "
"taxes and journals according to the selected template"
+=======
+#: report:account.vat.declaration:0
+msgid "Based On"
+>>>>>>> MERGE-SOURCE
msgstr ""
"Ovo će automatski podesiti vaš računski plan, bankovne račune, poreze i "
"temeljnice u skladu sa odabranim predloškom"
@@ -6620,6 +7081,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_move_line.py:1218
#, python-format
msgid ""
@@ -6637,6 +7099,16 @@
msgstr ""
#. module: account
+=======
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+msgid "JRNL"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: view:account.partner.balance:0
#: view:account.partner.ledger:0
msgid ""
@@ -6801,6 +7273,7 @@
msgstr "Podšifre"
#. module: account
+<<<<<<< TREE
#: view:account.tax.template:0
msgid "Taxes used in Sales"
msgstr ""
@@ -6808,6 +7281,10 @@
#. module: account
#: code:addons/account/account_invoice.py:495
#: code:addons/account/wizard/account_invoice_refund.py:145
+=======
+#: code:addons/account/account_invoice.py:495
+#: code:addons/account/wizard/account_invoice_refund.py:145
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Data Insufficient !"
msgstr ""
@@ -6962,6 +7439,17 @@
msgstr "Retci"
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account_invoice.py:532
+#, python-format
+msgid ""
+"Can not find account chart for this company in invoice line account, Please "
+"Create account."
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: view:account.tax.template:0
msgid "Account Tax Template"
msgstr "Predložak poreznog računa"
@@ -6977,6 +7465,7 @@
msgstr "Jeste sigurni da želite otvoriti ovu fakturu ?"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:528
#: code:addons/account/account_invoice.py:543
#, python-format
@@ -6992,6 +7481,9 @@
#. module: account
#: code:addons/account/account_move_line.py:999
+=======
+#: code:addons/account/account_move_line.py:999
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Accounting Entries"
msgstr "Knjiženja"
@@ -7071,9 +7563,24 @@
msgstr "Uredu"
#. module: account
+<<<<<<< TREE
#: field:account.chart.template,tax_code_root_id:0
msgid "Root Tax Code"
msgstr "Šifra korijenskog poreza"
+=======
+#: code:addons/account/report/account_partner_balance.py:115
+#, python-format
+msgid "Unknown Partner"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+#: code:addons/account/account.py:420
+#: code:addons/account/account.py:432
+#, python-format
+msgid "Opening Balance"
+msgstr ""
+>>>>>>> MERGE-SOURCE
#. module: account
#: help:account.journal,centralisation:0
@@ -7271,10 +7778,22 @@
msgstr "PRO-FORMA"
#. module: account
+<<<<<<< TREE
#: selection:account.entries.report,move_line_state:0
#: view:account.move.line:0
#: selection:account.move.line,state:0
msgid "Unbalanced"
+=======
+#: help:account.installer.modules,account_followup:0
+msgid ""
+"Helps you generate reminder letters for unpaid invoices, including multiple "
+"levels of reminding and customized per-partner policies."
+msgstr ""
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid " value amount: n.a"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -7294,10 +7813,21 @@
msgstr "Dodatne informacije"
#. module: account
+<<<<<<< TREE
#: code:addons/account/wizard/account_fiscalyear_close.py:84
#, python-format
msgid "The journal must have default credit and debit account"
msgstr ""
+=======
+#: view:account.analytic.line:0
+#: field:account.bank.statement,user_id:0
+#: view:account.journal:0
+#: field:account.journal,user_id:0
+#: view:analytic.entries.report:0
+#: field:analytic.entries.report,user_id:0
+msgid "User"
+msgstr "Korisnik"
+>>>>>>> MERGE-SOURCE
#. module: account
#: report:account.general.journal:0
@@ -7317,6 +7847,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: model:ir.ui.menu,name:account.menu_multi_currency
msgid "Multi-Currencies"
msgstr ""
@@ -7328,6 +7859,9 @@
#. module: account
#: code:addons/account/account_move_line.py:1302
+=======
+#: code:addons/account/account_move_line.py:1302
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Bad account !"
msgstr ""
@@ -7488,12 +8022,16 @@
msgstr "Porezi prodaje"
#. module: account
+<<<<<<< TREE
#: field:account.financial.report,name:0
msgid "Report Name"
msgstr ""
#. module: account
#: model:account.account.type,name:account.data_account_type_cash
+=======
+#: model:account.account.type,name:account.data_account_type_cash
+>>>>>>> MERGE-SOURCE
#: selection:account.analytic.journal,type:0
#: selection:account.bank.accounts.wizard,account_type:0
#: selection:account.entries.report,type:0
@@ -7728,6 +8266,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:3446
#, python-format
msgid ""
@@ -7736,6 +8275,9 @@
#. module: account
#: code:addons/account/wizard/account_invoice_refund.py:108
+=======
+#: code:addons/account/wizard/account_invoice_refund.py:108
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Can not %s draft/proforma/cancel invoice."
msgstr ""
@@ -7747,12 +8289,16 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: view:account.financial.report:0
msgid "Report Type"
msgstr ""
#. module: account
#: view:account.analytic.account:0
+=======
+#: view:account.analytic.account:0
+>>>>>>> MERGE-SOURCE
#: view:account.bank.statement:0
#: field:account.bank.statement,state:0
#: field:account.entries.report,move_state:0
@@ -7785,6 +8331,7 @@
msgstr "Upotreba poreza u"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_bank_statement.py:315
#, python-format
msgid ""
@@ -7794,6 +8341,9 @@
#. module: account
#: code:addons/account/account_bank_statement.py:353
+=======
+#: code:addons/account/account_bank_statement.py:353
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "The account entries lines are not in valid state."
msgstr ""
@@ -8483,10 +9033,18 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: model:account.account.type,name:account.data_account_type_expense
#: model:account.financial.report,name:account.account_financial_report_expense0
msgid "Expense"
msgstr "Trošak"
+=======
+#: code:addons/account/account_move_line.py:1155
+#: code:addons/account/account_move_line.py:1238
+#, python-format
+msgid "Bad account!"
+msgstr ""
+>>>>>>> MERGE-SOURCE
#. module: account
#: help:account.chart,fiscalyear:0
@@ -8913,12 +9471,28 @@
msgstr ""
#. module: account
-#: model:ir.actions.act_window,help:account.action_invoice_tree4
-msgid ""
-"With Supplier Refunds you can manage the credit notes you receive from your "
-"suppliers. A refund is a document that credits an invoice completely or "
-"partially. You can easily generate refunds and reconcile them directly from "
-"the invoice form."
+#: code:addons/account/account.py:1088
+#: code:addons/account/account.py:1090
+#: code:addons/account/account.py:1321
+#: code:addons/account/account.py:1563
+#: code:addons/account/account.py:1567
+#: code:addons/account/account.py:3368
+#: code:addons/account/account_move_line.py:807
+#: code:addons/account/account_move_line.py:830
+#: code:addons/account/account_move_line.py:832
+#: code:addons/account/account_move_line.py:835
+#: code:addons/account/account_move_line.py:837
+#: code:addons/account/report/common_report_header.py:92
+#: code:addons/account/wizard/account_change_currency.py:38
+#: code:addons/account/wizard/account_change_currency.py:59
+#: code:addons/account/wizard/account_change_currency.py:64
+#: code:addons/account/wizard/account_change_currency.py:70
+#: code:addons/account/wizard/account_financial_report.py:69
+#: code:addons/account/wizard/account_move_bank_reconcile.py:49
+#: code:addons/account/wizard/account_report_common.py:144
+#: code:addons/account/wizard/account_report_common.py:150
+#, python-format
+msgid "Error"
msgstr ""
#. module: account
@@ -8927,11 +9501,23 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: model:ir.actions.act_window,name:account.action_bank_statement_periodic_tree
#: model:ir.actions.act_window,name:account.action_bank_statement_tree
#: model:ir.ui.menu,name:account.menu_bank_statement_tree
msgid "Bank Statements"
msgstr ""
+=======
+#: selection:account.account.type,report_type:0
+msgid "Profit & Loss (Income Accounts)"
+msgstr ""
+
+#. module: account
+#: view:account.tax:0
+#: view:account.tax.template:0
+msgid "Keep empty to use the income account"
+msgstr "Ne popunjavati za upotrebu računa za prihod"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.account,balance:0
@@ -9222,9 +9808,18 @@
msgstr "Konto pretplate"
#. module: account
+<<<<<<< TREE
#: report:account.overdue:0
msgid "Maturity date"
msgstr "Datum dospijeća"
+=======
+#: code:addons/account/account_invoice.py:736
+#, python-format
+msgid ""
+"Tax base different !\n"
+"Click on compute to update tax base"
+msgstr ""
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.subscription:0
@@ -9262,6 +9857,7 @@
msgstr "Početni datum"
#. module: account
+<<<<<<< TREE
#: help:account.invoice,reconciled:0
msgid ""
"It indicates that the invoice has been paid and the journal entry of the "
@@ -9271,6 +9867,10 @@
#. module: account
#: view:account.invoice:0
#: view:account.invoice.report:0
+=======
+#: view:account.invoice:0
+#: view:account.invoice.report:0
+>>>>>>> MERGE-SOURCE
#: model:process.node,name:account.process_node_supplierdraftinvoices0
msgid "Draft Invoices"
msgstr "Fakture u pripremi"
@@ -9337,12 +9937,16 @@
msgstr "Aktivan"
#. module: account
+<<<<<<< TREE
#: view:accounting.report:0
msgid "Comparison"
msgstr ""
#. module: account
#: code:addons/account/account_invoice.py:372
+=======
+#: code:addons/account/account_invoice.py:372
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Unknown Error"
msgstr ""
@@ -9406,6 +10010,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: selection:account.account.type,report_type:0
#: code:addons/account/account.py:181
#, python-format
@@ -9418,6 +10023,11 @@
"Configuration Error! \n"
"You can not select an account type with a deferral method different of "
"\"Unreconciled\" for accounts with internal type \"Payable/Receivable\"! "
+=======
+#: view:account.general.journal:0
+#: model:ir.ui.menu,name:account.menu_account_general_journal
+msgid "General Journals"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -9680,6 +10290,17 @@
msgstr "Izvorni porez"
#. module: account
+<<<<<<< TREE
+=======
+#: report:account.balancesheet:0
+#: report:account.balancesheet.horizontal:0
+#: report:pl.account:0
+#: report:pl.account.horizontal:0
+msgid "Net Profit"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: view:ir.sequence:0
msgid "Fiscal Year Sequences"
msgstr "Sekvenca fiskalne godine"
@@ -9859,8 +10480,20 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: sql_constraint:account.journal:0
msgid "The code of the journal must be unique per company !"
+=======
+#: code:addons/account/account_move_line.py:759
+#: code:addons/account/account_move_line.py:842
+#: code:addons/account/wizard/account_invoice_state.py:44
+#: code:addons/account/wizard/account_invoice_state.py:68
+#: code:addons/account/wizard/account_state_open.py:37
+#: code:addons/account/wizard/account_validate_account_move.py:39
+#: code:addons/account/wizard/account_validate_account_move.py:61
+#, python-format
+msgid "Warning"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -9872,6 +10505,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: view:wizard.multi.charts.accounts:0
msgid "Generate Your Chart of Accounts from a Chart Template"
msgstr ""
@@ -9889,6 +10523,17 @@
#: view:account.move.line.reconcile.writeoff:0
msgid "Write-Off Move"
msgstr "Otpiši prijenos"
+=======
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
+#: selection:account.bank.statement,state:0
+#: selection:account.entries.report,type:0
+#: view:account.fiscalyear:0
+#: selection:account.fiscalyear,state:0
+#: selection:account.period,state:0
+msgid "Closed"
+msgstr "Zatvoreno"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:process.node,note:account.process_node_paidinvoice0
@@ -9955,16 +10600,20 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: selection:account.print.journal,sort_selection:0
msgid "Journal Entry Number"
msgstr ""
#. module: account
+=======
+>>>>>>> MERGE-SOURCE
#: view:account.subscription:0
msgid "Recurring"
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:642
#, python-format
msgid ""
@@ -9974,6 +10623,9 @@
#. module: account
#: code:addons/account/account_move_line.py:832
+=======
+#: code:addons/account/account_move_line.py:832
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Entry is already reconciled"
msgstr ""
@@ -10178,6 +10830,14 @@
msgstr "Račun prihoda ili troškova vezan za odabrani proizvod."
#. module: account
+<<<<<<< TREE
+=======
+#: constraint:account.move.line:0
+msgid "The date of your Journal Entry is not in the defined period!"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: field:account.subscription,period_total:0
msgid "Number of Periods"
msgstr "Broj perioda"
@@ -10203,6 +10863,7 @@
msgstr "Povrat"
#. module: account
+<<<<<<< TREE
#: model:email.template,body_text:account.email_template_edi_invoice
msgid ""
"\n"
@@ -10278,6 +10939,9 @@
#. module: account
#: model:ir.model,name:account.model_res_partner_bank
+=======
+#: model:ir.model,name:account.model_res_partner_bank
+>>>>>>> MERGE-SOURCE
msgid "Bank Accounts"
msgstr "Bankovna konta"
@@ -10479,6 +11143,7 @@
"The residual amount on a receivable or payable of a journal entry expressed "
"in its currency (maybe different of the company currency)."
msgstr ""
+<<<<<<< TREE
#~ msgid "Invalid model name in the action definition."
#~ msgstr "Neispravan naziv modela u definiciji zadatka."
@@ -11717,3 +12382,49 @@
#~ msgid "Include Reconciled Entries"
#~ msgstr "Uključi usklađene stavke"
+=======
+
+#. module: account
+#: model:account.financial.report,name:account.account_financial_report_assets0
+msgid "Assets"
+msgstr ""
+
+#. module: account
+#: model:account.account.template,name:0
+msgid "Liabilities"
+msgstr ""
+
+#. module: account
+#: report:account.balancesheet.horizontal:0
+#: report:account.balancesheet:0
+#: report:pl.account.horizontal:0
+#: report:pl.account:0
+msgid "Balance:"
+msgstr ""
+
+#. module: account
+#: report:pl.account.horizontal:0
+#: report:pl.account:0
+msgid "Particular"
+msgstr ""
+
+#. module: account
+#: report:account.aged_trial_balance:0
+msgid "Aged Trial Balance"
+msgstr "Zreli probni saldo"
+
+#. module: account
+#: report:account.aged_trial_balance:0
+msgid "Period Length(days)"
+msgstr ""
+
+#. module: account
+#: report:account.aged_trial_balance:0
+msgid "Account Total"
+msgstr ""
+
+#. module: account
+#: report:account.aged_trial_balance:0
+msgid "Not due"
+msgstr ""
+>>>>>>> MERGE-SOURCE
=== modified file 'account/i18n/ca.po'
--- account/i18n/ca.po 2012-02-29 09:45:02 +0000
+++ account/i18n/ca.po 2012-03-25 07:09:26 +0000
@@ -6,13 +6,20 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
+<<<<<<< TREE
"POT-Creation-Date: 2012-02-08 00:35+0000\n"
"PO-Revision-Date: 2011-11-07 13:03+0000\n"
"Last-Translator: OpenERP Administrators <Unknown>\n"
+=======
+"POT-Creation-Date: 2011-05-09 10:18+0000\n"
+"PO-Revision-Date: 2011-08-17 00:34+0000\n"
+"Last-Translator: mgaja (GrupoIsep.com) <Unknown>\n"
+>>>>>>> MERGE-SOURCE
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2012-02-09 06:17+0000\n"
"X-Generator: Launchpad (build 14763)\n"
@@ -21,6 +28,10 @@
#: view:analytic.entries.report:0
msgid "last month"
msgstr ""
+=======
+"X-Launchpad-Export-Date: 2012-02-22 05:11+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -30,19 +41,42 @@
#. module: account
#: view:account.journal:0
msgid "Other Configuration"
+<<<<<<< TREE
msgstr "Altra configuració"
#. module: account
#: help:account.tax.code,sequence:0
+=======
+msgstr "Altra configuració"
+
+#. module: account
+#: code:addons/account/account.py:506
+#, python-format
+>>>>>>> MERGE-SOURCE
msgid ""
+<<<<<<< TREE
"Determine the display order in the report 'Accounting \\ Reporting \\ "
"Generic Reporting \\ Taxes \\ Taxes Report'"
msgstr ""
+=======
+"You cannot remove/deactivate an account which is set as a property to any "
+"Partner."
+msgstr "No podeu suprimir/desactivar un compte vinculat a una empresa"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.move.reconcile:0
msgid "Journal Entry Reconcile"
-msgstr "Concilia l'assentament comptable"
+<<<<<<< TREE
+msgstr "Concilia l'assentament comptable"
+=======
+msgstr "Concilia l'assentament comptable"
+
+#. module: account
+#: field:account.installer.modules,account_voucher:0
+msgid "Voucher Management"
+msgstr "Gestió de rebuts"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.account:0
@@ -53,16 +87,28 @@
msgstr "Estadístiques de comptes"
#. module: account
+<<<<<<< TREE
#: view:account.invoice:0
msgid "Proforma/Open/Paid Invoices"
msgstr ""
#. module: account
+=======
+>>>>>>> MERGE-SOURCE
#: field:report.invoice.created,residual:0
msgid "Residual"
msgstr "Pendent"
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account_invoice.py:805
+#, python-format
+msgid "Please define sequence on invoice journal"
+msgstr "Definiu una seqüència en el diari de la factura"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: constraint:account.period:0
msgid "Error ! The duration of the Period(s) is/are invalid. "
msgstr "Error! La durada del període(s) no és vàlid. "
@@ -75,6 +121,7 @@
#. module: account
#: view:account.tax:0
msgid "Children Definition"
+<<<<<<< TREE
msgstr "Definició de fills"
#. module: account
@@ -82,6 +129,9 @@
#, python-format
msgid "Journal item \"%s\" is not valid."
msgstr ""
+=======
+msgstr "Definició de fills"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:ir.model,name:account.model_report_aged_receivable
@@ -89,6 +139,23 @@
msgstr "A cobrar anteriors fins avui"
#. module: account
+<<<<<<< TREE
+=======
+#: field:account.partner.ledger,reconcil:0
+msgid "Include Reconciled Entries"
+msgstr "Incloure assentaments conciliats"
+
+#. module: account
+#: view:account.pl.report:0
+msgid ""
+"The Profit and Loss report gives you an overview of your company profit and "
+"loss in a single document"
+msgstr ""
+"L'informe de pèrdues i guanys (PiG) li dóna una visió global de les pèrdues "
+"i guanys de la seva companyia en un únic document"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: model:process.transition,name:account.process_transition_invoiceimport0
msgid "Import from invoice or payment"
msgstr "Importa des de factura o pagament"
@@ -109,6 +176,7 @@
"If you unreconciliate transactions, you must also verify all the actions "
"that are linked to those transactions because they will not be disabled"
msgstr ""
+<<<<<<< TREE
"Si desconcileu transaccions, heu de verificar totes les accions relacionades "
"amb aquestes perquè no es desactivaran."
@@ -118,6 +186,21 @@
"Configuration error! The currency chosen should be shared by the default "
"accounts too."
msgstr ""
+=======
+"Si desconcileu transaccions, heu de verificar totes les accions relacionades "
+"amb aquestes perquè no es desactivaran."
+
+#. module: account
+#: report:account.tax.code.entries:0
+msgid "Accounting Entries-"
+msgstr "Assentaments comptables"
+
+#. module: account
+#: code:addons/account/account.py:1291
+#, python-format
+msgid "You can not delete posted movement: \"%s\"!"
+msgstr "No podeu eliminar el moviment fixat: \"%s\"!"
+>>>>>>> MERGE-SOURCE
#. module: account
#: report:account.invoice:0
@@ -162,6 +245,7 @@
#: code:addons/account/account_invoice.py:1428
#, python-format
msgid "Warning!"
+<<<<<<< TREE
msgstr "Avís!"
#. module: account
@@ -169,6 +253,9 @@
#, python-format
msgid "Miscellaneous Journal"
msgstr ""
+=======
+msgstr "Avís!"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.fiscal.position.account,account_src_id:0
@@ -220,9 +307,35 @@
msgstr "account.tax"
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account.py:901
+#, python-format
+msgid ""
+"No period defined for this date: %s !\n"
+"Please create a fiscal year."
+msgstr ""
+"Sense període definit per aquesta data: %s !\n"
+"Creeu un any fiscal."
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: model:ir.model,name:account.model_account_move_line_reconcile_select
msgid "Move line reconcile select"
-msgstr "Selecciona conciliació de la línia moviment"
+<<<<<<< TREE
+msgstr "Selecciona conciliació de la línia moviment"
+=======
+msgstr "Selecciona conciliació de la línia moviment"
+
+#. module: account
+#: help:account.model.line,sequence:0
+msgid ""
+"The sequence field is used to order the resources from lower sequences to "
+"higher ones"
+msgstr ""
+"El camp seqüència s'utilitza per ordenar els recursos de menor a major "
+"seqüència."
+>>>>>>> MERGE-SOURCE
#. module: account
#: help:account.tax.code,notprintable:0
@@ -257,12 +370,18 @@
msgstr "No podeu afegir/modificar assentaments en un diari tancat."
#. module: account
+<<<<<<< TREE
#: help:account.account,user_type:0
msgid ""
"Account Type is used for information purpose, to generate country-specific "
"legal reports, and set the rules to close a fiscal year and generate opening "
"entries."
msgstr ""
+=======
+#: view:account.bank.statement:0
+msgid "Calculated Balance"
+msgstr "Balanç calculat"
+>>>>>>> MERGE-SOURCE
#. module: account
#: report:account.overdue:0
@@ -372,6 +491,7 @@
"OpenERP. Journal items are created by OpenERP if you use Bank Statements, "
"Cash Registers, or Customer/Supplier payments."
msgstr ""
+<<<<<<< TREE
"Els comptables utilitzen aquesta vista per gravar registres en massa a "
"OpenERP. OpenERP crea els moviments comptables si fa ús d'extractes "
"bancaris, registres de caixa o pagaments de client/proveïdor."
@@ -380,6 +500,11 @@
#: constraint:account.move.line:0
msgid "You can not create journal items on an account of type view."
msgstr ""
+=======
+"Els comptables utilitzen aquesta vista per gravar registres en massa a "
+"OpenERP. OpenERP crea els moviments comptables si fa ús d'extractes "
+"bancaris, registres de caixa o pagaments de client/proveïdor."
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:ir.model,name:account.model_account_tax_template
@@ -545,12 +670,16 @@
#: help:account.vat.declaration,chart_account_id:0
#: help:accounting.report,chart_account_id:0
msgid "Select Charts of Accounts"
+<<<<<<< TREE
msgstr "Seleccioneu el pla comptable"
#. module: account
#: sql_constraint:res.company:0
msgid "The company name must be unique !"
msgstr ""
+=======
+msgstr "Seleccioneu el pla comptable"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:ir.model,name:account.model_account_invoice_refund
@@ -568,10 +697,17 @@
msgstr "Transaccions no conciliades"
#. module: account
+<<<<<<< TREE
#: report:account.general.ledger:0
#: report:account.general.ledger_landscape:0
msgid "Counterpart"
msgstr "Contrapartida"
+=======
+#: code:addons/account/account_cash_statement.py:348
+#, python-format
+msgid "CashBox Balance is not matching with Calculated Balance !"
+msgstr "El saldo del diari de caixa no concorda amb el saldo calculat !"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.fiscal.position:0
@@ -649,6 +785,7 @@
#. module: account
#: sql_constraint:account.sequence.fiscalyear:0
msgid "Main Sequence must be different from current !"
+<<<<<<< TREE
msgstr "La seqüència principal ha de ser diferent de l'actual!"
#. module: account
@@ -656,6 +793,9 @@
#, python-format
msgid "No period found or more than one period found for the given date."
msgstr ""
+=======
+msgstr "La seqüència principal ha de ser diferent de l'actual!"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.invoice.tax,tax_amount:0
@@ -669,6 +809,14 @@
msgstr "VENDA"
#. module: account
+<<<<<<< TREE
+=======
+#: help:account.bank.statement,balance_end_real:0
+msgid "closing balance entered by the cashbox verifier"
+msgstr "tancant el balanç introduït pel verificador de caixa"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: view:account.period:0
#: view:account.period.close:0
msgid "Close Period"
@@ -733,13 +881,20 @@
msgstr "Esteu segurs que voleu crear els assentaments?"
#. module: account
+<<<<<<< TREE
#: view:account.invoice:0
msgid "Print Invoice"
msgstr "Imprimeix factura"
+=======
+#: selection:account.bank.accounts.wizard,account_type:0
+msgid "Check"
+msgstr "Comprova"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.partner.reconcile.process,today_reconciled:0
msgid "Partners Reconciled Today"
+<<<<<<< TREE
msgstr "Empreses conciliades avui"
#. module: account
@@ -751,6 +906,15 @@
#: selection:account.financial.report,display_detail:0
msgid "Display children with hierarchy"
msgstr ""
+=======
+msgstr "Empreses conciliades avui"
+
+#. module: account
+#: code:addons/account/account_bank_statement.py:306
+#, python-format
+msgid "The statement balance is incorrect !\n"
+msgstr "El balanç de l'extracte bancari és incorrecte!\n"
+>>>>>>> MERGE-SOURCE
#. module: account
#: selection:account.payment.term.line,value:0
@@ -768,23 +932,31 @@
#: model:ir.model,name:account.model_project_account_analytic_line
#, python-format
msgid "Analytic Entries by line"
+<<<<<<< TREE
msgstr "Assentaments analítics per línia"
#. module: account
#: field:account.invoice.refund,filter_refund:0
msgid "Refund Method"
msgstr ""
+=======
+msgstr "Assentaments analítics per línia"
+>>>>>>> MERGE-SOURCE
#. module: account
#: code:addons/account/wizard/account_change_currency.py:38
#, python-format
msgid "You can only change currency for Draft Invoice !"
+<<<<<<< TREE
msgstr "Només podeu canviar la moneda per a factures a l'esborrany!"
#. module: account
#: model:ir.ui.menu,name:account.menu_account_report
msgid "Financial Report"
msgstr ""
+=======
+msgstr "Només podeu canviar la moneda per a factures a l'esborrany!"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.analytic.journal:0
@@ -833,19 +1005,32 @@
msgstr "No conciliació"
#. module: account
+<<<<<<< TREE
#: view:account.payment.term.line:0
msgid "At 14 net days 2 percent, remaining amount at 30 days end of month."
msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_analytic_journal_report
+=======
+#: model:ir.model,name:account.model_account_analytic_journal_report
+>>>>>>> MERGE-SOURCE
msgid "Account Analytic Journal"
msgstr "Diari analític comptable"
#. module: account
#: model:ir.model,name:account.model_account_automatic_reconcile
msgid "Automatic Reconcile"
-msgstr "Conciliació automàtica"
+<<<<<<< TREE
+msgstr "Conciliació automàtica"
+=======
+msgstr "Conciliació automàtica"
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid "Due date Computation"
+msgstr "Càlcul de la data de venciment"
+>>>>>>> MERGE-SOURCE
#. module: account
#: report:account.analytic.account.quantity_cost_ledger:0
@@ -903,9 +1088,15 @@
msgstr "Càlcul"
#. module: account
+<<<<<<< TREE
#: selection:account.invoice.refund,filter_refund:0
msgid "Cancel: refund invoice and reconcile"
msgstr ""
+=======
+#: view:account.move.line:0
+msgid "Next Partner to reconcile"
+msgstr "Propera empresa a conciliar"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.cashbox.line,pieces:0
@@ -936,6 +1127,7 @@
msgstr "Degut"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:1345
#, python-format
msgid ""
@@ -950,6 +1142,12 @@
"This account does not allow reconciliation! You should update the account "
"definition to change this."
msgstr ""
+=======
+#: view:account.invoice.report:0
+#: field:account.invoice.report,price_total_tax:0
+msgid "Total With Tax"
+msgstr "Total amb impostos"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.invoice:0
@@ -974,6 +1172,7 @@
msgstr "Consolidació"
#. module: account
+<<<<<<< TREE
#: model:account.account.type,name:account.data_account_type_liability
#: model:account.financial.report,name:account.account_financial_report_liability0
#: model:account.financial.report,name:account.account_financial_report_liabilitysum0
@@ -981,6 +1180,8 @@
msgstr "Passiu"
#. module: account
+=======
+>>>>>>> MERGE-SOURCE
#: view:account.entries.report:0
msgid "Extended Filters..."
msgstr "Filtres estesos..."
@@ -1012,6 +1213,7 @@
"amount.If the tax account is base tax code, this field will contain the "
"basic amount(without tax)."
msgstr ""
+<<<<<<< TREE
"Si el compte és un compte de tipus impositiu, aquest camp contindrà la suma "
"de l'impost. Si el compte és un tipus de base impositiva, el camp contindrà "
"la suma de la base imposable (sense impost)."
@@ -1021,6 +1223,11 @@
#, python-format
msgid "I can not locate a parent code for the template account!"
msgstr ""
+=======
+"Si el compte és un compte de tipus impositiu, aquest camp contindrà la suma "
+"de l'impost. Si el compte és un tipus de base impositiva, el camp contindrà "
+"la suma de la base imposable (sense impost)."
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.analytic.line:0
@@ -1090,6 +1297,7 @@
msgstr "Mode horitzontal"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:645
#, python-format
msgid ""
@@ -1101,6 +1309,11 @@
#: field:account.report.general.ledger,sortby:0
msgid "Sort by"
msgstr ""
+=======
+#: view:board.board:0
+msgid "Customer Invoices to Approve"
+msgstr "Factures de client per aprovar"
+>>>>>>> MERGE-SOURCE
#. module: account
#: help:account.fiscalyear.close,fy_id:0
@@ -1113,6 +1326,7 @@
"These types are defined according to your country. The type contains more "
"information about the account and its specificities."
msgstr ""
+<<<<<<< TREE
"Aquests tipus es defineixen d'acord a la legislació comptable del vostre "
"país. El tipus conté més informació sobre el compte i les seves "
"especificitats."
@@ -1123,6 +1337,11 @@
msgid ""
"You have to provide an account for the write off/exchange difference entry !"
msgstr ""
+=======
+"Aquests tipus es defineixen d'acord a la legislació comptable del vostre "
+"país. El tipus conté més informació sobre el compte i les seves "
+"especificitats."
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.tax:0
@@ -1138,7 +1357,16 @@
#: model:ir.actions.act_window,name:account.action_view_bank_statement_tree
#: model:ir.ui.menu,name:account.journal_cash_move_lines
msgid "Cash Registers"
-msgstr "Registres de caixa"
+<<<<<<< TREE
+msgstr "Registres de caixa"
+=======
+msgstr "Registres de caixa"
+
+#. module: account
+#: selection:account.account.type,report_type:0
+msgid "Profit & Loss (Expense Accounts)"
+msgstr "Pèrdues i Guanys (comptes de despeses)"
+>>>>>>> MERGE-SOURCE
#. module: account
#: report:account.analytic.account.journal:0
@@ -1156,12 +1384,16 @@
#. module: account
#: view:account.subscription.generate:0
msgid "Generate Entries before:"
+<<<<<<< TREE
msgstr "Genera els assentaments abans:"
#. module: account
#: view:account.move.line:0
msgid "Unbalanced Journal Items"
msgstr ""
+=======
+msgstr "Genera els assentaments abans:"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:account.account.type,name:account.data_account_type_bank
@@ -1179,6 +1411,7 @@
#. module: account
#: model:process.transition,name:account.process_transition_confirmstatementfromdraft0
msgid "Confirm statement"
+<<<<<<< TREE
msgstr "Confirma extracte"
#. module: account
@@ -1187,6 +1420,9 @@
"Total amount (in Secondary currency) for transactions held in secondary "
"currency for this account."
msgstr ""
+=======
+msgstr "Confirma extracte"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.fiscal.position.tax,tax_dest_id:0
@@ -1212,6 +1448,7 @@
"purchase orders or receipts. This way, you can control the invoice from your "
"supplier according to what you purchased or received."
msgstr ""
+<<<<<<< TREE
"Amb les factures de proveïdor podeu introduir i gestionar factures emeses "
"pels seus proveïdors. OpenERP també pot generar esborranys de factura "
"automàticament des de comandes o albarans de compra. D'aquesta forma, podeu "
@@ -1222,10 +1459,17 @@
#: model:ir.ui.menu,name:account.menu_action_account_tax_code_template_form
msgid "Tax Code Templates"
msgstr "Plantilles codis d'impostos"
+=======
+"Amb les factures de proveïdor podeu introduir i gestionar factures emeses "
+"pels seus proveïdors. OpenERP també pot generar esborranys de factura "
+"automàticament des de comandes o albarans de compra. D'aquesta forma, podeu "
+"contrastar la factura del seu proveïdor amb el comprat o rebut."
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.invoice.cancel:0
msgid "Cancel Invoices"
+<<<<<<< TREE
msgstr "Cancel·la factures"
#. module: account
@@ -1237,6 +1481,14 @@
#: view:account.tax.template:0
msgid "Taxes used in Purchases"
msgstr ""
+=======
+msgstr "Cancel·la factures"
+
+#. module: account
+#: view:account.unreconcile.reconcile:0
+msgid "Unreconciliation transactions"
+msgstr "Transaccions de no conciliació"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.invoice.tax,tax_code_id:0
@@ -1373,12 +1625,16 @@
#: code:addons/account/wizard/account_report_common.py:144
#, python-format
msgid "Select a starting and an ending period"
+<<<<<<< TREE
msgstr "Seleccioneu un període inicial i final"
#. module: account
#: model:account.financial.report,name:account.account_financial_report_profitandloss0
msgid "Profit and Loss"
msgstr ""
+=======
+msgstr "Seleccioneu un període inicial i final"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:ir.model,name:account.model_account_account_template
@@ -1388,7 +1644,16 @@
#. module: account
#: view:account.tax.code.template:0
msgid "Search tax template"
-msgstr "Cerca plantilla impostos"
+<<<<<<< TREE
+msgstr "Cerca plantilla impostos"
+=======
+msgstr "Cerca plantilla impostos"
+
+#. module: account
+#: report:account.invoice:0
+msgid "Your Reference"
+msgstr "La vostra referència"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.move.reconcile:0
@@ -1525,6 +1790,7 @@
#. module: account
#: view:account.entries.report:0
msgid "# of Entries "
+<<<<<<< TREE
msgstr "Nombre d'assentaments "
#. module: account
@@ -1533,6 +1799,9 @@
"By unchecking the active field, you may hide a fiscal position without "
"deleting it."
msgstr ""
+=======
+msgstr "Nombre d'assentaments "
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:ir.model,name:account.model_temp_range
@@ -1546,6 +1815,7 @@
msgstr "Factures rectificatives (abonament) de proveïdor"
#. module: account
+<<<<<<< TREE
#: selection:account.account,type:0
#: selection:account.account.template,type:0
#: selection:account.bank.statement,state:0
@@ -1555,6 +1825,36 @@
#: selection:account.period,state:0
msgid "Closed"
msgstr "Tancament"
+=======
+#: view:account.payment.term.line:0
+msgid ""
+"Example: at 14 net days 2 percents, remaining amount at 30 days end of month."
+msgstr ""
+"Per exemple: a 14 dies nets 2 per cent, import restant a 30 dies fi de mes."
+
+#. module: account
+#: code:addons/account/invoice.py:815
+#, python-format
+msgid ""
+"Cannot create the invoice !\n"
+"The payment term defined gives a computed amount greater than the total "
+"invoiced amount."
+msgstr ""
+"No es pot crear la factura!\n"
+"El termini de pagament definit genera un import superior a l'import total "
+"facturat."
+
+#. module: account
+#: field:account.installer.modules,account_anglo_saxon:0
+msgid "Anglo-Saxon Accounting"
+msgstr "Comptabilitat anglosaxona"
+
+#. module: account
+#: view:account.automatic.reconcile:0
+#: view:account.move.line.reconcile.writeoff:0
+msgid "Write-Off Move"
+msgstr "Moviment de desajust"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:ir.ui.menu,name:account.menu_finance_recurrent_entries
@@ -1567,6 +1867,14 @@
msgstr "Plantilla per posició fiscal"
#. module: account
+<<<<<<< TREE
+=======
+#: model:account.tax.code,name:account.account_tax_code_0
+msgid "Tax Code Test"
+msgstr "Test codi impost"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: field:account.automatic.reconcile,reconciled:0
msgid "Reconciled transactions"
msgstr "Transaccions conciliades"
@@ -1611,6 +1919,8 @@
#: view:account.move.line:0
msgid "Unposted Journal Items"
msgstr ""
+"Valors deure o haver incorrectes en el model (deure + haver ha de ser major "
+"que \"0\")!"
#. module: account
#: view:account.chart.template:0
@@ -1693,7 +2003,16 @@
#. module: account
#: view:account.invoice:0
msgid "Responsible"
-msgstr "Responsable"
+<<<<<<< TREE
+msgstr "Responsable"
+=======
+msgstr "Responsable"
+
+#. module: account
+#: report:account.overdue:0
+msgid "Sub-Total :"
+msgstr "Subtotal :"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
@@ -1712,6 +2031,7 @@
#. module: account
#: model:ir.ui.menu,name:account.periodical_processing_invoicing
msgid "Invoicing"
+<<<<<<< TREE
msgstr "Facturació"
#. module: account
@@ -1719,6 +2039,20 @@
#, python-format
msgid "Unknown Partner"
msgstr "Empresa desconeguda"
+=======
+msgstr "Facturació"
+
+#. module: account
+#: field:account.chart.template,tax_code_root_id:0
+msgid "Root Tax Code"
+msgstr "Codi impost arrel"
+
+#. module: account
+#: field:account.partner.ledger,initial_balance:0
+#: field:account.report.general.ledger,initial_balance:0
+msgid "Include initial balances"
+msgstr "Incloure balanços inicials"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.tax.code,sum:0
@@ -1726,6 +2060,7 @@
msgstr "Suma de l'any"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:1429
#, python-format
msgid ""
@@ -1734,6 +2069,8 @@
"Heu seleccionat una unitat de mesura que no és compatible amb el producte."
#. module: account
+=======
+>>>>>>> MERGE-SOURCE
#: view:account.change.currency:0
msgid "This wizard will change the currency of the invoice"
msgstr "Aquest assistent canviarà la moneda de la factura"
@@ -1745,6 +2082,7 @@
"Have a complete tree view of all journal items per account code by clicking "
"on an account."
msgstr ""
+<<<<<<< TREE
"Mostra el pla de comptes de l'empresa per exercici fiscal i filtrat pel "
"període. Obteniu una vista en arbre completa de tots els assentaments per "
"codi de compte que podeu estendre fent clic sobre un compte."
@@ -1758,6 +2096,27 @@
#: view:account.tax.template:0
msgid "Tax Declaration"
msgstr "Declaració d'impostos"
+=======
+"Mostra el pla de comptes de l'empresa per exercici fiscal i filtrat pel "
+"període. Obteniu una vista en arbre completa de tots els assentaments per "
+"codi de compte que podeu estendre fent clic sobre un compte."
+
+#. module: account
+#: constraint:account.fiscalyear:0
+msgid "Error! You cannot define overlapping fiscal years"
+msgstr "Error! No podeu definir exercicis fiscals que es superposin"
+
+#. module: account
+#: code:addons/account/account_move_line.py:835
+#, python-format
+msgid "The account is not defined to be reconciled !"
+msgstr "El compte no s'ha definit per ser conciliat!"
+
+#. module: account
+#: field:account.cashbox.line,pieces:0
+msgid "Values"
+msgstr "Valors"
+>>>>>>> MERGE-SOURCE
#. module: account
#: help:account.journal.period,active:0
@@ -1823,7 +2182,17 @@
#. module: account
#: view:account.tax:0
msgid "Tax Declaration: Credit Notes"
-msgstr "Declaració d'impostos: Factures rectficatives"
+<<<<<<< TREE
+msgstr "Declaració d'impostos: Factures rectficatives"
+=======
+msgstr "Declaració d'impostos: Factures rectficatives"
+
+#. module: account
+#: code:addons/account/account.py:499
+#, python-format
+msgid "You cannot deactivate an account that contains account moves."
+msgstr "No podeu desactivar un compte que conté assentaments comptables."
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.move.line.reconcile,credit:0
@@ -1831,12 +2200,35 @@
msgstr "Import haver"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:407
#: code:addons/account/account.py:412
#: code:addons/account/account.py:429
+=======
+#: constraint:account.move.line:0
+msgid "You can not create move line on closed account."
+msgstr "No podeu crear una línia de moviment en un compte tancat."
+
+#. module: account
+#: code:addons/account/account.py:519
+>>>>>>> MERGE-SOURCE
#, python-format
+<<<<<<< TREE
msgid "Error!"
msgstr ""
+=======
+msgid ""
+"You cannot change the type of account from 'Closed' to any other type which "
+"contains account entries!"
+msgstr ""
+"No podeu canviar el tipus de compte de 'Tancat' a qualsevol altre tipus si "
+"conté assentaments comptables!"
+
+#. module: account
+#: view:res.company:0
+msgid "Reserve And Profit/Loss Account"
+msgstr "Compte de reserves i pèrdues/guanys"
+>>>>>>> MERGE-SOURCE
#. module: account
#: sql_constraint:account.move.line:0
@@ -1866,9 +2258,15 @@
msgstr "Assentaments per línia"
#. module: account
+<<<<<<< TREE
#: field:account.vat.declaration,based_on:0
msgid "Based on"
msgstr ""
+=======
+#: report:account.tax.code.entries:0
+msgid "A/c Code"
+msgstr "Codi del compte"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.invoice,move_id:0
@@ -1898,12 +2296,16 @@
#. module: account
#: constraint:res.company:0
msgid "Error! You can not create recursive companies."
+<<<<<<< TREE
msgstr "Error! No podeu crear companyies recursives."
#. module: account
#: model:ir.actions.report.xml,name:account.account_journal_sale_purchase
msgid "Sale/Purchase Journal"
msgstr ""
+=======
+msgstr "Error! No podeu crear companyies recursives."
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.analytic.account:0
@@ -1939,12 +2341,24 @@
msgstr "/"
#. module: account
+<<<<<<< TREE
#: help:res.company,property_reserve_and_surplus_account:0
msgid ""
"This account is used for transferring Profit/Loss (If It is Profit: Amount "
"will be added, Loss : Amount will be deducted.), as calculated in Profit & "
"Loss Report"
+=======
+#: field:account.bs.report,reserve_account_id:0
+msgid "Reserve & Profit/Loss Account"
+msgstr "Compte de Reserves i Pèrdues/Guanys"
+
+#. module: account
+#: help:account.bank.statement,balance_end:0
+msgid "Closing balance based on Starting Balance and Cash Transactions"
+>>>>>>> MERGE-SOURCE
msgstr ""
+"Saldo de tancament calculat a partir del balanç inicial i les transaccions "
+"de caixa."
#. module: account
#: model:process.node,note:account.process_node_reconciliation0
@@ -1987,15 +2401,22 @@
"estigui dins de les dates del període."
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:73
#, python-format
msgid "You must define an analytic journal of type '%s'!"
msgstr ""
+=======
+#: model:ir.actions.act_window,name:account.action_account_pl_report
+msgid "Account Profit And Loss"
+msgstr "Compte de pèrdues i guanys"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.installer,config_logo:0
#: field:wizard.multi.charts.accounts,config_logo:0
msgid "Image"
+<<<<<<< TREE
msgstr "Imatge"
#. module: account
@@ -2010,6 +2431,9 @@
#: model:ir.actions.act_window,help:account.action_account_financial_report_tree
msgid "Makes a generic system to draw financial reports easily."
msgstr ""
+=======
+msgstr "Imatge"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.invoice:0
@@ -2023,6 +2447,7 @@
"If the active field is set to False, it will allow you to hide the tax "
"without removing it."
msgstr ""
+<<<<<<< TREE
"Si el camp actiu està desmarcat, permetrà ocultar l'impost sense eliminar-lo."
#. module: account
@@ -2052,6 +2477,27 @@
#: report:account.journal.period.print.sale.purchase:0
msgid "VAT Declaration"
msgstr ""
+=======
+"Si el camp actiu està desmarcat, permetrà ocultar l'impost sense eliminar-lo."
+
+#. module: account
+#: help:account.bank.statement,name:0
+msgid ""
+"if you give the Name other then /, its created Accounting Entries Move will "
+"be with same name as statement name. This allows the statement entries to "
+"have the same references than the statement itself"
+msgstr ""
+"si li doneu un nom diferent de /, l'assentament comptable tindrà el mateix "
+"nom que l'extracte. Això permet que els assentaments de l'extracte tinguin "
+"les mateixes referències que el propi extracte"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_unreconcile
+#: model:ir.actions.act_window,name:account.action_account_unreconcile_reconcile
+#: model:ir.actions.act_window,name:account.action_account_unreconcile_select
+msgid "Unreconcile Entries"
+msgstr "Trenca conciliació dels assentaments"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.move.reconcile,line_partial_ids:0
@@ -2133,7 +2579,17 @@
msgstr "Pro-forma"
#. module: account
-#: code:addons/account/account.py:1461
+<<<<<<< TREE
+#: code:addons/account/account.py:1461
+=======
+#: code:addons/account/installer.py:348
+#, python-format
+msgid " Journal"
+msgstr " Diari"
+
+#. module: account
+#: code:addons/account/account.py:1461
+>>>>>>> MERGE-SOURCE
#, python-format
msgid ""
"There is no default default debit account defined \n"
@@ -2161,6 +2617,7 @@
#. module: account
#: view:account.chart.template:0
msgid "Search Chart of Account Templates"
+<<<<<<< TREE
msgstr "Cerca plantilles de pla comptable"
#. module: account
@@ -2184,6 +2641,9 @@
#: report:account.invoice:0
msgid "Customer Code"
msgstr ""
+=======
+msgstr "Cerca plantilles de pla comptable"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.installer:0
@@ -2427,7 +2887,19 @@
#: model:process.node,note:account.process_node_draftinvoices0
#: model:process.node,note:account.process_node_supplierdraftinvoices0
msgid "Draft state of an invoice"
-msgstr "Estat esborrany d'una factura"
+<<<<<<< TREE
+msgstr "Estat esborrany d'una factura"
+=======
+msgstr "Estat esborrany d'una factura"
+
+#. module: account
+#: help:account.account,reconcile:0
+msgid ""
+"Check this if the user is allowed to reconcile entries in this account."
+msgstr ""
+"Marqueu aquesta opció si l'usuari se li permet conciliar assentaments en "
+"aquest compte."
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.partner.reconcile.process:0
@@ -2449,6 +2921,7 @@
"You can create one in the menu: \n"
"Configuration\\Financial Accounting\\Accounts\\Journals."
msgstr ""
+<<<<<<< TREE
"No es troba cap diari del tipus %s per a aquesta companyia.\n"
"\n"
"Heu de crear un en el menú: \n"
@@ -2464,6 +2937,12 @@
#: view:account.entries.report:0
msgid "Unreconciled entries"
msgstr "Assentaments no conciliats"
+=======
+"No es troba cap diari del tipus %s per a aquesta companyia.\n"
+"\n"
+"Heu de crear un en el menú: \n"
+"Configuració\\Comptabilitat financera\\Comptes\\Diaris."
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.invoice.tax,base_code_id:0
@@ -2596,9 +3075,15 @@
"específic"
#. module: account
+<<<<<<< TREE
#: model:ir.model,name:account.model_account_move_line_reconcile_writeoff
msgid "Account move line reconcile (writeoff)"
msgstr ""
+=======
+#: constraint:product.category:0
+msgid "Error ! You can not create recursive categories."
+msgstr "Error! No podeu crear categories recursives."
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:account.account.type,name:account.account_type_tax
@@ -2649,6 +3134,18 @@
msgstr "Data:"
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account.py:640
+#, python-format
+msgid ""
+"You cannot modify company of this journal as its related record exist in "
+"Entry Lines"
+msgstr ""
+"No podeu modificar l'empresa d'aquest diari perquè ja conté assentaments"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: report:account.journal.period.print:0
#: report:account.journal.period.print.sale.purchase:0
msgid "Label"
@@ -2690,6 +3187,7 @@
#: help:account.move.line,tax_code_id:0
msgid "The Account can either be a base tax code or a tax code account."
msgstr ""
+<<<<<<< TREE
"El compte pot ser o bé un compte d'un codi d'impost base o bé d'un codi "
"d'impost."
@@ -2697,6 +3195,10 @@
#: sql_constraint:account.model.line:0
msgid "Wrong credit or debit value in model, they must be positive!"
msgstr ""
+=======
+"El compte pot ser o bé un compte d'un codi d'impost base o bé d'un codi "
+"d'impost."
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:ir.ui.menu,name:account.menu_automatic_reconcile
@@ -2715,6 +3217,16 @@
msgstr "Codi base reintegrament"
#. module: account
+<<<<<<< TREE
+=======
+#: model:ir.actions.act_window,name:account.action_bank_statement_periodic_tree
+#: model:ir.actions.act_window,name:account.action_bank_statement_tree
+#: model:ir.ui.menu,name:account.menu_bank_statement_tree
+msgid "Bank Statements"
+msgstr "Extractes bancaris"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: selection:account.tax.template,applicable_type:0
msgid "True"
msgstr "Cert"
@@ -2726,12 +3238,16 @@
#: view:account.move.line:0
#: view:accounting.report:0
msgid "Dates"
+<<<<<<< TREE
msgstr "Dates"
#. module: account
#: field:account.chart.template,parent_id:0
msgid "Parent Chart Template"
msgstr ""
+=======
+msgstr "Dates"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.tax,parent_id:0
@@ -2765,12 +3281,16 @@
#: model:process.transition,name:account.process_transition_entriesreconcile0
#: model:process.transition,name:account.process_transition_supplierentriesreconcile0
msgid "Accounting entries"
+<<<<<<< TREE
msgstr "Assentaments comptables"
#. module: account
#: field:account.invoice,reference_type:0
msgid "Communication Type"
msgstr ""
+=======
+msgstr "Assentaments comptables"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.invoice.line,discount:0
@@ -2796,12 +3316,16 @@
#: model:ir.actions.server,name:account.ir_actions_server_action_wizard_multi_chart
#: model:ir.ui.menu,name:account.menu_act_ir_actions_bleble
msgid "New Company Financial Setting"
+<<<<<<< TREE
msgstr "Configuració financera per una nova companyia"
#. module: account
#: view:account.installer:0
msgid "Configure Your Chart of Accounts"
msgstr ""
+=======
+msgstr "Configuració financera per una nova companyia"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
@@ -2869,12 +3393,32 @@
#: selection:report.account.sales,month:0
#: selection:report.account_type.sales,month:0
msgid "August"
-msgstr "Agost"
+<<<<<<< TREE
+msgstr "Agost"
+=======
+msgstr "Agost"
+
+#. module: account
+#: code:addons/account/account_bank_statement.py:307
+#, python-format
+msgid ""
+"The expected balance (%.2f) is different than the computed one. (%.2f)"
+msgstr "El balanç previst (%.2f) és diferent del calculat. (%.2f)"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:process.transition,note:account.process_transition_paymentreconcile0
msgid "Payment entries are the second input of the reconciliation."
-msgstr "Les entrades de pagament són la segona entrada de la reconciliació."
+<<<<<<< TREE
+msgstr "Les entrades de pagament són la segona entrada de la reconciliació."
+=======
+msgstr "Les entrades de pagament són la segona entrada de la reconciliació."
+
+#. module: account
+#: selection:account.print.journal,sort_selection:0
+msgid "Reference Number"
+msgstr "Número de referència"
+>>>>>>> MERGE-SOURCE
#. module: account
#: selection:account.entries.report,month:0
@@ -2942,6 +3486,7 @@
#. module: account
#: field:wizard.multi.charts.accounts,sale_tax:0
msgid "Default Sale Tax"
+<<<<<<< TREE
msgstr "Impost de venda per defecte"
#. module: account
@@ -2949,6 +3494,9 @@
#, python-format
msgid "Invoice '%s' is validated."
msgstr "Factura '%s' és validada."
+=======
+msgstr "Impost de venda per defecte"
+>>>>>>> MERGE-SOURCE
#. module: account
#: help:account.model.line,date_maturity:0
@@ -2986,7 +3534,27 @@
msgstr "Posició fiscal"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:735
+=======
+#: help:account.partner.ledger,initial_balance:0
+#: help:account.report.general.ledger,initial_balance:0
+msgid ""
+"It adds initial balance row on report which display previous sum amount of "
+"debit/credit/balance"
+msgstr ""
+"Afegeix una fila de saldo inicial en l'informe que mostra l'import previ del "
+"deure/haver/saldo"
+
+#. module: account
+#: view:account.analytic.line:0
+#: model:ir.actions.act_window,name:account.action_account_analytic_line_form
+msgid "Analytic Entries"
+msgstr "Entrades analítiques"
+
+#. module: account
+#: code:addons/account/account.py:962
+>>>>>>> MERGE-SOURCE
#, python-format
msgid ""
"Tax base different!\n"
@@ -3034,6 +3602,7 @@
#. module: account
#: view:account.change.currency:0
msgid "Invoice Currency"
+<<<<<<< TREE
msgstr "Moneda de la factura"
#. module: account
@@ -3041,6 +3610,9 @@
#: model:ir.ui.menu,name:account.menu_account_financial_reports_tree
msgid "Account Reports"
msgstr ""
+=======
+msgstr "Moneda de la factura"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.payment.term,line_ids:0
@@ -3101,6 +3673,7 @@
#. module: account
#: selection:account.tax,applicable_type:0
msgid "Always"
+<<<<<<< TREE
msgstr "Sempre"
#. module: account
@@ -3108,6 +3681,9 @@
#: view:analytic.entries.report:0
msgid "Month-1"
msgstr ""
+=======
+msgstr "Sempre"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.analytic.line:0
@@ -3184,7 +3760,16 @@
#. module: account
#: help:account.journal.column,sequence:0
msgid "Gives the sequence order to journal column."
-msgstr "Indica l'ordre de seqüència de la columna del diari."
+<<<<<<< TREE
+msgstr "Indica l'ordre de seqüència de la columna del diari."
+=======
+msgstr "Indica l'ordre de seqüència de la columna del diari."
+
+#. module: account
+#: view:account.tax.template:0
+msgid "Tax Declaration"
+msgstr "Declaració d'impostos"
+>>>>>>> MERGE-SOURCE
#. module: account
#: help:account.account,currency_id:0
@@ -3223,12 +3808,16 @@
#. module: account
#: model:ir.model,name:account.model_account_unreconcile_reconcile
msgid "Account Unreconcile Reconcile"
+<<<<<<< TREE
msgstr "Concilia el compte desconciliat"
#. module: account
#: sql_constraint:account.tax:0
msgid "The description must be unique per company!"
msgstr ""
+=======
+msgstr "Concilia el
