Skip to content

Commit

Permalink
Merge remote-tracking branch 'addons-dev/misc-addons-12.0-pad_crm' in…
Browse files Browse the repository at this point in the history
…to 12.0-pad_crm-port
  • Loading branch information
Ommo73 committed May 20, 2019
2 parents 21b23e9 + 8f60afd commit eb79a2d
Show file tree
Hide file tree
Showing 11 changed files with 104 additions and 59 deletions.
1 change: 0 additions & 1 deletion ir_config_parameter_multi_company/models/__init__.py
@@ -1,3 +1,2 @@
from . import ir_config_parameter
from . import res_users
from . import ir_property
Expand Up @@ -5,8 +5,6 @@

_logger = logging.getLogger(__name__)

DATABASE_SECRET_KEY = 'database.secret'

# params that has to be shared across all companies
SHARED_KEYS = [
'database.expiration_date',
Expand Down
36 changes: 0 additions & 36 deletions ir_config_parameter_multi_company/models/res_users.py

This file was deleted.

12 changes: 4 additions & 8 deletions pad_crm/README.rst
Expand Up @@ -2,15 +2,11 @@
:target: https://www.gnu.org/licenses/lgpl
:alt: License: LGPL-3

============================
Pad on Leads\Opportunities
============================
======================================
Pad support in Lead's Internal notes
======================================

Adds a pad to the lead in CRM to the description tab.

Allows to collaborative edit internal notes and saves the change history.

This module can add padding to the text inside the pad widget in other modules.
This module allows collaborative editing with *html support* in Lead's Internal notes and maintains the versions history.

Credits
=======
Expand Down
8 changes: 4 additions & 4 deletions pad_crm/__manifest__.py
Expand Up @@ -2,11 +2,11 @@
# Copyright 2019 Artem Rafailov <https://it-projects.info/team/Ommo73/>
# License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html)
{
"name": """Pad on Leads(Opportunities)""",
"summary": """Collaborative editing Internal notes + history of changes""",
"category": "Customer Relationship Management",
"name": """Pad support in Lead's Internal notes""",
"summary": """This module allows collaborative editing with *html support* in Lead's Internal notes and maintains the versions history.""",
"category": "Project",
# "live_test_url": "http://apps.it-projects.info/shop/product/DEMO-URL?version=12.0",
"images": [],
"images": ['images/pad_crm_2.jpg'],
"version": "12.0.1.0.0",
"application": False,

Expand Down
3 changes: 0 additions & 3 deletions pad_crm/doc/changelog.rst
@@ -1,6 +1,3 @@
Changelog
=========

`1.0.0`
-------

Expand Down
8 changes: 4 additions & 4 deletions pad_crm/doc/index.rst
@@ -1,6 +1,6 @@
============================
Pad on Leads\Opportunities
============================
======================================
Pad support in Lead's Internal notes
======================================

Installation
============
Expand All @@ -13,4 +13,4 @@ Usage
* Open ``[CRM]``
* Click on any lead
* Click on the ``[Edit]`` button
* Now in the ``[Internal Notes]`` tab you can use the pad
* RESULT: now in the ``[Internal Notes]`` tab you can use the Pad.
Binary file added pad_crm/images/pad_crm_2.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
91 changes: 91 additions & 0 deletions pad_crm/static/description/index.html
@@ -0,0 +1,91 @@
<section class="oe_container">
<div class="oe_row oe_spaced">
<div class="oe_span12">
<h2 class="oe_slogan" style="color:#875A7B;">Pad support in Lead's Internal notes</h2>
<h3 class="oe_slogan">This module allows collaborative editing with <i>html support</i>i> in Lead's Internal notes and maintains the versions history.</h3>
</div>
</div>
</section>

<section class="oe_container">
<div class="oe_row oe_spaced">
<div class="oe_span12">
<p class="oe_mt32">
<div class="alert alert-warning" style="padding:0.3em 0.6em; font-size: 150%;">
The Pad is very useful collaborative text-tool for producing nicely formatted text, good-looking notes, and so on.
</div>
</div>
</div>
</section>

<section class="oe_container oe_dark">
<div class="oe_row oe_spaced">
<h3 class="oe_slogan">How It Works</h3>
<div class="oe_span12">
<p class="oe_mt32">
<font style="font-size: 120%;">
<ul>
<li>Open <b>CRM</b> and click the <i>Edit</i> button on any lead</li>
<li>Create nicely formatted text</li>
</ul>
</font>
</p>
</div>
<div class="oe_screenshot" align="center">
<img style="max-width: 60%" src="pad_crm.png"/>
</div>
</div>
</section>

<section class="oe_container">
<div class="oe_row oe_spaced">
<div class="oe_span8">
<h2>Need our service?</h2>
<p class="oe_mt32">Contact us by <a href="mailto:apps@it-projects.info">email</a> or fill out <a href="https://www.it-projects.info/page/website.contactus " target="_blank">request form</a></p>
<ul>
<li><a href="mailto:apps@it-projects.info">apps@it-projects.info <i class="fa fa-envelope-o"></i></a></li>
<li><a href="https://www.it-projects.info/page/website.contactus " target="_blank">https://www.it-projects.info/page/website.contactus <i class="fa fa-list-alt"></i></a></li>
<li><a href="https://m.me/itprojectsllc" target="_blank">https://m.me/itprojectsllc <i class="fa fa-facebook-square"></i></a></li>
<li>skype@it-projects.info <i class="fa fa-skype"></i></li>
</ul>
</div>
<div class="oe_span4">
<div class="stamp" style="width:200px;">
<div style="margin-top: 15px;
position: relative;
font-family:'Vollkorn', serif;
font-size: 16px;
line-height: 25px;
text-transform: uppercase;
font-weight: bold;
color: #75526b;
border: 3px dashed #75526b;
float: left;
padding: 4px 12px;
-webkit-transform: rotate(8deg);
-o-transform: rotate(8deg);
-moz-transform: rotate(8deg);
-ms-transform: rotate(8deg);">
Tested on Odoo<br/>10.0 community
</div>
<!--<div style="margin-top: 15px;
position: relative;
font-family:'Vollkorn', serif;
font-size: 16px;
line-height: 25px;
text-transform: uppercase;
font-weight: bold;
color: #75526b;
border: 3px dashed #75526b;
float: left;
padding: 4px 12px;
-webkit-transform: rotate(6deg);
-o-transform: rotate(6deg);
-moz-transform: rotate(6deg);
-ms-transform: rotate(6deg);">
Tested on Odoo<br/>10.0 enterprise
</div>-->
</div>
</div>
</div>
</section>
Binary file added pad_crm/static/description/pad_crm.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion theme_kit/__manifest__.py
Expand Up @@ -5,7 +5,7 @@
"name": """Brand kit""",
"summary": """Brand your odoo instance in few clicks""",
"category": "Debranding",
"live_test_url": "http://apps.it-projects.info/shop/product/theme-kit?version=11.0",
# "live_test_url": "http://apps.it-projects.info/shop/product/theme-kit?version=11.0",
"images": ['images/brandkit.png'],
"version": "11.0.1.1.2",
"application": False,
Expand Down

0 comments on commit eb79a2d

Please sign in to comment.