Fall 5558: Information - Neuer Kunde vom Portal

develop
Ahmed Aly 2018-06-18 13:43:26 +02:00
parent aa40cd3593
commit f97699f957
4 changed files with 100 additions and 14 deletions

View File

@ -37,7 +37,7 @@ msgstr "Untere Bemerkungen"
#. module: invoice_comment_template
#: model:ir.ui.view,arch_db:invoice_comment_template.invoice_form_add_comment
msgid "Comments"
msgstr "Bemerkungen"
msgstr "Textbausteine"
#. module: invoice_comment_template
#: model:ir.ui.menu,name:invoice_comment_template.menu_base_comment_template_invoice

View File

@ -0,0 +1,76 @@
# Translation of Odoo Server.
# This file contains the translation of the following modules:
# * sale_comment_template
#
# Translators:
# Rudolf Schnapka <rs@techno-flex.de>, 2017
# OCA Transbot <transbot@odoo-community.org>, 2017
msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 9.0c\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-05-16 11:59+0000\n"
"PO-Revision-Date: 2017-05-16 11:59+0000\n"
"Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
"Language-Team: German (https://www.transifex.com/oca/teams/23907/de/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: \n"
"Language: de\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. module: sale_comment_template
#: model:ir.model.fields,field_description:sale_comment_template.field_sale_order_note2
msgid "Bottom Comment"
msgstr "Untere Bemerkung"
#. module: sale_comment_template
#: model:ir.model.fields,field_description:sale_comment_template.field_sale_order_comment_template2_id
msgid "Bottom Comment Template"
msgstr "Vorlage für Untere Bemerkung"
#. module: sale_comment_template
#: model:ir.ui.view,arch_db:sale_comment_template.sale_order_form_add_comment
msgid "Bottom Comments"
msgstr "Untere Bemerkungen"
#. module: sale_comment_template
#: model:ir.ui.view,arch_db:sale_comment_template.sale_order_form_add_comment
msgid "Comments"
msgstr "Textbausteine"
#. module: sale_comment_template
#: model:ir.ui.menu,name:sale_comment_template.menu_base_comment_template_sale
msgid "Document Comments"
msgstr "Dokument-Bemerkungen"
#. module: sale_comment_template
#: model:ir.ui.view,arch_db:sale_comment_template.sale_order_form_add_comment
msgid "Load a template"
msgstr "Vorlage öffnen"
#. module: sale_comment_template
#: model:ir.ui.view,arch_db:sale_comment_template.sale_order_form_add_comment
msgid ""
"The comments will be displayed on the printed document. You can load a "
"predefined template, write your own text or load a template and then modify "
"it only for this document."
msgstr ""
"Bemerkungen werden im gedruckten Dokument angezeigt. Sie können zuvor "
"erstellte Vorlagen verwenden, Ihren eigenen Text erfassen oder eine Vorlage "
"öffnen und diese für dieses Dokument anpassen."
#. module: sale_comment_template
#: model:ir.model.fields,field_description:sale_comment_template.field_sale_order_note1
msgid "Top Comment"
msgstr "Obere Bemerkungen"
#. module: sale_comment_template
#: model:ir.model.fields,field_description:sale_comment_template.field_sale_order_comment_template1_id
msgid "Top Comment Template"
msgstr "Vorlagen für obere Bemerkungen"
#. module: sale_comment_template
#: model:ir.ui.view,arch_db:sale_comment_template.sale_order_form_add_comment
msgid "Top Comments"
msgstr "Obere Bemerkungen"

View File

@ -105,15 +105,16 @@ class Partner(models.Model):
users = self.env.ref('dp_custom.group_inform_on_new_company').users
for user in users:
values = {'user_id': user.id,
'date_deadline': fields.Date.today(),
'activity_type_id': self.env.ref('mail.mail_activity_data_todo').id,
'activity_category': 'default',
'res_id': recordset.id,
'res_model': recordset._name,
'res_model_id': self.env.ref('base_partner_sequence.model_res_partner').id,
"summary": "Es wurde ein neuer Portalkunde angelegt"
}
values = {
'user_id': user.id,
'date_deadline': fields.Date.today(),
'activity_type_id': self.env.ref('mail.mail_activity_data_todo').id,
'activity_category': 'default',
'res_id': recordset.id,
'res_model': recordset._name,
'res_model_id': self.env.ref('base_partner_sequence.model_res_partner').id,
'summary': 'Es wurde ein neuer Portalkunde angelegt'
}
self.env['mail.activity'].create(values)
return True
@ -326,7 +327,7 @@ class Partner(models.Model):
data=json.dumps(data))
if response.status_code != 200:
data = response.json()
error_string = data.get('errors',[])
error_string = data.get('errors', [])
raise ValidationError(_('Rabatt konnte nicht gesetzt werden. '
'Status Code: %s, Reason: %s') % (response.status_code, error_string))
@ -364,6 +365,13 @@ class Partner(models.Model):
res.append((partner.id, name))
return res
@api.model
def search_read(self, domain=None, fields=None, offset=0, limit=None, order=None):
for context_element in self.env.context:
if context_element.startswith('search_default_activities_'):
return super(Partner, self.with_context(active_test=False)).search_read(domain=domain, fields=fields, offset=offset, limit=limit, order=order)
return super(Partner, self).search_read(domain=domain, fields=fields, offset=offset, limit=limit, order=order)
@api.depends('company_name', 'parent_id.is_company', 'commercial_partner_id.name')
def _compute_commercial_company_name(self):
res = super(Partner, self)._compute_commercial_company_name()

View File

@ -1,11 +1,13 @@
# Copyright 2018-Today datenpol gmbh (<http://www.datenpol.at>)
# License OPL-1 or later (https://www.odoo.com/documentation/user/11.0/legal/licenses/licenses.html#licenses).
from odoo import api, fields, models
from odoo import fields, models
class DeliveryCarrier(models.Model):
_inherit = 'delivery.carrier'
integration_level = fields.Selection([('none', 'NONE'), ('rate', 'Get Rate'),
('rate_and_ship', 'Get Rate and Create Shipment')], string="Integration Level", default='none', help="Action while validating Delivery Orders")
('rate_and_ship', 'Get Rate and Create Shipment')],
string="Integration Level", default='none',
help="Action while validating Delivery Orders")