From ddd53dc30ea3b1edeaf4c9506a1405002107a420 Mon Sep 17 00:00:00 2001 From: "Tejas (OpenERP)" Date: Tue, 16 Aug 2011 17:51:44 +0530 Subject: [PATCH 1/9] [Usability] Changed meni location of the -job position bzr revid: tta@openerp.com-20110816122144-4hjrj4qyk848hkma --- addons/hr/hr_view.xml | 2 +- addons/hr_recruitment/hr_recruitment_menu.xml | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml index 64580a7dbe1..c463cf436e0 100644 --- a/addons/hr/hr_view.xml +++ b/addons/hr/hr_view.xml @@ -377,7 +377,7 @@ - + diff --git a/addons/hr_recruitment/hr_recruitment_menu.xml b/addons/hr_recruitment/hr_recruitment_menu.xml index 2e941877b65..9883e311fba 100644 --- a/addons/hr_recruitment/hr_recruitment_menu.xml +++ b/addons/hr_recruitment/hr_recruitment_menu.xml @@ -46,6 +46,9 @@ name="Applicants" parent="base.menu_crm_case_job_req_main" id="menu_crm_case_categ0_act_job" action="crm_case_categ0_act_job" sequence="1"/> + + + From 90569c64cac1ff269e6734a1a481d7b949ecb8cf Mon Sep 17 00:00:00 2001 From: "Tejas (OpenERP)" Date: Tue, 16 Aug 2011 18:20:51 +0530 Subject: [PATCH 2/9] [Usability] Product : Lable changed ,Real Stock and Virtual Stock respectively Quanity On Hand and Quantity On Order. bzr revid: tta@openerp.com-20110816125051-4lgrd1x567v2ea0k --- addons/product/product.py | 4 ++-- addons/stock/product.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/product/product.py b/addons/product/product.py index 8e6e132296d..5eb4247fd29 100644 --- a/addons/product/product.py +++ b/addons/product/product.py @@ -469,8 +469,8 @@ class product_product(osv.osv): _inherits = {'product.template': 'product_tmpl_id'} _order = 'default_code,name_template' _columns = { - 'qty_available': fields.function(_product_qty_available, type='float', string='Real Stock'), - 'virtual_available': fields.function(_product_virtual_available, type='float', string='Virtual Stock'), + 'qty_available': fields.function(_product_qty_available, type='float', string='Quantity On Hand'), + 'virtual_available': fields.function(_product_virtual_available, type='float', string='Quantity On Order'), 'incoming_qty': fields.function(_product_incoming_qty, type='float', string='Incoming'), 'outgoing_qty': fields.function(_product_outgoing_qty, type='float', string='Outgoing'), 'price': fields.function(_product_price, type='float', string='Pricelist', digits_compute=dp.get_precision('Sale Price')), diff --git a/addons/stock/product.py b/addons/stock/product.py index 70925a82d10..46a5dec759d 100644 --- a/addons/stock/product.py +++ b/addons/stock/product.py @@ -330,8 +330,8 @@ class product_product(osv.osv): return res _columns = { - 'qty_available': fields.function(_product_available, type='float', string='Real Stock', help="Current quantities of products in selected locations or all internal if none have been selected.", multi='qty_available', digits_compute=dp.get_precision('Product UoM')), - 'virtual_available': fields.function(_product_available, type='float', string='Virtual Stock', help="Future stock for this product according to the selected locations or all internal if none have been selected. Computed as: Real Stock - Outgoing + Incoming.", multi='qty_available', digits_compute=dp.get_precision('Product UoM')), + 'qty_available': fields.function(_product_available, type='float', string='Quantity On Hand', help="Current quantities of products in selected locations or all internal if none have been selected.", multi='qty_available', digits_compute=dp.get_precision('Product UoM')), + 'virtual_available': fields.function(_product_available, type='float', string='Quantity On Order', help="Future stock for this product according to the selected locations or all internal if none have been selected. Computed as: Real Stock - Outgoing + Incoming.", multi='qty_available', digits_compute=dp.get_precision('Product UoM')), 'incoming_qty': fields.function(_product_available, type='float', string='Incoming', help="Quantities of products that are planned to arrive in selected locations or all internal if none have been selected.", multi='qty_available', digits_compute=dp.get_precision('Product UoM')), 'outgoing_qty': fields.function(_product_available, type='float', string='Outgoing', help="Quantities of products that are planned to leave in selected locations or all internal if none have been selected.", multi='qty_available', digits_compute=dp.get_precision('Product UoM')), 'track_production': fields.boolean('Track Manufacturing Lots' , help="Forces to specify a Production Lot for all moves containing this product and generated by a Manufacturing Order"), From 2fa479cdf50d1ee99ccc32bd4ef4e2711ece157d Mon Sep 17 00:00:00 2001 From: "Tejas (OpenERP)" Date: Tue, 16 Aug 2011 19:03:59 +0530 Subject: [PATCH 3/9] [Usability] Account -> Config. Menu sequence changed bzr revid: tta@openerp.com-20110816133359-krnni8we6yw1qd60 --- addons/account/account_view.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml index 19def9fff12..ff4f36d9c6d 100644 --- a/addons/account/account_view.xml +++ b/addons/account/account_view.xml @@ -362,7 +362,7 @@ Here you can customize an existing journal view or create a new view. Journal views determine the way you can record entries in your journal. Select the fields you want to appear in a journal and determine the sequence in which they will appear. Then you can create a new journal and link your view to it. - + From 9511203a4d6f4afb3428dd427c7c0257055f2e45 Mon Sep 17 00:00:00 2001 From: "Tejas (OpenERP)" Date: Wed, 17 Aug 2011 12:31:21 +0530 Subject: [PATCH 4/9] [Usability] Improved the menu location bzr revid: tta@openerp.com-20110817070121-4yeg133nu8fzu8wb --- addons/hr/hr_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml index c463cf436e0..e0034d27033 100644 --- a/addons/hr/hr_view.xml +++ b/addons/hr/hr_view.xml @@ -377,7 +377,7 @@ - + From 96364651ede865ae34431103bb4b9eb9f491ffb5 Mon Sep 17 00:00:00 2001 From: "Tejas (OpenERP)" Date: Wed, 17 Aug 2011 14:27:12 +0530 Subject: [PATCH 5/9] [Usability] renamed the label and changed the sequence of the menu bzr revid: tta@openerp.com-20110817085712-7n64kag6hb6vtwhf --- addons/mrp/mrp_view.xml | 2 +- addons/resource/resource.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml index fb029710eb3..ee8f201d179 100644 --- a/addons/mrp/mrp_view.xml +++ b/addons/mrp/mrp_view.xml @@ -304,7 +304,7 @@ Routings allow you to create and manage the manufacturing operations that should be followed within your work centers in order to produce a product. They are attached to bills of materials that will define the required raw materials. - + + + crm.case.channel.tree + crm.case.channel + tree + + + + + + + + + crm.case.channel.form + crm.case.channel + form + +
+ + + + +
+ + Channels + crm.case.channel + form + tree,form + Track from where is coming your leads and opportunities by creating specific channels that will be maintained at the creation of a document in the system. Some examples of channels can be: Website, Phone Call, Reseller, etc. + + + + diff --git a/addons/crm/report/crm_lead_report.py b/addons/crm/report/crm_lead_report.py index 51f1eb5d96e..bd61e1ee80d 100644 --- a/addons/crm/report/crm_lead_report.py +++ b/addons/crm/report/crm_lead_report.py @@ -57,7 +57,7 @@ class crm_lead_report(osv.osv): 'user_id':fields.many2one('res.users', 'User', readonly=True), 'country_id':fields.many2one('res.country', 'Country', readonly=True), 'section_id':fields.many2one('crm.case.section', 'Sales Team', readonly=True), - 'channel_id':fields.many2one('res.partner.canal', 'Channel', readonly=True), + 'channel_id':fields.many2one('crm.case.channel', 'Channel', readonly=True), 'type_id':fields.many2one('crm.case.resource.type', 'Campaign', readonly=True), 'state': fields.selection(AVAILABLE_STATES, 'State', size=16, readonly=True), 'creation_month':fields.selection(MONTHS, 'Creation Date', readonly=True), diff --git a/addons/crm/security/ir.model.access.csv b/addons/crm/security/ir.model.access.csv index 4aa68a6625c..6f7b3066d7a 100644 --- a/addons/crm/security/ir.model.access.csv +++ b/addons/crm/security/ir.model.access.csv @@ -3,6 +3,8 @@ "access_crm_segmentation_line_user","crm.segmentation.line user","model_crm_segmentation_line","base.group_sale_salesman",1,0,0,0 "access_crm_segmentation","crm.segmentation","model_crm_segmentation","base.group_sale_manager",1,1,1,1 "access_crm_segmentation_line","crm.segmentation.line","model_crm_segmentation_line","base.group_sale_manager",1,1,1,1 +"access_crm_case_channel_user","crm.case.channel user","model_crm_case_channel","base.group_sale_salesman",1,0,0,0 +"access_crm_case_channel_manager","crm.case.channel manager","model_crm_case_channel","base.group_sale_manager",1,1,1,1 "access_crm_case_section","crm.case.section","model_crm_case_section","base.group_sale_salesman",1,1,1,0 "access_crm_case_categ","crm.case.categ","model_crm_case_categ","base.group_sale_salesman",1,1,1,0 "access_crm_meeting_manager","crm.meeting.manager","model_crm_meeting","base.group_sale_manager",1,1,1,1 @@ -41,7 +43,6 @@ "access_crm_lead_report_user","crm.lead.report user","model_crm_lead_report","base.group_sale_salesman",1,1,1,1 "access_res_partner_bank_type_crm_user","res.partner.bank.type.crm.user","base.model_res_partner_bank_type","base.group_sale_salesman",1,0,0,0 "access_res_partner_bank_type_crm_manager","res.partner.bank.type.crm.manager","base.model_res_partner_bank_type","base.group_sale_manager",1,0,0,0 -"access_res_partner_canal_manager","res.partner.canal.manager","base.model_res_partner_canal","base.group_sale_manager",1,1,1,1 "access_crm_lead_partner_manager","crm.lead.partner.manager","model_crm_lead","base.group_partner_manager",1,1,1,1 "access_crm_phonecall_partner_manager","crm.phonecall.partner.manager","model_crm_phonecall","base.group_partner_manager",1,1,1,1 "access_crm_meeting_partner_manager","crm.meeting.partner.manager","model_crm_meeting","base.group_partner_manager",1,1,1,1 diff --git a/addons/crm_fundraising/crm_fundraising.py b/addons/crm_fundraising/crm_fundraising.py index e2b0bb566fd..01234dbf436 100644 --- a/addons/crm_fundraising/crm_fundraising.py +++ b/addons/crm_fundraising/crm_fundraising.py @@ -67,9 +67,6 @@ class crm_fundraising(crm.crm_case, osv.osv): 'duration': fields.float('Duration'), 'ref': fields.reference('Reference', selection=crm._links_get, size=128), 'ref2': fields.reference('Reference 2', selection=crm._links_get, size=128), - 'canal_id': fields.many2one('res.partner.canal', 'Channel', \ - help="The channels represent the different communication \ - modes available with the customer."), 'state': fields.selection(crm.AVAILABLE_STATES, 'State', size=16, readonly=True, help='The state is set to \'Draft\', when a case is created.\ \nIf the case is in progress the state is set to \'Open\'.\ diff --git a/addons/crm_fundraising/crm_fundraising_view.xml b/addons/crm_fundraising/crm_fundraising_view.xml index 9dddc31bd6c..c98a06eda46 100644 --- a/addons/crm_fundraising/crm_fundraising_view.xml +++ b/addons/crm_fundraising/crm_fundraising_view.xml @@ -190,7 +190,6 @@ - diff --git a/addons/crm_helpdesk/crm_helpdesk.py b/addons/crm_helpdesk/crm_helpdesk.py index 5d02ec12369..b27fa04a2af 100644 --- a/addons/crm_helpdesk/crm_helpdesk.py +++ b/addons/crm_helpdesk/crm_helpdesk.py @@ -63,9 +63,7 @@ class crm_helpdesk(crm.crm_case, osv.osv): 'date': fields.datetime('Date'), 'ref' : fields.reference('Reference', selection=crm._links_get, size=128), 'ref2' : fields.reference('Reference 2', selection=crm._links_get, size=128), - 'canal_id': fields.many2one('res.partner.canal', 'Channel', \ - help="The channels represent the different communication \ - modes available with the customer."), + 'channel_id': fields.many2one('crm.case.channel', 'Channel', help="Communication channel."), 'planned_revenue': fields.float('Planned Revenue'), 'planned_cost': fields.float('Planned Costs'), 'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'), diff --git a/addons/crm_helpdesk/crm_helpdesk_demo.xml b/addons/crm_helpdesk/crm_helpdesk_demo.xml index f48af6b5de3..a7f36c931c9 100644 --- a/addons/crm_helpdesk/crm_helpdesk_demo.xml +++ b/addons/crm_helpdesk/crm_helpdesk_demo.xml @@ -2,7 +2,6 @@ - @@ -15,7 +14,6 @@ - @@ -28,7 +26,6 @@ - @@ -41,7 +38,6 @@ - @@ -54,4 +50,4 @@ - \ No newline at end of file + diff --git a/addons/crm_helpdesk/crm_helpdesk_view.xml b/addons/crm_helpdesk/crm_helpdesk_view.xml index e0ca162286f..af893a3f40f 100644 --- a/addons/crm_helpdesk/crm_helpdesk_view.xml +++ b/addons/crm_helpdesk/crm_helpdesk_view.xml @@ -62,7 +62,7 @@ - + diff --git a/addons/crm_helpdesk/report/crm_helpdesk_report.py b/addons/crm_helpdesk/report/crm_helpdesk_report.py index 0d1d97c6905..7b70b77d5d1 100644 --- a/addons/crm_helpdesk/report/crm_helpdesk_report.py +++ b/addons/crm_helpdesk/report/crm_helpdesk_report.py @@ -56,7 +56,7 @@ class crm_helpdesk_report(osv.osv): 'date_deadline': fields.date('Deadline', select=True), 'priority': fields.selection([('5', 'Lowest'), ('4', 'Low'), \ ('3', 'Normal'), ('2', 'High'), ('1', 'Highest')], 'Priority'), - 'canal_id': fields.many2one('res.partner.canal', 'Channel'), + 'channel_id': fields.many2one('crm.case.channel', 'Channel'), 'categ_id': fields.many2one('crm.case.categ', 'Category', \ domain="[('section_id','=',section_id),\ ('object_id.model', '=', 'crm.helpdesk')]"), @@ -93,7 +93,7 @@ class crm_helpdesk_report(osv.osv): c.priority, c.date_deadline, c.categ_id, - c.canal_id, + c.channel_id, c.planned_cost, count(*) as nbr, extract('epoch' from (c.date_closed-c.create_date))/(3600*24) as delay_close, @@ -104,7 +104,7 @@ class crm_helpdesk_report(osv.osv): group by to_char(c.date, 'YYYY'), to_char(c.date, 'MM'),to_char(c.date, 'YYYY-MM-DD'),\ c.state, c.user_id,c.section_id,c.priority,\ c.partner_id,c.company_id,c.date_deadline,c.create_date,c.date,c.date_closed,\ - c.categ_id,c.canal_id,c.planned_cost,c.id + c.categ_id,c.channel_id,c.planned_cost,c.id )""") crm_helpdesk_report() diff --git a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml index d54b719fe2b..e954c790582 100644 --- a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml +++ b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml @@ -25,7 +25,7 @@ - + @@ -106,9 +106,7 @@ domain="[]" context="{'group_by':'partner_id'}" /> - + diff --git a/addons/hr_recruitment/hr_recruitment_demo.xml b/addons/hr_recruitment/hr_recruitment_demo.xml index 20a4fa0e17a..b2d029f74d4 100644 --- a/addons/hr_recruitment/hr_recruitment_demo.xml +++ b/addons/hr_recruitment/hr_recruitment_demo.xml @@ -25,7 +25,6 @@ - @@ -45,7 +44,6 @@ - @@ -115,7 +113,6 @@ - @@ -136,7 +133,6 @@ - diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py index 2217bade5fa..ea974eea7d4 100644 --- a/addons/project_issue/project_issue.py +++ b/addons/project_issue/project_issue.py @@ -206,8 +206,7 @@ class project_issue(crm.crm_case, osv.osv): # Project Issue fields 'date_closed': fields.datetime('Closed', readonly=True,select=True), 'date': fields.datetime('Date'), - 'canal_id': fields.many2one('res.partner.canal', 'Channel', help="The channels represent the different communication modes available with the customer." \ - " With each commercial opportunity, you can indicate the canall which is this opportunity source."), + 'channel_id': fields.many2one('crm.case.channel', 'Channel', help="Communication channel."), 'categ_id': fields.many2one('crm.case.categ', 'Category', domain="[('object_id.model', '=', 'crm.project.bug')]"), 'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'), 'version_id': fields.many2one('project.issue.version', 'Version'), diff --git a/addons/project_issue/project_issue_demo.xml b/addons/project_issue/project_issue_demo.xml index 539cef5579e..12ff265b1e9 100644 --- a/addons/project_issue/project_issue_demo.xml +++ b/addons/project_issue/project_issue_demo.xml @@ -198,7 +198,6 @@ - diff --git a/addons/project_issue/report/project_issue_report.py b/addons/project_issue/report/project_issue_report.py index 29542f32912..5eae252f446 100644 --- a/addons/project_issue/report/project_issue_report.py +++ b/addons/project_issue/report/project_issue_report.py @@ -66,7 +66,7 @@ class project_issue_report(osv.osv): 'version_id': fields.many2one('project.issue.version', 'Version'), 'assigned_to' : fields.many2one('res.users', 'Assigned to',readonly=True), 'partner_id': fields.many2one('res.partner','Partner',domain="[('object_id.model', '=', 'project.issue')]"), - 'canal_id': fields.many2one('res.partner.canal', 'Channel',readonly=True), + 'channel_id': fields.many2one('crm.case.channel', 'Channel',readonly=True), 'task_id': fields.many2one('project.task', 'Task',domain="[('object_id.model', '=', 'project.issue')]" ), 'email': fields.integer('# Emails', size=128, readonly=True), } @@ -97,7 +97,7 @@ class project_issue_report(osv.osv): 1 as nbr, c.assigned_to, c.partner_id, - c.canal_id, + c.channel_id, c.task_id, date_trunc('day',c.create_date) as create_date, extract('epoch' from (c.date_open-c.create_date))/(3600*24) as delay_open, diff --git a/addons/project_issue/report/project_issue_report_view.xml b/addons/project_issue/report/project_issue_report_view.xml index 015a7750548..4808ff29f81 100644 --- a/addons/project_issue/report/project_issue_report_view.xml +++ b/addons/project_issue/report/project_issue_report_view.xml @@ -18,7 +18,7 @@ - + diff --git a/addons/sale/sale.py b/addons/sale/sale.py index 17d2c636e12..2fe965002c6 100644 --- a/addons/sale/sale.py +++ b/addons/sale/sale.py @@ -794,7 +794,6 @@ class sale_order(osv.osv): 'document': '', 'partner_id': part, 'date': time.strftime('%Y-%m-%d'), - 'canal_id': False, 'user_id': uid, 'partner_type': partnertype, 'probability': 1.0, From 5e98baa18543859a970678ced8ea456499e429ee Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Sun, 28 Aug 2011 03:58:02 +0200 Subject: [PATCH 8/9] [FIX] base_iban remove unneeded dependency on account bzr revid: al@openerp.com-20110828015802-f5gd4gaekh1k33ey --- addons/base_iban/__openerp__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/base_iban/__openerp__.py b/addons/base_iban/__openerp__.py index 4cbef04a204..370ca6c93f2 100644 --- a/addons/base_iban/__openerp__.py +++ b/addons/base_iban/__openerp__.py @@ -31,7 +31,7 @@ The ability to extract the correctly represented local accounts from IBAN accoun """, 'author': 'OpenERP SA', 'website': 'http://www.openerp.com', - 'depends': ['account'], + 'depends': ['base'], 'init_xml': ['base_iban_data.xml'], 'update_xml': ['base_iban_view.xml'], 'installable': True, From f1c98c8160ad1f3f0740e3c0a24e29d408fd2392 Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Sun, 28 Aug 2011 04:22:24 +0200 Subject: [PATCH 9/9] [FIX] project_issue removed unused fields bzr revid: al@openerp.com-20110828022224-q3x2ogkdozmjao3b --- addons/project_issue/project_issue.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py index ea974eea7d4..61a45f01753 100644 --- a/addons/project_issue/project_issue.py +++ b/addons/project_issue/project_issue.py @@ -210,9 +210,6 @@ class project_issue(crm.crm_case, osv.osv): 'categ_id': fields.many2one('crm.case.categ', 'Category', domain="[('object_id.model', '=', 'crm.project.bug')]"), 'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'), 'version_id': fields.many2one('project.issue.version', 'Version'), - 'partner_name': fields.char("Partner Name", size=64), - 'partner_mobile': fields.char('Mobile', size=32), - 'partner_phone': fields.char('Phone', size=32), 'type_id': fields.many2one ('project.task.type', 'Resolution', domain="[('project_ids', '=', project_id)]"), 'project_id':fields.many2one('project.project', 'Project'), 'duration': fields.float('Duration'),