Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Patch 1 #31

Open
wants to merge 28 commits into
base: 10.0
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
c6cf47a
[MIG][12.0] Migrate module in 12.0
ChiragPatel-SerpentCS Aug 7, 2019
dff3fc2
[IMP] changed license code and terms.
ChiragPatel-SerpentCS Aug 7, 2019
cda3905
[MIG][12.0] Migrate Module.
ChiragPatel-SerpentCS Aug 7, 2019
214544b
[MIG][12.0] Migrate Module.
ChiragPatel-SerpentCS Aug 7, 2019
67375ba
[REM][12.0] it seem dosn't required in this branch and default snippe…
ChiragPatel-SerpentCS Aug 7, 2019
51db647
[REM][12.0] It seems does't requir this module because : Blog post p…
ChiragPatel-SerpentCS Aug 7, 2019
920e2f8
Merge pull request #2 from ChiragPatel-SerpentCS/website_portal_enhan…
JayVora-SerpentCS Aug 8, 2019
303c97c
Merge pull request #3 from ChiragPatel-SerpentCS/website_timeline_v12.0
JayVora-SerpentCS Aug 8, 2019
0d31b71
Merge pull request #4 from ChiragPatel-SerpentCS/website_news_roller_…
JayVora-SerpentCS Aug 8, 2019
85bf7d5
Merge pull request #5 from ChiragPatel-SerpentCS/website_image_carous…
JayVora-SerpentCS Aug 8, 2019
430e40a
Merge pull request #6 from ChiragPatel-SerpentCS/website_blog_configu…
JayVora-SerpentCS Aug 8, 2019
ece6b2f
[MIG/IMP][12.0] Migrate module and code improvements.
ChiragPatel-SerpentCS Aug 9, 2019
d180035
[MIG][12.0] Migrate module.
ChiragPatel-SerpentCS Aug 9, 2019
a146bf9
[MIG][12.0] Migrate module.
ChiragPatel-SerpentCS Aug 9, 2019
cc7115a
Merge pull request #10 from ChiragPatel-SerpentCS/cp_committee_v12.0
JayVora-SerpentCS Aug 9, 2019
fc1b9d2
Merge pull request #7 from ChiragPatel-SerpentCS/website_community_po…
JayVora-SerpentCS Aug 9, 2019
6b0a4ec
Merge pull request #8 from ChiragPatel-SerpentCS/cp_businessdiary_v12…
JayVora-SerpentCS Aug 9, 2019
69b7fc8
[MIG][12.0] Migrate Module.
ChiragPatel-SerpentCS Aug 13, 2019
e6db31e
Merge pull request #11 from ChiragPatel-SerpentCS/cp_event_v12.0
JayVora-SerpentCS Aug 13, 2019
a5f323d
[MIG][12.0] Migrate module and improved rate and comment code in webs…
ChiragPatel-SerpentCS Aug 13, 2019
4bc9753
[MIG][12.0] Migrate module and improved code.
ChiragPatel-SerpentCS Aug 13, 2019
b928e2f
[MIG][12.0] migrate module.
ChiragPatel-SerpentCS Aug 13, 2019
8e1682e
[MIG][12.0] Migrate module.
ChiragPatel-SerpentCS Aug 14, 2019
ebf77ae
Merge pull request #15 from ChiragPatel-SerpentCS/cp_places_v12.0
JayVora-SerpentCS Aug 18, 2019
0fc24fb
Merge pull request #14 from ChiragPatel-SerpentCS/cp_membership_v12.0
JayVora-SerpentCS Aug 18, 2019
7492582
Merge pull request #13 from ChiragPatel-SerpentCS/cp_gallery_v12.0
JayVora-SerpentCS Aug 18, 2019
e6480c8
Merge pull request #12 from ChiragPatel-SerpentCS/cp_event_rating_v12.0
JayVora-SerpentCS Aug 18, 2019
841341f
Create test
rlfss Sep 2, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cp_businessdiary/LICENSE/LICENSE
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
OpenERP, Open Source Management Solution
Copyright (C) 2018-TODAY Serpent Consulting Services Pvt. Ltd. (<http://www.serpentcs.com>).
Copyright (C) 2019-TODAY Serpent Consulting Services Pvt. Ltd. (<http://www.serpentcs.com>).

This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as
Expand Down
2 changes: 1 addition & 1 deletion cp_businessdiary/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# -*- coding: utf-8 -*-
# See LICENSE file for full copyright and licensing details.

from . import models
from . import controllers
5 changes: 2 additions & 3 deletions cp_businessdiary/__manifest__.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
# -*- coding: utf-8 -*-
# See LICENSE file for full copyright and licensing details.

{
'name': 'Business Diary For Community Portal',
'category': 'Website',
'summary': 'Business Diary Management',
'version': '10.0',
'version': '12.0.1.0.0',
'license': 'AGPL-3',
'website': 'http://www.serpentcs.com',
'author': 'Serpent Consulting Services Pvt. Ltd.',
Expand All @@ -16,7 +15,7 @@
'data': [
'security/portal_security.xml',
'security/ir.model.access.csv',
'views/menu_details.xml',
'data/website_menu.xml',
'views/templates.xml',
'views/template_input_business.xml',
'views/view_business_diary.xml',
Expand Down
2 changes: 1 addition & 1 deletion cp_businessdiary/controllers/__init__.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# -*- coding: utf-8 -*-
# See LICENSE file for full copyright and licensing details.

from . import controllers
1 change: 0 additions & 1 deletion cp_businessdiary/controllers/controllers.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# -*- coding: utf-8 -*-
# See LICENSE file for full copyright and licensing details.

from odoo import http
Expand Down
10 changes: 10 additions & 0 deletions cp_businessdiary/data/website_menu.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
<data>
<record id="menu_business_diary" model="website.menu">
<field name="name">Business Diary</field>
<field name="url">/page/business_diary</field>
<field name="parent_id" ref="website.main_menu" />
</record>
</data>
</odoo>
2 changes: 1 addition & 1 deletion cp_businessdiary/models/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# -*- coding: utf-8 -*-
# See LICENSE file for full copyright and licensing details.

from . import business_diary
from . import designation
Expand Down
1 change: 0 additions & 1 deletion cp_businessdiary/models/business_diary.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# -*- coding: utf-8 -*-
# See LICENSE file for full copyright and licensing details.

from odoo import api, fields, models
Expand Down
1 change: 0 additions & 1 deletion cp_businessdiary/models/designation.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# -*- coding: utf-8 -*-
# See LICENSE file for full copyright and licensing details.

from odoo import models, fields
Expand Down
1 change: 0 additions & 1 deletion cp_businessdiary/models/res_partner.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# -*- coding: utf-8 -*-
# See LICENSE file for full copyright and licensing details.

from odoo import models, fields
Expand Down
17 changes: 0 additions & 17 deletions cp_businessdiary/views/menu_details.xml

This file was deleted.

2 changes: 1 addition & 1 deletion cp_committee/LICENSE/LICENSE
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
OpenERP, Open Source Management Solution
Copyright (C) 2018-TODAY Serpent Consulting Services Pvt. Ltd. (<http://www.serpentcs.com>).
Copyright (C) 2019-TODAY Serpent Consulting Services Pvt. Ltd. (<http://www.serpentcs.com>).

This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as
Expand Down
2 changes: 1 addition & 1 deletion cp_committee/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# -*- coding: utf-8 -*-
# See LICENSE file for full copyright and licensing details.

from . import models
from . import controllers
5 changes: 2 additions & 3 deletions cp_committee/__manifest__.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
# -*- coding: utf-8 -*-
# See LICENSE file for full copyright and licensing details.

{
'name': 'Committees For Community Portal',
'category': 'website',
'summary': 'Committees management',
'version': '10.0.1.0.0',
'version': '12.0.1.0.0',
'license': 'AGPL-3',
'author': 'Serpent Consulting Services Pvt. Ltd.',
'maintainer': 'Serpent Consulting Services Pvt. Ltd.',
Expand All @@ -17,7 +16,7 @@
'security/portal_security.xml',
'security/ir.model.access.csv',
'data/sequence.xml',
'views/menu_details.xml',
'data/website_menu.xml',
'views/res_partner_view.xml',
'views/job_assign_view.xml',
'views/template_committee_chart.xml',
Expand Down
2 changes: 1 addition & 1 deletion cp_committee/controllers/__init__.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# -*- coding: utf-8 -*-
# See LICENSE file for full copyright and licensing details.

from . import controllers
1 change: 0 additions & 1 deletion cp_committee/controllers/controllers.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# -*- coding: utf-8 -*-
# See LICENSE file for full copyright and licensing details.

from odoo import http
Expand Down
2 changes: 1 addition & 1 deletion cp_committee/data/sequence.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@
<field name="implementation">no_gap</field>
</record>

</odoo>
</odoo>
22 changes: 22 additions & 0 deletions cp_committee/data/website_menu.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
<data>
<record id="menu_committees" model="website.menu">
<field name="name">Committees</field>
<field name="parent_id" ref="website.main_menu" />
</record>

<record id="menu_committees_tree" model="website.menu">
<field name="name">Committees Tree</field>
<field name="url">/page/committee</field>
<field name="parent_id" ref="menu_committees" />
</record>

<record id="menu_committees_list" model="website.menu">
<field name="name">Committees List</field>
<field name="url">/page/committee/list</field>
<field name="parent_id" ref="menu_committees" />
</record>

</data>
</odoo>
2 changes: 1 addition & 1 deletion cp_committee/models/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# -*- coding: utf-8 -*-
# See LICENSE file for full copyright and licensing details.

from . import job_position
from . import job_position_history
Expand Down
1 change: 0 additions & 1 deletion cp_committee/models/job_position.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# -*- coding: utf-8 -*-
# See LICENSE file for full copyright and licensing details.

import datetime
Expand Down
1 change: 0 additions & 1 deletion cp_committee/models/job_position_history.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# -*- coding: utf-8 -*-
# See LICENSE file for full copyright and licensing details.

from odoo import models, fields, api
Expand Down
1 change: 0 additions & 1 deletion cp_committee/models/res_partner.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# -*- coding: utf-8 -*-
# See LICENSE file for full copyright and licensing details.

from odoo import models, fields
Expand Down
1 change: 0 additions & 1 deletion cp_committee/models/res_user.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# -*- coding: utf-8 -*-
# See LICENSE file for full copyright and licensing details.

from odoo import models, api
Expand Down
2 changes: 1 addition & 1 deletion cp_committee/security/portal_security.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@
<field name="category_id" ref="cp_committee.category_committee_groups"/>
</record>

</odoo>
</odoo>
31 changes: 0 additions & 31 deletions cp_committee/views/menu_details.xml

This file was deleted.

2 changes: 1 addition & 1 deletion cp_committee/views/template_committee_chart.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
</xpath>
</template>

<template id="template_committee_chart" name="Committee chart" page="True">
<template id="template_committee_chart" name="Committee chart">
<t t-call="website.layout">
<div class="container-fluid">
<div class="row">
Expand Down
8 changes: 0 additions & 8 deletions cp_committee/views/template_committee_grid.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,11 @@
type="text/css"/>
<link rel="stylesheet"
href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700|Material+Icons"/>
<!--<link rel="stylesheet" href="https://unpkg.com/[email protected]/dist/css/bootstrap-material-design.min.css"/>-->

<div class="grid_partner_bg">
<br/>
<br/>
<div class="container">
<form name="frm">

<div class="row">
<div class="col-md-12">
<t t-foreach="job_pos_data" t-as="jobs">
Expand Down Expand Up @@ -44,19 +41,14 @@
src="/cp_committee/static/img/avtar_img.png"
style="padding-bottom: 5px width:100%"/>
</t>

</div>
<h4 class="card-title text-center">
<span t-field="jobs.responsible_person_id.name"/>
</h4>

</div>
</div>

</div>
</t>


</div>
</div>
</form>
Expand Down
2 changes: 1 addition & 1 deletion cp_event/LICENSE/LICENSE
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
OpenERP, Open Source Management Solution
Copyright (C) 2017-TODAY Serpent Consulting Services Pvt. Ltd. (<http://www.serpentcs.com>).
Copyright (C) 2019-TODAY Serpent Consulting Services Pvt. Ltd. (<http://www.serpentcs.com>).

This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as
Expand Down
2 changes: 1 addition & 1 deletion cp_event/__init__.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# -*- coding: utf-8 -*-
# See LICENSE file for full copyright and licensing details.

from . import wizard
3 changes: 1 addition & 2 deletions cp_event/__manifest__.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
# -*- coding: utf-8 -*-
# See LICENSE file for full copyright and licensing details.

{
'name': 'Event For Community Portal',
'category': 'Website',
'summary': 'Event Management',
'version': '10.0.1.0.0',
'version': '12.0.1.0.0',
'license': 'AGPL-3',
'author': 'Serpent Consulting Services Pvt. Ltd.',
'maintainer': 'Serpent Consulting Services Pvt. Ltd.',
Expand Down
2 changes: 1 addition & 1 deletion cp_event/wizard/__init__.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# -*- coding: utf-8 -*-
# See LICENSE file for full copyright and licensing details.

from . import event_attendees
1 change: 0 additions & 1 deletion cp_event/wizard/event_attendees.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# -*- coding: utf-8 -*-
# See LICENSE file for full copyright and licensing details.

import base64
Expand Down
2 changes: 1 addition & 1 deletion cp_event_rating/LICENSE/LICENSE
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
OpenERP, Open Source Management Solution
Copyright (C) 2018-TODAY Serpent Consulting Services Pvt. Ltd. (<http://www.serpentcs.com>).
Copyright (C) 2019-TODAY Serpent Consulting Services Pvt. Ltd. (<http://www.serpentcs.com>).

This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as
Expand Down
2 changes: 1 addition & 1 deletion cp_event_rating/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# -*- coding: utf-8 -*-
# See LICENSE file for full copyright and licensing details.

from . import controllers
from . import models
4 changes: 2 additions & 2 deletions cp_event_rating/__manifest__.py
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
# -*- coding: utf-8 -*-
# See LICENSE file for full copyright and licensing details.

{
'name': 'Event Rating For Community Portal',
'category': 'Website',
'summary': 'Event Review & Rating Management',
'version': '10.0.1.0.0',
'version': '12.0.1.0.0',
'license': 'AGPL-3',
'author': 'Serpent Consulting Services Pvt. Ltd.',
'maintainer': 'Serpent Consulting Services Pvt. Ltd.',
'website': 'http://www.serpentcs.com',
'depends': [
'website_event',
'website_mail',
'website_rating',
'rating',
],
'data': [
Expand Down
2 changes: 1 addition & 1 deletion cp_event_rating/controllers/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# -*- coding: utf-8 -*-
# See LICENSE file for full copyright and licensing details.

from . import main
from . import website_mail
1 change: 0 additions & 1 deletion cp_event_rating/controllers/main.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# -*- coding: utf-8 -*-
# See LICENSE file for full copyright and licensing details.

from odoo import http
Expand Down
1 change: 0 additions & 1 deletion cp_event_rating/controllers/website_mail.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# -*- coding: utf-8 -*-
# See LICENSE file for full copyright and licensing details.

from odoo import http
Expand Down
2 changes: 1 addition & 1 deletion cp_event_rating/models/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# -*- coding: utf-8 -*-
# See LICENSE file for full copyright and licensing details.

from . import event
from . import rating
1 change: 0 additions & 1 deletion cp_event_rating/models/event.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# -*- coding: utf-8 -*-
# See LICENSE file for full copyright and licensing details.

from odoo import fields, models
Expand Down
1 change: 0 additions & 1 deletion cp_event_rating/models/rating.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# -*- coding: utf-8 -*-
# See LICENSE file for full copyright and licensing details.

from odoo import fields, models
Expand Down
Loading