[IMP] better views

bzr revid: fp@tinyerp.com-20100418191109-ee9avwgdbzegda4j
This commit is contained in:
Fabien Pinckaers 2010-04-18 21:11:09 +02:00
parent cbb3ffed6f
commit b4e65caa16
29 changed files with 130 additions and 109 deletions

View File

@ -1485,6 +1485,7 @@
<!-- register configuration wizard -->
<record id="config_fiscalyear" model="ir.actions.todo">
<field name="action_id" ref="action_account_config_wizard_form"/>
<field name="restart">onskip</field>
</record>
<record id="view_account_addtmpl_wizard_form" model="ir.ui.view">

View File

@ -17,6 +17,7 @@
string="You can start configuring the system or connect directly to the database using the default setup."/>
</group>
</group>
<separator string="" colspan="4"/>
<button name="menu" icon="gtk-ok" type="object"
string="Use Directly"/>
<button name="config" icon="gtk-go-forward" type="object"

View File

@ -50,8 +50,8 @@ If you don't think you need any of these right now, you can easily install them
</record>
<record id="base_setup_installer_todo" model="ir.actions.todo">
<field name="action_id" ref="action_base_setup_installer"/>
<field name="sequence">2</field>
<field name="action_id" ref="action_base_setup_installer"/>
<field name="sequence">2</field>
</record>
</data>
</openerp>

View File

@ -54,8 +54,9 @@
</record>
<record id="base_setup_company_todo" model="ir.actions.todo">
<field name="action_id" ref="action_base_setup_company"/>
<field name="sequence">1</field>
<field name="action_id" ref="action_base_setup_company"/>
<field name="sequence">1</field>
<field name="restart">onskip</field>
</record>
</data>
</openerp>

View File

@ -1,52 +1,53 @@
<?xml version="1.0"?>
<openerp>
<data noupdate="1">
<data noupdate="1">
<menuitem id="base.menu_aftersale" name="After-Sale Services"
parent="base.menu_base_partner" sequence="6" />
<menuitem id="base.menu_aftersale" name="After-Sale Services"
groups="base.group_extended"
parent="base.menu_base_partner" sequence="6" />
<!-- Claims Menu -->
<!-- Claims Menu -->
<record model="ir.actions.act_window" id="crm_case_categ_claim0">
<field name="name">Claims</field>
<field name="res_model">crm.claim</field>
<field name="view_type">form</field>
<field name="view_mode">tree,calendar,form,graph</field>
<field name="view_id" ref="crm_case_claims_tree_view"/>
<field name="context">{"search_default_section_id":section_id,"search_default_current":1,"search_default_my_claims":1}</field>
<field name="search_view_id" ref="crm.view_crm_case_claims_filter"/>
</record>
<record model="ir.actions.act_window" id="crm_case_categ_claim0">
<field name="name">Claims</field>
<field name="res_model">crm.claim</field>
<field name="view_type">form</field>
<field name="view_mode">tree,calendar,form,graph</field>
<field name="view_id" ref="crm_case_claims_tree_view"/>
<field name="context">{"search_default_section_id":section_id,"search_default_current":1,"search_default_my_claims":1}</field>
<field name="search_view_id" ref="crm.view_crm_case_claims_filter"/>
</record>
<record model="ir.actions.act_window.view" id="action_crm_tag_tree_claim0">
<field name="sequence" eval="1"/>
<field name="view_mode">tree</field>
<field name="view_id" ref="crm_case_claims_tree_view"/>
<field name="act_window_id" ref="crm_case_categ_claim0"/>
</record>
<record model="ir.actions.act_window.view" id="action_crm_tag_tree_claim0">
<field name="sequence" eval="1"/>
<field name="view_mode">tree</field>
<field name="view_id" ref="crm_case_claims_tree_view"/>
<field name="act_window_id" ref="crm_case_categ_claim0"/>
</record>
<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_claim0">
<field name="sequence" eval="2"/>
<field name="view_mode">calendar</field>
<field name="view_id" ref="crm_case_claims_calendar_view"/>
<field name="act_window_id" ref="crm_case_categ_claim0"/>
</record>
<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_claim0">
<field name="sequence" eval="2"/>
<field name="view_mode">calendar</field>
<field name="view_id" ref="crm_case_claims_calendar_view"/>
<field name="act_window_id" ref="crm_case_categ_claim0"/>
</record>
<record model="ir.actions.act_window.view" id="action_crm_tag_form_claim0">
<field name="sequence" eval="3"/>
<field name="view_mode">form</field>
<field name="view_id" ref="crm_case_claims_form_view"/>
<field name="act_window_id" ref="crm_case_categ_claim0"/>
</record>
<record model="ir.actions.act_window.view" id="action_crm_tag_form_claim0">
<field name="sequence" eval="3"/>
<field name="view_mode">form</field>
<field name="view_id" ref="crm_case_claims_form_view"/>
<field name="act_window_id" ref="crm_case_categ_claim0"/>
</record>
<record model="ir.actions.act_window.view" id="action_crm_sec_graph_view_act_job">
<field name="sequence" eval="4"/>
<field name="view_mode">graph</field>
<field name="view_id" ref="crm_case_graph_view_stage_cost"/>
<field name="act_window_id" ref="crm_case_categ_claim0"/>
</record>
<record model="ir.actions.act_window.view" id="action_crm_sec_graph_view_act_job">
<field name="sequence" eval="4"/>
<field name="view_mode">graph</field>
<field name="view_id" ref="crm_case_graph_view_stage_cost"/>
<field name="act_window_id" ref="crm_case_categ_claim0"/>
</record>
<menuitem name="Claims" id="menu_crm_case_claims"
parent="base.menu_aftersale" action="crm_case_categ_claim0" />
<menuitem name="Claims" id="menu_crm_case_claims"
parent="base.menu_aftersale" action="crm_case_categ_claim0" />
</data>
</data>
</openerp>

View File

@ -81,6 +81,7 @@
states="draft,open" type="object" icon="gtk-media-pause" />
<button name="case_escalate" string="Escalate"
states="open,draft,pending" type="object"
groups="base.group_extended"
icon="gtk-go-up" />
<button name="case_reset" string="Reset to Draft"
states="done,cancel" type="object" icon="gtk-convert" />
@ -147,6 +148,7 @@
icon="gtk-media-pause" />
<button name="case_escalate" string="Escalate"
states="open,draft,pending" type="object"
groups="base.group_extended"
icon="gtk-go-up" />
<button name="case_reset"
string="Reset to Draft" states="done,cancel"

View File

@ -177,6 +177,7 @@
states="draft,open" type="object"
icon="gtk-media-pause" />
<button name="case_escalate" string="Escalate"
groups="base.group_extended"
states="open,draft,pending" type="object"
icon="gtk-go-up" />
<button name="case_reset" string="Reset to Draft"

View File

@ -118,6 +118,7 @@
icon="gtk-media-pause" />
<button name="case_escalate" string="Escalate"
states="open,draft,pending" type="object"
groups="base.group_extended"
icon="gtk-go-up" />
<button name="case_reset"
string="Reset to Draft" states="done,cancel"

View File

@ -33,9 +33,7 @@ crm_opportunity()
class crm_phonecall(osv.osv):
""" CRM Phonecall """
_name = 'crm.phonecall'
crm_phonecall()

View File

@ -29,7 +29,9 @@
colspan="4" />
<field name="categ_id" widget="selection"
string="Meeting Type"
groups="base.group_extended"
domain="[('object_id.model', '=', 'crm.meeting')]" />
<newline/>
<field name="date" string="Start Date" required="1"
on_change="onchange_dates(date,duration,False)" />
<field name="duration" widget="float_time"
@ -99,8 +101,9 @@
<group col="6" colspan="4">
<group col="2" colspan="2">
<separator colspan="2" string="Assignment"/>
<field name="section_id" widget="selection" />
<field name="user_id" />
<field name="section_id" widget="selection"
groups="base.group_extended"/>
</group><group col="2" colspan="2">
<separator colspan="2" string="Contacts"/>
<field name="partner_id" string="Partner"
@ -111,11 +114,11 @@
<field name="email_from"/>
</group><group col="2" colspan="2">
<separator colspan="2" string="Visibility"/>
<field name="show_as" string="Show time as"/>
<field name="class" string="Privacy"/>
<field name="show_as" string="Show time as" groups="base.group_extended"/>
<field name="rrule" groups="base.group_extended" />
<field name="recurrent_id" invisible="1" />
<field name="recurrent_uid" invisible="1" />
<field name="recurrent_id" invisible="1"/>
<field name="recurrent_uid" invisible="1"/>
</group>
</group>
<separator string="Description" colspan="4" />
@ -203,14 +206,12 @@
<field name="arch" type="xml">
<tree string="Meetings"
colors="red:state=='open';black:state in ('draft', 'cancel','done','pending')">
<field name="id" widget="char" />
<field name="name" string="Subject" />
<field name="partner_id" string="Partner" />
<field name="section_id" />
<field name="date" string="Meeting Date" />
<field name="categ_id" />
<field name="duration" />
<field name="user_id" />
<field name="state" />
<field name="state" invisible="1"/>
</tree>
</field>
</record>

View File

@ -115,6 +115,7 @@
icon="gtk-go-forward" />
<button name="case_escalate" string="Escalate"
states="open,draft,pending" type="object"
groups="base.group_extended"
icon="gtk-go-up" />
<button name="case_pending" string="Pending"
states="draft,open" type="object"

View File

@ -296,6 +296,7 @@
icon="gtk-media-pause" />
<button name="case_escalate"
states="open,draft,pending" string="Escalate"
groups="base.group_extended"
type="object" icon="gtk-go-up" />
<button name="case_reset" states="done,cancel"
string="Reset to Draft" type="object"
@ -363,6 +364,7 @@
<button name="case_escalate"
states="open,draft,pending"
string="Escalate" type="object"
groups="base.group_extended"
icon="gtk-go-up" />
<button name="case_reset"
states="done,cancel"
@ -680,7 +682,7 @@
<field eval="18" name="priority"/>
<field name="arch" type="xml">
<field name="password" position="after">
<field name="context_section_id" completion="1" widget="selection"/>
<field name="context_section_id" completion="1" widget="selection"/>
</field>
</field>
</record>
@ -695,7 +697,8 @@
<field eval="18" name="priority"/>
<field name="arch" type="xml">
<field name="parent_id" position="after">
<field name="section_id" completion="1" widget="selection"/>
<field name="section_id" completion="1" widget="selection"
groups="base.group_extended"/>
</field>
</field>
</record>
@ -708,7 +711,8 @@
<field eval="18" name="priority"/>
<field name="arch" type="xml">
<field name="lang" position="after">
<field name="section_id" completion="1" widget="selection"/>
<field name="section_id" completion="1" widget="selection"
groups="base.group_extended"/>
</field>
</field>
</record>
@ -721,7 +725,8 @@
<field eval="18" name="priority"/>
<field name="arch" type="xml">
<field name="category_id" position="after">
<field name="section_id" completion="1" widget="selection"/>
<field name="section_id" completion="1" widget="selection"
groups="base.group_extended"/>
</field>
</field>
</record>

View File

@ -124,10 +124,10 @@
<field name="model">sale.order</field>
<field name="inherit_id" ref="sale.view_order_form"/>
<field name="arch" type="xml">
<separator string="Notes" position="before">
<group name="logistic" position="inside">
<field name="id" invisible="True"/>
<field name="carrier_id" context="{'order_id':id}"/>
</separator>
</group>
</field>
</record>

View File

@ -4,6 +4,7 @@
<record id="config_call_account_template" model="ir.actions.todo">
<field name="action_id" ref="account.action_wizard_multi_chart"/>
<field name="restart">onskip</field>
</record>
</data>

View File

@ -42,6 +42,7 @@
<record id="action_config_journal_todo" model="ir.actions.todo">
<field name="action_id" ref="action_config_journal"/>
<field name="sequence">5</field>
<field name="restart">onskip</field>
</record>
</data>
</openerp>

View File

@ -44,6 +44,7 @@
<record id="action_config_tax_todo" model="ir.actions.todo">
<field name="action_id" ref="action_config_tax"/>
<field name="sequence">5</field>
<field name="restart">onskip</field>
</record>
</data>
</openerp>

View File

@ -7,6 +7,7 @@
This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template.</field>
<field name="action_id" ref="account.action_wizard_multi_chart"/>
<field name="sequence">4</field>
<field name="restart">onskip</field>
</record>
</data>
</openerp>
</openerp>

View File

@ -2,13 +2,14 @@
<openerp>
<data>
<record id="config_call_account_template_uk_minimal" model="ir.actions.todo">
<field name="name">Generate Chart of Accounts from a Chart Template</field>
<field name="note">Generate Chart of Accounts from a Chart Template. You will be asked to pass the name of the company, the chart template to follow, the no. of digits to generate the code for your accounts and Bank account, currency to create Journals. Thus,the pure copy of chart Template is generated.
This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template.</field>
<field name="action_id" ref="account.action_wizard_multi_chart"/>
<field name="state">open</field>
</record>
<record id="config_call_account_template_uk_minimal" model="ir.actions.todo">
<field name="name">Generate Chart of Accounts from a Chart Template</field>
<field name="note">Generate Chart of Accounts from a Chart Template. You will be asked to pass the name of the company, the chart template to follow, the no. of digits to generate the code for your accounts and Bank account, currency to create Journals. Thus,the pure copy of chart Template is generated.
This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template.</field>
<field name="action_id" ref="account.action_wizard_multi_chart"/>
<field name="state">open</field>
<field name="restart">onskip</field>
</record>
</data>
</openerp>
</openerp>

View File

@ -2,24 +2,25 @@
<openerp>
<data>
<wizard id="wizard_l10n_fr_pcg_cdr_report"
string="Compte de resultat"
model="account.move.line"
name="l10n.fr.cdr.report"
keyword="client_print_multi"
/>
string="Compte de resultat"
model="account.move.line"
name="l10n.fr.cdr.report"
keyword="client_print_multi"
/>
<wizard id="wizard_l10n_fr_pcg_bilan_report"
string="Bilan"
model="account.move.line"
name="l10n.fr.bilan.report"
keyword="client_print_multi"
/>
<record id="config_call_account_template_fr_pcg" model="ir.actions.todo">
<field name="name">Generate Chart of Accounts from a Chart Template</field>
<field name="note">Generate Chart of Accounts from a Chart Template. You will be asked to pass the name of the company, the chart template to follow, the no. of digits to generate the code for your accounts and Bank account, currency to create Journals. Thus,the pure copy of chart Template is generated.
This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template.</field>
<field name="action_id" ref="account.action_wizard_multi_chart"/>
</record>
string="Bilan"
model="account.move.line"
name="l10n.fr.bilan.report"
keyword="client_print_multi"
/>
<record id="config_call_account_template_fr_pcg" model="ir.actions.todo">
<field name="name">Generate Chart of Accounts from a Chart Template</field>
<field name="note">Generate Chart of Accounts from a Chart Template. You will be asked to pass the name of the company, the chart template to follow, the no. of digits to generate the code for your accounts and Bank account, currency to create Journals. Thus,the pure copy of chart Template is generated.
This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template.</field>
<field name="action_id" ref="account.action_wizard_multi_chart"/>
<field name="restart">onskip</field>
</record>
</data>
</openerp>

View File

@ -4,6 +4,7 @@
<record id="config_call_account_template" model="ir.actions.todo">
<field name="action_id" ref="account.action_wizard_multi_chart"/>
<field name="restart">onskip</field>
</record>
<menuitem

View File

@ -334,12 +334,13 @@ class mrp_bom(osv.osv):
d, m = divmod(factor, wc_use.workcenter_id.capacity_per_cycle)
mult = (d + (m and 1.0 or 0.0))
cycle = mult * wc_use.cycle_nbr
print mult, wc_use.hour_nbr, wc.time_start, wc.time_stop, cycle
result2.append({
'name': bom.routing_id.name,
'workcenter_id': wc.id,
'sequence': level+(wc_use.sequence or 0),
'cycle': cycle,
'hour': float(wc_use.hour_nbr*mult + (wc.time_start+wc.time_stop+cycle*wc.time_cycle) * (wc.time_efficiency or 1.0)),
'hour': float(wc_use.hour_nbr*mult + ((wc.time_start or 0.0)+(wc.time_stop or 0.0)+cycle*(wc.time_cycle or 0.0)) * (wc.time_efficiency or 1.0)),
})
for bom2 in bom.bom_lines:
res = self._bom_explode(cr, uid, bom2, factor, properties, addthis=True, level=level+10)

View File

@ -39,7 +39,7 @@
id="menu_mrp_configuration"
name="Configuration"
parent="base.menu_mrp_root"
groups="group_mrp_manager"
groups="base.group_extended"
sequence="50" />
<record id="mrp_property_tree_view" model="ir.ui.view">

View File

@ -71,7 +71,7 @@
<group colspan="1" col="2">
<separator string="Codes" colspan="2"/>
<field name="default_code" select="1"/>
<field groups="base.group_extended" name="ean13"/>
<field name="ean13" groups="base.group_extended"/>
</group>
<group colspan="1" col="2">
<separator string="Product Characteristics" colspan="2"/>
@ -132,8 +132,8 @@
<field name="loc_case"/>
</group>
<group colspan="2" col="2" name="misc">
<separator string="Miscellaneous" colspan="2" groups="base.group_extended"/>
<group colspan="2" col="2" name="misc" groups="base.group_extended">
<separator string="Miscellaneous" colspan="2"/>
<field name="active"/>
<field name="company_id" groups="base.group_multi_company" widget="selection"/>
</group>

View File

@ -9,7 +9,7 @@
<field name="priority">36</field>
<field name="arch" type="xml">
<group name="sale_list" position="after" groups="base.group_extended">
<group colspan="2" col="2">
<group colspan="2" col="2" groups="base.group_extended">
<separator string="Purchases Properties" colspan="2"/>
<field name="property_product_pricelist_purchase"/>
</group>

View File

@ -20,7 +20,7 @@
<menuitem id="menu_procurement_management_nventory" name="Inventory Control"
parent="base.menu_purchase_root" sequence="4"/>
<menuitem action="stock.action_picking_tree4" id="menu_action_picking_tree4" parent="menu_procurement_management_nventory"
name="Incoming shipments" sequence="9"/>
name="Incoming Shipments" sequence="9"/>
<menuitem action="stock.action_reception_picking_move" id="menu_action_reception_picking_move"
name="Incoming Products" parent="menu_procurement_management_nventory" sequence="10"/>

View File

@ -1093,7 +1093,8 @@ class sale_config_picking_policy(osv.osv_memory):
'order_policy': fields.selection([
('manual', 'Invoice Based on Sales Orders'),
('picking', 'Invoice Based on Deliveries'),
], 'Shipping Default Policy', required=True),
], 'Shipping Default Policy', required=True,
help="You can generate invoices based on sales orders or based on shippings."),
'step': fields.selection([
('one', 'Delivery Order Only'),
('two', 'Picking List & Delivery Order')
@ -1105,7 +1106,7 @@ class sale_config_picking_policy(osv.osv_memory):
}
_defaults = {
'picking_policy': lambda *a: 'direct',
'order_policy': lambda *a: 'picking',
'order_policy': lambda *a: 'manual',
'step': lambda *a: 'one'
}

View File

@ -119,7 +119,6 @@
<form string="Sale Order Lines">
<notebook>
<page string="Order Line">
<separator colspan="4" string="Automatic Declaration"/>
<field colspan="4"
context="partner_id=parent.partner_id,quantity=product_uom_qty,pricelist=parent.pricelist_id,shop=parent.shop_id,uom=product_uom"
name="product_id"
@ -140,7 +139,6 @@
groups="base.group_extended"/>
<field name="company_id" groups="base.group_multi_company" widget="selection"/>
<separator colspan="4" string="Manual Description"/>
<field colspan="4" name="name"/>
<field name="price_unit"/>
<field name="discount"/>
@ -148,9 +146,9 @@
<field name="delay" groups="base.group_extended"/>
<newline/>
<field colspan="4" name="tax_id" domain="[('parent_id','=',False),('type_tax_use','&lt;&gt;','purchase')]"/>
<separator colspan="4" string="States"/>
<field name="state"/>
<group col="3" colspan="2">
<group colspan="4" col="5" groups="base.group_extended">
<separator colspan="5" string="States"/>
<field name="state"/>
<field name="invoiced"/>
<button colspan="1"
name="%(action_view_sale_order_line_make_invoice)d"
@ -212,7 +210,7 @@
</group>
</page>
<page string="Other data">
<group colspan="2" col="2" groups="base.group_extended">
<group colspan="2" col="2" groups="base.group_extended" name="logistic">
<separator string="Logistic" colspan="2"/>
<field name="incoterm"/>
<field name="picking_policy" required="True"/>
@ -509,11 +507,11 @@
</form>
<group string="res_config_contents" position="replace">
<label colspan="4" align="0.0"
string="Set the policies selected by default when creating a new sale order."/>
string="Setup your sales workflow and default values."/>
<separator colspan="4"
string="Configure Sale Order Logistic"/>
<newline/>
<field name="picking_policy"/>
<field name="picking_policy" groups="base.group_extended"/>
<newline/>
<field name="order_policy"/>
<newline/>

View File

@ -8,10 +8,10 @@
<field name="type">form</field>
<field name="inherit_id" ref="crm.crm_case_form_view_oppor"/>
<field name="arch" type="xml">
<xpath expr="/form[@string='Opportunities']/group/button[@string='Schedule Call']" position="after">
<field name="priority" position="after">
<button string="Convert to Quote" icon="terp-sale" name="%(sale_crm_wizard)d" type="action"/>
<label colspan="6" string=""/>
</xpath>
<label colspan="2" string=""/>
</field>
</field>
</record>
@ -22,7 +22,7 @@
<field name="inherit_id" ref="sale.view_order_form"/>
<field name="arch" type="xml">
<field name="user_id" position="after">
<field name="section_id" widget="selection"/>
<field name="section_id" widget="selection" groups="base.group_extended"/>
</field>
</field>
</record>
@ -37,6 +37,7 @@
<field name="section_id" default="context.get('section_id', False)" select="1" widget="selection" string="Section">
<filter icon="terp-crm"
domain="[('section_id','=',context.get('section_id',False))]"
groups="base.group_extended"
help="My section"/>
</field>
</field>

View File

@ -12,7 +12,7 @@
<field name="inherit_id" ref="base.view_partner_form"/>
<field name="arch" type="xml">
<page string="Sales &amp; Purchases" position="inside">
<group colspan="4" col="4">
<group colspan="4" col="4" groups="base.group_extended">
<separator string="Stock Properties" colspan="4"/>
<field name="property_stock_customer" widget="selection" domain="[('usage','=','customer')]" />
<field name="property_stock_supplier" widget="selection" domain="[('usage','=','supplier')]"/>