odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

merge 

bzr revid: mra@tinyerp.com-20080910100204-q1z9u6s5mzbz92ea
This commit is contained in:
Mustufa Rangwala 2008-09-10 15:32:04 +05:30
parent 704a0a5c27 c526b4c8ae
commit b5ca339056
6 changed files with 55 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
addons/mrp/mrp.py
View File

@ -993,6 +993,7 @@ class stock_warehouse_orderpoint(osv.osv):
'active': fields.boolean('Active'),
'logic': fields.selection([('max','Order to Max'),('price','Best price (not yet active!)')], 'Reordering Mode', required=True),
'warehouse_id': fields.many2one('stock.warehouse', 'Warehouse', required=True),
'location_id': fields.many2one('stock.location', 'Location', required=True),
'product_id': fields.many2one('product.product', 'Product', required=True, domain=[('type','=','product')]),
'product_uom': fields.many2one('product.uom', 'Product UOM', required=True ),
'product_min_qty': fields.float('Min Quantity', required=True),
@ -1007,9 +1008,15 @@ class stock_warehouse_orderpoint(osv.osv):
'name': lambda x,y,z,c: x.pool.get('ir.sequence').get(y,z,'mrp.warehouse.orderpoint') or '',
'product_uom': lambda sel, cr, uid, context: context.get('product_uom', False),
}
def onchange_warehouse_id(self, cr, uid, ids, warehouse_id, context={}):
if warehouse_id:
w=self.pool.get('stock.warehouse').browse(cr,uid,warehouse_id, context)
v = {'location_id':w.lot_stock_id.id}
return {'value': v}
return {}
def onchange_product_id(self, cr, uid, ids, product_id, context={}):
if product_id:
prod=self.pool.get('product.product').browse(cr,uid,[product_id])[0]
prod=self.pool.get('product.product').browse(cr,uid,product_id)
v = {'product_uom':prod.uom_id.id}
return {'value': v}
return {}

3
addons/mrp/mrp_view.xml
View File

@ -761,7 +761,8 @@
<form string="Minimum Stock Rules">
<field name="name" select="1"/>
<field name="active" select="1"/>
<field name="warehouse_id" select="1"/>
<field name="warehouse_id" on_change="onchange_warehouse_id(warehouse_id)" select="1"/>
<field name="location_id" select="2"/>
<field name="product_id" on_change="onchange_product_id(product_id)" select="1"/>
<field name="product_uom"/>
<field name="product_min_qty"/>

2
addons/mrp/schedulers.py
View File

@ -198,7 +198,7 @@ class mrp_procurement(osv.osv):
for op in orderpoint_obj.browse(cr, uid, ids):
try:
prods = location_obj._product_virtual_get(cr, uid,
op.warehouse_id.lot_stock_id.id, [op.product_id.id],
op.location_id.id, [op.product_id.id],
{'uom': op.product_uom.id})[op.product_id.id]
if prods < op.product_min_qty:
qty = max(op.product_min_qty, op.product_max_qty)-prods

4
addons/project_gtd/project_gtd_view.xml
View File

@ -107,7 +107,7 @@
<field name="arch" type="xml">
<tree string="Tasks" editable="bottom" colors="blue:timebox_id">
<field name="name"/>
<field name="timebox_id" required="1"/>
<field name="timebox_id" required="1" domain="[('user_id','=',uid)]"/>
<field name="context_id" required="1"/>
<field name="date_start"/>
<field name="priority"/>
@ -160,7 +160,7 @@
<field name="arch" type="xml">
<field name="date_close" position="after">
<newline/>
<field name="timebox_id" select="1"/>
<field name="timebox_id" select="1" domain="[('user_id', '=', uid)]"/>
<field name="context_id" select="2"/>
</field>
</field>

4
addons/scrum/scrum.py
View File

@ -94,7 +94,7 @@ class scrum_sprint(osv.osv):
res[sprint.id] += bl.planned_hours
return res
_columns = {
'name' : fields.char('Sprint Name', size=64),
'name' : fields.char('Sprint Name', required=True, size=64),
'date_start': fields.date('Starting Date', required=True),
'date_stop': fields.date('Ending Date', required=True),
'project_id': fields.many2one('scrum.project', 'Project', required=True, domain=[('scrum','=',1)]),
@ -166,7 +166,7 @@ class scrum_product_backlog(osv.osv):
res[bl.id] += task.planned_hours
return res
_columns = {
'name' : fields.char('Feature', size=64),
'name' : fields.char('Feature', size=64, required=True),
'note' : fields.text('Note'),
'active' : fields.boolean('Active'),
'project_id': fields.many2one('scrum.project', 'Scrum Project', required=True, domain=[('scrum','=',1)]),

97
addons/scrum/scrum_view.xml
View File

@ -4,8 +4,8 @@
<!--
Usual views
-->
Usual views
-->
<!-- Scrum Project -->
@ -16,10 +16,11 @@
<field name="type">form</field>
<field name="inherit_id" ref="project.edit_project"/>
<field name="arch" type="xml">
<field name="warn_manager" position="after">
<field name="state" position="after">
<newline/>
<field name="product_owner_id" required="1" select="1"/>
<field name="sprint_size"/>
<field name="product_owner_id" required="1" select="1"/>
<separator string="Scrum Data" colspan="4"/>
</field>
</field>
</record>
@ -59,8 +60,8 @@
<!--
Product backlog
-->
Product backlog
-->
<record id="view_scrum_product_backlog_tree" model="ir.ui.view">
<field name="name">scrum.product.backlog.tree</field>
@ -86,13 +87,15 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Scrum Product backlog">
<notebook>
<group colspan="4" col="6">
<field name="name" select="1"/>
<field name="project_id" select="1"/>
<field domain="[('project_id','=',project_id)]" name="sprint_id" select="1"/>
</group>
<notebook colspan="4">
<page string="Product backlog">
<field colspan="4" name="name" select="1"/>
<field name="priority"/>
<field name="sequence"/>
<field name="project_id" select="1"/>
<field domain="[('project_id','=',project_id)]" name="sprint_id" select="1"/>
<field name="user_id" select="1"/>
<field name="active" select="1"/>
<field colspan="4" name="note"/>
@ -136,8 +139,8 @@
<!--
Scrum Sprint
-->
Scrum Sprint
-->
<record id="view_scrum_sprint_tree" model="ir.ui.view">
<field name="name">scrum.sprint.tree</field>
@ -162,12 +165,10 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Scrum Sprint">
<notebook>
<field name="name" select="1"/>
<field name="project_id" on_change="onchange_project_id(project_id)"/>
<notebook colspan="4">
<page string="Sprint Info">
<field colspan="4" name="name" select="1"/>
<newline/>
<field name="project_id" on_change="onchange_project_id(project_id)"/>
<newline/>
<field name="date_start" select="1"/>
<field name="date_stop"/>
<field name="product_owner_id"/>
@ -255,8 +256,8 @@
<!--
Daily Meeting
-->
Daily Meeting
-->
<record id="view_scrum_meeting_tree" model="ir.ui.view">
@ -277,10 +278,10 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Scrum Sprint">
<notebook>
<field name="name" select="1"/>
<field name="sprint_id"/>
<notebook colspan="4">
<page string="Scrum Meeting">
<field name="name" select="1"/>
<field name="sprint_id"/>
<separator colspan="4" string="What have you accomplished since yesterday ?"/>
<field colspan="4" name="question_yesterday" nolabel="1"/>
<separator colspan="4" string="What are you working on today ?"/>
@ -299,7 +300,7 @@
</field>
</record>
<record id="action_meeting_form" model="ir.actions.act_window">
<field name="name">scrum.meeting.form</field>
<field name="name">Scrum Meeting</field>
<field name="res_model">scrum.meeting</field>
<field name="view_type">form</field>
<field name="view_id" ref="view_scrum_meeting_form"/>
@ -307,11 +308,11 @@
<menuitem action="action_meeting_form" id="menu_action_meeting_form" parent="scrum.next_id_67"/>
<!--
Clicks on a sprint: what a hack
-->
Clicks on a sprint: what a hack
-->
<record id="action_sprint_task_open" model="ir.actions.act_window">
<field name="res_model">scrum.task</field>
<field name="res_model">project.task</field>
<field name="name">View sprint Tasks</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
@ -341,8 +342,8 @@
</record>
<!--
Clicks on a project
-->
Clicks on a project
-->
<record id="dblc_proj" model="ir.actions.act_window">
<field name="res_model">scrum.product.backlog</field>
@ -359,7 +360,7 @@
<field eval="True" name="object"/>
</record>
<record id="dblc_proj2" model="ir.actions.act_window">
<field name="res_model">scrum.task</field>
<field name="res_model">project.task</field>
<field name="name">View project's tasks</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
@ -376,44 +377,26 @@
<!--
Tasks
-->
<record id="view_task_tree" model="ir.ui.view">
<field name="name">scrum.task.tree</field>
<field name="model">scrum.task</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Scrum Tasks">
<field name="sequence"/>
<field name="name"/>
<field name="user_id"/>
<field name="priority"/>
<field name="date_deadline"/>
<field name="progress"/>
<field name="planned_hours" sum="Planned hours" widget="float_time"/>
<field name="effective_hours" sum="Effective hours" widget="float_time"/>
<field name="state"/>
</tree>
</field>
</record>
Tasks
-->
<record id="view_task_form2" model="ir.ui.view">
<field name="name">scrum.task.form</field>
<field name="model">scrum.task</field>
<field name="name">project.task.form</field>
<field name="model">project.task</field>
<field name="type">form</field>
<field name="inherit_id" ref="project.view_task_form2"/>
<field name="arch" type="xml">
<field name="project_id" position="replace">
<newline/>
<field name="project_id" required="1" select="1"/>
<field domain="[('project_id','=',project_id)]" name="product_backlog_id" select="1"/>
</field>
</field>
</record>
<record id="action_view_task" model="ir.actions.act_window">
<field name="name">All Tasks</field>
<field name="res_model">scrum.task</field>
<field name="res_model">project.task</field>
<field name="view_type">form</field>
<field name="domain">[('scrum','=',1)]</field>
</record>
@ -421,7 +404,7 @@
<record id="action_view_task4" model="ir.actions.act_window">
<field name="name">My tasks</field>
<field name="res_model">scrum.task</field>
<field name="res_model">project.task</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('user_id', '=', uid),('scrum','=',1)]</field>
@ -430,7 +413,7 @@
<record id="action_view_task5" model="ir.actions.act_window">
<field name="name">My opened tasks</field>
<field name="res_model">scrum.task</field>
<field name="res_model">project.task</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('user_id','=',uid),('state','=','open'),('scrum','=',1)]</field>
@ -446,4 +429,4 @@
</record>
<menuitem action="action_view_task6" id="menu_action_view_task6" parent="project.menu_action_view_task"/>
</data>
</terp>
</terp>