[MERGE] merged the branch that hide date fields as they will later be replaced by the 'chatter'

bzr revid: qdp-launchpad@openerp.com-20120321165440-hl1shvdigj204td7
This commit is contained in:
Quentin (OpenERP) 2012-03-21 17:54:40 +01:00
commit 4a07a424cd
14 changed files with 76 additions and 74 deletions

View File

@ -176,7 +176,7 @@
<field name="channel_id" select="1" widget="selection"/>
<field name="referred"/>
</group>
<group colspan="2" col="2">
<group colspan="2" col="2" groups="base.group_no_one">
<separator string="Dates" colspan="2" col="2"/>
<field name="create_date"/>
<field name="write_date"/>
@ -188,7 +188,7 @@
<field name="optin" on_change="on_change_optin(optin)"/>
<field name="optout" on_change="on_change_optout(optout)"/>
</group>
<group colspan="2" col="2">
<group colspan="2" col="2" groups="base.group_no_one">
<separator string="Statistics" colspan="2" col="2"/>
<field name="day_open"/>
<field name="day_close"/>
@ -208,7 +208,7 @@
<field name="arch" type="xml">
<tree string="Leads" colors="blue:state=='pending';grey:state in ('cancel', 'done')">
<field name="date_deadline" invisible="1"/>
<field name="create_date"/>
<field name="create_date" groups="base.group_no_one"/>
<field name="name" string="Subject"/>
<field name="contact_name"/>
<field name="country_id" invisible="context.get('invisible_country', True)" />
@ -417,9 +417,9 @@
<separator orientation="vertical"/>
<filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/>
<filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
<separator orientation="vertical"/>
<separator orientation="vertical" groups="base.group_no_one"/>
<filter string="Creation" help="Create date" icon="terp-go-month"
domain="[]" context="{'group_by':'create_date'}" />
domain="[]" context="{'group_by':'create_date'}" groups="base.group_no_one"/>
</group>
</search>
</field>
@ -570,7 +570,7 @@
icon="terp-mail-message-new" type="action"/>
</page>
<page string="Extra Info" groups="base.group_extended">
<group col="2" colspan="2">
<group col="2" colspan="2" groups="base.group_no_one">
<separator string="Dates" colspan="2"/>
<field name="create_date"/>
<field name="write_date"/>
@ -580,8 +580,8 @@
<group col="2" colspan="2">
<separator string="Misc" colspan="2"/>
<field name="active"/>
<field name="day_open"/>
<field name="day_close"/>
<field name="day_open" groups="base.group_no_one"/>
<field name="day_close" groups="base.group_no_one"/>
<field name="referred"/>
</group>
<separator colspan="4" string="References"/>
@ -601,7 +601,7 @@
<field name="arch" type="xml">
<tree string="Opportunities" colors="blue:state=='pending' and not(date_deadline and (date_deadline &lt; current_date));gray:state in ('cancel', 'done');red:date_deadline and (date_deadline &lt; current_date)">
<field name="date_deadline" invisible="1"/>
<field name="create_date"/>
<field name="create_date" groups="base.group_no_one"/>
<field name="name" string="Opportunity"/>
<field name="partner_id" string="Customer"/>
<field name="country_id" invisible="context.get('invisible_country', True)" />
@ -682,7 +682,7 @@
<filter string="Channel" icon="terp-call-start" domain="[]" context="{'group_by':'channel_id'}" />
<filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
<separator orientation="vertical" />
<filter string="Creation" icon="terp-go-month" domain="[]" context="{'group_by':'create_date'}" />
<filter string="Creation" icon="terp-go-month" domain="[]" context="{'group_by':'create_date'}" groups="base.group_no_one"/>
<filter string="Exp.Closing" icon="terp-go-month" help="Expected Closing" domain="[]" context="{'group_by':'date_deadline'}" />
</group>
</search>

View File

@ -130,7 +130,7 @@
<field name="date_action_next"/>
<field name="action_next"/>
</group>
<group colspan="2" col="2">
<group colspan="2" col="2" groups="base.group_no_one">
<separator colspan="2" string="Dates"/>
<field name="create_date"/>
<field name="date_closed"/>
@ -245,7 +245,7 @@
context="{'group_by':'date_deadline'}" />
<filter string="Closure" icon="terp-go-month"
domain="[]" help="Date Closed"
context="{'group_by':'date_closed'}" />
context="{'group_by':'date_closed'}" groups="base.group_no_one"/>
</group>
</search>
</field>

View File

@ -162,7 +162,7 @@
<field name="id" select="1"/>
<field name="priority" string="Priority"/>
</group>
<group col="2" colspan="2">
<group col="2" colspan="2" groups="base.group_no_one">
<separator colspan="4" string="Dates"/>
<field name="create_date"/>
<field name="date_closed"/>

View File

@ -116,7 +116,7 @@
icon="terp-mail-message-new" type="action"/>
</page>
<page string="Extra Info" groups="base.group_extended">
<group colspan="2" col="2">
<group colspan="2" col="2" groups="base.group_no_one">
<separator colspan="4" string="Dates"/>
<field name="create_date"/>
<field name="write_date"/>

View File

@ -264,12 +264,12 @@
<separator string="Related to" colspan="2"/>
<field name="partner_id"/>
</group>
<group col="2" colspan="2" groups="base.group_extended">
<group col="2" colspan="2" groups="base.group_no_one">
<separator string="Created" colspan="2"/>
<field name="create_uid" readonly="1"/>
<field name="create_date" readonly="1"/>
</group>
<group col="2" colspan="2" groups="base.group_extended">
<group col="2" colspan="2" groups="base.group_no_one">
<separator string="Modified" colspan="2"/>
<field name="write_uid" readonly="1"/>
<field name="write_date" readonly="1"/>
@ -335,8 +335,8 @@
<field name="parent_id" />
<field name="user_id"/>
<field name="company_id"/>
<field name="create_date"/>
<field name="write_date"/>
<field name="create_date" groups="base.group_no_one"/>
<field name="write_date" groups="base.group_no_one"/>
<field name="partner_id" groups="base.group_extended" />
<field name="type" groups="base.group_extended"/>
</tree>

View File

@ -299,7 +299,7 @@
<field name="email"/>
<field name="phone"/>
</group>
<group colspan="2" col="2" groups="base.group_extended">
<group colspan="2" col="2" groups="base.group_no_one">
<separator string="Dates" colspan="2"/>
<field name="create_date"/>
<field name="date_closed"/>

View File

@ -114,11 +114,11 @@
<field name="journal_id"/>
<field name="invoice_id" context="{'type':'in_invoice', 'journal_type': 'purchase'}"/>
</group>
<group col="2" colspan="2">
<separator colspan="2" string="Validation"/>
<field name="date_confirm" readonly = "1"/>
<field name="date_valid" readonly = "1"/>
<field name="user_valid"/>
<group col="2" colspan="2" groups="base.group_no_one">
<separator colspan="2" string="Validation"/>
<field name="date_confirm" readonly = "1"/>
<field name="date_valid" readonly = "1"/>
<field name="user_valid"/>
</group>
<separator colspan="4" string="Notes"/>
<field colspan="4" name="note" nolabel="1"/>

View File

@ -42,7 +42,7 @@
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Applicants" colors="grey:state in ('cancel','done');blue:state=='pending'">
<field name="create_date"/>
<field name="create_date" groups="base.group_no_one"/>
<field name="name" string="Subject"/>
<field name="partner_name"/>
<field name="email_from"/>
@ -124,7 +124,7 @@
<field name="source_id"/>
<field name="reference"/>
</group>
<group col="2" colspan="2">
<group col="2" colspan="2" groups="base.group_no_one">
<separator colspan="2" string="Dates"/>
<field name="create_date"/>
<field name="write_date"/>
@ -228,8 +228,8 @@
<filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/>
<filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
<filter string="Source" icon="terp-face-plain" domain="[]" context="{'group_by':'source_id'}"/>
<separator orientation="vertical"/>
<filter string="Creation Date" icon="terp-go-month" domain="[]" context="{'group_by':'create_date'}"/>
<separator orientation="vertical" groups="base.group_no_one"/>
<filter string="Creation Date" icon="terp-go-month" domain="[]" context="{'group_by':'create_date'}" groups="base.group_no_one"/>
</group>
</search>
</field>

View File

@ -291,7 +291,7 @@
<field name="priority"/>
<field name="sequence"/>
</group>
<group colspan="2" col="2">
<group colspan="2" col="2" groups="base.group_no_one">
<separator string="Dates" colspan="2"/>
<field name="date_start"/>
<field name="date_end"/>
@ -430,8 +430,8 @@
icon="gtk-go-forward"
groups="base.group_extended"
help="Change Type"/>
<field name="date_start" invisible="1"/>
<field name="date_end" invisible="1"/>
<field name="date_start" invisible="1" groups="base.group_no_one"/>
<field name="date_end" invisible="1" groups="base.group_no_one"/>
<field name="progress" widget="progressbar" invisible="context.get('set_visible',False)"/>
<field name="state" invisible="context.get('set_visible',False)"/>
<button name="do_open" states="pending,draft,done,cancelled" string="Start Task" type="object" icon="gtk-media-play" help="For changing to open state" invisible="context.get('set_visible',False)"/>
@ -510,9 +510,9 @@
<filter string="State" name="group_state" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
<separator orientation="vertical"/>
<filter string="Deadline" icon="terp-gnome-cpu-frequency-applet+" domain="[]" context="{'group_by':'date_deadline'}"/>
<separator orientation="vertical"/>
<filter string="Start Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_start'}"/>
<filter string="End Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_end'}"/>
<separator orientation="vertical" groups="base.group_no_one"/>
<filter string="Start Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_start'}" groups="base.group_no_one"/>
<filter string="End Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_end'}" groups="base.group_no_one"/>
</group>
</search>
</field>

View File

@ -116,23 +116,23 @@
name="%(mail.action_email_compose_message_wizard)d"
icon="terp-mail-message-new" type="action"/>
</page>
<page string="Extra Info" groups="base.group_extended">
<page string="Extra Info" groups="base.group_no_one">
<group col="2" colspan="2">
<separator colspan="2" string="Date"/>
<field name="create_date"/>
<field name="write_date" />
<field name="date_closed"/>
<field name="date_open"/>
<field name="date_action_last"/>
<separator colspan="2" string="Date"/>
<field name="create_date"/>
<field name="write_date" />
<field name="date_closed"/>
<field name="date_open"/>
<field name="date_action_last"/>
</group>
<group colspan="2" col="2">
<separator string="Statistics" colspan="2" col="2"/>
<field name="day_open"/>
<field name="day_close"/>
<field name="working_hours_open" widget="float_time"/>
<field name="working_hours_close" widget="float_time"/>
<field name="inactivity_days"/>
<field name="days_since_creation"/>
<separator string="Statistics" colspan="2" col="2"/>
<field name="day_open"/>
<field name="day_close"/>
<field name="working_hours_open" widget="float_time"/>
<field name="working_hours_close" widget="float_time"/>
<field name="inactivity_days"/>
<field name="days_since_creation"/>
</group>
<group colspan="2" col="2">
<separator string="References" colspan="2"/>
@ -152,7 +152,7 @@
<field name="arch" type="xml">
<tree string="Issue Tracker Tree" colors="black:state=='open';blue:state=='pending';grey:state in ('cancel', 'done')">
<field name="id"/>
<field name="create_date"/>
<field name="create_date" groups="base.group_no_one"/>
<field name="name"/>
<field name="partner_id" groups="base.group_extended"/>
<field name="project_id" />

View File

@ -220,9 +220,11 @@
<field name="fiscal_position" widget="selection"/>
</group>
<newline/>
<separator string="Purchase Control" colspan="4"/>
<field name="validator"/>
<field name="date_approve"/>
<group colspan="2" col="2" groups="base.group_no_one">
<separator string="Purchase Control" colspan="4"/>
<field name="validator"/>
<field name="date_approve"/>
</group>
<separator string="Invoices" colspan="4"/>
<newline/>
<field name="invoice_ids" groups="base.group_extended" nolabel="1" colspan="4" context="{'type':'in_invoice', 'journal_type':'purchase'}"/>

View File

@ -235,7 +235,7 @@
<field name="fiscal_position" widget="selection"/>
<field name="company_id" widget="selection" groups="base.group_multi_company"/>
</group>
<group colspan="2" col="2" groups="base.group_extended">
<group colspan="2" col="2" groups="base.group_no_one">
<separator string="Dates" colspan="2"/>
<field name="create_date"/>
<field name="date_confirm"/>

View File

@ -432,8 +432,8 @@
<field name="picking_id"/>
<field name="location_id" />
<field name="location_dest_id" />
<field name="create_date"/>
<field name="date" string="Date"/>
<field name="create_date" groups="base.group_no_one"/>
<field name="date" string="Date" groups="base.group_no_one"/>
<field name="date_expected" string="Date Expected"/>
<field name="state"/>
</tree>
@ -456,8 +456,8 @@
<field name="picking_id"/>
<field name="location_id" />
<field name="location_dest_id" />
<field name="create_date" />
<field name="date" string="Date"/>
<field name="create_date" groups="base.group_no_one"/>
<field name="date" string="Date" groups="base.group_no_one"/>
<field name="date_expected" string="Date Expected"/>
<field name="state"/>
</tree>
@ -1366,7 +1366,7 @@
<field name="name"/>
<field name="picking_id" string="Reference"/>
<field name="origin"/>
<field name="create_date" invisible="1"/>
<field name="create_date" invisible="1" groups="base.group_no_one"/>
<field name="partner_id"/>
<field name="product_id"/>
<field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
@ -1393,7 +1393,7 @@
states="draft,assigned,confirmed,done"/>
<field name="location_id"/>
<field name="location_dest_id"/>
<field name="date"/>
<field name="date" groups="base.group_no_one"/>
<field name="date_expected"/>
<field name="state"/>
<button name="action_done" states="confirmed,assigned" string="Process" type="object" icon="gtk-go-forward"/>
@ -1439,8 +1439,8 @@
<group colspan="2" col="2">
<separator string="Dates" colspan="2" />
<field name="create_date" groups="base.group_extended"/>
<field name="date" groups="base.group_extended"/>
<field name="create_date" groups="base.group_no_one" />
<field name="date" groups="base.group_no_one" />
<field name="date_expected" on_change="onchange_date(date,date_expected)"/>
</group>
@ -1490,7 +1490,7 @@
<field name="product_id"/>
<field name="location_id" string="Location" filter_domain="['|',('location_id','ilike',self),('location_dest_id','ilike',self)]"/>
<field name="address_id" string="Partner" context="{'contact_display':'partner'}" filter_domain="[('picking_id.address_id','ilike',self)]"/>
<field name="date"/>
<field name="date" groups="base.group_no_one"/>
<field name="origin"/>
<field name="prodlot_id"/>
</group>
@ -1506,7 +1506,7 @@
<separator orientation="vertical"/>
<filter icon="terp-stock_effects-object-colorize" string="State" domain="[]" context="{'group_by':'state'}" />
<separator orientation="vertical"/>
<filter string="Creation" name="groupby_create_date" icon="terp-go-month" domain="[]" context="{'group_by':'create_date'}"/>
<filter string="Creation" name="groupby_create_date" icon="terp-go-month" domain="[]" context="{'group_by':'create_date'}" groups="base.group_no_one"/>
<filter string="Expected" name="groupby_date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/>
</group>
</search>
@ -1564,7 +1564,7 @@
groups="base.group_extended"
icon="terp-stock_effects-object-colorize"
states="draft,assigned,confirmed,done"/>
<field name="date"/>
<field name="date" groups="base.group_no_one"/>
<field name="state"/>
<button name="action_assign" states="confirmed" string="Set Available" type="object" icon="gtk-yes"/>
<button name="action_done" string="Process" type="object" states="confirmed,assigned" icon="gtk-go-forward"/>
@ -1584,7 +1584,7 @@
<field name="product_id"/>
<field name="product_qty" />
<field name="product_uom" string="UoM"/>
<field name="date"/>
<field name="date" groups="base.group_no_one" />
<button name="action_done" states="confirmed,assigned" string="Process" type="object" icon="gtk-go-forward"/>
</tree>
</field>
@ -1627,8 +1627,8 @@
<group colspan="2" col="2">
<separator string="Dates" colspan="2" />
<field name="create_date" groups="base.group_extended"/>
<field name="date" groups="base.group_extended"/>
<field name="create_date" groups="base.group_no_one" />
<field name="date" groups="base.group_no_one" />
<field name="date_expected" on_change="onchange_date(date,date_expected)"/>
</group>
@ -1687,8 +1687,8 @@
<separator orientation="vertical"/>
<filter string="Order" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'origin'}"/>
<filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
<separator orientation="vertical"/>
<filter string="Order Date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}" />
<separator orientation="vertical" groups="base.group_no_one"/>
<filter string="Order Date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}" groups="base.group_no_one"/>
</group>
</search>
</field>
@ -1720,8 +1720,8 @@
<filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
<filter string="Order" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'origin'}"/>
<filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
<separator orientation="vertical"/>
<filter string="Order Date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}" />
<separator orientation="vertical" groups="base.group_no_one"/>
<filter string="Order Date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}" groups="base.group_no_one"/>
</group>
</search>
</field>

View File

@ -115,7 +115,7 @@
<field name="review"/>
<field name="create_uid" invisible="context.get('create_uid',False)"/>
<field name="write_uid"/>
<field name="write_date"/>
<field name="write_date" groups="base.group_no_one"/>
</tree>
</field>
</record>
@ -141,7 +141,7 @@
</notebook>
<group col="2" colspan="2">
<separator colspan="4" string="Modification Information"/>
<field name="write_date" readonly="1"/>
<field name="write_date" readonly="1" groups="base.group_no_one"/>
<field name="minor_edit" groups="base.group_extended"/>
<field name="review" select="1" groups="base.group_extended"/>
</group>
@ -168,7 +168,7 @@
<field name="tags"/>
<field name="section" groups="base.group_extended"/>
<field name="write_uid"/>
<field name="write_date"/>
<field name="write_date" groups="base.group_no_one"/>
<newline/>
<group expand="0" string="Group By...">
<filter icon="terp-folder-blue" string="Wiki Group" domain="[]" context="{'group_by':'group_id'}"/>