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

bugfix_302750 

bzr revid: fp@tinyerp.com-20081127103236-6edihr3hg7jk5z9x
This commit is contained in:
Fabien Pinckaers 2008-11-27 11:32:36 +01:00
parent fbaede2d2d
commit 41bb26ef9b
4 changed files with 19 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
addons/mrp/mrp.py
View File

@ -769,7 +769,6 @@ class mrp_procurement(osv.osv):
" a make to order method."),
'purchase_id': fields.many2one('purchase.order', 'Purchase Order'),
'purchase_line_id': fields.many2one('purchase.order.line', 'Purchase Order Line'),
'property_ids': fields.many2many('mrp.property', 'mrp_procurement_property_rel', 'procurement_id','property_id', 'Properties'),

15
addons/mrp/mrp_demo.xml
View File

@ -117,27 +117,24 @@
<field name="group_id" ref="mrp_property_group_psu"/>
<field name="name">PSU LC Power LC6550</field>
</record>
<!--
Resource: mrp.routing
-->
<record id="mrp_routing_0" model="mrp.routing">
<field name="workcenter_lines">[1]</field>
<field name="name">Assembly of pre-defined PC</field>
<field model="stock.location" name="location_id" search="[('name','=','Stock')]"/>
<field name="name">Assembly Line 1</field>
</record>
<record id="mrp_routing_1" model="mrp.routing">
<field name="workcenter_lines">[2]</field>
<field name="name">Assembly of made to measure PC</field>
<field model="stock.location" name="location_id" search="[('name','=','Stock')]"/>
<field name="name">Custom Assembly Line</field>
</record>
<record id="mrp_routing_2" model="mrp.routing">
<field name="workcenter_lines">[3]</field>
<field name="name">Assembly main board + processor</field>
<field model="stock.location" name="location_id" search="[('name','=','Stock')]"/>
<field name="name">Component Manufacturing</field>
</record>
<!--
Resource: mrp.routing.workcenter
-->

8
addons/wiki/wiki.py
View File

@ -53,11 +53,11 @@ class Wiki(osv.osv):
_order = 'section,create_date desc'
_columns={
'name':fields.char('Title', size=256, select=True, required=True),
'write_uid':fields.many2one('res.users',"Last Modified By"),
'write_uid':fields.many2one('res.users',"Last Author"),
'text_area':fields.text("Content", select=True),
'create_uid':fields.many2one('res.users','Author', select=True),
'create_date':fields.datetime("Created on", select=True),
'write_date':fields.datetime("Last modified", select=True),
'write_date':fields.datetime("Modification Date", select=True),
'tags':fields.char('Tags', size=1024),
'history_id':fields.one2many('wiki.wiki.history','wiki_id','History Lines'),
'minor_edit':fields.boolean('Minor edit', select=True),
@ -85,14 +85,12 @@ class Wiki(osv.osv):
'section': section
}
}
def copy(self, cr, uid, id, default=None, context=None):
return super(Wiki, self).copy(cr, uid, id, {'wiki_id':False}, context)
def write(self, cr, uid, ids, vals, context=None):
result = super(Wiki,self).write(cr, uid, ids, vals, context)
history = self.pool.get('wiki.wiki.history')
if vals.get('text_area'):
for id in ids:
res = {

22
addons/wiki/wizard/wizard_view.xml
View File

@ -2,30 +2,28 @@
<openerp>
<data>
<record id="view_wiki_history_diff" model="ir.ui.view">
<field name="name">Wiki Differance</field>
<field name="name">Differences</field>
<field name="model">wizard.wiki.history.show_diff</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="History Differance">
<separator string="Wiki Differance" colspan="4"/>
<separator string="Wiki Differance" colspan="4"/>
<field name="diff" widget="html_tag" nolabel="1" colspan="4"/>
</form>
</field>
</record>
<act_window
id="act_view_diff"
name="View Differance"
res_model="wizard.wiki.history.show_diff"
src_model="wiki.wiki.history"
target="new"
view_mode="form"
id="act_view_diff"
name="Differences"
res_model="wizard.wiki.history.show_diff"
src_model="wiki.wiki.history"
target="new"
view_mode="form"
/>
<wizard
id="wizard_make_index"
string="Create Index"
name="wiki.make.index"
model="wiki.wiki"/>
</data>
</openerp>
</data>
</openerp>