Skip to content
Permalink
Browse files

Merge branch '11.0' into 11.0-FIX-saas_portal_sale_disable_recurring_…

…invoices
  • Loading branch information...
FFernandez-PlanetaTIC committed Jul 10, 2019
2 parents a1de68f + d275118 commit f903ba4f7ef9e297e11bc4f1f28bf04dda05c171
Showing with 903 additions and 484 deletions.
  1. +0 −18 product_price_factor/__manifest__.py
  2. +0 −5 product_price_factor/doc/changelog.rst
  3. +0 −15 product_price_factor/doc/index.rst
  4. BIN product_price_factor/images/1.png
  5. +0 −1 product_price_factor/models/__init__.py
  6. +0 −107 product_price_factor/models/product.py
  7. BIN product_price_factor/static/description/1.png
  8. BIN product_price_factor/static/description/2.png
  9. BIN product_price_factor/static/description/3.png
  10. BIN product_price_factor/static/description/4.png
  11. BIN product_price_factor/static/description/5.png
  12. BIN product_price_factor/static/description/6.png
  13. +0 −78 product_price_factor/static/description/index.html
  14. +0 −23 product_price_factor/views/product_view.xml
  15. 0 product_price_factor_online/__init__.py
  16. +0 −18 product_price_factor_online/__manifest__.py
  17. +0 −5 product_price_factor_online/doc/changelog.rst
  18. +0 −27 product_price_factor_online/doc/index.rst
  19. BIN product_price_factor_online/images/1.png
  20. BIN product_price_factor_online/static/description/1.png
  21. +0 −12 product_price_factor_online/static/description/index.html
  22. +0 −18 product_price_factor_online/views/templates.xml
  23. +1 −1 saas_base/__manifest__.py
  24. +0 −1 saas_client/__manifest__.py
  25. +1 −0 saas_client/controllers/main.py
  26. +9 −12 saas_client/models/res_config.py
  27. +1 −1 saas_client/models/res_user.py
  28. +1 −1 saas_client/views/res_config.xml
  29. +6 −5 saas_portal/__manifest__.py
  30. +1 −1 saas_portal/models/saas_portal.py
  31. +2 −2 saas_portal/views/saas_portal.xml
  32. +2 −2 saas_portal_portal/__manifest__.py
  33. +1 −1 saas_portal_portal/controllers/__init__.py
  34. +0 −41 saas_portal_portal/controllers/main.py
  35. +45 −0 saas_portal_portal/controllers/portal.py
  36. +11 −2 saas_portal_portal/doc/changelog.rst
  37. +1 −1 saas_portal_portal/static/src/js/main.js
  38. +0 −83 saas_portal_portal/views/templates.xml
  39. +98 −0 saas_portal_portal/views/website_instance_templates.xml
  40. +1 −1 saas_portal_sale/views/saas_portal.xml
  41. +13 −0 saas_portal_sale_subscription/README.rst
  42. +1 −0 {product_price_factor → saas_portal_sale_subscription}/__init__.py
  43. +20 −0 saas_portal_sale_subscription/__manifest__.py
  44. +4 −0 saas_portal_sale_subscription/models/__init__.py
  45. +23 −0 saas_portal_sale_subscription/models/account_analytic_account.py
  46. +85 −0 saas_portal_sale_subscription/models/account_invoice.py
  47. +19 −0 saas_portal_sale_subscription/models/product_template.py
  48. +153 −0 saas_portal_sale_subscription/models/saas_portal.py
  49. BIN {product_price_factor → saas_portal_sale_subscription}/static/description/icon.png
  50. +25 −0 saas_portal_sale_subscription/views/account_invoice_view.xml
  51. +24 −0 saas_portal_sale_subscription/views/product_attribute_views.xml
  52. +41 −0 saas_portal_sale_subscription/views/saas_portal.xml
  53. +1 −0 saas_portal_sale_subscription/wizard/__init__.py
  54. +42 −0 saas_portal_sale_subscription/wizard/subscription_wizard.py
  55. +43 −0 saas_portal_sale_subscription/wizard/subscription_wizard.xml
  56. +14 −0 saas_portal_subscription/README.rst
  57. +2 −0 saas_portal_subscription/__init__.py
  58. +19 −0 saas_portal_subscription/__manifest__.py
  59. +19 −0 saas_portal_subscription/data/base_automation.xml
  60. +2 −0 saas_portal_subscription/models/__init__.py
  61. +67 −0 saas_portal_subscription/models/saas_portal.py
  62. +11 −0 saas_portal_subscription/models/subscription_log.py
  63. BIN {product_price_factor_online → saas_portal_subscription}/static/description/icon.png
  64. +35 −0 saas_portal_subscription/views/saas_portal.xml
  65. +1 −0 saas_portal_subscription/wizard/__init__.py
  66. +26 −0 saas_portal_subscription/wizard/subscription_wizard.py
  67. +32 −0 saas_portal_subscription/wizard/subscription_wizard.xml
  68. +0 −1 saas_server/__manifest__.py
  69. +0 −1 saas_server_backup_ftp/models/saas_server.py

This file was deleted.

This file was deleted.

This file was deleted.

Binary file not shown.

This file was deleted.

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

This file was deleted.

This file was deleted.

No changes.

This file was deleted.

This file was deleted.

This file was deleted.

Binary file not shown.
Binary file not shown.

This file was deleted.

This file was deleted.

@@ -6,7 +6,7 @@
'category': 'SaaS',
"support": "apps@it-projects.info",
'website': 'https://it-projects.info',
'depends': ['saas_utils'],
'depends': ['base'],
'data': [],
'installable': True,
}
@@ -10,7 +10,6 @@
'auth_oauth',
'auth_oauth_ip',
'auth_oauth_check_client_id',
'saas_utils',
'mail',
'web_settings_dashboard',
'access_limit_records_number',
@@ -28,5 +28,6 @@ def web_login(self, redirect=None, **kw):
suspended = param_model.sudo().get_param('saas_client.suspended', '0')
page_for_suspended = param_model.sudo().get_param('saas_client.page_for_suspended', '/')
if suspended == '1':
request.params['login_success'] = False
return werkzeug.utils.redirect(page_for_suspended, 303)
return super(SaaSClientLogin, self).web_login(redirect, **kw)
@@ -1,23 +1,20 @@
from odoo import models, fields, api


class BaseConfigSettings(models.TransientModel):
class ResConfigSettings(models.TransientModel):
_inherit = 'res.config.settings'

base_saas_domain = fields.Char('Base SaaS domain')

current_domain = fields.Char(readonly=True)
domain_change_link = fields.Html(readonly=True)

# current_domain
@api.model
def get_default_current_domain(self, fields):
def get_values(self):
res = super(ResConfigSettings, self).get_values()
current_domain = self.env["ir.config_parameter"].sudo().get_param('web.base.url', default=None)
return {'current_domain': current_domain or False}

# domain_change_link
@api.model
def get_default_domain_change_link(self, fields):
link = self.env["ir.config_parameter"].sudo().get_param('saas_client.saas_dashboard', default=None)
html = link and '<a href=' + link + '>' + 'You can change your domain name here' + '</a>' or False
return {'domain_change_link': html}
html = link and '<a href="' + link + '" target="_blank" class="oe_link"><i class="fa fa-fw fa-arrow-right"/>' + 'You can change your domain name here' + '</a>' or False
res.update(
current_domain=current_domain or False,
domain_change_link=html,
)
return res

0 comments on commit f903ba4

Please sign in to comment.
You can’t perform that action at this time.