From e1255aab6f06788042cb279d427fa46d76203b12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Valyi?= Date: Wed, 30 Jun 2010 17:13:08 -0300 Subject: [PATCH 1/8] [IMP] mrp: by default MRP work-centers are supposed to be 'material' resources bzr revid: rvalyi@gmail.com-20100630201308-vf1uu5iyzq4qq6n4 --- addons/mrp/mrp.py | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py index 9ed07cb5f38..0e1a65b1a86 100644 --- a/addons/mrp/mrp.py +++ b/addons/mrp/mrp.py @@ -59,6 +59,7 @@ class mrp_workcenter(osv.osv): } _defaults = { 'capacity_per_cycle': lambda *a: 1.0, + 'resource_type': lambda *a: 'material', } mrp_workcenter() From 253615e63873115aea50ed855b4416afc5b471d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Valyi?= Date: Fri, 9 Jul 2010 13:40:44 -0300 Subject: [PATCH 2/8] [merge] bzr revid: rvalyi@gmail.com-20100709164044-ubzc4dw9xfeyz6ig --- addons/project_long_term/project_long_term_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml index 91347f0bbfe..6fb26c26fe6 100644 --- a/addons/project_long_term/project_long_term_view.xml +++ b/addons/project_long_term/project_long_term_view.xml @@ -54,7 +54,7 @@ project.resource.allocation gantt - + From a00bcef71cb5f50590f320e8ef4c2af3c608bec1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Valyi?= Date: Thu, 15 Jul 2010 15:14:19 -0300 Subject: [PATCH 3/8] [merge] bzr revid: rvalyi@gmail.com-20100715181419-1z3bsocywu7rmano --- addons/project_scrum/__openerp__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/project_scrum/__openerp__.py b/addons/project_scrum/__openerp__.py index c42908ff50a..92eb86f381f 100644 --- a/addons/project_scrum/__openerp__.py +++ b/addons/project_scrum/__openerp__.py @@ -62,6 +62,6 @@ 'demo_xml': ['project_scrum_demo.xml'], 'installable': True, 'active': False, - 'certificate': '0084121063261', + 'certificate': '', } # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: From 39f886f35cc2ab26dad91acfd01a56d0cf7bc70d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Valyi?= Date: Fri, 23 Jul 2010 11:53:24 -0300 Subject: [PATCH 4/8] [merge] restored original project_long_term/project_long_term_view.xml bzr revid: rvalyi@gmail.com-20100723145324-8nmnmdlb15thu6je --- .../project_long_term_view.xml | 33 ++----------------- 1 file changed, 3 insertions(+), 30 deletions(-) diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml index c31a3f86a55..b338a5bd37a 100644 --- a/addons/project_long_term/project_long_term_view.xml +++ b/addons/project_long_term/project_long_term_view.xml @@ -45,36 +45,9 @@ - - - - - project.resource.allocation.calendar - project.resource.allocation - calendar - - - - - - - - - - project.resource.allocation.gantt - project.resource.allocation - gantt - - - - - - - - project.resource.allocation.search @@ -99,8 +72,8 @@ Resource Allocations project.resource.allocation form - tree,form,calendar,gantt - {} + gantt,tree,form + {} @@ -359,4 +332,4 @@ - + \ No newline at end of file From f5707955cdf4beee85a0b02e96e56a4746b9504e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Valyi?= Date: Fri, 23 Jul 2010 13:08:54 -0300 Subject: [PATCH 5/8] [FIX] project_long_term: deleting a phase should delete its affected resources! bzr revid: rvalyi@gmail.com-20100723160854-jdjopucvsl4x2af2 --- addons/project_long_term/project_long_term.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py index 0ecdcc69a2e..56e2ff9b3d8 100644 --- a/addons/project_long_term/project_long_term.py +++ b/addons/project_long_term/project_long_term.py @@ -245,7 +245,7 @@ class project_resource_allocation(osv.osv): _description = 'Project Resource Allocation' _rec_name = 'resource_id' _columns = { - 'resource_id': fields.many2one('resource.resource', 'Resource', required=True), + 'resource_id': fields.many2one('resource.resource', 'Resource', ondelete='cascade', required=True), 'phase_id': fields.many2one('project.phase', 'Project Phase', required=True), 'phase_id_date_start': fields.related('phase_id', 'date_start', type='date', string='Starting Date of the phase'), 'phase_id_date_end': fields.related('phase_id', 'date_end', type='date', string='Ending Date of the phase'), From 934d8adb5af78dbe5a4e93bbbd33ede30d822789 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Valyi?= Date: Sun, 25 Jul 2010 12:55:10 -0300 Subject: [PATCH 6/8] [FIX] account chart creation fixed what seems untested code bzr revid: rvalyi@gmail.com-20100725155510-jpbn83g1ap0ef1wd --- addons/account/installer.py | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/account/installer.py b/addons/account/installer.py index 4dd01f9ec8b..16fe116b481 100644 --- a/addons/account/installer.py +++ b/addons/account/installer.py @@ -298,6 +298,7 @@ class account_installer(osv.osv_memory): # Creating Journals Sales and Purchase vals_journal={} + data_pool = self.pool.get('ir.model.data') data_id = data_pool.search(cr, uid, [('model','=','account.journal.view'), ('name','=','account_sp_journal_view')]) data = data_pool.browse(cr, uid, data_id[0]) view_id = data.res_id From 717c7c5b11fb0a4bd6821abc8f774bf6f4d5ceb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Valyi?= Date: Sun, 25 Jul 2010 12:55:48 -0300 Subject: [PATCH 7/8] [FIX] project_long_term: it's phase_id that should be ondelete='cascade'; fixed write if only one id provided as it is usually permitted bzr revid: rvalyi@gmail.com-20100725155548-fss28s73p0gvxjrj --- addons/project_long_term/project_long_term.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py index 56e2ff9b3d8..fc1fea91311 100644 --- a/addons/project_long_term/project_long_term.py +++ b/addons/project_long_term/project_long_term.py @@ -190,6 +190,8 @@ class project_phase(osv.osv): return super(project_phase, self).write(cr, uid, ids, vals, context=context) # Consider calendar and efficiency if the phase is performed by a resource # otherwise consider the project's working calendar + if type(ids) == int: + ids = [ids] phase = self.browse(cr, uid, ids[0], context=context) calendar_id = phase.project_id.resource_calendar_id and phase.project_id.resource_calendar_id.id or False resource_id = resource_obj.search(cr, uid, [('user_id', '=', phase.responsible_id.id)],context=context) @@ -245,8 +247,8 @@ class project_resource_allocation(osv.osv): _description = 'Project Resource Allocation' _rec_name = 'resource_id' _columns = { - 'resource_id': fields.many2one('resource.resource', 'Resource', ondelete='cascade', required=True), - 'phase_id': fields.many2one('project.phase', 'Project Phase', required=True), + 'resource_id': fields.many2one('resource.resource', 'Resource', required=True), + 'phase_id': fields.many2one('project.phase', 'Project Phase', ondelete='cascade', required=True), 'phase_id_date_start': fields.related('phase_id', 'date_start', type='date', string='Starting Date of the phase'), 'phase_id_date_end': fields.related('phase_id', 'date_end', type='date', string='Ending Date of the phase'), 'useability': fields.float('Usability', help="Usability of this resource for this project phase in percentage (=50%)"), From 3bc25fb07ef8aa959d2c7df0b9515e6a3147c0c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Valyi?= Date: Sun, 25 Jul 2010 13:58:26 -0300 Subject: [PATCH 8/8] [REF] clean up before merge (clean double work diffs) bzr revid: rvalyi@gmail.com-20100725165826-etg68lktjnt9ih5l --- addons/account/invoice.py | 1 - addons/project_long_term/project_long_term.py | 2 -- addons/project_long_term/project_long_term_view.xml | 2 +- addons/project_scrum/__openerp__.py | 1 - 4 files changed, 1 insertion(+), 5 deletions(-) diff --git a/addons/account/invoice.py b/addons/account/invoice.py index 1c452b54258..f5ebc5b3d3d 100644 --- a/addons/account/invoice.py +++ b/addons/account/invoice.py @@ -1261,7 +1261,6 @@ class account_invoice_line(osv.osv): return {'price_unit': price_unit,'invoice_line_tax_id': tax_id} def product_id_change(self, cr, uid, ids, product, uom, qty=0, name='', type='out_invoice', partner_id=False, fposition_id=False, price_unit=False, address_invoice_id=False, currency_id=False, context=None): - print "2222*", uid, ids, product, uom, qty, name, type, partner_id, fposition_id, price_unit, address_invoice_id, currency_id, context if context is None: context = {} company_id = context.get('company_id',False) diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py index fc1fea91311..9371232745b 100644 --- a/addons/project_long_term/project_long_term.py +++ b/addons/project_long_term/project_long_term.py @@ -252,8 +252,6 @@ class project_resource_allocation(osv.osv): 'phase_id_date_start': fields.related('phase_id', 'date_start', type='date', string='Starting Date of the phase'), 'phase_id_date_end': fields.related('phase_id', 'date_end', type='date', string='Ending Date of the phase'), 'useability': fields.float('Usability', help="Usability of this resource for this project phase in percentage (=50%)"), - 'date_start': fields.related('phase_id', 'date_start', type='datetime', string='Start Date'), - 'date_end': fields.related('phase_id', 'date_end', type='datetime', string='End Date'), } _defaults = { 'useability': 100, diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml index b338a5bd37a..7d51f79530a 100644 --- a/addons/project_long_term/project_long_term_view.xml +++ b/addons/project_long_term/project_long_term_view.xml @@ -332,4 +332,4 @@ - \ No newline at end of file + diff --git a/addons/project_scrum/__openerp__.py b/addons/project_scrum/__openerp__.py index 92eb86f381f..9fa418d6ca3 100644 --- a/addons/project_scrum/__openerp__.py +++ b/addons/project_scrum/__openerp__.py @@ -62,6 +62,5 @@ 'demo_xml': ['project_scrum_demo.xml'], 'installable': True, 'active': False, - 'certificate': '', } # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: