mirror of
https://gitlab.com/flectra-hq/flectra.git
synced 2026-11-02 20:30:20 -06:00
[FIX] bad links
This commit is contained in:
1 parent
272d1a5aef
commit
91f893241c
71 files changed
+218
-218
No files matched your search
@@ -12,12 +12,12 @@ class TestAccountIncomingSupplierInvoice(AccountTestInvoicingCommon):
|
||||
def setUpClass(cls, chart_template_ref=None):
|
||||
super().setUpClass(chart_template_ref=chart_template_ref)
|
||||
|
||||
cls.env['ir.config_parameter'].sudo().set_param('mail.catchall.domain', 'test-company.flectra.com')
|
||||
cls.env['ir.config_parameter'].sudo().set_param('mail.catchall.domain', 'test-company.flectrahq.com')
|
||||
|
||||
cls.internal_user = cls.env['res.users'].create({
|
||||
'name': 'Internal User',
|
||||
'login': 'internal.user@test.flectra.com',
|
||||
'email': 'internal.user@test.flectra.com',
|
||||
'login': 'internal.user@test.flectrahq.com',
|
||||
'email': 'internal.user@test.flectrahq.com',
|
||||
})
|
||||
|
||||
cls.supplier_partner = cls.env['res.partner'].create({
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
<data noupdate="1">
|
||||
<record model="ir.config_parameter" id="adyen_platforms_proxy_url">
|
||||
<field name="key">adyen_platforms.proxy_url</field>
|
||||
<field name="value">https://payment-adyen.flectra.com/payment_proxy_adyen/</field>
|
||||
<field name="value">https://payment-adyen.flectrahq.com/payment_proxy_adyen/</field>
|
||||
</record>
|
||||
|
||||
<record model="ir.config_parameter" id="adyen_platforms_onboarding_url">
|
||||
|
||||
@@ -159,10 +159,10 @@ class AdyenAccount(models.Model):
|
||||
adyen_account_id = super(AdyenAccount, self).create(values)
|
||||
self.env.company.adyen_account_id = adyen_account_id.id
|
||||
|
||||
# Create account on flectra.com, proxy and Adyen
|
||||
# Create account on flectrahq.com, proxy and Adyen
|
||||
response = adyen_account_id._adyen_rpc('create_account_holder', adyen_account_id._format_data())
|
||||
|
||||
# Save adyen_uuid and proxy_token, that have been generated by flectra.com and the proxy
|
||||
# Save adyen_uuid and proxy_token, that have been generated by flectrahq.com and the proxy
|
||||
adyen_account_id.with_context(update_from_adyen=True).write({
|
||||
'adyen_uuid': response['adyen_uuid'],
|
||||
'proxy_token': response['proxy_token'],
|
||||
@@ -192,8 +192,8 @@ class AdyenAccount(models.Model):
|
||||
def action_create_redirect(self):
|
||||
'''
|
||||
Accessing the FormView to create an Adyen account needs to be done through this action.
|
||||
The action will redirect the user to accounts.flectra.com to link an Flectra user_id to the Adyen
|
||||
account. After logging in on flectra.com the user will be redirected to his DB with a token in
|
||||
The action will redirect the user to accounts.flectrahq.com to link an Flectra user_id to the Adyen
|
||||
account. After logging in on flectrahq.com the user will be redirected to his DB with a token in
|
||||
the URL. This token is then needed to create the Adyen account.
|
||||
'''
|
||||
if self.env.company.adyen_account_id:
|
||||
|
||||
@@ -3,9 +3,9 @@
|
||||
<data noupdate="1">
|
||||
<record id="provider_openerp" model="auth.oauth.provider">
|
||||
<field name="name">Flectrahq.com Accounts</field>
|
||||
<field name="auth_endpoint">https://accounts.flectra.com/oauth2/auth</field>
|
||||
<field name="auth_endpoint">https://accounts.flectrahq.com/oauth2/auth</field>
|
||||
<field name="scope">userinfo</field>
|
||||
<field name="validation_endpoint">https://accounts.flectra.com/oauth2/tokeninfo</field>
|
||||
<field name="validation_endpoint">https://accounts.flectrahq.com/oauth2/tokeninfo</field>
|
||||
<field name="data_endpoint"></field>
|
||||
<field name="css_class">fa fa-fw o_custom_icon</field>
|
||||
<field name="body">Log in with Flectrahq.com</field>
|
||||
|
||||
@@ -72,7 +72,7 @@ class TestCRMLead(TestCrmCommon):
|
||||
'street': 'My street',
|
||||
'street2': 'My street',
|
||||
'city': 'My city',
|
||||
'zip': 'test@flectra.com',
|
||||
'zip': 'test@flectrahq.com',
|
||||
'state_id': self.env['res.country.state'].create({
|
||||
'name': 'My state',
|
||||
'country_id': self.country_ref.id,
|
||||
|
||||
@@ -3,8 +3,8 @@
|
||||
<data noupdate="1">
|
||||
<record id="lead_generation_no_credits" model="mail.template">
|
||||
<field name="name">IAP Lead Generation Notification</field>
|
||||
<field name="email_from">iap@flectra.com</field>
|
||||
<field name="email_to">iap@flectra.com</field>
|
||||
<field name="email_from">iap@flectrahq.com</field>
|
||||
<field name="email_to">iap@flectrahq.com</field>
|
||||
<field name="subject">IAP Lead Generation Notification</field>
|
||||
<field name="model_id" ref="iap.model_iap_account"/>
|
||||
<field name="body_html" type="html">
|
||||
|
||||
@@ -8,7 +8,7 @@ from flectra.addons.iap.tools import iap_tools
|
||||
|
||||
_logger = logging.getLogger(__name__)
|
||||
|
||||
DEFAULT_ENDPOINT = 'https://iap-services.flectra.com'
|
||||
DEFAULT_ENDPOINT = 'https://iap-services.flectrahq.com'
|
||||
|
||||
MAX_LEAD = 200
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@ from flectra.addons.iap.tools import iap_tools
|
||||
class IapEnrichAPI(models.AbstractModel):
|
||||
_name = 'iap.enrich.api'
|
||||
_description = 'IAP Lead Enrichment API'
|
||||
_DEFAULT_ENDPOINT = 'https://iap-services.flectra.com'
|
||||
_DEFAULT_ENDPOINT = 'https://iap-services.flectrahq.com'
|
||||
|
||||
@api.model
|
||||
def _contact_iap(self, local_endpoint, params):
|
||||
@@ -29,7 +29,7 @@ class IapEnrichAPI(models.AbstractModel):
|
||||
* InsufficientCreditError: {
|
||||
"credit": 4.0,
|
||||
"service_name": "reveal",
|
||||
"base_url": "https://iap.flectra.com/iap/1/credit",
|
||||
"base_url": "https://iap.flectrahq.com/iap/1/credit",
|
||||
"message": "You don't have enough credits on your account to use this service."
|
||||
}
|
||||
"""
|
||||
|
||||
@@ -15,7 +15,7 @@ from flectra.exceptions import ValidationError
|
||||
|
||||
_logger = logging.getLogger(__name__)
|
||||
|
||||
DEFAULT_ENDPOINT = 'https://iap-services.flectra.com'
|
||||
DEFAULT_ENDPOINT = 'https://iap-services.flectrahq.com'
|
||||
DEFAULT_REVEAL_BATCH_LIMIT = 25
|
||||
DEFAULT_REVEAL_MONTH_VALID = 6
|
||||
|
||||
|
||||
@@ -244,7 +244,7 @@ If you have development competencies, we can propose you specific traineeships</
|
||||
<field name="category_ids" eval="[(6, 0, [ref('employee_category_4')])]"/>
|
||||
<field name="work_location">Building 1, Second Floor</field>
|
||||
<field name="work_phone">+3281813700</field>
|
||||
<field name="work_email">gilles@flectra.com</field>
|
||||
<field name="work_email">gilles@flectrahq.com</field>
|
||||
<field name="image_1920" type="base64" file="hr/static/img/employee_qdp-image.png"/>
|
||||
</record>
|
||||
|
||||
@@ -353,7 +353,7 @@ If you have development competencies, we can propose you specific traineeships</
|
||||
<field name="job_title">Marketing and Community Manager</field>
|
||||
<field name="work_location">Building 1, Second Floor</field>
|
||||
<field name="work_phone">(206)-267-3735</field>
|
||||
<field name="work_email">jod@flectra.com</field>
|
||||
<field name="work_email">jod@flectrahq.com</field>
|
||||
<field name="image_1920" type="base64" file="hr/static/img/employee_jod-image.jpg"/>
|
||||
</record>
|
||||
|
||||
|
||||
@@ -42,7 +42,7 @@ class ConnectionManager(Thread):
|
||||
|
||||
try:
|
||||
urllib3.disable_warnings()
|
||||
req = requests.post('https://iot-proxy.flectra.com/flectra-enterprise/iot/connect-box', json=data, verify=False)
|
||||
req = requests.post('https://iot-proxy.flectrahq.com/flectra-enterprise/iot/connect-box', json=data, verify=False)
|
||||
result = req.json().get('result', {})
|
||||
if all(key in result for key in ['pairing_code', 'pairing_uuid']):
|
||||
self.pairing_code = result['pairing_code']
|
||||
@@ -50,7 +50,7 @@ class ConnectionManager(Thread):
|
||||
elif all(key in result for key in ['url', 'token', 'db_uuid', 'enterprise_code']):
|
||||
self._connect_to_server(result['url'], result['token'], result['db_uuid'], result['enterprise_code'])
|
||||
except Exception as e:
|
||||
_logger.error('Could not reach iot-proxy.flectra.com')
|
||||
_logger.error('Could not reach iot-proxy.flectrahq.com')
|
||||
_logger.error('A error encountered : %s ' % e)
|
||||
|
||||
def _connect_to_server(self, url, token, db_uuid, enterprise_code):
|
||||
|
||||
@@ -110,7 +110,7 @@ def check_image():
|
||||
"""
|
||||
Check if the current image of IoT Box is up to date
|
||||
"""
|
||||
url = 'https://nightly.flectra.com/master/iotbox/SHA1SUMS.txt'
|
||||
url = 'https://nightly.flectrahq.com/master/iotbox/SHA1SUMS.txt'
|
||||
urllib3.disable_warnings()
|
||||
http = urllib3.PoolManager(cert_reqs='CERT_NONE')
|
||||
response = http.request('GET', url)
|
||||
|
||||
@@ -71,7 +71,7 @@
|
||||
<p>
|
||||
This tool will help you perform an upgrade of the IoTBox's software over the internet.
|
||||
However the preferred method to upgrade the IoTBox is to flash the sd-card with
|
||||
the <a href='https://nightly.flectra.com/master/iotbox/iotbox-latest.zip'>latest image</a>. The upgrade
|
||||
the <a href='https://nightly.flectrahq.com/master/iotbox/iotbox-latest.zip'>latest image</a>. The upgrade
|
||||
procedure is explained into to the
|
||||
<a href='https://doc.flectrahq.com//14.0/iot.html'>IoTBox manual</a>
|
||||
</p>
|
||||
|
||||
@@ -10,7 +10,7 @@ from flectra.addons.iap.tools import iap_tools
|
||||
|
||||
_logger = logging.getLogger(__name__)
|
||||
|
||||
DEFAULT_ENDPOINT = 'https://iap.flectra.com'
|
||||
DEFAULT_ENDPOINT = 'https://iap.flectrahq.com'
|
||||
|
||||
|
||||
class IapAccount(models.Model):
|
||||
|
||||
@@ -12,7 +12,7 @@ from flectra.tools import pycompat
|
||||
|
||||
_logger = logging.getLogger(__name__)
|
||||
|
||||
DEFAULT_ENDPOINT = 'https://iap.flectra.com'
|
||||
DEFAULT_ENDPOINT = 'https://iap.flectrahq.com'
|
||||
|
||||
#----------------------------------------------------------
|
||||
# Helpers for both clients and proxy
|
||||
|
||||
@@ -34,7 +34,7 @@ class Alias(models.Model):
|
||||
def _default_alias_domain(self):
|
||||
return self.env["ir.config_parameter"].sudo().get_param("mail.catchall.domain")
|
||||
|
||||
alias_name = fields.Char('Alias Name', copy=False, help="The name of the email alias, e.g. 'jobs' if you want to catch emails for <jobs@example.flectra.com>")
|
||||
alias_name = fields.Char('Alias Name', copy=False, help="The name of the email alias, e.g. 'jobs' if you want to catch emails for <jobs@example.flectrahq.com>")
|
||||
alias_model_id = fields.Many2one('ir.model', 'Aliased Model', required=True, ondelete="cascade",
|
||||
help="The model (Flectra Document Kind) to which this alias "
|
||||
"corresponds. Any incoming email that does not reply to an "
|
||||
@@ -124,7 +124,7 @@ class Alias(models.Model):
|
||||
def name_get(self):
|
||||
"""Return the mail alias display alias_name, including the implicit
|
||||
mail catchall domain if exists from config otherwise "New Alias".
|
||||
e.g. `jobs@mail.flectra.com` or `jobs` or 'New Alias'
|
||||
e.g. `jobs@mail.flectrahq.com` or `jobs` or 'New Alias'
|
||||
"""
|
||||
res = []
|
||||
for record in self:
|
||||
|
||||
@@ -927,12 +927,12 @@ QUnit.test('display partner mention suggestions on typing "@"', async function (
|
||||
|
||||
this.data['res.partner'].records.push({
|
||||
id: 11,
|
||||
email: "testpartner@flectra.com",
|
||||
email: "testpartner@flectrahq.com",
|
||||
name: "TestPartner",
|
||||
});
|
||||
this.data['res.partner'].records.push({
|
||||
id: 12,
|
||||
email: "testpartner2@flectra.com",
|
||||
email: "testpartner2@flectrahq.com",
|
||||
name: "TestPartner2",
|
||||
});
|
||||
this.data['res.users'].records.push({
|
||||
@@ -972,7 +972,7 @@ QUnit.test('mention a partner', async function (assert) {
|
||||
assert.expect(4);
|
||||
|
||||
this.data['res.partner'].records.push({
|
||||
email: "testpartner@flectra.com",
|
||||
email: "testpartner@flectrahq.com",
|
||||
name: "TestPartner",
|
||||
});
|
||||
await this.start();
|
||||
@@ -1026,7 +1026,7 @@ QUnit.test('mention a partner after some text', async function (assert) {
|
||||
assert.expect(5);
|
||||
|
||||
this.data['res.partner'].records.push({
|
||||
email: "testpartner@flectra.com",
|
||||
email: "testpartner@flectrahq.com",
|
||||
name: "TestPartner",
|
||||
});
|
||||
await this.start();
|
||||
@@ -1089,7 +1089,7 @@ QUnit.test('add an emoji after a partner mention', async function (assert) {
|
||||
assert.expect(5);
|
||||
|
||||
this.data['res.partner'].records.push({
|
||||
email: "testpartner@flectra.com",
|
||||
email: "testpartner@flectrahq.com",
|
||||
name: "TestPartner",
|
||||
});
|
||||
await this.start();
|
||||
|
||||
+2
-2
@@ -76,7 +76,7 @@ QUnit.test('partner mention suggestion correct data', async function (assert) {
|
||||
model: 'mail.channel',
|
||||
});
|
||||
const partner = this.env.models['mail.partner'].create({
|
||||
email: "demo_user@flectra.com",
|
||||
email: "demo_user@flectrahq.com",
|
||||
id: 7,
|
||||
im_status: 'online',
|
||||
name: "Demo User",
|
||||
@@ -115,7 +115,7 @@ QUnit.test('partner mention suggestion correct data', async function (assert) {
|
||||
);
|
||||
assert.strictEqual(
|
||||
document.querySelector(`.o_ComposerSuggestion_part2`).textContent,
|
||||
"(demo_user@flectra.com)",
|
||||
"(demo_user@flectrahq.com)",
|
||||
"Partner's email should be displayed"
|
||||
);
|
||||
});
|
||||
|
||||
@@ -38,7 +38,7 @@ QUnit.test('reply: discard on pressing escape', async function (assert) {
|
||||
|
||||
// partner expected to be found by mention
|
||||
this.data['res.partner'].records.push({
|
||||
email: "testpartnert@flectra.com",
|
||||
email: "testpartnert@flectrahq.com",
|
||||
id: 11,
|
||||
name: "TestPartner",
|
||||
});
|
||||
|
||||
@@ -1132,7 +1132,7 @@ QUnit.test('Post a message containing an email address followed by a mention on
|
||||
this.data['mail.channel'].records.push({ id: 11 });
|
||||
this.data['res.partner'].records.push({
|
||||
id: 25,
|
||||
email: "testpartner@flectra.com",
|
||||
email: "testpartner@flectrahq.com",
|
||||
name: "TestPartner",
|
||||
});
|
||||
await this.start();
|
||||
@@ -1146,7 +1146,7 @@ QUnit.test('Post a message containing an email address followed by a mention on
|
||||
});
|
||||
await this.createThreadViewComponent(threadViewer.threadView, { hasComposer: true });
|
||||
document.querySelector('.o_ComposerTextInput_textarea').focus();
|
||||
await afterNextRender(() => document.execCommand('insertText', false, "email@flectra.com\n"));
|
||||
await afterNextRender(() => document.execCommand('insertText', false, "email@flectrahq.com\n"));
|
||||
await afterNextRender(() => {
|
||||
["@", "T", "e"].forEach((char)=>{
|
||||
document.execCommand('insertText', false, char);
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
</div>
|
||||
<div class="col-12 col-lg-6 o_setting_box"
|
||||
id="email_servers_setting"
|
||||
title="Using your own email server is required to send/receive emails in Community and Enterprise versions. Online users already benefit from a ready-to-use email server (@mycompany.flectra.com).">
|
||||
title="Using your own email server is required to send/receive emails in Community and Enterprise versions. Online users already benefit from a ready-to-use email server (@mycompany.flectrahq.com).">
|
||||
<div class="o_setting_left_pane">
|
||||
<field name="external_email_server_default"/>
|
||||
</div>
|
||||
@@ -38,7 +38,7 @@
|
||||
<div class="content-group" attrs="{'invisible': [('external_email_server_default', '=', False)]}">
|
||||
<div class="row mt16" id="mail_alias_domain">
|
||||
<label for="alias_domain" class="col-lg-3 o_light_label"/>
|
||||
<field name="alias_domain" placeholder="mycompany.flectra.com"/>
|
||||
<field name="alias_domain" placeholder="mycompany.flectrahq.com"/>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -164,7 +164,7 @@
|
||||
|
||||
<record id="mass_mail_1_stat_0" model="mailing.trace">
|
||||
<field name="mass_mailing_id" ref="mass_mail_1"/>
|
||||
<field name="message_id">1111000@flectra.com</field>
|
||||
<field name="message_id">1111000@flectrahq.com</field>
|
||||
<field name="model">res.partner</field>
|
||||
<field name="res_id" ref="base.res_partner_address_7"/>
|
||||
<field name="email">billy.fox45@example.com</field>
|
||||
@@ -174,7 +174,7 @@
|
||||
</record>
|
||||
<record id="mass_mail_1_stat_1" model="mailing.trace">
|
||||
<field name="mass_mailing_id" ref="mass_mail_1"/>
|
||||
<field name="message_id">1111001@flectra.com</field>
|
||||
<field name="message_id">1111001@flectrahq.com</field>
|
||||
<field name="model">res.partner</field>
|
||||
<field name="res_id" ref="base.res_partner_address_13"/>
|
||||
<field name="email">kim.snyder96@example.com</field>
|
||||
@@ -184,7 +184,7 @@
|
||||
</record>
|
||||
<record id="mass_mail_1_stat_2" model="mailing.trace">
|
||||
<field name="mass_mailing_id" ref="mass_mail_1"/>
|
||||
<field name="message_id">1111002@flectra.com</field>
|
||||
<field name="message_id">1111002@flectrahq.com</field>
|
||||
<field name="model">res.partner</field>
|
||||
<field name="res_id" ref="base.res_partner_address_14"/>
|
||||
<field name="email">edith.sanchez68@example.com</field>
|
||||
@@ -193,7 +193,7 @@
|
||||
</record>
|
||||
<record id="mass_mail_1_stat_3" model="mailing.trace">
|
||||
<field name="mass_mailing_id" ref="mass_mail_1"/>
|
||||
<field name="message_id">1111003@flectra.com</field>
|
||||
<field name="message_id">1111003@flectrahq.com</field>
|
||||
<field name="model">res.partner</field>
|
||||
<field name="res_id" ref="base.res_partner_address_24"/>
|
||||
<field name="email">theodore.gardner36@example.com</field>
|
||||
@@ -202,7 +202,7 @@
|
||||
</record>
|
||||
<record id="mass_mail_1_stat_4" model="mailing.trace">
|
||||
<field name="mass_mailing_id" ref="mass_mail_1"/>
|
||||
<field name="message_id">1111004@flectra.com</field>
|
||||
<field name="message_id">1111004@flectrahq.com</field>
|
||||
<field name="model">res.partner</field>
|
||||
<field name="res_id" ref="base.res_partner_address_32"/>
|
||||
<field name="email">sandra.neal80@example.com</field>
|
||||
@@ -210,7 +210,7 @@
|
||||
</record>
|
||||
<record id="mass_mail_1_stat_5" model="mailing.trace">
|
||||
<field name="mass_mailing_id" ref="mass_mail_1"/>
|
||||
<field name="message_id">1111005@flectra.com</field>
|
||||
<field name="message_id">1111005@flectrahq.com</field>
|
||||
<field name="model">res.partner</field>
|
||||
<field name="res_id" ref="base.res_partner_address_33"/>
|
||||
<field name="email">julie.richards84@example.com</field>
|
||||
@@ -219,7 +219,7 @@
|
||||
</record>
|
||||
<record id="mass_mail_1_stat_6" model="mailing.trace">
|
||||
<field name="mass_mailing_id" ref="mass_mail_1"/>
|
||||
<field name="message_id">1111006@flectra.com</field>
|
||||
<field name="message_id">1111006@flectrahq.com</field>
|
||||
<field name="model">res.partner</field>
|
||||
<field name="res_id" ref="base.res_partner_address_34"/>
|
||||
<field name="email">travis.mendoza24@example.com</field>
|
||||
@@ -228,7 +228,7 @@
|
||||
</record>
|
||||
<record id="mass_mail_1_stat_7" model="mailing.trace">
|
||||
<field name="mass_mailing_id" ref="mass_mail_1"/>
|
||||
<field name="message_id">1111007@flectra.com</field>
|
||||
<field name="message_id">1111007@flectrahq.com</field>
|
||||
<field name="model">res.partner</field>
|
||||
<field name="res_id" ref="base.res_partner_address_34"/>
|
||||
<field name="email">travis.mendoza24@example.com</field>
|
||||
|
||||
@@ -76,16 +76,16 @@ class MassMailingList(models.Model):
|
||||
'src_lists' after the merge except the destination mailing list 'self'.
|
||||
"""
|
||||
# Explation of the SQL query with an example. There are the following lists
|
||||
# A (id=4): yti@flectra.com; yti@example.com
|
||||
# B (id=5): yti@flectra.com; yti@openerp.com
|
||||
# A (id=4): yti@flectrahq.com; yti@example.com
|
||||
# B (id=5): yti@flectrahq.com; yti@openerp.com
|
||||
# C (id=6): nothing
|
||||
# To merge the mailing lists A and B into C, we build the view st that looks
|
||||
# like this with our example:
|
||||
#
|
||||
# contact_id | email | row_number | list_id |
|
||||
# ------------+---------------------------+------------------------
|
||||
# 4 | yti@flectra.com | 1 | 4 |
|
||||
# 6 | yti@flectra.com | 2 | 5 |
|
||||
# 4 | yti@flectrahq.com | 1 | 4 |
|
||||
# 6 | yti@flectrahq.com | 2 | 5 |
|
||||
# 5 | yti@example.com | 1 | 4 |
|
||||
# 7 | yti@openerp.com | 1 | 5 |
|
||||
#
|
||||
|
||||
@@ -213,14 +213,14 @@ class TestMassMailFeatures(MassMailCommon):
|
||||
'subject': 'TestShortener',
|
||||
'body_html': """<div>
|
||||
Hi,
|
||||
% set url = "www.flectra.com"
|
||||
% set url = "www.flectrahq.com"
|
||||
% set httpurl = "https://www.flectra.eu"
|
||||
Website0: <a id="url0" href="https://www.flectra.tz/my/${object.name}">https://www.flectra.tz/my/${object.name}</a>
|
||||
Website1: <a id="url1" href="https://www.flectra.be">https://www.flectra.be</a>
|
||||
Website2: <a id="url2" href="https://${url}">https://${url}</a>
|
||||
Website3: <a id="url3" href="${httpurl}">${httpurl}</a>
|
||||
External1: <a id="url4" href="https://www.example.com/foo/bar?baz=qux">Youpie</a>
|
||||
Email: <a id="url5" href="mailto:test@flectra.com">test@flectra.com</a></div>""",
|
||||
Email: <a id="url5" href="mailto:test@flectrahq.com">test@flectrahq.com</a></div>""",
|
||||
'mailing_model_id': self.env['ir.model']._get('mailing.list').id,
|
||||
'reply_to_mode': 'email',
|
||||
'reply_to': self.email_reply_to,
|
||||
@@ -247,7 +247,7 @@ Email: <a id="url5" href="mailto:test@flectra.com">test@flectra.com</a></div>"""
|
||||
('url2', 'https://flectrahq.com', True),
|
||||
('url3', 'https://www.flectra.eu', True),
|
||||
('url4', 'https://www.example.com/foo/bar?baz=qux', True),
|
||||
('url5', 'mailto:test@flectra.com', False)]:
|
||||
('url5', 'mailto:test@flectrahq.com', False)]:
|
||||
# TDE FIXME: why going to mail message id ? mail.body_html seems to fail, check
|
||||
link_params = {'utm_medium': 'Email', 'utm_source': mailing.name}
|
||||
if link_info[0] == 'url4':
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
<flectra>
|
||||
|
||||
<record id="base.main_company" model="res.company">
|
||||
<field name="pad_server">https://pad.flectra.com</field>
|
||||
<field name="pad_server">https://pad.flectrahq.com</field>
|
||||
</record>
|
||||
|
||||
<record id="base.main_company" model="res.company">
|
||||
|
||||
@@ -10,7 +10,7 @@ from requests.exceptions import ConnectionError, HTTPError
|
||||
|
||||
_logger = logging.getLogger(__name__)
|
||||
|
||||
DEFAULT_ENDPOINT = 'https://partner-autocomplete.flectra.com'
|
||||
DEFAULT_ENDPOINT = 'https://partner-autocomplete.flectrahq.com'
|
||||
|
||||
class ResPartner(models.Model):
|
||||
_name = 'res.partner'
|
||||
|
||||
@@ -38,9 +38,9 @@ flectra.define('partner_autocomplete.tests', function (require) {
|
||||
|
||||
var suggestions = [{
|
||||
name: "Flectra",
|
||||
website: "flectra.com",
|
||||
domain: "flectra.com",
|
||||
logo: "flectra.com/logo.png",
|
||||
website: "flectrahq.com",
|
||||
domain: "flectrahq.com",
|
||||
logo: "flectrahq.com/logo.png",
|
||||
vat: "BE0477472701"
|
||||
}];
|
||||
|
||||
@@ -54,7 +54,7 @@ flectra.define('partner_autocomplete.tests', function (require) {
|
||||
_.each(fieldsToPatch, function (fieldToPatch) {
|
||||
testUtils.mock.patch(fieldToPatch, {
|
||||
_getBase64Image: function (url) {
|
||||
return Promise.resolve(url === "flectra.com/logo.png" ? "flectrabase64" : "");
|
||||
return Promise.resolve(url === "flectrahq.com/logo.png" ? "flectrabase64" : "");
|
||||
},
|
||||
_isOnline: function () {
|
||||
return true;
|
||||
@@ -101,7 +101,7 @@ flectra.define('partner_autocomplete.tests', function (require) {
|
||||
country_id: 20,
|
||||
state_id: false,
|
||||
partner_gid: 1,
|
||||
website: "flectra.com",
|
||||
website: "flectrahq.com",
|
||||
comment: "Comment on Flectra",
|
||||
street: "40 Chaussée de Namur",
|
||||
city: "Ramillies",
|
||||
@@ -208,7 +208,7 @@ flectra.define('partner_autocomplete.tests', function (require) {
|
||||
'</form>',
|
||||
mockRPC: function (route) {
|
||||
if (route === "/web/static/src/img/placeholder.png"
|
||||
|| route === "flectra.com/logo.png"
|
||||
|| route === "flectrahq.com/logo.png"
|
||||
|| route === "data:image/png;base64,flectrabase64") { // land here as it is not valid base64 content
|
||||
return Promise.resolve();
|
||||
}
|
||||
@@ -233,7 +233,7 @@ flectra.define('partner_autocomplete.tests', function (require) {
|
||||
await testUtils.dom.click($dropdown.find("a").first());
|
||||
$input = form.$(".o_field_partner_autocomplete > input");
|
||||
assert.strictEqual($input.val(), "Flectra", "Input value should have been updated to \"Flectra\"");
|
||||
assert.strictEqual(form.$("input.o_field_widget").val(), "flectra.com", "website value should have been updated to \"flectra.com\"");
|
||||
assert.strictEqual(form.$("input.o_field_widget").val(), "flectrahq.com", "website value should have been updated to \"flectrahq.com\"");
|
||||
|
||||
_compareResultFields(assert, form, fields, createData);
|
||||
|
||||
@@ -281,7 +281,7 @@ flectra.define('partner_autocomplete.tests', function (require) {
|
||||
'</form>',
|
||||
mockRPC: function (route) {
|
||||
if (route === "/web/static/src/img/placeholder.png"
|
||||
|| route === "flectra.com/logo.png"
|
||||
|| route === "flectrahq.com/logo.png"
|
||||
|| route === "data:image/png;base64,flectrabase64") { // land here as it is not valid base64 content
|
||||
return Promise.resolve();
|
||||
}
|
||||
|
||||
@@ -118,7 +118,7 @@ class BuckarooForm(BuckarooCommon):
|
||||
'brq_payment': u'573311D081B04069BD6336001611DBD4',
|
||||
'BRQ_PAYMENT_METHOD': u'paypal',
|
||||
'BRQ_SERVICE_PAYPAL_PAYERCOUNTRY': u'NL',
|
||||
'BRQ_SERVICE_PAYPAL_PAYEREMAIL': u'fhe@flectra.com',
|
||||
'BRQ_SERVICE_PAYPAL_PAYEREMAIL': u'fhe@flectrahq.com',
|
||||
'BRQ_SERVICE_PAYPAL_PAYERFIRSTNAME': u'Jan',
|
||||
'BRQ_SERVICE_PAYPAL_PAYERLASTNAME': u'Tester',
|
||||
'BRQ_SERVICE_PAYPAL_PAYERMIDDLENAME': u'de',
|
||||
|
||||
@@ -43,7 +43,7 @@ class PaypalForm(PaypalCommon):
|
||||
def test_10_paypal_form_render(self):
|
||||
base_url = self.env['ir.config_parameter'].get_param('web.base.url')
|
||||
# be sure not to do stupid things
|
||||
self.paypal.write({'paypal_email_account': 'tde+paypal-facilitator@flectra.com', 'fees_active': False})
|
||||
self.paypal.write({'paypal_email_account': 'tde+paypal-facilitator@flectrahq.com', 'fees_active': False})
|
||||
self.assertEqual(self.paypal.state, 'test', 'test without test environment')
|
||||
|
||||
# ----------------------------------------
|
||||
@@ -57,7 +57,7 @@ class PaypalForm(PaypalCommon):
|
||||
|
||||
form_values = {
|
||||
'cmd': '_xclick',
|
||||
'business': 'tde+paypal-facilitator@flectra.com',
|
||||
'business': 'tde+paypal-facilitator@flectrahq.com',
|
||||
'item_name': '%s: test_ref0' % (self.paypal.company_id.name),
|
||||
'item_number': 'test_ref0',
|
||||
'first_name': 'Norbert',
|
||||
@@ -165,7 +165,7 @@ class PaypalForm(PaypalCommon):
|
||||
'address_status': u'unconfirmed',
|
||||
'mc_currency': u'EUR',
|
||||
'shipping': u'0.00',
|
||||
'payer_email': u'tde+buyer@flectra.com',
|
||||
'payer_email': u'tde+buyer@flectrahq.com',
|
||||
'payment_type': u'instant',
|
||||
'mc_gross': u'1.95',
|
||||
'ipn_track_id': u'866df2ccd444b',
|
||||
|
||||
@@ -13,7 +13,7 @@ X-Original-To: {to}
|
||||
Delivered-To: {to}
|
||||
To: {to}
|
||||
cc: {cc}
|
||||
Received: by mail1.flectra.com (Postfix, from userid 10002)
|
||||
Received: by mail1.flectrahq.com (Postfix, from userid 10002)
|
||||
id 5DF9ABFB2A; Fri, 10 Aug 2012 16:16:39 +0200 (CEST)
|
||||
Message-ID: {msg_id}
|
||||
Date: Tue, 29 Nov 2011 12:43:21 +0530
|
||||
|
||||
@@ -22,7 +22,7 @@ class TestPurchaseInvoice(AccountTestInvoicingCommon):
|
||||
).create({
|
||||
'name': 'Purchase user',
|
||||
'login': 'purchaseUser',
|
||||
'email': 'pu@flectra.com',
|
||||
'email': 'pu@flectrahq.com',
|
||||
'groups_id': [(6, 0, [group_purchase_user.id, group_employee.id, group_partner_manager.id])],
|
||||
})
|
||||
|
||||
@@ -73,7 +73,7 @@ class TestPurchaseInvoice(AccountTestInvoicingCommon):
|
||||
purchase_user_2 = self.purchase_user.copy({
|
||||
'name': 'Purchase user 2',
|
||||
'login': 'purchaseUser2',
|
||||
'email': 'pu2@flectra.com',
|
||||
'email': 'pu2@flectrahq.com',
|
||||
})
|
||||
|
||||
purchase_order_form = Form(self.env['purchase.order'].with_user(purchase_user_2))
|
||||
@@ -110,7 +110,7 @@ class TestPurchaseInvoice(AccountTestInvoicingCommon):
|
||||
purchase_user_2 = self.purchase_user.copy({
|
||||
'name': 'Purchase user 2',
|
||||
'login': 'purchaseUser2',
|
||||
'email': 'pu2@flectra.com',
|
||||
'email': 'pu2@flectrahq.com',
|
||||
})
|
||||
|
||||
purchase_order_form = Form(self.env['purchase.order'].with_user(purchase_user_2))
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
from flectra import api, models
|
||||
from flectra.addons.iap.tools import iap_tools
|
||||
|
||||
DEFAULT_ENDPOINT = 'https://iap-sms.flectra.com'
|
||||
DEFAULT_ENDPOINT = 'https://iap-sms.flectrahq.com'
|
||||
|
||||
|
||||
class SmsApi(models.AbstractModel):
|
||||
|
||||
@@ -112,7 +112,7 @@ var SmsWidget = FieldTextEmojis.extend({
|
||||
*/
|
||||
_renderIAPButton: function () {
|
||||
return $('<a>', {
|
||||
'href': 'https://iap-services.flectra.com/iap/sms/pricing',
|
||||
'href': 'https://iap-services.flectrahq.com/iap/sms/pricing',
|
||||
'target': '_blank',
|
||||
'title': _t('SMS Pricing'),
|
||||
'aria-label': _t('SMS Pricing'),
|
||||
|
||||
@@ -7,7 +7,7 @@ from flectra import fields, models, api, _
|
||||
from flectra.addons.iap.tools import iap_tools
|
||||
from flectra.tools.safe_eval import safe_eval
|
||||
|
||||
DEFAULT_ENDPOINT = 'https://iap-snailmail.flectra.com'
|
||||
DEFAULT_ENDPOINT = 'https://iap-snailmail.flectrahq.com'
|
||||
PRINT_ENDPOINT = '/iap/snailmail/1/print'
|
||||
DEFAULT_TIMEOUT = 30
|
||||
|
||||
@@ -270,7 +270,7 @@ class SnailmailLetter(models.Model):
|
||||
return _('You don\'t have enough credits to perform this operation.<br>Please go to your <a href=%s target="new">iap account</a>.', link)
|
||||
if error == 'TRIAL_ERROR':
|
||||
link = self.env['iap.account'].get_credits_url(service_name='snailmail', trial=True)
|
||||
return _('You don\'t have an IAP account registered for this service.<br>Please go to <a href=%s target="new">iap.flectra.com</a> to claim your free credits.', link)
|
||||
return _('You don\'t have an IAP account registered for this service.<br>Please go to <a href=%s target="new">iap.flectrahq.com</a> to claim your free credits.', link)
|
||||
if error == 'NO_PRICE_AVAILABLE':
|
||||
return _('The country of the partner is not covered by Snailmail.')
|
||||
if error == 'MISSING_REQUIRED_FIELDS':
|
||||
|
||||
@@ -190,7 +190,7 @@ Received: by mail.example.com (Postfix, from userid 10002)
|
||||
id E8166BFACB; Fri, 23 Aug 2013 13:18:02 +0200 (CEST)
|
||||
From: "Bruce Wayne" <bruce@wayneenterprises.com>
|
||||
Subject: test
|
||||
Message-ID: <c0c20fdd-a38e-b296-865b-d9232bf30ce5@flectra.com>
|
||||
Message-ID: <c0c20fdd-a38e-b296-865b-d9232bf30ce5@flectrahq.com>
|
||||
Date: Mon, 26 Aug 2019 16:55:09 +0200
|
||||
MIME-Version: 1.0
|
||||
Content-Type: multipart/mixed;
|
||||
@@ -329,13 +329,13 @@ AAAAACwAAAAAAgACAAAEA3DJFQA7
|
||||
MAIL_EML_ATTACHMENT = """Subject: Re: test attac
|
||||
From: {email_from}
|
||||
To: {to}
|
||||
References: <f3b9f8f8-28fa-2543-cab2-7aa68f679ebb@flectra.com>
|
||||
Message-ID: <cb7eaf62-58dc-2017-148c-305d0c78892f@flectra.com>
|
||||
References: <f3b9f8f8-28fa-2543-cab2-7aa68f679ebb@flectrahq.com>
|
||||
Message-ID: <cb7eaf62-58dc-2017-148c-305d0c78892f@flectrahq.com>
|
||||
Date: Wed, 14 Mar 2018 14:26:58 +0100
|
||||
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101
|
||||
Thunderbird/52.6.0
|
||||
MIME-Version: 1.0
|
||||
In-Reply-To: <f3b9f8f8-28fa-2543-cab2-7aa68f679ebb@flectra.com>
|
||||
In-Reply-To: <f3b9f8f8-28fa-2543-cab2-7aa68f679ebb@flectrahq.com>
|
||||
Content-Type: multipart/mixed;
|
||||
boundary="------------A6B5FD5F68F4D73ECD739009"
|
||||
Content-Language: en-US
|
||||
@@ -384,33 +384,33 @@ ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc
|
||||
7wXuo/gpYe6E2cPuS2opei8AzjEhYTNzlYXTPvaoxCCTTjfGTaPv22TeRDehuIXngSEl
|
||||
Nmmw==
|
||||
ARC-Authentication-Results: i=1; mx.google.com;
|
||||
dkim=pass header.i=@flectra.com header.s=mail header.b=MCzhjB9b;
|
||||
spf=pass (google.com: domain of soup@flectra.com designates 149.202.180.44 as permitted sender) smtp.mailfrom=soup@flectra.com;
|
||||
dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=flectra.com
|
||||
Return-Path: <soup@flectra.com>
|
||||
Received: from mail2.flectra.com (mail2.flectra.com. [149.202.180.44])
|
||||
dkim=pass header.i=@flectrahq.com header.s=mail header.b=MCzhjB9b;
|
||||
spf=pass (google.com: domain of soup@flectrahq.com designates 149.202.180.44 as permitted sender) smtp.mailfrom=soup@flectrahq.com;
|
||||
dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=flectrahq.com
|
||||
Return-Path: <soup@flectrahq.com>
|
||||
Received: from mail2.flectrahq.com (mail2.flectrahq.com. [149.202.180.44])
|
||||
by mx.google.com with ESMTPS id y4si4279200wmy.148.2018.03.05.01.19.22
|
||||
(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
|
||||
Mon, 05 Mar 2018 01:19:23 -0800 (PST)
|
||||
Received-SPF: pass (google.com: domain of soup@flectra.com designates 149.202.180.44 as permitted sender) client-ip=149.202.180.44;
|
||||
Received-SPF: pass (google.com: domain of soup@flectrahq.com designates 149.202.180.44 as permitted sender) client-ip=149.202.180.44;
|
||||
Authentication-Results: mx.google.com;
|
||||
dkim=pass header.i=@flectra.com header.s=mail header.b=MCzhjB9b;
|
||||
spf=pass (google.com: domain of soup@flectra.com designates 149.202.180.44 as permitted sender) smtp.mailfrom=soup@flectra.com;
|
||||
dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=flectra.com
|
||||
dkim=pass header.i=@flectrahq.com header.s=mail header.b=MCzhjB9b;
|
||||
spf=pass (google.com: domain of soup@flectrahq.com designates 149.202.180.44 as permitted sender) smtp.mailfrom=soup@flectrahq.com;
|
||||
dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=flectrahq.com
|
||||
Received: from [10.10.31.24] (unknown [91.183.114.50])
|
||||
(Authenticated sender: soup)
|
||||
by mail2.flectra.com (Postfix) with ESMTPSA id 7B571A4085
|
||||
for <what@flectra.com>; Mon, 5 Mar 2018 10:19:21 +0100 (CET)
|
||||
DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=flectra.com; s=mail;
|
||||
by mail2.flectrahq.com (Postfix) with ESMTPSA id 7B571A4085
|
||||
for <what@flectrahq.com>; Mon, 5 Mar 2018 10:19:21 +0100 (CET)
|
||||
DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=flectrahq.com; s=mail;
|
||||
t=1520241562; bh=L2r7Sp/vjogIdM1k8H9zDGDjnhKolsTTLLjndnFC4Jc=;
|
||||
h=To:From:Subject:Date:From;
|
||||
b=MCzhjB9bnsrJ3uKjq+GjujFxmtrq3fc7Vv7Vg2C72EPKnkxgqy6yPjWKtXbBlaiT3
|
||||
YjKI24aiSQlOeOPQiqFgiDzeqqemNDp+CRuhoYz1Vbz+ESRaHtkWRLb7ZjvohS2k7e
|
||||
RTq7tUxY2nUL2YrNHV7DFYtJVBwiTuyLP6eAiJdE=
|
||||
To: what@flectra.com
|
||||
From: Soup <soup@flectra.com>
|
||||
To: what@flectrahq.com
|
||||
From: Soup <soup@flectrahq.com>
|
||||
Subject: =?UTF-8?Q?Soupe_du_jour_:_Pois_cass=c3=a9s?=
|
||||
Message-ID: <a05d8334-7b7c-df68-c96a-4a88ed19f31b@flectra.com>
|
||||
Message-ID: <a05d8334-7b7c-df68-c96a-4a88ed19f31b@flectrahq.com>
|
||||
Date: Mon, 5 Mar 2018 10:19:21 +0100
|
||||
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101
|
||||
Thunderbird/52.6.0
|
||||
@@ -421,7 +421,7 @@ Content-Language: en-US
|
||||
X-Spam-Status: No, score=-1.2 required=5.0 tests=ALL_TRUSTED,BAYES_00,
|
||||
HTML_IMAGE_ONLY_08,HTML_MESSAGE,T_REMOTE_IMAGE autolearn=no
|
||||
autolearn_force=no version=3.4.0
|
||||
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mail2.flectra.com
|
||||
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mail2.flectrahq.com
|
||||
|
||||
This is a multi-part message in MIME format.
|
||||
--------------1F2D18B1129FC2F0B9EECF50
|
||||
|
||||
@@ -326,7 +326,7 @@ class TestMessageAccess(TestMailCommon):
|
||||
test_record = self.env['mail.test.simple'].with_context(self._test_context).create({'name': 'Test', 'email_from': 'ignasse@example.com'})
|
||||
partner_1 = self.env['res.partner'].create({
|
||||
'name': 'Jitendra Prajapati (jpr-flectra)',
|
||||
'email': 'jpr@flectra.com',
|
||||
'email': 'jpr@flectrahq.com',
|
||||
})
|
||||
test_record.message_subscribe((partner_1 | self.user_admin.partner_id).ids)
|
||||
|
||||
|
||||
@@ -24,7 +24,7 @@ class TestFlectrabot(TestMailCommon, TestRecipients):
|
||||
'partner_ids': [],
|
||||
'subtype_xmlid': 'mail.mt_comment'
|
||||
}
|
||||
cls.flectrabot_ping_body = '<a href="http://flectra.com/web#model=res.partner&id=%s" class="o_mail_redirect" data-oe-id="%s" data-oe-model="res.partner" target="_blank">@FlectraBot</a>' % (cls.flectrabot.id, cls.flectrabot.id)
|
||||
cls.flectrabot_ping_body = '<a href="http://flectrahq.com/web#model=res.partner&id=%s" class="o_mail_redirect" data-oe-id="%s" data-oe-model="res.partner" target="_blank">@FlectraBot</a>' % (cls.flectrabot.id, cls.flectrabot.id)
|
||||
cls.test_record_employe = cls.test_record.with_user(cls.user_employee)
|
||||
|
||||
@mute_logger('flectra.addons.mail.models.mail_mail')
|
||||
|
||||
@@ -20,7 +20,7 @@ class LinkTrackerMock(common.BaseCase):
|
||||
def _get_title_from_url(u):
|
||||
return "Test_TITLE"
|
||||
|
||||
self.env['ir.config_parameter'].sudo().set_param('web.base.url', 'https://test.flectra.com')
|
||||
self.env['ir.config_parameter'].sudo().set_param('web.base.url', 'https://test.flectrahq.com')
|
||||
|
||||
link_tracker_title_patch = patch('flectra.addons.link_tracker.models.link_tracker.LinkTracker._get_title_from_url', wraps=_get_title_from_url)
|
||||
link_tracker_title_patch.start()
|
||||
@@ -70,7 +70,7 @@ class TestSMSPost(TestMailFullCommon, LinkTrackerMock):
|
||||
link = self.env['link.tracker'].search([('url', '=', link)])
|
||||
self.assertIn(link.short_url, new_body)
|
||||
|
||||
link = 'https://test.flectra.com/my/super_page?test[0]=42&toto=áâà#title3'
|
||||
link = 'https://test.flectrahq.com/my/super_page?test[0]=42&toto=áâà#title3'
|
||||
self.env['link.tracker'].search([('url', '=', link)]).unlink()
|
||||
new_body = self.env['mail.render.mixin']._shorten_links_text('Welcome to %s !' % link, self.tracker_values)
|
||||
self.assertNotIn(link, new_body)
|
||||
@@ -84,14 +84,14 @@ class TestSMSPost(TestMailFullCommon, LinkTrackerMock):
|
||||
self.assertIn(link.short_url, new_body)
|
||||
|
||||
def test_body_link_shorten_wshort(self):
|
||||
link = 'https://test.flectra.com/r/RAOUL'
|
||||
link = 'https://test.flectrahq.com/r/RAOUL'
|
||||
self.env['link.tracker'].search([('url', '=', link)]).unlink()
|
||||
new_body = self.env['mail.render.mixin']._shorten_links_text('Welcome to %s !' % link, self.tracker_values)
|
||||
self.assertIn(link, new_body)
|
||||
self.assertFalse(self.env['link.tracker'].search([('url', '=', link)]))
|
||||
|
||||
def test_body_link_shorten_wunsubscribe(self):
|
||||
link = 'https://test.flectra.com/sms/3/'
|
||||
link = 'https://test.flectrahq.com/sms/3/'
|
||||
self.env['link.tracker'].search([('url', '=', link)]).unlink()
|
||||
new_body = self.env['mail.render.mixin']._shorten_links_text('Welcome to %s !' % link, self.tracker_values)
|
||||
self.assertIn(link, new_body)
|
||||
@@ -105,28 +105,28 @@ class TestSMSPost(TestMailFullCommon, LinkTrackerMock):
|
||||
})
|
||||
|
||||
sms_0 = self.env['sms.sms'].create({
|
||||
'body': 'Welcome to https://test.flectra.com',
|
||||
'body': 'Welcome to https://test.flectrahq.com',
|
||||
'number': '12',
|
||||
'mailing_id': mailing.id,
|
||||
})
|
||||
sms_1 = self.env['sms.sms'].create({
|
||||
'body': 'Welcome to https://test.flectra.com/r/RAOUL',
|
||||
'body': 'Welcome to https://test.flectrahq.com/r/RAOUL',
|
||||
'number': '12',
|
||||
})
|
||||
sms_2 = self.env['sms.sms'].create({
|
||||
'body': 'Welcome to https://test.flectra.com/r/RAOUL',
|
||||
'body': 'Welcome to https://test.flectrahq.com/r/RAOUL',
|
||||
'number': '12', 'mailing_id': mailing.id,
|
||||
})
|
||||
sms_3 = self.env['sms.sms'].create({
|
||||
'body': 'Welcome to https://test.flectra.com/leodagan/r/RAOUL',
|
||||
'body': 'Welcome to https://test.flectrahq.com/leodagan/r/RAOUL',
|
||||
'number': '12', 'mailing_id': mailing.id,
|
||||
})
|
||||
|
||||
res = (sms_0 | sms_1 | sms_2 | sms_3)._update_body_short_links()
|
||||
self.assertEqual(res[sms_0.id], 'Welcome to https://test.flectra.com')
|
||||
self.assertEqual(res[sms_1.id], 'Welcome to https://test.flectra.com/r/RAOUL')
|
||||
self.assertEqual(res[sms_2.id], 'Welcome to https://test.flectra.com/r/RAOUL/s/%s' % sms_2.id)
|
||||
self.assertEqual(res[sms_3.id], 'Welcome to https://test.flectra.com/leodagan/r/RAOUL')
|
||||
self.assertEqual(res[sms_0.id], 'Welcome to https://test.flectrahq.com')
|
||||
self.assertEqual(res[sms_1.id], 'Welcome to https://test.flectrahq.com/r/RAOUL')
|
||||
self.assertEqual(res[sms_2.id], 'Welcome to https://test.flectrahq.com/r/RAOUL/s/%s' % sms_2.id)
|
||||
self.assertEqual(res[sms_3.id], 'Welcome to https://test.flectrahq.com/leodagan/r/RAOUL')
|
||||
|
||||
def test_sms_send_batch_size(self):
|
||||
self.count = 0
|
||||
|
||||
@@ -1316,7 +1316,7 @@ class Session(http.Controller):
|
||||
'state': json.dumps({'d': request.db, 'u': ICP.get_param('web.base.url')}),
|
||||
'scope': 'userinfo',
|
||||
}
|
||||
return 'https://accounts.flectra.com/oauth2/auth?' + url_encode(params)
|
||||
return 'https://accounts.flectrahq.com/oauth2/auth?' + url_encode(params)
|
||||
|
||||
@http.route('/web/session/destroy', type='json', auth="user")
|
||||
def destroy(self):
|
||||
|
||||
+4
-4
@@ -1,12 +1,12 @@
|
||||
<p class="logo"><a href="https://doc.flectra.com/">
|
||||
<p class="logo"><a href="https://doc.flectrahq.com/">
|
||||
<img class="logo" src="{{ pathto('_static/openerp.png', 1) }}" alt="Logo"/>
|
||||
</a></p>
|
||||
|
||||
<h3>Other Docs</h3>
|
||||
<ul>
|
||||
<li><a href="https://doc.flectra.com/trunk">Flectra Developers Documentation</a></li>
|
||||
<li><a href="https://doc.flectra.com/trunk/server">Flectra Server Developers Documentation</a></li>
|
||||
<li><a href="https://doc.flectra.com/book">Flectra Users Documentation</a></li>
|
||||
<li><a href="https://doc.flectrahq.com/trunk">Flectra Developers Documentation</a></li>
|
||||
<li><a href="https://doc.flectrahq.com/trunk/server">Flectra Server Developers Documentation</a></li>
|
||||
<li><a href="https://doc.flectrahq.com/book">Flectra Users Documentation</a></li>
|
||||
</ul>
|
||||
|
||||
<h3>Useful Links</h3>
|
||||
|
||||
@@ -70,7 +70,7 @@ var UserMenu = Widget.extend({
|
||||
})
|
||||
.guardedCatch(function (result, ev){
|
||||
ev.preventDefault();
|
||||
framework.redirect('https://accounts.flectra.com/account');
|
||||
framework.redirect('https://accounts.flectrahq.com/account');
|
||||
});
|
||||
},
|
||||
});
|
||||
|
||||
@@ -20,7 +20,7 @@ from flectra.tools.misc import file_open
|
||||
from ..models.ir_attachment import SUPPORTED_IMAGE_MIMETYPES
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
DEFAULT_LIBRARY_ENDPOINT = 'https://media-api.flectra.com'
|
||||
DEFAULT_LIBRARY_ENDPOINT = 'https://media-api.flectrahq.com'
|
||||
|
||||
class Web_Editor(http.Controller):
|
||||
#------------------------------------------------------
|
||||
|
||||
@@ -27,7 +27,7 @@
|
||||
</li>
|
||||
<li class="divider"></li>
|
||||
<li>
|
||||
<a data-menu="account" href="https://accounts.flectra.com/web/login?">My flectra.com account</a>
|
||||
<a data-menu="account" href="https://accounts.flectrahq.com/web/login?">My flectrahq.com account</a>
|
||||
</li>
|
||||
<li>
|
||||
<a data-menu="logout" href="/web/session/logout?redirect=/">Log out</a>
|
||||
|
||||
@@ -160,7 +160,7 @@ class Http(models.AbstractModel):
|
||||
@classmethod
|
||||
def _dispatch(cls):
|
||||
"""
|
||||
In case of rerouting for translate (e.g. when visiting flectra.com/fr_BE/),
|
||||
In case of rerouting for translate (e.g. when visiting flectrahq.com/fr_BE/),
|
||||
_dispatch calls reroute() that returns _dispatch with altered request properties.
|
||||
The second _dispatch will continue until end of process. When second _dispatch is finished, the first _dispatch
|
||||
call receive the new altered request and continue.
|
||||
|
||||
@@ -103,7 +103,7 @@
|
||||
Display this website when users visit this domain
|
||||
</div>
|
||||
<div class="mt8">
|
||||
<field name="website_domain" placeholder="www.flectra.com"/>
|
||||
<field name="website_domain" placeholder="www.flectrahq.com"/>
|
||||
</div>
|
||||
<div groups="base.group_no_one">
|
||||
<div class="mt8 text-muted" title="You can have 2 websites with same domain AND a condition on country group to select wich website use.">
|
||||
|
||||
@@ -82,7 +82,7 @@
|
||||
<li>Point of Sale (POS), Introduction to report customization.</li>
|
||||
</ul>
|
||||
|
||||
<p>For any additional information, please contact us at <a href="mailto:events@flectra.com">events@flectra.com</a></p>
|
||||
<p>For any additional information, please contact us at <a href="mailto:events@flectrahq.com">events@flectrahq.com</a></p>
|
||||
|
||||
<section class="s_we_speaker bg-200 p-3 mb-4" itemscope="itemscope" itemtype="http://schema.org/Person" itemprop="performer">
|
||||
<span class="badge badge-secondary o_wevent_badge float-right">SPEAKER</span>
|
||||
|
||||
@@ -4,13 +4,13 @@
|
||||
<field name="event_id" ref="event.event_0"/>
|
||||
<field name="sponsor_type_id" ref="event_sponsor_type1"/>
|
||||
<field name="partner_id" ref="base.res_partner_2"/>
|
||||
<field name="url">http://flectra.com</field>
|
||||
<field name="url">http://flectrahq.com</field>
|
||||
</record>
|
||||
<record id="event_sponsor_1" model="event.sponsor">
|
||||
<field name="event_id" ref="event.event_0"/>
|
||||
<field name="sponsor_type_id" ref="event_sponsor_type2"/>
|
||||
<field name="partner_id" ref="base.res_partner_12"/>
|
||||
<field name="url">http://flectra.com</field>
|
||||
<field name="url">http://flectrahq.com</field>
|
||||
</record>
|
||||
<record id="event_sponsor_2" model="event.sponsor">
|
||||
<field name="event_id" ref="event.event_0"/>
|
||||
@@ -21,7 +21,7 @@
|
||||
<field name="event_id" ref="event.event_0"/>
|
||||
<field name="sponsor_type_id" ref="event_sponsor_type3"/>
|
||||
<field name="partner_id" ref="base.res_partner_4"/>
|
||||
<field name="url">http://flectra.com</field>
|
||||
<field name="url">http://flectrahq.com</field>
|
||||
</record>
|
||||
|
||||
<record id="event_7_sponsor_0" model="event.sponsor">
|
||||
|
||||
@@ -62,7 +62,7 @@ In simple words does Flectra became CMS+ERP platform?</p>]]></field>
|
||||
<field name="forum_id" ref="website_forum.forum_help"/>
|
||||
<field name="name">Re: CMS replacement for ERP and eCommerce</field>
|
||||
<field name="content"><![CDATA[
|
||||
<p>Flectra v8 provides a web module and an e-commerce module: www.flectra.com/page/website-builder
|
||||
<p>Flectra v8 provides a web module and an e-commerce module: www.flectrahq.com/page/website-builder
|
||||
The CMS editor in Flectra web is nice but I prefer Drupal for customization and there is a Drupal module for Flectra. I think WP is better than Flectra web too.
|
||||
</p>]]></field>
|
||||
<field name="parent_id" ref="question_1"/>
|
||||
|
||||
@@ -52,7 +52,7 @@ flectra.define('website_sale_tour.tour', function (require) {
|
||||
run: function () {
|
||||
$('input[name="name"]').val('abc');
|
||||
$('input[name="phone"]').val('99999999');
|
||||
$('input[name="email"]').val('abc@flectra.com');
|
||||
$('input[name="email"]').val('abc@flectrahq.com');
|
||||
$('input[name="street"]').val('SO1 Billing Street, 33');
|
||||
$('input[name="city"]').val('SO1BillingCity');
|
||||
$('input[name="zip"]').val('10000');
|
||||
@@ -248,7 +248,7 @@ flectra.define('website_sale_tour.tour', function (require) {
|
||||
content: "Submit login",
|
||||
trigger: '.oe_login_form',
|
||||
run: function () {
|
||||
$('.oe_login_form input[name="login"]').val("abc@flectra.com");
|
||||
$('.oe_login_form input[name="login"]').val("abc@flectrahq.com");
|
||||
$('.oe_login_form input[name="password"]').val("1admin@admin");
|
||||
$('.oe_login_form').submit();
|
||||
},
|
||||
@@ -345,7 +345,7 @@ flectra.define('website_sale_tour.tour', function (require) {
|
||||
content: "Submit login",
|
||||
trigger: '.oe_login_form',
|
||||
run: function () {
|
||||
$('.oe_login_form input[name="login"]').val("abc@flectra.com");
|
||||
$('.oe_login_form input[name="login"]').val("abc@flectrahq.com");
|
||||
$('.oe_login_form input[name="password"]').val("1admin@admin");
|
||||
$('.oe_login_form input[name="redirect"]').val("/shop?search=Storage Box Test");
|
||||
$('.oe_login_form').submit();
|
||||
|
||||
@@ -79,6 +79,6 @@ class ResConfigSettings(models.TransientModel):
|
||||
res = super(ResConfigSettings, self).get_values()
|
||||
Params = self.env['ir.config_parameter'].sudo()
|
||||
res.update({
|
||||
'twitter_server_uri': '%s/' % Params.get_param('web.base.url', default='http://yourcompany.flectra.com'),
|
||||
'twitter_server_uri': '%s/' % Params.get_param('web.base.url', default='http://yourcompany.flectrahq.com'),
|
||||
})
|
||||
return res
|
||||
Reference in new issue
Block a user