From a4879a590076b505c471056654c53f99bd035031 Mon Sep 17 00:00:00 2001 From: "Turkesh Patel (Open ERP)" Date: Tue, 17 Jul 2012 11:09:45 +0530 Subject: [PATCH 01/22] [ADD] added summary field in ir.module.module bzr revid: tpa@tinyerp.com-20120717053945-02f18osd5eq3eoca --- openerp/addons/base/module/module.py | 2 ++ openerp/addons/base/module/module_view.xml | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/openerp/addons/base/module/module.py b/openerp/addons/base/module/module.py index fde8fcf5b9a..7a890f9095a 100644 --- a/openerp/addons/base/module/module.py +++ b/openerp/addons/base/module/module.py @@ -227,6 +227,7 @@ class module(osv.osv): 'application': fields.boolean('Application', readonly=True), 'icon': fields.char('Icon URL', size=128), 'icon_image': fields.function(_get_icon_image, string='Icon', type="binary"), + 'summary': fields.char('Summary', size=256, translate=True, readonly=True), } _defaults = { @@ -481,6 +482,7 @@ class module(osv.osv): 'application': terp.get('application', False), 'auto_install': terp.get('auto_install', False), 'icon': terp.get('icon', False), + 'summary': terp.get('summary', ''), } # update the list of available packages diff --git a/openerp/addons/base/module/module_view.xml b/openerp/addons/base/module/module_view.xml index 5624c8ff58c..12947c827f3 100644 --- a/openerp/addons/base/module/module_view.xml +++ b/openerp/addons/base/module/module_view.xml @@ -78,7 +78,8 @@

-
+ +

From b25e73a680fc731ab33feb34d00c6e0c03a6d330 Mon Sep 17 00:00:00 2001 From: "Twinkle Christian (OpenERP)" Date: Tue, 17 Jul 2012 11:35:47 +0530 Subject: [PATCH 02/22] [IMP]Adding summary bzr revid: tch@tinyerp.com-20120717060547-6owny0ouxrc1hxlu --- addons/account_accountant/__openerp__.py | 1 + addons/account_voucher/__openerp__.py | 1 + addons/crm/__openerp__.py | 1 + addons/event/__openerp__.py | 1 + addons/hr/__openerp__.py | 1 + addons/hr_evaluation/__openerp__.py | 1 + addons/hr_expense/__openerp__.py | 1 + addons/hr_holidays/__openerp__.py | 1 + addons/hr_recruitment/__openerp__.py | 2 ++ addons/hr_timesheet_sheet/__openerp__.py | 1 + addons/mail/__openerp__.py | 1 + addons/mrp/__openerp__.py | 2 ++ addons/point_of_sale/__openerp__.py | 1 + addons/project/__openerp__.py | 1 + addons/project_gtd/__openerp__.py | 1 + addons/project_issue/__openerp__.py | 1 + addons/purchase/__openerp__.py | 1 + addons/sale/__openerp__.py | 1 + addons/stock/__openerp__.py | 1 + 19 files changed, 21 insertions(+) diff --git a/addons/account_accountant/__openerp__.py b/addons/account_accountant/__openerp__.py index f1155311f39..4bdca34e5f3 100644 --- a/addons/account_accountant/__openerp__.py +++ b/addons/account_accountant/__openerp__.py @@ -24,6 +24,7 @@ "author" : "OpenERP SA", "category": 'Accounting & Finance', "sequence": 10, + "summary": "Accounts Moves, Journals, Chart of Accounts", "description": """ Accounting Access Rights. ========================= diff --git a/addons/account_voucher/__openerp__.py b/addons/account_voucher/__openerp__.py index a7899338b8e..c943724f5f2 100644 --- a/addons/account_voucher/__openerp__.py +++ b/addons/account_voucher/__openerp__.py @@ -23,6 +23,7 @@ "name" : "eInvoicing & Payments", "version" : "1.0", "author" : 'OpenERP SA', + "summary": 'Supplier & Customer Invoices, Payments', "description": """ Account Voucher module includes all the basic requirements of Voucher Entries for Bank, Cash, Sales, Purchase, Expanse, Contra, etc. ==================================================================================================================================== diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py index 0c9b75b4d41..e9e5337ed83 100644 --- a/addons/crm/__openerp__.py +++ b/addons/crm/__openerp__.py @@ -25,6 +25,7 @@ 'version': '1.0', 'category': 'Customer Relationship Management', "sequence": 2, + "summary": "Agenda, Lead, Opportunities", 'description': """ The generic OpenERP Customer Relationship Management. ===================================================== diff --git a/addons/event/__openerp__.py b/addons/event/__openerp__.py index 1a7f3ba09c5..919cfb5846b 100644 --- a/addons/event/__openerp__.py +++ b/addons/event/__openerp__.py @@ -25,6 +25,7 @@ 'name': 'Events Organisation', 'version': '0.1', 'category': 'Tools', + 'summary': 'Invitation, Subscription', 'description': """ Organization and management of Events. ====================================== diff --git a/addons/hr/__openerp__.py b/addons/hr/__openerp__.py index 71d7d9aa93d..9833e2d611c 100644 --- a/addons/hr/__openerp__.py +++ b/addons/hr/__openerp__.py @@ -26,6 +26,7 @@ "category": "Human Resources", "sequence": 12, "website": "http://www.openerp.com", + "summary": "Hierarchy, Jobs, Departments", "description": """ Module for human resource management. ===================================== diff --git a/addons/hr_evaluation/__openerp__.py b/addons/hr_evaluation/__openerp__.py index 231f4593868..fbb1bcb162f 100644 --- a/addons/hr_evaluation/__openerp__.py +++ b/addons/hr_evaluation/__openerp__.py @@ -25,6 +25,7 @@ "author": "OpenERP SA", "category": "Human Resources", "website": "http://www.openerp.com", + "summary": "Top-Down and Bottom-Up Evaluation", "images": ["images/hr_evaluation_analysis.jpeg","images/hr_evaluation.jpeg"], "depends": ["hr","base_calendar","survey"], "description": """ diff --git a/addons/hr_expense/__openerp__.py b/addons/hr_expense/__openerp__.py index 2a1d302e094..173b31e4b4e 100644 --- a/addons/hr_expense/__openerp__.py +++ b/addons/hr_expense/__openerp__.py @@ -25,6 +25,7 @@ 'version': '1.0', 'category': 'Human Resources', "sequence": 30, + "summary": "Expense Validation, Invoicing", 'description': """ This module aims to manage employee's expenses. =============================================== diff --git a/addons/hr_holidays/__openerp__.py b/addons/hr_holidays/__openerp__.py index 4509508b2be..9219dd92ed7 100644 --- a/addons/hr_holidays/__openerp__.py +++ b/addons/hr_holidays/__openerp__.py @@ -26,6 +26,7 @@ "author": "OpenERP SA", "category": "Human Resources", "sequence": 28, + "summary": "Allocation and Leaves Request, Reporting by Department", "website": "http://www.openerp.com", "description": """ This module allows you to manage leaves and leaves' requests. diff --git a/addons/hr_recruitment/__openerp__.py b/addons/hr_recruitment/__openerp__.py index e5df8cf2bf3..2fa37e66ffd 100644 --- a/addons/hr_recruitment/__openerp__.py +++ b/addons/hr_recruitment/__openerp__.py @@ -1,3 +1,4 @@ + # -*- encoding: utf-8 -*- ############################################################################## # @@ -24,6 +25,7 @@ 'version': '1.0', 'category': 'Human Resources', "sequence": 24, + "summary": "Job Description, Recruitment Process", 'description': """ Manages job positions and the recruitment process. ================================================== diff --git a/addons/hr_timesheet_sheet/__openerp__.py b/addons/hr_timesheet_sheet/__openerp__.py index defa3ee5873..023cb401c63 100644 --- a/addons/hr_timesheet_sheet/__openerp__.py +++ b/addons/hr_timesheet_sheet/__openerp__.py @@ -25,6 +25,7 @@ 'version': '1.0', 'category': 'Human Resources', "sequence": 16, + "summary": "Attendance, Activities, Timing", 'description': """ This module helps you to easily encode and validate timesheet and attendances within the same view. =================================================================================================== diff --git a/addons/mail/__openerp__.py b/addons/mail/__openerp__.py index e911f24e809..cb949a63efc 100644 --- a/addons/mail/__openerp__.py +++ b/addons/mail/__openerp__.py @@ -24,6 +24,7 @@ 'version': '1.0', 'category':'Social Network', "sequence": 2, + "summary": "Discussions, Feeds, Alerts", 'description': """ A bussiness oriented Social Networking with a fully-integrated email and message management. diff --git a/addons/mrp/__openerp__.py b/addons/mrp/__openerp__.py index bdf6f63b755..f7183bf3708 100644 --- a/addons/mrp/__openerp__.py +++ b/addons/mrp/__openerp__.py @@ -1,3 +1,4 @@ + # -*- coding: utf-8 -*- ############################################################################## # @@ -27,6 +28,7 @@ "website" : "http://www.openerp.com", "category" : "Manufacturing", "sequence": 18, + "summary": "Manufacture, Production, Bill of Material", "images" : ["images/bill_of_materials.jpeg", "images/manufacturing_order.jpeg", "images/planning_manufacturing_order.jpeg", "images/production_analysis.jpeg", "images/production_dashboard.jpeg","images/routings.jpeg","images/work_centers.jpeg"], "depends" : ["procurement", "stock", "resource", "purchase", "product","process"], "description": """ diff --git a/addons/point_of_sale/__openerp__.py b/addons/point_of_sale/__openerp__.py index 5e7e5578f72..f13abc4b035 100644 --- a/addons/point_of_sale/__openerp__.py +++ b/addons/point_of_sale/__openerp__.py @@ -25,6 +25,7 @@ 'version': '1.0.1', 'category': 'Point Of Sale', "sequence": 6, + "summary": "Touchscreen Sales", 'description': """ This module provides a quick and easy sale process. =================================================== diff --git a/addons/project/__openerp__.py b/addons/project/__openerp__.py index dad67f5dc30..b6464610711 100644 --- a/addons/project/__openerp__.py +++ b/addons/project/__openerp__.py @@ -27,6 +27,7 @@ "website": "http://www.openerp.com", "category": "Project Management", "sequence": 8, + "summary": "Projects, Tasks", "images": ["images/gantt.png", "images/project_dashboard.jpeg","images/project_task_tree.jpeg","images/project_task.jpeg","images/project.jpeg","images/task_analysis.jpeg"], "depends": ["base_setup", "base_status", "product", "analytic", "board", "mail", "resource","web_kanban"], "description": """ diff --git a/addons/project_gtd/__openerp__.py b/addons/project_gtd/__openerp__.py index d6fa568977a..c28bc6f732a 100644 --- a/addons/project_gtd/__openerp__.py +++ b/addons/project_gtd/__openerp__.py @@ -25,6 +25,7 @@ 'version': '1.0', 'category': 'Project Management', "sequence": 20, + "summary": "Personal Tasks", 'description': """ This module implements all concepts defined by the Getting Things Done methodology. =================================================================================== diff --git a/addons/project_issue/__openerp__.py b/addons/project_issue/__openerp__.py index 9037523d41e..fa7d002f571 100644 --- a/addons/project_issue/__openerp__.py +++ b/addons/project_issue/__openerp__.py @@ -25,6 +25,7 @@ 'version': '1.0', 'category': 'Project Management', "sequence": 22, + "summary": "Multi Level Support", 'description': """ This module provides Issues/Bugs Management in Project. ======================================================= diff --git a/addons/purchase/__openerp__.py b/addons/purchase/__openerp__.py index d84408a690d..298c743d660 100644 --- a/addons/purchase/__openerp__.py +++ b/addons/purchase/__openerp__.py @@ -25,6 +25,7 @@ 'version': '1.1', 'category': 'Purchase Management', "sequence": 19, + "summary": "Request for Quotation, Invoicing Control", 'description': """ Purchase module is for generating a purchase order for purchase of goods from a supplier. ========================================================================================= diff --git a/addons/sale/__openerp__.py b/addons/sale/__openerp__.py index 968d8d1cecd..d02b6278cbe 100644 --- a/addons/sale/__openerp__.py +++ b/addons/sale/__openerp__.py @@ -24,6 +24,7 @@ 'version': '1.0', 'category': 'Sales Management', "sequence": 14, + "summary": "Quotation, Sales, Invoicing", 'description': """ The base module to manage quotations and sales orders. ====================================================== diff --git a/addons/stock/__openerp__.py b/addons/stock/__openerp__.py index 50bcb23df7b..467ba05c2a2 100644 --- a/addons/stock/__openerp__.py +++ b/addons/stock/__openerp__.py @@ -23,6 +23,7 @@ "name" : "Warehouse Management", "version" : "1.1", "author" : "OpenERP SA", + "summary": "Incoming Shipment, Deliveries, Inventory, Stock", "description" : """ OpenERP Inventory Management module can manage multi-warehouses, multi and structured stock locations. ====================================================================================================== From 6b88b4317a7ca455f8bbae17dda60981717a65f9 Mon Sep 17 00:00:00 2001 From: Jigar Amin - OpenERP Date: Tue, 17 Jul 2012 12:19:55 +0530 Subject: [PATCH 03/22] [IMP] view imp bzr revid: jam@tinyerp.com-20120717064955-lz3b2u3fg5hs40f4 --- openerp/addons/base/module/module.py | 1 - openerp/addons/base/module/module_view.xml | 5 +++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/openerp/addons/base/module/module.py b/openerp/addons/base/module/module.py index 7a890f9095a..927cefcccb9 100644 --- a/openerp/addons/base/module/module.py +++ b/openerp/addons/base/module/module.py @@ -227,7 +227,6 @@ class module(osv.osv): 'application': fields.boolean('Application', readonly=True), 'icon': fields.char('Icon URL', size=128), 'icon_image': fields.function(_get_icon_image, string='Icon', type="binary"), - 'summary': fields.char('Summary', size=256, translate=True, readonly=True), } _defaults = { diff --git a/openerp/addons/base/module/module_view.xml b/openerp/addons/base/module/module_view.xml index 12947c827f3..6ae7ec3962e 100644 --- a/openerp/addons/base/module/module_view.xml +++ b/openerp/addons/base/module/module_view.xml @@ -70,6 +70,7 @@ +
@@ -78,8 +79,8 @@

- -
+
+

From 67931a35d29370416eac4ee10482294964b33a40 Mon Sep 17 00:00:00 2001 From: Jigar Amin - OpenERP Date: Tue, 17 Jul 2012 14:20:28 +0530 Subject: [PATCH 04/22] [Add] Add module summary on db install bzr revid: jam@tinyerp.com-20120717085028-2jkbf9ymrftkui45 --- openerp/addons/base/base.sql | 1 + openerp/modules/db.py | 6 +++--- openerp/modules/module.py | 1 + 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/openerp/addons/base/base.sql b/openerp/addons/base/base.sql index f2cb77709ed..26d70b7ede6 100644 --- a/openerp/addons/base/base.sql +++ b/openerp/addons/base/base.sql @@ -286,6 +286,7 @@ CREATE TABLE ir_module_module ( write_date timestamp without time zone, write_uid integer references res_users on delete set null, website character varying(256), + summary character varying(256), name character varying(128) NOT NULL, author character varying(128), url character varying(128), diff --git a/openerp/modules/db.py b/openerp/modules/db.py index 2449efc7fcd..7490631a3b9 100644 --- a/openerp/modules/db.py +++ b/openerp/modules/db.py @@ -77,8 +77,8 @@ def initialize(cr): cr.execute('INSERT INTO ir_module_module \ (author, website, name, shortdesc, description, \ - category_id, auto_install, state, certificate, web, license, application, icon, sequence) \ - VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s) RETURNING id', ( + category_id, auto_install, state, certificate, web, license, application, icon, sequence, summary) \ + VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s) RETURNING id', ( info['author'], info['website'], i, info['name'], info['description'], category_id, @@ -86,7 +86,7 @@ def initialize(cr): info['web'], info['license'], info['application'], info['icon'], - info['sequence'])) + info['sequence'], info['summary'])) id = cr.fetchone()[0] cr.execute('INSERT INTO ir_model_data \ (name,model,module, res_id, noupdate) VALUES (%s,%s,%s,%s,%s)', ( diff --git a/openerp/modules/module.py b/openerp/modules/module.py index 265a23190e5..b1d4de31bce 100644 --- a/openerp/modules/module.py +++ b/openerp/modules/module.py @@ -341,6 +341,7 @@ def load_information_from_description_file(module): 'web': False, 'website': '', 'sequence': 100, + 'summary': '', } info.update(itertools.izip( 'depends data demo test init_xml update_xml demo_xml'.split(), From cdffbc85845529ea383bb6ad819e5ee5f1eb80c3 Mon Sep 17 00:00:00 2001 From: Jigar Amin - OpenERP Date: Tue, 17 Jul 2012 16:05:27 +0530 Subject: [PATCH 05/22] [IMP] Made the summary search compitiablw with Keywords search bzr revid: jam@tinyerp.com-20120717103527-0898nuuhg56utkhg --- openerp/addons/base/module/module_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openerp/addons/base/module/module_view.xml b/openerp/addons/base/module/module_view.xml index 6ae7ec3962e..6f08e8c4e3d 100644 --- a/openerp/addons/base/module/module_view.xml +++ b/openerp/addons/base/module/module_view.xml @@ -43,7 +43,7 @@ - + From 0fb838686c78ee24a0ea2cce0247d782ce0b97d9 Mon Sep 17 00:00:00 2001 From: Antonin Bourguignon Date: Tue, 17 Jul 2012 18:25:07 +0200 Subject: [PATCH 06/22] [IMP] give higher sequence numbers (with wider gaps) to top menu items it should now be easier to insert new elements wherever we want in the main menu bzr revid: abo@openerp.com-20120717162507-eezg0luxap793wrx --- openerp/addons/base/base_menu.xml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/openerp/addons/base/base_menu.xml b/openerp/addons/base/base_menu.xml index 90c7dd348e6..6c8055ff8d4 100644 --- a/openerp/addons/base/base_menu.xml +++ b/openerp/addons/base/base_menu.xml @@ -1,10 +1,12 @@ - + + - + + @@ -12,11 +14,13 @@ + + From 2b59d63699aea495dfb747a3b90b527db2f81409 Mon Sep 17 00:00:00 2001 From: Antonin Bourguignon Date: Tue, 17 Jul 2012 18:25:28 +0200 Subject: [PATCH 07/22] [IMP] give higher sequence numbers (with wider gaps) to top menu items it should now be easier to insert new elements wherever we want in the main menu bzr revid: abo@openerp.com-20120717162528-0kkk32mjeoyda9c4 --- addons/account/account_menuitem.xml | 2 +- addons/base_tools/tools_view.xml | 4 ++- addons/event/event_view.xml | 33 ++++++++++---------- addons/hr/hr_view.xml | 14 ++++----- addons/knowledge/knowledge_view.xml | 2 +- addons/mail/mail_thread_view.xml | 4 +-- addons/marketing/marketing_view.xml | 5 ++- addons/membership/membership_view.xml | 8 ++--- addons/mrp/mrp_view.xml | 6 ++-- addons/point_of_sale/point_of_sale_view.xml | 34 ++++++++++++--------- addons/project/project_view.xml | 15 ++++----- addons/purchase/purchase_view.xml | 4 +-- addons/sale/sale_view.xml | 4 +-- addons/stock/stock_view.xml | 12 ++++---- addons/survey/survey_view.xml | 24 ++++++++------- 15 files changed, 90 insertions(+), 81 deletions(-) diff --git a/addons/account/account_menuitem.xml b/addons/account/account_menuitem.xml index c2275c0e461..401f77c9f94 100644 --- a/addons/account/account_menuitem.xml +++ b/addons/account/account_menuitem.xml @@ -2,7 +2,7 @@ - diff --git a/addons/base_tools/tools_view.xml b/addons/base_tools/tools_view.xml index eb51e000c1b..0541e452620 100644 --- a/addons/base_tools/tools_view.xml +++ b/addons/base_tools/tools_view.xml @@ -1,9 +1,11 @@ + + diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml index 1b1b5daa9a9..11e2322a0d8 100644 --- a/addons/event/event_view.xml +++ b/addons/event/event_view.xml @@ -1,7 +1,7 @@ - - - - + + - + + + Event type event.type @@ -52,7 +53,7 @@ - + @@ -111,7 +112,7 @@
+

From to

@@ -151,7 +152,7 @@ - + @@ -222,7 +223,7 @@ - + event.event.kanban event.event kanban @@ -286,7 +287,7 @@ - + event.event.calendar @@ -316,7 +317,7 @@ - + Events @@ -362,7 +363,7 @@ - + Events ir.actions.act_window event.event @@ -371,9 +372,9 @@ {"search_default_upcoming":1} Event is the low level object used by meeting and others documents that should be synchronized with mobile devices or calendar applications through caldav. Most of the users should work in the Calendar menu, and not in the list of events. - + - - + - + diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml index 54ced534880..6e798449fba 100644 --- a/addons/hr/hr_view.xml +++ b/addons/hr/hr_view.xml @@ -2,7 +2,7 @@ - @@ -20,7 +20,7 @@
- +
- + @@ -748,10 +749,15 @@ pos.ui
+ - Point of Sale - - + Point of Sale + 160 + @@ -842,12 +848,12 @@ - + domain="[('config_id', '=', active_id)]" /> Point of Sales @@ -864,8 +870,8 @@ id="menu_pos_config_pos" groups="group_pos_manager"/> - pos.session form - +
-
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml index e7420edb910..c1a8ea22d8b 100644 --- a/addons/sale/sale_view.xml +++ b/addons/sale/sale_view.xml @@ -1,6 +1,6 @@ - + @@ -197,7 +197,7 @@