[MERGE] merged with trunk development

bzr revid: hmo@tinyerp.com-20111024133206-4oesjq8gsvb3ly2q

addons/account_voucher/account_voucher.py

@@ -39,8 +39,6 @@ class account_voucher(osv.osv):
             res[voucher.id] = ok
         return res
 
-
-
     def _get_type(self, cr, uid, context=None):
         if context is None:
             context = {}
@@ -98,7 +96,6 @@ class account_voucher(osv.osv):
         journal_id = context.get('journal_id', False)
         if journal_id:
             journal = journal_pool.browse(cr, uid, journal_id, context=context)
-#            currency_id = journal.company_id.currency_id.id
             if journal.currency:
                 return journal.currency.id
         return False
@@ -182,6 +179,14 @@ class account_voucher(osv.osv):
             res[voucher.id] =  abs(voucher.amount - abs(credit - debit))
         return res
 
+    def _paid_amount_in_company_currency(self, cr, uid, ids, name, args, context=None):
+        if not ids: return {}
+        res = {}
+        debit = credit = 0.0
+        for voucher in self.browse(cr, uid, ids, context=context):
+            res[voucher.id] =  voucher.amount / voucher.payment_rate
+        return res
+
     _name = 'account.voucher'
     _description = 'Accounting Voucher'
     _order = "date desc, id desc"
@@ -242,6 +247,9 @@ class account_voucher(osv.osv):
         'comment': fields.char('Counterpart Comment', size=64, required=True, readonly=True, states={'draft': [('readonly', False)]}),
         'analytic_id': fields.many2one('account.analytic.account','Write-Off Analytic Account', readonly=True, states={'draft': [('readonly', False)]}),
         'writeoff_amount': fields.function(_get_writeoff_amount, string='Reconcile Amount', type='float', readonly=True),
+        'payment_rate': fields.float('Payment Rate', digits=(12,6), required=True, readonly=True, states={'draft': [('readonly', False)]},
+            help='The rate between the journal currency and the company currency for this particular payment.'),
+        'paid_amount_in_company_currency': fields.function(_paid_amount_in_company_currency, string='Paid Amount in Company Currency', type='float', readonly=True),
     }
     _defaults = {
         'period_id': _get_period,
@@ -260,6 +268,7 @@ class account_voucher(osv.osv):
         'tax_id': _get_tax,
         'payment_option': 'without_writeoff',
         'comment': _('Write-Off'),
+        'payment_rate': 1.0,
     }
 
     def compute_tax(self, cr, uid, ids, context=None):
@@ -409,6 +418,19 @@ class account_voucher(osv.osv):
 
         return default
 
+    def onchange_rate(self, cr, uid, ids, rate, amount, context=None):
+        res =  {'value': {'paid_amount_in_company_currency': 0.0}}
+        if rate and amount:
+            res['value']['paid_amount_in_company_currency'] = amount / rate
+        return res
+
+    def onchange_amount(self, cr, uid, ids, amount, rate, partner_id, journal_id, currency_id, ttype, date, context=None):
+        res = self.onchange_partner_id(cr, uid, ids, partner_id, journal_id, amount, currency_id, ttype, date, context=context)
+        vals = self.onchange_rate(cr, uid, ids, rate, amount, context=context)
+        for key in vals.keys():
+            res[key].update(vals[key])
+        return res
+
     def onchange_partner_id(self, cr, uid, ids, partner_id, journal_id, price, currency_id, ttype, date, context=None):
         """
         Returns a dict that contains new values and context
@@ -421,42 +443,32 @@ class account_voucher(osv.osv):
         """
         if context is None:
             context = {}
-        if not journal_id:
-            return {}
         context_multi_currency = context.copy()
         if date:
             context_multi_currency.update({'date': date})
 
-        line_pool = self.pool.get('account.voucher.line')
-        line_ids = ids and line_pool.search(cr, uid, [('voucher_id', '=', ids[0])]) or False
-        if line_ids:
-            line_pool.unlink(cr, uid, line_ids)
-
         currency_pool = self.pool.get('res.currency')
         move_line_pool = self.pool.get('account.move.line')
         partner_pool = self.pool.get('res.partner')
         journal_pool = self.pool.get('account.journal')
+        line_pool = self.pool.get('account.voucher.line')
 
-        vals = self.onchange_journal(cr, uid, ids, journal_id, [], False, partner_id, context)
-        vals = vals.get('value')
+        #set default values
+        default = {
+            'value': {'line_ids': [] ,'line_dr_ids': [] ,'line_cr_ids': [] ,'pre_line': False,},
+        }
+
+        #drop existing lines
+        line_ids = ids and line_pool.search(cr, uid, [('voucher_id', '=', ids[0])]) or False
+        if line_ids:
+            line_pool.unlink(cr, uid, line_ids)
+
+        if not partner_id or not journal_id:
+            return default
 
         journal = journal_pool.browse(cr, uid, journal_id, context=context)
-        currency_id = vals.get('currency_id', currency_id)
-        default = {
-            'value':{'line_ids':[], 'line_dr_ids':[], 'line_cr_ids':[], 'pre_line': False, 'currency_id':currency_id},
-        }
-        currency_id = currency_id or journal.company_id.currency_id.id
-
-        if not partner_id:
-            return default
-
-        if not partner_id and ids:
-            line_ids = line_pool.search(cr, uid, [('voucher_id', '=', ids[0])])
-            if line_ids:
-                line_pool.unlink(cr, uid, line_ids)
-            return default
-
         partner = partner_pool.browse(cr, uid, partner_id, context=context)
+        currency_id = currency_id or journal.company_id.currency_id.id
         account_id = False
         if journal.type in ('sale','sale_refund'):
             account_id = partner.property_account_receivable.id
@@ -484,64 +496,78 @@ class account_voucher(osv.osv):
             ids = move_line_pool.search(cr, uid, [('state','=','valid'), ('account_id.type', '=', account_type), ('reconcile_id', '=', False), ('partner_id', '=', partner_id)], context=context)
         else:
             ids = context['move_line_ids']
+        invoice_id = context.get('invoice_id', False)
+        company_currency = journal.company_id.currency_id.id
+        move_line_found = False
+
+        #order the lines by most old first
         ids.reverse()
         moves = move_line_pool.browse(cr, uid, ids, context=context)
 
-        #company_currency = journal.company_id.currency_id.id
-        #if company_currency != currency_id and ttype == 'payment':
-        #    total_debit = currency_pool.compute(cr, uid, currency_id, company_currency, total_debit, context=context_multi_currency)
-        #elif company_currency != currency_id and ttype == 'receipt':
-        #    total_credit = currency_pool.compute(cr, uid, currency_id, company_currency, total_credit, context=context_multi_currency)
-
-        company_currency = journal.company_id.currency_id.id
         for line in moves:
             if line.credit and line.reconcile_partial_id and ttype == 'receipt':
                 continue
             if line.debit and line.reconcile_partial_id and ttype == 'payment':
                 continue
+            if invoice_id:
+                if line.invoice.id == invoice_id:
+                    #if the invoice linked to the voucher line is equal to the invoice_id in context
+                    #then we assign the amount on that line, whatever the other voucher lines
+                    move_line_found = line.id
+                    break
+            elif currency_id == company_currency:
+                #otherwise treatments is the same but with other field names
+                if line.amount_residual == price:
+                    #if the amount residual is equal the amount voucher, we assign it to that voucher 
+                    #line, whatever the other voucher lines
+                    move_line_found = line.id
+                    break
+                #otherwise we will split the voucher amount on each line (by most old first)
+                total_credit += line.credit or 0.0
+                total_debit += line.debit or 0.0
+            elif currency_id == line.currency_id.id:
+                if line.amount_residual_currency == price:
+                    move_line_found = line.id
+                    break
+                total_credit += line.credit and line.amount_currency or 0.0
+                total_debit += line.debit and line.amount_currency or 0.0
 
-            if line.currency_id and currency_id==line.currency_id.id:
-                total_credit += line.amount_currency <0 and -line.amount_currency or 0.0
-                total_debit += line.amount_currency >0 and line.amount_currency or 0.0
-            else:
-                total_credit += currency_pool.compute(cr, uid, company_currency, currency_id, line.credit or 0.0)
-                total_debit += currency_pool.compute(cr, uid, company_currency, currency_id, line.debit or 0.0)
-
+        #voucher line creation
         for line in moves:
             if line.credit and line.reconcile_partial_id and ttype == 'receipt':
                 continue
             if line.debit and line.reconcile_partial_id and ttype == 'payment':
                 continue
-
             if line.currency_id and currency_id==line.currency_id.id:
                 amount_original = abs(line.amount_currency)
                 amount_unreconciled = abs(line.amount_residual_currency)
             else:
                 amount_original = currency_pool.compute(cr, uid, company_currency, currency_id, line.credit or line.debit or 0.0)
                 amount_unreconciled = currency_pool.compute(cr, uid, company_currency, currency_id, abs(line.amount_residual))
-
-            #original_amount = line.credit or line.debit or 0.0
-            #amount_unreconciled = currency_pool.compute(cr, uid, line.currency_id and line.currency_id.id or company_currency, currency_id, abs(line.amount_residual_currency), context=context_multi_currency)
             rs = {
                 'name':line.move_id.name,
                 'type': line.credit and 'dr' or 'cr',
                 'move_line_id':line.id,
                 'account_id':line.account_id.id,
                 'amount_original': amount_original,
+                'amount': (move_line_found == line.id) and min(price, amount_unreconciled) or 0.0,
                 'date_original':line.date,
                 'date_due':line.date_maturity,
                 'amount_unreconciled': amount_unreconciled,
-
             }
 
-            if line.credit:
-                amount = min(amount_unreconciled, total_debit)
-                rs['amount'] = amount
-                total_debit -= amount
-            else:
-                amount = min(amount_unreconciled, total_credit)
-                rs['amount'] = amount
-                total_credit -= amount
+            #split voucher amount by most old first, but only for lines in the same currency
+            if not move_line_found:
+                line_currency_id = line.currency_id and line.currency_id.id or company_currency
+                if currency_id == line_currency_id:
+                    if line.credit:
+                        amount = min(amount_unreconciled, abs(total_debit))
+                        rs['amount'] = amount
+                        total_debit -= amount
+                    else:
+                        amount = min(amount_unreconciled, abs(total_credit))
+                        rs['amount'] = amount
+                        total_credit -= amount
 
             default['value']['line_ids'].append(rs)
             if rs['type'] == 'cr':
@@ -556,23 +582,30 @@ class account_voucher(osv.osv):
             default['value']['writeoff_amount'] = self._compute_writeoff_amount(cr, uid, default['value']['line_dr_ids'], default['value']['line_cr_ids'], price)
         return default
 
-    def onchange_date(self, cr, uid, ids, partner_id, journal_id, price, currency_id, ttype, date, context=None):
+    def onchange_date(self, cr, uid, ids, date, currency_id, amount, context=None):
         """
         @param date: latest value from user input for field date
         @param args: other arguments
         @param context: context arguments, like lang, time zone
         @return: Returns a dict which contains new values, and context
         """
+        res = {'value': {}}
+        #set the period of the voucher
         period_pool = self.pool.get('account.period')
-        res = self.onchange_partner_id(cr, uid, ids, partner_id, journal_id, price, currency_id, ttype, date, context=context)
         pids = period_pool.search(cr, uid, [('date_start', '<=', date), ('date_stop', '>=', date)])
         if pids:
-            if not 'value' in res:
-                res['value'] = {}
             res['value'].update({'period_id':pids[0]})
+        #set the default payment rate of the voucher and compute the paid amount in company currency
+        payment_rate = 1.0
+        if currency_id:
+            payment_rate = self.pool.get('res.currency').browse(cr, uid, currency_id, context={'date': date}).rate
+        res['value'].update({'payment_rate': payment_rate})
+        vals = self.onchange_rate(cr, uid, ids, payment_rate, amount, context=context)
+        for key in vals.keys():
+            res[key].update(vals[key])
         return res
 
-    def onchange_journal(self, cr, uid, ids, journal_id, line_ids, tax_id, partner_id, context=None):
+    def onchange_journal(self, cr, uid, ids, journal_id, line_ids, tax_id, partner_id, date, amount, ttype, context=None):
         if not journal_id:
             return False
         journal_pool = self.pool.get('account.journal')
@@ -583,11 +616,19 @@ class account_voucher(osv.osv):
             tax_id = account_id.tax_ids[0].id
 
         vals = self.onchange_price(cr, uid, ids, line_ids, tax_id, partner_id, context)
-        vals['value'].update({'tax_id':tax_id})
-        currency_id = False #journal.company_id.currency_id.id
+        vals['value'].update({'tax_id':tax_id,'amount': amount})
+        currency_id = False
         if journal.currency:
             currency_id = journal.currency.id
-        vals['value'].update({'currency_id':currency_id})
+            payment_rate = self.pool.get('res.currency').browse(cr, uid, currency_id, context={'date': date}).rate
+            vals['value'].update({'payment_rate': payment_rate})
+            res = self.onchange_rate(cr, uid, ids, payment_rate, amount, context=context)
+            for key in res.keys():
+                vals[key].update(res[key])
+        vals['value'].update({'currency_id': currency_id})
+        res = self.onchange_partner_id(cr, uid, ids, partner_id, journal_id, amount, currency_id, ttype, date, context)
+        for key in res.keys():
+            vals[key].update(res[key])
         return vals
 
     def proforma_voucher(self, cr, uid, ids, context=None):
@@ -631,7 +672,6 @@ class account_voucher(osv.osv):
                 raise osv.except_osv(_('Invalid action !'), _('Cannot delete Voucher(s) which are already opened or paid !'))
         return super(account_voucher, self).unlink(cr, uid, ids, context=context)
 
-    # TODO: may be we can remove this method if not used anyware
     def onchange_payment(self, cr, uid, ids, pay_now, journal_id, partner_id, ttype='sale'):
         res = {}
         if not partner_id:
@@ -690,9 +730,9 @@ class account_voucher(osv.osv):
         # TODO: Make this logic available.
         # -for sale, purchase we have but for the payment and receipt we do not have as based on the bank/cash journal we can not know its payment or receipt
         if voucher_brw.type in ('purchase', 'payment'):
-            credit = currency_obj.compute(cr, uid, current_currency, company_currency, voucher_brw.amount, context=context)
+            credit = voucher_brw.amount / voucher_brw.payment_rate
         elif voucher_brw.type in ('sale', 'receipt'):
-            debit = currency_obj.compute(cr, uid, current_currency, company_currency, voucher_brw.amount, context=context)
+            debit = voucher_brw.amount / voucher_brw.payment_rate
         if debit < 0: credit = -debit; debit = 0.0
         if credit < 0: debit = -credit; credit = 0.0
         sign = debit - credit < 0 and -1 or 1
@@ -817,10 +857,10 @@ class account_voucher(osv.osv):
                 continue
             #we check if the voucher line is fully paid or not and create a move line to balance the payment and initial invoice if needed
             if line.amount == line.amount_unreconciled:
-                amount = currency_obj.compute(cr, uid, current_currency, company_currency, line.untax_amount or line.amount, context=context)
+                amount = (line.untax_amount or line.amount) / voucher_brw.payment_rate
                 amount_residual = line.move_line_id.amount_residual - amount #residual amount in company currency
             else:
-                amount = currency_obj.compute(cr, uid, current_currency, company_currency, line.untax_amount or line.amount, context=context)
+                amount = (line.untax_amount or line.amount)  / voucher_brw.payment_rate
                 amount_residual = 0.0
             move_line = {
                 'journal_id': voucher_brw.journal_id.id,
@@ -970,9 +1010,9 @@ class account_voucher(osv.osv):
             line_total = move_line_brw.debit - move_line_brw.credit
             rec_list_ids = []
             if voucher.type == 'sale':
-                line_total = line_total - currency_pool.compute(cr, uid, current_currency, company_currency, voucher.tax_amount, context=context)
+                line_total = line_total - (voucher.tax_amount / voucher.payment_rate)
             elif voucher.type == 'purchase':
-                line_total = line_total + currency_pool.compute(cr, uid, current_currency, company_currency, voucher.tax_amount, context=context)
+                line_total = line_total + (voucher.tax_amount / voucher.payment_rate)
             #create one move line per voucher line where amount is not 0.0
             line_total, rec_list_ids = self.voucher_move_line_create(cr, uid, voucher.id, line_total, move_id, company_currency, current_currency, context)
 
@@ -1172,17 +1212,10 @@ class account_bank_statement_line(osv.osv):
     def _amount_reconciled(self, cursor, user, ids, name, args, context=None):
         if not ids:
             return {}
-
         res = {}
-#        company_currency_id = False
         for line in self.browse(cursor, user, ids, context=context):
-#            if not company_currency_id:
-#                company_currency_id = line.company_id.id
             if line.voucher_id:
                 res[line.id] = line.voucher_id.amount#
-#                        res_currency_obj.compute(cursor, user,
-#                        company_currency_id, line.statement_id.currency.id,
-#                        line.voucher_id.amount, context=context)
             else:
                 res[line.id] = 0.0
         return res
@@ -1203,7 +1236,6 @@ class account_bank_statement_line(osv.osv):
         'amount_reconciled': fields.function(_amount_reconciled,
             string='Amount reconciled', type='float'),
         'voucher_id': fields.many2one('account.voucher', 'Payment'),
-
     }
 
     def unlink(self, cr, uid, ids, context=None):

addons/account_voucher/invoice.py

@@ -45,10 +45,11 @@ class invoice(osv.osv):
                 'close_after_process': True,
                 'invoice_type':inv.type,
                 'invoice_id':inv.id,
-                'default_type': inv.type in ('out_invoice','out_refund') and 'receipt' or 'payment'
+                'default_type': inv.type in ('out_invoice','out_refund') and 'receipt' or 'payment',
+                'type': inv.type in ('out_invoice','out_refund') and 'receipt' or 'payment'
                 }
         }
 
 invoice()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/account_voucher/test/case1_usd_usd.yml

@@ -149,12 +149,13 @@
         'partner_id': ref('res_partner_strauss0'),
         'period_id': ref('account.period_3'),
         'type': 'receipt',
-        'date': time.strftime("%Y-03-01"),
+        'date': time.strftime("%Y-%m-%d"),
         'payment_option': 'with_writeoff',
         'writeoff_acc_id': ref('account.a_expense'),
         'comment': 'Write Off',
         'name': 'First payment',
     }
+    vals.update(self.onchange_date(cr, uid, [], time.strftime('%Y-03-01'), ref('base.USD'), 240)['value'])
     if not res['value']['line_cr_ids']:
       res['value']['line_cr_ids'] = [{'type': 'cr', 'account_id': ref('account.a_recv'),}]
     for item in res['value']['line_cr_ids']:
@@ -247,12 +248,13 @@
         'partner_id': ref('res_partner_strauss0'),
         'period_id': ref('account.period_3'),
         'type': 'receipt',
-        'date': time.strftime("%Y-04-01"),
+        'date': time.strftime("%Y-%m-%d"),
         'payment_option': 'with_writeoff',
         'writeoff_acc_id': ref('account.a_expense'),
         'comment': 'Write Off',
         'name': 'Second payment',
     }
+    vals.update(self.onchange_date(cr, uid, [], time.strftime('%Y-04-01'), ref('base.USD'), 45.0)['value'])
     if not res['value']['line_cr_ids']:
       res['value']['line_cr_ids'] = [{'type': 'cr', 'account_id': ref('account.a_recv'),}]
     for item in res['value']['line_cr_ids']:

addons/account_voucher/test/case2_suppl_usd_eur.yml

@@ -239,12 +239,13 @@
         'partner_id': ref('res_partner_clements0'),
         'period_id': ref('account.period_3'),
         'type': 'payment',
-        'date': time.strftime("%Y-04-01"),
+        'date': time.strftime("%Y-%m-%d"),
         'payment_option': 'with_writeoff',
         'writeoff_acc_id': ref('account.a_expense'),
         'comment': 'Write Off',
         'name': 'Second payment',
     }
+    vals.update(self.onchange_date(cr, uid, [], time.strftime('%Y-04-01'), ref('base.USD'), 45.0)['value'])
     if not res['value']['line_dr_ids']:
       res['value']['line_dr_ids'] = [{'type': 'dr', 'account_id': ref('account.a_pay'),}]
     for item in res['value']['line_dr_ids']:

addons/account_voucher/test/case2_usd_eur_debtor_in_eur.yml

@@ -155,12 +155,12 @@
   !python {model: account.voucher}: |
     import netsvc, time
     vals = {}
-    res = self.onchange_partner_id(cr, uid, [], ref("res_partner_michael0"), ref('bank_journal_EUR'), 240.0, 2, ttype='receipt', date=False)
+    res = self.onchange_partner_id(cr, uid, [], ref("res_partner_michael0"), ref('bank_journal_EUR'), 240.0, False, ttype='receipt', date=False)
     vals = {
         'account_id': ref('account.cash'),
         'amount': 200.0,
         'company_id': ref('base.main_company'),
-        'currency_id': ref('base.EUR'),
+        'currency_id': False,
         'journal_id': ref('bank_journal_EUR'),
         'partner_id': ref('res_partner_michael0'),
         'period_id': ref('account.period_3'),
@@ -220,8 +220,9 @@
     move_line_obj = self.pool.get('account.move.line')
     move_lines = move_line_obj.search(cr, uid, [('move_id', '=', invoice_id.move_id.id), ('invoice', '=', invoice_id.id), ('account_id', '=', invoice_id.account_id.id)])
     move_line = move_line_obj.browse(cr, uid, move_lines[0])
+    print move_line.amount_residual, move_line.amount_residual_currency
     assert (move_line.amount_residual_currency == 55.56 and move_line.amount_residual == 20) , "Residual amount is not correct for first Invoice"
--    toto
+-
   I check the residual amuont of Invoice2, should be 22.22 in residual currency and 10 in amount_residual
 -
    !python {model: account.invoice}: |
@@ -247,13 +248,14 @@
         'partner_id': ref('res_partner_michael0'),
         'period_id': ref('account.period_3'),
         'type': 'receipt',
-        'date': time.strftime("%Y-04-01"),
+        'date': time.strftime("%Y-%m-%d"),
         'payment_option': 'with_writeoff',
         'writeoff_acc_id': ref('account.a_expense'),
         'exchange_acc_id': ref('account.o_expense'),
         'comment': 'Write Off',
         'name': 'Second payment',
     }
+    vals.update(self.onchange_date(cr, uid, [], time.strftime('%Y-04-01'), ref('base.USD'), 80.0)['value'])
     if not res['value']['line_cr_ids']:
       res['value']['line_cr_ids'] = [{'type': 'cr', 'account_id': ref('account.a_recv'),}]
     for item in res['value']['line_cr_ids']:

addons/account_voucher/test/case2_usd_eur_debtor_in_usd.yml

@@ -155,7 +155,7 @@
   !python {model: account.voucher}: |
     import netsvc, time
     vals = {}
-    res = self.onchange_partner_id(cr, uid, [], ref("res_partner_michal1"), ref('bank_journal_EUR'), 200.0, 2, ttype='receipt', date=False)
+    res = self.onchange_partner_id(cr, uid, [], ref("res_partner_michal1"), ref('bank_journal_EUR'), 200.0, False, ttype='receipt', date=False)
     vals = {
         'account_id': ref('account.cash'),
         'amount': 200.0,
@@ -240,7 +240,7 @@
   !python {model: account.voucher}: |
     import netsvc, time
     vals = {}
-    res = self.onchange_partner_id(cr, uid, [], ref("res_partner_michal1"), ref('bank_journal_USD'), 80.0, 2, ttype='receipt', date=False)
+    res = self.onchange_partner_id(cr, uid, [], ref("res_partner_michal1"), ref('bank_journal_USD'), 80.0, ref('base.USD'), ttype='receipt', date=False)
     vals = {
         'account_id': ref('account.cash'),
         'amount': 80.0,
@@ -250,13 +250,14 @@
         'partner_id': ref('res_partner_michal1'),
         'period_id': ref('account.period_3'),
         'type': 'receipt',
-        'date': time.strftime("%Y-04-01"),
+        'date': time.strftime("%Y-%m-%d"),
         'payment_option': 'with_writeoff',
         'writeoff_acc_id': ref('account.a_expense'),
         'exchange_acc_id': ref('account.o_expense'),
         'comment': 'Write Off',
         'name': 'Second payment',
     }
+    vals.update(self.onchange_date(cr, uid, [], time.strftime('%Y-04-01'), ref('base.USD'), 80.0)['value'])
     if not res['value']['line_cr_ids']:
       res['value']['line_cr_ids'] = [{'type': 'cr', 'account_id': ref('account.a_recv'),}]
     for item in res['value']['line_cr_ids']:

addons/account_voucher/test/case3_eur_eur.yml

@@ -118,7 +118,7 @@
   !python {model: account.voucher}: |
     import netsvc, time
     vals = {}
-    res = self.onchange_partner_id(cr, uid, [], ref("res_partner_peter0"), ref('bank_journal_EUR'), 120.00, 2, ttype='receipt', date=False)
+    res = self.onchange_partner_id(cr, uid, [], ref("res_partner_peter0"), ref('bank_journal_EUR'), 120.00, False, ttype='receipt', date=False)
     vals = {
         'account_id': ref('account.cash'),
         'amount': 120.00,
@@ -210,7 +210,7 @@
   !python {model: account.voucher}: |
     import netsvc, time
     vals = {}
-    res = self.onchange_partner_id(cr, uid, [], ref("res_partner_peter0"), ref('bank_journal_EUR'), 120.00, 2, ttype='receipt', date=False)
+    res = self.onchange_partner_id(cr, uid, [], ref("res_partner_peter0"), ref('bank_journal_EUR'), 120.00, False, ttype='receipt', date=False)
     vals = {
         'account_id': ref('account.cash'),
         'amount': 120.00,

addons/account_voucher/test/case4_cad_chf.yml

@@ -97,7 +97,7 @@
   !python {model: account.voucher}: |
     import netsvc, time
     vals = {}
-    res = self.onchange_partner_id(cr, uid, [], ref("res_partner_john0"), ref('bank_journal_CHF'), 200.00, 2, ttype='receipt', date=False)
+    res = self.onchange_partner_id(cr, uid, [], ref("res_partner_john0"), ref('bank_journal_CHF'), 200.00, ref('base.CHF'), ttype='receipt', date=False)
     vals = {
         'account_id': ref('account.cash'),
         'amount': 200.00,
@@ -107,13 +107,14 @@
         'partner_id': ref('res_partner_john0'),
         'period_id': ref('account.period_3'),
         'type': 'receipt',
-        'date': time.strftime("%Y-03-01"),
+        'date': time.strftime("%Y-%m-%d"),
         'payment_option': 'with_writeoff',
         'writeoff_acc_id': ref('account.a_expense'),
         'exchange_acc_id': ref('account.o_expense'),
         'comment': 'Write Off',
         'name': 'First payment',
     }
+    vals.update(self.onchange_date(cr, uid, [], time.strftime('%Y-03-01'), ref('base.CHF'), 200.0)['value'])
     if not res['value']['line_cr_ids']:
       res['value']['line_cr_ids'] = [{'type': 'cr', 'account_id': ref('account.a_recv'),}]
     for item in res['value']['line_cr_ids']:

addons/account_voucher/voucher_payment_receipt_view.xml

@@ -74,14 +74,14 @@
             <field name="arch" type="xml">
                 <form string="Bill Payment">
                     <group col="6" colspan="4">
-                        <field name="partner_id" required="1" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date)" context="{'invoice_currency':currency_id}" string="Supplier"/>
-                        <field name="amount" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date)"/>
+                        <field name="partner_id" required="1" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)" context="{'invoice_currency':currency_id}" string="Supplier"/>
+                        <field name="amount" on_change="onchange_amount(amount, payment_rate, partner_id, journal_id, currency_id, type, date, context)"/>
                         <field name="journal_id"
                             domain="[('type','in',['bank', 'cash'])]"
                             widget="selection" select="1"
-                            on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date)"
+                            on_change="onchange_journal(journal_id, line_dr_ids, False, partner_id, date, amount, type, context)"
                             string="Payment Method"/>
-                        <field name="date" select="1" on_change="onchange_date(partner_id, journal_id, amount, currency_id, type, date)"/>
+                        <field name="date" select="1" on_change="onchange_date(date, currency_id, amount, context)"/>
                         <field name="reference" select="1" string="Payment Ref"/>
                         <field name="name" colspan="2"/>
                         <field name="account_id"
@@ -92,7 +92,7 @@
                     </group>
                     <notebook colspan="4">
                         <page string="Payment Information">
-                            <field name="line_dr_ids" attrs="{'invisible': [('type', '=', 'receipt')]}" default_get="{'journal_id':journal_id, 'type':type, 'partner_id':partner_id}" colspan="4" nolabel="1" height="140" on_change="onchange_line_ids(line_dr_ids, line_cr_ids, amount)">
+                            <field name="line_dr_ids" attrs="{'invisible': [('type', '=', 'receipt')]}" default_get="{'journal_id':journal_id, 'type':type, 'partner_id':partner_id}" colspan="4" nolabel="1" height="140" on_change="onchange_line_ids(line_dr_ids, line_cr_ids, amount, context)">
                                 <tree string="Open Supplier Journal Entries" editable="bottom">
                                     <field name="move_line_id" context="{'journal_id':parent.journal_id, 'partner_id':parent.partner_id}"
                                         on_change="onchange_move_line_id(move_line_id)"
@@ -106,7 +106,7 @@
                                     <field name="amount" sum="Payment"/>
                                 </tree>
                             </field>
-                            <field name="line_cr_ids" colspan="4" nolabel="1" attrs="{'invisible': [('type', '=', 'payment')]}" default_get="{'journal_id':journal_id, 'partner_id':partner_id}" on_change="onchange_line_ids(line_dr_ids, line_cr_ids, amount)">
+                            <field name="line_cr_ids" colspan="4" nolabel="1" attrs="{'invisible': [('type', '=', 'payment')]}" default_get="{'journal_id':journal_id, 'partner_id':partner_id}" on_change="onchange_line_ids(line_dr_ids, line_cr_ids, amount, context)">
                                 <tree string="Open Customer Journal Entries" editable="bottom">
                                     <field name="move_line_id"/>
                                     <field name="account_id" groups="base.group_extended" domain="[('type','=','receivable')]"/>
@@ -122,6 +122,8 @@
                             <group col="2" colspan="1">
                                 <separator string="Other Information" colspan="2"/>
                                 <field name="currency_id"/>
+                                <field name="payment_rate" required="1" on_change="onchange_rate(payment_rate, amount, context)" groups='base.group_extended'/>
+                                <field name="paid_amount_in_company_currency" groups='base.group_extended'/>
                                 <field name="number"/>
                             </group>
                         </page>
@@ -137,15 +139,15 @@
             <field name="arch" type="xml">
                 <form string="Bill Payment">
                     <group col="6" colspan="4">
-                        <field name="partner_id" domain="[('supplier','=',True)]" required="1" invisible="context.get('line_type', False)" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date)" context="{'invoice_currency':currency_id}" string="Supplier"/>
-                        <field name="amount" invisible="context.get('line_type', False)" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date)"/>
+                        <field name="partner_id" domain="[('supplier','=',True)]" required="1" invisible="context.get('line_type', False)" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)" context="{'invoice_currency':currency_id}" string="Supplier"/>
+                        <field name="amount" invisible="context.get('line_type', False)" on_change="onchange_amount(amount, payment_rate, partner_id, journal_id, currency_id, type, date, context)"/>
                         <field name="journal_id"
                             domain="[('type','in',['bank', 'cash'])]"
                             invisible="context.get('line_type', False)"
                             widget="selection" select="1"
-                            on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date)"
+                            on_change="onchange_journal(journal_id, line_dr_ids, False, partner_id, date, amount, type, context)"
                             string="Payment Method"/>
-                        <field name="date" select="1" invisible="context.get('line_type', False)" on_change="onchange_date(partner_id, journal_id, amount, currency_id, type, date)"/>
+                        <field name="date" select="1" invisible="context.get('line_type', False)" on_change="onchange_date(date, currency_id, amount, context)"/>
                         <field name="reference" select="1" invisible="context.get('line_type', False)" string="Payment Ref"/>
                         <field name="name" colspan="2" invisible="context.get('line_type', False)"/>
                         <field name="company_id" widget="selection" groups="base.group_multi_company"/>
@@ -186,12 +188,14 @@
                                 <field name="narration" colspan="2" nolabel="1"/>
                             </group>
                             <group col="2" colspan="1">
-                                <group col="2" colspan="1">
+                                <group col="2" colspan="1" attrs="{'invisible':[('currency_id','=',False)]}">
+                                    <separator string="Currency Options" colspan="2"/>
                                     <field name="exchange_acc_id"
-                                           attrs="{'invisible':[('currency_id','=',False)]}"
                                            domain="[('type','=','other')]"/>
-                                    <field name="analytic_id"
-                                           groups="analytic.group_analytic_accounting"/>
+                                    <field name="payment_rate" required="1" on_change="onchange_rate(payment_rate, amount, context)" groups='base.group_extended'/>
+                                    <field name="paid_amount_in_company_currency" groups='base.group_extended'/>
+                                </group>
+                                <group col="2" colspan="1">
                                     <separator string="Payment Options" colspan="2"/>
                                     <field name="payment_option" required="1"/>
                                     <field name="writeoff_amount"
@@ -201,12 +205,13 @@
                                            domain="[('type','=','other')]"/>
                                     <field name="comment"
                                            attrs="{'invisible':[('payment_option','!=','with_writeoff')]}"/>
-
+                                    <field name="analytic_id"
+                                           groups="analytic.group_analytic_accounting"/>
                                 </group>
-                                <separator string="Other Information" colspan="2"/>
-                                <group col="2" colspan="1">
-                                    <field name="number"/>
-                                    <field name="currency_id" invisible="1"/>
+                                <group col="4" colspan="2">
+                                    <separator string="Other Information" colspan="4"/>
+                                    <field name="number" colspan="4"/>
+                                    <field name="currency_id" invisible="1" colspan="4"/>
                                 </group>
                             </group>
                         </page>
@@ -279,19 +284,19 @@
             <field name="arch" type="xml">
                 <form string="Customer Payment">
                     <group col="6" colspan="4">
-                        <field name="partner_id" required="1" invisible="context.get('line_type', False)" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date)" string="Customer"/>
+                        <field name="partner_id" required="1" invisible="context.get('line_type', False)" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)" string="Customer"/>
                         <field name="currency_id" invisible="1"/>
                         <field name="amount"
                             invisible="context.get('line_type', False)"
                             string="Paid Amount"
-                            on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date)"/>
+                            on_change="onchange_amount(amount, payment_rate, partner_id, journal_id, currency_id, type, date, context)"/>
                         <field name="journal_id"
                             domain="[('type','in',['bank', 'cash'])]"
                             invisible="context.get('line_type', False)"
                             widget="selection" select="1"
-                            on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date)"
+                            on_change="onchange_journal(journal_id, line_cr_ids, False, partner_id, date, amount, type, context)"
                             string="Payment Method"/>
-                        <field name="date" select="1" invisible="context.get('line_type', False)" on_change="onchange_date(partner_id, journal_id, amount, currency_id, type, date)"/>
+                        <field name="date" select="1" invisible="context.get('line_type', False)" on_change="onchange_date(date, currency_id, amount, context)"/>
                         <field name="reference" select="1" invisible="context.get('line_type', False)" string="Payment Ref"/>
                         <field name="name" colspan="2" invisible="context.get('line_type', False)"/>
                         <field name="company_id" widget="selection" groups="base.group_multi_company"/>
@@ -303,7 +308,7 @@
                     </group>
                     <notebook colspan="4">
                         <page string="Payment Information">
-                            <field name="line_cr_ids" default_get="{'journal_id':journal_id, 'type':type, 'partner_id':partner_id}" colspan="4" nolabel="1" height="140" on_change="onchange_line_ids(line_dr_ids, line_cr_ids, amount)">
+                            <field name="line_cr_ids" default_get="{'journal_id':journal_id, 'type':type, 'partner_id':partner_id}" colspan="4" nolabel="1" height="140" on_change="onchange_line_ids(line_dr_ids, line_cr_ids, amount, context)">
                                 <tree string="Invoices and outstanding transactions" editable="bottom">
                                     <field name="move_line_id" context="{'journal_id':parent.journal_id, 'partner_id':parent.partner_id}"
                                         on_change="onchange_move_line_id(move_line_id)"
@@ -318,7 +323,7 @@
                                     <field name="amount" sum="Payment"/>
                                 </tree>
                             </field>
-                            <field name="line_dr_ids" colspan="4" nolabel="1" attrs="{'invisible': [('pre_line','=',False)]}" default_get="{'journal_id':journal_id, 'partner_id':partner_id}" on_change="onchange_line_ids(line_dr_ids, line_cr_ids, amount)">
+                            <field name="line_dr_ids" colspan="4" nolabel="1" attrs="{'invisible': [('pre_line','=',False)]}" default_get="{'journal_id':journal_id, 'partner_id':partner_id}" on_change="onchange_line_ids(line_dr_ids, line_cr_ids, amount, context)">
                                 <tree string="Credits" editable="bottom">
                                     <field name="move_line_id"/>
                                     <field name="account_id"  groups="base.group_extended" domain="[('type','=','receivable')]"/>
@@ -332,13 +337,15 @@
                                 <field name="narration" colspan="2" nolabel="1"/>
                             </group>
                             <group col="2" colspan="1">
+                                <group col="2" colspan="1" attrs="{'invisible':[('currency_id','=',False)]}">
+                                    <separator string="Currency Options" colspan="2"/>
+                                    <field name="exchange_acc_id"
+                                           domain="[('type','=','other')]"/>
+                                    <field name="payment_rate" required="1" on_change="onchange_rate(payment_rate, amount, context)" groups='base.group_extended'/>
+                                    <field name="paid_amount_in_company_currency" groups='base.group_extended'/>
+                                </group>
                                 <group col="2" colspan="1">
                                     <separator string="Payment Options" colspan="2"/>
-                                    <field name="analytic_id"
-                                           groups="analytic.group_analytic_accounting"/>
-                                    <field name="exchange_acc_id"
-                                           attrs="{'invisible':[('currency_id','=',False)]}"
-                                           domain="[('type','=','other')]"/>
                                     <field name="payment_option" required="1"/>
                                     <field name="writeoff_amount"
                                            attrs="{'invisible':[('payment_option','!=','with_writeoff')]}"/>
@@ -347,10 +354,12 @@
                                            domain="[('type','=','other')]"/>
                                     <field name="comment"
                                            attrs="{'invisible':[('payment_option','!=','with_writeoff')]}"/>
+                                    <field name="analytic_id"
+                                           groups="analytic.group_analytic_accounting"/>
                                 </group>
-                                <separator string="Other Information" colspan="2"/>
-                                <group col="4" colspan="1">
-                                    <field name="number"/>
+                                <group col="4" colspan="2">
+                                    <separator string="Other Information" colspan="4"/>
+                                    <field name="number" colspan="4"/>
                                 </group>
                             </group>
                         </page>

addons/account_voucher/voucher_sales_purchase_view.xml

@@ -82,9 +82,9 @@
             <field name="arch" type="xml">
                 <form string="Sales Receipt">
                     <group col="6" colspan="4">
-                        <field name="partner_id" required="1" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date)" string="Customer"/>
-                        <field name="date" on_change="onchange_date(partner_id, journal_id, amount, currency_id, type, date)"/>
-                        <field name="journal_id" domain="[('type','in',['sale','sale_refund'])]" widget="selection" on_change="onchange_journal(journal_id, line_cr_ids, tax_id, partner_id)"/>
+                        <field name="partner_id" required="1" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)" string="Customer"/>
+                        <field name="date" on_change="onchange_date(date, currency_id, amount, context)"/>
+                        <field name="journal_id" domain="[('type','in',['sale','sale_refund'])]" widget="selection" on_change="onchange_journal(journal_id, line_cr_ids, tax_id, partner_id, date, amount, type, context)"/>
                         <field name="number"/>
                         <field name="name" colspan="2"/>
                         <field name="company_id" select="1" widget="selection" groups="base.group_multi_company"/>
@@ -209,9 +209,9 @@
             <field name="arch" type="xml">
                 <form string="Supplier Voucher">
                     <group col="6" colspan="4">
-                        <field name="partner_id" domain="[('supplier','=',True)]" required="1" string="Supplier" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date)"/>
-                        <field name="date" string="Bill Date" select="1" on_change="onchange_date(partner_id, journal_id, amount, currency_id, type, date)"/>
-                        <field name="journal_id" domain="[('type','in',['purchase','purchase_refund'])]" widget="selection" select="1" on_change="onchange_journal(journal_id, line_dr_ids, tax_id, partner_id)"/>
+                        <field name="partner_id" domain="[('supplier','=',True)]" required="1" string="Supplier" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)"/>
+                        <field name="date" string="Bill Date" select="1" on_change="onchange_date(date, currency_id, amount, context)"/>
+                        <field name="journal_id" domain="[('type','in',['purchase','purchase_refund'])]" widget="selection" select="1" on_change="onchange_journal(journal_id, line_dr_ids, tax_id, partner_id, date, amount, type, context)"/>
                         <field name="number"/>
                         <field name="name" colspan="2"/>
                         <field name="reference" select="1"/>

addons/board/board_data_home.xml

@@ -53,6 +53,16 @@
               <action name="%(action_res_widgets_events)d"/>
             </child2>
           </hpaned>
+          <!--
+          The new version should this, kept as comment until rng grammar is updated.
+            <board style="1">
+                <column>
+                    <action name="100"/>
+                </column>
+                <column/>
+                <column/>
+            </board>
+           -->
         </form>
       </field>
     </record>

addons/hr_expense/hr_expense.py

@@ -131,16 +131,14 @@ class hr_expense_expense(osv.osv):
         wf_service = netsvc.LocalService("workflow")
         mod_obj = self.pool.get('ir.model.data')
         res = mod_obj.get_object_reference(cr, uid, 'account', 'invoice_supplier_form')
-        res_id = res and res[1] or False,
         inv_ids = []
         for id in ids:
             wf_service.trg_validate(uid, 'hr.expense.expense', id, 'invoice', cr)
             inv_ids.append(self.browse(cr, uid, id).invoice_id.id)
         return {
             'name': _('Supplier Invoices'),
-            'view_type': 'form',
-            'view_mode': 'form,tree',
-            'view_id': [res_id],
+            'view_mode': 'form',
+            'view_id': [res[1] if res else False],
             'res_model': 'account.invoice',
             'context': "{'type':'out_invoice', 'journal_type': 'purchase'}",
             'type': 'ir.actions.act_window',

addons/import_base/import_framework.py

@@ -60,7 +60,7 @@ class import_framework(Thread):
         self.context = context or {}
         self.email = email_to_notify
         self.table_list = []
-        self.logger = logging.getLogger('import_framework')
+        self.logger = logging.getLogger(module_name)
         self.initialize()
 
     """
@@ -165,6 +165,7 @@ class import_framework(Thread):
                 data_i is a map external field_name => value
                 and each data_i have a external id => in data_id['id']
         """
+        self.logger.info(' Importing %s into %s' % (table, model))
         if not datas:
             return (0, 'No data found')
         mapping['id'] = 'id_new'
@@ -187,8 +188,7 @@ class import_framework(Thread):
         model_obj = self.obj.pool.get(model)
         if not model_obj:
             raise ValueError(_("%s is not a valid model name") % model)
-        self.logger.debug(_("fields imported : "))
-        self.logger.debug(fields)
+        self.logger.debug(_(" fields imported : ") + str(fields))
         (p, r, warning, s) = model_obj.import_data(self.cr, self.uid, fields, res, mode='update', current_module=self.module_name, noupdate=True, context=self.context)
         for (field, field_name) in self_dependencies:
             self._import_self_dependencies(model_obj, field, datas)
@@ -330,7 +330,6 @@ class import_framework(Thread):
         xml_ref = self.mapped_id_if_exist(model, domain_search, table, name)
         fields.append('id')
         data.append(xml_id)
-
         obj.import_data(self.cr, self.uid, fields, [data], mode='update', current_module=self.module_name, noupdate=True, context=self.context)
         return xml_ref or xml_id
     
@@ -385,7 +384,6 @@ class import_framework(Thread):
                     res = self._resolve_dependencies(self.get_mapping()[table].get('dependencies', []), imported)
                     result.extend(res)
                     if to_import:
-                        self.logger.debug(_("import : ") + table )
                         (position, warning) = self._import_table(table)
                         result.append((table, position, warning))
                     imported.add(table)
@@ -396,12 +394,13 @@ class import_framework(Thread):
             traceback.print_exc(file=sh)
             error = sh.getvalue()
             print error
-        finally:
-            self.cr.close()
+            
            
         self.date_ended = datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")
         self._send_notification_email(result, error)
         
+        self.cr.close()
+        
     def _resolve_dependencies(self, dep, imported):
         """ 
             import dependencies recursively
@@ -414,7 +413,6 @@ class import_framework(Thread):
                 res = self._resolve_dependencies(self.get_mapping()[dependency].get('dependencies', []), imported)
                 result.extend(res)
                 if to_import:
-                    self.logger.debug("import dependency : " + dependency)
                     r = self._import_table(dependency)
                     (position, warning) = r
                     result.append((dependency, position, warning))
@@ -422,15 +420,16 @@ class import_framework(Thread):
         return result
                 
     def _send_notification_email(self, result, error):
-        if not self.email or not self.email[0]:
+        if not self.email:
             return False	 
-
-        tools.email_send(
-                'import@module.openerp',
-                self.email,
-                self.get_email_subject(result, error),
-                self.get_email_body(result, error),
-            )
+        email_obj = self.obj.pool.get('mail.message')
+        email_id = email_obj.create(self.cr, self.uid, {
+            'email_from' : 'import@module.openerp', 
+            'email_to' : self.email,
+            'body_text' : self.get_email_body(result, error),
+            'subject' : self.get_email_subject(result, error),
+            'auto_delete' : True})
+        email_obj.send(self.cr, self.uid, [email_id])
         if error:
             self.logger.error(_("Import failed due to an unexpected error"))
         else:

addons/import_sugarcrm/import_sugarcrm.py

@@ -210,12 +210,12 @@ class sugar_import(import_framework):
         
     def get_email_mapping(self): 
         return { 
-                'model' : 'mailgate.message',
+                'model' : 'mail.message',
                 'dependencies' : [self.TABLE_USER, self.TABLE_ACCOUNT, self.TABLE_CONTACT, self.TABLE_LEAD, self.TABLE_OPPORTUNITY, self.TABLE_MEETING, self.TABLE_CALL],
                 'hook' : self.import_email,
                 'map' : {
-                        'name':'name',
-                        'history' : const("1"),
+                        'subject':'name',
+                        'state' : const('received'),
                         'date':'date_sent',
                         'email_from': 'from_addr_name',
                         'email_to': 'to_addrs_names',
@@ -226,7 +226,9 @@ class sugar_import(import_framework):
                         'model': 'model',
                         'partner_id/.id': 'partner_id/.id',                         
                         'user_id/id': ref(self.TABLE_USER, 'assigned_user_id'),
-                        'description': ppconcat('description', 'description_html'),
+                        'body_text': 'description',
+                        'body_html' : 'description_html',
+                        
                 }
             } 
     
@@ -575,10 +577,10 @@ class sugar_import(import_framework):
         }
         
     def get_opportunity_status(self, sugar_val):
-        fields = ['name', 'type']
+        fields = ['name', 'case_default']
         name = 'Opportunity_' + sugar_val['sales_stage']
-        data = [sugar_val['sales_stage'], 'Opportunity']
-        return self.import_object(fields, data, 'crm.case.stage', self.TABLE_STAGE, name, [('type', '=', 'opportunity'), ('name', 'ilike', sugar_val['sales_stage'])])
+        data = [sugar_val['sales_stage'], '1']
+        return self.import_object(fields, data, 'crm.case.stage', self.TABLE_STAGE, name, [('name', 'ilike', sugar_val['sales_stage'])])
     
     def import_opportunity_contact(self, val):
         sugar_opportunities_contact = set(sugar.relation_search(self.context.get('port'), self.context.get('session_id'), 'Opportunities', module_id=val.get('id'), related_module='Contacts', query=None, deleted=None))
@@ -647,11 +649,11 @@ class sugar_import(import_framework):
         import lead
     """
     def get_lead_status(self, sugar_val):
-        fields = ['name', 'type']
+        fields = ['name', 'case_default']
         name = 'lead_' + sugar_val.get('status', '')
-        data = [sugar_val.get('status', ''), 'lead']
-        return self.import_object(fields, data, 'crm.case.stage', self.TABLE_STAGE, name, [('type', '=', 'lead'), ('name', 'ilike', sugar_val.get('status', ''))])
-
+        data = [sugar_val.get('status', ''), '1']
+        return self.import_object(fields, data, 'crm.case.stage', self.TABLE_STAGE, name, [('name', 'ilike', sugar_val.get('status', ''))])
+    
     lead_state = {
         'New' : 'draft',
         'Assigned':'open',
@@ -1085,7 +1087,7 @@ class import_sugarcrm(osv.osv):
         scheduler Method
         """
         context = {'username': args[4], 'password': args[5], 'url': args[3], 'instance_name': args[3]}
-        imp = sugar_import(self, cr, uid, args[2], "import_sugarcrm", [args[1]], context)
+        imp = sugar_import(self, cr, uid, args[2], "import_sugarcrm", args[1], context)
         imp.set_table_list(args[0])
         imp.start()
         return True 
@@ -1129,7 +1131,7 @@ class import_sugarcrm(osv.osv):
                 raise osv.except_osv(_('Error !!'), _("%s data required %s Module to be installed, Please install %s module") %(keys,module,module))
         url = self.parse_valid_url(context)
         context.update({'url': url})
-        imp = sugar_import(self, cr, uid, context.get('instance_name'), "import_sugarcrm", [context.get('email_user')], context)
+        imp = sugar_import(self, cr, uid, context.get('instance_name'), "import_sugarcrm", context.get('email_user'), context)
         imp.set_table_list(keys)
         imp.start()
         obj_model = self.pool.get('ir.model.data')

addons/import_sugarcrm/sugar.py

@@ -32,13 +32,21 @@ import import_sugarcrm
 
 import logging
 
+import sys
+
+
+debug = False
+
 
 class LoginError(Exception): pass
 
 def login(username, password, url):
     setURL(url)
     loc = sugarsoapLocator()
-    portType = loc.getsugarsoapPortType(url)
+    if debug:
+        portType = loc.getsugarsoapPortType(url, tracefile=sys.stdout)
+    else:
+        portType = loc.getsugarsoapPortType(url)
     request = loginRequest()
     uauth = ns0.user_auth_Def(request)
     request._user_auth = uauth

addons/project/project_view.xml

@@ -321,6 +321,10 @@
             <field name="type">kanban</field>
             <field name="arch" type="xml">
                 <kanban default_group_by="type_id" >
+                    <field name="color"/>
+                    <field name="priority"/>
+                    <field name="state"/>
+                    <field name="type_id"/>
                     <templates>
                         <t t-name="kanban-box">
                             <t t-set="color" t-value="kanban_color(record.color.raw_value || record.type_id.raw_value)"/>

addons/project_issue/project_issue_view.xml

@@ -188,7 +188,7 @@
                     <button name="next_type" string="Next" type="object" icon="gtk-go-forward" help="Change to Next Stage"/>
                     <field name="version_id" widget="selection"/>
                     <field name="user_id"/>
-                    <field name="progress" widget="progressbar" attrs="{'invisible':[('task_id','=',False)]}"/>
+                    <field name="progress" widget="progressbar"/>
                     <field name="state"/>
                     <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" icon="gtk-cancel"/>
                     <button name="case_close" string="Done" states="open,draft,pending" type="object" icon="gtk-jump-to"/>

addons/stock/stock_view.xml

@@ -1384,7 +1384,6 @@
                     <button name="%(track_line)d" string="Split in production lots" type="action"
                         icon="terp-stock_effects-object-colorize" attrs="{'invisible': [('prodlot_id','&lt;&gt;',False)]}"
                         states="draft,waiting,confirmed,assigned,done"
-                        context="{'default_use_exist': picking_id.type=='in'}"
                         groups="base.group_extended"/>
                     <field groups="base.group_extended" name="tracking_id"/>
                     <button name="setlast_tracking" string="Put in current pack" type="object"
@@ -1557,7 +1556,6 @@
                     <button name="%(track_line)d" string="Split in production lots" type="action"
                         icon="terp-stock_effects-object-colorize" attrs="{'invisible': [('prodlot_id','&lt;&gt;',False)]}"
                        states="draft,waiting,confirmed,assigned,done"
-                        context="{'default_use_exist': picking_id.type=='in'}"
                         groups="base.group_extended"/>
                     <field name="tracking_id" groups="base.group_extended"/>
                     <button name="setlast_tracking" string="Put in current pack" type="object"

addons/survey/i18n/bg.po

@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-10-19 05:37+0000\n"
-"X-Generator: Launchpad (build 14157)\n"
+"X-Launchpad-Export-Date: 2011-10-22 04:59+0000\n"
+"X-Generator: Launchpad (build 14170)\n"
 
 #. module: survey
 #: view:survey.print:0
@@ -358,24 +358,24 @@ msgstr ""
 #: code:addons/survey/survey.py:642
 #: code:addons/survey/wizard/survey_answer.py:124
 #: code:addons/survey/wizard/survey_answer.py:131
-#: code:addons/survey/wizard/survey_answer.py:700
-#: code:addons/survey/wizard/survey_answer.py:739
-#: code:addons/survey/wizard/survey_answer.py:759
-#: code:addons/survey/wizard/survey_answer.py:788
-#: code:addons/survey/wizard/survey_answer.py:793
-#: code:addons/survey/wizard/survey_answer.py:801
-#: code:addons/survey/wizard/survey_answer.py:812
-#: code:addons/survey/wizard/survey_answer.py:821
-#: code:addons/survey/wizard/survey_answer.py:826
-#: code:addons/survey/wizard/survey_answer.py:900
-#: code:addons/survey/wizard/survey_answer.py:936
-#: code:addons/survey/wizard/survey_answer.py:954
-#: code:addons/survey/wizard/survey_answer.py:982
-#: code:addons/survey/wizard/survey_answer.py:985
-#: code:addons/survey/wizard/survey_answer.py:988
-#: code:addons/survey/wizard/survey_answer.py:1000
-#: code:addons/survey/wizard/survey_answer.py:1007
-#: code:addons/survey/wizard/survey_answer.py:1010
+#: code:addons/survey/wizard/survey_answer.py:699
+#: code:addons/survey/wizard/survey_answer.py:738
+#: code:addons/survey/wizard/survey_answer.py:758
+#: code:addons/survey/wizard/survey_answer.py:787
+#: code:addons/survey/wizard/survey_answer.py:792
+#: code:addons/survey/wizard/survey_answer.py:800
+#: code:addons/survey/wizard/survey_answer.py:811
+#: code:addons/survey/wizard/survey_answer.py:820
+#: code:addons/survey/wizard/survey_answer.py:825
+#: code:addons/survey/wizard/survey_answer.py:899
+#: code:addons/survey/wizard/survey_answer.py:935
+#: code:addons/survey/wizard/survey_answer.py:953
+#: code:addons/survey/wizard/survey_answer.py:981
+#: code:addons/survey/wizard/survey_answer.py:984
+#: code:addons/survey/wizard/survey_answer.py:987
+#: code:addons/survey/wizard/survey_answer.py:999
+#: code:addons/survey/wizard/survey_answer.py:1006
+#: code:addons/survey/wizard/survey_answer.py:1009
 #: code:addons/survey/wizard/survey_selection.py:134
 #: code:addons/survey/wizard/survey_selection.py:138
 #: code:addons/survey/wizard/survey_send_invitation.py:74
@@ -722,8 +722,8 @@ msgid "You must enter one or more column heading."
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:759
-#: code:addons/survey/wizard/survey_answer.py:954
+#: code:addons/survey/wizard/survey_answer.py:758
+#: code:addons/survey/wizard/survey_answer.py:953
 #, python-format
 msgid "Please enter an integer value"
 msgstr "Моля въведете числов израз"
@@ -748,8 +748,9 @@ msgid ""
 msgstr ""
 
 #. module: survey
+#: selection:survey.request,state:0
 #: view:survey.request:0
-msgid "Watting Answer"
+msgid "Waiting Answer"
 msgstr ""
 
 #. module: survey
@@ -1089,12 +1090,6 @@ msgstr "Тип на отговор"
 msgid "Validation"
 msgstr "Валидиране"
 
-#. module: survey
-#: view:survey.request:0
-#: selection:survey.request,state:0
-msgid "Waiting Answer"
-msgstr ""
-
 #. module: survey
 #: selection:survey.question,comment_valid_type:0
 #: selection:survey.question,validation_type:0
@@ -1374,7 +1369,7 @@ msgid "Answered"
 msgstr "Отговорено"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:433
+#: code:addons/survey/wizard/survey_answer.py:432
 #, python-format
 msgid "Complete Survey Answer"
 msgstr ""
@@ -1401,7 +1396,7 @@ msgid "Send Invitation"
 msgstr "Изпрати покана"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:793
+#: code:addons/survey/wizard/survey_answer.py:792
 #, python-format
 msgid "You cannot select the same answer more than one time"
 msgstr ""
@@ -1517,7 +1512,7 @@ msgid ""
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:985
+#: code:addons/survey/wizard/survey_answer.py:984
 #, python-format
 msgid "You cannot select same answer more than one time'"
 msgstr ""

addons/survey/i18n/ca.po

@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-10-19 05:37+0000\n"
-"X-Generator: Launchpad (build 14157)\n"
+"X-Launchpad-Export-Date: 2011-10-22 04:59+0000\n"
+"X-Generator: Launchpad (build 14170)\n"
 
 #. module: survey
 #: view:survey.print:0
@@ -369,24 +369,24 @@ msgstr "Camp tipus comentari"
 #: code:addons/survey/survey.py:642
 #: code:addons/survey/wizard/survey_answer.py:124
 #: code:addons/survey/wizard/survey_answer.py:131
-#: code:addons/survey/wizard/survey_answer.py:700
-#: code:addons/survey/wizard/survey_answer.py:739
-#: code:addons/survey/wizard/survey_answer.py:759
-#: code:addons/survey/wizard/survey_answer.py:788
-#: code:addons/survey/wizard/survey_answer.py:793
-#: code:addons/survey/wizard/survey_answer.py:801
-#: code:addons/survey/wizard/survey_answer.py:812
-#: code:addons/survey/wizard/survey_answer.py:821
-#: code:addons/survey/wizard/survey_answer.py:826
-#: code:addons/survey/wizard/survey_answer.py:900
-#: code:addons/survey/wizard/survey_answer.py:936
-#: code:addons/survey/wizard/survey_answer.py:954
-#: code:addons/survey/wizard/survey_answer.py:982
-#: code:addons/survey/wizard/survey_answer.py:985
-#: code:addons/survey/wizard/survey_answer.py:988
-#: code:addons/survey/wizard/survey_answer.py:1000
-#: code:addons/survey/wizard/survey_answer.py:1007
-#: code:addons/survey/wizard/survey_answer.py:1010
+#: code:addons/survey/wizard/survey_answer.py:699
+#: code:addons/survey/wizard/survey_answer.py:738
+#: code:addons/survey/wizard/survey_answer.py:758
+#: code:addons/survey/wizard/survey_answer.py:787
+#: code:addons/survey/wizard/survey_answer.py:792
+#: code:addons/survey/wizard/survey_answer.py:800
+#: code:addons/survey/wizard/survey_answer.py:811
+#: code:addons/survey/wizard/survey_answer.py:820
+#: code:addons/survey/wizard/survey_answer.py:825
+#: code:addons/survey/wizard/survey_answer.py:899
+#: code:addons/survey/wizard/survey_answer.py:935
+#: code:addons/survey/wizard/survey_answer.py:953
+#: code:addons/survey/wizard/survey_answer.py:981
+#: code:addons/survey/wizard/survey_answer.py:984
+#: code:addons/survey/wizard/survey_answer.py:987
+#: code:addons/survey/wizard/survey_answer.py:999
+#: code:addons/survey/wizard/survey_answer.py:1006
+#: code:addons/survey/wizard/survey_answer.py:1009
 #: code:addons/survey/wizard/survey_selection.py:134
 #: code:addons/survey/wizard/survey_selection.py:138
 #: code:addons/survey/wizard/survey_send_invitation.py:74
@@ -754,8 +754,8 @@ msgid "You must enter one or more column heading."
 msgstr "Heu d'introduir una o més capçaleres de columna."
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:759
-#: code:addons/survey/wizard/survey_answer.py:954
+#: code:addons/survey/wizard/survey_answer.py:758
+#: code:addons/survey/wizard/survey_answer.py:953
 #, python-format
 msgid "Please enter an integer value"
 msgstr "Introduïu un valor numèric enter"
@@ -782,8 +782,9 @@ msgstr ""
 "és major que el número de respostes. Utilitzeu un número menor que %d."
 
 #. module: survey
+#: selection:survey.request,state:0
 #: view:survey.request:0
-msgid "Watting Answer"
+msgid "Waiting Answer"
 msgstr "Esperant resposta"
 
 #. module: survey
@@ -1131,12 +1132,6 @@ msgstr "Tipus de resposta"
 msgid "Validation"
 msgstr "Validació"
 
-#. module: survey
-#: view:survey.request:0
-#: selection:survey.request,state:0
-msgid "Waiting Answer"
-msgstr "Esperant resposta"
-
 #. module: survey
 #: selection:survey.question,comment_valid_type:0
 #: selection:survey.question,validation_type:0
@@ -1420,7 +1415,7 @@ msgid "Answered"
 msgstr "Respost"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:433
+#: code:addons/survey/wizard/survey_answer.py:432
 #, python-format
 msgid "Complete Survey Answer"
 msgstr "Enquesta completada"
@@ -1447,7 +1442,7 @@ msgid "Send Invitation"
 msgstr "Envia invitació"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:793
+#: code:addons/survey/wizard/survey_answer.py:792
 #, python-format
 msgid "You cannot select the same answer more than one time"
 msgstr "No podeu seleccionar la mateixa resposta més d'una vegada"
@@ -1567,7 +1562,7 @@ msgstr ""
 "de respostes. Utilitzeu un número menor que %d."
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:985
+#: code:addons/survey/wizard/survey_answer.py:984
 #, python-format
 msgid "You cannot select same answer more than one time'"
 msgstr "No podeu seleccionar la mateixa resposta més d'una vegada"
@@ -1764,3 +1759,6 @@ msgstr "Respostes màximes per usuari"
 #: field:survey.name.wiz,page:0
 msgid "Page Position"
 msgstr "Posició de la pàgina"
+
+#~ msgid "Watting Answer"
+#~ msgstr "Esperant resposta"

addons/survey/i18n/cs.po

@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-10-19 05:37+0000\n"
-"X-Generator: Launchpad (build 14157)\n"
+"X-Launchpad-Export-Date: 2011-10-22 04:59+0000\n"
+"X-Generator: Launchpad (build 14170)\n"
 
 #. module: survey
 #: view:survey.print:0
@@ -358,24 +358,24 @@ msgstr ""
 #: code:addons/survey/survey.py:642
 #: code:addons/survey/wizard/survey_answer.py:124
 #: code:addons/survey/wizard/survey_answer.py:131
-#: code:addons/survey/wizard/survey_answer.py:700
-#: code:addons/survey/wizard/survey_answer.py:739
-#: code:addons/survey/wizard/survey_answer.py:759
-#: code:addons/survey/wizard/survey_answer.py:788
-#: code:addons/survey/wizard/survey_answer.py:793
-#: code:addons/survey/wizard/survey_answer.py:801
-#: code:addons/survey/wizard/survey_answer.py:812
-#: code:addons/survey/wizard/survey_answer.py:821
-#: code:addons/survey/wizard/survey_answer.py:826
-#: code:addons/survey/wizard/survey_answer.py:900
-#: code:addons/survey/wizard/survey_answer.py:936
-#: code:addons/survey/wizard/survey_answer.py:954
-#: code:addons/survey/wizard/survey_answer.py:982
-#: code:addons/survey/wizard/survey_answer.py:985
-#: code:addons/survey/wizard/survey_answer.py:988
-#: code:addons/survey/wizard/survey_answer.py:1000
-#: code:addons/survey/wizard/survey_answer.py:1007
-#: code:addons/survey/wizard/survey_answer.py:1010
+#: code:addons/survey/wizard/survey_answer.py:699
+#: code:addons/survey/wizard/survey_answer.py:738
+#: code:addons/survey/wizard/survey_answer.py:758
+#: code:addons/survey/wizard/survey_answer.py:787
+#: code:addons/survey/wizard/survey_answer.py:792
+#: code:addons/survey/wizard/survey_answer.py:800
+#: code:addons/survey/wizard/survey_answer.py:811
+#: code:addons/survey/wizard/survey_answer.py:820
+#: code:addons/survey/wizard/survey_answer.py:825
+#: code:addons/survey/wizard/survey_answer.py:899
+#: code:addons/survey/wizard/survey_answer.py:935
+#: code:addons/survey/wizard/survey_answer.py:953
+#: code:addons/survey/wizard/survey_answer.py:981
+#: code:addons/survey/wizard/survey_answer.py:984
+#: code:addons/survey/wizard/survey_answer.py:987
+#: code:addons/survey/wizard/survey_answer.py:999
+#: code:addons/survey/wizard/survey_answer.py:1006
+#: code:addons/survey/wizard/survey_answer.py:1009
 #: code:addons/survey/wizard/survey_selection.py:134
 #: code:addons/survey/wizard/survey_selection.py:138
 #: code:addons/survey/wizard/survey_send_invitation.py:74
@@ -722,8 +722,8 @@ msgid "You must enter one or more column heading."
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:759
-#: code:addons/survey/wizard/survey_answer.py:954
+#: code:addons/survey/wizard/survey_answer.py:758
+#: code:addons/survey/wizard/survey_answer.py:953
 #, python-format
 msgid "Please enter an integer value"
 msgstr ""
@@ -748,8 +748,9 @@ msgid ""
 msgstr ""
 
 #. module: survey
+#: selection:survey.request,state:0
 #: view:survey.request:0
-msgid "Watting Answer"
+msgid "Waiting Answer"
 msgstr ""
 
 #. module: survey
@@ -1089,12 +1090,6 @@ msgstr ""
 msgid "Validation"
 msgstr ""
 
-#. module: survey
-#: view:survey.request:0
-#: selection:survey.request,state:0
-msgid "Waiting Answer"
-msgstr ""
-
 #. module: survey
 #: selection:survey.question,comment_valid_type:0
 #: selection:survey.question,validation_type:0
@@ -1374,7 +1369,7 @@ msgid "Answered"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:433
+#: code:addons/survey/wizard/survey_answer.py:432
 #, python-format
 msgid "Complete Survey Answer"
 msgstr ""
@@ -1401,7 +1396,7 @@ msgid "Send Invitation"
 msgstr "Poslat pozvání"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:793
+#: code:addons/survey/wizard/survey_answer.py:792
 #, python-format
 msgid "You cannot select the same answer more than one time"
 msgstr ""
@@ -1517,7 +1512,7 @@ msgid ""
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:985
+#: code:addons/survey/wizard/survey_answer.py:984
 #, python-format
 msgid "You cannot select same answer more than one time'"
 msgstr ""

addons/survey/i18n/de.po

@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-10-19 05:37+0000\n"
-"X-Generator: Launchpad (build 14157)\n"
+"X-Launchpad-Export-Date: 2011-10-22 04:59+0000\n"
+"X-Generator: Launchpad (build 14170)\n"
 
 #. module: survey
 #: view:survey.print:0
@@ -368,24 +368,24 @@ msgstr "Kommentar Feldtyp"
 #: code:addons/survey/survey.py:642
 #: code:addons/survey/wizard/survey_answer.py:124
 #: code:addons/survey/wizard/survey_answer.py:131
-#: code:addons/survey/wizard/survey_answer.py:700
-#: code:addons/survey/wizard/survey_answer.py:739
-#: code:addons/survey/wizard/survey_answer.py:759
-#: code:addons/survey/wizard/survey_answer.py:788
-#: code:addons/survey/wizard/survey_answer.py:793
-#: code:addons/survey/wizard/survey_answer.py:801
-#: code:addons/survey/wizard/survey_answer.py:812
-#: code:addons/survey/wizard/survey_answer.py:821
-#: code:addons/survey/wizard/survey_answer.py:826
-#: code:addons/survey/wizard/survey_answer.py:900
-#: code:addons/survey/wizard/survey_answer.py:936
-#: code:addons/survey/wizard/survey_answer.py:954
-#: code:addons/survey/wizard/survey_answer.py:982
-#: code:addons/survey/wizard/survey_answer.py:985
-#: code:addons/survey/wizard/survey_answer.py:988
-#: code:addons/survey/wizard/survey_answer.py:1000
-#: code:addons/survey/wizard/survey_answer.py:1007
-#: code:addons/survey/wizard/survey_answer.py:1010
+#: code:addons/survey/wizard/survey_answer.py:699
+#: code:addons/survey/wizard/survey_answer.py:738
+#: code:addons/survey/wizard/survey_answer.py:758
+#: code:addons/survey/wizard/survey_answer.py:787
+#: code:addons/survey/wizard/survey_answer.py:792
+#: code:addons/survey/wizard/survey_answer.py:800
+#: code:addons/survey/wizard/survey_answer.py:811
+#: code:addons/survey/wizard/survey_answer.py:820
+#: code:addons/survey/wizard/survey_answer.py:825
+#: code:addons/survey/wizard/survey_answer.py:899
+#: code:addons/survey/wizard/survey_answer.py:935
+#: code:addons/survey/wizard/survey_answer.py:953
+#: code:addons/survey/wizard/survey_answer.py:981
+#: code:addons/survey/wizard/survey_answer.py:984
+#: code:addons/survey/wizard/survey_answer.py:987
+#: code:addons/survey/wizard/survey_answer.py:999
+#: code:addons/survey/wizard/survey_answer.py:1006
+#: code:addons/survey/wizard/survey_answer.py:1009
 #: code:addons/survey/wizard/survey_selection.py:134
 #: code:addons/survey/wizard/survey_selection.py:138
 #: code:addons/survey/wizard/survey_send_invitation.py:74
@@ -750,8 +750,8 @@ msgid "You must enter one or more column heading."
 msgstr "Sie müssen einer oder mehr Spaltenüberschriften eingeben."
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:759
-#: code:addons/survey/wizard/survey_answer.py:954
+#: code:addons/survey/wizard/survey_answer.py:758
+#: code:addons/survey/wizard/survey_answer.py:953
 #, python-format
 msgid "Please enter an integer value"
 msgstr "Bitte geben Sie einen Integer Wert ein."
@@ -778,8 +778,9 @@ msgstr ""
 "Antworten. Bitte geben Sie eine Zahl kleiner als %d ein."
 
 #. module: survey
+#: selection:survey.request,state:0
 #: view:survey.request:0
-msgid "Watting Answer"
+msgid "Waiting Answer"
 msgstr "Erwarte Antwort"
 
 #. module: survey
@@ -1127,12 +1128,6 @@ msgstr "Antworttyp"
 msgid "Validation"
 msgstr "Validierung"
 
-#. module: survey
-#: view:survey.request:0
-#: selection:survey.request,state:0
-msgid "Waiting Answer"
-msgstr "Erwarte Antwort"
-
 #. module: survey
 #: selection:survey.question,comment_valid_type:0
 #: selection:survey.question,validation_type:0
@@ -1417,7 +1412,7 @@ msgid "Answered"
 msgstr "Beantwortet"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:433
+#: code:addons/survey/wizard/survey_answer.py:432
 #, python-format
 msgid "Complete Survey Answer"
 msgstr "Komplettiere Antworten zur Umfrage"
@@ -1444,7 +1439,7 @@ msgid "Send Invitation"
 msgstr "Einladung verschicken"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:793
+#: code:addons/survey/wizard/survey_answer.py:792
 #, python-format
 msgid "You cannot select the same answer more than one time"
 msgstr "Sie können die selbe Antwort nicht mehr als einmal auswählen."
@@ -1565,7 +1560,7 @@ msgstr ""
 "der verfügbaren Antworten. Bitte tragen Sie eine Anzahl kleiner als %d ein."
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:985
+#: code:addons/survey/wizard/survey_answer.py:984
 #, python-format
 msgid "You cannot select same answer more than one time'"
 msgstr "Sie können die selbe Antwort nicht mehr als einmal auswählen."
@@ -1919,3 +1914,6 @@ msgstr "Seitenposition"
 
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Ungültiger Modulname in der Aktionsdefinition."
+
+#~ msgid "Watting Answer"
+#~ msgstr "Erwarte Antwort"

addons/survey/i18n/es.po

@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-10-19 05:38+0000\n"
-"X-Generator: Launchpad (build 14157)\n"
+"X-Launchpad-Export-Date: 2011-10-22 05:00+0000\n"
+"X-Generator: Launchpad (build 14170)\n"
 
 #. module: survey
 #: view:survey.print:0
@@ -369,24 +369,24 @@ msgstr "Campo tipo comentario"
 #: code:addons/survey/survey.py:642
 #: code:addons/survey/wizard/survey_answer.py:124
 #: code:addons/survey/wizard/survey_answer.py:131
-#: code:addons/survey/wizard/survey_answer.py:700
-#: code:addons/survey/wizard/survey_answer.py:739
-#: code:addons/survey/wizard/survey_answer.py:759
-#: code:addons/survey/wizard/survey_answer.py:788
-#: code:addons/survey/wizard/survey_answer.py:793
-#: code:addons/survey/wizard/survey_answer.py:801
-#: code:addons/survey/wizard/survey_answer.py:812
-#: code:addons/survey/wizard/survey_answer.py:821
-#: code:addons/survey/wizard/survey_answer.py:826
-#: code:addons/survey/wizard/survey_answer.py:900
-#: code:addons/survey/wizard/survey_answer.py:936
-#: code:addons/survey/wizard/survey_answer.py:954
-#: code:addons/survey/wizard/survey_answer.py:982
-#: code:addons/survey/wizard/survey_answer.py:985
-#: code:addons/survey/wizard/survey_answer.py:988
-#: code:addons/survey/wizard/survey_answer.py:1000
-#: code:addons/survey/wizard/survey_answer.py:1007
-#: code:addons/survey/wizard/survey_answer.py:1010
+#: code:addons/survey/wizard/survey_answer.py:699
+#: code:addons/survey/wizard/survey_answer.py:738
+#: code:addons/survey/wizard/survey_answer.py:758
+#: code:addons/survey/wizard/survey_answer.py:787
+#: code:addons/survey/wizard/survey_answer.py:792
+#: code:addons/survey/wizard/survey_answer.py:800
+#: code:addons/survey/wizard/survey_answer.py:811
+#: code:addons/survey/wizard/survey_answer.py:820
+#: code:addons/survey/wizard/survey_answer.py:825
+#: code:addons/survey/wizard/survey_answer.py:899
+#: code:addons/survey/wizard/survey_answer.py:935
+#: code:addons/survey/wizard/survey_answer.py:953
+#: code:addons/survey/wizard/survey_answer.py:981
+#: code:addons/survey/wizard/survey_answer.py:984
+#: code:addons/survey/wizard/survey_answer.py:987
+#: code:addons/survey/wizard/survey_answer.py:999
+#: code:addons/survey/wizard/survey_answer.py:1006
+#: code:addons/survey/wizard/survey_answer.py:1009
 #: code:addons/survey/wizard/survey_selection.py:134
 #: code:addons/survey/wizard/survey_selection.py:138
 #: code:addons/survey/wizard/survey_send_invitation.py:74
@@ -753,8 +753,8 @@ msgid "You must enter one or more column heading."
 msgstr "Debe introducir una o más cabeceras de columna."
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:759
-#: code:addons/survey/wizard/survey_answer.py:954
+#: code:addons/survey/wizard/survey_answer.py:758
+#: code:addons/survey/wizard/survey_answer.py:953
 #, python-format
 msgid "Please enter an integer value"
 msgstr "Por favor introduzca un valor numérico entero"
@@ -781,8 +781,9 @@ msgstr ""
 "es mayor que el número de respuestas. Por favor, use un número menor que %d."
 
 #. module: survey
+#: selection:survey.request,state:0
 #: view:survey.request:0
-msgid "Watting Answer"
+msgid "Waiting Answer"
 msgstr "Esperando respuesta"
 
 #. module: survey
@@ -1131,12 +1132,6 @@ msgstr "Tipo respuesta"
 msgid "Validation"
 msgstr "Validación"
 
-#. module: survey
-#: view:survey.request:0
-#: selection:survey.request,state:0
-msgid "Waiting Answer"
-msgstr "Esperando respuesta"
-
 #. module: survey
 #: selection:survey.question,comment_valid_type:0
 #: selection:survey.question,validation_type:0
@@ -1420,7 +1415,7 @@ msgid "Answered"
 msgstr "Contestadas"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:433
+#: code:addons/survey/wizard/survey_answer.py:432
 #, python-format
 msgid "Complete Survey Answer"
 msgstr "Respuesta completa de la encuesta"
@@ -1447,7 +1442,7 @@ msgid "Send Invitation"
 msgstr "Enviar invitación"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:793
+#: code:addons/survey/wizard/survey_answer.py:792
 #, python-format
 msgid "You cannot select the same answer more than one time"
 msgstr "No se puede seleccionar la misma respuesta más de una vez"
@@ -1567,7 +1562,7 @@ msgstr ""
 "de respuestas. Utilice un número menor que %d."
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:985
+#: code:addons/survey/wizard/survey_answer.py:984
 #, python-format
 msgid "You cannot select same answer more than one time'"
 msgstr "No puede seleccionar la misma respuesta más de una vez"
@@ -1801,6 +1796,9 @@ msgstr "Posición página"
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "¡XML no válido para la estructura de la vista!"
 
+#~ msgid "Watting Answer"
+#~ msgstr "Esperando respuesta"
+
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
 #~ msgstr ""

addons/survey/i18n/et.po

@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-10-19 05:37+0000\n"
-"X-Generator: Launchpad (build 14157)\n"
+"X-Launchpad-Export-Date: 2011-10-22 04:59+0000\n"
+"X-Generator: Launchpad (build 14170)\n"
 
 #. module: survey
 #: view:survey.print:0
@@ -358,24 +358,24 @@ msgstr ""
 #: code:addons/survey/survey.py:642
 #: code:addons/survey/wizard/survey_answer.py:124
 #: code:addons/survey/wizard/survey_answer.py:131
-#: code:addons/survey/wizard/survey_answer.py:700
-#: code:addons/survey/wizard/survey_answer.py:739
-#: code:addons/survey/wizard/survey_answer.py:759
-#: code:addons/survey/wizard/survey_answer.py:788
-#: code:addons/survey/wizard/survey_answer.py:793
-#: code:addons/survey/wizard/survey_answer.py:801
-#: code:addons/survey/wizard/survey_answer.py:812
-#: code:addons/survey/wizard/survey_answer.py:821
-#: code:addons/survey/wizard/survey_answer.py:826
-#: code:addons/survey/wizard/survey_answer.py:900
-#: code:addons/survey/wizard/survey_answer.py:936
-#: code:addons/survey/wizard/survey_answer.py:954
-#: code:addons/survey/wizard/survey_answer.py:982
-#: code:addons/survey/wizard/survey_answer.py:985
-#: code:addons/survey/wizard/survey_answer.py:988
-#: code:addons/survey/wizard/survey_answer.py:1000
-#: code:addons/survey/wizard/survey_answer.py:1007
-#: code:addons/survey/wizard/survey_answer.py:1010
+#: code:addons/survey/wizard/survey_answer.py:699
+#: code:addons/survey/wizard/survey_answer.py:738
+#: code:addons/survey/wizard/survey_answer.py:758
+#: code:addons/survey/wizard/survey_answer.py:787
+#: code:addons/survey/wizard/survey_answer.py:792
+#: code:addons/survey/wizard/survey_answer.py:800
+#: code:addons/survey/wizard/survey_answer.py:811
+#: code:addons/survey/wizard/survey_answer.py:820
+#: code:addons/survey/wizard/survey_answer.py:825
+#: code:addons/survey/wizard/survey_answer.py:899
+#: code:addons/survey/wizard/survey_answer.py:935
+#: code:addons/survey/wizard/survey_answer.py:953
+#: code:addons/survey/wizard/survey_answer.py:981
+#: code:addons/survey/wizard/survey_answer.py:984
+#: code:addons/survey/wizard/survey_answer.py:987
+#: code:addons/survey/wizard/survey_answer.py:999
+#: code:addons/survey/wizard/survey_answer.py:1006
+#: code:addons/survey/wizard/survey_answer.py:1009
 #: code:addons/survey/wizard/survey_selection.py:134
 #: code:addons/survey/wizard/survey_selection.py:138
 #: code:addons/survey/wizard/survey_send_invitation.py:74
@@ -722,8 +722,8 @@ msgid "You must enter one or more column heading."
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:759
-#: code:addons/survey/wizard/survey_answer.py:954
+#: code:addons/survey/wizard/survey_answer.py:758
+#: code:addons/survey/wizard/survey_answer.py:953
 #, python-format
 msgid "Please enter an integer value"
 msgstr ""
@@ -748,8 +748,9 @@ msgid ""
 msgstr ""
 
 #. module: survey
+#: selection:survey.request,state:0
 #: view:survey.request:0
-msgid "Watting Answer"
+msgid "Waiting Answer"
 msgstr ""
 
 #. module: survey
@@ -1089,12 +1090,6 @@ msgstr ""
 msgid "Validation"
 msgstr ""
 
-#. module: survey
-#: view:survey.request:0
-#: selection:survey.request,state:0
-msgid "Waiting Answer"
-msgstr ""
-
 #. module: survey
 #: selection:survey.question,comment_valid_type:0
 #: selection:survey.question,validation_type:0
@@ -1374,7 +1369,7 @@ msgid "Answered"
 msgstr "Vastatud"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:433
+#: code:addons/survey/wizard/survey_answer.py:432
 #, python-format
 msgid "Complete Survey Answer"
 msgstr ""
@@ -1401,7 +1396,7 @@ msgid "Send Invitation"
 msgstr "Saada kutse"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:793
+#: code:addons/survey/wizard/survey_answer.py:792
 #, python-format
 msgid "You cannot select the same answer more than one time"
 msgstr ""
@@ -1517,7 +1512,7 @@ msgid ""
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:985
+#: code:addons/survey/wizard/survey_answer.py:984
 #, python-format
 msgid "You cannot select same answer more than one time'"
 msgstr ""

addons/survey/i18n/fr.po

@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-10-19 05:37+0000\n"
-"X-Generator: Launchpad (build 14157)\n"
+"X-Launchpad-Export-Date: 2011-10-22 04:59+0000\n"
+"X-Generator: Launchpad (build 14170)\n"
 
 #. module: survey
 #: view:survey.print:0
@@ -369,24 +369,24 @@ msgstr "Type de champ 'Commentaire'"
 #: code:addons/survey/survey.py:642
 #: code:addons/survey/wizard/survey_answer.py:124
 #: code:addons/survey/wizard/survey_answer.py:131
-#: code:addons/survey/wizard/survey_answer.py:700
-#: code:addons/survey/wizard/survey_answer.py:739
-#: code:addons/survey/wizard/survey_answer.py:759
-#: code:addons/survey/wizard/survey_answer.py:788
-#: code:addons/survey/wizard/survey_answer.py:793
-#: code:addons/survey/wizard/survey_answer.py:801
-#: code:addons/survey/wizard/survey_answer.py:812
-#: code:addons/survey/wizard/survey_answer.py:821
-#: code:addons/survey/wizard/survey_answer.py:826
-#: code:addons/survey/wizard/survey_answer.py:900
-#: code:addons/survey/wizard/survey_answer.py:936
-#: code:addons/survey/wizard/survey_answer.py:954
-#: code:addons/survey/wizard/survey_answer.py:982
-#: code:addons/survey/wizard/survey_answer.py:985
-#: code:addons/survey/wizard/survey_answer.py:988
-#: code:addons/survey/wizard/survey_answer.py:1000
-#: code:addons/survey/wizard/survey_answer.py:1007
-#: code:addons/survey/wizard/survey_answer.py:1010
+#: code:addons/survey/wizard/survey_answer.py:699
+#: code:addons/survey/wizard/survey_answer.py:738
+#: code:addons/survey/wizard/survey_answer.py:758
+#: code:addons/survey/wizard/survey_answer.py:787
+#: code:addons/survey/wizard/survey_answer.py:792
+#: code:addons/survey/wizard/survey_answer.py:800
+#: code:addons/survey/wizard/survey_answer.py:811
+#: code:addons/survey/wizard/survey_answer.py:820
+#: code:addons/survey/wizard/survey_answer.py:825
+#: code:addons/survey/wizard/survey_answer.py:899
+#: code:addons/survey/wizard/survey_answer.py:935
+#: code:addons/survey/wizard/survey_answer.py:953
+#: code:addons/survey/wizard/survey_answer.py:981
+#: code:addons/survey/wizard/survey_answer.py:984
+#: code:addons/survey/wizard/survey_answer.py:987
+#: code:addons/survey/wizard/survey_answer.py:999
+#: code:addons/survey/wizard/survey_answer.py:1006
+#: code:addons/survey/wizard/survey_answer.py:1009
 #: code:addons/survey/wizard/survey_selection.py:134
 #: code:addons/survey/wizard/survey_selection.py:138
 #: code:addons/survey/wizard/survey_send_invitation.py:74
@@ -753,8 +753,8 @@ msgid "You must enter one or more column heading."
 msgstr "Vous devez saisir un ou plusieurs en-têtes de colonne."
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:759
-#: code:addons/survey/wizard/survey_answer.py:954
+#: code:addons/survey/wizard/survey_answer.py:758
+#: code:addons/survey/wizard/survey_answer.py:953
 #, python-format
 msgid "Please enter an integer value"
 msgstr "Veuillez saisir un nombre entier"
@@ -781,8 +781,9 @@ msgstr ""
 "que le nombre de réponses. Veuillez saisir un nombre plus petit que %d."
 
 #. module: survey
+#: selection:survey.request,state:0
 #: view:survey.request:0
-msgid "Watting Answer"
+msgid "Waiting Answer"
 msgstr "En attente de réponse"
 
 #. module: survey
@@ -1131,12 +1132,6 @@ msgstr "Type de réponse"
 msgid "Validation"
 msgstr "Validation"
 
-#. module: survey
-#: view:survey.request:0
-#: selection:survey.request,state:0
-msgid "Waiting Answer"
-msgstr "En attente de réponse"
-
 #. module: survey
 #: selection:survey.question,comment_valid_type:0
 #: selection:survey.question,validation_type:0
@@ -1420,7 +1415,7 @@ msgid "Answered"
 msgstr "Répondu"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:433
+#: code:addons/survey/wizard/survey_answer.py:432
 #, python-format
 msgid "Complete Survey Answer"
 msgstr "Terminer de répondre au sondage"
@@ -1447,7 +1442,7 @@ msgid "Send Invitation"
 msgstr "Envoyer des invitations"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:793
+#: code:addons/survey/wizard/survey_answer.py:792
 #, python-format
 msgid "You cannot select the same answer more than one time"
 msgstr "Vous ne pouvez pas sélectionner plusieurs fois une même réponse."
@@ -1567,7 +1562,7 @@ msgstr ""
 "que le nombre de réponses. Veuillez saisir un nombre plus petit que %d."
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:985
+#: code:addons/survey/wizard/survey_answer.py:984
 #, python-format
 msgid "You cannot select same answer more than one time'"
 msgstr "Vous ne pouvez pas saisir plusieurs fois la même réponse"
@@ -1764,3 +1759,6 @@ msgstr "Nb de réponses maximum par utilisateur"
 #: field:survey.name.wiz,page:0
 msgid "Page Position"
 msgstr "Position de la page"
+
+#~ msgid "Watting Answer"
+#~ msgstr "En attente de réponse"

addons/survey/i18n/gl.po

@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-10-19 05:37+0000\n"
-"X-Generator: Launchpad (build 14157)\n"
+"X-Launchpad-Export-Date: 2011-10-22 04:59+0000\n"
+"X-Generator: Launchpad (build 14170)\n"
 
 #. module: survey
 #: view:survey.print:0
@@ -358,24 +358,24 @@ msgstr ""
 #: code:addons/survey/survey.py:642
 #: code:addons/survey/wizard/survey_answer.py:124
 #: code:addons/survey/wizard/survey_answer.py:131
-#: code:addons/survey/wizard/survey_answer.py:700
-#: code:addons/survey/wizard/survey_answer.py:739
-#: code:addons/survey/wizard/survey_answer.py:759
-#: code:addons/survey/wizard/survey_answer.py:788
-#: code:addons/survey/wizard/survey_answer.py:793
-#: code:addons/survey/wizard/survey_answer.py:801
-#: code:addons/survey/wizard/survey_answer.py:812
-#: code:addons/survey/wizard/survey_answer.py:821
-#: code:addons/survey/wizard/survey_answer.py:826
-#: code:addons/survey/wizard/survey_answer.py:900
-#: code:addons/survey/wizard/survey_answer.py:936
-#: code:addons/survey/wizard/survey_answer.py:954
-#: code:addons/survey/wizard/survey_answer.py:982
-#: code:addons/survey/wizard/survey_answer.py:985
-#: code:addons/survey/wizard/survey_answer.py:988
-#: code:addons/survey/wizard/survey_answer.py:1000
-#: code:addons/survey/wizard/survey_answer.py:1007
-#: code:addons/survey/wizard/survey_answer.py:1010
+#: code:addons/survey/wizard/survey_answer.py:699
+#: code:addons/survey/wizard/survey_answer.py:738
+#: code:addons/survey/wizard/survey_answer.py:758
+#: code:addons/survey/wizard/survey_answer.py:787
+#: code:addons/survey/wizard/survey_answer.py:792
+#: code:addons/survey/wizard/survey_answer.py:800
+#: code:addons/survey/wizard/survey_answer.py:811
+#: code:addons/survey/wizard/survey_answer.py:820
+#: code:addons/survey/wizard/survey_answer.py:825
+#: code:addons/survey/wizard/survey_answer.py:899
+#: code:addons/survey/wizard/survey_answer.py:935
+#: code:addons/survey/wizard/survey_answer.py:953
+#: code:addons/survey/wizard/survey_answer.py:981
+#: code:addons/survey/wizard/survey_answer.py:984
+#: code:addons/survey/wizard/survey_answer.py:987
+#: code:addons/survey/wizard/survey_answer.py:999
+#: code:addons/survey/wizard/survey_answer.py:1006
+#: code:addons/survey/wizard/survey_answer.py:1009
 #: code:addons/survey/wizard/survey_selection.py:134
 #: code:addons/survey/wizard/survey_selection.py:138
 #: code:addons/survey/wizard/survey_send_invitation.py:74
@@ -722,8 +722,8 @@ msgid "You must enter one or more column heading."
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:759
-#: code:addons/survey/wizard/survey_answer.py:954
+#: code:addons/survey/wizard/survey_answer.py:758
+#: code:addons/survey/wizard/survey_answer.py:953
 #, python-format
 msgid "Please enter an integer value"
 msgstr ""
@@ -748,8 +748,9 @@ msgid ""
 msgstr ""
 
 #. module: survey
+#: selection:survey.request,state:0
 #: view:survey.request:0
-msgid "Watting Answer"
+msgid "Waiting Answer"
 msgstr ""
 
 #. module: survey
@@ -1089,12 +1090,6 @@ msgstr ""
 msgid "Validation"
 msgstr ""
 
-#. module: survey
-#: view:survey.request:0
-#: selection:survey.request,state:0
-msgid "Waiting Answer"
-msgstr ""
-
 #. module: survey
 #: selection:survey.question,comment_valid_type:0
 #: selection:survey.question,validation_type:0
@@ -1374,7 +1369,7 @@ msgid "Answered"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:433
+#: code:addons/survey/wizard/survey_answer.py:432
 #, python-format
 msgid "Complete Survey Answer"
 msgstr ""
@@ -1401,7 +1396,7 @@ msgid "Send Invitation"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:793
+#: code:addons/survey/wizard/survey_answer.py:792
 #, python-format
 msgid "You cannot select the same answer more than one time"
 msgstr ""
@@ -1517,7 +1512,7 @@ msgid ""
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:985
+#: code:addons/survey/wizard/survey_answer.py:984
 #, python-format
 msgid "You cannot select same answer more than one time'"
 msgstr ""

addons/survey/i18n/hr.po

@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-10-19 05:38+0000\n"
-"X-Generator: Launchpad (build 14157)\n"
+"X-Launchpad-Export-Date: 2011-10-22 05:00+0000\n"
+"X-Generator: Launchpad (build 14170)\n"
 "Language: hr\n"
 
 #. module: survey
@@ -359,24 +359,24 @@ msgstr ""
 #: code:addons/survey/survey.py:642
 #: code:addons/survey/wizard/survey_answer.py:124
 #: code:addons/survey/wizard/survey_answer.py:131
-#: code:addons/survey/wizard/survey_answer.py:700
-#: code:addons/survey/wizard/survey_answer.py:739
-#: code:addons/survey/wizard/survey_answer.py:759
-#: code:addons/survey/wizard/survey_answer.py:788
-#: code:addons/survey/wizard/survey_answer.py:793
-#: code:addons/survey/wizard/survey_answer.py:801
-#: code:addons/survey/wizard/survey_answer.py:812
-#: code:addons/survey/wizard/survey_answer.py:821
-#: code:addons/survey/wizard/survey_answer.py:826
-#: code:addons/survey/wizard/survey_answer.py:900
-#: code:addons/survey/wizard/survey_answer.py:936
-#: code:addons/survey/wizard/survey_answer.py:954
-#: code:addons/survey/wizard/survey_answer.py:982
-#: code:addons/survey/wizard/survey_answer.py:985
-#: code:addons/survey/wizard/survey_answer.py:988
-#: code:addons/survey/wizard/survey_answer.py:1000
-#: code:addons/survey/wizard/survey_answer.py:1007
-#: code:addons/survey/wizard/survey_answer.py:1010
+#: code:addons/survey/wizard/survey_answer.py:699
+#: code:addons/survey/wizard/survey_answer.py:738
+#: code:addons/survey/wizard/survey_answer.py:758
+#: code:addons/survey/wizard/survey_answer.py:787
+#: code:addons/survey/wizard/survey_answer.py:792
+#: code:addons/survey/wizard/survey_answer.py:800
+#: code:addons/survey/wizard/survey_answer.py:811
+#: code:addons/survey/wizard/survey_answer.py:820
+#: code:addons/survey/wizard/survey_answer.py:825
+#: code:addons/survey/wizard/survey_answer.py:899
+#: code:addons/survey/wizard/survey_answer.py:935
+#: code:addons/survey/wizard/survey_answer.py:953
+#: code:addons/survey/wizard/survey_answer.py:981
+#: code:addons/survey/wizard/survey_answer.py:984
+#: code:addons/survey/wizard/survey_answer.py:987
+#: code:addons/survey/wizard/survey_answer.py:999
+#: code:addons/survey/wizard/survey_answer.py:1006
+#: code:addons/survey/wizard/survey_answer.py:1009
 #: code:addons/survey/wizard/survey_selection.py:134
 #: code:addons/survey/wizard/survey_selection.py:138
 #: code:addons/survey/wizard/survey_send_invitation.py:74
@@ -723,8 +723,8 @@ msgid "You must enter one or more column heading."
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:759
-#: code:addons/survey/wizard/survey_answer.py:954
+#: code:addons/survey/wizard/survey_answer.py:758
+#: code:addons/survey/wizard/survey_answer.py:953
 #, python-format
 msgid "Please enter an integer value"
 msgstr ""
@@ -749,8 +749,9 @@ msgid ""
 msgstr ""
 
 #. module: survey
+#: selection:survey.request,state:0
 #: view:survey.request:0
-msgid "Watting Answer"
+msgid "Waiting Answer"
 msgstr ""
 
 #. module: survey
@@ -1090,12 +1091,6 @@ msgstr ""
 msgid "Validation"
 msgstr ""
 
-#. module: survey
-#: view:survey.request:0
-#: selection:survey.request,state:0
-msgid "Waiting Answer"
-msgstr ""
-
 #. module: survey
 #: selection:survey.question,comment_valid_type:0
 #: selection:survey.question,validation_type:0
@@ -1375,7 +1370,7 @@ msgid "Answered"
 msgstr "Odgovoren"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:433
+#: code:addons/survey/wizard/survey_answer.py:432
 #, python-format
 msgid "Complete Survey Answer"
 msgstr ""
@@ -1402,7 +1397,7 @@ msgid "Send Invitation"
 msgstr "Poslan poziv"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:793
+#: code:addons/survey/wizard/survey_answer.py:792
 #, python-format
 msgid "You cannot select the same answer more than one time"
 msgstr ""
@@ -1518,7 +1513,7 @@ msgid ""
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:985
+#: code:addons/survey/wizard/survey_answer.py:984
 #, python-format
 msgid "You cannot select same answer more than one time'"
 msgstr ""

addons/survey/i18n/hu.po

@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-10-19 05:37+0000\n"
-"X-Generator: Launchpad (build 14157)\n"
+"X-Launchpad-Export-Date: 2011-10-22 04:59+0000\n"
+"X-Generator: Launchpad (build 14170)\n"
 
 #. module: survey
 #: view:survey.print:0
@@ -358,24 +358,24 @@ msgstr "Megjegyzésmező típusa"
 #: code:addons/survey/survey.py:642
 #: code:addons/survey/wizard/survey_answer.py:124
 #: code:addons/survey/wizard/survey_answer.py:131
-#: code:addons/survey/wizard/survey_answer.py:700
-#: code:addons/survey/wizard/survey_answer.py:739
-#: code:addons/survey/wizard/survey_answer.py:759
-#: code:addons/survey/wizard/survey_answer.py:788
-#: code:addons/survey/wizard/survey_answer.py:793
-#: code:addons/survey/wizard/survey_answer.py:801
-#: code:addons/survey/wizard/survey_answer.py:812
-#: code:addons/survey/wizard/survey_answer.py:821
-#: code:addons/survey/wizard/survey_answer.py:826
-#: code:addons/survey/wizard/survey_answer.py:900
-#: code:addons/survey/wizard/survey_answer.py:936
-#: code:addons/survey/wizard/survey_answer.py:954
-#: code:addons/survey/wizard/survey_answer.py:982
-#: code:addons/survey/wizard/survey_answer.py:985
-#: code:addons/survey/wizard/survey_answer.py:988
-#: code:addons/survey/wizard/survey_answer.py:1000
-#: code:addons/survey/wizard/survey_answer.py:1007
-#: code:addons/survey/wizard/survey_answer.py:1010
+#: code:addons/survey/wizard/survey_answer.py:699
+#: code:addons/survey/wizard/survey_answer.py:738
+#: code:addons/survey/wizard/survey_answer.py:758
+#: code:addons/survey/wizard/survey_answer.py:787
+#: code:addons/survey/wizard/survey_answer.py:792
+#: code:addons/survey/wizard/survey_answer.py:800
+#: code:addons/survey/wizard/survey_answer.py:811
+#: code:addons/survey/wizard/survey_answer.py:820
+#: code:addons/survey/wizard/survey_answer.py:825
+#: code:addons/survey/wizard/survey_answer.py:899
+#: code:addons/survey/wizard/survey_answer.py:935
+#: code:addons/survey/wizard/survey_answer.py:953
+#: code:addons/survey/wizard/survey_answer.py:981
+#: code:addons/survey/wizard/survey_answer.py:984
+#: code:addons/survey/wizard/survey_answer.py:987
+#: code:addons/survey/wizard/survey_answer.py:999
+#: code:addons/survey/wizard/survey_answer.py:1006
+#: code:addons/survey/wizard/survey_answer.py:1009
 #: code:addons/survey/wizard/survey_selection.py:134
 #: code:addons/survey/wizard/survey_selection.py:138
 #: code:addons/survey/wizard/survey_send_invitation.py:74
@@ -723,8 +723,8 @@ msgid "You must enter one or more column heading."
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:759
-#: code:addons/survey/wizard/survey_answer.py:954
+#: code:addons/survey/wizard/survey_answer.py:758
+#: code:addons/survey/wizard/survey_answer.py:953
 #, python-format
 msgid "Please enter an integer value"
 msgstr "Adjon meg egy egész számot"
@@ -749,8 +749,9 @@ msgid ""
 msgstr ""
 
 #. module: survey
+#: selection:survey.request,state:0
 #: view:survey.request:0
-msgid "Watting Answer"
+msgid "Waiting Answer"
 msgstr "Válaszra várva"
 
 #. module: survey
@@ -1090,12 +1091,6 @@ msgstr "Válasz típusa"
 msgid "Validation"
 msgstr "Érvényesítés"
 
-#. module: survey
-#: view:survey.request:0
-#: selection:survey.request,state:0
-msgid "Waiting Answer"
-msgstr "Válaszra várva"
-
 #. module: survey
 #: selection:survey.question,comment_valid_type:0
 #: selection:survey.question,validation_type:0
@@ -1375,7 +1370,7 @@ msgid "Answered"
 msgstr "Megválaszolt"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:433
+#: code:addons/survey/wizard/survey_answer.py:432
 #, python-format
 msgid "Complete Survey Answer"
 msgstr ""
@@ -1402,7 +1397,7 @@ msgid "Send Invitation"
 msgstr "Meghívás küldése"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:793
+#: code:addons/survey/wizard/survey_answer.py:792
 #, python-format
 msgid "You cannot select the same answer more than one time"
 msgstr ""
@@ -1518,7 +1513,7 @@ msgid ""
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:985
+#: code:addons/survey/wizard/survey_answer.py:984
 #, python-format
 msgid "You cannot select same answer more than one time'"
 msgstr ""
@@ -1711,3 +1706,6 @@ msgstr "Maximum válasz felhasználónként"
 #: field:survey.name.wiz,page:0
 msgid "Page Position"
 msgstr "Oldal pozíció"
+
+#~ msgid "Watting Answer"
+#~ msgstr "Válaszra várva"

addons/survey/i18n/it.po

@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-10-19 05:37+0000\n"
-"X-Generator: Launchpad (build 14157)\n"
+"X-Launchpad-Export-Date: 2011-10-22 04:59+0000\n"
+"X-Generator: Launchpad (build 14170)\n"
 
 #. module: survey
 #: view:survey.print:0
@@ -358,24 +358,24 @@ msgstr "Tipo di campo commento"
 #: code:addons/survey/survey.py:642
 #: code:addons/survey/wizard/survey_answer.py:124
 #: code:addons/survey/wizard/survey_answer.py:131
-#: code:addons/survey/wizard/survey_answer.py:700
-#: code:addons/survey/wizard/survey_answer.py:739
-#: code:addons/survey/wizard/survey_answer.py:759
-#: code:addons/survey/wizard/survey_answer.py:788
-#: code:addons/survey/wizard/survey_answer.py:793
-#: code:addons/survey/wizard/survey_answer.py:801
-#: code:addons/survey/wizard/survey_answer.py:812
-#: code:addons/survey/wizard/survey_answer.py:821
-#: code:addons/survey/wizard/survey_answer.py:826
-#: code:addons/survey/wizard/survey_answer.py:900
-#: code:addons/survey/wizard/survey_answer.py:936
-#: code:addons/survey/wizard/survey_answer.py:954
-#: code:addons/survey/wizard/survey_answer.py:982
-#: code:addons/survey/wizard/survey_answer.py:985
-#: code:addons/survey/wizard/survey_answer.py:988
-#: code:addons/survey/wizard/survey_answer.py:1000
-#: code:addons/survey/wizard/survey_answer.py:1007
-#: code:addons/survey/wizard/survey_answer.py:1010
+#: code:addons/survey/wizard/survey_answer.py:699
+#: code:addons/survey/wizard/survey_answer.py:738
+#: code:addons/survey/wizard/survey_answer.py:758
+#: code:addons/survey/wizard/survey_answer.py:787
+#: code:addons/survey/wizard/survey_answer.py:792
+#: code:addons/survey/wizard/survey_answer.py:800
+#: code:addons/survey/wizard/survey_answer.py:811
+#: code:addons/survey/wizard/survey_answer.py:820
+#: code:addons/survey/wizard/survey_answer.py:825
+#: code:addons/survey/wizard/survey_answer.py:899
+#: code:addons/survey/wizard/survey_answer.py:935
+#: code:addons/survey/wizard/survey_answer.py:953
+#: code:addons/survey/wizard/survey_answer.py:981
+#: code:addons/survey/wizard/survey_answer.py:984
+#: code:addons/survey/wizard/survey_answer.py:987
+#: code:addons/survey/wizard/survey_answer.py:999
+#: code:addons/survey/wizard/survey_answer.py:1006
+#: code:addons/survey/wizard/survey_answer.py:1009
 #: code:addons/survey/wizard/survey_selection.py:134
 #: code:addons/survey/wizard/survey_selection.py:138
 #: code:addons/survey/wizard/survey_send_invitation.py:74
@@ -722,8 +722,8 @@ msgid "You must enter one or more column heading."
 msgstr "E' necessario inserire una o più colonne intestazione."
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:759
-#: code:addons/survey/wizard/survey_answer.py:954
+#: code:addons/survey/wizard/survey_answer.py:758
+#: code:addons/survey/wizard/survey_answer.py:953
 #, python-format
 msgid "Please enter an integer value"
 msgstr "Inserire un numero intero"
@@ -748,9 +748,10 @@ msgid ""
 msgstr ""
 
 #. module: survey
+#: selection:survey.request,state:0
 #: view:survey.request:0
-msgid "Watting Answer"
-msgstr ""
+msgid "Waiting Answer"
+msgstr "In attesa di risposta"
 
 #. module: survey
 #: view:survey:0
@@ -1091,12 +1092,6 @@ msgstr "Tipo risposta"
 msgid "Validation"
 msgstr "Convalida"
 
-#. module: survey
-#: view:survey.request:0
-#: selection:survey.request,state:0
-msgid "Waiting Answer"
-msgstr "In attesa di risposta"
-
 #. module: survey
 #: selection:survey.question,comment_valid_type:0
 #: selection:survey.question,validation_type:0
@@ -1376,7 +1371,7 @@ msgid "Answered"
 msgstr "Risposto"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:433
+#: code:addons/survey/wizard/survey_answer.py:432
 #, python-format
 msgid "Complete Survey Answer"
 msgstr ""
@@ -1403,7 +1398,7 @@ msgid "Send Invitation"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:793
+#: code:addons/survey/wizard/survey_answer.py:792
 #, python-format
 msgid "You cannot select the same answer more than one time"
 msgstr ""
@@ -1519,7 +1514,7 @@ msgid ""
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:985
+#: code:addons/survey/wizard/survey_answer.py:984
 #, python-format
 msgid "You cannot select same answer more than one time'"
 msgstr ""

addons/survey/i18n/mn.po

@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-10-19 05:37+0000\n"
-"X-Generator: Launchpad (build 14157)\n"
+"X-Launchpad-Export-Date: 2011-10-22 04:59+0000\n"
+"X-Generator: Launchpad (build 14170)\n"
 
 #. module: survey
 #: view:survey.print:0
@@ -358,24 +358,24 @@ msgstr "Тайлбар талбарын төрөл"
 #: code:addons/survey/survey.py:642
 #: code:addons/survey/wizard/survey_answer.py:124
 #: code:addons/survey/wizard/survey_answer.py:131
-#: code:addons/survey/wizard/survey_answer.py:700
-#: code:addons/survey/wizard/survey_answer.py:739
-#: code:addons/survey/wizard/survey_answer.py:759
-#: code:addons/survey/wizard/survey_answer.py:788
-#: code:addons/survey/wizard/survey_answer.py:793
-#: code:addons/survey/wizard/survey_answer.py:801
-#: code:addons/survey/wizard/survey_answer.py:812
-#: code:addons/survey/wizard/survey_answer.py:821
-#: code:addons/survey/wizard/survey_answer.py:826
-#: code:addons/survey/wizard/survey_answer.py:900
-#: code:addons/survey/wizard/survey_answer.py:936
-#: code:addons/survey/wizard/survey_answer.py:954
-#: code:addons/survey/wizard/survey_answer.py:982
-#: code:addons/survey/wizard/survey_answer.py:985
-#: code:addons/survey/wizard/survey_answer.py:988
-#: code:addons/survey/wizard/survey_answer.py:1000
-#: code:addons/survey/wizard/survey_answer.py:1007
-#: code:addons/survey/wizard/survey_answer.py:1010
+#: code:addons/survey/wizard/survey_answer.py:699
+#: code:addons/survey/wizard/survey_answer.py:738
+#: code:addons/survey/wizard/survey_answer.py:758
+#: code:addons/survey/wizard/survey_answer.py:787
+#: code:addons/survey/wizard/survey_answer.py:792
+#: code:addons/survey/wizard/survey_answer.py:800
+#: code:addons/survey/wizard/survey_answer.py:811
+#: code:addons/survey/wizard/survey_answer.py:820
+#: code:addons/survey/wizard/survey_answer.py:825
+#: code:addons/survey/wizard/survey_answer.py:899
+#: code:addons/survey/wizard/survey_answer.py:935
+#: code:addons/survey/wizard/survey_answer.py:953
+#: code:addons/survey/wizard/survey_answer.py:981
+#: code:addons/survey/wizard/survey_answer.py:984
+#: code:addons/survey/wizard/survey_answer.py:987
+#: code:addons/survey/wizard/survey_answer.py:999
+#: code:addons/survey/wizard/survey_answer.py:1006
+#: code:addons/survey/wizard/survey_answer.py:1009
 #: code:addons/survey/wizard/survey_selection.py:134
 #: code:addons/survey/wizard/survey_selection.py:138
 #: code:addons/survey/wizard/survey_send_invitation.py:74
@@ -722,8 +722,8 @@ msgid "You must enter one or more column heading."
 msgstr "Та нэгээс олон баганад гарчиг оруулах ёстой"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:759
-#: code:addons/survey/wizard/survey_answer.py:954
+#: code:addons/survey/wizard/survey_answer.py:758
+#: code:addons/survey/wizard/survey_answer.py:953
 #, python-format
 msgid "Please enter an integer value"
 msgstr ""
@@ -748,9 +748,10 @@ msgid ""
 msgstr ""
 
 #. module: survey
+#: selection:survey.request,state:0
 #: view:survey.request:0
-msgid "Watting Answer"
-msgstr ""
+msgid "Waiting Answer"
+msgstr "Хариулт хүлээх"
 
 #. module: survey
 #: view:survey:0
@@ -1089,12 +1090,6 @@ msgstr "Хариултын төрөл"
 msgid "Validation"
 msgstr "Батлагдсан"
 
-#. module: survey
-#: view:survey.request:0
-#: selection:survey.request,state:0
-msgid "Waiting Answer"
-msgstr "Хариулт хүлээх"
-
 #. module: survey
 #: selection:survey.question,comment_valid_type:0
 #: selection:survey.question,validation_type:0
@@ -1374,7 +1369,7 @@ msgid "Answered"
 msgstr "Хариулсан"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:433
+#: code:addons/survey/wizard/survey_answer.py:432
 #, python-format
 msgid "Complete Survey Answer"
 msgstr ""
@@ -1401,7 +1396,7 @@ msgid "Send Invitation"
 msgstr "Урилга илгээх"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:793
+#: code:addons/survey/wizard/survey_answer.py:792
 #, python-format
 msgid "You cannot select the same answer more than one time"
 msgstr ""
@@ -1517,7 +1512,7 @@ msgid ""
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:985
+#: code:addons/survey/wizard/survey_answer.py:984
 #, python-format
 msgid "You cannot select same answer more than one time'"
 msgstr ""

addons/survey/i18n/nl.po

@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-10-19 05:37+0000\n"
-"X-Generator: Launchpad (build 14157)\n"
+"X-Launchpad-Export-Date: 2011-10-22 04:59+0000\n"
+"X-Generator: Launchpad (build 14170)\n"
 
 #. module: survey
 #: view:survey.print:0
@@ -367,24 +367,24 @@ msgstr "Opmerking veldsoort"
 #: code:addons/survey/survey.py:642
 #: code:addons/survey/wizard/survey_answer.py:124
 #: code:addons/survey/wizard/survey_answer.py:131
-#: code:addons/survey/wizard/survey_answer.py:700
-#: code:addons/survey/wizard/survey_answer.py:739
-#: code:addons/survey/wizard/survey_answer.py:759
-#: code:addons/survey/wizard/survey_answer.py:788
-#: code:addons/survey/wizard/survey_answer.py:793
-#: code:addons/survey/wizard/survey_answer.py:801
-#: code:addons/survey/wizard/survey_answer.py:812
-#: code:addons/survey/wizard/survey_answer.py:821
-#: code:addons/survey/wizard/survey_answer.py:826
-#: code:addons/survey/wizard/survey_answer.py:900
-#: code:addons/survey/wizard/survey_answer.py:936
-#: code:addons/survey/wizard/survey_answer.py:954
-#: code:addons/survey/wizard/survey_answer.py:982
-#: code:addons/survey/wizard/survey_answer.py:985
-#: code:addons/survey/wizard/survey_answer.py:988
-#: code:addons/survey/wizard/survey_answer.py:1000
-#: code:addons/survey/wizard/survey_answer.py:1007
-#: code:addons/survey/wizard/survey_answer.py:1010
+#: code:addons/survey/wizard/survey_answer.py:699
+#: code:addons/survey/wizard/survey_answer.py:738
+#: code:addons/survey/wizard/survey_answer.py:758
+#: code:addons/survey/wizard/survey_answer.py:787
+#: code:addons/survey/wizard/survey_answer.py:792
+#: code:addons/survey/wizard/survey_answer.py:800
+#: code:addons/survey/wizard/survey_answer.py:811
+#: code:addons/survey/wizard/survey_answer.py:820
+#: code:addons/survey/wizard/survey_answer.py:825
+#: code:addons/survey/wizard/survey_answer.py:899
+#: code:addons/survey/wizard/survey_answer.py:935
+#: code:addons/survey/wizard/survey_answer.py:953
+#: code:addons/survey/wizard/survey_answer.py:981
+#: code:addons/survey/wizard/survey_answer.py:984
+#: code:addons/survey/wizard/survey_answer.py:987
+#: code:addons/survey/wizard/survey_answer.py:999
+#: code:addons/survey/wizard/survey_answer.py:1006
+#: code:addons/survey/wizard/survey_answer.py:1009
 #: code:addons/survey/wizard/survey_selection.py:134
 #: code:addons/survey/wizard/survey_selection.py:138
 #: code:addons/survey/wizard/survey_send_invitation.py:74
@@ -748,8 +748,8 @@ msgid "You must enter one or more column heading."
 msgstr "U moet één of meer kolomkoppen invoeren."
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:759
-#: code:addons/survey/wizard/survey_answer.py:954
+#: code:addons/survey/wizard/survey_answer.py:758
+#: code:addons/survey/wizard/survey_answer.py:953
 #, python-format
 msgid "Please enter an integer value"
 msgstr "Vul aub een heel getal in"
@@ -776,8 +776,9 @@ msgstr ""
 "Gebruik aub een aantal dat kleiner is dan %d."
 
 #. module: survey
+#: selection:survey.request,state:0
 #: view:survey.request:0
-msgid "Watting Answer"
+msgid "Waiting Answer"
 msgstr "Wacht op antwoord"
 
 #. module: survey
@@ -1121,12 +1122,6 @@ msgstr "Antwoordsoort"
 msgid "Validation"
 msgstr "Validatie"
 
-#. module: survey
-#: view:survey.request:0
-#: selection:survey.request,state:0
-msgid "Waiting Answer"
-msgstr "Wacht op antwoord"
-
 #. module: survey
 #: selection:survey.question,comment_valid_type:0
 #: selection:survey.question,validation_type:0
@@ -1410,7 +1405,7 @@ msgid "Answered"
 msgstr "Beantwoord"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:433
+#: code:addons/survey/wizard/survey_answer.py:432
 #, python-format
 msgid "Complete Survey Answer"
 msgstr "Volledig enquête antwoord"
@@ -1437,7 +1432,7 @@ msgid "Send Invitation"
 msgstr "Uitnodiging versturen"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:793
+#: code:addons/survey/wizard/survey_answer.py:792
 #, python-format
 msgid "You cannot select the same answer more than one time"
 msgstr "U kunt hetzelfde antwoord niet meer dan één keer selecteren"
@@ -1557,7 +1552,7 @@ msgstr ""
 "aub een aantal dat kleiner is dan %d."
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:985
+#: code:addons/survey/wizard/survey_answer.py:984
 #, python-format
 msgid "You cannot select same answer more than one time'"
 msgstr "U kunt hetzelfde antwoord niet meer dan één keer selecteren"
@@ -1756,3 +1751,6 @@ msgstr "Pagina positie"
 
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Ongeldige modelnaam in de actie definitie."
+
+#~ msgid "Watting Answer"
+#~ msgstr "Wacht op antwoord"

addons/survey/i18n/pl.po

@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-10-19 05:37+0000\n"
-"X-Generator: Launchpad (build 14157)\n"
+"X-Launchpad-Export-Date: 2011-10-22 04:59+0000\n"
+"X-Generator: Launchpad (build 14170)\n"
 
 #. module: survey
 #: view:survey.print:0
@@ -358,24 +358,24 @@ msgstr ""
 #: code:addons/survey/survey.py:642
 #: code:addons/survey/wizard/survey_answer.py:124
 #: code:addons/survey/wizard/survey_answer.py:131
-#: code:addons/survey/wizard/survey_answer.py:700
-#: code:addons/survey/wizard/survey_answer.py:739
-#: code:addons/survey/wizard/survey_answer.py:759
-#: code:addons/survey/wizard/survey_answer.py:788
-#: code:addons/survey/wizard/survey_answer.py:793
-#: code:addons/survey/wizard/survey_answer.py:801
-#: code:addons/survey/wizard/survey_answer.py:812
-#: code:addons/survey/wizard/survey_answer.py:821
-#: code:addons/survey/wizard/survey_answer.py:826
-#: code:addons/survey/wizard/survey_answer.py:900
-#: code:addons/survey/wizard/survey_answer.py:936
-#: code:addons/survey/wizard/survey_answer.py:954
-#: code:addons/survey/wizard/survey_answer.py:982
-#: code:addons/survey/wizard/survey_answer.py:985
-#: code:addons/survey/wizard/survey_answer.py:988
-#: code:addons/survey/wizard/survey_answer.py:1000
-#: code:addons/survey/wizard/survey_answer.py:1007
-#: code:addons/survey/wizard/survey_answer.py:1010
+#: code:addons/survey/wizard/survey_answer.py:699
+#: code:addons/survey/wizard/survey_answer.py:738
+#: code:addons/survey/wizard/survey_answer.py:758
+#: code:addons/survey/wizard/survey_answer.py:787
+#: code:addons/survey/wizard/survey_answer.py:792
+#: code:addons/survey/wizard/survey_answer.py:800
+#: code:addons/survey/wizard/survey_answer.py:811
+#: code:addons/survey/wizard/survey_answer.py:820
+#: code:addons/survey/wizard/survey_answer.py:825
+#: code:addons/survey/wizard/survey_answer.py:899
+#: code:addons/survey/wizard/survey_answer.py:935
+#: code:addons/survey/wizard/survey_answer.py:953
+#: code:addons/survey/wizard/survey_answer.py:981
+#: code:addons/survey/wizard/survey_answer.py:984
+#: code:addons/survey/wizard/survey_answer.py:987
+#: code:addons/survey/wizard/survey_answer.py:999
+#: code:addons/survey/wizard/survey_answer.py:1006
+#: code:addons/survey/wizard/survey_answer.py:1009
 #: code:addons/survey/wizard/survey_selection.py:134
 #: code:addons/survey/wizard/survey_selection.py:138
 #: code:addons/survey/wizard/survey_send_invitation.py:74
@@ -722,8 +722,8 @@ msgid "You must enter one or more column heading."
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:759
-#: code:addons/survey/wizard/survey_answer.py:954
+#: code:addons/survey/wizard/survey_answer.py:758
+#: code:addons/survey/wizard/survey_answer.py:953
 #, python-format
 msgid "Please enter an integer value"
 msgstr ""
@@ -748,8 +748,9 @@ msgid ""
 msgstr ""
 
 #. module: survey
+#: selection:survey.request,state:0
 #: view:survey.request:0
-msgid "Watting Answer"
+msgid "Waiting Answer"
 msgstr ""
 
 #. module: survey
@@ -1089,12 +1090,6 @@ msgstr ""
 msgid "Validation"
 msgstr ""
 
-#. module: survey
-#: view:survey.request:0
-#: selection:survey.request,state:0
-msgid "Waiting Answer"
-msgstr ""
-
 #. module: survey
 #: selection:survey.question,comment_valid_type:0
 #: selection:survey.question,validation_type:0
@@ -1374,7 +1369,7 @@ msgid "Answered"
 msgstr "Z odpowiedzią"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:433
+#: code:addons/survey/wizard/survey_answer.py:432
 #, python-format
 msgid "Complete Survey Answer"
 msgstr ""
@@ -1401,7 +1396,7 @@ msgid "Send Invitation"
 msgstr "Wyślij zaproszenie"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:793
+#: code:addons/survey/wizard/survey_answer.py:792
 #, python-format
 msgid "You cannot select the same answer more than one time"
 msgstr ""
@@ -1517,7 +1512,7 @@ msgid ""
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:985
+#: code:addons/survey/wizard/survey_answer.py:984
 #, python-format
 msgid "You cannot select same answer more than one time'"
 msgstr ""

addons/survey/i18n/pt.po

@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-10-19 05:38+0000\n"
-"X-Generator: Launchpad (build 14157)\n"
+"X-Launchpad-Export-Date: 2011-10-22 05:00+0000\n"
+"X-Generator: Launchpad (build 14170)\n"
 
 #. module: survey
 #: view:survey.print:0
@@ -364,24 +364,24 @@ msgstr ""
 #: code:addons/survey/survey.py:642
 #: code:addons/survey/wizard/survey_answer.py:124
 #: code:addons/survey/wizard/survey_answer.py:131
-#: code:addons/survey/wizard/survey_answer.py:700
-#: code:addons/survey/wizard/survey_answer.py:739
-#: code:addons/survey/wizard/survey_answer.py:759
-#: code:addons/survey/wizard/survey_answer.py:788
-#: code:addons/survey/wizard/survey_answer.py:793
-#: code:addons/survey/wizard/survey_answer.py:801
-#: code:addons/survey/wizard/survey_answer.py:812
-#: code:addons/survey/wizard/survey_answer.py:821
-#: code:addons/survey/wizard/survey_answer.py:826
-#: code:addons/survey/wizard/survey_answer.py:900
-#: code:addons/survey/wizard/survey_answer.py:936
-#: code:addons/survey/wizard/survey_answer.py:954
-#: code:addons/survey/wizard/survey_answer.py:982
-#: code:addons/survey/wizard/survey_answer.py:985
-#: code:addons/survey/wizard/survey_answer.py:988
-#: code:addons/survey/wizard/survey_answer.py:1000
-#: code:addons/survey/wizard/survey_answer.py:1007
-#: code:addons/survey/wizard/survey_answer.py:1010
+#: code:addons/survey/wizard/survey_answer.py:699
+#: code:addons/survey/wizard/survey_answer.py:738
+#: code:addons/survey/wizard/survey_answer.py:758
+#: code:addons/survey/wizard/survey_answer.py:787
+#: code:addons/survey/wizard/survey_answer.py:792
+#: code:addons/survey/wizard/survey_answer.py:800
+#: code:addons/survey/wizard/survey_answer.py:811
+#: code:addons/survey/wizard/survey_answer.py:820
+#: code:addons/survey/wizard/survey_answer.py:825
+#: code:addons/survey/wizard/survey_answer.py:899
+#: code:addons/survey/wizard/survey_answer.py:935
+#: code:addons/survey/wizard/survey_answer.py:953
+#: code:addons/survey/wizard/survey_answer.py:981
+#: code:addons/survey/wizard/survey_answer.py:984
+#: code:addons/survey/wizard/survey_answer.py:987
+#: code:addons/survey/wizard/survey_answer.py:999
+#: code:addons/survey/wizard/survey_answer.py:1006
+#: code:addons/survey/wizard/survey_answer.py:1009
 #: code:addons/survey/wizard/survey_selection.py:134
 #: code:addons/survey/wizard/survey_selection.py:138
 #: code:addons/survey/wizard/survey_send_invitation.py:74
@@ -730,8 +730,8 @@ msgid "You must enter one or more column heading."
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:759
-#: code:addons/survey/wizard/survey_answer.py:954
+#: code:addons/survey/wizard/survey_answer.py:758
+#: code:addons/survey/wizard/survey_answer.py:953
 #, python-format
 msgid "Please enter an integer value"
 msgstr "Por favor, indique um número inteiro"
@@ -756,8 +756,9 @@ msgid ""
 msgstr ""
 
 #. module: survey
+#: selection:survey.request,state:0
 #: view:survey.request:0
-msgid "Watting Answer"
+msgid "Waiting Answer"
 msgstr "Aguardando resposta"
 
 #. module: survey
@@ -1099,12 +1100,6 @@ msgstr "Tipo de resposta"
 msgid "Validation"
 msgstr "Validação"
 
-#. module: survey
-#: view:survey.request:0
-#: selection:survey.request,state:0
-msgid "Waiting Answer"
-msgstr "Aguardando resposta"
-
 #. module: survey
 #: selection:survey.question,comment_valid_type:0
 #: selection:survey.question,validation_type:0
@@ -1385,7 +1380,7 @@ msgid "Answered"
 msgstr "Respondido"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:433
+#: code:addons/survey/wizard/survey_answer.py:432
 #, python-format
 msgid "Complete Survey Answer"
 msgstr ""
@@ -1412,7 +1407,7 @@ msgid "Send Invitation"
 msgstr "Enviar Convite"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:793
+#: code:addons/survey/wizard/survey_answer.py:792
 #, python-format
 msgid "You cannot select the same answer more than one time"
 msgstr ""
@@ -1528,7 +1523,7 @@ msgid ""
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:985
+#: code:addons/survey/wizard/survey_answer.py:984
 #, python-format
 msgid "You cannot select same answer more than one time'"
 msgstr ""
@@ -1880,3 +1875,6 @@ msgstr "Posição da Página"
 
 #~ msgid "Response Count"
 #~ msgstr "Contagem da Resposta"
+
+#~ msgid "Watting Answer"
+#~ msgstr "Aguardando resposta"

addons/survey/i18n/pt_BR.po

@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-10-19 05:38+0000\n"
-"X-Generator: Launchpad (build 14157)\n"
+"X-Launchpad-Export-Date: 2011-10-22 05:00+0000\n"
+"X-Generator: Launchpad (build 14170)\n"
 
 #. module: survey
 #: view:survey.print:0
@@ -360,24 +360,24 @@ msgstr "Tipo do Campo de Comentário"
 #: code:addons/survey/survey.py:642
 #: code:addons/survey/wizard/survey_answer.py:124
 #: code:addons/survey/wizard/survey_answer.py:131
-#: code:addons/survey/wizard/survey_answer.py:700
-#: code:addons/survey/wizard/survey_answer.py:739
-#: code:addons/survey/wizard/survey_answer.py:759
-#: code:addons/survey/wizard/survey_answer.py:788
-#: code:addons/survey/wizard/survey_answer.py:793
-#: code:addons/survey/wizard/survey_answer.py:801
-#: code:addons/survey/wizard/survey_answer.py:812
-#: code:addons/survey/wizard/survey_answer.py:821
-#: code:addons/survey/wizard/survey_answer.py:826
-#: code:addons/survey/wizard/survey_answer.py:900
-#: code:addons/survey/wizard/survey_answer.py:936
-#: code:addons/survey/wizard/survey_answer.py:954
-#: code:addons/survey/wizard/survey_answer.py:982
-#: code:addons/survey/wizard/survey_answer.py:985
-#: code:addons/survey/wizard/survey_answer.py:988
-#: code:addons/survey/wizard/survey_answer.py:1000
-#: code:addons/survey/wizard/survey_answer.py:1007
-#: code:addons/survey/wizard/survey_answer.py:1010
+#: code:addons/survey/wizard/survey_answer.py:699
+#: code:addons/survey/wizard/survey_answer.py:738
+#: code:addons/survey/wizard/survey_answer.py:758
+#: code:addons/survey/wizard/survey_answer.py:787
+#: code:addons/survey/wizard/survey_answer.py:792
+#: code:addons/survey/wizard/survey_answer.py:800
+#: code:addons/survey/wizard/survey_answer.py:811
+#: code:addons/survey/wizard/survey_answer.py:820
+#: code:addons/survey/wizard/survey_answer.py:825
+#: code:addons/survey/wizard/survey_answer.py:899
+#: code:addons/survey/wizard/survey_answer.py:935
+#: code:addons/survey/wizard/survey_answer.py:953
+#: code:addons/survey/wizard/survey_answer.py:981
+#: code:addons/survey/wizard/survey_answer.py:984
+#: code:addons/survey/wizard/survey_answer.py:987
+#: code:addons/survey/wizard/survey_answer.py:999
+#: code:addons/survey/wizard/survey_answer.py:1006
+#: code:addons/survey/wizard/survey_answer.py:1009
 #: code:addons/survey/wizard/survey_selection.py:134
 #: code:addons/survey/wizard/survey_selection.py:138
 #: code:addons/survey/wizard/survey_send_invitation.py:74
@@ -726,8 +726,8 @@ msgid "You must enter one or more column heading."
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:759
-#: code:addons/survey/wizard/survey_answer.py:954
+#: code:addons/survey/wizard/survey_answer.py:758
+#: code:addons/survey/wizard/survey_answer.py:953
 #, python-format
 msgid "Please enter an integer value"
 msgstr "Digite um valor inteiro"
@@ -752,8 +752,9 @@ msgid ""
 msgstr ""
 
 #. module: survey
+#: selection:survey.request,state:0
 #: view:survey.request:0
-msgid "Watting Answer"
+msgid "Waiting Answer"
 msgstr "Aguardando Resposta"
 
 #. module: survey
@@ -1093,12 +1094,6 @@ msgstr "Tipo de Resposta"
 msgid "Validation"
 msgstr "Validação"
 
-#. module: survey
-#: view:survey.request:0
-#: selection:survey.request,state:0
-msgid "Waiting Answer"
-msgstr "Aguardando Resposta"
-
 #. module: survey
 #: selection:survey.question,comment_valid_type:0
 #: selection:survey.question,validation_type:0
@@ -1380,7 +1375,7 @@ msgid "Answered"
 msgstr "Respondida"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:433
+#: code:addons/survey/wizard/survey_answer.py:432
 #, python-format
 msgid "Complete Survey Answer"
 msgstr "Resposta Completa da Pesquisa"
@@ -1407,7 +1402,7 @@ msgid "Send Invitation"
 msgstr "Enviar Convite"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:793
+#: code:addons/survey/wizard/survey_answer.py:792
 #, python-format
 msgid "You cannot select the same answer more than one time"
 msgstr "Você não pode selecionar a mesma resposta mais de uma vez"
@@ -1523,7 +1518,7 @@ msgid ""
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:985
+#: code:addons/survey/wizard/survey_answer.py:984
 #, python-format
 msgid "You cannot select same answer more than one time'"
 msgstr "Você não pode selecionar a mesma resposta mais de uma vez"
@@ -1716,3 +1711,6 @@ msgstr ""
 #: field:survey.name.wiz,page:0
 msgid "Page Position"
 msgstr ""
+
+#~ msgid "Watting Answer"
+#~ msgstr "Aguardando Resposta"

addons/survey/i18n/ru.po

@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-10-19 05:38+0000\n"
-"X-Generator: Launchpad (build 14157)\n"
+"X-Launchpad-Export-Date: 2011-10-22 05:00+0000\n"
+"X-Generator: Launchpad (build 14170)\n"
 
 #. module: survey
 #: view:survey.print:0
@@ -358,24 +358,24 @@ msgstr ""
 #: code:addons/survey/survey.py:642
 #: code:addons/survey/wizard/survey_answer.py:124
 #: code:addons/survey/wizard/survey_answer.py:131
-#: code:addons/survey/wizard/survey_answer.py:700
-#: code:addons/survey/wizard/survey_answer.py:739
-#: code:addons/survey/wizard/survey_answer.py:759
-#: code:addons/survey/wizard/survey_answer.py:788
-#: code:addons/survey/wizard/survey_answer.py:793
-#: code:addons/survey/wizard/survey_answer.py:801
-#: code:addons/survey/wizard/survey_answer.py:812
-#: code:addons/survey/wizard/survey_answer.py:821
-#: code:addons/survey/wizard/survey_answer.py:826
-#: code:addons/survey/wizard/survey_answer.py:900
-#: code:addons/survey/wizard/survey_answer.py:936
-#: code:addons/survey/wizard/survey_answer.py:954
-#: code:addons/survey/wizard/survey_answer.py:982
-#: code:addons/survey/wizard/survey_answer.py:985
-#: code:addons/survey/wizard/survey_answer.py:988
-#: code:addons/survey/wizard/survey_answer.py:1000
-#: code:addons/survey/wizard/survey_answer.py:1007
-#: code:addons/survey/wizard/survey_answer.py:1010
+#: code:addons/survey/wizard/survey_answer.py:699
+#: code:addons/survey/wizard/survey_answer.py:738
+#: code:addons/survey/wizard/survey_answer.py:758
+#: code:addons/survey/wizard/survey_answer.py:787
+#: code:addons/survey/wizard/survey_answer.py:792
+#: code:addons/survey/wizard/survey_answer.py:800
+#: code:addons/survey/wizard/survey_answer.py:811
+#: code:addons/survey/wizard/survey_answer.py:820
+#: code:addons/survey/wizard/survey_answer.py:825
+#: code:addons/survey/wizard/survey_answer.py:899
+#: code:addons/survey/wizard/survey_answer.py:935
+#: code:addons/survey/wizard/survey_answer.py:953
+#: code:addons/survey/wizard/survey_answer.py:981
+#: code:addons/survey/wizard/survey_answer.py:984
+#: code:addons/survey/wizard/survey_answer.py:987
+#: code:addons/survey/wizard/survey_answer.py:999
+#: code:addons/survey/wizard/survey_answer.py:1006
+#: code:addons/survey/wizard/survey_answer.py:1009
 #: code:addons/survey/wizard/survey_selection.py:134
 #: code:addons/survey/wizard/survey_selection.py:138
 #: code:addons/survey/wizard/survey_send_invitation.py:74
@@ -722,8 +722,8 @@ msgid "You must enter one or more column heading."
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:759
-#: code:addons/survey/wizard/survey_answer.py:954
+#: code:addons/survey/wizard/survey_answer.py:758
+#: code:addons/survey/wizard/survey_answer.py:953
 #, python-format
 msgid "Please enter an integer value"
 msgstr ""
@@ -748,8 +748,9 @@ msgid ""
 msgstr ""
 
 #. module: survey
+#: selection:survey.request,state:0
 #: view:survey.request:0
-msgid "Watting Answer"
+msgid "Waiting Answer"
 msgstr ""
 
 #. module: survey
@@ -1089,12 +1090,6 @@ msgstr ""
 msgid "Validation"
 msgstr ""
 
-#. module: survey
-#: view:survey.request:0
-#: selection:survey.request,state:0
-msgid "Waiting Answer"
-msgstr ""
-
 #. module: survey
 #: selection:survey.question,comment_valid_type:0
 #: selection:survey.question,validation_type:0
@@ -1374,7 +1369,7 @@ msgid "Answered"
 msgstr "Отвечено"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:433
+#: code:addons/survey/wizard/survey_answer.py:432
 #, python-format
 msgid "Complete Survey Answer"
 msgstr ""
@@ -1401,7 +1396,7 @@ msgid "Send Invitation"
 msgstr "Отправить Приглашение"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:793
+#: code:addons/survey/wizard/survey_answer.py:792
 #, python-format
 msgid "You cannot select the same answer more than one time"
 msgstr ""
@@ -1517,7 +1512,7 @@ msgid ""
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:985
+#: code:addons/survey/wizard/survey_answer.py:984
 #, python-format
 msgid "You cannot select same answer more than one time'"
 msgstr ""

addons/survey/i18n/sl.po

@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-10-19 05:38+0000\n"
-"X-Generator: Launchpad (build 14157)\n"
+"X-Launchpad-Export-Date: 2011-10-22 05:00+0000\n"
+"X-Generator: Launchpad (build 14170)\n"
 
 #. module: survey
 #: view:survey.print:0
@@ -358,24 +358,24 @@ msgstr ""
 #: code:addons/survey/survey.py:642
 #: code:addons/survey/wizard/survey_answer.py:124
 #: code:addons/survey/wizard/survey_answer.py:131
-#: code:addons/survey/wizard/survey_answer.py:700
-#: code:addons/survey/wizard/survey_answer.py:739
-#: code:addons/survey/wizard/survey_answer.py:759
-#: code:addons/survey/wizard/survey_answer.py:788
-#: code:addons/survey/wizard/survey_answer.py:793
-#: code:addons/survey/wizard/survey_answer.py:801
-#: code:addons/survey/wizard/survey_answer.py:812
-#: code:addons/survey/wizard/survey_answer.py:821
-#: code:addons/survey/wizard/survey_answer.py:826
-#: code:addons/survey/wizard/survey_answer.py:900
-#: code:addons/survey/wizard/survey_answer.py:936
-#: code:addons/survey/wizard/survey_answer.py:954
-#: code:addons/survey/wizard/survey_answer.py:982
-#: code:addons/survey/wizard/survey_answer.py:985
-#: code:addons/survey/wizard/survey_answer.py:988
-#: code:addons/survey/wizard/survey_answer.py:1000
-#: code:addons/survey/wizard/survey_answer.py:1007
-#: code:addons/survey/wizard/survey_answer.py:1010
+#: code:addons/survey/wizard/survey_answer.py:699
+#: code:addons/survey/wizard/survey_answer.py:738
+#: code:addons/survey/wizard/survey_answer.py:758
+#: code:addons/survey/wizard/survey_answer.py:787
+#: code:addons/survey/wizard/survey_answer.py:792
+#: code:addons/survey/wizard/survey_answer.py:800
+#: code:addons/survey/wizard/survey_answer.py:811
+#: code:addons/survey/wizard/survey_answer.py:820
+#: code:addons/survey/wizard/survey_answer.py:825
+#: code:addons/survey/wizard/survey_answer.py:899
+#: code:addons/survey/wizard/survey_answer.py:935
+#: code:addons/survey/wizard/survey_answer.py:953
+#: code:addons/survey/wizard/survey_answer.py:981
+#: code:addons/survey/wizard/survey_answer.py:984
+#: code:addons/survey/wizard/survey_answer.py:987
+#: code:addons/survey/wizard/survey_answer.py:999
+#: code:addons/survey/wizard/survey_answer.py:1006
+#: code:addons/survey/wizard/survey_answer.py:1009
 #: code:addons/survey/wizard/survey_selection.py:134
 #: code:addons/survey/wizard/survey_selection.py:138
 #: code:addons/survey/wizard/survey_send_invitation.py:74
@@ -722,8 +722,8 @@ msgid "You must enter one or more column heading."
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:759
-#: code:addons/survey/wizard/survey_answer.py:954
+#: code:addons/survey/wizard/survey_answer.py:758
+#: code:addons/survey/wizard/survey_answer.py:953
 #, python-format
 msgid "Please enter an integer value"
 msgstr ""
@@ -748,8 +748,9 @@ msgid ""
 msgstr ""
 
 #. module: survey
+#: selection:survey.request,state:0
 #: view:survey.request:0
-msgid "Watting Answer"
+msgid "Waiting Answer"
 msgstr ""
 
 #. module: survey
@@ -1089,12 +1090,6 @@ msgstr ""
 msgid "Validation"
 msgstr ""
 
-#. module: survey
-#: view:survey.request:0
-#: selection:survey.request,state:0
-msgid "Waiting Answer"
-msgstr ""
-
 #. module: survey
 #: selection:survey.question,comment_valid_type:0
 #: selection:survey.question,validation_type:0
@@ -1374,7 +1369,7 @@ msgid "Answered"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:433
+#: code:addons/survey/wizard/survey_answer.py:432
 #, python-format
 msgid "Complete Survey Answer"
 msgstr ""
@@ -1401,7 +1396,7 @@ msgid "Send Invitation"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:793
+#: code:addons/survey/wizard/survey_answer.py:792
 #, python-format
 msgid "You cannot select the same answer more than one time"
 msgstr ""
@@ -1517,7 +1512,7 @@ msgid ""
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:985
+#: code:addons/survey/wizard/survey_answer.py:984
 #, python-format
 msgid "You cannot select same answer more than one time'"
 msgstr ""

addons/survey/i18n/sr.po

@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-10-19 05:38+0000\n"
-"X-Generator: Launchpad (build 14157)\n"
+"X-Launchpad-Export-Date: 2011-10-22 05:00+0000\n"
+"X-Generator: Launchpad (build 14170)\n"
 
 #. module: survey
 #: view:survey.print:0
@@ -358,24 +358,24 @@ msgstr ""
 #: code:addons/survey/survey.py:642
 #: code:addons/survey/wizard/survey_answer.py:124
 #: code:addons/survey/wizard/survey_answer.py:131
-#: code:addons/survey/wizard/survey_answer.py:700
-#: code:addons/survey/wizard/survey_answer.py:739
-#: code:addons/survey/wizard/survey_answer.py:759
-#: code:addons/survey/wizard/survey_answer.py:788
-#: code:addons/survey/wizard/survey_answer.py:793
-#: code:addons/survey/wizard/survey_answer.py:801
-#: code:addons/survey/wizard/survey_answer.py:812
-#: code:addons/survey/wizard/survey_answer.py:821
-#: code:addons/survey/wizard/survey_answer.py:826
-#: code:addons/survey/wizard/survey_answer.py:900
-#: code:addons/survey/wizard/survey_answer.py:936
-#: code:addons/survey/wizard/survey_answer.py:954
-#: code:addons/survey/wizard/survey_answer.py:982
-#: code:addons/survey/wizard/survey_answer.py:985
-#: code:addons/survey/wizard/survey_answer.py:988
-#: code:addons/survey/wizard/survey_answer.py:1000
-#: code:addons/survey/wizard/survey_answer.py:1007
-#: code:addons/survey/wizard/survey_answer.py:1010
+#: code:addons/survey/wizard/survey_answer.py:699
+#: code:addons/survey/wizard/survey_answer.py:738
+#: code:addons/survey/wizard/survey_answer.py:758
+#: code:addons/survey/wizard/survey_answer.py:787
+#: code:addons/survey/wizard/survey_answer.py:792
+#: code:addons/survey/wizard/survey_answer.py:800
+#: code:addons/survey/wizard/survey_answer.py:811
+#: code:addons/survey/wizard/survey_answer.py:820
+#: code:addons/survey/wizard/survey_answer.py:825
+#: code:addons/survey/wizard/survey_answer.py:899
+#: code:addons/survey/wizard/survey_answer.py:935
+#: code:addons/survey/wizard/survey_answer.py:953
+#: code:addons/survey/wizard/survey_answer.py:981
+#: code:addons/survey/wizard/survey_answer.py:984
+#: code:addons/survey/wizard/survey_answer.py:987
+#: code:addons/survey/wizard/survey_answer.py:999
+#: code:addons/survey/wizard/survey_answer.py:1006
+#: code:addons/survey/wizard/survey_answer.py:1009
 #: code:addons/survey/wizard/survey_selection.py:134
 #: code:addons/survey/wizard/survey_selection.py:138
 #: code:addons/survey/wizard/survey_send_invitation.py:74
@@ -722,8 +722,8 @@ msgid "You must enter one or more column heading."
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:759
-#: code:addons/survey/wizard/survey_answer.py:954
+#: code:addons/survey/wizard/survey_answer.py:758
+#: code:addons/survey/wizard/survey_answer.py:953
 #, python-format
 msgid "Please enter an integer value"
 msgstr ""
@@ -748,8 +748,9 @@ msgid ""
 msgstr ""
 
 #. module: survey
+#: selection:survey.request,state:0
 #: view:survey.request:0
-msgid "Watting Answer"
+msgid "Waiting Answer"
 msgstr ""
 
 #. module: survey
@@ -1089,12 +1090,6 @@ msgstr ""
 msgid "Validation"
 msgstr ""
 
-#. module: survey
-#: view:survey.request:0
-#: selection:survey.request,state:0
-msgid "Waiting Answer"
-msgstr ""
-
 #. module: survey
 #: selection:survey.question,comment_valid_type:0
 #: selection:survey.question,validation_type:0
@@ -1374,7 +1369,7 @@ msgid "Answered"
 msgstr "Odgovoreno"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:433
+#: code:addons/survey/wizard/survey_answer.py:432
 #, python-format
 msgid "Complete Survey Answer"
 msgstr ""
@@ -1401,7 +1396,7 @@ msgid "Send Invitation"
 msgstr "Pošalji poziv"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:793
+#: code:addons/survey/wizard/survey_answer.py:792
 #, python-format
 msgid "You cannot select the same answer more than one time"
 msgstr ""
@@ -1517,7 +1512,7 @@ msgid ""
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:985
+#: code:addons/survey/wizard/survey_answer.py:984
 #, python-format
 msgid "You cannot select same answer more than one time'"
 msgstr ""

addons/survey/i18n/sr@latin.po

@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-10-19 05:38+0000\n"
-"X-Generator: Launchpad (build 14157)\n"
+"X-Launchpad-Export-Date: 2011-10-22 05:00+0000\n"
+"X-Generator: Launchpad (build 14170)\n"
 
 #. module: survey
 #: view:survey.print:0
@@ -358,24 +358,24 @@ msgstr ""
 #: code:addons/survey/survey.py:642
 #: code:addons/survey/wizard/survey_answer.py:124
 #: code:addons/survey/wizard/survey_answer.py:131
-#: code:addons/survey/wizard/survey_answer.py:700
-#: code:addons/survey/wizard/survey_answer.py:739
-#: code:addons/survey/wizard/survey_answer.py:759
-#: code:addons/survey/wizard/survey_answer.py:788
-#: code:addons/survey/wizard/survey_answer.py:793
-#: code:addons/survey/wizard/survey_answer.py:801
-#: code:addons/survey/wizard/survey_answer.py:812
-#: code:addons/survey/wizard/survey_answer.py:821
-#: code:addons/survey/wizard/survey_answer.py:826
-#: code:addons/survey/wizard/survey_answer.py:900
-#: code:addons/survey/wizard/survey_answer.py:936
-#: code:addons/survey/wizard/survey_answer.py:954
-#: code:addons/survey/wizard/survey_answer.py:982
-#: code:addons/survey/wizard/survey_answer.py:985
-#: code:addons/survey/wizard/survey_answer.py:988
-#: code:addons/survey/wizard/survey_answer.py:1000
-#: code:addons/survey/wizard/survey_answer.py:1007
-#: code:addons/survey/wizard/survey_answer.py:1010
+#: code:addons/survey/wizard/survey_answer.py:699
+#: code:addons/survey/wizard/survey_answer.py:738
+#: code:addons/survey/wizard/survey_answer.py:758
+#: code:addons/survey/wizard/survey_answer.py:787
+#: code:addons/survey/wizard/survey_answer.py:792
+#: code:addons/survey/wizard/survey_answer.py:800
+#: code:addons/survey/wizard/survey_answer.py:811
+#: code:addons/survey/wizard/survey_answer.py:820
+#: code:addons/survey/wizard/survey_answer.py:825
+#: code:addons/survey/wizard/survey_answer.py:899
+#: code:addons/survey/wizard/survey_answer.py:935
+#: code:addons/survey/wizard/survey_answer.py:953
+#: code:addons/survey/wizard/survey_answer.py:981
+#: code:addons/survey/wizard/survey_answer.py:984
+#: code:addons/survey/wizard/survey_answer.py:987
+#: code:addons/survey/wizard/survey_answer.py:999
+#: code:addons/survey/wizard/survey_answer.py:1006
+#: code:addons/survey/wizard/survey_answer.py:1009
 #: code:addons/survey/wizard/survey_selection.py:134
 #: code:addons/survey/wizard/survey_selection.py:138
 #: code:addons/survey/wizard/survey_send_invitation.py:74
@@ -722,8 +722,8 @@ msgid "You must enter one or more column heading."
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:759
-#: code:addons/survey/wizard/survey_answer.py:954
+#: code:addons/survey/wizard/survey_answer.py:758
+#: code:addons/survey/wizard/survey_answer.py:953
 #, python-format
 msgid "Please enter an integer value"
 msgstr ""
@@ -748,8 +748,9 @@ msgid ""
 msgstr ""
 
 #. module: survey
+#: selection:survey.request,state:0
 #: view:survey.request:0
-msgid "Watting Answer"
+msgid "Waiting Answer"
 msgstr ""
 
 #. module: survey
@@ -1089,12 +1090,6 @@ msgstr ""
 msgid "Validation"
 msgstr ""
 
-#. module: survey
-#: view:survey.request:0
-#: selection:survey.request,state:0
-msgid "Waiting Answer"
-msgstr ""
-
 #. module: survey
 #: selection:survey.question,comment_valid_type:0
 #: selection:survey.question,validation_type:0
@@ -1374,7 +1369,7 @@ msgid "Answered"
 msgstr "Odgovoreno"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:433
+#: code:addons/survey/wizard/survey_answer.py:432
 #, python-format
 msgid "Complete Survey Answer"
 msgstr ""
@@ -1401,7 +1396,7 @@ msgid "Send Invitation"
 msgstr "Pošalji poziv"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:793
+#: code:addons/survey/wizard/survey_answer.py:792
 #, python-format
 msgid "You cannot select the same answer more than one time"
 msgstr ""
@@ -1517,7 +1512,7 @@ msgid ""
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:985
+#: code:addons/survey/wizard/survey_answer.py:984
 #, python-format
 msgid "You cannot select same answer more than one time'"
 msgstr ""

addons/survey/i18n/survey.pot

@@ -716,8 +716,9 @@ msgid "Maximum Required Answer you                                     entered f
 msgstr ""
 
 #. module: survey
+#: selection:survey.request,state:0
 #: view:survey.request:0
-msgid "Watting Answer"
+msgid "Waiting Answer"
 msgstr ""
 
 #. module: survey
@@ -1055,12 +1056,6 @@ msgstr ""
 msgid "Validation"
 msgstr ""
 
-#. module: survey
-#: view:survey.request:0
-#: selection:survey.request,state:0
-msgid "Waiting Answer"
-msgstr ""
-
 #. module: survey
 #: selection:survey.question,comment_valid_type:0
 #: selection:survey.question,validation_type:0

addons/survey/i18n/sv.po

@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-10-19 05:38+0000\n"
-"X-Generator: Launchpad (build 14157)\n"
+"X-Launchpad-Export-Date: 2011-10-22 05:00+0000\n"
+"X-Generator: Launchpad (build 14170)\n"
 
 #. module: survey
 #: view:survey.print:0
@@ -358,24 +358,24 @@ msgstr ""
 #: code:addons/survey/survey.py:642
 #: code:addons/survey/wizard/survey_answer.py:124
 #: code:addons/survey/wizard/survey_answer.py:131
-#: code:addons/survey/wizard/survey_answer.py:700
-#: code:addons/survey/wizard/survey_answer.py:739
-#: code:addons/survey/wizard/survey_answer.py:759
-#: code:addons/survey/wizard/survey_answer.py:788
-#: code:addons/survey/wizard/survey_answer.py:793
-#: code:addons/survey/wizard/survey_answer.py:801
-#: code:addons/survey/wizard/survey_answer.py:812
-#: code:addons/survey/wizard/survey_answer.py:821
-#: code:addons/survey/wizard/survey_answer.py:826
-#: code:addons/survey/wizard/survey_answer.py:900
-#: code:addons/survey/wizard/survey_answer.py:936
-#: code:addons/survey/wizard/survey_answer.py:954
-#: code:addons/survey/wizard/survey_answer.py:982
-#: code:addons/survey/wizard/survey_answer.py:985
-#: code:addons/survey/wizard/survey_answer.py:988
-#: code:addons/survey/wizard/survey_answer.py:1000
-#: code:addons/survey/wizard/survey_answer.py:1007
-#: code:addons/survey/wizard/survey_answer.py:1010
+#: code:addons/survey/wizard/survey_answer.py:699
+#: code:addons/survey/wizard/survey_answer.py:738
+#: code:addons/survey/wizard/survey_answer.py:758
+#: code:addons/survey/wizard/survey_answer.py:787
+#: code:addons/survey/wizard/survey_answer.py:792
+#: code:addons/survey/wizard/survey_answer.py:800
+#: code:addons/survey/wizard/survey_answer.py:811
+#: code:addons/survey/wizard/survey_answer.py:820
+#: code:addons/survey/wizard/survey_answer.py:825
+#: code:addons/survey/wizard/survey_answer.py:899
+#: code:addons/survey/wizard/survey_answer.py:935
+#: code:addons/survey/wizard/survey_answer.py:953
+#: code:addons/survey/wizard/survey_answer.py:981
+#: code:addons/survey/wizard/survey_answer.py:984
+#: code:addons/survey/wizard/survey_answer.py:987
+#: code:addons/survey/wizard/survey_answer.py:999
+#: code:addons/survey/wizard/survey_answer.py:1006
+#: code:addons/survey/wizard/survey_answer.py:1009
 #: code:addons/survey/wizard/survey_selection.py:134
 #: code:addons/survey/wizard/survey_selection.py:138
 #: code:addons/survey/wizard/survey_send_invitation.py:74
@@ -722,8 +722,8 @@ msgid "You must enter one or more column heading."
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:759
-#: code:addons/survey/wizard/survey_answer.py:954
+#: code:addons/survey/wizard/survey_answer.py:758
+#: code:addons/survey/wizard/survey_answer.py:953
 #, python-format
 msgid "Please enter an integer value"
 msgstr ""
@@ -748,8 +748,9 @@ msgid ""
 msgstr ""
 
 #. module: survey
+#: selection:survey.request,state:0
 #: view:survey.request:0
-msgid "Watting Answer"
+msgid "Waiting Answer"
 msgstr ""
 
 #. module: survey
@@ -1089,12 +1090,6 @@ msgstr ""
 msgid "Validation"
 msgstr ""
 
-#. module: survey
-#: view:survey.request:0
-#: selection:survey.request,state:0
-msgid "Waiting Answer"
-msgstr ""
-
 #. module: survey
 #: selection:survey.question,comment_valid_type:0
 #: selection:survey.question,validation_type:0
@@ -1374,7 +1369,7 @@ msgid "Answered"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:433
+#: code:addons/survey/wizard/survey_answer.py:432
 #, python-format
 msgid "Complete Survey Answer"
 msgstr ""
@@ -1401,7 +1396,7 @@ msgid "Send Invitation"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:793
+#: code:addons/survey/wizard/survey_answer.py:792
 #, python-format
 msgid "You cannot select the same answer more than one time"
 msgstr ""
@@ -1517,7 +1512,7 @@ msgid ""
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:985
+#: code:addons/survey/wizard/survey_answer.py:984
 #, python-format
 msgid "You cannot select same answer more than one time'"
 msgstr ""

addons/survey/i18n/zh_CN.po

@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-10-19 05:38+0000\n"
-"X-Generator: Launchpad (build 14157)\n"
+"X-Launchpad-Export-Date: 2011-10-22 05:00+0000\n"
+"X-Generator: Launchpad (build 14170)\n"
 
 #. module: survey
 #: view:survey.print:0
@@ -358,24 +358,24 @@ msgstr "备注自动类型"
 #: code:addons/survey/survey.py:642
 #: code:addons/survey/wizard/survey_answer.py:124
 #: code:addons/survey/wizard/survey_answer.py:131
-#: code:addons/survey/wizard/survey_answer.py:700
-#: code:addons/survey/wizard/survey_answer.py:739
-#: code:addons/survey/wizard/survey_answer.py:759
-#: code:addons/survey/wizard/survey_answer.py:788
-#: code:addons/survey/wizard/survey_answer.py:793
-#: code:addons/survey/wizard/survey_answer.py:801
-#: code:addons/survey/wizard/survey_answer.py:812
-#: code:addons/survey/wizard/survey_answer.py:821
-#: code:addons/survey/wizard/survey_answer.py:826
-#: code:addons/survey/wizard/survey_answer.py:900
-#: code:addons/survey/wizard/survey_answer.py:936
-#: code:addons/survey/wizard/survey_answer.py:954
-#: code:addons/survey/wizard/survey_answer.py:982
-#: code:addons/survey/wizard/survey_answer.py:985
-#: code:addons/survey/wizard/survey_answer.py:988
-#: code:addons/survey/wizard/survey_answer.py:1000
-#: code:addons/survey/wizard/survey_answer.py:1007
-#: code:addons/survey/wizard/survey_answer.py:1010
+#: code:addons/survey/wizard/survey_answer.py:699
+#: code:addons/survey/wizard/survey_answer.py:738
+#: code:addons/survey/wizard/survey_answer.py:758
+#: code:addons/survey/wizard/survey_answer.py:787
+#: code:addons/survey/wizard/survey_answer.py:792
+#: code:addons/survey/wizard/survey_answer.py:800
+#: code:addons/survey/wizard/survey_answer.py:811
+#: code:addons/survey/wizard/survey_answer.py:820
+#: code:addons/survey/wizard/survey_answer.py:825
+#: code:addons/survey/wizard/survey_answer.py:899
+#: code:addons/survey/wizard/survey_answer.py:935
+#: code:addons/survey/wizard/survey_answer.py:953
+#: code:addons/survey/wizard/survey_answer.py:981
+#: code:addons/survey/wizard/survey_answer.py:984
+#: code:addons/survey/wizard/survey_answer.py:987
+#: code:addons/survey/wizard/survey_answer.py:999
+#: code:addons/survey/wizard/survey_answer.py:1006
+#: code:addons/survey/wizard/survey_answer.py:1009
 #: code:addons/survey/wizard/survey_selection.py:134
 #: code:addons/survey/wizard/survey_selection.py:138
 #: code:addons/survey/wizard/survey_send_invitation.py:74
@@ -730,8 +730,8 @@ msgid "You must enter one or more column heading."
 msgstr "你必须输入一条或多条列头"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:759
-#: code:addons/survey/wizard/survey_answer.py:954
+#: code:addons/survey/wizard/survey_answer.py:758
+#: code:addons/survey/wizard/survey_answer.py:953
 #, python-format
 msgid "Please enter an integer value"
 msgstr "请输入一个整数"
@@ -756,9 +756,10 @@ msgid ""
 msgstr "你输入的最多需要的答案数大于答案数。请用小于%d的数字。"
 
 #. module: survey
+#: selection:survey.request,state:0
 #: view:survey.request:0
-msgid "Watting Answer"
-msgstr "等待回答"
+msgid "Waiting Answer"
+msgstr "等待回复"
 
 #. module: survey
 #: view:survey:0
@@ -1097,12 +1098,6 @@ msgstr "回复类型"
 msgid "Validation"
 msgstr "验证"
 
-#. module: survey
-#: view:survey.request:0
-#: selection:survey.request,state:0
-msgid "Waiting Answer"
-msgstr "等待回复"
-
 #. module: survey
 #: selection:survey.question,comment_valid_type:0
 #: selection:survey.question,validation_type:0
@@ -1382,7 +1377,7 @@ msgid "Answered"
 msgstr "已答复"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:433
+#: code:addons/survey/wizard/survey_answer.py:432
 #, python-format
 msgid "Complete Survey Answer"
 msgstr "完成问卷回复"
@@ -1409,7 +1404,7 @@ msgid "Send Invitation"
 msgstr "发送邀请"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:793
+#: code:addons/survey/wizard/survey_answer.py:792
 #, python-format
 msgid "You cannot select the same answer more than one time"
 msgstr "不能选择多次选择同样的答案"
@@ -1525,7 +1520,7 @@ msgid ""
 msgstr "你输入的需要的答复#大于答复数量。请用小于%d的数。"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:985
+#: code:addons/survey/wizard/survey_answer.py:984
 #, python-format
 msgid "You cannot select same answer more than one time'"
 msgstr "不能多次选择同样的答复"
@@ -1748,3 +1743,6 @@ msgstr "页面位置"
 
 #~ msgid "New Survey Question"
 #~ msgstr "新的调查问题"
+
+#~ msgid "Watting Answer"
+#~ msgstr "等待回答"

addons/survey/survey_demo.xml

@@ -100,7 +100,7 @@
         </record>
         <record id="survey_question_company_size_Europ" model="survey.answer">
             <field name="in_visible_answer_type">1</field>
-            <field name="answer">Europ</field>
+            <field name="answer">Europe</field>
             <field name="question_id" ref="survey_question_located" />
             <field name="sequence" eval="1"/>
         </record>

addons/survey/survey_view.xml

@@ -1066,7 +1066,7 @@
                      <field name="state"/>
                         <button name="survey_req_cancel" string="Cancelled" states="waiting_answer" type="object" icon="gtk-cancel"/>
                         <button name="survey_req_draft" string="Set to Draft" states="cancel,done" type="object" icon="gtk-new"/>
-                        <button name="survey_req_waiting_answer" string="Watting Answer" states="draft" type="object" icon="gtk-new"/>
+                        <button name="survey_req_waiting_answer" string="Waiting Answer" states="draft" type="object" icon="gtk-new"/>
                         <button name="survey_req_done" string="Done" states="waiting_answer" type="object" icon="gtk-ok"/>
                     </group>
                 </form>

addons/users_ldap/users_ldap.py

@@ -22,10 +22,11 @@ from osv import fields, osv
 import pooler
 import tools
 import logging
-from service import security
 import ldap
 from ldap.filter import filter_format
 
+import openerp.exceptions
+
 
 class CompanyLDAP(osv.osv):
     _name = 'res.company.ldap'
@@ -148,12 +149,12 @@ class users(osv.osv):
     def check(self, db, uid, passwd):
         try:
             return super(users,self).check(db, uid, passwd)
-        except security.ExceptionNoTb: # AccessDenied
+        except openerp.exceptions.AccessDenied:
             pass
 
         if not passwd:
             # empty passwords disallowed for obvious security reasons
-            raise security.ExceptionNoTb('AccessDenied')
+            raise openerp.exceptions.AccessDenied()
 
         cr = pooler.get_db(db).cursor()
         user = self.browse(cr, 1, uid)
@@ -187,7 +188,7 @@ class users(osv.osv):
                     logger.warning('cannot check', exc_info=True)
                     pass
         cr.close()
-        raise security.ExceptionNoTb('AccessDenied')
+        raise openerp.exceptions.AccessDenied()
         
 users()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: