From 61aa21b90c74bc509f193677cdeede07de3c4563 Mon Sep 17 00:00:00 2001 From: "Amit Bhavsar (Open ERP)" Date: Wed, 18 May 2011 17:54:09 +0530 Subject: [PATCH 01/73] [usability] move action rules into administration, base_action_rule_view bzr revid: amb@tinyerp.com-20110518122409-3dpyvfdq0fai5hmj --- addons/base_action_rule/base_action_rule_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/base_action_rule/base_action_rule_view.xml b/addons/base_action_rule/base_action_rule_view.xml index 65c16edf4ae..a9262a6b746 100644 --- a/addons/base_action_rule/base_action_rule_view.xml +++ b/addons/base_action_rule/base_action_rule_view.xml @@ -118,7 +118,7 @@ + parent="base.menu_custom" action="base_action_rule_act" sequence="1"/> From 7992a309fc5c0f372309ddf31c6bb0667c8de148 Mon Sep 17 00:00:00 2001 From: "Hardik Ansodariy (OpenERP)" Date: Wed, 18 May 2011 18:37:27 +0530 Subject: [PATCH 02/73] [usability] improve product view, sale_view and point_of_sale_view bzr revid: han@tinyerp.com-20110518130727-rdi4p0cqrarlceyh --- addons/point_of_sale/point_of_sale_view.xml | 13 ++++++++----- addons/sale/sale_view.xml | 2 +- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml index acc0a72ff3b..1f63b6ed382 100644 --- a/addons/point_of_sale/point_of_sale_view.xml +++ b/addons/point_of_sale/point_of_sale_view.xml @@ -654,11 +654,14 @@ form - - - - - + + + + + + + + diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml index 9b6664daf20..67f8b5b9a90 100644 --- a/addons/sale/sale_view.xml +++ b/addons/sale/sale_view.xml @@ -521,7 +521,7 @@ From 8ade69632e43b7c1ea5a33933e39f0de0958ccd8 Mon Sep 17 00:00:00 2001 From: "Amit Bhavsar (Open ERP)" Date: Thu, 19 May 2011 12:02:55 +0530 Subject: [PATCH 03/73] [usability], with project task in calendar view replaced the start date with deadline date bzr revid: amb@tinyerp.com-20110519063255-lao3cufauxk6sfpe --- addons/project/project_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml index d3b28c0d562..a2c52d3d85b 100644 --- a/addons/project/project_view.xml +++ b/addons/project/project_view.xml @@ -356,7 +356,7 @@ calendar - + From 26b4bcfde8bb19267189adb8006e6979186dd2c3 Mon Sep 17 00:00:00 2001 From: "Hardik Ansodariy (OpenERP)" Date: Thu, 19 May 2011 12:52:39 +0530 Subject: [PATCH 04/73] [IMP]:point_of_sale:add seprator above point_of_sale's fields bzr revid: han@tinyerp.com-20110519072239-itbv5am3kkfbq5ck --- addons/point_of_sale/point_of_sale_view.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml index 1f63b6ed382..6c85fbfd9e1 100644 --- a/addons/point_of_sale/point_of_sale_view.xml +++ b/addons/point_of_sale/point_of_sale_view.xml @@ -654,7 +654,8 @@ form - + + @@ -662,7 +663,7 @@ - + From 42d29b0af67eb4863acb9237a21b2e1c305d22b9 Mon Sep 17 00:00:00 2001 From: "Hardik Ansodariy (OpenERP)" Date: Thu, 19 May 2011 12:56:19 +0530 Subject: [PATCH 05/73] [IMP]:point_of_sale:removed comments bzr revid: han@tinyerp.com-20110519072619-7cd3ln1q0g2fd7y5 --- addons/point_of_sale/point_of_sale_view.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml index 6c85fbfd9e1..32cc6ba6f03 100644 --- a/addons/point_of_sale/point_of_sale_view.xml +++ b/addons/point_of_sale/point_of_sale_view.xml @@ -655,7 +655,6 @@ - From 0c0065a913995ac03e5a64e8451aaacc1aa89906 Mon Sep 17 00:00:00 2001 From: "Hardik Ansodariy (OpenERP)" Date: Thu, 19 May 2011 15:53:40 +0530 Subject: [PATCH 06/73] [IMP]:partner, base contact is reset to addresses bzr revid: han@tinyerp.com-20110519102340-jeds70ggm76di2st --- addons/base_contact/base_contact_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/base_contact/base_contact_view.xml b/addons/base_contact/base_contact_view.xml index 659307e289c..30174e746c3 100644 --- a/addons/base_contact/base_contact_view.xml +++ b/addons/base_contact/base_contact_view.xml @@ -125,7 +125,7 @@ - + + From fca888b1c89e873814ee850859fb65805da43598 Mon Sep 17 00:00:00 2001 From: "Amit Bhavsar (Open ERP)" Date: Thu, 19 May 2011 18:07:47 +0530 Subject: [PATCH 09/73] [usability],change in manu automated action bzr revid: amb@tinyerp.com-20110519123747-ysmde794md2m1esg --- addons/base_action_rule/base_action_rule_view.xml | 6 +++--- addons/process/process_view.xml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/base_action_rule/base_action_rule_view.xml b/addons/base_action_rule/base_action_rule_view.xml index a9262a6b746..57c862cb2fe 100644 --- a/addons/base_action_rule/base_action_rule_view.xml +++ b/addons/base_action_rule/base_action_rule_view.xml @@ -3,7 +3,7 @@ + parent="base.menu_custom" sequence="3" /> From 184cdbe346e3ed3dc87d4d2baf43e6aa23e8a315 Mon Sep 17 00:00:00 2001 From: "Amit Bhavsar (Open ERP)" Date: Fri, 20 May 2011 11:30:11 +0530 Subject: [PATCH 10/73] [usability],text improvement in outlook module bzr revid: amb@tinyerp.com-20110520060011-prkqbpuon7x4ns3u --- addons/outlook/installer.py | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/addons/outlook/installer.py b/addons/outlook/installer.py index c6947263996..21332551fc2 100644 --- a/addons/outlook/installer.py +++ b/addons/outlook/installer.py @@ -51,21 +51,19 @@ class outlook_installer(osv.osv_memory): 'doc_name' : 'Installation Guide to OpenERP Outlook Plug-in.doc', 'description' : """ * Save the Outlook plug­-in. -* Follows these steps to install outlook plug­in. -Pre-requirements : - 1. Python 2.6+ . - 2. Python for Windows extensions - PyWin32 this module for python must be installed for appropriate version of the Python. - 3.1 If With MS Outlook 2007 it is required to install externally "Collaboration Data Objects, version 1.2.1". - - http://www.microsoft.com/downloads/en/details.aspx?FamilyID=2714320D-C997-4DE1-986F-24F081725D36&displaylang=en - 3.2 With MS Outlook2003 Install inbuilt Collaboration Data Objects(CDO) while installing Outlook. +* steps to install outlook plug­in. + Required : + 1. Python 2.6+ . + 2. Python for Windows extensions - PyWin32 this module for python must be installed for appropriate version of the Python. + 3.1 With MS Outlook 2007, install externally "Collaboration Data Objects, version 1.2.1". - http://www.microsoft.com/downloads/en/details.aspx?FamilyID=2714320D-C997-4DE1-986F-24F081725D36&displaylang=en + 3.2 With MS Outlook2003 Install inbuilt Collaboration Data Objects(CDO) while installing Outlook. -How to install openerp-outlook plug-in? - 1. Save the executable plug-in file. - 2. Close Outlook Application if Running. - 3. Run executable plug-in file and the folllow the instruction. - -Note : - Please refer README file for dependecies external link, openobject-addons/outlook/README. + * install openerp-outlook plug-in? + 1. Save the executable plug-in file. + 2. Close Outlook Application if Running. + 3. Run executable plug-in file and folllow the instruction. + * Note : + Please refer README file for dependecies external link, openobject-addons/outlook/README. """ } outlook_installer() From 601a0799ca55d6a38955fc8a53f0c7784aacc7ce Mon Sep 17 00:00:00 2001 From: "Amit Bhavsar (Open ERP)" Date: Fri, 20 May 2011 14:10:37 +0530 Subject: [PATCH 11/73] [usability],improve text with thunderbird module bzr revid: amb@tinyerp.com-20110520084037-44s4vus359ezxpqf --- addons/thunderbird/installer.py | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/addons/thunderbird/installer.py b/addons/thunderbird/installer.py index ef8fc2fced4..943e97ede9f 100644 --- a/addons/thunderbird/installer.py +++ b/addons/thunderbird/installer.py @@ -52,19 +52,19 @@ class thunderbird_installer(osv.osv_memory): 'name' : 'openerp_plugin.xpi', 'description' : """ * Save the Thunderbird plug-­in. - * Follow these steps to install Thunderbird plug-­in. - 1. From Menu Bar of Thunderbird, open Tools ­> Add-ons. - 2. Click "Install" button. - 3. Select the plug-in(openerp_plugin.xpi file) - 5. Click "Install Now". - 6. Restart Thunderbird. - * Follow the steps to configure OpenERP in Thunderbird. - 1. Go to Tools > OpenERP Configuration. - 2. Check data (configured by default). - 3. Click "Connect". - 4. A message appears with the state of your connection. - 5. If your connection failed, check if your database is opened, and check data again. - 6. If your database is connected successfully, you can start to archive your e-mail in OpenERP. """ + * Steps to install Thunderbird plug-­in. + 1. From Menu Bar of Thunderbird, open Tools ­> Add-ons. + 2. Click "Install" + 3. Select the plug-in (openerp_plugin.xpi file) + 5. Click "Install Now". + 6. Restart Thunderbird. + * Steps to configure OpenERP in Thunderbird. + 1. Go to Tools > OpenERP Configuration. + 2. Check data (configured by default). + 3. Click "Connect". + 4. A message appears with the state of your connection. + 5. If your connection failed, check if your database is opened, and check data again. + 6. If database is connected successfully, start to archive e-mails in OpenERP. """ } thunderbird_installer() From 7c3c8956311289317bb858c3240c30d82b0963b0 Mon Sep 17 00:00:00 2001 From: "Amit (OpenERP)" Date: Fri, 20 May 2011 15:46:07 +0530 Subject: [PATCH 12/73] [IMP]:point_of_sale: Added two products in the module data : - "Cash In" with field "Product for Input" set (it must appear in Point of Sale / Configuration / Products for Input Operations) - "Cash Out" with field "Product for expenses" set (it must appear in Point of Sale / Configuration / Products for Output Operations) Rename the fields: - income_pdt as "Product for Input Operation" - expense_pdt as "Product for Output Operation" In Journal view (Accounting/Configuration/Financial Accounting/ Journals/Journals): - Changed the label "Users" to "POS Users. - Fixed separator label "Extended Configureation" -> "Extended Configuration. - In demo data, the journal type "Cash" should have field check_dtls set. - Renamed "check details" into "Check Cash Balance." bzr revid: apa@tinyerp.com-20110520101607-5ilo2t7zna392s63 --- .../point_of_sale/account_statement_demo.xml | 3 +++ .../point_of_sale/account_statement_view.xml | 6 +++--- addons/point_of_sale/point_of_sale_demo.xml | 18 ++++++++++++++++++ addons/point_of_sale/point_of_sale_view.xml | 4 ++-- 4 files changed, 26 insertions(+), 5 deletions(-) diff --git a/addons/point_of_sale/account_statement_demo.xml b/addons/point_of_sale/account_statement_demo.xml index c4850ded0a3..7cdbbf99596 100644 --- a/addons/point_of_sale/account_statement_demo.xml +++ b/addons/point_of_sale/account_statement_demo.xml @@ -5,6 +5,7 @@ Visa Journal VIJ cash + @@ -30,6 +31,7 @@ Bancontact Journal BACJ cash + @@ -68,6 +70,7 @@ + diff --git a/addons/point_of_sale/account_statement_view.xml b/addons/point_of_sale/account_statement_view.xml index 2b09639588b..45f89c5062c 100644 --- a/addons/point_of_sale/account_statement_view.xml +++ b/addons/point_of_sale/account_statement_view.xml @@ -10,12 +10,12 @@ - - + + - + diff --git a/addons/point_of_sale/point_of_sale_demo.xml b/addons/point_of_sale/point_of_sale_demo.xml index b022bd86693..e95ce05256f 100644 --- a/addons/point_of_sale/point_of_sale_demo.xml +++ b/addons/point_of_sale/point_of_sale_demo.xml @@ -7,6 +7,24 @@ + + + buy + + Cash In + + Cash In + + + + + buy + + Cash Out + + Cash Out + + POS/019 diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml index bf21eca349f..e08ec7cbaf9 100644 --- a/addons/point_of_sale/point_of_sale_view.xml +++ b/addons/point_of_sale/point_of_sale_view.xml @@ -657,8 +657,8 @@ - - + + From b25bf17013565154b4c4e65cd28747d03048735a Mon Sep 17 00:00:00 2001 From: "Tejas (OpenERP)" Date: Mon, 23 May 2011 12:55:24 +0530 Subject: [PATCH 13/73] [usability] purchase improvement , added picking to invoice bzr revid: tta@openerp.com-20110523072524-1sid4yhe9u1dqt9m --- addons/purchase/stock_view.xml | 57 ++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/addons/purchase/stock_view.xml b/addons/purchase/stock_view.xml index a65f557a3b2..fff91c4e627 100644 --- a/addons/purchase/stock_view.xml +++ b/addons/purchase/stock_view.xml @@ -57,5 +57,62 @@ + + + + stock.picking.in.search + stock.picking + search + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Picking to Invoice + stock.picking + ir.actions.act_window + form + tree,form,calendar + [('type','=','in')] + + {"search_default_done":1,"search_default_to_invoice":1} + + + + Create invoice from picking. If you selected this invoice method in the purchase order, all reception done are available here to be invoiced. + + + + From 44a6af1f4ee1fbb30ead1ddf4ca52c29c3c46280 Mon Sep 17 00:00:00 2001 From: Raphael Collet Date: Mon, 23 May 2011 10:56:25 +0200 Subject: [PATCH 14/73] [FIX] in POS, rename all 'Product for expenses' into 'Product for Output' bzr revid: rco@openerp.com-20110523085625-t1r3k84umw3u31ww --- addons/point_of_sale/i18n/ar.po | 2 +- addons/point_of_sale/i18n/bg.po | 2 +- addons/point_of_sale/i18n/bs.po | 2 +- addons/point_of_sale/i18n/ca.po | 2 +- addons/point_of_sale/i18n/cs.po | 2 +- addons/point_of_sale/i18n/da.po | 2 +- addons/point_of_sale/i18n/de.po | 2 +- addons/point_of_sale/i18n/el.po | 2 +- addons/point_of_sale/i18n/es.po | 2 +- addons/point_of_sale/i18n/es_AR.po | 2 +- addons/point_of_sale/i18n/es_EC.po | 4 ++-- addons/point_of_sale/i18n/et.po | 2 +- addons/point_of_sale/i18n/fi.po | 2 +- addons/point_of_sale/i18n/fr.po | 2 +- addons/point_of_sale/i18n/hi.po | 2 +- addons/point_of_sale/i18n/hr.po | 2 +- addons/point_of_sale/i18n/hu.po | 2 +- addons/point_of_sale/i18n/id.po | 2 +- addons/point_of_sale/i18n/it.po | 2 +- addons/point_of_sale/i18n/ko.po | 2 +- addons/point_of_sale/i18n/lt.po | 2 +- addons/point_of_sale/i18n/mn.po | 2 +- addons/point_of_sale/i18n/nl.po | 2 +- addons/point_of_sale/i18n/nl_BE.po | 2 +- addons/point_of_sale/i18n/pl.po | 2 +- addons/point_of_sale/i18n/point_of_sale.pot | 2 +- addons/point_of_sale/i18n/pt.po | 2 +- addons/point_of_sale/i18n/pt_BR.po | 2 +- addons/point_of_sale/i18n/ro.po | 2 +- addons/point_of_sale/i18n/ru.po | 2 +- addons/point_of_sale/i18n/sl.po | 2 +- addons/point_of_sale/i18n/sq.po | 2 +- addons/point_of_sale/i18n/sr.po | 2 +- addons/point_of_sale/i18n/sr@latin.po | 2 +- addons/point_of_sale/i18n/sv.po | 2 +- addons/point_of_sale/i18n/tlh.po | 2 +- addons/point_of_sale/i18n/tr.po | 2 +- addons/point_of_sale/i18n/uk.po | 2 +- addons/point_of_sale/i18n/vi.po | 2 +- addons/point_of_sale/i18n/zh_CN.po | 2 +- addons/point_of_sale/i18n/zh_HK.po | 2 +- addons/point_of_sale/i18n/zh_TW.po | 2 +- addons/point_of_sale/point_of_sale.py | 2 +- 43 files changed, 44 insertions(+), 44 deletions(-) diff --git a/addons/point_of_sale/i18n/ar.po b/addons/point_of_sale/i18n/ar.po index 9e123debacc..b51c591718e 100644 --- a/addons/point_of_sale/i18n/ar.po +++ b/addons/point_of_sale/i18n/ar.po @@ -768,7 +768,7 @@ msgstr "" #. module: point_of_sale #: field:product.product,expense_pdt:0 -msgid "Product for expenses" +msgid "Product for Output" msgstr "" #. module: point_of_sale diff --git a/addons/point_of_sale/i18n/bg.po b/addons/point_of_sale/i18n/bg.po index a013c85335d..1b96cb6a671 100644 --- a/addons/point_of_sale/i18n/bg.po +++ b/addons/point_of_sale/i18n/bg.po @@ -768,7 +768,7 @@ msgstr "" #. module: point_of_sale #: field:product.product,expense_pdt:0 -msgid "Product for expenses" +msgid "Product for Output" msgstr "" #. module: point_of_sale diff --git a/addons/point_of_sale/i18n/bs.po b/addons/point_of_sale/i18n/bs.po index 7a704f6f381..feca51685c8 100644 --- a/addons/point_of_sale/i18n/bs.po +++ b/addons/point_of_sale/i18n/bs.po @@ -768,7 +768,7 @@ msgstr "" #. module: point_of_sale #: field:product.product,expense_pdt:0 -msgid "Product for expenses" +msgid "Product for Output" msgstr "" #. module: point_of_sale diff --git a/addons/point_of_sale/i18n/ca.po b/addons/point_of_sale/i18n/ca.po index c7e564988ad..e67ad396923 100644 --- a/addons/point_of_sale/i18n/ca.po +++ b/addons/point_of_sale/i18n/ca.po @@ -769,7 +769,7 @@ msgstr "" #. module: point_of_sale #: field:product.product,expense_pdt:0 -msgid "Product for expenses" +msgid "Product for Output" msgstr "" #. module: point_of_sale diff --git a/addons/point_of_sale/i18n/cs.po b/addons/point_of_sale/i18n/cs.po index 3d378e19bd2..6572c211ff4 100644 --- a/addons/point_of_sale/i18n/cs.po +++ b/addons/point_of_sale/i18n/cs.po @@ -768,7 +768,7 @@ msgstr "" #. module: point_of_sale #: field:product.product,expense_pdt:0 -msgid "Product for expenses" +msgid "Product for Output" msgstr "" #. module: point_of_sale diff --git a/addons/point_of_sale/i18n/da.po b/addons/point_of_sale/i18n/da.po index 50d77c82e79..5d826a9ce85 100644 --- a/addons/point_of_sale/i18n/da.po +++ b/addons/point_of_sale/i18n/da.po @@ -769,7 +769,7 @@ msgstr "" #. module: point_of_sale #: field:product.product,expense_pdt:0 -msgid "Product for expenses" +msgid "Product for Output" msgstr "" #. module: point_of_sale diff --git a/addons/point_of_sale/i18n/de.po b/addons/point_of_sale/i18n/de.po index 59e772f8cb4..4d29f3ae7bb 100644 --- a/addons/point_of_sale/i18n/de.po +++ b/addons/point_of_sale/i18n/de.po @@ -778,7 +778,7 @@ msgstr "" #. module: point_of_sale #: field:product.product,expense_pdt:0 -msgid "Product for expenses" +msgid "Product for Output" msgstr "Produkt für Ausgaben" #. module: point_of_sale diff --git a/addons/point_of_sale/i18n/el.po b/addons/point_of_sale/i18n/el.po index a2ce1c4beed..639edf9dd3a 100644 --- a/addons/point_of_sale/i18n/el.po +++ b/addons/point_of_sale/i18n/el.po @@ -769,7 +769,7 @@ msgstr "" #. module: point_of_sale #: field:product.product,expense_pdt:0 -msgid "Product for expenses" +msgid "Product for Output" msgstr "" #. module: point_of_sale diff --git a/addons/point_of_sale/i18n/es.po b/addons/point_of_sale/i18n/es.po index 0f02805713f..de505a2b245 100644 --- a/addons/point_of_sale/i18n/es.po +++ b/addons/point_of_sale/i18n/es.po @@ -778,7 +778,7 @@ msgstr "" #. module: point_of_sale #: field:product.product,expense_pdt:0 -msgid "Product for expenses" +msgid "Product for Output" msgstr "Producto para gastos" #. module: point_of_sale diff --git a/addons/point_of_sale/i18n/es_AR.po b/addons/point_of_sale/i18n/es_AR.po index 44f81e309aa..ea0e6cd29aa 100644 --- a/addons/point_of_sale/i18n/es_AR.po +++ b/addons/point_of_sale/i18n/es_AR.po @@ -768,7 +768,7 @@ msgstr "" #. module: point_of_sale #: field:product.product,expense_pdt:0 -msgid "Product for expenses" +msgid "Product for Output" msgstr "" #. module: point_of_sale diff --git a/addons/point_of_sale/i18n/es_EC.po b/addons/point_of_sale/i18n/es_EC.po index 0abeddfbfff..d0258d26334 100644 --- a/addons/point_of_sale/i18n/es_EC.po +++ b/addons/point_of_sale/i18n/es_EC.po @@ -777,8 +777,8 @@ msgstr "" #. module: point_of_sale #: field:product.product,expense_pdt:0 -msgid "Product for expenses" -msgstr "Product for expenses" +msgid "Product for Output" +msgstr "Product for Output" #. module: point_of_sale #: model:ir.actions.act_window,name:point_of_sale.action_report_pos_sales_user_today_current_user diff --git a/addons/point_of_sale/i18n/et.po b/addons/point_of_sale/i18n/et.po index b337178faa3..ad1de47d48b 100644 --- a/addons/point_of_sale/i18n/et.po +++ b/addons/point_of_sale/i18n/et.po @@ -774,7 +774,7 @@ msgstr "" #. module: point_of_sale #: field:product.product,expense_pdt:0 -msgid "Product for expenses" +msgid "Product for Output" msgstr "" #. module: point_of_sale diff --git a/addons/point_of_sale/i18n/fi.po b/addons/point_of_sale/i18n/fi.po index 05261c37364..9d9b3aa8ba2 100644 --- a/addons/point_of_sale/i18n/fi.po +++ b/addons/point_of_sale/i18n/fi.po @@ -769,7 +769,7 @@ msgstr "" #. module: point_of_sale #: field:product.product,expense_pdt:0 -msgid "Product for expenses" +msgid "Product for Output" msgstr "" #. module: point_of_sale diff --git a/addons/point_of_sale/i18n/fr.po b/addons/point_of_sale/i18n/fr.po index 79287926ac9..c98b071164d 100644 --- a/addons/point_of_sale/i18n/fr.po +++ b/addons/point_of_sale/i18n/fr.po @@ -780,7 +780,7 @@ msgstr "" #. module: point_of_sale #: field:product.product,expense_pdt:0 -msgid "Product for expenses" +msgid "Product for Output" msgstr "Produits pour Sortie de Caisse" #. module: point_of_sale diff --git a/addons/point_of_sale/i18n/hi.po b/addons/point_of_sale/i18n/hi.po index 03a905d7cb8..fe1aa7b0671 100644 --- a/addons/point_of_sale/i18n/hi.po +++ b/addons/point_of_sale/i18n/hi.po @@ -769,7 +769,7 @@ msgstr "" #. module: point_of_sale #: field:product.product,expense_pdt:0 -msgid "Product for expenses" +msgid "Product for Output" msgstr "" #. module: point_of_sale diff --git a/addons/point_of_sale/i18n/hr.po b/addons/point_of_sale/i18n/hr.po index abb2fdb1054..18196580bed 100644 --- a/addons/point_of_sale/i18n/hr.po +++ b/addons/point_of_sale/i18n/hr.po @@ -768,7 +768,7 @@ msgstr "" #. module: point_of_sale #: field:product.product,expense_pdt:0 -msgid "Product for expenses" +msgid "Product for Output" msgstr "" #. module: point_of_sale diff --git a/addons/point_of_sale/i18n/hu.po b/addons/point_of_sale/i18n/hu.po index 16bd5c42fec..47e1947d562 100644 --- a/addons/point_of_sale/i18n/hu.po +++ b/addons/point_of_sale/i18n/hu.po @@ -769,7 +769,7 @@ msgstr "" #. module: point_of_sale #: field:product.product,expense_pdt:0 -msgid "Product for expenses" +msgid "Product for Output" msgstr "" #. module: point_of_sale diff --git a/addons/point_of_sale/i18n/id.po b/addons/point_of_sale/i18n/id.po index 5c5db29269a..cd444e5c830 100644 --- a/addons/point_of_sale/i18n/id.po +++ b/addons/point_of_sale/i18n/id.po @@ -768,7 +768,7 @@ msgstr "" #. module: point_of_sale #: field:product.product,expense_pdt:0 -msgid "Product for expenses" +msgid "Product for Output" msgstr "" #. module: point_of_sale diff --git a/addons/point_of_sale/i18n/it.po b/addons/point_of_sale/i18n/it.po index e978536e1c0..803a569482b 100644 --- a/addons/point_of_sale/i18n/it.po +++ b/addons/point_of_sale/i18n/it.po @@ -778,7 +778,7 @@ msgstr "" #. module: point_of_sale #: field:product.product,expense_pdt:0 -msgid "Product for expenses" +msgid "Product for Output" msgstr "Prodotto per spese" #. module: point_of_sale diff --git a/addons/point_of_sale/i18n/ko.po b/addons/point_of_sale/i18n/ko.po index 52c56982b36..0bad0a5c2ab 100644 --- a/addons/point_of_sale/i18n/ko.po +++ b/addons/point_of_sale/i18n/ko.po @@ -769,7 +769,7 @@ msgstr "" #. module: point_of_sale #: field:product.product,expense_pdt:0 -msgid "Product for expenses" +msgid "Product for Output" msgstr "" #. module: point_of_sale diff --git a/addons/point_of_sale/i18n/lt.po b/addons/point_of_sale/i18n/lt.po index 8d5faeb01c7..a5e452458a4 100644 --- a/addons/point_of_sale/i18n/lt.po +++ b/addons/point_of_sale/i18n/lt.po @@ -768,7 +768,7 @@ msgstr "" #. module: point_of_sale #: field:product.product,expense_pdt:0 -msgid "Product for expenses" +msgid "Product for Output" msgstr "" #. module: point_of_sale diff --git a/addons/point_of_sale/i18n/mn.po b/addons/point_of_sale/i18n/mn.po index 162ca31703d..9bd79ac9cbf 100644 --- a/addons/point_of_sale/i18n/mn.po +++ b/addons/point_of_sale/i18n/mn.po @@ -769,7 +769,7 @@ msgstr "" #. module: point_of_sale #: field:product.product,expense_pdt:0 -msgid "Product for expenses" +msgid "Product for Output" msgstr "" #. module: point_of_sale diff --git a/addons/point_of_sale/i18n/nl.po b/addons/point_of_sale/i18n/nl.po index 05814df59e4..d7dd3e5ba65 100644 --- a/addons/point_of_sale/i18n/nl.po +++ b/addons/point_of_sale/i18n/nl.po @@ -768,7 +768,7 @@ msgstr "" #. module: point_of_sale #: field:product.product,expense_pdt:0 -msgid "Product for expenses" +msgid "Product for Output" msgstr "" #. module: point_of_sale diff --git a/addons/point_of_sale/i18n/nl_BE.po b/addons/point_of_sale/i18n/nl_BE.po index f9b0fbe4e97..3d7f392cb2b 100644 --- a/addons/point_of_sale/i18n/nl_BE.po +++ b/addons/point_of_sale/i18n/nl_BE.po @@ -768,7 +768,7 @@ msgstr "" #. module: point_of_sale #: field:product.product,expense_pdt:0 -msgid "Product for expenses" +msgid "Product for Output" msgstr "" #. module: point_of_sale diff --git a/addons/point_of_sale/i18n/pl.po b/addons/point_of_sale/i18n/pl.po index 323efb6f2b4..aff595ac16a 100644 --- a/addons/point_of_sale/i18n/pl.po +++ b/addons/point_of_sale/i18n/pl.po @@ -772,7 +772,7 @@ msgstr "" #. module: point_of_sale #: field:product.product,expense_pdt:0 -msgid "Product for expenses" +msgid "Product for Output" msgstr "" #. module: point_of_sale diff --git a/addons/point_of_sale/i18n/point_of_sale.pot b/addons/point_of_sale/i18n/point_of_sale.pot index e4dcfccbe50..d9fb20dccbb 100644 --- a/addons/point_of_sale/i18n/point_of_sale.pot +++ b/addons/point_of_sale/i18n/point_of_sale.pot @@ -793,7 +793,7 @@ msgstr "" #. module: point_of_sale #: field:product.product,expense_pdt:0 -msgid "Product for expenses" +msgid "Product for Output" msgstr "" #. module: point_of_sale diff --git a/addons/point_of_sale/i18n/pt.po b/addons/point_of_sale/i18n/pt.po index f7857c6568b..ea2d62aa43b 100644 --- a/addons/point_of_sale/i18n/pt.po +++ b/addons/point_of_sale/i18n/pt.po @@ -774,7 +774,7 @@ msgstr "O montante do vale deve ser o mesmo que o da linha do extracto" #. module: point_of_sale #: field:product.product,expense_pdt:0 -msgid "Product for expenses" +msgid "Product for Output" msgstr "Produto para despesas" #. module: point_of_sale diff --git a/addons/point_of_sale/i18n/pt_BR.po b/addons/point_of_sale/i18n/pt_BR.po index 4aba5f89473..bf2472cd7bf 100644 --- a/addons/point_of_sale/i18n/pt_BR.po +++ b/addons/point_of_sale/i18n/pt_BR.po @@ -768,7 +768,7 @@ msgstr "" #. module: point_of_sale #: field:product.product,expense_pdt:0 -msgid "Product for expenses" +msgid "Product for Output" msgstr "Produto para Despesas" #. module: point_of_sale diff --git a/addons/point_of_sale/i18n/ro.po b/addons/point_of_sale/i18n/ro.po index 4e1629bbc55..b9a9c4bcbea 100644 --- a/addons/point_of_sale/i18n/ro.po +++ b/addons/point_of_sale/i18n/ro.po @@ -768,7 +768,7 @@ msgstr "" #. module: point_of_sale #: field:product.product,expense_pdt:0 -msgid "Product for expenses" +msgid "Product for Output" msgstr "" #. module: point_of_sale diff --git a/addons/point_of_sale/i18n/ru.po b/addons/point_of_sale/i18n/ru.po index 50fe81005c5..6d119a7d14d 100644 --- a/addons/point_of_sale/i18n/ru.po +++ b/addons/point_of_sale/i18n/ru.po @@ -768,7 +768,7 @@ msgstr "" #. module: point_of_sale #: field:product.product,expense_pdt:0 -msgid "Product for expenses" +msgid "Product for Output" msgstr "" #. module: point_of_sale diff --git a/addons/point_of_sale/i18n/sl.po b/addons/point_of_sale/i18n/sl.po index 19ddfbc1d79..f0d246e826e 100644 --- a/addons/point_of_sale/i18n/sl.po +++ b/addons/point_of_sale/i18n/sl.po @@ -768,7 +768,7 @@ msgstr "" #. module: point_of_sale #: field:product.product,expense_pdt:0 -msgid "Product for expenses" +msgid "Product for Output" msgstr "" #. module: point_of_sale diff --git a/addons/point_of_sale/i18n/sq.po b/addons/point_of_sale/i18n/sq.po index a359cfd3088..072137798d9 100644 --- a/addons/point_of_sale/i18n/sq.po +++ b/addons/point_of_sale/i18n/sq.po @@ -769,7 +769,7 @@ msgstr "" #. module: point_of_sale #: field:product.product,expense_pdt:0 -msgid "Product for expenses" +msgid "Product for Output" msgstr "" #. module: point_of_sale diff --git a/addons/point_of_sale/i18n/sr.po b/addons/point_of_sale/i18n/sr.po index 28b674dfdd7..d3246cf3262 100644 --- a/addons/point_of_sale/i18n/sr.po +++ b/addons/point_of_sale/i18n/sr.po @@ -769,7 +769,7 @@ msgstr "" #. module: point_of_sale #: field:product.product,expense_pdt:0 -msgid "Product for expenses" +msgid "Product for Output" msgstr "Proizvodi za Troskove" #. module: point_of_sale diff --git a/addons/point_of_sale/i18n/sr@latin.po b/addons/point_of_sale/i18n/sr@latin.po index c52da341fa9..250c8ee3580 100644 --- a/addons/point_of_sale/i18n/sr@latin.po +++ b/addons/point_of_sale/i18n/sr@latin.po @@ -769,7 +769,7 @@ msgstr "" #. module: point_of_sale #: field:product.product,expense_pdt:0 -msgid "Product for expenses" +msgid "Product for Output" msgstr "Proizvodi za Troskove" #. module: point_of_sale diff --git a/addons/point_of_sale/i18n/sv.po b/addons/point_of_sale/i18n/sv.po index 5801d102015..2fd7656fa66 100644 --- a/addons/point_of_sale/i18n/sv.po +++ b/addons/point_of_sale/i18n/sv.po @@ -768,7 +768,7 @@ msgstr "" #. module: point_of_sale #: field:product.product,expense_pdt:0 -msgid "Product for expenses" +msgid "Product for Output" msgstr "" #. module: point_of_sale diff --git a/addons/point_of_sale/i18n/tlh.po b/addons/point_of_sale/i18n/tlh.po index 52563a6c3f7..e2bfba37d81 100644 --- a/addons/point_of_sale/i18n/tlh.po +++ b/addons/point_of_sale/i18n/tlh.po @@ -768,7 +768,7 @@ msgstr "" #. module: point_of_sale #: field:product.product,expense_pdt:0 -msgid "Product for expenses" +msgid "Product for Output" msgstr "" #. module: point_of_sale diff --git a/addons/point_of_sale/i18n/tr.po b/addons/point_of_sale/i18n/tr.po index 79f1801e7a6..683103d47e6 100644 --- a/addons/point_of_sale/i18n/tr.po +++ b/addons/point_of_sale/i18n/tr.po @@ -806,7 +806,7 @@ msgstr "" #. module: point_of_sale #: field:product.product,expense_pdt:0 -msgid "Product for expenses" +msgid "Product for Output" msgstr "" #. module: point_of_sale diff --git a/addons/point_of_sale/i18n/uk.po b/addons/point_of_sale/i18n/uk.po index 28508a5c583..c0c1dbe6bcd 100644 --- a/addons/point_of_sale/i18n/uk.po +++ b/addons/point_of_sale/i18n/uk.po @@ -768,7 +768,7 @@ msgstr "" #. module: point_of_sale #: field:product.product,expense_pdt:0 -msgid "Product for expenses" +msgid "Product for Output" msgstr "" #. module: point_of_sale diff --git a/addons/point_of_sale/i18n/vi.po b/addons/point_of_sale/i18n/vi.po index be5a240147e..d67353905fd 100644 --- a/addons/point_of_sale/i18n/vi.po +++ b/addons/point_of_sale/i18n/vi.po @@ -769,7 +769,7 @@ msgstr "" #. module: point_of_sale #: field:product.product,expense_pdt:0 -msgid "Product for expenses" +msgid "Product for Output" msgstr "" #. module: point_of_sale diff --git a/addons/point_of_sale/i18n/zh_CN.po b/addons/point_of_sale/i18n/zh_CN.po index 450b2a6b160..e3a3804294a 100644 --- a/addons/point_of_sale/i18n/zh_CN.po +++ b/addons/point_of_sale/i18n/zh_CN.po @@ -768,7 +768,7 @@ msgstr "" #. module: point_of_sale #: field:product.product,expense_pdt:0 -msgid "Product for expenses" +msgid "Product for Output" msgstr "" #. module: point_of_sale diff --git a/addons/point_of_sale/i18n/zh_HK.po b/addons/point_of_sale/i18n/zh_HK.po index 1f3b56d7bcf..cbe4d6e10f6 100644 --- a/addons/point_of_sale/i18n/zh_HK.po +++ b/addons/point_of_sale/i18n/zh_HK.po @@ -769,7 +769,7 @@ msgstr "" #. module: point_of_sale #: field:product.product,expense_pdt:0 -msgid "Product for expenses" +msgid "Product for Output" msgstr "" #. module: point_of_sale diff --git a/addons/point_of_sale/i18n/zh_TW.po b/addons/point_of_sale/i18n/zh_TW.po index d407a999d9e..e4f64e6fb10 100644 --- a/addons/point_of_sale/i18n/zh_TW.po +++ b/addons/point_of_sale/i18n/zh_TW.po @@ -768,7 +768,7 @@ msgstr "" #. module: point_of_sale #: field:product.product,expense_pdt:0 -msgid "Product for expenses" +msgid "Product for Output" msgstr "" #. module: point_of_sale diff --git a/addons/point_of_sale/point_of_sale.py b/addons/point_of_sale/point_of_sale.py index 4eeb7b2dd9f..1f4df6e482f 100644 --- a/addons/point_of_sale/point_of_sale.py +++ b/addons/point_of_sale/point_of_sale.py @@ -1231,7 +1231,7 @@ class product_product(osv.osv): _inherit = 'product.product' _columns = { 'income_pdt': fields.boolean('Product for Input'), - 'expense_pdt': fields.boolean('Product for expenses'), + 'expense_pdt': fields.boolean('Product for Output'), 'am_out': fields.boolean('Control for Output Operations'), 'disc_controle': fields.boolean('Discount Control'), } From 7dcc7ce82812562e1d7109344bf4efacfb9aa329 Mon Sep 17 00:00:00 2001 From: Raphael Collet Date: Mon, 23 May 2011 11:06:56 +0200 Subject: [PATCH 15/73] [IMP] remove unused modules bzr revid: rco@openerp.com-20110523090656-qfuk3rquictzlprj --- addons/thunderbird/installer.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/addons/thunderbird/installer.py b/addons/thunderbird/installer.py index 69644f55579..5bf11218842 100644 --- a/addons/thunderbird/installer.py +++ b/addons/thunderbird/installer.py @@ -21,11 +21,9 @@ from osv import fields from osv import osv -from tools import config import base64 import addons -import difflib class thunderbird_installer(osv.osv_memory): _name = 'thunderbird.installer' From 4a71ddbb1b105d3834542932b6723210d58f3eb3 Mon Sep 17 00:00:00 2001 From: "Tejas (OpenERP)" Date: Tue, 24 May 2011 14:43:58 +0530 Subject: [PATCH 16/73] [usability] in user form : department, sales team and project should be on the same level. bzr revid: tta@openerp.com-20110524091358-0dwzrnr8jc7zwjbs --- addons/hr/hr_department_view.xml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/addons/hr/hr_department_view.xml b/addons/hr/hr_department_view.xml index 08fa5e0d7d8..fe6f75244ef 100644 --- a/addons/hr/hr_department_view.xml +++ b/addons/hr/hr_department_view.xml @@ -71,11 +71,9 @@ res.users - - + - - + From 26d26a234b3ff66cb0dfd209ef4f491a8b2e3818 Mon Sep 17 00:00:00 2001 From: "Hardik Ansodariy (OpenERP)" Date: Tue, 24 May 2011 18:27:03 +0530 Subject: [PATCH 17/73] [IMP]:hr_evaluation:i have add two data in this module 1)Employee Evaluation 2)job Survey bzr revid: han@tinyerp.com-20110524125703-6nt9o8hgckwh2c6i --- addons/hr_evaluation/__openerp__.py | 3 +- addons/hr_evaluation/hr_evaluation_data.xml | 597 ++++++++++++++ addons/hr_evaluation/hr_evaluation_demo.xml | 772 ------------------ addons/hr_recruitment/hr_recruitment_data.xml | 372 +++++++++ addons/hr_recruitment/hr_recruitment_demo.xml | 437 ---------- addons/survey/survey_data.xml | 15 +- addons/survey/survey_demo.xml | 4 +- 7 files changed, 986 insertions(+), 1214 deletions(-) create mode 100644 addons/hr_evaluation/hr_evaluation_data.xml diff --git a/addons/hr_evaluation/__openerp__.py b/addons/hr_evaluation/__openerp__.py index 1a611768d7e..3e45d38156e 100644 --- a/addons/hr_evaluation/__openerp__.py +++ b/addons/hr_evaluation/__openerp__.py @@ -47,7 +47,8 @@ in the form of pdf file. Implements a dashboard for My Current Evaluations "wizard/hr_evaluation_mail_view.xml", "hr_evaluation_view.xml", "report/hr_evaluation_report_view.xml", - "board_hr_evaluation_view.xml" + "board_hr_evaluation_view.xml", + "hr_evaluation_data.xml" ], "test": ["test/test_hr_evaluation.yml"], "active": False, diff --git a/addons/hr_evaluation/hr_evaluation_data.xml b/addons/hr_evaluation/hr_evaluation_data.xml new file mode 100644 index 00000000000..769522e876b --- /dev/null +++ b/addons/hr_evaluation/hr_evaluation_data.xml @@ -0,0 +1,597 @@ + + + + + Employee Evaluation + 20 + + + + 5 + open + + + Employee Evaluation Form + + + + + Work Plan + + + + + Employee Performance In Key Areas + + + The appraiser should rate the employee’s major work accomplishments and performance according to the metric provided below : + 1 - Significantly exceeds standards and expectations required of the position + 2 - Exceeds standards and expectations + 3 - Meet standards and expectations + 4 - Did not meet standards and expectations + 5 - Significantly below standards and expectations + + + Professional Development And Performance Plan (optional) + + + Identify professional, performance, or project objectives you recommend for employee’s continued career development over the coming year. + + + Employee Comments + + + + + 1 + do_not_validate + do_not_validate + Please enter a comment. + The choices need to add up to [enter sum here]. + + The comment you entered is in an invalid format. + + This question requires an answer. + + Employee Information + + multiple_textboxes_diff_type + The comment you entered is in an invalid format. + + + + Other + + + + + 1 + do_not_validate + do_not_validate + Please enter a comment. + The choices need to add up to [enter sum here]. + + The comment you entered is in an invalid format. + + This question requires an answer. + + Overall Purpose Of Employee Appraisal + + descriptive_text + The comment you entered is in an invalid format. + * To initiate a clear and open communication of performance expectations + +* To assist employees in their professional growth, through the identification of strengths and opportunities for development + + + + Other + + + + + 1 + do_not_validate + do_not_validate + Please enter a comment. + The choices need to add up to [enter sum here]. + + The comment you entered is in an invalid format. + + This question requires an answer. + + At the outset of the appraisal time period + + descriptive_text + The comment you entered is in an invalid format. + * It is the joint responsibility of the employee and the supervisor (appraiser) to establish a feasible work plan for the coming year, including major employee responsibilities and corresponding benchmarks against which results will be evaluated. +* Critical or key elements of performance and professional development needs (if any), should also be noted at this time + + + + Other + + + + + 1 + do_not_validate + do_not_validate + Please enter a comment. + The choices need to add up to [enter sum here]. + + The comment you entered is in an invalid format. + + This question requires an answer. + + At the conclusion of the appraisal time period + + descriptive_text + The comment you entered is in an invalid format. + * The employee will be responsible for completing a draft of the Appraisal Form as a tool for self-evaluation and a starting point for the supervisor’s evaluation. The employee can add examples of achievements for each criterion. +Once the form had been filled, the employee send it to his supervisor. + +* It is the primary responsibility of the supervisor to gather the necessary input from the appropriate sources of feedback (internal and/or external customers, peers). In case of collaboration with OpenERP SA Belgium, the supervisor must receive completed evaluation form from the employee's Belgian project manager. + +* The supervisor synthesizes and integrates all input into the completed appraisal. He motivates his evaluation in the ad hoc fields. + +* The employee may choose to offer comments or explanation regarding the completed review. + +* The supervisor send the form to the HR department in India and in Belgium. + + + + Other + + + + + 1 + do_not_validate + do_not_validate + Please enter a comment. + The choices need to add up to [enter sum here]. + + The comment you entered is in an invalid format. + + This question requires an answer. + + Work Plan + + table + The comment you entered is in an invalid format. + + + + Other + + + + + + 1 + do_not_validate + do_not_validate + Please enter a comment. + The choices need to add up to [enter sum here]. + + The comment you entered is in an invalid format. + + This question requires an answer. + + Additional comments : + + comment + The comment you entered is in an invalid format. + + + + Other + + + + + 1 + do_not_validate + do_not_validate + Please enter a comment. + The choices need to add up to [enter sum here]. + + The comment you entered is in an invalid format. + + This question requires an answer. + + Subject + + matrix_of_choices_only_one_ans + Recommendations / Evaluations + The comment you entered is in an invalid format. + + + + Other + + + + + 1 + do_not_validate + do_not_validate + Please enter a comment. + The choices need to add up to [enter sum here]. + + The comment you entered is in an invalid format. + + This question requires an answer. + + Supervisors only : + + matrix_of_choices_only_one_ans + Recommendations / Evaluations + The comment you entered is in an invalid format. + + + + Other + + + + + 1 + do_not_validate + do_not_validate + Please enter a comment. + The choices need to add up to [enter sum here]. + + The comment you entered is in an invalid format. + + This question requires an answer. + + Overall Performance Summary Rating + + descriptive_text + The comment you entered is in an invalid format. + including the project evaluation form (if any) + + + + Other + + + + + 1 + do_not_validate + do_not_validate + Please enter a comment. + The choices need to add up to [enter sum here]. + + The comment you entered is in an invalid format. + + This question requires an answer. + + Professional Development Objectives + + comment + The comment you entered is in an invalid format. + + + + Other + + + + + 1 + do_not_validate + do_not_validate + Please enter a comment. + The choices need to add up to [enter sum here]. + + The comment you entered is in an invalid format. + + This question requires an answer. + + Personal Performance Objectives + + comment + The comment you entered is in an invalid format. + + + + Other + + + + + 1 + do_not_validate + do_not_validate + Please enter a comment. + The choices need to add up to [enter sum here]. + + The comment you entered is in an invalid format. + + This question requires an answer. + + Project Objectives + + comment + The comment you entered is in an invalid format. + + + + Other + + + + + 1 + do_not_validate + do_not_validate + Please enter a comment. + The choices need to add up to [enter sum here]. + + The comment you entered is in an invalid format. + + This question requires an answer. + + Use the following space to make any comments regarding the above performance evaluation. + + comment + The comment you entered is in an invalid format. + + + + Other + + + + + Name + + char + + + + Position Title + + char + + + + Appraisal for Period + + char + + + + Date of Review + + datetime + + + + Appraiser + + char + + + + Title + + char + + + + 1 + 1 + 1 + + + + 1 + 1 + 2 + + + + 1 + 1 + 3 + + + + 1 + 1 + 4 + + + + 1 + 1 + 5 + + + + 1 + Ability to cope with multidisciplinary of team + + + + + 1 + Enthusiasm & implication toward projects/assignments + + + + + 1 + Compliance to internal rules and processes (timesheets completion, etc.) + + + + + 1 + Team spirit : ability to work efficiently with peers, manage the conflicts with diplomacy + + + + + 1 + Initiative and self autonomy + + + + + 1 + Ability to follow and complete work as instructed + + + + + 1 + Decision making + + + + + 1 + Customer commitment + + + + + 1 + Communication skills ( written & verbally): clearness, concision, exactitude + + + + + 1 + Technical skills regarding to the job requirements + + + + + 1 + Analytical and synthetic mind + + + + + 1 + Promptness and attendance record + + + + + 1 + Adaptability : Ability to adapt oneself to organizational changes while keeping efficiency + + + + + 1 + Creativity and forward looking aptitude + + + + + 1 + Time management : projects/tasks are completed on time + + + + + 1 + 1 + 1 + + + + 1 + 1 + 2 + + + + 1 + 1 + 3 + + + + 1 + 1 + 4 + + + + 1 + 1 + 5 + + + + 1 + Results of the bottom-up survey and mitigation actions to face technical, organizational, structural and/or relational issues + + + + + 1 + Delegation : Ability to efficiently assign tasks to other people + + + + + 1 + Leadership: create a challenging and motivating work environment aligned with the company's strategy + + + + + 1 + Leadership: sustain subordinates in their professional growth + + + + + 1 + Ability to manage planning resources, risks, budgets and deadlines + + + + + 1 + 1 + Objectives + + + + 1 + 1 + Results + + + + 1 + 1 + Comments + + + + 1 + At the conclusion of the appraisal time period: + + + + + 1 + At the outset of the appraisal time period: + + + + + diff --git a/addons/hr_evaluation/hr_evaluation_demo.xml b/addons/hr_evaluation/hr_evaluation_demo.xml index 59396717d49..a7be585272f 100644 --- a/addons/hr_evaluation/hr_evaluation_demo.xml +++ b/addons/hr_evaluation/hr_evaluation_demo.xml @@ -1,17 +1,5 @@ - - - - Employee Evaluation - 20 - - - - 5 - open - - @@ -24,14 +12,6 @@ - - - Employee Evaluation Form - - - - - Process @@ -40,45 +20,6 @@ - - - Work Plan - - - - - - - - Employee Performance In Key Areas - - - The appraiser should rate the employee’s major work accomplishments and performance according to the metric provided below : - 1 - Significantly exceeds standards and expectations required of the position - 2 - Exceeds standards and expectations - 3 - Meet standards and expectations - 4 - Did not meet standards and expectations - 5 - Significantly below standards and expectations - - - - - - Professional Development And Performance Plan (optional) - - - Identify professional, performance, or project objectives you recommend for employee’s continued career development over the coming year. - - - - - - Employee Comments - - - - - Survey @@ -112,31 +53,6 @@ - - - 1 - do_not_validate - do_not_validate - Please enter a comment. - The choices need to add up to [enter sum here]. - - The comment you entered is in an invalid format. - - This question requires an answer. - - Employee Information - - multiple_textboxes_diff_type - The comment you entered is in an invalid format. - - - - Other - - - - - 1 @@ -162,32 +78,6 @@ - - - 1 - do_not_validate - do_not_validate - Please enter a comment. - The choices need to add up to [enter sum here]. - - The comment you entered is in an invalid format. - - This question requires an answer. - - Subject - - matrix_of_choices_only_one_ans - Recommendations / Evaluations - The comment you entered is in an invalid format. - - - - Other - - - - - 1 @@ -213,58 +103,6 @@ - - - 1 - do_not_validate - do_not_validate - Please enter a comment. - The choices need to add up to [enter sum here]. - - The comment you entered is in an invalid format. - - This question requires an answer. - - Supervisors only : - - matrix_of_choices_only_one_ans - Recommendations / Evaluations - The comment you entered is in an invalid format. - - - - Other - - - - - - - - 1 - do_not_validate - do_not_validate - Please enter a comment. - The choices need to add up to [enter sum here]. - - The comment you entered is in an invalid format. - - This question requires an answer. - - Work Plan - - table - The comment you entered is in an invalid format. - - - - Other - - - - - - 1 @@ -315,31 +153,6 @@ - - - 1 - do_not_validate - do_not_validate - Please enter a comment. - The choices need to add up to [enter sum here]. - - The comment you entered is in an invalid format. - - This question requires an answer. - - Additional comments : - - comment - The comment you entered is in an invalid format. - - - - Other - - - - - 1 @@ -365,60 +178,6 @@ - - - 1 - do_not_validate - do_not_validate - Please enter a comment. - The choices need to add up to [enter sum here]. - - The comment you entered is in an invalid format. - - This question requires an answer. - - Overall Performance Summary Rating - - descriptive_text - The comment you entered is in an invalid format. - including the project evaluation form (if any) - - - - Other - - - - - - - - 1 - do_not_validate - do_not_validate - Please enter a comment. - The choices need to add up to [enter sum here]. - - The comment you entered is in an invalid format. - - This question requires an answer. - - Overall Purpose Of Employee Appraisal - - descriptive_text - The comment you entered is in an invalid format. - * To initiate a clear and open communication of performance expectations - -* To assist employees in their professional growth, through the identification of strengths and opportunities for development - - - - Other - - - - - 1 @@ -469,68 +228,6 @@ - - - 1 - do_not_validate - do_not_validate - Please enter a comment. - The choices need to add up to [enter sum here]. - - The comment you entered is in an invalid format. - - This question requires an answer. - - At the outset of the appraisal time period - - descriptive_text - The comment you entered is in an invalid format. - * It is the joint responsibility of the employee and the supervisor (appraiser) to establish a feasible work plan for the coming year, including major employee responsibilities and corresponding benchmarks against which results will be evaluated. -* Critical or key elements of performance and professional development needs (if any), should also be noted at this time - - - - Other - - - - - - - - 1 - do_not_validate - do_not_validate - Please enter a comment. - The choices need to add up to [enter sum here]. - - The comment you entered is in an invalid format. - - This question requires an answer. - - At the conclusion of the appraisal time period - - descriptive_text - The comment you entered is in an invalid format. - * The employee will be responsible for completing a draft of the Appraisal Form as a tool for self-evaluation and a starting point for the supervisor’s evaluation. The employee can add examples of achievements for each criterion. -Once the form had been filled, the employee send it to his supervisor. - -* It is the primary responsibility of the supervisor to gather the necessary input from the appropriate sources of feedback (internal and/or external customers, peers). In case of collaboration with OpenERP SA Belgium, the supervisor must receive completed evaluation form from the employee's Belgian project manager. - -* The supervisor synthesizes and integrates all input into the completed appraisal. He motivates his evaluation in the ad hoc fields. - -* The employee may choose to offer comments or explanation regarding the completed review. - -* The supervisor send the form to the HR department in India and in Belgium. - - - - Other - - - - - 1 @@ -566,197 +263,6 @@ Once the form had been filled, the employee send it to his supervisor. - - - - 1 - do_not_validate - do_not_validate - Please enter a comment. - The choices need to add up to [enter sum here]. - - The comment you entered is in an invalid format. - - This question requires an answer. - - Professional Development Objectives - - comment - The comment you entered is in an invalid format. - - - - Other - - - - - - - - 1 - do_not_validate - do_not_validate - Please enter a comment. - The choices need to add up to [enter sum here]. - - The comment you entered is in an invalid format. - - This question requires an answer. - - Personal Performance Objectives - - comment - The comment you entered is in an invalid format. - - - - Other - - - - - - - - 1 - do_not_validate - do_not_validate - Please enter a comment. - The choices need to add up to [enter sum here]. - - The comment you entered is in an invalid format. - - This question requires an answer. - - Project Objectives - - comment - The comment you entered is in an invalid format. - - - - Other - - - - - - - - 1 - do_not_validate - do_not_validate - Please enter a comment. - The choices need to add up to [enter sum here]. - - The comment you entered is in an invalid format. - - This question requires an answer. - - Use the following space to make any comments regarding the above performance evaluation. - - comment - The comment you entered is in an invalid format. - - - - Other - - - - - - - - 1 - 1 - 1 - - - - - - - 1 - 1 - 2 - - - - - - - 1 - 1 - 3 - - - - - - - 1 - 1 - 4 - - - - - - - 1 - 1 - 5 - - - - - - - 1 - 1 - 1 - - - - - - - 1 - 1 - 2 - - - - - - - 1 - 1 - 3 - - - - - - - 1 - 1 - 4 - - - - - - - 1 - 1 - 5 - - - - 1 @@ -1036,15 +542,6 @@ Once the form had been filled, the employee send it to his supervisor. - - - Name - - char - - - - 1 @@ -1119,15 +616,6 @@ Once the form had been filled, the employee send it to his supervisor. - - - Position Title - - char - - - - 1 @@ -1210,15 +698,6 @@ Once the form had been filled, the employee send it to his supervisor. - - - Appraisal for Period - - char - - - - 1 @@ -1255,113 +734,6 @@ Once the form had been filled, the employee send it to his supervisor. - - - Date of Review - - datetime - - - - - - - 1 - Time management : projects/tasks are completed on time - - - - - - - - 1 - Results of the bottom-up survey and mitigation actions to face technical, organizational, structural and/or relational issues - - - - - - - - 1 - Delegation : Ability to efficiently assign tasks to other people - - - - - - - - Appraiser - - char - - - - - - - 1 - Ability to cope with multidisciplinary of team - - - - - - - - 1 - Enthusiasm & implication toward projects/assignments - - - - - - - - 1 - Compliance to internal rules and processes (timesheets completion, etc.) - - - - - - - - 1 - Team spirit : ability to work efficiently with peers, manage the conflicts with diplomacy - - - - - - - - 1 - Leadership: create a challenging and motivating work environment aligned with the company's strategy - - - - - - - - 1 - Leadership: sustain subordinates in their professional growth - - - - - - - - 1 - Ability to manage planning resources, risks, budgets and deadlines - - - - @@ -1381,150 +753,6 @@ Once the form had been filled, the employee send it to his supervisor. - - - 1 - Initiative and self autonomy - - - - - - - - 1 - Ability to follow and complete work as instructed - - - - - - - - 1 - Decision making - - - - - - - - 1 - At the conclusion of the appraisal time period: - - - - - - - - 1 - At the outset of the appraisal time period: - - - - - - - - 1 - Customer commitment - - - - - - - - 1 - Communication skills ( written & verbally): clearness, concision, exactitude - - - - - - - - 1 - Technical skills regarding to the job requirements - - - - - - - - 1 - Analytical and synthetic mind - - - - - - - - 1 - Promptness and attendance record - - - - - - - - 1 - Adaptability : Ability to adapt oneself to organizational changes while keeping efficiency - - - - - - - - 1 - Creativity and forward looking aptitude - - - - - - - - Title - - char - - - - - - - 1 - 1 - Objectives - - - - - - - 1 - 1 - Results - - - - - - - 1 - 1 - Comments - - - - diff --git a/addons/hr_recruitment/hr_recruitment_data.xml b/addons/hr_recruitment/hr_recruitment_data.xml index 7985ddb42f0..2287f3c05c3 100644 --- a/addons/hr_recruitment/hr_recruitment_data.xml +++ b/addons/hr_recruitment/hr_recruitment_data.xml @@ -65,6 +65,378 @@ 7 + + Job Survey + draft + 20 + + + + 5 + + + Default Section + + + + + Education & Activities + + + + + Importance + + + + + 1 + do_not_validate + do_not_validate + Please enter a comment. + The choices need to add up to [enter sum here]. + + The comment you entered is in an invalid format. + + This question requires an answer. + + From which university will you graduate? + + single_textbox + The comment you entered is in an invalid format. + + + + Other + + + + + 1 + do_not_validate + do_not_validate + Please enter a comment. + The choices need to add up to [enter sum here]. + + The comment you entered is in an invalid format. + + This question requires an answer. + + Rate the Importance + + matrix_of_choices_only_one_ans + The comment you entered is in an invalid format. + + + + Other + + + + + 1 + do_not_validate + do_not_validate + Please enter a comment. + The choices need to add up to [enter sum here]. + + The comment you entered is in an invalid format. + + This question requires an answer. + + Education + + comment + The comment you entered is in an invalid format. + + + + Other + + + + + 1 + do_not_validate + do_not_validate + Please enter a comment. + The choices need to add up to [enter sum here]. + + The comment you entered is in an invalid format. + + This question requires an answer. + + Knowledge + + comment + The comment you entered is in an invalid format. + + + + Other + + + + + 1 + do_not_validate + do_not_validate + Please enter a comment. + The choices need to add up to [enter sum here]. + + The comment you entered is in an invalid format. + + This question requires an answer. + + What is your gender? + + multiple_choice_only_one_ans + The comment you entered is in an invalid format. + + + + Other + + + + + 1 + Male + + + + + + 1 + Female + + + + + + 1 + do_not_validate + do_not_validate + Please enter a comment. + The choices need to add up to [enter sum here]. + + The comment you entered is in an invalid format. + + This question requires an answer. + + What age group do you belong to? + + multiple_choice_only_one_ans + The comment you entered is in an invalid format. + + + + Other + + + + + + 1 + 0 - 15 + + + + + 1 + 16 - 20 + + + + + 1 + 21 - 30 + + + + + 1 + 31 - 40 + + + + + 1 + 41 - 50 + + + + + 1 + 51 - 60 + + + + + 1 + 61 - 70 + + + + + 1 + 71 + + + + + + + 1 + do_not_validate + do_not_validate + Please enter a comment. + The choices need to add up to [enter sum here]. + + The comment you entered is in an invalid format. + + This question requires an answer. + + Exprience + + comment + The comment you entered is in an invalid format. + + + + Other + + + + + 1 + do_not_validate + do_not_validate + Please enter a comment. + The choices need to add up to [enter sum here]. + + The comment you entered is in an invalid format. + + This question requires an answer. + + Activities + + comment + The comment you entered is in an invalid format. + + + + Other + + + + + + Not important + + + + + + Somewhat important + + + + + + Important + + + + + + Very important + + + + + + Most important + + + + + 1 + Good pay + + + + + 1 + Getting on with colleagues + + + + + 1 + Office environment (décor, light, space etc) + + + + + 1 + Desk space + + + + + 1 + State of the art technology + + + + + 1 + Office location (proximity to home) + + + + + 1 + Good management/boss + + + + + 1 + Freebies such as tea, coffee and stationery + + + + + 1 + Perks such as free parking, gym passes etc + + + + + 1 + No out of hours working + + + + + 1 + Dress code + + + + + 1 + Regular meetings + + + + + 1 + Good social life (office nights out, good Christmas parties etc) + + + diff --git a/addons/hr_recruitment/hr_recruitment_demo.xml b/addons/hr_recruitment/hr_recruitment_demo.xml index 4811e2b91a2..df34ec093c8 100644 --- a/addons/hr_recruitment/hr_recruitment_demo.xml +++ b/addons/hr_recruitment/hr_recruitment_demo.xml @@ -134,442 +134,5 @@ - - - - - Job Survey - draft - 20 - - - - 5 - - - - - Default Section - - - - - - - Education & Activities - - - - - - - Importance - - - - - - - 1 - do_not_validate - do_not_validate - Please enter a comment. - The choices need to add up to [enter sum here]. - - The comment you entered is in an invalid format. - - This question requires an answer. - - From which university will you graduate? - - single_textbox - The comment you entered is in an invalid format. - - - - Other - - - - - - - 1 - do_not_validate - do_not_validate - Please enter a comment. - The choices need to add up to [enter sum here]. - - The comment you entered is in an invalid format. - - This question requires an answer. - - Rate the Importance - - matrix_of_choices_only_one_ans - The comment you entered is in an invalid format. - - - - Other - - - - - - - 1 - do_not_validate - do_not_validate - Please enter a comment. - The choices need to add up to [enter sum here]. - - The comment you entered is in an invalid format. - - This question requires an answer. - - Education - - comment - The comment you entered is in an invalid format. - - - - Other - - - - - - - 1 - do_not_validate - do_not_validate - Please enter a comment. - The choices need to add up to [enter sum here]. - - The comment you entered is in an invalid format. - - This question requires an answer. - - Knowledge - - comment - The comment you entered is in an invalid format. - - - - Other - - - - - - - 1 - do_not_validate - do_not_validate - Please enter a comment. - The choices need to add up to [enter sum here]. - - The comment you entered is in an invalid format. - - This question requires an answer. - - What is your gender? - - multiple_choice_only_one_ans - The comment you entered is in an invalid format. - - - - Other - - - - - - 1 - Male - - - - - - 1 - Female - - - - - - - - 1 - do_not_validate - do_not_validate - Please enter a comment. - The choices need to add up to [enter sum here]. - - The comment you entered is in an invalid format. - - This question requires an answer. - - What age group do you belong to? - - multiple_choice_only_one_ans - The comment you entered is in an invalid format. - - - - Other - - - - - - 1 - 0 - 15 - - - - - 1 - 16 - 20 - - - - - 1 - 21 - 30 - - - - - 1 - 31 - 40 - - - - - 1 - 41 - 50 - - - - - 1 - 51 - 60 - - - - - 1 - 61 - 70 - - - - - 1 - 71 + - - - - - - - - 1 - do_not_validate - do_not_validate - Please enter a comment. - The choices need to add up to [enter sum here]. - - The comment you entered is in an invalid format. - - This question requires an answer. - - Exprience - - comment - The comment you entered is in an invalid format. - - - - Other - - - - - - - 1 - do_not_validate - do_not_validate - Please enter a comment. - The choices need to add up to [enter sum here]. - - The comment you entered is in an invalid format. - - This question requires an answer. - - Activities - - comment - The comment you entered is in an invalid format. - - - - Other - - - - - - - - Not important - - - - - - - - Somewhat important - - - - - - - - Important - - - - - - - - Very important - - - - - - - - Most important - - - - - - - - 1 - Good pay - - - - - - - 1 - Getting on with colleagues - - - - - - - 1 - Office environment (décor, light, space etc) - - - - - - - 1 - Desk space - - - - - - - 1 - State of the art technology - - - - - - - 1 - Office location (proximity to home) - - - - - - - 1 - Good management/boss - - - - - - - 1 - Freebies such as tea, coffee and stationery - - - - - - - 1 - Perks such as free parking, gym passes etc - - - - - - - 1 - No out of hours working - - - - - - - 1 - Dress code - - - - - - - 1 - Regular meetings - - - - - - - 1 - Good social life (office nights out, good Christmas parties etc) - - - - - diff --git a/addons/survey/survey_data.xml b/addons/survey/survey_data.xml index c057868d6de..7627c5d54b0 100644 --- a/addons/survey/survey_data.xml +++ b/addons/survey/survey_data.xml @@ -1,6 +1,17 @@ - + + Human Resources + Human Resources + + + Customer Feeback + Customer Feeback + + + Supplier Selection + Supplier Selection + - \ No newline at end of file + diff --git a/addons/survey/survey_demo.xml b/addons/survey/survey_demo.xml index c8fa9c269ff..e9e4821e957 100644 --- a/addons/survey/survey_demo.xml +++ b/addons/survey/survey_demo.xml @@ -6,7 +6,7 @@ - + From 5285ccfae52e442157fe277a06ab5222c867abe3 Mon Sep 17 00:00:00 2001 From: "Hardik Ansodariy (OpenERP)" Date: Tue, 24 May 2011 18:40:38 +0530 Subject: [PATCH 18/73] [IMP]:survey, removed commented code bzr revid: han@tinyerp.com-20110524131038-4s4rhg7b72bnage7 --- addons/survey/survey_demo.xml | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/addons/survey/survey_demo.xml b/addons/survey/survey_demo.xml index e9e4821e957..97e8daeb5b4 100644 --- a/addons/survey/survey_demo.xml +++ b/addons/survey/survey_demo.xml @@ -6,19 +6,6 @@ - - OpenERP Partner Feedback From 41add68371dd1766bac8ae067876bb5765816feb Mon Sep 17 00:00:00 2001 From: "Tejas (OpenERP)" Date: Wed, 25 May 2011 18:10:02 +0530 Subject: [PATCH 19/73] [usability] sale's product view improved, old changed removed. bzr revid: tta@openerp.com-20110525124002-z49h60drvfnqdv1a --- addons/sale/sale_view.xml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml index 67f8b5b9a90..32f7321c007 100644 --- a/addons/sale/sale_view.xml +++ b/addons/sale/sale_view.xml @@ -7,7 +7,17 @@ - + + Products + ir.actions.act_window + product.product + form + {"search_default_filter_to_sell":1} + + + You must define a Product for everything you buy or sell. Products can be raw materials, stockable products, consumables or services. The Product form contains detailed information about your products related to procurement logistics, sales price, product category, suppliers and so on. + + sale.shop From 4e7e34b61bf9bec6b0fea87df9f47d02114856ac Mon Sep 17 00:00:00 2001 From: "Tejas (OpenERP)" Date: Thu, 26 May 2011 11:56:58 +0530 Subject: [PATCH 20/73] [usability] add name attribute to filter bzr revid: tta@openerp.com-20110526062658-3d84t7g1y7ib49bs --- addons/product/product_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml index 844ad6dc8fd..67d59bb9c8d 100644 --- a/addons/product/product_view.xml +++ b/addons/product/product_view.xml @@ -12,7 +12,7 @@ - + From 549334db27ca41b88c70ea5d5a7c79c24eff4d06 Mon Sep 17 00:00:00 2001 From: "Tejas (OpenERP)" Date: Thu, 26 May 2011 12:05:05 +0530 Subject: [PATCH 21/73] [usability] removed the module_name from action bzr revid: tta@openerp.com-20110526063505-yqrjppysjn9ovswx --- addons/sale/sale_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml index 32f7321c007..968c115bd9a 100644 --- a/addons/sale/sale_view.xml +++ b/addons/sale/sale_view.xml @@ -17,7 +17,7 @@ You must define a Product for everything you buy or sell. Products can be raw materials, stockable products, consumables or services. The Product form contains detailed information about your products related to procurement logistics, sales price, product category, suppliers and so on. - + sale.shop From bf32c2c499897fb65b1380a73cb6c770e7d590bb Mon Sep 17 00:00:00 2001 From: "Tejas (OpenERP)" Date: Thu, 26 May 2011 14:29:36 +0530 Subject: [PATCH 22/73] [usability] action and menu shifted to product view file, proposed changed done bzr revid: tta@openerp.com-20110526085936-55mawq3fb3ek5ec0 --- addons/product/product_view.xml | 12 +++++++++++- addons/sale/sale_view.xml | 13 +------------ 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml index 67d59bb9c8d..0a2a309ba92 100644 --- a/addons/product/product_view.xml +++ b/addons/product/product_view.xml @@ -195,9 +195,19 @@ You must define a Product for everything you buy or sell. Products can be raw materials, stockable products, consumables or services. The Product form contains detailed information about your products related to procurement logistics, sales price, product category, suppliers and so on. + + Products + ir.actions.act_window + product.product + form + {"search_default_filter_to_sell":1} + + + You must define a Product for everything you buy or sell. Products can be raw materials, stockable products, consumables or services. The Product form contains detailed information about your products related to procurement logistics, sales price, product category, suppliers and so on. + - + Products diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml index 968c115bd9a..85206cdf6b0 100644 --- a/addons/sale/sale_view.xml +++ b/addons/sale/sale_view.xml @@ -6,18 +6,7 @@ - - - Products - ir.actions.act_window - product.product - form - {"search_default_filter_to_sell":1} - - - You must define a Product for everything you buy or sell. Products can be raw materials, stockable products, consumables or services. The Product form contains detailed information about your products related to procurement logistics, sales price, product category, suppliers and so on. - - + sale.shop From f375570a9cff5347501a347005e2f99adfec2736 Mon Sep 17 00:00:00 2001 From: "Tejas (OpenERP)" Date: Mon, 30 May 2011 11:53:09 +0530 Subject: [PATCH 23/73] [Usability] changes with purchase, renaming field name and menu name bzr revid: tta@openerp.com-20110530062309-gp9ltvu3pmhcdk90 --- addons/purchase/purchase.py | 2 +- addons/purchase/purchase_view.xml | 2 +- addons/purchase/stock_view.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py index 6f6ab0c1b44..01f5c9faf11 100644 --- a/addons/purchase/purchase.py +++ b/addons/purchase/purchase.py @@ -188,7 +188,7 @@ class purchase_order(osv.osv): 'shipped_rate': fields.function(_shipped_rate, method=True, string='Received', type='float'), 'invoiced': fields.function(_invoiced, method=True, string='Invoiced & Paid', type='boolean', help="It indicates that an invoice has been paid"), 'invoiced_rate': fields.function(_invoiced_rate, method=True, string='Invoiced', type='float'), - 'invoice_method': fields.selection([('manual','Manual'),('order','From Order'),('picking','From Picking')], 'Invoicing Control', required=True, + 'invoice_method': fields.selection([('manual','Manual'),('order','From Order'),('picking','From Reception')], 'Invoicing Control', required=True, help="From Order: a draft invoice will be pre-generated based on the purchase order. The accountant " \ "will just have to validate this invoice for control.\n" \ "From Picking: a draft invoice will be pre-generated based on validated receptions.\n" \ diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml index bc74fc852c1..fc990ecefee 100644 --- a/addons/purchase/purchase_view.xml +++ b/addons/purchase/purchase_view.xml @@ -455,7 +455,7 @@ - Purchase Lines Not Invoiced + On Purchase Order Line ir.actions.act_window purchase.order.line [('order_id.invoice_method','<>','picking'), ('state','in',('confirmed','done')), ('invoiced', '=', False)] diff --git a/addons/purchase/stock_view.xml b/addons/purchase/stock_view.xml index e3ff3247430..084e8761650 100644 --- a/addons/purchase/stock_view.xml +++ b/addons/purchase/stock_view.xml @@ -103,7 +103,7 @@ - Picking to Invoice + On Receptions stock.picking ir.actions.act_window form From dd63d93421160be9e93756f22a0a337514e292f4 Mon Sep 17 00:00:00 2001 From: "Tejas (OpenERP)" Date: Mon, 30 May 2011 16:02:02 +0530 Subject: [PATCH 24/73] [Usability] Updated the purchase.pot bzr revid: tta@openerp.com-20110530103202-r8c5oy3h0e34kl2i --- addons/purchase/i18n/purchase.pot | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/addons/purchase/i18n/purchase.pot b/addons/purchase/i18n/purchase.pot index 5798c30d7d5..b1c3b86aafb 100644 --- a/addons/purchase/i18n/purchase.pot +++ b/addons/purchase/i18n/purchase.pot @@ -56,7 +56,7 @@ msgstr "" #. module: purchase #: selection:purchase.order,invoice_method:0 -msgid "From Picking" +msgid "From Reception" msgstr "" #. module: purchase @@ -883,7 +883,13 @@ msgstr "" #. module: purchase #: model:ir.actions.act_window,name:purchase.purchase_line_form_action2 #: model:ir.ui.menu,name:purchase.menu_purchase_line_order_draft -msgid "Purchase Lines Not Invoiced" +msgid "On Purchase Order Line" +msgstr "" + +#. module: purchase +#: model:ir.actions.act_window,name:purchase.action_picking_tree4_picking_to_invoice +#: model:ir.ui.menu,name:purchase.action_picking_tree4_picking_to_invoice +msgid "On Receptions" msgstr "" #. module: purchase From 071ae2713414e22f0e703129bb457e766b143de8 Mon Sep 17 00:00:00 2001 From: "Amit (OpenERP)" Date: Thu, 2 Jun 2011 12:25:59 +0530 Subject: [PATCH 25/73] [IMP]:product,stock:Added a field 'Stock of Warehouse' and rename 'extended filter' into 'Context' and also improved the code for method. bzr revid: apa@tinyerp.com-20110602065559-20u83owfgt32sb1o --- addons/product/product_view.xml | 6 +++--- addons/stock/product.py | 22 ++++++++++++++++++---- addons/stock/product_view.xml | 1 + 3 files changed, 22 insertions(+), 7 deletions(-) diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml index 0a2a309ba92..bcbded962f0 100644 --- a/addons/product/product_view.xml +++ b/addons/product/product_view.xml @@ -19,7 +19,7 @@ - + @@ -201,8 +201,8 @@ product.product form {"search_default_filter_to_sell":1} - - + + You must define a Product for everything you buy or sell. Products can be raw materials, stockable products, consumables or services. The Product form contains detailed information about your products related to procurement logistics, sales price, product category, suppliers and so on. diff --git a/addons/stock/product.py b/addons/stock/product.py index 2a819ea89b2..76e499c454e 100644 --- a/addons/stock/product.py +++ b/addons/stock/product.py @@ -182,6 +182,10 @@ class product_product(osv.osv): """ if context is None: context = {} + + location_obj = self.pool.get('stock.location') + warehouse_obj = self.pool.get('stock.warehouse') + states = context.get('states',[]) what = context.get('what',()) if not ids: @@ -198,6 +202,15 @@ class product_product(osv.osv): context['warehouse'] = res2[0] if context.get('warehouse', False): + + # write code for added filter in product view. + if isinstance(context['warehouse'],str): + warehouse_id = warehouse_obj.search(cr, uid, [('name','ilike',context['warehouse'])], context=context) + if warehouse_id: + context['warehouse'] = warehouse_id[0] + else: + raise osv.except_osv(_('Warning!'),_('There is no warehouse defined name like: "%s"')%(context['warehouse'],)) + cr.execute('select lot_stock_id from stock_warehouse where id=%s', (int(context['warehouse']),)) res2 = cr.fetchone() if res2: @@ -207,18 +220,18 @@ class product_product(osv.osv): if type(context['location']) == type(1): location_ids = [context['location']] elif type(context['location']) in (type(''), type(u'')): - location_ids = self.pool.get('stock.location').search(cr, uid, [('name','ilike',context['location'])], context=context) + location_ids = location_obj.search(cr, uid, [('name','ilike',context['location'])], context=context) else: location_ids = context['location'] else: location_ids = [] - wids = self.pool.get('stock.warehouse').search(cr, uid, [], context=context) - for w in self.pool.get('stock.warehouse').browse(cr, uid, wids, context=context): + wids = warehouse_obj.search(cr, uid, [], context=context) + for w in warehouse_obj.browse(cr, uid, wids, context=context): location_ids.append(w.lot_stock_id.id) # build the list of ids of children of the location given by id if context.get('compute_child',True): - child_location_ids = self.pool.get('stock.location').search(cr, uid, [('location_id', 'child_of', location_ids)]) + child_location_ids = location_obj.search(cr, uid, [('location_id', 'child_of', location_ids)]) location_ids = child_location_ids or location_ids else: location_ids = location_ids @@ -334,6 +347,7 @@ class product_product(osv.osv): 'track_incoming': fields.boolean('Track Incoming Lots', help="Forces to specify a Production Lot for all moves containing this product and coming from a Supplier Location"), 'track_outgoing': fields.boolean('Track Outgoing Lots', help="Forces to specify a Production Lot for all moves containing this product and going to a Customer Location"), 'location_id': fields.dummy(string='Stock Location', relation='stock.location', type='many2one'), + 'warehouse_id': fields.dummy(string='Stock of Warehouse', relation='stock.warehouse', type='many2one'), 'valuation':fields.selection([('manual_periodic', 'Periodical (manual)'), ('real_time','Real Time (automated)'),], 'Inventory Valuation', help="If real-time valuation is enabled for a product, the system will automatically write journal entries corresponding to stock moves." \ diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml index def92fe79eb..af660ab74d4 100644 --- a/addons/stock/product_view.xml +++ b/addons/stock/product_view.xml @@ -10,6 +10,7 @@ + From 5cc546bad9685fa80b67f111fe756147bc99bf8d Mon Sep 17 00:00:00 2001 From: "Tejas (OpenERP)" Date: Tue, 7 Jun 2011 14:31:31 +0530 Subject: [PATCH 26/73] [usability] res_partner_address default is default (create one default address if none given) bzr revid: tta@openerp.com-20110607090131-6qxynpmrlzq68a0s --- openerp/addons/base/res/partner/partner.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/openerp/addons/base/res/partner/partner.py b/openerp/addons/base/res/partner/partner.py index a5ef8bfa49c..42928877b8d 100644 --- a/openerp/addons/base/res/partner/partner.py +++ b/openerp/addons/base/res/partner/partner.py @@ -267,7 +267,12 @@ class res_partner(osv.osv): cr, uid, model_data.search(cr, uid, [('module','=','base'), ('name','=','main_partner')])[0], - ).res_id + ).res_id + def create(self, cr, user, vals, context=None): + if vals.has_key('address') and vals['address'] == []: + address={'address': [[0, 0, {'type': 'default'}]]} + vals.update(address) + return super(res_partner, self).create(cr, user, vals, context) res_partner() class res_partner_address(osv.osv): From 3571b8df7a48fd11bfbfcb23a7b04c2012f0aecf Mon Sep 17 00:00:00 2001 From: "Tejas (OpenERP)" Date: Tue, 7 Jun 2011 17:23:53 +0530 Subject: [PATCH 27/73] [Usability] create a default address if non is exists, improved code bzr revid: tta@openerp.com-20110607115353-l7ljzhbot7fjk5wy --- openerp/addons/base/res/partner/partner.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/openerp/addons/base/res/partner/partner.py b/openerp/addons/base/res/partner/partner.py index 42928877b8d..62ff1adf049 100644 --- a/openerp/addons/base/res/partner/partner.py +++ b/openerp/addons/base/res/partner/partner.py @@ -269,9 +269,8 @@ class res_partner(osv.osv): ('name','=','main_partner')])[0], ).res_id def create(self, cr, user, vals, context=None): - if vals.has_key('address') and vals['address'] == []: - address={'address': [[0, 0, {'type': 'default'}]]} - vals.update(address) + if vals.has_key('address') and not vals.get('address'): + vals.get('address').append((0, 0, {'type': 'default'})) return super(res_partner, self).create(cr, user, vals, context) res_partner() From ef7b0c0dd4cde731c05af910b1898baf5a5d6fca Mon Sep 17 00:00:00 2001 From: "Tejas (OpenERP)" Date: Mon, 4 Jul 2011 15:58:11 +0530 Subject: [PATCH 28/73] [Usability] imporve supplier domain for search view bzr revid: tta@openerp.com-20110704102811-ygcfm75k6mocjmqc --- openerp/addons/base/res/partner/partner_view.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/openerp/addons/base/res/partner/partner_view.xml b/openerp/addons/base/res/partner/partner_view.xml index 48f12ed18b4..0f5a8c08996 100644 --- a/openerp/addons/base/res/partner/partner_view.xml +++ b/openerp/addons/base/res/partner/partner_view.xml @@ -394,7 +394,6 @@ ir.actions.act_window res.partner form - [('supplier','=',1)] {'default_customer':0, 'search_default_supplier': 1, 'default_supplier':1} You can access all information regarding your suppliers from the supplier form: accounting data, history of emails, meetings, purchases, etc. You can uncheck the 'Suppliers' filter button in order to search in all your partners, including customers and prospects. From c59e815f36229e6e377653187794a725a9418ba9 Mon Sep 17 00:00:00 2001 From: "Tejas (OpenERP)" Date: Mon, 4 Jul 2011 17:45:12 +0530 Subject: [PATCH 29/73] [Usability] Enhance the search view of suppliers , Removed unwanted domain or filter bzr revid: tta@openerp.com-20110704121512-je0y16buk5zmrs3x --- openerp/addons/base/res/partner/partner_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openerp/addons/base/res/partner/partner_view.xml b/openerp/addons/base/res/partner/partner_view.xml index 0f5a8c08996..041caa63dc2 100644 --- a/openerp/addons/base/res/partner/partner_view.xml +++ b/openerp/addons/base/res/partner/partner_view.xml @@ -394,7 +394,7 @@ ir.actions.act_window res.partner form - {'default_customer':0, 'search_default_supplier': 1, 'default_supplier':1} + {'search_default_supplier': 1} You can access all information regarding your suppliers from the supplier form: accounting data, history of emails, meetings, purchases, etc. You can uncheck the 'Suppliers' filter button in order to search in all your partners, including customers and prospects. From 6ff2268d467b90b228b54ea32367cdab444875bd Mon Sep 17 00:00:00 2001 From: "Tejas (OpenERP)" Date: Tue, 5 Jul 2011 11:50:08 +0530 Subject: [PATCH 30/73] [Usability] renamed label narration to Internal Notes bzr revid: tta@openerp.com-20110705062008-hmsgg61r6ixm0w0z --- addons/account/account.py | 2 +- addons/account/account_move_line.py | 2 +- addons/account/account_view.xml | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/addons/account/account.py b/addons/account/account.py index f6dd36c01fc..6883789c2f1 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -1141,7 +1141,7 @@ class account_move(osv.osv): 'partner_id': fields.related('line_id', 'partner_id', type="many2one", relation="res.partner", string="Partner", store=True), 'amount': fields.function(_amount_compute, method=True, string='Amount', digits_compute=dp.get_precision('Account'), type='float', fnct_search=_search_amount), 'date': fields.date('Date', required=True, states={'posted':[('readonly',True)]}, select=True), - 'narration':fields.text('Narration'), + 'narration':fields.text('Internal Note'), 'company_id': fields.related('journal_id','company_id',type='many2one',relation='res.company',string='Company', store=True, readonly=True), } _defaults = { diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py index 8a487fe696d..be74e0f9441 100644 --- a/addons/account/account_move_line.py +++ b/addons/account/account_move_line.py @@ -483,7 +483,7 @@ class account_move_line(osv.osv): 'credit': fields.float('Credit', digits_compute=dp.get_precision('Account')), 'account_id': fields.many2one('account.account', 'Account', required=True, ondelete="cascade", domain=[('type','<>','view'), ('type', '<>', 'closed')], select=2), 'move_id': fields.many2one('account.move', 'Move', ondelete="cascade", help="The move of this entry line.", select=2, required=True), - 'narration': fields.related('move_id','narration', type='text', relation='account.move', string='Narration'), + 'narration': fields.related('move_id','narration', type='text', relation='account.move', string='Internal Note'), 'ref': fields.related('move_id', 'ref', string='Reference', type='char', size=64, store=True), 'statement_id': fields.many2one('account.bank.statement', 'Statement', help="The bank statement used for bank reconciliation", select=1), 'reconcile_id': fields.many2one('account.move.reconcile', 'Reconcile', readonly=True, ondelete='set null', select=2), diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml index e0a355c35bf..7ab040900fc 100644 --- a/addons/account/account_view.xml +++ b/addons/account/account_view.xml @@ -1097,7 +1097,7 @@ - + @@ -1392,7 +1392,7 @@ - + @@ -1419,7 +1419,7 @@ - + From 90734e477cd63b577f59d540763caffa2bd659a7 Mon Sep 17 00:00:00 2001 From: "Amit Bhavsar (Open ERP)" Date: Wed, 6 Jul 2011 13:01:13 +0530 Subject: [PATCH 31/73] [usability],In routing form view change selection feild to search bzr revid: amb@tinyerp.com-20110706073113-02leyku0z289ifqj --- addons/mrp/mrp_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml index 1ac11707870..377b8d89c0e 100644 --- a/addons/mrp/mrp_view.xml +++ b/addons/mrp/mrp_view.xml @@ -229,7 +229,7 @@ - + From 1f5aa0643ffee36327151e8e2b30315c883e0cd5 Mon Sep 17 00:00:00 2001 From: "Hardik Ansodariy (OpenERP)" Date: Wed, 6 Jul 2011 17:59:28 +0530 Subject: [PATCH 32/73] [IMP]: module is defined by its complexity bzr revid: han@tinyerp.com-20110706122928-xvcpdu5inpkganfy --- addons/account/__openerp__.py | 1 + addons/account_accountant/__openerp__.py | 1 + .../account_analytic_analysis/__openerp__.py | 1 + .../account_analytic_default/__openerp__.py | 1 + addons/account_analytic_plans/__openerp__.py | 1 + addons/account_anglo_saxon/__openerp__.py | 1 + addons/account_budget/__openerp__.py | 1 + addons/account_cancel/__openerp__.py | 1 + addons/account_coda/__openerp__.py | 1 + addons/account_followup/__openerp__.py | 1 + addons/account_invoice_layout/__openerp__.py | 1 + addons/account_payment/__openerp__.py | 1 + addons/account_sequence/__openerp__.py | 1 + addons/account_voucher/__openerp__.py | 1 + addons/anonymization/__openerp__.py | 1 + addons/association/__openerp__.py | 1 + addons/auction/__openerp__.py | 1 + addons/base_action_rule/__openerp__.py | 1 + addons/base_calendar/__openerp__.py | 63 ++++++++++++++++--- addons/base_contact/__openerp__.py | 1 + addons/base_crypt/__openerp__.py | 1 + addons/base_iban/__openerp__.py | 1 + addons/base_report_creator/__openerp__.py | 1 + addons/base_report_designer/__openerp__.py | 1 + addons/base_setup/__openerp__.py | 1 + addons/base_tools/__openerp__.py | 1 + addons/base_vat/__openerp__.py | 1 + addons/board/__openerp__.py | 1 + addons/caldav/__openerp__.py | 1 + addons/crm/__openerp__.py | 1 + addons/crm_caldav/__openerp__.py | 1 + addons/crm_claim/__openerp__.py | 1 + addons/crm_fundraising/__openerp__.py | 1 + addons/crm_helpdesk/__openerp__.py | 1 + addons/crm_partner_assign/__openerp__.py | 1 + addons/crm_profiling/__openerp__.py | 1 + addons/decimal_precision/__openerp__.py | 1 + addons/delivery/__openerp__.py | 1 + addons/document/__openerp__.py | 1 + addons/document_ftp/__openerp__.py | 1 + addons/document_ics/__openerp__.py | 1 + addons/document_webdav/__openerp__.py | 1 + addons/email_template/__openerp__.py | 1 + addons/event/__openerp__.py | 1 + addons/event_project/__openerp__.py | 1 + addons/google_map/__openerp__.py | 1 + addons/hr/__openerp__.py | 1 + addons/hr_attendance/__openerp__.py | 1 + addons/hr_contract/__openerp__.py | 1 + addons/hr_evaluation/__openerp__.py | 1 + addons/hr_expense/__openerp__.py | 1 + addons/hr_holidays/__openerp__.py | 1 + addons/hr_payroll/__openerp__.py | 1 + addons/hr_payroll_account/__openerp__.py | 1 + addons/hr_recruitment/__openerp__.py | 1 + addons/hr_timesheet/__openerp__.py | 1 + addons/idea/__openerp__.py | 1 + addons/knowledge/__openerp__.py | 1 + addons/lunch/__openerp__.py | 1 + addons/mail_gateway/__openerp__.py | 1 + addons/marketing/__openerp__.py | 1 + addons/marketing_campaign/__openerp__.py | 1 + addons/mrp_jit/__openerp__.py | 1 + addons/mrp_operations/__openerp__.py | 1 + addons/multi_company/__openerp__.py | 1 + addons/pad/__openerp__.py | 1 + addons/product_expiry/__openerp__.py | 1 + addons/product_manufacturer/__openerp__.py | 1 + .../product_visible_discount/__openerp__.py | 1 + addons/profile_tools/__openerp__.py | 1 + addons/project/__openerp__.py | 1 + addons/project_gtd/__openerp__.py | 1 + addons/project_issue/__openerp__.py | 1 + addons/project_mailgate/__openerp__.py | 1 + addons/project_messages/__openerp__.py | 1 + addons/project_mrp/__openerp__.py | 1 + addons/project_planning/__openerp__.py | 1 + addons/project_scrum/__openerp__.py | 1 + addons/purchase/__openerp__.py | 1 + .../purchase_double_validation/__openerp__.py | 1 + addons/purchase_requisition/__openerp__.py | 1 + addons/sale/__openerp__.py | 1 + addons/sale_crm/__openerp__.py | 1 + addons/sale_journal/__openerp__.py | 1 + addons/sale_layout/__openerp__.py | 1 + addons/sale_mrp/__openerp__.py | 1 + addons/sale_order_dates/__openerp__.py | 1 + addons/share/__openerp__.py | 1 + addons/stock/__openerp__.py | 1 + addons/stock_invoice_directly/__openerp__.py | 1 + addons/users_ldap/__openerp__.py | 1 + addons/warning/__openerp__.py | 1 + addons/web_livechat/__openerp__.py | 1 + addons/web_uservoice/__openerp__.py | 1 + addons/wiki/__openerp__.py | 1 + addons/wiki_faq/__openerp__.py | 1 + addons/wiki_quality_manual/__openerp__.py | 1 + addons/wiki_sale_faq/__openerp__.py | 1 + 98 files changed, 152 insertions(+), 8 deletions(-) diff --git a/addons/account/__openerp__.py b/addons/account/__openerp__.py index 3b04713a1bb..9a48ab171d2 100644 --- a/addons/account/__openerp__.py +++ b/addons/account/__openerp__.py @@ -23,6 +23,7 @@ "version" : "1.1", "author" : "OpenERP SA", "category": 'Finance', + 'complexity': "normal", "description": """ Accounting and Financial Management. ==================================== diff --git a/addons/account_accountant/__openerp__.py b/addons/account_accountant/__openerp__.py index e00353f28ce..8194b9537a3 100644 --- a/addons/account_accountant/__openerp__.py +++ b/addons/account_accountant/__openerp__.py @@ -23,6 +23,7 @@ "version" : "1.1", "author" : "OpenERP SA", "category": 'Finance', + 'complexity': "normal", "description": """ Accounting Access Rights. ========================= diff --git a/addons/account_analytic_analysis/__openerp__.py b/addons/account_analytic_analysis/__openerp__.py index 588055b3741..5e93307865c 100644 --- a/addons/account_analytic_analysis/__openerp__.py +++ b/addons/account_analytic_analysis/__openerp__.py @@ -24,6 +24,7 @@ 'name' : 'Analytic Account View', 'version' : '1.1', 'category' : 'Finance', + 'complexity': "normal", 'description': """ This module is for modifying account analytic view to show important data to project manager of services companies. =================================================================================================================== diff --git a/addons/account_analytic_default/__openerp__.py b/addons/account_analytic_default/__openerp__.py index 0b9aa33c503..c2bea6783df 100644 --- a/addons/account_analytic_default/__openerp__.py +++ b/addons/account_analytic_default/__openerp__.py @@ -23,6 +23,7 @@ 'name' : 'Account Analytic Defaults', 'version' : '1.0', 'category' : 'Finance', + 'complexity': "normal", 'description': """Set default values for your analytic accounts Allows to automatically select analytic accounts based on criterions: ===================================================================== diff --git a/addons/account_analytic_plans/__openerp__.py b/addons/account_analytic_plans/__openerp__.py index dab9e83c75a..85f0643ef66 100644 --- a/addons/account_analytic_plans/__openerp__.py +++ b/addons/account_analytic_plans/__openerp__.py @@ -24,6 +24,7 @@ 'name' : 'Manage multiple plans in Analytic Accounting', 'version' : '1.0', 'category' : 'Finance', + 'complexity': "normal", 'description': """ This module allows to use several analytic plans, according to the general journal. =================================================================================== diff --git a/addons/account_anglo_saxon/__openerp__.py b/addons/account_anglo_saxon/__openerp__.py index 46052c77a36..79afb26ab26 100644 --- a/addons/account_anglo_saxon/__openerp__.py +++ b/addons/account_anglo_saxon/__openerp__.py @@ -23,6 +23,7 @@ "version" : "1.2", "author" : "OpenERP SA, Veritos", "website" : "http://tinyerp.com - http://veritos.nl", + 'complexity': "normal", "description" : """ This module supports the Anglo-Saxon accounting methodology by changing the accounting logic with stock transactions. ===================================================================================================================== diff --git a/addons/account_budget/__openerp__.py b/addons/account_budget/__openerp__.py index b9f972f83e5..9ff5964637a 100644 --- a/addons/account_budget/__openerp__.py +++ b/addons/account_budget/__openerp__.py @@ -24,6 +24,7 @@ 'name': 'Budget Management', 'version': '1.0', 'category': 'Finance', + 'complexity': "normal", 'description': """ This module allows accountants to manage analytic and crossovered budgets. ========================================================================== diff --git a/addons/account_cancel/__openerp__.py b/addons/account_cancel/__openerp__.py index f5ab865b1ab..469033ac56e 100644 --- a/addons/account_cancel/__openerp__.py +++ b/addons/account_cancel/__openerp__.py @@ -24,6 +24,7 @@ "version" : "1.1", "author" : "OpenERP SA", "category": 'Finance', + 'complexity': "normal", "description": """ Allows cancelling accounting entries. ===================================== diff --git a/addons/account_coda/__openerp__.py b/addons/account_coda/__openerp__.py index 1883d744779..fb39bc4c5ba 100644 --- a/addons/account_coda/__openerp__.py +++ b/addons/account_coda/__openerp__.py @@ -24,6 +24,7 @@ "version" : "1.0", "author" : "OpenERP SA", "category" : "Finance", + 'complexity': "normal", "description": """ Module provides functionality to import bank statements from coda files. ======================================================================== diff --git a/addons/account_followup/__openerp__.py b/addons/account_followup/__openerp__.py index bda833d5767..fd5cc859646 100644 --- a/addons/account_followup/__openerp__.py +++ b/addons/account_followup/__openerp__.py @@ -23,6 +23,7 @@ 'name': 'Reminders', 'version': '1.0', 'category': 'Finance', + 'complexity': "normal", 'description': """ Modules to automate letters for unpaid invoices, with multi-level recalls. ========================================================================== diff --git a/addons/account_invoice_layout/__openerp__.py b/addons/account_invoice_layout/__openerp__.py index feb77ae4547..b045b7b0b5d 100644 --- a/addons/account_invoice_layout/__openerp__.py +++ b/addons/account_invoice_layout/__openerp__.py @@ -24,6 +24,7 @@ 'name': 'Improve Invoice Layout', 'version': '1.0', 'category': 'Finance', + 'complexity': "easy", 'description': """ This module provides some features to improve the layout of the invoices. ========================================================================= diff --git a/addons/account_payment/__openerp__.py b/addons/account_payment/__openerp__.py index 105a883e432..8a90a140558 100644 --- a/addons/account_payment/__openerp__.py +++ b/addons/account_payment/__openerp__.py @@ -24,6 +24,7 @@ "version": "1.1", "author": "OpenERP SA", "category": "Finance", + 'complexity': "easy", "description": """ Module to manage invoice payment. ================================= diff --git a/addons/account_sequence/__openerp__.py b/addons/account_sequence/__openerp__.py index 18ca7a8c8ec..f7ab18f3e7e 100644 --- a/addons/account_sequence/__openerp__.py +++ b/addons/account_sequence/__openerp__.py @@ -23,6 +23,7 @@ 'name': 'Entries Sequence Numbering', 'version': '1.1', 'category': 'Finance', + 'complexity': "easy", 'description': """ This module maintains internal sequence number for accounting entries. ====================================================================== diff --git a/addons/account_voucher/__openerp__.py b/addons/account_voucher/__openerp__.py index ef93be397a0..7da2b2da99c 100644 --- a/addons/account_voucher/__openerp__.py +++ b/addons/account_voucher/__openerp__.py @@ -23,6 +23,7 @@ "name" : "Accounting Voucher Entries", "version" : "1.0", "author" : 'OpenERP SA', + 'complexity': "normal", "description": """ Account Voucher module includes all the basic requirements of Voucher Entries for Bank, Cash, Sales, Purchase, Expanse, Contra, etc. ==================================================================================================================================== diff --git a/addons/anonymization/__openerp__.py b/addons/anonymization/__openerp__.py index 97597eb7ca9..842b774eb9c 100644 --- a/addons/anonymization/__openerp__.py +++ b/addons/anonymization/__openerp__.py @@ -25,6 +25,7 @@ 'name': 'Database Anonymization', 'version': '1.0', 'category': 'Tools', + 'complexity': "easy", 'description': """ This module allows you to anonymize a database. =============================================== diff --git a/addons/association/__openerp__.py b/addons/association/__openerp__.py index 3a32a5b48c0..22489f72ea4 100644 --- a/addons/association/__openerp__.py +++ b/addons/association/__openerp__.py @@ -25,6 +25,7 @@ 'version': '0.1', 'category': 'General', 'category': 'Profile', + 'complexity': "normal", 'description': """ This module is to configure modules related to an association. ============================================================== diff --git a/addons/auction/__openerp__.py b/addons/auction/__openerp__.py index fa5f2f5f635..e1ceaf9921c 100644 --- a/addons/auction/__openerp__.py +++ b/addons/auction/__openerp__.py @@ -24,6 +24,7 @@ 'name': 'Auction Management', 'version': '1.0', 'category': 'General', + 'complexity': "normal", 'description': """ This module manages the records of artists, auction articles, buyers and sellers. ================================================================================= diff --git a/addons/base_action_rule/__openerp__.py b/addons/base_action_rule/__openerp__.py index 018f14d83a9..b6796f8958d 100644 --- a/addons/base_action_rule/__openerp__.py +++ b/addons/base_action_rule/__openerp__.py @@ -23,6 +23,7 @@ 'name': 'Action Rule', 'version': '1.0', 'category': 'Tools', + 'complexity': "expert", 'category': 'Generic Modules/Others', 'description': """ This module allows to implement action rules for any object. diff --git a/addons/base_calendar/__openerp__.py b/addons/base_calendar/__openerp__.py index 5688c0e05b5..45e98149809 100644 --- a/addons/base_calendar/__openerp__.py +++ b/addons/base_calendar/__openerp__.py @@ -1,11 +1,58 @@ +# -*- coding: utf-8 -*- +############################################################################## +# +# OpenERP, Open Source Management Solution +# Copyright (C) 2004-2010 Tiny SPRL (). +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +############################################################################## + { - "name": "Base calendar", - "version": "2.0", - "depends": ['base'], - "js": [ - 'static/lib/dhtmlxScheduler/codebase/dhtmlxscheduler.js', - 'static/src/js/calendar.js' + "name" : "Basic Calendar Functionality", + "version" : "1.0", + "depends" : ["base"], + 'complexity': "easy", + 'description': """ +This is a full-featured calendar system. +======================================== + +It supports: + - Calendar of events + - Alerts (create requests) + - Recurring events + - Invitations to people""", + "author" : "OpenERP SA", + 'category': 'Tools', + 'website': 'http://www.openerp.com', + "init_xml" : [ + 'base_calendar_data.xml' ], - "css": ['static/lib/dhtmlxScheduler/codebase/dhtmlxscheduler.css'], - 'active': True + "demo_xml" : [], + "update_xml" : [ + 'security/calendar_security.xml', + 'security/ir.model.access.csv', + 'wizard/calendar_event_edit_all_view.xml', + 'wizard/base_calendar_invite_attendee_view.xml', + 'wizard/base_calendar_set_exrule_view.xml', + 'base_calendar_view.xml' + ], + "test" : ['test/base_calendar_test.yml'], + "installable" : True, + "active" : False, + "certificate" : "00694071962960352821", + 'images': ['images/base_calendar1.jpeg','images/base_calendar2.jpeg','images/base_calendar3.jpeg','images/base_calendar4.jpeg',], } + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/base_contact/__openerp__.py b/addons/base_contact/__openerp__.py index 1f8667e4cc6..17e7d3a69c8 100644 --- a/addons/base_contact/__openerp__.py +++ b/addons/base_contact/__openerp__.py @@ -24,6 +24,7 @@ 'name': 'Base Contact', 'version': '1.0', 'category': 'Tools', + 'complexity': "expert", 'description': """ This module allows you to manage your contacts entirely. ======================================================== diff --git a/addons/base_crypt/__openerp__.py b/addons/base_crypt/__openerp__.py index fb152da929d..1054f854874 100644 --- a/addons/base_crypt/__openerp__.py +++ b/addons/base_crypt/__openerp__.py @@ -25,6 +25,7 @@ "maintainer" : "OpenERP SA", "website" : "http://www.openerp.com", "category" : "Tools", + 'complexity': "easy", "description": """ This module replaces the cleartext password in the database with a password hash. ================================================================================= diff --git a/addons/base_iban/__openerp__.py b/addons/base_iban/__openerp__.py index 6de0e6d0735..4cbef04a204 100644 --- a/addons/base_iban/__openerp__.py +++ b/addons/base_iban/__openerp__.py @@ -22,6 +22,7 @@ 'name': 'Create IBAN bank accounts', 'version': '1.0', 'category': 'Finance', + 'complexity': "easy", 'description': """ This module installs the base for IBAN (International Bank Account Number) bank accounts and checks for its validity. ===================================================================================================================== diff --git a/addons/base_report_creator/__openerp__.py b/addons/base_report_creator/__openerp__.py index 9e469fe37c6..6c0a01f78fd 100644 --- a/addons/base_report_creator/__openerp__.py +++ b/addons/base_report_creator/__openerp__.py @@ -24,6 +24,7 @@ 'name': 'Statistical Report Creator', 'version': '1.0', 'category': 'Tools', + 'complexity': "expert", 'description': """ This module allows you to create any statistic report on several objects. ========================================================================= diff --git a/addons/base_report_designer/__openerp__.py b/addons/base_report_designer/__openerp__.py index 1d280de71fe..c5bbbbd34ec 100644 --- a/addons/base_report_designer/__openerp__.py +++ b/addons/base_report_designer/__openerp__.py @@ -24,6 +24,7 @@ 'name': 'OpenOffice Report Designer Interface', 'version': '0.1', 'category': 'Tools', + 'complexity': "normal", 'description': """ This module is used along with OpenERP OpenOffice Plugin. ========================================================= diff --git a/addons/base_setup/__openerp__.py b/addons/base_setup/__openerp__.py index 420deb46bfb..2d534917da3 100644 --- a/addons/base_setup/__openerp__.py +++ b/addons/base_setup/__openerp__.py @@ -24,6 +24,7 @@ 'name': 'Base Setup', 'version': '1.0', 'category': 'Tools', + 'complexity': "easy", 'description': """ This module helps to configure the system at the installation of a new database. ================================================================================ diff --git a/addons/base_tools/__openerp__.py b/addons/base_tools/__openerp__.py index f915d8929a2..aade7664041 100644 --- a/addons/base_tools/__openerp__.py +++ b/addons/base_tools/__openerp__.py @@ -5,6 +5,7 @@ "version": "1.0", "depends": ["base"], "category" : "Tools", + 'complexity': "easy", 'description': """ Common base for tools modules. ============================== diff --git a/addons/base_vat/__openerp__.py b/addons/base_vat/__openerp__.py index 1de5a94fabd..92af5664336 100644 --- a/addons/base_vat/__openerp__.py +++ b/addons/base_vat/__openerp__.py @@ -23,6 +23,7 @@ 'version': '1.0', 'category': 'Tools', 'category': 'Generic Modules/Base', + 'complexity': "easy", 'description': """ Enable VAT Number for a partner and check its validity. ======================================================= diff --git a/addons/board/__openerp__.py b/addons/board/__openerp__.py index 587dd92362f..f4de253c4f5 100644 --- a/addons/board/__openerp__.py +++ b/addons/board/__openerp__.py @@ -23,6 +23,7 @@ 'name': 'Dashboard Creator', 'version': '1.0', 'category': 'Tools', + 'complexity': "normal", 'description': """ Lets the user create a custom dashboard. ======================================== diff --git a/addons/caldav/__openerp__.py b/addons/caldav/__openerp__.py index 346e49949c1..edf852e4d5e 100644 --- a/addons/caldav/__openerp__.py +++ b/addons/caldav/__openerp__.py @@ -23,6 +23,7 @@ { "name" : "Share Calendar using CalDAV", "version" : "1.1", + 'complexity': "normal", "depends" : [ "base", "document_webdav", diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py index 903bf5f0b68..a0ff9067a76 100644 --- a/addons/crm/__openerp__.py +++ b/addons/crm/__openerp__.py @@ -24,6 +24,7 @@ 'name': 'Customer & Supplier Relationship Management', 'version': '1.0', 'category': 'Sales', + 'complexity': "easy", 'description': """ The generic OpenERP Customer Relationship Management. ===================================================== diff --git a/addons/crm_caldav/__openerp__.py b/addons/crm_caldav/__openerp__.py index 58b01bc6511..fdbde1c8d2d 100644 --- a/addons/crm_caldav/__openerp__.py +++ b/addons/crm_caldav/__openerp__.py @@ -26,6 +26,7 @@ 'version': '1.1', 'category': 'Sales', 'category': 'Generic Modules/CRM & SRM', + 'complexity': "normal", 'description': """ Caldav features in Meeting. =========================== diff --git a/addons/crm_claim/__openerp__.py b/addons/crm_claim/__openerp__.py index 43894185ac0..696298d275b 100644 --- a/addons/crm_claim/__openerp__.py +++ b/addons/crm_claim/__openerp__.py @@ -24,6 +24,7 @@ 'name': 'Customer & Supplier Claims Management', 'version': '1.0', 'category': 'Sales', + 'complexity': "easy", 'description': """ This modules allows you to track your customers/suppliers claims and grievances. ================================================================================ diff --git a/addons/crm_fundraising/__openerp__.py b/addons/crm_fundraising/__openerp__.py index 4315eea87a5..7a37bd13d16 100644 --- a/addons/crm_fundraising/__openerp__.py +++ b/addons/crm_fundraising/__openerp__.py @@ -24,6 +24,7 @@ 'category': 'Sales', 'name': 'CRM Fundraising', 'version': '1.0', + 'complexity': "easy", 'description': """ Fundraising. ============ diff --git a/addons/crm_helpdesk/__openerp__.py b/addons/crm_helpdesk/__openerp__.py index 3a62433a591..b69f1de1b08 100644 --- a/addons/crm_helpdesk/__openerp__.py +++ b/addons/crm_helpdesk/__openerp__.py @@ -24,6 +24,7 @@ 'category': 'Sales', 'name': 'CRM Helpdesk', 'version': '1.0', + 'complexity': "easy", 'description': """ Helpdesk Management. ==================== diff --git a/addons/crm_partner_assign/__openerp__.py b/addons/crm_partner_assign/__openerp__.py index a00434e8ee0..eca5307df91 100644 --- a/addons/crm_partner_assign/__openerp__.py +++ b/addons/crm_partner_assign/__openerp__.py @@ -24,6 +24,7 @@ 'name': 'Partner Geo-Localization', 'version': '1.0', 'category': 'Sales', + 'complexity': "normal", 'description': """ This is the module used by OpenERP SA to redirect customers to its partners, based on geolocalization. ====================================================================================================== diff --git a/addons/crm_profiling/__openerp__.py b/addons/crm_profiling/__openerp__.py index b2a539ab305..c76278201b1 100644 --- a/addons/crm_profiling/__openerp__.py +++ b/addons/crm_profiling/__openerp__.py @@ -24,6 +24,7 @@ 'name': 'CRM Profiling Management - To Perform Segmentation within Partners', 'version': '1.3', 'category': 'Sales', + 'complexity': "easy", 'description': """ This module allows users to perform segmentation within partners. ================================================================= diff --git a/addons/decimal_precision/__openerp__.py b/addons/decimal_precision/__openerp__.py index fc6399fb730..a2e94c7f58d 100644 --- a/addons/decimal_precision/__openerp__.py +++ b/addons/decimal_precision/__openerp__.py @@ -31,6 +31,7 @@ The decimal precision is configured per company. "version": "0.1", "depends": ["base"], "category" : "Tools", + 'complexity': "easy", "init_xml": [], "update_xml": [ 'decimal_precision_view.xml', diff --git a/addons/delivery/__openerp__.py b/addons/delivery/__openerp__.py index 3d1dcfbffde..e9fa8240e21 100644 --- a/addons/delivery/__openerp__.py +++ b/addons/delivery/__openerp__.py @@ -24,6 +24,7 @@ 'name': 'Carriers and Deliveries', 'version': '1.0', 'category': 'Warehouse', + 'complexity': "normal", 'description': """ Allows you to add delivery methods in sale orders and picking. ============================================================== diff --git a/addons/document/__openerp__.py b/addons/document/__openerp__.py index e8d85a8c5a6..c98daa4eaaf 100644 --- a/addons/document/__openerp__.py +++ b/addons/document/__openerp__.py @@ -25,6 +25,7 @@ 'version': '2.1', 'category': 'Tools', 'category': 'Generic Modules/Others', + 'complexity': "normal", 'description': """ This is a complete document management system. ============================================== diff --git a/addons/document_ftp/__openerp__.py b/addons/document_ftp/__openerp__.py index ff38e3b92b4..2683ba5ef0a 100644 --- a/addons/document_ftp/__openerp__.py +++ b/addons/document_ftp/__openerp__.py @@ -24,6 +24,7 @@ 'name': 'Integrated FTP Server with Document Management System', 'version': '1.99', 'category': 'Tools', + 'complexity': "normal", 'description': """ This is a support FTP Interface with document management system. ================================================================ diff --git a/addons/document_ics/__openerp__.py b/addons/document_ics/__openerp__.py index e232c8dd487..56bb8f11fee 100644 --- a/addons/document_ics/__openerp__.py +++ b/addons/document_ics/__openerp__.py @@ -24,6 +24,7 @@ 'name': 'Support for iCal based on Document Management System', 'version': '1.0', 'category': 'Tools', + 'complexity': "normal", 'description': """ Allows to synchronise calendars with others applications. ========================================================= diff --git a/addons/document_webdav/__openerp__.py b/addons/document_webdav/__openerp__.py index 52ec679cf21..dc74085ab6f 100644 --- a/addons/document_webdav/__openerp__.py +++ b/addons/document_webdav/__openerp__.py @@ -33,6 +33,7 @@ "version" : "2.3", "author" : "OpenERP SA", "category" : "Tools", + 'complexity': "normal", "website": "http://www.openerp.com", "description": """ With this module, the WebDAV server for documents is activated. diff --git a/addons/email_template/__openerp__.py b/addons/email_template/__openerp__.py index e5e712624ac..f56062f37ed 100644 --- a/addons/email_template/__openerp__.py +++ b/addons/email_template/__openerp__.py @@ -26,6 +26,7 @@ "author" : "Openlabs", "website" : "http://openerp.com", "category" : "Tools", + 'complexity': "expert", "depends" : ['marketing', 'base_tools'], "description": """ Email Template is extraction of Power Email basically just to send emails. diff --git a/addons/event/__openerp__.py b/addons/event/__openerp__.py index a2e0932b062..680cf1e6572 100644 --- a/addons/event/__openerp__.py +++ b/addons/event/__openerp__.py @@ -24,6 +24,7 @@ 'name': 'Event', 'version': '0.1', 'category': 'Tools', + 'complexity': "easy", 'description': """ Organization and management of Events. ====================================== diff --git a/addons/event_project/__openerp__.py b/addons/event_project/__openerp__.py index 75ac9e2b17c..ddd32c37631 100644 --- a/addons/event_project/__openerp__.py +++ b/addons/event_project/__openerp__.py @@ -23,6 +23,7 @@ 'name': 'Event Project - Create Retro-Planning to manage your Events', 'version': '0.1', 'category': 'Tools', + 'complexity': "easy", 'description': """ Organization and management of events. ====================================== diff --git a/addons/google_map/__openerp__.py b/addons/google_map/__openerp__.py index 16be73f1e2d..5c48a9370d7 100644 --- a/addons/google_map/__openerp__.py +++ b/addons/google_map/__openerp__.py @@ -24,6 +24,7 @@ 'name': 'Google Map', 'version': '1.0', 'category': 'Tools', + 'complexity': "easy", 'category': 'Generic Modules/Others', 'description': """ The module adds Google Map field in partner address. diff --git a/addons/hr/__openerp__.py b/addons/hr/__openerp__.py index 86083d6b37e..82be7c9f367 100644 --- a/addons/hr/__openerp__.py +++ b/addons/hr/__openerp__.py @@ -24,6 +24,7 @@ "version": "1.1", "author": "OpenERP SA", "category": "Human Resources", + 'complexity': "easy", "website": "http://www.openerp.com", "description": """ Module for human resource management. diff --git a/addons/hr_attendance/__openerp__.py b/addons/hr_attendance/__openerp__.py index 5d58ce2d647..f7111fdb191 100644 --- a/addons/hr_attendance/__openerp__.py +++ b/addons/hr_attendance/__openerp__.py @@ -24,6 +24,7 @@ 'name': 'Attendances Of Employees', 'version': '1.1', 'category': 'Human Resources', + 'complexity': "easy", 'description': """ This module aims to manage employee's attendances. ================================================== diff --git a/addons/hr_contract/__openerp__.py b/addons/hr_contract/__openerp__.py index 380a4f1c696..6a4d7e6a27e 100644 --- a/addons/hr_contract/__openerp__.py +++ b/addons/hr_contract/__openerp__.py @@ -24,6 +24,7 @@ 'name': 'Human Resources Contracts', 'version': '1.0', 'category': 'Human Resources', + 'complexity': "easy", 'description': """ Add all information on the employee form to manage contracts. ============================================================= diff --git a/addons/hr_evaluation/__openerp__.py b/addons/hr_evaluation/__openerp__.py index 3e45d38156e..d11d07ece66 100644 --- a/addons/hr_evaluation/__openerp__.py +++ b/addons/hr_evaluation/__openerp__.py @@ -24,6 +24,7 @@ "version": "0.1", "author": "OpenERP SA", "category": "Human Resources", + 'complexity': "easy", "website": "http://www.openerp.com", "images": ["images/hr_evaluation_analysis.jpeg","images/hr_evaluation.jpeg"], "depends": ["hr",'hr_recruitment','survey'], diff --git a/addons/hr_expense/__openerp__.py b/addons/hr_expense/__openerp__.py index 95d2b60300b..baf992d2132 100644 --- a/addons/hr_expense/__openerp__.py +++ b/addons/hr_expense/__openerp__.py @@ -24,6 +24,7 @@ 'name': 'Human Resources Expenses Tracking', 'version': '1.0', 'category': 'Human Resources', + 'complexity': "easy", 'description': """ This module aims to manage employee's expenses. =============================================== diff --git a/addons/hr_holidays/__openerp__.py b/addons/hr_holidays/__openerp__.py index e63d86b2041..63c2eb76195 100644 --- a/addons/hr_holidays/__openerp__.py +++ b/addons/hr_holidays/__openerp__.py @@ -25,6 +25,7 @@ "version": "1.5", "author": ['OpenERP SA', 'Axelor'], "category": "Human Resources", + 'complexity': "easy", "website": "http://www.openerp.com", "description": """ This module allows you to manage leaves and leaves' requests. diff --git a/addons/hr_payroll/__openerp__.py b/addons/hr_payroll/__openerp__.py index 69cba040d6b..1cc1b44177b 100644 --- a/addons/hr_payroll/__openerp__.py +++ b/addons/hr_payroll/__openerp__.py @@ -23,6 +23,7 @@ 'name': 'Human Resource Payroll', 'version': '1.0', 'category': 'Human Resources', + 'complexity': "expert", 'description': """ Generic Payroll system. ======================= diff --git a/addons/hr_payroll_account/__openerp__.py b/addons/hr_payroll_account/__openerp__.py index 30dcd9e7b55..d9bad77a101 100644 --- a/addons/hr_payroll_account/__openerp__.py +++ b/addons/hr_payroll_account/__openerp__.py @@ -23,6 +23,7 @@ 'name': 'Human Resource Payroll Accounting', 'version': '1.0', 'category': 'Human Resources', + 'complexity': "expert", 'description': """ Generic Payroll system Integrated with Accountings. =================================================== diff --git a/addons/hr_recruitment/__openerp__.py b/addons/hr_recruitment/__openerp__.py index c7f97cf3075..d36ba69a844 100644 --- a/addons/hr_recruitment/__openerp__.py +++ b/addons/hr_recruitment/__openerp__.py @@ -23,6 +23,7 @@ 'name': 'HR - Recruitment', 'version': '1.0', 'category': 'Human Resources', + 'complexity': "easy", 'description': """ Manages job positions and the recruitment process. ================================================== diff --git a/addons/hr_timesheet/__openerp__.py b/addons/hr_timesheet/__openerp__.py index e58d09c296d..411ac68d57b 100644 --- a/addons/hr_timesheet/__openerp__.py +++ b/addons/hr_timesheet/__openerp__.py @@ -24,6 +24,7 @@ 'name': 'Human Resources (Timesheet encoding)', 'version': '1.0', 'category': 'Human Resources', + 'complexity': "easy", 'description': """ This module implements a timesheet system. ========================================== diff --git a/addons/idea/__openerp__.py b/addons/idea/__openerp__.py index 8c6ed4aff4c..2a561a93b81 100644 --- a/addons/idea/__openerp__.py +++ b/addons/idea/__openerp__.py @@ -24,6 +24,7 @@ 'name': 'Idea Manager', 'version': '0.1', 'category': 'Tools', + 'complexity': "easy", 'description': """ This module allows your user to easily and efficiently participate in enterprise innovation. ============================================================================================ diff --git a/addons/knowledge/__openerp__.py b/addons/knowledge/__openerp__.py index 3add4ee977c..d924f203b47 100644 --- a/addons/knowledge/__openerp__.py +++ b/addons/knowledge/__openerp__.py @@ -26,6 +26,7 @@ "depends" : ["base"], "author" : "OpenERP SA", "category": 'Tools', + 'complexity': "easy", "description": """ Installer for knowledge-based tools. ==================================== diff --git a/addons/lunch/__openerp__.py b/addons/lunch/__openerp__.py index e5317cd8a94..b0140a95f51 100644 --- a/addons/lunch/__openerp__.py +++ b/addons/lunch/__openerp__.py @@ -22,6 +22,7 @@ { "name": "Lunch Module", "author": "OpenERP SA", + 'complexity': "easy", "Description": """ The lunch module is for keeping a record of the order placed and payment of the orders. ======================================================================================= diff --git a/addons/mail_gateway/__openerp__.py b/addons/mail_gateway/__openerp__.py index 2ec47eb0159..af1e28e0c2c 100644 --- a/addons/mail_gateway/__openerp__.py +++ b/addons/mail_gateway/__openerp__.py @@ -23,6 +23,7 @@ 'name': 'Email Gateway System', 'version': '1.0', 'category': 'Tools', + 'complexity': "easy", 'description': """ The generic email gateway system allows to send and receive emails. =================================================================== diff --git a/addons/marketing/__openerp__.py b/addons/marketing/__openerp__.py index b4283a60406..b6e94b9b5cc 100644 --- a/addons/marketing/__openerp__.py +++ b/addons/marketing/__openerp__.py @@ -26,6 +26,7 @@ "depends" : ["base"], "author" : "OpenERP SA", "category": 'Sales', + 'complexity': "expert", "description": """ Menu for Marketing. =================== diff --git a/addons/marketing_campaign/__openerp__.py b/addons/marketing_campaign/__openerp__.py index 24a251bc000..78060b1e571 100644 --- a/addons/marketing_campaign/__openerp__.py +++ b/addons/marketing_campaign/__openerp__.py @@ -30,6 +30,7 @@ ], "author" : "OpenERP SA", "category": 'Sales', + 'complexity': "expert", "description": """ This module provides leads automation through marketing campaigns (campaigns can in fact be defined on any resource, not just CRM Leads). ========================================================================================================================================= diff --git a/addons/mrp_jit/__openerp__.py b/addons/mrp_jit/__openerp__.py index 99edd7fe507..77bece7cfd6 100644 --- a/addons/mrp_jit/__openerp__.py +++ b/addons/mrp_jit/__openerp__.py @@ -24,6 +24,7 @@ 'name': 'MRP JIT', 'version': '1.0', 'category': 'Manufacturing', + 'complexity': "easy", 'description': """ This module allows Just In Time computation of procurement orders. ================================================================== diff --git a/addons/mrp_operations/__openerp__.py b/addons/mrp_operations/__openerp__.py index 7bf64376f70..08f8f5b7f5b 100644 --- a/addons/mrp_operations/__openerp__.py +++ b/addons/mrp_operations/__openerp__.py @@ -24,6 +24,7 @@ 'name': 'Work Center Production start end workflow', 'version': '1.0', 'category': 'Manufacturing', + 'complexity': "easy", 'description': """ This module adds state, date_start,date_stop in production order operation lines (in the "Work Centers" tab). ============================================================================================================= diff --git a/addons/multi_company/__openerp__.py b/addons/multi_company/__openerp__.py index baf3a88c32e..d82f0e1eb7c 100644 --- a/addons/multi_company/__openerp__.py +++ b/addons/multi_company/__openerp__.py @@ -24,6 +24,7 @@ 'name': 'Multi-Company', 'version': '1.0', 'category': 'Tools', + 'complexity': "expert", 'description': """ This module is for managing a multicompany environment. ======================================================= diff --git a/addons/pad/__openerp__.py b/addons/pad/__openerp__.py index d26af68f170..b3429dde329 100644 --- a/addons/pad/__openerp__.py +++ b/addons/pad/__openerp__.py @@ -3,6 +3,7 @@ 'name': 'Enhanced support for (Ether)Pad attachments', 'version': '1.0.3', 'category': 'Tools', + 'complexity': "easy", 'description': """ Adds enhanced support for (Ether)Pad attachments in the web client. =================================================================== diff --git a/addons/product_expiry/__openerp__.py b/addons/product_expiry/__openerp__.py index 847f7e6a536..434f5605baa 100644 --- a/addons/product_expiry/__openerp__.py +++ b/addons/product_expiry/__openerp__.py @@ -22,6 +22,7 @@ "version" : "1.0", "author" : "OpenERP SA", "category" : "Warehouse", + 'complexity': "easy", "depends" : ["stock"], "init_xml" : [], "demo_xml" : ["product_expiry_demo.xml"], diff --git a/addons/product_manufacturer/__openerp__.py b/addons/product_manufacturer/__openerp__.py index 90beef4343a..5aea3f333d3 100644 --- a/addons/product_manufacturer/__openerp__.py +++ b/addons/product_manufacturer/__openerp__.py @@ -22,6 +22,7 @@ "version" : "1.0", "author" : "OpenERP SA", "category" : "Tools", + 'complexity': "easy", "depends" : ["stock"], "init_xml" : [], "demo_xml" : [], diff --git a/addons/product_visible_discount/__openerp__.py b/addons/product_visible_discount/__openerp__.py index faf0dbba051..903bc6c7523 100644 --- a/addons/product_visible_discount/__openerp__.py +++ b/addons/product_visible_discount/__openerp__.py @@ -22,6 +22,7 @@ "version": "1.0", "author": "OpenERP SA", "category": "Sales", + 'complexity': "easy", "description": """ This module lets you calculate discounts on Sale Order lines and Invoice lines base on the partner's pricelist. =============================================================================================================== diff --git a/addons/profile_tools/__openerp__.py b/addons/profile_tools/__openerp__.py index 8f99b32cee0..efb155d4cf0 100644 --- a/addons/profile_tools/__openerp__.py +++ b/addons/profile_tools/__openerp__.py @@ -26,6 +26,7 @@ "depends" : ["base"], "author" : "OpenERP SA", "category" : "Tools", + 'complexity': "easy", "description": """ Installer for extra tools like lunch, survey, idea, share, etc. =============================================================== diff --git a/addons/project/__openerp__.py b/addons/project/__openerp__.py index f8cab193ab3..47b6345beeb 100644 --- a/addons/project/__openerp__.py +++ b/addons/project/__openerp__.py @@ -26,6 +26,7 @@ "author": "OpenERP SA", "website": "http://www.openerp.com", "category": "Project Management", + 'complexity': "easy", "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": ["product", "analytic", "board"], "description": """ diff --git a/addons/project_gtd/__openerp__.py b/addons/project_gtd/__openerp__.py index 8b0ad03f5cf..5f70392352b 100644 --- a/addons/project_gtd/__openerp__.py +++ b/addons/project_gtd/__openerp__.py @@ -24,6 +24,7 @@ 'name': 'Getting Things Done - Time Management Module', 'version': '1.0', 'category': 'Project Management', + 'complexity': "easy", '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 931d9f97727..459c44dea04 100644 --- a/addons/project_issue/__openerp__.py +++ b/addons/project_issue/__openerp__.py @@ -24,6 +24,7 @@ 'name': 'Issue Management in Project Management', 'version': '1.0', 'category': 'Project Management', + 'complexity': "easy", 'description': """ This module provides Issues/Bugs Management in Project. ======================================================= diff --git a/addons/project_mailgate/__openerp__.py b/addons/project_mailgate/__openerp__.py index 9140a04f36e..4551d19bb1f 100644 --- a/addons/project_mailgate/__openerp__.py +++ b/addons/project_mailgate/__openerp__.py @@ -26,6 +26,7 @@ "author": "OpenERP SA", "website": "http://www.openerp.com", "category": "Project Management", + 'complexity': "easy", "images": ["images/project_mailgate_task.jpeg"], "depends": ["project", "mail_gateway"], "description": """ diff --git a/addons/project_messages/__openerp__.py b/addons/project_messages/__openerp__.py index 1e584c3be13..3f1882ed376 100644 --- a/addons/project_messages/__openerp__.py +++ b/addons/project_messages/__openerp__.py @@ -27,6 +27,7 @@ "depends": ["project"], "author": "OpenERP SA", "category": 'Project Management', + 'complexity': "easy", "description": """ This module provides the functionality to send messages within a project. ========================================================================= diff --git a/addons/project_mrp/__openerp__.py b/addons/project_mrp/__openerp__.py index 09d2c48fa08..cfd745cb24c 100644 --- a/addons/project_mrp/__openerp__.py +++ b/addons/project_mrp/__openerp__.py @@ -24,6 +24,7 @@ 'name': 'Procurement and Project Management integration', 'version': '1.0', 'category': 'Project Management', + 'complexity': "easy", 'description': """ This module creates a link between procurement orders containing "service" lines and project management tasks. ============================================================================================================== diff --git a/addons/project_planning/__openerp__.py b/addons/project_planning/__openerp__.py index 9dbcf66c274..537170d4e3d 100644 --- a/addons/project_planning/__openerp__.py +++ b/addons/project_planning/__openerp__.py @@ -24,6 +24,7 @@ 'name': 'Planning Management Module', 'version': '1.0', 'category': 'Project Management', + 'complexity': "easy", 'description': """Keep track of your planning This module helps you to manage your plannings. =============================================== diff --git a/addons/project_scrum/__openerp__.py b/addons/project_scrum/__openerp__.py index 0f9649fd31d..9a1713b9014 100644 --- a/addons/project_scrum/__openerp__.py +++ b/addons/project_scrum/__openerp__.py @@ -24,6 +24,7 @@ 'name': 'Scrum, Agile Development Method', 'version': '1.0', 'category': 'Project Management', + 'complexity': "easy", 'description': """ This module implements all concepts defined by the scrum project management methodology for IT companies. ========================================================================================================= diff --git a/addons/purchase/__openerp__.py b/addons/purchase/__openerp__.py index 1fb49198404..975754dd5fe 100644 --- a/addons/purchase/__openerp__.py +++ b/addons/purchase/__openerp__.py @@ -24,6 +24,7 @@ 'name': 'Purchase Management', 'version': '1.1', 'category': 'Purchases', + 'complexity': "easy", 'description': """ Purchase module is for generating a purchase order for purchase of goods from a supplier. ========================================================================================= diff --git a/addons/purchase_double_validation/__openerp__.py b/addons/purchase_double_validation/__openerp__.py index 1a10fb5c0ce..c111d0679c1 100644 --- a/addons/purchase_double_validation/__openerp__.py +++ b/addons/purchase_double_validation/__openerp__.py @@ -23,6 +23,7 @@ "name" : "Double Validation for Purchase", "version" : "1.1", "category": 'Purchases', + 'complexity': "easy", "images" : ["images/purchase_validation.jpeg"], "depends" : ["base","purchase"], "author" : 'OpenERP SA', diff --git a/addons/purchase_requisition/__openerp__.py b/addons/purchase_requisition/__openerp__.py index 5fd224b14f9..a3658414e0f 100644 --- a/addons/purchase_requisition/__openerp__.py +++ b/addons/purchase_requisition/__openerp__.py @@ -22,6 +22,7 @@ "version" : "0.1", "author" : "OpenERP SA", "category" : "Purchases", + 'complexity': "easy", "images" : ['images/purchase_requisitions.jpeg'], "website" : "http://www.openerp.com", "description": """ diff --git a/addons/sale/__openerp__.py b/addons/sale/__openerp__.py index c223fd348d2..c983edc881e 100644 --- a/addons/sale/__openerp__.py +++ b/addons/sale/__openerp__.py @@ -24,6 +24,7 @@ 'version': '1.0', 'category': 'Sales', 'category': 'Generic Modules/Sales & Purchases', + 'complexity': "easy", 'description': """ The base module to manage quotations and sales orders. ====================================================== diff --git a/addons/sale_crm/__openerp__.py b/addons/sale_crm/__openerp__.py index 754b5e95b24..7fe2bd135c7 100644 --- a/addons/sale_crm/__openerp__.py +++ b/addons/sale_crm/__openerp__.py @@ -23,6 +23,7 @@ 'name': 'Creates Sales order from Opportunity', 'version': '1.0', 'category': 'Sales', + 'complexity': "easy", 'description': """ This module adds a shortcut on one or several opportunity cases in the CRM. =========================================================================== diff --git a/addons/sale_journal/__openerp__.py b/addons/sale_journal/__openerp__.py index 7aca468c397..c95b94da3ee 100644 --- a/addons/sale_journal/__openerp__.py +++ b/addons/sale_journal/__openerp__.py @@ -23,6 +23,7 @@ 'name': 'Managing sales and deliveries by journal', 'version': '1.0', 'category': 'Sales', + 'complexity': "easy", 'description': """ The sales journal modules allows you to categorise your sales and deliveries (picking lists) between different journals. ======================================================================================================================== diff --git a/addons/sale_layout/__openerp__.py b/addons/sale_layout/__openerp__.py index d3fa8388a76..8f9005e50a0 100644 --- a/addons/sale_layout/__openerp__.py +++ b/addons/sale_layout/__openerp__.py @@ -24,6 +24,7 @@ "images" : ["images/sale_layout.jpeg"], "depends" : ["sale", "account_invoice_layout"], "author" : "OpenERP SA", + 'complexity': "easy", "description": """ This module provides features to improve the layout of the Sales Order. ======================================================================= diff --git a/addons/sale_mrp/__openerp__.py b/addons/sale_mrp/__openerp__.py index 641290ec6ee..1fd1fab9d2f 100644 --- a/addons/sale_mrp/__openerp__.py +++ b/addons/sale_mrp/__openerp__.py @@ -24,6 +24,7 @@ 'name': 'Sales and MRP Management', 'version': '1.0', 'category': 'Sales', + 'complexity': "easy", 'description': """ This module provides facility to the user to install mrp and sales modulesat a time. ==================================================================================== diff --git a/addons/sale_order_dates/__openerp__.py b/addons/sale_order_dates/__openerp__.py index 554f01af1b1..eb7e3a516fa 100644 --- a/addons/sale_order_dates/__openerp__.py +++ b/addons/sale_order_dates/__openerp__.py @@ -24,6 +24,7 @@ 'name': 'Sales Order Dates', 'version': '1.0', 'category': 'Sales', + 'complexity': "easy", 'description': """ Add additional date information to the sales order. =================================================== diff --git a/addons/share/__openerp__.py b/addons/share/__openerp__.py index 085266b4dae..597e1af1879 100644 --- a/addons/share/__openerp__.py +++ b/addons/share/__openerp__.py @@ -26,6 +26,7 @@ "depends" : ["base"], "author" : "OpenERP SA", "category": 'Tools', + 'complexity': "easy", "description": """ This module adds generic sharing tools to your current OpenERP database. ======================================================================== diff --git a/addons/stock/__openerp__.py b/addons/stock/__openerp__.py index 1a33fd3012c..70dc37ec2da 100644 --- a/addons/stock/__openerp__.py +++ b/addons/stock/__openerp__.py @@ -23,6 +23,7 @@ "name" : "Inventory Management", "version" : "1.1", "author" : "OpenERP SA", + 'complexity': "easy", "description" : """ OpenERP Inventory Management module can manage multi-warehouses, multi and structured stock locations. ====================================================================================================== diff --git a/addons/stock_invoice_directly/__openerp__.py b/addons/stock_invoice_directly/__openerp__.py index 712aaca289d..98c63dca506 100644 --- a/addons/stock_invoice_directly/__openerp__.py +++ b/addons/stock_invoice_directly/__openerp__.py @@ -24,6 +24,7 @@ 'name': 'Invoice Picking Directly', 'version': '1.0', 'category': 'Warehouse', + 'complexity': "easy", 'description': """ Invoice Wizard for Delivery. ============================ diff --git a/addons/users_ldap/__openerp__.py b/addons/users_ldap/__openerp__.py index 71ed399c5da..1278ffc74f3 100644 --- a/addons/users_ldap/__openerp__.py +++ b/addons/users_ldap/__openerp__.py @@ -24,6 +24,7 @@ "depends" : ["base"], "images" : ["images/ldap_configuration.jpeg"], "author" : "OpenERP SA", + 'complexity': "easy", "description": """ Adds support for authentication by LDAP server. =============================================== diff --git a/addons/warning/__openerp__.py b/addons/warning/__openerp__.py index d2c8e923c16..66915423af8 100644 --- a/addons/warning/__openerp__.py +++ b/addons/warning/__openerp__.py @@ -24,6 +24,7 @@ 'name': 'Display Warning Messages', 'version': '1.0', 'category': 'Tools', + 'complexity': "easy", 'description': """ Module to trigger warnings in OpenERP objects. ============================================== diff --git a/addons/web_livechat/__openerp__.py b/addons/web_livechat/__openerp__.py index 2ee8b47b55b..cea342ef05e 100644 --- a/addons/web_livechat/__openerp__.py +++ b/addons/web_livechat/__openerp__.py @@ -22,6 +22,7 @@ 'name': 'Live Chat Support', 'version': '1.1', 'category': 'Tools', + 'complexity': "easy", 'description': """ Enable live chat support for those who have a maintenance contract. =================================================================== diff --git a/addons/web_uservoice/__openerp__.py b/addons/web_uservoice/__openerp__.py index 14d59e993ab..cc248e90da7 100644 --- a/addons/web_uservoice/__openerp__.py +++ b/addons/web_uservoice/__openerp__.py @@ -22,6 +22,7 @@ 'name': 'Receive User Feedback', 'version': '1.0', 'category': 'Tools', + 'complexity': "easy", 'description': """ Add Feedback button in header. ============================== diff --git a/addons/wiki/__openerp__.py b/addons/wiki/__openerp__.py index ef746cb2d44..cf2234b4386 100644 --- a/addons/wiki/__openerp__.py +++ b/addons/wiki/__openerp__.py @@ -23,6 +23,7 @@ 'name': 'Document Management - Wiki', 'version': '1.0.1', 'category': 'Tools', + 'complexity': "easy", 'description': """ The base module to manage documents(wiki). ========================================== diff --git a/addons/wiki_faq/__openerp__.py b/addons/wiki_faq/__openerp__.py index caf2ca80d03..873b4fea9d0 100644 --- a/addons/wiki_faq/__openerp__.py +++ b/addons/wiki_faq/__openerp__.py @@ -23,6 +23,7 @@ 'name': 'Document Management - Wiki - FAQ', 'version': '1.0', 'category': 'Tools', + 'complexity': "easy", 'description': """ This module provides a Wiki FAQ Template. ========================================= diff --git a/addons/wiki_quality_manual/__openerp__.py b/addons/wiki_quality_manual/__openerp__.py index ce8c2bdb061..e962265cea8 100644 --- a/addons/wiki_quality_manual/__openerp__.py +++ b/addons/wiki_quality_manual/__openerp__.py @@ -23,6 +23,7 @@ 'name': 'Document Management - Wiki - Quality Manual', 'version': '1.0', 'category': 'Tools', + 'complexity': "easy", 'description': """ Quality Manual Template. ======================== diff --git a/addons/wiki_sale_faq/__openerp__.py b/addons/wiki_sale_faq/__openerp__.py index 74eb722257b..7d06dc73712 100644 --- a/addons/wiki_sale_faq/__openerp__.py +++ b/addons/wiki_sale_faq/__openerp__.py @@ -23,6 +23,7 @@ 'name': 'Wiki - Sale-FAQ', 'version': '1.0', 'category': 'Tools', + 'complexity': "easy", 'description': """ This module provides a Wiki Sales FAQ Template. =============================================== From 409cf866737982d6e6d50b2c28633d3356ea6e05 Mon Sep 17 00:00:00 2001 From: "Hardik Ansodariy (OpenERP)" Date: Wed, 6 Jul 2011 18:00:53 +0530 Subject: [PATCH 33/73] [IMP]: complexity field is added in ir_module_module bzr revid: han@tinyerp.com-20110706123053-an4rk7vspzrdh8u0 --- openerp/addons/base/__openerp__.py | 1 + openerp/addons/base/module/module.py | 5 +++++ openerp/addons/base/module/module_view.xml | 3 +++ 3 files changed, 9 insertions(+) diff --git a/openerp/addons/base/__openerp__.py b/openerp/addons/base/__openerp__.py index 5fb2da9beb8..3f10179f147 100644 --- a/openerp/addons/base/__openerp__.py +++ b/openerp/addons/base/__openerp__.py @@ -25,6 +25,7 @@ 'name': 'Base', 'version': '1.3', 'category': 'Generic Modules/Base', + 'complexity': "easy", 'description': """The kernel of OpenERP, needed for all installation.""", 'author': 'OpenERP SA', 'maintainer': 'OpenERP SA', diff --git a/openerp/addons/base/module/module.py b/openerp/addons/base/module/module.py index 5458771b49d..c0091b1a517 100644 --- a/openerp/addons/base/module/module.py +++ b/openerp/addons/base/module/module.py @@ -188,6 +188,10 @@ class module(osv.osv): 'views_by_module': fields.function(_get_views, method=True, string='Views', type='text', multi="meta", store=True), 'certificate' : fields.char('Quality Certificate', size=64, readonly=True), 'web': fields.boolean('Has a web component', readonly=True), + 'complexity':fields.selection([('easy','Easy'), + ('normal','Normal'), + ('expert','Expert')], + string='Complexity', readonly=True, help='"Level of difficulties of module. Easy : this module is intuitive and easy to use for everyone. Normal : easy to use for business expert. Expert : this module needs some technical skills".'), } _defaults = { @@ -364,6 +368,7 @@ class module(osv.osv): 'license': terp.get('license', 'AGPL-3'), 'certificate': terp.get('certificate') or False, 'web': terp.get('web') or False, + 'complexity': terp.get('complexity', ''), } # 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 16527641656..e3fc13ad98b 100644 --- a/openerp/addons/base/module/module_view.xml +++ b/openerp/addons/base/module/module_view.xml @@ -46,6 +46,7 @@ + @@ -90,6 +91,7 @@ + @@ -149,6 +151,7 @@ + From 0046b4558ed232920028c7d55931cdea60fc2b0f Mon Sep 17 00:00:00 2001 From: "RavishchanraMurari (Open ERP)" Date: Fri, 8 Jul 2011 16:00:47 +0530 Subject: [PATCH 34/73] added tools tips bzr revid: rmu@tinyerp.com-20110708103047-eck3ijxd1mouvppy --- addons/account/account_invoice_view.xml | 4 ++-- addons/crm/crm_lead.py | 4 ++-- addons/mrp/mrp_view.xml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml index ed45c705674..6ec9d736fd0 100644 --- a/addons/account/account_invoice_view.xml +++ b/addons/account/account_invoice_view.xml @@ -203,7 +203,7 @@ -