From 01a3d66e9a994846f12d9ce24045c981268f167e Mon Sep 17 00:00:00 2001 From: "nel@tinyerp.com" <> Date: Tue, 6 Jul 2010 11:34:59 +0200 Subject: [PATCH 01/22] [IMP] expenses bzr revid: nel@tinyerp.com-20100706093459-3rr6ebih4frj1ckc --- addons/hr_expense/report/hr_expense_report.py | 2 ++ .../report/hr_expense_report_view.xml | 22 +++++++------------ 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/addons/hr_expense/report/hr_expense_report.py b/addons/hr_expense/report/hr_expense_report.py index e2ec064dc4f..a885dfc55a0 100644 --- a/addons/hr_expense/report/hr_expense_report.py +++ b/addons/hr_expense/report/hr_expense_report.py @@ -38,6 +38,7 @@ class hr_expense_report(osv.osv): 'product_id':fields.many2one('product.product', 'Product', readonly=True), 'journal_id': fields.many2one('account.journal', 'Force Journal', readonly=True), 'product_qty':fields.float('Qty', readonly=True), + 'invoiced':fields.integer('# of Invoiced Lines', readonly=True), 'employee_id': fields.many2one('hr.employee', "Employee's Name", readonly=True), 'date_confirm': fields.date('Confirmation Date', readonly=True), 'date_valid': fields.date('Validation Date', readonly=True), @@ -77,6 +78,7 @@ class hr_expense_report(osv.osv): to_date(to_char(s.date_confirm, 'dd-MM-YYYY'),'dd-MM-YYYY') as date_confirm, to_date(to_char(s.date_valid, 'dd-MM-YYYY'),'dd-MM-YYYY') as date_valid, s.invoice_id, + count(s.invoice_id) as invoiced, s.user_valid as user_id, s.department_id, to_char(date_trunc('day',s.create_date), 'YYYY') as year, diff --git a/addons/hr_expense/report/hr_expense_report_view.xml b/addons/hr_expense/report/hr_expense_report_view.xml index 75ee934709b..0152a09c240 100644 --- a/addons/hr_expense/report/hr_expense_report_view.xml +++ b/addons/hr_expense/report/hr_expense_report_view.xml @@ -17,17 +17,17 @@ - + - - + + @@ -62,15 +62,14 @@ - - + - - - + + @@ -80,7 +79,6 @@ - @@ -96,10 +94,6 @@ - - - - From 5f5019db0b036ff3321df3805a74568e6a845344 Mon Sep 17 00:00:00 2001 From: "nel@tinyerp.com" <> Date: Wed, 7 Jul 2010 10:37:16 +0200 Subject: [PATCH 02/22] [IMP] holidays bzr revid: nel@tinyerp.com-20100707083716-murdgyn8a47yebu4 --- .../report/hr_holidays_report_view.xml | 41 ++++++++----------- 1 file changed, 18 insertions(+), 23 deletions(-) diff --git a/addons/hr_holidays/report/hr_holidays_report_view.xml b/addons/hr_holidays/report/hr_holidays_report_view.xml index a367506bce5..0d515bcacff 100644 --- a/addons/hr_holidays/report/hr_holidays_report_view.xml +++ b/addons/hr_holidays/report/hr_holidays_report_view.xml @@ -45,11 +45,6 @@ - - - - - + - - - + + + - + + + + + - + @@ -82,18 +82,13 @@ - + + - - - + - - + - - @@ -104,7 +99,7 @@ hr.holidays.report form tree,graph - {"search_default_user_id": uid, 'search_default_month':1, 'search_default_Employee':1, 'group_by':[]} + {"search_default_user_id": uid, 'search_default_month':1, 'search_default_department':1, 'group_by':[], 'group_by_no_leaf':1} From 2572e7d06258324b4821c9e2c8ce190dfa6e48e8 Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Wed, 7 Jul 2010 14:29:17 +0530 Subject: [PATCH 03/22] account view and deprecated fields fixes bzr revid: al@openerp.com-20100707085917-jouhgqj16j60alhh --- addons/account/account.py | 5 +- addons/account/account_view.xml | 90 ++++++++++++++++----------------- 2 files changed, 46 insertions(+), 49 deletions(-) diff --git a/addons/account/account.py b/addons/account/account.py index a461cbe5bb7..4629a306a0b 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -136,7 +136,6 @@ class account_account_type(osv.osv): 'name': fields.char('Acc. Type Name', size=64, required=True, translate=True), 'code': fields.char('Code', size=32, required=True), 'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of account types."), - 'partner_account': fields.boolean('Partner account'), 'close_method': fields.selection([('none', 'None'), ('balance', 'Balance'), ('detail', 'Detail'), ('unreconciled', 'Unreconciled')], 'Deferral Method', required=True), 'sign': fields.selection([(-1, 'Negative'), (1, 'Positive')], 'Sign on Reports', required=True, help='Allows you to change the sign of the balance amount displayed in the reports, so that you can see positive figures instead of negative ones in expenses accounts.'), 'report_type':fields.selection([ @@ -366,11 +365,11 @@ class account_account(osv.osv): 'currency_id': fields.many2one('res.currency', 'Secondary Currency', help="Forces all moves for this account to have this secondary currency."), 'code': fields.char('Code', size=64, required=True), 'type': fields.selection([ + ('view', 'View'), + ('other', 'Regular'), ('receivable', 'Receivable'), ('payable', 'Payable'), - ('view', 'View'), ('consolidation', 'Consolidation'), - ('other', 'Others'), ('closed', 'Closed'), ], 'Internal Type', required=True, help="This type is used to differentiate types with "\ "special effects in Open ERP: view can not have entries, consolidation are accounts that "\ diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml index 1af3f1bef1e..c52302cb823 100644 --- a/addons/account/account_view.xml +++ b/addons/account/account_view.xml @@ -3,8 +3,8 @@ + Fiscal Year + --> account.fiscalyear.form @@ -12,7 +12,7 @@ form
- + @@ -32,7 +32,7 @@ - +