From 576cd19e3bf314e669e5c9f02724e92d519ab557 Mon Sep 17 00:00:00 2001 From: "Jay (OpenERP)" Date: Mon, 11 Oct 2010 11:11:24 +0530 Subject: [PATCH 1/5] [FIX] Account : Typo fix lp bug: https://launchpad.net/bugs/657619 fixed bzr revid: jvo@tinyerp.com-20101011054124-5rh9fyid8dq7jq13 --- addons/account/project/report/analytic_journal.rml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/account/project/report/analytic_journal.rml b/addons/account/project/report/analytic_journal.rml index 7b55c6ad212..47775ea9253 100644 --- a/addons/account/project/report/analytic_journal.rml +++ b/addons/account/project/report/analytic_journal.rml @@ -280,7 +280,7 @@ [[ move_a.code ]] - [[ move_a.name ]] asgfas + [[ move_a.name ]] [[ move_a.account_id.code ]] - [[ move_a.account_id.name ]] From 10a1939f6903f86b78a948529cde740bf53892eb Mon Sep 17 00:00:00 2001 From: "Jay (OpenERP)" Date: Mon, 11 Oct 2010 11:15:00 +0530 Subject: [PATCH 2/5] [FIx] Hr_payroll_account : Typo fix lp bug: https://launchpad.net/bugs/657629 fixed bzr revid: jvo@tinyerp.com-20101011054500-r6aw3313kxubxkn1 --- addons/hr_payroll_account/__openerp__.py | 2 +- addons/hr_payroll_account/hr_payroll_account.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/hr_payroll_account/__openerp__.py b/addons/hr_payroll_account/__openerp__.py index 8cdfe0593e4..5dec5dc4fb8 100644 --- a/addons/hr_payroll_account/__openerp__.py +++ b/addons/hr_payroll_account/__openerp__.py @@ -24,7 +24,7 @@ 'version': '1.0', 'category': 'Generic Modules/Human Resources', 'description': """Generic Payroll system Integrated with Accountings - * Expanse Encoding + * Expense Encoding * Payment Encoding * Company Contribution Management """, diff --git a/addons/hr_payroll_account/hr_payroll_account.py b/addons/hr_payroll_account/hr_payroll_account.py index f5a6897bf1d..87b76895e1a 100644 --- a/addons/hr_payroll_account/hr_payroll_account.py +++ b/addons/hr_payroll_account/hr_payroll_account.py @@ -162,7 +162,7 @@ class hr_payslip(osv.osv): for line in slip.line_ids: if line.type == 'otherpay' and line.expanse_id.invoice_id: if not line.expanse_id.invoice_id.move_id: - raise osv.except_osv(_('Warning !'), _('Please Confirm all Expanse Invoice appear for Reimbursement')) + raise osv.except_osv(_('Warning !'), _('Please Confirm all Expense Invoice appear for Reimbursement')) invids = [line.expanse_id.invoice_id.id] amount = line.total acc_id = slip.bank_journal_id.default_credit_account_id and slip.bank_journal_id.default_credit_account_id.id @@ -487,7 +487,7 @@ class account_move_link_slip(osv.osv): _description = 'Account Move Link to Pay Slip' _columns = { 'name':fields.char('Name', size=256, required=True, readonly=False), - 'move_id':fields.many2one('account.move', 'Expanse Entries', required=False, readonly=True), + 'move_id':fields.many2one('account.move', 'Expense Entries', required=False, readonly=True), 'slip_id':fields.many2one('hr.payslip', 'Pay Slip', required=False), 'sequence': fields.integer('Sequence'), } From 2ce1c306d11b1c43a76afd85e0a6bcc95197f2a5 Mon Sep 17 00:00:00 2001 From: "AMP(Open ERP)" <> Date: Mon, 11 Oct 2010 11:48:14 +0530 Subject: [PATCH 3/5] [MOD] crm_meeting : change in calendar view and added shortcut for meeting. product : shortcut added bzr revid: vir@tinyerp.com-20101011061814-5hb940uka624jeph --- addons/crm/crm_meeting_menu.xml | 2 +- addons/crm/crm_meeting_view.xml | 2 +- addons/product/product_view.xml | 7 +++++++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/addons/crm/crm_meeting_menu.xml b/addons/crm/crm_meeting_menu.xml index 7726280a05f..bc4f9ba948c 100644 --- a/addons/crm/crm_meeting_menu.xml +++ b/addons/crm/crm_meeting_menu.xml @@ -92,7 +92,7 @@ sequence="1" /> - Calendar + Meetings ir.ui.menu diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml index aa8b6cc4820..978b6e1a889 100644 --- a/addons/crm/crm_meeting_view.xml +++ b/addons/crm/crm_meeting_view.xml @@ -268,7 +268,7 @@ calendar - + diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml index 8f2e5efe649..5872e325715 100644 --- a/addons/product/product_view.xml +++ b/addons/product/product_view.xml @@ -632,5 +632,12 @@ form + + Products + ir.ui.menu + + + + From cd5994c6a4bc0fe59a9e958dc4270f83411aa00e Mon Sep 17 00:00:00 2001 From: "DBR(Open ERP)" <> Date: Mon, 11 Oct 2010 11:58:44 +0530 Subject: [PATCH 4/5] [MOD] crm : partner icons are changed in view bzr revid: vir@tinyerp.com-20101011062844-x1k673b53oqjznvu --- addons/crm/crm_lead_view.xml | 2 +- addons/crm/crm_opportunity_view.xml | 2 +- addons/crm/crm_phonecall_view.xml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml index 3d996b990e7..722a17d2931 100644 --- a/addons/crm/crm_lead_view.xml +++ b/addons/crm/crm_lead_view.xml @@ -97,7 +97,7 @@