Removed dependencies to MRP
bzr revid: fp@tinyerp.com-b87fe33f0a24a8266f3b2f651b805a3e032db6ae
This commit is contained in:
parent
63c235f775
commit
f96a40fa55
|
@ -1,5 +1,3 @@
|
|||
import project
|
||||
import report
|
||||
import wizard
|
||||
|
||||
import mrp
|
||||
|
|
|
@ -13,7 +13,6 @@
|
|||
"project_wizard.xml",
|
||||
"project_view.xml",
|
||||
"project_report.xml",
|
||||
"project_workflow.xml",
|
||||
],
|
||||
"active": False,
|
||||
"installable": True
|
||||
|
|
|
@ -1,50 +0,0 @@
|
|||
##############################################################################
|
||||
#
|
||||
# Copyright (c) 2005 TINY SPRL. (http://tiny.be) All Rights Reserved.
|
||||
#
|
||||
# $Id: project.py 1011 2005-07-26 08:11:45Z nicoe $
|
||||
#
|
||||
# WARNING: This program as such is intended to be used by professional
|
||||
# programmers who take the whole responsability of assessing all potential
|
||||
# consequences resulting from its eventual inadequacies and bugs
|
||||
# End users who are looking for a ready-to-use solution with commercial
|
||||
# garantees and support are strongly adviced to contract a Free Software
|
||||
# Service Company
|
||||
#
|
||||
# This program is Free Software; you can redistribute it and/or
|
||||
# modify it under the terms of the GNU General Public License
|
||||
# as published by the Free Software Foundation; either version 2
|
||||
# of the License, or (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program; if not, write to the Free Software
|
||||
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
#
|
||||
##############################################################################
|
||||
|
||||
from osv import fields, osv, orm
|
||||
|
||||
class mrp_procurement(osv.osv):
|
||||
_name = "mrp.procurement"
|
||||
_inherit = "mrp.procurement"
|
||||
|
||||
def action_produce_assign_service(self, cr, uid, ids, context={}):
|
||||
for procurement in self.browse(cr, uid, ids):
|
||||
self.write(cr, uid, [procurement.id], {'state':'running'})
|
||||
task_id = self.pool.get('project.task').create(cr, uid, {
|
||||
'name': procurement.name,
|
||||
'date_deadline': procurement.date_planned,
|
||||
'state': 'open',
|
||||
'planned_hours': procurement.product_qty,
|
||||
'user_id': procurement.product_id.product_manager.id,
|
||||
'notes': procurement.origin,
|
||||
'procurement_id': procurement.id
|
||||
})
|
||||
return task_id
|
||||
mrp_procurement()
|
||||
|
|
@ -227,7 +227,6 @@ class task(osv.osv):
|
|||
'user_id': fields.many2one('res.users', 'Assigned to'),
|
||||
'partner_id': fields.many2one('res.partner', 'Customer'),
|
||||
'work_ids': fields.one2many('project.task.work', 'task_id', 'Work done'),
|
||||
'procurement_id': fields.many2one('mrp.procurement', 'Procurement', ondelete='set null')
|
||||
}
|
||||
_defaults = {
|
||||
'user_id': lambda obj,cr,uid,context: uid,
|
||||
|
@ -258,10 +257,6 @@ class task(osv.osv):
|
|||
self.write(cr, uid, [task.id], {'state': 'done', 'date_close':time.strftime('%Y-%m-%d %H:%M:%S'), 'progress': 100})
|
||||
if task.parent_id and task.parent_id.state in ('pending','draft'):
|
||||
self.do_reopen(cr, uid, [task.parent_id.id])
|
||||
|
||||
if task.procurement_id:
|
||||
wf_service = netsvc.LocalService("workflow")
|
||||
wf_service.trg_validate(uid, 'mrp.procurement', task.procurement_id.id, 'subflow.done', cr)
|
||||
return True
|
||||
|
||||
def do_reopen(self, cr, uid, ids, *args):
|
||||
|
@ -299,9 +294,6 @@ class task(osv.osv):
|
|||
'ref_doc2': 'project.project,%d' % project.id,
|
||||
})
|
||||
self.write(cr, uid, [task.id], {'state': 'cancelled'})
|
||||
if task.procurement_id:
|
||||
wf_service = netsvc.LocalService("workflow")
|
||||
wf_service.trg_validate(uid, 'mrp.procurement', task.procurement_id.id, 'subflow.cancel', cr)
|
||||
return True
|
||||
|
||||
def do_open(self, cr, uid, ids, *args):
|
||||
|
|
|
@ -1,11 +0,0 @@
|
|||
<?xml version="1.0"?>
|
||||
<terp>
|
||||
<data>
|
||||
<record model="workflow.transition" id="mrp.trans_produce_service_make_done">
|
||||
<field name="act_from" ref="mrp.act_produce_service"/>
|
||||
<field name="act_to" ref="mrp.act_make_done"/>
|
||||
<field name="signal">subflow.done</field>
|
||||
</record>
|
||||
</data>
|
||||
</terp>
|
||||
|
Loading…
Reference in New Issue