|
- [[ move_ids.name ]] - [[ get_ref(voucher.id,move_ids) ]]
+ [[ move_ids.name ]] - [[ voucher.reference ]]
|
diff --git a/addons/account_voucher/test/sales_payment.yml b/addons/account_voucher/test/sales_payment.yml
new file mode 100644
index 00000000000..050eec1d014
--- /dev/null
+++ b/addons/account_voucher/test/sales_payment.yml
@@ -0,0 +1,87 @@
+-
+ In order to test account voucher i will create an invoice and pay it through account voucher.
+-
+ I create a new Partner
+-
+ !record {model: res.partner, id: res_partner_micropc0}:
+ address:
+ - country_id: base.be
+ name: Jenifer
+ street: 69 rue de Chimay
+ type: default
+ zip: '5478'
+ category_id:
+ - base.res_partner_category_8
+ credit_limit: 0.0
+ name: Micro PC
+ property_account_payable: account.a_pay
+ property_account_receivable: account.a_recv
+
+-
+ Creat an invoice for the partner
+-
+ !record {model: account.invoice, id: account_invoice_0}:
+ 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
+ currency_id: base.EUR
+ invoice_line:
+ - account_id: account.a_sale
+ name: '[PC1] Basic PC'
+ price_unit: 450.0
+ quantity: 1.0
+ product_id: product.product_product_pc1
+ uos_id: product.product_uom_unit
+ journal_id: account.sales_journal
+ partner_id: res_partner_micropc0
+
+-
+ I check that the customer invoice is in draft state
+-
+ !assert {model: account.invoice, id: account_invoice_0}:
+ - state == 'draft'
+
+-
+ I make the invoice in Open state
+-
+ !workflow {model: account.invoice, action: invoice_open, ref: account_invoice_0}
+
+-
+ I check that a payment entry gets created in the account.move.line
+-
+ !python {model: account.invoice}: |
+ acc_id=self.browse(cr, uid, ref("account_invoice_0"))
+ assert(acc_id.move_id)
+
+-
+ I will create and post an account voucher for the partner.
+-
+ !python {model: account.voucher}: |
+ import netsvc
+ vals = {}
+ journal_id = self.default_get(cr, uid, ['journal_id']).get('journal_id',None)
+ res = self.onchange_partner_id(cr, uid, [], ref("res_partner_micropc0"), journal_id, price=0.0, ttype='receipt')
+ vals = {
+ 'account_id': ref('account.cash'),
+ 'amount': 450.0,
+ 'company_id': ref('base.main_company'),
+ 'currency_id': ref('base.EUR'),
+ 'journal_id': ref('account.bank_journal'),
+ 'partner_id': ref('res_partner_micropc0'),
+ 'period_id': ref('account.period_8'),
+ 'type': 'receipt',
+ }
+ res['value']['line_cr_ids'][0]['amount'] = 450.0
+ vals['line_cr_ids'] = [(0,0,i) for i in res['value']['line_cr_ids']]
+ id = self.create(cr, uid, vals)
+ voucher_id = self.browse(cr, uid, id)
+ assert (voucher_id.state=='draft'), "Voucher is not in draft state"
+ wf_service = netsvc.LocalService("workflow")
+ wf_service.trg_validate(uid, 'account.voucher', voucher_id.id, 'proforma_voucher', cr)
+
+-
+ Finally i will Confirm the state of the invoice is paid
+-
+ !assert {model: account.invoice, id: account_invoice_0}:
+ - state == 'paid'
diff --git a/addons/account_voucher/test/sales_receipt.yml b/addons/account_voucher/test/sales_receipt.yml
new file mode 100644
index 00000000000..70539f5061f
--- /dev/null
+++ b/addons/account_voucher/test/sales_receipt.yml
@@ -0,0 +1,74 @@
+
+-
+ In order to test sales receipt i will create a sale receipt and pay it through sales payment
+-
+ First of all I create a voucher
+-
+ !record {model: account.voucher, id: account_voucher_chinaexport_0}:
+ account_id: account.a_recv
+ amount: 30000.0
+ company_id: base.main_company
+ journal_id: account.sales_journal
+ line_cr_ids:
+ - account_id: account.a_sale
+ amount: 30000.0
+ partner_id: base.res_partner_3
+ period_id: account.period_8
+ tax_amount: 0.0
+ type: sale
+
+-
+ I check that the voucher state is Draft
+-
+ !assert {model: account.voucher, id: account_voucher_chinaexport_0}:
+ - state == 'draft'
+
+-
+ I clicked on post button to post the voucher
+-
+ !workflow {model: account.voucher, action: proforma_voucher, ref: account_voucher_chinaexport_0}
+
+-
+ Check the voucher state is Posted
+-
+ !assert {model: account.voucher, id: account_voucher_chinaexport_0}:
+ - state == 'posted'
+
+-
+ I create a voucher record for the same partner
+-
+ !record {model: account.voucher, id: account_voucher_chinaexport_1}:
+ account_id: account.cash
+ amount: 30000.0
+ company_id: base.main_company
+ currency_id: base.EUR
+ journal_id: account.bank_journal
+ line_cr_ids:
+ - account_id: account.a_recv
+ amount: 0.0
+ name: 2010/003
+ type: cr
+ - account_id: account.a_recv
+ amount: 30000.0
+ name: 2010/003
+ type: cr
+ partner_id: base.res_partner_3
+ period_id: account.period_8
+ type: receipt
+
+-
+ Check the voucher state is draft
+-
+ !assert {model: account.voucher, id: account_voucher_chinaexport_1}:
+ - state == 'draft'
+
+-
+ I clicked on Post button to post the voucher
+-
+ !workflow {model: account.voucher, action: proforma_voucher, ref: account_voucher_chinaexport_1}
+
+-
+ Check the voucher state is Posted
+-
+ !assert {model: account.voucher, id: account_voucher_chinaexport_1}:
+ - state == 'posted'
diff --git a/addons/account_voucher/voucher.py b/addons/account_voucher/voucher.py
index 4cc44433ff8..77b6627c7e3 100644
--- a/addons/account_voucher/voucher.py
+++ b/addons/account_voucher/voucher.py
@@ -78,7 +78,10 @@ class account_voucher(osv.osv):
if user.company_id:
return user.company_id.currency_id.id
return False
-
+
+ def _get_partner(self, cr, uid, context={}):
+ return context.get('partner_id', False)
+
_name = 'account.voucher'
_description = 'Accounting Voucher'
_order = "date desc, id desc"
@@ -89,7 +92,7 @@ class account_voucher(osv.osv):
('purchase','Purchase'),
('payment','Payment'),
('receipt','Receipt'),
- ],'Type'),
+ ],'Default Type', readonly=True, states={'draft':[('readonly',False)]}),
'name':fields.char('Memo', size=256, readonly=True, states={'draft':[('readonly',False)]}),
'date':fields.date('Date', readonly=True, states={'draft':[('readonly',False)]}, help="Effective date for accounting entries"),
'journal_id':fields.many2one('account.journal', 'Journal', required=True, readonly=True, states={'draft':[('readonly',False)]}),
@@ -101,7 +104,7 @@ class account_voucher(osv.osv):
'line_dr_ids':fields.one2many('account.voucher.line','voucher_id','Debits',
domain=[('type','=','dr')], context={'default_type':'dr'}, readonly=True, states={'draft':[('readonly',False)]}),
'period_id': fields.many2one('account.period', 'Period', required=True, readonly=True, states={'draft':[('readonly',False)]}),
- 'narration':fields.text('Narration', readonly=True, states={'draft':[('readonly',False)]}),
+ 'narration':fields.text('Notes', readonly=True, states={'draft':[('readonly',False)]}),
'currency_id': fields.many2one('res.currency', 'Currency', required=True, readonly=True, states={'draft':[('readonly',False)]}),
'company_id': fields.many2one('res.company', 'Company', required=True),
'state':fields.selection(
@@ -116,11 +119,11 @@ class account_voucher(osv.osv):
\n* The \'Cancelled\' state is used when user cancel voucher.'),
'amount': fields.float('Total', digits=(16, 2), required=True, readonly=True, states={'draft':[('readonly',False)]}),
'tax_amount':fields.float('Tax Amount', digits=(14,2), readonly=True, states={'draft':[('readonly',False)]}),
- 'reference': fields.char('Ref #', size=64, readonly=True, states={'draft':[('readonly',False)]}, help="Payment or Receipt transaction number, i.e. Bank cheque number or payorder number or Wire transfer number or Acknowledge number."),
+ 'reference': fields.char('Ref #', size=64, readonly=True, states={'draft':[('readonly',False)]}, help="Transaction referance number."),
'number': fields.related('move_id', 'name', type="char", readonly=True, string='Number'),
'move_id':fields.many2one('account.move', 'Account Entry'),
'move_ids': fields.related('move_id','line_id', type='many2many', relation='account.move.line', string='Journal Items', readonly=True),
- 'partner_id':fields.many2one('res.partner', 'Partner', readonly=True, states={'draft':[('readonly',False)]}),
+ 'partner_id':fields.many2one('res.partner', 'Partner', change_default=1, readonly=True, states={'draft':[('readonly',False)]}),
'audit': fields.related('move_id','to_check', type='boolean', relation='account.move', string='Audit Complete ?'),
'pay_now':fields.selection([
('pay_now','Pay Directly'),
@@ -129,10 +132,11 @@ class account_voucher(osv.osv):
'tax_id':fields.many2one('account.tax', 'Tax', readonly=True, states={'draft':[('readonly',False)]}),
'pre_line':fields.boolean('Previous Payments ?', required=False),
'date_due': fields.date('Due Date'),
- 'term_id':fields.many2one('account.payment.term', 'Term', required=False),
+# 'term_id':fields.many2one('account.payment.term', 'Term', required=False),
}
_defaults = {
'period_id': _get_period,
+ 'partner_id': _get_partner,
'journal_id':_get_journal,
'currency_id': _get_currency,
'type':_get_type,
@@ -143,7 +147,52 @@ class account_voucher(osv.osv):
'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'account.voucher',context=c),
'tax_id': _get_tax,
}
-
+
+ def compute_tax(self, cr, uid, ids, context={}):
+ tax_pool = self.pool.get('account.tax')
+ partner_pool = self.pool.get('res.partner')
+ position_pool = self.pool.get('account.fiscal.position')
+ voucher_line_pool = self.pool.get('account.voucher.line')
+ voucher_pool = self.pool.get('account.voucher')
+
+ for voucher in voucher_pool.browse(cr, uid, ids, context):
+ voucher_amount = 0.0
+ for line in voucher.line_ids:
+ voucher_amount += line.untax_amount or line.amount
+ line.amount = line.untax_amount or line.amount
+ voucher_line_pool.write(cr, uid, [line.id], {'amount':line.amount, 'untax_amount':line.untax_amount})
+
+ if not voucher.tax_id:
+ continue
+
+ tax = [tax_pool.browse(cr, uid, voucher.tax_id.id)]
+ partner = partner_pool.browse(cr, uid, voucher.partner_id.id) or False
+ taxes = position_pool.map_tax(cr, uid, partner and partner.property_account_position or False, tax)
+ tax = tax_pool.browse(cr, uid, taxes)
+
+ total = voucher_amount
+ total_tax = 0.0
+
+ if not tax[0].price_include:
+ for tax_line in tax_pool.compute_all(cr, uid, tax, voucher_amount, 1).get('taxes'):
+ total_tax += tax_line.get('amount')
+ total += total_tax
+ else:
+ line_ids2 = []
+ for line in voucher.line_ids:
+ line_total = 0.0
+ line_tax = 0.0
+
+ for tax_line in tax_pool.compute_all(cr, uid, tax, line.untax_amount or line.amount, 1).get('taxes'):
+ line_tax += tax_line.get('amount')
+ line_total += tax_line.get('price_unit')
+ total_tax += line_tax
+ untax_amount = line.untax_amount or line.amount
+ voucher_line_pool.write(cr, uid, [line.id], {'amount':line_total, 'untax_amount':untax_amount})
+
+ self.write(cr, uid, [voucher.id], {'amount':total, 'tax_amount':total_tax})
+ return True
+
# TODO: review this code.
def onchange_price(self, cr, uid, ids, line_ids, tax_id, partner_id=False, context={}):
tax_pool = self.pool.get('account.tax')
@@ -162,45 +211,16 @@ class account_voucher(osv.osv):
total_tax = 0.0
for line in line_ids:
+ line_amount = 0.0
+ if line[1]:
+ line_amount = voucher_line_pool.browse(cr, uid, line[1]).untax_amount
+ else:
+ line_amount = line[2].get('amount')
voucher_line_ids += [line[1]]
- voucher_total += line[2].get('amount')
+ voucher_total += line_amount
total = voucher_total
- if tax_id:
- tax = [tax_pool.browse(cr, uid, tax_id)]
-
- if partner_id:
- partner = partner_pool.browse(cr, uid, partner_id) or False
- taxes = position_pool.map_tax(cr, uid, partner and partner.property_account_position or False, tax)
- tax = tax_pool.browse(cr, uid, taxes)
-
- if not tax[0].price_include:
- for tax_line in tax_pool.compute_all(cr, uid, tax, voucher_total, 1).get('taxes'):
- total_tax += tax_line.get('amount')
- total += total_tax
- else:
- line_ids2 = []
- for line in line_ids:
- line_total = 0.0
- line_tax = 0.0
- operation = line[0]
- rec_id = line[1]
- rec = line[2]
- for tax_line in tax_pool.compute_all(cr, uid, tax, rec.get('amount'), 1).get('taxes'):
- line_tax += tax_line.get('amount')
- line_total += tax_line.get('price_unit')
- total_tax += line_tax
- if rec_id:
- voucher_line_pool.write(cr, uid, [rec_id], {'amount':line_total})
- line_ids2 += [rec_id]
- else:
- rec.update({
- 'amount':line_total
- })
- res.update({
- 'line_ids':line_ids2
- })
res.update({
'amount':total,
'tax_amount':total_tax
@@ -260,10 +280,6 @@ class account_voucher(osv.osv):
if journal.type in ('sale','sale_refund'):
account_id = partner.property_account_receivable.id
elif journal.type in ('purchase', 'purchase_refund','expense'):
- term_id = partner.property_payment_term.id
- if term_id:
- vals = self.onchange_term_id(cr, uid, ids, term_id, price)
- default['value'].update(vals.get('value'))
account_id = partner.property_account_payable.id
else:
account_id = journal.default_credit_account_id.id or journal.default_debit_account_id.id
@@ -274,16 +290,20 @@ class account_voucher(osv.osv):
if journal.type not in ('cash', 'bank'):
return default
+ total_credit = 0.0
+ total_debit = 0.0
account_type = 'receivable'
if ttype == 'payment':
account_type = 'payable'
+ total_debit = price or 0.0
else:
+ total_credit = price or 0.0
account_type = 'receivable'
-
+
ids = move_line_pool.search(cr, uid, [('account_id.type','=', account_type), ('reconcile_id','=', False), ('partner_id','=',partner_id)], context=context)
+ ids.reverse()
moves = move_line_pool.browse(cr, uid, ids)
- total_credit = price or 0.0
- total_debit = 0.0
+
for line in moves:
if line.credit and line.reconcile_partial_id:
continue
@@ -306,7 +326,7 @@ class account_voucher(osv.osv):
rs['amount'] = min(line.amount_unreconciled, total_debit)
total_debit -= rs['amount']
else:
- rs['amount'] = min(line.debit, total_credit)
+ rs['amount'] = min(line.amount_unreconciled, total_credit)
total_credit -= rs['amount']
default['value']['line_ids'].append(rs)
@@ -319,7 +339,7 @@ class account_voucher(osv.osv):
default['value']['pre_line'] = 1
elif ttype == 'receipt' and len(default['value']['line_dr_ids']) > 0:
default['value']['pre_line'] = 1
-
+
return default
def onchange_date(self, cr, user, ids, date, context={}):
@@ -340,7 +360,16 @@ class account_voucher(osv.osv):
}
def onchange_journal(self, cr, uid, ids, journal_id):
- return {}
+ if not journal_id:
+ return False
+ journal_pool = self.pool.get('account.journal')
+ journal = journal_pool.browse(cr, uid, journal_id)
+ account_id = journal.default_credit_account_id or journal.default_debit_account_id
+ tax_id = False
+ if account_id and account_id.tax_ids:
+ tax_id = account_id.tax_ids[0].id
+
+ return {'value':{'tax_id':tax_id}}
def proforma_voucher(self, cr, uid, ids):
self.action_move_line_create(cr, uid, ids)
@@ -354,9 +383,20 @@ class account_voucher(osv.osv):
return True
def cancel_voucher(self, cr, uid, ids, context={}):
+ reconcile_pool = self.pool.get('account.move.reconcile')
move_pool = self.pool.get('account.move')
voucher_line_pool = self.pool.get('account.voucher.line')
+
for voucher in self.browse(cr, uid, ids):
+ recs = []
+ for line in voucher.move_ids:
+ if line.reconcile_id:
+ recs += [line.reconcile_id.id]
+ if line.reconcile_partial_id:
+ recs += [line.reconcile_partial_id.id]
+
+ reconcile_pool.unlink(cr, uid, recs)
+
if voucher.move_id:
move_pool.button_cancel(cr, uid, [voucher.move_id.id])
move_pool.unlink(cr, uid, [voucher.move_id.id])
@@ -401,7 +441,7 @@ class account_voucher(osv.osv):
terms = term_pool.compute(cr, uid, term_id, amount)
return terms
return False
-
+
move_pool = self.pool.get('account.move')
move_line_pool = self.pool.get('account.move.line')
analytic_pool = self.pool.get('account.analytic.line')
@@ -439,54 +479,61 @@ class account_voucher(osv.osv):
credit = currency_pool.compute(cr, uid, inv.currency_id.id, company_currency, inv.amount)
elif inv.type in ('sale', 'receipt'):
debit = currency_pool.compute(cr, uid, inv.currency_id.id, company_currency, inv.amount)
-
- if inv.type == 'purchase' and inv.term_id and _get_payment_term_lines(inv.term_id.id, credit or debit):
- terms = _get_payment_term_lines(inv.term_id.id, credit or debit)
- for term in terms:
- due_date = term[0]
- amount = term[1]
- move_line = {
- 'name':inv.name or '/',
- 'debit':0.0,
- 'credit':amount,
- 'date_maturity':due_date,
- 'account_id':inv.account_id.id,
- 'move_id':move_id ,
- 'journal_id':inv.journal_id.id,
- 'period_id':inv.period_id.id,
- 'partner_id':inv.partner_id.id,
- 'currency_id':inv.currency_id.id,
- 'date':inv.date
- }
- master_line = move_line_pool.create(cr, uid, move_line)
- else:
- move_line = {
- 'name':inv.name or '/',
- 'debit':debit,
- 'credit':credit,
- 'account_id':inv.account_id.id,
- 'move_id':move_id ,
- 'journal_id':inv.journal_id.id,
- 'period_id':inv.period_id.id,
- 'partner_id':inv.partner_id.id,
- 'currency_id':inv.currency_id.id,
- 'date':inv.date
- }
- master_line = move_line_pool.create(cr, uid, move_line)
+ if debit < 0:
+ credit = -debit
+ debit = 0.0
+ if credit < 0:
+ debit = -credit
+ credit = 0.0
+
+ move_line = {
+ 'name':inv.name or '/',
+ 'debit':debit,
+ 'credit':credit,
+ 'account_id':inv.account_id.id,
+ 'move_id':move_id ,
+ 'journal_id':inv.journal_id.id,
+ 'period_id':inv.period_id.id,
+ 'partner_id':inv.partner_id.id,
+ 'currency_id':inv.currency_id.id,
+ 'date':inv.date,
+ 'date_maturity':inv.date_due
+ }
+ master_line = move_line_pool.create(cr, uid, move_line)
rec_list_ids = []
line_total = debit - credit
+
+ if inv.type == 'sale':
+ line_total = line_total - inv.tax_amount
+ elif inv.type == 'purchase':
+ line_total = line_total + inv.tax_amount
+
for line in inv.line_ids:
if not line.amount:
continue
amount = currency_pool.compute(cr, uid, inv.currency_id.id, company_currency, line.amount)
move_line = {
+ 'journal_id':inv.journal_id.id,
+ 'period_id':inv.period_id.id,
'name':line.name and line.name or '/',
'account_id':line.account_id.id,
'move_id':move_id,
'partner_id':inv.partner_id.id,
'currency_id':inv.currency_id.id,
+ 'analytic_account_id':line.account_analytic_id and line.account_analytic_id.id or False,
+ 'quantity':1,
+ 'credit':0.0,
+ 'debit':0.0,
+ 'date':inv.date
}
+ if amount < 0:
+ amount = -amount
+ if line.type == 'dr':
+ line.type = 'cr'
+ else:
+ line.type = 'dr'
+
if (line.type=='dr'):
line_total += amount
move_line['debit'] = amount
@@ -494,42 +541,16 @@ class account_voucher(osv.osv):
line_total -= amount
move_line['credit'] = amount
+ if inv.tax_id:
+ move_line.update({
+ 'account_tax_id':inv.tax_id.id,
+ })
+
master_line = move_line_pool.create(cr, uid, move_line)
if line.move_line_id.id:
rec_ids = [master_line, line.move_line_id.id]
rec_list_ids.append(rec_ids)
- if inv.tax_amount > 0:
- amount = currency_pool.compute(cr, uid, inv.currency_id.id, company_currency, inv.tax_amount)
- name = inv.tax_id and inv.tax_id.name or '/'
- move_line = {
- 'name':name,
- 'move_id':move_id ,
- 'journal_id':inv.journal_id.id,
- 'period_id':inv.period_id.id,
- 'partner_id':inv.partner_id.id,
- 'currency_id':inv.currency_id.id,
- }
-
- if inv.journal_id.type in ('sale','purchase_refund'):
- line_total -= amount
- move_line['credit'] = amount
- else:
- line_total += amount
- move_line['debit'] = amount
-
- account_id = False
- if inv.tax_id:
- if inv.journal_id.type in ('sale_refund','purchase_refund'):
- account_id = inv.tax_id.account_paid_id
- else:
- account_id = inv.tax_id.account_collected_id.id
- if not account_id:
- raise osv.except_osv(_('Invalid Error !'), _('No account defined on the related tax !'))
- move_line['account_id'] = account_id
-
- move_line_id = move_line_pool.create(cr, uid, move_line)
-
if not self.pool.get('res.currency').is_zero(cr, uid, inv.currency_id, line_total):
diff = line_total
move_line = {
@@ -563,7 +584,10 @@ class account_voucher(osv.osv):
default.update({
'state':'draft',
'number':False,
- 'move_id':False
+ 'move_id':False,
+ 'line_cr_ids':False,
+ 'line_dr_ids':False,
+ 'reference':False
})
if 'date' not in default:
default['date'] = time.strftime('%Y-%m-%d')
@@ -590,6 +614,7 @@ class account_voucher(osv.osv):
}
if view_type == 'form':
tview = voucher_type.get(context.get('type'))
+ tview = tview or 'view_voucher_form'
result = data_pool._get_id(cr, uid, 'account_voucher', tview)
view_id = data_pool.browse(cr, uid, result, context=context).res_id
@@ -597,7 +622,17 @@ class account_voucher(osv.osv):
#Restrict the list of journal view in search view
if view_type == 'search':
- journal_list = journal_pool.name_search(cr, uid, '', [], context=context)
+ type_search = {
+ 'bank':[('type','in',['bank','cash'])],
+ 'cash':[('type','in',['bank','cash'])],
+ 'sale':[('type','in',['sale','purchase_refund'])],
+ 'purchase':[('type','in',['purchase','sale_refund'])],
+ 'expense':[('type','in',['purchase'])],
+ 'sale_refund':[('type','in',['sale','purchase_refund'])],
+ 'purchase_refund':[('type','in',['purchase','sale_refund'])]
+ }
+ domain = type_search.get(context.get('journal_type'))
+ journal_list = journal_pool.name_search(cr, uid, '', domain)
res['fields']['journal_id']['selection'] = journal_list
return res
@@ -606,6 +641,8 @@ account_voucher()
class account_voucher_line(osv.osv):
_name = 'account.voucher.line'
_description = 'Voucher Lines'
+ _order = "move_line_id"
+
def _compute_balance(self, cr, uid, ids, name, args, context=None):
res = {}
for line in self.browse(cr, uid, ids):
@@ -623,6 +660,7 @@ class account_voucher_line(osv.osv):
'name':fields.char('Description', size=256),
'account_id':fields.many2one('account.account','Account', required=True),
'partner_id':fields.related('voucher_id', 'partner_id', type='many2one', relation='res.partner', string='Partner'),
+ 'untax_amount':fields.float('Untax Amount'),
'amount':fields.float('Amount'),
'type':fields.selection([('dr','Debit'),('cr','Credit')], 'Cr/Dr'),
'account_analytic_id': fields.many2one('account.analytic.account', 'Analytic Account'),
@@ -630,7 +668,7 @@ class account_voucher_line(osv.osv):
'date_original': fields.related('move_line_id','date', type='date', relation='account.move.line', string='Date', readonly=1),
'date_due': fields.related('move_line_id','date_maturity', type='date', relation='account.move.line', string='Due Date', readonly=1),
'amount_original': fields.function(_compute_balance, method=True, type='float', string='Originial Amount', store=True),
- 'amount_unreconciled': fields.related('move_line_id','amount_unreconciled', type='float', relation='account.move.line', string='Open Balance', readonly="1"),
+ 'amount_unreconciled': fields.related('move_line_id','amount_unreconciled', type='float', relation='account.move.line', string='Open Balance', store=True, readonly="1"),
}
_defaults = {
'name': lambda *a: ''
@@ -683,13 +721,16 @@ class account_voucher_line(osv.osv):
return values
journal = journal_pool.browse(cr, user, journal_id)
account_id = False
+ ttype = 'cr'
if journal.type in ('sale', 'purchase_refund'):
account_id = journal.default_credit_account_id and journal.default_credit_account_id.id or False
elif journal.type in ('purchase', 'expense', 'sale_refund'):
account_id = journal.default_debit_account_id and journal.default_debit_account_id.id or False
+ ttype = 'dr'
elif partner_id:
partner = partner_pool.browse(cr, user, partner_id, context=context)
if context.get('type') == 'payment':
+ ttype = 'dr'
account_id = partner.property_account_payable.id
elif context.get('type') == 'receipt':
account_id = partner.property_account_receivable.id
@@ -698,6 +739,7 @@ class account_voucher_line(osv.osv):
raise osv.except_osv(_('Invalid Error !'), _('Please change partner and try again !'))
values.update({
'account_id':account_id,
+ 'type':ttype
})
return values
account_voucher_line()
diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index 4ffba531dc4..406249b22cc 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -8,13 +8,13 @@
@@ -91,7 +94,7 @@
new
-
@@ -127,7 +130,7 @@
on_change="onchange_move_line_id(move_line_id)"
domain="[('account_id.type','in',('receivable','payable')), ('reconcile_id','=', False), ('partner_id','=',parent.partner_id)]"
/>
-
+
@@ -138,7 +141,7 @@
-
+
@@ -155,7 +158,7 @@
-
+
@@ -167,10 +170,10 @@
-
+
+
-
@@ -185,7 +188,7 @@
new
-
diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index f795ec14e4a..b778272551a 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -1,6 +1,16 @@
+
+
+ Sales Payment
+ account.voucher
+ form
+ [('journal_id.type', 'in', ['bank', 'cash']), ('type','=','receipt'), ('partner_id','=',partner_id)]
+ {'journal_type':'bank', 'type':'receipt', 'partner_id': partner_id}
+
+ new
+
account.voucher.sale.form
account.voucher
@@ -9,7 +19,7 @@
@@ -74,15 +85,24 @@
Sales Receipt
account.voucher.open
form
- [('journal_id.type','=','sale'), ('type','=','sale')]
+ [('journal_id.type','in',['sale','purchase_refund']), ('type','=','sale')]
{'journal_type':'sale', 'type':'sale'}
new
+ action="action_sale_receipt" parent="account.menu_finance_receivables" sequence="10"/>
+
+ Bill Payment
+ account.voucher
+ form
+ [('journal_id.type', 'in', ['bank', 'cash']), ('type','=','payment'), ('partner_id','=',partner_id)]
+ {'journal_type':'bank', 'type':'payment', 'partner_id': partner_id}
+
+ new
+
account.voucher.purchase.form
account.voucher
@@ -91,7 +111,7 @@
@@ -149,13 +171,13 @@
Vendor Bills
account.voucher.open
form
- [('journal_id.type','=','purchase'), ('type','=','purchase')]
+ [('journal_id.type','in',['purchase','sale_refund']), ('type','=','purchase')]
{'journal_type':'purchase', 'type':'purchase'}
new
+ action="action_purchase_receipt" parent="account.menu_finance_payables" sequence="10"/>
diff --git a/addons/account_voucher/voucher_view.xml b/addons/account_voucher/voucher_view.xml
index b7d66e71eeb..a8b86f5877e 100644
--- a/addons/account_voucher/voucher_view.xml
+++ b/addons/account_voucher/voucher_view.xml
@@ -12,7 +12,7 @@
-
+
@@ -27,46 +27,37 @@
@@ -139,19 +131,16 @@
-
+
+
+
-
-
-
-
-
diff --git a/addons/account_voucher/wizard/account_voucher_open.py b/addons/account_voucher/wizard/account_voucher_open.py
index 3efffe04c67..5ba55bf9856 100644
--- a/addons/account_voucher/wizard/account_voucher_open.py
+++ b/addons/account_voucher/wizard/account_voucher_open.py
@@ -124,7 +124,7 @@ class account_voucher_open(osv.osv_memory):
period_id = self._get_period(cr, uid, context)
menu = self.pool.get('ir.ui.menu').browse(cr, uid, context.get('active_id'))
- name = menu.name
+ name = context.get('title', menu.name)
result = data_pool._get_id(cr, uid, 'account_voucher', 'view_voucher_filter_new')
res_id = data_pool.browse(cr, uid, result, context=context).res_id
@@ -136,7 +136,7 @@ class account_voucher_open(osv.osv_memory):
'view_mode': 'tree,graph,form',
'res_model': 'account.voucher',
'view_id': False,
- 'context': "{'journal_id': %d, 'search_default_journal_id':%d, 'search_default_period_id':%d}" % (journal_id, journal_id, period_id),
+ 'context': "{'journal_id': %d, 'search_default_journal_id':%d, 'search_default_period_id':%d, 'partner_id':%s}" % (journal_id, journal_id, period_id, context.get('partner_id',False)),
'type': 'ir.actions.act_window',
'search_view_id': res_id
}
diff --git a/addons/account_voucher/wizard/account_voucher_unreconcile.py b/addons/account_voucher/wizard/account_voucher_unreconcile.py
index fdb51bb6b91..30cda8958d5 100644
--- a/addons/account_voucher/wizard/account_voucher_unreconcile.py
+++ b/addons/account_voucher/wizard/account_voucher_unreconcile.py
@@ -49,12 +49,10 @@ class account_voucher_unreconcile(osv.osv_memory):
recs += [line.reconcile_id.id]
if line.reconcile_partial_id:
recs += [line.reconcile_partial_id.id]
-
#for rec in recs:
reconcile_pool.unlink(cr, uid, recs)
-
- if res.remove:
- voucher_pool.cancel_voucher(cr, uid, [context.get('active_id')], context)
+# if res.remove:
+ voucher_pool.cancel_voucher(cr, uid, [context.get('active_id')], context)
# wf_service = netsvc.LocalService("workflow")
# wf_service.trg_validate(uid, 'account.voucher', context.get('active_id'), 'cancel_voucher', cr)
diff --git a/addons/account_voucher/wizard/account_voucher_unreconcile_view.xml b/addons/account_voucher/wizard/account_voucher_unreconcile_view.xml
index 3f8dd9c4e32..138aaec586f 100644
--- a/addons/account_voucher/wizard/account_voucher_unreconcile_view.xml
+++ b/addons/account_voucher/wizard/account_voucher_unreconcile_view.xml
@@ -11,8 +11,6 @@
-
-
diff --git a/addons/analytic/analytic.py b/addons/analytic/analytic.py
index ae0c7e11d5c..6393a471b21 100644
--- a/addons/analytic/analytic.py
+++ b/addons/analytic/analytic.py
@@ -340,7 +340,7 @@ class account_analytic_line(osv.osv):
'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'account.analytic.line', context=c),
}
- _order = 'date'
+ _order = 'date desc'
account_analytic_line()
diff --git a/addons/analytic/security/analytic_security.xml b/addons/analytic/security/analytic_security.xml
index a382380d962..8a9ebf573d5 100644
--- a/addons/analytic/security/analytic_security.xml
+++ b/addons/analytic/security/analytic_security.xml
@@ -7,5 +7,13 @@
[('company_id','=',user.company_id.id)]
+
+
+ Analytic Accounting / User
+
+
+ Analytic Accounting / Manager
+
+
diff --git a/addons/analytic/security/ir.model.access.csv b/addons/analytic/security/ir.model.access.csv
index 0343f29f43a..6c945ca9ea2 100644
--- a/addons/analytic/security/ir.model.access.csv
+++ b/addons/analytic/security/ir.model.access.csv
@@ -1 +1,5 @@
"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"access_account_analytic_account_manager","account.analytic.account manager","model_account_analytic_account","analytic.group_analytic_manager",1,1,1,1
+"access_account_analytic_line_manager","account.analytic.line manager","model_account_analytic_line","analytic.group_analytic_manager",1,1,1,1
+"access_account_analytic_account_user","account.analytic.account user","model_account_analytic_account","analytic.group_analytic_user",1,0,0,0
+"access_account_analytic_line_user","account.analytic.line user","model_account_analytic_line","analytic.group_analytic_user",1,0,0,0
\ No newline at end of file
diff --git a/addons/analytic_journal_billing_rate/i18n/tr.po b/addons/analytic_journal_billing_rate/i18n/tr.po
index f2418771b3c..8280adf8789 100644
--- a/addons/analytic_journal_billing_rate/i18n/tr.po
+++ b/addons/analytic_journal_billing_rate/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-29 09:43+0000\n"
+"PO-Revision-Date: 2010-08-31 08:08+0000\n"
"Last-Translator: Fabien (Open ERP) \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: 2010-08-30 03:58+0000\n"
+"X-Launchpad-Export-Date: 2010-09-01 04:00+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: analytic_journal_billing_rate
diff --git a/addons/analytic_user_function/i18n/tr.po b/addons/analytic_user_function/i18n/tr.po
index 8078b09134e..136f14ae807 100644
--- a/addons/analytic_user_function/i18n/tr.po
+++ b/addons/analytic_user_function/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-29 09:43+0000\n"
+"PO-Revision-Date: 2010-08-31 08:08+0000\n"
"Last-Translator: Fabien (Open ERP) \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: 2010-08-30 03:58+0000\n"
+"X-Launchpad-Export-Date: 2010-09-01 04:00+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: analytic_user_function
diff --git a/addons/association/profile_association.xml b/addons/association/profile_association.xml
index 032005010e0..a149cfb0952 100644
--- a/addons/association/profile_association.xml
+++ b/addons/association/profile_association.xml
@@ -12,8 +12,8 @@
Association Profile Configuration
-
-
+
+
Install more modules. A few modules are proposed according to the Association Profile you selected. You will be able to install them based on our requirements.
@@ -51,21 +51,10 @@
3
-
- ir.actions.todo
- association_installer_action_replace
- tree
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
diff --git a/addons/auction/auction_demo.xml b/addons/auction/auction_demo.xml
index 51d9c166178..a26e5355cde 100644
--- a/addons/auction/auction_demo.xml
+++ b/addons/auction/auction_demo.xml
@@ -808,7 +808,6 @@
Demo
- -->
diff --git a/addons/auction/i18n/lt.po b/addons/auction/i18n/lt.po
index 6eb7d1bbdc2..bd97ccbac98 100644
--- a/addons/auction/i18n/lt.po
+++ b/addons/auction/i18n/lt.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-29 08:57+0000\n"
+"PO-Revision-Date: 2010-08-31 07:59+0000\n"
"Last-Translator: Fabien (Open ERP) \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: 2010-08-30 03:58+0000\n"
+"X-Launchpad-Export-Date: 2010-09-01 03:59+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: auction
diff --git a/addons/auction/i18n/nl.po b/addons/auction/i18n/nl.po
index 672883ceb24..75d893a9b2b 100644
--- a/addons/auction/i18n/nl.po
+++ b/addons/auction/i18n/nl.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-29 10:34+0000\n"
+"PO-Revision-Date: 2010-08-31 08:19+0000\n"
"Last-Translator: OpenERP Administrators \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: 2010-08-30 03:58+0000\n"
+"X-Launchpad-Export-Date: 2010-09-01 03:59+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: auction
diff --git a/addons/auction/i18n/tr.po b/addons/auction/i18n/tr.po
index dc07313ae2e..0320aa3df18 100644
--- a/addons/auction/i18n/tr.po
+++ b/addons/auction/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-29 09:42+0000\n"
+"PO-Revision-Date: 2010-08-31 08:08+0000\n"
"Last-Translator: OpenERP Administrators \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: 2010-08-30 03:58+0000\n"
+"X-Launchpad-Export-Date: 2010-09-01 04:00+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: auction
diff --git a/addons/audittrail/i18n/lt.po b/addons/audittrail/i18n/lt.po
index caf692ea6eb..216b0b6b43b 100644
--- a/addons/audittrail/i18n/lt.po
+++ b/addons/audittrail/i18n/lt.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-29 10:43+0000\n"
+"PO-Revision-Date: 2010-08-31 08:23+0000\n"
"Last-Translator: OpenERP Administrators \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: 2010-08-30 03:58+0000\n"
+"X-Launchpad-Export-Date: 2010-09-01 04:00+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: audittrail
diff --git a/addons/audittrail/i18n/tr.po b/addons/audittrail/i18n/tr.po
index 7da4abbf876..c462f84de32 100644
--- a/addons/audittrail/i18n/tr.po
+++ b/addons/audittrail/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-29 09:56+0000\n"
+"PO-Revision-Date: 2010-08-31 08:09+0000\n"
"Last-Translator: Fabien (Open ERP) \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: 2010-08-30 03:58+0000\n"
+"X-Launchpad-Export-Date: 2010-09-01 04:00+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: audittrail
diff --git a/addons/audittrail/i18n/zh_CN.po b/addons/audittrail/i18n/zh_CN.po
index 75522522104..626056153a3 100644
--- a/addons/audittrail/i18n/zh_CN.po
+++ b/addons/audittrail/i18n/zh_CN.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-29 09:53+0000\n"
+"PO-Revision-Date: 2010-08-31 08:09+0000\n"
"Last-Translator: Black Jack \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: 2010-08-30 03:58+0000\n"
+"X-Launchpad-Export-Date: 2010-09-01 04:00+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: audittrail
diff --git a/addons/base_action_rule/i18n/fr.po b/addons/base_action_rule/i18n/fr.po
index d12cbfdc6f8..df5ec2716cf 100644
--- a/addons/base_action_rule/i18n/fr.po
+++ b/addons/base_action_rule/i18n/fr.po
@@ -6,18 +6,20 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-08-19 12:31:13+0000\n"
-"PO-Revision-Date: 2010-08-19 12:31:13+0000\n"
+"POT-Creation-Date: 2010-08-19 12:20+0000\n"
+"PO-Revision-Date: 2010-08-30 12:19+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"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-08-31 03:59+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
#. module: base_action_rule
#: help:base.action.rule,act_mail_to_user:0
-msgid "Check this if you want the rule to send an email to the responsible person."
+msgid ""
+"Check this if you want the rule to send an email to the responsible person."
msgstr ""
#. module: base_action_rule
@@ -37,7 +39,8 @@ msgstr ""
#. module: base_action_rule
#: help:base.action.rule,act_remind_user:0
-msgid "Check this if you want the rule to send a reminder by email to the user."
+msgid ""
+"Check this if you want the rule to send a reminder by email to the user."
msgstr ""
#. module: base_action_rule
@@ -83,7 +86,9 @@ msgstr ""
#. module: base_action_rule
#: help:base.action.rule,act_email_cc:0
-msgid "These people will receive a copy of the future communication between partner and users by email"
+msgid ""
+"These people will receive a copy of the future communication between partner "
+"and users by email"
msgstr ""
#. module: base_action_rule
@@ -98,7 +103,8 @@ msgstr ""
#. module: base_action_rule
#: help:base.action.rule,act_remind_partner:0
-msgid "Check this if you want the rule to send a reminder by email to the partner."
+msgid ""
+"Check this if you want the rule to send a reminder by email to the partner."
msgstr ""
#. module: base_action_rule
@@ -209,7 +215,9 @@ msgstr ""
#. module: base_action_rule
#: view:base.action.rule:0
-msgid "The rule uses the AND operator. The model must match all non-empty fields so that the rule executes the action described in the 'Actions' tab."
+msgid ""
+"The rule uses the AND operator. The model must match all non-empty fields so "
+"that the rule executes the action described in the 'Actions' tab."
msgstr ""
#. module: base_action_rule
@@ -219,8 +227,10 @@ msgstr ""
#. module: base_action_rule
#: help:base.action.rule,regex_name:0
-msgid "Regular expression for matching name of the resource\n"
-"e.g.: 'urgent.*' will search for records having name starting with the string 'urgent'\n"
+msgid ""
+"Regular expression for matching name of the resource\n"
+"e.g.: 'urgent.*' will search for records having name starting with the "
+"string 'urgent'\n"
"Note: This is case sensitive search."
msgstr ""
@@ -231,7 +241,9 @@ msgstr ""
#. module: base_action_rule
#: help:base.action.rule,act_mail_to_watchers:0
-msgid "Check this if you want the rule to mark CC(mail to any other person defined in actions)."
+msgid ""
+"Check this if you want the rule to mark CC(mail to any other person defined "
+"in actions)."
msgstr ""
#. module: base_action_rule
@@ -261,7 +273,10 @@ msgstr ""
#. module: base_action_rule
#: help:base.action.rule,trg_date_range:0
-msgid "Delay After Trigger Date,specifies you can put a negative number. If you need a delay before the trigger date, like sending a reminder 15 minutes before a meeting."
+msgid ""
+"Delay After Trigger Date,specifies you can put a negative number. If you "
+"need a delay before the trigger date, like sending a reminder 15 minutes "
+"before a meeting."
msgstr ""
#. module: base_action_rule
@@ -307,7 +322,8 @@ msgstr ""
#. module: base_action_rule
#: help:base.action.rule,server_action_id:0
-msgid "Describes the action name.\n"
+msgid ""
+"Describes the action name.\n"
"eg:on which object which action to be taken on basis of which condition"
msgstr ""
@@ -333,7 +349,8 @@ msgstr ""
#. module: base_action_rule
#: constraint:ir.model:0
-msgid "The Object name must start with x_ and not contain any special character !"
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
msgstr ""
#. module: base_action_rule
@@ -414,7 +431,9 @@ msgstr ""
#. module: base_action_rule
#: help:base.action.rule,act_remind_attach:0
-msgid "Check this if you want that all documents attached to the object be attached to the reminder email sent."
+msgid ""
+"Check this if you want that all documents attached to the object be attached "
+"to the reminder email sent."
msgstr ""
#. module: base_action_rule
@@ -434,7 +453,9 @@ msgstr ""
#. module: base_action_rule
#: help:base.action.rule,active:0
-msgid "If the active field is set to False, it will allow you to hide the rule without removing it."
+msgid ""
+"If the active field is set to False, it will allow you to hide the rule "
+"without removing it."
msgstr ""
#. module: base_action_rule
@@ -456,4 +477,3 @@ msgstr ""
#: field:base.action.rule,trg_date_type:0
msgid "Trigger Date"
msgstr ""
-
diff --git a/addons/base_calendar/i18n/fr.po b/addons/base_calendar/i18n/fr.po
index 1c5efc1526c..fc8a802e556 100644
--- a/addons/base_calendar/i18n/fr.po
+++ b/addons/base_calendar/i18n/fr.po
@@ -6,14 +6,15 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-08-19 12:50:56+0000\n"
-"PO-Revision-Date: 2010-08-19 12:50:56+0000\n"
+"POT-Creation-Date: 2010-08-19 12:50+0000\n"
+"PO-Revision-Date: 2010-08-30 12:19+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"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-08-31 03:59+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
#. module: base_calendar
#: selection:calendar.alarm,trigger_related:0
@@ -36,7 +37,9 @@ msgstr ""
#. module: base_calendar
#: help:calendar.event,exdate:0
#: help:calendar.todo,exdate:0
-msgid "This property defines the list of date/time exceptions for a recurring calendar component."
+msgid ""
+"This property defines the list of date/time exceptions for a recurring "
+"calendar component."
msgstr ""
#. module: base_calendar
@@ -327,7 +330,8 @@ msgstr ""
#. module: base_calendar
#: help:calendar.event,exrule:0
#: help:calendar.todo,exrule:0
-msgid "defines a rule or repeating pattern for an exception to a recurrence set"
+msgid ""
+"defines a rule or repeating pattern for an exception to a recurrence set"
msgstr ""
#. module: base_calendar
@@ -797,7 +801,8 @@ msgstr ""
#. module: base_calendar
#: constraint:ir.model:0
-msgid "The Object name must start with x_ and not contain any special character !"
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
msgstr ""
#. module: base_calendar
@@ -839,7 +844,9 @@ msgstr ""
#. module: base_calendar
#: help:calendar.attendee,dir:0
-msgid "Reference to the URIthat points to the directory information corresponding to the attendee."
+msgid ""
+"Reference to the URIthat points to the directory information corresponding "
+"to the attendee."
msgstr ""
#. module: base_calendar
@@ -1010,7 +1017,9 @@ msgstr ""
#. module: base_calendar
#: help:calendar.alarm,duration:0
#: help:res.alarm,duration:0
-msgid "Duration' and 'Repeat' are both optional, but if one occurs, so MUST the other"
+msgid ""
+"Duration' and 'Repeat' are both optional, but if one occurs, so MUST the "
+"other"
msgstr ""
#. module: base_calendar
@@ -1052,7 +1061,9 @@ msgstr ""
#: help:calendar.event,active:0
#: help:calendar.todo,active:0
#: help:res.alarm,active:0
-msgid "If the active field is set to true, it will allow you to hide the event alarm information without removing it."
+msgid ""
+"If the active field is set to true, it will allow you to hide the event "
+"alarm information without removing it."
msgstr ""
#. module: base_calendar
@@ -1126,7 +1137,10 @@ msgstr ""
#. module: base_calendar
#: help:calendar.alarm,description:0
-msgid "Provides a more complete description of the calendar component, than that provided by the \"SUMMARY\" property"
+msgid ""
+"Provides a more complete description of the "
+"calendar component, than that provided by the "
+"\"SUMMARY\" property"
msgstr ""
#. module: base_calendar
@@ -1195,7 +1209,8 @@ msgstr ""
#. module: base_calendar
#: help:calendar.attendee,language:0
-msgid "To specify the language for text values in aproperty or property parameter."
+msgid ""
+"To specify the language for text values in aproperty or property parameter."
msgstr ""
#. module: base_calendar
@@ -1219,8 +1234,10 @@ msgstr ""
#. module: base_calendar
#: help:calendar.event,rrule:0
#: help:calendar.todo,rrule:0
-msgid "Defines a rule or repeating pattern for recurring events\n"
-"e.g.: Every other month on the last Sunday of the month for 10 occurrences: FREQ=MONTHLY;INTERVAL=2;COUNT=10;BYDAY=-1SU"
+msgid ""
+"Defines a rule or repeating pattern for recurring events\n"
+"e.g.: Every other month on the last Sunday of the month for 10 occurrences: "
+" FREQ=MONTHLY;INTERVAL=2;COUNT=10;BYDAY=-1SU"
msgstr ""
#. module: base_calendar
@@ -1292,7 +1309,8 @@ msgstr ""
#. module: base_calendar
#: model:ir.module.module,description:base_calendar.module_meta_information
-msgid "Full featured calendar system that supports:\n"
+msgid ""
+"Full featured calendar system that supports:\n"
" - Calendar of events\n"
" - Alerts (create requests)\n"
" - Recurring events\n"
@@ -1342,7 +1360,9 @@ msgstr ""
#. module: base_calendar
#: help:calendar.alarm,name:0
-msgid "Contains the text to be used as the message subject for email or contains the text to be used for display"
+msgid ""
+"Contains the text to be used as the message subject for "
+"email or contains the text to be used for display"
msgstr ""
#. module: base_calendar
@@ -1502,9 +1522,13 @@ msgstr ""
#. module: base_calendar
#: help:calendar.alarm,attach:0
-msgid "* Points to a sound resource, which is rendered when the alarm is triggered for audio,\n"
-" * File which is intended to be sent as message attachments for email,\n"
-" * Points to a procedure resource, which is invoked when the alarm is triggered for procedure."
+msgid ""
+"* Points to a sound resource, which is rendered when the "
+"alarm is triggered for audio,\n"
+" * File which is intended to be sent as message "
+"attachments for email,\n"
+" * Points to a procedure resource, which is invoked when "
+" the alarm is triggered for procedure."
msgstr ""
#. module: base_calendar
@@ -1513,4 +1537,3 @@ msgstr ""
#: selection:calendar.todo,byday:0
msgid "Fifth"
msgstr ""
-
diff --git a/addons/base_contact/base_contact_view.xml b/addons/base_contact/base_contact_view.xml
index e602968798f..1f22b550bdc 100644
--- a/addons/base_contact/base_contact_view.xml
+++ b/addons/base_contact/base_contact_view.xml
@@ -190,8 +190,6 @@
-
-
diff --git a/addons/base_contact/i18n/lt.po b/addons/base_contact/i18n/lt.po
index f79c1552aff..7aae9789762 100644
--- a/addons/base_contact/i18n/lt.po
+++ b/addons/base_contact/i18n/lt.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-29 10:27+0000\n"
+"PO-Revision-Date: 2010-08-31 08:18+0000\n"
"Last-Translator: Giedrius Slavinskas \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: 2010-08-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-09-01 03:58+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
"Language: lt\n"
diff --git a/addons/base_contact/i18n/tr.po b/addons/base_contact/i18n/tr.po
index f5e72f3055a..fd3fb3104fd 100644
--- a/addons/base_contact/i18n/tr.po
+++ b/addons/base_contact/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-29 10:42+0000\n"
+"PO-Revision-Date: 2010-08-31 08:22+0000\n"
"Last-Translator: OpenERP Administrators \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: 2010-08-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-09-01 03:58+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base_contact
diff --git a/addons/base_contact/i18n/zh_CN.po b/addons/base_contact/i18n/zh_CN.po
index dc2fb21fded..22123492b4f 100644
--- a/addons/base_contact/i18n/zh_CN.po
+++ b/addons/base_contact/i18n/zh_CN.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-29 10:38+0000\n"
+"PO-Revision-Date: 2010-08-31 08:21+0000\n"
"Last-Translator: Black Jack \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: 2010-08-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-09-01 03:58+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base_contact
diff --git a/addons/base_iban/i18n/tr.po b/addons/base_iban/i18n/tr.po
index d17bd1b5d5d..bd2ff7b70d9 100644
--- a/addons/base_iban/i18n/tr.po
+++ b/addons/base_iban/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-29 10:39+0000\n"
+"PO-Revision-Date: 2010-08-31 08:21+0000\n"
"Last-Translator: Fabien (Open ERP) \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: 2010-08-30 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-09-01 03:57+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base_iban
diff --git a/addons/base_module_quality/i18n/tr.po b/addons/base_module_quality/i18n/tr.po
index 69bf9c4dd68..18e7c8dc3df 100644
--- a/addons/base_module_quality/i18n/tr.po
+++ b/addons/base_module_quality/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-29 09:02+0000\n"
+"PO-Revision-Date: 2010-08-31 08:01+0000\n"
"Last-Translator: Fabien (Open ERP) \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: 2010-08-30 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-09-01 04:00+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base_module_quality
diff --git a/addons/base_module_record/i18n/tr.po b/addons/base_module_record/i18n/tr.po
index 7741f171422..6398e42e566 100644
--- a/addons/base_module_record/i18n/tr.po
+++ b/addons/base_module_record/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-29 09:56+0000\n"
+"PO-Revision-Date: 2010-08-31 08:09+0000\n"
"Last-Translator: OpenERP Administrators \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: 2010-08-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-09-01 03:58+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base_module_record
diff --git a/addons/base_report_creator/i18n/tr.po b/addons/base_report_creator/i18n/tr.po
index 054a0271870..2fd4aed9157 100644
--- a/addons/base_report_creator/i18n/tr.po
+++ b/addons/base_report_creator/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-29 10:27+0000\n"
+"PO-Revision-Date: 2010-08-31 08:18+0000\n"
"Last-Translator: Fabien (Open ERP) \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: 2010-08-30 03:58+0000\n"
+"X-Launchpad-Export-Date: 2010-09-01 04:00+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base_report_creator
diff --git a/addons/base_report_designer/i18n/tr.po b/addons/base_report_designer/i18n/tr.po
index f989e1c215f..d273ce4f3d0 100644
--- a/addons/base_report_designer/i18n/tr.po
+++ b/addons/base_report_designer/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-29 10:13+0000\n"
+"PO-Revision-Date: 2010-08-31 08:12+0000\n"
"Last-Translator: OpenERP Administrators \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: 2010-08-30 03:58+0000\n"
+"X-Launchpad-Export-Date: 2010-09-01 03:59+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base_report_designer
diff --git a/addons/base_setup/base_setup_installer.xml b/addons/base_setup/base_setup_installer.xml
index 08a85d32436..cdaf66100ac 100644
--- a/addons/base_setup/base_setup_installer.xml
+++ b/addons/base_setup/base_setup_installer.xml
@@ -53,16 +53,5 @@
2
-
- ir.actions.todo
- base_setup_installer_action_replace
- tree
-
-
-
-
-
-
-
diff --git a/addons/base_setup/i18n/tr.po b/addons/base_setup/i18n/tr.po
index 1bc9fd9adee..5d3542213ba 100644
--- a/addons/base_setup/i18n/tr.po
+++ b/addons/base_setup/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-29 10:32+0000\n"
+"PO-Revision-Date: 2010-08-31 08:19+0000\n"
"Last-Translator: OpenERP Administrators \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: 2010-08-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-09-01 03:58+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base_setup
diff --git a/addons/base_vat/i18n/tr.po b/addons/base_vat/i18n/tr.po
index 7b53b27c9e6..99c25adfb0e 100644
--- a/addons/base_vat/i18n/tr.po
+++ b/addons/base_vat/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-29 10:34+0000\n"
+"PO-Revision-Date: 2010-08-31 08:19+0000\n"
"Last-Translator: Fabien (Open ERP) \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: 2010-08-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-09-01 03:58+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base_vat
diff --git a/addons/board/board_view.xml b/addons/board/board_view.xml
index 79e3ff5dd9d..984a17caa51 100644
--- a/addons/board/board_view.xml
+++ b/addons/board/board_view.xml
@@ -88,7 +88,7 @@
+
+
+ board.board.search
+ board.board
+ search
+
+
+
+
+
+
+
@@ -121,6 +133,7 @@
board.board
form
tree,form
+
|