From 0a8ab4d37142cac208cc0a2320298ed1a26cfae7 Mon Sep 17 00:00:00 2001 From: Stephane Wirtel Date: Wed, 26 Oct 2011 13:18:25 +0200 Subject: [PATCH 01/20] [FIX] Specify the right category bzr revid: stw@openerp.com-20111026111825-7w6x09u4bwk9bcf7 --- addons/association/__openerp__.py | 2 +- addons/auction/__openerp__.py | 2 +- addons/product_expiry/__openerp__.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/association/__openerp__.py b/addons/association/__openerp__.py index 0251eb68d02..3dc6c03f94e 100644 --- a/addons/association/__openerp__.py +++ b/addons/association/__openerp__.py @@ -23,7 +23,7 @@ { 'name': 'Association profile', 'version': '0.1', - 'category': 'Vertical Applications', + 'category': 'Specific Industry Applications', '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 511407e10a2..3f6c6c35e31 100644 --- a/addons/auction/__openerp__.py +++ b/addons/auction/__openerp__.py @@ -23,7 +23,7 @@ { 'name': 'Auction Management', 'version': '1.0', - 'category': 'Vertical Applications', + 'category': 'Specific Industry Applications', 'complexity': "normal", 'description': """ This module manages the records of artists, auction articles, buyers and sellers. diff --git a/addons/product_expiry/__openerp__.py b/addons/product_expiry/__openerp__.py index ebf3b97bc0a..bd1ad693a93 100644 --- a/addons/product_expiry/__openerp__.py +++ b/addons/product_expiry/__openerp__.py @@ -21,7 +21,7 @@ "name" : "Products Expiry Date", "version" : "1.0", "author" : "OpenERP SA", - "category" : "Vertical Applications", + "category" : "Specific Industry Applications", 'complexity': "easy", "depends" : ["stock"], "init_xml" : [], From ff7766f2f6815b90eaffc7b899ef670a68ab406d Mon Sep 17 00:00:00 2001 From: Stephane Wirtel Date: Wed, 26 Oct 2011 13:21:27 +0200 Subject: [PATCH 02/20] [FIX] sale: demo data, set the demo user instead of the admin user bzr revid: stw@openerp.com-20111026112127-j7uuhn5sl5esk6b2 --- addons/sale/sale_demo.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/sale/sale_demo.xml b/addons/sale/sale_demo.xml index 4fcce85c5b5..45a2c2b7f21 100644 --- a/addons/sale/sale_demo.xml +++ b/addons/sale/sale_demo.xml @@ -7,7 +7,7 @@ - + From 49143b08b58e66a22c090f9484f376c53b620b1d Mon Sep 17 00:00:00 2001 From: Stephane Wirtel Date: Wed, 26 Oct 2011 13:33:32 +0200 Subject: [PATCH 03/20] [IMP] crm: phone_call: set the required flag for the summary of a phone call bzr revid: stw@openerp.com-20111026113332-gad5j71ipdtsbvrc --- addons/crm/crm_phonecall.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/crm/crm_phonecall.py b/addons/crm/crm_phonecall.py index 748f85ad063..9cfdddf159c 100644 --- a/addons/crm/crm_phonecall.py +++ b/addons/crm/crm_phonecall.py @@ -35,7 +35,7 @@ class crm_phonecall(crm_base, osv.osv): _columns = { # From crm.case 'id': fields.integer('ID', readonly=True), - 'name': fields.char('Call Summary', size=64), + 'name': fields.char('Call Summary', size=64, required=True), 'active': fields.boolean('Active', required=False), 'date_action_last': fields.datetime('Last Action', readonly=1), 'date_action_next': fields.datetime('Next Action', readonly=1), From f2def5a85ed15e0e7fdd713e945aa4c7335c314d Mon Sep 17 00:00:00 2001 From: Stephane Wirtel Date: Wed, 26 Oct 2011 13:35:33 +0200 Subject: [PATCH 04/20] [FIX] l10n_hn: Set the right category bzr revid: stw@openerp.com-20111026113533-1c7z05g1y9s6px8w --- addons/l10n_hn/__openerp__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/l10n_hn/__openerp__.py b/addons/l10n_hn/__openerp__.py index c4428759af0..31d9344cb65 100755 --- a/addons/l10n_hn/__openerp__.py +++ b/addons/l10n_hn/__openerp__.py @@ -35,7 +35,7 @@ { 'name': 'Honduras - Plan contable general', 'version': '0.1', - 'category': 'Localisation/Account Charts', + 'category': 'Localization/Account Charts', 'description': """Agrega una nomenclatura contable para Honduras. También incluye impuestos y la moneda Lempira. -- Adds accounting chart for Honduras. It also includes taxes and the Lempira currency""", 'author': 'Salvatore Josue Trimarchi Pinto', 'website': 'http://trimarchi.co.cc', From e9cd408f5c76be248ea326687b55ec0c7198164f Mon Sep 17 00:00:00 2001 From: Stephane Wirtel Date: Wed, 26 Oct 2011 13:36:58 +0200 Subject: [PATCH 05/20] [FIX] l10n_hn: Remove the eXecutable flag bzr revid: stw@openerp.com-20111026113658-dl3itmmincgbt2g6 --- addons/l10n_hn/__init__.py | 0 addons/l10n_hn/__openerp__.py | 0 addons/l10n_hn/account_chart.xml | 0 addons/l10n_hn/account_tax.xml | 0 addons/l10n_hn/account_types.xml | 0 addons/l10n_hn/i18n/ca.po | 0 addons/l10n_hn/i18n/es.po | 0 addons/l10n_hn/i18n/es_PY.po | 0 addons/l10n_hn/i18n/fr.po | 0 addons/l10n_hn/i18n/gl.po | 0 addons/l10n_hn/i18n/hu.po | 0 addons/l10n_hn/i18n/it.po | 0 addons/l10n_hn/i18n/l10n_hn.pot | 0 addons/l10n_hn/i18n/pt_BR.po | 0 addons/l10n_hn/i18n/sr@latin.po | 0 addons/l10n_hn/l10n_hn_base.xml | 0 16 files changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 addons/l10n_hn/__init__.py mode change 100755 => 100644 addons/l10n_hn/__openerp__.py mode change 100755 => 100644 addons/l10n_hn/account_chart.xml mode change 100755 => 100644 addons/l10n_hn/account_tax.xml mode change 100755 => 100644 addons/l10n_hn/account_types.xml mode change 100755 => 100644 addons/l10n_hn/i18n/ca.po mode change 100755 => 100644 addons/l10n_hn/i18n/es.po mode change 100755 => 100644 addons/l10n_hn/i18n/es_PY.po mode change 100755 => 100644 addons/l10n_hn/i18n/fr.po mode change 100755 => 100644 addons/l10n_hn/i18n/gl.po mode change 100755 => 100644 addons/l10n_hn/i18n/hu.po mode change 100755 => 100644 addons/l10n_hn/i18n/it.po mode change 100755 => 100644 addons/l10n_hn/i18n/l10n_hn.pot mode change 100755 => 100644 addons/l10n_hn/i18n/pt_BR.po mode change 100755 => 100644 addons/l10n_hn/i18n/sr@latin.po mode change 100755 => 100644 addons/l10n_hn/l10n_hn_base.xml diff --git a/addons/l10n_hn/__init__.py b/addons/l10n_hn/__init__.py old mode 100755 new mode 100644 diff --git a/addons/l10n_hn/__openerp__.py b/addons/l10n_hn/__openerp__.py old mode 100755 new mode 100644 diff --git a/addons/l10n_hn/account_chart.xml b/addons/l10n_hn/account_chart.xml old mode 100755 new mode 100644 diff --git a/addons/l10n_hn/account_tax.xml b/addons/l10n_hn/account_tax.xml old mode 100755 new mode 100644 diff --git a/addons/l10n_hn/account_types.xml b/addons/l10n_hn/account_types.xml old mode 100755 new mode 100644 diff --git a/addons/l10n_hn/i18n/ca.po b/addons/l10n_hn/i18n/ca.po old mode 100755 new mode 100644 diff --git a/addons/l10n_hn/i18n/es.po b/addons/l10n_hn/i18n/es.po old mode 100755 new mode 100644 diff --git a/addons/l10n_hn/i18n/es_PY.po b/addons/l10n_hn/i18n/es_PY.po old mode 100755 new mode 100644 diff --git a/addons/l10n_hn/i18n/fr.po b/addons/l10n_hn/i18n/fr.po old mode 100755 new mode 100644 diff --git a/addons/l10n_hn/i18n/gl.po b/addons/l10n_hn/i18n/gl.po old mode 100755 new mode 100644 diff --git a/addons/l10n_hn/i18n/hu.po b/addons/l10n_hn/i18n/hu.po old mode 100755 new mode 100644 diff --git a/addons/l10n_hn/i18n/it.po b/addons/l10n_hn/i18n/it.po old mode 100755 new mode 100644 diff --git a/addons/l10n_hn/i18n/l10n_hn.pot b/addons/l10n_hn/i18n/l10n_hn.pot old mode 100755 new mode 100644 diff --git a/addons/l10n_hn/i18n/pt_BR.po b/addons/l10n_hn/i18n/pt_BR.po old mode 100755 new mode 100644 diff --git a/addons/l10n_hn/i18n/sr@latin.po b/addons/l10n_hn/i18n/sr@latin.po old mode 100755 new mode 100644 diff --git a/addons/l10n_hn/l10n_hn_base.xml b/addons/l10n_hn/l10n_hn_base.xml old mode 100755 new mode 100644 From 1ab755c37fcef6a697d22ee853425647c33fc668 Mon Sep 17 00:00:00 2001 From: Stephane Wirtel Date: Wed, 26 Oct 2011 13:38:38 +0200 Subject: [PATCH 06/20] [FIX] account_analytic_analysis: change the category and the name bzr revid: stw@openerp.com-20111026113838-ox4b64a6dxhh2oik --- addons/account_analytic_analysis/__openerp__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/account_analytic_analysis/__openerp__.py b/addons/account_analytic_analysis/__openerp__.py index f75fe3d1615..af821c77365 100644 --- a/addons/account_analytic_analysis/__openerp__.py +++ b/addons/account_analytic_analysis/__openerp__.py @@ -21,9 +21,9 @@ { - 'name' : 'Analytic Account View', + 'name' : 'Sales Contract Management', 'version' : '1.1', - 'category' : 'Hidden', + 'category' : 'Sales Management', 'complexity': "normal", 'description': """ This module is for modifying account analytic view to show important data to project manager of services companies. From 2fa6555668792c367b250aba0ce5cdf96b0caa4b Mon Sep 17 00:00:00 2001 From: Stephane Wirtel Date: Wed, 26 Oct 2011 13:39:21 +0200 Subject: [PATCH 07/20] [FIX] idea: change the category bzr revid: stw@openerp.com-20111026113921-iltd9qjsccacoao8 --- addons/idea/__openerp__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/idea/__openerp__.py b/addons/idea/__openerp__.py index e6dab775d6e..66709824c4a 100644 --- a/addons/idea/__openerp__.py +++ b/addons/idea/__openerp__.py @@ -23,7 +23,7 @@ { 'name': 'Ideas Box', 'version': '0.1', - 'category': 'Hidden', + 'category': 'Human Resources', 'complexity': "easy", 'description': """ This module allows your user to easily and efficiently participate in enterprise innovation. From 0336daad0082133b8cc766439265b1ee2e393a19 Mon Sep 17 00:00:00 2001 From: Stephane Wirtel Date: Wed, 26 Oct 2011 13:40:18 +0200 Subject: [PATCH 08/20] [FIX] lunch: change the category bzr revid: stw@openerp.com-20111026114018-brcjpz954bad108k --- addons/lunch/__openerp__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/lunch/__openerp__.py b/addons/lunch/__openerp__.py index 2a493f39dcf..6d5cd576912 100644 --- a/addons/lunch/__openerp__.py +++ b/addons/lunch/__openerp__.py @@ -33,7 +33,7 @@ """, "version": "0.1", "depends": ["base_tools"], - "category" : "Hidden", + "category" : "Human Resources", 'description': """ The base module to manage lunch From 42f5b78eaec72eed3dde9317886ab2ae103f96fc Mon Sep 17 00:00:00 2001 From: Stephane Wirtel Date: Wed, 26 Oct 2011 14:06:09 +0200 Subject: [PATCH 09/20] [IMP] hr_payroll: Change the complexity bzr revid: stw@openerp.com-20111026120609-mpbaes0aj9rm372i --- addons/hr_payroll/__openerp__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/hr_payroll/__openerp__.py b/addons/hr_payroll/__openerp__.py index 34e8924bea5..5c78b80f095 100644 --- a/addons/hr_payroll/__openerp__.py +++ b/addons/hr_payroll/__openerp__.py @@ -23,7 +23,7 @@ 'name': 'Payroll', 'version': '1.0', 'category': 'Human Resources', - 'complexity': "expert", + 'complexity': "normal", 'description': """ Generic Payroll system. ======================= From 93b87cd69406e44fc9f712315fcfb27e29eb1b19 Mon Sep 17 00:00:00 2001 From: Stephane Wirtel Date: Wed, 26 Oct 2011 14:06:41 +0200 Subject: [PATCH 10/20] [IMP] base_setup: install procurement by default if we select warehouse bzr revid: stw@openerp.com-20111026120641-kyg731qyi4m06txz --- addons/base_setup/base_setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/base_setup/base_setup.py b/addons/base_setup/base_setup.py index 59adf25e015..e546d5c24fc 100644 --- a/addons/base_setup/base_setup.py +++ b/addons/base_setup/base_setup.py @@ -34,7 +34,7 @@ DEFAULT_MODULES = { 'Sales Management' : ['sale',], 'Project Management' : ['project',], 'Knowledge Management' : ['document',], - 'Warehouse Management' : ['stock',], + 'Warehouse Management' : ['stock', 'procurement'], 'Manufacturing' : ['mrp'], 'Accounting & Finance' : ['account'], 'Purchase Management' : ['purchase'], From 581bd0ebaf8f173ff3dfdc8b81e6d85b0ecd732e Mon Sep 17 00:00:00 2001 From: Stephane Wirtel Date: Wed, 26 Oct 2011 14:12:25 +0200 Subject: [PATCH 11/20] [FIX] Remove the 'Customer Relationship Management' category bzr revid: stw@openerp.com-20111026121225-pb3tfdtd4w2vy4mo --- addons/crm/__openerp__.py | 2 +- addons/crm_caldav/__openerp__.py | 2 +- addons/crm_claim/__openerp__.py | 2 +- addons/crm_fundraising/__openerp__.py | 2 +- addons/crm_helpdesk/__openerp__.py | 2 +- addons/fetchmail/__openerp__.py | 2 +- addons/import_google/__openerp__.py | 2 +- addons/import_sugarcrm/__openerp__.py | 2 +- addons/outlook/__openerp__.py | 2 +- addons/thunderbird/__openerp__.py | 2 +- addons/wiki_sale_faq/__openerp__.py | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py index a6f5f1630f7..0c2011d5856 100644 --- a/addons/crm/__openerp__.py +++ b/addons/crm/__openerp__.py @@ -23,7 +23,7 @@ { 'name': 'Customer & Supplier Relationship Management', 'version': '1.0', - 'category': 'Customer Relationship Management', + 'category': 'Sales Management', 'complexity': "easy", 'description': """ The generic OpenERP Customer Relationship Management. diff --git a/addons/crm_caldav/__openerp__.py b/addons/crm_caldav/__openerp__.py index 8f1812862c5..0c811b22f69 100644 --- a/addons/crm_caldav/__openerp__.py +++ b/addons/crm_caldav/__openerp__.py @@ -24,7 +24,7 @@ { 'name': 'Calendar Synchronizing', 'version': '1.1', - 'category': 'Customer Relationship Management', + 'category': 'Sales Management', 'complexity': "normal", 'description': """ Caldav features in Meeting. diff --git a/addons/crm_claim/__openerp__.py b/addons/crm_claim/__openerp__.py index ae493c5dac2..1af7cfa96bb 100644 --- a/addons/crm_claim/__openerp__.py +++ b/addons/crm_claim/__openerp__.py @@ -23,7 +23,7 @@ { 'name': 'Claims', 'version': '1.0', - 'category': 'Customer Relationship Management', + 'category': 'Sales Management', '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 2d75f9e69b7..029f083420b 100644 --- a/addons/crm_fundraising/__openerp__.py +++ b/addons/crm_fundraising/__openerp__.py @@ -21,7 +21,7 @@ { - 'category': 'Customer Relationship Management', + 'category': 'Sales Management', 'name': 'Fundraising', 'version': '1.0', 'complexity': "easy", diff --git a/addons/crm_helpdesk/__openerp__.py b/addons/crm_helpdesk/__openerp__.py index 5124c3c5817..856c269349c 100644 --- a/addons/crm_helpdesk/__openerp__.py +++ b/addons/crm_helpdesk/__openerp__.py @@ -21,7 +21,7 @@ { - 'category': 'Customer Relationship Management', + 'category': 'Sales Management', 'name': 'Helpdesk', 'version': '1.0', 'complexity': "easy", diff --git a/addons/fetchmail/__openerp__.py b/addons/fetchmail/__openerp__.py index ae082aacacd..296db884f22 100644 --- a/addons/fetchmail/__openerp__.py +++ b/addons/fetchmail/__openerp__.py @@ -25,7 +25,7 @@ "version" : "1.0", "depends" : ["base", 'mail'], "author" : "OpenERP SA", - "category": 'Customer Relationship Management', + 'category': 'Sales Management', "description": """ Retrieve incoming email on POP / IMAP servers ============================================= diff --git a/addons/import_google/__openerp__.py b/addons/import_google/__openerp__.py index a0a15756ec3..d96a8bd522f 100644 --- a/addons/import_google/__openerp__.py +++ b/addons/import_google/__openerp__.py @@ -22,7 +22,7 @@ { 'name': 'Google Import', 'version': '1.0', - 'category': 'Customer Relationship Management', + 'category': 'Sales Management', 'description': """The module adds google contact in partner address and add google calendar events details in Meeting""", 'author': 'OpenERP SA', 'website': 'http://www.openerp.com', diff --git a/addons/import_sugarcrm/__openerp__.py b/addons/import_sugarcrm/__openerp__.py index 927a4b542ed..fca47e4ec25 100644 --- a/addons/import_sugarcrm/__openerp__.py +++ b/addons/import_sugarcrm/__openerp__.py @@ -22,7 +22,7 @@ { 'name': 'Import Data from SugarCRM', 'version': '1.0', - 'category': 'Customer Relationship Management', + 'category': 'Sales Management', 'description': """This Module Import SugarCRM "Leads", "Opportunities", "Users", "Accounts", "Contacts", "Employees", Meetings, Phonecalls, Emails, and Project, Project Tasks Data into OpenERP Module.""", 'author': 'OpenERP SA', diff --git a/addons/outlook/__openerp__.py b/addons/outlook/__openerp__.py index beab5aca648..55a452e7f11 100644 --- a/addons/outlook/__openerp__.py +++ b/addons/outlook/__openerp__.py @@ -26,7 +26,7 @@ 'author' : 'OpenERP SA', 'website' : 'http://www.openerp.com/', 'depends' : ['base', 'mail'], - 'category' : 'Customer Relationship Management', + 'category': 'Sales Management', 'description': ''' This module provides the Outlook Plug-in. ========================================= diff --git a/addons/thunderbird/__openerp__.py b/addons/thunderbird/__openerp__.py index 5b124af05aa..52eedf801ca 100644 --- a/addons/thunderbird/__openerp__.py +++ b/addons/thunderbird/__openerp__.py @@ -25,7 +25,7 @@ "author" : ['OpenERP SA', 'Axelor'], "website" : "http://www.openerp.com/", "depends" : ["base","mail"], - "category" : "Customer Relationship Management", + 'category': 'Sales Management', "description": """ This module is required for the Thuderbird Plug-in to work properly. ==================================================================== diff --git a/addons/wiki_sale_faq/__openerp__.py b/addons/wiki_sale_faq/__openerp__.py index 1e56baf58cc..ccd31909048 100644 --- a/addons/wiki_sale_faq/__openerp__.py +++ b/addons/wiki_sale_faq/__openerp__.py @@ -22,7 +22,7 @@ { 'name': 'Sale FAQ', 'version': '1.0', - 'category': 'Customer Relationship Management', + 'category': 'Sales Management', 'complexity': "easy", 'description': """ This module provides a Wiki Sales FAQ Template. From ba3a54f7b55d93207a394ac9d23bc09581e64d8a Mon Sep 17 00:00:00 2001 From: Stephane Wirtel Date: Wed, 26 Oct 2011 14:12:44 +0200 Subject: [PATCH 12/20] [FIX] Remove the CRM Category and set the crm module in the Sales Management bzr revid: stw@openerp.com-20111026121244-9sknogp7r7pfjx3g --- addons/base_setup/base_setup.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/addons/base_setup/base_setup.py b/addons/base_setup/base_setup.py index e546d5c24fc..c53a33a0207 100644 --- a/addons/base_setup/base_setup.py +++ b/addons/base_setup/base_setup.py @@ -30,8 +30,7 @@ from lxml import etree #Application and feature chooser, this could be done by introspecting ir.modules DEFAULT_MODULES = { - 'Customer Relationship Management' : ['crm',], - 'Sales Management' : ['sale',], + 'Sales Management' : ['sale', 'crm'], 'Project Management' : ['project',], 'Knowledge Management' : ['document',], 'Warehouse Management' : ['stock', 'procurement'], From c600b067a58ac8cae42519c5d2737e89f6a6e630 Mon Sep 17 00:00:00 2001 From: Stephane Wirtel Date: Wed, 26 Oct 2011 15:44:48 +0200 Subject: [PATCH 13/20] [IMP] crm: allow to search with the name of the opportunity bzr revid: stw@openerp.com-20111026134448-bu5wq8p7gzvg0u10 --- addons/crm/crm_lead_view.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml index 42587eea2b0..f05c46bd58f 100644 --- a/addons/crm/crm_lead_view.xml +++ b/addons/crm/crm_lead_view.xml @@ -688,8 +688,7 @@ name="pending" domain="[('state','=','pending')]"/> - - + Date: Wed, 26 Oct 2011 16:04:45 +0200 Subject: [PATCH 14/20] [IMP] sale_crm: Set the reference of the sale order in the opportunity when we convert the opp to so bzr revid: stw@openerp.com-20111026140445-db4vd7dho7b3nh27 --- addons/sale_crm/wizard/crm_make_sale.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/addons/sale_crm/wizard/crm_make_sale.py b/addons/sale_crm/wizard/crm_make_sale.py index ae41ced671c..40a19679486 100644 --- a/addons/sale_crm/wizard/crm_make_sale.py +++ b/addons/sale_crm/wizard/crm_make_sale.py @@ -103,12 +103,13 @@ class crm_make_sale(osv.osv_memory): } if partner.id: vals['user_id'] = partner.user_id and partner.user_id.id or uid - new_id = sale_obj.create(cr, uid, vals) + new_id = sale_obj.create(cr, uid, vals, context=context) + sale_order = sale_obj.browse(cr, uid, new_id, context=context) case_obj.write(cr, uid, [case.id], {'ref': 'sale.order,%s' % new_id}) new_ids.append(new_id) message = _("Opportunity '%s' is converted to Quotation.") % (case.name) self.log(cr, uid, case.id, message) - case_obj.message_append(cr, uid, [case], _("Converted to Sales Quotation(id: %s).") % (new_id), context=context) + case_obj.message_append(cr, uid, [case], _("Converted to Sales Quotation(%s).") % (sale_order.name), context=context) if make.close: case_obj.case_close(cr, uid, data) From 33a6d24bcd82c5b2a05e3f5078f545f7c04f9a8a Mon Sep 17 00:00:00 2001 From: Stephane Wirtel Date: Wed, 26 Oct 2011 16:56:43 +0200 Subject: [PATCH 15/20] [IMP] account: Hide the company_id only if there is a default company (only one) bzr revid: stw@openerp.com-20111026145643-nw9rza8g8u08i7bg --- addons/account/account_installer.xml | 3 ++- addons/account/installer.py | 6 ++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/addons/account/account_installer.xml b/addons/account/account_installer.xml index b35b37aa972..230078c4e33 100644 --- a/addons/account/account_installer.xml +++ b/addons/account/account_installer.xml @@ -28,7 +28,8 @@ - + + diff --git a/addons/account/installer.py b/addons/account/installer.py index 530ea7ccc6f..a91af8f0862 100644 --- a/addons/account/installer.py +++ b/addons/account/installer.py @@ -59,12 +59,17 @@ class account_installer(osv.osv_memory): 'sale_tax': fields.float('Sale Tax(%)'), 'purchase_tax': fields.float('Purchase Tax(%)'), 'company_id': fields.many2one('res.company', 'Company', required=True), + 'has_default_company' : fields.boolean('Has Default Company', readonly=True), } def _default_company(self, cr, uid, context=None): user = self.pool.get('res.users').browse(cr, uid, uid, context=context) return user.company_id and user.company_id.id or False + def _default_has_default_company(self, cr, uid, context=None): + count = self.pool.get('res.company').search_count(cr, uid, [], context=context) + return bool(count == 1) + _defaults = { 'date_start': lambda *a: time.strftime('%Y-01-01'), 'date_stop': lambda *a: time.strftime('%Y-12-31'), @@ -72,6 +77,7 @@ class account_installer(osv.osv_memory): 'sale_tax': 0.0, 'purchase_tax': 0.0, 'company_id': _default_company, + 'has_default_company': _default_has_default_company, 'charts': 'configurable' } From 06b8d1e5c3b5dcb7778d20f326c64fc739c02bc7 Mon Sep 17 00:00:00 2001 From: Stephane Wirtel Date: Wed, 26 Oct 2011 17:03:24 +0200 Subject: [PATCH 16/20] [IMP] hr: show the employees from the category bzr revid: stw@openerp.com-20111026150324-1c5k1lsq2yvqhfq9 --- addons/hr/hr.py | 3 ++- addons/hr/hr_view.xml | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/addons/hr/hr.py b/addons/hr/hr.py index 7a704de78d0..f641a425e18 100644 --- a/addons/hr/hr.py +++ b/addons/hr/hr.py @@ -47,7 +47,8 @@ class hr_employee_category(osv.osv): 'name': fields.char("Category", size=64, required=True), 'complete_name': fields.function(_name_get_fnc, type="char", string='Name'), 'parent_id': fields.many2one('hr.employee.category', 'Parent Category', select=True), - 'child_ids': fields.one2many('hr.employee.category', 'parent_id', 'Child Categories') + 'child_ids': fields.one2many('hr.employee.category', 'parent_id', 'Child Categories'), + 'employee_ids': fields.many2many('hr.employee', 'employee_category_rel', 'category_id', 'emp_id', 'Employees'), } def _check_recursion(self, cr, uid, ids, context=None): diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml index a59269bd3ff..bc68736b48e 100644 --- a/addons/hr/hr_view.xml +++ b/addons/hr/hr_view.xml @@ -287,6 +287,8 @@
+ +
From 29304322196eb970be8280b533a25e5a130c2d24 Mon Sep 17 00:00:00 2001 From: Stephane Wirtel Date: Thu, 27 Oct 2011 11:47:22 +0200 Subject: [PATCH 17/20] [FIX] hr_payroll: Change a label bzr revid: stw@openerp.com-20111027094722-xq0h0cbn21y8bt58 --- addons/hr_payroll/hr_payroll.py | 4 ++-- addons/hr_payroll/hr_payroll_view.xml | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/addons/hr_payroll/hr_payroll.py b/addons/hr_payroll/hr_payroll.py index b913cc0b2f1..5a202fecaef 100644 --- a/addons/hr_payroll/hr_payroll.py +++ b/addons/hr_payroll/hr_payroll.py @@ -211,7 +211,7 @@ class one2many_mod2(fields.one2many): class hr_payslip_run(osv.osv): _name = 'hr.payslip.run' - _description = 'Payslip Run' + _description = 'Payslip Generation' _columns = { 'name': fields.char('Name', size=64, required=True, readonly=True, states={'draft': [('readonly', False)]}), 'slip_ids': fields.one2many('hr.payslip', 'payslip_run_id', 'Payslips', required=False, readonly=True, states={'draft': [('readonly', False)]}), @@ -286,7 +286,7 @@ class hr_payslip(osv.osv): 'contract_id': fields.many2one('hr.contract', 'Contract', required=False, readonly=True, states={'draft': [('readonly', False)]}), 'details_by_salary_rule_category': fields.function(_get_lines_salary_rule_category, method=True, type='one2many', relation='hr.payslip.line', string='Details by Salary Rule Category'), 'credit_note': fields.boolean('Credit Note', help="Indicates this payslip has a refund of another", readonly=True, states={'draft': [('readonly', False)]}), - 'payslip_run_id': fields.many2one('hr.payslip.run', 'Payslip Run', readonly=True, states={'draft': [('readonly', False)]}), + 'payslip_run_id': fields.many2one('hr.payslip.run', 'Payslip Generation', readonly=True, states={'draft': [('readonly', False)]}), } _defaults = { 'date_from': lambda *a: time.strftime('%Y-%m-01'), diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml index aa97ad9503a..3a545aa27e8 100644 --- a/addons/hr_payroll/hr_payroll_view.xml +++ b/addons/hr_payroll/hr_payroll_view.xml @@ -392,7 +392,7 @@ - + @@ -684,9 +684,9 @@ hr.payslip.run search - - - + + + From e9600b82567d34735680cb287aeeb9de105e88ae Mon Sep 17 00:00:00 2001 From: Stephane Wirtel Date: Thu, 3 Nov 2011 15:40:39 +0100 Subject: [PATCH 18/20] [FIX] account: Use the category 'Account Charts' for the wizard of Chart of Accounts bzr revid: stw@openerp.com-20111103144039-fqikzqv88ka89yxs --- addons/account/installer.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/addons/account/installer.py b/addons/account/installer.py index a91af8f0862..6c6d6c41695 100644 --- a/addons/account/installer.py +++ b/addons/account/installer.py @@ -38,7 +38,9 @@ class account_installer(osv.osv_memory): def _get_charts(self, cr, uid, context=None): modules = self.pool.get('ir.module.module') - ids = modules.search(cr, uid, [('name', 'like', 'l10n_')], context=context) + # Looking for the module with the 'Account Charts' category + category_name, category_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'base', 'module_category_localization_account_charts') + ids = modules.search(cr, uid, [('category_id', '=', category_id)], context=context) charts = list( sorted(((m.name, m.shortdesc) for m in modules.browse(cr, uid, ids, context=context)), From 59aaea47dc1bb8c8b8723e48e61bde3408d48462 Mon Sep 17 00:00:00 2001 From: Stephane Wirtel Date: Thu, 3 Nov 2011 15:53:50 +0100 Subject: [PATCH 19/20] [FIX] hr_contract: fix the layout of the hr_contract bzr revid: stw@openerp.com-20111103145350-6tvy5lvxvx2uee6a --- addons/hr_contract/hr_contract_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/hr_contract/hr_contract_view.xml b/addons/hr_contract/hr_contract_view.xml index 485b0566120..5a4f84a9692 100644 --- a/addons/hr_contract/hr_contract_view.xml +++ b/addons/hr_contract/hr_contract_view.xml @@ -74,7 +74,7 @@ - + From 3a1b083daa5f3cfaa25c3bbdb1fa3f1145d7a9d2 Mon Sep 17 00:00:00 2001 From: Stephane Wirtel Date: Thu, 3 Nov 2011 16:12:46 +0100 Subject: [PATCH 20/20] [FIX] hr_holidays: use the manager for the second validation bzr revid: stw@openerp.com-20111103151246-5gybhi02go4491gj --- addons/hr_holidays/hr_holidays_workflow.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/hr_holidays/hr_holidays_workflow.xml b/addons/hr_holidays/hr_holidays_workflow.xml index 9b0c5652bdd..7013d62a5ed 100644 --- a/addons/hr_holidays/hr_holidays_workflow.xml +++ b/addons/hr_holidays/hr_holidays_workflow.xml @@ -84,7 +84,7 @@ second_validate - +