[MERGE] from trunk

bzr revid: rco@openerp.com-20120403082756-egpot17iztniu8tr
This commit is contained in:
Raphael Collet 2012-04-03 10:27:56 +02:00
commit 017c5f8290
469 changed files with 13002 additions and 27125 deletions

View File

@ -1079,7 +1079,7 @@ class account_period(osv.osv):
def build_ctx_periods(self, cr, uid, period_from_id, period_to_id): def build_ctx_periods(self, cr, uid, period_from_id, period_to_id):
if period_from_id == period_to_id: if period_from_id == period_to_id:
return period_from_id return [period_from_id]
period_from = self.browse(cr, uid, period_from_id) period_from = self.browse(cr, uid, period_from_id)
period_date_start = period_from.date_start period_date_start = period_from.date_start
company1_id = period_from.company_id.id company1_id = period_from.company_id.id
@ -1652,7 +1652,7 @@ class account_move_reconcile(osv.osv):
'create_date': fields.date('Creation date', readonly=True), 'create_date': fields.date('Creation date', readonly=True),
} }
_defaults = { _defaults = {
'name': lambda self,cr,uid,ctx={}: self.pool.get('ir.sequence').get(cr, uid, 'account.reconcile') or '/', 'name': lambda self,cr,uid,ctx=None: self.pool.get('ir.sequence').get(cr, uid, 'account.reconcile', context=ctx) or '/',
} }
def reconcile_partial_check(self, cr, uid, ids, type='auto', context=None): def reconcile_partial_check(self, cr, uid, ids, type='auto', context=None):
@ -1841,7 +1841,7 @@ class account_tax(osv.osv):
PERCENT: tax = price * amount PERCENT: tax = price * amount
FIXED: tax = price + amount FIXED: tax = price + amount
NONE: no tax line NONE: no tax line
CODE: execute python code. localcontext = {'price_unit':pu, 'address':address_object} CODE: execute python code. localcontext = {'price_unit':pu}
return result in the context return result in the context
Ex: result=round(price_unit*0.21,4) Ex: result=round(price_unit*0.21,4)
""" """
@ -1963,8 +1963,8 @@ class account_tax(osv.osv):
return self.pool.get('res.company').search(cr, uid, [('parent_id', '=', False)])[0] return self.pool.get('res.company').search(cr, uid, [('parent_id', '=', False)])[0]
_defaults = { _defaults = {
'python_compute': '''# price_unit\n# address: res.partner.address object or False\n# product: product.product object or None\n# partner: res.partner object or None\n\nresult = price_unit * 0.10''', 'python_compute': '''# price_unit\n# or False\n# product: product.product object or None\n# partner: res.partner object or None\n\nresult = price_unit * 0.10''',
'python_compute_inv': '''# price_unit\n# address: res.partner.address object or False\n# product: product.product object or False\n\nresult = price_unit * 0.10''', 'python_compute_inv': '''# price_unit\n# product: product.product object or False\n\nresult = price_unit * 0.10''',
'applicable_type': 'true', 'applicable_type': 'true',
'type': 'percent', 'type': 'percent',
'amount': 0, 'amount': 0,
@ -1981,12 +1981,11 @@ class account_tax(osv.osv):
} }
_order = 'sequence' _order = 'sequence'
def _applicable(self, cr, uid, taxes, price_unit, address_id=None, product=None, partner=None): def _applicable(self, cr, uid, taxes, price_unit, product=None, partner=None):
res = [] res = []
obj_partener_address = self.pool.get('res.partner.address')
for tax in taxes: for tax in taxes:
if tax.applicable_type=='code': if tax.applicable_type=='code':
localdict = {'price_unit':price_unit, 'address':obj_partener_address.browse(cr, uid, address_id), 'product':product, 'partner':partner} localdict = {'price_unit':price_unit, 'product':product, 'partner':partner}
exec tax.python_applicable in localdict exec tax.python_applicable in localdict
if localdict.get('result', False): if localdict.get('result', False):
res.append(tax) res.append(tax)
@ -1994,11 +1993,10 @@ class account_tax(osv.osv):
res.append(tax) res.append(tax)
return res return res
def _unit_compute(self, cr, uid, taxes, price_unit, address_id=None, product=None, partner=None, quantity=0): def _unit_compute(self, cr, uid, taxes, price_unit, product=None, partner=None, quantity=0):
taxes = self._applicable(cr, uid, taxes, price_unit, address_id, product, partner) taxes = self._applicable(cr, uid, taxes, price_unit ,product, partner)
res = [] res = []
cur_price_unit=price_unit cur_price_unit=price_unit
obj_partener_address = self.pool.get('res.partner.address')
for tax in taxes: for tax in taxes:
# we compute the amount for the current tax object and append it to the result # we compute the amount for the current tax object and append it to the result
data = {'id':tax.id, data = {'id':tax.id,
@ -2026,8 +2024,7 @@ class account_tax(osv.osv):
data['tax_amount']=quantity data['tax_amount']=quantity
# data['amount'] = quantity # data['amount'] = quantity
elif tax.type=='code': elif tax.type=='code':
address = address_id and obj_partener_address.browse(cr, uid, address_id) or None localdict = {'price_unit':cur_price_unit, 'product':product, 'partner':partner}
localdict = {'price_unit':cur_price_unit, 'address':address, 'product':product, 'partner':partner}
exec tax.python_compute in localdict exec tax.python_compute in localdict
amount = localdict['result'] amount = localdict['result']
data['amount'] = amount data['amount'] = amount
@ -2040,7 +2037,7 @@ class account_tax(osv.osv):
if tax.child_depend: if tax.child_depend:
latest = res.pop() latest = res.pop()
amount = amount2 amount = amount2
child_tax = self._unit_compute(cr, uid, tax.child_ids, amount, address_id, product, partner, quantity) child_tax = self._unit_compute(cr, uid, tax.child_ids, amount, product, partner, quantity)
res.extend(child_tax) res.extend(child_tax)
if tax.child_depend: if tax.child_depend:
for r in res: for r in res:
@ -2060,7 +2057,7 @@ class account_tax(osv.osv):
cur_price_unit+=amount2 cur_price_unit+=amount2
return res return res
def compute_all(self, cr, uid, taxes, price_unit, quantity, address_id=None, product=None, partner=None, force_excluded=False): def compute_all(self, cr, uid, taxes, price_unit, quantity, product=None, partner=None, force_excluded=False):
""" """
:param force_excluded: boolean used to say that we don't want to consider the value of field price_include of :param force_excluded: boolean used to say that we don't want to consider the value of field price_include of
tax. It's used in encoding by line where you don't matter if you encoded a tax with that boolean to True or tax. It's used in encoding by line where you don't matter if you encoded a tax with that boolean to True or
@ -2080,7 +2077,7 @@ class account_tax(osv.osv):
tex.append(tax) tex.append(tax)
else: else:
tin.append(tax) tin.append(tax)
tin = self.compute_inv(cr, uid, tin, price_unit, quantity, address_id=address_id, product=product, partner=partner) tin = self.compute_inv(cr, uid, tin, price_unit, quantity, product=product, partner=partner)
for r in tin: for r in tin:
totalex -= r.get('amount', 0.0) totalex -= r.get('amount', 0.0)
totlex_qty = 0.0 totlex_qty = 0.0
@ -2088,7 +2085,7 @@ class account_tax(osv.osv):
totlex_qty = totalex/quantity totlex_qty = totalex/quantity
except: except:
pass pass
tex = self._compute(cr, uid, tex, totlex_qty, quantity, address_id=address_id, product=product, partner=partner) tex = self._compute(cr, uid, tex, totlex_qty, quantity,product=product, partner=partner)
for r in tex: for r in tex:
totalin += r.get('amount', 0.0) totalin += r.get('amount', 0.0)
return { return {
@ -2097,13 +2094,13 @@ class account_tax(osv.osv):
'taxes': tin + tex 'taxes': tin + tex
} }
def compute(self, cr, uid, taxes, price_unit, quantity, address_id=None, product=None, partner=None): def compute(self, cr, uid, taxes, price_unit, quantity, product=None, partner=None):
logger = netsvc.Logger() logger = netsvc.Logger()
logger.notifyChannel("warning", netsvc.LOG_WARNING, logger.notifyChannel("warning", netsvc.LOG_WARNING,
"Deprecated, use compute_all(...)['taxes'] instead of compute(...) to manage prices with tax included") "Deprecated, use compute_all(...)['taxes'] instead of compute(...) to manage prices with tax included")
return self._compute(cr, uid, taxes, price_unit, quantity, address_id, product, partner) return self._compute(cr, uid, taxes, price_unit, quantity, product, partner)
def _compute(self, cr, uid, taxes, price_unit, quantity, address_id=None, product=None, partner=None): def _compute(self, cr, uid, taxes, price_unit, quantity, product=None, partner=None):
""" """
Compute tax values for given PRICE_UNIT, QUANTITY and a buyer/seller ADDRESS_ID. Compute tax values for given PRICE_UNIT, QUANTITY and a buyer/seller ADDRESS_ID.
@ -2112,7 +2109,7 @@ class account_tax(osv.osv):
tax = {'name':'', 'amount':0.0, 'account_collected_id':1, 'account_paid_id':2} tax = {'name':'', 'amount':0.0, 'account_collected_id':1, 'account_paid_id':2}
one tax for each tax id in IDS and their children one tax for each tax id in IDS and their children
""" """
res = self._unit_compute(cr, uid, taxes, price_unit, address_id, product, partner, quantity) res = self._unit_compute(cr, uid, taxes, price_unit, product, partner, quantity)
total = 0.0 total = 0.0
precision_pool = self.pool.get('decimal.precision') precision_pool = self.pool.get('decimal.precision')
for r in res: for r in res:
@ -2123,9 +2120,8 @@ class account_tax(osv.osv):
total += r['amount'] total += r['amount']
return res return res
def _unit_compute_inv(self, cr, uid, taxes, price_unit, address_id=None, product=None, partner=None): def _unit_compute_inv(self, cr, uid, taxes, price_unit, product=None, partner=None):
taxes = self._applicable(cr, uid, taxes, price_unit, address_id, product, partner) taxes = self._applicable(cr, uid, taxes, price_unit, product, partner)
obj_partener_address = self.pool.get('res.partner.address')
res = [] res = []
taxes.reverse() taxes.reverse()
cur_price_unit = price_unit cur_price_unit = price_unit
@ -2150,8 +2146,7 @@ class account_tax(osv.osv):
amount = tax.amount amount = tax.amount
elif tax.type=='code': elif tax.type=='code':
address = address_id and obj_partener_address.browse(cr, uid, address_id) or None localdict = {'price_unit':cur_price_unit, 'product':product, 'partner':partner}
localdict = {'price_unit':cur_price_unit, 'address':address, 'product':product, 'partner':partner}
exec tax.python_compute_inv in localdict exec tax.python_compute_inv in localdict
amount = localdict['result'] amount = localdict['result']
elif tax.type=='balance': elif tax.type=='balance':
@ -2185,7 +2180,7 @@ class account_tax(osv.osv):
del res[-1] del res[-1]
amount = price_unit amount = price_unit
parent_tax = self._unit_compute_inv(cr, uid, tax.child_ids, amount, address_id, product, partner) parent_tax = self._unit_compute_inv(cr, uid, tax.child_ids, amount, product, partner)
res.extend(parent_tax) res.extend(parent_tax)
total = 0.0 total = 0.0
@ -2197,7 +2192,7 @@ class account_tax(osv.osv):
r['todo'] = 0 r['todo'] = 0
return res return res
def compute_inv(self, cr, uid, taxes, price_unit, quantity, address_id=None, product=None, partner=None): def compute_inv(self, cr, uid, taxes, price_unit, quantity, product=None, partner=None):
""" """
Compute tax values for given PRICE_UNIT, QUANTITY and a buyer/seller ADDRESS_ID. Compute tax values for given PRICE_UNIT, QUANTITY and a buyer/seller ADDRESS_ID.
Price Unit is a VAT included price Price Unit is a VAT included price
@ -2207,7 +2202,7 @@ class account_tax(osv.osv):
tax = {'name':'', 'amount':0.0, 'account_collected_id':1, 'account_paid_id':2} tax = {'name':'', 'amount':0.0, 'account_collected_id':1, 'account_paid_id':2}
one tax for each tax id in IDS and their children one tax for each tax id in IDS and their children
""" """
res = self._unit_compute_inv(cr, uid, taxes, price_unit, address_id, product, partner=None) res = self._unit_compute_inv(cr, uid, taxes, price_unit, product, partner=None)
total = 0.0 total = 0.0
obj_precision = self.pool.get('decimal.precision') obj_precision = self.pool.get('decimal.precision')
for r in res: for r in res:
@ -2806,8 +2801,8 @@ class account_tax_template(osv.osv):
return self.pool.get('res.company').search(cr, uid, [('parent_id', '=', False)])[0] return self.pool.get('res.company').search(cr, uid, [('parent_id', '=', False)])[0]
_defaults = { _defaults = {
'python_compute': lambda *a: '''# price_unit\n# address: res.partner.address object or False\n# product: product.product object or None\n# partner: res.partner object or None\n\nresult = price_unit * 0.10''', 'python_compute': lambda *a: '''# price_unit\n# product: product.product object or None\n# partner: res.partner object or None\n\nresult = price_unit * 0.10''',
'python_compute_inv': lambda *a: '''# price_unit\n# address: res.partner.address object or False\n# product: product.product object or False\n\nresult = price_unit * 0.10''', 'python_compute_inv': lambda *a: '''# price_unit\n# product: product.product object or False\n\nresult = price_unit * 0.10''',
'applicable_type': 'true', 'applicable_type': 'true',
'type': 'percent', 'type': 'percent',
'amount': 0, 'amount': 0,

View File

@ -55,7 +55,7 @@ class bank(osv.osv):
# Find the code and parent of the bank account to create # Find the code and parent of the bank account to create
dig = 6 dig = 6
current_num = 1 current_num = 1
ids = obj_acc.search(cr, uid, [('type','=','liquidity')], context=context) ids = obj_acc.search(cr, uid, [('type','=','liquidity'), ('company_id', '=', bank.company_id.id)], context=context)
# No liquidity account exists, no template available # No liquidity account exists, no template available
if not ids: continue if not ids: continue

View File

@ -341,11 +341,11 @@ class account_bank_statement(osv.osv):
if not st.name == '/': if not st.name == '/':
st_number = st.name st_number = st.name
else: else:
c = {'fiscalyear_id': st.period_id.fiscalyear_id.id}
if st.journal_id.sequence_id: if st.journal_id.sequence_id:
c = {'fiscalyear_id': st.period_id.fiscalyear_id.id}
st_number = obj_seq.next_by_id(cr, uid, st.journal_id.sequence_id.id, context=c) st_number = obj_seq.next_by_id(cr, uid, st.journal_id.sequence_id.id, context=c)
else: else:
st_number = obj_seq.next_by_code(cr, uid, 'account.bank.statement') st_number = obj_seq.next_by_code(cr, uid, 'account.bank.statement', context=c)
for line in st.move_line_ids: for line in st.move_line_ids:
if line.state <> 'valid': if line.state <> 'valid':

View File

@ -279,11 +279,11 @@ class account_cash_statement(osv.osv):
raise osv.except_osv(_('Error !'), (_('User %s does not have rights to access %s journal !') % (statement.user_id.name, statement.journal_id.name))) raise osv.except_osv(_('Error !'), (_('User %s does not have rights to access %s journal !') % (statement.user_id.name, statement.journal_id.name)))
if statement.name and statement.name == '/': if statement.name and statement.name == '/':
c = {'fiscalyear_id': statement.period_id.fiscalyear_id.id}
if statement.journal_id.sequence_id: if statement.journal_id.sequence_id:
c = {'fiscalyear_id': statement.period_id.fiscalyear_id.id}
st_number = obj_seq.next_by_id(cr, uid, statement.journal_id.sequence_id.id, context=c) st_number = obj_seq.next_by_id(cr, uid, statement.journal_id.sequence_id.id, context=c)
else: else:
st_number = obj_seq.next_by_code(cr, uid, 'account.cash.statement') st_number = obj_seq.next_by_code(cr, uid, 'account.cash.statement', context=c)
vals.update({ vals.update({
'name': st_number 'name': st_number
}) })

View File

@ -216,8 +216,6 @@ class account_invoice(osv.osv):
help="If you use payment terms, the due date will be computed automatically at the generation "\ help="If you use payment terms, the due date will be computed automatically at the generation "\
"of accounting entries. If you keep the payment term and the due date empty, it means direct payment. The payment term may compute several due dates, for example 50% now, 50% in one month."), "of accounting entries. If you keep the payment term and the due date empty, it means direct payment. The payment term may compute several due dates, for example 50% now, 50% in one month."),
'partner_id': fields.many2one('res.partner', 'Partner', change_default=True, readonly=True, required=True, states={'draft':[('readonly',False)]}), 'partner_id': fields.many2one('res.partner', 'Partner', change_default=True, readonly=True, required=True, states={'draft':[('readonly',False)]}),
'address_contact_id': fields.many2one('res.partner.address', 'Contact Address', readonly=True, states={'draft':[('readonly',False)]}),
'address_invoice_id': fields.many2one('res.partner.address', 'Invoice Address', readonly=True, required=True, states={'draft':[('readonly',False)]}),
'payment_term': fields.many2one('account.payment.term', 'Payment Term',readonly=True, states={'draft':[('readonly',False)]}, 'payment_term': fields.many2one('account.payment.term', 'Payment Term',readonly=True, states={'draft':[('readonly',False)]},
help="If you use payment terms, the due date will be computed automatically at the generation "\ help="If you use payment terms, the due date will be computed automatically at the generation "\
"of accounting entries. If you keep the payment term and the due date empty, it means direct payment. "\ "of accounting entries. If you keep the payment term and the due date empty, it means direct payment. "\
@ -396,7 +394,6 @@ class account_invoice(osv.osv):
def onchange_partner_id(self, cr, uid, ids, type, partner_id,\ def onchange_partner_id(self, cr, uid, ids, type, partner_id,\
date_invoice=False, payment_term=False, partner_bank_id=False, company_id=False): date_invoice=False, payment_term=False, partner_bank_id=False, company_id=False):
invoice_addr_id = False invoice_addr_id = False
contact_addr_id = False
partner_payment_term = False partner_payment_term = False
acc_id = False acc_id = False
bank_id = False bank_id = False
@ -406,8 +403,7 @@ class account_invoice(osv.osv):
if partner_id: if partner_id:
opt.insert(0, ('id', partner_id)) opt.insert(0, ('id', partner_id))
res = self.pool.get('res.partner').address_get(cr, uid, [partner_id], ['contact', 'invoice']) res = self.pool.get('res.partner').address_get(cr, uid, [partner_id], ['invoice'])
contact_addr_id = res['contact']
invoice_addr_id = res['invoice'] invoice_addr_id = res['invoice']
p = self.pool.get('res.partner').browse(cr, uid, partner_id) p = self.pool.get('res.partner').browse(cr, uid, partner_id)
if company_id: if company_id:
@ -442,8 +438,6 @@ class account_invoice(osv.osv):
bank_id = p.bank_ids[0].id bank_id = p.bank_ids[0].id
result = {'value': { result = {'value': {
'address_contact_id': contact_addr_id,
'address_invoice_id': invoice_addr_id,
'account_id': acc_id, 'account_id': acc_id,
'payment_term': partner_payment_term, 'payment_term': partner_payment_term,
'fiscal_position': fiscal_position 'fiscal_position': fiscal_position
@ -1092,7 +1086,7 @@ class account_invoice(osv.osv):
return map(lambda x: (0,0,x), lines) return map(lambda x: (0,0,x), lines)
def refund(self, cr, uid, ids, date=None, period_id=None, description=None, journal_id=None): 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', 'partner_contact', 'partner_insite', 'partner_ref', 'payment_term', 'account_id', 'currency_id', 'invoice_line', 'tax_line', 'journal_id'])
obj_invoice_line = self.pool.get('account.invoice.line') obj_invoice_line = self.pool.get('account.invoice.line')
obj_invoice_tax = self.pool.get('account.invoice.tax') obj_invoice_tax = self.pool.get('account.invoice.tax')
obj_journal = self.pool.get('account.journal') obj_journal = self.pool.get('account.journal')
@ -1140,7 +1134,7 @@ class account_invoice(osv.osv):
'name': description, 'name': description,
}) })
# take the id part of the tuple returned for many2one fields # take the id part of the tuple returned for many2one fields
for field in ('address_contact_id', 'address_invoice_id', 'partner_id', for field in ('partner_id',
'account_id', 'currency_id', 'payment_term', 'journal_id'): 'account_id', 'currency_id', 'payment_term', 'journal_id'):
invoice[field] = invoice[field] and invoice[field][0] invoice[field] = invoice[field] and invoice[field][0]
# create the new invoice # create the new invoice
@ -1257,7 +1251,7 @@ class account_invoice_line(osv.osv):
cur_obj = self.pool.get('res.currency') cur_obj = self.pool.get('res.currency')
for line in self.browse(cr, uid, ids): for line in self.browse(cr, uid, ids):
price = line.price_unit * (1-(line.discount or 0.0)/100.0) price = line.price_unit * (1-(line.discount or 0.0)/100.0)
taxes = tax_obj.compute_all(cr, uid, line.invoice_line_tax_id, price, line.quantity, product=line.product_id, address_id=line.invoice_id.address_invoice_id, partner=line.invoice_id.partner_id) taxes = tax_obj.compute_all(cr, uid, line.invoice_line_tax_id, price, line.quantity, product=line.product_id, partner=line.invoice_id.partner_id)
res[line.id] = taxes['total'] res[line.id] = taxes['total']
if line.invoice_id: if line.invoice_id:
cur = line.invoice_id.currency_id cur = line.invoice_id.currency_id
@ -1277,7 +1271,7 @@ class account_invoice_line(osv.osv):
taxes = l[2].get('invoice_line_tax_id') taxes = l[2].get('invoice_line_tax_id')
if len(taxes[0]) >= 3 and taxes[0][2]: if len(taxes[0]) >= 3 and taxes[0][2]:
taxes = tax_obj.browse(cr, uid, list(taxes[0][2])) taxes = tax_obj.browse(cr, uid, list(taxes[0][2]))
for tax in tax_obj.compute_all(cr, uid, taxes, p,l[2].get('quantity'), context.get('address_invoice_id', False), l[2].get('product_id', False), context.get('partner_id', False))['taxes']: for tax in tax_obj.compute_all(cr, uid, taxes, p,l[2].get('quantity'), l[2].get('product_id', False), context.get('partner_id', False))['taxes']:
t = t - tax['amount'] t = t - tax['amount']
return t return t
return 0 return 0
@ -1322,7 +1316,7 @@ class account_invoice_line(osv.osv):
res['arch'] = etree.tostring(doc) res['arch'] = etree.tostring(doc)
return res return res
def product_id_change(self, cr, uid, ids, product, uom, qty=0, name='', type='out_invoice', partner_id=False, fposition_id=False, price_unit=False, address_invoice_id=False, currency_id=False, context=None, company_id=None): def product_id_change(self, cr, uid, ids, product, uom, qty=0, name='', type='out_invoice', partner_id=False, fposition_id=False, price_unit=False, currency_id=False, context=None, company_id=None):
if context is None: if context is None:
context = {} context = {}
company_id = company_id if company_id != None else context.get('company_id',False) company_id = company_id if company_id != None else context.get('company_id',False)
@ -1397,14 +1391,14 @@ class account_invoice_line(osv.osv):
res_final['value']['price_unit'] = new_price res_final['value']['price_unit'] = new_price
return res_final return res_final
def uos_id_change(self, cr, uid, ids, product, uom, qty=0, name='', type='out_invoice', partner_id=False, fposition_id=False, price_unit=False, address_invoice_id=False, currency_id=False, context=None, company_id=None): def uos_id_change(self, cr, uid, ids, product, uom, qty=0, name='', type='out_invoice', partner_id=False, fposition_id=False, price_unit=False, currency_id=False, context=None, company_id=None):
if context is None: if context is None:
context = {} context = {}
company_id = company_id if company_id != None else context.get('company_id',False) company_id = company_id if company_id != None else context.get('company_id',False)
context = dict(context) context = dict(context)
context.update({'company_id': company_id}) context.update({'company_id': company_id})
warning = {} warning = {}
res = self.product_id_change(cr, uid, ids, product, uom, qty, name, type, partner_id, fposition_id, price_unit, address_invoice_id, currency_id, context=context) res = self.product_id_change(cr, uid, ids, product, uom, qty, name, type, partner_id, fposition_id, price_unit, currency_id, context=context)
if 'uos_id' in res['value']: if 'uos_id' in res['value']:
del res['value']['uos_id'] del res['value']['uos_id']
if not uom: if not uom:
@ -1437,7 +1431,7 @@ class account_invoice_line(osv.osv):
tax_code_found= False tax_code_found= False
for tax in tax_obj.compute_all(cr, uid, line.invoice_line_tax_id, for tax in tax_obj.compute_all(cr, uid, line.invoice_line_tax_id,
(line.price_unit * (1.0 - (line['discount'] or 0.0) / 100.0)), (line.price_unit * (1.0 - (line['discount'] or 0.0) / 100.0)),
line.quantity, inv.address_invoice_id.id, line.product_id, line.quantity, line.product_id,
inv.partner_id)['taxes']: inv.partner_id)['taxes']:
if inv.type in ('out_invoice', 'in_invoice'): if inv.type in ('out_invoice', 'in_invoice'):
@ -1572,7 +1566,7 @@ class account_invoice_tax(osv.osv):
company_currency = inv.company_id.currency_id.id company_currency = inv.company_id.currency_id.id
for line in inv.invoice_line: for line in inv.invoice_line:
for tax in tax_obj.compute_all(cr, uid, line.invoice_line_tax_id, (line.price_unit* (1-(line.discount or 0.0)/100.0)), line.quantity, inv.address_invoice_id.id, line.product_id, inv.partner_id)['taxes']: for tax in tax_obj.compute_all(cr, uid, line.invoice_line_tax_id, (line.price_unit* (1-(line.discount or 0.0)/100.0)), line.quantity, line.product_id, inv.partner_id)['taxes']:
tax['price_unit'] = cur_obj.round(cr, uid, cur, tax['price_unit']) tax['price_unit'] = cur_obj.round(cr, uid, cur, tax['price_unit'])
val={} val={}
val['invoice_id'] = inv.id val['invoice_id'] = inv.id

View File

@ -51,12 +51,12 @@
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Invoice Line"> <form string="Invoice Line">
<field name="product_id" on_change="product_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.address_invoice_id, parent.currency_id, context, parent.company_id)"/> <field name="product_id" on_change="product_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.currency_id, context, parent.company_id)"/>
<field colspan="2" name="name"/> <field colspan="2" name="name"/>
<label string="Quantity :" align="1.0"/> <label string="Quantity :" align="1.0"/>
<group colspan="1" col="2"> <group colspan="1" col="2">
<field name="quantity" nolabel="1"/> <field name="quantity" nolabel="1"/>
<field name="uos_id" on_change="uos_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.address_invoice_id, parent.currency_id, context, parent.company_id)" nolabel="1"/> <field name="uos_id" on_change="uos_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.currency_id, context, parent.company_id)" nolabel="1"/>
</group> </group>
<field name="price_unit"/> <field name="price_unit"/>
<field domain="[('company_id', '=', parent.company_id), ('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view')]" name="account_id" on_change="onchange_account_id(product_id, parent.partner_id, parent.type, parent.fiscal_position,account_id)"/> <field domain="[('company_id', '=', parent.company_id), ('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view')]" name="account_id" on_change="onchange_account_id(product_id, parent.partner_id, parent.type, parent.fiscal_position,account_id)"/>
@ -153,7 +153,6 @@
<button name="%(action_account_change_currency)d" type="action" icon="terp-stock_effects-object-colorize" string="Change" attrs="{'invisible':[('state','!=','draft')]}" groups="account.group_account_user"/> <button name="%(action_account_change_currency)d" type="action" icon="terp-stock_effects-object-colorize" string="Change" attrs="{'invisible':[('state','!=','draft')]}" groups="account.group_account_user"/>
<newline/> <newline/>
<field string="Supplier" name="partner_id" on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank_id,company_id)" context="{'default_customer': 0, 'search_default_supplier': 1, 'default_supplier': 1}" options='{"quick_create": false}' domain="[('supplier', '=', True)]"/> <field string="Supplier" name="partner_id" on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank_id,company_id)" context="{'default_customer': 0, 'search_default_supplier': 1, 'default_supplier': 1}" options='{"quick_create": false}' domain="[('supplier', '=', True)]"/>
<field domain="[('partner_id','=',partner_id)]" name="address_invoice_id" context="{'default_partner_id': partner_id}" options='{"quick_create": false}'/>
<field name="fiscal_position" groups="base.group_extended" widget="selection"/> <field name="fiscal_position" groups="base.group_extended" widget="selection"/>
<newline/> <newline/>
<field name="date_invoice"/> <field name="date_invoice"/>
@ -168,9 +167,9 @@
<field name="reference_type" nolabel="1" size="0"/> <field name="reference_type" nolabel="1" size="0"/>
<field name="reference" nolabel="1"/> <field name="reference" nolabel="1"/>
<field name="date_due"/> <field name="date_due"/>
<field colspan="4" context="{'address_invoice_id': address_invoice_id, 'partner_id': partner_id, 'price_type': 'price_type' in dir() and price_type or False, 'type': type}" name="invoice_line" nolabel="1"> <field colspan="4" context="{'partner_id': partner_id, 'price_type': 'price_type' in dir() and price_type or False, 'type': type}" name="invoice_line" nolabel="1">
<tree string="Invoice lines"> <tree string="Invoice lines">
<field name="product_id" on_change="product_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.address_invoice_id, parent.currency_id, context, parent.company_id)"/> <field name="product_id" on_change="product_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.currency_id, context, parent.company_id)"/>
<field domain="[('company_id', '=', parent.company_id), ('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view')]" name="account_id" on_change="onchange_account_id(product_id,parent.partner_id,parent.type,parent.fiscal_position,account_id)"/> <field domain="[('company_id', '=', parent.company_id), ('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view')]" name="account_id" on_change="onchange_account_id(product_id,parent.partner_id,parent.type,parent.fiscal_position,account_id)"/>
<field name="invoice_line_tax_id" view_mode="2" context="{'type':parent.type}" domain="[('parent_id','=',False)]"/> <field name="invoice_line_tax_id" view_mode="2" context="{'type':parent.type}" domain="[('parent_id','=',False)]"/>
<field domain="[('type','&lt;&gt;','view'), ('company_id', '=', parent.company_id), ('parent_id', '!=', False)]" name="account_analytic_id" groups="analytic.group_analytic_accounting"/> <field domain="[('type','&lt;&gt;','view'), ('company_id', '=', parent.company_id), ('parent_id', '!=', False)]" name="account_analytic_id" groups="analytic.group_analytic_accounting"/>
@ -223,7 +222,6 @@
<field name="name"/> <field name="name"/>
<newline/> <newline/>
<field name="origin" groups="base.group_extended"/> <field name="origin" groups="base.group_extended"/>
<field domain="[('partner_id','=',partner_id)]" name="address_contact_id" groups="base.group_extended"/>
<field name="user_id"/> <field name="user_id"/>
<field name="move_id" groups="account.group_account_user"/> <field name="move_id" groups="account.group_account_user"/>
<separator colspan="4" string="Additional Information"/> <separator colspan="4" string="Additional Information"/>
@ -263,7 +261,6 @@
<button name="%(action_account_change_currency)d" type="action" icon="terp-stock_effects-object-colorize" string="Change" attrs="{'invisible':[('state','!=','draft')]}" groups="account.group_account_user"/> <button name="%(action_account_change_currency)d" type="action" icon="terp-stock_effects-object-colorize" string="Change" attrs="{'invisible':[('state','!=','draft')]}" groups="account.group_account_user"/>
<newline/> <newline/>
<field string="Customer" name="partner_id" on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank_id,company_id)" groups="base.group_user" context="{'search_default_customer': 1}" options='{"quick_create": false}' domain="[('customer', '=', True)]"/> <field string="Customer" name="partner_id" on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank_id,company_id)" groups="base.group_user" context="{'search_default_customer': 1}" options='{"quick_create": false}' domain="[('customer', '=', True)]"/>
<field domain="[('partner_id','=',partner_id)]" name="address_invoice_id" context="{'default_partner_id': partner_id}" options='{"quick_create": false}'/>
<field name="fiscal_position" groups="base.group_extended" widget="selection" options='{"quick_create": false}'/> <field name="fiscal_position" groups="base.group_extended" widget="selection" options='{"quick_create": false}'/>
<newline/> <newline/>
<field name="date_invoice"/> <field name="date_invoice"/>
@ -321,8 +318,6 @@
<field domain="[('partner_id.ref_companies', 'in', [company_id])]" name="partner_bank_id" <field domain="[('partner_id.ref_companies', 'in', [company_id])]" name="partner_bank_id"
groups="base.group_extended"/> groups="base.group_extended"/>
<field name="origin"/> <field name="origin"/>
<field colspan="4" domain="[('partner_id','=',partner_id)]" name="address_contact_id"
groups="base.group_extended"/>
<field name="move_id" groups="account.group_account_user"/> <field name="move_id" groups="account.group_account_user"/>
<separator colspan="4" string="Additional Information"/> <separator colspan="4" string="Additional Information"/>
<field colspan="4" name="comment" nolabel="1"/> <field colspan="4" name="comment" nolabel="1"/>

View File

@ -10,27 +10,28 @@
<menuitem id="menu_finance_payables" name="Suppliers" parent="menu_finance" sequence="3"/> <menuitem id="menu_finance_payables" name="Suppliers" parent="menu_finance" sequence="3"/>
<menuitem id="menu_finance_bank_and_cash" name="Bank and Cash" parent="menu_finance" sequence="4" <menuitem id="menu_finance_bank_and_cash" name="Bank and Cash" parent="menu_finance" sequence="4"
groups="group_account_user,group_account_manager"/> groups="group_account_user,group_account_manager"/>
<menuitem id="menu_finance_periodical_processing" name="Periodical Processing" parent="menu_finance" sequence="9" groups="group_account_user,group_account_manager"/> <menuitem id="menu_finance_periodical_processing" name="Periodical Processing" parent="menu_finance" sequence="13" groups="group_account_user,group_account_manager"/>
<!-- This menu is used in account_code module --> <!-- This menu is used in account_code module -->
<menuitem id="menu_account_pp_statements" name="Statements" parent="menu_finance_periodical_processing" sequence="12"/> <menuitem id="menu_account_pp_statements" name="Statements" parent="menu_finance_periodical_processing" sequence="12"/>
<menuitem id="periodical_processing_journal_entries_validation" name="Draft Entries" parent="menu_finance_periodical_processing"/> <menuitem id="periodical_processing_journal_entries_validation" name="Draft Entries" parent="menu_finance_periodical_processing"/>
<menuitem id="periodical_processing_reconciliation" name="Reconciliation" parent="menu_finance_periodical_processing"/> <menuitem id="periodical_processing_reconciliation" name="Reconciliation" parent="menu_finance_periodical_processing"/>
<menuitem id="periodical_processing_invoicing" name="Invoicing" parent="menu_finance_periodical_processing"/> <menuitem id="periodical_processing_invoicing" name="Invoicing" parent="menu_finance_periodical_processing"/>
<menuitem id="menu_finance_charts" name="Charts" parent="menu_finance" groups="account.group_account_user" sequence="6"/> <menuitem id="menu_finance_charts" name="Charts" parent="menu_finance" groups="account.group_account_user" sequence="6"/>
<menuitem id="menu_finance_reporting" name="Reporting" parent="account.menu_finance" sequence="13"/> <menuitem id="menu_finance_reporting" name="Accounting" parent="base.menu_reporting" sequence="35"/>
<menuitem id="menu_finance_reporting_budgets" name="Budgets" parent="menu_finance_reporting" groups="group_account_user"/> <menuitem id="menu_finance_reporting_budgets" name="Budgets" parent="menu_finance_reporting" groups="group_account_user"/>
<menuitem id="menu_finance_legal_statement" name="Legal Reports" parent="menu_finance_reporting"/> <menuitem id="menu_finance_reports" name="Reporting" parent="menu_finance" sequence="14" groups="group_account_user,group_account_manager"/>
<menuitem id="menu_finance_legal_statement" name="Legal Reports" parent="menu_finance_reports"/>
<menuitem id="menu_finance_management_belgian_reports" name="Belgian Reports" parent="menu_finance_reporting"/> <menuitem id="menu_finance_management_belgian_reports" name="Belgian Reports" parent="menu_finance_reporting"/>
<menuitem id="menu_finance_configuration" name="Configuration" parent="menu_finance" sequence="14" groups="group_account_manager"/> <menuitem id="menu_finance_configuration" name="Configuration" parent="menu_finance" sequence="15" groups="group_account_manager"/>
<menuitem id="menu_finance_accounting" name="Financial Accounting" parent="menu_finance_configuration"/> <menuitem id="menu_finance_accounting" name="Financial Accounting" parent="menu_finance_configuration" sequence="1"/>
<menuitem id="menu_analytic_accounting" name="Analytic Accounting" parent="menu_finance_configuration" groups="analytic.group_analytic_accounting"/> <menuitem id="menu_analytic_accounting" name="Analytic Accounting" parent="menu_finance_configuration" groups="analytic.group_analytic_accounting" sequence="40"/>
<menuitem id="menu_analytic" parent="menu_analytic_accounting" name="Accounts" groups="analytic.group_analytic_accounting"/> <menuitem id="menu_analytic" parent="menu_analytic_accounting" name="Accounts" groups="analytic.group_analytic_accounting"/>
<menuitem id="menu_journals" sequence="9" name="Journals" parent="menu_finance_accounting" groups="group_account_manager"/> <menuitem id="menu_journals" sequence="15" name="Journals" parent="menu_finance_configuration" groups="group_account_manager"/>
<menuitem id="menu_configuration_misc" name="Miscellaneous" parent="menu_finance_configuration" sequence="30"/> <menuitem id="menu_configuration_misc" name="Miscellaneous" parent="menu_finance_configuration" sequence="55"/>
<menuitem id="base.menu_action_currency_form" parent="menu_configuration_misc" sequence="20"/> <menuitem id="base.menu_action_currency_form" parent="menu_configuration_misc" sequence="20" groups="base.group_no_one"/>
<menuitem id="menu_finance_generic_reporting" name="Generic Reporting" parent="menu_finance_reporting" sequence="100"/> <menuitem id="menu_finance_generic_reporting" name="Generic Reporting" parent="menu_finance_reports" sequence="100"/>
<menuitem id="menu_finance_entries" name="Journal Entries" parent="menu_finance" sequence="5" groups="group_account_user,group_account_manager"/> <menuitem id="menu_finance_entries" name="Journal Entries" parent="menu_finance" sequence="5" groups="group_account_user,group_account_manager"/>
<menuitem id="menu_account_reports" name="Financial Reports" parent="menu_finance_accounting" sequence="18"/> <menuitem id="menu_account_reports" name="Financial Reports" parent="menu_finance_configuration" sequence="30" />
<menuitem id="account.menu_finance_recurrent_entries" name="Recurring Entries" <menuitem id="account.menu_finance_recurrent_entries" name="Recurring Entries"
parent="menu_finance_periodical_processing" sequence="15" parent="menu_finance_periodical_processing" sequence="15"

View File

@ -7,8 +7,8 @@
wiz = wizards.browse(cr, uid, ref('account.account_configuration_installer_todo')) wiz = wizards.browse(cr, uid, ref('account.account_configuration_installer_todo'))
part = self.pool.get('res.partner').browse(cr, uid, ref('base.main_partner')) part = self.pool.get('res.partner').browse(cr, uid, ref('base.main_partner'))
# if we know the country and the wizard has not yet been executed, we do it # if we know the country and the wizard has not yet been executed, we do it
if (part.country.id) and (wiz.state=='open'): if (part.country_id.id) and (wiz.state=='open'):
mod = 'l10n_'+part.country.code.lower() mod = 'l10n_'+part.country_id.code.lower()
ids = modules.search(cr, uid, [ ('name','=',mod) ], context=context) ids = modules.search(cr, uid, [ ('name','=',mod) ], context=context)
if ids: if ids:
wizards.write(cr, uid, [ref('account.account_configuration_installer_todo')], { wizards.write(cr, uid, [ref('account.account_configuration_installer_todo')], {

View File

@ -5,14 +5,12 @@
<record id="test_invoice_1" model="account.invoice"> <record id="test_invoice_1" model="account.invoice">
<field name="currency_id" ref="base.EUR"/> <field name="currency_id" ref="base.EUR"/>
<field name="company_id" ref="base.main_company"/> <field name="company_id" ref="base.main_company"/>
<field name="address_invoice_id" ref="base.res_partner_address_tang"/>
<field name="partner_id" ref="base.res_partner_asus"/> <field name="partner_id" ref="base.res_partner_asus"/>
<field name="journal_id" ref="account.sales_journal"/> <field name="journal_id" ref="account.sales_journal"/>
<field name="state">draft</field> <field name="state">draft</field>
<field name="type">out_invoice</field> <field name="type">out_invoice</field>
<field name="account_id" ref="account.a_recv"/> <field name="account_id" ref="account.a_recv"/>
<field name="name">Test invoice 1</field> <field name="name">Test invoice 1</field>
<field name="address_contact_id" ref="base.res_partner_address_tang"/>
</record> </record>
<record id="test_tax_line" model="account.invoice.tax"> <record id="test_tax_line" model="account.invoice.tax">
<field name="name">Test Tax</field> <field name="name">Test Tax</field>

View File

@ -80,7 +80,7 @@
<field name="view_mode">tree,form</field> <field name="view_mode">tree,form</field>
<field name="help">Define your company's financial year according to your needs. A financial year is a period at the end of which a company's accounts are made up (usually 12 months). The financial year is usually referred to by the date in which it ends. For example, if a company's financial year ends November 30, 2011, then everything between December 1, 2010 and November 30, 2011 would be referred to as FY 2011. You are not obliged to follow the actual calendar year.</field> <field name="help">Define your company's financial year according to your needs. A financial year is a period at the end of which a company's accounts are made up (usually 12 months). The financial year is usually referred to by the date in which it ends. For example, if a company's financial year ends November 30, 2011, then everything between December 1, 2010 and November 30, 2011 would be referred to as FY 2011. You are not obliged to follow the actual calendar year.</field>
</record> </record>
<menuitem id="next_id_23" name="Periods" parent="account.menu_finance_accounting" sequence="8" /> <menuitem id="next_id_23" name="Periods" parent="account.menu_finance_configuration" sequence="5" />
<menuitem action="action_account_fiscalyear_form" id="menu_action_account_fiscalyear_form" parent="next_id_23"/> <menuitem action="action_account_fiscalyear_form" id="menu_action_account_fiscalyear_form" parent="next_id_23"/>
<!-- <!--
@ -149,7 +149,7 @@
<field name="context">{'search_default_draft': 1}</field> <field name="context">{'search_default_draft': 1}</field>
<field name="help">Here you can define a financial period, an interval of time in your company's financial year. An accounting period typically is a month or a quarter. It usually corresponds to the periods of the tax declaration. Create and manage periods from here and decide whether a period should be closed or left open depending on your company's activities over a specific period.</field> <field name="help">Here you can define a financial period, an interval of time in your company's financial year. An accounting period typically is a month or a quarter. It usually corresponds to the periods of the tax declaration. Create and manage periods from here and decide whether a period should be closed or left open depending on your company's activities over a specific period.</field>
</record> </record>
<menuitem action="action_account_period_form" id="menu_action_account_period_form" parent="account.next_id_23"/> <menuitem action="action_account_period_form" id="menu_action_account_period_form" parent="account.next_id_23" groups="base.group_no_one"/>
<!-- <!--
@ -265,7 +265,7 @@
<field name="view_id" ref="view_account_list"/> <field name="view_id" ref="view_account_list"/>
<field name="help">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.</field> <field name="help">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.</field>
</record> </record>
<menuitem id="account_account_menu" name="Accounts" parent="menu_finance_accounting"/> <menuitem id="account_account_menu" name="Accounts" parent="account.menu_finance_configuration" sequence="15"/>
<menuitem action="action_account_form" id="menu_action_account_form" parent="account_account_menu"/> <menuitem action="action_account_form" id="menu_action_account_form" parent="account_account_menu"/>
<record id="view_account_tree" model="ir.ui.view"> <record id="view_account_tree" model="ir.ui.view">
@ -740,7 +740,7 @@
</record> </record>
<menuitem string="Bank Statements" action="action_bank_statement_tree" id="menu_bank_statement_tree" parent="menu_finance_bank_and_cash" sequence="7"/> <menuitem string="Bank Statements" action="action_bank_statement_tree" id="menu_bank_statement_tree" parent="menu_finance_bank_and_cash" sequence="7"/>
<menuitem name="Statements Reconciliation" action="action_bank_statement_periodic_tree" id="menu_menu_Bank_process" parent="account.menu_account_pp_statements" sequence="7"/> <menuitem name="Statements Reconciliation" action="action_bank_statement_periodic_tree" id="menu_menu_Bank_process" parent="account.periodical_processing_reconciliation" sequence="15"/>
<record id="action_bank_statement_draft_tree" model="ir.actions.act_window"> <record id="action_bank_statement_draft_tree" model="ir.actions.act_window">
@ -810,7 +810,7 @@
<field name="search_view_id" ref="view_account_type_search"/> <field name="search_view_id" ref="view_account_type_search"/>
<field name="help">An account type is used to determine how an account is used in each journal. The deferral method of an account type determines the process for the annual closing. Reports such as the Balance Sheet and the Profit and Loss report use the category (profit/loss or balance sheet). For example, the account type could be linked to an asset account, expense account or payable account. From this view, you can create and manage the account types you need for your company.</field> <field name="help">An account type is used to determine how an account is used in each journal. The deferral method of an account type determines the process for the annual closing. Reports such as the Balance Sheet and the Profit and Loss report use the category (profit/loss or balance sheet). For example, the account type could be linked to an asset account, expense account or payable account. From this view, you can create and manage the account types you need for your company.</field>
</record> </record>
<menuitem action="action_account_type_form" sequence="20" id="menu_action_account_type_form" parent="account_account_menu" groups="base.group_extended"/> <menuitem action="action_account_type_form" sequence="20" id="menu_action_account_type_form" parent="account_account_menu" groups="base.group_no_one"/>
<!-- <!--
Entries Entries
--> -->
@ -923,8 +923,8 @@
<field name="search_view_id" ref="view_tax_code_search"/> <field name="search_view_id" ref="view_tax_code_search"/>
<field name="help">The tax code definition depends on the tax declaration of your country. OpenERP allows you to define the tax structure and manage it from this menu. You can define both numeric and alphanumeric tax codes.</field> <field name="help">The tax code definition depends on the tax declaration of your country. OpenERP allows you to define the tax structure and manage it from this menu. You can define both numeric and alphanumeric tax codes.</field>
</record> </record>
<menuitem id="next_id_27" name="Taxes" parent="account.menu_finance_accounting"/> <menuitem id="next_id_27" name="Taxes" parent="account.menu_finance_configuration" sequence="20"/>
<menuitem action="action_tax_code_list" id="menu_action_tax_code_list" parent="next_id_27" sequence="12"/> <menuitem action="action_tax_code_list" id="menu_action_tax_code_list" parent="next_id_27" sequence="12" groups="base.group_no_one"/>
<!-- <!--

View File

@ -61,7 +61,7 @@
<field name="view_id" ref="board_account_form"/> <field name="view_id" ref="board_account_form"/>
</record> </record>
<menuitem id="menu_dashboard_acc" name="Dashboard" sequence="2" parent="account.menu_finance_reporting" groups="group_account_user,group_account_manager"/> <menuitem id="menu_dashboard_acc" name="Accounting" sequence="30" parent="base.menu_reporting_dashboard" groups="group_account_user,group_account_manager"/>
<menuitem action="open_board_account" icon="terp-graph" id="menu_board_account" parent="menu_dashboard_acc" sequence="1"/> <menuitem action="open_board_account" icon="terp-graph" id="menu_board_account" parent="menu_dashboard_acc" sequence="1"/>
<menuitem icon="terp-account" id="account.menu_finance" name="Accounting" sequence="14" action="open_board_account"/> <menuitem icon="terp-account" id="account.menu_finance" name="Accounting" sequence="14" action="open_board_account"/>

View File

@ -6,9 +6,7 @@
<field name="payment_term" ref="account.account_payment_term"/> <field name="payment_term" ref="account.account_payment_term"/>
<field name="journal_id" ref="account.expenses_journal"/> <field name="journal_id" ref="account.expenses_journal"/>
<field name="currency_id" ref="base.EUR"/> <field name="currency_id" ref="base.EUR"/>
<field name="address_invoice_id" ref="base.res_partner_address_wong"/>
<field name="user_id" ref="base.user_demo"/> <field name="user_id" ref="base.user_demo"/>
<field name="address_contact_id" ref="base.res_partner_address_wong"/>
<field name="reference_type">none</field> <field name="reference_type">none</field>
<field name="company_id" ref="base.main_company"/> <field name="company_id" ref="base.main_company"/>
<field name="state">draft</field> <field name="state">draft</field>

View File

@ -75,7 +75,7 @@ class account_invoice(osv.osv, EDIMixin):
"""Exports a supplier or customer invoice""" """Exports a supplier or customer invoice"""
edi_struct = dict(edi_struct or INVOICE_EDI_STRUCT) edi_struct = dict(edi_struct or INVOICE_EDI_STRUCT)
res_company = self.pool.get('res.company') res_company = self.pool.get('res.company')
res_partner_address = self.pool.get('res.partner.address') res_partner = self.pool.get('res.partner')
edi_doc_list = [] edi_doc_list = []
for invoice in records: for invoice in records:
# generate the main report # generate the main report
@ -84,8 +84,7 @@ class account_invoice(osv.osv, EDIMixin):
edi_doc.update({ edi_doc.update({
'company_address': res_company.edi_export_address(cr, uid, invoice.company_id, context=context), 'company_address': res_company.edi_export_address(cr, uid, invoice.company_id, context=context),
'company_paypal_account': invoice.company_id.paypal_account, 'company_paypal_account': invoice.company_id.paypal_account,
'partner_address': res_partner_address.edi_export(cr, uid, [invoice.address_invoice_id], context=context)[0], 'partner_address': res_partner.edi_export(cr, uid, [invoice.partner_id], context=context)[0],
'currency': self.pool.get('res.currency').edi_export(cr, uid, [invoice.currency_id], context=context)[0], 'currency': self.pool.get('res.currency').edi_export(cr, uid, [invoice.currency_id], context=context)[0],
'partner_ref': invoice.reference or False, 'partner_ref': invoice.reference or False,
}) })
@ -125,34 +124,32 @@ class account_invoice(osv.osv, EDIMixin):
# the desired company among the user's allowed companies # the desired company among the user's allowed companies
self._edi_requires_attributes(('company_id','company_address','type'), edi_document) self._edi_requires_attributes(('company_id','company_address','type'), edi_document)
res_partner_address = self.pool.get('res.partner.address')
res_partner = self.pool.get('res.partner') res_partner = self.pool.get('res.partner')
# imported company = new partner
src_company_id, src_company_name = edi_document.pop('company_id') src_company_id, src_company_name = edi_document.pop('company_id')
partner_id = self.edi_import_relation(cr, uid, 'res.partner', src_company_name,
src_company_id, context=context)
invoice_type = edi_document['type'] invoice_type = edi_document['type']
partner_value = {} partner_value = {}
if invoice_type in ('out_invoice', 'out_refund'): if invoice_type in ('out_invoice', 'out_refund'):
partner_value.update({'customer': True}) partner_value.update({'customer': True})
if invoice_type in ('in_invoice', 'in_refund'): if invoice_type in ('in_invoice', 'in_refund'):
partner_value.update({'supplier': True}) partner_value.update({'supplier': True})
res_partner.write(cr, uid, [partner_id], partner_value, context=context)
# imported company_address = new partner address # imported company_address = new partner address
address_info = edi_document.pop('company_address') address_info = edi_document.pop('company_address')
address_info['partner_id'] = (src_company_id, src_company_name) if 'name' not in address_info:
address_info['name'] = src_company_name
address_info['type'] = 'invoice' address_info['type'] = 'invoice'
address_id = res_partner_address.edi_import(cr, uid, address_info, context=context) address_info.update(partner_value)
address_id = res_partner.edi_import(cr, uid, address_info, context=context)
# modify edi_document to refer to new partner # modify edi_document to refer to new partner
partner_address = res_partner_address.browse(cr, uid, address_id, context=context) partner_address = res_partner.browse(cr, uid, address_id, context=context)
edi_document['partner_id'] = (src_company_id, src_company_name) address_edi_m2o = self.edi_m2o(cr, uid, partner_address, context=context)
edi_document['partner_id'] = address_edi_m2o
edi_document.pop('partner_address', False) # ignored edi_document.pop('partner_address', False) # ignored
edi_document['address_invoice_id'] = self.edi_m2o(cr, uid, partner_address, context=context)
return partner_id return address_id
def edi_import(self, cr, uid, edi_document, context=None): def edi_import(self, cr, uid, edi_document, context=None):

View File

@ -23,7 +23,7 @@
<field name="context">{'search_default_model_id':'account.invoice'}</field> <field name="context">{'search_default_model_id':'account.invoice'}</field>
<field name="context" eval="{'search_default_model_id': ref('account.model_account_invoice')}"/> <field name="context" eval="{'search_default_model_id': ref('account.model_account_invoice')}"/>
</record> </record>
<menuitem id="menu_email_templates" parent="menu_configuration_misc" action="action_email_templates" sequence="30"/> <menuitem id="menu_email_templates" parent="menu_configuration_misc" action="action_email_templates" sequence="30" groups="base.group_no_one"/>
</data> </data>
@ -40,14 +40,14 @@
<field name="name">Automated Invoice Notification Mail</field> <field name="name">Automated Invoice Notification Mail</field>
<field name="email_from">${object.user_id.user_email or object.company_id.email or 'noreply@localhost'}</field> <field name="email_from">${object.user_id.user_email or object.company_id.email or 'noreply@localhost'}</field>
<field name="subject">${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })</field> <field name="subject">${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })</field>
<field name="email_to">${object.address_invoice_id.email or ''}</field> <field name="email_to">${object.partner_id.email or ''}</field>
<field name="model_id" ref="account.model_account_invoice"/> <field name="model_id" ref="account.model_account_invoice"/>
<field name="auto_delete" eval="True"/> <field name="auto_delete" eval="True"/>
<field name="body_html"><![CDATA[ <field name="body_html"><![CDATA[
<div style="font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, 255, 255); "> <div style="font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, 255, 255); ">
<p>Hello${object.address_invoice_id.name and ' ' or ''}${object.address_invoice_id.name or ''},</p> <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name or ''},</p>
<p>A new invoice is available for ${object.partner_id.name}: </p> <p>A new invoice is available for ${object.partner_id.name}: </p>
<p style="border-left: 1px solid #8e0000; margin-left: 30px;"> <p style="border-left: 1px solid #8e0000; margin-left: 30px;">
@ -124,7 +124,7 @@
</div> </div>
]]></field> ]]></field>
<field name="body_text"><![CDATA[ <field name="body_text"><![CDATA[
Hello${object.address_invoice_id.name and ' ' or ''}${object.address_invoice_id.name or ''}, Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name or ''},
A new invoice is available for ${object.partner_id.name}: A new invoice is available for ${object.partner_id.name}:
| Invoice number: *${object.number}* | Invoice number: *${object.number}*

View File

@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n" "Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-02-08 00:35+0000\n" "POT-Creation-Date: 2012-02-08 00:35+0000\n"
"PO-Revision-Date: 2012-03-18 19:30+0000\n" "PO-Revision-Date: 2012-03-21 21:33+0000\n"
"Last-Translator: Tryfon Farmakakis <farmakakistryfon@gmail.com>\n" "Last-Translator: Christos Ververidis <Unknown>\n"
"Language-Team: Greek <el@li.org>\n" "Language-Team: Greek <el@li.org>\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-03-19 04:40+0000\n" "X-Launchpad-Export-Date: 2012-03-22 04:57+0000\n"
"X-Generator: Launchpad (build 14969)\n" "X-Generator: Launchpad (build 14981)\n"
#. module: account #. module: account
#: view:account.invoice.report:0 #: view:account.invoice.report:0
@ -145,7 +145,7 @@ msgstr "Συμφωνία"
#: field:account.move.line,ref:0 #: field:account.move.line,ref:0
#: field:account.subscription,ref:0 #: field:account.subscription,ref:0
msgid "Reference" msgid "Reference"
msgstr "Παραπομπή" msgstr "Παραπομπές"
#. module: account #. module: account
#: view:account.open.closed.fiscalyear:0 #: view:account.open.closed.fiscalyear:0

View File

@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n" "Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n" "Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-02-08 00:35+0000\n" "POT-Creation-Date: 2012-02-08 00:35+0000\n"
"PO-Revision-Date: 2012-02-21 04:07+0000\n" "PO-Revision-Date: 2012-03-27 01:25+0000\n"
"Last-Translator: Jeff Wang <wjfonhand@hotmail.com>\n" "Last-Translator: Jeff Wang <wjfonhand@hotmail.com>\n"
"Language-Team: \n" "Language-Team: \n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-02-22 04:57+0000\n" "X-Launchpad-Export-Date: 2012-03-28 04:45+0000\n"
"X-Generator: Launchpad (build 14838)\n" "X-Generator: Launchpad (build 15027)\n"
#. module: account #. module: account
#: view:account.invoice.report:0 #: view:account.invoice.report:0
@ -6492,7 +6492,7 @@ msgstr "当前期间凭证列表"
msgid "" msgid ""
"Check this box if you want to allow the cancellation the entries related to " "Check this box if you want to allow the cancellation the entries related to "
"this journal or of the invoice related to this journal" "this journal or of the invoice related to this journal"
msgstr "请勾选这,如果您允许作废此账簿的分录或发票。" msgstr "勾选这里,则此凭证簿下的亏即凭证或发票可以被作废。"
#. module: account #. module: account
#: view:account.fiscalyear.close:0 #: view:account.fiscalyear.close:0
@ -6736,7 +6736,7 @@ msgstr "此报表用于生成一个试算平衡表的PDF报表。这样你可以
msgid "" msgid ""
"Check this box if you are unsure of that journal entry and if you want to " "Check this box if you are unsure of that journal entry and if you want to "
"note it as 'to be reviewed' by an accounting expert." "note it as 'to be reviewed' by an accounting expert."
msgstr "勾选这里,如果您不肯定账簿的分录,您可以把它标注为“待审核”状态交由会计师来确定。" msgstr "勾选这里,如果您不确定凭证是否正确,您可以把它标注为“待审核”状态交由会计师来确定。"
#. module: account #. module: account
#: field:account.chart.template,complete_tax_set:0 #: field:account.chart.template,complete_tax_set:0
@ -6986,7 +6986,7 @@ msgstr "税模板"
#. module: account #. module: account
#: view:account.journal.select:0 #: view:account.journal.select:0
msgid "Are you sure you want to open Journal Entries?" msgid "Are you sure you want to open Journal Entries?"
msgstr "您确定要打开账簿的分录吗" msgstr "你确定要显示这个凭证簿的会计凭证么"
#. module: account #. module: account
#: view:account.state.open:0 #: view:account.state.open:0
@ -8830,7 +8830,8 @@ msgid ""
"in which order. You can create your own view for a faster encoding in each " "in which order. You can create your own view for a faster encoding in each "
"journal." "journal."
msgstr "" msgstr ""
"选择在输入或显示 账簿分录的视图。这视图可以定义字段是否显示,是否必输,是否只读,按什么序列显示。您可以为每个账簿的分录定义视图用于快速输入。" "选择在输入或显示该凭证簿中的会计凭证行所使用的的视图。这视图可以定义字段是否显示,是否必输,是否只读,按什么序列显示。您可以为每个凭证簿定义视图用于快速输"
"入会计凭证行。"
#. module: account #. module: account
#: field:account.period,date_stop:0 #: field:account.period,date_stop:0

View File

@ -48,6 +48,8 @@ class ir_sequence(osv.osv):
} }
def _next(self, cr, uid, seq_ids, context=None): def _next(self, cr, uid, seq_ids, context=None):
if context is None:
context = {}
for seq in self.browse(cr, uid, seq_ids, context): for seq in self.browse(cr, uid, seq_ids, context):
for line in seq.fiscal_ids: for line in seq.fiscal_ids:
if line.fiscalyear_id.id == context.get('fiscalyear_id'): if line.fiscalyear_id.id == context.get('fiscalyear_id'):

View File

@ -96,7 +96,7 @@
<separator string="Supplier Debit" colspan="2"/> <separator string="Supplier Debit" colspan="2"/>
<field name="debit"/> <field name="debit"/>
</group> </group>
<field colspan="4" context="{'address': address}" name="bank_ids" nolabel="1"> <field colspan="4" name="bank_ids" nolabel="1">
<form string="Bank account"> <form string="Bank account">
<field name="state"/> <field name="state"/>
<newline/> <newline/>

View File

@ -103,7 +103,6 @@
<field name="type">normal</field> <field name="type">normal</field>
<field name="state">open</field> <field name="state">open</field>
<field name="partner_id" ref="base.res_partner_seagate"/> <field name="partner_id" ref="base.res_partner_seagate"/>
<field name="contact_id" ref="base.res_partner_address_seagate"/>
</record> </record>
<record id="analytic_seagate_p2" model="account.analytic.account"> <record id="analytic_seagate_p2" model="account.analytic.account">
<field name="name">Seagate P2</field> <field name="name">Seagate P2</field>
@ -112,7 +111,6 @@
<field name="parent_id" ref="analytic_integration"/> <field name="parent_id" ref="analytic_integration"/>
<field name="state">open</field> <field name="state">open</field>
<field name="partner_id" ref="base.res_partner_seagate"/> <field name="partner_id" ref="base.res_partner_seagate"/>
<field name="contact_id" ref="base.res_partner_address_seagate"/>
</record> </record>
<record id="analytic_magasin_bml_1" model="account.analytic.account"> <record id="analytic_magasin_bml_1" model="account.analytic.account">
<field name="name">Magasin BML 1</field> <field name="name">Magasin BML 1</field>
@ -120,7 +118,6 @@
<field name="parent_id" ref="analytic_integration"/> <field name="parent_id" ref="analytic_integration"/>
<field name="type">normal</field> <field name="type">normal</field>
<field name="partner_id" ref="base.res_partner_15"/> <field name="partner_id" ref="base.res_partner_15"/>
<field name="contact_id" ref="base.res_partner_address_14"/>
</record> </record>
<record id="analytic_integration_c2c" model="account.analytic.account"> <record id="analytic_integration_c2c" model="account.analytic.account">
<field name="name">CampToCamp</field> <field name="name">CampToCamp</field>
@ -130,7 +127,6 @@
<field eval="time.strftime('%Y-12-31')" name="date"/> <field eval="time.strftime('%Y-12-31')" name="date"/>
<field name="parent_id" ref="analytic_integration"/> <field name="parent_id" ref="analytic_integration"/>
<field name="partner_id" ref="base.res_partner_c2c"/> <field name="partner_id" ref="base.res_partner_c2c"/>
<field name="contact_id" ref="base.res_partner_address_Camptocamp"/>
<field name="state">open</field> <field name="state">open</field>
</record> </record>
<record id="analytic_agrolait" model="account.analytic.account"> <record id="analytic_agrolait" model="account.analytic.account">
@ -139,7 +135,6 @@
<field name="parent_id" ref="analytic_customers"/> <field name="parent_id" ref="analytic_customers"/>
<field name="type">normal</field> <field name="type">normal</field>
<field name="partner_id" ref="base.res_partner_agrolait"/> <field name="partner_id" ref="base.res_partner_agrolait"/>
<field name="contact_id" ref="base.res_partner_address_8"/>
</record> </record>
<record id="analytic_asustek" model="account.analytic.account"> <record id="analytic_asustek" model="account.analytic.account">
<field name="name">Asustek</field> <field name="name">Asustek</field>
@ -147,7 +142,6 @@
<field name="type">normal</field> <field name="type">normal</field>
<field name="parent_id" ref="analytic_customers"/> <field name="parent_id" ref="analytic_customers"/>
<field name="partner_id" ref="base.res_partner_asus"/> <field name="partner_id" ref="base.res_partner_asus"/>
<field name="contact_id" ref="base.res_partner_address_tang"/>
</record> </record>
<record id="analytic_distripc" model="account.analytic.account"> <record id="analytic_distripc" model="account.analytic.account">
<field name="name">DistriPC</field> <field name="name">DistriPC</field>
@ -155,7 +149,6 @@
<field name="parent_id" ref="analytic_customers"/> <field name="parent_id" ref="analytic_customers"/>
<field name="type">normal</field> <field name="type">normal</field>
<field name="partner_id" ref="base.res_partner_4"/> <field name="partner_id" ref="base.res_partner_4"/>
<field name="contact_id" ref="base.res_partner_address_7"/>
</record> </record>
<record id="analytic_sednacom" model="account.analytic.account"> <record id="analytic_sednacom" model="account.analytic.account">
<field name="name">Sednacom</field> <field name="name">Sednacom</field>
@ -165,7 +158,6 @@
<field name="parent_id" ref="analytic_partners"/> <field name="parent_id" ref="analytic_partners"/>
<field name="type">normal</field> <field name="type">normal</field>
<field name="partner_id" ref="base.res_partner_sednacom"/> <field name="partner_id" ref="base.res_partner_sednacom"/>
<field name="contact_id" ref="base.res_partner_address_11"/>
<field name="state">open</field> <field name="state">open</field>
</record> </record>
<record id="analytic_thymbra" model="account.analytic.account"> <record id="analytic_thymbra" model="account.analytic.account">
@ -176,7 +168,6 @@
<field name="type">normal</field> <field name="type">normal</field>
<field name="parent_id" ref="analytic_partners"/> <field name="parent_id" ref="analytic_partners"/>
<field name="partner_id" ref="base.res_partner_thymbra"/> <field name="partner_id" ref="base.res_partner_thymbra"/>
<field name="contact_id" ref="base.res_partner_address_thymbra"/>
<field name="state">open</field> <field name="state">open</field>
</record> </record>
<record id="analytic_leclerc" model="account.analytic.account"> <record id="analytic_leclerc" model="account.analytic.account">
@ -187,7 +178,6 @@
<field name="type">normal</field> <field name="type">normal</field>
<field name="parent_id" ref="analytic_partners"/> <field name="parent_id" ref="analytic_partners"/>
<field name="partner_id" ref="base.res_partner_11"/> <field name="partner_id" ref="base.res_partner_11"/>
<field name="contact_id" ref="base.res_partner_address_15"/>
</record> </record>
<record id="analytic_desertic_hispafuentes" model="account.analytic.account"> <record id="analytic_desertic_hispafuentes" model="account.analytic.account">
<field name="name">Desertic - Hispafuentes</field> <field name="name">Desertic - Hispafuentes</field>
@ -197,7 +187,6 @@
<field name="type">normal</field> <field name="type">normal</field>
<field name="parent_id" ref="analytic_partners"/> <field name="parent_id" ref="analytic_partners"/>
<field name="partner_id" ref="base.res_partner_desertic_hispafuentes"/> <field name="partner_id" ref="base.res_partner_desertic_hispafuentes"/>
<field name="contact_id" ref="base.res_partner_address_3000"/>
</record> </record>
<record id="analytic_tiny_at_work" model="account.analytic.account"> <record id="analytic_tiny_at_work" model="account.analytic.account">
<field name="name">OpenERP SA AT Work</field> <field name="name">OpenERP SA AT Work</field>
@ -205,7 +194,6 @@
<field name="type">normal</field> <field name="type">normal</field>
<field name="parent_id" ref="analytic_partners"/> <field name="parent_id" ref="analytic_partners"/>
<field name="partner_id" ref="base.res_partner_tinyatwork"/> <field name="partner_id" ref="base.res_partner_tinyatwork"/>
<field name="contact_id" ref="base.res_partner_address_tinyatwork"/>
</record> </record>
<record id="analytic_partners_camp_to_camp" model="account.analytic.account"> <record id="analytic_partners_camp_to_camp" model="account.analytic.account">
<field name="name">Camp to Camp</field> <field name="name">Camp to Camp</field>
@ -215,7 +203,6 @@
<field name="type">normal</field> <field name="type">normal</field>
<field name="parent_id" ref="analytic_partners"/> <field name="parent_id" ref="analytic_partners"/>
<field name="partner_id" ref="base.res_partner_c2c"/> <field name="partner_id" ref="base.res_partner_c2c"/>
<field name="contact_id" ref="base.res_partner_address_Camptocamp"/>
<field name="state">open</field> <field name="state">open</field>
</record> </record>
<record id="analytic_project_2_support" model="account.analytic.account"> <record id="analytic_project_2_support" model="account.analytic.account">

View File

@ -92,8 +92,7 @@
<page string="Account Data"> <page string="Account Data">
<group colspan="2" col="2"> <group colspan="2" col="2">
<separator colspan="2" string="Contacts"/> <separator colspan="2" string="Contacts"/>
<field name="partner_id" on_change="on_change_partner_id(partner_id)"/> <field name="partner_id"/>
<field name="contact_id"/>
<field name="user_id"/> <field name="user_id"/>
</group> </group>
<group colspan="2" col="2" name="contract"> <group colspan="2" col="2" name="contract">

View File

@ -65,8 +65,6 @@ class account_invoice_report(osv.osv):
('cancel','Cancelled') ('cancel','Cancelled')
], 'Invoice State', readonly=True), ], 'Invoice State', readonly=True),
'date_due': fields.date('Due Date', readonly=True), 'date_due': fields.date('Due Date', readonly=True),
'address_contact_id': fields.many2one('res.partner.address', 'Contact Address Name', readonly=True),
'address_invoice_id': fields.many2one('res.partner.address', 'Invoice Address Name', readonly=True),
'account_id': fields.many2one('account.account', 'Account',readonly=True), 'account_id': fields.many2one('account.account', 'Account',readonly=True),
'account_line_id': fields.many2one('account.account', 'Account Line',readonly=True), 'account_line_id': fields.many2one('account.account', 'Account Line',readonly=True),
'partner_bank_id': fields.many2one('res.partner.bank', 'Bank Account',readonly=True), 'partner_bank_id': fields.many2one('res.partner.bank', 'Bank Account',readonly=True),
@ -103,8 +101,6 @@ class account_invoice_report(osv.osv):
ai.state, ai.state,
pt.categ_id, pt.categ_id,
ai.date_due as date_due, ai.date_due as date_due,
ai.address_contact_id as address_contact_id,
ai.address_invoice_id as address_invoice_id,
ai.account_id as account_id, ai.account_id as account_id,
ail.account_id as account_line_id, ail.account_id as account_line_id,
ai.partner_bank_id as partner_bank_id, ai.partner_bank_id as partner_bank_id,
@ -186,8 +182,6 @@ class account_invoice_report(osv.osv):
ai.state, ai.state,
pt.categ_id, pt.categ_id,
ai.date_due, ai.date_due,
ai.address_contact_id,
ai.address_invoice_id,
ai.account_id, ai.account_id,
ail.account_id, ail.account_id,
ai.partner_bank_id, ai.partner_bank_id,

View File

@ -22,8 +22,6 @@
<field name="period_id" invisible="1"/> <field name="period_id" invisible="1"/>
<field name="currency_id" invisible="1"/> <field name="currency_id" invisible="1"/>
<field name="journal_id" invisible="1"/> <field name="journal_id" invisible="1"/>
<field name="address_contact_id" invisible="1"/>
<field name="address_invoice_id" invisible="1"/>
<field name="partner_bank_id" invisible="1"/> <field name="partner_bank_id" invisible="1"/>
<field name="date_due" invisible="1"/> <field name="date_due" invisible="1"/>
<field name="account_id" invisible="1"/> <field name="account_id" invisible="1"/>

View File

@ -162,13 +162,13 @@
</td> </td>
<td> <td>
<para style="terp_default_8">[[ (o.partner_id and o.partner_id.title and o.partner_id.title.name) or '' ]] [[ (o.partner_id and o.partner_id.name) or '' ]]</para> <para style="terp_default_8">[[ (o.partner_id and o.partner_id.title and o.partner_id.title.name) or '' ]] [[ (o.partner_id and o.partner_id.name) or '' ]]</para>
<para style="terp_default_8">[[ display_address(o.address_invoice_id) ]]</para> <para style="terp_default_8">[[ display_address(o.partner_id,'invoice') ]]</para>
<para style="terp_default_8"> <para style="terp_default_8">
<font color="white"> </font> <font color="white"> </font>
</para> </para>
<para style="terp_default_8">Tel. : [[ (o.address_invoice_id and o.address_invoice_id.phone) or removeParentNode('para') ]]</para> <para style="terp_default_8">Tel. : [[ (o.partner_id.phone) or removeParentNode('para') ]]</para>
<para style="terp_default_8">Fax : [[ (o.address_invoice_id and o.address_invoice_id.fax) or removeParentNode('para') ]]</para> <para style="terp_default_8">Fax : [[ (o.partner_id.fax) or removeParentNode('para') ]]</para>
<para style="terp_default_8">VAT : [[ (o.partner_id and o.partner_id.vat) or removeParentNode('para') ]]</para> <para style="terp_default_8">VAT : [[ (o.partner_id.vat) or removeParentNode('para') ]]</para>
</td> </td>
</tr> </tr>
</blockTable> </blockTable>
@ -210,7 +210,7 @@
<para style="terp_default_Centre_9">[[ o.origin or '' ]]</para> <para style="terp_default_Centre_9">[[ o.origin or '' ]]</para>
</td> </td>
<td> <td>
<para style="terp_default_Centre_9">[[ (o.address_invoice_id and o.address_invoice_id.partner_id and o.address_invoice_id.partner_id.ref) or ' ' ]]</para> <para style="terp_default_Centre_9">[[ (o.partner_id.ref) or ' ' ]]</para>
</td> </td>
</tr> </tr>
</blockTable> </blockTable>

View File

@ -38,7 +38,6 @@ class Overdue(report_sxw.rml_parse):
def _adr_get(self, partner, type): def _adr_get(self, partner, type):
res = [] res = []
res_partner = pooler.get_pool(self.cr.dbname).get('res.partner') res_partner = pooler.get_pool(self.cr.dbname).get('res.partner')
res_partner_address = pooler.get_pool(self.cr.dbname).get('res.partner.address')
addresses = res_partner.address_get(self.cr, self.uid, [partner.id], [type]) addresses = res_partner.address_get(self.cr, self.uid, [partner.id], [type])
adr_id = addresses and addresses[type] or False adr_id = addresses and addresses[type] or False
result = { result = {
@ -51,7 +50,7 @@ class Overdue(report_sxw.rml_parse):
'country_id': False, 'country_id': False,
} }
if adr_id: if adr_id:
result = res_partner_address.read(self.cr, self.uid, [adr_id], context=self.context.copy()) result = res_partner.read(self.cr, self.uid, [adr_id], context=self.context.copy())
result[0]['country_id'] = result[0]['country_id'] and result[0]['country_id'][1] or False result[0]['country_id'] = result[0]['country_id'] and result[0]['country_id'][1] or False
result[0]['state_id'] = result[0]['state_id'] and result[0]['state_id'][1] or False result[0]['state_id'] = result[0]['state_id'] and result[0]['state_id'][1] or False
return result return result
@ -62,7 +61,6 @@ class Overdue(report_sxw.rml_parse):
def _tel_get(self,partner): def _tel_get(self,partner):
if not partner: if not partner:
return False return False
res_partner_address = pooler.get_pool(self.cr.dbname).get('res.partner.address')
res_partner = pooler.get_pool(self.cr.dbname).get('res.partner') res_partner = pooler.get_pool(self.cr.dbname).get('res.partner')
addresses = res_partner.address_get(self.cr, self.uid, [partner.id], ['invoice']) addresses = res_partner.address_get(self.cr, self.uid, [partner.id], ['invoice'])
adr_id = addresses and addresses['invoice'] or False adr_id = addresses and addresses['invoice'] or False
@ -70,7 +68,7 @@ class Overdue(report_sxw.rml_parse):
adr=res_partner_address.read(self.cr, self.uid, [adr_id])[0] adr=res_partner_address.read(self.cr, self.uid, [adr_id])[0]
return adr['phone'] return adr['phone']
else: else:
return partner.address and partner.address[0].phone or False return partner.phone or False
return False return False
def _lines_get(self, partner): def _lines_get(self, partner):

View File

@ -88,9 +88,7 @@ access_account_invoice_tax_accountant,account.invoice.tax accountant,model_accou
access_account_move_reconcile_manager,account.move.reconcile manager,model_account_move_reconcile,account.group_account_manager,1,0,0,0 access_account_move_reconcile_manager,account.move.reconcile manager,model_account_move_reconcile,account.group_account_manager,1,0,0,0
access_account_analytic_line_invoice,account.analytic.line invoice,model_account_analytic_line,account.group_account_invoice,1,1,1,1 access_account_analytic_line_invoice,account.analytic.line invoice,model_account_analytic_line,account.group_account_invoice,1,1,1,1
access_account_invoice_line_accountant,account.invoice.line accountant,model_account_invoice_line,account.group_account_user,1,0,0,0 access_account_invoice_line_accountant,account.invoice.line accountant,model_account_invoice_line,account.group_account_user,1,0,0,0
access_res_partner_address_accountant,res.partner.address accountant,base.model_res_partner_address,account.group_account_user,1,0,0,0
access_account_account_invoice,account.account invoice,model_account_account,account.group_account_invoice,1,1,1,1 access_account_account_invoice,account.account invoice,model_account_account,account.group_account_invoice,1,1,1,1
access_res_partner_address_invoice,res.partner.address invoice,base.model_res_partner_address,account.group_account_invoice,1,1,1,1
access_account_analytic_accountant,account.analytic.account accountant,analytic.model_account_analytic_account,account.group_account_user,1,1,1,1 access_account_analytic_accountant,account.analytic.account accountant,analytic.model_account_analytic_account,account.group_account_user,1,1,1,1
access_account_account_type_invoice,account.account.type invoice,model_account_account_type,account.group_account_invoice,1,1,1,1 access_account_account_type_invoice,account.account.type invoice,model_account_account_type,account.group_account_invoice,1,1,1,1
access_report_account_receivable_invoice,report.account.receivable.invoice,model_report_account_receivable,account.group_account_invoice,1,1,1,1 access_report_account_receivable_invoice,report.account.receivable.invoice,model_report_account_receivable,account.group_account_invoice,1,1,1,1

1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
88 access_account_move_reconcile_manager account.move.reconcile manager model_account_move_reconcile account.group_account_manager 1 0 0 0
89 access_account_analytic_line_invoice account.analytic.line invoice model_account_analytic_line account.group_account_invoice 1 1 1 1
90 access_account_invoice_line_accountant account.invoice.line accountant model_account_invoice_line account.group_account_user 1 0 0 0
access_res_partner_address_accountant res.partner.address accountant base.model_res_partner_address account.group_account_user 1 0 0 0
91 access_account_account_invoice account.account invoice model_account_account account.group_account_invoice 1 1 1 1
access_res_partner_address_invoice res.partner.address invoice base.model_res_partner_address account.group_account_invoice 1 1 1 1
92 access_account_analytic_accountant account.analytic.account accountant analytic.model_account_analytic_account account.group_account_user 1 1 1 1
93 access_account_account_type_invoice account.account.type invoice model_account_account_type account.group_account_invoice 1 1 1 1
94 access_report_account_receivable_invoice report.account.receivable.invoice model_report_account_receivable account.group_account_invoice 1 1 1 1

View File

@ -3,8 +3,6 @@
- -
!record {model: account.invoice, id: account_invoice_currency}: !record {model: account.invoice, id: account_invoice_currency}:
account_id: account.a_recv account_id: account.a_recv
address_contact_id: base.res_partner_address_3000
address_invoice_id: base.res_partner_address_3000
company_id: base.main_company company_id: base.main_company
currency_id: base.EUR currency_id: base.EUR
invoice_line: invoice_line:

View File

@ -3,8 +3,6 @@
- -
!record {model: account.invoice, id: account_invoice_state}: !record {model: account.invoice, id: account_invoice_state}:
account_id: account.a_recv account_id: account.a_recv
address_contact_id: base.res_partner_address_3000
address_invoice_id: base.res_partner_address_3000
company_id: base.main_company company_id: base.main_company
currency_id: base.EUR currency_id: base.EUR
invoice_line: invoice_line:

View File

@ -4,13 +4,11 @@
!record {model: account.invoice, id: test_invoice_1}: !record {model: account.invoice, id: test_invoice_1}:
currency_id: base.EUR currency_id: base.EUR
company_id: base.main_company company_id: base.main_company
address_invoice_id: base.res_partner_address_tang
partner_id: base.res_partner_asus partner_id: base.res_partner_asus
state: draft state: draft
type: out_invoice type: out_invoice
account_id: account.a_recv account_id: account.a_recv
name: Test invoice 1 name: Test invoice 1
address_contact_id: base.res_partner_address_tang
- -
In order to test the PDF reports defined on an invoice, we will print an Invoice Report In order to test the PDF reports defined on an invoice, we will print an Invoice Report
- -

View File

@ -16,8 +16,6 @@
- I create a draft customer invoice in a period of the demo fiscal year - I create a draft customer invoice in a period of the demo fiscal year
- !record {model: account.invoice, id: invoice_seq_test}: - !record {model: account.invoice, id: invoice_seq_test}:
account_id: account.a_recv account_id: account.a_recv
address_contact_id: base.res_partner_address_zen
address_invoice_id: base.res_partner_address_zen
company_id: base.main_company company_id: base.main_company
currency_id: base.EUR currency_id: base.EUR
invoice_line: invoice_line:

View File

@ -23,8 +23,6 @@
- -
!record {model: account.invoice, id: account_invoice_supplier0}: !record {model: account.invoice, id: account_invoice_supplier0}:
account_id: account.a_pay account_id: account.a_pay
address_contact_id: base.res_partner_address_3000
address_invoice_id: base.res_partner_address_3000
check_total: 3000.0 check_total: 3000.0
company_id: base.main_company company_id: base.main_company
currency_id: base.EUR currency_id: base.EUR

View File

@ -21,7 +21,6 @@
name: Precision Test name: Precision Test
type: out_invoice type: out_invoice
partner_id: base.res_partner_2 partner_id: base.res_partner_2
address_invoice_id: base.res_partner_address_1
account_id: account.a_recv account_id: account.a_recv
date_invoice: !eval time.strftime('%Y-%m-%d') date_invoice: !eval time.strftime('%Y-%m-%d')
invoice_line: invoice_line:

View File

@ -7,7 +7,6 @@
journal_id: 1 journal_id: 1
partner_id: base.res_partner_agrolait partner_id: base.res_partner_agrolait
currency_id: base.EUR currency_id: base.EUR
address_invoice_id: base.res_partner_address_8invoice
company_id: 1 company_id: 1
account_id: account.a_pay account_id: account.a_pay
date_invoice: !eval "'%s' % (time.strftime('%Y-%m-%d'))" date_invoice: !eval "'%s' % (time.strftime('%Y-%m-%d'))"
@ -58,11 +57,12 @@
"company_address": { "company_address": {
"__id": "base:b22acf7a-ddcd-11e0-a4db-701a04e25543.main_address", "__id": "base:b22acf7a-ddcd-11e0-a4db-701a04e25543.main_address",
"__module": "base", "__module": "base",
"__model": "res.partner.address", "__model": "res.partner",
"city": "Gerompont", "city": "Gerompont",
"zip": "1367", "name": "Company main address",
"country_id": ["base:b22acf7a-ddcd-11e0-a4db-701a04e25543.be", "Belgium"], "zip": "1367",
"phone": "(+32).81.81.37.00", "country_id": ["base:b22acf7a-ddcd-11e0-a4db-701a04e25543.be", "Belgium"],
"phone": "(+32).81.81.37.00",
"street": "Chaussee de Namur 40", "street": "Chaussee de Namur 40",
"bank_ids": [ "bank_ids": [
["base:b22acf7a-ddcd-11e0-a4db-701a04e25543.res_partner_bank-ZrTWzesfsdDJzGbp","Sample bank: 123465789-156113"] ["base:b22acf7a-ddcd-11e0-a4db-701a04e25543.res_partner_bank-ZrTWzesfsdDJzGbp","Sample bank: 123465789-156113"]
@ -80,12 +80,13 @@
"partner_address": { "partner_address": {
"__id": "base:5af1272e-dd26-11e0-b65e-701a04e25543.res_partner_address_7wdsjasdjh", "__id": "base:5af1272e-dd26-11e0-b65e-701a04e25543.res_partner_address_7wdsjasdjh",
"__module": "base", "__module": "base",
"__model": "res.partner.address", "__model": "res.partner",
"phone": "(+32).81.81.37.00", "name": "Default Address",
"street": "Chaussee de Namur 40", "phone": "(+32).81.81.37.00",
"city": "Gerompont", "street": "Chaussee de Namur 40",
"zip": "1367", "city": "Gerompont",
"country_id": ["base:5af1272e-dd26-11e0-b65e-701a04e25543.be", "Belgium"], "zip": "1367",
"country_id": ["base:5af1272e-dd26-11e0-b65e-701a04e25543.be", "Belgium"],
}, },
"date_invoice": time.strftime('%Y-%m-%d'), "date_invoice": time.strftime('%Y-%m-%d'),
"name": "sample invoice", "name": "sample invoice",

View File

@ -176,7 +176,6 @@ class account_invoice_refund(osv.osv_memory):
invoice = inv_obj.read(cr, uid, [inv.id], invoice = inv_obj.read(cr, uid, [inv.id],
['name', 'type', 'number', 'reference', ['name', 'type', 'number', 'reference',
'comment', 'date_due', 'partner_id', 'comment', 'date_due', 'partner_id',
'address_contact_id', 'address_invoice_id',
'partner_insite', 'partner_contact', 'partner_insite', 'partner_contact',
'partner_ref', 'payment_term', 'account_id', 'partner_ref', 'payment_term', 'account_id',
'currency_id', 'invoice_line', 'tax_line', 'currency_id', 'invoice_line', 'tax_line',
@ -197,8 +196,8 @@ class account_invoice_refund(osv.osv_memory):
'period_id': period, 'period_id': period,
'name': description 'name': description
}) })
for field in ('address_contact_id', 'address_invoice_id', 'partner_id', for field in ('partner_id', 'account_id', 'currency_id',
'account_id', 'currency_id', 'payment_term', 'journal_id'): 'payment_term', 'journal_id'):
invoice[field] = invoice[field] and invoice[field][0] invoice[field] = invoice[field] and invoice[field][0]
inv_id = inv_obj.create(cr, uid, invoice, {}) inv_id = inv_obj.create(cr, uid, invoice, {})
if inv.payment_term.id: if inv.payment_term.id:

View File

@ -123,6 +123,7 @@ class account_common_report(osv.osv_memory):
_defaults = { _defaults = {
'fiscalyear_id': _get_fiscalyear, 'fiscalyear_id': _get_fiscalyear,
'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'account.common.report',context=c),
'journal_ids': _get_all_journal, 'journal_ids': _get_all_journal,
'filter': 'filter_no', 'filter': 'filter_no',
'chart_account_id': _get_account, 'chart_account_id': _get_account,

View File

@ -3,7 +3,7 @@
<menuitem id="base.menu_invoiced" name="Invoicing" parent="base.menu_base_partner" sequence="5"/> <menuitem id="base.menu_invoiced" name="Invoicing" parent="base.menu_base_partner" sequence="5"/>
<record id="action_hr_tree_invoiced_all" model="ir.actions.act_window"> <record id="action_hr_tree_invoiced_all" model="ir.actions.act_window">
<field name="name">All Uninvoiced Entries</field> <field name="name">Time &amp; Costs to Invoice</field>
<field name="res_model">account.analytic.line</field> <field name="res_model">account.analytic.line</field>
<field name="view_type">form</field> <field name="view_type">form</field>
<field name="view_mode">tree,form</field> <field name="view_mode">tree,form</field>
@ -11,7 +11,7 @@
<field name="context">{'search_default_to_invoice': 1}</field> <field name="context">{'search_default_to_invoice': 1}</field>
<field name="search_view_id" ref="account.view_account_analytic_line_filter"/> <field name="search_view_id" ref="account.view_account_analytic_line_filter"/>
</record> </record>
<menuitem action="action_hr_tree_invoiced_all" id="menu_action_hr_tree_invoiced_all" parent="base.menu_invoiced"/> <menuitem action="action_hr_tree_invoiced_all" id="menu_action_hr_tree_invoiced_all" parent="base.menu_invoiced" sequence="5"/>
<record id="view_account_analytic_account_overdue_search" model="ir.ui.view"> <record id="view_account_analytic_account_overdue_search" model="ir.ui.view">
<field name="name">account.analytic.account.search</field> <field name="name">account.analytic.account.search</field>
@ -81,7 +81,7 @@
<menuitem id="base.menu_sales" name="Sales" <menuitem id="base.menu_sales" name="Sales"
parent="base.menu_base_partner" parent="base.menu_base_partner"
sequence="1"/> sequence="1"/>
<menuitem action="action_account_analytic_overdue_all" id="menu_action_account_analytic_overdue_all" sequence="50" parent="base.menu_sales"/> <menuitem action="action_account_analytic_overdue_all" id="menu_action_account_analytic_overdue_all" sequence="6" parent="base.menu_sales"/>
</data> </data>

View File

@ -32,9 +32,7 @@ Here is the list of contracts to renew:
% endif % endif
- Dates: ${account.date_start} to ${account.date and account.date or '???'} - Dates: ${account.date_start} to ${account.date and account.date or '???'}
- Contacts: - Contacts:
% for address in account.partner_id.address: ${account.partner_id.name}, ${account.partner_id.phone}, ${account.partner_id.email}
. ${address.name}, ${address.phone}, ${address.email}
% endfor
% endfor % endfor
% endfor % endfor

View File

@ -73,8 +73,8 @@ class account_invoice_line(osv.osv):
_inherit = "account.invoice.line" _inherit = "account.invoice.line"
_description = "Invoice Line" _description = "Invoice Line"
def product_id_change(self, cr, uid, ids, product, uom, qty=0, name='', type='out_invoice', partner_id=False, fposition_id=False, price_unit=False, address_invoice_id=False, currency_id=False, context=None, company_id=None): def product_id_change(self, cr, uid, ids, product, uom, qty=0, name='', type='out_invoice', partner_id=False, fposition_id=False, price_unit=False, currency_id=False, context=None, company_id=None):
res_prod = super(account_invoice_line, self).product_id_change(cr, uid, ids, product, uom, qty, name, type, partner_id, fposition_id, price_unit, address_invoice_id, currency_id=currency_id, context=context, company_id=company_id) res_prod = super(account_invoice_line, self).product_id_change(cr, uid, ids, product, uom, qty, name, type, partner_id, fposition_id, price_unit, currency_id=currency_id, context=context, company_id=company_id)
rec = self.pool.get('account.analytic.default').account_get(cr, uid, product, partner_id, uid, time.strftime('%Y-%m-%d'), context=context) rec = self.pool.get('account.analytic.default').account_get(cr, uid, product, partner_id, uid, time.strftime('%Y-%m-%d'), context=context)
if rec: if rec:
res_prod['value'].update({'account_analytic_id': rec.analytic_id.id}) res_prod['value'].update({'account_analytic_id': rec.analytic_id.id})
@ -89,8 +89,8 @@ class stock_picking(osv.osv):
_inherit = "stock.picking" _inherit = "stock.picking"
def _get_account_analytic_invoice(self, cursor, user, picking, move_line): def _get_account_analytic_invoice(self, cursor, user, picking, move_line):
partner_id = picking.address_id and picking.address_id.partner_id or False partner_id = picking.partner_id and picking.partner_id.id or False
rec = self.pool.get('account.analytic.default').account_get(cursor, user, move_line.product_id.id, partner_id and partner_id.id, user, time.strftime('%Y-%m-%d'), context={}) rec = self.pool.get('account.analytic.default').account_get(cursor, user, move_line.product_id.id, partner_id , user, time.strftime('%Y-%m-%d'), context={})
if rec: if rec:
return rec.analytic_id.id return rec.analytic_id.id

View File

@ -307,8 +307,8 @@ class account_invoice_line(osv.osv):
res ['analytics_id'] = line.analytics_id and line.analytics_id.id or False res ['analytics_id'] = line.analytics_id and line.analytics_id.id or False
return res return res
def product_id_change(self, cr, uid, ids, product, uom, qty=0, name='', type='out_invoice', partner_id=False, fposition_id=False, price_unit=False, address_invoice_id=False, currency_id=False, context=None, company_id=None): def product_id_change(self, cr, uid, ids, product, uom, qty=0, name='', type='out_invoice', partner_id=False, fposition_id=False, price_unit=False, currency_id=False, context=None, company_id=None):
res_prod = super(account_invoice_line, self).product_id_change(cr, uid, ids, product, uom, qty, name, type, partner_id, fposition_id, price_unit, address_invoice_id, currency_id, context=context, company_id=company_id) res_prod = super(account_invoice_line, self).product_id_change(cr, uid, ids, product, uom, qty, name, type, partner_id, fposition_id, price_unit, currency_id, context=context, company_id=company_id)
rec = self.pool.get('account.analytic.default').account_get(cr, uid, product, partner_id, uid, time.strftime('%Y-%m-%d'), context=context) rec = self.pool.get('account.analytic.default').account_get(cr, uid, product, partner_id, uid, time.strftime('%Y-%m-%d'), context=context)
if rec and rec.analytics_id: if rec and rec.analytics_id:
res_prod['value'].update({'analytics_id': rec.analytics_id.id}) res_prod['value'].update({'analytics_id': rec.analytics_id.id})

View File

@ -0,0 +1,98 @@
# Japanese translation for openobject-addons
# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
# This file is distributed under the same license as the openobject-addons package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
#
msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-02-08 00:35+0000\n"
"PO-Revision-Date: 2012-04-01 05:17+0000\n"
"Last-Translator: Masaki Yamaya <Unknown>\n"
"Language-Team: Japanese <ja@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-04-02 04:37+0000\n"
"X-Generator: Launchpad (build 15032)\n"
#. module: account_anglo_saxon
#: sql_constraint:purchase.order:0
msgid "Order Reference must be unique per Company!"
msgstr "発注参照は会社ごとにユニークなければいけません"
#. module: account_anglo_saxon
#: view:product.category:0
msgid " Accounting Property"
msgstr " 経理属性"
#. module: account_anglo_saxon
#: model:ir.model,name:account_anglo_saxon.model_product_category
msgid "Product Category"
msgstr "製品カテゴリー"
#. module: account_anglo_saxon
#: sql_constraint:stock.picking:0
msgid "Reference must be unique per Company!"
msgstr "参照は会社ごとにユニークでなければいけません"
#. module: account_anglo_saxon
#: constraint:product.category:0
msgid "Error ! You cannot create recursive categories."
msgstr "エラー:再帰カテゴリーを作成することはできません"
#. module: account_anglo_saxon
#: constraint:account.invoice:0
msgid "Invalid BBA Structured Communication !"
msgstr "無効なBBA構造のコミュニケーション"
#. module: account_anglo_saxon
#: constraint:product.template:0
msgid ""
"Error: The default UOM and the purchase UOM must be in the same category."
msgstr "エラーデフォールトのUOMと購入UOMは同じカテゴリーでなければいけません"
#. module: account_anglo_saxon
#: model:ir.model,name:account_anglo_saxon.model_account_invoice_line
msgid "Invoice Line"
msgstr "請求明細"
#. module: account_anglo_saxon
#: model:ir.model,name:account_anglo_saxon.model_purchase_order
msgid "Purchase Order"
msgstr "購買発注"
#. module: account_anglo_saxon
#: model:ir.model,name:account_anglo_saxon.model_product_template
msgid "Product Template"
msgstr "製品テンプレート"
#. module: account_anglo_saxon
#: field:product.category,property_account_creditor_price_difference_categ:0
#: field:product.template,property_account_creditor_price_difference:0
msgid "Price Difference Account"
msgstr "価格が異なるアカウント"
#. module: account_anglo_saxon
#: model:ir.model,name:account_anglo_saxon.model_account_invoice
msgid "Invoice"
msgstr "請求書"
#. module: account_anglo_saxon
#: model:ir.model,name:account_anglo_saxon.model_stock_picking
msgid "Picking List"
msgstr "選択リスト"
#. module: account_anglo_saxon
#: sql_constraint:account.invoice:0
msgid "Invoice Number must be unique per Company!"
msgstr "請求書番号は会社ごとにユニークでなければいけません"
#. module: account_anglo_saxon
#: help:product.category,property_account_creditor_price_difference_categ:0
#: help:product.template,property_account_creditor_price_difference:0
msgid ""
"This account will be used to value price difference between purchase price "
"and cost price."
msgstr "このアカウントを使って購買価格とコスト価格の違いを計算します"

View File

@ -136,9 +136,9 @@ class account_invoice_line(osv.osv):
res += diff_res res += diff_res
return res return res
def product_id_change(self, cr, uid, ids, product, uom, qty=0, name='', type='out_invoice', partner_id=False, fposition_id=False, price_unit=False, address_invoice_id=False, currency_id=False, context=None, company_id=None): def product_id_change(self, cr, uid, ids, product, uom, qty=0, name='', type='out_invoice', partner_id=False, fposition_id=False, price_unit=False, currency_id=False, context=None, company_id=None):
fiscal_pool = self.pool.get('account.fiscal.position') fiscal_pool = self.pool.get('account.fiscal.position')
res = super(account_invoice_line, self).product_id_change(cr, uid, ids, product, uom, qty, name, type, partner_id, fposition_id, price_unit, address_invoice_id, currency_id, context, company_id) res = super(account_invoice_line, self).product_id_change(cr, uid, ids, product, uom, qty, name, type, partner_id, fposition_id, price_unit, currency_id, context, company_id)
if not product: if not product:
return res return res
if type in ('in_invoice','in_refund'): if type in ('in_invoice','in_refund'):

View File

@ -288,7 +288,7 @@
</field> </field>
</record> </record>
<menuitem id="menu_finance_assets" name="Assets" parent="account.menu_finance"/> <menuitem id="menu_finance_assets" name="Assets" parent="account.menu_finance" sequence="9"/>
<menuitem parent="menu_finance_assets" id="menu_action_account_asset_asset_tree" <menuitem parent="menu_finance_assets" id="menu_action_account_asset_asset_tree"
groups="base.group_extended" groups="base.group_extended"
sequence="100" sequence="100"
@ -306,7 +306,7 @@
<act_window id="act_entries_open" name="Entries" res_model="account.move.line" src_model="account.asset.asset" context="{'search_default_asset_id': [active_id], 'default_asset_id': active_id}"/> <act_window id="act_entries_open" name="Entries" res_model="account.move.line" src_model="account.asset.asset" context="{'search_default_asset_id': [active_id], 'default_asset_id': active_id}"/>
<menuitem id="menu_finance_config_assets" name="Assets" parent="account.menu_finance_accounting"/> <menuitem id="menu_finance_config_assets" name="Assets" parent="account.menu_finance_configuration" sequence="25"/>
<record model="ir.actions.act_window" id="action_account_asset_asset_list_normal"> <record model="ir.actions.act_window" id="action_account_asset_asset_list_normal">
<field name="name">Asset Categories</field> <field name="name">Asset Categories</field>
<field name="res_model">account.asset.category</field> <field name="res_model">account.asset.category</field>

View File

@ -0,0 +1,833 @@
# Spanish (Ecuador) translation for openobject-addons
# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
# This file is distributed under the same license as the openobject-addons package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
#
msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-02-08 01:37+0100\n"
"PO-Revision-Date: 2012-03-24 03:16+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Spanish (Ecuador) <es_EC@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-03-25 05:05+0000\n"
"X-Generator: Launchpad (build 14981)\n"
#. module: account_asset
#: view:account.asset.asset:0
msgid "Assets in draft and open states"
msgstr "Activos en estado borrador y abierto"
#. module: account_asset
#: field:account.asset.category,method_end:0
#: field:account.asset.history,method_end:0 field:asset.modify,method_end:0
msgid "Ending date"
msgstr "Fecha de finalización"
#. module: account_asset
#: field:account.asset.asset,value_residual:0
msgid "Residual Value"
msgstr "Valor residual"
#. module: account_asset
#: field:account.asset.category,account_expense_depreciation_id:0
msgid "Depr. Expense Account"
msgstr "Cuenta gastos amortización"
#. module: account_asset
#: view:asset.depreciation.confirmation.wizard:0
msgid "Compute Asset"
msgstr "Calcular activo"
#. module: account_asset
#: view:asset.asset.report:0
msgid "Group By..."
msgstr "Agrupar por..."
#. module: account_asset
#: field:asset.asset.report,gross_value:0
msgid "Gross Amount"
msgstr "Importe bruto"
#. module: account_asset
#: view:account.asset.asset:0 field:account.asset.asset,name:0
#: field:account.asset.depreciation.line,asset_id:0
#: field:account.asset.history,asset_id:0 field:account.move.line,asset_id:0
#: view:asset.asset.report:0 field:asset.asset.report,asset_id:0
#: model:ir.model,name:account_asset.model_account_asset_asset
msgid "Asset"
msgstr "Activo Fijo"
#. module: account_asset
#: help:account.asset.asset,prorata:0 help:account.asset.category,prorata:0
msgid ""
"Indicates that the first depreciation entry for this asset have to be done "
"from the purchase date instead of the first January"
msgstr ""
"Indica que el primer asiento de depreciación para este activo tiene que ser "
"hecho desde la fecha de compra en vez de desde el 1 de enero"
#. module: account_asset
#: field:account.asset.history,name:0
msgid "History name"
msgstr "Nombre histórico"
#. module: account_asset
#: field:account.asset.asset,company_id:0
#: field:account.asset.category,company_id:0 view:asset.asset.report:0
#: field:asset.asset.report,company_id:0
msgid "Company"
msgstr "Compañia"
#. module: account_asset
#: view:asset.modify:0
msgid "Modify"
msgstr "Modificar"
#. module: account_asset
#: selection:account.asset.asset,state:0 view:asset.asset.report:0
#: selection:asset.asset.report,state:0
msgid "Running"
msgstr "En proceso"
#. module: account_asset
#: field:account.asset.depreciation.line,amount:0
msgid "Depreciation Amount"
msgstr "Importe de depreciación"
#. module: account_asset
#: view:asset.asset.report:0
#: model:ir.actions.act_window,name:account_asset.action_asset_asset_report
#: model:ir.model,name:account_asset.model_asset_asset_report
#: model:ir.ui.menu,name:account_asset.menu_action_asset_asset_report
msgid "Assets Analysis"
msgstr "Análisis activos"
#. module: account_asset
#: field:asset.modify,name:0
msgid "Reason"
msgstr "Motivo"
#. module: account_asset
#: field:account.asset.asset,method_progress_factor:0
#: field:account.asset.category,method_progress_factor:0
msgid "Degressive Factor"
msgstr "Factor degresivo"
#. module: account_asset
#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_list_normal
#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_list_normal
msgid "Asset Categories"
msgstr "Categorías de Activo Fijo"
#. module: account_asset
#: view:asset.depreciation.confirmation.wizard:0
msgid ""
"This wizard will post the depreciation lines of running assets that belong "
"to the selected period."
msgstr ""
"Este asistente asentará las líneas de depreciación de los activos en "
"ejecución que pertenezcan al periodo seleccionado"
#. module: account_asset
#: field:account.asset.asset,account_move_line_ids:0
#: field:account.move.line,entry_ids:0
#: model:ir.actions.act_window,name:account_asset.act_entries_open
msgid "Entries"
msgstr "Asientos"
#. module: account_asset
#: view:account.asset.asset:0
#: field:account.asset.asset,depreciation_line_ids:0
msgid "Depreciation Lines"
msgstr "Detalle de Depreciación"
#. module: account_asset
#: help:account.asset.asset,salvage_value:0
msgid "It is the amount you plan to have that you cannot depreciate."
msgstr "Es el importe que prevee tener y que no puede depreciar"
#. module: account_asset
#: field:account.asset.depreciation.line,depreciation_date:0
#: view:asset.asset.report:0 field:asset.asset.report,depreciation_date:0
msgid "Depreciation Date"
msgstr "Fecha de depreciación"
#. module: account_asset
#: field:account.asset.category,account_asset_id:0
msgid "Asset Account"
msgstr "Cuenta de Activo Fijo"
#. module: account_asset
#: field:asset.asset.report,posted_value:0
msgid "Posted Amount"
msgstr "Monto Contabilizado"
#. module: account_asset
#: view:account.asset.asset:0 view:asset.asset.report:0
#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_form
#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_form
#: model:ir.ui.menu,name:account_asset.menu_finance_assets
#: model:ir.ui.menu,name:account_asset.menu_finance_config_assets
msgid "Assets"
msgstr "Activos Fijos"
#. module: account_asset
#: field:account.asset.category,account_depreciation_id:0
msgid "Depreciation Account"
msgstr "Cuenta de Depreciación"
#. module: account_asset
#: view:account.asset.asset:0 view:account.asset.category:0
#: view:account.asset.history:0 view:asset.modify:0 field:asset.modify,note:0
msgid "Notes"
msgstr "Notas"
#. module: account_asset
#: field:account.asset.depreciation.line,move_id:0
msgid "Depreciation Entry"
msgstr "Asiento de Depreciación"
#. module: account_asset
#: sql_constraint:account.move.line:0
msgid "Wrong credit or debit value in accounting entry !"
msgstr "¡Valor erróneo en el debe o en el haber del asiento contable!"
#. module: account_asset
#: view:asset.asset.report:0 field:asset.asset.report,nbr:0
msgid "# of Depreciation Lines"
msgstr "# de líneas de depreciación"
#. module: account_asset
#: view:asset.asset.report:0
msgid "Assets in draft state"
msgstr "Depreciaciones en estado borrador"
#. module: account_asset
#: field:account.asset.asset,method_end:0
#: selection:account.asset.asset,method_time:0
#: selection:account.asset.category,method_time:0
#: selection:account.asset.history,method_time:0
msgid "Ending Date"
msgstr "Fecha de Cierre"
#. module: account_asset
#: field:account.asset.asset,code:0
msgid "Reference"
msgstr "Ref."
#. module: account_asset
#: constraint:account.invoice:0
msgid "Invalid BBA Structured Communication !"
msgstr "¡Estructura de comunicación BBA no válida!"
#. module: account_asset
#: view:account.asset.asset:0
msgid "Account Asset"
msgstr "Cuenta de activo"
#. module: account_asset
#: model:ir.actions.act_window,name:account_asset.action_asset_depreciation_confirmation_wizard
#: model:ir.ui.menu,name:account_asset.menu_asset_depreciation_confirmation_wizard
msgid "Compute Assets"
msgstr "Calcular Depreciación de Activos Fijos"
#. module: account_asset
#: field:account.asset.depreciation.line,sequence:0
msgid "Sequence of the depreciation"
msgstr "Secuencia de Depreciación"
#. module: account_asset
#: field:account.asset.asset,method_period:0
#: field:account.asset.category,method_period:0
#: field:account.asset.history,method_period:0
#: field:asset.modify,method_period:0
msgid "Period Length"
msgstr "Tiempo a Depreciar"
#. module: account_asset
#: selection:account.asset.asset,state:0 view:asset.asset.report:0
#: selection:asset.asset.report,state:0
msgid "Draft"
msgstr "Borrador"
#. module: account_asset
#: view:asset.asset.report:0
msgid "Date of asset purchase"
msgstr "Fecha de compra del activo"
#. module: account_asset
#: help:account.asset.asset,method_number:0
msgid "Calculates Depreciation within specified interval"
msgstr "Calcula la depreciación en el período especificado"
#. module: account_asset
#: view:account.asset.asset:0
msgid "Change Duration"
msgstr "Cambiar duración"
#. module: account_asset
#: field:account.asset.category,account_analytic_id:0
msgid "Analytic account"
msgstr "Cuenta Analitica"
#. module: account_asset
#: field:account.asset.asset,method:0 field:account.asset.category,method:0
msgid "Computation Method"
msgstr "Método de cálculo"
#. module: account_asset
#: help:account.asset.asset,method_period:0
msgid "State here the time during 2 depreciations, in months"
msgstr "Ponga aquí el tiempo entre 2 amortizaciones, en meses"
#. module: account_asset
#: constraint:account.asset.asset:0
msgid ""
"Prorata temporis can be applied only for time method \"number of "
"depreciations\"."
msgstr ""
"Prorata temporis puede ser aplicado solo para método de tiempo \"numero de "
"depreciaciones\""
#. module: account_asset
#: help:account.asset.history,method_time:0
msgid ""
"The method to use to compute the dates and number of depreciation lines.\n"
"Number of Depreciations: Fix the number of depreciation lines and the time "
"between 2 depreciations.\n"
"Ending Date: Choose the time between 2 depreciations and the date the "
"depreciations won't go beyond."
msgstr ""
"El método usado para calcular las fechas número de líneas de depreciación\n"
"Número de depreciaciones: Ajusta el número de líneas de depreciación y el "
"tiempo entre 2 depreciaciones\n"
"Fecha de fin: Escoja un tiempo entre 2 amortizaciones y la fecha de "
"depreciación no irá más allá."
#. module: account_asset
#: field:account.asset.asset,purchase_value:0
msgid "Gross value "
msgstr "Valor bruto "
#. module: account_asset
#: constraint:account.asset.asset:0
msgid "Error ! You can not create recursive assets."
msgstr "¡Error! No puede crear activos recursivos"
#. module: account_asset
#: help:account.asset.history,method_period:0
msgid "Time in month between two depreciations"
msgstr "Tiempo en meses entre 2 depreciaciones"
#. module: account_asset
#: view:asset.asset.report:0 field:asset.asset.report,name:0
msgid "Year"
msgstr "Año"
#. module: account_asset
#: view:asset.modify:0
#: model:ir.actions.act_window,name:account_asset.action_asset_modify
#: model:ir.model,name:account_asset.model_asset_modify
msgid "Modify Asset"
msgstr "Modificar Activo Fijo"
#. module: account_asset
#: view:account.asset.asset:0
msgid "Other Information"
msgstr "Otra Información"
#. module: account_asset
#: field:account.asset.asset,salvage_value:0
msgid "Salvage Value"
msgstr "Valor de salvaguarda"
#. module: account_asset
#: field:account.invoice.line,asset_category_id:0 view:asset.asset.report:0
msgid "Asset Category"
msgstr "Categoría de Activo"
#. module: account_asset
#: view:account.asset.asset:0
msgid "Set to Close"
msgstr "Marcar cerrado"
#. module: account_asset
#: model:ir.actions.wizard,name:account_asset.wizard_asset_compute
msgid "Compute assets"
msgstr "Calcular Activos Fijos"
#. module: account_asset
#: model:ir.actions.wizard,name:account_asset.wizard_asset_modify
msgid "Modify asset"
msgstr "Modificar activo"
#. module: account_asset
#: view:account.asset.asset:0
msgid "Assets in closed state"
msgstr "Activos en cerrados"
#. module: account_asset
#: field:account.asset.asset,parent_id:0
msgid "Parent Asset"
msgstr "Padre del activo"
#. module: account_asset
#: view:account.asset.history:0
#: model:ir.model,name:account_asset.model_account_asset_history
msgid "Asset history"
msgstr "Histórico del activo"
#. module: account_asset
#: view:asset.asset.report:0
msgid "Assets purchased in current year"
msgstr "Activos comprados en el año actual"
#. module: account_asset
#: field:account.asset.asset,state:0 field:asset.asset.report,state:0
msgid "State"
msgstr "Estado"
#. module: account_asset
#: model:ir.model,name:account_asset.model_account_invoice_line
msgid "Invoice Line"
msgstr "Detalle de Factura"
#. module: account_asset
#: constraint:account.move.line:0
msgid ""
"The selected account of your Journal Entry forces to provide a secondary "
"currency. You should remove the secondary currency on the account or select "
"a multi-currency view on the journal."
msgstr ""
"La cuenta selecionada de su diario obliga a tener una moneda secundaria. "
"Usted debería eliminar la moneda secundaria de la cuenta o asignar una vista "
"de multi-moneda al diario."
#. module: account_asset
#: view:asset.asset.report:0
msgid "Month"
msgstr "Mes"
#. module: account_asset
#: view:account.asset.asset:0
msgid "Depreciation Board"
msgstr "Tabla de depreciación"
#. module: account_asset
#: model:ir.model,name:account_asset.model_account_move_line
msgid "Journal Items"
msgstr "Asientos Contables"
#. module: account_asset
#: field:asset.asset.report,unposted_value:0
msgid "Unposted Amount"
msgstr "Importe no contabilizado"
#. module: account_asset
#: field:account.asset.asset,method_time:0
#: field:account.asset.category,method_time:0
#: field:account.asset.history,method_time:0
msgid "Time Method"
msgstr "Método de tiempo"
#. module: account_asset
#: view:account.asset.category:0
msgid "Analytic information"
msgstr "Información analítica"
#. module: account_asset
#: view:asset.modify:0
msgid "Asset durations to modify"
msgstr "Duraciones de activo para modificar"
#. module: account_asset
#: constraint:account.move.line:0
msgid ""
"The date of your Journal Entry is not in the defined period! You should "
"change the date or remove this constraint from the journal."
msgstr ""
"¡La fecha de su asiento no está en el periodo definido! Usted debería "
"cambiar la fecha o borrar esta restricción del diario."
#. module: account_asset
#: field:account.asset.asset,note:0 field:account.asset.category,note:0
#: field:account.asset.history,note:0
msgid "Note"
msgstr "Nota"
#. module: account_asset
#: help:account.asset.asset,method:0 help:account.asset.category,method:0
msgid ""
"Choose the method to use to compute the amount of depreciation lines.\n"
" * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n"
" * Degressive: Calculated on basis of: Remaining Value * Degressive Factor"
msgstr ""
"Escoja el método para usar en el cálculo del importe de las líneas de "
"depreciación\n"
" * Lineal: calculado en base a: valor bruto / número de depreciaciones\n"
" * Regresivo: calculado en base a: valor remanente/ factor de regresión"
#. module: account_asset
#: help:account.asset.asset,method_time:0
#: help:account.asset.category,method_time:0
msgid ""
"Choose the method to use to compute the dates and number of depreciation "
"lines.\n"
" * Number of Depreciations: Fix the number of depreciation lines and the "
"time between 2 depreciations.\n"
" * Ending Date: Choose the time between 2 depreciations and the date the "
"depreciations won't go beyond."
msgstr ""
"Escoja el método utilizado para calcular las fechas y número de las líneas "
"de depreciación\n"
" * Número de depreciaciones: Establece el número de líneas de depreciación "
"y el tiempo entre dos depreciaciones.\n"
" * Fecha fin: Seleccione el tiempo entre 2 depreciaciones y la fecha de la "
"depreciación no irá más allá."
#. module: account_asset
#: view:asset.asset.report:0
msgid "Assets in running state"
msgstr "Activos en depreciación"
#. module: account_asset
#: view:account.asset.asset:0
msgid "Closed"
msgstr "Cerrado"
#. module: account_asset
#: field:account.asset.asset,partner_id:0
#: field:asset.asset.report,partner_id:0
msgid "Partner"
msgstr "Empresa"
#. module: account_asset
#: view:asset.asset.report:0 field:asset.asset.report,depreciation_value:0
msgid "Amount of Depreciation Lines"
msgstr "Importe de las líneas de depreciación"
#. module: account_asset
#: view:asset.asset.report:0
msgid "Posted depreciation lines"
msgstr "Detalle de depreciación"
#. module: account_asset
#: constraint:account.move.line:0
msgid "Company must be the same for its related account and period."
msgstr "La compañía debe ser la misma para su cuenta y periodos relacionados"
#. module: account_asset
#: field:account.asset.asset,child_ids:0
msgid "Children Assets"
msgstr "Activos hijos"
#. module: account_asset
#: view:asset.asset.report:0
msgid "Date of depreciation"
msgstr "Fecha de depreciación"
#. module: account_asset
#: field:account.asset.history,user_id:0
msgid "User"
msgstr "Usuario"
#. module: account_asset
#: field:account.asset.history,date:0
msgid "Date"
msgstr "Fecha"
#. module: account_asset
#: view:asset.asset.report:0
msgid "Assets purchased in current month"
msgstr "Activos comprados en el mes actual"
#. module: account_asset
#: constraint:account.move.line:0
msgid "You can not create journal items on an account of type view."
msgstr "No puede crear asientos en una cuenta de tipo vista"
#. module: account_asset
#: view:asset.asset.report:0
msgid "Extended Filters..."
msgstr "Filtros extendidos..."
#. module: account_asset
#: view:account.asset.asset:0 view:asset.depreciation.confirmation.wizard:0
msgid "Compute"
msgstr "Calcular"
#. module: account_asset
#: view:account.asset.category:0
msgid "Search Asset Category"
msgstr "Buscar categoría de activo"
#. module: account_asset
#: model:ir.model,name:account_asset.model_asset_depreciation_confirmation_wizard
msgid "asset.depreciation.confirmation.wizard"
msgstr "asset.depreciation.confirmation.wizard"
#. module: account_asset
#: field:account.asset.asset,active:0
msgid "Active"
msgstr "Activo"
#. module: account_asset
#: model:ir.actions.wizard,name:account_asset.wizard_asset_close
msgid "Close asset"
msgstr "Cerrar Activo Fijo"
#. module: account_asset
#: field:account.asset.depreciation.line,parent_state:0
msgid "State of Asset"
msgstr "Estado del activo"
#. module: account_asset
#: field:account.asset.depreciation.line,name:0
msgid "Depreciation Name"
msgstr "Nombre depreciación"
#. module: account_asset
#: view:account.asset.asset:0 field:account.asset.asset,history_ids:0
msgid "History"
msgstr "Histórico"
#. module: account_asset
#: sql_constraint:account.invoice:0
msgid "Invoice Number must be unique per Company!"
msgstr "¡El número de factura debe ser único por compañía!"
#. module: account_asset
#: field:asset.depreciation.confirmation.wizard,period_id:0
msgid "Period"
msgstr "Período"
#. module: account_asset
#: view:account.asset.asset:0
msgid "General"
msgstr "General"
#. module: account_asset
#: field:account.asset.asset,prorata:0 field:account.asset.category,prorata:0
msgid "Prorata Temporis"
msgstr "Prorata Temporis"
#. module: account_asset
#: view:account.asset.category:0
msgid "Accounting information"
msgstr "Información contable"
#. module: account_asset
#: model:ir.model,name:account_asset.model_account_invoice
msgid "Invoice"
msgstr "Factura"
#. module: account_asset
#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_form_normal
msgid "Review Asset Categories"
msgstr "Revisar categorías de activos"
#. module: account_asset
#: view:asset.depreciation.confirmation.wizard:0 view:asset.modify:0
msgid "Cancel"
msgstr "Cancelar"
#. module: account_asset
#: selection:account.asset.asset,state:0 selection:asset.asset.report,state:0
msgid "Close"
msgstr "Cerrar"
#. module: account_asset
#: view:account.asset.asset:0 view:account.asset.category:0
msgid "Depreciation Method"
msgstr "Método de depreciación"
#. module: account_asset
#: field:account.asset.asset,purchase_date:0 view:asset.asset.report:0
#: field:asset.asset.report,purchase_date:0
msgid "Purchase Date"
msgstr "Fecha de compra"
#. module: account_asset
#: selection:account.asset.asset,method:0
#: selection:account.asset.category,method:0
msgid "Degressive"
msgstr "Disminución"
#. module: account_asset
#: help:asset.depreciation.confirmation.wizard,period_id:0
msgid ""
"Choose the period for which you want to automatically post the depreciation "
"lines of running assets"
msgstr ""
"Escoja el periodo para el que desea asentar automáticamente las líneas de "
"depreciación para los activos en ejecución"
#. module: account_asset
#: view:account.asset.asset:0
msgid "Current"
msgstr "Actual"
#. module: account_asset
#: field:account.asset.depreciation.line,remaining_value:0
msgid "Amount to Depreciate"
msgstr "Importe a depreciar"
#. module: account_asset
#: field:account.asset.category,open_asset:0
msgid "Skip Draft State"
msgstr "Omitir estado borrador"
#. module: account_asset
#: view:account.asset.asset:0 view:account.asset.category:0
#: view:account.asset.history:0
msgid "Depreciation Dates"
msgstr "Fechas de depreciación"
#. module: account_asset
#: field:account.asset.asset,currency_id:0
msgid "Currency"
msgstr "Moneda"
#. module: account_asset
#: field:account.asset.category,journal_id:0
msgid "Journal"
msgstr "Diario"
#. module: account_asset
#: field:account.asset.depreciation.line,depreciated_value:0
msgid "Amount Already Depreciated"
msgstr "importe depreciado"
#. module: account_asset
#: field:account.asset.depreciation.line,move_check:0
#: view:asset.asset.report:0 field:asset.asset.report,move_check:0
msgid "Posted"
msgstr "Contabilizado"
#. module: account_asset
#: help:account.asset.asset,state:0
msgid ""
"When an asset is created, the state is 'Draft'.\n"
"If the asset is confirmed, the state goes in 'Running' and the depreciation "
"lines can be posted in the accounting.\n"
"You can manually close an asset when the depreciation is over. If the last "
"line of depreciation is posted, the asset automatically goes in that state."
msgstr ""
"Cuando un activo es creado, su estado es 'Borrador'.\n"
"Si el activo es confirmado, el estado pasa a 'en ejecución' y las líneas de "
"amortización pueden ser asentados en la contabilidad.\n"
"Puede cerrar manualmente un activo cuando su amortización ha finalizado. Si "
"la última línea de depreciación se asienta, el activo automáticamente pasa a "
"este estado."
#. module: account_asset
#: field:account.asset.category,name:0
msgid "Name"
msgstr "Nombre"
#. module: account_asset
#: help:account.asset.category,open_asset:0
msgid ""
"Check this if you want to automatically confirm the assets of this category "
"when created by invoices."
msgstr ""
"Valide si desea confirmar automáticamente el activo de esta categoría cuando "
"es creado desde una factura."
#. module: account_asset
#: view:account.asset.asset:0
msgid "Set to Draft"
msgstr "Cambiar a borrador"
#. module: account_asset
#: selection:account.asset.asset,method:0
#: selection:account.asset.category,method:0
msgid "Linear"
msgstr "Lineal"
#. module: account_asset
#: view:asset.asset.report:0
msgid "Month-1"
msgstr "Mes-1"
#. module: account_asset
#: model:ir.model,name:account_asset.model_account_asset_depreciation_line
msgid "Asset depreciation line"
msgstr "Línea de depreciación del activo"
#. module: account_asset
#: field:account.asset.asset,category_id:0 view:account.asset.category:0
#: field:asset.asset.report,asset_category_id:0
#: model:ir.model,name:account_asset.model_account_asset_category
msgid "Asset category"
msgstr "Categoría de activo"
#. module: account_asset
#: view:asset.asset.report:0
msgid "Assets purchased in last month"
msgstr "Activos comprados en el último mes"
#. module: account_asset
#: code:addons/account_asset/wizard/wizard_asset_compute.py:49
#, python-format
msgid "Created Asset Moves"
msgstr "Movimientos de activos creados"
#. module: account_asset
#: constraint:account.move.line:0
msgid "You can not create journal items on closed account."
msgstr "No puede crear asientos en cuentas cerradas"
#. module: account_asset
#: model:ir.actions.act_window,help:account_asset.action_asset_asset_report
msgid ""
"From this report, you can have an overview on all depreciation. The tool "
"search can also be used to personalise your Assets reports and so, match "
"this analysis to your needs;"
msgstr ""
"Para este informe, puede tener una visión general de todas las "
"depreciaciones. La herramienta de búsqueda también puede ser utilizada para "
"personalizar sus informes de activos y por lo tanto adecuar este análisis a "
"sus necesidades;"
#. module: account_asset
#: help:account.asset.category,method_period:0
msgid "State here the time between 2 depreciations, in months"
msgstr "Establezca aquí el tiempo entre 2 depreciaciones, en meses"
#. module: account_asset
#: field:account.asset.asset,method_number:0
#: selection:account.asset.asset,method_time:0
#: field:account.asset.category,method_number:0
#: selection:account.asset.category,method_time:0
#: field:account.asset.history,method_number:0
#: selection:account.asset.history,method_time:0
#: field:asset.modify,method_number:0
msgid "Number of Depreciations"
msgstr "Número de depreciaciones"
#. module: account_asset
#: view:account.asset.asset:0
msgid "Create Move"
msgstr "Crear asiento"
#. module: account_asset
#: view:asset.depreciation.confirmation.wizard:0
msgid "Post Depreciation Lines"
msgstr "Asentar líneas de depreciación"
#. module: account_asset
#: view:account.asset.asset:0
msgid "Confirm Asset"
msgstr "Confirmar activo"
#. module: account_asset
#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_tree
#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_tree
msgid "Asset Hierarchy"
msgstr "Jerarquía de activos"

View File

@ -0,0 +1,374 @@
# Italian translation for openobject-addons
# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
# This file is distributed under the same license as the openobject-addons package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
#
msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-02-08 00:35+0000\n"
"PO-Revision-Date: 2012-03-30 19:02+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Italian <it@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-03-31 05:09+0000\n"
"X-Generator: Launchpad (build 15032)\n"
#. module: account_bank_statement_extensions
#: view:account.bank.statement.line:0
msgid "Search Bank Transactions"
msgstr "Cerca transazioni bancarie"
#. module: account_bank_statement_extensions
#: view:account.bank.statement.line:0
#: selection:account.bank.statement.line,state:0
msgid "Confirmed"
msgstr "Confermato"
#. module: account_bank_statement_extensions
#: view:account.bank.statement:0
#: view:account.bank.statement.line:0
msgid "Glob. Id"
msgstr "Glob. Id"
#. module: account_bank_statement_extensions
#: selection:account.bank.statement.line.global,type:0
msgid "CODA"
msgstr "CODA"
#. module: account_bank_statement_extensions
#: field:account.bank.statement.line.global,parent_id:0
msgid "Parent Code"
msgstr "Codice Genitore"
#. module: account_bank_statement_extensions
#: view:account.bank.statement.line:0
msgid "Debit"
msgstr "Debito"
#. module: account_bank_statement_extensions
#: view:cancel.statement.line:0
#: model:ir.actions.act_window,name:account_bank_statement_extensions.action_cancel_statement_line
#: model:ir.model,name:account_bank_statement_extensions.model_cancel_statement_line
msgid "Cancel selected statement lines"
msgstr ""
#. module: account_bank_statement_extensions
#: constraint:res.partner.bank:0
msgid "The RIB and/or IBAN is not valid"
msgstr ""
#. module: account_bank_statement_extensions
#: view:account.bank.statement.line:0
msgid "Group By..."
msgstr "Ragguppa per..."
#. module: account_bank_statement_extensions
#: field:account.bank.statement.line,state:0
msgid "State"
msgstr "Stato"
#. module: account_bank_statement_extensions
#: view:account.bank.statement.line:0
#: selection:account.bank.statement.line,state:0
msgid "Draft"
msgstr "Bozza"
#. module: account_bank_statement_extensions
#: view:account.bank.statement.line:0
msgid "Statement"
msgstr "Dichiarazione"
#. module: account_bank_statement_extensions
#: view:confirm.statement.line:0
#: model:ir.actions.act_window,name:account_bank_statement_extensions.action_confirm_statement_line
#: model:ir.model,name:account_bank_statement_extensions.model_confirm_statement_line
msgid "Confirm selected statement lines"
msgstr ""
#. module: account_bank_statement_extensions
#: report:bank.statement.balance.report:0
#: model:ir.actions.report.xml,name:account_bank_statement_extensions.bank_statement_balance_report
msgid "Bank Statement Balances Report"
msgstr ""
#. module: account_bank_statement_extensions
#: view:cancel.statement.line:0
msgid "Cancel Lines"
msgstr "Cancella linee"
#. module: account_bank_statement_extensions
#: view:account.bank.statement.line.global:0
#: model:ir.model,name:account_bank_statement_extensions.model_account_bank_statement_line_global
msgid "Batch Payment Info"
msgstr ""
#. module: account_bank_statement_extensions
#: view:confirm.statement.line:0
msgid "Confirm Lines"
msgstr "Conferma linee"
#. module: account_bank_statement_extensions
#: code:addons/account_bank_statement_extensions/account_bank_statement.py:130
#, python-format
msgid ""
"Delete operation not allowed ! Please go to the associated bank "
"statement in order to delete and/or modify this bank statement line"
msgstr ""
#. module: account_bank_statement_extensions
#: field:account.bank.statement.line.global,type:0
msgid "Type"
msgstr ""
#. module: account_bank_statement_extensions
#: view:account.bank.statement.line:0
#: field:account.bank.statement.line,journal_id:0
#: report:bank.statement.balance.report:0
msgid "Journal"
msgstr "Registro"
#. module: account_bank_statement_extensions
#: view:account.bank.statement.line:0
msgid "Confirmed Statement Lines."
msgstr ""
#. module: account_bank_statement_extensions
#: view:account.bank.statement.line:0
msgid "Credit Transactions."
msgstr ""
#. module: account_bank_statement_extensions
#: model:ir.actions.act_window,help:account_bank_statement_extensions.action_cancel_statement_line
msgid "cancel selected statement lines."
msgstr ""
#. module: account_bank_statement_extensions
#: field:account.bank.statement.line,counterparty_number:0
msgid "Counterparty Number"
msgstr ""
#. module: account_bank_statement_extensions
#: view:account.bank.statement.line.global:0
msgid "Transactions"
msgstr "Transazioni"
#. module: account_bank_statement_extensions
#: code:addons/account_bank_statement_extensions/account_bank_statement.py:130
#, python-format
msgid "Warning"
msgstr "Attenzione"
#. module: account_bank_statement_extensions
#: report:bank.statement.balance.report:0
msgid "Closing Balance"
msgstr ""
#. module: account_bank_statement_extensions
#: report:bank.statement.balance.report:0
msgid "Date"
msgstr "Data"
#. module: account_bank_statement_extensions
#: view:account.bank.statement.line:0
#: field:account.bank.statement.line,globalisation_amount:0
msgid "Glob. Amount"
msgstr ""
#. module: account_bank_statement_extensions
#: view:account.bank.statement.line:0
msgid "Debit Transactions."
msgstr ""
#. module: account_bank_statement_extensions
#: view:account.bank.statement.line:0
msgid "Extended Filters..."
msgstr ""
#. module: account_bank_statement_extensions
#: view:confirm.statement.line:0
msgid "Confirmed lines cannot be changed anymore."
msgstr ""
#. module: account_bank_statement_extensions
#: constraint:res.partner.bank:0
msgid ""
"\n"
"Please define BIC/Swift code on bank for bank type IBAN Account to make "
"valid payments"
msgstr ""
#. module: account_bank_statement_extensions
#: field:account.bank.statement.line,val_date:0
msgid "Valuta Date"
msgstr ""
#. module: account_bank_statement_extensions
#: model:ir.actions.act_window,help:account_bank_statement_extensions.action_confirm_statement_line
msgid "Confirm selected statement lines."
msgstr ""
#. module: account_bank_statement_extensions
#: view:cancel.statement.line:0
msgid "Are you sure you want to cancel the selected Bank Statement lines ?"
msgstr ""
#. module: account_bank_statement_extensions
#: report:bank.statement.balance.report:0
msgid "Name"
msgstr ""
#. module: account_bank_statement_extensions
#: selection:account.bank.statement.line.global,type:0
msgid "ISO 20022"
msgstr ""
#. module: account_bank_statement_extensions
#: view:account.bank.statement.line:0
msgid "Notes"
msgstr ""
#. module: account_bank_statement_extensions
#: selection:account.bank.statement.line.global,type:0
msgid "Manual"
msgstr ""
#. module: account_bank_statement_extensions
#: view:account.bank.statement.line:0
msgid "Credit"
msgstr ""
#. module: account_bank_statement_extensions
#: field:account.bank.statement.line.global,amount:0
msgid "Amount"
msgstr ""
#. module: account_bank_statement_extensions
#: view:account.bank.statement.line:0
msgid "Fin.Account"
msgstr ""
#. module: account_bank_statement_extensions
#: field:account.bank.statement.line,counterparty_currency:0
msgid "Counterparty Currency"
msgstr ""
#. module: account_bank_statement_extensions
#: field:account.bank.statement.line,counterparty_bic:0
msgid "Counterparty BIC"
msgstr ""
#. module: account_bank_statement_extensions
#: field:account.bank.statement.line.global,child_ids:0
msgid "Child Codes"
msgstr ""
#. module: account_bank_statement_extensions
#: view:confirm.statement.line:0
msgid "Are you sure you want to confirm the selected Bank Statement lines ?"
msgstr ""
#. module: account_bank_statement_extensions
#: constraint:account.bank.statement.line:0
msgid ""
"The amount of the voucher must be the same amount as the one on the "
"statement line"
msgstr ""
#. module: account_bank_statement_extensions
#: help:account.bank.statement.line,globalisation_id:0
msgid ""
"Code to identify transactions belonging to the same globalisation level "
"within a batch payment"
msgstr ""
#. module: account_bank_statement_extensions
#: view:account.bank.statement.line:0
msgid "Draft Statement Lines."
msgstr ""
#. module: account_bank_statement_extensions
#: view:account.bank.statement.line:0
msgid "Glob. Am."
msgstr ""
#. module: account_bank_statement_extensions
#: model:ir.model,name:account_bank_statement_extensions.model_account_bank_statement_line
msgid "Bank Statement Line"
msgstr ""
#. module: account_bank_statement_extensions
#: field:account.bank.statement.line.global,code:0
msgid "Code"
msgstr ""
#. module: account_bank_statement_extensions
#: field:account.bank.statement.line,counterparty_name:0
msgid "Counterparty Name"
msgstr ""
#. module: account_bank_statement_extensions
#: field:account.bank.statement.line.global,name:0
msgid "Communication"
msgstr ""
#. module: account_bank_statement_extensions
#: model:ir.model,name:account_bank_statement_extensions.model_res_partner_bank
msgid "Bank Accounts"
msgstr ""
#. module: account_bank_statement_extensions
#: constraint:account.bank.statement:0
msgid "The journal and period chosen have to belong to the same company."
msgstr ""
#. module: account_bank_statement_extensions
#: model:ir.model,name:account_bank_statement_extensions.model_account_bank_statement
msgid "Bank Statement"
msgstr ""
#. module: account_bank_statement_extensions
#: view:account.bank.statement.line:0
msgid "Statement Line"
msgstr ""
#. module: account_bank_statement_extensions
#: sql_constraint:account.bank.statement.line.global:0
msgid "The code must be unique !"
msgstr ""
#. module: account_bank_statement_extensions
#: field:account.bank.statement.line.global,bank_statement_line_ids:0
#: model:ir.actions.act_window,name:account_bank_statement_extensions.action_bank_statement_line
#: model:ir.ui.menu,name:account_bank_statement_extensions.bank_statement_line
msgid "Bank Statement Lines"
msgstr ""
#. module: account_bank_statement_extensions
#: view:account.bank.statement.line.global:0
msgid "Child Batch Payments"
msgstr ""
#. module: account_bank_statement_extensions
#: view:cancel.statement.line:0
#: view:confirm.statement.line:0
msgid "Cancel"
msgstr ""
#. module: account_bank_statement_extensions
#: view:account.bank.statement.line:0
msgid "Statement Lines"
msgstr ""
#. module: account_bank_statement_extensions
#: view:account.bank.statement.line:0
msgid "Total Amount"
msgstr ""
#. module: account_bank_statement_extensions
#: field:account.bank.statement.line,globalisation_id:0
msgid "Globalisation ID"
msgstr ""

View File

@ -46,7 +46,7 @@
<field name="search_view_id" ref="view_budget_post_search"/> <field name="search_view_id" ref="view_budget_post_search"/>
</record> </record>
<menuitem id="next_id_31" name="Budgets" parent="account.menu_finance" sequence="6"/> <menuitem id="next_id_31" name="Budgets" parent="account.menu_finance" sequence="6"/>
<menuitem id="next_id_pos" name="Budgets" parent="account.menu_finance_configuration" sequence="20"/> <menuitem id="next_id_pos" name="Budgets" parent="account.menu_finance_configuration" sequence="50"/>
<menuitem action="open_budget_post_form" id="menu_budget_post_form" parent="next_id_pos" sequence="20"/> <menuitem action="open_budget_post_form" id="menu_budget_post_form" parent="next_id_pos" sequence="20"/>

View File

@ -0,0 +1,23 @@
# Japanese translation for openobject-addons
# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
# This file is distributed under the same license as the openobject-addons package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
#
msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-02-08 00:35+0000\n"
"PO-Revision-Date: 2012-03-31 18:46+0000\n"
"Last-Translator: Masaki Yamaya <Unknown>\n"
"Language-Team: Japanese <ja@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-04-01 04:38+0000\n"
"X-Generator: Launchpad (build 15032)\n"
#. module: account_cancel
#: view:account.invoice:0
msgid "Cancel"
msgstr "キャンセル"

View File

@ -0,0 +1,28 @@
# Japanese translation for openobject-addons
# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
# This file is distributed under the same license as the openobject-addons package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
#
msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2011-01-11 11:14+0000\n"
"PO-Revision-Date: 2012-03-31 18:48+0000\n"
"Last-Translator: Masaki Yamaya <Unknown>\n"
"Language-Team: Japanese <ja@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-04-01 04:38+0000\n"
"X-Generator: Launchpad (build 15032)\n"
#. module: account_chart
#: model:ir.module.module,description:account_chart.module_meta_information
msgid "Remove minimal account chart"
msgstr "最小限の勘定科目を削除してください"
#. module: account_chart
#: model:ir.module.module,shortdesc:account_chart.module_meta_information
msgid "Charts of Accounts"
msgstr "勘定科目"

View File

@ -169,7 +169,7 @@
</para> </para>
</td> </td>
</tr> </tr>
</blockTable> </blockTable>
<blockTable colWidths="568.0" style="Table3"> <blockTable colWidths="568.0" style="Table3">
<tr> <tr>
<td> <td>
@ -245,7 +245,7 @@
</blockTable> </blockTable>
<para style="P2"> <para style="P2">
<font color="white"> </font> <font color="white"> </font>
</para> </para>
<blockTable colWidths="568.0" style="Table1"> <blockTable colWidths="568.0" style="Table1">
<tr> <tr>
<td> <td>
@ -259,7 +259,7 @@
<td> <td>
<para style="P9">[[ voucher.journal_id.use_preprint_check and voucher.chk_seq or '' ]]</para> <para style="P9">[[ voucher.journal_id.use_preprint_check and voucher.chk_seq or '' ]]</para>
</td> </td>
</tr> </tr>
<tr> <tr>
<td> <td>
<para style="P9"></para> <para style="P9"></para>
@ -281,10 +281,10 @@
</td> </td>
<td> <td>
<para style="P15">[[ voucher.partner_id.name ]]</para> <para style="P15">[[ voucher.partner_id.name ]]</para>
<para style="P15">[[ voucher.partner_id.address and voucher.partner_id.address[0] and voucher.partner_id.address[0].street or removeParentNode('para') ]]</para> <para style="P15">[[ voucher.partner_id.street or removeParentNode('para') ]]</para>
<para style="P15">[[ voucher.partner_id.address and voucher.partner_id.address[0] and voucher.partner_id.address[0].street2 or removeParentNode('para') ]]</para> <para style="P15">[[ voucher.partner_id.street2 or removeParentNode('para') ]]</para>
<para style="P15">[[ get_zip_line(voucher.partner_id.address) ]] </para> <para style="P15">[[ get_zip_line(voucher.partner_id) ]] </para>
<para style="P15">[[ voucher.partner_id.address[0].country_id.name]]</para> <para style="P15">[[ voucher.partner_id.country_id.name]]</para>
</td> </td>
</tr> </tr>
</blockTable> </blockTable>
@ -295,7 +295,7 @@
</td> </td>
</tr> </tr>
</blockTable> </blockTable>
<blockTable colWidths="25.0,500" style="Table12"> <blockTable colWidths="25.0,500" style="Table12">
<tr> <tr>
<td> <td>
@ -306,11 +306,11 @@
<td> <td>
<para style="P3"> <para style="P3">
<font color="white"> </font> <font color="white"> </font>
</para> </para>
<!--para style="P15">[[ voucher.name ]]</para--> <!--para style="P15">[[ voucher.name ]]</para-->
</td> </td>
</tr> </tr>
</blockTable> </blockTable>
<para style="P3"> <para style="P3">
<font color="white"> </font> <font color="white"> </font>
</para> </para>

View File

@ -193,7 +193,7 @@
</para> </para>
</td> </td>
</tr> </tr>
</blockTable> </blockTable>
<blockTable colWidths="550.0" rowHeights="10" style="Table5"> <blockTable colWidths="550.0" rowHeights="10" style="Table5">
<tr> <tr>
<td> <td>
@ -215,7 +215,7 @@
<td> <td>
<para style="P9"></para> <para style="P9"></para>
</td> </td>
</tr> </tr>
<tr> <tr>
<td> <td>
<para style="P9"></para> <para style="P9"></para>
@ -237,10 +237,10 @@
</td> </td>
<td> <td>
<para style="P15">[[ voucher.partner_id.name ]]</para> <para style="P15">[[ voucher.partner_id.name ]]</para>
<para style="P15">[[ voucher.partner_id.address and voucher.partner_id.address[0] and voucher.partner_id.address[0].street or removeParentNode('para') ]]</para> <para style="P15">[[ voucher.partner_id.street or removeParentNode('para') ]]</para>
<para style="P15">[[ voucher.partner_id.address and voucher.partner_id.address[0] and voucher.partner_id.address[0].street2 or removeParentNode('para') ]]</para> <para style="P15">[[ voucher.partner_id.street2 or removeParentNode('para') ]]</para>
<para style="P15">[[ get_zip_line(voucher.partner_id.address) ]] </para> <para style="P15">[[ get_zip_line(voucher.partner_id) ]] </para>
<para style="P15">[[ voucher.partner_id.address[0].country_id.name]]</para> <para style="P15">[[ voucher.partner_id.country_id.name]]</para>
</td> </td>
</tr> </tr>
</blockTable> </blockTable>
@ -254,11 +254,11 @@
<td> <td>
<para style="P3"> <para style="P3">
<font color="white"> </font> <font color="white"> </font>
</para> </para>
<!--para style="P15">[[ voucher.name ]]</para--> <!--para style="P15">[[ voucher.name ]]</para-->
</td> </td>
</tr> </tr>
</blockTable> </blockTable>
<para style="P3"> <para style="P3">
<font color="white"> </font> <font color="white"> </font>
</para> </para>

View File

@ -112,7 +112,7 @@
<font color="white"> </font> <font color="white"> </font>
</para> </para>
</td> </td>
</tr> </tr>
<tr> <tr>
<td> <td>
<para style="P6"> <para style="P6">
@ -123,7 +123,7 @@
<para style="P9">[[ formatLang(voucher.date , date=True) or '' ]] [[ voucher.journal_id.use_preprint_check and voucher.chk_seq or '' ]]</para> <para style="P9">[[ formatLang(voucher.date , date=True) or '' ]] [[ voucher.journal_id.use_preprint_check and voucher.chk_seq or '' ]]</para>
</td> </td>
</tr> </tr>
</blockTable> </blockTable>
<blockTable colWidths="54.0,425.0,85.0" rowHeights="21.5" style="Table4"> <blockTable colWidths="54.0,425.0,85.0" rowHeights="21.5" style="Table4">
<tr> <tr>
<td> <td>
@ -153,15 +153,15 @@
</td> </td>
<td> <td>
<para style="P9">[[ voucher.partner_id.name ]] </para> <para style="P9">[[ voucher.partner_id.name ]] </para>
<para style="P15">[[ voucher.partner_id.address and voucher.partner_id.address[0] and voucher.partner_id.address[0].street2 or removeParentNode('para') ]]</para> <para style="P15">[[ voucher.partner_id.street2 or removeParentNode('para') ]]</para>
<para style="P15">[[ get_zip_line(voucher.partner_id.address[0]) ]] </para> <para style="P15">[[ get_zip_line(voucher.partner_id) ]] </para>
<para style="P15">[[ voucher.partner_id.address[0].country_id.name]]</para> <para style="P15">[[ voucher.partner_id.country_id.name]]</para>
</td> </td>
<td> <td>
<para/> <para/>
</td> </td>
</tr> </tr>
</blockTable> </blockTable>
<blockTable colWidths="25.0,350,150" rowHeights="10.5" style="Table12"> <blockTable colWidths="25.0,350,150" rowHeights="10.5" style="Table12">
<tr> <tr>
<td> <td>
@ -176,7 +176,7 @@
<para style="P3"> <para style="P3">
<font color="white"> </font> <font color="white"> </font>
</para> </para>
</td> </td>
</tr> </tr>
</blockTable> </blockTable>
<para style="P3"> <para style="P3">
@ -184,7 +184,7 @@
</para> </para>
</td> </td>
</tr> </tr>
</blockTable> </blockTable>
<blockTable colWidths="568.0" style="Table2" rowHeights="255"> <blockTable colWidths="568.0" style="Table2" rowHeights="255">
<tr> <tr>
<td> <td>

View File

@ -3,7 +3,7 @@
<data> <data>
<!-- CODA Configuration --> <!-- CODA Configuration -->
<menuitem id="menu_manage_coda" name="CODA Configuration" parent="account.menu_finance_accounting" sequence="30"/> <menuitem id="menu_manage_coda" name="CODA Configuration" parent="account.menu_finance_configuration" sequence="30"/>
<!-- CODA Bank Account Configuration --> <!-- CODA Bank Account Configuration -->
<record id="view_coda_bank_account_search" model="ir.ui.view"> <record id="view_coda_bank_account_search" model="ir.ui.view">
@ -77,7 +77,7 @@
<field name="view_mode">tree,form</field> <field name="view_mode">tree,form</field>
<field name="search_view_id" ref="view_coda_bank_account_search"/> <field name="search_view_id" ref="view_coda_bank_account_search"/>
</record> </record>
<menuitem action="action_coda_bank_account_form" id="menu_action_coda_bank_account_form" parent="menu_manage_coda" sequence="1"/> <menuitem action="action_coda_bank_account_form" id="menu_action_coda_bank_account_form" parent="menu_manage_coda" sequence="1" groups="base.group_no_one"/>
<!-- CODA Transaction Types --> <!-- CODA Transaction Types -->
<record id="view_account_coda_trans_type_tree" model="ir.ui.view"> <record id="view_account_coda_trans_type_tree" model="ir.ui.view">
@ -111,7 +111,7 @@
<field name="view_type">form</field> <field name="view_type">form</field>
<field name="view_mode">tree,form</field> <field name="view_mode">tree,form</field>
</record> </record>
<menuitem action="action_account_coda_trans_type_form" id="menu_action_account_coda_trans_type_form" parent="menu_manage_coda" sequence="2"/> <menuitem action="action_account_coda_trans_type_form" id="menu_action_account_coda_trans_type_form" parent="menu_manage_coda" sequence="2" groups="base.group_no_one"/>
<!-- CODA Transaction Codes --> <!-- CODA Transaction Codes -->
<record id="view_account_coda_trans_code_tree" model="ir.ui.view"> <record id="view_account_coda_trans_code_tree" model="ir.ui.view">
@ -148,7 +148,7 @@
<field name="view_type">form</field> <field name="view_type">form</field>
<field name="view_mode">tree,form</field> <field name="view_mode">tree,form</field>
</record> </record>
<menuitem action="action_account_coda_trans_code_form" id="menu_action_account_coda_trans_code_form" parent="menu_manage_coda" sequence="3"/> <menuitem action="action_account_coda_trans_code_form" id="menu_action_account_coda_trans_code_form" parent="menu_manage_coda" sequence="3" groups="base.group_no_one"/>
<!-- CODA Transaction Categories --> <!-- CODA Transaction Categories -->
<record id="view_account_coda_trans_category_tree" model="ir.ui.view"> <record id="view_account_coda_trans_category_tree" model="ir.ui.view">
@ -180,7 +180,7 @@
<field name="view_type">form</field> <field name="view_type">form</field>
<field name="view_mode">tree,form</field> <field name="view_mode">tree,form</field>
</record> </record>
<menuitem action="action_account_coda_trans_category_form" id="menu_action_account_coda_trans_category_form" parent="menu_manage_coda" sequence="4"/> <menuitem action="action_account_coda_trans_category_form" id="menu_action_account_coda_trans_category_form" parent="menu_manage_coda" sequence="4" groups="base.group_no_one"/>
<!-- CODA Structured Communication Types --> <!-- CODA Structured Communication Types -->
<record id="view_account_coda_comm_type_tree" model="ir.ui.view"> <record id="view_account_coda_comm_type_tree" model="ir.ui.view">
@ -212,7 +212,7 @@
<field name="view_type">form</field> <field name="view_type">form</field>
<field name="view_mode">tree,form</field> <field name="view_mode">tree,form</field>
</record> </record>
<menuitem action="action_account_coda_comm_type_form" id="menu_action_account_coda_comm_type_form" parent="menu_manage_coda" sequence="5"/> <menuitem action="action_account_coda_comm_type_form" id="menu_action_account_coda_comm_type_form" parent="menu_manage_coda" sequence="5" groups="base.group_no_one"/>
<!-- CODA Processing --> <!-- CODA Processing -->
<menuitem name="CODA Processing" parent="account.menu_finance_bank_and_cash" id="menu_account_coda" groups="base.group_extended" sequence="40"/> <menuitem name="CODA Processing" parent="account.menu_finance_bank_and_cash" id="menu_account_coda" groups="base.group_extended" sequence="40"/>

View File

@ -45,9 +45,8 @@ class report_rappel(report_sxw.rml_parse):
def _adr_get(self, stat_line, type): def _adr_get(self, stat_line, type):
res_partner = pooler.get_pool(self.cr.dbname).get('res.partner') res_partner = pooler.get_pool(self.cr.dbname).get('res.partner')
res_partner_address = pooler.get_pool(self.cr.dbname).get('res.partner.address')
adr = res_partner.address_get(self.cr, self.uid, [stat_line.partner_id.id], [type])[type] adr = res_partner.address_get(self.cr, self.uid, [stat_line.partner_id.id], [type])[type]
return adr and res_partner_address.read(self.cr, self.uid, [adr]) or [{}] return adr and res_partner.read(self.cr, self.uid, [adr]) or [{}]
def _lines_get(self, stat_by_partner_line): def _lines_get(self, stat_by_partner_line):
pool = pooler.get_pool(self.cr.dbname) pool = pooler.get_pool(self.cr.dbname)

View File

@ -89,8 +89,8 @@ class account_followup_stat_by_partner(osv.osv):
tools.drop_view_if_exists(cr, 'account_followup_stat_by_partner') tools.drop_view_if_exists(cr, 'account_followup_stat_by_partner')
# Here we don't have other choice but to create a virtual ID based on the concatenation # Here we don't have other choice but to create a virtual ID based on the concatenation
# of the partner_id and the company_id, because if a partner is shared between 2 companies, # of the partner_id and the company_id, because if a partner is shared between 2 companies,
# we want to see 2 lines for him in this table. It means that both company should be able # we want to see 2 lines for him in this table. It means that both company should be able
# to send him followups separately . An assumption that the number of companies will not # to send him followups separately . An assumption that the number of companies will not
# reach 10 000 records is made, what should be enough for a time. # reach 10 000 records is made, what should be enough for a time.
cr.execute(""" cr.execute("""
create or replace view account_followup_stat_by_partner as ( create or replace view account_followup_stat_by_partner as (
@ -234,14 +234,13 @@ class account_followup_print_all(osv.osv_memory):
for line in data_lines: for line in data_lines:
total_amt += line.debit - line.credit total_amt += line.debit - line.credit
dest = False dest = False
if partner.address: if partner:
for adr in partner.address: if partner.type=='contact':
if adr.type=='contact': if adr.email:
if adr.email: dest = [partner.email]
dest = [adr.email] if (not dest) and partner.type=='default':
if (not dest) and adr.type=='default': if partner.email:
if adr.email: dest = [partner.email]
dest = [adr.email]
src = tools.config.options['email_from'] src = tools.config.options['email_from']
if not data.partner_lang: if not data.partner_lang:
body = data.email_body body = data.email_body

View File

@ -112,7 +112,7 @@
<field name="search_view_id" ref="view_notify_message_search"/> <field name="search_view_id" ref="view_notify_message_search"/>
</record> </record>
<menuitem name="Notification Message" id="menu_finan_config_notify_message" parent="account.menu_finance_configuration"/> <menuitem name="Notification Message" id="menu_finan_config_notify_message" parent="account.menu_finance_configuration" sequence="45"/>
<menuitem name="All Notification Messages" id="menu_notify_mesage_tree_form" action="notify_mesage_tree_form" parent="menu_finan_config_notify_message"/> <menuitem name="All Notification Messages" id="menu_notify_mesage_tree_form" action="notify_mesage_tree_form" parent="menu_finan_config_notify_message"/>
</data> </data>

View File

@ -193,13 +193,13 @@
</td> </td>
<td> <td>
<para style="terp_default_8">[[ (o.partner_id and o.partner_id.title and o.partner_id.title.name) or '' ]] [[ (o.partner_id and o.partner_id.name) or '' ]]</para> <para style="terp_default_8">[[ (o.partner_id and o.partner_id.title and o.partner_id.title.name) or '' ]] [[ (o.partner_id and o.partner_id.name) or '' ]]</para>
<para style="terp_default_8">[[ display_address(o.address_invoice_id) ]]</para> <para style="terp_default_8">[[ display_address(o.partner_id, 'invoice') ]]</para>
<para style="terp_default_8"> <para style="terp_default_8">
<font color="white"> </font> <font color="white"> </font>
</para> </para>
<para style="terp_default_8">Tel. : [[ (o.address_invoice_id and o.address_invoice_id.phone) or removeParentNode('para') ]]</para> <para style="terp_default_8">Tel. : [[ (o.partner_id.phone) or removeParentNode('para') ]]</para>
<para style="terp_default_8">Fax : [[ (o.address_invoice_id and o.address_invoice_id.fax) or removeParentNode('para') ]]</para> <para style="terp_default_8">Fax : [[ (o.partner_id.fax) or removeParentNode('para') ]]</para>
<para style="terp_default_8">VAT : [[ (o.partner_id and o.partner_id.vat) or removeParentNode('para') ]]</para> <para style="terp_default_8">VAT : [[ (o.partner_id.vat) or removeParentNode('para') ]]</para>
</td> </td>
</tr> </tr>
</blockTable> </blockTable>
@ -247,7 +247,7 @@
<para style="terp_default_Centre_9">[[ o.name or '' ]]</para> <para style="terp_default_Centre_9">[[ o.name or '' ]]</para>
</td> </td>
<td> <td>
<para style="terp_default_Centre_9">[[ (o.address_invoice_id and o.address_invoice_id.partner_id and o.address_invoice_id.partner_id.ref) or ' ' ]]</para> <para style="terp_default_Centre_9">[[ (o.partner_id.ref) or ' ' ]]</para>
</td> </td>
</tr> </tr>
</blockTable> </blockTable>

View File

@ -197,12 +197,12 @@
</td> </td>
<td> <td>
<para style="terp_default_8">[[ (o.partner_id and o.partner_id.title and o.partner_id.title.name) or '' ]] [[ (o.partner_id and o.partner_id.name) or '' ]]</para> <para style="terp_default_8">[[ (o.partner_id and o.partner_id.title and o.partner_id.title.name) or '' ]] [[ (o.partner_id and o.partner_id.name) or '' ]]</para>
<para style="terp_default_8">[[ display_address(o.address_invoice_id) ]]</para> <para style="terp_default_8">[[ display_address(o.partner_id, 'invoice') ]]</para>
<para style="terp_default_8"> <para style="terp_default_8">
<font color="white"> </font> <font color="white"> </font>
</para> </para>
<para style="terp_default_8">Tel. : [[ (o.address_invoice_id and o.address_invoice_id.phone) or removeParentNode('para') ]]</para> <para style="terp_default_8">Tel. : [[ (o.partner_id.phone) or removeParentNode('para') ]]</para>
<para style="terp_default_8">Fax : [[ (o.address_invoice_id and o.address_invoice_id.fax) or removeParentNode('para') ]]</para> <para style="terp_default_8">Fax : [[ (o.partner_id.fax) or removeParentNode('para') ]]</para>
<para style="terp_default_8">VAT : [[ (o.partner_id and o.partner_id.vat) or removeParentNode('para') ]]</para> <para style="terp_default_8">VAT : [[ (o.partner_id and o.partner_id.vat) or removeParentNode('para') ]]</para>
</td> </td>
</tr> </tr>
@ -251,7 +251,7 @@
<para style="terp_default_Centre_9">[[ o.name or '' ]]</para> <para style="terp_default_Centre_9">[[ o.name or '' ]]</para>
</td> </td>
<td> <td>
<para style="terp_default_Centre_9">[[ (o.address_invoice_id and o.address_invoice_id.partner_id and o.address_invoice_id.partner_id.ref) or ' ' ]]</para> <para style="terp_default_Centre_9">[[ ( o.partner_id.ref) or ' ' ]]</para>
</td> </td>
</tr> </tr>
</blockTable> </blockTable>

View File

@ -35,7 +35,7 @@ class payment_mode(osv.osv):
domain=[('type', 'in', ('bank','cash'))], help='Bank or Cash Journal for the Payment Mode'), domain=[('type', 'in', ('bank','cash'))], help='Bank or Cash Journal for the Payment Mode'),
'company_id': fields.many2one('res.company', 'Company',required=True), 'company_id': fields.many2one('res.company', 'Company',required=True),
'partner_id':fields.related('company_id','partner_id',type='many2one',relation='res.partner',string='Partner',store=True,), 'partner_id':fields.related('company_id','partner_id',type='many2one',relation='res.partner',string='Partner',store=True,),
} }
_defaults = { _defaults = {
'company_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id 'company_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id
@ -51,14 +51,14 @@ class payment_mode(osv.osv):
JOIN payment_mode pm ON (pm.bank_id = pb.id) JOIN payment_mode pm ON (pm.bank_id = pb.id)
WHERE pm.id = %s """, [payment_code]) WHERE pm.id = %s """, [payment_code])
return [x[0] for x in cr.fetchall()] return [x[0] for x in cr.fetchall()]
def onchange_company_id (self, cr, uid, ids, company_id=False, context=None): def onchange_company_id (self, cr, uid, ids, company_id=False, context=None):
result = {} result = {}
if company_id: if company_id:
partner_id = self.pool.get('res.company').browse(cr, uid, company_id, context=context).partner_id.id partner_id = self.pool.get('res.company').browse(cr, uid, company_id, context=context).partner_id.id
result['partner_id'] = partner_id result['partner_id'] = partner_id
return {'value': result} return {'value': result}
payment_mode() payment_mode()
@ -183,57 +183,30 @@ class payment_line(osv.osv):
"reference": "ref"}.get(orig, orig) "reference": "ref"}.get(orig, orig)
def info_owner(self, cr, uid, ids, name=None, args=None, context=None): def info_owner(self, cr, uid, ids, name=None, args=None, context=None):
if not ids: return {}
partner_zip_obj = self.pool.get('res.partner.zip')
result = {} result = {}
info=''
for line in self.browse(cr, uid, ids, context=context): for line in self.browse(cr, uid, ids, context=context):
owner = line.order_id.mode.bank_id.partner_id owner = line.order_id.mode.bank_id.partner_id
result[line.id] = False result[line.id] = self._get_info_partner(cr, uid, owner, context=context)
if owner.address:
for ads in owner.address:
if ads.type == 'default':
st = ads.street and ads.street or ''
st1 = ads.street2 and ads.street2 or ''
if 'zip_id' in ads:
zip_city = ads.zip_id and partner_zip_obj.name_get(cr, uid, [ads.zip_id.id])[0][1] or ''
else:
zip = ads.zip and ads.zip or ''
city = ads.city and ads.city or ''
zip_city = zip + ' ' + city
cntry = ads.country_id and ads.country_id.name or ''
info = owner.name + "\n" + st + " " + st1 + "\n" + zip_city + "\n" +cntry
result[line.id] = info
break
return result return result
def info_partner(self, cr, uid, ids, name=None, args=None, context=None): def _get_info_partner(self,cr, uid, partner_record, context=None):
if not ids: return {} if not partner_record:
partner_zip_obj = self.pool.get('res.partner.zip') return False
result = {} st = partner_record.street or ''
info = '' st1 = partner_record.street2 or ''
zip = partner_record.zip or ''
city = partner_record.city or ''
zip_city = zip + ' ' + city
cntry = partner_record.country_id and partner_record.country_id.name or ''
return partner_record.name + "\n" + st + " " + st1 + "\n" + zip_city + "\n" +cntry
def info_partner(self, cr, uid, ids, name=None, args=None, context=None):
result = {}
for line in self.browse(cr, uid, ids, context=context): for line in self.browse(cr, uid, ids, context=context):
result[line.id] = False result[line.id] = False
if not line.partner_id: if not line.partner_id:
break break
partner = line.partner_id.name or '' result[line.id] = self._get_info_partner(cr, uid, line.partner_id, context=context)
if line.partner_id.address:
for ads in line.partner_id.address:
if ads.type == 'default':
st = ads.street and ads.street or ''
st1 = ads.street2 and ads.street2 or ''
if 'zip_id' in ads:
zip_city = ads.zip_id and partner_zip_obj.name_get(cr, uid, [ads.zip_id.id])[0][1] or ''
else:
zip = ads.zip and ads.zip or ''
city = ads.city and ads.city or ''
zip_city = zip + ' ' + city
cntry = ads.country_id and ads.country_id.name or ''
info = partner + "\n" + st + " " + st1 + "\n" + zip_city + "\n" +cntry
result[line.id] = info
break
return result return result
#dead code #dead code
@ -420,7 +393,6 @@ class payment_line(osv.osv):
def onchange_partner(self, cr, uid, ids, partner_id, payment_type, context=None): def onchange_partner(self, cr, uid, ids, partner_id, payment_type, context=None):
data = {} data = {}
partner_zip_obj = self.pool.get('res.partner.zip')
partner_obj = self.pool.get('res.partner') partner_obj = self.pool.get('res.partner')
payment_mode_obj = self.pool.get('payment.mode') payment_mode_obj = self.pool.get('payment.mode')
data['info_partner'] = data['bank_id'] = False data['info_partner'] = data['bank_id'] = False
@ -428,24 +400,7 @@ class payment_line(osv.osv):
if partner_id: if partner_id:
part_obj = partner_obj.browse(cr, uid, partner_id, context=context) part_obj = partner_obj.browse(cr, uid, partner_id, context=context)
partner = part_obj.name or '' partner = part_obj.name or ''
data['info_partner'] = self._get_info_partner(cr, uid, part_obj, context=context)
if part_obj.address:
for ads in part_obj.address:
if ads.type == 'default':
st = ads.street and ads.street or ''
st1 = ads.street2 and ads.street2 or ''
if 'zip_id' in ads:
zip_city = ads.zip_id and partner_zip_obj.name_get(cr, uid, [ads.zip_id.id])[0][1] or ''
else:
zip = ads.zip and ads.zip or ''
city = ads.city and ads.city or ''
zip_city = zip + ' ' + city
cntry = ads.country_id and ads.country_id.name or ''
info = partner + "\n" + st + " " + st1 + "\n" + zip_city + "\n" +cntry
data['info_partner'] = info
if part_obj.bank_ids and payment_type: if part_obj.bank_ids and payment_type:
bank_type = payment_mode_obj.suitable_bank_types(cr, uid, payment_type, context=context) bank_type = payment_mode_obj.suitable_bank_types(cr, uid, payment_type, context=context)

View File

@ -93,7 +93,7 @@
<field name="search_view_id" ref="view_payment_mode_search"/> <field name="search_view_id" ref="view_payment_mode_search"/>
</record> </record>
<menuitem action="action_payment_mode_form" id="menu_action_payment_mode_form" parent="account.menu_configuration_misc"/> <menuitem action="action_payment_mode_form" id="menu_action_payment_mode_form" parent="account.menu_configuration_misc" groups="base.group_no_one"/>
<record id="view_payment_order_form" model="ir.ui.view"> <record id="view_payment_order_form" model="ir.ui.view">
<field name="name">payment.order.form</field> <field name="name">payment.order.form</field>

View File

@ -0,0 +1,726 @@
# Amharic translation for openobject-addons
# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
# This file is distributed under the same license as the openobject-addons package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
#
msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-02-08 00:35+0000\n"
"PO-Revision-Date: 2012-03-21 15:50+0000\n"
"Last-Translator: Araya <info@climaxtechnologies.com>\n"
"Language-Team: Amharic <am@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-03-22 04:57+0000\n"
"X-Generator: Launchpad (build 14981)\n"
#. module: account_payment
#: field:payment.order,date_scheduled:0
msgid "Scheduled date if fixed"
msgstr ""
#. module: account_payment
#: field:payment.line,currency:0
msgid "Partner Currency"
msgstr ""
#. module: account_payment
#: view:payment.order:0
msgid "Set to draft"
msgstr ""
#. module: account_payment
#: help:payment.order,mode:0
msgid "Select the Payment Mode to be applied."
msgstr "የአከፋፈል መንገድ ምረጥ"
#. module: account_payment
#: view:payment.mode:0
#: view:payment.order:0
msgid "Group By..."
msgstr ""
#. module: account_payment
#: field:payment.order,line_ids:0
msgid "Payment lines"
msgstr ""
#. module: account_payment
#: view:payment.line:0
#: field:payment.line,info_owner:0
#: view:payment.order:0
msgid "Owner Account"
msgstr ""
#. module: account_payment
#: help:payment.order,state:0
msgid ""
"When an order is placed the state is 'Draft'.\n"
" Once the bank is confirmed the state is set to 'Confirmed'.\n"
" Then the order is paid the state is 'Done'."
msgstr ""
#. module: account_payment
#: help:account.invoice,amount_to_pay:0
msgid ""
"The amount which should be paid at the current date\n"
"minus the amount which is already in payment order"
msgstr ""
#. module: account_payment
#: field:payment.line,company_id:0
#: field:payment.mode,company_id:0
#: field:payment.order,company_id:0
msgid "Company"
msgstr ""
#. module: account_payment
#: field:payment.order,date_prefered:0
msgid "Preferred date"
msgstr ""
#. module: account_payment
#: model:res.groups,name:account_payment.group_account_payment
msgid "Accounting / Payments"
msgstr ""
#. module: account_payment
#: selection:payment.line,state:0
msgid "Free"
msgstr ""
#. module: account_payment
#: view:payment.order.create:0
#: field:payment.order.create,entries:0
msgid "Entries"
msgstr ""
#. module: account_payment
#: report:payment.order:0
msgid "Used Account"
msgstr ""
#. module: account_payment
#: field:payment.line,ml_maturity_date:0
#: field:payment.order.create,duedate:0
msgid "Due Date"
msgstr ""
#. module: account_payment
#: view:account.move.line:0
msgid "Account Entry Line"
msgstr ""
#. module: account_payment
#: view:payment.order.create:0
msgid "_Add to payment order"
msgstr ""
#. module: account_payment
#: model:ir.actions.act_window,name:account_payment.action_account_payment_populate_statement
#: model:ir.actions.act_window,name:account_payment.action_account_populate_statement_confirm
msgid "Payment Populate statement"
msgstr ""
#. module: account_payment
#: report:payment.order:0
#: view:payment.order:0
msgid "Amount"
msgstr ""
#. module: account_payment
#: sql_constraint:account.move.line:0
msgid "Wrong credit or debit value in accounting entry !"
msgstr ""
#. module: account_payment
#: view:payment.order:0
msgid "Total in Company Currency"
msgstr ""
#. module: account_payment
#: selection:payment.order,state:0
msgid "Cancelled"
msgstr ""
#. module: account_payment
#: model:ir.actions.act_window,name:account_payment.action_payment_order_tree_new
msgid "New Payment Order"
msgstr ""
#. module: account_payment
#: report:payment.order:0
#: field:payment.order,reference:0
msgid "Reference"
msgstr ""
#. module: account_payment
#: sql_constraint:payment.line:0
msgid "The payment line name must be unique!"
msgstr ""
#. module: account_payment
#: constraint:account.invoice:0
msgid "Invalid BBA Structured Communication !"
msgstr ""
#. module: account_payment
#: model:ir.actions.act_window,name:account_payment.action_payment_order_tree
#: model:ir.ui.menu,name:account_payment.menu_action_payment_order_form
msgid "Payment Orders"
msgstr ""
#. module: account_payment
#: constraint:account.move.line:0
msgid ""
"The date of your Journal Entry is not in the defined period! You should "
"change the date or remove this constraint from the journal."
msgstr ""
#. module: account_payment
#: selection:payment.order,date_prefered:0
msgid "Directly"
msgstr ""
#. module: account_payment
#: model:ir.actions.act_window,name:account_payment.action_payment_line_form
#: model:ir.model,name:account_payment.model_payment_line
#: view:payment.line:0
#: view:payment.order:0
msgid "Payment Line"
msgstr ""
#. module: account_payment
#: view:payment.line:0
msgid "Amount Total"
msgstr ""
#. module: account_payment
#: view:payment.order:0
#: selection:payment.order,state:0
msgid "Confirmed"
msgstr ""
#. module: account_payment
#: help:payment.line,ml_date_created:0
msgid "Invoice Effective Date"
msgstr ""
#. module: account_payment
#: report:payment.order:0
msgid "Execution Type"
msgstr ""
#. module: account_payment
#: selection:payment.line,state:0
msgid "Structured"
msgstr ""
#. module: account_payment
#: view:payment.order:0
#: field:payment.order,state:0
msgid "State"
msgstr ""
#. module: account_payment
#: view:payment.line:0
#: view:payment.order:0
msgid "Transaction Information"
msgstr ""
#. module: account_payment
#: model:ir.actions.act_window,name:account_payment.action_payment_mode_form
#: model:ir.model,name:account_payment.model_payment_mode
#: model:ir.ui.menu,name:account_payment.menu_action_payment_mode_form
#: view:payment.mode:0
#: view:payment.order:0
msgid "Payment Mode"
msgstr ""
#. module: account_payment
#: field:payment.line,ml_date_created:0
msgid "Effective Date"
msgstr ""
#. module: account_payment
#: field:payment.line,ml_inv_ref:0
msgid "Invoice Ref."
msgstr ""
#. module: account_payment
#: help:payment.order,date_prefered:0
msgid ""
"Choose an option for the Payment Order:'Fixed' stands for a date specified "
"by you.'Directly' stands for the direct execution.'Due date' stands for the "
"scheduled date of execution."
msgstr ""
#. module: account_payment
#: code:addons/account_payment/account_move_line.py:110
#, python-format
msgid "Error !"
msgstr ""
#. module: account_payment
#: view:account.move.line:0
msgid "Total debit"
msgstr ""
#. module: account_payment
#: field:payment.order,date_done:0
msgid "Execution date"
msgstr ""
#. module: account_payment
#: help:payment.mode,journal:0
msgid "Bank or Cash Journal for the Payment Mode"
msgstr ""
#. module: account_payment
#: selection:payment.order,date_prefered:0
msgid "Fixed date"
msgstr ""
#. module: account_payment
#: field:payment.line,info_partner:0
#: view:payment.order:0
msgid "Destination Account"
msgstr ""
#. module: account_payment
#: view:payment.line:0
msgid "Desitination Account"
msgstr ""
#. module: account_payment
#: view:payment.order:0
msgid "Search Payment Orders"
msgstr ""
#. module: account_payment
#: field:payment.line,create_date:0
msgid "Created"
msgstr ""
#. module: account_payment
#: view:payment.order:0
msgid "Select Invoices to Pay"
msgstr ""
#. module: account_payment
#: view:payment.line:0
msgid "Currency Amount Total"
msgstr ""
#. module: account_payment
#: view:payment.order:0
msgid "Make Payments"
msgstr ""
#. module: account_payment
#: field:payment.line,state:0
msgid "Communication Type"
msgstr ""
#. module: account_payment
#: field:payment.line,partner_id:0
#: field:payment.mode,partner_id:0
#: report:payment.order:0
msgid "Partner"
msgstr ""
#. module: account_payment
#: field:payment.line,bank_statement_line_id:0
msgid "Bank statement line"
msgstr ""
#. module: account_payment
#: selection:payment.order,date_prefered:0
msgid "Due date"
msgstr ""
#. module: account_payment
#: field:account.invoice,amount_to_pay:0
msgid "Amount to be paid"
msgstr ""
#. module: account_payment
#: constraint:account.move.line:0
msgid ""
"The selected account of your Journal Entry forces to provide a secondary "
"currency. You should remove the secondary currency on the account or select "
"a multi-currency view on the journal."
msgstr ""
#. module: account_payment
#: report:payment.order:0
msgid "Currency"
msgstr ""
#. module: account_payment
#: view:account.payment.make.payment:0
msgid "Yes"
msgstr ""
#. module: account_payment
#: help:payment.line,info_owner:0
msgid "Address of the Main Partner"
msgstr ""
#. module: account_payment
#: help:payment.line,date:0
msgid ""
"If no payment date is specified, the bank will treat this payment line "
"directly"
msgstr ""
#. module: account_payment
#: model:ir.model,name:account_payment.model_account_payment_populate_statement
msgid "Account Payment Populate Statement"
msgstr ""
#. module: account_payment
#: help:payment.mode,name:0
msgid "Mode of Payment"
msgstr ""
#. module: account_payment
#: report:payment.order:0
msgid "Value Date"
msgstr ""
#. module: account_payment
#: report:payment.order:0
msgid "Payment Type"
msgstr ""
#. module: account_payment
#: help:payment.line,amount_currency:0
msgid "Payment amount in the partner currency"
msgstr ""
#. module: account_payment
#: view:payment.order:0
#: selection:payment.order,state:0
msgid "Draft"
msgstr ""
#. module: account_payment
#: help:payment.line,communication2:0
msgid "The successor message of Communication."
msgstr ""
#. module: account_payment
#: code:addons/account_payment/account_move_line.py:110
#, python-format
msgid "No partner defined on entry line"
msgstr ""
#. module: account_payment
#: help:payment.line,info_partner:0
msgid "Address of the Ordering Customer."
msgstr ""
#. module: account_payment
#: view:account.payment.populate.statement:0
msgid "Populate Statement:"
msgstr ""
#. module: account_payment
#: view:account.move.line:0
msgid "Total credit"
msgstr ""
#. module: account_payment
#: help:payment.order,date_scheduled:0
msgid "Select a date if you have chosen Preferred Date to be fixed."
msgstr ""
#. module: account_payment
#: field:payment.order,user_id:0
msgid "User"
msgstr ""
#. module: account_payment
#: field:account.payment.populate.statement,lines:0
msgid "Payment Lines"
msgstr ""
#. module: account_payment
#: model:ir.model,name:account_payment.model_account_move_line
msgid "Journal Items"
msgstr ""
#. module: account_payment
#: constraint:account.move.line:0
msgid "You can not create journal items on an account of type view."
msgstr ""
#. module: account_payment
#: help:payment.line,move_line_id:0
msgid ""
"This Entry Line will be referred for the information of the ordering "
"customer."
msgstr ""
#. module: account_payment
#: view:payment.order.create:0
msgid "Search"
msgstr ""
#. module: account_payment
#: model:ir.actions.report.xml,name:account_payment.payment_order1
#: model:ir.model,name:account_payment.model_payment_order
msgid "Payment Order"
msgstr ""
#. module: account_payment
#: field:payment.line,date:0
msgid "Payment Date"
msgstr ""
#. module: account_payment
#: report:payment.order:0
msgid "Total:"
msgstr ""
#. module: account_payment
#: field:payment.order,date_created:0
msgid "Creation date"
msgstr ""
#. module: account_payment
#: view:account.payment.populate.statement:0
msgid "ADD"
msgstr ""
#. module: account_payment
#: view:account.bank.statement:0
msgid "Import payment lines"
msgstr ""
#. module: account_payment
#: field:account.move.line,amount_to_pay:0
msgid "Amount to pay"
msgstr ""
#. module: account_payment
#: field:payment.line,amount:0
msgid "Amount in Company Currency"
msgstr ""
#. module: account_payment
#: help:payment.line,partner_id:0
msgid "The Ordering Customer"
msgstr ""
#. module: account_payment
#: model:ir.model,name:account_payment.model_account_payment_make_payment
msgid "Account make payment"
msgstr ""
#. module: account_payment
#: report:payment.order:0
msgid "Invoice Ref"
msgstr ""
#. module: account_payment
#: sql_constraint:account.invoice:0
msgid "Invoice Number must be unique per Company!"
msgstr ""
#. module: account_payment
#: field:payment.line,name:0
msgid "Your Reference"
msgstr ""
#. module: account_payment
#: view:payment.order:0
msgid "Payment order"
msgstr ""
#. module: account_payment
#: view:payment.line:0
#: view:payment.order:0
msgid "General Information"
msgstr ""
#. module: account_payment
#: view:payment.order:0
#: selection:payment.order,state:0
msgid "Done"
msgstr ""
#. module: account_payment
#: model:ir.model,name:account_payment.model_account_invoice
msgid "Invoice"
msgstr ""
#. module: account_payment
#: field:payment.line,communication:0
msgid "Communication"
msgstr ""
#. module: account_payment
#: view:account.payment.make.payment:0
#: view:account.payment.populate.statement:0
#: view:payment.order:0
#: view:payment.order.create:0
msgid "Cancel"
msgstr ""
#. module: account_payment
#: field:payment.line,bank_id:0
msgid "Destination Bank Account"
msgstr ""
#. module: account_payment
#: view:payment.line:0
#: view:payment.order:0
msgid "Information"
msgstr ""
#. module: account_payment
#: constraint:account.move.line:0
msgid "Company must be the same for its related account and period."
msgstr ""
#. module: account_payment
#: model:ir.actions.act_window,help:account_payment.action_payment_order_tree
msgid ""
"A payment order is a payment request from your company to pay a supplier "
"invoice or a customer credit note. Here you can register all payment orders "
"that should be done, keep track of all payment orders and mention the "
"invoice reference and the partner the payment should be done for."
msgstr ""
#. module: account_payment
#: help:payment.line,amount:0
msgid "Payment amount in the company currency"
msgstr ""
#. module: account_payment
#: view:payment.order.create:0
msgid "Search Payment lines"
msgstr ""
#. module: account_payment
#: field:payment.line,amount_currency:0
msgid "Amount in Partner Currency"
msgstr ""
#. module: account_payment
#: field:payment.line,communication2:0
msgid "Communication 2"
msgstr ""
#. module: account_payment
#: view:account.payment.make.payment:0
msgid "Are you sure you want to make payment?"
msgstr ""
#. module: account_payment
#: view:payment.mode:0
#: field:payment.mode,journal:0
msgid "Journal"
msgstr ""
#. module: account_payment
#: field:payment.mode,bank_id:0
msgid "Bank account"
msgstr ""
#. module: account_payment
#: view:payment.order:0
msgid "Confirm Payments"
msgstr ""
#. module: account_payment
#: field:payment.line,company_currency:0
#: report:payment.order:0
msgid "Company Currency"
msgstr ""
#. module: account_payment
#: model:ir.ui.menu,name:account_payment.menu_main_payment
#: view:payment.line:0
#: view:payment.order:0
msgid "Payment"
msgstr ""
#. module: account_payment
#: report:payment.order:0
msgid "Payment Order / Payment"
msgstr ""
#. module: account_payment
#: field:payment.line,move_line_id:0
msgid "Entry line"
msgstr ""
#. module: account_payment
#: help:payment.line,communication:0
msgid ""
"Used as the message between ordering customer and current company. Depicts "
"'What do you want to say to the recipient about this order ?'"
msgstr ""
#. module: account_payment
#: field:payment.mode,name:0
msgid "Name"
msgstr ""
#. module: account_payment
#: report:payment.order:0
msgid "Bank Account"
msgstr ""
#. module: account_payment
#: view:payment.line:0
#: view:payment.order:0
msgid "Entry Information"
msgstr ""
#. module: account_payment
#: model:ir.model,name:account_payment.model_payment_order_create
msgid "payment.order.create"
msgstr ""
#. module: account_payment
#: field:payment.line,order_id:0
msgid "Order"
msgstr ""
#. module: account_payment
#: constraint:account.move.line:0
msgid "You can not create journal items on closed account."
msgstr ""
#. module: account_payment
#: field:payment.order,total:0
msgid "Total"
msgstr ""
#. module: account_payment
#: view:account.payment.make.payment:0
#: model:ir.actions.act_window,name:account_payment.action_account_payment_make_payment
msgid "Make Payment"
msgstr ""
#. module: account_payment
#: field:payment.order,mode:0
msgid "Payment mode"
msgstr ""
#. module: account_payment
#: model:ir.actions.act_window,name:account_payment.action_create_payment_order
msgid "Populate Payment"
msgstr ""
#. module: account_payment
#: help:payment.mode,bank_id:0
msgid "Bank Account for the Payment Mode"
msgstr ""

View File

@ -903,7 +903,7 @@ class account_voucher(osv.osv):
if voucher_brw.number: if voucher_brw.number:
name = voucher_brw.number name = voucher_brw.number
elif voucher_brw.journal_id.sequence_id: elif voucher_brw.journal_id.sequence_id:
name = seq_obj.next_by_id(cr, uid, voucher_brw.journal_id.sequence_id.id) name = seq_obj.next_by_id(cr, uid, voucher_brw.journal_id.sequence_id.id, context=context)
else: else:
raise osv.except_osv(_('Error !'), raise osv.except_osv(_('Error !'),
_('Please define a sequence on the journal !')) _('Please define a sequence on the journal !'))

View File

@ -73,8 +73,6 @@
- -
!record {model: account.invoice, id: account_invoice_jan}: !record {model: account.invoice, id: account_invoice_jan}:
account_id: account.a_recv account_id: account.a_recv
address_contact_id: base.res_partner_address_3000
address_invoice_id: base.res_partner_address_3000
company_id: base.main_company company_id: base.main_company
currency_id: base.USD currency_id: base.USD
date_invoice: !eval "'%s-01-01' %(datetime.now().year)" date_invoice: !eval "'%s-01-01' %(datetime.now().year)"
@ -108,8 +106,6 @@
- -
!record {model: account.invoice, id: account_invoice_feb}: !record {model: account.invoice, id: account_invoice_feb}:
account_id: account.a_recv account_id: account.a_recv
address_contact_id: base.res_partner_address_3000
address_invoice_id: base.res_partner_address_3000
company_id: base.main_company company_id: base.main_company
currency_id: base.USD currency_id: base.USD
date_invoice: !eval "'%s-02-01' %(datetime.now().year)" date_invoice: !eval "'%s-02-01' %(datetime.now().year)"

View File

@ -44,8 +44,6 @@
!record {model: account.invoice, id: account_first_invoice_jan_suppl}: !record {model: account.invoice, id: account_first_invoice_jan_suppl}:
account_id: account.a_pay account_id: account.a_pay
type : in_invoice type : in_invoice
address_contact_id: base.res_partner_address_3000
address_invoice_id: base.res_partner_address_3000
company_id: base.main_company company_id: base.main_company
currency_id: base.USD currency_id: base.USD
date_invoice: !eval "'%s-01-01' %(datetime.now().year)" date_invoice: !eval "'%s-01-01' %(datetime.now().year)"
@ -80,8 +78,6 @@
- -
!record {model: account.invoice, id: account_second_invoice_feb_suppl}: !record {model: account.invoice, id: account_second_invoice_feb_suppl}:
account_id: account.a_pay account_id: account.a_pay
address_contact_id: base.res_partner_address_3000
address_invoice_id: base.res_partner_address_3000
company_id: base.main_company company_id: base.main_company
currency_id: base.USD currency_id: base.USD
date_invoice: !eval "'%s-02-01' %(datetime.now().year)" date_invoice: !eval "'%s-02-01' %(datetime.now().year)"

View File

@ -79,8 +79,6 @@
- -
!record {model: account.invoice, id: account_first_invoice_jan}: !record {model: account.invoice, id: account_first_invoice_jan}:
account_id: account.a_recv account_id: account.a_recv
address_contact_id: base.res_partner_address_3000
address_invoice_id: base.res_partner_address_3000
company_id: base.main_company company_id: base.main_company
currency_id: base.USD currency_id: base.USD
date_invoice: !eval "'%s-01-01' %(datetime.now().year)" date_invoice: !eval "'%s-01-01' %(datetime.now().year)"
@ -114,8 +112,6 @@
- -
!record {model: account.invoice, id: account_second_invoice_feb}: !record {model: account.invoice, id: account_second_invoice_feb}:
account_id: account.a_recv account_id: account.a_recv
address_contact_id: base.res_partner_address_3000
address_invoice_id: base.res_partner_address_3000
company_id: base.main_company company_id: base.main_company
currency_id: base.USD currency_id: base.USD
date_invoice: !eval "'%s-02-01' %(datetime.now().year)" date_invoice: !eval "'%s-02-01' %(datetime.now().year)"

View File

@ -79,8 +79,6 @@
- -
!record {model: account.invoice, id: account_first_invoice_jan_michal}: !record {model: account.invoice, id: account_first_invoice_jan_michal}:
account_id: account.a_recv account_id: account.a_recv
address_contact_id: base.res_partner_address_3000
address_invoice_id: base.res_partner_address_3000
company_id: base.main_company company_id: base.main_company
currency_id: base.USD currency_id: base.USD
date_invoice: !eval "'%s-01-01' %(datetime.now().year)" date_invoice: !eval "'%s-01-01' %(datetime.now().year)"
@ -114,8 +112,6 @@
- -
!record {model: account.invoice, id: account_second_invoice_feb_michal}: !record {model: account.invoice, id: account_second_invoice_feb_michal}:
account_id: account.a_recv account_id: account.a_recv
address_contact_id: base.res_partner_address_3000
address_invoice_id: base.res_partner_address_3000
company_id: base.main_company company_id: base.main_company
currency_id: base.USD currency_id: base.USD
date_invoice: !eval "'%s-02-01' %(datetime.now().year)" date_invoice: !eval "'%s-02-01' %(datetime.now().year)"

View File

@ -33,8 +33,6 @@
- -
!record {model: account.invoice, id: account_first_invoice_jan_eur}: !record {model: account.invoice, id: account_first_invoice_jan_eur}:
account_id: account.a_recv account_id: account.a_recv
address_contact_id: base.res_partner_address_3000
address_invoice_id: base.res_partner_address_3000
company_id: base.main_company company_id: base.main_company
currency_id: base.EUR currency_id: base.EUR
date_invoice: !eval "'%s-01-01' %(datetime.now().year)" date_invoice: !eval "'%s-01-01' %(datetime.now().year)"
@ -68,8 +66,6 @@
- -
!record {model: account.invoice, id: account_second_invoice_feb_eur}: !record {model: account.invoice, id: account_second_invoice_feb_eur}:
account_id: account.a_recv account_id: account.a_recv
address_contact_id: base.res_partner_address_3000
address_invoice_id: base.res_partner_address_3000
company_id: base.main_company company_id: base.main_company
currency_id: base.EUR currency_id: base.EUR
date_invoice: !eval "'%s-02-01' %(datetime.now().year)" date_invoice: !eval "'%s-02-01' %(datetime.now().year)"

View File

@ -67,8 +67,6 @@
- -
!record {model: account.invoice, id: account_first_invoice_jan_cad}: !record {model: account.invoice, id: account_first_invoice_jan_cad}:
account_id: account.a_recv account_id: account.a_recv
address_contact_id: base.res_partner_address_3000
address_invoice_id: base.res_partner_address_3000
company_id: base.main_company company_id: base.main_company
currency_id: base.CAD currency_id: base.CAD
date_invoice: !eval "'%s-01-01' %(datetime.now().year)" date_invoice: !eval "'%s-01-01' %(datetime.now().year)"

View File

@ -3,8 +3,6 @@
- -
!record {model: account.invoice, id: account_invoice_0}: !record {model: account.invoice, id: account_invoice_0}:
account_id: account.a_recv account_id: account.a_recv
address_contact_id: base.res_partner_address_7
address_invoice_id: base.res_partner_address_7
company_id: base.main_company company_id: base.main_company
currency_id: base.EUR currency_id: base.EUR
invoice_line: invoice_line:

View File

@ -165,7 +165,6 @@ class account_analytic_account(osv.osv):
'quantity': fields.function(_debit_credit_bal_qtty, type='float', string='Quantity', multi='debit_credit_bal_qtty'), 'quantity': fields.function(_debit_credit_bal_qtty, type='float', string='Quantity', multi='debit_credit_bal_qtty'),
'quantity_max': fields.float('Maximum Time', help='Sets the higher limit of time to work on the contract.'), 'quantity_max': fields.float('Maximum Time', help='Sets the higher limit of time to work on the contract.'),
'partner_id': fields.many2one('res.partner', 'Partner'), 'partner_id': fields.many2one('res.partner', 'Partner'),
'contact_id': fields.many2one('res.partner.address', 'Contact'),
'user_id': fields.many2one('res.users', 'Account Manager'), 'user_id': fields.many2one('res.users', 'Account Manager'),
'date_start': fields.date('Date Start'), 'date_start': fields.date('Date Start'),
'date': fields.date('Date End', select=True), 'date': fields.date('Date End', select=True),
@ -199,7 +198,6 @@ class account_analytic_account(osv.osv):
'state': 'open', 'state': 'open',
'user_id': lambda self, cr, uid, ctx: uid, 'user_id': lambda self, cr, uid, ctx: uid,
'partner_id': lambda self, cr, uid, ctx: ctx.get('partner_id', False), 'partner_id': lambda self, cr, uid, ctx: ctx.get('partner_id', False),
'contact_id': lambda self, cr, uid, ctx: ctx.get('contact_id', False),
'date_start': lambda *a: time.strftime('%Y-%m-%d'), 'date_start': lambda *a: time.strftime('%Y-%m-%d'),
'currency_id': _get_default_currency, 'currency_id': _get_default_currency,
} }
@ -219,12 +217,6 @@ class account_analytic_account(osv.osv):
default['line_ids'] = [] default['line_ids'] = []
return super(account_analytic_account, self).copy(cr, uid, id, default, context=context) return super(account_analytic_account, self).copy(cr, uid, id, default, context=context)
def on_change_partner_id(self, cr, uid, id, partner_id, context={}):
if not partner_id:
return {'value': {'contact_id': False}}
addr = self.pool.get('res.partner').address_get(cr, uid, [partner_id], ['invoice'])
return {'value': {'contact_id': addr.get('invoice', False)}}
def on_change_company(self, cr, uid, id, company_id): def on_change_company(self, cr, uid, id, company_id):
if not company_id: if not company_id:
return {} return {}
@ -244,13 +236,6 @@ class account_analytic_account(osv.osv):
res['value']['partner_id'] = partner res['value']['partner_id'] = partner
return res return res
def onchange_partner_id(self, cr, uid, ids, partner, context=None):
partner_obj = self.pool.get('res.partner')
if not partner:
return {'value':{'contact_id': False}}
address = partner_obj.address_get(cr, uid, [partner], ['contact'])
return {'value':{'contact_id': address['contact']}}
def name_search(self, cr, uid, name, args=None, operator='ilike', context=None, limit=100): def name_search(self, cr, uid, name, args=None, operator='ilike', context=None, limit=100):
if not args: if not args:
args=[] args=[]

View File

@ -1,15 +1,15 @@
id,model_name,field_name id,model_name,field_name
anonymization_field_res_partner_name,res.partner,name anonymization_field_res_partner_name,res.partner,name
anonymization_field_res_partner_code,res.partner,ref anonymization_field_res_partner_code,res.partner,ref
anonymization_field_res_partner_address_name,res.partner.address,name anonymization_field_res_partner_name,res.partner,name
anonymization_field_res_partner_address_city,res.partner.address,city anonymization_field_res_partner_city,res.partner,city
anonymization_field_res_partner_address_street,res.partner.address,street anonymization_field_res_partner_street,res.partner,street
anonymization_field_res_partner_address_street2,res.partner.address,street2 anonymization_field_res_partner_street2,res.partner,street2
anonymization_field_res_partner_address_zip,res.partner.address,zip anonymization_field_res_partner_zip,res.partner,zip
anonymization_field_res_partner_address_phone,res.partner.address,phone anonymization_field_res_partner_phone,res.partner,phone
anonymization_field_res_partner_address_fax,res.partner.address,fax anonymization_field_res_partner_fax,res.partner,fax
anonymization_field_res_partner_address_mobile,res.partner.address,mobile anonymization_field_res_partner_mobile,res.partner,mobile
anonymization_field_res_partner_address_email,res.partner.address,email anonymization_field_res_partner_email,res.partner,email
anonymization_field_account_invoice_amount_untaxed,account.invoice,amount_untaxed anonymization_field_account_invoice_amount_untaxed,account.invoice,amount_untaxed
anonymization_field_account_invoice_amount_tax,account.invoice,amount_tax anonymization_field_account_invoice_amount_tax,account.invoice,amount_tax
anonymization_field_account_invoice_amount_total,account.invoice,amount_total anonymization_field_account_invoice_amount_total,account.invoice,amount_total

1 id model_name field_name
2 anonymization_field_res_partner_name res.partner name
3 anonymization_field_res_partner_code res.partner ref
4 anonymization_field_res_partner_address_name anonymization_field_res_partner_name res.partner.address res.partner name
5 anonymization_field_res_partner_address_city anonymization_field_res_partner_city res.partner.address res.partner city
6 anonymization_field_res_partner_address_street anonymization_field_res_partner_street res.partner.address res.partner street
7 anonymization_field_res_partner_address_street2 anonymization_field_res_partner_street2 res.partner.address res.partner street2
8 anonymization_field_res_partner_address_zip anonymization_field_res_partner_zip res.partner.address res.partner zip
9 anonymization_field_res_partner_address_phone anonymization_field_res_partner_phone res.partner.address res.partner phone
10 anonymization_field_res_partner_address_fax anonymization_field_res_partner_fax res.partner.address res.partner fax
11 anonymization_field_res_partner_address_mobile anonymization_field_res_partner_mobile res.partner.address res.partner mobile
12 anonymization_field_res_partner_address_email anonymization_field_res_partner_email res.partner.address res.partner email
13 anonymization_field_account_invoice_amount_untaxed account.invoice amount_untaxed
14 anonymization_field_account_invoice_amount_tax account.invoice amount_tax
15 anonymization_field_account_invoice_amount_total account.invoice amount_total

View File

@ -9,6 +9,6 @@
web_icon="images/association.png" web_icon="images/association.png"
web_icon_hover="images/association-hover.png"/> web_icon_hover="images/association-hover.png"/>
<menuitem name="Configuration" id="base.menu_event_config" parent="base.menu_association" sequence="30" groups="base.group_extended"/> <menuitem name="Configuration" id="base.menu_event_config" parent="base.menu_association" sequence="30" groups="base.group_extended"/>
<menuitem name="Reporting" id="base.menu_report_association" parent="base.menu_association" sequence="20"/> <menuitem name="Association" id="base.menu_report_association" parent="base.menu_reporting" sequence="23"/>
</data> </data>
</openerp> </openerp>

View File

@ -687,9 +687,9 @@ class auction_lots(osv.osv):
if (lot.auction_id.id, lot.ach_uid.id) in invoices: if (lot.auction_id.id, lot.ach_uid.id) in invoices:
inv_id = invoices[(lot.auction_id.id, lot.ach_uid.id)] inv_id = invoices[(lot.auction_id.id, lot.ach_uid.id)]
else: else:
add = res_obj.read(cr, uid, [lot.ach_uid.id], ['address'])[0]['address'] add = res_obj.address_get(cr, uid, [lot.ach_uid.id], ['default'])['default']
if not len(add): if not add:
raise orm.except_orm(_('Missed Address !'), _('The Buyer has no Invoice Address.')) raise orm.except_orm(_('Missed Address !'), _('The Buyer has no Address.'))
inv = { inv = {
'name':lot.auction_id.name or '', 'name':lot.auction_id.name or '',
'reference': lot.ach_login, 'reference': lot.ach_login,
@ -751,8 +751,8 @@ class auction_bid(osv.osv):
if not partner_id: if not partner_id:
return {'value': {'contact_tel':False}} return {'value': {'contact_tel':False}}
contact = self.pool.get('res.partner').browse(cr, uid, partner_id) contact = self.pool.get('res.partner').browse(cr, uid, partner_id)
if len(contact.address): if contact:
v_contact=contact.address[0] and contact.address[0].phone v_contact=contact.phone
else: else:
v_contact = False v_contact = False
return {'value': {'contact_tel': v_contact}} return {'value': {'contact_tel': v_contact}}

View File

@ -107,9 +107,10 @@
<record id="partner_record1" model="res.partner"> <record id="partner_record1" model="res.partner">
<field name="name">Unknown</field> <field name="name">Unknown</field>
<field name="is_company">1</field>
</record> </record>
<record id="res_partner_unknown_address_1" model="res.partner.address"> <record id="res_partner_unknown_address_1" model="res.partner">
<field name="city">Bruxelles1</field> <field name="city">Bruxelles1</field>
<field name="name">Benoit Mortie1r1</field> <field name="name">Benoit Mortie1r1</field>
<field name="zip">1030</field> <field name="zip">1030</field>
@ -118,22 +119,24 @@
<field name="phone">(+32)2 211 34 83</field> <field name="phone">(+32)2 211 34 83</field>
<field name="street">Rue des Palais 44, bte 33</field> <field name="street">Rue des Palais 44, bte 33</field>
<field name="type">default</field> <field name="type">default</field>
<field name="partner_id" ref="partner_record1"/> <field name="use_parent_address" eval="0"/>
<field name="parent_id" ref="partner_record1"/>
</record> </record>
<record id="res_partner_unknown_address_2" model="res.partner.address"> <record id="res_partner_unknown_address_2" model="res.partner">
<field name="city">Avignon CEDEX 091</field> <field name="city">Avignon CEDEX 091</field>
<field name="name">Laurent Jacot1</field> <field name="name">Lara</field>
<field name="zip">84911</field> <field name="zip">84911</field>
<field name="country_id" model="res.country" search="[('name','=','France')]"/> <field name="country_id" model="res.country" search="[('name','=','France')]"/>
<field name="email">contact@tecsas.fr</field> <field name="email">contact@tecsas.fr</field>
<field name="phone">(+33)4.32.74.10.57</field> <field name="phone">(+33)4.32.74.10.57</field>
<field name="street">85 rue du traite de Rome</field> <field name="street">85 rue du traite de Rome</field>
<field name="type">default</field> <field name="type">default</field>
<field name="partner_id" ref="partner_record1"/> <field name="use_parent_address" eval="0"/>
<field name="parent_id" ref="partner_record1"/>
</record> </record>
<record id="res_partner_unknown_address_3" model="res.partner.address"> <record id="res_partner_unknown_address_3" model="res.partner">
<field name="city">Louvain-la-Neuve</field> <field name="city">Louvain-la-Neuve</field>
<field name="name">Thomas Passot</field> <field name="name">Thomas Passot</field>
<field name="zip">1348</field> <field name="zip">1348</field>
@ -141,7 +144,8 @@
<field name="email">info@mediapole.net</field> <field name="email">info@mediapole.net</field>
<field name="phone">(+32).10.45.17.73</field> <field name="phone">(+32).10.45.17.73</field>
<field name="street">Rue de l'Angelique, 1</field> <field name="street">Rue de l'Angelique, 1</field>
<field name="partner_id" ref="partner_record1"/> <field name="use_parent_address" eval="0"/>
<field name="parent_id" ref="partner_record1"/>
</record> </record>
<!-- demo data for the auction_artist object--> <!-- demo data for the auction_artist object-->

View File

@ -770,7 +770,7 @@
<menuitem name="Buyers" id="auction_buyers_menu" parent="auction_menu_root" sequence="4"/> <menuitem name="Buyers" id="auction_buyers_menu" parent="auction_menu_root" sequence="4"/>
<menuitem name="Bids" parent="auction_buyers_menu" action="action_bid_open" id="menu_action_bid_open"/> <menuitem name="Bids" parent="auction_buyers_menu" action="action_bid_open" id="menu_action_bid_open"/>
<menuitem name="Reporting" id="auction_report_menu" parent="auction_menu_root" sequence="6" groups="group_auction_manager"/> <menuitem name="Auction" id="auction_report_menu" parent="base.menu_reporting" sequence="70" groups="group_auction_manager"/>
<act_window name="Deposit slip" <act_window name="Deposit slip"
context="{'search_default_partner_id': [active_id], 'default_partner_id': active_id}" context="{'search_default_partner_id': [active_id], 'default_partner_id': active_id}"

View File

@ -93,7 +93,7 @@
<field name="view_id" ref="board_auction_form1"/> <field name="view_id" ref="board_auction_form1"/>
</record> </record>
<menuitem name="Dashboard" id="menu_board_auction" parent="auction.auction_report_menu" sequence="0"/> <menuitem name="Auction" id="menu_board_auction" parent="base.menu_reporting_dashboard" sequence="40"/>
<menuitem <menuitem
name="Auction DashBoard" name="Auction DashBoard"

View File

@ -99,7 +99,7 @@
</td> </td>
<td> <td>
<para style="Addressee">[[ o['partner'] and o['partner'].name or False]]</para> <para style="Addressee">[[ o['partner'] and o['partner'].name or False]]</para>
<para style="Addressee">[[o['partner'] and o['partner'].address and display_address(o['partner'].address[0]) ]]</para> <para style="Addressee">[[o['partner'] and o['partner'] and display_address(o['partner']) ]]</para>
</td> </td>
</tr> </tr>
</blockTable> </blockTable>

View File

@ -84,7 +84,7 @@
</para> </para>
<para style="P5">[[o.bord_vnd_id.partner_id.title]]</para> <para style="P5">[[o.bord_vnd_id.partner_id.title]]</para>
<para style="P5">[[o.bord_vnd_id.partner_id.name]]</para> <para style="P5">[[o.bord_vnd_id.partner_id.name]]</para>
<para style="P5">[[o.bord_vnd_id.partner_id.address and display_address(o.bord_vnd_id.partner_id.address[0]) ]] </para> <para style="P5">[[o.bord_vnd_id.partner_id and display_address(o.bord_vnd_id.partner_id) ]] </para>
<para style="P6"> <para style="P6">
<font color="white"> </font> <font color="white"> </font>
</para> </para>

View File

@ -74,7 +74,7 @@
</td> </td>
<td> <td>
<para style="Addressee">[[ o['partner'] and o['partner'].name or False]]</para> <para style="Addressee">[[ o['partner'] and o['partner'].name or False]]</para>
<para style="Addressee">[[ o['partner'] and o['partner'].address and display_address(o['partner'].address[0]) </para> <para style="Addressee">[[ o['partner'] and o['partner'] and display_address(o['partner']) </para>
<para style="P4"> <para style="P4">
<font color="white"> </font> <font color="white"> </font>
</para> </para>

View File

@ -1,6 +1,6 @@
- -
In order to test the auction module in the OpenERP I start the process by creating a product. In order to test the auction module in the OpenERP I start the process by creating a product.
- -
!record {model: product.product, id: product_product_furniture0}: !record {model: product.product, id: product_product_furniture0}:
categ_id: product.cat1 categ_id: product.cat1
cost_method: standard cost_method: standard
@ -16,55 +16,53 @@
warranty: 0.0 warranty: 0.0
weight: 0.0 weight: 0.0
weight_net: 0.0 weight_net: 0.0
-
I create a new artist for an object.
- -
I create a new artist for an object.
-
!record {model: auction.artists, id: auction_artists_vincentvangogh0}: !record {model: auction.artists, id: auction_artists_vincentvangogh0}:
birth_death_dates: 1853-1900 birth_death_dates: 1853-1900
name: Vincent van Gogh name: Vincent van Gogh
- -
I am modifying an expenses journal record for analytic journal. I am modifying an expenses journal record for analytic journal.
- -
!record {model: account.journal, id: account.expenses_journal}: !record {model: account.journal, id: account.expenses_journal}:
analytic_journal_id: account.exp analytic_journal_id: account.exp
- -
I am modifying a sales journal record for analytic journal. I am modifying a sales journal record for analytic journal.
- -
!record {model: account.journal, id: account.sales_journal}: !record {model: account.journal, id: account.sales_journal}:
analytic_journal_id: account.cose_journal_sale analytic_journal_id: account.cose_journal_sale
- -
I'm creating new Buyer "Mr. Patel" with his email "info@myinfobid.com". I'm creating new Buyer "Mr. Patel" with his email "info@myinfobid.com".
- -
!record {model: res.partner, id: res_partner_mrpatel0}: !record {model: res.partner, id: res_partner_mrpatel0}:
address: name: Mr. Patel
- city: Bruxelles city: Bruxelles
country_id: base.be country_id: base.be
street: Rue des Palais 51, bte 33 street: Rue des Palais 51, bte 33
type: default type: default
zip: '1000' zip: '1000'
email: 'info@myinfobid.com' email: 'info@myinfobid.com'
name: Mr. Patel
- -
I'm creating new Buyer "Mr. Rahi" with his email "info@poalrahi.com". I'm creating new Buyer "Mr. Rahi" with his email "info@poalrahi.com".
- -
!record {model: res.partner, id: res_partner_poalrahi0}: !record {model: res.partner, id: res_partner_poalrahi0}:
address: name: Mr. Rahi
- city: Bruxelles city: Bruxelles
country_id: base.be country_id: base.be
street: Rue des Palais 51, bte 33 street: Rue des Palais 51, bte 33
type: default type: default
zip: '1000' zip: '1000'
email: 'info@poalrahi.com' email: 'info@poalrahi.com'
name: Mr. Rahi
- -
I create an Account tax with 0.03 amount to give Buyer "3%" Commission. I create an Account tax with 0.03 amount to give Buyer "3%" Commission.
- -
!record {model: account.tax, id: account_tax_buyer0}: !record {model: account.tax, id: account_tax_buyer0}:
amount: 0.029999999999999999 amount: 0.029999999999999999
applicable_type: 'true' applicable_type: 'true'
@ -76,7 +74,7 @@
type_tax_use: all type_tax_use: all
- -
I create another Account tax with 0.04 amount to give seller "4%" commission. I create another Account tax with 0.04 amount to give seller "4%" commission.
- -
!record {model: account.tax, id: account_tax_sellercosts0}: !record {model: account.tax, id: account_tax_sellercosts0}:
amount: 0.040000000000000001 amount: 0.040000000000000001
applicable_type: 'true' applicable_type: 'true'
@ -85,8 +83,8 @@
name: Seller Costs(%4) name: Seller Costs(%4)
sequence: 1 sequence: 1
type: percent type: percent
type_tax_use: all type_tax_use: all
- -
Now I want to associate an object with the auction so for that I create an auction "Antique furniture exhibition" which Now I want to associate an object with the auction so for that I create an auction "Antique furniture exhibition" which
start from 1 Aug to 31 Aug with Seller Commission 4%, buyer commission 3%. start from 1 Aug to 31 Aug with Seller Commission 4%, buyer commission 3%.
@ -105,9 +103,9 @@
seller_costs: seller_costs:
- auction.account_tax_sellercosts0 - auction.account_tax_sellercosts0
buyer_costs: buyer_costs:
- auction.account_tax_buyer0 - auction.account_tax_buyer0
- -
An object is being deposited for an auction,I create a seller's deposit record with deposit cost. An object is being deposited for an auction,I create a seller's deposit record with deposit cost.
- -
!record {model: auction.deposit, id: auction_deposit_ad0}: !record {model: auction.deposit, id: auction_deposit_ad0}:
date_dep: !eval "'%s-08-01' %(datetime.now().year)" date_dep: !eval "'%s-08-01' %(datetime.now().year)"
@ -117,7 +115,7 @@
specific_cost_ids: specific_cost_ids:
- account: auction.auction_expense - account: auction.auction_expense
amount: 200.0 amount: 200.0
name: Transfer Cost name: Transfer Cost
- -
I create a new object wooden-chair which is to be auctioned. I create a new object wooden-chair which is to be auctioned.
- -
@ -156,7 +154,7 @@
- -
I create another bid for an object "wooden-chair" bid by a Mr.poalrahi I create another bid for an object "wooden-chair" bid by a Mr.poalrahi
- -
!record {model: auction.bid, id: auction_bid_bid1}: !record {model: auction.bid, id: auction_bid_bid1}:
auction_id: auction_dates_antiquefurnitureexhibition0 auction_id: auction_dates_antiquefurnitureexhibition0
name: bid/002 name: bid/002
@ -170,10 +168,10 @@
call: 1 call: 1
lot_id: auction.auction_lots_woodenchair0 lot_id: auction.auction_lots_woodenchair0
price: 3200.0 price: 3200.0
- -
I create another bid for an object "wooden-chair" bid by a Mr.Seagate I create another bid for an object "wooden-chair" bid by a Mr.Seagate
- -
!record {model: auction.bid, id: auction_bid_bid2}: !record {model: auction.bid, id: auction_bid_bid2}:
auction_id: auction_dates_antiquefurnitureexhibition0 auction_id: auction_dates_antiquefurnitureexhibition0
name: bid/003 name: bid/003
@ -202,7 +200,7 @@
!python {model: auction.lots}: | !python {model: auction.lots}: |
self.button_bought(cr, uid, [ref("auction_lots_woodenchair0")], {"lang": "en_US", "tz": self.button_bought(cr, uid, [ref("auction_lots_woodenchair0")], {"lang": "en_US", "tz":
False, "active_model": "ir.ui.menu", "active_ids": [ref("auction.auction_lots_woodenchair0")], False, "active_model": "ir.ui.menu", "active_ids": [ref("auction.auction_lots_woodenchair0")],
"active_id": ref("auction.auction_lots_woodenchair0")}) "active_id": ref("auction.auction_lots_woodenchair0")})
- -
I click on the "Create all invoices" button for all Objects in this Auction. I click on the "Create all invoices" button for all Objects in this Auction.
- -
@ -216,8 +214,8 @@
!python {model: auction.lots}: | !python {model: auction.lots}: |
from tools.translate import _ from tools.translate import _
auc_id=self.browse(cr, uid, ref("auction_lots_woodenchair0")) auc_id=self.browse(cr, uid, ref("auction_lots_woodenchair0"))
assert(auc_id.sel_inv_id), _('Seller Invoice has not been created!') assert(auc_id.sel_inv_id), _('Seller Invoice has not been created!')
- -
I create a buyer's invoice by using the "Invoice Buyer objects" wizard. I create a buyer's invoice by using the "Invoice Buyer objects" wizard.
- -
@ -238,10 +236,10 @@
!python {model: auction.lots}: | !python {model: auction.lots}: |
from tools.translate import _ from tools.translate import _
auc_id=self.browse(cr, uid, ref("auction_lots_woodenchair0")) auc_id=self.browse(cr, uid, ref("auction_lots_woodenchair0"))
assert(auc_id.ach_inv_id), _('Buyer Invoice has not been created!') assert(auc_id.ach_inv_id), _('Buyer Invoice has not been created!')
- -
Buyer pays the invoice Buyer pays the invoice
- -
!python {model: account.invoice}: | !python {model: account.invoice}: |
obj_lots = self.pool.get('auction.lots') obj_lots = self.pool.get('auction.lots')
lots_id = obj_lots.browse(cr, uid, ref("auction_lots_woodenchair0")) lots_id = obj_lots.browse(cr, uid, ref("auction_lots_woodenchair0"))
@ -279,9 +277,9 @@
- -
!record {model: auction.lots.auction.move, id: auction_lots_auction_move_0}: !record {model: auction.lots.auction.move, id: auction_lots_auction_move_0}:
auction_id: auction.auction_date_2 auction_id: auction.auction_date_2
- -
I click on the "Move to Auction date" button. I click on the "Move to Auction date" button.
- -
!python {model: auction.lots.auction.move}: | !python {model: auction.lots.auction.move}: |
self.auction_move_set(cr, uid, [ref("auction_lots_auction_move_0")], {"lang": self.auction_move_set(cr, uid, [ref("auction_lots_auction_move_0")], {"lang":
"en_US", "tz": False, "active_model": "auction.lots", "active_ids": [ref("auction_lots_woodenchair0")], "en_US", "tz": False, "active_model": "auction.lots", "active_ids": [ref("auction_lots_woodenchair0")],
@ -294,4 +292,4 @@
auc_id=self.browse(cr, uid, ref("auction_lots_woodenchair0")) auc_id=self.browse(cr, uid, ref("auction_lots_woodenchair0"))
auc_lot_his=self.pool.get('auction.lot.history') auc_lot_his=self.pool.get('auction.lot.history')
ids=auc_lot_his.search(cr, uid, [('lot_id', '=', auc_id.id)]) ids=auc_lot_his.search(cr, uid, [('lot_id', '=', auc_id.id)])
assert ids, _('Auction history does not exists!') assert ids, _('Auction history does not exists!')

View File

@ -47,18 +47,16 @@ class auction_lots_sms_send(osv.osv_memory):
if context is None: context = {} if context is None: context = {}
lot_obj = self.pool.get('auction.lots') lot_obj = self.pool.get('auction.lots')
partner_obj = self.pool.get('res.partner') partner_obj = self.pool.get('res.partner')
partner_address_obj = self.pool.get('res.partner.address')
for data in self.read(cr, uid, ids, context=context): for data in self.read(cr, uid, ids, context=context):
lots = lot_obj.read(cr, uid, context.get('active_ids', []), ['obj_num','obj_price','ach_uid']) lots = lot_obj.read(cr, uid, context.get('active_ids', []), ['obj_num','obj_price','ach_uid'])
res = partner_obj.read(cr, uid, [l['ach_uid'][0] for l in lots if l['ach_uid']], ['gsm'], context) res = partner_obj.read(cr, uid, [l['ach_uid'][0] for l in lots if l['ach_uid']], ['gsm'], context)
nbr = 0 nbr = 0
for r in res: for r in res:
add = partner_obj.address_get(cr, uid, [r['id']])['default'] add = partner_obj.address_get(cr, uid, [r['id']])['default']
addr = partner_address_obj.browse(cr, uid, add, context=context) addr = partner_obj.browse(cr, uid, add, context=context)
to = addr.mobile to = addr.mobile
if to: if to:
tools.smssend(data['user'], data['password'], data['app_id'], unicode(data['text'], 'utf-8').encode('latin1'), to) tools.sms_send(data['user'], data['password'], data['app_id'], unicode(data['text'], 'utf-8').encode('latin1'), to)
nbr += 1 nbr += 1
return {'sms_sent': nbr} return {'sms_sent': nbr}
auction_lots_sms_send() auction_lots_sms_send()

View File

@ -375,8 +375,7 @@ class audittrail_objects_proxy(object_proxy):
} }
The reason why the structure returned is build as above is because when modifying an existing The reason why the structure returned is build as above is because when modifying an existing
record (res.partner, for example), we may have to log a change done in a x2many field (on record, we may have to log a change done in a x2many field of that object
res.partner.address, for example)
""" """
key = (model.id, resource_id) key = (model.id, resource_id)
lines = { lines = {

View File

@ -0,0 +1,112 @@
# Finnish translation for openobject-addons
# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
# This file is distributed under the same license as the openobject-addons package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
#
msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-02-08 01:37+0100\n"
"PO-Revision-Date: 2012-03-30 09:57+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Finnish <fi@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-03-31 05:09+0000\n"
"X-Generator: Launchpad (build 15032)\n"
#. #-#-#-#-# auth_openid.pot (OpenERP Server 6.1rc1) #-#-#-#-#
#. module: auth_openid
#. #-#-#-#-# auth_openid.pot.web (PROJECT VERSION) #-#-#-#-#
#. openerp-web
#: view:res.users:0
#: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:12
msgid "OpenID"
msgstr "OpenID"
#. #-#-#-#-# auth_openid.pot (OpenERP Server 6.1rc1) #-#-#-#-#
#. module: auth_openid
#. #-#-#-#-# auth_openid.pot.web (PROJECT VERSION) #-#-#-#-#
#. openerp-web
#: field:res.users,openid_url:0
#: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:47
msgid "OpenID URL"
msgstr "OpenID URL"
#. module: auth_openid
#: help:res.users,openid_email:0
msgid "Used for disambiguation in case of a shared OpenID URL"
msgstr "Käytetään täsmennyksenä, jos käytössä jaettu OpenID URL"
#. module: auth_openid
#: sql_constraint:res.users:0
msgid "You can not have two users with the same login !"
msgstr "Kahdella eri käyttäjällä ei voi olla samaa käyttäjätunnusta!"
#. module: auth_openid
#: field:res.users,openid_email:0
msgid "OpenID Email"
msgstr "OpenID sähköposti"
#. module: auth_openid
#: constraint:res.users:0
msgid "The chosen company is not in the allowed companies for this user"
msgstr "Valittu yritys ei ole sallittu tälle käyttäjälle"
#. module: auth_openid
#: field:res.users,openid_key:0
msgid "OpenID Key"
msgstr "OpenID avain"
#. module: auth_openid
#: model:ir.model,name:auth_openid.model_res_users
msgid "res.users"
msgstr ""
#. openerp-web
#: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:8
msgid "Password"
msgstr "Salasana"
#. openerp-web
#: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:9
#: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:10
msgid "Google"
msgstr "Google"
#. openerp-web
#: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:10
msgid "Google Apps"
msgstr "Google apps"
#. openerp-web
#: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:11
msgid "Launchpad"
msgstr "Launchpad"
#. openerp-web
#: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:20
msgid "Google Apps Domain:"
msgstr "Google Apps toimialue:"
#. openerp-web
#: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:24
msgid "Username:"
msgstr "Käyttäjätunnus:"
#. openerp-web
#: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:28
msgid "OpenID URL:"
msgstr "OpenID URL:"
#. openerp-web
#: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:35
msgid "Google Apps Domain"
msgstr "Google Apps toimialue"
#. openerp-web
#: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:41
msgid "Username"
msgstr "Käyttäjänimi"

View File

@ -65,8 +65,10 @@ class res_users(osv.osv):
return result return result
else: else:
with utils.cursor(db) as cr: with utils.cursor(db) as cr:
cr.execute('UPDATE res_users SET date=now() WHERE login=%s AND openid_key=%s AND active=%s RETURNING id', cr.execute("""UPDATE res_users
(tools.ustr(login), tools.ustr(password), True)) SET date=now() AT TIME ZONE 'UTC'
WHERE login=%s AND openid_key=%s AND active=%s RETURNING id""",
(tools.ustr(login), tools.ustr(password), True))
res = cr.fetchone() res = cr.fetchone()
cr.commit() cr.commit()
return res[0] if res else False return res[0] if res else False

View File

@ -24,6 +24,7 @@ from tools.translate import _
from datetime import datetime from datetime import datetime
from datetime import timedelta from datetime import timedelta
from tools.safe_eval import safe_eval from tools.safe_eval import safe_eval
from tools import ustr
import pooler import pooler
import re import re
import time import time
@ -369,8 +370,8 @@ the rule to mark CC(mail to any other person defined in actions)."),
reg_name = action.regex_name reg_name = action.regex_name
result_name = True result_name = True
if reg_name: if reg_name:
ptrn = re.compile(str(reg_name)) ptrn = re.compile(ustr(reg_name))
_result = ptrn.search(str(obj.name)) _result = ptrn.search(ustr(obj.name))
if not _result: if not _result:
result_name = False result_name = False
regex_n = not reg_name or result_name regex_n = not reg_name or result_name

View File

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<openerp> <openerp>
<data> <data>
<menuitem id="base.menu_base_action_rule" name="Automated Actions" <!-- <menuitem id="base.menu_base_action_rule" name="Automated Actions"
groups="base.group_extended" groups="base.group_extended"
parent="base.menu_base_config" sequence="20" /> parent="base.menu_base_config" sequence="20" />-->
<menuitem id="base.menu_base_action_rule_admin" name="Automated Actions" <menuitem id="base.menu_base_action_rule_admin" name="Automated Actions"
groups="base.group_extended" groups="base.group_extended"
parent="base.menu_custom" /> parent="base.menu_custom" />

View File

@ -250,8 +250,8 @@ class calendar_attendee(osv.osv):
if name == 'cn': if name == 'cn':
if attdata.user_id: if attdata.user_id:
result[id][name] = attdata.user_id.name result[id][name] = attdata.user_id.name
elif attdata.partner_address_id: elif attdata.partner_id:
result[id][name] = attdata.partner_address_id.name or attdata.partner_id.name result[id][name] = attdata.partner_id.name or False
else: else:
result[id][name] = attdata.email or '' result[id][name] = attdata.email or ''
@ -365,9 +365,7 @@ that points to the directory information corresponding to the attendee."),
store=True, help="To specify the language for text values in a\ store=True, help="To specify the language for text values in a\
property or property parameter."), property or property parameter."),
'user_id': fields.many2one('res.users', 'User'), 'user_id': fields.many2one('res.users', 'User'),
'partner_address_id': fields.many2one('res.partner.address', 'Contact'), 'partner_id': fields.many2one('res.partner', 'Contact'),
'partner_id': fields.related('partner_address_id', 'partner_id', type='many2one', \
relation='res.partner', string='Partner', help="Partner related to contact"),
'email': fields.char('Email', size=124, help="Email of Invited Person"), 'email': fields.char('Email', size=124, help="Email of Invited Person"),
'event_date': fields.function(_compute_data, string='Event Date', \ 'event_date': fields.function(_compute_data, string='Event Date', \
type="datetime", multi='event_date'), type="datetime", multi='event_date'),
@ -1618,20 +1616,13 @@ class ir_attachment(osv.osv):
_inherit = 'ir.attachment' _inherit = 'ir.attachment'
def search_count(self, cr, user, args, context=None): def search_count(self, cr, user, args, context=None):
""" new_args = []
@param self: The object pointer for domain_item in args:
@param cr: the current row, from the database cursor, if isinstance(domain_item, (list, tuple)) and len(domain_item) == 3 and domain_item[0] == 'res_id':
@param user: the current users ID for security checks, new_args.append((domain_item[0], domain_item[1], base_calendar_id2real_id(domain_item[2])))
@param args: list of tuples of form [(name_of_the_field, operator, value), ...]. else:
@param context: A standard dictionary for contextual values new_args.append(domain_item)
""" return super(ir_attachment, self).search_count(cr, user, new_args, context)
args1 = []
for arg in args:
args1.append(map(lambda x:str(x).split('-')[0], arg))
return super(ir_attachment, self).search_count(cr, user, args1, context)
def create(self, cr, uid, vals, context=None): def create(self, cr, uid, vals, context=None):
if context: if context:
@ -1641,21 +1632,12 @@ class ir_attachment(osv.osv):
def search(self, cr, uid, args, offset=0, limit=None, order=None, def search(self, cr, uid, args, offset=0, limit=None, order=None,
context=None, count=False): context=None, count=False):
""" new_args = []
@param self: The object pointer for domain_item in args:
@param cr: the current row, from the database cursor, if isinstance(domain_item, (list, tuple)) and len(domain_item) == 3 and domain_item[0] == 'res_id':
@param uid: the current users ID for security checks, new_args.append((domain_item[0], domain_item[1], base_calendar_id2real_id(domain_item[2])))
@param args: list of tuples of form [(name_of_the_field, operator, value), ...]. else:
@param offset: The Number of Results to pass, new_args.append(domain_item)
@param limit: The Number of Results to Return,
@param context: A standard dictionary for contextual values
"""
new_args = args
for i, arg in enumerate(new_args):
if arg[0] == 'res_id':
new_args[i] = (arg[0], arg[1], base_calendar_id2real_id(arg[2]))
return super(ir_attachment, self).search(cr, uid, new_args, offset=offset, return super(ir_attachment, self).search(cr, uid, new_args, offset=offset,
limit=limit, order=order, context=context, count=False) limit=limit, order=order, context=context, count=False)
ir_attachment() ir_attachment()

View File

@ -22,10 +22,8 @@
<group colspan="4" col="4"> <group colspan="4" col="4">
<field name="user_id" string="Invited User"/> <field name="user_id" string="Invited User"/>
<newline/> <newline/>
<field name="partner_address_id"
string="Contact" />
<field name="partner_id" <field name="partner_id"
string="Partner" readonly="1" /> string="Contact" />
</group> </group>
<separator string="Event Detail" colspan="4" /> <separator string="Event Detail" colspan="4" />
<group colspan="4" col="4"> <group colspan="4" col="4">
@ -78,7 +76,7 @@
<field name="sent_by_uid" string="Invitation From" /> <field name="sent_by_uid" string="Invitation From" />
<field name="role" string="My Role"/> <field name="role" string="My Role"/>
<field name="user_id" invisible="1"/> <field name="user_id" invisible="1"/>
<field name="partner_address_id" invisible="1"/> <field name="partner_id" invisible="1"/>
<field name="cutype" string="Invitation type"/> <field name="cutype" string="Invitation type"/>
<field name="state" /> <field name="state" />
<field name="rsvp" string="Required to Join"/> <field name="rsvp" string="Required to Join"/>
@ -132,7 +130,7 @@
<filter string="Responsible" icon="terp-personal" domain="[]" <filter string="Responsible" icon="terp-personal" domain="[]"
context="{'group_by':'user_id'}" /> context="{'group_by':'user_id'}" />
<filter string="Contact" icon="terp-personal" domain="[]" <filter string="Contact" icon="terp-personal" domain="[]"
context="{'group_by':'partner_address_id'}" /> context="{'group_by':'partner_id'}" />
<separator orientation="vertical" /> <separator orientation="vertical" />
<filter string="Type" icon="terp-stock_symbol-selection" help="Invitation Type" <filter string="Type" icon="terp-stock_symbol-selection" help="Invitation Type"
domain="[]" context="{'group_by':'cutype'}" /> domain="[]" context="{'group_by':'cutype'}" />
@ -159,7 +157,7 @@
<!-- Calenadar's menu --> <!-- Calenadar's menu -->
<menuitem id="base.menu_calendar_configuration" name="Calendar" <menuitem id="base.menu_calendar_configuration" name="Calendar"
parent="base.menu_base_config" sequence="6" groups="base.group_sale_manager" /> parent="base.menu_base_config" sequence="50" groups="base.group_sale_manager" />
<!-- Invitation menu --> <!-- Invitation menu -->
@ -215,9 +213,9 @@
<!-- Menu for Alarms--> <!-- Menu for Alarms-->
<menuitem id="menu_crm_meeting_avail_alarm" <menuitem id="menu_crm_meeting_avail_alarm"
groups="base.group_extended" groups="base.group_no_one"
action="base_calendar.action_res_alarm_view" action="base_calendar.action_res_alarm_view"
parent="base.menu_calendar_configuration" /> parent="base.menu_calendar_configuration" sequence="5"/>
<!-- Event Form View--> <!-- Event Form View-->
@ -350,9 +348,9 @@
<group col="4" colspan="4"> <group col="4" colspan="4">
<field name="rrule_type" string="Recurrency period" <field name="rrule_type" string="Recurrency period"
attrs="{'readonly':[('recurrent_uid','!=',False)]}" /> attrs="{'readonly':[('recurrent_uid','!=',False)]}" />
<field name="interval" /> <field name="interval" />
<separator string="End of recurrency" colspan="4"/> <separator string="End of recurrency" colspan="4"/>
<field name="end_type" /> <field name="end_type" />
<label string=" " colspan="2" /> <label string=" " colspan="2" />
@ -362,8 +360,8 @@
<newline /> <newline />
<field name="end_date" attrs="{'invisible' : [('end_type', '!=', 'end_date')] }"/> <field name="end_date" attrs="{'invisible' : [('end_type', '!=', 'end_date')] }"/>
<newline /> <newline />
</group> </group>
<group col="8" colspan="4" name="Select weekdays" attrs="{'invisible' :[('rrule_type','not in', ['weekly'])]}"> <group col="8" colspan="4" name="Select weekdays" attrs="{'invisible' :[('rrule_type','not in', ['weekly'])]}">
<separator string="Choose day where repeat the meeting" colspan="8"/> <separator string="Choose day where repeat the meeting" colspan="8"/>
@ -501,7 +499,7 @@
<menuitem id="menu_events" <menuitem id="menu_events"
name="Events" parent="base.menu_calendar_configuration" name="Events" parent="base.menu_calendar_configuration"
groups="base.group_extended" groups="base.group_extended"
sequence="5" action="action_view_event" /> sequence="15" action="action_view_event" />
</data> </data>
</openerp> </openerp>

View File

@ -41,7 +41,7 @@ class base_calendar_invite_attendee(osv.osv_memory):
'invite_id', 'user_id', 'Users'), 'invite_id', 'user_id', 'Users'),
'partner_id': fields.many2one('res.partner', 'Partner'), 'partner_id': fields.many2one('res.partner', 'Partner'),
'email': fields.char('Email', size=124, help="Provide external email address who will receive this invitation."), 'email': fields.char('Email', size=124, help="Provide external email address who will receive this invitation."),
'contact_ids': fields.many2many('res.partner.address', 'invite_contact_rel', 'contact_ids': fields.many2many('res.partner', 'invite_contact_rel',
'invite_id', 'contact_id', 'Contacts'), 'invite_id', 'contact_id', 'Contacts'),
'send_mail': fields.boolean('Send mail?', help='Check this if you want to \ 'send_mail': fields.boolean('Send mail?', help='Check this if you want to \
send an Email to Invited Person') send an Email to Invited Person')
@ -112,10 +112,10 @@ send an Email to Invited Person')
mail_to.append(datas['email']) mail_to.append(datas['email'])
elif type == 'partner': elif type == 'partner':
add_obj = self.pool.get('res.partner.address') add_obj = self.pool.get('res.partner')
for contact in add_obj.browse(cr, uid, datas['contact_ids']): for contact in add_obj.browse(cr, uid, datas['contact_ids']):
res = { res = {
'partner_address_id': contact.id, 'partner_id': contact.id,
'email': contact.email 'email': contact.email
} }
res.update(ref) res.update(ref)
@ -159,8 +159,8 @@ send an Email to Invited Person')
if not partner_id: if not partner_id:
return {'value': {'contact_ids': []}} return {'value': {'contact_ids': []}}
cr.execute('SELECT id FROM res_partner_address \ cr.execute('SELECT id FROM res_partner \
WHERE partner_id=%s', (partner_id,)) WHERE id=%s or parent_id =%s' , (partner_id,partner_id,))
contacts = map(lambda x: x[0], cr.fetchall()) contacts = map(lambda x: x[0], cr.fetchall())
return {'value': {'contact_ids': contacts}} return {'value': {'contact_ids': contacts}}

View File

@ -27,7 +27,7 @@
<field name="partner_id" colspan="2" on_change="onchange_partner_id(partner_id)" attrs="{'required': [('type', '=', 'partner')]}"/> <field name="partner_id" colspan="2" on_change="onchange_partner_id(partner_id)" attrs="{'required': [('type', '=', 'partner')]}"/>
<newline/> <newline/>
<separator string="Partner Contacts" colspan="6"/> <separator string="Partner Contacts" colspan="6"/>
<field name="contact_ids" select="1" colspan="4" nolabel="1" domain="[('partner_id', '=', partner_id)]" attrs="{'readonly': [('type', '!=', 'partner')]}"/> <field name="contact_ids" select="1" colspan="4" nolabel="1" domain="[('id', 'child_of', [partner_id])]" attrs="{'readonly': [('type', '!=', 'partner')]}"/>
</group> </group>
</page> </page>
</notebook> </notebook>

View File

@ -1,23 +0,0 @@
# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
# published by the Free Software Foundation, either version 3 of the
# License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
import base_contact

View File

@ -1,60 +0,0 @@
# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
# published by the Free Software Foundation, either version 3 of the
# License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
{
'name': 'Contacts Management',
'version': '1.0',
'category': 'Customer Relationship Management',
'complexity': "expert",
'description': """
This module allows you to manage your contacts
==============================================
It lets you define:
* contacts unrelated to a partner,
* contacts working at several addresses (possibly for different partners),
* contacts with possibly different functions for each of its job's addresses
It also adds new menu items located in
Purchases / Address Book / Contacts
Sales / Address Book / Contacts
Pay attention that this module converts the existing addresses into "addresses + contacts". It means that some fields of the addresses will be missing (like the contact name), since these are supposed to be defined in an other object.
""",
'author': 'OpenERP SA',
'website': 'http://www.openerp.com',
'depends': ['base','process'],
'init_xml': [],
'update_xml': [
'security/ir.model.access.csv',
'base_contact_view.xml',
'process/base_contact_process.xml'
],
'demo_xml': ['base_contact_demo.xml'],
'test': [
'test/base_contact00.yml',
],
'installable': True,
'auto_install': False,
'certificate': '0031287885469',
'images': ['images/base_contact1.jpeg','images/base_contact2.jpeg','images/base_contact3.jpeg'],
}
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

View File

@ -1,252 +0,0 @@
# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
# published by the Free Software Foundation, either version 3 of the
# License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
from osv import fields, osv
import addons
class res_partner_contact(osv.osv):
""" Partner Contact """
_name = "res.partner.contact"
_description = "Contact"
def _name_get_full(self, cr, uid, ids, prop, unknow_none, context=None):
result = {}
for rec in self.browse(cr, uid, ids, context=context):
result[rec.id] = rec.last_name+' '+(rec.first_name or '')
return result
_columns = {
'name': fields.function(_name_get_full, string='Name', size=64, type="char", store=True, select=True),
'last_name': fields.char('Last Name', size=64, required=True),
'first_name': fields.char('First Name', size=64),
'mobile': fields.char('Mobile', size=64),
'title': fields.many2one('res.partner.title','Title', domain=[('domain','=','contact')]),
'website': fields.char('Website', size=120),
'lang_id': fields.many2one('res.lang', 'Language'),
'job_ids': fields.one2many('res.partner.address', 'contact_id', 'Functions and Addresses'),
'country_id': fields.many2one('res.country','Nationality'),
'birthdate': fields.char('Birthdate', size=64),
'active': fields.boolean('Active', help="If the active field is set to False,\
it will allow you to hide the partner contact without removing it."),
'partner_id': fields.related('job_ids', 'partner_id', type='many2one',\
relation='res.partner', string='Main Employer'),
'function': fields.related('job_ids', 'function', type='char', \
string='Main Function'),
'email': fields.char('E-Mail', size=240),
'comment': fields.text('Notes', translate=True),
'photo': fields.binary('Photo'),
}
def _get_photo(self, cr, uid, context=None):
photo_path = addons.get_module_resource('base_contact', 'images', 'photo.png')
return open(photo_path, 'rb').read().encode('base64')
_defaults = {
'photo' : _get_photo,
'active' : lambda *a: True,
}
_order = "name"
def name_search(self, cr, uid, name='', args=None, operator='ilike', context=None, limit=None):
if not args:
args = []
if context is None:
context = {}
if name:
ids = self.search(cr, uid, ['|',('name', operator, name),('first_name', operator, name)] + args, limit=limit, context=context)
else:
ids = self.search(cr, uid, args, limit=limit, context=context)
return self.name_get(cr, uid, ids, context=context)
def name_get(self, cr, uid, ids, context=None):
result = {}
for obj in self.browse(cr, uid, ids, context=context):
result[obj.id] = obj.name or '/'
if obj.partner_id:
result[obj.id] = result[obj.id] + ', ' + obj.partner_id.name
return result.items()
def _auto_init(self, cr, context=None):
def table_exists(view_name):
cr.execute('SELECT count(relname) FROM pg_class WHERE relname = %s', (view_name,))
value = cr.fetchone()[0]
return bool(value == 1)
exists = table_exists(self._table)
super(res_partner_contact, self)._auto_init(cr, context)
if not exists:
cr.execute("""
INSERT INTO
res_partner_contact
(id,name,last_name,title,active,email,mobile,birthdate)
SELECT
id,COALESCE(name, '/'),COALESCE(name, '/'),title,true,email,mobile,birthdate
FROM
res_partner_address""")
cr.execute("alter table res_partner_address add contact_id int references res_partner_contact")
cr.execute("update res_partner_address set contact_id=id")
cr.execute("select setval('res_partner_contact_id_seq', (select max(id)+1 from res_partner_contact))")
res_partner_contact()
class res_partner_location(osv.osv):
_name = 'res.partner.location'
_rec_name = 'street'
_columns = {
'street': fields.char('Street', size=128),
'street2': fields.char('Street2', size=128),
'zip': fields.char('Zip', change_default=True, size=24),
'city': fields.char('City', size=128),
'state_id': fields.many2one("res.country.state", 'Fed. State', domain="[('country_id','=',country_id)]"),
'country_id': fields.many2one('res.country', 'Country'),
'company_id': fields.many2one('res.company', 'Company',select=1),
'job_ids': fields.one2many('res.partner.address', 'location_id', 'Contacts'),
'partner_id': fields.related('job_ids', 'partner_id', type='many2one',\
relation='res.partner', string='Main Partner'),
}
_defaults = {
'company_id': lambda s,cr,uid,c: s.pool.get('res.company')._company_default_get(cr, uid, 'res.partner.address', context=c),
}
def _auto_init(self, cr, context=None):
def table_exists(view_name):
cr.execute('SELECT count(relname) FROM pg_class WHERE relname = %s', (view_name,))
value = cr.fetchone()[0]
return bool(value == 1)
exists = table_exists(self._table)
super(res_partner_location, self)._auto_init(cr, context)
if not exists:
cr.execute("""
INSERT INTO
res_partner_location
(id,street,street2,zip,city,
state_id,country_id,company_id)
SELECT
id,street,street2,zip,city,
state_id,country_id,company_id
FROM
res_partner_address""")
cr.execute("alter table res_partner_address add location_id int references res_partner_location")
cr.execute("update res_partner_address set location_id=id")
cr.execute("select setval('res_partner_location_id_seq', (select max(id)+1 from res_partner_address))")
def name_get(self, cr, uid, ids, context=None):
result = {}
for obj in self.browse(cr, uid, ids, context=context):
res = []
if obj.partner_id: res.append(obj.partner_id.name_get()[0][1])
if obj.city: res.append(obj.city)
if obj.country_id: res.append(obj.country_id.name_get()[0][1])
result[obj.id] = ', '.join(res)
return result.items()
res_partner_location()
class res_partner_address(osv.osv):
_inherit = 'res.partner.address'
def _default_location_id(self, cr, uid, context=None):
if context is None:
context = {}
if not context.get('default_partner_id',False):
return False
ids = self.pool.get('res.partner.location').search(cr, uid, [('partner_id','=',context['default_partner_id'])], context=context)
return ids and ids[0] or False
def onchange_location_id(self,cr, uid, ids, location_id=False, context={}):
if not location_id:
return {}
location = self.pool.get('res.partner.location').browse(cr, uid, location_id, context=context)
return {'value':{
'street': location.street,
'street2': location.street2,
'zip': location.zip,
'city': location.city,
'country_id': location.country_id and location.country_id.id or False,
'state_id': location.state_id and location.state_id.id or False,
}}
_columns = {
'location_id' : fields.many2one('res.partner.location', 'Location'),
'contact_id' : fields.many2one('res.partner.contact', 'Contact'),
# fields from location
'street': fields.related('location_id', 'street', string='Street', type="char", store=True, size=128),
'street2': fields.related('location_id', 'street2', string='Street2', type="char", store=True, size=128),
'zip': fields.related('location_id', 'zip', string='Zip', type="char", store=True, change_default=True, size=24),
'city': fields.related('location_id', 'city', string='City', type="char", store=True, size=128),
'state_id': fields.related('location_id', 'state_id', relation="res.country.state", string='Fed. State', type="many2one", store=True, domain="[('country_id','=',country_id)]"),
'country_id': fields.related('location_id', 'country_id', type='many2one', string='Country', store=True, relation='res.country'),
'phone': fields.char('Phone', size=64),
'fax': fields.char('Fax', size=64),
'email': fields.char('E-Mail', size=240),
# fields from contact
'mobile' : fields.related('contact_id', 'mobile', type='char', size=64, string='Mobile'),
'name' : fields.related('contact_id', 'name', type='char', size=64, string="Contact Name", store=True),
'title' : fields.related('contact_id', 'title', type='many2one', relation='res.partner.title', string="Title", store=True),
}
def create(self, cr, uid, data, context={}):
if not data.get('location_id', False):
loc_id = self.pool.get('res.partner.location').create(cr, uid, {
'street': data.get('street',''),
'street2': data.get('street2',''),
'zip': data.get('zip',''),
'city': data.get('city',''),
'country_id': data.get('country_id',False),
'state_id': data.get('state_id',False)
}, context=context)
data['location_id'] = loc_id
result = super(res_partner_address, self).create(cr, uid, data, context=context)
return result
def name_get(self, cr, uid, ids, context=None):
result = {}
for rec in self.browse(cr,uid, ids, context=context):
res = []
if rec.partner_id:
res.append(rec.partner_id.name_get()[0][1])
if rec.contact_id and rec.contact_id.name:
res.append(rec.contact_id.name)
if rec.location_id:
if rec.location_id.city: res.append(rec.location_id.city)
if rec.location_id.country_id: res.append(rec.location_id.country_id.name_get()[0][1])
result[rec.id] = ', '.join(res)
return result.items()
_defaults = {
'location_id': _default_location_id
}
def default_get(self, cr, uid, fields=[], context=None):
if context is None:
context = {}
if 'default_type' in context:
del context['default_type']
return super(res_partner_address, self).default_get(cr, uid, fields, context)
res_partner_address()

View File

@ -1,279 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<record id="base.user_demo" model="res.users">
<field eval="[(4,ref('base.group_sale_salesman'))]" name="groups_id"/>
</record>
<!-- Create the contacts -->
<record id="res_partner_contact_mortier0" model="res.partner.contact">
<field name="first_name">Benoit</field>
<field name="last_name">Mortier</field>
<field name="title" ref="base.res_partner_title_sir"/>
</record>
<record id="res_partner_contact_jacot0" model="res.partner.contact">
<field name="first_name">Laurent</field>
<field name="last_name">Jacot</field>
<field ref="base.res_partner_title_sir" name="title"/>
</record>
<record id="res_partner_contact_passot0" model="res.partner.contact">
<field name="first_name">Thomas</field>
<field name="last_name">Passot</field>
<field ref="base.res_partner_title_sir" name="title"/>
</record>
<record id="res_partner_contact_lacarte0" model="res.partner.contact">
<field name="first_name">Etienne</field>
<field name="last_name">Lacarte</field>
</record>
<record id="res_partner_contact_tang0" model="res.partner.contact">
<field name="last_name">Tang</field>
</record>
<record id="res_partner_contact_wong0" model="res.partner.contact">
<field name="last_name">Wong</field>
</record>
<record id="res_partner_contact_lavente0" model="res.partner.contact">
<field name="first_name">Jean-Guy</field>
<field name="last_name">Lavente</field>
<field ref="base.res_partner_title_sir" name="title"/>
</record>
<record id="res_partner_contact_lelitre0" model="res.partner.contact">
<field name="first_name">Sylvie</field>
<field name="last_name">Lelitre</field>
<field ref="base.res_partner_title_sir" name="title"/>
</record>
<record id="res_partner_contact_grosbonnet0" model="res.partner.contact">
<field name="first_name">Arthur</field>
<field name="last_name">Grosbonnet</field>
<field ref="base.res_partner_title_sir" name="title"/>
</record>
<record id="res_partner_contact_lesbrouffe0" model="res.partner.contact">
<field name="first_name">Karine</field>
<field name="last_name">Lesbrouffe</field>
<field ref="base.res_partner_title_madam" name="title"/>
</record>
<record id="res_partner_contact_zen0" model="res.partner.contact">
<field name="last_name">Zen</field>
</record>
<record id="res_partner_contact_pinckears0" model="res.partner.contact">
<field name="website">http://fptiny.blogspot.com/</field>
<field name="first_name">Fabien</field>
<field name="last_name">Pinckaers</field>
<field ref="base.res_partner_title_sir" name="title"/>
</record>
<record id="res_partner_contact_debois0" model="res.partner.contact">
<field name="first_name">Marc</field>
<field name="last_name">Debois</field>
<field ref="base.res_partner_title_sir" name="title"/>
</record>
<record id="res_partner_contact_luu0" model="res.partner.contact">
<field name="first_name">Phuong</field>
<field name="last_name">Luu</field>
<field ref="base.res_partner_title_madam" name="title"/>
</record>
<record id="res_partner_contact_elkhayat0" model="res.partner.contact">
<field name="first_name">Najlaa</field>
<field name="last_name">Khayat</field>
<field ref="base.res_partner_title_madam" name="title"/>
</record>
<record id="res_partner_contact_depaoli0" model="res.partner.contact">
<field name="first_name">Quentin</field>
<field name="last_name">Paolino</field>
<field ref="base.res_partner_title_sir" name="title"/>
</record>
<record id="res_partner_contact_semal0" model="res.partner.contact">
<field name="first_name">Fabian</field>
<field name="last_name">W.</field>
<field ref="base.res_partner_title_sir" name="title"/>
</record>
<record id="res_partner_contact_vandewerve0" model="res.partner.contact">
<field name="first_name">Yvan</field>
<field name="last_name">Van</field>
<field ref="base.res_partner_title_sir" name="title"/>
</record>
<record id="res_partner_contact_lambotte0" model="res.partner.contact">
<field name="first_name">Henry</field>
<field name="last_name">Lambotte</field>
<field ref="base.res_partner_title_sir" name="title"/>
</record>
<record id="res_partner_contact_laurent0" model="res.partner.contact">
<field name="first_name">Olivier</field>
<field name="last_name">Laurent</field>
<field ref="base.res_partner_title_sir" name="title"/>
</record>
<record id="res_partner_contact_simonis0" model="res.partner.contact">
<field name="first_name">Christophe</field>
<field name="last_name">Dupont</field>
<field ref="base.res_partner_title_sir" name="title"/>
</record>
<record id="res_partner_contact_wirtel0" model="res.partner.contact">
<field name="first_name">Stéphane</field>
<field name="last_name">Andre</field>
<field ref="base.res_partner_title_sir" name="title"/>
</record>
<record id="res_partner_contact_mignon0" model="res.partner.contact">
<field name="first_name">Philippe</field>
<field name="last_name">Antoine</field>
<field ref="base.res_partner_title_sir" name="title"/>
</record>
<!-- Create the jobs -->
<!--
<record id="res_partner_job_0" model="res.partner.job">
<field name="address_id" ref="base.res_partner_address_1"/>
<field name="function">Salesman</field>
<field name="contact_id" ref="res_partner_contact_mortier0"/>
<field name="sequence_partner">2</field>
</record>
<record id="res_partner_job_1" model="res.partner.job">
<field name="address_id" ref="base.res_partner_address_2"/>
<field name="function">Salesman</field>
<field name="email">contact@tecsas.fr</field>
<field name="contact_id" ref="res_partner_contact_jacot0"/>
</record>
<record id="res_partner_job_2" model="res.partner.job">
<field name="address_id" ref="base.res_partner_address_3"/>
<field name="function">CTO</field>
<field name="email">info@mycompany.com</field>
<field name="contact_id" ref="res_partner_contact_passot0"/>
</record>
<record id="res_partner_job_3" model="res.partner.job">
<field name="address_id" ref="base.res_partner_address_tang"/>
<field name="function">Salesman</field>
<field name="contact_id" ref="res_partner_contact_tang0"/>
</record>
<record id="res_partner_job_4" model="res.partner.job">
<field name="address_id" ref="base.res_partner_address_wong"/>
<field name="function">Salesman</field>
<field name="contact_id" ref="res_partner_contact_wong0"/>
</record>
<record id="res_partner_job_5" model="res.partner.job">
<field name="address_id" ref="base.res_partner_address_6"/>
<field name="function">CEO</field>
<field name="contact_id" ref="res_partner_contact_lacarte0"/>
<field name="sequence_contact">1</field>
<field name="sequence_partner">0</field>
</record>
<record id="res_partner_job_6" model="res.partner.job">
<field name="address_id" ref="base.res_partner_address_7"/>
<field name="function">Salesman</field>
<field name="contact_id" ref="res_partner_contact_lavente0"/>
</record>
<record id="res_partner_job_7" model="res.partner.job">
<field name="address_id" ref="base.res_partner_address_8"/>
<field name="function">CTO</field>
<field name="contact_id" ref="res_partner_contact_lelitre0"/>
</record>
<record id="res_partner_job_8" model="res.partner.job">
<field name="address_id" ref="base.res_partner_address_9"/>
<field name="function">CEO</field>
<field name="contact_id" ref="res_partner_contact_grosbonnet0"/>
</record>
<record id="res_partner_job_9" model="res.partner.job">
<field name="address_id" ref="base.res_partner_address_10"/>
<field name="function">Salesman</field>
<field name="contact_id" ref="res_partner_contact_lesbrouffe0"/>
</record>
<record id="res_partner_job_10" model="res.partner.job">
<field name="address_id" ref="base.res_partner_address_zen"/>
<field name="function">CTO</field>
<field name="contact_id" ref="res_partner_contact_zen0"/>
</record>
<record id="res_partner_job_11" model="res.partner.job">
<field name="address_id" ref="base.main_address"/>
<field name="function">Salesman</field>
<field name="email">re@mycompany.com</field>
<field name="contact_id" ref="res_partner_contact_mignon0"/>
</record>
<record id="res_partner_job_12" model="res.partner.job">
<field name="address_id" ref="base.main_address"/>
<field name="function">CTO</field>
<field name="email">st@mycompany.com</field>
<field name="contact_id" ref="res_partner_contact_wirtel0"/>
</record>
<record id="res_partner_job_13" model="res.partner.job">
<field name="address_id" ref="base.main_address"/>
<field name="function">CTO</field>
<field name="email">ch@mycompany.com</field>
<field name="contact_id" ref="res_partner_contact_simonis0"/>
</record>
<record id="res_partner_job_14" model="res.partner.job">
<field name="address_id" ref="base.main_address"/>
<field name="function">CTO</field>
<field name="email">ol@mycompany.com</field>
<field name="contact_id" ref="res_partner_contact_laurent0"/>
</record>
<record id="res_partner_job_15" model="res.partner.job">
<field name="address_id" ref="base.main_address"/>
<field name="function">CTO</field>
<field name="email">fl@mycompany.com</field>
<field name="contact_id" ref="res_partner_contact_lambotte0"/>
</record>
<record id="res_partner_job_16" model="res.partner.job">
<field name="address_id" ref="base.main_address"/>
<field name="function">Salesman</field>
<field name="email">av@mycompany.com</field>
<field name="contact_id" ref="res_partner_contact_vandewerve0"/>
</record>
<record id="res_partner_job_17" model="res.partner.job">
<field name="address_id" ref="base.main_address"/>
<field name="function">CTO</field>
<field name="email">fb@mycompany.com</field>
<field name="contact_id" ref="res_partner_contact_semal0"/>
</record>
<record id="res_partner_job_18" model="res.partner.job">
<field name="address_id" ref="base.main_address"/>
<field name="function">CTO</field>
<field name="email">qd@mycompany.com</field>
<field name="contact_id" ref="res_partner_contact_depaoli0"/>
</record>
<record id="res_partner_job_19" model="res.partner.job">
<field name="address_id" ref="base.main_address"/>
<field name="function">CTO</field>
<field name="email">ne@mycompany.com</field>
<field name="contact_id" ref="res_partner_contact_elkhayat0"/>
</record>
<record id="res_partner_job_20" model="res.partner.job">
<field name="address_id" ref="base.main_address"/>
<field name="function">CTO</field>
<field name="email">ph@mycompany.com</field>
<field name="contact_id" ref="res_partner_contact_luu0"/>
</record>
<record id="res_partner_job_21" model="res.partner.job">
<field name="address_id" ref="base.main_address"/>
<field name="function">CEO</field>
<field name="email">fp@mycompany.com</field>
<field name="contact_id" ref="res_partner_contact_pinckears0"/>
<field name="sequence_partner">-1</field>
</record>
<record id="res_partner_job_22" model="res.partner.job">
<field name="address_id" ref="base.main_address"/>
<field name="function">Salesman</field>
<field name="email">cd@mycompany.com</field>
<field name="contact_id" ref="res_partner_contact_debois0"/>
</record>
<record id="res_partner_job_23" model="res.partner.job">
<field name="address_id" ref="res_partner_address_0"/>
<field name="contact_id" ref="res_partner_contact_mortier0"/>
<field name="sequence_contact">5</field>
<field name="function">PA</field>
</record>
<record id="res_partner_job_24" model="res.partner.job">
<field name="sequence_contact">1</field>
<field name="address_id" ref="res_partner_address_1"/>
<field name="contact_id" ref="res_partner_contact_lacarte0"/>
<field name="function">PA</field>
<field name="sequence_contact">5</field>
</record>
<record id="res_partner_job_25" model="res.partner.job">
<field name="sequence_contact">2</field>
<field name="address_id" ref="base.res_partner_address_1"/>
<field name="contact_id" ref="res_partner_contact_lacarte0"/>
<field name="function">CEO</field>
<field name="sequence_contact">1</field>
</record>
-->
</data>
</openerp>

View File

@ -1,197 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<!-- Views for Contacts Tree View -->
<record model="ir.ui.view" id="view_partner_contact_tree">
<field name="name">res.partner.contact.tree</field>
<field name="model">res.partner.contact</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Partner Contact">
<field name="name"/>
<field name="first_name"/>
<field name="mobile"/>
<field name="email"/>
<field name="lang_id"/>
<field name="partner_id"/>
<field name="function"/>
</tree>
</field>
</record>
<!-- Views for Contacts Form View -->
<record model="ir.ui.view" id="view_partner_contact_form">
<field name="name">res.partner.contact.form</field>
<field name="model">res.partner.contact</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Partner Contact">
<group colspan="4" col="6">
<field name="last_name" select="1"/>
<field name="first_name" select="1"/>
<field name="title" select="1" widget="selection" domain="[('domain', '=', 'contact')]" size="0"/>
</group>
<notebook colspan="4" >
<page string="General">
<group colspan="4" col="4">
<group colspan="2" col="4">
<separator string="Personal Information" colspan="4"/>
<field name="mobile"/>
<field name="email" widget="email"/>
<field name="website"/>
</group>
<group colspan="2" col="1">
<separator string="Photo" colspan="4"/>
<field name="photo" widget='image' nolabel="1"/>
</group>
</group>
<field name="job_ids" colspan="4" nolabel="1" mode="tree,form">
<form string="Functions and Addresses">
<field name="partner_id" />
<field name="location_id" domain="[('partner_id', '=', partner_id)]"/>
<field name="function" />
<separator string="Professional Info" colspan="4"/>
<field name="phone"/>
<field name="fax"/>
<field name="email" widget="email"/>
</form>
<tree string="Functions and Addresses">
<field name="location_id"/>
<field name="function"/>
<field name="phone"/>
<field name="email"/>
</tree>
</field>
</page>
<page string="Extra Information">
<field name="active"/>
<field name="lang_id" widget="selection"/>
<field name="partner_id" invisible="1" select="1"/>
<field name="function" invisible="1" />
<field name="country_id"/>
<field name="birthdate"/>
</page>
<page string="Notes">
<field name="comment" nolabel="1"/>
</page>
</notebook>
</form>
</field>
</record>
<!-- Views for Contacts Search View -->
<record model="ir.ui.view" id="view_partner_contact_search">
<field name="name">res.partner.contact.search</field>
<field name="model">res.partner.contact</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Partner Contact">
<field name="name" string="First/Lastname"
filter_domain="['|', ('first_name','ilike', self), ('last_name', 'ilike', self)]"/>
<field name="partner_id" string="Partner"/>
</search>
</field>
</record>
<!-- Views for Contacts Action -->
<record model="ir.actions.act_window" id="action_partner_contact_form">
<field name="name">Contacts</field>
<field name="res_model">res.partner.contact</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="view_id" ref="view_partner_contact_tree"/>
<field name="search_view_id" ref="view_partner_contact_search"/>
</record>
<menuitem name="Contacts" id="menu_partner_contact_form" action="action_partner_contact_form" parent = "base.menu_address_book" sequence="2"/>
<!-- Rename menuitem for partner addresses -->
<record model="ir.ui.menu" id="base.menu_partner_address_form">
<field name="name">Addresses</field>
</record>
<!--
Contacts for Suppliers
-->
<menuitem icon="terp-purchase" id="base.menu_purchase_root" name="Purchases"
sequence="3"/>
<menuitem id="base.menu_procurement_management_supplier" name="Address Book"
parent="base.menu_purchase_root" sequence="3"/>
<menuitem id="base.menu_procurement_management_supplier_name" name="Suppliers"
parent="base.menu_procurement_management_supplier" action="base.action_partner_supplier_form" sequence="1"/>
<menuitem name="Contacts" id="menu_purchases_partner_contact_form" action="action_partner_contact_form"
parent = "base.menu_procurement_management_supplier" sequence="2"/>
<!-- Views for Partners Form View -->
<record model="ir.ui.view" id="view_partner_form_inherit">
<field name="name">Partner form inherited</field>
<field name="model">res.partner</field>
<field name="inherit_id" ref="base.view_partner_form"/>
<field name="type">form</field>
<field name="arch" type="xml">
<separator string="Postal Address" position="after">
<field name="location_id" on_change="onchange_location_id(location_id)" domain="[('partner_id', '=', parent.id)]"/>
</separator>
<xpath expr="//field[@string='Contact Name']" position="replace">
<field name="contact_id"/>
</xpath>
<field name="title" position="replace"/>
</field>
</record>
<!-- Views for Addresses -->
<record model="ir.ui.view" id="view_partner_location_form">
<field name="name">res.partner.location.form</field>
<field name="model">res.partner.location</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Locations">
<field name="street" colspan="4"/>
<field name="street2" colspan="4"/>
<field name="zip"/>
<field name="city"/>
<field name="country_id" />
<field name="state_id"/>
</form>
</field>
</record>
<record model="ir.ui.view" id="view_partner_location_tree">
<field name="name">res.partner.location.tree</field>
<field name="model">res.partner.location</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Locations">
<field name="city"/>
<field name="country_id" />
<field name="state_id"/>
</tree>
</field>
</record>
<record model="ir.ui.view" id="view_partner_address_form_inherited0">
<field name='name'>res.partner.address.form.inherited0</field>
<field name='model'>res.partner.address</field>
<field name="inherit_id" ref="base.view_partner_address_form1"/>
<field name='type'>form</field>
<field name='arch' type='xml'>
<field name="name" position="replace">
<field name="contact_id"/>
</field>
<separator string="Postal Address" position="after">
<field name="location_id" on_change="onchange_location_id(location_id)"/>
</separator>
<field name="title" position="replace"/>
</field>
</record>
</data>
</openerp>

View File

@ -1,481 +0,0 @@
# Translation of OpenERP Server.
# This file contains the translation of the following modules:
# * base_contact
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.4\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-02-08 00:36+0000\n"
"PO-Revision-Date: 2012-02-12 19:38+0000\n"
"Last-Translator: amani ali <applepie9911@yahoo.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-02-13 04:49+0000\n"
"X-Generator: Launchpad (build 14781)\n"
#. module: base_contact
#: field:res.partner.location,city:0
msgid "City"
msgstr ""
#. module: base_contact
#: view:res.partner.contact:0
msgid "First/Lastname"
msgstr ""
#. module: base_contact
#: model:ir.actions.act_window,name:base_contact.action_partner_contact_form
#: model:ir.ui.menu,name:base_contact.menu_partner_contact_form
#: model:ir.ui.menu,name:base_contact.menu_purchases_partner_contact_form
#: model:process.node,name:base_contact.process_node_contacts0
#: field:res.partner.location,job_ids:0
msgid "Contacts"
msgstr "جهات الاتصال"
#. module: base_contact
#: view:res.partner.contact:0
msgid "Professional Info"
msgstr ""
#. module: base_contact
#: field:res.partner.contact,first_name:0
msgid "First Name"
msgstr "الاسم الأول"
#. module: base_contact
#: field:res.partner.address,location_id:0
msgid "Location"
msgstr ""
#. module: base_contact
#: model:process.transition,name:base_contact.process_transition_partnertoaddress0
msgid "Partner to address"
msgstr "شريك إلى عنوان"
#. module: base_contact
#: help:res.partner.contact,active:0
msgid ""
"If the active field is set to False, it will allow you to "
"hide the partner contact without removing it."
msgstr ""
"اذا كان وضع الحقل النشط خطأ, سيسمح لك بإخفاء اتصال الشريك بدون ازالته."
#. module: base_contact
#: field:res.partner.contact,website:0
msgid "Website"
msgstr "الموقع الإلكتروني"
#. module: base_contact
#: field:res.partner.location,zip:0
msgid "Zip"
msgstr ""
#. module: base_contact
#: field:res.partner.location,state_id:0
msgid "Fed. State"
msgstr ""
#. module: base_contact
#: field:res.partner.location,company_id:0
msgid "Company"
msgstr ""
#. module: base_contact
#: field:res.partner.contact,title:0
msgid "Title"
msgstr "اللقب"
#. module: base_contact
#: field:res.partner.location,partner_id:0
msgid "Main Partner"
msgstr ""
#. module: base_contact
#: model:process.process,name:base_contact.process_process_basecontactprocess0
msgid "Base Contact"
msgstr "جهة الاتصال الأساسية"
#. module: base_contact
#: field:res.partner.contact,email:0
msgid "E-Mail"
msgstr "البريد الإلكتروني"
#. module: base_contact
#: field:res.partner.contact,active:0
msgid "Active"
msgstr "نشِط"
#. module: base_contact
#: field:res.partner.contact,country_id:0
msgid "Nationality"
msgstr "الجنسية"
#. module: base_contact
#: view:res.partner:0
#: view:res.partner.address:0
msgid "Postal Address"
msgstr "العنوان البريدي"
#. module: base_contact
#: field:res.partner.contact,function:0
msgid "Main Function"
msgstr "المهمة الرئيسية"
#. module: base_contact
#: model:process.transition,note:base_contact.process_transition_partnertoaddress0
msgid "Define partners and their addresses."
msgstr "تعريف الشركاء وعناوينهم"
#. module: base_contact
#: field:res.partner.contact,name:0
msgid "Name"
msgstr "الاسم"
#. module: base_contact
#: field:res.partner.contact,lang_id:0
msgid "Language"
msgstr "اللغة"
#. module: base_contact
#: field:res.partner.contact,mobile:0
msgid "Mobile"
msgstr "الجوال"
#. module: base_contact
#: field:res.partner.location,country_id:0
msgid "Country"
msgstr ""
#. module: base_contact
#: view:res.partner.contact:0
#: field:res.partner.contact,comment:0
msgid "Notes"
msgstr "ملاحظات"
#. module: base_contact
#: model:process.node,note:base_contact.process_node_contacts0
msgid "People you work with."
msgstr "أشخاص تعمل معهم."
#. module: base_contact
#: view:res.partner.contact:0
msgid "Extra Information"
msgstr "معلومات إضافية"
#. module: base_contact
#: view:res.partner.contact:0
#: field:res.partner.contact,job_ids:0
msgid "Functions and Addresses"
msgstr "المهام والعناوين"
#. module: base_contact
#: model:ir.model,name:base_contact.model_res_partner_contact
#: field:res.partner.address,contact_id:0
msgid "Contact"
msgstr "جهة الاتصال"
#. module: base_contact
#: model:ir.model,name:base_contact.model_res_partner_location
msgid "res.partner.location"
msgstr ""
#. module: base_contact
#: model:process.node,note:base_contact.process_node_partners0
msgid "Companies you work with."
msgstr "الشركات التي تتعامل معها."
#. module: base_contact
#: field:res.partner.contact,partner_id:0
msgid "Main Employer"
msgstr "صاحب العمل الرئيسي"
#. module: base_contact
#: view:res.partner.contact:0
msgid "Partner Contact"
msgstr "جهة الاتصال بالشريك"
#. module: base_contact
#: model:process.node,name:base_contact.process_node_addresses0
msgid "Addresses"
msgstr "العناوين"
#. module: base_contact
#: model:process.node,note:base_contact.process_node_addresses0
msgid "Working and private addresses."
msgstr "عناوين العمل والعناوين الخاصة"
#. module: base_contact
#: field:res.partner.contact,last_name:0
msgid "Last Name"
msgstr "اسم العائلة"
#. module: base_contact
#: view:res.partner.contact:0
#: field:res.partner.contact,photo:0
msgid "Photo"
msgstr "صورة"
#. module: base_contact
#: view:res.partner.location:0
msgid "Locations"
msgstr ""
#. module: base_contact
#: view:res.partner.contact:0
msgid "General"
msgstr "عام"
#. module: base_contact
#: field:res.partner.location,street:0
msgid "Street"
msgstr ""
#. module: base_contact
#: view:res.partner.contact:0
msgid "Partner"
msgstr "الشريك"
#. module: base_contact
#: model:process.node,name:base_contact.process_node_partners0
msgid "Partners"
msgstr "الشركاء"
#. module: base_contact
#: model:ir.model,name:base_contact.model_res_partner_address
msgid "Partner Addresses"
msgstr "عناوين الشريك"
#. module: base_contact
#: field:res.partner.location,street2:0
msgid "Street2"
msgstr ""
#. module: base_contact
#: view:res.partner.contact:0
msgid "Personal Information"
msgstr ""
#. module: base_contact
#: field:res.partner.contact,birthdate:0
msgid "Birth Date"
msgstr "تاريخ الميلاد"
#~ msgid "Fax"
#~ msgstr "فاكس"
#~ msgid "# of Contacts"
#~ msgstr "عدد جهات الاتصال"
#~ msgid ""
#~ "You may enter Address first,Partner will be linked "
#~ "automatically if any."
#~ msgstr "يمكنك إدخال العنوان أولاً، وسيتمّ ربط الشريك تلقائياً إن وُجِد."
#~ msgid "Job FAX no."
#~ msgstr "فاكس العمل"
#~ msgid "Status of Address"
#~ msgstr "حالة العنوان"
#~ msgid "Start date of job(Joining Date)"
#~ msgstr "تاريخ الالتحاق بالوظيفة"
#~ msgid "Migrate"
#~ msgstr "نقل"
#~ msgid "Categories"
#~ msgstr "الفئات"
#~ msgid "Job Phone no."
#~ msgstr "هاتف العمل"
#~ msgid "Extension"
#~ msgstr "الامتداد"
#~ msgid "Job E-Mail"
#~ msgstr "البريد الإلكتروني للعمل"
#~ msgid "Image"
#~ msgstr "صورة"
#~ msgid "title"
#~ msgstr "الاسم"
#~ msgid "Select the Option for Addresses Migration"
#~ msgstr "حدد الخيار لنقل العناوين"
#~ msgid "Last date of job"
#~ msgstr "تاريخ ترك الوظيفة"
#~ msgid "Contact's Jobs"
#~ msgstr "الوظائف"
#~ msgid ""
#~ "Order of importance of this job title in the list of job "
#~ "title of the linked partner"
#~ msgstr ""
#~ "ترتيب المسمى الوظيفي هذا حسب الأهمية بين المسميات الوظيغية المستخدمة لدى "
#~ "الشريك"
#~ msgid "Internal/External extension phone number"
#~ msgstr "امتداد رقم الهاتف الداخلي/الخارجي"
#~ msgid "Date Stop"
#~ msgstr "تاريخ التوقف"
#~ msgid "Communication"
#~ msgstr "التواصل"
#~ msgid "Partner Seq."
#~ msgstr "رقم الشريك"
#~ msgid "Address which is linked to the Partner"
#~ msgstr "العنوان المرتبط بالشريك"
#~ msgid "Additional phone field"
#~ msgstr "حقل هاتف إضافي"
#~ msgid "Contact Seq."
#~ msgstr "رقم جهة الاتصال"
#~ msgid "Phone"
#~ msgstr "هاتف"
#~ msgid "Otherwise these details will not be visible from address/contact."
#~ msgstr "وإلا فلن تظهر هذه التفاصيل في العنوان/جهة الاتصال."
#~ msgid "base.contact.installer"
#~ msgstr "base.contact.installer"
#~ msgid "Configure"
#~ msgstr "ضبط الإعدادات"
#~ msgid "Seq."
#~ msgstr "رقم"
#~ msgid "If you select this, all addresses will be migrated."
#~ msgstr "إذا اخترت هذا الخيار، سيتم نقل جميع العناوين."
#~ msgid "Current"
#~ msgstr "الحالي"
#~ msgid "Main Job"
#~ msgstr "الوظيفة الرئيسية"
#~ msgid "Defines contacts and functions."
#~ msgstr "تعريف جهات الاتصال والمهام."
#~ msgid "Contact to function"
#~ msgstr "جهة اتصال إلى مهمة"
#~ msgid "Address"
#~ msgstr "العنوان"
#~ msgid "Other"
#~ msgstr "غير ذلك"
#~ msgid ""
#~ "Order of importance of this address in the list of "
#~ "addresses of the linked contact"
#~ msgstr "ترتيب هذا العنوان حسب الأهمية بين عناوين جهة الاتصال"
#~ msgid "Address Migration"
#~ msgstr "نقل العنوان"
#~ msgid "Date Start"
#~ msgstr "تاريخ البدء"
#~ msgid "Open Jobs"
#~ msgstr "الوظائف المفتوحة"
#~ msgid "You can migrate Partner's current addresses to the contact."
#~ msgstr "يمكنك نقل العناوين الحالية للشريك إلى جهة الاتصال"
#~ msgid "Define functions and address."
#~ msgstr "تعريف المهام والعنوان"
#~ msgid "Contact Partner Function"
#~ msgstr "مهمة الشريك"
#~ msgid "Partner Function"
#~ msgstr "مهمة الشريك"
#~ msgid "Contact Functions"
#~ msgstr "مهام جهة الاتصال"
#~ msgid "Function to address"
#~ msgstr "مهمة إلى عنوان"
#~ msgid ""
#~ "\n"
#~ " This module allows you to manage your contacts entirely.\n"
#~ "\n"
#~ " It lets you define\n"
#~ " *contacts unrelated to a partner,\n"
#~ " *contacts working at several addresses (possibly for different "
#~ "partners),\n"
#~ " *contacts with possibly different functions for each of its job's "
#~ "addresses\n"
#~ "\n"
#~ " It also adds new menu items located in\n"
#~ " Partners \\ Contacts\n"
#~ " Partners \\ Functions\n"
#~ "\n"
#~ " Pay attention that this module converts the existing addresses into "
#~ "\"addresses + contacts\". It means that some fields of the addresses will be "
#~ "missing (like the contact name), since these are supposed to be defined in "
#~ "an other object.\n"
#~ " "
#~ msgstr ""
#~ "\n"
#~ " تمكنك هذه الوحدة البرمجية من إدارة جهات الاتصال بشكل كامل.\n"
#~ " فهي تسمح لك بـتعرف:\n"
#~ " * جهات اتصال غير ذات صلة بشريك،\n"
#~ " * جهات اتصال ذات عناوين عمل متعددة (ربما لارتباطها بشركاء مختلفين)،\n"
#~ " * جهات اتصال ذات مهام مختلفة لكل عنوان من عناوين وظائفها\n"
#~ "\n"
#~ " كذلك تضيف هذه الوحدة البرمجية عناصر جديدة إلى القائمة تحت\n"
#~ " الشركاء / جهات الاتصال\n"
#~ " الشركاء / المهام\n"
#~ "\n"
#~ " تنبه إلى أن هذه الوحدة البرمجية تقوم بتحويل العناوين الموجودة مسبقاً إلى "
#~ "\"عناوين\" و \"جهات اتصال\"، مما يعني أن بعض حقول العناوين سيتم حذفها (مثل "
#~ "اسم جهة الاتصال) لأنه من المفترض أن يتم تعريفها في كائن آخر.\n"
#~ " "
#~ msgid "Function of this contact with this partner"
#~ msgstr "مهمة جهة الاتصال هذه عند هذا الشريك"
#~ msgid "Function"
#~ msgstr "المهمة"
#~ msgid "Search Contact"
#~ msgstr "بحث جهة الإتصال"
#~ msgid "State"
#~ msgstr "المحافظة"
#~ msgid "Configuration Progress"
#~ msgstr "سير الإعدادات"
#~ msgid ""
#~ "Due to changes in Address and Partner's relation, some of the details from "
#~ "address are needed to be migrated into contact information."
#~ msgstr ""
#~ "نتيجة للتغيرات في العنوان، وعلاقة الشريك, سيكون هناك الحاجة الى ترحيل بعض "
#~ "التفاصيل من العنوان الى معلومات الاتصال."
#~ msgid "Jobs at a same partner address."
#~ msgstr "الوظائف عند نفس عنوان الشريك."
#~ msgid "Past"
#~ msgstr "سابق"
#~ msgid "Do you want to migrate your Address data in Contact Data?"
#~ msgstr "هل تريد ترحيل بيانات عنوانك الى بيانات الاتصال؟"
#~ msgid "Address's Migration to Contacts"
#~ msgstr "ترحيل العنوان الى جهات الاتصالات"

View File

@ -1,261 +0,0 @@
# Translation of OpenERP Server.
# This file contains the translation of the following modules:
# * base_contact
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.1rc1\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2012-02-08 00:36+0000\n"
"PO-Revision-Date: 2012-02-08 00:36+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: \n"
"Plural-Forms: \n"
#. module: base_contact
#: field:res.partner.location,city:0
msgid "City"
msgstr ""
#. module: base_contact
#: view:res.partner.contact:0
msgid "First/Lastname"
msgstr ""
#. module: base_contact
#: model:ir.actions.act_window,name:base_contact.action_partner_contact_form
#: model:ir.ui.menu,name:base_contact.menu_partner_contact_form
#: model:ir.ui.menu,name:base_contact.menu_purchases_partner_contact_form
#: model:process.node,name:base_contact.process_node_contacts0
#: field:res.partner.location,job_ids:0
msgid "Contacts"
msgstr ""
#. module: base_contact
#: view:res.partner.contact:0
msgid "Professional Info"
msgstr ""
#. module: base_contact
#: field:res.partner.contact,first_name:0
msgid "First Name"
msgstr ""
#. module: base_contact
#: field:res.partner.address,location_id:0
msgid "Location"
msgstr ""
#. module: base_contact
#: model:process.transition,name:base_contact.process_transition_partnertoaddress0
msgid "Partner to address"
msgstr ""
#. module: base_contact
#: help:res.partner.contact,active:0
msgid "If the active field is set to False, it will allow you to hide the partner contact without removing it."
msgstr ""
#. module: base_contact
#: field:res.partner.contact,website:0
msgid "Website"
msgstr ""
#. module: base_contact
#: field:res.partner.location,zip:0
msgid "Zip"
msgstr ""
#. module: base_contact
#: field:res.partner.location,state_id:0
msgid "Fed. State"
msgstr ""
#. module: base_contact
#: field:res.partner.location,company_id:0
msgid "Company"
msgstr ""
#. module: base_contact
#: field:res.partner.contact,title:0
msgid "Title"
msgstr ""
#. module: base_contact
#: field:res.partner.location,partner_id:0
msgid "Main Partner"
msgstr ""
#. module: base_contact
#: model:process.process,name:base_contact.process_process_basecontactprocess0
msgid "Base Contact"
msgstr ""
#. module: base_contact
#: field:res.partner.contact,email:0
msgid "E-Mail"
msgstr ""
#. module: base_contact
#: field:res.partner.contact,active:0
msgid "Active"
msgstr ""
#. module: base_contact
#: field:res.partner.contact,country_id:0
msgid "Nationality"
msgstr ""
#. module: base_contact
#: view:res.partner:0
#: view:res.partner.address:0
msgid "Postal Address"
msgstr ""
#. module: base_contact
#: field:res.partner.contact,function:0
msgid "Main Function"
msgstr ""
#. module: base_contact
#: model:process.transition,note:base_contact.process_transition_partnertoaddress0
msgid "Define partners and their addresses."
msgstr ""
#. module: base_contact
#: field:res.partner.contact,name:0
msgid "Name"
msgstr ""
#. module: base_contact
#: field:res.partner.contact,lang_id:0
msgid "Language"
msgstr ""
#. module: base_contact
#: field:res.partner.contact,mobile:0
msgid "Mobile"
msgstr ""
#. module: base_contact
#: field:res.partner.location,country_id:0
msgid "Country"
msgstr ""
#. module: base_contact
#: view:res.partner.contact:0
#: field:res.partner.contact,comment:0
msgid "Notes"
msgstr ""
#. module: base_contact
#: model:process.node,note:base_contact.process_node_contacts0
msgid "People you work with."
msgstr ""
#. module: base_contact
#: view:res.partner.contact:0
msgid "Extra Information"
msgstr ""
#. module: base_contact
#: view:res.partner.contact:0
#: field:res.partner.contact,job_ids:0
msgid "Functions and Addresses"
msgstr ""
#. module: base_contact
#: model:ir.model,name:base_contact.model_res_partner_contact
#: field:res.partner.address,contact_id:0
msgid "Contact"
msgstr ""
#. module: base_contact
#: model:ir.model,name:base_contact.model_res_partner_location
msgid "res.partner.location"
msgstr ""
#. module: base_contact
#: model:process.node,note:base_contact.process_node_partners0
msgid "Companies you work with."
msgstr ""
#. module: base_contact
#: field:res.partner.contact,partner_id:0
msgid "Main Employer"
msgstr ""
#. module: base_contact
#: view:res.partner.contact:0
msgid "Partner Contact"
msgstr ""
#. module: base_contact
#: model:process.node,name:base_contact.process_node_addresses0
msgid "Addresses"
msgstr ""
#. module: base_contact
#: model:process.node,note:base_contact.process_node_addresses0
msgid "Working and private addresses."
msgstr ""
#. module: base_contact
#: field:res.partner.contact,last_name:0
msgid "Last Name"
msgstr ""
#. module: base_contact
#: view:res.partner.contact:0
#: field:res.partner.contact,photo:0
msgid "Photo"
msgstr ""
#. module: base_contact
#: view:res.partner.location:0
msgid "Locations"
msgstr ""
#. module: base_contact
#: view:res.partner.contact:0
msgid "General"
msgstr ""
#. module: base_contact
#: field:res.partner.location,street:0
msgid "Street"
msgstr ""
#. module: base_contact
#: view:res.partner.contact:0
msgid "Partner"
msgstr ""
#. module: base_contact
#: model:process.node,name:base_contact.process_node_partners0
msgid "Partners"
msgstr ""
#. module: base_contact
#: model:ir.model,name:base_contact.model_res_partner_address
msgid "Partner Addresses"
msgstr ""
#. module: base_contact
#: field:res.partner.location,street2:0
msgid "Street2"
msgstr ""
#. module: base_contact
#: view:res.partner.contact:0
msgid "Personal Information"
msgstr ""
#. module: base_contact
#: field:res.partner.contact,birthdate:0
msgid "Birth Date"
msgstr ""

View File

@ -1,504 +0,0 @@
# Translation of OpenERP Server.
# This file contains the translation of the following modules:
# * base_contact
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-02-08 00:36+0000\n"
"PO-Revision-Date: 2010-08-03 00:57+0000\n"
"Last-Translator: Boris <boris.t.ivanov@gmail.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-02-09 06:14+0000\n"
"X-Generator: Launchpad (build 14763)\n"
#. module: base_contact
#: field:res.partner.location,city:0
msgid "City"
msgstr ""
#. module: base_contact
#: view:res.partner.contact:0
msgid "First/Lastname"
msgstr ""
#. module: base_contact
#: model:ir.actions.act_window,name:base_contact.action_partner_contact_form
#: model:ir.ui.menu,name:base_contact.menu_partner_contact_form
#: model:ir.ui.menu,name:base_contact.menu_purchases_partner_contact_form
#: model:process.node,name:base_contact.process_node_contacts0
#: field:res.partner.location,job_ids:0
msgid "Contacts"
msgstr "Контакти"
#. module: base_contact
#: view:res.partner.contact:0
msgid "Professional Info"
msgstr ""
#. module: base_contact
#: field:res.partner.contact,first_name:0
msgid "First Name"
msgstr "Собствено Име"
#. module: base_contact
#: field:res.partner.address,location_id:0
msgid "Location"
msgstr ""
#. module: base_contact
#: model:process.transition,name:base_contact.process_transition_partnertoaddress0
msgid "Partner to address"
msgstr "Партньор на адрес"
#. module: base_contact
#: help:res.partner.contact,active:0
msgid ""
"If the active field is set to False, it will allow you to "
"hide the partner contact without removing it."
msgstr ""
"Ако полето е настроено на невярно, то се скрива връзка с партньор, без да я "
"премахва."
#. module: base_contact
#: field:res.partner.contact,website:0
msgid "Website"
msgstr "Уеб сайт"
#. module: base_contact
#: field:res.partner.location,zip:0
msgid "Zip"
msgstr ""
#. module: base_contact
#: field:res.partner.location,state_id:0
msgid "Fed. State"
msgstr ""
#. module: base_contact
#: field:res.partner.location,company_id:0
msgid "Company"
msgstr ""
#. module: base_contact
#: field:res.partner.contact,title:0
msgid "Title"
msgstr "Обръщение"
#. module: base_contact
#: field:res.partner.location,partner_id:0
msgid "Main Partner"
msgstr ""
#. module: base_contact
#: model:process.process,name:base_contact.process_process_basecontactprocess0
msgid "Base Contact"
msgstr "База контакт"
#. module: base_contact
#: field:res.partner.contact,email:0
msgid "E-Mail"
msgstr "Имейл"
#. module: base_contact
#: field:res.partner.contact,active:0
msgid "Active"
msgstr "Активен"
#. module: base_contact
#: field:res.partner.contact,country_id:0
msgid "Nationality"
msgstr "Националност"
#. module: base_contact
#: view:res.partner:0
#: view:res.partner.address:0
msgid "Postal Address"
msgstr "Пощенски адрес"
#. module: base_contact
#: field:res.partner.contact,function:0
msgid "Main Function"
msgstr "Основна длъжност"
#. module: base_contact
#: model:process.transition,note:base_contact.process_transition_partnertoaddress0
msgid "Define partners and their addresses."
msgstr "Задаване на партньори и техните адреси."
#. module: base_contact
#: field:res.partner.contact,name:0
msgid "Name"
msgstr "Име"
#. module: base_contact
#: field:res.partner.contact,lang_id:0
msgid "Language"
msgstr "Език"
#. module: base_contact
#: field:res.partner.contact,mobile:0
msgid "Mobile"
msgstr "Мобилен"
#. module: base_contact
#: field:res.partner.location,country_id:0
msgid "Country"
msgstr ""
#. module: base_contact
#: view:res.partner.contact:0
#: field:res.partner.contact,comment:0
msgid "Notes"
msgstr "Бележки"
#. module: base_contact
#: model:process.node,note:base_contact.process_node_contacts0
msgid "People you work with."
msgstr "Хора, с които работите"
#. module: base_contact
#: view:res.partner.contact:0
msgid "Extra Information"
msgstr "Допълнителна информация"
#. module: base_contact
#: view:res.partner.contact:0
#: field:res.partner.contact,job_ids:0
msgid "Functions and Addresses"
msgstr "Длъжности и адреси"
#. module: base_contact
#: model:ir.model,name:base_contact.model_res_partner_contact
#: field:res.partner.address,contact_id:0
msgid "Contact"
msgstr "Контакт"
#. module: base_contact
#: model:ir.model,name:base_contact.model_res_partner_location
msgid "res.partner.location"
msgstr ""
#. module: base_contact
#: model:process.node,note:base_contact.process_node_partners0
msgid "Companies you work with."
msgstr "Фирми с които работите."
#. module: base_contact
#: field:res.partner.contact,partner_id:0
msgid "Main Employer"
msgstr "Основен работодател"
#. module: base_contact
#: view:res.partner.contact:0
msgid "Partner Contact"
msgstr "Контакт на партньор"
#. module: base_contact
#: model:process.node,name:base_contact.process_node_addresses0
msgid "Addresses"
msgstr "Адреси"
#. module: base_contact
#: model:process.node,note:base_contact.process_node_addresses0
msgid "Working and private addresses."
msgstr "Работни и домашни адреси"
#. module: base_contact
#: field:res.partner.contact,last_name:0
msgid "Last Name"
msgstr "Фамилия"
#. module: base_contact
#: view:res.partner.contact:0
#: field:res.partner.contact,photo:0
msgid "Photo"
msgstr "Снимка"
#. module: base_contact
#: view:res.partner.location:0
msgid "Locations"
msgstr ""
#. module: base_contact
#: view:res.partner.contact:0
msgid "General"
msgstr "Общ"
#. module: base_contact
#: field:res.partner.location,street:0
msgid "Street"
msgstr ""
#. module: base_contact
#: view:res.partner.contact:0
msgid "Partner"
msgstr "Партньор"
#. module: base_contact
#: model:process.node,name:base_contact.process_node_partners0
msgid "Partners"
msgstr "Партньори"
#. module: base_contact
#: model:ir.model,name:base_contact.model_res_partner_address
msgid "Partner Addresses"
msgstr "Адрес на партньора"
#. module: base_contact
#: field:res.partner.location,street2:0
msgid "Street2"
msgstr ""
#. module: base_contact
#: view:res.partner.contact:0
msgid "Personal Information"
msgstr ""
#. module: base_contact
#: field:res.partner.contact,birthdate:0
msgid "Birth Date"
msgstr "Дата на раждане"
#~ msgid "# of Contacts"
#~ msgstr "# контакти"
#~ msgid "res.partner.contact"
#~ msgstr "res.partner.contact"
#~ msgid ""
#~ "The Object name must start with x_ and not contain any special character !"
#~ msgstr ""
#~ "Името на обекта трябва да започва с \"x_\" и да не съдържа никакви специални "
#~ "символи!"
#~ msgid "Phone"
#~ msgstr "Телефон"
#~ msgid "Address"
#~ msgstr "Адрес"
#~ msgid "Categories"
#~ msgstr "Категории"
#~ msgid "Invalid XML for View Architecture!"
#~ msgstr "Невалиден XML за преглед на архитектурата"
#~ msgid "General Information"
#~ msgstr "Обща информация"
#~ msgid "Current"
#~ msgstr "Текущ"
#~ msgid "Other"
#~ msgstr "Друго"
#~ msgid "Start date of job(Joining Date)"
#~ msgstr "Дата на постъпване на работа"
#~ msgid "Fax"
#~ msgstr "Факс"
#~ msgid "State"
#~ msgstr "Област"
#~ msgid "Last date of job"
#~ msgstr "Последен работен ден"
#~ msgid "Job Phone no."
#~ msgstr "Служебен тел. номер"
#~ msgid "Job E-Mail"
#~ msgstr "Служебен имейл"
#~ msgid "Image"
#~ msgstr "Изображение"
#~ msgid "Communication"
#~ msgstr "Комуникация"
#~ msgid "Past"
#~ msgstr "Предишен"
#~ msgid "Search Contact"
#~ msgstr "Търсене на контакт"
#~ msgid "Additional phone field"
#~ msgstr "Допълнително поле за телефон"
#~ msgid "Configure"
#~ msgstr "Настройване"
#~ msgid "Main Job"
#~ msgstr "Основна работа"
#~ msgid "Date Start"
#~ msgstr "Начална дата"
#~ msgid ""
#~ "You may enter Address first,Partner will be linked "
#~ "automatically if any."
#~ msgstr ""
#~ "Може първо да въведете адрес, ако има партньор, ще бъде добавен автоматично."
#~ msgid "Job FAX no."
#~ msgstr "Служ. факс"
#~ msgid "Status of Address"
#~ msgstr "Състояние на адрес"
#~ msgid "title"
#~ msgstr "обръщение"
#~ msgid "Select the Option for Addresses Migration"
#~ msgstr "Изберете опция за мигриране на адреси"
#~ msgid "Migrate"
#~ msgstr "Мигриране"
#~ msgid "Jobs at a same partner address."
#~ msgstr "Длъжности на същия партньорски адрес"
#~ msgid ""
#~ "Order of importance of this job title in the list of job "
#~ "title of the linked partner"
#~ msgstr ""
#~ "Определение на значението на тази длъжност в списъка на длъжността на "
#~ "свързан партньор"
#~ msgid "Date Stop"
#~ msgstr "Дата на спиране"
#~ msgid "Internal/External extension phone number"
#~ msgstr "Вътрешни / Външни допълнителни телефонни номера"
#~ msgid "Contact's Jobs"
#~ msgstr "Контакти на работни места"
#~ msgid "Extension"
#~ msgstr "Разширение"
#~ msgid "Configuration Progress"
#~ msgstr "Прогрес на настройките"
#~ msgid "Function to address"
#~ msgstr "Длъжност за адрес"
#~ msgid "Function of this contact with this partner"
#~ msgstr "Длъжностна контакта при този партньор"
#~ msgid "Define functions and address."
#~ msgstr "Определяне на длъжност и адрес"
#~ msgid ""
#~ "\n"
#~ " This module allows you to manage your contacts entirely.\n"
#~ "\n"
#~ " It lets you define\n"
#~ " *contacts unrelated to a partner,\n"
#~ " *contacts working at several addresses (possibly for different "
#~ "partners),\n"
#~ " *contacts with possibly different functions for each of its job's "
#~ "addresses\n"
#~ "\n"
#~ " It also adds new menu items located in\n"
#~ " Partners \\ Contacts\n"
#~ " Partners \\ Functions\n"
#~ "\n"
#~ " Pay attention that this module converts the existing addresses into "
#~ "\"addresses + contacts\". It means that some fields of the addresses will be "
#~ "missing (like the contact name), since these are supposed to be defined in "
#~ "an other object.\n"
#~ " "
#~ msgstr ""
#~ "\n"
#~ " Този модул ви позволява да управлявате контактите си напълно.\n"
#~ "\n"
#~ "Позволява да определит:\n"
#~ "* контактите не са свързани с партньор,\n"
#~ "* контакти, работещи в няколко адреса (вероятно за различнит партньори),\n"
#~ "* контакти с възможно различни длъности за всеки един от адресите си на "
#~ "работа\n"
#~ "\n"
#~ "Той също така добавя нови елементи от менюто, разположени в\n"
#~ "Партньори \\ Контакти\n"
#~ "Партньори \\ Длъжности\n"
#~ "\n"
#~ "Обърнете внимание, че този модул преобразува съществуващите адреси в "
#~ "\"адреси + контакти \". Това означава, че някои области от адресите ще "
#~ "липсват (като името на контакта), тъй като те се очаква да бъдат определени "
#~ "в един друг обект.\n"
#~ " "
#~ msgid "Address which is linked to the Partner"
#~ msgstr "Адрес, свързан с партньора"
#~ msgid ""
#~ "Due to changes in Address and Partner's relation, some of the details from "
#~ "address are needed to be migrated into contact information."
#~ msgstr ""
#~ "Поради промени във връзката Адрес и Партньори, някои от данните от адреса е "
#~ "необходими за да себъдат прехвърлени в контакт."
#~ msgid "Partner Function"
#~ msgstr "Длъжност на партньора"
#~ msgid "Address's Migration to Contacts"
#~ msgstr "Адрес на преселване за контакти"
#~ msgid "Contact Functions"
#~ msgstr "Длъжност на контакта"
#~ msgid "Do you want to migrate your Address data in Contact Data?"
#~ msgstr "Искате ли да преместите адресните данни в данни за контакт?"
#~ msgid "Otherwise these details will not be visible from address/contact."
#~ msgstr ""
#~ "В противен случай тези данни няма да бъдат видими чрез адрес / контакт."
#~ msgid "base.contact.installer"
#~ msgstr "base.contact.installer"
#~ msgid "Seq."
#~ msgstr "Посл."
#~ msgid "If you select this, all addresses will be migrated."
#~ msgstr "Ако изберете това, всички адреси ще се прехвърлят."
#~ msgid "Defines contacts and functions."
#~ msgstr "Определяне на контакти и длъности"
#~ msgid "Contact Partner Function"
#~ msgstr "Длъжност на контакта в партньора"
#~ msgid "Contact to function"
#~ msgstr "Контакт за длъжност"
#~ msgid "Function"
#~ msgstr "Длъжност"
#~ msgid ""
#~ "Order of importance of this address in the list of "
#~ "addresses of the linked contact"
#~ msgstr ""
#~ "Определение на значението на този адрес в списъка с адреси на свързаните "
#~ "контакти"
#~ msgid "Address Migration"
#~ msgstr "Адрес на преместване"
#~ msgid "Open Jobs"
#~ msgstr "Отворете работни мяста"
#~ msgid "You can migrate Partner's current addresses to the contact."
#~ msgstr "Можете да преместите адреса на партньора за контакта."
#~ msgid "Partner Seq."
#~ msgstr "Партньор последов."
#~ msgid "Contact Seq."
#~ msgstr "Кантакт последов."

View File

@ -1,266 +0,0 @@
# Translation of OpenERP Server.
# This file contains the translation of the following modules:
# * base_contact
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.4\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-02-08 00:36+0000\n"
"PO-Revision-Date: 2009-02-03 17:43+0000\n"
"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-02-09 06:14+0000\n"
"X-Generator: Launchpad (build 14763)\n"
#. module: base_contact
#: field:res.partner.location,city:0
msgid "City"
msgstr ""
#. module: base_contact
#: view:res.partner.contact:0
msgid "First/Lastname"
msgstr ""
#. module: base_contact
#: model:ir.actions.act_window,name:base_contact.action_partner_contact_form
#: model:ir.ui.menu,name:base_contact.menu_partner_contact_form
#: model:ir.ui.menu,name:base_contact.menu_purchases_partner_contact_form
#: model:process.node,name:base_contact.process_node_contacts0
#: field:res.partner.location,job_ids:0
msgid "Contacts"
msgstr ""
#. module: base_contact
#: view:res.partner.contact:0
msgid "Professional Info"
msgstr ""
#. module: base_contact
#: field:res.partner.contact,first_name:0
msgid "First Name"
msgstr ""
#. module: base_contact
#: field:res.partner.address,location_id:0
msgid "Location"
msgstr ""
#. module: base_contact
#: model:process.transition,name:base_contact.process_transition_partnertoaddress0
msgid "Partner to address"
msgstr ""
#. module: base_contact
#: help:res.partner.contact,active:0
msgid ""
"If the active field is set to False, it will allow you to "
"hide the partner contact without removing it."
msgstr ""
#. module: base_contact
#: field:res.partner.contact,website:0
msgid "Website"
msgstr ""
#. module: base_contact
#: field:res.partner.location,zip:0
msgid "Zip"
msgstr ""
#. module: base_contact
#: field:res.partner.location,state_id:0
msgid "Fed. State"
msgstr ""
#. module: base_contact
#: field:res.partner.location,company_id:0
msgid "Company"
msgstr ""
#. module: base_contact
#: field:res.partner.contact,title:0
msgid "Title"
msgstr ""
#. module: base_contact
#: field:res.partner.location,partner_id:0
msgid "Main Partner"
msgstr ""
#. module: base_contact
#: model:process.process,name:base_contact.process_process_basecontactprocess0
msgid "Base Contact"
msgstr ""
#. module: base_contact
#: field:res.partner.contact,email:0
msgid "E-Mail"
msgstr ""
#. module: base_contact
#: field:res.partner.contact,active:0
msgid "Active"
msgstr ""
#. module: base_contact
#: field:res.partner.contact,country_id:0
msgid "Nationality"
msgstr ""
#. module: base_contact
#: view:res.partner:0
#: view:res.partner.address:0
msgid "Postal Address"
msgstr ""
#. module: base_contact
#: field:res.partner.contact,function:0
msgid "Main Function"
msgstr ""
#. module: base_contact
#: model:process.transition,note:base_contact.process_transition_partnertoaddress0
msgid "Define partners and their addresses."
msgstr ""
#. module: base_contact
#: field:res.partner.contact,name:0
msgid "Name"
msgstr ""
#. module: base_contact
#: field:res.partner.contact,lang_id:0
msgid "Language"
msgstr ""
#. module: base_contact
#: field:res.partner.contact,mobile:0
msgid "Mobile"
msgstr ""
#. module: base_contact
#: field:res.partner.location,country_id:0
msgid "Country"
msgstr ""
#. module: base_contact
#: view:res.partner.contact:0
#: field:res.partner.contact,comment:0
msgid "Notes"
msgstr ""
#. module: base_contact
#: model:process.node,note:base_contact.process_node_contacts0
msgid "People you work with."
msgstr ""
#. module: base_contact
#: view:res.partner.contact:0
msgid "Extra Information"
msgstr ""
#. module: base_contact
#: view:res.partner.contact:0
#: field:res.partner.contact,job_ids:0
msgid "Functions and Addresses"
msgstr ""
#. module: base_contact
#: model:ir.model,name:base_contact.model_res_partner_contact
#: field:res.partner.address,contact_id:0
msgid "Contact"
msgstr ""
#. module: base_contact
#: model:ir.model,name:base_contact.model_res_partner_location
msgid "res.partner.location"
msgstr ""
#. module: base_contact
#: model:process.node,note:base_contact.process_node_partners0
msgid "Companies you work with."
msgstr ""
#. module: base_contact
#: field:res.partner.contact,partner_id:0
msgid "Main Employer"
msgstr ""
#. module: base_contact
#: view:res.partner.contact:0
msgid "Partner Contact"
msgstr ""
#. module: base_contact
#: model:process.node,name:base_contact.process_node_addresses0
msgid "Addresses"
msgstr ""
#. module: base_contact
#: model:process.node,note:base_contact.process_node_addresses0
msgid "Working and private addresses."
msgstr ""
#. module: base_contact
#: field:res.partner.contact,last_name:0
msgid "Last Name"
msgstr ""
#. module: base_contact
#: view:res.partner.contact:0
#: field:res.partner.contact,photo:0
msgid "Photo"
msgstr ""
#. module: base_contact
#: view:res.partner.location:0
msgid "Locations"
msgstr ""
#. module: base_contact
#: view:res.partner.contact:0
msgid "General"
msgstr ""
#. module: base_contact
#: field:res.partner.location,street:0
msgid "Street"
msgstr ""
#. module: base_contact
#: view:res.partner.contact:0
msgid "Partner"
msgstr ""
#. module: base_contact
#: model:process.node,name:base_contact.process_node_partners0
msgid "Partners"
msgstr ""
#. module: base_contact
#: model:ir.model,name:base_contact.model_res_partner_address
msgid "Partner Addresses"
msgstr ""
#. module: base_contact
#: field:res.partner.location,street2:0
msgid "Street2"
msgstr ""
#. module: base_contact
#: view:res.partner.contact:0
msgid "Personal Information"
msgstr ""
#. module: base_contact
#: field:res.partner.contact,birthdate:0
msgid "Birth Date"
msgstr ""
#~ msgid "Invalid XML for View Architecture!"
#~ msgstr "Neodgovarajući XML za arhitekturu prikaza!"

View File

@ -1,528 +0,0 @@
# Translation of OpenERP Server.
# This file contains the translation of the following modules:
# * base_contact
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-02-08 00:36+0000\n"
"PO-Revision-Date: 2010-08-03 00:58+0000\n"
"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-02-09 06:14+0000\n"
"X-Generator: Launchpad (build 14763)\n"
#. module: base_contact
#: field:res.partner.location,city:0
msgid "City"
msgstr ""
#. module: base_contact
#: view:res.partner.contact:0
msgid "First/Lastname"
msgstr ""
#. module: base_contact
#: model:ir.actions.act_window,name:base_contact.action_partner_contact_form
#: model:ir.ui.menu,name:base_contact.menu_partner_contact_form
#: model:ir.ui.menu,name:base_contact.menu_purchases_partner_contact_form
#: model:process.node,name:base_contact.process_node_contacts0
#: field:res.partner.location,job_ids:0
msgid "Contacts"
msgstr "Contactes"
#. module: base_contact
#: view:res.partner.contact:0
msgid "Professional Info"
msgstr ""
#. module: base_contact
#: field:res.partner.contact,first_name:0
msgid "First Name"
msgstr "Primer nom"
#. module: base_contact
#: field:res.partner.address,location_id:0
msgid "Location"
msgstr ""
#. module: base_contact
#: model:process.transition,name:base_contact.process_transition_partnertoaddress0
msgid "Partner to address"
msgstr "Empresa a adreça"
#. module: base_contact
#: help:res.partner.contact,active:0
msgid ""
"If the active field is set to False, it will allow you to "
"hide the partner contact without removing it."
msgstr ""
"Si el camp actiu es desmarca, permet ocultar el contacte de l'empresa sense "
"eliminar-lo."
#. module: base_contact
#: field:res.partner.contact,website:0
msgid "Website"
msgstr "Lloc web"
#. module: base_contact
#: field:res.partner.location,zip:0
msgid "Zip"
msgstr ""
#. module: base_contact
#: field:res.partner.location,state_id:0
msgid "Fed. State"
msgstr ""
#. module: base_contact
#: field:res.partner.location,company_id:0
msgid "Company"
msgstr ""
#. module: base_contact
#: field:res.partner.contact,title:0
msgid "Title"
msgstr "Títol"
#. module: base_contact
#: field:res.partner.location,partner_id:0
msgid "Main Partner"
msgstr ""
#. module: base_contact
#: model:process.process,name:base_contact.process_process_basecontactprocess0
msgid "Base Contact"
msgstr "Contacte base"
#. module: base_contact
#: field:res.partner.contact,email:0
msgid "E-Mail"
msgstr "Email"
#. module: base_contact
#: field:res.partner.contact,active:0
msgid "Active"
msgstr "Actiu"
#. module: base_contact
#: field:res.partner.contact,country_id:0
msgid "Nationality"
msgstr "Nacionalitat"
#. module: base_contact
#: view:res.partner:0
#: view:res.partner.address:0
msgid "Postal Address"
msgstr "Adreça postal"
#. module: base_contact
#: field:res.partner.contact,function:0
msgid "Main Function"
msgstr "Funció principal"
#. module: base_contact
#: model:process.transition,note:base_contact.process_transition_partnertoaddress0
msgid "Define partners and their addresses."
msgstr "Defineix empreses i les seves adreces."
#. module: base_contact
#: field:res.partner.contact,name:0
msgid "Name"
msgstr "Nom"
#. module: base_contact
#: field:res.partner.contact,lang_id:0
msgid "Language"
msgstr "Idioma"
#. module: base_contact
#: field:res.partner.contact,mobile:0
msgid "Mobile"
msgstr "Mòbil"
#. module: base_contact
#: field:res.partner.location,country_id:0
msgid "Country"
msgstr ""
#. module: base_contact
#: view:res.partner.contact:0
#: field:res.partner.contact,comment:0
msgid "Notes"
msgstr "Notes"
#. module: base_contact
#: model:process.node,note:base_contact.process_node_contacts0
msgid "People you work with."
msgstr "Persones amb qui treballa."
#. module: base_contact
#: view:res.partner.contact:0
msgid "Extra Information"
msgstr "Informació extra"
#. module: base_contact
#: view:res.partner.contact:0
#: field:res.partner.contact,job_ids:0
msgid "Functions and Addresses"
msgstr "Càrrecs i adreces"
#. module: base_contact
#: model:ir.model,name:base_contact.model_res_partner_contact
#: field:res.partner.address,contact_id:0
msgid "Contact"
msgstr "Contacte"
#. module: base_contact
#: model:ir.model,name:base_contact.model_res_partner_location
msgid "res.partner.location"
msgstr ""
#. module: base_contact
#: model:process.node,note:base_contact.process_node_partners0
msgid "Companies you work with."
msgstr "Empreses en les que treballa."
#. module: base_contact
#: field:res.partner.contact,partner_id:0
msgid "Main Employer"
msgstr "Empleat principal"
#. module: base_contact
#: view:res.partner.contact:0
msgid "Partner Contact"
msgstr "Contacte empresa"
#. module: base_contact
#: model:process.node,name:base_contact.process_node_addresses0
msgid "Addresses"
msgstr "Adreces"
#. module: base_contact
#: model:process.node,note:base_contact.process_node_addresses0
msgid "Working and private addresses."
msgstr "Adreces de treball i privades."
#. module: base_contact
#: field:res.partner.contact,last_name:0
msgid "Last Name"
msgstr "Cognoms"
#. module: base_contact
#: view:res.partner.contact:0
#: field:res.partner.contact,photo:0
msgid "Photo"
msgstr "Fotografia"
#. module: base_contact
#: view:res.partner.location:0
msgid "Locations"
msgstr ""
#. module: base_contact
#: view:res.partner.contact:0
msgid "General"
msgstr "General"
#. module: base_contact
#: field:res.partner.location,street:0
msgid "Street"
msgstr ""
#. module: base_contact
#: view:res.partner.contact:0
msgid "Partner"
msgstr "Empresa"
#. module: base_contact
#: model:process.node,name:base_contact.process_node_partners0
msgid "Partners"
msgstr "Empreses"
#. module: base_contact
#: model:ir.model,name:base_contact.model_res_partner_address
msgid "Partner Addresses"
msgstr "Adreces de l'empresa"
#. module: base_contact
#: field:res.partner.location,street2:0
msgid "Street2"
msgstr ""
#. module: base_contact
#: view:res.partner.contact:0
msgid "Personal Information"
msgstr ""
#. module: base_contact
#: field:res.partner.contact,birthdate:0
msgid "Birth Date"
msgstr "Data naixement"
#~ msgid "# of Contacts"
#~ msgstr "# de contactes"
#~ msgid "Main Job"
#~ msgstr "Treball principal"
#~ msgid "Contact Seq."
#~ msgstr "Seq. contacte"
#~ msgid "res.partner.contact"
#~ msgstr "res.partner.contacte"
#~ msgid ""
#~ "The Object name must start with x_ and not contain any special character !"
#~ msgstr ""
#~ "El nom de l'objecte ha de començar amb x_ i no contenir cap caràcter "
#~ "especial!"
#~ msgid "Partner Function"
#~ msgstr "Funció a l'empresa"
#~ msgid "Partner Seq."
#~ msgstr "Seq. empresa"
#~ msgid "Current"
#~ msgstr "Actual"
#~ msgid "Contact Partner Function"
#~ msgstr "Funció contacte a l'empresa"
#~ msgid "Contact to function"
#~ msgstr "Contacte a càrrec"
#~ msgid "Function"
#~ msgstr "Funció"
#~ msgid "Phone"
#~ msgstr "Telèfon"
#~ msgid "Defines contacts and functions."
#~ msgstr "Defineix contactes i càrrecs."
#~ msgid "Contact Functions"
#~ msgstr "Funcions contacte"
#~ msgid ""
#~ "Order of importance of this job title in the list of job title of the linked "
#~ "partner"
#~ msgstr ""
#~ "Ordre d'importància d'aquesta ocupació en la llista d'ocupacions de "
#~ "l'empresa relacionada"
#~ msgid "Date Stop"
#~ msgstr "Data finalització"
#~ msgid "Address"
#~ msgstr "Adreça"
#~ msgid "Contact's Jobs"
#~ msgstr "Treballs del contacte"
#~ msgid ""
#~ "Order of importance of this address in the list of addresses of the linked "
#~ "contact"
#~ msgstr ""
#~ "Ordre d'importància d'aquesta adreça en la llista d'adreces del contacte "
#~ "relacionat"
#~ msgid "Categories"
#~ msgstr "Categories"
#~ msgid "Invalid XML for View Architecture!"
#~ msgstr "XML invàlid per a la definició de la vista!"
#~ msgid "Base Contact Process"
#~ msgstr "Procés contacte base"
#~ msgid "Seq."
#~ msgstr "Seq."
#~ msgid "Function to address"
#~ msgstr "Càrrec a adreça"
#~ msgid "Partner Contacts"
#~ msgstr "Contactes de l'empresa"
#~ msgid "State"
#~ msgstr "Estat"
#~ msgid "Past"
#~ msgstr "Anterior"
#~ msgid "General Information"
#~ msgstr "Informació general"
#~ msgid "Jobs at a same partner address."
#~ msgstr "Treballs en la mateixa adreça d'empresa."
#~ msgid "Date Start"
#~ msgstr "Data inicial"
#~ msgid "Define functions and address."
#~ msgstr "Defineix càrrecs i adreces."
#~ msgid "Internal/External extension phone number"
#~ msgstr "Número d'extensió telefònica interior / exterior"
#~ msgid "Extension"
#~ msgstr "Extensió"
#~ msgid "Other"
#~ msgstr "Un altre"
#~ msgid "Fax"
#~ msgstr "Fax"
#~ msgid "Additional phone field"
#~ msgstr "Camp per telèfon addicional"
#~ msgid "Invalid model name in the action definition."
#~ msgstr "Nom de model no vàlid en la definició de l'acció."
#~ msgid "Migrate"
#~ msgstr "Migra"
#~ msgid "Function of this contact with this partner"
#~ msgstr "Funció d'aquest contacte amb aquesta empresa."
#~ msgid "title"
#~ msgstr "títol"
#~ msgid "Start date of job(Joining Date)"
#~ msgstr "Data inicial del treball (data d'unió)."
#~ msgid "Select the Option for Addresses Migration"
#~ msgstr "Seleccioneu l'opció per a la migració d'adreces"
#~ msgid "Job Phone no."
#~ msgstr "Número de telèfon del treball."
#~ msgid "Image"
#~ msgstr "Imatge"
#~ msgid "Communication"
#~ msgstr "Comunicació"
#~ msgid ""
#~ "Order of importance of this job title in the list of job "
#~ "title of the linked partner"
#~ msgstr ""
#~ "Ordre d'importància d'aquest títol de treball en la llista de títols de "
#~ "treballs de l'empresa relacionada."
#~ msgid "Configuration Progress"
#~ msgstr "Progrés de la configuració"
#~ msgid "Address's Migration to Contacts"
#~ msgstr "Migració d'adreces a contactes"
#~ msgid "Search Contact"
#~ msgstr "Cerca contacte"
#~ msgid "base.contact.installer"
#~ msgstr "base.contacte.instal·lador"
#~ msgid "Configure"
#~ msgstr "Configura"
#~ msgid "Open Jobs"
#~ msgstr "Treballs oberts"
#~ msgid "You can migrate Partner's current addresses to the contact."
#~ msgstr "Podeu migrar les adreces actuals de l'empresa al contacte."
#~ msgid "Address Migration"
#~ msgstr "Migració d'adreces"
#~ msgid "Status of Address"
#~ msgstr "Estat de l'adreça"
#~ msgid ""
#~ "You may enter Address first,Partner will be linked "
#~ "automatically if any."
#~ msgstr ""
#~ "Podeu introduir primer una adreça, es relacionarà automàticament amb "
#~ "l'empresa si n'hi ha."
#~ msgid "Job FAX no."
#~ msgstr "Número del fax del treball."
#~ msgid "Last date of job"
#~ msgstr "Data final del treball"
#~ msgid "Job E-Mail"
#~ msgstr "Correu electrònic del treball"
#~ msgid ""
#~ "\n"
#~ " This module allows you to manage your contacts entirely.\n"
#~ "\n"
#~ " It lets you define\n"
#~ " *contacts unrelated to a partner,\n"
#~ " *contacts working at several addresses (possibly for different "
#~ "partners),\n"
#~ " *contacts with possibly different functions for each of its job's "
#~ "addresses\n"
#~ "\n"
#~ " It also adds new menu items located in\n"
#~ " Partners \\ Contacts\n"
#~ " Partners \\ Functions\n"
#~ "\n"
#~ " Pay attention that this module converts the existing addresses into "
#~ "\"addresses + contacts\". It means that some fields of the addresses will be "
#~ "missing (like the contact name), since these are supposed to be defined in "
#~ "an other object.\n"
#~ " "
#~ msgstr ""
#~ "\n"
#~ " Aquest mòdul us permet gestionar els contactes de forma completa.\n"
#~ "\n"
#~ " Us permet definir:\n"
#~ " contactes sense cap relació amb una empresa,\n"
#~ " contactes que treballen en diverses adreces (probablement per a "
#~ "diferents empreses),\n"
#~ " contactes amb diverses funcions per a cadascuna de les seves adreces "
#~ "de treball\n"
#~ "\n"
#~ " També afegeix noves entrades de menús localitzades en:\n"
#~ " Empreses \\ Contactes\n"
#~ " Empreses \\ Funcions\n"
#~ "\n"
#~ " Aneu amb compte que aquest mòdul converteix les adreces existents en "
#~ "\"adreces + contactes\". Això significa que alguns camps de les adreces "
#~ "desapareixeran (com ara el nom del contacte), ja que se suposa que estaran "
#~ "definides en un altre objecte.\n"
#~ " "
#~ msgid "Otherwise these details will not be visible from address/contact."
#~ msgstr "Si no aquests detalls no seran visibles des d'adreces/contactes."
#~ msgid "Address which is linked to the Partner"
#~ msgstr "Adreça que està relacionada amb l'empresa"
#~ msgid ""
#~ "Due to changes in Address and Partner's relation, some of the details from "
#~ "address are needed to be migrated into contact information."
#~ msgstr ""
#~ "A causa dels canvis en la relació entre Adreces i Empreses, alguns dels "
#~ "detalls de les adreces cal migrar-los a la informació de contactes."
#~ msgid "Do you want to migrate your Address data in Contact Data?"
#~ msgstr "Voleu migrar les dades de les adreces a les dades de contacte?"
#~ msgid "If you select this, all addresses will be migrated."
#~ msgstr "Si seleccioneu aquesta opció, totes les adreces es migraran."
#~ msgid ""
#~ "Order of importance of this address in the list of "
#~ "addresses of the linked contact"
#~ msgstr ""
#~ "Ordre d'importància d'aquesta adreça en la llista d'adreces del contacte "
#~ "relacionat"

View File

@ -1,501 +0,0 @@
# Translation of OpenERP Server.
# This file contains the translation of the following modules:
# * base_contact
#
msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-02-08 00:36+0000\n"
"PO-Revision-Date: 2011-11-25 12:34+0000\n"
"Last-Translator: Jiří Hajda <robie@centrum.cz>\n"
"Language-Team: Czech <openerp-i18n-czech@lists.launchpad.net >\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-02-09 06:14+0000\n"
"X-Generator: Launchpad (build 14763)\n"
"X-Poedit-Language: Czech\n"
#. module: base_contact
#: field:res.partner.location,city:0
msgid "City"
msgstr ""
#. module: base_contact
#: view:res.partner.contact:0
msgid "First/Lastname"
msgstr ""
#. module: base_contact
#: model:ir.actions.act_window,name:base_contact.action_partner_contact_form
#: model:ir.ui.menu,name:base_contact.menu_partner_contact_form
#: model:ir.ui.menu,name:base_contact.menu_purchases_partner_contact_form
#: model:process.node,name:base_contact.process_node_contacts0
#: field:res.partner.location,job_ids:0
msgid "Contacts"
msgstr "Kontakty"
#. module: base_contact
#: view:res.partner.contact:0
msgid "Professional Info"
msgstr ""
#. module: base_contact
#: field:res.partner.contact,first_name:0
msgid "First Name"
msgstr "Křestní jméno"
#. module: base_contact
#: field:res.partner.address,location_id:0
msgid "Location"
msgstr ""
#. module: base_contact
#: model:process.transition,name:base_contact.process_transition_partnertoaddress0
msgid "Partner to address"
msgstr "Partner na adresu"
#. module: base_contact
#: help:res.partner.contact,active:0
msgid ""
"If the active field is set to False, it will allow you to "
"hide the partner contact without removing it."
msgstr ""
"Pokud je aktivní pole nastaveno na Nepravda, umožní vám to "
"skrýt kontakt partnera bez jeho odstranění."
#. module: base_contact
#: field:res.partner.contact,website:0
msgid "Website"
msgstr "Webová stránka"
#. module: base_contact
#: field:res.partner.location,zip:0
msgid "Zip"
msgstr ""
#. module: base_contact
#: field:res.partner.location,state_id:0
msgid "Fed. State"
msgstr ""
#. module: base_contact
#: field:res.partner.location,company_id:0
msgid "Company"
msgstr ""
#. module: base_contact
#: field:res.partner.contact,title:0
msgid "Title"
msgstr "Název"
#. module: base_contact
#: field:res.partner.location,partner_id:0
msgid "Main Partner"
msgstr ""
#. module: base_contact
#: model:process.process,name:base_contact.process_process_basecontactprocess0
msgid "Base Contact"
msgstr "Základní kontakt"
#. module: base_contact
#: field:res.partner.contact,email:0
msgid "E-Mail"
msgstr "E-mail"
#. module: base_contact
#: field:res.partner.contact,active:0
msgid "Active"
msgstr "Aktivní"
#. module: base_contact
#: field:res.partner.contact,country_id:0
msgid "Nationality"
msgstr "Národnost"
#. module: base_contact
#: view:res.partner:0
#: view:res.partner.address:0
msgid "Postal Address"
msgstr "Poštovní adresa"
#. module: base_contact
#: field:res.partner.contact,function:0
msgid "Main Function"
msgstr "Hlavní funkce"
#. module: base_contact
#: model:process.transition,note:base_contact.process_transition_partnertoaddress0
msgid "Define partners and their addresses."
msgstr "Určuje partnery a jejich adresy."
#. module: base_contact
#: field:res.partner.contact,name:0
msgid "Name"
msgstr "Jméno"
#. module: base_contact
#: field:res.partner.contact,lang_id:0
msgid "Language"
msgstr "Jazyk"
#. module: base_contact
#: field:res.partner.contact,mobile:0
msgid "Mobile"
msgstr "Mobil"
#. module: base_contact
#: field:res.partner.location,country_id:0
msgid "Country"
msgstr ""
#. module: base_contact
#: view:res.partner.contact:0
#: field:res.partner.contact,comment:0
msgid "Notes"
msgstr "Poznámky"
#. module: base_contact
#: model:process.node,note:base_contact.process_node_contacts0
msgid "People you work with."
msgstr "Lidé, s kterými pracujete."
#. module: base_contact
#: view:res.partner.contact:0
msgid "Extra Information"
msgstr "Speciální informace"
#. module: base_contact
#: view:res.partner.contact:0
#: field:res.partner.contact,job_ids:0
msgid "Functions and Addresses"
msgstr "Funkce a adresy"
#. module: base_contact
#: model:ir.model,name:base_contact.model_res_partner_contact
#: field:res.partner.address,contact_id:0
msgid "Contact"
msgstr "Kontakt"
#. module: base_contact
#: model:ir.model,name:base_contact.model_res_partner_location
msgid "res.partner.location"
msgstr ""
#. module: base_contact
#: model:process.node,note:base_contact.process_node_partners0
msgid "Companies you work with."
msgstr "Společnosti, se kterými pracujete."
#. module: base_contact
#: field:res.partner.contact,partner_id:0
msgid "Main Employer"
msgstr "Hlavní zaměstnavatel"
#. module: base_contact
#: view:res.partner.contact:0
msgid "Partner Contact"
msgstr "Kontakt partnera"
#. module: base_contact
#: model:process.node,name:base_contact.process_node_addresses0
msgid "Addresses"
msgstr "Adresy"
#. module: base_contact
#: model:process.node,note:base_contact.process_node_addresses0
msgid "Working and private addresses."
msgstr "Pracovní a soukromé adresy."
#. module: base_contact
#: field:res.partner.contact,last_name:0
msgid "Last Name"
msgstr "Příjmení"
#. module: base_contact
#: view:res.partner.contact:0
#: field:res.partner.contact,photo:0
msgid "Photo"
msgstr "Fotka"
#. module: base_contact
#: view:res.partner.location:0
msgid "Locations"
msgstr ""
#. module: base_contact
#: view:res.partner.contact:0
msgid "General"
msgstr "Obecný"
#. module: base_contact
#: field:res.partner.location,street:0
msgid "Street"
msgstr ""
#. module: base_contact
#: view:res.partner.contact:0
msgid "Partner"
msgstr "Partner"
#. module: base_contact
#: model:process.node,name:base_contact.process_node_partners0
msgid "Partners"
msgstr "Partneři"
#. module: base_contact
#: model:ir.model,name:base_contact.model_res_partner_address
msgid "Partner Addresses"
msgstr "Adresy partnerů"
#. module: base_contact
#: field:res.partner.location,street2:0
msgid "Street2"
msgstr ""
#. module: base_contact
#: view:res.partner.contact:0
msgid "Personal Information"
msgstr ""
#. module: base_contact
#: field:res.partner.contact,birthdate:0
msgid "Birth Date"
msgstr "Datum narození"
#~ msgid "Categories"
#~ msgstr "Kategorie"
#~ msgid "Current"
#~ msgstr "Stávající"
#~ msgid "Fax"
#~ msgstr "Fax"
#~ msgid "Address"
#~ msgstr "Adresa"
#~ msgid "Invalid XML for View Architecture!"
#~ msgstr "Invalidní XML pro zobrazení architektury!"
#~ msgid ""
#~ "The Object name must start with x_ and not contain any special character !"
#~ msgstr ""
#~ "Jméno objektu musí začínat znakem x_ a nesmí obsahovat žádný speciální znak!"
#~ msgid "Invalid model name in the action definition."
#~ msgstr "Špatný název modelu v definici akce"
#~ msgid "Contact Functions"
#~ msgstr "Kontaktní funkce"
#~ msgid "Phone"
#~ msgstr "Telefon"
#~ msgid "Function"
#~ msgstr "Funkce"
#~ msgid "# of Contacts"
#~ msgstr "# z kontaktů"
#~ msgid "title"
#~ msgstr "nadpis"
#~ msgid "Start date of job(Joining Date)"
#~ msgstr "Datum zahájení práce (datum připojení)"
#~ msgid "Select the Option for Addresses Migration"
#~ msgstr "Vyberte volbu pro přesun adres"
#~ msgid "Function of this contact with this partner"
#~ msgstr "Funkce tohoto kontaktu s tímto partnerem"
#~ msgid "Status of Address"
#~ msgstr "Stav adresy"
#~ msgid ""
#~ "You may enter Address first,Partner will be linked "
#~ "automatically if any."
#~ msgstr ""
#~ "Můžete zadat nejdříve adresu. Pokud je nějaký partner, "
#~ "bude napojen automaticky."
#~ msgid "Job FAX no."
#~ msgstr "Číslo FAXu do práce"
#~ msgid "Define functions and address."
#~ msgstr "Určit funkce a adresu."
#~ msgid "Last date of job"
#~ msgstr "Poslední datum práce"
#~ msgid "Migrate"
#~ msgstr "Přesunout"
#~ msgid "Jobs at a same partner address."
#~ msgstr "Pracovní pozice u stejné adresy partnera."
#~ msgid "State"
#~ msgstr "Stav"
#~ msgid ""
#~ "\n"
#~ " This module allows you to manage your contacts entirely.\n"
#~ "\n"
#~ " It lets you define\n"
#~ " *contacts unrelated to a partner,\n"
#~ " *contacts working at several addresses (possibly for different "
#~ "partners),\n"
#~ " *contacts with possibly different functions for each of its job's "
#~ "addresses\n"
#~ "\n"
#~ " It also adds new menu items located in\n"
#~ " Partners \\ Contacts\n"
#~ " Partners \\ Functions\n"
#~ "\n"
#~ " Pay attention that this module converts the existing addresses into "
#~ "\"addresses + contacts\". It means that some fields of the addresses will be "
#~ "missing (like the contact name), since these are supposed to be defined in "
#~ "an other object.\n"
#~ " "
#~ msgstr ""
#~ "\n"
#~ " Tento modul umožňuje úplně spravovat vaše kontakty.\n"
#~ "\n"
#~ " Nechá vás určit\n"
#~ " *kontakty nevztažené k partnerovi,\n"
#~ " *kontakty pracující na několika adresách (případně i pro různé "
#~ "partnery),\n"
#~ " *kontakty s možnými různými funkcemi pro každou jeho pracovní "
#~ "adresu\n"
#~ "\n"
#~ " Také přidává nové položky nabídky umístěné v\n"
#~ " Partneři \\ Kontakty\n"
#~ " Partneři \\ Funkce\n"
#~ "\n"
#~ " Berte na vědomí, že tento modul převádí existující adresy na \"adresy + "
#~ "kontakty\". To znamená, že některé pole adres budou chybět (jako jméno "
#~ "kontaktu), protože ty jsou definovány v jiném objektu.\n"
#~ " "
#~ msgid "Date Stop"
#~ msgstr "Datum zastavení"
#~ msgid "Contact's Jobs"
#~ msgstr "Pozice kontaktu"
#~ msgid ""
#~ "Order of importance of this job title in the list of job "
#~ "title of the linked partner"
#~ msgstr ""
#~ "Pořadí důležitosti této pracovní pozice v seznamu titulů "
#~ "pozic napojeného partnera"
#~ msgid "Extension"
#~ msgstr "Rozšíření"
#~ msgid "Internal/External extension phone number"
#~ msgstr "Vnitřní/vnější telefoní číslo klapky"
#~ msgid "Job Phone no."
#~ msgstr "Telefoní číslo do práce."
#~ msgid "Job E-Mail"
#~ msgstr "Pracovní E-Mail"
#~ msgid "Partner Seq."
#~ msgstr "Poř. parnera"
#~ msgid "Function to address"
#~ msgstr "Funkce na adresu"
#~ msgid "Configuration Progress"
#~ msgstr "Průběh nastavení"
#~ msgid "Communication"
#~ msgstr "Komunikace"
#~ msgid "Image"
#~ msgstr "Obrázek"
#~ msgid "Past"
#~ msgstr "Minulý"
#~ msgid "Address's Migration to Contacts"
#~ msgstr "Stěhování adresy na kontakty"
#~ msgid "Contact Seq."
#~ msgstr "Poř. kontaktu"
#~ msgid "Search Contact"
#~ msgstr "Hledat kontakt"
#~ msgid ""
#~ "Due to changes in Address and Partner's relation, some of the details from "
#~ "address are needed to be migrated into contact information."
#~ msgstr ""
#~ "Kvůli změnám v adrese a vztahu partnera, některé podrobnosti adresy jsou "
#~ "potřebné, aby byly přesunuty do informací účtu."
#~ msgid "Address which is linked to the Partner"
#~ msgstr "Adresa, která je napojena na partnera"
#~ msgid "Partner Function"
#~ msgstr "Funkce partnera"
#~ msgid "Additional phone field"
#~ msgstr "Doplňující pole telefonu"
#~ msgid "Otherwise these details will not be visible from address/contact."
#~ msgstr "Jinak tyto podrobnosti nebudou viditelné z adresy/kontaktu."
#~ msgid "Configure"
#~ msgstr "Nastavit"
#~ msgid "base.contact.installer"
#~ msgstr "base.contact.installer"
#~ msgid "Do you want to migrate your Address data in Contact Data?"
#~ msgstr "Chcete stěhovat vaše data adresy v datech kontaktu?"
#~ msgid "Seq."
#~ msgstr "Poř."
#~ msgid "If you select this, all addresses will be migrated."
#~ msgstr "Pokud toto vyberete, všechny adresy budou přesunuty."
#~ msgid "Contact Partner Function"
#~ msgstr "Kontakt funkce partnera"
#~ msgid "Other"
#~ msgstr "Jiné"
#~ msgid "Main Job"
#~ msgstr "Hlavní práce"
#~ msgid "Defines contacts and functions."
#~ msgstr "Určuje kontakty a funkce."
#~ msgid "Contact to function"
#~ msgstr "Kontakt na funkci"
#~ msgid "Open Jobs"
#~ msgstr "Otevřené pozice"
#~ msgid "You can migrate Partner's current addresses to the contact."
#~ msgstr "Můžete stěhovat partnerovu aktuální adresu do kontaktu."
#~ msgid "Address Migration"
#~ msgstr "Stěhování adresy"
#~ msgid "Date Start"
#~ msgstr "Počáteční datum"
#~ msgid ""
#~ "Order of importance of this address in the list of "
#~ "addresses of the linked contact"
#~ msgstr ""
#~ "Pořadí podle důležitosti této adresy v seznamu adres napojeného "
#~ "kontaktu"

View File

@ -1,318 +0,0 @@
# Danish translation for openobject-addons
# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
# This file is distributed under the same license as the openobject-addons package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
#
msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-02-08 00:36+0000\n"
"PO-Revision-Date: 2011-11-08 22:31+0000\n"
"Last-Translator: OpenERP Danmark / Henning Dinsen <Unknown>\n"
"Language-Team: Danish <da@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-02-09 06:14+0000\n"
"X-Generator: Launchpad (build 14763)\n"
#. module: base_contact
#: field:res.partner.location,city:0
msgid "City"
msgstr ""
#. module: base_contact
#: view:res.partner.contact:0
msgid "First/Lastname"
msgstr ""
#. module: base_contact
#: model:ir.actions.act_window,name:base_contact.action_partner_contact_form
#: model:ir.ui.menu,name:base_contact.menu_partner_contact_form
#: model:ir.ui.menu,name:base_contact.menu_purchases_partner_contact_form
#: model:process.node,name:base_contact.process_node_contacts0
#: field:res.partner.location,job_ids:0
msgid "Contacts"
msgstr "Kontakter"
#. module: base_contact
#: view:res.partner.contact:0
msgid "Professional Info"
msgstr ""
#. module: base_contact
#: field:res.partner.contact,first_name:0
msgid "First Name"
msgstr "Fornavn"
#. module: base_contact
#: field:res.partner.address,location_id:0
msgid "Location"
msgstr ""
#. module: base_contact
#: model:process.transition,name:base_contact.process_transition_partnertoaddress0
msgid "Partner to address"
msgstr ""
#. module: base_contact
#: help:res.partner.contact,active:0
msgid ""
"If the active field is set to False, it will allow you to "
"hide the partner contact without removing it."
msgstr ""
#. module: base_contact
#: field:res.partner.contact,website:0
msgid "Website"
msgstr "Hjemmeside"
#. module: base_contact
#: field:res.partner.location,zip:0
msgid "Zip"
msgstr ""
#. module: base_contact
#: field:res.partner.location,state_id:0
msgid "Fed. State"
msgstr ""
#. module: base_contact
#: field:res.partner.location,company_id:0
msgid "Company"
msgstr ""
#. module: base_contact
#: field:res.partner.contact,title:0
msgid "Title"
msgstr "Titel"
#. module: base_contact
#: field:res.partner.location,partner_id:0
msgid "Main Partner"
msgstr ""
#. module: base_contact
#: model:process.process,name:base_contact.process_process_basecontactprocess0
msgid "Base Contact"
msgstr ""
#. module: base_contact
#: field:res.partner.contact,email:0
msgid "E-Mail"
msgstr "E-mail"
#. module: base_contact
#: field:res.partner.contact,active:0
msgid "Active"
msgstr "Aktive"
#. module: base_contact
#: field:res.partner.contact,country_id:0
msgid "Nationality"
msgstr "Nationalitet"
#. module: base_contact
#: view:res.partner:0
#: view:res.partner.address:0
msgid "Postal Address"
msgstr "Postadresse"
#. module: base_contact
#: field:res.partner.contact,function:0
msgid "Main Function"
msgstr "Primær funktion"
#. module: base_contact
#: model:process.transition,note:base_contact.process_transition_partnertoaddress0
msgid "Define partners and their addresses."
msgstr ""
#. module: base_contact
#: field:res.partner.contact,name:0
msgid "Name"
msgstr "Navn"
#. module: base_contact
#: field:res.partner.contact,lang_id:0
msgid "Language"
msgstr "Sprog"
#. module: base_contact
#: field:res.partner.contact,mobile:0
msgid "Mobile"
msgstr "Mobil"
#. module: base_contact
#: field:res.partner.location,country_id:0
msgid "Country"
msgstr ""
#. module: base_contact
#: view:res.partner.contact:0
#: field:res.partner.contact,comment:0
msgid "Notes"
msgstr "Noter"
#. module: base_contact
#: model:process.node,note:base_contact.process_node_contacts0
msgid "People you work with."
msgstr ""
#. module: base_contact
#: view:res.partner.contact:0
msgid "Extra Information"
msgstr "Ekstra information"
#. module: base_contact
#: view:res.partner.contact:0
#: field:res.partner.contact,job_ids:0
msgid "Functions and Addresses"
msgstr ""
#. module: base_contact
#: model:ir.model,name:base_contact.model_res_partner_contact
#: field:res.partner.address,contact_id:0
msgid "Contact"
msgstr "Kontaktperson"
#. module: base_contact
#: model:ir.model,name:base_contact.model_res_partner_location
msgid "res.partner.location"
msgstr ""
#. module: base_contact
#: model:process.node,note:base_contact.process_node_partners0
msgid "Companies you work with."
msgstr ""
#. module: base_contact
#: field:res.partner.contact,partner_id:0
msgid "Main Employer"
msgstr ""
#. module: base_contact
#: view:res.partner.contact:0
msgid "Partner Contact"
msgstr ""
#. module: base_contact
#: model:process.node,name:base_contact.process_node_addresses0
msgid "Addresses"
msgstr "Adresser"
#. module: base_contact
#: model:process.node,note:base_contact.process_node_addresses0
msgid "Working and private addresses."
msgstr "Arbejds- og privat adresse"
#. module: base_contact
#: field:res.partner.contact,last_name:0
msgid "Last Name"
msgstr "Efternavn"
#. module: base_contact
#: view:res.partner.contact:0
#: field:res.partner.contact,photo:0
msgid "Photo"
msgstr "Foto"
#. module: base_contact
#: view:res.partner.location:0
msgid "Locations"
msgstr ""
#. module: base_contact
#: view:res.partner.contact:0
msgid "General"
msgstr "Generelt"
#. module: base_contact
#: field:res.partner.location,street:0
msgid "Street"
msgstr ""
#. module: base_contact
#: view:res.partner.contact:0
msgid "Partner"
msgstr "Partner"
#. module: base_contact
#: model:process.node,name:base_contact.process_node_partners0
msgid "Partners"
msgstr "Partnere"
#. module: base_contact
#: model:ir.model,name:base_contact.model_res_partner_address
msgid "Partner Addresses"
msgstr "Partneradresser"
#. module: base_contact
#: field:res.partner.location,street2:0
msgid "Street2"
msgstr ""
#. module: base_contact
#: view:res.partner.contact:0
msgid "Personal Information"
msgstr ""
#. module: base_contact
#: field:res.partner.contact,birthdate:0
msgid "Birth Date"
msgstr "Fødselsdato"
#~ msgid "Job FAX no."
#~ msgstr "Arbejds Fax nr."
#~ msgid "title"
#~ msgstr "titel"
#~ msgid "Fax"
#~ msgstr "Fax"
#~ msgid "State"
#~ msgstr "Delstat"
#~ msgid "Migrate"
#~ msgstr "Migrer"
#~ msgid "Categories"
#~ msgstr "Kategorier"
#~ msgid "Job Phone no."
#~ msgstr "Arbejdstlf."
#~ msgid "Extension"
#~ msgstr "Lokalnr"
#~ msgid "Configuration Progress"
#~ msgstr "Konfigurations fremskridt"
#~ msgid "Image"
#~ msgstr "Billede"
#~ msgid "Communication"
#~ msgstr "Kommunikation"
#~ msgid "Phone"
#~ msgstr "Tlf. nr."
#~ msgid "Configure"
#~ msgstr "Konfigurér"
#~ msgid "Function"
#~ msgstr "Funktion"
#~ msgid "Address"
#~ msgstr "Adresse"
#~ msgid "Other"
#~ msgstr "Andet"
#~ msgid "Date Start"
#~ msgstr "Startdato"
#~ msgid "# of Contacts"
#~ msgstr "# kontakter"

View File

@ -1,527 +0,0 @@
# Translation of OpenERP Server.
# This file contains the translation of the following modules:
# * base_contact
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-02-08 00:36+0000\n"
"PO-Revision-Date: 2012-01-13 19:52+0000\n"
"Last-Translator: Ferdinand @ Camptocamp <Unknown>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-02-09 06:14+0000\n"
"X-Generator: Launchpad (build 14763)\n"
#. module: base_contact
#: field:res.partner.location,city:0
msgid "City"
msgstr "Ort"
#. module: base_contact
#: view:res.partner.contact:0
msgid "First/Lastname"
msgstr "Vor/Nachname"
#. module: base_contact
#: model:ir.actions.act_window,name:base_contact.action_partner_contact_form
#: model:ir.ui.menu,name:base_contact.menu_partner_contact_form
#: model:ir.ui.menu,name:base_contact.menu_purchases_partner_contact_form
#: model:process.node,name:base_contact.process_node_contacts0
#: field:res.partner.location,job_ids:0
msgid "Contacts"
msgstr "Kontakte"
#. module: base_contact
#: view:res.partner.contact:0
msgid "Professional Info"
msgstr "Professionelle INformation"
#. module: base_contact
#: field:res.partner.contact,first_name:0
msgid "First Name"
msgstr "Vorname"
#. module: base_contact
#: field:res.partner.address,location_id:0
msgid "Location"
msgstr "Adresse"
#. module: base_contact
#: model:process.transition,name:base_contact.process_transition_partnertoaddress0
msgid "Partner to address"
msgstr "Anschreiben Partner"
#. module: base_contact
#: help:res.partner.contact,active:0
msgid ""
"If the active field is set to False, it will allow you to "
"hide the partner contact without removing it."
msgstr ""
"Wenn dieses Feld deaktiviert wird, kann der Partnerkontakt ausgeblendet "
"werden."
#. module: base_contact
#: field:res.partner.contact,website:0
msgid "Website"
msgstr "Website"
#. module: base_contact
#: field:res.partner.location,zip:0
msgid "Zip"
msgstr "PLZ"
#. module: base_contact
#: field:res.partner.location,state_id:0
msgid "Fed. State"
msgstr "Bundesstaat"
#. module: base_contact
#: field:res.partner.location,company_id:0
msgid "Company"
msgstr "Unternehmen"
#. module: base_contact
#: field:res.partner.contact,title:0
msgid "Title"
msgstr "Partner Titel"
#. module: base_contact
#: field:res.partner.location,partner_id:0
msgid "Main Partner"
msgstr "Haupt Partner"
#. module: base_contact
#: model:process.process,name:base_contact.process_process_basecontactprocess0
msgid "Base Contact"
msgstr "Basis Kontakt"
#. module: base_contact
#: field:res.partner.contact,email:0
msgid "E-Mail"
msgstr "E-Mail"
#. module: base_contact
#: field:res.partner.contact,active:0
msgid "Active"
msgstr "Aktiv"
#. module: base_contact
#: field:res.partner.contact,country_id:0
msgid "Nationality"
msgstr "Nationalität"
#. module: base_contact
#: view:res.partner:0
#: view:res.partner.address:0
msgid "Postal Address"
msgstr "Postal. Anschrift"
#. module: base_contact
#: field:res.partner.contact,function:0
msgid "Main Function"
msgstr "Haupt Funktion"
#. module: base_contact
#: model:process.transition,note:base_contact.process_transition_partnertoaddress0
msgid "Define partners and their addresses."
msgstr "definiere Partner und Anschrift"
#. module: base_contact
#: field:res.partner.contact,name:0
msgid "Name"
msgstr "Bezeichnung"
#. module: base_contact
#: field:res.partner.contact,lang_id:0
msgid "Language"
msgstr "Sprache"
#. module: base_contact
#: field:res.partner.contact,mobile:0
msgid "Mobile"
msgstr "Mobil"
#. module: base_contact
#: field:res.partner.location,country_id:0
msgid "Country"
msgstr "Staat"
#. module: base_contact
#: view:res.partner.contact:0
#: field:res.partner.contact,comment:0
msgid "Notes"
msgstr "Bemerkungen"
#. module: base_contact
#: model:process.node,note:base_contact.process_node_contacts0
msgid "People you work with."
msgstr "Personen Team"
#. module: base_contact
#: view:res.partner.contact:0
msgid "Extra Information"
msgstr "Extra Information"
#. module: base_contact
#: view:res.partner.contact:0
#: field:res.partner.contact,job_ids:0
msgid "Functions and Addresses"
msgstr "Aufgabenbereiche und Adressen"
#. module: base_contact
#: model:ir.model,name:base_contact.model_res_partner_contact
#: field:res.partner.address,contact_id:0
msgid "Contact"
msgstr "Kontakt"
#. module: base_contact
#: model:ir.model,name:base_contact.model_res_partner_location
msgid "res.partner.location"
msgstr "res.partner.location"
#. module: base_contact
#: model:process.node,note:base_contact.process_node_partners0
msgid "Companies you work with."
msgstr "Kooperationspartner"
#. module: base_contact
#: field:res.partner.contact,partner_id:0
msgid "Main Employer"
msgstr "Arbeitgeber"
#. module: base_contact
#: view:res.partner.contact:0
msgid "Partner Contact"
msgstr "Kontakt bei Partner"
#. module: base_contact
#: model:process.node,name:base_contact.process_node_addresses0
msgid "Addresses"
msgstr "Partner Anschriften"
#. module: base_contact
#: model:process.node,note:base_contact.process_node_addresses0
msgid "Working and private addresses."
msgstr "Arbeitgeber- und Privatadresse"
#. module: base_contact
#: field:res.partner.contact,last_name:0
msgid "Last Name"
msgstr "Nachname"
#. module: base_contact
#: view:res.partner.contact:0
#: field:res.partner.contact,photo:0
msgid "Photo"
msgstr "Photo"
#. module: base_contact
#: view:res.partner.location:0
msgid "Locations"
msgstr "Standorte"
#. module: base_contact
#: view:res.partner.contact:0
msgid "General"
msgstr "Allgemein"
#. module: base_contact
#: field:res.partner.location,street:0
msgid "Street"
msgstr "Straße"
#. module: base_contact
#: view:res.partner.contact:0
msgid "Partner"
msgstr "Partner"
#. module: base_contact
#: model:process.node,name:base_contact.process_node_partners0
msgid "Partners"
msgstr "Partner"
#. module: base_contact
#: model:ir.model,name:base_contact.model_res_partner_address
msgid "Partner Addresses"
msgstr "Partner Adressen"
#. module: base_contact
#: field:res.partner.location,street2:0
msgid "Street2"
msgstr "Straße 2"
#. module: base_contact
#: view:res.partner.contact:0
msgid "Personal Information"
msgstr "Persönliche Information"
#. module: base_contact
#: field:res.partner.contact,birthdate:0
msgid "Birth Date"
msgstr "Geburtsdatum"
#~ msgid "Partner Seq."
#~ msgstr "Partner Seq."
#~ msgid "Contact Seq."
#~ msgstr "Kontakt Seq."
#~ msgid "res.partner.contact"
#~ msgstr "res.partner.contact"
#~ msgid ""
#~ "The Object name must start with x_ and not contain any special character !"
#~ msgstr ""
#~ "Der Objekt Name muss mit einem x_ starten und darf keine Sonderzeichen "
#~ "beinhalten"
#~ msgid "Current"
#~ msgstr "Aktuell"
#~ msgid "Contact to function"
#~ msgstr "Kontaktdaten"
#~ msgid "Phone"
#~ msgstr "Tel"
#~ msgid "Defines contacts and functions."
#~ msgstr "Definieren Kontakte und Funktionen"
#~ msgid ""
#~ "Order of importance of this job title in the list of job title of the linked "
#~ "partner"
#~ msgstr "Wichtigkeit der Anschriften in der Adressliste des Partners"
#~ msgid "Address"
#~ msgstr "Adresse"
#~ msgid ""
#~ "Order of importance of this address in the list of addresses of the linked "
#~ "contact"
#~ msgstr "Wichtigkeit der Anschriften in der Adressliste des Kontakts"
#~ msgid "Categories"
#~ msgstr "Kategorien"
#~ msgid "Invalid XML for View Architecture!"
#~ msgstr "Fehlerhafter xml Code für diese Ansicht!"
#~ msgid "Base Contact Process"
#~ msgstr "Basis Kontakt Prozess"
#~ msgid "Seq."
#~ msgstr "Seq."
#~ msgid "Function to address"
#~ msgstr "Zu kontaktieren"
#~ msgid "Partner Contacts"
#~ msgstr "Ansprechpartner"
#~ msgid "State"
#~ msgstr "Status"
#~ msgid "Past"
#~ msgstr "Vergangenheit"
#~ msgid "General Information"
#~ msgstr "Grundinformation"
#~ msgid "Date Start"
#~ msgstr "gültig von"
#~ msgid "Define functions and address."
#~ msgstr "Definiere Funktion und Adresse"
#~ msgid "Internal/External extension phone number"
#~ msgstr "interne/externe Durchwahl"
#~ msgid "Extension"
#~ msgstr "Durchwahl"
#~ msgid "Other"
#~ msgstr "Anderes"
#~ msgid "Fax"
#~ msgstr "Fax"
#~ msgid "# of Contacts"
#~ msgstr "# Kontakte"
#~ msgid "Main Job"
#~ msgstr "Haupt-Beruf"
#~ msgid "Invalid model name in the action definition."
#~ msgstr "Ungültiger Modulname in der Aktionsdefinition."
#~ msgid "Start date of job(Joining Date)"
#~ msgstr "Beschäftigt seit"
#~ msgid "Status of Address"
#~ msgstr "Status der Adresse"
#~ msgid "Job FAX no."
#~ msgstr "Arbeit Fax"
#~ msgid "Last date of job"
#~ msgstr "Beschäftigt Bis"
#~ msgid "Migrate"
#~ msgstr "Migration"
#~ msgid "Jobs at a same partner address."
#~ msgstr "Beschäftigt an derselben Adresse"
#~ msgid "Date Stop"
#~ msgstr "Beschäftigt Bis"
#~ msgid "Job Phone no."
#~ msgstr "Arbeit Tel. Nr."
#~ msgid "Job E-Mail"
#~ msgstr "Arbeit E-Mail"
#~ msgid "Communication"
#~ msgstr "Kommunikation"
#~ msgid "Image"
#~ msgstr "Bild"
#~ msgid "Search Contact"
#~ msgstr "Suche Ansprechpartner"
#~ msgid ""
#~ "Due to changes in Address and Partner's relation, some of the details from "
#~ "address are needed to be migrated into contact information."
#~ msgstr ""
#~ "Aufgrund technischer Änderungen bei der Datenbeziehung von Adresse zu "
#~ "Partner, müssen einige Details der Adressdaten zu den Kontaktdaten migriert "
#~ "werden."
#~ msgid "Address which is linked to the Partner"
#~ msgstr "Adresse beim Partner"
#~ msgid "Additional phone field"
#~ msgstr "Zusätzliche Telefon Nr."
#~ msgid "Otherwise these details will not be visible from address/contact."
#~ msgstr ""
#~ "Ansonsten sind diese Detaildaten nicht über die Kontakte und Adressen "
#~ "ersichtlich."
#~ msgid "Configuration Progress"
#~ msgstr "Fortschritt Konfiguration"
#~ msgid "Do you want to migrate your Address data in Contact Data?"
#~ msgstr "Möchten Sie die Adressdaten zum Kontakt übernehmen?"
#~ msgid "If you select this, all addresses will be migrated."
#~ msgstr "Wenn Sie diese Option wählen, werden alle Adressen migriert."
#~ msgid "Contact Partner Function"
#~ msgstr "Kontakt Partner Aufgabenbereich"
#~ msgid "Function"
#~ msgstr "Aufgabenbereich"
#~ msgid "Open Jobs"
#~ msgstr "Offene Stellen"
#~ msgid "Address Migration"
#~ msgstr "Adresse Migration"
#~ msgid ""
#~ "Order of importance of this address in the list of "
#~ "addresses of the linked contact"
#~ msgstr "Wichtigkeit der Anschriften in der Adressliste des Kontakts"
#~ msgid "Function of this contact with this partner"
#~ msgstr "Funktion des Ansprechpartners beim Partner"
#~ msgid ""
#~ "You may enter Address first,Partner will be linked "
#~ "automatically if any."
#~ msgstr ""
#~ "Sie könnten zuerst die Adresse eingeben, der Partner wird dann automatisch "
#~ "verlinkt, wenn er existiert."
#~ msgid "Partner Function"
#~ msgstr "Funktion bei Partner"
#~ msgid "Contact's Jobs"
#~ msgstr "Funktion des Ansprechpartners"
#~ msgid ""
#~ "Order of importance of this job title in the list of job "
#~ "title of the linked partner"
#~ msgstr ""
#~ "Priorität bei der Anzeige der Funktion der Kontaktperson beim Partner"
#~ msgid "Contact Functions"
#~ msgstr "Funktion des Kontakts"
#~ msgid "Configure"
#~ msgstr "Konfigurieren"
#~ msgid ""
#~ "\n"
#~ " This module allows you to manage your contacts entirely.\n"
#~ "\n"
#~ " It lets you define\n"
#~ " *contacts unrelated to a partner,\n"
#~ " *contacts working at several addresses (possibly for different "
#~ "partners),\n"
#~ " *contacts with possibly different functions for each of its job's "
#~ "addresses\n"
#~ "\n"
#~ " It also adds new menu items located in\n"
#~ " Partners \\ Contacts\n"
#~ " Partners \\ Functions\n"
#~ "\n"
#~ " Pay attention that this module converts the existing addresses into "
#~ "\"addresses + contacts\". It means that some fields of the addresses will be "
#~ "missing (like the contact name), since these are supposed to be defined in "
#~ "an other object.\n"
#~ " "
#~ msgstr ""
#~ "\n"
#~ " Dieses Modul erlaubt Ihnen ein ganzheitliches und zentrales Kontakt- "
#~ "und Adressdatenmanagement.\n"
#~ "\n"
#~ " Sie können folgende Kontaktdaten definieren:\n"
#~ " * Kontakte ohne besonderen Bezug einem Partner,\n"
#~ " * Kontakte mit verschiedenen Adressen (möglicherweise bei "
#~ "verschiedenen Partnern),\n"
#~ " * Kontakte mit möglicherweise unterschiedlichen Funktionen (bei "
#~ "unterschiedlichen Adressen)\n"
#~ "\n"
#~ " Weiterhin werden auch neue Menüpunkte durch das Modul generiert, und "
#~ "zwar\n"
#~ " Partnerverzeichnis \\ Kontakte\n"
#~ " Partnerverzeichnis \\ Partner Kontaktanrede\n"
#~ "\n"
#~ " Beachten Sie, dass dieses Modul bereits vorhandene Adressen umwandelt "
#~ "in \"Adressen + Kontakte\". Dieses bedeutet, \n"
#~ " dass einige Felder bei der Adresse fehlen werden (wie z.B. der Namen "
#~ "des Kontaktpartners), da diese durch den Einsatz\n"
#~ " dieses Moduls in einem anderen Objekt zu definieren werden müssen.\n"
#~ " "
#~ msgid "Select the Option for Addresses Migration"
#~ msgstr "Wählen Sie eine Option für die Adressenübernahme"
#~ msgid "Address's Migration to Contacts"
#~ msgstr "Migration Adressverzeichnis zu Kontaktdaten"
#~ msgid "You can migrate Partner's current addresses to the contact."
#~ msgstr "Sie können die aktuelle Partneradresse für den Kontakt übernehmen"
#~ msgid "title"
#~ msgstr "Titel"
#~ msgid "base.contact.installer"
#~ msgstr "base.contact.installer"

Some files were not shown because too many files have changed in this diff Show More