From a5311e690000d371e886a30ea1557d24ee0186b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?=
Date: Wed, 14 May 2014 14:30:26 +0200
Subject: [PATCH] [MOV] crm: moved css / js related to salesteam to sales_team
module; sale_crm: moved data and demo data into sale and sales_team module.
---
addons/crm/__openerp__.py | 1 -
addons/crm/static/src/css/Makefile | 2 -
addons/crm/static/src/css/crm.css | 62 ---------
addons/crm/views/crm.xml | 13 --
addons/sale/sale_data.xml | 18 ++-
addons/sale/sale_demo.xml | 103 ++++++++++++++
addons/sale_crm/__openerp__.py | 3 +-
addons/sale_crm/sale_crm_data.xml | 22 ---
addons/sale_crm/sale_crm_demo.xml | 130 ------------------
addons/sales_team/sales_team.xml | 12 +-
addons/sales_team/static/src/css/Makefile | 2 +
.../static/src/css/sales_team.sass} | 0
.../static/src/js/sales_team.js} | 0
13 files changed, 134 insertions(+), 234 deletions(-)
delete mode 100644 addons/crm/static/src/css/Makefile
delete mode 100644 addons/crm/static/src/css/crm.css
delete mode 100644 addons/crm/views/crm.xml
delete mode 100644 addons/sale_crm/sale_crm_data.xml
delete mode 100644 addons/sale_crm/sale_crm_demo.xml
create mode 100644 addons/sales_team/static/src/css/Makefile
rename addons/{crm/static/src/css/crm.sass => sales_team/static/src/css/sales_team.sass} (100%)
rename addons/{crm/static/src/js/crm_case_section.js => sales_team/static/src/js/sales_team.js} (100%)
diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py
index 1bf4c611be6..15544dc3dff 100644
--- a/addons/crm/__openerp__.py
+++ b/addons/crm/__openerp__.py
@@ -92,7 +92,6 @@ Dashboard for CRM will include:
'base_partner_merge_view.xml',
'sales_team_view.xml',
- 'views/crm.xml',
],
'demo': [
'crm_demo.xml',
diff --git a/addons/crm/static/src/css/Makefile b/addons/crm/static/src/css/Makefile
deleted file mode 100644
index a2ced24a13d..00000000000
--- a/addons/crm/static/src/css/Makefile
+++ /dev/null
@@ -1,2 +0,0 @@
-crm.css: crm.sass
- sass --trace -t expanded crm.sass:crm.css
diff --git a/addons/crm/static/src/css/crm.css b/addons/crm/static/src/css/crm.css
deleted file mode 100644
index 8999f758e41..00000000000
--- a/addons/crm/static/src/css/crm.css
+++ /dev/null
@@ -1,62 +0,0 @@
-@charset "utf-8";
-.openerp .oe_kanban_view .oe_kanban_crm_salesteams {
- /* Customize width and height of kanban according bootstrap3 */
- width: 357px;
- min-height: 254px !important;
- /* End of customize */
- cursor: default;
-}
-.openerp .oe_kanban_view .oe_kanban_crm_salesteams .oe_items_list {
- position: relative;
- /* Improved margin to set alignment of list items according bootstrap3 */
- margin: 10px 0 10px 9px;
- min-height: 10px;
-}
-.openerp .oe_kanban_view .oe_kanban_crm_salesteams .oe_items_list div {
- width: 160px;
- height: 22px;
- margin: 0 !important;
- position: relative;
- display: inline-block;
- float: left;
-}
-.openerp .oe_kanban_view .oe_kanban_crm_salesteams .oe_items_list div a:nth-child(2n) {
- position: absolute;
- left: 90px;
- top: 0;
-}
-.openerp .oe_kanban_view .oe_kanban_crm_salesteams .oe_items_list div:nth-child(2n) a:nth-child(2n) {
- left: 110px;
-}
-.openerp .oe_kanban_view .oe_kanban_crm_salesteams .oe_items_list a:hover {
- text-decoration: underline !important;
-}
-.openerp .oe_kanban_view .oe_kanban_crm_salesteams .oe_center {
- text-align: center;
- margin: 3px 0;
-}
-.openerp .oe_kanban_view .oe_kanban_crm_salesteams .oe_center .oe_sum {
- margin: 0;
- font-size: 40px;
-}
-.openerp .oe_kanban_view .oe_kanban_crm_salesteams .oe_center .oe_subsum {
- font-size: 10px;
-}
-.openerp .oe_kanban_view .oe_salesteams_help {
- display: inline-block;
-}
-.openerp .oe_kanban_view .oe_kanban_salesteams_avatars {
- margin-top: 20px;
-}
-.openerp .oe_kanban_view .oe_kanban_salesteams_avatars img {
- width: 30px;
- height: 30px;
- padding-left: 0px;
- margin-top: 3px;
- -moz-border-radius: 2px;
- -webkit-border-radius: 2px;
- border-radius: 2px;
- -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);
- -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);
- -box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);
-}
diff --git a/addons/crm/views/crm.xml b/addons/crm/views/crm.xml
deleted file mode 100644
index c28ba723d24..00000000000
--- a/addons/crm/views/crm.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/addons/sale/sale_data.xml b/addons/sale/sale_data.xml
index 443895631a9..4c5347cf1d0 100644
--- a/addons/sale/sale_data.xml
+++ b/addons/sale/sale_data.xml
@@ -29,7 +29,7 @@
This application lets you create and send quotations and process your sales orders; from delivery to invoicing.
If you need to manage your sales pipeline (leads, opportunities, phonecalls), the CRM application may be useful. Use the Settings menu to install it.
]]>
-
+
Quotation sent
@@ -44,5 +44,21 @@
Quotation confirmed
+
+
+ Quotation Send
+ 20
+ crm.case.section
+
+ section_id
+
+
+ Sales Order Confirmed
+ 21
+ crm.case.section
+
+ section_id
+
+
diff --git a/addons/sale/sale_demo.xml b/addons/sale/sale_demo.xml
index 2e0019598f7..bcb69f9a7a3 100644
--- a/addons/sale/sale_demo.xml
+++ b/addons/sale/sale_demo.xml
@@ -2,12 +2,24 @@
+
+ 52700
+ 60000
+
+
+
+ 36000
+ 40000
+
+
+
+
@@ -47,6 +59,8 @@
manual
+
+
@@ -76,6 +90,7 @@
manual
+
@@ -104,6 +119,7 @@
+
@@ -152,6 +168,8 @@
+
+
@@ -190,6 +208,7 @@
+
@@ -209,6 +228,8 @@
manual
+
+
@@ -259,6 +280,7 @@
manual
+
@@ -335,5 +357,86 @@ Thanks!
+
+
+
+
+
+
+
+ draft
+ in_invoice
+
+ Test invoice 1
+
+
+ Basic computer with Dvorak keyboard and left-handed mouse
+
+ 250
+ 1
+
+
+
+ Little server with raid 1 and 512ECC ram
+
+ 800
+ 2
+
+
+
+ Server with raid 10 and 2048ECC ram
+
+ 4800
+ 4
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ draft
+ out_invoice
+
+ Test invoice 1
+
+
+ Basic formation with Dvorak
+
+ 500
+ 1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/sale_crm/__openerp__.py b/addons/sale_crm/__openerp__.py
index 37059458acd..251c4746a86 100644
--- a/addons/sale_crm/__openerp__.py
+++ b/addons/sale_crm/__openerp__.py
@@ -41,11 +41,10 @@ modules.
'data': [
'wizard/crm_make_sale_view.xml',
'sale_crm_view.xml',
- 'sale_crm_data.xml',
'security/sale_crm_security.xml',
'security/ir.model.access.csv',
],
- 'demo': ['sale_crm_demo.xml'],
+ 'demo': [],
'test': ['test/sale_crm.yml'],
'installable': True,
'auto_install': True,
diff --git a/addons/sale_crm/sale_crm_data.xml b/addons/sale_crm/sale_crm_data.xml
deleted file mode 100644
index 1996f367202..00000000000
--- a/addons/sale_crm/sale_crm_data.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
-
-
- Quotation Send
- 20
- crm.case.section
-
- section_id
-
-
- Sales Order Confirmed
- 21
- crm.case.section
-
- section_id
-
-
-
-
diff --git a/addons/sale_crm/sale_crm_demo.xml b/addons/sale_crm/sale_crm_demo.xml
deleted file mode 100644
index 4af287b0587..00000000000
--- a/addons/sale_crm/sale_crm_demo.xml
+++ /dev/null
@@ -1,130 +0,0 @@
-
-
-
-
-
- 52700
- 60000
-
-
-
- Indirect Sales
- IM
- 36000
- 40000
-
-
-
-
-
-
-
-
-
-
- draft
- in_invoice
-
- Test invoice 1
-
-
- Basic computer with Dvorak keyboard and left-handed mouse
-
- 250
- 1
-
-
-
- Little server with raid 1 and 512ECC ram
-
- 800
- 2
-
-
-
- Server with raid 10 and 2048ECC ram
-
- 4800
- 4
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- draft
- out_invoice
-
- Test invoice 1
-
-
- Basic formation with Dvorak
-
- 500
- 1
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/addons/sales_team/sales_team.xml b/addons/sales_team/sales_team.xml
index 95fcb6f3078..67907c38c7e 100644
--- a/addons/sales_team/sales_team.xml
+++ b/addons/sales_team/sales_team.xml
@@ -195,6 +195,16 @@
-
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/sales_team/static/src/css/Makefile b/addons/sales_team/static/src/css/Makefile
new file mode 100644
index 00000000000..523f4a1e81e
--- /dev/null
+++ b/addons/sales_team/static/src/css/Makefile
@@ -0,0 +1,2 @@
+sales_team.css: sales_team.sass
+ sass --trace -t expanded sales_team.sass:sales_team.css
diff --git a/addons/crm/static/src/css/crm.sass b/addons/sales_team/static/src/css/sales_team.sass
similarity index 100%
rename from addons/crm/static/src/css/crm.sass
rename to addons/sales_team/static/src/css/sales_team.sass
diff --git a/addons/crm/static/src/js/crm_case_section.js b/addons/sales_team/static/src/js/sales_team.js
similarity index 100%
rename from addons/crm/static/src/js/crm_case_section.js
rename to addons/sales_team/static/src/js/sales_team.js