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 @@ - Flectra.com Accounts + Flectrahq.com Accounts https://accounts.flectra.com/oauth2/auth userinfo https://accounts.flectra.com/oauth2/tokeninfo zocial openerp - Log in with Flectra.com + Log in with Flectrahq.com diff --git a/addons/auth_oauth/views/res_config_settings_views.xml b/addons/auth_oauth/views/res_config_settings_views.xml index 02d0338d..cda060e3 100644 --- a/addons/auth_oauth/views/res_config_settings_views.xml +++ b/addons/auth_oauth/views/res_config_settings_views.xml @@ -27,7 +27,7 @@ @@ -166,7 +166,7 @@ If you have development competencies, we can propose you specific traineeshipsBuilding 1, Second Floor +3281813700 +32486571630 - john@flectra.com + john@flectrahq.com @@ -178,7 +178,7 @@ If you have development competencies, we can propose you specific traineeships Building 1, Second Floor +3281813700 - michael@flectra.com + michael@flectrahq.com @@ -190,7 +190,7 @@ If you have development competencies, we can propose you specific traineeships Building 1, Second Floor +3281813700 - liam@flectra.com + liam@flectrahq.com @@ -202,7 +202,7 @@ If you have development competencies, we can propose you specific traineeships Building 1, Second Floor +3281813700 - david@flectra.com + david@flectrahq.com @@ -215,7 +215,7 @@ If you have development competencies, we can propose you specific traineeships Building 1, Second Floor +3281813700 - gilles@flectra.com + gilles@flectrahq.com @@ -227,7 +227,7 @@ If you have development competencies, we can propose you specific traineeships Building 1, Second Floor +3281813700 - jack@flectra.com + jack@flectrahq.com @@ -239,7 +239,7 @@ If you have development competencies, we can propose you specific traineeships Building 1, Second Floor +3281813700 - martin@flectra.com + martin@flectrahq.com @@ -251,7 +251,7 @@ If you have development competencies, we can propose you specific traineeships Building 1, Second Floor +3281813700 - jimmy@flectra.com + jimmy@flectrahq.com @@ -263,7 +263,7 @@ If you have development competencies, we can propose you specific traineeships Building 1, Second Floor +3281813700 - famke@flectra.com + famke@flectrahq.com @@ -275,7 +275,7 @@ If you have development competencies, we can propose you specific traineeships Building 1, Second Floor +3281813700 - ashley@flectra.com + ashley@flectrahq.com @@ -294,7 +294,7 @@ If you have development competencies, we can propose you specific traineeships Building 1, Second Floor +3282823500 - jve@flectra.com + jve@flectrahq.com @@ -304,7 +304,7 @@ If you have development competencies, we can propose you specific traineeships Building 1, Second Floor +3282823500 - jep@flectra.com + jep@flectrahq.com @@ -314,7 +314,7 @@ If you have development competencies, we can propose you specific traineeships Building 1, Second Floor +3282823500 - jod@flectra.com + jod@flectrahq.com @@ -324,7 +324,7 @@ If you have development competencies, we can propose you specific traineeships Building 1, Second Floor +3282823500 - jog@flectra.com + jog@flectrahq.com @@ -343,7 +343,7 @@ If you have development competencies, we can propose you specific traineeships Building 1, Second Floor +3282823500 - lur@flectra.com + lur@flectrahq.com diff --git a/addons/hr_expense/data/web_planner_data.xml b/addons/hr_expense/data/web_planner_data.xml index c539249d..8b038c1c 100644 --- a/addons/hr_expense/data/web_planner_data.xml +++ b/addons/hr_expense/data/web_planner_data.xml @@ -42,7 +42,7 @@ Expense Types

The first step if to - + configure the expense types that your company allows. Here are some examples: @@ -88,7 +88,7 @@ Recording Mode

As employees, there are - 2 ways to record expenses: + 2 ways to record expenses:

@@ -151,7 +151,7 @@ Submit for Approval

The next step is to settle an internal policy to - submit expenses to managers + submit expenses to managers

@@ -189,7 +189,7 @@

Depending on your company structure, the - approval process + approval process can be:

@@ -243,7 +243,7 @@ Reimbursement

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)

  • - See how to manage payables + See how to manage payables
  • @@ -267,7 +267,7 @@ Invoice Customers

    - 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:

    diff --git a/addons/hr_recruitment/data/hr_recruitment_data.xml b/addons/hr_recruitment/data/hr_recruitment_data.xml index 1b55d0e9..8f8a8384 100644 --- a/addons/hr_recruitment/data/hr_recruitment_data.xml +++ b/addons/hr_recruitment/data/hr_recruitment_data.xml @@ -176,9 +176,7 @@

    Want to learn about us?

      -
    1. Founders' story
    2. -
    3. The Flectra Culture
    4. -
    5. About us
    6. +

    @@ -314,9 +312,7 @@

    Want to learn more?

      -
    1. Founders' story
    2. -
    3. The Flectra Culture
    4. -
    5. About us
    6. +

    diff --git a/addons/hw_posbox_homepage/controllers/main.py b/addons/hw_posbox_homepage/controllers/main.py index 31e50126..be407d9f 100644 --- a/addons/hw_posbox_homepage/controllers/main.py +++ b/addons/hw_posbox_homepage/controllers/main.py @@ -38,13 +38,14 @@ index_template = """

    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

    @@ -76,7 +77,8 @@ class PosboxHomepage(flectra.addons.web.controllers.main.Home): return """

    The activate the customer display feature, you will need to reinstall the PosBox software. - You can find the latest images on the Flectra Nightly builds website. + You can find the latest images on the Flectra Nightly builds website. Make sure to download at least the version 16.
    Flectra version 11, or above, is required to use the customer display feature.

    diff --git a/addons/hw_posbox_upgrade/controllers/main.py b/addons/hw_posbox_upgrade/controllers/main.py index 50776621..9909ca08 100644 --- a/addons/hw_posbox_upgrade/controllers/main.py +++ b/addons/hw_posbox_upgrade/controllers/main.py @@ -68,9 +68,9 @@ upgrade_template = """ internet.

    However the preferred method to upgrade the posbox is to flash the sd-card with - the latest image. The upgrade + the latest image. The upgrade procedure is explained into to the - PosBox manual + PosBox manual

    To upgrade the posbox, click on the upgrade button. The upgrade will take a few minutes. Do not reboot the PosBox during the upgrade. diff --git a/addons/iap/models/iap.py b/addons/iap/models/iap.py index 4482968a..f9304030 100644 --- a/addons/iap/models/iap.py +++ b/addons/iap/models/iap.py @@ -12,7 +12,7 @@ from flectra.tools import pycompat _logger = logging.getLogger(__name__) -DEFAULT_ENDPOINT = 'https://iap.flectra.com' +DEFAULT_ENDPOINT = 'https://www.flectrahq.com' #---------------------------------------------------------- diff --git a/addons/l10n_es/__manifest__.py b/addons/l10n_es/__manifest__.py index f7d2aee0..3fa3ea7e 100644 --- a/addons/l10n_es/__manifest__.py +++ b/addons/l10n_es/__manifest__.py @@ -9,7 +9,7 @@ # Carlos Liébana # Hugo Santos # Albert Cabedo -# Olivier Colson +# Olivier Colson # Roberto Lizana { diff --git a/addons/l10n_fr_certification/data/account_move.xml b/addons/l10n_fr_certification/data/account_move.xml index 4cb6e7be..8de96697 100644 --- a/addons/l10n_fr_certification/data/account_move.xml +++ b/addons/l10n_fr_certification/data/account_move.xml @@ -17,7 +17,7 @@ db_uuid = env['ir.config_parameter'].sudo().get_param('database.uuid') action = {"type": "ir.actions.act_url", - "url": "https://www.flectra.com/my/contract/french-certification/db/" + db_uuid, + "url": "https://www.flectrahq.com/my/contract/french-certification/db/" + db_uuid, "target": "new",} diff --git a/addons/l10n_fr_certification/models/account.py b/addons/l10n_fr_certification/models/account.py index cfadd41f..c97a2036 100644 --- a/addons/l10n_fr_certification/models/account.py +++ b/addons/l10n_fr_certification/models/account.py @@ -141,7 +141,9 @@ class AccountMove(models.Model): From: %(start_move_name)s %(start_move_ref)s To: %(end_move_name)s %(end_move_ref)s - For this report to be legally meaningful, please download your certification from your customer account on Flectra.com (Only for Flectra Enterprise users).''' + For this report to be legally meaningful, please + download your certification from your customer + account on Flectrahq.com (Only for Flectra Enterprise users).''' ) % report_dict) diff --git a/addons/l10n_fr_pos_cert/models/pos.py b/addons/l10n_fr_pos_cert/models/pos.py index 54327072..203258c9 100644 --- a/addons/l10n_fr_pos_cert/models/pos.py +++ b/addons/l10n_fr_pos_cert/models/pos.py @@ -180,7 +180,10 @@ class pos_order(models.Model): From: %(start_order_name)s %(start_order_ref)s recorded on %(start_order_date)s To: %(end_order_name)s %(end_order_ref)s recorded on %(end_order_date)s - For this report to be legally meaningful, please download your certification from your customer account on Flectra.com (Only for Flectra Enterprise users).''' + For this report to be legally meaningful, please + download your certification from your customer + account on flectrahq.com (Only for Flectra + Enterprise users).''' ) % report_dict) diff --git a/addons/mail/models/mail_alias.py b/addons/mail/models/mail_alias.py index 4317d538..8c94713d 100644 --- a/addons/mail/models/mail_alias.py +++ b/addons/mail/models/mail_alias.py @@ -41,7 +41,9 @@ class Alias(models.Model): _rec_name = 'alias_name' _order = 'alias_model_id, alias_name' - alias_name = fields.Char('Alias Name', help="The name of the email alias, e.g. 'jobs' if you want to catch emails for ") + alias_name = fields.Char('Alias Name', help="The name of the email " + "alias, e.g. 'jobs' if you " + "want to catch emails for ") 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 " @@ -129,7 +131,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: diff --git a/addons/mail/static/tests/chatter_tests.js b/addons/mail/static/tests/chatter_tests.js index 3c3b2b6e..b4288c7d 100644 --- a/addons/mail/static/tests/chatter_tests.js +++ b/addons/mail/static/tests/chatter_tests.js @@ -425,7 +425,7 @@ QUnit.test('chatter: post, receive and star messages', function (assert) { } if (args.method === 'get_mention_suggestions') { getSuggestionsDef.resolve(); - return $.when([{email: "test@flectra.com", id: 1, name: "Test User"}]); + return $.when([{email: "test@flectrahq.com", id: 1, name: "Test User"}]); } return this._super(route, args); }, @@ -545,7 +545,8 @@ QUnit.test('chatter: post, receive and star messages', function (assert) { "suggestion's id should be correct"); assert.strictEqual(form.$('.o_mention_proposition .o_mention_name').text(), 'Test User', "suggestion should be displayed correctly"); - assert.strictEqual(form.$('.o_mention_proposition .o_mention_info').text(), '(test@flectra.com)', + assert.strictEqual(form.$('.o_mention_proposition' + + ' .o_mention_info').text(), '(test@flectrahq.com)', "suggestion should be displayed correctly"); BasicComposer.prototype.MENTION_THROTTLE = mentionThrottle; diff --git a/addons/mail/views/mail_templates.xml b/addons/mail/views/mail_templates.xml index f8fc32c6..b57bf01b 100644 --- a/addons/mail/views/mail_templates.xml +++ b/addons/mail/views/mail_templates.xml @@ -71,7 +71,7 @@ View

    - +