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

[IMP] form views 

bzr revid: fp@tinyerp.com-20120607181950-0x1uwz0ef8p25m7u
This commit is contained in:
Fabien Pinckaers 2012-06-07 20:19:50 +02:00
parent 183ecc85e6
commit 1ad391c398
14 changed files with 313 additions and 331 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
addons/l10n_be/wizard/l10n_be_account_vat_declaration_view.xml
View File

@ -8,28 +8,23 @@
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Periodical VAT Declaration"> <form string="Periodical VAT Declaration">
<header>
<button icon="gtk-execute" name="create_xml" string="Create XML" type="object" default_focus="1" />
<button special="cancel" string="Close" icon="gtk-cancel"/>
</header>
<group> <group>
<group colspan="4"> <group string="Declare Periodical VAT">
<separator string="Declare Periodical VAT" colspan="4"/>
<field name="period_id" widget="selection"/> <field name="period_id" widget="selection"/>
<field name="tax_code_id" string="Company" widget="selection" groups="base.group_multi_company"/> <field name="tax_code_id" string="Company" widget="selection" groups="base.group_multi_company"/>
<newline/> </group>
<separator string="Advanced Options" colspan="4"/> <group string="Advanced Options">
<field name="ask_restitution"/> <field name="ask_restitution"/>
<field name="ask_payment"/> <field name="ask_payment"/>
<field name="client_nihil" string="Is Last Declaration"/><label/> <field name="client_nihil" string="Is Last Declaration"/>
</group>
<group colspan="4">
<separator string="Comments" colspan="4"/>
<field colspan="4" name="comments" nolabel="1"/>
</group>
<group>
<separator colspan="4"/>
<newline/>
<button special="cancel" string="Close" icon="gtk-cancel"/>
<button icon="gtk-execute" name="create_xml" string="Create XML" type="object" default_focus="1" />
</group> </group>
</group> </group>
<separator string="Comments"/>
<field name="comments"/>
</form> </form>
</field> </field>
</record> </record>
@ -40,14 +35,12 @@
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Save xml"> <form string="Save xml">
<group colspan="3"> <header>
<label string="Save the File with '.xml' extension." colspan="2" align="0.0"/><newline/>
<field name="name"/><newline/>
<field name="file_save" readonly="True" filename="name"/>
<newline/>
<separator colspan="4"/><label/>
<button special="cancel" string="Ok" icon="gtk-ok"/> <button special="cancel" string="Ok" icon="gtk-ok"/>
</group> </header>
<label string="Save the File with '.xml' extension."/>
<field name="name"/>
<field name="file_save" readonly="True" filename="name"/>
</form> </form>
</field> </field>
</record> </record>

156
addons/l10n_br/l10n_br_view.xml
View File

@ -1,80 +1,84 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<openerp> <openerp>
<data> <data>
<record model="ir.ui.view" id="view_l10n_br_cst_template_form"> <record model="ir.ui.view" id="view_l10n_br_cst_template_form">
<field name="name">l10n_br.cst.form</field> <field name="name">l10n_br.cst.form</field>
<field name="model">l10n_br_account.cst.template</field> <field name="model">l10n_br_account.cst.template</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Tax Situation Code Template"> <form string="Tax Situation Code Template">
<field name="code" select="1"/> <group col="4">
<field name="name" select="1"/> <field name="code"/>
<field name="tax_code_template_id" select="2"/> <field name="name"/>
</form> <field name="tax_code_template_id"/>
</field> </group>
</record> </form>
</field>
</record>
<record model="ir.ui.view" id="view_l10n_br_cst_template_tree"> <record model="ir.ui.view" id="view_l10n_br_cst_template_tree">
<field name="name">l10n_br.cst.tree</field> <field name="name">l10n_br.cst.tree</field>
<field name="model">l10n_br_account.cst.template</field> <field name="model">l10n_br_account.cst.template</field>
<field name="type">tree</field> <field name="type">tree</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<tree string="Tax Situation Code Template"> <tree string="Tax Situation Code Template">
<field name="code" select="1"/> <field name="code" select="1"/>
<field name="name" select="1"/> <field name="name" select="1"/>
<field name="tax_code_template_id" select="2"/> <field name="tax_code_template_id" select="2"/>
</tree> </tree>
</field> </field>
</record> </record>
<record model="ir.actions.act_window" id="action_l10n_br_cst_template_form"> <record model="ir.actions.act_window" id="action_l10n_br_cst_template_form">
<field name="name">Tax Situation Code Template</field> <field name="name">Tax Situation Code Template</field>
<field name="type">ir.actions.act_window</field> <field name="type">ir.actions.act_window</field>
<field name="res_model">l10n_br_account.cst.template</field> <field name="res_model">l10n_br_account.cst.template</field>
<field name="view_mode">tree,form</field> <field name="view_mode">tree,form</field>
<field name="view_type">form</field> <field name="view_type">form</field>
<field name="view_id" ref="view_l10n_br_cst_template_tree"/> <field name="view_id" ref="view_l10n_br_cst_template_tree"/>
</record> </record>
<record model="ir.ui.view" id="view_l10n_br_cst_form"> <record model="ir.ui.view" id="view_l10n_br_cst_form">
<field name="name">l10n_br.cst.form</field> <field name="name">l10n_br.cst.form</field>
<field name="model">l10n_br_account.cst</field> <field name="model">l10n_br_account.cst</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Tax Situation Code"> <form string="Tax Situation Code">
<field name="code" select="1"/> <group col="4">
<field name="name" select="1"/> <field name="code"/>
<field name="tax_code_id" select="2"/> <field name="name"/>
</form> <field name="tax_code_id"/>
</field> </group>
</record> </form>
</field>
</record>
<record model="ir.ui.view" id="view_l10n_br_cst_tree"> <record model="ir.ui.view" id="view_l10n_br_cst_tree">
<field name="name">l10n_br.cst.tree</field> <field name="name">l10n_br.cst.tree</field>
<field name="model">l10n_br_account.cst</field> <field name="model">l10n_br_account.cst</field>
<field name="type">tree</field> <field name="type">tree</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<tree string="Tax Situation Code"> <tree string="Tax Situation Code">
<field name="code" select="1"/> <field name="code" select="1"/>
<field name="name" select="1"/> <field name="name" select="1"/>
<field name="tax_code_id" select="2"/> <field name="tax_code_id" select="2"/>
</tree> </tree>
</field> </field>
</record> </record>
<record model="ir.actions.act_window" id="action_l10n_br_cst_form"> <record model="ir.actions.act_window" id="action_l10n_br_cst_form">
<field name="name">Tax Situation Code</field> <field name="name">Tax Situation Code</field>
<field name="type">ir.actions.act_window</field> <field name="type">ir.actions.act_window</field>
<field name="res_model">l10n_br_account.cst</field> <field name="res_model">l10n_br_account.cst</field>
<field name="view_mode">tree,form</field> <field name="view_mode">tree,form</field>
<field name="view_type">form</field> <field name="view_type">form</field>
<field name="view_id" ref="view_l10n_br_cst_tree"/> <field name="view_id" ref="view_l10n_br_cst_tree"/>
</record> </record>
<menuitem name="Tax Situation Code Template" id="menu_action_l10n_br_cst_template" sequence="99" parent="account.account_template_taxes" action="action_l10n_br_cst_template_form"/> <menuitem name="Tax Situation Code Template" id="menu_action_l10n_br_cst_template" sequence="99" parent="account.account_template_taxes" action="action_l10n_br_cst_template_form"/>
<menuitem name="Tax Situation Code" id="menu_action_l10n_br_cst" parent="account.next_id_27" sequence="99" action="action_l10n_br_cst_form" groups="base.group_no_one"/> <menuitem name="Tax Situation Code" id="menu_action_l10n_br_cst" parent="account.next_id_27" sequence="99" action="action_l10n_br_cst_form" groups="base.group_no_one"/>
</data> </data>
</openerp> </openerp>

13
addons/l10n_ch/wizard/bvr_import_view.xml
View File

@ -8,13 +8,12 @@
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="BVR Import"> <form string="BVR Import">
<group width="525" colspan="4"> <header>
button name="import_bvr" string="Import" type="object" icon="gtk-ok" colspan="2"/>
<button special="cancel" string="Cancel" icon="gtk-cancel" colspan="2"/>
</header>
<group>
<field name="file"/> <field name="file"/>
<newline/>
<group colspan="4">
<button special="cancel" string="Cancel" icon="gtk-cancel" colspan="2"/>
<button name="import_bvr" string="Import" type="object" icon="gtk-ok" colspan="2"/>
</group>
</group> </group>
</form> </form>
</field> </field>
@ -42,4 +41,4 @@
</field> </field>
</record> </record>
</data> </data>
</openerp> </openerp>

10
addons/l10n_ch/wizard/create_dta_view.xml
View File

@ -8,12 +8,12 @@
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="DTA file creation - Results"> <form string="DTA file creation - Results">
<group colspan="4"> <header>
<button name="create_dta" string="Create DTA" type="object" icon="gtk-execute" colspan="2"/>
<button special="cancel" string="Cancel" icon="gtk-cancel" colspan="2"/>
</header>
<group>
<field name="dta_file"/> <field name="dta_file"/>
<group colspan="4">
<button special="cancel" string="Cancel" icon="gtk-cancel" colspan="2"/>
<button name="create_dta" string="Create DTA" type="object" icon="gtk-execute" colspan="2"/>
</group>
</group> </group>
</form> </form>
</field> </field>

13
addons/l10n_fr/wizard/fr_report_bilan_view.xml
View File

@ -8,14 +8,13 @@
<field name="model">account.bilan.report</field> <field name="model">account.bilan.report</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Bilan Report"> <form string="Bilan Report">
<field name="fiscalyear_id"/> <header>
<separator colspan="4"/>
<group colspan="4" col="6">
<button special="cancel" string="Cancel" icon="gtk-cancel"/>
<button name="print_bilan_report" string="Print" type="object" icon="gtk-ok"/> <button name="print_bilan_report" string="Print" type="object" icon="gtk-ok"/>
</group> <button special="cancel" string="Cancel" icon="gtk-cancel"/>
</form> </header>
<field name="fiscalyear_id"/>
</form>
</field> </field>
</record> </record>

11
addons/l10n_fr/wizard/fr_report_compute_resultant_view.xml
View File

@ -7,14 +7,13 @@
<field name="model">account.cdr.report</field> <field name="model">account.cdr.report</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string='Compte de resultant'> <form string='Compte de resultat'>
<field name="fiscalyear_id"/> <header>
<separator colspan="4"/>
<group colspan="4" col="6">
<button special="cancel" string="Cancel" icon="gtk-cancel"/> <button special="cancel" string="Cancel" icon="gtk-cancel"/>
<button name="print_cdr_report" string="Print" type="object" icon="gtk-ok"/> <button name="print_cdr_report" string="Print" type="object" icon="gtk-ok"/>
</group> </header>
</form> <field name="fiscalyear_id"/>
</form>
</field> </field>
</record> </record>

18
addons/l10n_lu/wizard/print_vat_view.xml
View File

@ -6,15 +6,16 @@
<field name="model">vat.declaration.report</field> <field name="model">vat.declaration.report</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Print Tax Statements"> <form string="Print Tax Statements">
<field name="tax_code_id" widget="selection"/> <header>
<field name="period_id" widget="selection"/>
<separator colspan="4"/>
<group colspan="4" col="6">
<button special="cancel" string="Cancel" icon="gtk-cancel"/>
<button name="print_vat_declaration_report" string="Print Tax Statements" type="object" icon="gtk-ok"/> <button name="print_vat_declaration_report" string="Print Tax Statements" type="object" icon="gtk-ok"/>
</group> <button special="cancel" string="Cancel" icon="gtk-cancel"/>
</form> </header>
<group col="4">
<field name="tax_code_id" widget="selection"/>
<field name="period_id" widget="selection"/>
</group>
</form>
</field> </field>
</record> </record>
@ -32,4 +33,5 @@
<menuitem name="VAT Declaration" id="legal_lu_vat" parent="legal_lu" action="action_vat_report"/> <menuitem name="VAT Declaration" id="legal_lu_vat" parent="legal_lu" action="action_vat_report"/>
</data> </data>
</openerp> </openerp>

72
addons/lunch/lunch_view.xml
View File

@ -23,20 +23,22 @@
<field name="name">Order</field> <field name="name">Order</field>
<field name="model">lunch.order</field> <field name="model">lunch.order</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form layout="manual"> <form>
<header> <header>
<button name="%(action_lunch_order_confirm)d" string="Confirm Order" type="action" attrs="{'invisible':[('state','=','confirmed')]}"/> <button name="%(action_lunch_order_confirm)d" string="Confirm Order" type="action" attrs="{'invisible':[('state','=','confirmed')]}"/>
<button name="%(action_lunch_order_cancel)d" string="Cancel Order" type="action"/> <button name="%(action_lunch_order_cancel)d" string="Cancel Order" type="action"/>
<field name="state" widget="statusbar" statusbar_visible="draft,confirmed"/> <field name="state" widget="statusbar" statusbar_visible="draft,confirmed"/>
</header> </header>
<sheet string="Order" layout="auto"> <sheet string="Order">
<field name="user_id" select="1"/> <group col="4">
<field name="date" select="1"/> <field name="user_id"/>
<field name="product" select="1" on_change="onchange_product(product)"/> <field name="date"/>
<field name="category"/> <field name="product" on_change="onchange_product(product)"/>
<field name="descript"/> <field name="category"/>
<field name="price"/> <field name="descript"/>
<field name="cashmove"/> <field name="price"/>
<field name="cashmove"/>
</group>
</sheet> </sheet>
</form> </form>
</field> </field>
@ -104,8 +106,8 @@
<field name="model">lunch.cashbox</field> <field name="model">lunch.cashbox</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Cashboxes"> <form string="Cashboxes">
<field name="name" select="1"/> <field name="name"/>
<field name="manager" select="1"/> <field name="manager"/>
</form> </form>
</field> </field>
</record> </record>
@ -118,9 +120,9 @@
<field name="type">tree</field> <field name="type">tree</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<tree string="Cashboxes" colors="red:sum_remain&lt;=0"> <tree string="Cashboxes" colors="red:sum_remain&lt;=0">
<field name="name" select="1"/> <field name="name"/>
<field name="manager" select="1"/> <field name="manager"/>
<field name="sum_remain" select="1"/> <field name="sum_remain"/>
</tree> </tree>
</field> </field>
</record> </record>
@ -144,12 +146,14 @@
<field name="model">lunch.cashmove</field> <field name="model">lunch.cashmove</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="CashMove"> <form string="CashMove">
<field name="name" select="1"/> <group col="4">
<field name="user_cashmove" select="1"/> <field name="name"/>
<field name="amount"/> <field name="user_cashmove"/>
<field name="box" select="1"/> <field name="amount"/>
<field name="create_date" select="1"/> <field name="box"/>
<field name="active" select="1"/> <field name="create_date"/>
<field name="active"/>
</group>
</form> </form>
</field> </field>
</record> </record>
@ -163,10 +167,10 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<tree string="CashMove" editable="top"> <tree string="CashMove" editable="top">
<field name="create_date"/> <field name="create_date"/>
<field name="box" select="1"/> <field name="box"/>
<field name="name" select="1" required="1"/> <field name="name" required="1"/>
<field name="user_cashmove" select="1"/> <field name="user_cashmove"/>
<field name="amount" select="1" sum="Total amount"/> <field name="amount" sum="Total amount"/>
</tree> </tree>
</field> </field>
</record> </record>
@ -217,7 +221,7 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Category"> <form string="Category">
<separator string="Category Related to Products" colspan="4"/> <separator string="Category Related to Products" colspan="4"/>
<field name="name" select="1"/> <field name="name"/>
</form> </form>
</field> </field>
</record> </record>
@ -230,7 +234,7 @@
<field name="type">tree</field> <field name="type">tree</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<tree string="Order"> <tree string="Order">
<field name="name" select="1"/> <field name="name"/>
</tree> </tree>
</field> </field>
</record> </record>
@ -251,7 +255,7 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Products"> <form string="Products">
<group col="6"> <group col="6">
<field name="name" select="1"/> <field name="name"/>
<field name="category_id"/> <field name="category_id"/>
<field name="price" /> <field name="price" />
</group> </group>
@ -331,9 +335,9 @@
<field name="year" invisible="1"/> <field name="year" invisible="1"/>
<field name="day" invisible="1"/> <field name="day" invisible="1"/>
<field name="month" invisible="1"/> <field name="month" invisible="1"/>
<field name="box" select="1"/> <field name="box"/>
<field name="user_id" select="1"/> <field name="user_id"/>
<field name="amount" select="1" sum="Total box" /> <field name="amount" sum="Total box" />
</tree> </tree>
</field> </field>
</record> </record>
@ -346,9 +350,11 @@
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Box Amount by User"> <form string="Box Amount by User">
<field name="user_id" select="1"/> <group col="4">
<field name="box" select="1"/> <field name="user_id"/>
<field name="amount" select="1"/> <field name="box"/>
<field name="amount"/>
</group>
</form> </form>
</field> </field>
</record> </record>

23
addons/lunch/wizard/lunch_cashbox_clean_view.xml
View File

@ -4,23 +4,20 @@
<!-- Lunch cashbox --> <!-- Lunch cashbox -->
<record id="view_lunch_cashbox_clean" model="ir.ui.view"> <record id="view_lunch_cashbox_clean" model="ir.ui.view">
<field name="name">lunch.cashbox.clean.form</field> <field name="name">lunch.cashbox.clean.form</field>
<field name="model">lunch.cashbox.clean</field> <field name="model">lunch.cashbox.clean</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Reset cashbox"> <form string="Reset cashbox">
<group colspan="4" > <header>
<label string="Are you sure you want to reset this cashbox ?"/> <button icon="gtk-ok" name="set_to_zero" string="Set to Zero" type="object"/>
</group> <button icon="gtk-cancel" special="cancel" string="No"/>
<separator string="" colspan="4" /> </header>
<group colspan="4" col="6"> <label string="Are you sure you want to reset this cashbox ?"/>
<button icon="gtk-cancel" special="cancel" string="No"/>
<button icon="gtk-ok" name="set_to_zero" string="Set to Zero" type="object"/>
</group>
</form> </form>
</field> </field>
</record> </record>
<record id="action_lunch_cashbox_clean" model="ir.actions.act_window"> <record id="action_lunch_cashbox_clean" model="ir.actions.act_window">
<field name="name">Set CashBox to Zero</field> <field name="name">Set CashBox to Zero</field>
@ -32,9 +29,9 @@
</record> </record>
<act_window id="action_lunch_cashbox_clean_values" <act_window id="action_lunch_cashbox_clean_values"
key2="client_action_multi" name="Set CashBox to Zero" key2="client_action_multi" name="Set CashBox to Zero"
res_model="lunch.cashbox.clean" src_model="lunch.cashbox" res_model="lunch.cashbox.clean" src_model="lunch.cashbox"
view_mode="form" target="new" view_type="form" /> view_mode="form" target="new" view_type="form" />
</data> </data>
</openerp> </openerp>

23
addons/lunch/wizard/lunch_order_cancel_view.xml
View File

@ -4,23 +4,22 @@
<!-- cancel order --> <!-- cancel order -->
<record id="view_lunch_order_cancel" model="ir.ui.view"> <record id="view_lunch_order_cancel" model="ir.ui.view">
<field name="name">lunch.order.cancel.form</field> <field name="name">lunch.order.cancel.form</field>
<field name="model">lunch.order.cancel</field> <field name="model">lunch.order.cancel</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Cancel Order"> <form string="Cancel Order">
<group colspan="4" > <header>
<label string="Are you sure you want to cancel this order ?"/> <button icon="gtk-ok" name="cancel" string="Yes" type="object"/>
</group> <button icon="gtk-cancel" special="cancel" string="No"/>
<separator string="" colspan="4" /> </header>
<group colspan="4" col="6"> <group col="4" >
<button icon="gtk-cancel" special="cancel" string="No"/> <label string="Are you sure you want to cancel this order ?"/>
<button icon="gtk-ok" name="cancel" string="Yes" type="object"/>
</group> </group>
</form> </form>
</field> </field>
</record> </record>
<record id="action_lunch_order_cancel" model="ir.actions.act_window"> <record id="action_lunch_order_cancel" model="ir.actions.act_window">
<field name="name">Cancel Order</field> <field name="name">Cancel Order</field>
@ -32,9 +31,9 @@
</record> </record>
<act_window id="action_lunch_order_cancel_values" <act_window id="action_lunch_order_cancel_values"
key2="client_action_multi" name="Cancel Order" key2="client_action_multi" name="Cancel Order"
res_model="lunch.order.cancel" src_model="lunch.order" res_model="lunch.order.cancel" src_model="lunch.order"
view_mode="form" target="new" view_type="form"/> view_mode="form" target="new" view_type="form"/>
</data> </data>
</openerp> </openerp>

26
addons/lunch/wizard/lunch_order_confirm_view.xml
View File

@ -4,25 +4,23 @@
<!-- confirm order --> <!-- confirm order -->
<record id="view_lunch_order_confirm" model="ir.ui.view"> <record id="view_lunch_order_confirm" model="ir.ui.view">
<field name="name">lunch.order.confirm.form</field> <field name="name">lunch.order.confirm.form</field>
<field name="model">lunch.order.confirm</field> <field name="model">lunch.order.confirm</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Confirm"> <form string="Confirm">
<group colspan="4" > <header>
<separator string="Orders Confirmation" colspan="4"/> <button icon="gtk-ok" name="confirm" string="Confirm Order" type="object"/>
<field name="confirm_cashbox"/> <button icon="gtk-cancel" special="cancel" string="Cancel"/>
<newline/> </header>
</group> <group col="4">
<separator string="" colspan="4" /> <separator string="Orders Confirmation" colspan="4"/>
<group colspan="4" col="6"> <field name="confirm_cashbox"/>
<button icon="gtk-cancel" special="cancel" string="Cancel"/>
<button icon="gtk-ok" name="confirm" string="Confirm Order" type="object"/>
</group> </group>
</form> </form>
</field> </field>
</record> </record>
<record id="action_lunch_order_confirm" model="ir.actions.act_window"> <record id="action_lunch_order_confirm" model="ir.actions.act_window">
<field name="name">Confirm Order</field> <field name="name">Confirm Order</field>
@ -34,9 +32,9 @@
</record> </record>
<act_window id="action_lunch_order_confirm_values" <act_window id="action_lunch_order_confirm_values"
key2="client_action_multi" name="Confirm Order" key2="client_action_multi" name="Confirm Order"
res_model="lunch.order.confirm" src_model="lunch.order" res_model="lunch.order.confirm" src_model="lunch.order"
view_mode="form" target="new" view_type="form"/> view_mode="form" target="new" view_type="form"/>
</data> </data>
</openerp> </openerp>

55
addons/mail/mail_message_view.xml
View File

@ -26,17 +26,19 @@
<field name="priority">20</field> <field name="priority">20</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Message"> <form string="Message">
<group colspan="2" col="2"> <group>
<field name="subject"/> <group>
<field name="date"/> <field name="subject"/>
<field name="type"/> <field name="date"/>
<field name="body_text"/> <field name="type"/>
</group> <field name="body_text"/>
<group colspan="2" col="2"> </group>
<field name="user_id" string="User" readonly="0"/> <group>
<field name="model"/> <field name="user_id" string="User"/>
<field name="res_id"/> <field name="model"/>
<field name="parent_id"/> <field name="res_id"/>
<field name="parent_id"/>
</group>
</group> </group>
</form> </form>
</field> </field>
@ -77,52 +79,47 @@
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Email message"> <form string="Email message">
<group colspan="4" col="6"> <label for="subject" class="oe_form_readonly_hidden"/>
<field name="subject" colspan="4"/> <h1><field name="subject"/></h1>
<field name="date"/> <label for="user_id"/>
<field name="user_id" string="User"/> <h2><field name="user_id" class="or_form_inline" string="User"/> on <field name="date" class="or_form_inline"/></h2>
<group col="4">
<field name="partner_id" readonly="1" attrs="{'invisible':[('partner_id', '=', False)]}"/> <field name="partner_id" readonly="1" attrs="{'invisible':[('partner_id', '=', False)]}"/>
<field name="type"/> <field name="type"/>
</group> </group>
<notebook colspan="4"> <notebook colspan="4">
<page string="Details"> <page string="Details">
<group col="2" colspan="2"> <group string="Recipients">
<separator string="Recipients" colspan="4"/>
<field name="email_from"/> <field name="email_from"/>
<field name="email_to"/> <field name="email_to"/>
<field name="email_cc" attrs="{'invisible':[('email_cc', '=', False)]}"/> <field name="email_cc" attrs="{'invisible':[('email_cc', '=', False)]}"/>
<field name="email_bcc" attrs="{'invisible':[('email_bcc', '=', False)]}"/> <field name="email_bcc" attrs="{'invisible':[('email_bcc', '=', False)]}"/>
<field name="reply_to" attrs="{'invisible':[('reply_to', '=', False)]}"/> <field name="reply_to" attrs="{'invisible':[('reply_to', '=', False)]}"/>
</group> </group>
<group col="4" colspan="2"> <group col="4" string="Message Details">
<separator string="Message Details" colspan="4"/>
<field name="model"/> <field name="model"/>
<button name="open_document" string="Open" type="object" icon="gtk-jump-to" colspan="2"/> <button name="open_document" string="Open" type="object" icon="gtk-jump-to" colspan="2"/>
<field name="res_id"/> <field name="res_id"/>
<field name="message_id" colspan="4" attrs="{'invisible':[('message_id', '=', False)]}"/> <field name="message_id" colspan="4" attrs="{'invisible':[('message_id', '=', False)]}"/>
<field name="references" colspan="4" widget="char" size="512" attrs="{'invisible':[('references', '=', False)]}"/> <field name="references" colspan="4" widget="char" size="512" attrs="{'invisible':[('references', '=', False)]}"/>
</group> </group>
<notebook colspan="4"> <notebook>
<page string="Body (Rich)" attrs="{'invisible':[('subtype','=','plain')]}"> <page string="Body (Rich)" attrs="{'invisible':[('subtype','=','plain')]}">
<field name="body_html" widget="text_html" nolabel="1" colspan="4"/> <field name="body_html" widget="text_html"/>
</page> </page>
<page string="Body (Plain)"> <page string="Body (Plain)">
<field name="body_text" colspan="4" widget="text" nolabel="1"/> <field name="body_text" widget="text"/>
</page> </page>
</notebook> </notebook>
<separator string="" colspan="4"/> <group col="5">
<group col="6" colspan="6">
<field name="state" colspan="2"/> <field name="state" colspan="2"/>
<field name="subtype" attrs="{'invisible':[('subtype', '=', False)]}"/> <field name="subtype" attrs="{'invisible':[('subtype', '=', False)]}"/>
<group colspan="2"> <button name="%(action_email_compose_message_wizard)d" string="Reply" type="action" icon="terp-mail-replied"
<button name="%(action_email_compose_message_wizard)d" string="Reply" type="action" icon="terp-mail-replied"
context="{'mail.compose.message.mode':'reply', 'message_id':active_id}" states='received,sent,exception,cancel'/> context="{'mail.compose.message.mode':'reply', 'message_id':active_id}" states='received,sent,exception,cancel'/>
</group>
</group> </group>
</page> </page>
<page string="Attachments"> <page string="Attachments">
<separator string="Attachments" colspan="4"/> <field name="attachment_ids"/>
<field name="attachment_ids" nolabel="1" colspan="4"/>
</page> </page>
<page string="Advanced" groups="base.group_no_one"> <page string="Advanced" groups="base.group_no_one">
<group col="2" colspan="4"> <group col="2" colspan="4">

14
addons/marketing/res_config_view.xml
View File

@ -6,17 +6,17 @@
<field name="model">marketing.config.settings</field> <field name="model">marketing.config.settings</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Configure Marketing" layout="manual"> <form string="Configure Marketing">
<header> <header>
<button string="Apply" type="object" name="execute"/> <button string="Apply" type="object" name="execute"/>
<button string="Cancel" special="cancel"/> <button string="Cancel" special="cancel"/>
</header> </header>
<sheet layout="auto"> <sheet>
<separator string="Campaigns" colspan="4"/> <group col="4" string="Campaigns"/>
<field name="module_marketing_campaign"/> <field name="module_marketing_campaign"/>
<field name="module_marketing_campaign_crm_demo"/> <field name="module_marketing_campaign_crm_demo"/>
<newline/> <field name="module_crm_profiling"/>
<field name="module_crm_profiling"/> </group>
</sheet> </sheet>
</form> </form>
</field> </field>

173
addons/marketing_campaign/marketing_campaign_view.xml
View File

@ -15,7 +15,7 @@
<field name="model">marketing.campaign</field> <field name="model">marketing.campaign</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form layout="manual"> <form>
<header> <header>
<button name="state_running_set" string="Run" states="draft"/> <button name="state_running_set" string="Run" states="draft"/>
<button name="state_done_set" string="Done" states="running"/> <button name="state_done_set" string="Done" states="running"/>
@ -23,27 +23,24 @@
<button name="state_cancel_set" string="Cancel" states="running"/> <button name="state_cancel_set" string="Cancel" states="running"/>
<field name="state" readonly="1" widget="statusbar" statusbar_visible="draft,running,done"/> <field name="state" readonly="1" widget="statusbar" statusbar_visible="draft,running,done"/>
</header> </header>
<sheet string="Campaign" layout="auto"> <sheet string="Campaign">
<group colspan="4" col="6"> <group>
<group colspan="2" col="2"> <group string="Campaign">
<separator string="Campaign" colspan="2" /> <field name="name"/>
<field name="name" select="1"/>
<field name="mode"/> <field name="mode"/>
</group> </group>
<group colspan="2" col="2"> <group string="Resource">
<separator string="Resource" colspan="2" />
<field name="object_id"/> <field name="object_id"/>
<field name="partner_field_id"/> <field name="partner_field_id"/>
<field name="unique_field_id"/> <field name="unique_field_id"/>
</group> </group>
<group colspan="2" col="2"> <group string="Cost">
<separator string="Cost" colspan="2" />
<field name="fixed_cost"/> <field name="fixed_cost"/>
</group> </group>
</group> </group>
<field name="activity_ids" nolabel = "1" colspan="4" context="{'default_object_id': object_id, 'default_campaign_id': active_id}" /> <field name="activity_ids" context="{'default_object_id': object_id, 'default_campaign_id': active_id}" />
</sheet> </sheet>
</form> </form>
</field> </field>
</record> </record>
@ -53,8 +50,8 @@
<field name="type">tree</field> <field name="type">tree</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<tree colors="blue:state == 'draft';black:state == 'running';gray:state in ('done','cancelled')" string="Campaigns"> <tree colors="blue:state == 'draft';black:state == 'running';gray:state in ('done','cancelled')" string="Campaigns">
<field name="name" select="1"/> <field name="name"/>
<field name="object_id" select="1"/> <field name="object_id"/>
<field name="mode"/> <field name="mode"/>
<field name="fixed_cost"/> <field name="fixed_cost"/>
<field name="state"/> <field name="state"/>
@ -145,28 +142,28 @@
<field name="state" readonly="1" widget="statusbar" statusbar_visible="draft,running,done"/> <field name="state" readonly="1" widget="statusbar" statusbar_visible="draft,running,done"/>
</header> </header>
<sheet string="Segments" layout="auto"> <sheet string="Segments" layout="auto">
<group colspan="2" col="2"> <group>
<separator string="Segment" colspan="4"/> <group string="Segment">
<field name="name"/> <field name="name"/>
<field name="campaign_id" select="1" on_change="onchange_campaign_id(campaign_id)"/> <field name="campaign_id" on_change="onchange_campaign_id(campaign_id)"/>
<field name="object_id" invisible="1"/> <field name="object_id" invisible="1"/>
</group> </group>
<group colspan="2" col="2"> <group string="Filter">
<separator string="Filter" colspan="4"/> <field name="ir_filter_id"/>
<field name="ir_filter_id"/> </group>
</group> <group string="Synchronization">
<newline/> <field name="sync_mode" required="True"/>
<group colspan="2" col="4"> <label for="sync_last_date"/>
<separator string="Synchronization" colspan="4"/> <div>
<field name="sync_mode" required="True" colspan="4"/> <field name="sync_last_date" class="oe_form_inline"/>
<field name="sync_last_date" colspan="3"/> <button string="Synchronize Manually" states="running" name="synchroniz" type="object"/>
<button string="Synchronize Manually" states="running" name="synchroniz" icon="terp-project" type="object"/> </div>
<field name="date_next_sync" colspan="3"/> <field name="date_next_sync"/>
</group> </group>
<group colspan="2" col="2"> <group string="History">
<separator string="History" colspan="2"/> <field name="date_run" readonly="1"/>
<field name="date_run" readonly="1"/> <field name="date_done" readonly="1"/>
<field name="date_done" readonly="1"/> </group>
</group> </group>
</sheet> </sheet>
</form> </form>
@ -244,40 +241,34 @@
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Activities"> <form string="Activities">
<group colspan="2" col="2"> <group>
<separator string="Activity" colspan="2"/> <group string="Activity">
<field name="name" select="1"/> <field name="name"/>
<field name="signal" groups="base.group_no_one"/> <field name="signal" groups="base.group_no_one"/>
<field name="start"/> <field name="start"/>
<field name="object_id" invisible="1"/> <field name="object_id" invisible="1"/>
<field name="campaign_id" invisible="1"/> <field name="campaign_id" invisible="1"/>
</group>
<group string="Cost / Revenue">
<field name="variable_cost"/>
<field name="revenue"/>
</group>
</group> </group>
<group colspan="2" col="2"> <group string="Condition" col="4">
<separator string="Cost / Revenue" colspan="2"/>
<field name="variable_cost"/>
<field name="revenue"/>
</group>
<newline/>
<group colspan="4" col="4">
<separator string="Condition" colspan="4"/>
<field name="condition" widget="char" colspan="4"/> <field name="condition" widget="char" colspan="4"/>
<field name="keep_if_condition_not_met"/> <field name="keep_if_condition_not_met"/>
</group> </group>
<group colspan="4" col="4"> <group col="4">
<separator string="Action" colspan="4"/> <separator string="Action" colspan="4"/>
<field name="type"/> <field name="type"/>
<group colspan="2" col="2"> <field name="email_template_id" attrs="{'required':[('type','=','email')], 'invisible':[('type','!=','email')]}"
<field name="email_template_id" attrs="{'required':[('type','=','email')], 'invisible':[('type','!=','email')]}" context="{'default_model_id':object_id}" />
context="{'default_model_id':object_id}" /> <field name="server_action_id" attrs="{'required':[('type','=','action')],'invisible':[('type','!=','action')]}" domain="[('model_id','=',object_id)]" />
<field name="server_action_id" attrs="{'required':[('type','=','action')],'invisible':[('type','!=','action')]}" domain="[('model_id','=',object_id)]" /> <field name="report_id" attrs="{'required':[('type','=','report')]}" context="{'object_id':object_id}" attrs="{ 'invisible':[('type','!=','report')]}" />
<group attrs="{ 'invisible':[('type','!=','report')]}"> <field name="report_directory_id" attrs="{'required':[('type','=','report')]}" attrs="{ 'invisible':[('type','!=','report')]}" />
<field name="report_id" attrs="{'required':[('type','=','report')]}" context="{'object_id':object_id}" />
<field name="report_directory_id" attrs="{'required':[('type','=','report')]}" />
</group>
</group>
</group> </group>
<separator string="Transitions" colspan="4"/> <separator string="Transitions"/>
<field name="from_ids" nolabel="1" mode="tree,form" context="{'default_activity_to_id': active_id}" colspan="2"> <field name="from_ids" mode="tree,form" context="{'default_activity_to_id': active_id}">
<tree string="Incoming Transitions" editable="bottom"> <tree string="Incoming Transitions" editable="bottom">
<field name="activity_from_id" domain="[('campaign_id', '=', parent.campaign_id)]"/> <field name="activity_from_id" domain="[('campaign_id', '=', parent.campaign_id)]"/>
<field name='trigger'/> <field name='trigger'/>
@ -285,10 +276,12 @@
<field name="interval_type"/> <field name="interval_type"/>
</tree> </tree>
<form string="Incoming Transitions"> <form string="Incoming Transitions">
<field name="activity_from_id" domain="[('campaign_id', '=', parent.campaign_id)]"/> <group col="4">
<field name='trigger'/> <field name="activity_from_id" domain="[('campaign_id', '=', parent.campaign_id)]"/>
<field name="interval_nbr"/> <field name='trigger'/>
<field name="interval_type"/> <field name="interval_nbr"/>
<field name="interval_type"/>
</group>
</form> </form>
</field> </field>
<field name="to_ids" nolabel="1" mode="tree,form" context="{'default_activity_from_id': active_id}" colspan="2"> <field name="to_ids" nolabel="1" mode="tree,form" context="{'default_activity_from_id': active_id}" colspan="2">
@ -299,10 +292,12 @@
<field name="interval_type"/> <field name="interval_type"/>
</tree> </tree>
<form string="Outgoing Transitions"> <form string="Outgoing Transitions">
<field name="activity_to_id" domain="[('campaign_id', '=', parent.campaign_id)]"/> <group col="4">
<field name='trigger'/> <field name="activity_to_id" domain="[('campaign_id', '=', parent.campaign_id)]"/>
<field name="interval_nbr"/> <field name='trigger'/>
<field name="interval_type"/> <field name="interval_nbr"/>
<field name="interval_type"/>
</group>
</form> </form>
</field> </field>
</form> </form>
@ -315,7 +310,7 @@
<field name="type">tree</field> <field name="type">tree</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<tree string="Activities"> <tree string="Activities">
<field name="name" select="1"/> <field name="name"/>
<field name="condition"/> <field name="condition"/>
<field name="type"/> <field name="type"/>
<field name="start"/> <field name="start"/>
@ -357,36 +352,30 @@
<field name="model">marketing.campaign.workitem</field> <field name="model">marketing.campaign.workitem</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form layout="manual"> <form string="Marketing Campaign Activities">
<header> <header>
<button string="Process" states="todo" name="process" type="object"/> <button string="Process" states="todo" name="process" type="object"/>
<button string="Reset" states="exception,cancelled" name="button_draft" type="object"/> <button string="Reset" states="exception,cancelled" name="button_draft" type="object"/>
<button string="Cancel" states="todo,exception" name="button_cancel" type="object"/> <button string="Cancel" states="todo,exception" name="button_cancel" type="object"/>
<field name="state" readonly="True" widget="statusbar" statusbar_visible="todo,done" statusbar_colors='{"exception":"red"}'/> <field name="state" readonly="True" widget="statusbar" statusbar_visible="todo,done" statusbar_colors='{"exception":"red"}'/>
<button string="Preview" states="todo" name="preview" icon="gtk-zoom-fit" type="object"/>
</header> </header>
<sheet string="Marketing Campaign Activities" layout="auto"> <sheet>
<group colspan="4" col="6"> <group>
<group colspan="2" col="2"> <group string="Campaign Step">
<separator string="Campaign Step" colspan="2"/> <field name="campaign_id"/>
<field name="campaign_id" select="1"/> <field name="segment_id"/>
<field name="segment_id" select="1"/> <field name="activity_id" context="{'segment_id':segment_id}"/>
<field name="activity_id" context="{'segment_id':segment_id}" select="1"/> <field name="date"/>
</group><group colspan="2" col="2"> </group><group string="Related Resource">
<separator string="Related Resource" colspan="2"/>
<field name="object_id" readonly="True"/> <field name="object_id" readonly="True"/>
<field name="res_name"/> <field name="res_name"/>
<field name="res_id"/> <field name="res_id"/>
<field name="partner_id" select="1"/> <field name="partner_id"/>
</group><group colspan="2" col="2">
<separator string="Date" colspan="2"/>
<field name="date"/>
<label string="" colspan="1"/>
<button string="Preview" states="todo" name="preview" icon="gtk-zoom-fit" type="object"/>
</group> </group>
</group> </group>
<group colspan="4" col="4" attrs="{'invisible':[('state','!=','exception')]}"> <group attrs="{'invisible':[('state','!=','exception')]}" string="Error Message">
<separator string="Error Message" colspan="4"/> <field name="error_msg" nolabel="1" colspan="2"/>
<field name="error_msg" nolabel="1" colspan="4"/>
</group> </group>
</sheet> </sheet>
</form> </form>