diff options
| author | Fabien Pinckaers <fp@tinyerp.com> | 2008-12-04 09:15:41 +0100 |
|---|---|---|
| committer | Fabien Pinckaers <fp@tinyerp.com> | 2008-12-04 09:15:41 +0100 |
| commit | 644378e4d90ebbee9d11e9e89ea1ebef7635c7a4 (patch) | |
| tree | eeeb8235df4f08e65a33903716bef1ad5ff0b561 | |
| parent | fafd61127d381b29a322c6337f4c51aa015e1fc0 (diff) | |
| parent | 1fa19942460167c65c60c57279be27ee86a286b0 (diff) | |
improved_view
bzr revid: fp@tinyerp.com-20081204081541-4pu8r6xo31ni10ap
| -rw-r--r-- | addons/crm/crm.py | 7 | ||||
| -rw-r--r-- | addons/crm/crm_view.xml | 6 | ||||
| -rw-r--r-- | addons/wiki/wiki_view.xml | 6 |
3 files changed, 10 insertions, 9 deletions
diff --git a/addons/crm/crm.py b/addons/crm/crm.py index 47016285e9f..d284da54904 100644 --- a/addons/crm/crm.py +++ b/addons/crm/crm.py @@ -320,12 +320,11 @@ class crm_case(osv.osv): return res def copy(self, cr, uid, id, default=None, context={}): if not default: default = {} -# default.update( {'state':'draft', 'id':False, 'history_line':[],'log_ids':[]}) - default.update( {'state':'draft', 'history_line':[],'log_ids':[]}) + default.update( {'state':'draft', 'id':False, 'history_line':[],'log_ids':[]}) return super(crm_case, self).copy(cr, uid, id, default, context) _columns = { -# 'id': fields.integer('ID', readonly=True), + 'id': fields.integer('ID', readonly=True), 'name': fields.char('Description',size=64, required=True), 'priority': fields.selection(AVAILABLE_PRIORITIES, 'Priority'), 'active': fields.boolean('Active'), @@ -343,7 +342,7 @@ class crm_case(osv.osv): 'partner_address_id': fields.many2one('res.partner.address', 'Partner Contact', domain="[('partner_id','=',partner_id)]"), 'som': fields.many2one('res.partner.som', 'State of Mind'), 'date': fields.datetime('Date'), -# 'create_date': fields.datetime('Created' ,readonly=True), + 'create_date': fields.datetime('Created' ,readonly=True), 'date_deadline': fields.datetime('Deadline'), 'date_closed': fields.datetime('Closed', readonly=True), 'canal_id': fields.many2one('res.partner.canal', 'Channel'), diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml index a1b60e449d2..71e5ba41296 100644 --- a/addons/crm/crm_view.xml +++ b/addons/crm/crm_view.xml @@ -254,7 +254,7 @@ <field name="type">tree</field> <field name="arch" type="xml"> <tree colors="red:date_deadline<current_date and state=='open'" string="Cases"> -<!-- <field name="id"/>--> + <field name="id"/> <field name="date"/> <field name="date_deadline"/> <field name="name"/> @@ -326,13 +326,13 @@ </group> </page> <page string="Extra Info"> -<!-- <field name="id" select="1"/>--> + <field name="id" select="1"/> <field name="active" select="2"/> <field colspan="4" name="email_cc"/> <field name="categ_id" on_change="onchange_categ_id(categ_id)" select="2"/> <field name="som" select="2"/> <separator colspan="4" string="Dates"/> -<!-- <field name="create_date"/>--> + <field name="create_date"/> <field name="date_closed"/> <field name="date_action_last"/> <field name="date_action_next"/> diff --git a/addons/wiki/wiki_view.xml b/addons/wiki/wiki_view.xml index 0d6e69ca6c2..9ad95f07213 100644 --- a/addons/wiki/wiki_view.xml +++ b/addons/wiki/wiki_view.xml @@ -98,14 +98,16 @@ <field name="name" select="1"/> <field name="group_id" select="1" on_change="onchange_group_id(group_id, text_area)"/> <field name="section" select="2" invisible="not context.get('section',False)"/> + </group> + <field name="text_area" nolabel="1" colspan="4" select="1" widget="text_wiki"/> + <separator colspan="4" string="Modifications"/> + <group col="6" colspan="4"> <field name="write_date" readonly="1" select="2"/> <field name="review" select="1"/> - <field name="minor_edit" select="2" groups="base.group_extended"/> <field name="toc"/> <field name="tags" select="2" groups="base.group_extended"/> <field name="summary" colspan="4" select="2" groups="base.group_extended"/> </group> - <field name="text_area" nolabel="1" colspan="4" select="1" widget="text_wiki"/> </form> </field> </record> |