From c219db4404b121b15fa17c74f59586aedad0bcca Mon Sep 17 00:00:00 2001 From: "mra (Open ERP)" Date: Mon, 8 Mar 2010 10:44:12 +0530 Subject: [PATCH 01/11] [IMP] hr_contract: change the field name working hours per day to working hours because it can be expressed in hours/week on contract object bzr revid: mra@tinyerp.com-20100308051412-horl6e8viy2haqyo --- addons/hr_contract/hr_contract.py | 22 +++++++++++----------- addons/hr_contract/hr_contract_view.xml | 14 +++++++------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/addons/hr_contract/hr_contract.py b/addons/hr_contract/hr_contract.py index 4d701341a72..b90f9dd1a89 100644 --- a/addons/hr_contract/hr_contract.py +++ b/addons/hr_contract/hr_contract.py @@ -80,20 +80,20 @@ class hr_contract(osv.osv): _name = 'hr.contract' _description = 'Contract' _columns = { - 'name' : fields.char('Contract Reference', size=30, required=True), - 'employee_id' : fields.many2one('hr.employee', "Employee", required=True), - 'department_id' : fields.related('employee_id','department_id', string="Department", readonly=True), - 'type_id' : fields.many2one('hr.contract.type', "Contract Type"), - 'job_id' : fields.many2one('hr.job', 'Job Title'), - 'date_start' : fields.date('Start Date', required=True), - 'date_end' : fields.date('End Date'), - 'working_hours_per_day_id' : fields.many2one('resource.calendar','Working hours per day'), - 'wage_type_id' : fields.many2one('hr.contract.wage.type', 'Wage Type', required=True), - 'wage' : fields.float('Wage', digits=(16,2), required=True), + 'name': fields.char('Contract Reference', size=30, required=True), + 'employee_id': fields.many2one('hr.employee', "Employee", required=True), + 'department_id': fields.related('employee_id','department_id', string="Department", readonly=True), + 'type_id': fields.many2one('hr.contract.type', "Contract Type"), + 'job_id': fields.many2one('hr.job', 'Job Title'), + 'date_start': fields.date('Start Date', required=True), + 'date_end': fields.date('End Date'), + 'working_hours': fields.many2one('resource.calendar','Working hours'), + 'wage_type_id': fields.many2one('hr.contract.wage.type', 'Wage Type', required=True), + 'wage': fields.float('Wage', digits=(16,2), required=True), 'advantages': fields.text('Advantages'), 'advantages_net': fields.float('Net Advantages Value', digits=(16,2)), 'advantages_gross': fields.float('Gross Advantages Value', digits=(16,2)), - 'notes' : fields.text('Notes'), + 'notes': fields.text('Notes'), } _defaults = { 'date_start' : lambda *a : time.strftime("%Y-%m-%d"), diff --git a/addons/hr_contract/hr_contract_view.xml b/addons/hr_contract/hr_contract_view.xml index 13e61c21ac4..e198cc35de5 100644 --- a/addons/hr_contract/hr_contract_view.xml +++ b/addons/hr_contract/hr_contract_view.xml @@ -57,9 +57,9 @@ hr.contract.wage.type.period form - @@ -76,7 +76,7 @@ - + @@ -95,7 +95,7 @@ - + @@ -165,7 +165,7 @@ - + @@ -204,7 +204,7 @@ - + From a9ed0573041ae419c2a3a586ebfc9d201391ac3a Mon Sep 17 00:00:00 2001 From: "mra (Open ERP)" Date: Mon, 8 Mar 2010 12:47:31 +0530 Subject: [PATCH 02/11] [IMP] Project: remove mistaken tooltip sentence for delay in project task bzr revid: mra@tinyerp.com-20100308071731-0bhwe5ehm6paps7w --- addons/project/project.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/project/project.py b/addons/project/project.py index 7a412bfecfe..e9c11cc605c 100644 --- a/addons/project/project.py +++ b/addons/project/project.py @@ -299,7 +299,7 @@ class task(osv.osv): 'remaining_hours': fields.float('Remaining Hours', digits=(16,4), help="Total remaining time, can be re-estimated periodically by the assignee of the task."), 'total_hours': fields.function(_hours_get, method=True, string='Total Hours', multi='hours', store=True, help="Computed as: Time Spent + Remaining Time."), 'progress': fields.function(_hours_get, method=True, string='Progress (%)', multi='hours', store=True, help="Computed as: Time Spent / Total Time."), - 'delay_hours': fields.function(_hours_get, method=True, string='Delay Hours', multi='hours', store=True, help="Computed as: Total Time - Estimated Time. It gives the difference of the time estimated by the project manager and the real time to close the task."), + 'delay_hours': fields.function(_hours_get, method=True, string='Delay Hours', multi='hours', store=True, help="Computed as difference of the time estimated by the project manager and the real time to close the task."), 'user_id': fields.many2one('res.users', 'Assigned to'), 'delegated_user_id': fields.related('child_ids','user_id',type='many2one', relation='res.users', string='Delegated To'), From db3ab3efe7f77681202ef69d2b28e0bc61f452f5 Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Mon, 8 Mar 2010 09:56:24 +0100 Subject: [PATCH 03/11] merge bzr revid: fp@tinyerp.com-20100308085624-jgag5j09iy6tf6ia --- addons/account/test/price_accuracy00.yaml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/addons/account/test/price_accuracy00.yaml b/addons/account/test/price_accuracy00.yaml index f33d3af499b..a825700e4b7 100644 --- a/addons/account/test/price_accuracy00.yaml +++ b/addons/account/test/price_accuracy00.yaml @@ -1,6 +1,5 @@ -- - Tax Scenario - +- | + Tax Scenario: In order to check that the accounting entries and tax engine works efficiently with all kind of price accuracies we run this test scenario. - @@ -55,7 +54,7 @@ Then, I change the precision of numbers to 3 digits. - !record {model: decimal.precision, id: product.decimal_account}: - digits: 2 + digits: 3 - And I create another invoice with the same content. - From 3b04171221de08948f82c977b63c457ea1539dd1 Mon Sep 17 00:00:00 2001 From: "mra (Open ERP)" Date: Mon, 8 Mar 2010 15:23:38 +0530 Subject: [PATCH 04/11] [IMP] project_issue: improve view, define new search and tree view for feature requests bzr revid: mra@tinyerp.com-20100308095338-heega2vunl0tedt5 --- addons/project_issue/project_feature_menu.xml | 16 +-- addons/project_issue/project_issue_view.xml | 116 ++++++++++++++---- 2 files changed, 103 insertions(+), 29 deletions(-) diff --git a/addons/project_issue/project_feature_menu.xml b/addons/project_issue/project_feature_menu.xml index 933a3a6112e..caf533efb7d 100644 --- a/addons/project_issue/project_feature_menu.xml +++ b/addons/project_issue/project_feature_menu.xml @@ -1,23 +1,23 @@ - - ######################## Future Request (menu) ########################### - + + ######################## Feature Request (menu) ########################### + - Future Requests + Feature Requests project.issue form tree,calendar - + - + tree - + @@ -33,6 +33,6 @@ - + diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml index 6d53c4f7036..305db272f4c 100644 --- a/addons/project_issue/project_issue_view.xml +++ b/addons/project_issue/project_issue_view.xml @@ -11,23 +11,23 @@ Issue Categories crm.case.categ form - + [('object_id.model', '=', 'project.issue')] - {'object_id':'project.issue'} + {'object_id':'project.issue'} - # ------------------------------------------------------ + # ------------------------------------------------------ # Stage - # ------------------------------------------------------ + # ------------------------------------------------------ Issue Stages crm.case.stage form [('object_id.model', '=', 'project.issue')] - {'object_id':'project.issue'} + {'object_id':'project.issue'} - + Project Issue Tracker Form project.issue @@ -35,8 +35,8 @@
- - + + @@ -45,7 +45,7 @@ icon="gtk-index" type="action" attrs="{'invisible':[('task_id','!=',False)]}" /> - + - + - + - + - Proejct Issue Tracker Tree + Project Issue Tracker Tree project.issue tree @@ -155,7 +155,7 @@ - +