diff --git a/addons/account/project/wizard/wizard_analytic_account_chart.py b/addons/account/project/wizard/wizard_analytic_account_chart.py index 354fe6e6046..e011fad15bb 100644 --- a/addons/account/project/wizard/wizard_analytic_account_chart.py +++ b/addons/account/project/wizard/wizard_analytic_account_chart.py @@ -65,7 +65,7 @@ class wizard_analytic_account_chart(wizard.interface): states = { 'init': { 'actions': [], - 'result': {'type': 'form', 'arch':_account_chart_arch, 'fields':_account_chart_fields, 'state': [('end', 'Cancel'), ('open', 'Open Charts')]} + 'result': {'type': 'form', 'arch':_account_chart_arch, 'fields':_account_chart_fields, 'state': [('end', 'Cancel', 'gtk-cancel'), ('open', 'Open Charts', 'gtk-ok')]} }, 'open': { 'actions': [], diff --git a/addons/account/wizard/account_chart.py b/addons/account/wizard/account_chart.py index 20c6cb7c858..7def37807c3 100644 --- a/addons/account/wizard/account_chart.py +++ b/addons/account/wizard/account_chart.py @@ -71,5 +71,4 @@ class account_chart(osv.osv_memory): 'target_move': lambda * a: 'all' } account_chart() - # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/account/wizard/wizard_account_duplicate.py b/addons/account/wizard/wizard_account_duplicate.py index 17fbad45b6f..abded25e9ad 100644 --- a/addons/account/wizard/wizard_account_duplicate.py +++ b/addons/account/wizard/wizard_account_duplicate.py @@ -40,7 +40,7 @@ class wizard_account_duplicate(wizard.interface): states = { 'init': { 'actions': [], - 'result': {'type': 'form', 'arch': duplicate_form, 'fields': duplicate_fields, 'state': (('end', 'Cancel'), ('duplicate', 'Duplicate'))}, + 'result': {'type': 'form', 'arch': duplicate_form, 'fields': duplicate_fields, 'state': (('end', 'Cancel', 'gtk-cancel'), ('duplicate', 'Duplicate', 'gtk-ok'))}, }, 'duplicate': { 'actions': [_do_duplicate], diff --git a/addons/account/wizard/wizard_aged_trial_balance.py b/addons/account/wizard/wizard_aged_trial_balance.py index 9935811031b..d21a64c0bbf 100755 --- a/addons/account/wizard/wizard_aged_trial_balance.py +++ b/addons/account/wizard/wizard_aged_trial_balance.py @@ -28,7 +28,7 @@ from mx.DateTime import * from tools.translate import _ _aged_trial_form = """ -
+ @@ -101,7 +101,7 @@ class wizard_report(wizard.interface): states = { 'init': { 'actions': [_get_defaults], - 'result': {'type':'form', 'arch':_aged_trial_form, 'fields':_aged_trial_fields, 'state':[('end','Cancel'),('print','Print Aged Trial Balance')]}, + 'result': {'type':'form', 'arch':_aged_trial_form, 'fields':_aged_trial_fields, 'state':[('end','Cancel', 'gtk-cancel'),('print','Print', 'gtk-ok')]}, }, 'print': { 'actions': [_calc_dates], diff --git a/addons/account/wizard/wizard_automatic_reconcile.py b/addons/account/wizard/wizard_automatic_reconcile.py index d3a3733dfb1..ac26b6c44fe 100644 --- a/addons/account/wizard/wizard_automatic_reconcile.py +++ b/addons/account/wizard/wizard_automatic_reconcile.py @@ -312,7 +312,7 @@ class wiz_reconcile(wizard.interface): }, 'reconcile': { 'actions': [_reconcile], - 'result': {'type':'form', 'arch':_result_form, 'fields':_result_fields, 'state':[('end','OK')]} + 'result': {'type':'form', 'arch':_result_form, 'fields':_result_fields, 'state':[('end','OK', 'gtk-cancel')]} } } wiz_reconcile('account.automatic.reconcile') diff --git a/addons/account/wizard/wizard_central_journal.py b/addons/account/wizard/wizard_central_journal.py index 8a6e1645a6f..32fb02f3230 100644 --- a/addons/account/wizard/wizard_central_journal.py +++ b/addons/account/wizard/wizard_central_journal.py @@ -59,7 +59,7 @@ class wizard_print_journal(wizard.interface): states = { 'init': { 'actions': [], - 'result': {'type': 'form', 'arch': form, 'fields': fields, 'state': (('end', 'Cancel'), ('print', 'Print'))}, + 'result': {'type': 'form', 'arch': form, 'fields': fields, 'state': (('end', 'Cancel', 'gtk-cancel'), ('print', 'Print', 'gtk-ok'))}, }, 'print': { 'actions': [_check_data], diff --git a/addons/account/wizard/wizard_change_currency.py b/addons/account/wizard/wizard_change_currency.py index 69fbd8c85ed..45b23e49022 100644 --- a/addons/account/wizard/wizard_change_currency.py +++ b/addons/account/wizard/wizard_change_currency.py @@ -92,7 +92,7 @@ class wizard_change_currency(wizard.interface): }, 'change': { 'actions': [], - 'result': {'type': 'form', 'arch': form, 'fields': fields, 'state': (('end', 'Cancel'), ('next', 'Change Currency'))}, + 'result': {'type': 'form', 'arch': form, 'fields': fields, 'state': (('end', 'Cancel', 'gtk-cancel'), ('next', 'Change Currency', 'gtk-go-forward'))}, }, 'next': { 'actions': [_change_currency], @@ -100,7 +100,7 @@ class wizard_change_currency(wizard.interface): }, 'message': { 'actions': [], - 'result': {'type': 'form', 'arch': message, 'fields': {}, 'state': [('end', 'Ok')]}, + 'result': {'type': 'form', 'arch': message, 'fields': {}, 'state': [('end', 'Ok', 'gtk-cancel')]}, }, } wizard_change_currency('account.invoice.currency_change') diff --git a/addons/account/wizard/wizard_compare_account_balance_report.py b/addons/account/wizard/wizard_compare_account_balance_report.py index 1928e82c41d..8000d37536d 100755 --- a/addons/account/wizard/wizard_compare_account_balance_report.py +++ b/addons/account/wizard/wizard_compare_account_balance_report.py @@ -146,7 +146,7 @@ class wizard_report(wizard.interface): states = { 'init': { 'actions': [_get_defaults], - 'result': {'type':'form', 'arch':dates_form, 'fields':dates_fields, 'state':[('end','Cancel'),('checkyear','Print')]} + 'result': {'type':'form', 'arch':dates_form, 'fields':dates_fields, 'state':[('end','Cancel', 'gtk-cancel'),('checkyear','Print', 'gtk-ok')]} }, 'backtoinit': { 'actions': [], diff --git a/addons/account/wizard/wizard_fiscalyear_close.py b/addons/account/wizard/wizard_fiscalyear_close.py index 42e35276802..cbf4b8d0529 100644 --- a/addons/account/wizard/wizard_fiscalyear_close.py +++ b/addons/account/wizard/wizard_fiscalyear_close.py @@ -214,7 +214,7 @@ class wiz_journal_close(wizard.interface): states = { 'init': { 'actions': [_data_load], - 'result': {'type': 'form', 'arch':_transaction_form, 'fields':_transaction_fields, 'state':[('end','Cancel'),('close','Create entries')]} + 'result': {'type': 'form', 'arch':_transaction_form, 'fields':_transaction_fields, 'state':[('end','Cancel', 'gtk-cancel'),('close','Create', 'gtk-ok')]} }, 'close': { 'actions': [_data_save], diff --git a/addons/account/wizard/wizard_general_journal.py b/addons/account/wizard/wizard_general_journal.py index 4d23624edab..26935aa80d6 100644 --- a/addons/account/wizard/wizard_general_journal.py +++ b/addons/account/wizard/wizard_general_journal.py @@ -57,7 +57,7 @@ class wizard_print_journal(wizard.interface): states = { 'init': { 'actions': [], - 'result': {'type': 'form', 'arch': form, 'fields': fields, 'state': (('end', 'Cancel'), ('print', 'Print'))}, + 'result': {'type': 'form', 'arch': form, 'fields': fields, 'state': (('end', 'Cancel', 'gtk-cancel'), ('print', 'Print', 'gtk-ok'))}, }, 'print': { 'actions': [_check_data], diff --git a/addons/account/wizard/wizard_open_closed_fiscalyear.py b/addons/account/wizard/wizard_open_closed_fiscalyear.py index cbc46316484..18ac86c8107 100644 --- a/addons/account/wizard/wizard_open_closed_fiscalyear.py +++ b/addons/account/wizard/wizard_open_closed_fiscalyear.py @@ -63,7 +63,7 @@ class open_closed_fiscal(wizard.interface): 'type': 'form', 'arch': form, 'fields': fields, - 'state':[('end','Cancel'),('open','Open')] + 'state':[('end','Cancel', 'gtk-cancel'),('open','Open', 'gtk-ok')] } }, 'open': { diff --git a/addons/account/wizard/wizard_print_journal.py b/addons/account/wizard/wizard_print_journal.py index 2f61b76f14a..8cd95608256 100644 --- a/addons/account/wizard/wizard_print_journal.py +++ b/addons/account/wizard/wizard_print_journal.py @@ -66,7 +66,7 @@ class wizard_print_journal(wizard.interface): states = { 'init': { 'actions': [], - 'result': {'type': 'form', 'arch': form, 'fields': fields, 'state': (('end', 'Cancel'), ('print', 'Print'))}, + 'result': {'type': 'form', 'arch': form, 'fields': fields, 'state': (('end', 'Cancel', 'gtk-cancel'), ('print', 'Print', 'gtk-ok'))}, }, 'print': { 'actions': [_check_data], diff --git a/addons/account/wizard/wizard_statement_from_invoice.py b/addons/account/wizard/wizard_statement_from_invoice.py index 92d33f329c7..6e9f912380f 100644 --- a/addons/account/wizard/wizard_statement_from_invoice.py +++ b/addons/account/wizard/wizard_statement_from_invoice.py @@ -176,8 +176,8 @@ class PopulateStatementFromInv(wizard.interface): 'arch': FORM, 'fields': FIELDS, 'state': [ - ('end', '_Cancel','', True), - ('finish', 'O_k','', True) + ('end', '_Cancel','', True, 'gtk-cancel'), + ('finish', 'O_k','', True, 'gtk-ok') ] }, }, diff --git a/addons/account/wizard/wizard_subscription_generate.py b/addons/account/wizard/wizard_subscription_generate.py index 51cbad9ec3a..1df25b219cd 100644 --- a/addons/account/wizard/wizard_subscription_generate.py +++ b/addons/account/wizard/wizard_subscription_generate.py @@ -47,7 +47,7 @@ class wiz_subscription(wizard.interface): states = { 'init': { 'actions': [], - 'result': {'type': 'form', 'arch':_subscription_form, 'fields':_subscription_fields, 'state':[('end','Cancel'),('generate','Compute Entry Dates')]} + 'result': {'type': 'form', 'arch':_subscription_form, 'fields':_subscription_fields, 'state':[('end','Cancel', 'gtk-cancel'),('generate','Compute', 'gtk-ok')]} }, 'generate': { 'actions': [_action_generate], diff --git a/addons/account/wizard/wizard_vat.py b/addons/account/wizard/wizard_vat.py index f9d015df336..6c14402c701 100755 --- a/addons/account/wizard/wizard_vat.py +++ b/addons/account/wizard/wizard_vat.py @@ -69,8 +69,8 @@ class wizard_report(wizard.interface): 'arch': dates_form, 'fields': dates_fields, 'state': [ - ('end', 'Cancel'), - ('report', 'Print VAT Decl.') + ('end', 'Cancel', 'gtk-cancel'), + ('report', 'Print VAT Decl.', 'gtk-ok') ] } }, diff --git a/addons/account_chart/i18n/ru.po b/addons/account_chart/i18n/ru.po index eaa300a9762..a7f14094a82 100644 --- a/addons/account_chart/i18n/ru.po +++ b/addons/account_chart/i18n/ru.po @@ -7,16 +7,16 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.4\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2009-04-10 14:08+0000\n" -"Last-Translator: <>\n" +"PO-Revision-Date: 2010-03-30 10:18+0000\n" +"Last-Translator: Nikolay Chesnokov \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n" +"X-Launchpad-Export-Date: 2010-03-31 03:55+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_chart #: model:ir.module.module,description:account_chart.module_meta_information msgid "Remove minimal account chart" -msgstr "" +msgstr "Удалите минимальный план счетов" diff --git a/addons/base_contact/i18n/bg.po b/addons/base_contact/i18n/bg.po index 80c573d1141..dfdcd14a63b 100644 --- a/addons/base_contact/i18n/bg.po +++ b/addons/base_contact/i18n/bg.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.0\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2009-09-08 13:01+0000\n" -"Last-Translator: Fabien (Open ERP) \n" +"PO-Revision-Date: 2010-03-30 19:31+0000\n" +"Last-Translator: Boris \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n" +"X-Launchpad-Export-Date: 2010-03-31 03:55+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: base_contact @@ -37,7 +37,7 @@ msgstr "" #. module: base_contact #: field:res.partner.job,function_id:0 msgid "Partner Function" -msgstr "" +msgstr "Функция ня партньора" #. module: base_contact #: model:ir.actions.act_window,name:base_contact.action_partner_contact_form @@ -57,12 +57,12 @@ msgstr "" #. module: base_contact #: selection:res.partner.job,state:0 msgid "Current" -msgstr "" +msgstr "Текущ" #. module: base_contact #: field:res.partner.contact,first_name:0 msgid "First Name" -msgstr "Собствено име" +msgstr "Собствено Име" #. module: base_contact #: model:ir.model,name:base_contact.model_res_partner_job @@ -72,7 +72,7 @@ msgstr "" #. module: base_contact #: field:res.partner.job,other:0 msgid "Other" -msgstr "" +msgstr "Друго" #. module: base_contact #: model:process.transition,name:base_contact.process_transition_contacttofunction0 @@ -286,7 +286,7 @@ msgstr "" #. module: base_contact #: model:process.node,name:base_contact.process_node_partners0 msgid "Partners" -msgstr "" +msgstr "Партньори" #. module: base_contact #: model:process.node,name:base_contact.process_node_addresses0 diff --git a/addons/board_account/i18n/ru.po b/addons/board_account/i18n/ru.po index 51214d18902..fd7e9d8b9fe 100644 --- a/addons/board_account/i18n/ru.po +++ b/addons/board_account/i18n/ru.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.0\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2009-09-08 12:16+0000\n" -"Last-Translator: Sergei Kostigoff \n" +"PO-Revision-Date: 2010-03-30 10:23+0000\n" +"Last-Translator: Nikolay Chesnokov \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n" +"X-Launchpad-Export-Date: 2010-03-31 03:55+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: board_account @@ -57,12 +57,12 @@ msgstr "Расходы для выставления счетов" #. module: board_account #: view:board.board:0 msgid "Aged receivables" -msgstr "" +msgstr "Повременный расход" #. module: board_account #: model:ir.module.module,shortdesc:board_account.module_meta_information msgid "Board for accountant" -msgstr "" +msgstr "Панель контролёра счетов" #. module: board_account #: model:ir.actions.act_window,name:board_account.action_aged_income @@ -77,7 +77,7 @@ msgstr "Мои индикаторы" #. module: board_account #: constraint:ir.actions.act_window:0 msgid "Invalid model name in the action definition." -msgstr "" +msgstr "Недопустимое имя модели в определении действия" #. module: board_account #: model:ir.ui.menu,name:board_account.next_id_68 @@ -87,9 +87,9 @@ msgstr "Бухгалтерский" #. module: board_account #: view:board.board:0 msgid "Account Board" -msgstr "" +msgstr "Панель счетов" #. module: board_account #: view:board.board:0 msgid "Aged income" -msgstr "" +msgstr "Повременный доход" diff --git a/addons/board_project/i18n/ru.po b/addons/board_project/i18n/ru.po index 074cd66183f..60115d0e65b 100644 --- a/addons/board_project/i18n/ru.po +++ b/addons/board_project/i18n/ru.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.0\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2009-09-08 12:27+0000\n" -"Last-Translator: Fabien (Open ERP) \n" +"PO-Revision-Date: 2010-03-30 10:26+0000\n" +"Last-Translator: Nikolay Chesnokov \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n" +"X-Launchpad-Export-Date: 2010-03-31 03:55+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: board_project @@ -30,7 +30,7 @@ msgstr "Табели" #. module: board_project #: constraint:ir.actions.act_window:0 msgid "Invalid model name in the action definition." -msgstr "" +msgstr "Недопустимое имя модели в определении действия" #. module: board_project #: view:board.board:0 @@ -63,7 +63,7 @@ msgstr "Панель аналитики проекта" #. module: board_project #: model:ir.module.module,shortdesc:board_project.module_meta_information msgid "Board for project users" -msgstr "" +msgstr "Панель для пользователей проекта" #. module: board_project #: model:ir.actions.act_window,name:board_project.action_project_pipeline_user @@ -73,7 +73,7 @@ msgstr "Конвейер заданий" #. module: board_project #: view:board.board:0 msgid "My Planning" -msgstr "" +msgstr "Мой план" #. module: board_project #: view:board.board:0 @@ -136,4 +136,4 @@ msgstr "Мои конвейеры пользователей" #. module: board_project #: view:board.board:0 msgid "My Timesheet" -msgstr "" +msgstr "Мой табель" diff --git a/addons/crm/crm.py b/addons/crm/crm.py index 6473ace2e3a..f19cd4bfb19 100644 --- a/addons/crm/crm.py +++ b/addons/crm/crm.py @@ -53,13 +53,6 @@ AVAILABLE_PRIORITIES = [ ('2','High'), ('1','Highest') ] - -icon_lst = { - 'form':'STOCK_NEW', - 'tree':'STOCK_JUSTIFY_FILL', - 'calendar':'STOCK_SELECT_COLOR' -} - class crm_case_section(osv.osv): _name = "crm.case.section" _description = "Sales Teams" @@ -321,31 +314,21 @@ class crm_case(osv.osv): s[section] = dict([(v, k) for (k, v) in s[section].iteritems()]) if st in s[section]: self.write(cr, uid, [case.id], {'stage_id': s[section][st]}) - return True - - def onchange_case_id(self, cr, uid, ids, case_id, name, partner_id, context={}): - if not case_id: - return {} - case = self.browse(cr, uid, case_id, context=context) - value = {} - if not name: - value['name'] = case.name - if (not partner_id) and case.partner_id: - value['partner_id'] = case.partner_id.id - if case.partner_address_id: - value['partner_address_id'] = case.partner_address_id.id - if case.email_from: - value['email_from'] = case.email_from - return {'value': value} + return True - def history(self, cr, uid, ids, keyword, history=False, email=False, details=None, context={}): + def history(self, cr, uid, ids, keyword, history=False, email=False, details=None, email_from=False, context={}): cases = self.browse(cr, uid, ids, context=context) - return self.__history(cr, uid, cases, keyword=keyword,\ - history=history, email=email, details=details,\ + return self._history(cr, uid, cases, keyword=keyword,\ + history=history, email=email, details=details, email_from=email_from, \ context=context) - def __history(self, cr, uid, cases, keyword, history=False, email=False, details=None, context={}): - model_obj = self.pool.get('ir.model') + def __history(self, cr, uid, cases, keyword, history=False, email=False, details=None, email_from=False, context={}): + model_obj = self.pool.get('ir.model') + if email and type(email) == type([]): + email = ','.join(email) + if email_from and type(email_from) == type([]): + email_from = ','.join(email_from) + for case in cases: model_ids = model_obj.search(cr, uid, [('model','=',case._name)]) data = { @@ -360,11 +343,12 @@ class crm_case(osv.osv): if history: obj = self.pool.get('crm.case.history') data['description'] = details or case.description - data['email'] = email or \ + data['email_to'] = email or \ + (case.user_id and case.user_id.address_id and \ + case.user_id.address_id.email) or False + data['email_from'] = email_from or \ (case.user_id and case.user_id.address_id and \ case.user_id.address_id.email) or False - data['email_from'] = (case.user_id and case.user_id.address_id and \ - case.user_id.address_id.email) or tools.config.get('email_from',False) res = obj.create(cr, uid, data, context) return True _history = __history @@ -403,12 +387,10 @@ class crm_case(osv.osv): if not case.description: raise osv.except_osv(_('Error!'), _('Can not send mail with empty body,you should have description in the body')) - self.__history(cr, uid, cases, _('Send'), history=True, email=False) + for case in cases: self.write(cr, uid, [case.id], { - 'description': False, - 'som': False, - 'canal_id': False, + 'description': False, }) emails = [case.email_from] + (case.email_cc or '').split(',') emails = filter(None, emails) @@ -429,6 +411,7 @@ class crm_case(osv.osv): reply_to=case.section_id.reply_to, openobject_id=str(case.id) ) + self.__history(cr, uid, [case], _('Send'), history=True, email=emails, details=body, email_from=emailfrom) return True def onchange_partner_id(self, cr, uid, ids, part, email=False): @@ -522,9 +505,7 @@ class crm_case_log(osv.osv): _order = "id desc" _columns = { 'name': fields.char('Status', size=64), - 'som': fields.many2one('res.partner.som', 'State of Mind'), - 'date': fields.datetime('Date'), - 'canal_id': fields.many2one('res.partner.canal', 'Channel'), + 'date': fields.datetime('Date'), 'section_id': fields.many2one('crm.case.section', 'Section'), 'user_id': fields.many2one('res.users', 'User Responsible', readonly=True), 'model_id': fields.many2one('ir.model', "Model"), @@ -550,8 +531,8 @@ class crm_case_history(osv.osv): _columns = { 'description': fields.text('Description'), 'note': fields.function(_note_get, method=True, string="Description", type="text"), - 'email': fields.char('Email', size=84), - 'email_from' : fields.char('From Email', size=84), + 'email_to': fields.char('Email TO', size=84), + 'email_from' : fields.char('Email From', size=84), 'log_id': fields.many2one('crm.case.log','Log',ondelete='cascade'), } crm_case_history() @@ -595,16 +576,16 @@ class crm_email_add_cc_wizard(osv.osv_memory): case = model_pool.browse(cr, uid, history_line.log_id.res_id) body = history_line.description.replace('\n','\n> ') flag = tools.email_send( - case.user_id.address_id.email, - [case.email_from], + email, + [case.user_id.address_id.email], subject or '['+str(case.id)+'] '+case.name, - model_pool.format_body(body), - email_cc = [email], + model_pool.format_body(body), openobject_id=str(case.id), subtype="html" ) if flag: model_pool.write(cr, uid, case.id, {'email_cc' : case.email_cc and case.email_cc +','+ email or email}) + self.__history(cr, uid, [case], _('Send'), history=True, email=email, details=body, email_from=case.user_id.address_id.email) else: raise osv.except_osv(_('Email Fail!'),("Lastest Email is not sent successfully")) return {} diff --git a/addons/crm/crm_claims_view.xml b/addons/crm/crm_claims_view.xml index 50c061121a1..2104c1c8d94 100644 --- a/addons/crm/crm_claims_view.xml +++ b/addons/crm/crm_claims_view.xml @@ -134,9 +134,7 @@ - - - + @@ -148,8 +146,8 @@
- - + +