From df723755044ac4af0ee4e989e99ecc166cacac6e Mon Sep 17 00:00:00 2001 From: Naresh Choksy Date: Tue, 7 Oct 2008 17:18:28 +0530 Subject: [PATCH 1/2] changed tag to bzr revid: nch@tinyerp.com-20081007114828-92lmkwru2s5dc1yq --- addons/base_contact/base_contact_demo.xml | 4 ++-- addons/base_module_record/base_module_record.py | 2 +- addons/document/custom_report.xml | 4 ++-- addons/document/custom_view.xml | 4 ++-- addons/document/document_data.xml | 4 ++-- addons/document/document_demo.xml | 4 ++-- addons/document/document_view.xml | 4 ++-- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/addons/base_contact/base_contact_demo.xml b/addons/base_contact/base_contact_demo.xml index 6efa01a7267..00104813896 100644 --- a/addons/base_contact/base_contact_demo.xml +++ b/addons/base_contact/base_contact_demo.xml @@ -1,5 +1,5 @@ - + @@ -323,4 +323,4 @@ 1 - + diff --git a/addons/base_module_record/base_module_record.py b/addons/base_module_record/base_module_record.py index 1a623b2dbb5..17ff37645f6 100644 --- a/addons/base_module_record/base_module_record.py +++ b/addons/base_module_record/base_module_record.py @@ -172,7 +172,7 @@ class base_module_record(osv.osv): # Create the minidom document self.ids = {} doc = minidom.Document() - terp = doc.createElement("terp") + terp = doc.createElement("openerp") doc.appendChild(terp) for rec in self.recording_data: if rec[0]=='workflow': diff --git a/addons/document/custom_report.xml b/addons/document/custom_report.xml index 02cf10e6a4a..ebfe70e4c50 100644 --- a/addons/document/custom_report.xml +++ b/addons/document/custom_report.xml @@ -1,6 +1,6 @@ - + - + diff --git a/addons/document/custom_view.xml b/addons/document/custom_view.xml index 4909336c498..61d95f9aa27 100644 --- a/addons/document/custom_view.xml +++ b/addons/document/custom_view.xml @@ -1,4 +1,4 @@ - + grcompta @@ -8,5 +8,5 @@ - + diff --git a/addons/document/document_data.xml b/addons/document/document_data.xml index 98793851804..9953d07dd92 100644 --- a/addons/document/document_data.xml +++ b/addons/document/document_data.xml @@ -1,6 +1,6 @@ - + - + diff --git a/addons/document/document_demo.xml b/addons/document/document_demo.xml index 3de248ffa28..94c52923556 100644 --- a/addons/document/document_demo.xml +++ b/addons/document/document_demo.xml @@ -1,5 +1,5 @@ - + @@ -90,4 +90,4 @@ - + diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml index 5ae50b2f539..4e5a0b717ba 100644 --- a/addons/document/document_view.xml +++ b/addons/document/document_view.xml @@ -1,4 +1,4 @@ - + @@ -237,5 +237,5 @@ - + From 01a51159e40f3fc3ada2a60da50e5d28b0fda849 Mon Sep 17 00:00:00 2001 From: Naresh Choksy Date: Wed, 8 Oct 2008 15:08:21 +0530 Subject: [PATCH 2/2] Defined a graph view on: * Analytic Accounts * General Accounts With: X: Account y: Computed Balance bzr revid: nch@tinyerp.com-20081008093821-jtertt29ykc05ggt --- addons/account/account_view.xml | 14 ++++- addons/account/project/project_view.xml | 16 +++++- .../account_analytic_analysis_menu.xml | 55 +++++++++++-------- 3 files changed, 60 insertions(+), 25 deletions(-) diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml index 3f0ce0fde85..89c19a436d0 100644 --- a/addons/account/account_view.xml +++ b/addons/account/account_view.xml @@ -141,7 +141,7 @@ List of Accounts account.account form - tree,form + tree,form,graph @@ -166,6 +166,7 @@ Chart of Accounts account.account tree + form [('parent_id','=',False)] @@ -1629,6 +1630,17 @@ + + account.account.graph + account.account + graph + + + + + + + diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml index 45a4307a6c9..ccc8fb420e7 100644 --- a/addons/account/project/project_view.xml +++ b/addons/account/project/project_view.xml @@ -73,6 +73,7 @@ ir.actions.act_window account.analytic.account form + tree,graph @@ -84,6 +85,7 @@ account.analytic.account [('parent_id','=',False)] tree + form,graph New Analytic Account account.analytic.account form - form,tree + form,tree,graph @@ -356,5 +358,17 @@ + + analytic.accounts.graph + account.analytic.account + graph + + + + + + + + diff --git a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml index c57a0cdba70..ebe0d4638bb 100644 --- a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml +++ b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml @@ -1,18 +1,19 @@ - + - + My managed accounts account.analytic.account form + tree,graph [('user_id','=',uid)] - + - + Uninvoiced entries of my accounts account.analytic.line @@ -20,85 +21,93 @@ tree,form [('invoice_id','=',False),('to_invoice','!=',False),('account_id.user_id','=',uid)] - + - + My Open Managed Accounts account.analytic.account form + tree,graph [('user_id','=',uid),('state','=','open')] - + - + My Pending Managed Accounts account.analytic.account form + tree,graph [('user_id','=',uid),('state','=','pending')] - + - - + + Overpassed accounts account.analytic.account form + tree,graph [('date','<=',time.strftime('%Y-%m-%d')),('state','=','open')] - + - + All Analytic Accounts account.analytic.account form + tree,graph [] - + - + Draft Analytic Accounts account.analytic.account form + tree,graph [('state','=','draft')] - + - + Open Analytic Accounts account.analytic.account form + tree,graph [('state','=','open')] - + - + Pending Analytic Accounts account.analytic.account form + tree,graph [('state','=','pending')] - + - + Simplified View Analytic Accounts account.analytic.account form + tree,graph [] - + - +