From 918ad3ebb8363d5bd069622690c69e0feba80a1a Mon Sep 17 00:00:00 2001 From: ssi Date: Tue, 2 Nov 2010 10:53:15 +0530 Subject: [PATCH 1/5] [FIX] caldav bug lp bug: https://launchpad.net/bugs/664773 fixed bzr revid: ssi@tinyerp.com-20101102052315-jyygrye5ulkleclf --- addons/caldav/caldav_view.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/addons/caldav/caldav_view.xml b/addons/caldav/caldav_view.xml index 6238ee1441d..38d86d0c55d 100644 --- a/addons/caldav/caldav_view.xml +++ b/addons/caldav/caldav_view.xml @@ -125,6 +125,10 @@ + + + + From a33e32e2877f5c2cdc2f121a060522e47fa8a09c Mon Sep 17 00:00:00 2001 From: ssi Date: Tue, 2 Nov 2010 12:29:32 +0530 Subject: [PATCH 2/5] [FIX] caldav: removed char bzr revid: ssi@tinyerp.com-20101102065932-1xi3n0haqw12ei7b --- addons/caldav/caldav_view.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/caldav/caldav_view.xml b/addons/caldav/caldav_view.xml index 38d86d0c55d..6bf9f31eb67 100644 --- a/addons/caldav/caldav_view.xml +++ b/addons/caldav/caldav_view.xml @@ -125,10 +125,10 @@ - - - - + + + + From e8ec3efe69dca9f3ce200e5b36627db95b96b40a Mon Sep 17 00:00:00 2001 From: "Vir (Open ERP)" Date: Tue, 2 Nov 2010 12:34:55 +0530 Subject: [PATCH 3/5] [ADD] account_* : help added for menus bzr revid: vir@tinyerp.com-20101102070455-obn9kosyhajipnur --- addons/account/account_end_fy.xml | 2 +- addons/account/account_view.xml | 1 + addons/account/wizard/account_fiscalyear_close_state.xml | 1 + addons/account/wizard/account_validate_move_view.xml | 1 + addons/account_budget/account_budget_view.xml | 1 + addons/account_payment/account_payment_view.xml | 1 + addons/sale_margin/report/report_margin_view.xml | 1 + 7 files changed, 7 insertions(+), 1 deletion(-) diff --git a/addons/account/account_end_fy.xml b/addons/account/account_end_fy.xml index d0c966898d6..5f4ed44adfe 100644 --- a/addons/account/account_end_fy.xml +++ b/addons/account/account_end_fy.xml @@ -8,7 +8,7 @@ form {'search_default_draft': 1} - After closing a period, you will no longer be able to post entries to the period once it has been closed. + A period is a fiscal period of time during which accounting entries should be recorded for accounting related activities. Monthly period is the norm but depending on your countries or company needs, you could also have quarterly periods. Closing a period will make it impossible to record new accounting entries, all new entries should then be made on the following open period. Close a period when you do not want to record new entries and want to lock this period for tax related calculation. form tree,form + A recurring entry is a payment related entry that occurs on a recurrent basis from a specific date corresponding to the signature of a contract or an agreement with a customer or a supplier. With Define Recurring Entries, you can create them in the system in order to automate their entries in the system. tree,form new + If no additional entries should be recorded on a fiscal year, you can close it from here. It will close all opened periods in this year that will make impossible any new entry record. Close a fiscal year when you need to finalize your end of year results definitive. {'record_id' : active_id} new + This wizard will validate all journal entries of a particular journal and period. Once journal entries are validated, you can not update them anymore. diff --git a/addons/account_budget/account_budget_view.xml b/addons/account_budget/account_budget_view.xml index 414c4cbfde1..3915463d8a2 100644 --- a/addons/account_budget/account_budget_view.xml +++ b/addons/account_budget/account_budget_view.xml @@ -192,6 +192,7 @@ tree,form + A budget is a forecast of your company's income and expenses expected for a period in the future. With a budget, a company is able to carefully look at how much money they are taking in during a given period, and figure out the best way to divide it among various categories. By keeping track of where your money goes, you may be less likely to overspend, and more likely to meet your financial goals. Forecast a budget by detailing the expected revenue per analytic account and monitor its evolution based on the actuals realised during that period. form tree,form + A payment order is a payment request that your company does in order to pay a supplier invoice or a customer credit note. Here you can register all payment orders that should be done, keep track of all payment orders and mention the invoice reference and the partner the payment should be done for. diff --git a/addons/sale_margin/report/report_margin_view.xml b/addons/sale_margin/report/report_margin_view.xml index c25f6d91ba2..fdc624b36ae 100644 --- a/addons/sale_margin/report/report_margin_view.xml +++ b/addons/sale_margin/report/report_margin_view.xml @@ -88,6 +88,7 @@ tree,graph {"search_default_At Date":1,'group_by_no_leaf':1,'group_by':[]} + This report gives you an overview of all the invoices generated by the system. You can sort and group your results by specific selection criteria to quickly find what you are looking for. From 9fd5f677fdf71bf8b77e735ec75c2e6193ab5179 Mon Sep 17 00:00:00 2001 From: "sbh (Open ERP)" Date: Tue, 2 Nov 2010 15:32:27 +0530 Subject: [PATCH 4/5] [Fix] project_issue: set view mode bzr revid: sbh@tinyerp.com-20101102100227-q36ne3sbrhrr3rzf --- addons/project_issue/board_project_issue_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/project_issue/board_project_issue_view.xml b/addons/project_issue/board_project_issue_view.xml index 2351869e003..b236d0458ec 100644 --- a/addons/project_issue/board_project_issue_view.xml +++ b/addons/project_issue/board_project_issue_view.xml @@ -113,7 +113,7 @@ My Open Project issues project.issue.report form - tree,form + graph,tree,form, [('state','=','open'),'|',('assigned_to','=',uid),('user_id','=',uid)] From 7ce8233a0b3fc1f3762b55fad5163c93ed7ed627 Mon Sep 17 00:00:00 2001 From: "sbh (Open ERP)" Date: Tue, 2 Nov 2010 17:02:31 +0530 Subject: [PATCH 5/5] [Fix] crm: Fix the id problem of meeting bzr revid: sbh@tinyerp.com-20101102113231-oqax0zbxpj3tusg8 --- addons/crm/crm_meeting.py | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/crm/crm_meeting.py b/addons/crm/crm_meeting.py index 4327052c36b..fc4d1235f29 100644 --- a/addons/crm/crm_meeting.py +++ b/addons/crm/crm_meeting.py @@ -133,6 +133,7 @@ class crm_meeting(crm_case, osv.osv): res = super(crm_meeting, self).case_open(cr, uid, ids, args) for (id, name) in self.name_get(cr, uid, ids): message = _("The meeting '%s' has been confirmed.") % name + id=base_calendar.base_calendar_id2real_id(id) self.log(cr, uid, id, message) return res