openerp-dev-web team mailing list archive
-
openerp-dev-web team
-
Mailing list archive
-
Message #04124
[Merge] lp:~openerp-dev/openobject-addons/fix-osv-wizard into lp:openobject-addons
Rucha (Open ERP) has proposed merging lp:~openerp-dev/openobject-addons/fix-osv-wizard into lp:openobject-addons.
Requested reviews:
qdp (OpenERP) (qdp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/fix-osv-wizard/+merge/53210
--
https://code.launchpad.net/~openerp-dev/openobject-addons/fix-osv-wizard/+merge/53210
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/fix-osv-wizard.
=== modified file 'account/i18n/hu.po'
--- account/i18n/hu.po 2011-03-04 04:45:28 +0000
+++ account/i18n/hu.po 2011-03-14 09:45:25 +0000
@@ -7,14 +7,23 @@
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+<<<<<<< TREE
"PO-Revision-Date: 2011-03-03 14:39+0000\n"
+=======
+"PO-Revision-Date: 2011-02-25 15:00+0000\n"
+>>>>>>> MERGE-SOURCE
"Last-Translator: NOVOTRADE RENDSZERHÃZ <openerp@xxxxxxxxxxxx>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2011-03-04 04:44+0000\n"
"X-Generator: Launchpad (build 12351)\n"
+=======
+"X-Launchpad-Export-Date: 2011-02-26 05:00+0000\n"
+"X-Generator: Launchpad (build 12351)\n"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
=== modified file 'account/i18n/pt_BR.po'
--- account/i18n/pt_BR.po 2011-03-09 13:14:25 +0000
+++ account/i18n/pt_BR.po 2011-03-14 09:45:25 +0000
@@ -7,13 +7,21 @@
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+<<<<<<< TREE
"PO-Revision-Date: 2011-03-08 21:39+0000\n"
+=======
+"PO-Revision-Date: 2011-02-20 20:25+0000\n"
+>>>>>>> MERGE-SOURCE
"Last-Translator: Emerson <Unknown>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2011-03-09 04:39+0000\n"
+=======
+"X-Launchpad-Export-Date: 2011-02-21 04:50+0000\n"
+>>>>>>> MERGE-SOURCE
"X-Generator: Launchpad (build 12351)\n"
#. module: account
=== modified file 'account/wizard/account_automatic_reconcile.py'
--- account/wizard/account_automatic_reconcile.py 2011-02-15 12:13:39 +0000
+++ account/wizard/account_automatic_reconcile.py 2011-03-14 09:45:25 +0000
@@ -143,15 +143,15 @@
obj_model = self.pool.get('ir.model.data')
if context is None:
context = {}
- form = self.read(cr, uid, ids, [])[0]
- max_amount = form.get('max_amount', False) and form.get('max_amount') or 0.0
- power = form['power']
- allow_write_off = form['allow_write_off']
+ form = self.browse(cr, uid, ids, context=context)[0]
+ max_amount = form.max_amount or 0.0
+ power = form.power
+ allow_write_off = form.allow_write_off
reconciled = unreconciled = 0
- if not form['account_ids']:
+ if not form.account_ids:
raise osv.except_osv(_('UserError'), _('You must select accounts to reconcile'))
- for account_id in form['account_ids']:
- params = (account_id,)
+ for account_id in form.account_ids:
+ params = (account_id.id,)
if not allow_write_off:
query = """SELECT partner_id FROM account_move_line WHERE account_id=%s AND reconcile_id IS NULL
AND state <> 'draft' GROUP BY partner_id
@@ -172,12 +172,12 @@
"AND partner_id=%s " \
"AND state <> 'draft' " \
"AND reconcile_id IS NULL",
- (account_id, partner_id))
+ (account_id.id, partner_id))
line_ids = [id for (id,) in cr.fetchall()]
if line_ids:
reconciled += len(line_ids)
if allow_write_off:
- move_line_obj.reconcile(cr, uid, line_ids, 'auto', form['writeoff_acc_id'], form['period_id'], form['journal_id'], context)
+ move_line_obj.reconcile(cr, uid, line_ids, 'auto', form.writeoff_acc_id.id, form.period_id.id, form.journal_id.id, context)
else:
move_line_obj.reconcile_partial(cr, uid, line_ids, 'manual', context=context)
@@ -191,7 +191,7 @@
"AND partner_id IS NOT NULL " \
"GROUP BY partner_id " \
"HAVING count(*)>1",
- (account_id,))
+ (account_id.id,))
partner_ids = [id for (id,) in cr.fetchall()]
#filter?
for partner_id in partner_ids:
@@ -205,7 +205,7 @@
"AND state <> 'draft' " \
"AND debit > 0 " \
"ORDER BY date_maturity",
- (account_id, partner_id))
+ (account_id.id, partner_id))
debits = cr.fetchall()
# get the list of unreconciled 'credit transactions' for this partner
@@ -218,10 +218,10 @@
"AND state <> 'draft' " \
"AND credit > 0 " \
"ORDER BY date_maturity",
- (account_id, partner_id))
+ (account_id.id, partner_id))
credits = cr.fetchall()
- (rec, unrec) = self.do_reconcile(cr, uid, credits, debits, max_amount, power, form['writeoff_acc_id'], form['period_id'], form['journal_id'], context)
+ (rec, unrec) = self.do_reconcile(cr, uid, credits, debits, max_amount, power, form.writeoff_acc_id.id, form.period_id.id, form.journal_id.id, context)
reconciled += rec
unreconciled += unrec
@@ -234,7 +234,7 @@
"WHERE account_id=%s " \
"AND reconcile_id IS NULL " \
"AND state <> 'draft' " + partner_filter,
- (account_id,))
+ (account_id.id,))
additional_unrec = cr.fetchone()[0]
unreconciled = unreconciled + additional_unrec
context.update({'reconciled': reconciled, 'unreconciled': unreconciled})
@@ -252,4 +252,4 @@
account_automatic_reconcile()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
=== modified file 'account/wizard/account_change_currency.py'
--- account/wizard/account_change_currency.py 2011-02-15 12:13:39 +0000
+++ account/wizard/account_change_currency.py 2011-03-14 09:45:25 +0000
@@ -45,8 +45,8 @@
obj_currency = self.pool.get('res.currency')
if context is None:
context = {}
- data = self.read(cr, uid, ids)[0]
- new_currency = data['currency_id']
+ data = self.browse(cr, uid, ids, context=context)[0]
+ new_currency = data.currency_id.id
invoice = obj_inv.browse(cr, uid, context['active_id'], context=context)
if invoice.currency_id.id == new_currency:
@@ -76,4 +76,4 @@
account_change_currency()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
=== modified file 'account/wizard/account_chart.py'
--- account/wizard/account_chart.py 2011-02-15 12:13:39 +0000
+++ account/wizard/account_chart.py 2011-03-14 09:45:25 +0000
@@ -79,17 +79,17 @@
fy_obj = self.pool.get('account.fiscalyear')
if context is None:
context = {}
- data = self.read(cr, uid, ids, [], context=context)[0]
+ data = self.browse(cr, uid, ids, context=context)[0]
result = mod_obj.get_object_reference(cr, uid, 'account', 'action_account_tree')
id = result and result[1] or False
result = act_obj.read(cr, uid, [id], context=context)[0]
result['periods'] = []
- if data['period_from'] and data['period_to']:
- result['periods'] = period_obj.build_ctx_periods(cr, uid, data['period_from'], data['period_to'])
- result['context'] = str({'fiscalyear': data['fiscalyear'], 'periods': result['periods'], \
- 'state': data['target_move']})
- if data['fiscalyear']:
- result['name'] += ':' + fy_obj.read(cr, uid, [data['fiscalyear']], context=context)[0]['code']
+ if data.period_from and data.period_to:
+ result['periods'] = period_obj.build_ctx_periods(cr, uid, data.period_from.id, data.period_to.id)
+ result['context'] = str({'fiscalyear': data.fiscalyear.id, 'periods': result['periods'], \
+ 'state': data.target_move})
+ if data.fiscalyear:
+ result['name'] += ':' + fy_obj.read(cr, uid, [data.fiscalyear.id], context=context)[0]['code']
return result
_defaults = {
=== modified file 'account/wizard/account_fiscalyear_close.py'
--- account/wizard/account_fiscalyear_close.py 2011-02-15 12:13:39 +0000
+++ account/wizard/account_fiscalyear_close.py 2011-03-14 09:45:25 +0000
@@ -56,22 +56,22 @@
obj_acc_account = self.pool.get('account.account')
obj_acc_journal_period = self.pool.get('account.journal.period')
- data = self.read(cr, uid, ids, context=context)
+ data = self.browse(cr, uid, ids, context=context)
if context is None:
context = {}
- fy_id = data[0]['fy_id']
+ fy_id = data[0].fy_id.id
- cr.execute("SELECT id FROM account_period WHERE date_stop < (SELECT date_start FROM account_fiscalyear WHERE id = %s)", (str(data[0]['fy2_id']),))
+ cr.execute("SELECT id FROM account_period WHERE date_stop < (SELECT date_start FROM account_fiscalyear WHERE id = %s)", (str(data[0].fy2_id.id),))
fy_period_set = ','.join(map(lambda id: str(id[0]), cr.fetchall()))
cr.execute("SELECT id FROM account_period WHERE date_start > (SELECT date_stop FROM account_fiscalyear WHERE id = %s)", (str(fy_id),))
fy2_period_set = ','.join(map(lambda id: str(id[0]), cr.fetchall()))
- period = obj_acc_period.browse(cr, uid, data[0]['period_id'], context=context)
- new_fyear = obj_acc_fiscalyear.browse(cr, uid, data[0]['fy2_id'], context=context)
- old_fyear = obj_acc_fiscalyear.browse(cr, uid, data[0]['fy_id'], context=context)
+ period = obj_acc_period.browse(cr, uid, data[0].period_id.id, context=context)
+ new_fyear = obj_acc_fiscalyear.browse(cr, uid, data[0].fy2_id.id, context=context)
+ old_fyear = obj_acc_fiscalyear.browse(cr, uid, fy_id, context=context)
- new_journal = data[0]['journal_id']
+ new_journal = data[0].journal_id.id
new_journal = obj_acc_journal.browse(cr, uid, new_journal, context=context)
if not new_journal.default_credit_account_id or not new_journal.default_debit_account_id:
@@ -107,7 +107,7 @@
obj_acc_move_line.create(cr, uid, {
'debit': account.balance>0 and account.balance,
'credit': account.balance<0 and -account.balance,
- 'name': data[0]['report_name'],
+ 'name': data[0].report_name,
'date': period.date_start,
'journal_id': new_journal.id,
'period_id': period.id,
@@ -204,7 +204,7 @@
if ids:
obj_acc_move_line.reconcile(cr, uid, ids, context=context)
- new_period = data[0]['period_id']
+ new_period = data[0].period_id.id
ids = obj_acc_journal_period.search(cr, uid, [('journal_id','=',new_journal.id),('period_id','=',new_period)])
if not ids:
ids = [obj_acc_journal_period.create(cr, uid, {
=== modified file 'account/wizard/account_fiscalyear_close_state.py'
--- account/wizard/account_fiscalyear_close_state.py 2011-02-15 12:13:39 +0000
+++ account/wizard/account_fiscalyear_close_state.py 2011-03-14 09:45:25 +0000
@@ -40,8 +40,8 @@
@param ids: List of Account fiscalyear close state’s IDs
"""
- for data in self.read(cr, uid, ids, context=context):
- fy_id = data['fy_id']
+ for data in self.browse(cr, uid, ids, context=context):
+ fy_id = data.fy_id.id
cr.execute('UPDATE account_journal_period ' \
'SET state = %s ' \
@@ -61,4 +61,4 @@
account_fiscalyear_close_state()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
=== modified file 'account/wizard/account_invoice_refund.py'
--- account/wizard/account_invoice_refund.py 2011-02-15 12:13:39 +0000
+++ account/wizard/account_invoice_refund.py 2011-03-14 09:45:25 +0000
@@ -88,29 +88,29 @@
if context is None:
context = {}
- for form in self.read(cr, uid, ids, context=context):
+ for form in self.browse(cr, uid, ids, context=context):
created_inv = []
date = False
period = False
description = False
company = res_users_obj.browse(cr, uid, uid, context=context).company_id
- journal_id = form.get('journal_id', False)
+ journal_id = form.journal_id.id
for inv in inv_obj.browse(cr, uid, context.get('active_ids'), context=context):
if inv.state in ['draft', 'proforma2', 'cancel']:
raise osv.except_osv(_('Error !'), _('Can not %s draft/proforma/cancel invoice.') % (mode))
if inv.reconciled and mode in ('cancel', 'modify'):
raise osv.except_osv(_('Error !'), _('Can not %s invoice which is already reconciled, invoice should be unreconciled first. You can only Refund this invoice') % (mode))
- if form['period']:
- period = form['period']
+ if form.period.id:
+ period = form.period.id
else:
period = inv.period_id and inv.period_id.id or False
if not journal_id:
journal_id = inv.journal_id.id
- if form['date']:
- date = form['date']
- if not form['period']:
+ if form.date:
+ date = form.date
+ if not form.period.id:
cr.execute("select name from ir_model_fields \
where model = 'account.period' \
and name = 'company_id'")
@@ -128,8 +128,8 @@
period = res[0]
else:
date = inv.date_invoice
- if form['description']:
- description = form['description']
+ if form.description:
+ description = form.description
else:
description = inv.name
@@ -211,10 +211,10 @@
return result
def invoice_refund(self, cr, uid, ids, context=None):
- data_refund = self.read(cr, uid, ids, [],context=context)[0]['filter_refund']
+ data_refund = self.read(cr, uid, ids, ['filter_refund'],context=context)[0]['filter_refund']
return self.compute_refund(cr, uid, ids, data_refund, context=context)
account_invoice_refund()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
=== modified file 'account/wizard/account_move_bank_reconcile.py'
--- account/wizard/account_move_bank_reconcile.py 2011-02-15 12:13:39 +0000
+++ account/wizard/account_move_bank_reconcile.py 2011-03-14 09:45:25 +0000
@@ -41,15 +41,15 @@
"""
if context is None:
context = {}
- data = self.read(cr, uid, ids, context=context)[0]
+ data = self.browse(cr, uid, ids, context=context)[0]
cr.execute('select default_credit_account_id \
- from account_journal where id=%s', (data['journal_id'],))
+ from account_journal where id=%s', (data.journal_id.id,))
account_id = cr.fetchone()[0]
if not account_id:
raise osv.except_osv(_('Error'), _('You have to define \
the bank account\nin the journal definition for reconciliation.'))
return {
- 'domain': "[('journal_id','=',%d), ('account_id','=',%d), ('state','<>','draft')]" % (data['journal_id'], account_id),
+ 'domain': "[('journal_id','=',%d), ('account_id','=',%d), ('state','<>','draft')]" % (data.journal_id.id, account_id),
'name': _('Standard Encoding'),
'view_type': 'form',
'view_mode': 'tree,form',
@@ -61,4 +61,4 @@
account_move_bank_reconcile()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
=== modified file 'account/wizard/account_move_journal.py'
--- account/wizard/account_move_journal.py 2011-02-15 13:27:07 +0000
+++ account/wizard/account_move_journal.py 2011-03-14 09:45:25 +0000
@@ -148,7 +148,7 @@
journal_id = self._get_journal(cr, uid, context)
period_id = self._get_period(cr, uid, context)
- target_move = self.read(cr, uid, ids, [])[0]['target_move']
+ target_move = self.read(cr, uid, ids, ['target_move'], context=context)[0]['target_move']
name = _("Journal Items")
if journal_id:
=== modified file 'account/wizard/account_move_line_reconcile_select.py'
--- account/wizard/account_move_line_reconcile_select.py 2011-02-15 12:13:39 +0000
+++ account/wizard/account_move_line_reconcile_select.py 2011-03-14 09:45:25 +0000
@@ -39,9 +39,9 @@
@return: dictionary of Open account move line window for reconcile on given account id
"""
- data = self.read(cr, uid, ids, context=context)[0]
+ data = self.browse(cr, uid, ids, context=context)[0]
return {
- 'domain': "[('account_id','=',%d),('reconcile_id','=',False),('state','<>','draft')]" % data['account_id'],
+ 'domain': "[('account_id','=',%d),('reconcile_id','=',False),('state','<>','draft')]" % data.account_id.id,
'name': _('Reconciliation'),
'view_type': 'form',
'view_mode': 'tree,form',
@@ -52,4 +52,4 @@
account_move_line_reconcile_select()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
=== modified file 'account/wizard/account_move_line_unreconcile_select.py'
--- account/wizard/account_move_line_unreconcile_select.py 2011-02-15 12:13:39 +0000
+++ account/wizard/account_move_line_unreconcile_select.py 2011-03-14 09:45:25 +0000
@@ -28,9 +28,9 @@
'account_id': fields.many2one('account.account','Account',required=True),
}
def action_open_window(self, cr, uid, ids, context=None):
- data = self.read(cr, uid, ids, context=context)[0]
+ data = self.browse(cr, uid, ids, context=context)[0]
return {
- 'domain': "[('account_id','=',%d),('reconcile_id','<>',False),('state','<>','draft')]" % data['account_id'],
+ 'domain': "[('account_id','=',%d),('reconcile_id','<>',False),('state','<>','draft')]" % data.account_id.id,
'name': 'Unreconciliation',
'view_type': 'form',
'view_mode': 'tree,form',
@@ -41,4 +41,4 @@
account_move_line_unreconcile_select()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
=== modified file 'account/wizard/account_open_closed_fiscalyear.py'
--- account/wizard/account_open_closed_fiscalyear.py 2011-02-15 13:27:07 +0000
+++ account/wizard/account_open_closed_fiscalyear.py 2011-03-14 09:45:25 +0000
@@ -31,14 +31,13 @@
}
def remove_entries(self, cr, uid, ids, context=None):
- fy_obj = self.pool.get('account.fiscalyear')
move_obj = self.pool.get('account.move')
- data = self.read(cr, uid, ids, [], context=context)[0]
- data_fyear = fy_obj.browse(cr, uid, data['fyear_id'], context=context)
- if not data_fyear.end_journal_period_id:
+ data = self.browse(cr, uid, ids, context=context)[0]
+ period_journal = data.fyear_id.end_journal_period_id or False
+ if not period_journal:
raise osv.except_osv(_('Error !'), _('No End of year journal defined for the fiscal year'))
- period_journal = data_fyear.end_journal_period_id
+
ids_move = move_obj.search(cr, uid, [('journal_id','=',period_journal.journal_id.id),('period_id','=',period_journal.period_id.id)])
if ids_move:
cr.execute('delete from account_move where id IN %s', (tuple(ids_move),))
@@ -46,4 +45,4 @@
account_open_closed_fiscalyear()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
=== modified file 'account/wizard/account_reconcile.py'
--- account/wizard/account_reconcile.py 2011-02-15 12:13:39 +0000
+++ account/wizard/account_reconcile.py 2011-03-14 09:45:25 +0000
@@ -152,13 +152,13 @@
period_obj = self.pool.get('account.period')
if context is None:
context = {}
- data = self.read(cr, uid, ids,context=context)[0]
- account_id = data['writeoff_acc_id']
- context['date_p'] = data['date_p']
- journal_id = data['journal_id']
- context['comment'] = data['comment']
- if data['analytic_id']:
- context['analytic_id'] = data['analytic_id']
+ data = self.browse(cr, uid, ids,context=context)[0]
+ account_id = data.writeoff_acc_id.id
+ context['date_p'] = data.date_p
+ journal_id = data.journal_id.id
+ context['comment'] = data.comment
+ if data.analytic_id:
+ context['analytic_id'] = data.analytic_id.id
if context['date_p']:
date = context['date_p']
@@ -173,4 +173,4 @@
account_move_line_reconcile_writeoff()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
=== modified file 'account/wizard/account_report_balance_sheet.py'
--- account/wizard/account_report_balance_sheet.py 2011-02-15 13:27:07 +0000
+++ account/wizard/account_report_balance_sheet.py 2011-03-14 09:45:25 +0000
@@ -65,7 +65,8 @@
def _print_report(self, cr, uid, ids, data, context=None):
if context is None:
context = {}
- data['form'].update(self.read(cr, uid, ids, ['display_type','reserve_account_id'])[0])
+ record = self.browse(cr, uid, ids, context=context)[0]
+ data['form'].update({'display_type':record.display_type, 'reserve_account_id':record.reserve_account_id.id})
if not data['form']['reserve_account_id']:
raise osv.except_osv(_('Warning'),_('Please define the Reserve and Profit/Loss account for current user company !'))
data = self.pre_print_report(cr, uid, ids, data, context=context)
=== modified file 'account/wizard/account_report_common.py'
--- account/wizard/account_report_common.py 2011-02-15 13:27:07 +0000
+++ account/wizard/account_report_common.py 2011-03-14 09:45:25 +0000
@@ -131,7 +131,10 @@
data = {}
data['ids'] = context.get('active_ids', [])
data['model'] = context.get('active_model', 'ir.ui.menu')
- data['form'] = self.read(cr, uid, ids, ['date_from', 'date_to', 'fiscalyear_id', 'journal_ids', 'period_from', 'period_to', 'filter', 'chart_account_id', 'target_move'])[0]
+ data['form'] = self.read(cr, uid, ids, ['date_from', 'date_to', 'fiscalyear_id', 'journal_ids', 'period_from', 'period_to', 'filter', 'chart_account_id', 'target_move'], context=context)[0]
+ for field in ['fiscalyear_id', 'chart_account_id', 'period_from', 'period_to']:
+ if isinstance(data['form'][field], tuple):
+ data['form'][field] = data['form'][field][0]
used_context = self._build_contexts(cr, uid, ids, data, context=context)
data['form']['periods'] = used_context.get('periods', False) and used_context['periods'] or []
data['form']['used_context'] = used_context
=== modified file 'account/wizard/account_report_general_ledger.py'
--- account/wizard/account_report_general_ledger.py 2011-02-15 13:27:07 +0000
+++ account/wizard/account_report_general_ledger.py 2011-03-14 09:45:25 +0000
@@ -50,7 +50,7 @@
if context is None:
context = {}
data = self.pre_print_report(cr, uid, ids, data, context=context)
- data['form'].update(self.read(cr, uid, ids, ['landscape', 'initial_balance', 'amount_currency', 'sortby'])[0])
+ data['form'].update(self.read(cr, uid, ids, ['landscape', 'initial_balance', 'amount_currency', 'sortby'], context=context)[0])
if not data['form']['fiscalyear_id']:# GTK client problem onchange does not consider in save record
data['form'].update({'initial_balance': False})
if data['form']['landscape']:
=== modified file 'account/wizard/account_report_partner_balance.py'
--- account/wizard/account_report_partner_balance.py 2011-02-15 13:27:07 +0000
+++ account/wizard/account_report_partner_balance.py 2011-03-14 09:45:25 +0000
@@ -42,7 +42,7 @@
if context is None:
context = {}
data = self.pre_print_report(cr, uid, ids, data, context=context)
- data['form'].update(self.read(cr, uid, ids, ['display_partner'])[0])
+ data['form'].update(self.read(cr, uid, ids, ['display_partner'], context=context)[0])
return {
'type': 'ir.actions.report.xml',
'report_name': 'account.partner.balance',
=== modified file 'account/wizard/account_report_partner_ledger.py'
--- account/wizard/account_report_partner_ledger.py 2011-02-15 13:27:07 +0000
+++ account/wizard/account_report_partner_ledger.py 2011-03-14 09:45:25 +0000
@@ -47,7 +47,7 @@
if context is None:
context = {}
data = self.pre_print_report(cr, uid, ids, data, context=context)
- data['form'].update(self.read(cr, uid, ids, ['initial_balance', 'reconcil', 'page_split', 'amount_currency'])[0])
+ data['form'].update(self.read(cr, uid, ids, ['initial_balance', 'reconcil', 'page_split', 'amount_currency'], context=context)[0])
if data['form']['page_split']:
return {
'type': 'ir.actions.report.xml',
=== modified file 'account/wizard/account_report_profit_loss.py'
--- account/wizard/account_report_profit_loss.py 2011-02-15 13:27:07 +0000
+++ account/wizard/account_report_profit_loss.py 2011-03-14 09:45:25 +0000
@@ -42,7 +42,7 @@
if context is None:
context = {}
data = self.pre_print_report(cr, uid, ids, data, context=context)
- data['form'].update(self.read(cr, uid, ids, ['display_type'])[0])
+ data['form'].update(self.read(cr, uid, ids, ['display_type'], context=context)[0])
if data['form']['display_type']:
return {
'type': 'ir.actions.report.xml',
=== modified file 'account/wizard/account_tax_chart.py'
--- account/wizard/account_tax_chart.py 2011-02-15 12:13:39 +0000
+++ account/wizard/account_tax_chart.py 2011-03-14 09:45:25 +0000
@@ -54,21 +54,19 @@
period_obj = self.pool.get('account.period')
if context is None:
context = {}
- data = self.read(cr, uid, ids, [], context=context)[0]
+ data = self.browse(cr, uid, ids, context=context)[0]
result = mod_obj.get_object_reference(cr, uid, 'account', 'action_tax_code_tree')
id = result and result[1] or False
result = act_obj.read(cr, uid, [id], context=context)[0]
- if data['period_id']:
- fiscalyear_id = period_obj.read(cr, uid, [data['period_id']], context=context)[0]['fiscalyear_id'][0]
- result['context'] = str({'period_id': data['period_id'], \
- 'fiscalyear_id': fiscalyear_id, \
- 'state': data['target_move']})
+ if data.period_id:
+ result['context'] = str({'period_id': data.period_id.id, \
+ 'fiscalyear_id': data.period_id.fiscalyear_id.id, \
+ 'state': data.target_move})
+ period_code = data.period_id.code
+ result['name'] += period_code and (':' + period_code) or ''
else:
- result['context'] = str({'state': data['target_move']})
+ result['context'] = str({'state': data.target_move})
- if data['period_id']:
- period_code = period_obj.read(cr, uid, [data['period_id']], context=context)[0]['code']
- result['name'] += period_code and (':' + period_code) or ''
return result
_defaults = {
@@ -78,4 +76,4 @@
account_tax_chart()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
=== modified file 'account/wizard/account_validate_account_move.py'
--- account/wizard/account_validate_account_move.py 2011-02-15 13:27:07 +0000
+++ account/wizard/account_validate_account_move.py 2011-03-14 09:45:25 +0000
@@ -33,8 +33,8 @@
obj_move = self.pool.get('account.move')
if context is None:
context = {}
- data = self.read(cr, uid, ids, context=context)[0]
- ids_move = obj_move.search(cr, uid, [('state','=','draft'),('journal_id','=',data['journal_id']),('period_id','=',data['period_id'])])
+ data = self.browse(cr, uid, ids, context=context)[0]
+ ids_move = obj_move.search(cr, uid, [('state','=','draft'),('journal_id','=',data.journal_id.id),('period_id','=',data.period_id.id)])
if not ids_move:
raise osv.except_osv(_('Warning'), _('Specified Journal does not have any account move entries in draft state for this period'))
obj_move.button_validate(cr, uid, ids_move, context=context)
=== modified file 'account/wizard/account_vat.py'
--- account/wizard/account_vat.py 2011-02-15 13:27:07 +0000
+++ account/wizard/account_vat.py 2011-03-14 09:45:25 +0000
@@ -46,7 +46,10 @@
context = {}
datas = {'ids': context.get('active_ids', [])}
datas['model'] = 'account.tax.code'
- datas['form'] = self.read(cr, uid, ids)[0]
+ datas['form'] = self.read(cr, uid, ids, context=context)[0]
+ for field in datas['form'].keys():
+ if isinstance(datas['form'][field], tuple):
+ datas['form'][field] = datas['form'][field][0]
datas['form']['company_id'] = self.pool.get('account.tax.code').browse(cr, uid, [datas['form']['chart_tax_id']], context=context)[0].company_id.id
return {
'type': 'ir.actions.report.xml',
=== modified file 'account_analytic_plans/wizard/account_crossovered_analytic.py'
--- account_analytic_plans/wizard/account_crossovered_analytic.py 2011-02-15 12:13:39 +0000
+++ account_analytic_plans/wizard/account_crossovered_analytic.py 2011-03-14 09:45:25 +0000
@@ -45,6 +45,7 @@
acc_ids = [x[0] for x in res]
data = self.read(cr, uid, ids, [], context=context)[0]
+ data['ref'] = data['ref'][0]
obj_acc = self.pool.get('account.analytic.account').browse(cr, uid, data['ref'], context=context)
name = obj_acc.name
@@ -72,4 +73,4 @@
account_crossovered_analytic()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
=== modified file 'account_coda/wizard/account_coda_import.py'
--- account_coda/wizard/account_coda_import.py 2011-02-15 12:13:39 +0000
+++ account_coda/wizard/account_coda_import.py 2011-03-14 09:45:25 +0000
@@ -69,14 +69,14 @@
if context is None:
context = {}
- data = self.read(cr, uid, ids)[0]
+ data = self.browse(cr, uid, ids, context=context)[0]
- codafile = data['coda']
- journal_code = journal_obj.browse(cr, uid, data['journal_id'], context=context).code
+ codafile = data.coda
+ journal_code = data.journal_id.code
period = account_period_obj.find(cr, uid, context=context)[0]
- def_pay_acc = data['def_payable']
- def_rec_acc = data['def_receivable']
+ def_pay_acc = data.def_payable.id
+ def_rec_acc = data.def_receivable.id
err_log = "Errors:\n------\n"
nb_err=0
@@ -96,7 +96,7 @@
bank_statement["bank_statement_line"]={}
bank_statement_lines = {}
bank_statement['date'] = str2date(line[5:11])
- bank_statement['journal_id']=data['journal_id']
+ bank_statement['journal_id']=data.journal_id.id
period_id = account_period_obj.search(cr, uid, [('date_start', '<=', time.strftime('%Y-%m-%d', time.strptime(bank_statement['date'], "%y/%m/%d"))), ('date_stop', '>=', time.strftime('%Y-%m-%d', time.strptime(bank_statement['date'], "%y/%m/%d")))])
bank_statement['period_id'] = period_id and period_id[0] or False
bank_statement['state']='draft'
@@ -144,7 +144,7 @@
bank_statement["bank_statement_line"]=bank_statement_lines
elif line[1] == '2':
st_line_name = line[2:6]
- bank_statement_lines[st_line_name].update({'account_id': data['awaiting_account']})
+ bank_statement_lines[st_line_name].update({'account_id': data.awaiting_account.id})
elif line[1] == '3':
# movement data record 3.1
@@ -165,7 +165,7 @@
else:
nb_err += 1
err_log += _('The bank account %s is not defined for the partner %s.\n')%(cntry_number, contry_name)
- bank_statement_lines[st_line_name].update({'account_id': data['awaiting_account']})
+ bank_statement_lines[st_line_name].update({'account_id': data.awaiting_account.id})
bank_statement["bank_statement_line"]=bank_statement_lines
elif line[0]=='3':
@@ -296,7 +296,7 @@
'name': codafile,
'statement_ids': [(6, 0, bkst_list,)],
'note': str_log1+str_not+std_log+err_log,
- 'journal_id': data['journal_id'],
+ 'journal_id': data.journal_id.id,
'date': time.strftime("%Y-%m-%d"),
'user_id': uid,
})
@@ -336,4 +336,4 @@
account_coda_import()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
=== modified file 'account_followup/wizard/account_followup_print.py'
--- account_followup/wizard/account_followup_print.py 2011-02-15 12:13:39 +0000
+++ account_followup/wizard/account_followup_print.py 2011-03-14 09:45:25 +0000
@@ -48,10 +48,10 @@
if context is None:
context = {}
- data = self.read(cr, uid, ids, [], context=context)[0]
+ data = self.browse(cr, uid, ids, context=context)[0]
model_data_ids = mod_obj.search(cr, uid, [('model','=','ir.ui.view'),('name','=','view_account_followup_print_all')], context=context)
resource_id = mod_obj.read(cr, uid, model_data_ids, fields=['res_id'], context=context)[0]['res_id']
- context.update({'followup_id': data['followup_id'], 'date':data['date']})
+ context.update({'followup_id': data.followup_id.id, 'date':data.date})
return {
'name': _('Select Partners'),
'view_type': 'form',
@@ -146,7 +146,7 @@
if context is None:
context = {}
if ids:
- data = self.read(cr, uid, ids, [], context=context)[0]
+ data = self.browse(cr, uid, ids, context=context)[0]
cr.execute(
"SELECT l.partner_id, l.followup_line_id,l.date_maturity, l.date, l.id "\
"FROM account_move_line AS l "\
@@ -162,8 +162,8 @@
move_lines = cr.fetchall()
old = None
fups = {}
- fup_id = 'followup_id' in context and context['followup_id'] or data['followup_id']
- date = 'date' in context and context['date'] or data['date']
+ fup_id = 'followup_id' in context and context['followup_id'] or data.followup_id.id
+ date = 'date' in context and context['date'] or data.date
current_date = datetime.date(*time.strptime(date,
'%Y-%m-%d')[:3])
@@ -208,14 +208,15 @@
if context is None:
context = {}
- data = self.read(cr, uid, ids, [], context=context)[0]
+ data = self.browse(cr, uid, ids, context=context)[0]
+ partner_ids = [partner_id.id for partner_id in data.partner_ids]
model_data_ids = mod_obj.search(cr, uid, [('model','=','ir.ui.view'),('name','=','view_account_followup_print_all_msg')], context=context)
resource_id = mod_obj.read(cr, uid, model_data_ids, fields=['res_id'], context=context)[0]['res_id']
- if data['email_conf']:
+ if data.email_conf:
msg_sent = ''
msg_unsent = ''
data_user = user_obj.browse(cr, uid, uid, context=context)
- move_lines = line_obj.browse(cr, uid, data['partner_ids'], context=context)
+ move_lines = line_obj.browse(cr, uid, partner_ids, context=context)
partners = []
dict_lines = {}
for line in move_lines:
@@ -235,8 +236,8 @@
if adr.email:
dest = [adr.email]
src = tools.config.options['email_from']
- if not data['partner_lang']:
- body = data['email_body']
+ if not data.partner_lang:
+ body = data.email_body
else:
cxt = context.copy()
cxt['lang'] = partner.lang
@@ -272,7 +273,7 @@
'date':time.strftime('%Y-%m-%d'),
}
body = body%val
- sub = tools.ustr(data['email_subject'])
+ sub = tools.ustr(data.email_subject)
msg = ''
if dest:
try:
=== modified file 'account_invoice_layout/report/special_message_invoice.py'
--- account_invoice_layout/report/special_message_invoice.py 2011-02-15 12:13:39 +0000
+++ account_invoice_layout/report/special_message_invoice.py 2011-03-14 09:45:25 +0000
@@ -37,7 +37,8 @@
self.context = context
def spcl_msg(self, form):
- account_msg_data = pooler.get_pool(self.cr.dbname).get('notify.message').browse(self.cr, self.uid, form['message'])
+ msg_id = form['message'][0]
+ account_msg_data = pooler.get_pool(self.cr.dbname).get('notify.message').browse(self.cr, self.uid, msg_id)
msg = account_msg_data.msg
return msg
=== modified file 'account_payment/wizard/account_payment_order.py'
--- account_payment/wizard/account_payment_order.py 2011-01-14 00:11:01 +0000
+++ account_payment/wizard/account_payment_order.py 2011-03-14 09:45:25 +0000
@@ -62,8 +62,8 @@
payment_obj = self.pool.get('payment.line')
if context is None:
context = {}
- data = self.read(cr, uid, ids, [], context=context)[0]
- line_ids = data['entries']
+ data = self.browse(cr, uid, ids, context=context)[0]
+ line_ids = [entry.id for entry in data.entries]
if not line_ids:
return {'type': 'ir.actions.act_window_close'}
@@ -97,8 +97,8 @@
mod_obj = self.pool.get('ir.model.data')
if context is None:
context = {}
- data = self.read(cr, uid, ids, [], context=context)[0]
- search_due_date = data['duedate']
+ data = self.browse(cr, uid, ids, context=context)[0]
+ search_due_date = data.duedate
# payment = self.pool.get('payment.order').browse(cr, uid, context['active_id'], context=context)
# Search for move line to pay:
=== modified file 'account_sequence/i18n/es.po'
--- account_sequence/i18n/es.po 2011-03-13 04:50:22 +0000
+++ account_sequence/i18n/es.po 2011-03-14 09:45:25 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
# Spanish 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.
@@ -233,3 +234,239 @@
#: constraint:account.move.line:0
msgid "You can not create move line on view account."
msgstr "No puede crear un movimiento en una cuenta de tipo vista."
+=======
+# Spanish 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: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2011-02-15 15:36+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish <es@xxxxxx>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-02-16 05:03+0000\n"
+"X-Generator: Launchpad (build 12351)\n"
+
+#. module: account_sequence
+#: view:account.sequence.installer:0
+#: model:ir.actions.act_window,name:account_sequence.action_account_seq_installer
+msgid "Account Sequence Application Configuration"
+msgstr "Configuración de Aplicación de Secuencia de Cuenta"
+
+#. module: account_sequence
+#: constraint:account.move:0
+msgid ""
+"You cannot create entries on different periods/journals in the same move"
+msgstr ""
+"No puede crear asientos con movimientos en distintos periodos/diarios"
+
+#. module: account_sequence
+#: help:account.move,internal_sequence_number:0
+#: help:account.move.line,internal_sequence_number:0
+msgid "Internal Sequence Number"
+msgstr "Número de secuencia interno"
+
+#. module: account_sequence
+#: help:account.sequence.installer,number_next:0
+msgid "Next number of this sequence"
+msgstr "Próximo número de secuencia"
+
+#. module: account_sequence
+#: field:account.sequence.installer,number_next:0
+msgid "Next Number"
+msgstr "Proximo numero"
+
+#. module: account_sequence
+#: field:account.sequence.installer,number_increment:0
+msgid "Increment Number"
+msgstr "Incremento del número"
+
+#. module: account_sequence
+#: model:ir.module.module,description:account_sequence.module_meta_information
+msgid ""
+"\n"
+" This module maintains internal sequence number for accounting entries.\n"
+" "
+msgstr ""
+"\n"
+" Este módulo gestiona el número de secuencia interno para los asientos "
+"contables\n"
+" "
+
+#. module: account_sequence
+#: model:ir.module.module,shortdesc:account_sequence.module_meta_information
+msgid "Entries Sequence Numbering"
+msgstr "Numeración de la secuencia de asientos"
+
+#. module: account_sequence
+#: help:account.sequence.installer,number_increment:0
+msgid "The next number of the sequence will be incremented by this number"
+msgstr ""
+"El número siguiente de esta secuencia será incrementado por este número."
+
+#. module: account_sequence
+#: view:account.sequence.installer:0
+msgid "Configure Your Account Sequence Application"
+msgstr "Configurar su Aplicación de Secuencia de la Cuenta"
+
+#. module: account_sequence
+#: field:account.sequence.installer,progress:0
+msgid "Configuration Progress"
+msgstr "Progreso configuración"
+
+#. module: account_sequence
+#: help:account.sequence.installer,suffix:0
+msgid "Suffix value of the record for the sequence"
+msgstr "Valor del sufijo del registro para la secuencia."
+
+#. module: account_sequence
+#: field:account.sequence.installer,company_id:0
+msgid "Company"
+msgstr "CompañÃa"
+
+#. module: account_sequence
+#: help:account.journal,internal_sequence_id:0
+msgid ""
+"This sequence will be used to maintain the internal number for the journal "
+"entries related to this journal."
+msgstr ""
+"Esta secuencia se utilizará para gestionar el número interno para los "
+"asientos relacionados con este diario."
+
+#. module: account_sequence
+#: field:account.sequence.installer,padding:0
+msgid "Number padding"
+msgstr "Relleno del número"
+
+#. module: account_sequence
+#: model:ir.model,name:account_sequence.model_account_move_line
+msgid "Journal Items"
+msgstr "Registros del diario"
+
+#. module: account_sequence
+#: field:account.move,internal_sequence_number:0
+#: field:account.move.line,internal_sequence_number:0
+msgid "Internal Number"
+msgstr "Número interno"
+
+#. module: account_sequence
+#: constraint:account.move.line:0
+msgid "Company must be same for its related account and period."
+msgstr "La compañÃa debe ser la misma para la cuenta y periodo relacionados."
+
+#. module: account_sequence
+#: help:account.sequence.installer,padding:0
+msgid ""
+"OpenERP will automatically adds some '0' on the left of the 'Next Number' to "
+"get the required padding size."
+msgstr ""
+"OpenERP automáticamente añadirá algunos '0' a la izquierda del 'Número "
+"siguiente' para obtener el tamaño de relleno necesario."
+
+#. module: account_sequence
+#: field:account.sequence.installer,name:0
+msgid "Name"
+msgstr "Nombre"
+
+#. module: account_sequence
+#: constraint:account.move.line:0
+msgid "You can not create move line on closed account."
+msgstr "No puede crear un movimiento sobre una cuenta cerrada."
+
+#. module: account_sequence
+#: constraint:account.move:0
+msgid ""
+"You cannot create more than one move per period on centralized journal"
+msgstr ""
+"No puede crear más de un movimiento por periodo en un diario centralizado"
+
+#. module: account_sequence
+#: sql_constraint:account.move.line:0
+msgid "Wrong credit or debit value in accounting entry !"
+msgstr "¡Valor haber o debe erróneo en el asiento contable!"
+
+#. module: account_sequence
+#: field:account.journal,internal_sequence_id:0
+msgid "Internal Sequence"
+msgstr "Secuencia interna"
+
+#. module: account_sequence
+#: model:ir.model,name:account_sequence.model_account_sequence_installer
+msgid "account.sequence.installer"
+msgstr "contabilidad.secuencia.instalador"
+
+#. module: account_sequence
+#: view:account.sequence.installer:0
+msgid "Configure"
+msgstr "Configurar"
+
+#. module: account_sequence
+#: help:account.sequence.installer,prefix:0
+msgid "Prefix value of the record for the sequence"
+msgstr "Valor del prefijo del registro para la secuencia."
+
+#. module: account_sequence
+#: model:ir.model,name:account_sequence.model_account_move
+msgid "Account Entry"
+msgstr "Entrada contable"
+
+#. module: account_sequence
+#: field:account.sequence.installer,suffix:0
+msgid "Suffix"
+msgstr "Sufijo"
+
+#. module: account_sequence
+#: field:account.sequence.installer,config_logo:0
+msgid "Image"
+msgstr "Imagen"
+
+#. module: account_sequence
+#: view:account.sequence.installer:0
+msgid "title"
+msgstr "TÃtulo"
+
+#. module: account_sequence
+#: sql_constraint:account.journal:0
+msgid "The name of the journal must be unique per company !"
+msgstr "¡El nombre del diaro debe ser único por compañÃa!"
+
+#. module: account_sequence
+#: field:account.sequence.installer,prefix:0
+msgid "Prefix"
+msgstr "Prefijo"
+
+#. module: account_sequence
+#: sql_constraint:account.journal:0
+msgid "The code of the journal must be unique per company !"
+msgstr "¡El código del diario debe ser único por compañÃa!"
+
+#. module: account_sequence
+#: constraint:account.move.line:0
+msgid ""
+"You can not create move line on receivable/payable account without partner"
+msgstr ""
+"No puede crear un movimiento en una cuenta a cobrar/a pagar sin una empresa."
+
+#. module: account_sequence
+#: model:ir.model,name:account_sequence.model_account_journal
+msgid "Journal"
+msgstr "Diario"
+
+#. module: account_sequence
+#: view:account.sequence.installer:0
+msgid "You can enhance the Account Sequence Application by installing ."
+msgstr ""
+"Puede realzar la Aplicación de Secuencia de la Cuenta mediante instalación ."
+
+#. module: account_sequence
+#: constraint:account.move.line:0
+msgid "You can not create move line on view account."
+msgstr "No puede crear un movimiento en una cuenta de tipo vista."
+>>>>>>> MERGE-SOURCE
=== modified file 'account_sequence/i18n/ru.po'
--- account_sequence/i18n/ru.po 2011-03-06 04:50:08 +0000
+++ account_sequence/i18n/ru.po 2011-03-14 09:45:25 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
# Russian 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.
@@ -222,3 +223,229 @@
#: constraint:account.move.line:0
msgid "You can not create move line on view account."
msgstr "ÐÐµÐ»ÑŒÐ·Ñ Ñоздать проводку по Ñчету Ñ Ñ‚Ð¸Ð¿Ð¾Ð¼ Вид."
+=======
+# Russian 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: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2011-02-21 19:27+0000\n"
+"Last-Translator: Chertykov Denis <chertykov@xxxxxxxxx>\n"
+"Language-Team: Russian <ru@xxxxxx>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-02-22 04:54+0000\n"
+"X-Generator: Launchpad (build 12351)\n"
+
+#. module: account_sequence
+#: view:account.sequence.installer:0
+#: model:ir.actions.act_window,name:account_sequence.action_account_seq_installer
+msgid "Account Sequence Application Configuration"
+msgstr ""
+
+#. module: account_sequence
+#: constraint:account.move:0
+msgid ""
+"You cannot create entries on different periods/journals in the same move"
+msgstr ""
+
+#. module: account_sequence
+#: help:account.move,internal_sequence_number:0
+#: help:account.move.line,internal_sequence_number:0
+msgid "Internal Sequence Number"
+msgstr "ВнутреннÑÑ Ð½ÑƒÐ¼ÐµÑ€Ð°Ñ†Ð¸Ñ"
+
+#. module: account_sequence
+#: help:account.sequence.installer,number_next:0
+msgid "Next number of this sequence"
+msgstr "Следующее чиÑло в Ñтой поÑледовательноÑти"
+
+#. module: account_sequence
+#: field:account.sequence.installer,number_next:0
+msgid "Next Number"
+msgstr "Следующее чиÑло"
+
+#. module: account_sequence
+#: field:account.sequence.installer,number_increment:0
+msgid "Increment Number"
+msgstr "Увеличение номера"
+
+#. module: account_sequence
+#: model:ir.module.module,description:account_sequence.module_meta_information
+msgid ""
+"\n"
+" This module maintains internal sequence number for accounting entries.\n"
+" "
+msgstr ""
+"\n"
+" Ðтот модуль поддерживает внутреннюю нумерацию Ð´Ð»Ñ Ð¿Ñ€Ð¾Ð²Ð¾Ð´Ð¾Ðº.\n"
+" "
+
+#. module: account_sequence
+#: model:ir.module.module,shortdesc:account_sequence.module_meta_information
+msgid "Entries Sequence Numbering"
+msgstr "ÐÑƒÐ¼ÐµÑ€Ð°Ñ†Ð¸Ñ Ð¿Ñ€Ð¾Ð²Ð¾Ð´Ð¾Ðº"
+
+#. module: account_sequence
+#: help:account.sequence.installer,number_increment:0
+msgid "The next number of the sequence will be incremented by this number"
+msgstr "Следующее чиÑло поÑледовательноÑти будет увеличено на Ñто чиÑло"
+
+#. module: account_sequence
+#: view:account.sequence.installer:0
+msgid "Configure Your Account Sequence Application"
+msgstr ""
+
+#. module: account_sequence
+#: field:account.sequence.installer,progress:0
+msgid "Configuration Progress"
+msgstr "ÐаÑтройка выполнÑетÑÑ"
+
+#. module: account_sequence
+#: help:account.sequence.installer,suffix:0
+msgid "Suffix value of the record for the sequence"
+msgstr "Ð¡ÑƒÑ„Ñ„Ð¸ÐºÑ Ð·Ð°Ð¿Ð¸Ñи Ð´Ð»Ñ Ð¿Ð¾ÑледовательноÑти"
+
+#. module: account_sequence
+#: field:account.sequence.installer,company_id:0
+msgid "Company"
+msgstr "КомпаниÑ"
+
+#. module: account_sequence
+#: help:account.journal,internal_sequence_id:0
+msgid ""
+"This sequence will be used to maintain the internal number for the journal "
+"entries related to this journal."
+msgstr ""
+
+#. module: account_sequence
+#: field:account.sequence.installer,padding:0
+msgid "Number padding"
+msgstr "Выравнивание чиÑел"
+
+#. module: account_sequence
+#: model:ir.model,name:account_sequence.model_account_move_line
+msgid "Journal Items"
+msgstr "Ðлементы журнала"
+
+#. module: account_sequence
+#: field:account.move,internal_sequence_number:0
+#: field:account.move.line,internal_sequence_number:0
+msgid "Internal Number"
+msgstr "Внутренний номер"
+
+#. module: account_sequence
+#: constraint:account.move.line:0
+msgid "Company must be same for its related account and period."
+msgstr "Ð”Ð»Ñ Ñчета и периода должна быть одна компаниÑ."
+
+#. module: account_sequence
+#: help:account.sequence.installer,padding:0
+msgid ""
+"OpenERP will automatically adds some '0' on the left of the 'Next Number' to "
+"get the required padding size."
+msgstr ""
+
+#. module: account_sequence
+#: field:account.sequence.installer,name:0
+msgid "Name"
+msgstr "Ðазвание"
+
+#. module: account_sequence
+#: constraint:account.move.line:0
+msgid "You can not create move line on closed account."
+msgstr "ÐÐµÐ»ÑŒÐ·Ñ Ñделать проводку по закрытому Ñчету."
+
+#. module: account_sequence
+#: constraint:account.move:0
+msgid ""
+"You cannot create more than one move per period on centralized journal"
+msgstr ""
+
+#. module: account_sequence
+#: sql_constraint:account.move.line:0
+msgid "Wrong credit or debit value in accounting entry !"
+msgstr "Ошибочное значение проводки по дебету или кредиту !"
+
+#. module: account_sequence
+#: field:account.journal,internal_sequence_id:0
+msgid "Internal Sequence"
+msgstr "ВнутреннÑÑ Ð½ÑƒÐ¼ÐµÑ€Ð°Ñ†Ð¸Ñ"
+
+#. module: account_sequence
+#: model:ir.model,name:account_sequence.model_account_sequence_installer
+msgid "account.sequence.installer"
+msgstr "account.sequence.installer"
+
+#. module: account_sequence
+#: view:account.sequence.installer:0
+msgid "Configure"
+msgstr "ÐаÑтройка"
+
+#. module: account_sequence
+#: help:account.sequence.installer,prefix:0
+msgid "Prefix value of the record for the sequence"
+msgstr "ÐŸÑ€ÐµÑ„Ð¸ÐºÑ Ð·Ð°Ð¿Ð¸Ñи Ð´Ð»Ñ Ð¿Ð¾ÑледовательноÑти"
+
+#. module: account_sequence
+#: model:ir.model,name:account_sequence.model_account_move
+msgid "Account Entry"
+msgstr "Проводка по Ñчету"
+
+#. module: account_sequence
+#: field:account.sequence.installer,suffix:0
+msgid "Suffix"
+msgstr "СуффикÑ"
+
+#. module: account_sequence
+#: field:account.sequence.installer,config_logo:0
+msgid "Image"
+msgstr "Изображение"
+
+#. module: account_sequence
+#: view:account.sequence.installer:0
+msgid "title"
+msgstr ""
+
+#. module: account_sequence
+#: sql_constraint:account.journal:0
+msgid "The name of the journal must be unique per company !"
+msgstr "Ðазвание журнала должно быть уникальным по компании !"
+
+#. module: account_sequence
+#: field:account.sequence.installer,prefix:0
+msgid "Prefix"
+msgstr "ПрефикÑ"
+
+#. module: account_sequence
+#: sql_constraint:account.journal:0
+msgid "The code of the journal must be unique per company !"
+msgstr "Код журнала должен быть уникальным Ð´Ð»Ñ ÐºÐ¾Ð¼Ð¿Ð°Ð½Ð¸Ð¸ !"
+
+#. module: account_sequence
+#: constraint:account.move.line:0
+msgid ""
+"You can not create move line on receivable/payable account without partner"
+msgstr ""
+
+#. module: account_sequence
+#: model:ir.model,name:account_sequence.model_account_journal
+msgid "Journal"
+msgstr "Журнал"
+
+#. module: account_sequence
+#: view:account.sequence.installer:0
+msgid "You can enhance the Account Sequence Application by installing ."
+msgstr ""
+
+#. module: account_sequence
+#: constraint:account.move.line:0
+msgid "You can not create move line on view account."
+msgstr "ÐÐµÐ»ÑŒÐ·Ñ Ñоздать проводку по Ñчету Ñ Ñ‚Ð¸Ð¿Ð¾Ð¼ Вид."
+>>>>>>> MERGE-SOURCE
=== modified file 'analytic/i18n/bg.po'
--- analytic/i18n/bg.po 2011-03-01 04:38:41 +0000
+++ analytic/i18n/bg.po 2011-03-14 09:45:25 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
# Bulgarian 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.
@@ -253,3 +254,260 @@
#: field:account.analytic.account,line_ids:0
msgid "Analytic Entries"
msgstr "Ðналитични запиÑи"
+=======
+# Bulgarian 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: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2011-02-25 23:13+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Bulgarian <bg@xxxxxx>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-02-26 05:00+0000\n"
+"X-Generator: Launchpad (build 12351)\n"
+
+#. module: analytic
+#: field:account.analytic.account,child_ids:0
+msgid "Child Accounts"
+msgstr "Подчинени Ñметки"
+
+#. module: analytic
+#: field:account.analytic.account,name:0
+msgid "Account Name"
+msgstr "име на Ñметка"
+
+#. module: analytic
+#: help:account.analytic.line,unit_amount:0
+msgid "Specifies the amount of quantity to count."
+msgstr ""
+
+#. module: analytic
+#: model:ir.module.module,description:analytic.module_meta_information
+msgid ""
+"Module for defining analytic accounting object.\n"
+" "
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,state:0
+msgid "State"
+msgstr "СъÑтоÑние"
+
+#. module: analytic
+#: field:account.analytic.account,user_id:0
+msgid "Account Manager"
+msgstr ""
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Draft"
+msgstr "Чернова"
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Closed"
+msgstr "Затворена"
+
+#. module: analytic
+#: field:account.analytic.account,debit:0
+msgid "Debit"
+msgstr "Дебит"
+
+#. module: analytic
+#: help:account.analytic.account,state:0
+msgid ""
+"* When an account is created its in 'Draft' state. "
+" \n"
+"* If any associated partner is there, it can be in 'Open' state. "
+" \n"
+"* If any pending balance is there it can be in 'Pending'. "
+" \n"
+"* And finally when all the transactions are over, it can be in 'Close' "
+"state. \n"
+"* The project can be in either if the states 'Template' and 'Running'.\n"
+" If it is template then we can make projects based on the template projects. "
+"If its in 'Running' state it is a normal project. "
+" \n"
+" If it is to be reviewed then the state is 'Pending'.\n"
+" When the project is completed the state is set to 'Done'."
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,type:0
+msgid "Account Type"
+msgstr "Вид Ñметка"
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Template"
+msgstr "Образец"
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Pending"
+msgstr "Изчакващи"
+
+#. module: analytic
+#: model:ir.model,name:analytic.model_account_analytic_line
+msgid "Analytic Line"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,description:0
+#: field:account.analytic.line,name:0
+msgid "Description"
+msgstr "ОпиÑание"
+
+#. module: analytic
+#: selection:account.analytic.account,type:0
+msgid "Normal"
+msgstr "Ðормален"
+
+#. module: analytic
+#: field:account.analytic.account,company_id:0
+#: field:account.analytic.line,company_id:0
+msgid "Company"
+msgstr "Фирма"
+
+#. module: analytic
+#: field:account.analytic.account,quantity_max:0
+msgid "Maximum Quantity"
+msgstr "МакÑимално количеÑтво"
+
+#. module: analytic
+#: field:account.analytic.line,user_id:0
+msgid "User"
+msgstr "Потребител"
+
+#. module: analytic
+#: field:account.analytic.account,parent_id:0
+msgid "Parent Analytic Account"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.line,date:0
+msgid "Date"
+msgstr "Дата"
+
+#. module: analytic
+#: field:account.analytic.account,currency_id:0
+msgid "Account currency"
+msgstr "Валута на Ñметката"
+
+#. module: analytic
+#: field:account.analytic.account,quantity:0
+#: field:account.analytic.line,unit_amount:0
+msgid "Quantity"
+msgstr "КоличеÑтво"
+
+#. module: analytic
+#: help:account.analytic.line,amount:0
+msgid ""
+"Calculated by multiplying the quantity and the price given in the Product's "
+"cost price. Always expressed in the company main currency."
+msgstr ""
+
+#. module: analytic
+#: help:account.analytic.account,quantity_max:0
+msgid "Sets the higher limit of quantity of hours."
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,credit:0
+msgid "Credit"
+msgstr "Кредит"
+
+#. module: analytic
+#: field:account.analytic.line,amount:0
+msgid "Amount"
+msgstr "КоличеÑтво"
+
+#. module: analytic
+#: field:account.analytic.account,contact_id:0
+msgid "Contact"
+msgstr "За контакт"
+
+#. module: analytic
+#: constraint:account.analytic.account:0
+msgid ""
+"Error! The currency has to be the same as the currency of the selected "
+"company"
+msgstr ""
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Cancelled"
+msgstr "Отказани"
+
+#. module: analytic
+#: field:account.analytic.account,balance:0
+msgid "Balance"
+msgstr "БаланÑ"
+
+#. module: analytic
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr "Грешка! Ðе можете да Ñъздавате рекурÑивни аналитични Ñметки."
+
+#. module: analytic
+#: help:account.analytic.account,type:0
+msgid ""
+"If you select the View Type, it means you won't allow to create journal "
+"entries using that account."
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,date:0
+msgid "Date End"
+msgstr "Крайна дата"
+
+#. module: analytic
+#: field:account.analytic.account,code:0
+msgid "Account Code"
+msgstr "Код на Ñметка"
+
+#. module: analytic
+#: field:account.analytic.account,complete_name:0
+msgid "Full Account Name"
+msgstr "Пълно има на Ñметка"
+
+#. module: analytic
+#: field:account.analytic.line,account_id:0
+#: model:ir.model,name:analytic.model_account_analytic_account
+#: model:ir.module.module,shortdesc:analytic.module_meta_information
+msgid "Analytic Account"
+msgstr "Ðналитична Ñметка"
+
+#. module: analytic
+#: selection:account.analytic.account,type:0
+msgid "View"
+msgstr "Преглеждане"
+
+#. module: analytic
+#: field:account.analytic.account,partner_id:0
+msgid "Partner"
+msgstr "Партньор"
+
+#. module: analytic
+#: field:account.analytic.account,date_start:0
+msgid "Date Start"
+msgstr "Ðачална дата"
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Open"
+msgstr "Отвoри"
+
+#. module: analytic
+#: field:account.analytic.account,line_ids:0
+msgid "Analytic Entries"
+msgstr "Ðналитични запиÑи"
+>>>>>>> MERGE-SOURCE
=== modified file 'anonymization/i18n/pt_BR.po'
--- anonymization/i18n/pt_BR.po 2011-03-09 04:40:26 +0000
+++ anonymization/i18n/pt_BR.po 2011-03-14 09:45:25 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
# Brazilian Portuguese 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.
@@ -224,3 +225,231 @@
#: field:ir.model.fields.anonymize.wizard,msg:0
msgid "Message"
msgstr ""
+=======
+# Brazilian Portuguese 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: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2011-02-20 20:53+0000\n"
+"Last-Translator: Emerson <Unknown>\n"
+"Language-Team: Brazilian Portuguese <pt_BR@xxxxxx>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-02-21 04:51+0000\n"
+"X-Generator: Launchpad (build 12351)\n"
+
+#. module: anonymization
+#: model:ir.model,name:anonymization.model_ir_model_fields_anonymize_wizard
+msgid "ir.model.fields.anonymize.wizard"
+msgstr ""
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization,field_name:0
+msgid "Field Name"
+msgstr "Nome do Campo"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization,field_id:0
+msgid "Field"
+msgstr "Campo"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization.history,state:0
+#: field:ir.model.fields.anonymize.wizard,state:0
+msgid "State"
+msgstr "Status"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymize.wizard,file_import:0
+msgid "Import"
+msgstr "Importação"
+
+#. module: anonymization
+#: model:ir.model,name:anonymization.model_ir_model_fields_anonymization
+msgid "ir.model.fields.anonymization"
+msgstr ""
+
+#. module: anonymization
+#: model:ir.module.module,shortdesc:anonymization.module_meta_information
+msgid "Database anonymization module"
+msgstr ""
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization.history,direction:0
+msgid "Direction"
+msgstr ""
+
+#. module: anonymization
+#: model:ir.actions.act_window,name:anonymization.action_ir_model_fields_anonymization_tree
+#: view:ir.model.fields.anonymization:0
+#: model:ir.ui.menu,name:anonymization.menu_administration_anonymization_fields
+msgid "Anonymized Fields"
+msgstr ""
+
+#. module: anonymization
+#: model:ir.ui.menu,name:anonymization.menu_administration_anonymization
+msgid "Database anonymization"
+msgstr ""
+
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:55
+#: sql_constraint:ir.model.fields.anonymization:0
+#, python-format
+msgid "You cannot have two records having the same model and the same field"
+msgstr ""
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization,state:0
+#: selection:ir.model.fields.anonymize.wizard,state:0
+msgid "Anonymized"
+msgstr ""
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization,state:0
+msgid "unknown"
+msgstr ""
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization,model_id:0
+msgid "Object"
+msgstr ""
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization.history,filepath:0
+msgid "File path"
+msgstr ""
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization.history,date:0
+msgid "Date"
+msgstr ""
+
+#. module: anonymization
+#: field:ir.model.fields.anonymize.wizard,file_export:0
+msgid "Export"
+msgstr ""
+
+#. module: anonymization
+#: view:ir.model.fields.anonymize.wizard:0
+msgid "Reverse the Database Anonymization"
+msgstr ""
+
+#. module: anonymization
+#: view:ir.model.fields.anonymize.wizard:0
+msgid "Database Anonymization"
+msgstr ""
+
+#. module: anonymization
+#: model:ir.ui.menu,name:anonymization.menu_administration_anonymization_wizard
+msgid "Anonymize database"
+msgstr ""
+
+#. module: anonymization
+#: view:ir.model.fields.anonymization.history:0
+#: field:ir.model.fields.anonymization.history,field_ids:0
+msgid "Fields"
+msgstr ""
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization,state:0
+#: selection:ir.model.fields.anonymize.wizard,state:0
+msgid "Clear"
+msgstr ""
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization.history,direction:0
+msgid "clear -> anonymized"
+msgstr ""
+
+#. module: anonymization
+#: view:ir.model.fields.anonymize.wizard:0
+#: field:ir.model.fields.anonymize.wizard,summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: anonymization
+#: view:ir.model.fields.anonymization:0
+msgid "Anonymized Field"
+msgstr ""
+
+#. module: anonymization
+#: model:ir.module.module,description:anonymization.module_meta_information
+msgid ""
+"\n"
+"This module allows you to anonymize a database.\n"
+" "
+msgstr ""
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymize.wizard,state:0
+msgid "Unstable"
+msgstr ""
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization.history,state:0
+msgid "Exception occured"
+msgstr ""
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization,state:0
+#: selection:ir.model.fields.anonymize.wizard,state:0
+msgid "Not Existing"
+msgstr ""
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization,model_name:0
+msgid "Object Name"
+msgstr ""
+
+#. module: anonymization
+#: model:ir.actions.act_window,name:anonymization.action_ir_model_fields_anonymization_history_tree
+#: view:ir.model.fields.anonymization.history:0
+#: model:ir.ui.menu,name:anonymization.menu_administration_anonymization_history
+msgid "Anonymization History"
+msgstr ""
+
+#. module: anonymization
+#: model:ir.model,name:anonymization.model_ir_model_fields_anonymization_history
+msgid "ir.model.fields.anonymization.history"
+msgstr ""
+
+#. module: anonymization
+#: model:ir.actions.act_window,name:anonymization.action_ir_model_fields_anonymize_wizard
+#: view:ir.model.fields.anonymize.wizard:0
+msgid "Anonymize Database"
+msgstr ""
+
+#. module: anonymization
+#: field:ir.model.fields.anonymize.wizard,name:0
+msgid "File Name"
+msgstr ""
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization.history,direction:0
+msgid "anonymized -> clear"
+msgstr ""
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization.history,state:0
+msgid "Started"
+msgstr ""
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization.history,state:0
+msgid "Done"
+msgstr ""
+
+#. module: anonymization
+#: view:ir.model.fields.anonymization.history:0
+#: field:ir.model.fields.anonymization.history,msg:0
+#: field:ir.model.fields.anonymize.wizard,msg:0
+msgid "Message"
+msgstr ""
+>>>>>>> MERGE-SOURCE
=== modified file 'auction/wizard/auction_lots_invoice.py'
--- auction/wizard/auction_lots_invoice.py 2011-02-15 12:13:39 +0000
+++ auction/wizard/auction_lots_invoice.py 2011-03-14 09:45:25 +0000
@@ -46,7 +46,7 @@
@param context: A standard dictionary
@return: A dictionary which of fields with values.
"""
- if context is None:
+ if context is None:
context = {}
res = super(auction_lots_invoice, self).default_get(cr, uid, fields, context=context)
service = netsvc.LocalService("object_proxy")
@@ -103,7 +103,7 @@
@param ids: List of Auction lots make invoice buyer’s IDs
@return: dictionary of account invoice form.
"""
- if context is None:
+ if context is None:
context = {}
service = netsvc.LocalService("object_proxy")
datas = {'ids' : context.get('active_ids',[])}
=== modified file 'board/wizard/board_menu_create.py'
--- board/wizard/board_menu_create.py 2011-02-15 13:27:07 +0000
+++ board/wizard/board_menu_create.py 2011-03-14 09:45:25 +0000
@@ -70,10 +70,10 @@
})
obj_menu = self.pool.get('ir.ui.menu')
#start Loop
- for data in self.read(cr, uid, ids):
+ for data in self.browse(cr, uid, ids, context=context):
obj_menu.create(cr, uid, {
- 'name': data.get('menu_name'),
- 'parent_id': data.get('menu_parent_id'),
+ 'name': data.menu_name,
+ 'parent_id': data.menu_parent_id.id,
'icon': 'STOCK_SELECT_COLOR',
'action': 'ir.actions.act_window,' + str(action_id)
}, context=context)
=== modified file 'crm/crm.py'
--- crm/crm.py 2011-03-04 12:53:34 +0000
+++ crm/crm.py 2011-03-14 09:45:25 +0000
@@ -283,11 +283,21 @@
@param part: Partner's id
@email: Partner's email ID
"""
+<<<<<<< TREE
data={}
if part:
addr = self.pool.get('res.partner').address_get(cr, uid, [part], ['contact'])
data = {'partner_address_id': addr['contact']}
data.update(self.onchange_partner_address_id(cr, uid, ids, addr['contact'])['value'])
+=======
+ data={}
+ if part:
+ addr = self.pool.get('res.partner').address_get(cr, uid, [part], ['contact'])
+ data = {'partner_address_id': addr['contact']}
+
+ #<<<<<<<<<<= MERGE
+ data.update(self.onchange_partner_address_id(cr, uid, ids, addr['contact'])['value'])
+>>>>>>> MERGE-SOURCE
return {'value': data}
def onchange_partner_address_id(self, cr, uid, ids, add, email=False):
@@ -486,6 +496,7 @@
attach_to_send = map(lambda x: (x['datas_fname'], base64.decodestring(x['datas'])), attach_to_send)
# Send an email
+<<<<<<< TREE
subject = "Reminder: [%s] %s" % (str(case.id), case.name,)
tools.email_send(
src,
@@ -498,6 +509,19 @@
)
self._history(cr, uid, [case], _('Send'), history=True, subject=subject, email=dest, details=body, email_from=src)
+=======
+ subject = "Reminder: [%s] %s" % (str(case.id), case.name, )
+ tools.email_send(
+ src,
+ [dest],
+ subject,
+ body,
+ reply_to=case.section_id.reply_to,
+ openobject_id=str(case.id),
+ attach=attach_to_send
+ )
+ self._history(cr, uid, [case], _('Send'), history=True, subject=subject, email=dest, details=body, email_from=src)
+>>>>>>> MERGE-SOURCE
return True
def _check(self, cr, uid, ids=False, context=None):
=== modified file 'crm/crm_lead.py'
--- crm/crm_lead.py 2011-03-04 12:53:34 +0000
+++ crm/crm_lead.py 2011-03-14 09:45:25 +0000
@@ -410,6 +410,7 @@
@param **args: Return Dictionary of Keyword Value
"""
return True
+<<<<<<< TREE
def on_change_optin(self, cr, uid, ids, optin):
return {'value':{'optin':optin,'optout':False}}
@@ -417,6 +418,19 @@
def on_change_optout(self, cr, uid, ids, optout):
return {'value':{'optout':optout,'optin':False}}
+=======
+
+ def on_chnage_optin(self, cr, uid, ids, optin):
+ if optin:
+ return {'value':{'optin':optin,'optout':False}}
+ return {}
+
+ def on_chnage_optout(self, cr, uid, ids, optout):
+ if optout:
+ return {'value':{'optout':optout,'optin':False}}
+ return {}
+
+>>>>>>> MERGE-SOURCE
crm_lead()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
=== modified file 'crm/crm_lead_view.xml'
--- crm/crm_lead_view.xml 2011-03-04 12:53:34 +0000
+++ crm/crm_lead_view.xml 2011-03-14 09:45:25 +0000
@@ -169,8 +169,13 @@
</group>
<group colspan="2" col="2">
<separator string="Mailings" colspan="2" col="2"/>
+<<<<<<< TREE
<field name="optin" on_change="on_change_optin(optin)"/>
<field name="optout" on_change="on_change_optout(optout)"/>
+=======
+ <field name="optin" on_change="on_chnage_optin(optin)"/>
+ <field name="optout" on_change="on_chnage_optout(optout)"/>
+>>>>>>> MERGE-SOURCE
</group>
<group colspan="2" col="2">
<separator string="Statistics" colspan="2" col="2"/>
=== modified file 'crm/crm_opportunity_view.xml'
=== modified file 'crm/wizard/crm_lead_to_partner.py'
--- crm/wizard/crm_lead_to_partner.py 2011-03-01 11:34:15 +0000
+++ crm/wizard/crm_lead_to_partner.py 2011-03-14 09:45:25 +0000
@@ -212,7 +212,12 @@
mod_obj = self.pool.get('ir.model.data')
result = mod_obj._get_id(cr, uid, 'base', 'view_res_partner_filter')
res = mod_obj.read(cr, uid, result, ['res_id'])
- return {'type': 'ir.actions.act_window_close'}
+<<<<<<< TREE
+ return {'type': 'ir.actions.act_window_close'}
+=======
+ print partner_ids
+ return {'type': 'ir.actions.act_window_close'}
+>>>>>>> MERGE-SOURCE
crm_lead2partner()
=== modified file 'crm_caldav/i18n/bg.po'
--- crm_caldav/i18n/bg.po 2011-03-01 04:38:41 +0000
+++ crm_caldav/i18n/bg.po 2011-03-14 09:45:25 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
# Bulgarian 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.
@@ -47,3 +48,51 @@
#: model:ir.ui.menu,name:crm_caldav.menu_caldav_browse
msgid "Synchronyze this calendar"
msgstr "Синхронизирай този календар"
+=======
+# Bulgarian 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: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-02-18 11:12+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Bulgarian <bg@xxxxxx>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-02-19 05:06+0000\n"
+"X-Generator: Launchpad (build 12351)\n"
+
+#. module: crm_caldav
+#: model:ir.actions.act_window,name:crm_caldav.action_caldav_browse
+msgid "Caldav Browse"
+msgstr ""
+
+#. module: crm_caldav
+#: model:ir.model,name:crm_caldav.model_crm_meeting
+msgid "Meeting"
+msgstr "Среща"
+
+#. module: crm_caldav
+#: model:ir.module.module,shortdesc:crm_caldav.module_meta_information
+msgid "Extended Module to Add CalDav feature on Meeting"
+msgstr ""
+
+#. module: crm_caldav
+#: model:ir.module.module,description:crm_caldav.module_meta_information
+msgid ""
+"\n"
+" New Features in Meeting:\n"
+" * Share meeting with other calendar clients like sunbird\n"
+msgstr ""
+
+#. module: crm_caldav
+#: model:ir.ui.menu,name:crm_caldav.menu_caldav_browse
+msgid "Synchronyze this calendar"
+msgstr "Синхронизирай този календар"
+>>>>>>> MERGE-SOURCE
=== modified file 'crm_claim/crm_claim_view.xml'
=== modified file 'decimal_precision/i18n/bg.po'
--- decimal_precision/i18n/bg.po 2011-03-01 04:38:41 +0000
+++ decimal_precision/i18n/bg.po 2011-03-14 09:45:25 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
# Bulgarian 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.
@@ -68,3 +69,70 @@
#: model:ir.model,name:decimal_precision.model_decimal_precision
msgid "decimal.precision"
msgstr "decimal.precision"
+=======
+# Bulgarian 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: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-02-18 11:14+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Bulgarian <bg@xxxxxx>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-02-19 05:06+0000\n"
+"X-Generator: Launchpad (build 12351)\n"
+
+#. module: decimal_precision
+#: field:decimal.precision,digits:0
+msgid "Digits"
+msgstr "Цифри"
+
+#. module: decimal_precision
+#: view:decimal.precision:0
+msgid "Decimal Precision"
+msgstr "Знаци Ñлед деÑетичен знак"
+
+#. module: decimal_precision
+#: model:ir.actions.act_window,name:decimal_precision.action_decimal_precision_form
+#: model:ir.ui.menu,name:decimal_precision.menu_decimal_precision_form
+msgid "Decimal Accuracy Definitions"
+msgstr "ДеÑетична точноÑÑ‚"
+
+#. module: decimal_precision
+#: model:ir.module.module,description:decimal_precision.module_meta_information
+msgid ""
+"\n"
+"This module allows to configure the price accuracy you need for different "
+"kind\n"
+"of usage: accounting, sales, purchases, ...\n"
+"\n"
+"The decimal precision is configured per company.\n"
+msgstr ""
+
+#. module: decimal_precision
+#: field:decimal.precision,name:0
+msgid "Usage"
+msgstr "Употреба"
+
+#. module: decimal_precision
+#: sql_constraint:decimal.precision:0
+msgid "Only one value can be defined for each given usage!"
+msgstr "Само една ÑтойноÑÑ‚ може да буде дефинирана за дадена употреба"
+
+#. module: decimal_precision
+#: model:ir.module.module,shortdesc:decimal_precision.module_meta_information
+msgid "Decimal Precision Configuration"
+msgstr "ÐаÑтройки на деÑетична точноÑÑ‚"
+
+#. module: decimal_precision
+#: model:ir.model,name:decimal_precision.model_decimal_precision
+msgid "decimal.precision"
+msgstr "decimal.precision"
+>>>>>>> MERGE-SOURCE
=== modified file 'email_template/security/email_template_security.xml'
--- email_template/security/email_template_security.xml 2011-02-25 10:23:30 +0000
+++ email_template/security/email_template_security.xml 2011-03-14 09:45:25 +0000
@@ -1,6 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data noupdate="0">
+ <record id="base.res_groups_email_template_admin" model="res.groups">
+ <field name="name">Marketing / User</field>
+ </record>
</data>
</openerp>
=== modified file 'hr_recruitment/wizard/hr_recruitment_phonecall.py'
--- hr_recruitment/wizard/hr_recruitment_phonecall.py 2011-03-09 13:14:25 +0000
+++ hr_recruitment/wizard/hr_recruitment_phonecall.py 2011-03-14 09:45:25 +0000
@@ -77,7 +77,7 @@
phonecall_case_obj = self.pool.get('crm.phonecall')
if context is None:
context = {}
- form = self.read(cr, uid, ids, [], context=context)[0]
+ form = self.browse(cr, uid, ids, context=context)[0]
result = mod_obj._get_id(cr, uid, 'crm', 'view_crm_case_phonecalls_filter')
res = mod_obj.read(cr, uid, result, ['res_id'], context=context)
# Select the view
@@ -93,10 +93,10 @@
#TODO: Take other info from job
new_phonecall_id = phonecall_case_obj.create(cr, uid, {
'name': job.name,
- 'user_id': form['user_id'],
- 'categ_id': form['category_id'],
- 'description': form['note'],
- 'date': form['deadline'],
+ 'user_id': form.user_id.id,
+ 'categ_id': form.category_id.id,
+ 'description': form.note,
+ 'date': form.deadline,
'description': job.description,
'partner_id': job.partner_id.id,
'partner_address_id': job.partner_address_id.id,
=== modified file 'hr_timesheet/hr_timesheet_view.xml'
=== modified file 'hr_timesheet/wizard/hr_timesheet_print_employee.py'
--- hr_timesheet/wizard/hr_timesheet_print_employee.py 2011-02-17 13:26:43 +0000
+++ hr_timesheet/wizard/hr_timesheet_print_employee.py 2011-03-14 09:45:25 +0000
@@ -31,7 +31,7 @@
'Month', required=True),
'year': fields.integer('Year', required=True),
'employee_id': fields.many2one('hr.employee', 'Employee', required=True)
-
+
}
def _get_user(self, cr, uid, context=None):
@@ -50,6 +50,7 @@
def print_report(self, cr, uid, ids, context=None):
data = self.read(cr, uid, ids, context=context)[0]
+ data['employee_id'] = data['employee_id'][0]
datas = {
'ids': [],
'model': 'hr.employee',
=== modified file 'hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py'
--- hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py 2011-02-17 13:26:43 +0000
+++ hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py 2011-03-14 09:45:25 +0000
@@ -58,7 +58,9 @@
result = mod_obj._get_id(cr, uid, 'account', 'view_account_invoice_filter')
res = mod_obj.read(cr, uid, result, ['res_id'], context=context)
- data = self.read(cr, uid, ids, [], context=context)[0]
+ data = self.browse(cr, uid, ids, context=context)[0]
+ balance_product = data.balance_product.id
+
account_ids = 'active_ids' in context and context['active_ids'] or []
for account in analytic_account_obj.browse(cr, uid, account_ids, context=context):
@@ -143,9 +145,9 @@
}
invoice_line_obj.create(cr, uid, curr_line, context=context)
- if not data['balance_product']:
+ if not balance_product:
raise osv.except_osv(_('Balance product needed'), _('Please fill a Balance product in the wizard'))
- product = product_obj.browse(cr, uid, data['balance_product'], context2)
+ product = product_obj.browse(cr, uid, balance_product, context=context2)
taxes = product.taxes_id
tax = fiscal_pos_obj.map_tax(cr, uid, account.partner_id.property_account_position, taxes)
account_id = product.product_tmpl_id.property_account_income.id or product.categ_id.property_account_income_categ.id
@@ -180,4 +182,4 @@
final_invoice_create()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
=== modified file 'hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py'
--- hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py 2011-02-15 12:13:39 +0000
+++ hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py 2011-03-14 09:45:25 +0000
@@ -63,13 +63,13 @@
if context is None:
context = {}
result = mod_obj._get_id(cr, uid, 'account', 'view_account_invoice_filter')
- data = self.read(cr, uid, ids, [], context=context)[0]
+ data = self.browse(cr, uid, ids, context=context)[0]
account_ids = {}
for line in self.pool.get('account.analytic.line').browse(cr, uid, context['active_ids'], context=context):
account_ids[line.account_id.id] = True
- account_ids = account_ids.keys() #data['accounts']
+ account_ids = account_ids.keys() #data.accounts
for account in analytic_account_obj.browse(cr, uid, account_ids, context=context):
partner = account.partner_id
if (not partner) or not (account.pricelist_id):
@@ -121,17 +121,17 @@
factor_name = ''
factor = invoice_factor_obj.browse(cr, uid, factor_id, context2)
- if not data['product']:
+ if not data.product:
if factor.customer_name:
factor_name = product.name+' - '+factor.customer_name
else:
factor_name = product.name
else:
- factor_name = product_obj.name_get(cr, uid, [data['product']], context=context)[0][1]
+ factor_name = product_obj.name_get(cr, uid, [data.product.id], context=context)[0][1]
if account.pricelist_id:
pl = account.pricelist_id.id
- price = pro_price_obj.price_get(cr,uid,[pl], data['product'] or product_id, qty or 1.0, account.partner_id.id)[pl]
+ price = pro_price_obj.price_get(cr,uid,[pl], data.product.id or product_id, qty or 1.0, account.partner_id.id)[pl]
else:
price = 0.0
@@ -145,7 +145,7 @@
'invoice_line_tax_id': [(6,0,tax )],
'invoice_id': last_invoice,
'name': factor_name,
- 'product_id': data['product'] or product_id,
+ 'product_id': data.product.id or product_id,
'invoice_line_tax_id': [(6,0,tax)],
'uos_id': product.uom_id.id,
'account_id': account_id,
@@ -162,14 +162,14 @@
for line in line_ids:
# set invoice_line_note
details = []
- if data['date']:
+ if data.date:
details.append(line['date'])
- if data['time']:
+ if data.time:
if line['product_uom_id']:
details.append("%s %s" % (line['unit_amount'], product_uom_obj.browse(cr, uid, [line['product_uom_id']],context2)[0].name))
else:
details.append("%s" % (line['unit_amount'], ))
- if data['name']:
+ if data.name:
details.append(line['name'])
note.append(u' - '.join(map(lambda x: unicode(x) or '',details)))
=== modified file 'hr_timesheet_sheet/hr_timesheet_sheet_view.xml'
=== modified file 'l10n_br/i18n/pt_BR.po'
--- l10n_br/i18n/pt_BR.po 2011-03-08 04:47:52 +0000
+++ l10n_br/i18n/pt_BR.po 2011-03-14 09:45:25 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
# Brazilian Portuguese 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.
@@ -40,3 +41,41 @@
#: model:ir.module.module,shortdesc:l10n_br.module_meta_information
msgid "Brazilian Localization"
msgstr "Localização Brasileira"
+=======
+# Brazilian Portuguese 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: 2011-01-07 06:40+0000\n"
+"PO-Revision-Date: 2011-02-15 15:37+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Brazilian Portuguese <pt_BR@xxxxxx>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-02-16 05:03+0000\n"
+"X-Generator: Launchpad (build 12351)\n"
+
+#. module: l10n_br
+#: model:ir.actions.todo,note:l10n_br.config_call_account_template_brazilian_localization
+msgid ""
+"Generate Chart of Accounts from a Chart Template. You will be asked to pass "
+"the name of the company, the chart template to follow, the no. of digits to "
+"generate the code for your accounts and Bank account, currency to create "
+"Journals. Thus,the pure copy of chart Template is generated.\n"
+" This is the same wizard that runs from Financial "
+"Management/Configuration/Financial Accounting/Financial Accounts/Generate "
+"Chart of Accounts from a Chart Template."
+msgstr ""
+
+#. module: l10n_br
+#: model:ir.module.module,description:l10n_br.module_meta_information
+#: model:ir.module.module,shortdesc:l10n_br.module_meta_information
+msgid "Brazilian Localization"
+msgstr "Localização Brasileira"
+>>>>>>> MERGE-SOURCE
=== modified file 'l10n_ch/test/l10n_ch_report.yml'
--- l10n_ch/test/l10n_ch_report.yml 2011-02-28 10:49:36 +0000
+++ l10n_ch/test/l10n_ch_report.yml 2011-03-14 09:45:25 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
-
In order to test BVR printing. I create Partner data.
-
@@ -46,6 +47,56 @@
name: BVR test invoice
address_contact_id: res_partner_address_1
+=======
+-
+ I Partner data to Test BVR printing.
+-
+ !record {model: res.partner.category, id: res_partner_category_bvr}:
+ name: Customers
+-
+ I create BVR DUMMY Customer.
+-
+ !record {model: res.partner, id: res_partner_bvr}:
+ category_id:
+ - res_partner_category_bvr
+ name: BVR DUMMY
+-
+ I create contact address for BVR DUMMY.
+-
+ !record {model: res.partner.address, id: res_partner_address_1}:
+ partner_id: res_partner_bvr
+ street: Route de Belario
+ type: contact
+-
+ I create invoice address for BVR DUMMY.
+-
+ !record {model: res.partner.address, id: res_partner_address_2}:
+ partner_id: res_partner_bvr
+ street: Route de Belario
+ type: invoice
+-
+ I create delivery address for BVR DUMMY.
+-
+ !record {model: res.partner.address, id: res_partner_address_3}:
+ partner_id: res_partner_bvr
+ street: Route de Belario
+ type: delivery
+
+-
+ In order to test the PDF BVR webkit reports defined on an invoice, we will create a Invoice Record
+-
+ !record {model: account.invoice, id: l10n_ch_invoice}:
+ currency_id: base.CHF
+ company_id: base.main_company
+ address_invoice_id: res_partner_address_2
+ partner_id: res_partner_bvr
+ state: draft
+ type: out_invoice
+ account_id: account.a_recv
+ name: BVR test invoice
+ address_contact_id: res_partner_address_1
+
+>>>>>>> MERGE-SOURCE
-
In order to test the BVR report, I will assign a bank to the invoice
-
@@ -56,5 +107,9 @@
-
!python {model: account.invoice}: |
from tools.test_reports import try_report
+<<<<<<< TREE
company = self.pool.get('res.users').browse(cr, uid, uid).company_id
company.lib_path and try_report(cr, uid, 'report.invoice_web_bvr', [ref('l10n_ch_invoice')]) or 'Webkit lib not set'
+=======
+ company = self.pool.get('res.users').browse(cr, uid, uid).company_id
+ company.lib_path and try_report(cr, uid, 'report.invoice_web_bvr', [ref('l10n_ch_invoice')]) or 'Webkit lib not set'>>>>>>> MERGE-SOURCE
=== modified file 'lunch/wizard/lunch_order_confirm.py'
--- lunch/wizard/lunch_order_confirm.py 2011-02-15 12:13:39 +0000
+++ lunch/wizard/lunch_order_confirm.py 2011-03-14 09:45:25 +0000
@@ -46,8 +46,8 @@
data = context and context.get('active_ids', []) or []
order_ref = self.pool.get('lunch.order')
- for confirm_obj in self.read(cr, uid, ids):
- order_ref.confirm(cr, uid, data, confirm_obj['confirm_cashbox'], context)
+ for confirm_obj in self.browse(cr, uid, ids, context=context):
+ order_ref.confirm(cr, uid, data, confirm_obj.confirm_cashbox.id, context)
return {'type': 'ir.actions.act_window_close'}
lunch_order_confirm()
=== modified file 'mail_gateway/mail_gateway.py'
--- mail_gateway/mail_gateway.py 2011-03-10 10:39:51 +0000
+++ mail_gateway/mail_gateway.py 2011-03-14 09:45:25 +0000
@@ -173,7 +173,11 @@
'message_id': message_id,
'attachment_ids': [(6, 0, attachments)]
}
+<<<<<<< TREE
+=======
+
+>>>>>>> MERGE-SOURCE
obj.create(cr, uid, data, context=context)
return True
mailgate_thread()
=== modified file 'mrp/i18n/ro.po'
--- mrp/i18n/ro.po 2011-03-12 05:02:30 +0000
+++ mrp/i18n/ro.po 2011-03-14 09:45:25 +0000
@@ -7,14 +7,24 @@
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+<<<<<<< TREE
"PO-Revision-Date: 2011-03-09 21:08+0000\n"
"Last-Translator: Dorin <dhongu@xxxxxxxxx>\n"
+=======
+"PO-Revision-Date: 2011-02-20 18:39+0000\n"
+"Last-Translator: Dorin <dhongu@xxxxxxxxx>\n"
+>>>>>>> MERGE-SOURCE
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2011-03-12 05:01+0000\n"
"X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-02-21 04:50+0000\n"
+"X-Generator: Launchpad (build 12351)\n"
+>>>>>>> MERGE-SOURCE
#. module: mrp
#: field:mrp.production,move_created_ids:0
@@ -596,8 +606,13 @@
#. module: mrp
#: help:mrp.workcenter,costs_cycle:0
+<<<<<<< TREE
msgid "Specify Cost of Work Center per cycle."
msgstr ""
+=======
+msgid "Specify Cost of Work center per cycle."
+msgstr "Precizaţi costul postulu de lucru pe ciclu."
+>>>>>>> MERGE-SOURCE
#. module: mrp
#: selection:mrp.production,state:0
@@ -2442,8 +2457,13 @@
"Depending on the chosen method to supply the stockable products, the "
"procurement order creates a RFQ, a production order, ... "
msgstr ""
+<<<<<<< TREE
"În funcție de metoda de furnizare aleasă a produselor stocabile, comanda de "
"achiziții creează o cerere de ofertă, o comandă de producție, ... "
+=======
+"În funcție de metoda de furnizare a produselor stocabile aleasă, ordinea de "
+"achiziții publice creează o Cerere de ofertă, o comandă de producție, ... "
+>>>>>>> MERGE-SOURCE
#. module: mrp
#: help:mrp.workcenter,time_stop:0
=== modified file 'mrp/mrp.py'
=== modified file 'mrp/mrp_view.xml'
--- mrp/mrp_view.xml 2011-03-11 15:18:19 +0000
+++ mrp/mrp_view.xml 2011-03-14 09:45:25 +0000
@@ -9,6 +9,11 @@
<menuitem id="menu_mrp_manufacturing" name="Manufacturing" parent="base.menu_mrp_root" sequence="1"/>
+<<<<<<< TREE
+=======
+
+
+>>>>>>> MERGE-SOURCE
<menuitem name="Master Data"
id="menu_mrp_bom"
parent="base.menu_mrp_root"
=== modified file 'mrp/wizard/mrp_product_produce.py'
--- mrp/wizard/mrp_product_produce.py 2011-02-17 13:26:43 +0000
+++ mrp/wizard/mrp_product_produce.py 2011-03-14 09:45:25 +0000
@@ -70,10 +70,10 @@
context = {}
prod_obj = self.pool.get('mrp.production')
move_ids = context.get('active_ids', [])
- for data in self.read(cr, uid, ids, context=context):
+ for data in self.browse(cr, uid, ids, context=context):
for move_id in move_ids:
prod_obj.action_produce(cr, uid, move_id,
- data['product_qty'], data['mode'], context=context)
+ data.product_qty, data.mode, context=context)
return {}
mrp_product_produce()
=== modified file 'outlook/i18n/bg.po'
--- outlook/i18n/bg.po 2011-03-01 04:38:41 +0000
+++ outlook/i18n/bg.po 2011-03-14 09:45:25 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
# Bulgarian 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.
@@ -141,3 +142,148 @@
#: view:outlook.installer:0
msgid "Configure"
msgstr "ÐаÑтройване"
+=======
+# Bulgarian 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: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-02-26 02:05+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Bulgarian <bg@xxxxxx>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-02-26 05:00+0000\n"
+"X-Generator: Launchpad (build 12351)\n"
+
+#. module: outlook
+#: field:outlook.installer,doc_file:0
+msgid "Installation Manual"
+msgstr "Упътване за инÑталациÑ"
+
+#. module: outlook
+#: field:outlook.installer,plugin_file:0
+msgid "Outlook Plug-in"
+msgstr "Outlook Plug-in"
+
+#. module: outlook
+#: field:outlook.installer,description:0
+msgid "Description"
+msgstr "ОпиÑание"
+
+#. module: outlook
+#: model:ir.ui.menu,name:outlook.menu_base_config_plugins_outlook
+#: view:outlook.installer:0
+msgid "Outlook Plug-In"
+msgstr ""
+
+#. module: outlook
+#: view:outlook.installer:0
+msgid "Skip"
+msgstr "ПропуÑкане"
+
+#. module: outlook
+#: model:ir.module.module,shortdesc:outlook.module_meta_information
+msgid "Outlook Interface"
+msgstr ""
+
+#. module: outlook
+#: field:outlook.installer,doc_name:0
+#: field:outlook.installer,name:0
+msgid "File name"
+msgstr "Име на файл"
+
+#. module: outlook
+#: field:outlook.installer,outlook:0
+msgid "Outlook Plug-in "
+msgstr ""
+
+#. module: outlook
+#: model:ir.module.module,description:outlook.module_meta_information
+msgid ""
+"\n"
+" This module provide the Outlook plug-in. \n"
+"\n"
+" Outlook plug-in allows you to select an object that you’d like to add\n"
+" to your email and its attachments from MS Outlook. You can select a "
+"partner, a task,\n"
+" a project, an analytical account, or any other object and Archived "
+"selected\n"
+" mail in mailgate.messages with attachments.\n"
+"\n"
+" "
+msgstr ""
+
+#. module: outlook
+#: help:outlook.installer,doc_file:0
+msgid "The documentation file :- how to install Outlook Plug-in."
+msgstr ""
+
+#. module: outlook
+#: model:ir.model,name:outlook.model_outlook_installer
+msgid "outlook.installer"
+msgstr ""
+
+#. module: outlook
+#: model:ir.actions.act_window,name:outlook.action_outlook_installer
+#: model:ir.actions.act_window,name:outlook.action_outlook_wizard
+#: view:outlook.installer:0
+msgid "Outlook Plug-In Configuration"
+msgstr ""
+
+#. module: outlook
+#: field:outlook.installer,progress:0
+msgid "Configuration Progress"
+msgstr "ÐŸÑ€Ð¾Ð³Ñ€ÐµÑ Ð½Ð° конфигурирането"
+
+#. module: outlook
+#: view:outlook.installer:0
+msgid ""
+"This plug-in allows you to link your e-mail to OpenERP's documents. You can "
+"attach it to any existing one in OpenERP or create a new one."
+msgstr ""
+
+#. module: outlook
+#: help:outlook.installer,outlook:0
+msgid ""
+"Allows you to select an object that you would like to add to your email and "
+"its attachments."
+msgstr ""
+
+#. module: outlook
+#: view:outlook.installer:0
+msgid "title"
+msgstr "заглавие"
+
+#. module: outlook
+#: view:outlook.installer:0
+msgid "_Close"
+msgstr "_Затвори"
+
+#. module: outlook
+#: view:outlook.installer:0
+msgid "Installation and Configuration Steps"
+msgstr ""
+
+#. module: outlook
+#: field:outlook.installer,config_logo:0
+msgid "Image"
+msgstr "Изображение"
+
+#. module: outlook
+#: help:outlook.installer,plugin_file:0
+msgid ""
+"outlook plug-in file. Save as this file and install this plug-in in outlook."
+msgstr ""
+
+#. module: outlook
+#: view:outlook.installer:0
+msgid "Configure"
+msgstr "ÐаÑтройване"
+>>>>>>> MERGE-SOURCE
=== modified file 'point_of_sale/i18n/pt_BR.po'
--- point_of_sale/i18n/pt_BR.po 2011-03-09 13:14:25 +0000
+++ point_of_sale/i18n/pt_BR.po 2011-03-14 09:45:25 +0000
@@ -7,14 +7,24 @@
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
"POT-Creation-Date: 2011-01-03 16:58+0000\n"
+<<<<<<< TREE
"PO-Revision-Date: 2011-02-28 20:57+0000\n"
"Last-Translator: Emerson <Unknown>\n"
+=======
+"PO-Revision-Date: 2011-02-16 22:57+0000\n"
+"Last-Translator: Emerson <Unknown>\n"
+>>>>>>> MERGE-SOURCE
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2011-03-01 04:37+0000\n"
"X-Generator: Launchpad (build 12351)\n"
+=======
+"X-Launchpad-Export-Date: 2011-02-19 05:05+0000\n"
+"X-Generator: Launchpad (build 12351)\n"
+>>>>>>> MERGE-SOURCE
#. module: point_of_sale
#: field:pos.discount,discount_notes:0
=== modified file 'point_of_sale/wizard/pos_payment.py'
--- point_of_sale/wizard/pos_payment.py 2011-03-11 15:46:47 +0000
+++ point_of_sale/wizard/pos_payment.py 2011-03-14 09:45:25 +0000
@@ -149,9 +149,14 @@
order = order_obj.browse(cr, uid, active_id, context=context)
amount = order.amount_total - order.amount_paid
data = self.read(cr, uid, ids, context=context)[0]
+<<<<<<< TREE
partner = obj_partner.browse(cr, uid, data['partner_id'], context=context)
if not partner.address:
raise osv.except_osv(_('Error!'),_("Customer doesn't have an address to make the invoice"))
+=======
+ for m2o_field in ['product_id','pricelist_id','partner_id']:
+ data[m2o_field] = data[m2o_field][0]
+>>>>>>> MERGE-SOURCE
if data['is_acc']:
amount = self.pool.get('product.product').browse(cr, uid, data['product_id'], context=context).list_price
=== modified file 'point_of_sale/wizard/pos_return.py'
--- point_of_sale/wizard/pos_return.py 2011-02-15 12:13:39 +0000
+++ point_of_sale/wizard/pos_return.py 2011-03-14 09:45:25 +0000
@@ -353,8 +353,8 @@
data = return_boj.read(cr,uid,return_id,[])[0]
wf_service = netsvc.LocalService("workflow")
- self_data = self.read(cr, uid, ids)[0]
- order_obj.add_product(cr, uid, active_ids[0], self_data['product_id'], self_data['quantity'], context=context)
+ self_data = self.browse(cr, uid, ids, context=context)[0]
+ order_obj.add_product(cr, uid, active_ids[0], self_data.product_id.id, self_data.quantity, context=context)
for order_id in order_obj.browse(cr, uid, active_ids, context=context):
prop_ids =property_obj.search(cr, uid, [('name', '=', 'property_stock_customer')])
=== modified file 'procurement/i18n/ro.po'
--- procurement/i18n/ro.po 2011-03-13 04:50:22 +0000
+++ procurement/i18n/ro.po 2011-03-14 09:45:25 +0000
@@ -8,14 +8,24 @@
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+<<<<<<< TREE
"PO-Revision-Date: 2011-03-12 15:14+0000\n"
"Last-Translator: Dorin <dhongu@xxxxxxxxx>\n"
+=======
+"PO-Revision-Date: 2011-02-20 19:25+0000\n"
+"Last-Translator: Dorin <dhongu@xxxxxxxxx>\n"
+>>>>>>> MERGE-SOURCE
"Language-Team: Romanian <ro@xxxxxx>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2011-03-13 04:50+0000\n"
"X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-02-21 04:51+0000\n"
+"X-Generator: Launchpad (build 12351)\n"
+>>>>>>> MERGE-SOURCE
#. module: procurement
#: view:make.procurement:0
@@ -273,7 +283,11 @@
#: model:ir.module.module,shortdesc:procurement.module_meta_information
#: field:stock.move,procurements:0
msgid "Procurements"
+<<<<<<< TREE
msgstr "Planificare necesar"
+=======
+msgstr "Aprovizionare"
+>>>>>>> MERGE-SOURCE
#. module: procurement
#: field:res.company,schedule_range:0
@@ -472,7 +486,11 @@
#. module: procurement
#: view:procurement.order:0
msgid "Procurement Lines"
+<<<<<<< TREE
msgstr "Poziții necesar planificat"
+=======
+msgstr "Poziţii procurare"
+>>>>>>> MERGE-SOURCE
#. module: procurement
#: view:procurement.order.compute.all:0
@@ -646,7 +664,11 @@
#. module: procurement
#: view:procurement.order:0
msgid "Run Procurement"
+<<<<<<< TREE
msgstr "Rulare planificare necesar"
+=======
+msgstr "Rulare aprovizionare"
+>>>>>>> MERGE-SOURCE
#. module: procurement
#: selection:procurement.order,state:0
=== modified file 'product/i18n/ro.po'
--- product/i18n/ro.po 2011-03-10 04:46:36 +0000
+++ product/i18n/ro.po 2011-03-14 09:45:25 +0000
@@ -7,14 +7,24 @@
"Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+<<<<<<< TREE
"PO-Revision-Date: 2011-03-09 17:56+0000\n"
"Last-Translator: Dorin <dhongu@xxxxxxxxx>\n"
+=======
+"PO-Revision-Date: 2011-02-20 18:12+0000\n"
+"Last-Translator: Dorin <dhongu@xxxxxxxxx>\n"
+>>>>>>> MERGE-SOURCE
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2011-03-10 04:46+0000\n"
"X-Generator: Launchpad (build 12351)\n"
+=======
+"X-Launchpad-Export-Date: 2011-02-21 04:50+0000\n"
+"X-Generator: Launchpad (build 12351)\n"
+>>>>>>> MERGE-SOURCE
#. module: product
#: model:product.template,name:product.product_product_ram512_product_template
@@ -443,7 +453,11 @@
#. module: product
#: help:product.template,weight_net:0
msgid "The net weight in Kg."
+<<<<<<< TREE
msgstr "Masa netă în Kg."
+=======
+msgstr "Greutate neta în Kg."
+>>>>>>> MERGE-SOURCE
#. module: product
#: help:product.template,state:0
@@ -900,7 +914,11 @@
#. module: product
#: field:product.packaging,weight:0
msgid "Total Package Weight"
+<<<<<<< TREE
msgstr "Masa totală pachet"
+=======
+msgstr "Greutate totală pachet"
+>>>>>>> MERGE-SOURCE
#. module: product
#: help:product.packaging,code:0
@@ -1350,7 +1368,11 @@
#. module: product
#: help:product.template,weight:0
msgid "The gross weight in Kg."
+<<<<<<< TREE
msgstr "Masă brută în Kg"
+=======
+msgstr "Greutatea brută în Kg"
+>>>>>>> MERGE-SOURCE
#. module: product
#: view:product.product:0
@@ -1490,7 +1512,11 @@
#. module: product
#: help:product.packaging,weight_ul:0
msgid "The weight of the empty UL"
+<<<<<<< TREE
msgstr "Masă ambalaj gol"
+=======
+msgstr "Greutate ambalaj gol"
+>>>>>>> MERGE-SOURCE
#. module: product
#: selection:product.uom,uom_type:0
@@ -1524,7 +1550,11 @@
#. module: product
#: field:product.packaging,weight_ul:0
msgid "Empty Package Weight"
+<<<<<<< TREE
msgstr "Masă ambalaj gol"
+=======
+msgstr "Greutate ambalaj gol"
+>>>>>>> MERGE-SOURCE
#. module: product
#: field:product.price.type,field:0
@@ -1952,7 +1982,11 @@
#. module: product
#: model:product.uom.categ,name:product.product_uom_categ_kgm
msgid "Weight"
+<<<<<<< TREE
msgstr "Masă"
+=======
+msgstr "Greutate"
+>>>>>>> MERGE-SOURCE
#. module: product
#: model:product.template,name:product.product_product_22_product_template
@@ -2006,7 +2040,11 @@
#: view:product.product:0
#: view:product.template:0
msgid "Weigths"
+<<<<<<< TREE
msgstr "Mase"
+=======
+msgstr "Greutate"
+>>>>>>> MERGE-SOURCE
#. module: product
#: constraint:res.partner:0
@@ -2076,7 +2114,11 @@
#. module: product
#: field:product.template,weight:0
msgid "Gross weight"
+<<<<<<< TREE
msgstr "Masă brută"
+=======
+msgstr "Greutate brută"
+>>>>>>> MERGE-SOURCE
#. module: product
#: model:product.template,name:product.product_product_assemblysection0_product_template
=== modified file 'product/product.py'
=== modified file 'product/wizard/product_price.py'
--- product/wizard/product_price.py 2011-02-15 12:13:39 +0000
+++ product/wizard/product_price.py 2011-03-14 09:45:25 +0000
@@ -53,6 +53,7 @@
datas = {'ids': context.get('active_ids', [])}
res = self.read(cr, uid, ids, ['price_list','qty1', 'qty2','qty3','qty4','qty5'], context=context)
res = res and res[0] or {}
+ res['price_list'] = res['price_list'][0]
datas['form'] = res
return {
'type': 'ir.actions.report.xml',
=== modified file 'project/project.py'
--- project/project.py 2011-03-02 22:52:59 +0000
+++ project/project.py 2011-03-14 09:45:25 +0000
@@ -247,8 +247,13 @@
start_date = date(*time.strptime(proj.date_start,'%Y-%m-%d')[:3])
end_date = date(*time.strptime(proj.date,'%Y-%m-%d')[:3])
new_date_end = (datetime(*time.strptime(new_date_start,'%Y-%m-%d')[:3])+(end_date-start_date)).strftime('%Y-%m-%d')
+<<<<<<< TREE
context.update({'copy':True})
new_id = self.template_copy(cr, uid, proj.id, default = {
+=======
+ context.update({'copy':True})
+ new_id = project_obj.copy(cr, uid, proj.id, default = {
+>>>>>>> MERGE-SOURCE
'name': proj.name +_(' (copy)'),
'state':'open',
'date_start':new_date_start,
@@ -393,10 +398,17 @@
default['active'] = True
default['type_id'] = False
if not default.get('name', False):
+<<<<<<< TREE
default['name'] = self.browse(cr, uid, id, context=context).name or ''
if not context.get('copy',False):
new_name = _("%s (copy)")%default.get('name','')
default.update({'name':new_name})
+=======
+ default['name'] = self.browse(cr, uid, id, context=context).name or ''
+ if not context.get('copy',False):
+ new_name = _("%s (copy)")%default.get('name','')
+ default.update({'name':new_name})
+>>>>>>> MERGE-SOURCE
return super(task, self).copy_data(cr, uid, id, default, context)
def _check_dates(self, cr, uid, ids, context=None):
=== modified file 'project/wizard/project_task_delegate.py'
--- project/wizard/project_task_delegate.py 2011-03-09 13:14:25 +0000
+++ project/wizard/project_task_delegate.py 2011-03-14 09:45:25 +0000
@@ -105,6 +105,7 @@
task_id = context.get('active_id', False)
task_pool = self.pool.get('project.task')
delegate_data = self.read(cr, uid, ids, context=context)[0]
+ delegate_data['user_id'] = delegate_data['user_id'][0]
delegate_data['name'] = tools.ustr(delegate_data['name'])
task_pool.do_delegate(cr, uid, task_id, delegate_data, context=context)
return {}
=== modified file 'project_gtd/wizard/project_gtd_fill.py'
--- project_gtd/wizard/project_gtd_fill.py 2011-02-15 12:13:39 +0000
+++ project_gtd/wizard/project_gtd_fill.py 2011-03-14 09:45:25 +0000
@@ -50,10 +50,10 @@
def process(self, cr, uid, ids, context=None):
if not ids:
return {}
- data = self.read(cr, uid, ids, [], context=context)
- if not data[0]['task_ids']:
+ data = self.browse(cr, uid, ids, context=context)
+ if not data[0].task_ids:
return {}
- self.pool.get('project.task').write(cr, uid, data[0]['task_ids'], {'timebox_id':data[0]['timebox_to_id']})
+ self.pool.get('project.task').write(cr, uid, [x.id for x in data[0].task_ids], {'timebox_id':data[0].timebox_to_id.id})
return {'type': 'ir.actions.act_window_close'}
project_timebox_fill()
=== modified file 'project_long_term/wizard/project_compute_phases.py'
--- project_long_term/wizard/project_compute_phases.py 2011-02-15 12:13:39 +0000
+++ project_long_term/wizard/project_compute_phases.py 2011-03-14 09:45:25 +0000
@@ -45,12 +45,12 @@
Compute the phases for scheduling.
"""
project_pool = self.pool.get('project.project')
- data = self.read(cr, uid, ids, [], context=context)[0]
- if not data['project_id'] and data['target_project'] == 'one':
+ data = self.browse(cr, uid, ids, context=context)[0]
+ if not data.project_id and data.target_project == 'one':
raise osv.except_osv(_('Error!'), _('Please Specify Project to be schedule'))
- if data['project_id']: # If project mentioned find its phases
- project_ids = [data['project_id']]
+ if data.project_id: # If project mentioned find its phases
+ project_ids = [data.project_id.id]
else: # Else take all the draft,open,pending states phases
project_ids = project_pool.search(cr, uid, [], context=context)
@@ -69,7 +69,7 @@
id = mod_obj.read(cr, uid, [result], ['res_id'])[0]['res_id']
result = act_obj.read(cr, uid, [id], context=context)[0]
result['target'] = 'current'
- result['context'] = {"search_default_project_id":data['project_id'], "default_project_id":data['project_id'], "search_default_responsible_id":uid, "search_default_current": 1}
+ result['context'] = {"search_default_project_id":data.project_id.id or False, "default_project_id":data.project_id.id or False, "search_default_responsible_id":uid, "search_default_current": 1}
return result
project_compute_phases()
=== modified file 'project_long_term/wizard/project_compute_tasks.py'
--- project_long_term/wizard/project_compute_tasks.py 2011-02-15 12:13:39 +0000
+++ project_long_term/wizard/project_compute_tasks.py 2011-03-14 09:45:25 +0000
@@ -37,8 +37,8 @@
if context is None:
context = {}
context['compute_by'] = 'project'
- data = self.read(cr, uid, ids, [])[0]
- project_id = data['project_id']
+ data = self.browse(cr, uid, ids)[0]
+ project_id = data.project_id.id
project_pool.schedule_tasks(cr, uid, [project_id], context=context)
return self._open_task_list(cr, uid, data, context=context)
=== modified file 'project_scrum/wizard/project_scrum_backlog_create_task.py'
--- project_scrum/wizard/project_scrum_backlog_create_task.py 2011-02-17 13:26:43 +0000
+++ project_scrum/wizard/project_scrum_backlog_create_task.py 2011-03-14 09:45:25 +0000
@@ -35,6 +35,8 @@
ids_task = []
data = self.read(cr, uid, ids, [], context=context)[0]
+ data['user_id'] = data['user_id'][0]
+
backlogs = backlog_id.browse(cr, uid, context['active_ids'], context=context)
result = mod_obj._get_id(cr, uid, 'project', 'view_task_search_form')
id = mod_obj.read(cr, uid, result, ['res_id'])
=== modified file 'project_scrum/wizard/project_scrum_backlog_merger.py'
--- project_scrum/wizard/project_scrum_backlog_merger.py 2011-01-14 00:11:01 +0000
+++ project_scrum/wizard/project_scrum_backlog_merger.py 2011-03-14 09:45:25 +0000
@@ -66,15 +66,14 @@
context = {}
#This will check product backlog's project id if different then will accept a new id provided by the user.
if 'scrum_projects' in context:
- data = self.read(cr, uid, ids, [])[0]
- if data['project_id'] == False:
+ data = self.browse(cr, uid, ids, [])[0]
+ if data.project_id.id == False:
raise osv.except_osv(_('Warning'),_('Please select any Project.'))
- new_project_id = data['project_id']
+ new_project_id = data.project_id.id
else:
p_id = backlog_obj.read(cr, uid, context['active_id'], ['project_id'])
new_project_id = p_id['project_id'][0]
#To merge note and description of backlogs
-
new_note = ''
new_description = ''
for backlogs in backlog_obj.browse(cr, uid, context['active_ids'], context=context):
@@ -93,7 +92,6 @@
'project_id': new_project_id,
'expected_hours': round(max(new_exp_hour))
}, context=context)
-
#To assing a new product backlog to merged tasks
task_obj.write(cr, uid, task_lines, {'product_backlog_id': id_b})
backlog_obj.unlink(cr, uid, context['active_ids'], context=context)
=== modified file 'project_scrum/wizard/project_scrum_backlog_sprint.py'
--- project_scrum/wizard/project_scrum_backlog_sprint.py 2011-02-17 13:26:43 +0000
+++ project_scrum/wizard/project_scrum_backlog_sprint.py 2011-03-14 09:45:25 +0000
@@ -41,10 +41,10 @@
backlog_ids = []
if context is None:
context = {}
- data = self.read(cr, uid, ids, [], context=context)[0]
+ data = self.browse(cr, uid, ids,context=context)[0]
for backlog in backlog_obj.browse(cr, uid, context['active_ids'], context=context):
backlog_ids.append(backlog.id)
- if data['convert_to_task']:
+ if data.convert_to_task:
task_id = task.create(cr, uid, {
'product_backlog_id': backlog.id,
'name': backlog.name,
@@ -56,12 +56,12 @@
})
message = _('Product Backlog') + " '" + backlog.name + "' "+ _("is converted into Task %d."%(task_id,))
self.log(cr, uid, backlog.id, message)
- if data['state_open'] and backlog.state == "draft":
+ if data.state_open and backlog.state == "draft":
backlog_obj.write(cr, uid, backlog.id, {'state':'open'})
- sprint = sprint_obj.browse(cr, uid, data['sprint_id'], context=context)
+ sprint = sprint_obj.browse(cr, uid, data.sprint_id.id, context=context)
message = _('Product Backlog') + " '" + backlog.name + "' "+ _("is assigned sprint:%s"%(sprint.name))
self.log(cr, uid, backlog.id, message)
- backlog_obj.write(cr, uid, backlog_ids, {'sprint_id': data['sprint_id']}, context=context)
+ backlog_obj.write(cr, uid, backlog_ids, {'sprint_id': data.sprint_id.id}, context=context)
return {'type': 'ir.actions.act_window_close'}
backlog_sprint_assign()
=== modified file 'purchase/i18n/ro.po'
--- purchase/i18n/ro.po 2011-03-10 04:46:36 +0000
+++ purchase/i18n/ro.po 2011-03-14 09:45:25 +0000
@@ -7,14 +7,24 @@
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+<<<<<<< TREE
"PO-Revision-Date: 2011-03-09 21:41+0000\n"
"Last-Translator: Dorin <dhongu@xxxxxxxxx>\n"
+=======
+"PO-Revision-Date: 2011-02-20 18:55+0000\n"
+"Last-Translator: Dorin <dhongu@xxxxxxxxx>\n"
+>>>>>>> MERGE-SOURCE
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2011-03-10 04:45+0000\n"
"X-Generator: Launchpad (build 12351)\n"
+=======
+"X-Launchpad-Export-Date: 2011-02-21 04:50+0000\n"
+"X-Generator: Launchpad (build 12351)\n"
+>>>>>>> MERGE-SOURCE
#. module: purchase
#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -1012,7 +1022,11 @@
#: view:purchase.order.line:0
#: field:stock.move,purchase_line_id:0
msgid "Purchase Order Line"
+<<<<<<< TREE
msgstr "Poziţie comandă aprovizionare"
+=======
+msgstr "Poziţii comandă aprovizionare"
+>>>>>>> MERGE-SOURCE
#. module: purchase
#: constraint:res.partner:0
=== modified file 'purchase/purchase_view.xml'
=== modified file 'purchase_double_validation/i18n/pt_BR.po'
--- purchase_double_validation/i18n/pt_BR.po 2011-03-02 04:39:01 +0000
+++ purchase_double_validation/i18n/pt_BR.po 2011-03-14 09:45:25 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
# Brazilian Portuguese 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.
@@ -86,3 +87,88 @@
#: field:purchase.double.validation.installer,limit_amount:0
msgid "Maximum Purchase Amount"
msgstr ""
+=======
+# Brazilian Portuguese 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: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-02-15 15:37+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Brazilian Portuguese <pt_BR@xxxxxx>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-02-16 05:03+0000\n"
+"X-Generator: Launchpad (build 12351)\n"
+
+#. module: purchase_double_validation
+#: view:purchase.double.validation.installer:0
+msgid "Purchase Application Configuration"
+msgstr ""
+
+#. module: purchase_double_validation
+#: field:purchase.double.validation.installer,progress:0
+msgid "Configuration Progress"
+msgstr ""
+
+#. module: purchase_double_validation
+#: view:purchase.double.validation.installer:0
+msgid "Define minimum amount after which puchase is needed to be validated."
+msgstr ""
+
+#. module: purchase_double_validation
+#: view:purchase.double.validation.installer:0
+msgid "title"
+msgstr ""
+
+#. module: purchase_double_validation
+#: model:ir.module.module,shortdesc:purchase_double_validation.module_meta_information
+msgid "purchase_double_validation"
+msgstr ""
+
+#. module: purchase_double_validation
+#: field:purchase.double.validation.installer,config_logo:0
+msgid "Image"
+msgstr ""
+
+#. module: purchase_double_validation
+#: model:ir.module.module,description:purchase_double_validation.module_meta_information
+msgid ""
+"\n"
+"\tThis module modifies the purchase workflow in order to validate purchases "
+"that exceeds minimum amount set by configuration wizard\n"
+" "
+msgstr ""
+
+#. module: purchase_double_validation
+#: model:ir.actions.act_window,name:purchase_double_validation.action_config_purchase_limit_amount
+#: view:purchase.double.validation.installer:0
+msgid "Configure Limit Amount for Purchase"
+msgstr ""
+
+#. module: purchase_double_validation
+#: view:purchase.double.validation.installer:0
+msgid "res_config_contents"
+msgstr ""
+
+#. module: purchase_double_validation
+#: help:purchase.double.validation.installer,limit_amount:0
+msgid "Maximum amount after which validation of purchase is required."
+msgstr ""
+
+#. module: purchase_double_validation
+#: model:ir.model,name:purchase_double_validation.model_purchase_double_validation_installer
+msgid "purchase.double.validation.installer"
+msgstr ""
+
+#. module: purchase_double_validation
+#: field:purchase.double.validation.installer,limit_amount:0
+msgid "Maximum Purchase Amount"
+msgstr ""
+>>>>>>> MERGE-SOURCE
=== modified file 'purchase_requisition/i18n/id.po'
--- purchase_requisition/i18n/id.po 2011-03-10 04:46:36 +0000
+++ purchase_requisition/i18n/id.po 2011-03-14 09:45:25 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
# Indonesian 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.
@@ -428,3 +429,427 @@
"You have already one %s purchase order for this partner, you must cancel "
"this purchase order to create a new quotation."
msgstr ""
+=======
+# Indonesian 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: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-02-23 05:56+0000\n"
+"Last-Translator: moelyana <Unknown>\n"
+"Language-Team: Indonesian <id@xxxxxx>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-02-25 04:40+0000\n"
+"X-Generator: Launchpad (build 12351)\n"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+#: selection:purchase.requisition,state:0
+msgid "In Progress"
+msgstr "Dalam Proses"
+
+#. module: purchase_requisition
+#: code:addons/purchase_requisition/wizard/purchase_requisition_partner.py:44
+#, python-format
+msgid "No Product in Tender"
+msgstr "Tidak ada Produk pada Tender"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Confirm"
+msgstr "Konfirmasi"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+#: field:purchase.requisition,user_id:0
+msgid "Responsible"
+msgstr "Yang Bertanggung Jawab"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Group By..."
+msgstr "Dikelompokan berdasarkan ..."
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+#: field:purchase.requisition,state:0
+msgid "State"
+msgstr "Status"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+#: selection:purchase.requisition,state:0
+msgid "Draft"
+msgstr "Draft"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Supplier"
+msgstr "Pemasok"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,exclusive:0
+msgid "Requisition Type"
+msgstr "Jenis permintaan"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Product Detail"
+msgstr "Detail Produk"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: field:purchase.requisition,date_start:0
+msgid "Requisition Date"
+msgstr "Tanggal permintaan"
+
+#. module: purchase_requisition
+#: model:ir.actions.act_window,name:purchase_requisition.action_purchase_requisition_partner
+#: model:ir.actions.report.xml,name:purchase_requisition.report_purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_purchase_requisition
+#: field:product.product,purchase_requisition:0
+#: field:purchase.order,requisition_id:0
+#: view:purchase.requisition:0
+#: field:purchase.requisition.line,requisition_id:0
+#: view:purchase.requisition.partner:0
+msgid "Purchase Requisition"
+msgstr "Permintaan Pembelian"
+
+#. module: purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_purchase_requisition_line
+msgid "Purchase Requisition Line"
+msgstr ""
+
+#. module: purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_product_product
+#: field:purchase.requisition.line,product_id:0
+msgid "Product"
+msgstr "Produk"
+
+#. module: purchase_requisition
+#: sql_constraint:purchase.order:0
+msgid "Order Reference must be unique !"
+msgstr "Referensi order harus unik !"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: field:purchase.requisition,description:0
+msgid "Description"
+msgstr "Keterangan"
+
+#. module: purchase_requisition
+#: help:product.product,purchase_requisition:0
+msgid ""
+"Check this box so that requisitions generates purchase requisitions instead "
+"of directly requests for quotations."
+msgstr ""
+"Centang kotak ini sehingga menghasilkan permintaan resmi permintaan resmi "
+"pembelian bukan langsung permintaan untuk penawaran."
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Type"
+msgstr "Jenis"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,company_id:0
+#: field:purchase.requisition.line,company_id:0
+msgid "Company"
+msgstr "Perusahaan"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Request a Quotation"
+msgstr ""
+
+#. module: purchase_requisition
+#: selection:purchase.requisition,exclusive:0
+msgid "Multiple Requisitions"
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Approved by Supplier"
+msgstr "Distujui oleh Pemasok"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Reset to Draft"
+msgstr "Kembalikan ke Konsep"
+
+#. module: purchase_requisition
+#: model:ir.module.module,description:purchase_requisition.module_meta_information
+msgid ""
+"\n"
+" This module allows you to manage your Purchase Requisition.\n"
+" When a purchase order is created, you now have the opportunity to save "
+"the related requisition.\n"
+" This new object will regroup and will allow you to easily keep track and "
+"order all your purchase orders.\n"
+msgstr ""
+
+#. module: purchase_requisition
+#: field:purchase.requisition.partner,partner_address_id:0
+msgid "Address"
+msgstr "Alamat"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Order Reference"
+msgstr "Referensi Order"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Start Date"
+msgstr "Tanggal Mulai"
+
+#. module: purchase_requisition
+#: model:ir.actions.act_window,help:purchase_requisition.action_purchase_requisition
+msgid ""
+"A purchase requisition is the step before a request for quotation. In a "
+"purchase requisition (or purchase tender), you can record the products you "
+"need to buy and trigger the creation of RfQs to suppliers. After the "
+"negotiation, once you have reviewed all the supplier's offers, you can "
+"validate some and cancel others."
+msgstr ""
+"Sebuah permintaan pembelian adalah merupakan langkah sebelum permintaan "
+"penawaran. Dalam permintaan pembelian (atau tender pembelian), Anda dapat "
+"merekam produk yang Anda perlu membeli dan memicu pembuatan RfQs kepada "
+"pemasok. Setelah negosiasi, setelah Anda telah meninjau semua menawarkan "
+"pemasok, Anda dapat memvalidasi beberapa dan membatalkan yang lainnya."
+
+#. module: purchase_requisition
+#: field:purchase.requisition.line,product_qty:0
+msgid "Quantity"
+msgstr "Kuantitas"
+
+#. module: purchase_requisition
+#: model:ir.actions.act_window,name:purchase_requisition.action_purchase_requisition
+#: model:ir.ui.menu,name:purchase_requisition.menu_purchase_requisition_pro_mgt
+msgid "Purchase Requisitions"
+msgstr "Pembelian Rekuisisi"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "End Date"
+msgstr "Tanggal berakhir"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: field:purchase.requisition,name:0
+msgid "Requisition Reference"
+msgstr "Referensi Permintaan"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,line_ids:0
+msgid "Products to Purchase"
+msgstr "Produk untuk pembelian"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,date_end:0
+msgid "Requisition Deadline"
+msgstr "Batas waktu permintaan"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Search Purchase Requisition"
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Notes"
+msgstr "Catatan"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Date Ordered"
+msgstr "Tanggal pemesanan"
+
+#. module: purchase_requisition
+#: help:purchase.requisition,exclusive:0
+msgid ""
+"Purchase Requisition (exclusive): On the confirmation of a purchase order, "
+"it cancels the remaining purchase order.\n"
+"Purchase Requisition(Multiple): It allows to have multiple purchase "
+"orders.On confirmation of a purchase order it does not cancel the remaining "
+"orders"
+msgstr ""
+"Permintaan Pembelian (eksklusif): Pada konfirmasi order pembelian, itu "
+"membatalkan pesanan pembelian yang tersisa.\n"
+"Permintaan Pembelian (Multiple): Hal ini memungkinkan untuk memiliki "
+"beberapa orders.On konfirmasi pembelian dari suatu pesanan pembelian itu "
+"tidak membatalkan perintah yang tersisa"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Cancel Purchase Order"
+msgstr "Order Pembelian di batalkan"
+
+#. module: purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_purchase_order
+#: view:purchase.requisition:0
+msgid "Purchase Order"
+msgstr "Order Pembelian"
+
+#. module: purchase_requisition
+#: code:addons/purchase_requisition/wizard/purchase_requisition_partner.py:44
+#, python-format
+msgid "Error!"
+msgstr "Ada Kesalahan !"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: field:purchase.requisition.line,product_uom_id:0
+msgid "Product UoM"
+msgstr "Produk UoM"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Products"
+msgstr "Produk"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Order Date"
+msgstr "Tanggal Order"
+
+#. module: purchase_requisition
+#: selection:purchase.requisition,state:0
+msgid "Cancelled"
+msgstr "Dibatalkan"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "["
+msgstr ""
+
+#. module: purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_purchase_requisition_partner
+msgid "Purchase Requisition Partner"
+msgstr ""
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "]"
+msgstr ""
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Quotation Detail"
+msgstr ""
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Purchase for Requisitions"
+msgstr "Pembelian untuk Rekuisisi"
+
+#. module: purchase_requisition
+#: model:ir.actions.act_window,name:purchase_requisition.act_res_partner_2_purchase_order
+msgid "Purchase orders"
+msgstr "Order Pembelian"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: view:purchase.requisition:0
+#: field:purchase.requisition,origin:0
+msgid "Origin"
+msgstr "Sumber"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Reference"
+msgstr "Referensi"
+
+#. module: purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_procurement_order
+msgid "Procurement"
+msgstr "Pengadaan"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,warehouse_id:0
+msgid "Warehouse"
+msgstr "Gudang"
+
+#. module: purchase_requisition
+#: field:procurement.order,requisition_id:0
+msgid "Latest Requisition"
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Quotations"
+msgstr "Penawaran"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Qty"
+msgstr "Qty"
+
+#. module: purchase_requisition
+#: selection:purchase.requisition,exclusive:0
+msgid "Purchase Requisition (exclusive)"
+msgstr "Permintaan Pembelian (eksklusif)"
+
+#. module: purchase_requisition
+#: view:purchase.requisition.partner:0
+msgid "Create Quotation"
+msgstr "Buat Penawaran"
+
+#. module: purchase_requisition
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr "Ada Kesalahan !! kode EAN tidak sah"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+#: selection:purchase.requisition,state:0
+msgid "Done"
+msgstr "selesai"
+
+#. module: purchase_requisition
+#: view:purchase.requisition.partner:0
+msgid "_Cancel"
+msgstr "Batal"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Confirm Purchase Order"
+msgstr "Konfirmasi order pembelian"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Cancel"
+msgstr "Batal"
+
+#. module: purchase_requisition
+#: field:purchase.requisition.partner,partner_id:0
+msgid "Partner"
+msgstr "Rekanan"
+
+#. module: purchase_requisition
+#: model:ir.module.module,shortdesc:purchase_requisition.module_meta_information
+msgid "Purchase - Purchase Requisition"
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Unassigned"
+msgstr "Tak ditugaskan"
+
+#. module: purchase_requisition
+#: view:purchase.order:0
+msgid "Requisition"
+msgstr "Daftar Permintaan"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,purchase_ids:0
+msgid "Purchase Orders"
+msgstr "Order Pembelian"
+>>>>>>> MERGE-SOURCE
=== modified file 'purchase_requisition/wizard/purchase_requisition_partner.py'
--- purchase_requisition/wizard/purchase_requisition_partner.py 2011-03-09 16:01:29 +0000
+++ purchase_requisition/wizard/purchase_requisition_partner.py 2011-03-14 09:45:25 +0000
@@ -67,7 +67,7 @@
context = {}
record_ids = context and context.get('active_ids', False)
if record_ids:
- data = self.read(cr, uid, ids)
+ data = self.browse(cr, uid, ids,context=context)[0]
company = self.pool.get('res.users').browse(cr, uid, uid, context).company_id
order_obj = self.pool.get('purchase.order')
order_line_obj = self.pool.get('purchase.order.line')
@@ -77,10 +77,8 @@
prod_obj = self.pool.get('product.product')
tender_obj = self.pool.get('purchase.requisition')
acc_pos_obj = self.pool.get('account.fiscal.position')
- partner_id = data[0]['partner_id']
-
- supplier_data = partner_obj.browse(cr, uid, partner_id, context=context)
-
+ partner_id = data.partner_id.id
+ supplier_data = data.partner_id
address_id = partner_obj.address_get(cr, uid, [partner_id], ['delivery'])['delivery']
list_line=[]
purchase_order_line={}
=== modified file 'stock/i18n/ro.po'
--- stock/i18n/ro.po 2011-03-10 04:46:36 +0000
+++ stock/i18n/ro.po 2011-03-14 09:45:25 +0000
@@ -7,14 +7,24 @@
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
"POT-Creation-Date: 2011-01-11 11:16+0000\n"
+<<<<<<< TREE
"PO-Revision-Date: 2011-03-09 18:39+0000\n"
"Last-Translator: Dorin <dhongu@xxxxxxxxx>\n"
+=======
+"PO-Revision-Date: 2011-02-22 12:18+0000\n"
+"Last-Translator: Dorin <dhongu@xxxxxxxxx>\n"
+>>>>>>> MERGE-SOURCE
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2011-03-10 04:45+0000\n"
"X-Generator: Launchpad (build 12351)\n"
+=======
+"X-Launchpad-Export-Date: 2011-02-23 04:37+0000\n"
+"X-Generator: Launchpad (build 12351)\n"
+>>>>>>> MERGE-SOURCE
#. module: stock
#: field:product.product,track_outgoing:0
@@ -280,7 +290,11 @@
#, python-format
msgid "You cannot cancel picking because stock move is in done state !"
msgstr ""
+<<<<<<< TREE
"Nu puteţi anula preluarea, deoarece mișcările de stoc sunt efectuate."
+=======
+"Nu puteţi anula picking-ul, deoarece mișcările de stoc sunt efectuate."
+>>>>>>> MERGE-SOURCE
#. module: stock
#: code:addons/stock/stock.py:2198
=== modified file 'stock/stock.py'
--- stock/stock.py 2011-03-09 13:14:25 +0000
+++ stock/stock.py 2011-03-14 09:45:25 +0000
@@ -2138,11 +2138,19 @@
prodlot_id = partial_datas and partial_datas.get('move%s_prodlot_id' % (move.id), False)
if prodlot_id:
self.write(cr, uid, [move.id], {'prodlot_id': prodlot_id}, context=context)
+<<<<<<< TREE
if move.state not in ('confirmed','done', 'assigned'):
todo.append(move.id)
if todo:
self.action_confirm(cr, uid, todo, context=context)
+=======
+ if move.state not in ('confirmed','done'):
+ todo.append(move.id)
+
+ if todo:
+ self.action_confirm(cr, uid, todo, context=context)
+>>>>>>> MERGE-SOURCE
self.write(cr, uid, move_ids, {'state': 'done', 'date_planned': time.strftime('%Y-%m-%d %H:%M:%S')}, context=context)
for id in move_ids:
=== modified file 'stock/wizard/stock_split_move.py'
--- stock/wizard/stock_split_move.py 2011-02-15 13:27:07 +0000
+++ stock/wizard/stock_split_move.py 2011-03-14 09:45:25 +0000
@@ -107,7 +107,7 @@
record_id = context and context.get('active_id', False) or False
pick_obj = self.pool.get('stock.picking')
pick = pick_obj.browse(cr, uid, record_id, context=context)
- data = self.read(cr, uid, ids[0])
+ data = self.read(cr, uid, ids[0], context=context)
for move in pick.move_lines:
quantity = data['move%s' % move.id]
if 0 < quantity < move.product_qty:
=== modified file 'survey/wizard/survey_print.py'
--- survey/wizard/survey_print.py 2011-02-15 13:27:07 +0000
+++ survey/wizard/survey_print.py 2011-03-14 09:45:25 +0000
@@ -55,10 +55,9 @@
@param context: A standard dictionary for contextual values
@return : Dictionary value for print survey form.
"""
-
- datas = {'ids' : self.read(cr, uid, ids, [], context)[0]['survey_ids']}
+ datas = {'ids' : self.read(cr, uid, ids, ['survey_ids'], context=context)[0]['survey_ids']}
res = self.read(cr, uid, ids, ['survey_title', 'orientation', 'paper_size',\
- 'page_number', 'without_pagebreak'], context)
+ 'page_number', 'without_pagebreak'], context=context)
res = res and res[0] or {}
datas['form'] = res
datas['model'] = 'survey.print'
=== modified file 'survey/wizard/survey_print_answer.py'
--- survey/wizard/survey_print_answer.py 2011-02-15 13:27:07 +0000
+++ survey/wizard/survey_print_answer.py 2011-03-14 09:45:25 +0000
@@ -59,7 +59,7 @@
context = {}
datas = {'ids': context.get('active_ids', [])}
res = self.read(cr, uid, ids, ['response_ids', 'orientation', 'paper_size',\
- 'page_number', 'without_pagebreak'], context)
+ 'page_number', 'without_pagebreak'], context=context)
res = res and res[0] or {}
datas['form'] = res
datas['model'] = 'survey.print.answer'
=== modified file 'survey/wizard/survey_print_statistics.py'
--- survey/wizard/survey_print_statistics.py 2011-02-15 13:27:07 +0000
+++ survey/wizard/survey_print_statistics.py 2011-03-14 09:45:25 +0000
@@ -44,7 +44,7 @@
if context is None:
context = {}
datas = {'ids': context.get('active_ids', [])}
- res = self.read(cr, uid, ids, ['survey_ids'], context)
+ res = self.read(cr, uid, ids, ['survey_ids'], context=context)
res = res and res[0] or {}
datas['form'] = res
datas['model'] = 'survey.print.statistics'
=== modified file 'survey/wizard/survey_selection.py'
--- survey/wizard/survey_selection.py 2011-02-15 13:27:07 +0000
+++ survey/wizard/survey_selection.py 2011-03-14 09:45:25 +0000
@@ -122,8 +122,7 @@
search_obj = self.pool.get('ir.ui.view')
if context is None: context = {}
- sur_id = self.read(cr, uid, ids, [])[0]
- survey_id = sur_id['survey_id']
+ survey_id = self.browse(cr, uid, ids, context=context)[0].survey_id.id
context.update({'survey_id': survey_id, 'sur_name_id': sur_id['id']})
cr.execute('select count(id) from survey_history where user_id=%s\
and survey_id=%s' % (uid,survey_id))
@@ -133,8 +132,8 @@
if user_limit and res >= user_limit:
raise osv.except_osv(_('Warning !'),_("You can not give response for this survey more than %s times") % (user_limit))
- sur_rec = survey_obj.read(cr,uid,self.read(cr,uid,ids)[0]['survey_id'])
- if sur_rec['max_response_limit'] and sur_rec['max_response_limit'] <= sur_rec['tot_start_survey']:
+ sur_rec = survey_obj.browse(cr,uid,ids,context=context)[0]
+ if sur_rec.max_response_limit and sur_rec.max_response_limit <= sur_rec.tot_start_survey:
raise osv.except_osv(_('Warning !'),_("You can not give more response. Please contact the author of this survey for further assistance."))
search_id = search_obj.search(cr,uid,[('model','=','survey.question.wiz'),('name','=','Survey Search')])
=== modified file 'survey/wizard/survey_send_invitation.py'
--- survey/wizard/survey_send_invitation.py 2011-02-15 13:27:07 +0000
+++ survey/wizard/survey_send_invitation.py 2011-03-14 09:45:25 +0000
@@ -96,7 +96,7 @@
def action_send(self, cr, uid, ids, context=None):
if context is None:
context = {}
- record = self.read(cr, uid, ids, [])
+ record = self.read(cr, uid, ids, [],context=context)
survey_ids = context.get('active_ids', [])
record = record and record[0]
partner_ids = record['partner_ids']
=== modified file 'web_livechat/i18n/bg.po'
--- web_livechat/i18n/bg.po 2011-03-02 04:39:01 +0000
+++ web_livechat/i18n/bg.po 2011-03-14 09:45:25 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
# Bulgarian 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.
@@ -37,3 +38,44 @@
#: model:ir.module.module,description:web_livechat.module_meta_information
msgid "Enable live chat support for whom have a maintenance contract"
msgstr "Разрешете live chat поддръжка ако имате договор за поддръжка"
+=======
+# Bulgarian 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: 2011-01-11 11:16+0000\n"
+"PO-Revision-Date: 2011-02-19 12:48+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Bulgarian <bg@xxxxxx>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-02-20 04:35+0000\n"
+"X-Generator: Launchpad (build 12351)\n"
+
+#. module: web_livechat
+#: sql_constraint:publisher_warranty.contract:0
+msgid ""
+"Your publisher warranty contract is already subscribed in the system !"
+msgstr ""
+
+#. module: web_livechat
+#: model:ir.module.module,shortdesc:web_livechat.module_meta_information
+msgid "Live Chat Support"
+msgstr "Поддръжка чат на живо"
+
+#. module: web_livechat
+#: model:ir.model,name:web_livechat.model_publisher_warranty_contract
+msgid "publisher_warranty.contract"
+msgstr "publisher_warranty.contract"
+
+#. module: web_livechat
+#: model:ir.module.module,description:web_livechat.module_meta_information
+msgid "Enable live chat support for whom have a maintenance contract"
+msgstr ""
+>>>>>>> MERGE-SOURCE
Follow ups
