diff --git a/LICENSE b/LICENSE old mode 100644 new mode 100755 diff --git a/README.md b/README.md old mode 100644 new mode 100755 index ff54522..7fdaa8c --- a/README.md +++ b/README.md @@ -18,8 +18,8 @@ List of Social Networks supported: - Pinterest - Houzz -Version for Odoo 12 -Available for Odoo 10 & 12 +Version for Odoo 13 +Available for Odoo 10, 12 & 13 --- diff --git a/__init__.py b/__init__.py old mode 100644 new mode 100755 diff --git a/__manifest__.py b/__manifest__.py old mode 100644 new mode 100755 index 928d155..0bff3ac --- a/__manifest__.py +++ b/__manifest__.py @@ -1,25 +1,22 @@ # -*- coding: utf-8 -*- { 'name': "Website Social Extension", - + 'version': '13.0', + 'depends': ['base', 'website'], 'summary': """ Extension for add more Social Networks to Odoo""", - 'description': """ Extension for add more Social Networks to Odoo Website, like Bitbucket, Instagram, Vimeo, Whatsapp, Twitch, Reddit, etc. """, - 'author': "Moldeo Interactive", 'website': "https://www.moldeointeractive.com.ar", - 'category': 'Website', - 'version': '1.1', - - 'depends': ['base', 'website'], - 'data': [ 'views/views.xml', ], 'demo': [ ], + 'active': False, + 'installable': True, + 'application': False, } diff --git a/__pycache__/__init__.cpython-37.pyc b/__pycache__/__init__.cpython-37.pyc new file mode 100644 index 0000000..94f47d6 Binary files /dev/null and b/__pycache__/__init__.cpython-37.pyc differ diff --git a/i18n/website_social.pot b/i18n/website_social.pot old mode 100644 new mode 100755 diff --git a/models/__init__.py b/models/__init__.py old mode 100644 new mode 100755 index 5305644..874c73a --- a/models/__init__.py +++ b/models/__init__.py @@ -1,3 +1,3 @@ # -*- coding: utf-8 -*- -from . import models \ No newline at end of file +from . import website_social \ No newline at end of file diff --git a/models/__pycache__/__init__.cpython-37.pyc b/models/__pycache__/__init__.cpython-37.pyc new file mode 100644 index 0000000..d87865e Binary files /dev/null and b/models/__pycache__/__init__.cpython-37.pyc differ diff --git a/models/__pycache__/website_social.cpython-37.pyc b/models/__pycache__/website_social.cpython-37.pyc new file mode 100644 index 0000000..db5c54d Binary files /dev/null and b/models/__pycache__/website_social.cpython-37.pyc differ diff --git a/models/models.py b/models/models.py deleted file mode 100644 index 0901f49..0000000 --- a/models/models.py +++ /dev/null @@ -1,32 +0,0 @@ -# -*- coding: utf-8 -*- - -from odoo import models, fields, api - -class WebsiteSocial(models.Model): - _inherit = 'website' - - social_bitbucket = fields.Char('BitBucket Account') - social_vimeo = fields.Char('Vimeo Account') - social_whatsapp = fields.Char('Whatsapp Number') - social_skype = fields.Char('Skype Account') - social_twitch = fields.Char('Twitch Account') - social_reddit = fields.Char('Reddit Account') - social_tumblr = fields.Char('Tumblr Account') - social_flickr = fields.Char('Flickr Account') - social_pinterest = fields.Char('Pinterest Account') - social_houzz = fields.Char('Houzz Account') - -class WebsiteSocialConfig(models.TransientModel): - _inherit = 'res.config.settings' - - social_bitbucket = fields.Char(related='website_id.social_bitbucket', readonly=False) - social_vimeo = fields.Char(related='website_id.social_vimeo', readonly=False) - social_whatsapp = fields.Char(related='website_id.social_whatsapp', readonly=False) - social_skype = fields.Char(related='website_id.social_skype', readonly=False) - social_twitch = fields.Char(related='website_id.social_twitch', readonly=False) - social_reddit = fields.Char(related='website_id.social_reddit', readonly=False) - social_tumblr = fields.Char(related='website_id.social_tumblr', readonly=False) - social_flickr = fields.Char(related='website_id.social_flickr', readonly=False) - social_pinterest = fields.Char(related='website_id.social_pinterest', readonly=False) - social_houzz = fields.Char(related='website_id.social_houzz', readonly=False) - diff --git a/models/website_social.py b/models/website_social.py new file mode 100755 index 0000000..f4786b9 --- /dev/null +++ b/models/website_social.py @@ -0,0 +1,71 @@ +# -*- coding: utf-8 -*- + +from odoo import models, fields, api + +class WebsiteSocial(models.Model): + _inherit = 'website' + + social_bitbucket = fields.Char('BitBucket Account') + social_vimeo = fields.Char('Vimeo Account') + social_whatsapp = fields.Char('Whatsapp Number') + social_skype = fields.Char('Skype Account') + social_twitch = fields.Char('Twitch Account') + social_reddit = fields.Char('Reddit Account') + social_tumblr = fields.Char('Tumblr Account') + social_flickr = fields.Char('Flickr Account') + social_pinterest = fields.Char('Pinterest Account') + social_houzz = fields.Char('Houzz Account') + + social_instagram_username = fields.Char( + compute='_compute_social_instagram_username', + ) + + def _get_username_from_url(self, url): + return url and [p for p in url.split('/') if p][-1] or '' + + @api.depends('company_id.social_instagram') + def _compute_social_instagram_username(self): + self.social_instagram_username = self._get_username_from_url( self.company_id.social_instagram) + +class WebsiteSocialConfig(models.TransientModel): + _inherit = 'res.config.settings' + + social_bitbucket = fields.Char(related='website_id.social_bitbucket', readonly=False) + social_vimeo = fields.Char(related='website_id.social_vimeo', readonly=False) + social_whatsapp = fields.Char(related='website_id.social_whatsapp', readonly=False) + social_skype = fields.Char(related='website_id.social_skype', readonly=False) + social_twitch = fields.Char(related='website_id.social_twitch', readonly=False) + social_reddit = fields.Char(related='website_id.social_reddit', readonly=False) + social_tumblr = fields.Char(related='website_id.social_tumblr', readonly=False) + social_flickr = fields.Char(related='website_id.social_flickr', readonly=False) + social_pinterest = fields.Char(related='website_id.social_pinterest', readonly=False) + social_houzz = fields.Char(related='website_id.social_houzz', readonly=False) + + @api.depends('website_id', 'social_twitter', 'social_facebook', 'social_github', 'social_linkedin', 'social_youtube', 'social_instagram', 'social_bitbucket', 'social_vimeo', 'social_whatsapp', 'social_skype', 'social_twitch', 'social_reddit', 'social_tumblr', 'social_flickr','social_pinterest','social_houzz') + def has_social_network(self): + self.has_social_network = self.social_twitter or self.social_facebook or self.social_github \ + or self.social_linkedin or self.social_youtube or self.social_instagram or self.social_bitbucket or self.social_vimeo \ + or self.social_whatsapp or self.social_skype or self.social_twitch \ + or self.social_reddit or self.social_tumblr or self.social_flickr \ + or self.social_pinterest or self.social_houzz + + def inverse_has_social_network(self): + if not self.has_social_network: + self.social_twitter = '' + self.social_facebook = '' + self.social_github = '' + self.social_linkedin = '' + self.social_youtube = '' + self.social_instagram = '' + self.social_bitbucket = '' + self.social_vimeo = '' + self.social_whatsapp = '' + self.social_skype = '' + self.social_twitch = '' + self.social_reddit = '' + self.social_tumblr = '' + self.social_flickr = '' + self.social_pinterest = '' + self.social_houzz = '' + + has_social_network = fields.Boolean("Configure Social Network", compute=has_social_network, inverse=inverse_has_social_network) \ No newline at end of file diff --git a/static/description/icon.png b/static/description/icon.png old mode 100644 new mode 100755 diff --git a/static/description/index.html b/static/description/index.html old mode 100644 new mode 100755 diff --git a/static/description/moldeo_interactive_logo.png b/static/description/moldeo_interactive_logo.png deleted file mode 100644 index 76f0d3b..0000000 Binary files a/static/description/moldeo_interactive_logo.png and /dev/null differ diff --git a/views/views.xml b/views/views.xml old mode 100644 new mode 100755 index 74a68fd..733a168 --- a/views/views.xml +++ b/views/views.xml @@ -1,12 +1,12 @@ + - - Website Social Extension res.config.settings - + +