diff --git a/CHANGELOG.md b/CHANGELOG.md
index 963f4b44..8bcf3d2a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
# CHANGELOG
-Inception of [Flectra](https://flectrahq.com/) from [Odoo](https://www.odoo.com/).
+Inception of [Flectra](https://www.flectrahq.com/) from [Odoo](https://www.odoo
+.com/).
Flectra is Forked from Odoo v11's commit reference [odoo/odoo@6135e82](https://github.com/odoo/odoo/commit/6135e82d735d5eb3af914f4a838468f6dc33e51d)
diff --git a/README.md b/README.md
index 724421d1..40aec30d 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,8 @@ Project Management,Billing & Accounting,Point of Sale,Human Resources,Market
Purchase Management and many more.
Flectra Apps can be used as stand-alone applications, but they also integrate seamlessly so you get
-a full-featured Open Source ERP when you install several Apps.
+a full-featured Open Source ERP when
+you install several Apps.
Additional Apps for Flectra are available here : https://gitlab.com/flectra-hq/extra-addons
diff --git a/addons/account/__manifest__.py b/addons/account/__manifest__.py
index e6acd599..30eb5120 100644
--- a/addons/account/__manifest__.py
+++ b/addons/account/__manifest__.py
@@ -10,7 +10,7 @@
Core mechanisms for the accounting modules. To display the menuitems, install the module account_invoicing.
""",
'category': 'Accounting',
- 'website': 'https://flectrahq.com/page/billing',
+ 'website': 'https://flectrahq.com/accounting',
'images' : ['images/accounts.jpeg','images/bank_statement.jpeg','images/cash_register.jpeg','images/chart_of_accounts.jpeg','images/customer_invoice.jpeg','images/journal_entries.jpeg'],
'depends' : ['base_setup', 'product', 'analytic', 'web_planner', 'portal'],
'data': [
diff --git a/addons/account/data/mail_template_data.xml b/addons/account/data/mail_template_data.xml
index 25fee8a2..2daacee0 100644
--- a/addons/account/data/mail_template_data.xml
+++ b/addons/account/data/mail_template_data.xml
@@ -128,7 +128,7 @@ from ${object.company_id.name}.
diff --git a/addons/account/models/account_move.py b/addons/account/models/account_move.py
index 5e5513a3..929953d6 100644
--- a/addons/account/models/account_move.py
+++ b/addons/account/models/account_move.py
@@ -1280,7 +1280,6 @@ class AccountMoveLine(models.Model):
# Create tax lines
tax_lines_vals = []
if context.get('apply_taxes') and vals.get('tax_ids'):
- # Get ids from triplets : https://www.flectra.com/documentation/10.0/reference/orm.html#flectra.models.Model.write
tax_ids = [tax['id'] for tax in self.resolve_2many_commands('tax_ids', vals['tax_ids']) if tax.get('id')]
# Since create() receives ids instead of recordset, let's just use the old-api bridge
taxes = self.env['account.tax'].browse(tax_ids)
diff --git a/addons/account_analytic_default/__manifest__.py b/addons/account_analytic_default/__manifest__.py
index aab39487..c8fc2e77 100644
--- a/addons/account_analytic_default/__manifest__.py
+++ b/addons/account_analytic_default/__manifest__.py
@@ -18,7 +18,7 @@ Allows to automatically select analytic accounts based on criterions:
* Company
* Date
""",
- 'website': 'https://flectrahq.com/page/accounting',
+ 'website': 'https://flectrahq.com/accounting',
'depends': ['sale_stock'],
'data': [
'security/ir.model.access.csv',
diff --git a/addons/account_asset/__manifest__.py b/addons/account_asset/__manifest__.py
index 55c0510b..1ea41341 100644
--- a/addons/account_asset/__manifest__.py
+++ b/addons/account_asset/__manifest__.py
@@ -12,7 +12,7 @@ Manage assets owned by a company or a person.
Keeps track of depreciations, and creates corresponding journal entries.
""",
- 'website': 'https://flectrahq.com/page/accounting',
+ 'website': 'https://flectrahq.com/accounting',
'category': 'Accounting',
'sequence': 32,
'demo': [
diff --git a/addons/account_budget/__manifest__.py b/addons/account_budget/__manifest__.py
index 56f86868..31c5afb2 100644
--- a/addons/account_budget/__manifest__.py
+++ b/addons/account_budget/__manifest__.py
@@ -28,7 +28,7 @@ Three reports are available:
3. The last one is available from the Analytic Chart of Accounts. It gives
the spreading, for the selected Analytic Accounts of Budgets.
""",
- 'website': 'https://flectrahq.com/page/accounting',
+ 'website': 'https://flectrahq.com/accounting',
'depends': ['account'],
'data': [
'security/ir.model.access.csv',
diff --git a/addons/account_cancel/__manifest__.py b/addons/account_cancel/__manifest__.py
index a19df70e..d7bea639 100644
--- a/addons/account_cancel/__manifest__.py
+++ b/addons/account_cancel/__manifest__.py
@@ -22,7 +22,7 @@ It also operates on invoices, bank statements, payments ...
Be careful with this module as it has audit implications. Cancelling accounting entries is not authorized in all countries.
""",
- 'website': 'https://flectrahq.com/page/accounting',
+ 'website': 'https://flectrahq.com/accounting',
'depends': ['account'],
'data': ['views/account_views.xml'],
'demo': [],
diff --git a/addons/account_invoicing/__manifest__.py b/addons/account_invoicing/__manifest__.py
index 56450392..2489f35b 100644
--- a/addons/account_invoicing/__manifest__.py
+++ b/addons/account_invoicing/__manifest__.py
@@ -15,7 +15,7 @@ The specific and easy-to-use Invoicing system in Odoo allows you to keep track o
You could use this simplified accounting in case you work with an (external) account to keep your books, and you still want to keep track of payments. This module also offers you an easy method of registering payments, without having to encode complete abstracts of account.
""",
'category': 'Invoicing Management',
- 'website': 'https://flectrahq.com/page/billing',
+ 'website': 'https://flectrahq.com/accounting',
'depends': ['account'],
'data': [
'views/account_menuitem_views.xml',
diff --git a/addons/account_test/__manifest__.py b/addons/account_test/__manifest__.py
index 201459e8..13ed70d4 100644
--- a/addons/account_test/__manifest__.py
+++ b/addons/account_test/__manifest__.py
@@ -9,7 +9,7 @@
'author': 'Odoo S.A',
'version': '1.0',
'category': 'Accounting',
- 'website': 'https://flectrahq.com/page/accounting',
+ 'website': 'https://flectrahq.com/accounting',
'description': """
Asserts on accounting.
======================
diff --git a/addons/account_voucher/__manifest__.py b/addons/account_voucher/__manifest__.py
index d32d13ed..a3278ccc 100644
--- a/addons/account_voucher/__manifest__.py
+++ b/addons/account_voucher/__manifest__.py
@@ -26,7 +26,7 @@ This module manages:
""",
'category': 'Accounting',
'sequence': 20,
- 'website' : 'https://flectrahq.com/page/billing',
+ 'website' : 'https://flectrahq.com/accounting',
'depends' : ['account'],
'demo' : [],
'data' : [
diff --git a/addons/analytic/__manifest__.py b/addons/analytic/__manifest__.py
index 85aa6432..de8f232f 100644
--- a/addons/analytic/__manifest__.py
+++ b/addons/analytic/__manifest__.py
@@ -5,7 +5,7 @@
'name' : 'Analytic Accounting',
'author' : 'Odoo S.A',
'version': '1.1',
- 'website' : 'https://flectrahq.com/page/accounting',
+ 'website' : 'https://flectrahq.com/accounting',
'category': 'Hidden/Dependency',
'depends' : ['base', 'decimal_precision', 'mail'],
'description': """
diff --git a/addons/auth_oauth/__manifest__.py b/addons/auth_oauth/__manifest__.py
index dc003d5c..c93d9441 100644
--- a/addons/auth_oauth/__manifest__.py
+++ b/addons/auth_oauth/__manifest__.py
@@ -12,7 +12,7 @@ Allow users to login through OAuth2 Provider.
'maintainer': 'Odoo S.A.',
'depends': ['base', 'web', 'base_setup', 'auth_signup'],
'data': [
- 'data/auth_oauth_data.xml',
+ # 'data/auth_oauth_data.xml',
'data/auth_oauth_data.yml',
'views/auth_oauth_views.xml',
'views/res_users_views.xml',
diff --git a/addons/auth_oauth/data/auth_oauth_data.xml b/addons/auth_oauth/data/auth_oauth_data.xml
index 01f1150c..980e6df3 100644
--- a/addons/auth_oauth/data/auth_oauth_data.xml
+++ b/addons/auth_oauth/data/auth_oauth_data.xml
@@ -2,13 +2,13 @@
We would be delighted to assist you along the way. Contact us through our
- support form if you have any question.
+ support form if you have any question.
You can also discover how to get the best out of Flectra CRM with our
-
+
User Documentation
or with our
-
+
API Documentation
We are here to help you. If you get stuck, do not hesitate to
- reach our support team or
- browse the documentation.
+ reach our support team or
+ browse the documentation.
Have fun deploying your sales strategy,
diff --git a/addons/crm/data/web_planner_data.xml b/addons/crm/data/web_planner_data.xml
index 3b857fb8..12b1a58b 100644
--- a/addons/crm/data/web_planner_data.xml
+++ b/addons/crm/data/web_planner_data.xml
@@ -22,8 +22,8 @@
it.
Where to find us:
Chamber Works 60, Rosewood Court Detroit, MI 48212 (United States)
-For any additional information, please contact us at events@flectra.com.
+For any additional information, please contact us at events@flectrahq.com.
Best regards,
Luigi Roni, Senior Event Manager
@@ -186,7 +187,8 @@-
For more information on the program, please explore https://www.flectra.com/services/technical-training.
+For more information on the program, please explore https://www.flectrahq.com/services/technical-training.
If you have a question concerning the content of the training, please contact events@yourcompany.com.
Where to find us:
@@ -197,7 +199,7 @@The organization of the training session has related costs. Due to these costs, cancellations made less than 2 weeks (14 calendar days) prior to the start of the training session is a subject to a fee. This fee can be up to a maximum of 1000€ per cancellation request.
We strongly recommend to book your flight tickets and/or hotel reservations 2 weeks prior to the training. If the training is cancelled 2 weeks in advance, you'll be notified by email.
For any additional information, please contact us at events@flectra.com.
+For any additional information, please contact us at events@flectrahq.com.
Best regards,
Luigi Roni, Senior Event Manager
diff --git a/addons/gamification/data/goal_base.xml b/addons/gamification/data/goal_base.xml index 306c2fed..c8a7c7ee 100644 --- a/addons/gamification/data/goal_base.xml +++ b/addons/gamification/data/goal_base.xml @@ -245,7 +245,7 @@ diff --git a/addons/google_account/models/google_service.py b/addons/google_account/models/google_service.py index 4b2bf028..6aedc1fe 100644 --- a/addons/google_account/models/google_service.py +++ b/addons/google_account/models/google_service.py @@ -80,7 +80,8 @@ class GoogleService(models.TransientModel): } get_param = self.env['ir.config_parameter'].sudo().get_param - base_url = get_param('web.base.url', default='http://www.flectra.com?NoBaseUrl') + base_url = get_param('web.base.url', + default='http://www.flectrahq.com?NoBaseUrl') client_id = get_param('google_%s_client_id' % (service,), default=False) encoded_params = urls.url_encode({ @@ -100,7 +101,8 @@ class GoogleService(models.TransientModel): not be redirected. """ get_param = self.env['ir.config_parameter'].sudo().get_param - base_url = get_param('web.base.url', default='http://www.flectra.com?NoBaseUrl') + base_url = get_param('web.base.url', + default='http://www.flectrahq.com?NoBaseUrl') client_id = get_param('google_%s_client_id' % (service,), default=False) client_secret = get_param('google_%s_client_secret' % (service,), default=False) diff --git a/addons/google_calendar/models/google_calendar.py b/addons/google_calendar/models/google_calendar.py index c3d125a1..40614ddc 100644 --- a/addons/google_calendar/models/google_calendar.py +++ b/addons/google_calendar/models/google_calendar.py @@ -901,7 +901,7 @@ class GoogleCalendar(models.AbstractModel): readonly = '.readonly' if RO else '' return 'https://www.googleapis.com/auth/calendar%s' % (readonly) - def authorize_google_uri(self, from_url='http://www.flectra.com'): + def authorize_google_uri(self, from_url='http://www.flectrahq.com'): url = self.env['google.service']._get_authorize_uri(from_url, self.STR_SERVICE, scope=self.get_calendar_scope()) return url diff --git a/addons/google_calendar/models/res_config_settings.py b/addons/google_calendar/models/res_config_settings.py index 2fd9ae51..68f3a5c7 100644 --- a/addons/google_calendar/models/res_config_settings.py +++ b/addons/google_calendar/models/res_config_settings.py @@ -24,6 +24,6 @@ class ResConfigSettings(models.TransientModel): res.update( cal_client_id=get_param('google_calendar_client_id', default=''), cal_client_secret=get_param('google_calendar_client_secret', default=''), - server_uri="%s/google_account/authentication" % get_param('web.base.url', default="http://yourcompany.flectra.com"), + server_uri="%s/google_account/authentication" % get_param('web.base.url', default="http://www.flectrahq.com"), ) return res diff --git a/addons/google_calendar/views/res_config_settings_views.xml b/addons/google_calendar/views/res_config_settings_views.xml index fff91b89..d77228cc 100644 --- a/addons/google_calendar/views/res_config_settings_views.xml +++ b/addons/google_calendar/views/res_config_settings_views.xml @@ -13,7 +13,7 @@
The first step if to
-
+
configure the expense types
that your company allows. Here are some examples:
@@ -88,7 +88,7 @@
As employees, there are - 2 ways to record expenses: + 2 ways to record expenses:
The next step is to settle an internal policy to - submit expenses to managers + submit expenses to managers
Depending on your company structure, the - approval process + approval process can be:
Once expense reports approved by managers, the accounting department checks accounts, products and taxes used. Then they - post them into the books and proceed with the employee reimbursement. + post them into the books and proceed with the employee reimbursement.
To do: @@ -258,7 +258,7 @@ Set Home Address to employees(used for reimbursement)
- If you track expenses on customer projects, you can charge them back to your customers automatically. Here are some advises to avoid conflictual situations: + If you track expenses on customer projects, you can charge them back to your customers automatically. Here are some advises to avoid conflictual situations:
The PosBox is a hardware adapter that allows you to use receipt printers and barcode scanners with Flectra's Point of - Sale, version 8.0 or later. You can start an online free trial, - or download and install it yourself. + Sale, version 8.0 or later. You can start an online free trial, + or download and install it yourself.
For more information on how to setup the Point of Sale with the PosBox, please refer to - the manual. + the manual.
To see the status of the connected hardware, please refer @@ -62,7 +63,7 @@ index_template = """ the posbox version number is independent from Flectra. You can upgrade the software on the upgrade page.
-For any other question, please contact the Flectra support at www.flectra.com/help +
For any other question, please contact the Flectra support at